diff --git a/.clang-format b/.clang-format
new file mode 100644
index 0000000000..f000a27017
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,39 @@
+Language: Cpp
+Standard: Cpp11
+BasedOnStyle: "Chromium" 
+ColumnLimit: 128
+IndentWidth: 4
+UseTab: Never
+
+BreakBeforeBraces: Custom
+BraceWrapping:   
+  AfterEnum: true
+  AfterClass: false
+  AfterControlStatement: false
+  AfterFunction: false
+  AfterNamespace: false
+  AfterStruct: false
+  AfterUnion: false
+  BeforeCatch: false
+  BeforeElse: false
+  SplitEmptyFunction: false
+  SplitEmptyNamespace: true
+
+
+AccessModifierOffset: -4
+AllowShortFunctionsOnASingleLine: InlineOnly  
+BreakConstructorInitializers: BeforeColon 
+BreakConstructorInitializersBeforeComma: true
+IndentCaseLabels: true
+ReflowComments: false 
+Cpp11BracedListStyle: false
+ContinuationIndentWidth: 4
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+CompactNamespaces: true
+SortIncludes: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+
+PenaltyReturnTypeOnItsOwnLine: 1000
+PenaltyBreakBeforeFirstCallParameter: 1000
+
diff --git a/.eslintrc.js b/.eslintrc.js
index b4d88777f2..5667a04984 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -54,7 +54,11 @@ module.exports = {
         "Window": false,
         "XMLHttpRequest": false,
         "location": false,
-        "print": false
+        "print": false,
+        "RayPick": false,
+        "LaserPointers": false,
+        "ContextOverlay": false,
+        "module": false
     },
     "rules": {
         "brace-style": ["error", "1tbs", { "allowSingleLine": false }],
@@ -64,7 +68,7 @@ module.exports = {
         "eqeqeq": ["error", "always"],
         "indent": ["error", 4, { "SwitchCase": 1 }],
         "keyword-spacing": ["error", { "before": true, "after": true }],
-        "max-len": ["error", 192, 4],
+        "max-len": ["error", 128, 4],
         "new-cap": ["error"],
         "no-floating-decimal": ["error"],
         //"no-magic-numbers": ["error", { "ignore": [0, 1], "ignoreArrayIndexes": true }],
diff --git a/.gitattributes b/.gitattributes
index 406780d20a..4a06c4288a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -10,6 +10,7 @@
 *.json text
 *.js text
 *.qml text
+*.qrc text
 *.slf text
 *.slh text
 *.slv text
diff --git a/.gitignore b/.gitignore
index d6227f1f30..c1eef3817f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,20 @@ ext/
 Makefile
 *.user
 
+# Android Studio
+*.iml
+local.properties
+android/libraries
+
+# VSCode
+# List taken from Github Global Ignores master@435c4d92 
+# https://github.com/github/gitignore/commits/master/Global/VisualStudioCode.gitignore
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
 # Xcode
 *.xcodeproj
 *.xcworkspace
@@ -50,6 +64,10 @@ gvr-interface/libs/*
 # ignore files for various dev environments
 TAGS
 *.sw[po]
+*.qmlc
+
+# ignore QML compilation output
+*.qmlc
 
 # ignore node files for the console
 node_modules
diff --git a/BUILD.md b/BUILD.md
index c45b7cb636..feed677828 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -1,34 +1,31 @@
 ### Dependencies
 
-* [cmake](https://cmake.org/download/) ~> 3.3.2
-* [Qt](https://www.qt.io/download-open-source) ~> 5.6.2
-* [OpenSSL](https://www.openssl.org/community/binaries.html)
-  * IMPORTANT: Use the latest available version of OpenSSL to avoid security vulnerabilities.
-* [VHACD](https://github.com/virneo/v-hacd)(clone this repository)(Optional)
+- [cmake](https://cmake.org/download/):  3.9
+- [Qt](https://www.qt.io/download-open-source):   5.9.1
+- [OpenSSL](https://www.openssl.org/): Use the latest available 1.0 version (**NOT** 1.1) of OpenSSL to avoid security vulnerabilities.
+- [VHACD](https://github.com/virneo/v-hacd)(clone this repository)(Optional)
 
-#### CMake External Project Dependencies
+### CMake External Project Dependencies
 
-* [boostconfig](https://github.com/boostorg/config) ~> 1.58
-* [Bullet Physics Engine](https://github.com/bulletphysics/bullet3/releases) ~> 2.83
-* [GLEW](http://glew.sourceforge.net/)
-* [glm](https://glm.g-truc.net/0.9.5/index.html) ~> 0.9.5.4
-* [gverb](https://github.com/highfidelity/gverb)
-* [Oculus SDK](https://developer.oculus.com/downloads/) ~> 0.6 (Win32) / 0.5 (Mac / Linux)
-* [oglplus](http://oglplus.org/) ~> 0.63
-* [OpenVR](https://github.com/ValveSoftware/openvr) ~> 0.91 (Win32 only)
-* [Polyvox](http://www.volumesoffun.com/) ~> 0.2.1
-* [QuaZip](https://sourceforge.net/projects/quazip/files/quazip/) ~> 0.7.1
-* [SDL2](https://www.libsdl.org/download-2.0.php) ~> 2.0.3
-* [soxr](https://sourceforge.net/p/soxr/wiki/Home/) ~> 0.1.1
-* [Intel Threading Building Blocks](https://www.threadingbuildingblocks.org/) ~> 4.3
-* [Sixense](http://sixense.com/) ~> 071615
-* [zlib](http://www.zlib.net/) ~> 1.28 (Win32 only)
+These dependencies need not be installed manually. They are automatically downloaded on the platforms where they are required.  
+- [Bullet Physics Engine](https://github.com/bulletphysics/bullet3/releases):  2.83
+- [GLEW](http://glew.sourceforge.net/):   1.13
+- [glm](https://glm.g-truc.net/0.9.8/index.html):  0.9.8
+- [Oculus SDK](https://developer.oculus.com/downloads/):   1.11 (Win32) / 0.5 (Mac)
+- [OpenVR](https://github.com/ValveSoftware/openvr):   1.0.6 (Win32 only)
+- [Polyvox](http://www.volumesoffun.com/):   0.2.1
+- [QuaZip](https://sourceforge.net/projects/quazip/files/quazip/):   0.7.3
+- [SDL2](https://www.libsdl.org/download-2.0.php):   2.0.3
+- [Intel Threading Building Blocks](https://www.threadingbuildingblocks.org/):   4.3
+- [Sixense](http://sixense.com/):   071615
+- [zlib](http://www.zlib.net/):   1.28 (Win32 only)
+- nVidia Texture Tools:   2.1
 
 The above dependencies will be downloaded, built, linked and included automatically by CMake where we require them. The CMakeLists files that handle grabbing each of the following external dependencies can be found in the [cmake/externals folder](cmake/externals). The resulting downloads, source files and binaries will be placed in the `build/ext` folder in each of the subfolders for each external project.
 
 These are not placed in your normal build tree when doing an out of source build so that they do not need to be re-downloaded and re-compiled every time the CMake build folder is cleared. Should you want to force a re-download and re-compile of a specific external, you can simply remove that directory from the appropriate subfolder in `build/ext`. Should you want to force a re-download and re-compile of all externals, just remove the `build/ext` folder.
 
-If you would like to use a specific install of a dependency instead of the version that would be grabbed as a CMake ExternalProject, you can pass -DUSE_LOCAL_$NAME=0 (where $NAME is the name of the subfolder in [cmake/externals](cmake/externals)) when you run CMake to tell it not to get that dependency as an external project.
+If you would like to use a specific install of a dependency instead of the version that would be grabbed as a CMake ExternalProject, you can pass -DUSE\_LOCAL\_$NAME=0 (where $NAME is the name of the subfolder in [cmake/externals](cmake/externals)) when you run CMake to tell it not to get that dependency as an external project.
 
 ### OS Specific Build Guides
 
diff --git a/BUILD_ANDROID.md b/BUILD_ANDROID.md
index d69d20ee8a..cc51e58b1d 100644
--- a/BUILD_ANDROID.md
+++ b/BUILD_ANDROID.md
@@ -1,19 +1,56 @@
 Please read the [general build guide](BUILD.md) for information on dependencies required for all platforms. Only Android specific instructions are found in this file.
 
-### Android Dependencies
+# Android Dependencies
 
 You will need the following tools to build our Android targets.
 
-* [cmake](http://www.cmake.org/download/) ~> 3.5.1
-* [Qt](http://www.qt.io/download-open-source/#) ~> 5.6.2
-* [ant](http://ant.apache.org/bindownload.cgi) ~> 1.9.4
-* [Android NDK](https://developer.android.com/tools/sdk/ndk/index.html) ~> r10d
-* [Android SDK](http://developer.android.com/sdk/installing/index.html) ~> 24.4.1.1
-  * Install the latest Platform-tools
-  * Install the latest Build-tools
-  * Install the SDK Platform for API Level 19
-  * Install Sources for Android SDK for API Level 19
-  * Install the ARM EABI v7a System Image if you want to run an emulator.
+* [Qt](http://www.qt.io/download-open-source/#) ~> 5.9.1
+* [Android Studio](https://developer.android.com/studio/index.html)
+* [Google VR SDK](https://github.com/googlevr/gvr-android-sdk/releases)
+* [Gradle](https://gradle.org/releases/)
+
+### Qt
+
+Download the Qt online installer.  Run the installer and select the android_armv7 binaries.  Installing to the default path is recommended
+
+### Android Studio
+
+Download the Android Studio installer and run it.   Once installed, at the welcome screen, click configure in the lower right corner and select SDK manager
+
+From the SDK Platforms tab, select API level 26.  
+
+* Install the ARM EABI v7a System Image if you want to run an emulator.
+
+From the SDK Tools tab select the following
+
+* Android SDK Build-Tools
+* GPU Debugging Tools
+* CMake (even if you have a separate CMake installation)
+* LLDB 
+* Android SDK Platform-Tools
+* Android SDK Tools
+* Android SDK Tools
+* NDK (even if you have the NDK installed separately)
+
+### Google VR SDK
+
+Download the 1.8 Google VR SDK [release](https://github.com/googlevr/gvr-android-sdk/archive/v1.80.0.zip).  Unzip the archive to a location on your drive.  
+
+### Gradle
+
+Download [Gradle 4.1](https://services.gradle.org/distributions/gradle-4.1-all.zip) and unzip it on your local drive.  You may wish to add the location of the bin directory within the archive to your path 
+
+#### Set up machine specific Gradle properties
+
+Create a `gradle.properties` file in ~/.gradle.   Edit the file to contain the following
+
+    QT5_ROOT=C\:\\Qt\\5.9.1\\android_armv7
+    GVR_ROOT=C\:\\Android\\gvr-android-sdk
+
+Replace the paths with your local installations of Qt5 and the Google VR SDK
+
+
+# TODO fix the rest
 
 You will also need to cross-compile the dependencies required for all platforms for Android, and help CMake find these compiled libraries on your machine.
 
diff --git a/BUILD_LINUX.md b/BUILD_LINUX.md
index d40576a75d..038f53154c 100644
--- a/BUILD_LINUX.md
+++ b/BUILD_LINUX.md
@@ -1,7 +1,96 @@
+# Linux build guide
+
 Please read the [general build guide](BUILD.md) for information on dependencies required for all platforms. Only Linux specific instructions are found in this file.
 
-### Qt5 Dependencies
+## Qt5 Dependencies
 
 Should you choose not to install Qt5 via a package manager that handles dependencies for you, you may be missing some Qt5 dependencies. On Ubuntu, for example, the following additional packages are required:
 
     libasound2 libxmu-dev libxi-dev freeglut3-dev libasound2-dev libjack0 libjack-dev libxrandr-dev libudev-dev libssl-dev
+
+## Ubuntu 16.04 specific build guide
+
+### Prepare environment
+
+Install qt:
+```bash
+wget http://debian.highfidelity.com/pool/h/hi/hifi-qt5.6.1_5.6.1_amd64.deb
+sudo dpkg -i hifi-qt5.6.1_5.6.1_amd64.deb
+```
+
+Install build dependencies:
+```bash
+sudo apt-get install libasound2 libxmu-dev libxi-dev freeglut3-dev libasound2-dev libjack0 libjack-dev libxrandr-dev libudev-dev libssl-dev
+```
+
+To compile interface in a server you must install:
+```bash
+sudo apt -y install libpulse0 libnss3 libnspr4 libfontconfig1 libxcursor1 libxcomposite1 libxtst6 libxslt1.1
+```
+
+Install build tools:
+```bash
+sudo apt install cmake
+```
+
+### Get code and checkout the tag you need
+
+Clone this repository:
+```bash
+git clone https://github.com/highfidelity/hifi.git
+```
+
+To compile a RELEASE version checkout the tag you need getting a list of all tags:
+```bash
+git fetch -a
+git tags
+```
+
+Then checkout last tag with:
+```bash
+git checkout tags/RELEASE-6819
+```
+
+Or go to the highfidelity download page (https://highfidelity.com/download) to get the release version. For example, if there is a BETA 6731 type:
+```bash
+git checkout tags/RELEASE-6731
+```
+
+### Compiling
+
+Create the build directory:
+```bash
+mkdir -p hifi/build
+cd hifi/build
+```
+
+Prepare makefiles:
+```bash
+cmake -DQT_CMAKE_PREFIX_PATH=/usr/local/Qt5.6.1/5.6/gcc_64/lib/cmake ..
+```
+
+Start compilation and get a cup of coffee:
+```bash
+make domain-server assignment-client interface
+```
+
+In a server does not make sense to compile interface 
+
+### Running the software
+
+Running domain server:
+```bash
+./domain-server/domain-server
+```
+
+Running assignment client:
+```bash
+./assignment-client/assignment-client -n 6
+```
+
+Running interface:
+```bash
+./interface/interface
+```
+
+Go to localhost in running interface.
diff --git a/BUILD_OSX.md b/BUILD_OSX.md
index 3365627b8c..6b66863534 100644
--- a/BUILD_OSX.md
+++ b/BUILD_OSX.md
@@ -1,29 +1,28 @@
-Please read the [general build guide](BUILD.md) for information on dependencies required for all platforms. Only OS X specific instructions are found in this file.
+Please read the [general build guide](BUILD.md) for information on dependencies required for all platforms. Only macOS specific instructions are found in this file.
 
 ### Homebrew
 
-[Homebrew](https://brew.sh/) is an excellent package manager for OS X. It makes install of some High Fidelity dependencies very simple.
+[Homebrew](https://brew.sh/) is an excellent package manager for macOS. It makes install of some High Fidelity dependencies very simple.
 
-    brew tap homebrew/versions
-    brew install cmake openssl
+    brew install cmake openssl qt
 
 ### OpenSSL
 
 Assuming you've installed OpenSSL using the homebrew instructions above, you'll need to set OPENSSL_ROOT_DIR so CMake can find your installations.
 For OpenSSL installed via homebrew, set OPENSSL_ROOT_DIR:
 
-    export OPENSSL_ROOT_DIR=/usr/local/Cellar/openssl/1.0.2h_1/
+    export OPENSSL_ROOT_DIR=/usr/local/Cellar/openssl/1.0.2l
 
 Note that this uses the version from the homebrew formula at the time of this writing, and the version in the path will likely change.
 
 ### Qt
 
-Download and install the [Qt 5.6.2 for macOS](http://download.qt.io/official_releases/qt/5.6/5.6.2/qt-opensource-mac-x64-clang-5.6.2.dmg). 
+Assuming you've installed Qt using the homebrew instructions above, you'll need to set QT_CMAKE_PREFIX_PATH so CMake can find your installations.
+For Qt installed via homebrew, set QT_CMAKE_PREFIX_PATH:
 
-Keep the default components checked when going through the installer.
+    export QT_CMAKE_PREFIX_PATH=/usr/local/Cellar/qt/5.9.1/lib/cmake
 
-Once Qt is installed, you need to manually configure the following:
-* Set the QT_CMAKE_PREFIX_PATH environment variable to your `Qt5.6.2/5.6/clang_64/lib/cmake/` directory.
+Note that this uses the version from the homebrew formula at the time of this writing, and the version in the path will likely change.
 
 ### Xcode
 
diff --git a/BUILD_WIN.md b/BUILD_WIN.md
index 818a176f75..eea1f85e5b 100644
--- a/BUILD_WIN.md
+++ b/BUILD_WIN.md
@@ -1,46 +1,58 @@
 This is a stand-alone guide for creating your first High Fidelity build for Windows 64-bit.
 
 ## Building High Fidelity
+Note: We are now using Visual Studio 2017 and Qt 5.9.1. If you are upgrading from Visual Studio 2013 and Qt 5.6.2, do a clean uninstall of those versions before going through this guide. 
 
-### Step 1. Installing Visual Studio 2013
+Note: The prerequisites will require about 10 GB of space on your drive. You will also need a system with at least 8GB of main memory.
 
-If you don't already have the Community or Professional edition of Visual Studio 2013, download and install [Visual Studio Community 2013](https://www.visualstudio.com/en-us/news/releasenotes/vs2013-community-vs). You do not need to install any of the optional components when going through the installer.
+### Step 1. Visual Studio 2017
 
-Note: Newer versions of Visual Studio are not yet compatible. 
+If you don’t have Community or Professional edition of Visual Studio 2017, download [Visual Studio Community 2017](https://www.visualstudio.com/downloads/). 
+
+When selecting components, check "Desktop development with C++." Also check "Windows 8.1 SDK and UCRT SDK" and "VC++ 2015.3 v140 toolset (x86,x64)" on the Summary toolbar on the right.
 
 ### Step 2. Installing CMake
 
-Download and install the [CMake 3.8.0 win64-x64 Installer](https://cmake.org/files/v3.8/cmake-3.8.0-win64-x64.msi). Make sure "Add CMake to system PATH for all users" is checked when going through the installer.
+Download and install the latest version of CMake 3.9. Download the file named  win64-x64 Installer from the [CMake Website](https://cmake.org/download/). Make sure to check "Add CMake to system PATH for all users" when prompted during installation.
 
 ### Step 3. Installing Qt
 
-Download and install the [Qt 5.6.2 for Windows 64-bit (VS 2013)](http://download.qt.io/official_releases/qt/5.6/5.6.2/qt-opensource-windows-x86-msvc2013_64-5.6.2.exe). 
+Download and install the [Qt Online Installer](https://www.qt.io/download-open-source/?hsCtaTracking=f977210e-de67-475f-a32b-65cec207fd03%7Cd62710cd-e1db-46aa-8d4d-2f1c1ffdacea). While installing, you only need to have the following components checked under Qt 5.9.1: "msvc2017 64-bit", "Qt WebEngine", and "Qt Script (Deprecated)".
 
-Keep the default components checked when going through the installer.
+Note: Installing the Sources is optional but recommended if you have room for them (~2GB). 
 
 ### Step 4. Setting Qt Environment Variable
 
 Go to `Control Panel > System > Advanced System Settings > Environment Variables > New...` (or search “Environment Variables” in Start Search).
 * Set "Variable name": `QT_CMAKE_PREFIX_PATH`
-* Set "Variable value": `%QT_DIR%\5.6\msvc2013_64\lib\cmake`
+* Set "Variable value": `C:\Qt\5.9.1\msvc2017_64\lib\cmake` 
 
-### Step 5. Installing OpenSSL
+### Step 5. Installing [vcpkg](https://github.com/Microsoft/vcpkg)
 
-Download and install the [Win64 OpenSSL v1.0.2L Installer](https://slproweb.com/download/Win64OpenSSL-1_0_2L.exe).
+ * Clone the VCPKG [repository](https://github.com/Microsoft/vcpkg)
+ * Follow the instructions in the [readme](https://github.com/Microsoft/vcpkg/blob/master/README.md) to bootstrap vcpkg
+   * Note, you may need to do these in a _Developer Command Prompt_
+ * Set an environment variable VCPKG_ROOT to the location of the cloned repository
+   * Close and re-open any command prompts after setting the environment variable so that they will pick up the change
 
-### Step 6. Running CMake to Generate Build Files
+### Step 6. Installing OpenSSL via vcpkg
+
+ * In the vcpkg directory, install the 64 bit OpenSSL package with the command `vcpkg install openssl:x64-windows`
+ * Once the build completes you should have a file `ssl.h` in `${VCPKG_ROOT}/installed/x64-windows/include/openssl`
+  
+### Step 7. Running CMake to Generate Build Files
 
 Run Command Prompt from Start and run the following commands:
-````
+```
 cd "%HIFI_DIR%"
 mkdir build
 cd build
-cmake .. -G "Visual Studio 12 Win64"
-````
+cmake .. -G "Visual Studio 15 Win64"
+```
     
 Where `%HIFI_DIR%` is the directory for the highfidelity repository.     
 
-### Step 7. Making a Build
+### Step 8. Making a Build
 
 Open `%HIFI_DIR%\build\hifi.sln` using Visual Studio.
 
@@ -48,7 +60,7 @@ Change the Solution Configuration (next to the green play button) from "Debug" t
 
 Run `Build > Build Solution`.
 
-### Step 8. Testing Interface
+### Step 9. Testing Interface
 
 Create another environment variable (see Step #4)
 * Set "Variable name": `_NO_DEBUG_HEAP`
@@ -62,24 +74,20 @@ Note: You can also run Interface by launching it from command line or File Explo
 
 ## Troubleshooting
 
-For any problems after Step #6, first try this: 
+For any problems after Step #7, first try this: 
 * Delete your locally cloned copy of the highfidelity repository
 * Restart your computer
 * Redownload the [repository](https://github.com/highfidelity/hifi) 
-* Restart directions from Step #6
+* Restart directions from Step #7
 
 #### CMake gives you the same error message repeatedly after the build fails
 
 Remove `CMakeCache.txt` found in the `%HIFI_DIR%\build` directory.
 
-#### nmake cannot be found
+#### CMake can't find OpenSSL
 
-Make sure nmake.exe is located at the following path:
-
-    C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin
-    
-If not, add the directory where nmake is located to the PATH environment variable.
+Remove `CMakeCache.txt` found in the `%HIFI_DIR%\build` directory.  Verify that your VCPKG_ROOT environment variable is set and pointing to the correct location.  Verify that the file `${VCPKG_ROOT}/installed/x64-windows/include/openssl/ssl.h` exists.
 
 #### Qt is throwing an error
 
-Make sure you have the correct version (5.6.2) installed and `QT_CMAKE_PREFIX_PATH` environment variable is set correctly.
+Make sure you have the correct version (5.9.1) installed and `QT_CMAKE_PREFIX_PATH` environment variable is set correctly.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3c90256134..2c10e714a3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,253 +1,95 @@
-cmake_minimum_required(VERSION 3.2)
-
-if (USE_ANDROID_TOOLCHAIN)
-  set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/cmake/android/android.toolchain.cmake")
-  set(ANDROID_NATIVE_API_LEVEL 19)
-  set(ANDROID_TOOLCHAIN_NAME arm-linux-androideabi-clang3.5)
-  set(ANDROID_STL c++_shared)
-endif ()
-
-if (WIN32)
-  cmake_policy(SET CMP0020 NEW)
-endif (WIN32)
-
-if (POLICY CMP0028)
-  cmake_policy(SET CMP0028 OLD)
-endif ()
-
-if (POLICY CMP0043)
-  cmake_policy(SET CMP0043 OLD)
-endif ()
-
-if (POLICY CMP0042)
-  cmake_policy(SET CMP0042 OLD)
-endif ()
-
-set_property(GLOBAL PROPERTY USE_FOLDERS ON)
-set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "CMakeTargets")
+# If we're running under the gradle build, HIFI_ANDROID will be set here, but 
+# ANDROID will not be set until after the `project` statement.  This is the *ONLY*
+# place you need to use `HIFI_ANDROID` instead of `ANDROID`
+if (WIN32 AND NOT HIFI_ANDROID)
+  cmake_minimum_required(VERSION 3.7)
+else()
+  cmake_minimum_required(VERSION 3.2)
+endif()
 
 project(hifi)
-add_definitions(-DGLM_FORCE_RADIANS)
-set(CMAKE_CXX_FLAGS_DEBUG  "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
 
-find_package( Threads )
+include("cmake/init.cmake")
 
-if (WIN32)
-  add_definitions(-DNOMINMAX -D_CRT_SECURE_NO_WARNINGS)
+include("cmake/compiler.cmake")
 
-  if (NOT WINDOW_SDK_PATH)
-    set(DEBUG_DISCOVERED_SDK_PATH TRUE)
-  endif()
-
-  # sets path for Microsoft SDKs
-  # if you get build error about missing 'glu32' this path is likely wrong
-  if (MSVC10)
-    set(WINDOW_SDK_PATH "C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1 " CACHE PATH "Windows SDK PATH")
-  elseif (MSVC12)
-    if ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-      set(WINDOW_SDK_FOLDER "x64")
-    else()
-      set(WINDOW_SDK_FOLDER "x86")
-    endif()
-    set(WINDOW_SDK_PATH "C:\\Program Files (x86)\\Windows Kits\\8.1\\Lib\\winv6.3\\um\\${WINDOW_SDK_FOLDER}" CACHE PATH "Windows SDK PATH")
-  endif ()
-
-  if (DEBUG_DISCOVERED_SDK_PATH)
-    message(STATUS "The discovered Windows SDK path is ${WINDOW_SDK_PATH}")
-  endif ()
-
-  set(CMAKE_PREFIX_PATH ${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")
-  # /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.
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE")
-  # always produce symbols as PDB files
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zi")
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DEBUG /OPT:REF /OPT:ICF")
-else ()
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -fno-strict-aliasing -Wno-unused-parameter")
-  if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ggdb -Woverloaded-virtual -Wdouble-promotion")
-      if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "5.1") # gcc 5.1 and on have suggest-override
-          set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsuggest-override")
-      endif ()
-  endif ()
-endif(WIN32)
-
-if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-  if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.3")
-    # GLM 0.9.8 on Ubuntu 14 (gcc 4.4) has issues with the simd declarations 
-    add_definitions(-DGLM_FORCE_PURE)
-  endif()
+if (NOT DEFINED SERVER_ONLY)
+  set(SERVER_ONLY 0)
 endif()
 
-if (NOT ANDROID)
-  if ((NOT MSVC12) AND (NOT MSVC14))
-    include(CheckCXXCompilerFlag)
-    CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
-    CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
-
-    if (COMPILER_SUPPORTS_CXX11)
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-    elseif(COMPILER_SUPPORTS_CXX0X)
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
-    else()
-      message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
-    endif()
-  endif ()
-else ()
-  # assume that the toolchain selected for android has C++11 support
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-endif ()
-
-if (APPLE)
-  set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++0x")
-  set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --stdlib=libc++")
-endif ()
-
-if (NOT ANDROID_LIB_DIR)
-  set(ANDROID_LIB_DIR $ENV{ANDROID_LIB_DIR})
-endif ()
-
-if (ANDROID)
-  if (NOT ANDROID_QT_CMAKE_PREFIX_PATH)
-    set(QT_CMAKE_PREFIX_PATH ${ANDROID_LIB_DIR}/Qt/5.5/android_armv7/lib/cmake)
-  else ()
-    set(QT_CMAKE_PREFIX_PATH ${ANDROID_QT_CMAKE_PREFIX_PATH})
-  endif ()
-
-  set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-  set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
-
-  if (ANDROID_LIB_DIR)
-    list(APPEND CMAKE_FIND_ROOT_PATH ${ANDROID_LIB_DIR})
-  endif ()
-else ()
-  if (NOT QT_CMAKE_PREFIX_PATH)
-    set(QT_CMAKE_PREFIX_PATH $ENV{QT_CMAKE_PREFIX_PATH})
-  endif ()
-  if (NOT QT_CMAKE_PREFIX_PATH)
-    get_filename_component(QT_CMAKE_PREFIX_PATH "${Qt5_DIR}/.." REALPATH)
-  endif ()
-endif ()
-
-set(QT_DIR $ENV{QT_DIR})
-
-if (WIN32)
-    if (NOT EXISTS ${QT_CMAKE_PREFIX_PATH})
-        message(FATAL_ERROR "Could not determine QT_CMAKE_PREFIX_PATH.")
-    endif ()
+if (ANDROID OR UWP)
+    set(MOBILE 1)
+else()
+    set(MOBILE 0)
 endif()
 
-# figure out where the qt dir is
-get_filename_component(QT_DIR "${QT_CMAKE_PREFIX_PATH}/../../" ABSOLUTE)
+if (ANDROID OR UWP)
+    option(BUILD_SERVER "Build server components" OFF)
+    option(BUILD_TOOLS "Build tools" OFF)
+else()
+    option(BUILD_SERVER "Build server components" ON)
+    option(BUILD_TOOLS "Build tools" ON)
+endif()
 
-set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${QT_CMAKE_PREFIX_PATH})
+if (SERVER_ONLY)
+    option(BUILD_CLIENT "Build client components" OFF)
+    option(BUILD_TESTS "Build tests" OFF)
+else()
+    option(BUILD_CLIENT "Build client components" ON)
+    option(BUILD_TESTS "Build tests" ON)
+endif()
 
-if (APPLE)
+option(BUILD_INSTALLER "Build installer" ON)
 
-  exec_program(sw_vers ARGS -productVersion  OUTPUT_VARIABLE OSX_VERSION)
-  string(REGEX MATCH "^[0-9]+\\.[0-9]+" OSX_VERSION ${OSX_VERSION})
-  message(STATUS "Detected OS X version = ${OSX_VERSION}")
+MESSAGE(STATUS "Build server:    " ${BUILD_SERVER})
+MESSAGE(STATUS "Build client:    " ${BUILD_CLIENT})
+MESSAGE(STATUS "Build tests:     " ${BUILD_TESTS})
+MESSAGE(STATUS "Build tools:     " ${BUILD_TOOLS})
+MESSAGE(STATUS "Build installer: " ${BUILD_INSTALLER})
 
-  set(OSX_SDK "${OSX_VERSION}" CACHE String "OS X SDK version to look for inside Xcode bundle or at OSX_SDK_PATH")
+if (UNIX AND DEFINED ENV{HIFI_MEMORY_DEBUGGING})
+    MESSAGE(STATUS "Memory debugging is enabled")
+endif()
 
-  # set our OS X deployment target
-  set(CMAKE_OSX_DEPLOYMENT_TARGET 10.8)
-
-  # find the SDK path for the desired SDK
-  find_path(
-    _OSX_DESIRED_SDK_PATH
-    NAME MacOSX${OSX_SDK}.sdk
-    HINTS ${OSX_SDK_PATH}
-    PATHS /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/
-          /Applications/Xcode-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/
-  )
-
-  if (NOT _OSX_DESIRED_SDK_PATH)
-    message(STATUS "Could not find OS X ${OSX_SDK} SDK. Will fall back to default. If you want a specific SDK, please pass OSX_SDK and optionally OSX_SDK_PATH to CMake.")
-  else ()
-    message(STATUS "Found OS X ${OSX_SDK} SDK at ${_OSX_DESIRED_SDK_PATH}/MacOSX${OSX_SDK}.sdk")
-
-    # set that as the SDK to use
-    set(CMAKE_OSX_SYSROOT ${_OSX_DESIRED_SDK_PATH}/MacOSX${OSX_SDK}.sdk)
-  endif ()
-
-endif ()
-
-# Hide automoc folders (for IDEs)
-set(AUTOGEN_TARGETS_FOLDER "hidden/generated")
-
-# Find includes in corresponding build directories
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-# Instruct CMake to run moc automatically when needed.
-set(CMAKE_AUTOMOC ON)
-# Instruct CMake to run rcc automatically when needed
-set(CMAKE_AUTORCC ON)
-
-set(HIFI_LIBRARY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries")
-
-# setup for find modules
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/")
-
-if (CMAKE_BUILD_TYPE)
-  string(TOUPPER ${CMAKE_BUILD_TYPE} UPPER_CMAKE_BUILD_TYPE)
-else ()
-  set(UPPER_CMAKE_BUILD_TYPE DEBUG)
-endif ()
-
-set(HF_CMAKE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-set(MACRO_DIR "${HF_CMAKE_DIR}/macros")
-set(EXTERNAL_PROJECT_DIR "${HF_CMAKE_DIR}/externals")
-
-file(GLOB HIFI_CUSTOM_MACROS "cmake/macros/*.cmake")
-foreach(CUSTOM_MACRO ${HIFI_CUSTOM_MACROS})
-  include(${CUSTOM_MACRO})
-endforeach()
+#
+# Helper projects
+#
+file(GLOB_RECURSE CMAKE_SRC cmake/*.cmake cmake/CMakeLists.txt)
+add_custom_target(cmake SOURCES ${CMAKE_SRC})
+GroupSources("cmake")
+unset(CMAKE_SRC)
 
 file(GLOB_RECURSE JS_SRC scripts/*.js unpublishedScripts/*.js)
 add_custom_target(js SOURCES ${JS_SRC})
 GroupSources("scripts")
 GroupSources("unpublishedScripts")
+unset(JS_SRC)
 
-if (UNIX)
-   install(
-   DIRECTORY "${CMAKE_SOURCE_DIR}/scripts"
-   DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/interface
-   COMPONENT ${CLIENT_COMPONENT}
-   )
-endif()
+# Locate the required Qt build on the filesystem
+setup_qt()
+list(APPEND CMAKE_PREFIX_PATH "${QT_CMAKE_PREFIX_PATH}")
 
-if (ANDROID)
-  file(GLOB ANDROID_CUSTOM_MACROS "cmake/android/*.cmake")
-  foreach(CUSTOM_MACRO ${ANDROID_CUSTOM_MACROS})
-    include(${CUSTOM_MACRO})
-  endforeach()
-endif ()
+find_package( Threads )
+
+add_definitions(-DGLM_FORCE_RADIANS)
+set(HIFI_LIBRARY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries")
 
 set(EXTERNAL_PROJECT_PREFIX "project")
 set_property(DIRECTORY PROPERTY EP_PREFIX ${EXTERNAL_PROJECT_PREFIX})
 setup_externals_binary_dir()
 
 option(USE_NSIGHT "Attempt to find the nSight libraries" 1)
-option(GET_QUAZIP "Get QuaZip library automatically as external project" 1)
-
-
-if (WIN32)
-  add_paths_to_fixup_libs("${QT_DIR}/bin")
-endif ()
-
-if (NOT DEFINED SERVER_ONLY)
-  set(SERVER_ONLY 0)
-endif()
 
 set_packaging_parameters()
 
+# FIXME hack to work on the proper Android toolchain
+if (ANDROID)
+    add_subdirectory(android/app)
+    return()
+endif()
+
 # add subdirectories for all targets
-if (NOT ANDROID)
+if (BUILD_SERVER)
   add_subdirectory(assignment-client)
   set_target_properties(assignment-client PROPERTIES FOLDER "Apps")
   add_subdirectory(domain-server)
@@ -255,28 +97,35 @@ if (NOT ANDROID)
   add_subdirectory(ice-server)
   set_target_properties(ice-server PROPERTIES FOLDER "Apps")
   add_subdirectory(server-console)
-  if (NOT SERVER_ONLY)
-    add_subdirectory(interface)
-    set_target_properties(interface PROPERTIES FOLDER "Apps")
-    add_subdirectory(tests)
-  endif()
-  add_subdirectory(plugins)
-  add_subdirectory(tools)
 endif()
 
-if (ANDROID OR DESKTOP_GVR)
-  add_subdirectory(interface)
-  add_subdirectory(gvr-interface)
-  add_subdirectory(plugins)
-endif ()
+if (BUILD_CLIENT)
+    add_subdirectory(interface)
+    set_target_properties(interface PROPERTIES FOLDER "Apps")
+    if (ANDROID)
+        add_subdirectory(gvr-interface)
+        set_target_properties(gvr-interface PROPERTIES FOLDER "Apps")
+    endif()
+endif()
 
-if (DEFINED ENV{HIFI_MEMORY_DEBUGGING})
-  SET( HIFI_MEMORY_DEBUGGING true )
-endif ()
-if (HIFI_MEMORY_DEBUGGING)
-  if (UNIX)
-    MESSAGE("-- Memory debugging is enabled")
-  endif (UNIX)
-endif ()
+if (BUILD_CLIENT OR BUILD_SERVER)
+    add_subdirectory(plugins)
+endif()
 
-generate_installers()
+# BUILD_TOOLS option will be handled inside the tools's CMakeLists.txt because 'scribe' tool is required for build anyway
+add_subdirectory(tools)
+
+if (BUILD_TESTS)
+    add_subdirectory(tests)
+endif()
+
+if (BUILD_INSTALLER)
+    if (UNIX)
+        install(
+            DIRECTORY "${CMAKE_SOURCE_DIR}/scripts"
+            DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/interface
+            COMPONENT ${CLIENT_COMPONENT}
+        )
+    endif()
+    generate_installers()
+endif()
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a0d867ade9..4654c311cc 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -16,7 +16,7 @@ Contributing
   git checkout -b new_branch_name 
   ```
 4. Code
-  * Follow the [coding standard](https://wiki.highfidelity.com/wiki/Coding_Standards)
+  * Follow the [coding standard](https://docs.highfidelity.com/build-guide/coding-standards)
 5. Commit
   * Use [well formed commit messages](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
 6. Update your branch
diff --git a/android/app/CMakeLists.txt b/android/app/CMakeLists.txt
new file mode 100644
index 0000000000..2d6df925e9
--- /dev/null
+++ b/android/app/CMakeLists.txt
@@ -0,0 +1,8 @@
+set(TARGET_NAME native-lib)
+setup_hifi_library()
+link_hifi_libraries(shared networking gl gpu gpu-gles render-utils)
+autoscribe_shader_lib(gpu model render render-utils)
+target_opengl()
+target_link_libraries(native-lib android log m)
+target_include_directories(native-lib PRIVATE  "${GVR_ROOT}/libraries/headers")
+target_link_libraries(native-lib "C:/Users/bdavis/Git/hifi/android/libraries/jni/armeabi-v7a/libgvr.so")
diff --git a/android/app/build.gradle b/android/app/build.gradle
new file mode 100644
index 0000000000..bd1c596bf3
--- /dev/null
+++ b/android/app/build.gradle
@@ -0,0 +1,57 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 26
+    buildToolsVersion "26.0.1"
+    defaultConfig {
+        applicationId "org.saintandreas.testapp"
+        minSdkVersion 24
+        targetSdkVersion 26
+        versionCode 1
+        versionName "1.0"
+        ndk { abiFilters 'armeabi-v7a' }
+        externalNativeBuild {
+            cmake {
+                arguments '-DHIFI_ANDROID=1',
+                    '-DANDROID_PLATFORM=android-24',
+                    '-DANDROID_TOOLCHAIN=clang',
+                    '-DANDROID_STL=gnustl_shared',
+                    '-DGVR_ROOT=' + GVR_ROOT,
+                    '-DNATIVE_SCRIBE=c:/bin/scribe.exe',
+                    "-DHIFI_ANDROID_PRECOMPILED=${project.rootDir}/libraries/jni/armeabi-v7a"
+            }
+        }
+        jackOptions { enabled true }
+        compileOptions {
+            sourceCompatibility JavaVersion.VERSION_1_8
+            targetCompatibility JavaVersion.VERSION_1_8
+        }
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    sourceSets {
+        main {
+            jniLibs.srcDirs += '../libraries/jni';
+        }
+    }
+    externalNativeBuild {
+        cmake {
+            path '../../CMakeLists.txt'
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: "${project.rootDir}/libraries/jar", include: 'QtAndroid-bundled.jar')
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile 'com.google.vr:sdk-audio:1.80.0'
+    compile 'com.google.vr:sdk-base:1.80.0'
+}
+
+build.dependsOn(':extractQt5')
diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro
new file mode 100644
index 0000000000..b3c0078513
--- /dev/null
+++ b/android/app/proguard-rules.pro
@@ -0,0 +1,25 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in C:\Android\SDK/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..05547bd5ae
--- /dev/null
+++ b/android/app/src/main/AndroidManifest.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.saintandreas.testapp">
+
+    <uses-sdk android:minSdkVersion="24" android:targetSdkVersion="26" />
+    <uses-feature android:glEsVersion="0x00030001" android:required="true" />
+    <uses-permission android:name="android.permission.VIBRATE"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-feature android:name="android.hardware.sensor.accelerometer" android:required="true"/>
+    <uses-feature android:name="android.hardware.sensor.gyroscope" android:required="true"/>
+    <uses-feature android:name="android.software.vr.mode" android:required="false"/>
+    <uses-feature android:name="android.hardware.vr.high_performance" android:required="false"/>
+
+    <application
+        android:allowBackup="true"
+        android:theme="@style/VrActivityTheme"
+        android:icon="@mipmap/ic_launcher"
+        android:roundIcon="@mipmap/ic_launcher_round">
+        <activity
+            android:name=".MainActivity"
+            android:label="@string/app_name"
+            android:screenOrientation="landscape"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:enableVrMode="@string/gvr_vr_mode_component"
+            android:resizeableActivity="false">
+            <intent-filter>
+               <action android:name="android.intent.action.MAIN" />
+               <category android:name="android.intent.category.LAUNCHER" />
+               <category android:name="com.google.intent.category.DAYDREAM"/>
+            </intent-filter>
+            <intent-filter>
+               <action android:name="android.intent.action.MAIN" />
+               <category android:name="android.intent.category.LAUNCHER" />
+               <category android:name="com.google.intent.category.CARDBOARD" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
\ No newline at end of file
diff --git a/android/app/src/main/cpp/GoogleVRHelpers.h b/android/app/src/main/cpp/GoogleVRHelpers.h
new file mode 100644
index 0000000000..10c46b036f
--- /dev/null
+++ b/android/app/src/main/cpp/GoogleVRHelpers.h
@@ -0,0 +1,50 @@
+#include <glm/glm.hpp>
+#include <glm/gtc/quaternion.hpp>
+#include <vr/gvr/capi/include/gvr.h>
+
+namespace googlevr {
+
+    // Convert a GVR matrix to GLM matrix
+    glm::mat4 toGlm(const gvr::Mat4f &matrix) {
+        glm::mat4 result;
+        for (int i = 0; i < 4; ++i) {
+            for (int j = 0; j < 4; ++j) {
+                result[j][i] = matrix.m[i][j];
+            }
+        }
+        return result;
+    }
+
+    // Given a field of view in degrees, compute the corresponding projection
+// matrix.
+    glm::mat4 perspectiveMatrixFromView(const gvr::Rectf& fov, float z_near, float z_far) {
+        const float x_left = -std::tan(fov.left * M_PI / 180.0f) * z_near;
+        const float x_right = std::tan(fov.right * M_PI / 180.0f) * z_near;
+        const float y_bottom = -std::tan(fov.bottom * M_PI / 180.0f) * z_near;
+        const float y_top = std::tan(fov.top * M_PI / 180.0f) * z_near;
+        const float Y = (2 * z_near) / (y_top - y_bottom);
+        const float A = (x_right + x_left) / (x_right - x_left);
+        const float B = (y_top + y_bottom) / (y_top - y_bottom);
+        const float C = (z_near + z_far) / (z_near - z_far);
+        const float D = (2 * z_near * z_far) / (z_near - z_far);
+
+        glm::mat4 result { 0 };
+        result[2][0] = A;
+        result[1][1] = Y;
+        result[2][1] = B;
+        result[2][2] = C;
+        result[3][2] = D;
+        result[2][3] = -1;
+        return result;
+    }
+
+    glm::quat toGlm(const gvr::ControllerQuat& q) {
+        glm::quat result;
+        result.w = q.qw;
+        result.x = q.qx;
+        result.y = q.qy;
+        result.z = q.qz;
+        return result;
+    }
+
+}
diff --git a/android/app/src/main/cpp/native-lib.cpp b/android/app/src/main/cpp/native-lib.cpp
new file mode 100644
index 0000000000..156d43d849
--- /dev/null
+++ b/android/app/src/main/cpp/native-lib.cpp
@@ -0,0 +1,78 @@
+#include <jni.h>
+
+#include <android/log.h>
+#include <QtCore/QDebug>
+
+#include "renderer.h"
+
+int QtMsgTypeToAndroidPriority(QtMsgType type) {
+    int priority = ANDROID_LOG_UNKNOWN;
+    switch (type) {
+        case QtDebugMsg: priority = ANDROID_LOG_DEBUG; break;
+        case QtWarningMsg: priority = ANDROID_LOG_WARN; break;
+        case QtCriticalMsg: priority = ANDROID_LOG_ERROR; break;
+        case QtFatalMsg: priority = ANDROID_LOG_FATAL; break;
+        case QtInfoMsg: priority = ANDROID_LOG_INFO; break;
+        default: break;
+    }
+    return priority;
+}
+
+void messageHandler(QtMsgType type, const QMessageLogContext& context, const QString& message) {
+    __android_log_write(QtMsgTypeToAndroidPriority(type), "Interface", message.toStdString().c_str());
+}
+
+static jlong toJni(NativeRenderer *renderer) {
+    return reinterpret_cast<intptr_t>(renderer);
+}
+
+static NativeRenderer *fromJni(jlong renderer) {
+    return reinterpret_cast<NativeRenderer*>(renderer);
+}
+
+#define JNI_METHOD(r, name) JNIEXPORT r JNICALL Java_org_saintandreas_testapp_MainActivity_##name
+
+extern "C" {
+
+JNI_METHOD(jlong, nativeCreateRenderer)
+(JNIEnv *env, jclass clazz, jobject class_loader, jobject android_context, jlong native_gvr_api) {
+    qInstallMessageHandler(messageHandler);
+#if defined(GVR)
+    auto gvrContext = reinterpret_cast<gvr_context *>(native_gvr_api);
+    return toJni(new NativeRenderer(gvrContext));
+#else
+    return toJni(new NativeRenderer(nullptr));
+#endif
+}
+
+JNI_METHOD(void, nativeDestroyRenderer)
+(JNIEnv *env, jclass clazz, jlong renderer) {
+    delete fromJni(renderer);
+}
+
+JNI_METHOD(void, nativeInitializeGl)
+(JNIEnv *env, jobject obj, jlong renderer) {
+    fromJni(renderer)->InitializeGl();
+}
+
+JNI_METHOD(void, nativeDrawFrame)
+(JNIEnv *env, jobject obj, jlong renderer) {
+    fromJni(renderer)->DrawFrame();
+}
+
+JNI_METHOD(void, nativeOnTriggerEvent)
+(JNIEnv *env, jobject obj, jlong renderer) {
+    fromJni(renderer)->OnTriggerEvent();
+}
+
+JNI_METHOD(void, nativeOnPause)
+(JNIEnv *env, jobject obj, jlong renderer) {
+    fromJni(renderer)->OnPause();
+}
+
+JNI_METHOD(void, nativeOnResume)
+(JNIEnv *env, jobject obj, jlong renderer) {
+    fromJni(renderer)->OnResume();
+}
+
+}  // extern "C"
diff --git a/android/app/src/main/cpp/renderer.cpp b/android/app/src/main/cpp/renderer.cpp
new file mode 100644
index 0000000000..a877ebd777
--- /dev/null
+++ b/android/app/src/main/cpp/renderer.cpp
@@ -0,0 +1,636 @@
+#include "renderer.h"
+
+#include <mutex>
+
+#include <QtCore/QDebug>
+#include <gl/Config.h>
+
+#include "GoogleVRHelpers.h"
+
+#include <gl/GLShaders.h>
+#include <shared/Bilateral.h>
+
+#include <gpu/DrawTransformUnitQuad_vert.h>
+#include <gpu/DrawTexcoordRectTransformUnitQuad_vert.h>
+#include <gpu/DrawViewportQuadTransformTexcoord_vert.h>
+#include <gpu/DrawTexture_frag.h>
+#include <gpu/DrawTextureOpaque_frag.h>
+#include <gpu/DrawColoredTexture_frag.h>
+
+#include <render-utils/simple_vert.h>
+#include <render-utils/simple_frag.h>
+#include <render-utils/simple_textured_frag.h>
+#include <render-utils/simple_textured_unlit_frag.h>
+
+#include <render-utils/deferred_light_vert.h>
+#include <render-utils/deferred_light_point_vert.h>
+#include <render-utils/deferred_light_spot_vert.h>
+
+#include <render-utils/directional_ambient_light_frag.h>
+#include <render-utils/directional_skybox_light_frag.h>
+
+#include <render-utils/standardTransformPNTC_vert.h>
+#include <render-utils/standardDrawTexture_frag.h>
+
+#include <render-utils/model_vert.h>
+#include <render-utils/model_shadow_vert.h>
+#include <render-utils/model_normal_map_vert.h>
+#include <render-utils/model_lightmap_vert.h>
+#include <render-utils/model_lightmap_normal_map_vert.h>
+#include <render-utils/skin_model_vert.h>
+#include <render-utils/skin_model_shadow_vert.h>
+#include <render-utils/skin_model_normal_map_vert.h>
+
+#include <render-utils/model_frag.h>
+#include <render-utils/model_shadow_frag.h>
+#include <render-utils/model_normal_map_frag.h>
+#include <render-utils/model_normal_specular_map_frag.h>
+#include <render-utils/model_specular_map_frag.h>
+#include <render-utils/model_lightmap_frag.h>
+#include <render-utils/model_lightmap_normal_map_frag.h>
+#include <render-utils/model_lightmap_normal_specular_map_frag.h>
+#include <render-utils/model_lightmap_specular_map_frag.h>
+#include <render-utils/model_translucent_frag.h>
+#include <render-utils/overlay3D_vert.h>
+#include <render-utils/overlay3D_frag.h>
+
+#include <render-utils/sdf_text3D_vert.h>
+#include <render-utils/sdf_text3D_frag.h>
+
+#if 0
+#include <model/skybox_vert.h>
+#include <model/skybox_frag.h>
+#include <entities-renderer/textured_particle_frag.h>
+#include <entities-renderer/textured_particle_vert.h>
+#include <entities-renderer/paintStroke_vert.h>
+#include <entities-renderer/paintStroke_frag.h>
+#include <entities-renderer/polyvox_vert.h>
+#include <entities-renderer/polyvox_frag.h>
+#endif
+
+
+template <typename F>
+void withFrameBuffer(gvr::Frame& frame, int32_t index, F f) {
+    frame.BindBuffer(index);
+    f();
+    frame.Unbind();
+}
+
+
+static const uint64_t kPredictionTimeWithoutVsyncNanos = 50000000;
+
+// Each shader has two variants: a single-eye ES 2.0 variant, and a multiview
+// ES 3.0 variant.  The multiview vertex shaders use transforms defined by
+// arrays of mat4 uniforms, using gl_ViewID_OVR to determine the array index.
+
+#define UNIFORM_LIGHT_POS 20
+#define UNIFORM_M 16
+#define UNIFORM_MV 8
+#define UNIFORM_MVP 0
+
+#if 0
+uniform Transform { // API uses “Transform[2]” to refer to instance 2
+ mat4 u_MVP[2];
+ mat4 u_MVMatrix[2];
+ mat4 u_Model;
+ vec3 u_LightPos[2];
+};
+static const char *kDiffuseLightingVertexShader = R"glsl(
+#version 300 es
+#extension GL_OVR_multiview2 : enable
+
+layout(num_views=2) in;
+
+layout(location = 0) uniform mat4 u_MVP[2];
+layout(location = 8) uniform mat4 u_MVMatrix[2];
+layout(location = 16) uniform mat4 u_Model;
+layout(location = 20) uniform vec3 u_LightPos[2];
+
+layout(location = 0) in vec4 a_Position;
+layout(location = 1) in vec4 a_Color;
+layout(location = 2) in vec3 a_Normal;
+
+out vec4 v_Color;
+out vec3 v_Grid;
+
+void main() {
+    mat4 mvp = u_MVP[gl_ViewID_OVR];
+    mat4 modelview = u_MVMatrix[gl_ViewID_OVR];
+    vec3 lightpos = u_LightPos[gl_ViewID_OVR];
+    v_Grid = vec3(u_Model * a_Position);
+    vec3 modelViewVertex = vec3(modelview * a_Position);
+    vec3 modelViewNormal = vec3(modelview * vec4(a_Normal, 0.0));
+    float distance = length(lightpos - modelViewVertex);
+    vec3 lightVector = normalize(lightpos - modelViewVertex);
+    float diffuse = max(dot(modelViewNormal, lightVector), 0.5);
+    diffuse = diffuse * (1.0 / (1.0 + (0.00001 * distance * distance)));
+    v_Color = vec4(a_Color.rgb * diffuse, a_Color.a);
+    gl_Position = mvp * a_Position;
+}
+)glsl";
+#endif
+
+
+static const char *kSimepleVertexShader = R"glsl(
+#version 300 es
+#extension GL_OVR_multiview2 : enable
+
+layout(num_views=2) in;
+
+layout(location = 0) in vec4 a_Position;
+
+out vec4 v_Color;
+
+void main() {
+    v_Color = vec4(a_Position.xyz, 1.0);
+    gl_Position = vec4(a_Position.xyz, 1.0);
+}
+)glsl";
+
+
+static const char *kPassthroughFragmentShader = R"glsl(
+#version 300 es
+precision mediump float;
+in vec4 v_Color;
+out vec4 FragColor;
+
+void main() { FragColor = v_Color; }
+)glsl";
+
+static void CheckGLError(const char* label) {
+    int gl_error = glGetError();
+    if (gl_error != GL_NO_ERROR) {
+        qWarning("GL error @ %s: %d", label, gl_error);
+        // Crash immediately to make OpenGL errors obvious.
+        abort();
+    }
+}
+
+// Contains vertex, normal and other data.
+namespace cube {
+    const std::array<float, 108> CUBE_COORDS{{
+                                                 // Front face
+                                                 -1.0f, 1.0f, 1.0f,
+                                                 -1.0f, -1.0f, 1.0f,
+                                                 1.0f, 1.0f, 1.0f,
+                                                 -1.0f, -1.0f, 1.0f,
+                                                 1.0f, -1.0f, 1.0f,
+                                                 1.0f, 1.0f, 1.0f,
+
+                                                 // Right face
+                                                 1.0f, 1.0f, 1.0f,
+                                                 1.0f, -1.0f, 1.0f,
+                                                 1.0f, 1.0f, -1.0f,
+                                                 1.0f, -1.0f, 1.0f,
+                                                 1.0f, -1.0f, -1.0f,
+                                                 1.0f, 1.0f, -1.0f,
+
+                                                 // Back face
+                                                 1.0f, 1.0f, -1.0f,
+                                                 1.0f, -1.0f, -1.0f,
+                                                 -1.0f, 1.0f, -1.0f,
+                                                 1.0f, -1.0f, -1.0f,
+                                                 -1.0f, -1.0f, -1.0f,
+                                                 -1.0f, 1.0f, -1.0f,
+
+                                                 // Left face
+                                                 -1.0f, 1.0f, -1.0f,
+                                                 -1.0f, -1.0f, -1.0f,
+                                                 -1.0f, 1.0f, 1.0f,
+                                                 -1.0f, -1.0f, -1.0f,
+                                                 -1.0f, -1.0f, 1.0f,
+                                                 -1.0f, 1.0f, 1.0f,
+
+                                                 // Top face
+                                                 -1.0f, 1.0f, -1.0f,
+                                                 -1.0f, 1.0f, 1.0f,
+                                                 1.0f, 1.0f, -1.0f,
+                                                 -1.0f, 1.0f, 1.0f,
+                                                 1.0f, 1.0f, 1.0f,
+                                                 1.0f, 1.0f, -1.0f,
+
+                                                 // Bottom face
+                                                 1.0f, -1.0f, -1.0f,
+                                                 1.0f, -1.0f, 1.0f,
+                                                 -1.0f, -1.0f, -1.0f,
+                                                 1.0f, -1.0f, 1.0f,
+                                                 -1.0f, -1.0f, 1.0f,
+                                                 -1.0f, -1.0f, -1.0f
+                                             }};
+
+    const std::array<float, 108> CUBE_COLORS{{
+                                                 // front, green
+                                                 0.0f, 0.5273f, 0.2656f,
+                                                 0.0f, 0.5273f, 0.2656f,
+                                                 0.0f, 0.5273f, 0.2656f,
+                                                 0.0f, 0.5273f, 0.2656f,
+                                                 0.0f, 0.5273f, 0.2656f,
+                                                 0.0f, 0.5273f, 0.2656f,
+
+                                                 // right, blue
+                                                 0.0f, 0.3398f, 0.9023f,
+                                                 0.0f, 0.3398f, 0.9023f,
+                                                 0.0f, 0.3398f, 0.9023f,
+                                                 0.0f, 0.3398f, 0.9023f,
+                                                 0.0f, 0.3398f, 0.9023f,
+                                                 0.0f, 0.3398f, 0.9023f,
+
+                                                 // back, also green
+                                                 0.0f, 0.5273f, 0.2656f,
+                                                 0.0f, 0.5273f, 0.2656f,
+                                                 0.0f, 0.5273f, 0.2656f,
+                                                 0.0f, 0.5273f, 0.2656f,
+                                                 0.0f, 0.5273f, 0.2656f,
+                                                 0.0f, 0.5273f, 0.2656f,
+
+                                                 // left, also blue
+                                                 0.0f, 0.3398f, 0.9023f,
+                                                 0.0f, 0.3398f, 0.9023f,
+                                                 0.0f, 0.3398f, 0.9023f,
+                                                 0.0f, 0.3398f, 0.9023f,
+                                                 0.0f, 0.3398f, 0.9023f,
+                                                 0.0f, 0.3398f, 0.9023f,
+
+                                                 // top, red
+                                                 0.8359375f, 0.17578125f, 0.125f,
+                                                 0.8359375f, 0.17578125f, 0.125f,
+                                                 0.8359375f, 0.17578125f, 0.125f,
+                                                 0.8359375f, 0.17578125f, 0.125f,
+                                                 0.8359375f, 0.17578125f, 0.125f,
+                                                 0.8359375f, 0.17578125f, 0.125f,
+
+                                                 // bottom, also red
+                                                 0.8359375f, 0.17578125f, 0.125f,
+                                                 0.8359375f, 0.17578125f, 0.125f,
+                                                 0.8359375f, 0.17578125f, 0.125f,
+                                                 0.8359375f, 0.17578125f, 0.125f,
+                                                 0.8359375f, 0.17578125f, 0.125f,
+                                                 0.8359375f, 0.17578125f, 0.125f
+                                             }};
+
+    const std::array<float, 108> CUBE_NORMALS{{
+                                                  // Front face
+                                                  0.0f, 0.0f, 1.0f,
+                                                  0.0f, 0.0f, 1.0f,
+                                                  0.0f, 0.0f, 1.0f,
+                                                  0.0f, 0.0f, 1.0f,
+                                                  0.0f, 0.0f, 1.0f,
+                                                  0.0f, 0.0f, 1.0f,
+
+                                                  // Right face
+                                                  1.0f, 0.0f, 0.0f,
+                                                  1.0f, 0.0f, 0.0f,
+                                                  1.0f, 0.0f, 0.0f,
+                                                  1.0f, 0.0f, 0.0f,
+                                                  1.0f, 0.0f, 0.0f,
+                                                  1.0f, 0.0f, 0.0f,
+
+                                                  // Back face
+                                                  0.0f, 0.0f, -1.0f,
+                                                  0.0f, 0.0f, -1.0f,
+                                                  0.0f, 0.0f, -1.0f,
+                                                  0.0f, 0.0f, -1.0f,
+                                                  0.0f, 0.0f, -1.0f,
+                                                  0.0f, 0.0f, -1.0f,
+
+                                                  // Left face
+                                                  -1.0f, 0.0f, 0.0f,
+                                                  -1.0f, 0.0f, 0.0f,
+                                                  -1.0f, 0.0f, 0.0f,
+                                                  -1.0f, 0.0f, 0.0f,
+                                                  -1.0f, 0.0f, 0.0f,
+                                                  -1.0f, 0.0f, 0.0f,
+
+                                                  // Top face
+                                                  0.0f, 1.0f, 0.0f,
+                                                  0.0f, 1.0f, 0.0f,
+                                                  0.0f, 1.0f, 0.0f,
+                                                  0.0f, 1.0f, 0.0f,
+                                                  0.0f, 1.0f, 0.0f,
+                                                  0.0f, 1.0f, 0.0f,
+
+                                                  // Bottom face
+                                                  0.0f, -1.0f, 0.0f,
+                                                  0.0f, -1.0f, 0.0f,
+                                                  0.0f, -1.0f, 0.0f,
+                                                  0.0f, -1.0f, 0.0f,
+                                                  0.0f, -1.0f, 0.0f,
+                                                  0.0f, -1.0f, 0.0f
+                                              }};
+}
+
+namespace triangle {
+    static std::array<float, 9> TRIANGLE_VERTS {{
+                                              -0.5f, -0.5f, 0.0f,
+                                              0.5f, -0.5f, 0.0f,
+                                              0.0f, 0.5f, 0.0f
+                                          }};
+}
+
+std::array<gvr::BufferViewport, 2> buildViewports(const std::unique_ptr<gvr::GvrApi> &gvrapi) {
+    return { {gvrapi->CreateBufferViewport(), gvrapi->CreateBufferViewport()} };
+};
+
+const std::string VERTEX_SHADER_DEFINES{ R"GLSL(
+#version 300 es
+#extension GL_EXT_clip_cull_distance : enable
+#define GPU_VERTEX_SHADER
+#define GPU_SSBO_TRANSFORM_OBJECT 1
+#define GPU_TRANSFORM_IS_STEREO
+#define GPU_TRANSFORM_STEREO_CAMERA
+#define GPU_TRANSFORM_STEREO_CAMERA_INSTANCED
+#define GPU_TRANSFORM_STEREO_SPLIT_SCREEN
+)GLSL" };
+
+const std::string PIXEL_SHADER_DEFINES{ R"GLSL(
+#version 300 es
+precision mediump float;
+#define GPU_PIXEL_SHADER
+#define GPU_TRANSFORM_IS_STEREO
+#define GPU_TRANSFORM_STEREO_CAMERA
+#define GPU_TRANSFORM_STEREO_CAMERA_INSTANCED
+#define GPU_TRANSFORM_STEREO_SPLIT_SCREEN
+)GLSL" };
+
+
+#if defined(GVR)
+NativeRenderer::NativeRenderer(gvr_context *vrContext) :
+    _gvrapi(new gvr::GvrApi(vrContext, false)),
+    _viewports(buildViewports(_gvrapi)),
+    _gvr_viewer_type(_gvrapi->GetViewerType())
+#else
+NativeRenderer::NativeRenderer(void *vrContext)
+#endif
+{
+    start = std::chrono::system_clock::now();
+    qDebug() << "QQQ" << __FUNCTION__;
+}
+
+
+/**
+ * Converts a raw text file, saved as a resource, into an OpenGL ES shader.
+ *
+ * @param type  The type of shader we will be creating.
+ * @param resId The resource ID of the raw text file.
+ * @return The shader object handler.
+ */
+int LoadGLShader(int type, const char *shadercode) {
+    GLuint result = 0;
+    std::string shaderError;
+    static const std::string SHADER_DEFINES;
+    if (!gl::compileShader(type, shadercode, SHADER_DEFINES, result, shaderError)) {
+        qWarning() << "QQQ" << __FUNCTION__ << "Shader compile failure" << shaderError.c_str();
+    }
+    return result;
+}
+
+// Computes a texture size that has approximately half as many pixels. This is
+// equivalent to scaling each dimension by approximately sqrt(2)/2.
+static gvr::Sizei HalfPixelCount(const gvr::Sizei &in) {
+    // Scale each dimension by sqrt(2)/2 ~= 7/10ths.
+    gvr::Sizei out;
+    out.width = (7 * in.width) / 10;
+    out.height = (7 * in.height) / 10;
+    return out;
+}
+
+
+#if defined(GVR)
+void NativeRenderer::InitializeVR() {
+    _gvrapi->InitializeGl();
+    bool multiviewEnabled = _gvrapi->IsFeatureSupported(GVR_FEATURE_MULTIVIEW);
+    qWarning() << "QQQ" << __FUNCTION__ << "Multiview enabled " << multiviewEnabled;
+    // Because we are using 2X MSAA, we can render to half as many pixels and
+    // achieve similar quality.
+    _renderSize = HalfPixelCount(_gvrapi->GetMaximumEffectiveRenderTargetSize());
+
+    std::vector<gvr::BufferSpec> specs;
+    specs.push_back(_gvrapi->CreateBufferSpec());
+    specs[0].SetColorFormat(GVR_COLOR_FORMAT_RGBA_8888);
+    specs[0].SetDepthStencilFormat(GVR_DEPTH_STENCIL_FORMAT_DEPTH_16);
+    specs[0].SetSamples(2);
+    gvr::Sizei half_size = {_renderSize.width / 2, _renderSize.height};
+    specs[0].SetMultiviewLayers(2);
+    specs[0].SetSize(half_size);
+
+    _swapchain.reset(new gvr::SwapChain(_gvrapi->CreateSwapChain(specs)));
+    _viewportlist.reset(new gvr::BufferViewportList(_gvrapi->CreateEmptyBufferViewportList()));
+}
+void NativeRenderer::PrepareFramebuffer() {
+    const gvr::Sizei recommended_size = HalfPixelCount(
+        _gvrapi->GetMaximumEffectiveRenderTargetSize());
+    if (_renderSize.width != recommended_size.width ||
+        _renderSize.height != recommended_size.height) {
+        // We need to resize the framebuffer. Note that multiview uses two texture
+        // layers, each with half the render width.
+        gvr::Sizei framebuffer_size = recommended_size;
+        framebuffer_size.width /= 2;
+        _swapchain->ResizeBuffer(0, framebuffer_size);
+        _renderSize = recommended_size;
+    }
+}
+#endif
+
+void testShaderBuild(const char* vs_src, const char * fs_src) {
+    std::string error;
+    GLuint vs, fs;
+    if (!gl::compileShader(GL_VERTEX_SHADER, vs_src, VERTEX_SHADER_DEFINES, vs, error) ||
+        !gl::compileShader(GL_FRAGMENT_SHADER, fs_src, PIXEL_SHADER_DEFINES, fs, error)) {
+        throw std::runtime_error("Failed to compile shader");
+    }
+    auto pr = gl::compileProgram({ vs, fs }, error);
+    if (!pr) {
+        throw std::runtime_error("Failed to link shader");
+    }
+}
+
+void NativeRenderer::InitializeGl() {
+    qDebug() << "QQQ" << __FUNCTION__;
+    //gl::initModuleGl();
+#if defined(GVR)
+    InitializeVR();
+#endif
+
+    glDisable(GL_DEPTH_TEST);
+    glDisable(GL_CULL_FACE);
+    glDisable(GL_SCISSOR_TEST);
+    glDisable(GL_BLEND);
+
+
+
+    const uint32_t vertShader = LoadGLShader(GL_VERTEX_SHADER, kSimepleVertexShader);
+    //const uint32_t vertShader = LoadGLShader(GL_VERTEX_SHADER, kDiffuseLightingVertexShader);
+    const uint32_t fragShader = LoadGLShader(GL_FRAGMENT_SHADER, kPassthroughFragmentShader);
+    std::string error;
+    _cubeProgram = gl::compileProgram({ vertShader, fragShader }, error);
+    CheckGLError("build program");
+
+    glGenBuffers(1, &_cubeBuffer);
+    glBindBuffer(GL_ARRAY_BUFFER, _cubeBuffer);
+    glBufferData(GL_ARRAY_BUFFER, sizeof(float) * 9, triangle::TRIANGLE_VERTS.data(), GL_STATIC_DRAW);
+    /*
+    glBufferData(GL_ARRAY_BUFFER, sizeof(float) * 108 * 3, NULL, GL_STATIC_DRAW);
+    glBufferSubData(GL_ARRAY_BUFFER, sizeof(float) * 108 * 0, sizeof(float) * 108, cube::CUBE_COORDS.data());
+    glBufferSubData(GL_ARRAY_BUFFER, sizeof(float) * 108 * 1, sizeof(float) * 108, cube::CUBE_COLORS.data());
+    glBufferSubData(GL_ARRAY_BUFFER, sizeof(float) * 108 * 2, sizeof(float) * 108, cube::CUBE_NORMALS.data());
+     */
+    glBindBuffer(GL_ARRAY_BUFFER, 0);
+    CheckGLError("upload vertices");
+
+    glGenVertexArrays(1, &_cubeVao);
+    glBindBuffer(GL_ARRAY_BUFFER, _cubeBuffer);
+    glBindVertexArray(_cubeVao);
+
+    glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), (void*)0);
+    glEnableVertexAttribArray(0);
+    /*
+    glVertexAttribPointer(0, 3, GL_FLOAT, false, 0, 0);
+    glEnableVertexAttribArray(0);
+    glVertexAttribPointer(1, 3, GL_FLOAT, false, 0, (const void*)(sizeof(float) * 108 * 1) );
+    glEnableVertexAttribArray(1);
+    glVertexAttribPointer(2, 3, GL_FLOAT, false, 0, (const void*)(sizeof(float) * 108 * 2));
+    glEnableVertexAttribArray(2);
+     */
+    glBindVertexArray(0);
+    glBindBuffer(GL_ARRAY_BUFFER, 0);
+    CheckGLError("build vao ");
+
+    static std::once_flag once;
+    std::call_once(once, [&]{
+        testShaderBuild(sdf_text3D_vert, sdf_text3D_frag);
+
+        testShaderBuild(DrawTransformUnitQuad_vert, DrawTexture_frag);
+        testShaderBuild(DrawTexcoordRectTransformUnitQuad_vert, DrawTexture_frag);
+        testShaderBuild(DrawViewportQuadTransformTexcoord_vert, DrawTexture_frag);
+        testShaderBuild(DrawTransformUnitQuad_vert, DrawTextureOpaque_frag);
+        testShaderBuild(DrawTransformUnitQuad_vert, DrawColoredTexture_frag);
+
+        testShaderBuild(simple_vert, simple_frag);
+        testShaderBuild(simple_vert, simple_textured_frag);
+        testShaderBuild(simple_vert, simple_textured_unlit_frag);
+        testShaderBuild(deferred_light_vert, directional_ambient_light_frag);
+        testShaderBuild(deferred_light_vert, directional_skybox_light_frag);
+        testShaderBuild(standardTransformPNTC_vert, standardDrawTexture_frag);
+        testShaderBuild(standardTransformPNTC_vert, DrawTextureOpaque_frag);
+
+        testShaderBuild(model_vert, model_frag);
+        testShaderBuild(model_normal_map_vert, model_normal_map_frag);
+        testShaderBuild(model_vert, model_specular_map_frag);
+        testShaderBuild(model_normal_map_vert, model_normal_specular_map_frag);
+        testShaderBuild(model_vert, model_translucent_frag);
+        testShaderBuild(model_normal_map_vert, model_translucent_frag);
+        testShaderBuild(model_lightmap_vert, model_lightmap_frag);
+        testShaderBuild(model_lightmap_normal_map_vert, model_lightmap_normal_map_frag);
+        testShaderBuild(model_lightmap_vert, model_lightmap_specular_map_frag);
+        testShaderBuild(model_lightmap_normal_map_vert, model_lightmap_normal_specular_map_frag);
+
+        testShaderBuild(skin_model_vert, model_frag);
+        testShaderBuild(skin_model_normal_map_vert, model_normal_map_frag);
+        testShaderBuild(skin_model_vert, model_specular_map_frag);
+        testShaderBuild(skin_model_normal_map_vert, model_normal_specular_map_frag);
+        testShaderBuild(skin_model_vert, model_translucent_frag);
+        testShaderBuild(skin_model_normal_map_vert, model_translucent_frag);
+
+        testShaderBuild(model_shadow_vert, model_shadow_frag);
+
+        testShaderBuild(overlay3D_vert, overlay3D_frag);
+
+#if 0
+        testShaderBuild(textured_particle_vert, textured_particle_frag);
+        testShaderBuild(skybox_vert, skybox_frag);
+        testShaderBuild(paintStroke_vert,paintStroke_frag);
+        testShaderBuild(polyvox_vert, polyvox_frag);
+#endif
+
+    });
+
+    qDebug() << "done";
+}
+
+static const float kZNear = 1.0f;
+static const float kZFar = 100.0f;
+static const gvr_rectf fullscreen = {0, 1, 0, 1};
+
+void NativeRenderer::DrawFrame() {
+    auto now = std::chrono::duration_cast<std::chrono::milliseconds>(
+        std::chrono::system_clock::now() - start);
+    glm::vec3 v;
+    v.r = (float) (now.count() % 1000) / 1000.0f;
+    v.g = 1.0f - v.r;
+    v.b = 1.0f;
+
+    PrepareFramebuffer();
+
+    // A client app does its rendering here.
+    gvr::ClockTimePoint target_time = gvr::GvrApi::GetTimePointNow();
+    target_time.monotonic_system_time_nanos += kPredictionTimeWithoutVsyncNanos;
+
+    using namespace googlevr;
+    using namespace bilateral;
+    const auto gvrHeadPose = _gvrapi->GetHeadSpaceFromStartSpaceRotation(target_time);
+    _head_view = toGlm(gvrHeadPose);
+    _viewportlist->SetToRecommendedBufferViewports();
+
+    glm::mat4 eye_views[2];
+    for_each_side([&](bilateral::Side side) {
+        int eye = index(side);
+        const gvr::Eye gvr_eye = eye == 0 ? GVR_LEFT_EYE : GVR_RIGHT_EYE;
+        const auto& eyeView = eye_views[eye] = toGlm(_gvrapi->GetEyeFromHeadMatrix(gvr_eye)) * _head_view;
+        auto& viewport = _viewports[eye];
+
+        _viewportlist->GetBufferViewport(eye, &viewport);
+        viewport.SetSourceUv(fullscreen);
+        viewport.SetSourceLayer(eye);
+        _viewportlist->SetBufferViewport(eye, viewport);
+        const auto &mvc = _modelview_cube[eye] = eyeView * _model_cube;
+        const auto &mvf = _modelview_floor[eye] = eyeView * _model_floor;
+        const gvr_rectf fov = viewport.GetSourceFov();
+        const glm::mat4 perspective = perspectiveMatrixFromView(fov, kZNear, kZFar);
+        _modelview_projection_cube[eye] = perspective * mvc;
+        _modelview_projection_floor[eye] = perspective * mvf;
+        _light_pos_eye_space[eye] = glm::vec3(eyeView * _light_pos_world_space);
+    });
+
+
+    gvr::Frame frame = _swapchain->AcquireFrame();
+    withFrameBuffer(frame, 0, [&]{
+        glClearColor(v.r, v.g, v.b, 1);
+        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+        glViewport(0, 0, _renderSize.width / 2, _renderSize.height);
+        glUseProgram(_cubeProgram);
+        glBindVertexArray(_cubeVao);
+        glDrawArrays(GL_TRIANGLES, 0, 3);
+        /*
+        float* fp;
+        fp = (float*)&_light_pos_eye_space[0];
+        glUniform3fv(UNIFORM_LIGHT_POS, 2, fp);
+        fp = (float*)&_modelview_cube[0];
+        glUniformMatrix4fv(UNIFORM_MV, 2, GL_FALSE, fp);
+        fp = (float*)&_modelview_projection_cube[0];
+        glUniformMatrix4fv(UNIFORM_MVP, 2, GL_FALSE, fp);
+        fp = (float*)&_model_cube;
+        glUniformMatrix4fv(UNIFORM_M, 1, GL_FALSE, fp);
+        glDrawArrays(GL_TRIANGLES, 0, 36);
+         */
+        glBindVertexArray(0);
+    });
+
+    frame.Submit(*_viewportlist, gvrHeadPose);
+    CheckGLError("onDrawFrame");
+
+}
+
+void NativeRenderer::OnTriggerEvent() {
+    qDebug() << "QQQ" << __FUNCTION__;
+}
+
+void NativeRenderer::OnPause() {
+    qDebug() << "QQQ" << __FUNCTION__;
+    _gvrapi->PauseTracking();
+}
+
+void NativeRenderer::OnResume() {
+    qDebug() << "QQQ" << __FUNCTION__;
+    _gvrapi->ResumeTracking();
+    _gvrapi->RefreshViewerProfile();
+}
diff --git a/android/app/src/main/cpp/renderer.h b/android/app/src/main/cpp/renderer.h
new file mode 100644
index 0000000000..df7c51cab4
--- /dev/null
+++ b/android/app/src/main/cpp/renderer.h
@@ -0,0 +1,60 @@
+#pragma once
+
+#include <chrono>
+#include <array>
+#include <glm/glm.hpp>
+
+#define GVR
+
+#if defined(GVR)
+#include <vr/gvr/capi/include/gvr.h>
+#endif
+
+class NativeRenderer {
+public:
+
+#if defined(GVR)
+    NativeRenderer(gvr_context* vrContext);
+#else
+    NativeRenderer(void* vrContext);
+#endif
+
+    void InitializeGl();
+    void DrawFrame();
+    void OnTriggerEvent();
+    void OnPause();
+    void OnResume();
+
+private:
+
+
+    std::chrono::time_point<std::chrono::system_clock> start;
+#if defined(GVR)
+    void InitializeVR();
+    void PrepareFramebuffer();
+
+    std::unique_ptr<gvr::GvrApi> _gvrapi;
+    gvr::ViewerType _gvr_viewer_type;
+    std::unique_ptr<gvr::BufferViewportList> _viewportlist;
+    std::unique_ptr<gvr::SwapChain> _swapchain;
+    std::array<gvr::BufferViewport, 2> _viewports;
+    gvr::Sizei _renderSize;
+#endif
+
+    uint32_t _cubeBuffer { 0 };
+    uint32_t _cubeVao { 0 };
+    uint32_t _cubeProgram { 0 };
+
+    glm::mat4 _head_view;
+    glm::mat4 _model_cube;
+    glm::mat4 _camera;
+    glm::mat4 _view;
+    glm::mat4 _model_floor;
+
+    std::array<glm::mat4, 2> _modelview_cube;
+    std::array<glm::mat4, 2> _modelview_floor;
+    std::array<glm::mat4, 2> _modelview_projection_cube;
+    std::array<glm::mat4, 2> _modelview_projection_floor;
+    std::array<glm::vec3, 2> _light_pos_eye_space;
+    const glm::vec4 _light_pos_world_space{ 0, 2, 0, 1};
+};
diff --git a/android/app/src/main/java/org/saintandreas/testapp/MainActivity.java b/android/app/src/main/java/org/saintandreas/testapp/MainActivity.java
new file mode 100644
index 0000000000..7eea14dce9
--- /dev/null
+++ b/android/app/src/main/java/org/saintandreas/testapp/MainActivity.java
@@ -0,0 +1,105 @@
+package org.saintandreas.testapp;
+
+import android.app.Activity;
+import android.content.Context;
+import android.opengl.GLSurfaceView;
+import android.os.Bundle;
+import android.view.View;
+
+import com.google.vr.ndk.base.AndroidCompat;
+import com.google.vr.ndk.base.GvrLayout;
+
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.opengles.GL10;
+
+public class MainActivity extends Activity {
+    private final static int IMMERSIVE_STICKY_VIEW_FLAGS = View.SYSTEM_UI_FLAG_LAYOUT_STABLE |
+        View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
+        View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN |
+        View.SYSTEM_UI_FLAG_HIDE_NAVIGATION |
+        View.SYSTEM_UI_FLAG_FULLSCREEN |
+        View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
+
+    static {
+        System.loadLibrary("gvr");
+        System.loadLibrary("native-lib");
+    }
+
+    private long nativeRenderer;
+    private GvrLayout gvrLayout;
+    private GLSurfaceView surfaceView;
+
+    private native long nativeCreateRenderer(ClassLoader appClassLoader, Context context, long nativeGvrContext);
+    private native void nativeDestroyRenderer(long renderer);
+    private native void nativeInitializeGl(long renderer);
+    private native void nativeDrawFrame(long renderer);
+    private native void nativeOnTriggerEvent(long renderer);
+    private native void nativeOnPause(long renderer);
+    private native void nativeOnResume(long renderer);
+
+    class NativeRenderer implements GLSurfaceView.Renderer {
+        @Override public void onSurfaceCreated(GL10 gl, EGLConfig config) { nativeInitializeGl(nativeRenderer); }
+        @Override public void onSurfaceChanged(GL10 gl, int width, int height) { }
+        @Override public void onDrawFrame(GL10 gl) {
+            nativeDrawFrame(nativeRenderer);
+        }
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setImmersiveSticky();
+        getWindow()
+            .getDecorView()
+            .setOnSystemUiVisibilityChangeListener((int visibility)->{
+                if ((visibility & View.SYSTEM_UI_FLAG_FULLSCREEN) == 0) { setImmersiveSticky(); }
+            });
+
+        gvrLayout = new GvrLayout(this);
+        nativeRenderer = nativeCreateRenderer(
+            getClass().getClassLoader(),
+            getApplicationContext(),
+            gvrLayout.getGvrApi().getNativeGvrContext());
+
+        surfaceView = new GLSurfaceView(this);
+        surfaceView.setEGLContextClientVersion(3);
+        surfaceView.setEGLConfigChooser(8, 8, 8, 0, 0, 0);
+        surfaceView.setPreserveEGLContextOnPause(true);
+        surfaceView.setRenderer(new NativeRenderer());
+
+        gvrLayout.setPresentationView(surfaceView);
+        setContentView(gvrLayout);
+        if (gvrLayout.setAsyncReprojectionEnabled(true)) {
+            AndroidCompat.setSustainedPerformanceMode(this, true);
+        }
+        AndroidCompat.setVrModeEnabled(this, true);
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        gvrLayout.shutdown();
+        nativeDestroyRenderer(nativeRenderer);
+        nativeRenderer = 0;
+    }
+
+    @Override
+    protected void onPause() {
+        surfaceView.queueEvent(()->nativeOnPause(nativeRenderer));
+        surfaceView.onPause();
+        gvrLayout.onPause();
+        super.onPause();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        gvrLayout.onResume();
+        surfaceView.onResume();
+        surfaceView.queueEvent(()->nativeOnResume(nativeRenderer));
+    }
+
+    private void setImmersiveSticky() {
+        getWindow().getDecorView().setSystemUiVisibility(IMMERSIVE_STICKY_VIEW_FLAGS);
+    }
+}
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000000..cde69bccce
Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000000..9a078e3e1a
Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000000..c133a0cbd3
Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000000..efc028a636
Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000000..bfa42f0e7b
Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000000..3af2608a44
Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000000..324e72cdd7
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000000..9bec2e6231
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000000..aee44e1384
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000000..34947cd6bb
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml
new file mode 100644
index 0000000000..344907f039
--- /dev/null
+++ b/android/app/src/main/res/values/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="white_opaque">#ffffff</color>
+</resources>
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..5d6a4c1b99
--- /dev/null
+++ b/android/app/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">TestApp</string>
+</resources>
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
new file mode 100644
index 0000000000..033324ac58
--- /dev/null
+++ b/android/app/src/main/res/values/styles.xml
@@ -0,0 +1,15 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="android:style/Theme.NoTitleBar.Fullscreen">
+        <!-- Customize your theme here. -->
+        <!--item name="android:windowFullscreen">true</item-->
+        <!--item name="android:windowNoTitle">true</item-->
+        <!--item name="android:windowActionBar">false</item-->
+
+        <!--item name="android:windowContentOverlay">@null</item-->
+        <!--item name="android:background">@color/white_opaque</item-->
+    </style>
+
+    
+</resources>
diff --git a/android/build.gradle b/android/build.gradle
new file mode 100644
index 0000000000..77c3dd498c
--- /dev/null
+++ b/android/build.gradle
@@ -0,0 +1,91 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.3.3'
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
+
+task extractQt5jars(type: Copy) {
+    from fileTree(QT5_ROOT + "/jar")
+    into("${project.rootDir}/libraries/jar")
+    include("*.jar")
+}
+
+task extractQt5so(type: Copy) {
+    from fileTree(QT5_ROOT + "/lib")
+    into("${project.rootDir}/libraries/jni/armeabi-v7a/")
+    include("libQt5AndroidExtras.so")
+    include("libQt5Concurrent.so")
+    include("libQt5Core.so")
+    include("libQt5Gamepad.so")
+    include("libQt5Gui.so")
+    include("libQt5Location.so")
+    include("libQt5Multimedia.so")
+    include("libQt5MultimediaQuick_p.so")
+    include("libQt5Network.so")
+    include("libQt5NetworkAuth.so")
+    include("libQt5OpenGL.so")
+    include("libQt5Positioning.so")
+    include("libQt5Qml.so")
+    include("libQt5Quick.so")
+    include("libQt5QuickControls2.so")
+    include("libQt5QuickParticles.so")
+    include("libQt5QuickTemplates2.so")
+    include("libQt5QuickWidgets.so")
+    include("libQt5Script.so")
+    include("libQt5ScriptTools.so")
+    include("libQt5Sensors.so")
+    include("libQt5Svg.so")
+    include("libQt5WebChannel.so")
+    include("libQt5WebSockets.so")
+    include("libQt5WebView.so")
+    include("libQt5Widgets.so")
+    include("libQt5Xml.so")
+    include("libQt5XmlPatterns.so")
+}
+
+task extractAudioSo(type: Copy) {
+    from zipTree(GVR_ROOT + "/libraries/sdk-audio-1.80.0.aar")
+    into "${project.rootDir}/libraries/"
+    include "jni/armeabi-v7a/libgvr_audio.so"
+}
+
+task extractGvrSo(type: Copy) {
+    from zipTree(GVR_ROOT + "/libraries/sdk-base-1.80.0.aar")
+    into "${project.rootDir}/libraries/"
+    include "jni/armeabi-v7a/libgvr.so"
+}
+
+task extractNdk { }
+extractNdk.dependsOn extractAudioSo
+extractNdk.dependsOn extractGvrSo
+
+task extractQt5 { }
+extractQt5.dependsOn extractQt5so
+extractQt5.dependsOn extractQt5jars
+
+task extractBinaries { }
+extractBinaries.dependsOn extractQt5
+extractBinaries.dependsOn extractNdk
+
+task deleteBinaries(type: Delete) {
+    delete "${project.rootDir}/libraries/jni"
+}
+
+//clean.dependsOn(deleteBinaries)
diff --git a/android/gradle.properties b/android/gradle.properties
new file mode 100644
index 0000000000..aac7c9b461
--- /dev/null
+++ b/android/gradle.properties
@@ -0,0 +1,17 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx1536m
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
diff --git a/android/settings.gradle b/android/settings.gradle
new file mode 100644
index 0000000000..e7b4def49c
--- /dev/null
+++ b/android/settings.gradle
@@ -0,0 +1 @@
+include ':app'
diff --git a/assignment-client/CMakeLists.txt b/assignment-client/CMakeLists.txt
index 0ef2db3b9d..0421195612 100644
--- a/assignment-client/CMakeLists.txt
+++ b/assignment-client/CMakeLists.txt
@@ -13,7 +13,7 @@ setup_memory_debugger()
 link_hifi_libraries(
   audio avatars octree gpu model fbx entities
   networking animation recording shared script-engine embedded-webserver
-  physics plugins
+  controllers physics plugins midi baking image
 )
 
 if (WIN32)
diff --git a/assignment-client/src/Agent.cpp b/assignment-client/src/Agent.cpp
index 8aec5adb1f..4efc3343d1 100644
--- a/assignment-client/src/Agent.cpp
+++ b/assignment-client/src/Agent.cpp
@@ -23,6 +23,7 @@
 #include <AvatarHashMap.h>
 #include <AudioInjectorManager.h>
 #include <AssetClient.h>
+#include <DebugDraw.h>
 #include <LocationScriptingInterface.h>
 #include <MessagesClient.h>
 #include <NetworkAccessManager.h>
@@ -50,14 +51,14 @@
 #include "RecordingScriptingInterface.h"
 #include "AbstractAudioInterface.h"
 
-#include "AvatarAudioTimer.h"
 
 static const int RECEIVED_AUDIO_STREAM_CAPACITY_FRAMES = 10;
 
 Agent::Agent(ReceivedMessage& message) :
     ThreadedAssignment(message),
     _receivedAudioStream(RECEIVED_AUDIO_STREAM_CAPACITY_FRAMES, RECEIVED_AUDIO_STREAM_CAPACITY_FRAMES),
-    _audioGate(AudioConstants::SAMPLE_RATE, AudioConstants::MONO)
+    _audioGate(AudioConstants::SAMPLE_RATE, AudioConstants::MONO),
+    _avatarAudioTimer(this)
 {
     _entityEditSender.setPacketsPerSecond(DEFAULT_ENTITY_PPS_PER_SCRIPT);
     DependencyManager::get<EntityScriptingInterface>()->setPacketSender(&_entityEditSender);
@@ -81,6 +82,9 @@ Agent::Agent(ReceivedMessage& message) :
     DependencyManager::set<RecordingScriptingInterface>();
     DependencyManager::set<UsersScriptingInterface>();
 
+    // Needed to ensure the creation of the DebugDraw instance on the main thread
+    DebugDraw::getInstance();
+
 
     auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();
 
@@ -92,6 +96,14 @@ Agent::Agent(ReceivedMessage& message) :
         this, "handleOctreePacket");
     packetReceiver.registerListener(PacketType::Jurisdiction, this, "handleJurisdictionPacket");
     packetReceiver.registerListener(PacketType::SelectedAudioFormat, this, "handleSelectedAudioFormat");
+
+
+    // 100Hz timer for audio
+    const int TARGET_INTERVAL_MSEC = 10; // 10ms
+    connect(&_avatarAudioTimer, &QTimer::timeout, this, &Agent::processAgentAvatarAudio);
+    _avatarAudioTimer.setSingleShot(false);
+    _avatarAudioTimer.setInterval(TARGET_INTERVAL_MSEC);
+    _avatarAudioTimer.setTimerType(Qt::PreciseTimer);
 }
 
 void Agent::playAvatarSound(SharedSoundPointer sound) {
@@ -172,6 +184,9 @@ void Agent::run() {
     // make sure we hear about connected nodes so we can grab an ATP script if a request is pending
     connect(nodeList.data(), &LimitedNodeList::nodeActivated, this, &Agent::nodeActivated);
 
+    // make sure we hear about dissappearing nodes so we can clear the entity tree if an entity server goes away
+    connect(nodeList.data(), &LimitedNodeList::nodeKilled, this,  &Agent::nodeKilled);
+
     nodeList->addSetOfNodeTypesToNodeInterestSet({
         NodeType::AudioMixer, NodeType::AvatarMixer, NodeType::EntityServer, NodeType::MessagesMixer, NodeType::AssetServer
     });
@@ -247,6 +262,13 @@ void Agent::nodeActivated(SharedNodePointer activatedNode) {
     }
 }
 
+void Agent::nodeKilled(SharedNodePointer killedNode) {
+    if (killedNode->getType() == NodeType::EntityServer) {
+        // an entity server has gone away, ask the headless viewer to clear its tree
+        _entityViewer.clear();
+    }
+}
+
 void Agent::negotiateAudioFormat() {
     auto nodeList = DependencyManager::get<NodeList>();
     auto negotiateFormatPacket = NLPacket::create(PacketType::NegotiateAudioFormat);
@@ -332,15 +354,16 @@ void Agent::scriptRequestFinished() {
 
 
 void Agent::executeScript() {
-    _scriptEngine = std::unique_ptr<ScriptEngine>(new ScriptEngine(ScriptEngine::AGENT_SCRIPT, _scriptContents, _payload));
+    _scriptEngine = scriptEngineFactory(ScriptEngine::AGENT_SCRIPT, _scriptContents, _payload);
     _scriptEngine->setParent(this); // be the parent of the script engine so it gets moved when we do
 
-    DependencyManager::get<RecordingScriptingInterface>()->setScriptEngine(_scriptEngine.get());
+    DependencyManager::get<RecordingScriptingInterface>()->setScriptEngine(_scriptEngine);
 
     // setup an Avatar for the script to use
     auto scriptedAvatar = DependencyManager::get<ScriptableAvatar>();
 
-    connect(_scriptEngine.get(), SIGNAL(update(float)), scriptedAvatar.data(), SLOT(update(float)), Qt::ConnectionType::QueuedConnection);
+    connect(_scriptEngine.data(), SIGNAL(update(float)),
+            scriptedAvatar.data(), SLOT(update(float)), Qt::ConnectionType::QueuedConnection);
     scriptedAvatar->setForceFaceTrackerConnected(true);
 
     // call model URL setters with empty URLs so our avatar, if user, will have the default models
@@ -471,14 +494,7 @@ void Agent::executeScript() {
 
     DependencyManager::set<AssignmentParentFinder>(_entityViewer.getTree());
 
-    // 100Hz timer for audio
-    AvatarAudioTimer* audioTimerWorker = new AvatarAudioTimer();
-    audioTimerWorker->moveToThread(&_avatarAudioTimerThread);
-    connect(audioTimerWorker, &AvatarAudioTimer::avatarTick, this, &Agent::processAgentAvatarAudio);
-    connect(this, &Agent::startAvatarAudioTimer, audioTimerWorker, &AvatarAudioTimer::start);
-    connect(this, &Agent::stopAvatarAudioTimer, audioTimerWorker, &AvatarAudioTimer::stop);
-    connect(&_avatarAudioTimerThread, &QThread::finished, audioTimerWorker, &QObject::deleteLater);
-    _avatarAudioTimerThread.start();
+    QMetaObject::invokeMethod(&_avatarAudioTimer, "start");
 
     // Agents should run at 45hz
     static const int AVATAR_DATA_HZ = 45;
@@ -557,7 +573,7 @@ void Agent::setIsAvatar(bool isAvatar) {
         _avatarIdentityTimer->start(AVATAR_IDENTITY_PACKET_SEND_INTERVAL_MSECS);  // FIXME - we shouldn't really need to constantly send identity packets
 
         // tell the avatarAudioTimer to start ticking
-        emit startAvatarAudioTimer();
+        QMetaObject::invokeMethod(&_avatarAudioTimer, "start");
 
     }
 
@@ -586,7 +602,7 @@ void Agent::setIsAvatar(bool isAvatar) {
                 nodeList->sendPacket(std::move(packet), *node);
             });
         }
-        emit stopAvatarAudioTimer();
+        QMetaObject::invokeMethod(&_avatarAudioTimer, "stop");
     }
 }
 
@@ -604,6 +620,24 @@ void Agent::processAgentAvatar() {
 
         AvatarData::AvatarDataDetail dataDetail = (randFloat() < AVATAR_SEND_FULL_UPDATE_RATIO) ? AvatarData::SendAllData : AvatarData::CullSmallData;
         QByteArray avatarByteArray = scriptedAvatar->toByteArrayStateful(dataDetail);
+
+        int maximumByteArraySize = NLPacket::maxPayloadSize(PacketType::AvatarData) - sizeof(AvatarDataSequenceNumber);
+
+        if (avatarByteArray.size() > maximumByteArraySize) {
+            qWarning() << " scriptedAvatar->toByteArrayStateful() resulted in very large buffer:" << avatarByteArray.size() << "... attempt to drop facial data";
+            avatarByteArray = scriptedAvatar->toByteArrayStateful(dataDetail, true);
+
+            if (avatarByteArray.size() > maximumByteArraySize) {
+                qWarning() << " scriptedAvatar->toByteArrayStateful() without facial data resulted in very large buffer:" << avatarByteArray.size() << "... reduce to MinimumData";
+                avatarByteArray = scriptedAvatar->toByteArrayStateful(AvatarData::MinimumData, true);
+
+                if (avatarByteArray.size() > maximumByteArraySize) {
+                    qWarning() << " scriptedAvatar->toByteArrayStateful() MinimumData resulted in very large buffer:" << avatarByteArray.size() << "... FAIL!!";
+                    return;
+                }
+            }
+        }
+
         scriptedAvatar->doneEncoding(true);
 
         static AvatarDataSequenceNumber sequenceNumber = 0;
@@ -796,8 +830,7 @@ void Agent::aboutToFinish() {
     DependencyManager::destroy<recording::Recorder>();
     DependencyManager::destroy<recording::ClipCache>();
 
-    emit stopAvatarAudioTimer();
-    _avatarAudioTimerThread.quit();
+    QMetaObject::invokeMethod(&_avatarAudioTimer, "stop");
 
     // cleanup codec & encoder
     if (_codec && _encoder) {
diff --git a/assignment-client/src/Agent.h b/assignment-client/src/Agent.h
index 549a0858b7..168da185b6 100644
--- a/assignment-client/src/Agent.h
+++ b/assignment-client/src/Agent.h
@@ -77,20 +77,18 @@ private slots:
     void handleSelectedAudioFormat(QSharedPointer<ReceivedMessage> message);
 
     void nodeActivated(SharedNodePointer activatedNode);
+    void nodeKilled(SharedNodePointer killedNode);
 
     void processAgentAvatar();
     void processAgentAvatarAudio();
 
-signals:
-    void startAvatarAudioTimer();
-    void stopAvatarAudioTimer();
 private:
     void negotiateAudioFormat();
     void selectAudioFormat(const QString& selectedCodecName);
     void encodeFrameOfZeros(QByteArray& encodedZeros);
     void computeLoudness(const QByteArray* decodedBuffer, QSharedPointer<ScriptableAvatar>);
 
-    std::unique_ptr<ScriptEngine> _scriptEngine;
+    ScriptEnginePointer _scriptEngine;
     EntityEditPacketSender _entityEditSender;
     EntityTreeHeadlessViewer _entityViewer;
 
@@ -112,13 +110,13 @@ private:
     QHash<QUuid, quint16> _outgoingScriptAudioSequenceNumbers;
 
     AudioGate _audioGate;
-    bool _audioGateOpen { false };
+    bool _audioGateOpen { true };
     bool _isNoiseGateEnabled { false };
 
     CodecPluginPointer _codec;
     QString _selectedCodecName;
     Encoder* _encoder { nullptr };
-    QThread _avatarAudioTimerThread;
+    QTimer _avatarAudioTimer;
     bool _flushEncoder { false };
 };
 
diff --git a/assignment-client/src/AssignmentClient.cpp b/assignment-client/src/AssignmentClient.cpp
index abfc66ac55..efced972a0 100644
--- a/assignment-client/src/AssignmentClient.cpp
+++ b/assignment-client/src/AssignmentClient.cpp
@@ -16,6 +16,7 @@
 #include <QThread>
 #include <QTimer>
 
+#include <shared/QtHelpers.h>
 #include <AccountManager.h>
 #include <AddressManager.h>
 #include <Assignment.h>
@@ -141,7 +142,7 @@ void AssignmentClient::stopAssignmentClient() {
         QThread* currentAssignmentThread = _currentAssignment->thread();
 
         // ask the current assignment to stop
-        QMetaObject::invokeMethod(_currentAssignment, "stop", Qt::BlockingQueuedConnection);
+        BLOCKING_INVOKE_METHOD(_currentAssignment, "stop");
 
         // ask the current assignment to delete itself on its thread
         _currentAssignment->deleteLater();
diff --git a/assignment-client/src/AssignmentClientApp.cpp b/assignment-client/src/AssignmentClientApp.cpp
index 7e9042e609..dd3050ba4e 100644
--- a/assignment-client/src/AssignmentClientApp.cpp
+++ b/assignment-client/src/AssignmentClientApp.cpp
@@ -9,21 +9,21 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include <QCommandLineParser>
-#include <QThread>
+#include "AssignmentClientApp.h"
+
+#include <QtCore/QCommandLineParser>
+#include <QtCore/QDir>
+#include <QtCore/QStandardPaths>
+#include <QtCore/QThread>
 
 #include <LogHandler.h>
-#include <SharedUtil.h>
 #include <HifiConfigVariantMap.h>
+#include <SharedUtil.h>
 #include <ShutdownEventListener.h>
 
 #include "Assignment.h"
 #include "AssignmentClient.h"
 #include "AssignmentClientMonitor.h"
-#include "AssignmentClientApp.h"
-#include <QtCore/QDir>
-#include <QtCore/QStandardPaths>
-
 
 AssignmentClientApp::AssignmentClientApp(int argc, char* argv[]) :
     QCoreApplication(argc, argv)
@@ -87,6 +87,9 @@ AssignmentClientApp::AssignmentClientApp(int argc, char* argv[]) :
     const QCommandLineOption logDirectoryOption(ASSIGNMENT_LOG_DIRECTORY, "directory to store logs", "log-directory");
     parser.addOption(logDirectoryOption);
 
+    const QCommandLineOption parentPIDOption(PARENT_PID_OPTION, "PID of the parent process", "parent-pid");
+    parser.addOption(parentPIDOption);
+
     if (!parser.parse(QCoreApplication::arguments())) {
         qCritical() << parser.errorText() << endl;
         parser.showHelp();
@@ -203,6 +206,16 @@ AssignmentClientApp::AssignmentClientApp(int argc, char* argv[]) :
         }
     }
 
+    if (parser.isSet(parentPIDOption)) {
+        bool ok = false;
+        int parentPID = parser.value(parentPIDOption).toInt(&ok);
+
+        if (ok) {
+            qDebug() << "Parent process PID is" << parentPID;
+            watchParentProcess(parentPID);
+        }
+    }
+
     QThread::currentThread()->setObjectName("main thread");
 
     DependencyManager::registerInheritance<LimitedNodeList, NodeList>();
diff --git a/assignment-client/src/AssignmentClientMonitor.cpp b/assignment-client/src/AssignmentClientMonitor.cpp
index 1ee876ceea..1868ccfafe 100644
--- a/assignment-client/src/AssignmentClientMonitor.cpp
+++ b/assignment-client/src/AssignmentClientMonitor.cpp
@@ -28,6 +28,10 @@
 const QString ASSIGNMENT_CLIENT_MONITOR_TARGET_NAME = "assignment-client-monitor";
 const int WAIT_FOR_CHILD_MSECS = 1000;
 
+#ifdef Q_OS_WIN
+HANDLE PROCESS_GROUP = createProcessGroup();
+#endif
+
 AssignmentClientMonitor::AssignmentClientMonitor(const unsigned int numAssignmentClientForks,
                                                  const unsigned int minAssignmentClientForks,
                                                  const unsigned int maxAssignmentClientForks,
@@ -91,9 +95,22 @@ void AssignmentClientMonitor::simultaneousWaitOnChildren(int waitMsecs) {
     }
 }
 
-void AssignmentClientMonitor::childProcessFinished(qint64 pid) {
+void AssignmentClientMonitor::childProcessFinished(qint64 pid, int exitCode, QProcess::ExitStatus exitStatus) {
+    auto message = "Child process " + QString::number(pid) + " has %1 with exit code " + QString::number(exitCode) + ".";
+
     if (_childProcesses.remove(pid)) {
-        qDebug() << "Child process" << pid << "has finished. Removed from internal map.";
+        message.append(" Removed from internal map.");
+    } else {
+        message.append(" Could not find process in internal map.");
+    }
+
+    switch (exitStatus) {
+        case QProcess::NormalExit:
+            qDebug() << qPrintable(message.arg("returned"));
+            break;
+        case QProcess::CrashExit:
+            qCritical() << qPrintable(message.arg("crashed"));
+            break;
     }
 }
 
@@ -131,7 +148,6 @@ void AssignmentClientMonitor::aboutToQuit() {
 void AssignmentClientMonitor::spawnChildClient() {
     QProcess* assignmentClient = new QProcess(this);
 
-
     // unparse the parts of the command-line that the child cares about
     QStringList _childArguments;
     if (_assignmentPool != "") {
@@ -160,6 +176,9 @@ void AssignmentClientMonitor::spawnChildClient() {
     _childArguments.append("--" + ASSIGNMENT_CLIENT_MONITOR_PORT_OPTION);
     _childArguments.append(QString::number(DependencyManager::get<NodeList>()->getLocalSockAddr().getPort()));
 
+    _childArguments.append("--" + PARENT_PID_OPTION);
+    _childArguments.append(QString::number(QCoreApplication::applicationPid()));
+
     QString nowString, stdoutFilenameTemp, stderrFilenameTemp, stdoutPathTemp, stderrPathTemp;
 
 
@@ -187,6 +206,10 @@ void AssignmentClientMonitor::spawnChildClient() {
     assignmentClient->setProcessChannelMode(QProcess::ForwardedChannels);
     assignmentClient->start(QCoreApplication::applicationFilePath(), _childArguments);
 
+#ifdef Q_OS_WIN
+    addProcessToGroup(PROCESS_GROUP, assignmentClient->processId());
+#endif
+
     QString stdoutPath, stderrPath;
 
     if (_wantsChildFileLogging) {
@@ -219,7 +242,9 @@ void AssignmentClientMonitor::spawnChildClient() {
         auto pid = assignmentClient->processId();
         // make sure we hear that this process has finished when it does
         connect(assignmentClient, static_cast<void(QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
-                this, [this, pid]() { childProcessFinished(pid); });
+                this, [this, pid](int exitCode, QProcess::ExitStatus exitStatus) {
+                    childProcessFinished(pid, exitCode, exitStatus);
+            });
 
         qDebug() << "Spawned a child client with PID" << assignmentClient->processId();
 
diff --git a/assignment-client/src/AssignmentClientMonitor.h b/assignment-client/src/AssignmentClientMonitor.h
index a7f69a559b..8848d503ae 100644
--- a/assignment-client/src/AssignmentClientMonitor.h
+++ b/assignment-client/src/AssignmentClientMonitor.h
@@ -44,7 +44,7 @@ public:
     void stopChildProcesses();
 private slots:
     void checkSpares();
-    void childProcessFinished(qint64 pid);
+    void childProcessFinished(qint64 pid, int exitCode, QProcess::ExitStatus exitStatus);
     void handleChildStatusPacket(QSharedPointer<ReceivedMessage> message);
 
     bool handleHTTPRequest(HTTPConnection* connection, const QUrl& url, bool skipSubHandler = false) override;
diff --git a/assignment-client/src/AvatarAudioTimer.cpp b/assignment-client/src/AvatarAudioTimer.cpp
deleted file mode 100644
index d031b9d9f6..0000000000
--- a/assignment-client/src/AvatarAudioTimer.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-//
-//  AvatarAudioTimer.cpp
-//  assignment-client/src
-//
-//  Created by David Kelly on 10/12/13.
-//  Copyright 2016 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 <QDebug>
-#include <SharedUtil.h>
-#include "AvatarAudioTimer.h"
-
-// this should send a signal every 10ms, with pretty good precision.  Hardcoding
-// to 10ms since that's what you'd want for audio.  
-void AvatarAudioTimer::start() {
-    auto startTime = usecTimestampNow();
-    quint64 frameCounter = 0;
-    const int TARGET_INTERVAL_USEC = 10000; // 10ms
-    while (!_quit) {
-        ++frameCounter;
-
-        // tick every 10ms from startTime
-        quint64 targetTime = startTime + frameCounter * TARGET_INTERVAL_USEC;
-        quint64 now = usecTimestampNow();
-
-        // avoid quint64 underflow
-        if (now < targetTime) {
-            usleep(targetTime - now);
-        }
-
-        emit avatarTick();
-    }
-    qDebug() << "AvatarAudioTimer is finished";
-}
diff --git a/assignment-client/src/AvatarAudioTimer.h b/assignment-client/src/AvatarAudioTimer.h
deleted file mode 100644
index 1f6381b030..0000000000
--- a/assignment-client/src/AvatarAudioTimer.h
+++ /dev/null
@@ -1,31 +0,0 @@
-//
-//  AvatarAudioTimer.h
-//  assignment-client/src
-//
-//  Created by David Kelly on 10/12/13.
-//  Copyright 2016 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_AvatarAudioTimer_h
-#define hifi_AvatarAudioTimer_h
-
-#include <QtCore/QObject>
-
-class AvatarAudioTimer : public QObject {
-    Q_OBJECT
-
-signals:
-    void avatarTick();
-
-public slots:
-    void start();
-    void stop() { _quit = true; }
-
-private:
-    bool _quit { false };
-};
-
-#endif //hifi_AvatarAudioTimer_h
diff --git a/assignment-client/src/assets/AssetServer.cpp b/assignment-client/src/assets/AssetServer.cpp
index 3886ff8d92..ca0f222e0c 100644
--- a/assignment-client/src/assets/AssetServer.cpp
+++ b/assignment-client/src/assets/AssetServer.cpp
@@ -13,24 +13,33 @@
 #include "AssetServer.h"
 
 #include <thread>
+#include <memory>
 
 #include <QtCore/QCoreApplication>
 #include <QtCore/QCryptographicHash>
 #include <QtCore/QDateTime>
 #include <QtCore/QDir>
+#include <QtCore/QDirIterator>
 #include <QtCore/QFile>
 #include <QtCore/QFileInfo>
 #include <QtCore/QJsonDocument>
 #include <QtCore/QString>
+#include <QtGui/QImageReader>
+#include <QtCore/QVector>
+#include <QtCore/QUrlQuery>
 
+#include <ClientServerUtils.h>
+#include <FBXBaker.h>
+#include <JSBaker.h>
+#include <NodeType.h>
 #include <SharedUtil.h>
 #include <PathUtils.h>
 
-#include "NetworkLogging.h"
-#include "NodeType.h"
+#include "AssetServerLogging.h"
+#include "BakeAssetTask.h"
 #include "SendAssetTask.h"
 #include "UploadAssetTask.h"
-#include <ClientServerUtils.h>
+
 
 static const uint8_t MIN_CORES_FOR_MULTICORE = 4;
 static const uint8_t CPU_AFFINITY_COUNT_HIGH = 2;
@@ -41,6 +50,157 @@ static const int INTERFACE_RUNNING_CHECK_FREQUENCY_MS = 1000;
 
 const QString ASSET_SERVER_LOGGING_TARGET_NAME = "asset-server";
 
+static const QStringList BAKEABLE_MODEL_EXTENSIONS = { "fbx" };
+static QStringList BAKEABLE_TEXTURE_EXTENSIONS;
+static const QStringList BAKEABLE_SCRIPT_EXTENSIONS = {};
+static const QString BAKED_MODEL_SIMPLE_NAME = "asset.fbx";
+static const QString BAKED_TEXTURE_SIMPLE_NAME = "texture.ktx";
+static const QString BAKED_SCRIPT_SIMPLE_NAME = "asset.js";
+
+void AssetServer::bakeAsset(const AssetHash& assetHash, const AssetPath& assetPath, const QString& filePath) {
+    qDebug() << "Starting bake for: " << assetPath << assetHash;
+    auto it = _pendingBakes.find(assetHash);
+    if (it == _pendingBakes.end()) {
+        auto task = std::make_shared<BakeAssetTask>(assetHash, assetPath, filePath);
+        task->setAutoDelete(false);
+        _pendingBakes[assetHash] = task;
+
+        connect(task.get(), &BakeAssetTask::bakeComplete, this, &AssetServer::handleCompletedBake);
+        connect(task.get(), &BakeAssetTask::bakeFailed, this, &AssetServer::handleFailedBake);
+        connect(task.get(), &BakeAssetTask::bakeAborted, this, &AssetServer::handleAbortedBake);
+
+        _bakingTaskPool.start(task.get());
+    } else {
+        qDebug() << "Already in queue";
+    }
+}
+
+QString AssetServer::getPathToAssetHash(const AssetHash& assetHash) {
+    return _filesDirectory.absoluteFilePath(assetHash);
+}
+
+std::pair<BakingStatus, QString> AssetServer::getAssetStatus(const AssetPath& path, const AssetHash& hash) {
+    auto it = _pendingBakes.find(hash);
+    if (it != _pendingBakes.end()) {
+        return { (*it)->isBaking() ? Baking : Pending, "" };
+    }
+
+    if (path.startsWith(HIDDEN_BAKED_CONTENT_FOLDER)) {
+        return { Baked, "" };
+    }
+
+    auto dotIndex = path.lastIndexOf(".");
+    if (dotIndex == -1) {
+        return { Irrelevant, "" };
+    }
+
+    auto extension = path.mid(dotIndex + 1);
+
+    QString bakedFilename;
+
+    if (BAKEABLE_MODEL_EXTENSIONS.contains(extension)) {
+        bakedFilename = BAKED_MODEL_SIMPLE_NAME;
+    } else if (BAKEABLE_TEXTURE_EXTENSIONS.contains(extension.toLocal8Bit()) && hasMetaFile(hash)) {
+        bakedFilename = BAKED_TEXTURE_SIMPLE_NAME;
+    } else if (BAKEABLE_SCRIPT_EXTENSIONS.contains(extension)) {
+        bakedFilename = BAKED_SCRIPT_SIMPLE_NAME;
+    } else {
+        return { Irrelevant, "" };
+    }
+
+    auto bakedPath = HIDDEN_BAKED_CONTENT_FOLDER + hash + "/" + bakedFilename;
+    auto jt = _fileMappings.find(bakedPath);
+    if (jt != _fileMappings.end()) {
+        if (jt->second == hash) {
+            return { NotBaked, "" };
+        } else {
+            return { Baked, "" };
+        }
+    } else {
+        bool loaded;
+        AssetMeta meta;
+
+        std::tie(loaded, meta) = readMetaFile(hash);
+        if (loaded && meta.failedLastBake) {
+            return { Error, meta.lastBakeErrors };
+        }
+    }
+    
+    return { Pending, "" };
+}
+
+void AssetServer::bakeAssets() {
+    auto it = _fileMappings.cbegin();
+    for (; it != _fileMappings.cend(); ++it) {
+        auto path = it->first;
+        auto hash = it->second;
+        maybeBake(path, hash);
+    }
+}
+
+void AssetServer::maybeBake(const AssetPath& path, const AssetHash& hash) {
+    if (needsToBeBaked(path, hash)) {
+        qDebug() << "Queuing bake of: " << path;
+        bakeAsset(hash, path, getPathToAssetHash(hash));
+    }
+}
+
+void AssetServer::createEmptyMetaFile(const AssetHash& hash) {
+    QString metaFilePath = "atp:/" + hash + "/meta.json";
+    QFile metaFile { metaFilePath };
+    
+    if (!metaFile.exists()) {
+        qDebug() << "Creating metafile for " << hash;
+        if (metaFile.open(QFile::WriteOnly)) {
+            qDebug() << "Created metafile for " << hash;
+            metaFile.write("{}");
+        }
+    }
+}
+
+bool AssetServer::hasMetaFile(const AssetHash& hash) {
+    QString metaFilePath = HIDDEN_BAKED_CONTENT_FOLDER + hash + "/meta.json";
+
+    return _fileMappings.find(metaFilePath) != _fileMappings.end();
+}
+
+bool AssetServer::needsToBeBaked(const AssetPath& path, const AssetHash& assetHash) {
+    if (path.startsWith(HIDDEN_BAKED_CONTENT_FOLDER)) {
+        return false;
+    }
+
+    auto dotIndex = path.lastIndexOf(".");
+    if (dotIndex == -1) {
+        return false;
+    }
+
+    auto extension = path.mid(dotIndex + 1);
+
+    QString bakedFilename;
+
+    bool loaded;
+    AssetMeta meta;
+    std::tie(loaded, meta) = readMetaFile(assetHash);
+
+    // TODO: Allow failed bakes that happened on old versions to be re-baked
+    if (loaded && meta.failedLastBake) {
+        return false;
+    }
+
+    if (BAKEABLE_MODEL_EXTENSIONS.contains(extension)) {
+        bakedFilename = BAKED_MODEL_SIMPLE_NAME;
+    } else if (loaded && BAKEABLE_TEXTURE_EXTENSIONS.contains(extension.toLocal8Bit())) {
+        bakedFilename = BAKED_TEXTURE_SIMPLE_NAME;
+    } else if (BAKEABLE_SCRIPT_EXTENSIONS.contains(extension)) {
+        bakedFilename = BAKED_SCRIPT_SIMPLE_NAME;
+    } else {
+        return false;
+    }
+
+    auto bakedPath = HIDDEN_BAKED_CONTENT_FOLDER + assetHash + "/" + bakedFilename;
+    return _fileMappings.find(bakedPath) == _fileMappings.end();
+}
+
 bool interfaceRunning() {
     bool result = false;
 
@@ -67,20 +227,37 @@ void updateConsumedCores() {
     if (isInterfaceRunning) {
         coreCount = coreCount > MIN_CORES_FOR_MULTICORE ? CPU_AFFINITY_COUNT_HIGH : CPU_AFFINITY_COUNT_LOW;
     } 
-    qDebug() << "Setting max consumed cores to " << coreCount;
+    qCDebug(asset_server) << "Setting max consumed cores to " << coreCount;
     setMaxCores(coreCount);
 }
 
 
 AssetServer::AssetServer(ReceivedMessage& message) :
     ThreadedAssignment(message),
-    _taskPool(this)
+    _transferTaskPool(this),
+    _bakingTaskPool(this),
+    _filesizeLimit(MAX_UPLOAD_SIZE)
 {
+    // store the current state of image compression so we can reset it when this assignment is complete
+    _wasColorTextureCompressionEnabled = image::isColorTexturesCompressionEnabled();
+    _wasGrayscaleTextureCompressionEnabled = image::isGrayscaleTexturesCompressionEnabled();
+    _wasNormalTextureCompressionEnabled = image::isNormalTexturesCompressionEnabled();
+    _wasCubeTextureCompressionEnabled = image::isCubeTexturesCompressionEnabled();
+
+    // enable compression in image library
+    image::setColorTexturesCompressionEnabled(true);
+    image::setGrayscaleTexturesCompressionEnabled(true);
+    image::setNormalTexturesCompressionEnabled(true);
+    image::setCubeTexturesCompressionEnabled(true);
+
+    BAKEABLE_TEXTURE_EXTENSIONS = TextureBaker::getSupportedFormats();
+    qDebug() << "Supported baking texture formats:" << BAKEABLE_MODEL_EXTENSIONS;
 
     // Most of the work will be I/O bound, reading from disk and constructing packet objects,
     // so the ideal is greater than the number of cores on the system.
     static const int TASK_POOL_THREAD_COUNT = 50;
-    _taskPool.setMaxThreadCount(TASK_POOL_THREAD_COUNT);
+    _transferTaskPool.setMaxThreadCount(TASK_POOL_THREAD_COUNT);
+    _bakingTaskPool.setMaxThreadCount(1);
 
     auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();
     packetReceiver.registerListener(PacketType::AssetGet, this, "handleAssetGet");
@@ -103,9 +280,39 @@ AssetServer::AssetServer(ReceivedMessage& message) :
 #endif
 }
 
+void AssetServer::aboutToFinish() {
+
+    // remove pending transfer tasks
+    _transferTaskPool.clear();
+
+    // abort each of our still running bake tasks, remove pending bakes that were never put on the thread pool
+    auto it = _pendingBakes.begin();
+    while (it != _pendingBakes.end()) {
+        auto pendingRunnable =  _bakingTaskPool.tryTake(it->get());
+
+        if (pendingRunnable) {
+            it = _pendingBakes.erase(it);
+        } else {
+            it.value()->abort();
+            ++it;
+        }
+    }
+
+    // make sure all bakers are finished or aborted
+    while (_pendingBakes.size() > 0) {
+        QCoreApplication::processEvents();
+    }
+
+    // re-set defaults in image library
+    image::setColorTexturesCompressionEnabled(_wasCubeTextureCompressionEnabled);
+    image::setGrayscaleTexturesCompressionEnabled(_wasGrayscaleTextureCompressionEnabled);
+    image::setNormalTexturesCompressionEnabled(_wasNormalTextureCompressionEnabled);
+    image::setCubeTexturesCompressionEnabled(_wasCubeTextureCompressionEnabled);
+}
+
 void AssetServer::run() {
 
-    qDebug() << "Waiting for connection to domain to request settings from domain-server.";
+    qCDebug(asset_server) << "Waiting for connection to domain to request settings from domain-server.";
 
     // wait until we have the domain-server settings, otherwise we bail
     DomainHandler& domainHandler = DependencyManager::get<NodeList>()->getDomainHandler();
@@ -126,7 +333,7 @@ void AssetServer::completeSetup() {
     static const QString ASSET_SERVER_SETTINGS_KEY = "asset_server";
 
     if (!settingsObject.contains(ASSET_SERVER_SETTINGS_KEY)) {
-        qCritical() << "Received settings from the domain-server with no asset-server section. Stopping assignment.";
+        qCCritical(asset_server) << "Received settings from the domain-server with no asset-server section. Stopping assignment.";
         setFinished(true);
         return;
     }
@@ -137,11 +344,11 @@ void AssetServer::completeSetup() {
     auto maxBandwidthValue = assetServerObject[MAX_BANDWIDTH_OPTION];
     auto maxBandwidthFloat = maxBandwidthValue.toDouble(-1);
 
+    const int BITS_PER_MEGABITS = 1000 * 1000;
     if (maxBandwidthFloat > 0.0) {
-        const int BITS_PER_MEGABITS = 1000 * 1000;
         int maxBandwidth = maxBandwidthFloat * BITS_PER_MEGABITS;
         nodeList->setConnectionMaxBandwidth(maxBandwidth);
-        qInfo() << "Set maximum bandwith per connection to" << maxBandwidthFloat << "Mb/s."
+        qCInfo(asset_server) << "Set maximum bandwith per connection to" << maxBandwidthFloat << "Mb/s."
                     " (" << maxBandwidth << "bits/s)";
     }
 
@@ -150,7 +357,7 @@ void AssetServer::completeSetup() {
     auto assetsJSONValue = assetServerObject[ASSETS_PATH_OPTION];
 
     if (!assetsJSONValue.isString()) {
-        qCritical() << "Received an assets path from the domain-server that could not be parsed. Stopping assignment.";
+        qCCritical(asset_server) << "Received an assets path from the domain-server that could not be parsed. Stopping assignment.";
         setFinished(true);
         return;
     }
@@ -167,19 +374,19 @@ void AssetServer::completeSetup() {
 
     _resourcesDirectory = QDir(absoluteFilePath);
 
-    qDebug() << "Creating resources directory";
+    qCDebug(asset_server) << "Creating resources directory";
     _resourcesDirectory.mkpath(".");
     _filesDirectory = _resourcesDirectory;
 
     if (!_resourcesDirectory.mkpath(ASSET_FILES_SUBDIR) || !_filesDirectory.cd(ASSET_FILES_SUBDIR)) {
-        qCritical() << "Unable to create file directory for asset-server files. Stopping assignment.";
+        qCCritical(asset_server) << "Unable to create file directory for asset-server files. Stopping assignment.";
         setFinished(true);
         return;
     }
 
     // load whatever mappings we currently have from the local file
     if (loadMappingsFromFile()) {
-        qInfo() << "Serving files from: " << _filesDirectory.path();
+        qCInfo(asset_server) << "Serving files from: " << _filesDirectory.path();
 
         // Check the asset directory to output some information about what we have
         auto files = _filesDirectory.entryList(QDir::Files);
@@ -187,18 +394,28 @@ void AssetServer::completeSetup() {
         QRegExp hashFileRegex { ASSET_HASH_REGEX_STRING };
         auto hashedFiles = files.filter(hashFileRegex);
 
-        qInfo() << "There are" << hashedFiles.size() << "asset files in the asset directory.";
+        qCInfo(asset_server) << "There are" << hashedFiles.size() << "asset files in the asset directory.";
 
-        if (_fileMappings.count() > 0) {
+        if (_fileMappings.size() > 0) {
             cleanupUnmappedFiles();
         }
 
         nodeList->addSetOfNodeTypesToNodeInterestSet({ NodeType::Agent, NodeType::EntityScriptServer });
+
+        bakeAssets();
     } else {
-        qCritical() << "Asset Server assignment will not continue because mapping file could not be loaded.";
+        qCCritical(asset_server) << "Asset Server assignment will not continue because mapping file could not be loaded.";
         setFinished(true);
     }
 
+    // get file size limit for an asset
+    static const QString ASSETS_FILESIZE_LIMIT_OPTION = "assets_filesize_limit";
+    auto assetsFilesizeLimitJSONValue = assetServerObject[ASSETS_FILESIZE_LIMIT_OPTION];
+    auto assetsFilesizeLimit = (uint64_t)assetsFilesizeLimitJSONValue.toInt(MAX_UPLOAD_SIZE);
+
+    if (assetsFilesizeLimit != 0 && assetsFilesizeLimit < MAX_UPLOAD_SIZE) {
+        _filesizeLimit = assetsFilesizeLimit * BITS_PER_MEGABITS;
+    }
 }
 
 void AssetServer::cleanupUnmappedFiles() {
@@ -206,21 +423,28 @@ void AssetServer::cleanupUnmappedFiles() {
 
     auto files = _filesDirectory.entryInfoList(QDir::Files);
 
-    // grab the currently mapped hashes
-    auto mappedHashes = _fileMappings.values();
-
-    qInfo() << "Performing unmapped asset cleanup.";
+    qCInfo(asset_server) << "Performing unmapped asset cleanup.";
 
     for (const auto& fileInfo : files) {
-        if (hashFileRegex.exactMatch(fileInfo.fileName())) {
-            if (!mappedHashes.contains(fileInfo.fileName())) {
+        auto filename = fileInfo.fileName();
+        if (hashFileRegex.exactMatch(filename)) {
+            bool matched { false };
+            for (auto& pair : _fileMappings) {
+                if (pair.second == filename) {
+                    matched = true;
+                    break;
+                }
+            }
+            if (!matched) {
                 // remove the unmapped file
                 QFile removeableFile { fileInfo.absoluteFilePath() };
 
                 if (removeableFile.remove()) {
-                    qDebug() << "\tDeleted" << fileInfo.fileName() << "from asset files directory since it is unmapped.";
+                    qCDebug(asset_server) << "\tDeleted" << filename << "from asset files directory since it is unmapped.";
+
+                    removeBakedPathsForDeletedAsset(filename);
                 } else {
-                    qDebug() << "\tAttempt to delete unmapped file" << fileInfo.fileName() << "failed";
+                    qCDebug(asset_server) << "\tAttempt to delete unmapped file" << filename << "failed";
                 }
             }
         }
@@ -238,26 +462,24 @@ void AssetServer::handleAssetMappingOperation(QSharedPointer<ReceivedMessage> me
     replyPacket->writePrimitive(messageID);
 
     switch (operationType) {
-        case AssetMappingOperationType::Get: {
+        case AssetMappingOperationType::Get:
             handleGetMappingOperation(*message, senderNode, *replyPacket);
             break;
-        }
-        case AssetMappingOperationType::GetAll: {
+        case AssetMappingOperationType::GetAll:
             handleGetAllMappingOperation(*message, senderNode, *replyPacket);
             break;
-        }
-        case AssetMappingOperationType::Set: {
+        case AssetMappingOperationType::Set:
             handleSetMappingOperation(*message, senderNode, *replyPacket);
             break;
-        }
-        case AssetMappingOperationType::Delete: {
+        case AssetMappingOperationType::Delete:
             handleDeleteMappingsOperation(*message, senderNode, *replyPacket);
             break;
-        }
-        case AssetMappingOperationType::Rename: {
+        case AssetMappingOperationType::Rename:
             handleRenameMappingOperation(*message, senderNode, *replyPacket);
             break;
-        }
+        case AssetMappingOperationType::SetBakingEnabled:
+            handleSetBakingEnabledOperation(*message, senderNode, *replyPacket);
+            break;
     }
 
     auto nodeList = DependencyManager::get<NodeList>();
@@ -267,11 +489,77 @@ void AssetServer::handleAssetMappingOperation(QSharedPointer<ReceivedMessage> me
 void AssetServer::handleGetMappingOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacketList& replyPacket) {
     QString assetPath = message.readString();
 
+    QUrl url { assetPath };
+    assetPath = url.path();
+
     auto it = _fileMappings.find(assetPath);
     if (it != _fileMappings.end()) {
-        auto assetHash = it->toString();
+
+        // check if we should re-direct to a baked asset
+
+        // first, figure out from the mapping extension what type of file this is
+        auto assetPathExtension = assetPath.mid(assetPath.lastIndexOf('.') + 1).toLower();
+        QString bakedRootFile;
+
+        if (BAKEABLE_MODEL_EXTENSIONS.contains(assetPathExtension)) {
+            bakedRootFile = BAKED_MODEL_SIMPLE_NAME;
+        } else if (BAKEABLE_TEXTURE_EXTENSIONS.contains(assetPathExtension.toLocal8Bit())) {
+            bakedRootFile = BAKED_TEXTURE_SIMPLE_NAME;
+        } else if (BAKEABLE_SCRIPT_EXTENSIONS.contains(assetPathExtension)) {
+            bakedRootFile = BAKED_SCRIPT_SIMPLE_NAME;
+        }
+        
+        auto originalAssetHash = it->second;
+        QString redirectedAssetHash;
+        QString bakedAssetPath;
+        quint8 wasRedirected = false;
+        bool bakingDisabled = false;
+
+        if (!bakedRootFile.isEmpty()) {
+            // we ran into an asset for which we could have a baked version, let's check if it's ready
+            bakedAssetPath = HIDDEN_BAKED_CONTENT_FOLDER + originalAssetHash + "/" + bakedRootFile;
+            auto bakedIt = _fileMappings.find(bakedAssetPath);
+
+            if (bakedIt != _fileMappings.end()) {
+                if (bakedIt->second != originalAssetHash) {
+                    qDebug() << "Did find baked version for: " << originalAssetHash << assetPath;
+                    // we found a baked version of the requested asset to serve, redirect to that
+                    redirectedAssetHash = bakedIt->second;
+                    wasRedirected = true;
+                } else {
+                    qDebug() << "Did not find baked version for: " << originalAssetHash << assetPath << " (disabled)";
+                    bakingDisabled = true;
+                }
+            } else {
+                qDebug() << "Did not find baked version for: " << originalAssetHash << assetPath;
+            }
+        }
+
         replyPacket.writePrimitive(AssetServerError::NoError);
-        replyPacket.write(QByteArray::fromHex(assetHash.toUtf8()));
+
+        if (wasRedirected) {
+            qDebug() << "Writing re-directed hash for" << originalAssetHash << "to" << redirectedAssetHash;
+            replyPacket.write(QByteArray::fromHex(redirectedAssetHash.toUtf8()));
+
+            // add a flag saying that this mapping request was redirect
+            replyPacket.writePrimitive(wasRedirected);
+
+            // include the re-directed path in case the caller needs to make relative path requests for the baked asset
+            replyPacket.writeString(bakedAssetPath);
+
+        } else {
+            replyPacket.write(QByteArray::fromHex(originalAssetHash.toUtf8()));
+            replyPacket.writePrimitive(wasRedirected);
+
+            auto query = QUrlQuery(url.query());
+            bool isSkybox = query.hasQueryItem("skybox");
+            if (isSkybox) {
+                writeMetaFile(originalAssetHash);
+                if (!bakingDisabled) {
+                    maybeBake(assetPath, originalAssetHash);
+                }
+            }
+        }
     } else {
         replyPacket.writePrimitive(AssetServerError::AssetNotFound);
     }
@@ -280,13 +568,23 @@ void AssetServer::handleGetMappingOperation(ReceivedMessage& message, SharedNode
 void AssetServer::handleGetAllMappingOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacketList& replyPacket) {
     replyPacket.writePrimitive(AssetServerError::NoError);
 
-    auto count = _fileMappings.size();
+    uint32_t count = (uint32_t)_fileMappings.size();
 
     replyPacket.writePrimitive(count);
 
     for (auto it = _fileMappings.cbegin(); it != _fileMappings.cend(); ++ it) {
-        replyPacket.writeString(it.key());
-        replyPacket.write(QByteArray::fromHex(it.value().toString().toUtf8()));
+        auto mapping = it->first;
+        auto hash = it->second;
+        replyPacket.writeString(mapping);
+        replyPacket.write(QByteArray::fromHex(hash.toUtf8()));
+
+        BakingStatus status;
+        QString lastBakeErrors;
+        std::tie(status, lastBakeErrors) = getAssetStatus(mapping, hash);
+        replyPacket.writePrimitive(status);
+        if (status == Error) {
+            replyPacket.writeString(lastBakeErrors);
+        }
     }
 }
 
@@ -296,11 +594,18 @@ void AssetServer::handleSetMappingOperation(ReceivedMessage& message, SharedNode
 
         auto assetHash = message.read(SHA256_HASH_LENGTH).toHex();
 
-        if (setMapping(assetPath, assetHash)) {
-            replyPacket.writePrimitive(AssetServerError::NoError);
+        // don't process a set mapping operation that is inside the hidden baked folder
+        if (assetPath.startsWith(HIDDEN_BAKED_CONTENT_FOLDER)) {
+            qCDebug(asset_server) << "Refusing to process a set mapping operation inside" << HIDDEN_BAKED_CONTENT_FOLDER;
+            replyPacket.writePrimitive(AssetServerError::PermissionDenied);
         } else {
-            replyPacket.writePrimitive(AssetServerError::MappingOperationFailed);
+            if (setMapping(assetPath, assetHash)) {
+                replyPacket.writePrimitive(AssetServerError::NoError);
+            } else {
+                replyPacket.writePrimitive(AssetServerError::MappingOperationFailed);
+            }
         }
+
     } else {
         replyPacket.writePrimitive(AssetServerError::PermissionDenied);
     }
@@ -314,7 +619,14 @@ void AssetServer::handleDeleteMappingsOperation(ReceivedMessage& message, Shared
         QStringList mappingsToDelete;
 
         for (int i = 0; i < numberOfDeletedMappings; ++i) {
-            mappingsToDelete << message.readString();
+            auto mapping = message.readString();
+
+            if (!mapping.startsWith(HIDDEN_BAKED_CONTENT_FOLDER)) {
+                mappingsToDelete << mapping;
+            } else {
+                qCDebug(asset_server) << "Refusing to delete mapping" << mapping
+                    << "that is inside" << HIDDEN_BAKED_CONTENT_FOLDER;
+            }
         }
 
         if (deleteMappings(mappingsToDelete)) {
@@ -332,7 +644,38 @@ void AssetServer::handleRenameMappingOperation(ReceivedMessage& message, SharedN
         QString oldPath = message.readString();
         QString newPath = message.readString();
 
-        if (renameMapping(oldPath, newPath)) {
+        if (oldPath.startsWith(HIDDEN_BAKED_CONTENT_FOLDER) || newPath.startsWith(HIDDEN_BAKED_CONTENT_FOLDER)) {
+            qCDebug(asset_server) << "Cannot rename" << oldPath << "to" << newPath
+                << "since one of the paths is inside" << HIDDEN_BAKED_CONTENT_FOLDER;
+            replyPacket.writePrimitive(AssetServerError::PermissionDenied);
+        } else {
+            if (renameMapping(oldPath, newPath)) {
+                replyPacket.writePrimitive(AssetServerError::NoError);
+            } else {
+                replyPacket.writePrimitive(AssetServerError::MappingOperationFailed);
+            }
+        }
+
+    } else {
+        replyPacket.writePrimitive(AssetServerError::PermissionDenied);
+    }
+}
+
+void AssetServer::handleSetBakingEnabledOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacketList& replyPacket) {
+    if (senderNode->getCanWriteToAssetServer()) {
+        bool enabled { true };
+        message.readPrimitive(&enabled);
+
+        int numberOfMappings{ 0 };
+        message.readPrimitive(&numberOfMappings);
+
+        QStringList mappings;
+
+        for (int i = 0; i < numberOfMappings; ++i) {
+            mappings << message.readString();
+        }
+
+        if (setBakingEnabled(mappings, enabled)) {
             replyPacket.writePrimitive(AssetServerError::NoError);
         } else {
             replyPacket.writePrimitive(AssetServerError::MappingOperationFailed);
@@ -347,7 +690,7 @@ void AssetServer::handleAssetGetInfo(QSharedPointer<ReceivedMessage> message, Sh
     MessageID messageID;
 
     if (message->getSize() < qint64(SHA256_HASH_LENGTH + sizeof(messageID))) {
-        qDebug() << "ERROR bad file request";
+        qCDebug(asset_server) << "ERROR bad file request";
         return;
     }
 
@@ -366,11 +709,11 @@ void AssetServer::handleAssetGetInfo(QSharedPointer<ReceivedMessage> message, Sh
     QFileInfo fileInfo { _filesDirectory.filePath(fileName) };
 
     if (fileInfo.exists() && fileInfo.isReadable()) {
-        qDebug() << "Opening file: " << fileInfo.filePath();
+        qCDebug(asset_server) << "Opening file: " << fileInfo.filePath();
         replyPacket->writePrimitive(AssetServerError::NoError);
         replyPacket->writePrimitive(fileInfo.size());
     } else {
-        qDebug() << "Asset not found: " << QString(hexHash);
+        qCDebug(asset_server) << "Asset not found: " << QString(hexHash);
         replyPacket->writePrimitive(AssetServerError::AssetNotFound);
     }
 
@@ -383,22 +726,22 @@ void AssetServer::handleAssetGet(QSharedPointer<ReceivedMessage> message, Shared
     auto minSize = qint64(sizeof(MessageID) + SHA256_HASH_LENGTH + sizeof(DataOffset) + sizeof(DataOffset));
 
     if (message->getSize() < minSize) {
-        qDebug() << "ERROR bad file request";
+        qCDebug(asset_server) << "ERROR bad file request";
         return;
     }
 
     // Queue task
     auto task = new SendAssetTask(message, senderNode, _filesDirectory);
-    _taskPool.start(task);
+    _transferTaskPool.start(task);
 }
 
 void AssetServer::handleAssetUpload(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) {
 
     if (senderNode->getCanWriteToAssetServer()) {
-        qDebug() << "Starting an UploadAssetTask for upload from" << uuidStringWithoutCurlyBraces(senderNode->getUUID());
+        qCDebug(asset_server) << "Starting an UploadAssetTask for upload from" << uuidStringWithoutCurlyBraces(senderNode->getUUID());
 
-        auto task = new UploadAssetTask(message, senderNode, _filesDirectory);
-        _taskPool.start(task);
+        auto task = new UploadAssetTask(message, senderNode, _filesDirectory, _filesizeLimit);
+        _transferTaskPool.start(task);
     } else {
         // this is a node the domain told us is not allowed to rez entities
         // for now this also means it isn't allowed to add assets
@@ -502,39 +845,46 @@ bool AssetServer::loadMappingsFromFile() {
             auto jsonDocument = QJsonDocument::fromJson(mapFile.readAll(), &error);
 
             if (error.error == QJsonParseError::NoError) {
-                _fileMappings = jsonDocument.object().toVariantHash();
-
-                // remove any mappings that don't match the expected format
-                auto it = _fileMappings.begin();
-                while (it != _fileMappings.end()) {
-                    bool shouldDrop = false;
-
-                    if (!isValidFilePath(it.key())) {
-                        qWarning() << "Will not keep mapping for" << it.key() << "since it is not a valid path.";
-                        shouldDrop = true;
-                    }
-
-                    if (!isValidHash(it.value().toString())) {
-                        qWarning() << "Will not keep mapping for" << it.key() << "since it does not have a valid hash.";
-                        shouldDrop = true;
-                    }
-
-                    if (shouldDrop) {
-                        it = _fileMappings.erase(it);
-                    } else {
-                        ++it;
-                    }
+                if (!jsonDocument.isObject()) {
+                    qCWarning(asset_server) << "Failed to read mapping file, root value in" << mapFilePath << "is not an object";
+                    return false;
                 }
 
-                qInfo() << "Loaded" << _fileMappings.count() << "mappings from map file at" << mapFilePath;
+                //_fileMappings = jsonDocument.object().toVariantHash();
+                auto root = jsonDocument.object();
+                for (auto it = root.begin(); it != root.end(); ++it) {
+                    auto key = it.key();
+                    auto value = it.value();
+
+                    if (!value.isString()) {
+                        qCWarning(asset_server) << "Skipping" << key << ":" << value << "because it is not a string";
+                        continue;
+                    }
+
+                    if (!isValidFilePath(key)) {
+                        qCWarning(asset_server) << "Will not keep mapping for" << key << "since it is not a valid path.";
+                        continue;
+                    }
+
+                    if (!isValidHash(value.toString())) {
+                        qCWarning(asset_server) << "Will not keep mapping for" << key << "since it does not have a valid hash.";
+                        continue;
+                    }
+
+
+                    qDebug() << "Added " << key << value.toString();
+                    _fileMappings[key] = value.toString();
+                }
+
+                qCInfo(asset_server) << "Loaded" << _fileMappings.size() << "mappings from map file at" << mapFilePath;
                 return true;
             }
         }
 
-        qCritical() << "Failed to read mapping file at" << mapFilePath;
+        qCCritical(asset_server) << "Failed to read mapping file at" << mapFilePath;
         return false;
     } else {
-        qInfo() << "No existing mappings loaded from file since no file was found at" << mapFilePath;
+        qCInfo(asset_server) << "No existing mappings loaded from file since no file was found at" << mapFilePath;
     }
 
     return true;
@@ -545,17 +895,22 @@ bool AssetServer::writeMappingsToFile() {
 
     QFile mapFile { mapFilePath };
     if (mapFile.open(QIODevice::WriteOnly)) {
-        auto jsonObject = QJsonObject::fromVariantHash(_fileMappings);
-        QJsonDocument jsonDocument { jsonObject };
+        QJsonObject root;
+
+        for (auto it : _fileMappings) {
+            root[it.first] = it.second;
+        }
+
+        QJsonDocument jsonDocument { root };
 
         if (mapFile.write(jsonDocument.toJson()) != -1) {
-            qDebug() << "Wrote JSON mappings to file at" << mapFilePath;
+            qCDebug(asset_server) << "Wrote JSON mappings to file at" << mapFilePath;
             return true;
         } else {
-            qWarning() << "Failed to write JSON mappings to file at" << mapFilePath;
+            qCWarning(asset_server) << "Failed to write JSON mappings to file at" << mapFilePath;
         }
     } else {
-        qWarning() << "Failed to open map file at" << mapFilePath;
+        qCWarning(asset_server) << "Failed to open map file at" << mapFilePath;
     }
 
     return false;
@@ -565,17 +920,18 @@ bool AssetServer::setMapping(AssetPath path, AssetHash hash) {
     path = path.trimmed();
 
     if (!isValidFilePath(path)) {
-        qWarning() << "Cannot set a mapping for invalid path:" << path << "=>" << hash;
+        qCWarning(asset_server) << "Cannot set a mapping for invalid path:" << path << "=>" << hash;
         return false;
     }
 
     if (!isValidHash(hash)) {
-        qWarning() << "Cannot set a mapping for invalid hash" << path << "=>" << hash;
+        qCWarning(asset_server) << "Cannot set a mapping for invalid hash" << path << "=>" << hash;
         return false;
     }
 
     // remember what the old mapping was in case persistence fails
-    auto oldMapping = _fileMappings.value(path).toString();
+    auto it = _fileMappings.find(path);
+    auto oldMapping = it != _fileMappings.end() ? it->second : "";
 
     // update the in memory QHash
     _fileMappings[path] = hash;
@@ -583,17 +939,18 @@ bool AssetServer::setMapping(AssetPath path, AssetHash hash) {
     // attempt to write to file
     if (writeMappingsToFile()) {
         // persistence succeeded, we are good to go
-        qDebug() << "Set mapping:" << path << "=>" << hash;
+        qCDebug(asset_server) << "Set mapping:" << path << "=>" << hash;
+        maybeBake(path, hash);
         return true;
     } else {
         // failed to persist this mapping to file - put back the old one in our in-memory representation
         if (oldMapping.isEmpty()) {
-            _fileMappings.remove(path);
+            _fileMappings.erase(_fileMappings.find(path));
         } else {
             _fileMappings[path] = oldMapping;
         }
 
-        qWarning() << "Failed to persist mapping:" << path << "=>" << hash;
+        qCWarning(asset_server) << "Failed to persist mapping:" << path << "=>" << hash;
 
         return false;
     }
@@ -603,16 +960,27 @@ bool pathIsFolder(const AssetPath& path) {
     return path.endsWith('/');
 }
 
-bool AssetServer::deleteMappings(AssetPathList& paths) {
+void AssetServer::removeBakedPathsForDeletedAsset(AssetHash hash) {
+    // we deleted the file with this hash
+
+    // check if we had baked content for that file that should also now be removed
+    // by calling deleteMappings for the hidden baked content folder for this hash
+    AssetPathList hiddenBakedFolder { HIDDEN_BAKED_CONTENT_FOLDER + hash + "/" };
+
+    qCDebug(asset_server) << "Deleting baked content below" << hiddenBakedFolder << "since" << hash << "was deleted";
+
+    deleteMappings(hiddenBakedFolder);
+}
+
+bool AssetServer::deleteMappings(const AssetPathList& paths) {
     // take a copy of the current mappings in case persistence of these deletes fails
     auto oldMappings = _fileMappings;
 
     QSet<QString> hashesToCheckForDeletion;
 
     // enumerate the paths to delete and remove them all
-    for (auto& path : paths) {
-
-        path = path.trimmed();
+    for (const auto& rawPath : paths) {
+        auto path = rawPath.trimmed();
 
         // figure out if this path will delete a file or folder
         if (pathIsFolder(path)) {
@@ -621,9 +989,9 @@ bool AssetServer::deleteMappings(AssetPathList& paths) {
             auto sizeBefore = _fileMappings.size();
 
             while (it != _fileMappings.end()) {
-                if (it.key().startsWith(path)) {
+                if (it->first.startsWith(path)) {
                     // add this hash to the list we need to check for asset removal from the server
-                    hashesToCheckForDeletion << it.value().toString();
+                    hashesToCheckForDeletion << it->second;
 
                     it = _fileMappings.erase(it);
                 } else {
@@ -633,20 +1001,22 @@ bool AssetServer::deleteMappings(AssetPathList& paths) {
 
             auto sizeNow = _fileMappings.size();
             if (sizeBefore != sizeNow) {
-                qDebug() << "Deleted" << sizeBefore - sizeNow << "mappings in folder: " << path;
+                qCDebug(asset_server) << "Deleted" << sizeBefore - sizeNow << "mappings in folder: " << path;
             } else {
-                qDebug() << "Did not find any mappings to delete in folder:" << path;
+                qCDebug(asset_server) << "Did not find any mappings to delete in folder:" << path;
             }
 
         } else {
-            auto oldMapping = _fileMappings.take(path);
-            if (!oldMapping.isNull()) {
+            auto it = _fileMappings.find(path);
+            if (it != _fileMappings.end()) {
                 // add this hash to the list we need to check for asset removal from server
-                hashesToCheckForDeletion << oldMapping.toString();
+                hashesToCheckForDeletion << it->second;
 
-                qDebug() << "Deleted a mapping:" << path << "=>" << oldMapping.toString();
+                qCDebug(asset_server) << "Deleted a mapping:" << path << "=>" << it->second;
+                
+                _fileMappings.erase(it);
             } else {
-                qDebug() << "Unable to delete a mapping that was not found:" << path;
+                qCDebug(asset_server) << "Unable to delete a mapping that was not found:" << path;
             }
         }
     }
@@ -655,12 +1025,9 @@ bool AssetServer::deleteMappings(AssetPathList& paths) {
     if (writeMappingsToFile()) {
         // persistence succeeded we are good to go
 
-        // grab the current mapped hashes
-        auto mappedHashes = _fileMappings.values();
-
-        // enumerate the mapped hashes and clear the list of hashes to check for anything that's present
-        for (auto& hashVariant : mappedHashes) {
-            auto it = hashesToCheckForDeletion.find(hashVariant.toString());
+        // TODO iterate through hashesToCheckForDeletion instead
+        for (auto& pair : _fileMappings) {
+            auto it = hashesToCheckForDeletion.find(pair.second);
             if (it != hashesToCheckForDeletion.end()) {
                 hashesToCheckForDeletion.erase(it);
             }
@@ -672,15 +1039,17 @@ bool AssetServer::deleteMappings(AssetPathList& paths) {
             QFile removeableFile { _filesDirectory.absoluteFilePath(hash) };
 
             if (removeableFile.remove()) {
-                qDebug() << "\tDeleted" << hash << "from asset files directory since it is now unmapped.";
+                qCDebug(asset_server) << "\tDeleted" << hash << "from asset files directory since it is now unmapped.";
+
+                removeBakedPathsForDeletedAsset(hash);
             } else {
-                qDebug() << "\tAttempt to delete unmapped file" << hash << "failed";
+                qCDebug(asset_server) << "\tAttempt to delete unmapped file" << hash << "failed";
             }
         }
 
         return true;
     } else {
-        qWarning() << "Failed to persist deleted mappings, rolling back";
+        qCWarning(asset_server) << "Failed to persist deleted mappings, rolling back";
 
         // we didn't delete the previous mapping, put it back in our in-memory representation
         _fileMappings = oldMappings;
@@ -694,7 +1063,7 @@ bool AssetServer::renameMapping(AssetPath oldPath, AssetPath newPath) {
     newPath = newPath.trimmed();
 
     if (!isValidFilePath(oldPath) || !isValidFilePath(newPath)) {
-        qWarning() << "Cannot perform rename with invalid paths - both should have leading forward and no ending slashes:"
+        qCWarning(asset_server) << "Cannot perform rename with invalid paths - both should have leading forward and no ending slashes:"
             << oldPath << "=>" << newPath;
 
         return false;
@@ -704,7 +1073,7 @@ bool AssetServer::renameMapping(AssetPath oldPath, AssetPath newPath) {
     if (pathIsFolder(oldPath)) {
         if (!pathIsFolder(newPath)) {
             // we were asked to rename a path to a folder to a path that isn't a folder, this is a fail
-            qWarning() << "Cannot rename mapping from folder path" << oldPath << "to file path" << newPath;
+            qCWarning(asset_server) << "Cannot rename mapping from folder path" << oldPath << "to file path" << newPath;
 
             return false;
         }
@@ -716,13 +1085,14 @@ bool AssetServer::renameMapping(AssetPath oldPath, AssetPath newPath) {
         auto it = oldMappings.begin();
 
         while (it != oldMappings.end()) {
-            if (it.key().startsWith(oldPath)) {
-                auto newKey = it.key();
+            auto& oldKey = it->first;
+            if (oldKey.startsWith(oldPath)) {
+                auto newKey = oldKey;
                 newKey.replace(0, oldPath.size(), newPath);
 
                 // remove the old version from the in memory file mappings
-                _fileMappings.remove(it.key());
-                _fileMappings.insert(newKey, it.value());
+                _fileMappings.erase(_fileMappings.find(oldKey));
+                _fileMappings[newKey] = it->second;
             }
 
             ++it;
@@ -730,52 +1100,54 @@ bool AssetServer::renameMapping(AssetPath oldPath, AssetPath newPath) {
 
         if (writeMappingsToFile()) {
             // persisted the changed mappings, return success
-            qDebug() << "Renamed folder mapping:" << oldPath << "=>" << newPath;
+            qCDebug(asset_server) << "Renamed folder mapping:" << oldPath << "=>" << newPath;
 
             return true;
         } else {
             // couldn't persist the renamed paths, rollback and return failure
             _fileMappings = oldMappings;
 
-            qWarning() << "Failed to persist renamed folder mapping:" << oldPath << "=>" << newPath;
+            qCWarning(asset_server) << "Failed to persist renamed folder mapping:" << oldPath << "=>" << newPath;
 
             return false;
         }
     } else {
         if (pathIsFolder(newPath)) {
             // we were asked to rename a path to a file to a path that is a folder, this is a fail
-            qWarning() << "Cannot rename mapping from file path" << oldPath << "to folder path" << newPath;
+            qCWarning(asset_server) << "Cannot rename mapping from file path" << oldPath << "to folder path" << newPath;
 
             return false;
         }
 
         // take the old hash to remove the old mapping
-        auto oldSourceMapping = _fileMappings.take(oldPath).toString();
+        auto it = _fileMappings.find(oldPath);
+        auto oldSourceMapping = it->second;
+        _fileMappings.erase(it);
 
         // in case we're overwriting, keep the current destination mapping for potential rollback
-        auto oldDestinationMapping = _fileMappings.value(newPath);
+        auto oldDestinationIt = _fileMappings.find(newPath);
 
         if (!oldSourceMapping.isEmpty()) {
             _fileMappings[newPath] = oldSourceMapping;
 
             if (writeMappingsToFile()) {
                 // persisted the renamed mapping, return success
-                qDebug() << "Renamed mapping:" << oldPath << "=>" << newPath;
+                qCDebug(asset_server) << "Renamed mapping:" << oldPath << "=>" << newPath;
 
                 return true;
             } else {
                 // we couldn't persist the renamed mapping, rollback and return failure
                 _fileMappings[oldPath] = oldSourceMapping;
 
-                if (!oldDestinationMapping.isNull()) {
+                if (oldDestinationIt != _fileMappings.end()) {
                     // put back the overwritten mapping for the destination path
-                    _fileMappings[newPath] = oldDestinationMapping.toString();
+                    _fileMappings[newPath] = oldDestinationIt->second;
                 } else {
                     // clear the new mapping
-                    _fileMappings.remove(newPath);
+                    _fileMappings.erase(_fileMappings.find(newPath));
                 }
 
-                qDebug() << "Failed to persist renamed mapping:" << oldPath << "=>" << newPath;
+                qCDebug(asset_server) << "Failed to persist renamed mapping:" << oldPath << "=>" << newPath;
 
                 return false;
             }
@@ -785,3 +1157,255 @@ bool AssetServer::renameMapping(AssetPath oldPath, AssetPath newPath) {
         }
     }
 }
+
+static const QString BAKED_ASSET_SIMPLE_FBX_NAME = "asset.fbx";
+static const QString BAKED_ASSET_SIMPLE_TEXTURE_NAME = "texture.ktx";
+static const QString BAKED_ASSET_SIMPLE_JS_NAME = "asset.js";
+
+QString getBakeMapping(const AssetHash& hash, const QString& relativeFilePath) {
+    return HIDDEN_BAKED_CONTENT_FOLDER + hash + "/" + relativeFilePath;
+}
+
+void AssetServer::handleFailedBake(QString originalAssetHash, QString assetPath, QString errors) {
+    qDebug() << "Failed: " << originalAssetHash << assetPath << errors;
+
+    bool loaded;
+    AssetMeta meta;
+
+    std::tie(loaded, meta) = readMetaFile(originalAssetHash);
+
+    meta.failedLastBake = true;
+    meta.lastBakeErrors = errors;
+
+    writeMetaFile(originalAssetHash, meta);
+
+    _pendingBakes.remove(originalAssetHash);
+}
+
+void AssetServer::handleCompletedBake(QString originalAssetHash, QString originalAssetPath,
+                                      QString bakedTempOutputDir, QVector<QString> bakedFilePaths) {
+    bool errorCompletingBake { false };
+    QString errorReason;
+
+    qDebug() << "Completing bake for " << originalAssetHash;
+
+    for (auto& filePath : bakedFilePaths) {
+        // figure out the hash for the contents of this file
+        QFile file(filePath);
+
+        qDebug() << "File path: " << filePath;
+
+        AssetHash bakedFileHash;
+
+        if (file.open(QIODevice::ReadOnly)) {
+            QCryptographicHash hasher(QCryptographicHash::Sha256);
+
+            if (hasher.addData(&file)) {
+                bakedFileHash = hasher.result().toHex();
+            } else {
+                // stop handling this bake, couldn't hash the contents of the file
+                errorCompletingBake = true;
+                errorReason = "Failed to finalize bake";
+                break;
+            }
+
+            // first check that we don't already have this bake file in our list
+            auto bakeFileDestination = _filesDirectory.absoluteFilePath(bakedFileHash);
+            if (!QFile::exists(bakeFileDestination)) {
+                // copy each to our files folder (with the hash as their filename)
+                if (!file.copy(_filesDirectory.absoluteFilePath(bakedFileHash))) {
+                    // stop handling this bake, couldn't copy the bake file into our files directory
+                    errorCompletingBake = true;
+                    errorReason = "Failed to copy baked assets to asset server";
+                    break;
+                }
+            }
+
+            // setup the mapping for this bake file
+            auto relativeFilePath = QUrl(filePath).fileName();
+            qDebug() << "Relative file path is: " << relativeFilePath;
+            if (relativeFilePath.endsWith(".fbx", Qt::CaseInsensitive)) {
+                // for an FBX file, we replace the filename with the simple name
+                // (to handle the case where two mapped assets have the same hash but different names)
+                relativeFilePath = BAKED_ASSET_SIMPLE_FBX_NAME;
+            } else if (relativeFilePath.endsWith(".js", Qt::CaseInsensitive)) {
+                relativeFilePath = BAKED_ASSET_SIMPLE_JS_NAME;
+            } else if (!originalAssetPath.endsWith(".fbx", Qt::CaseInsensitive)) {
+                relativeFilePath = BAKED_ASSET_SIMPLE_TEXTURE_NAME;
+            }
+
+            QString bakeMapping = getBakeMapping(originalAssetHash, relativeFilePath);
+
+            // add a mapping (under the hidden baked folder) for this file resulting from the bake
+            if (setMapping(bakeMapping, bakedFileHash)) {
+                qDebug() << "Added" << bakeMapping << "for bake file" << bakedFileHash << "from bake of" << originalAssetHash;
+            } else {
+                qDebug() << "Failed to set mapping";
+                // stop handling this bake, couldn't add a mapping for this bake file
+                errorCompletingBake = true;
+                errorReason = "Failed to finalize bake";
+                break;
+            }
+        } else {
+            qDebug() << "Failed to open baked file: " << filePath;
+            // stop handling this bake, we couldn't open one of the files for reading
+            errorCompletingBake = true;
+            errorReason = "Failed to finalize bake";
+            break;
+        }
+    }
+
+    for (auto& filePath : bakedFilePaths) {
+        QFile file(filePath);
+        if (!file.remove()) {
+            qWarning() << "Failed to remove temporary file:" << filePath;
+        }
+    }
+    if (!QDir(bakedTempOutputDir).rmdir(".")) {
+        qWarning() << "Failed to remove temporary directory:" << bakedTempOutputDir;
+    }
+
+    if (!errorCompletingBake) {
+        // create the meta file to store which version of the baking process we just completed
+        writeMetaFile(originalAssetHash);
+    } else {
+        qWarning() << "Could not complete bake for" << originalAssetHash;
+        AssetMeta meta;
+        meta.failedLastBake = true;
+        meta.lastBakeErrors = errorReason;
+        writeMetaFile(originalAssetHash, meta);
+    }
+
+    _pendingBakes.remove(originalAssetHash);
+}
+
+void AssetServer::handleAbortedBake(QString originalAssetHash, QString assetPath) {
+    // for an aborted bake we don't do anything but remove the BakeAssetTask from our pending bakes
+    _pendingBakes.remove(originalAssetHash);
+}
+
+static const QString BAKE_VERSION_KEY = "bake_version";
+static const QString FAILED_LAST_BAKE_KEY = "failed_last_bake";
+static const QString LAST_BAKE_ERRORS_KEY = "last_bake_errors";
+
+std::pair<bool, AssetMeta> AssetServer::readMetaFile(AssetHash hash) {
+    auto metaFilePath = HIDDEN_BAKED_CONTENT_FOLDER + hash + "/" + "meta.json";
+
+    auto it = _fileMappings.find(metaFilePath);
+    if (it == _fileMappings.end()) {
+        return { false, {} };
+    }
+
+    auto metaFileHash = it->second;
+
+    QFile metaFile(_filesDirectory.absoluteFilePath(metaFileHash));
+
+    if (metaFile.open(QIODevice::ReadOnly)) {
+        auto data = metaFile.readAll();
+        metaFile.close();
+
+        QJsonParseError error;
+        auto doc = QJsonDocument::fromJson(data, &error);
+
+        if (error.error == QJsonParseError::NoError && doc.isObject()) {
+            auto root = doc.object();
+
+            auto bakeVersion = root[BAKE_VERSION_KEY].toInt(-1);
+            auto failedLastBake = root[FAILED_LAST_BAKE_KEY];
+            auto lastBakeErrors = root[LAST_BAKE_ERRORS_KEY];
+
+            if (bakeVersion != -1
+                && failedLastBake.isBool()
+                && lastBakeErrors.isString()) {
+
+                AssetMeta meta;
+                meta.bakeVersion = bakeVersion;
+                meta.failedLastBake = failedLastBake.toBool();
+                meta.lastBakeErrors = lastBakeErrors.toString();
+
+                return { true, meta };
+            } else {
+                qCWarning(asset_server) << "Metafile for" << hash << "has either missing or malformed data.";
+            }
+        }
+    }
+
+    return { false, {} };
+}
+
+bool AssetServer::writeMetaFile(AssetHash originalAssetHash, const AssetMeta& meta) {
+    // construct the JSON that will be in the meta file
+    QJsonObject metaFileObject;
+
+    metaFileObject[BAKE_VERSION_KEY] = meta.bakeVersion;
+    metaFileObject[FAILED_LAST_BAKE_KEY] = meta.failedLastBake;
+    metaFileObject[LAST_BAKE_ERRORS_KEY] = meta.lastBakeErrors;
+
+    QJsonDocument metaFileDoc;
+    metaFileDoc.setObject(metaFileObject);
+
+    auto metaFileJSON = metaFileDoc.toJson();
+
+    // get a hash for the contents of the meta-file
+    AssetHash metaFileHash = QCryptographicHash::hash(metaFileJSON, QCryptographicHash::Sha256).toHex();
+
+    // create the meta file in our files folder, named by the hash of its contents
+    QFile metaFile(_filesDirectory.absoluteFilePath(metaFileHash));
+
+    if (metaFile.open(QIODevice::WriteOnly)) {
+        metaFile.write(metaFileJSON);
+        metaFile.close();
+
+        // add a mapping to the meta file so it doesn't get deleted because it is unmapped
+        auto metaFileMapping = HIDDEN_BAKED_CONTENT_FOLDER + originalAssetHash + "/" + "meta.json";
+
+        return setMapping(metaFileMapping, metaFileHash);
+    } else {
+        return false;
+    }
+}
+
+bool AssetServer::setBakingEnabled(const AssetPathList& paths, bool enabled) {
+    for (const auto& path : paths) {
+        auto it = _fileMappings.find(path);
+        if (it != _fileMappings.end()) {
+            auto hash = it->second;
+
+            auto dotIndex = path.lastIndexOf(".");
+            if (dotIndex == -1) {
+                continue;
+            }
+
+            auto extension = path.mid(dotIndex + 1);
+
+            QString bakedFilename;
+    
+            if (BAKEABLE_MODEL_EXTENSIONS.contains(extension)) {
+                bakedFilename = BAKED_MODEL_SIMPLE_NAME;
+            } else if (BAKEABLE_TEXTURE_EXTENSIONS.contains(extension.toLocal8Bit()) && hasMetaFile(hash)) {
+                bakedFilename = BAKED_TEXTURE_SIMPLE_NAME;
+            } else if (BAKEABLE_SCRIPT_EXTENSIONS.contains(extension)) {
+                bakedFilename = BAKED_SCRIPT_SIMPLE_NAME;
+            } else {
+                continue;
+            }
+
+            auto bakedMapping = getBakeMapping(hash, bakedFilename);
+
+            auto it = _fileMappings.find(bakedMapping);
+            bool currentlyDisabled = (it != _fileMappings.end() && it->second == hash);
+
+            if (enabled && currentlyDisabled) {
+                QStringList bakedMappings{ bakedMapping };
+                deleteMappings(bakedMappings);
+                maybeBake(path, hash);
+                qDebug() << "Enabled baking for" << path;
+            } else if (!enabled && !currentlyDisabled) {
+                removeBakedPathsForDeletedAsset(hash);
+                setMapping(bakedMapping, hash);
+                qDebug() << "Disabled baking for" << path;
+            }
+        }
+    }
+    return true;
+}
diff --git a/assignment-client/src/assets/AssetServer.h b/assignment-client/src/assets/AssetServer.h
index 132fb51433..e6393e6a98 100644
--- a/assignment-client/src/assets/AssetServer.h
+++ b/assignment-client/src/assets/AssetServer.h
@@ -14,17 +14,39 @@
 
 #include <QtCore/QDir>
 #include <QtCore/QThreadPool>
+#include <QRunnable>
 
 #include <ThreadedAssignment.h>
 
 #include "AssetUtils.h"
 #include "ReceivedMessage.h"
 
+
+namespace std {
+    template <>
+    struct hash<QString> {
+        size_t operator()(const QString& v) const { return qHash(v); }
+    };
+}
+
+struct AssetMeta {
+    AssetMeta() {
+    }
+
+    int bakeVersion { 0 };
+    bool failedLastBake { false };
+    QString lastBakeErrors;
+};
+
+class BakeAssetTask;
+
 class AssetServer : public ThreadedAssignment {
     Q_OBJECT
 public:
     AssetServer(ReceivedMessage& message);
 
+    void aboutToFinish() override;
+
 public slots:
     void run() override;
 
@@ -39,13 +61,14 @@ private slots:
     void sendStatsPacket() override;
 
 private:
-    using Mappings = QVariantHash;
+    using Mappings = std::unordered_map<QString, QString>;
 
     void handleGetMappingOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacketList& replyPacket);
     void handleGetAllMappingOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacketList& replyPacket);
     void handleSetMappingOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacketList& replyPacket);
     void handleDeleteMappingsOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacketList& replyPacket);
     void handleRenameMappingOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacketList& replyPacket);
+    void handleSetBakingEnabledOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacketList& replyPacket);
 
     // Mapping file operations must be called from main assignment thread only
     bool loadMappingsFromFile();
@@ -55,19 +78,57 @@ private:
     bool setMapping(AssetPath path, AssetHash hash);
 
     /// Delete mapping `path`. Returns `true` if deletion of mappings succeeds, else `false`.
-    bool deleteMappings(AssetPathList& paths);
+    bool deleteMappings(const AssetPathList& paths);
 
     /// Rename mapping from `oldPath` to `newPath`. Returns true if successful
     bool renameMapping(AssetPath oldPath, AssetPath newPath);
 
-    // deletes any unmapped files from the local asset directory
+    bool setBakingEnabled(const AssetPathList& paths, bool enabled);
+
+    /// Delete any unmapped files from the local asset directory
     void cleanupUnmappedFiles();
 
+    QString getPathToAssetHash(const AssetHash& assetHash);
+
+    std::pair<BakingStatus, QString> getAssetStatus(const AssetPath& path, const AssetHash& hash);
+
+    void bakeAssets();
+    void maybeBake(const AssetPath& path, const AssetHash& hash);
+    void createEmptyMetaFile(const AssetHash& hash);
+    bool hasMetaFile(const AssetHash& hash);
+    bool needsToBeBaked(const AssetPath& path, const AssetHash& assetHash);
+    void bakeAsset(const AssetHash& assetHash, const AssetPath& assetPath, const QString& filePath);
+
+    /// Move baked content for asset to baked directory and update baked status
+    void handleCompletedBake(QString originalAssetHash, QString assetPath, QString bakedTempOutputDir,
+                             QVector<QString> bakedFilePaths);
+    void handleFailedBake(QString originalAssetHash, QString assetPath, QString errors);
+    void handleAbortedBake(QString originalAssetHash, QString assetPath);
+
+    /// Create meta file to describe baked content for original asset
+    std::pair<bool, AssetMeta> readMetaFile(AssetHash hash);
+    bool writeMetaFile(AssetHash originalAssetHash, const AssetMeta& meta = AssetMeta());
+
+    /// Remove baked paths when the original asset is deleteds
+    void removeBakedPathsForDeletedAsset(AssetHash originalAssetHash);
+
     Mappings _fileMappings;
 
     QDir _resourcesDirectory;
     QDir _filesDirectory;
-    QThreadPool _taskPool;
+
+    /// Task pool for handling uploads and downloads of assets
+    QThreadPool _transferTaskPool;
+
+    QHash<AssetHash, std::shared_ptr<BakeAssetTask>> _pendingBakes;
+    QThreadPool _bakingTaskPool;
+
+    bool _wasColorTextureCompressionEnabled { false };
+    bool _wasGrayscaleTextureCompressionEnabled { false  };
+    bool _wasNormalTextureCompressionEnabled { false };
+    bool _wasCubeTextureCompressionEnabled { false };
+
+    uint64_t _filesizeLimit;
 };
 
 #endif
diff --git a/assignment-client/src/assets/AssetServerLogging.cpp b/assignment-client/src/assets/AssetServerLogging.cpp
new file mode 100644
index 0000000000..39a02107ea
--- /dev/null
+++ b/assignment-client/src/assets/AssetServerLogging.cpp
@@ -0,0 +1,14 @@
+//
+//  AssetServerLogging.cpp
+//  assignment-client/src/assets
+//
+//  Created by Clement Brisset on 8/9/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include "AssetServerLogging.h"
+
+Q_LOGGING_CATEGORY(asset_server, "hifi.asset-server")
diff --git a/assignment-client/src/assets/AssetServerLogging.h b/assignment-client/src/assets/AssetServerLogging.h
new file mode 100644
index 0000000000..986e01ecc5
--- /dev/null
+++ b/assignment-client/src/assets/AssetServerLogging.h
@@ -0,0 +1,19 @@
+//
+//  AssetServerLogging.h
+//  assignment-client/src/assets
+//
+//  Created by Clement Brisset on 8/9/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_AssetServerLogging_h
+#define hifi_AssetServerLogging_h
+
+#include <QLoggingCategory>
+
+Q_DECLARE_LOGGING_CATEGORY(asset_server)
+
+#endif // hifi_AssetServerLogging_h
diff --git a/assignment-client/src/assets/BakeAssetTask.cpp b/assignment-client/src/assets/BakeAssetTask.cpp
new file mode 100644
index 0000000000..6c78d2baf3
--- /dev/null
+++ b/assignment-client/src/assets/BakeAssetTask.cpp
@@ -0,0 +1,107 @@
+//
+//  BakeAssetTask.cpp
+//  assignment-client/src/assets
+//
+//  Created by Stephen Birarda on 9/18/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include "BakeAssetTask.h"
+
+#include <QtCore/QThread>
+
+#include <FBXBaker.h>
+#include <PathUtils.h>
+#include <JSBaker.h>
+
+BakeAssetTask::BakeAssetTask(const AssetHash& assetHash, const AssetPath& assetPath, const QString& filePath) :
+    _assetHash(assetHash),
+    _assetPath(assetPath),
+    _filePath(filePath)
+{
+
+}
+
+void cleanupTempFiles(QString tempOutputDir, std::vector<QString> files) {
+    for (const auto& filename : files) {
+        QFile f { filename };
+        if (!f.remove()) {
+            qDebug() << "Failed to remove:" << filename;
+        }
+    }
+    if (!tempOutputDir.isEmpty()) {
+        QDir dir { tempOutputDir };
+        if (!dir.rmdir(".")) {
+            qDebug() << "Failed to remove temporary directory:" << tempOutputDir;
+        }
+    }
+};
+
+void BakeAssetTask::run() {
+    _isBaking.store(true);
+
+    qRegisterMetaType<QVector<QString> >("QVector<QString>");
+    TextureBakerThreadGetter fn = []() -> QThread* { return QThread::currentThread();  };
+
+    QString tempOutputDir;
+
+    if (_assetPath.endsWith(".fbx")) {
+        tempOutputDir = PathUtils::generateTemporaryDir();
+        _baker = std::unique_ptr<FBXBaker> {
+            new FBXBaker(QUrl("file:///" + _filePath), fn, tempOutputDir)
+        };
+    } else if (_assetPath.endsWith(".js", Qt::CaseInsensitive)) {
+        _baker = std::unique_ptr<JSBaker>{
+            new JSBaker(QUrl("file:///" + _filePath), PathUtils::generateTemporaryDir())
+        };
+    } else {
+        tempOutputDir = PathUtils::generateTemporaryDir();
+        _baker = std::unique_ptr<TextureBaker> {
+            new TextureBaker(QUrl("file:///" + _filePath), image::TextureUsage::CUBE_TEXTURE,
+                             tempOutputDir)
+        };
+    }
+
+    QEventLoop loop;
+    connect(_baker.get(), &Baker::finished, &loop, &QEventLoop::quit);
+    connect(_baker.get(), &Baker::aborted, &loop, &QEventLoop::quit);
+    QMetaObject::invokeMethod(_baker.get(), "bake", Qt::QueuedConnection);
+    loop.exec();
+
+    if (_baker->wasAborted()) {
+        qDebug() << "Aborted baking: " << _assetHash << _assetPath;
+
+        _wasAborted.store(true);
+
+        cleanupTempFiles(tempOutputDir, _baker->getOutputFiles());
+
+        emit bakeAborted(_assetHash, _assetPath);
+    } else if (_baker->hasErrors()) {
+        qDebug() << "Failed to bake: " << _assetHash << _assetPath << _baker->getErrors();
+
+        auto errors = _baker->getErrors().join('\n'); // Join error list into a single string for convenience
+
+        _didFinish.store(true);
+
+        cleanupTempFiles(tempOutputDir, _baker->getOutputFiles());
+
+        emit bakeFailed(_assetHash, _assetPath, errors);
+    } else {
+        auto vectorOutputFiles = QVector<QString>::fromStdVector(_baker->getOutputFiles());
+
+        qDebug() << "Finished baking: " << _assetHash << _assetPath << vectorOutputFiles;
+
+        _didFinish.store(true);
+
+        emit bakeComplete(_assetHash, _assetPath, tempOutputDir, vectorOutputFiles);
+    }
+}
+
+void BakeAssetTask::abort() {
+    if (_baker) {
+        _baker->abort();
+    }
+}
diff --git a/assignment-client/src/assets/BakeAssetTask.h b/assignment-client/src/assets/BakeAssetTask.h
new file mode 100644
index 0000000000..90458ac223
--- /dev/null
+++ b/assignment-client/src/assets/BakeAssetTask.h
@@ -0,0 +1,52 @@
+//
+//  BakeAssetTask.h
+//  assignment-client/src/assets
+//
+//  Created by Stephen Birarda on 9/18/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_BakeAssetTask_h
+#define hifi_BakeAssetTask_h
+
+#include <memory>
+
+#include <QtCore/QDebug>
+#include <QtCore/QObject>
+#include <QtCore/QRunnable>
+
+#include <AssetUtils.h>
+#include <Baker.h>
+
+class BakeAssetTask : public QObject, public QRunnable {
+    Q_OBJECT
+public:
+    BakeAssetTask(const AssetHash& assetHash, const AssetPath& assetPath, const QString& filePath);
+
+    bool isBaking() { return _isBaking.load(); }
+
+    void run() override;
+
+    void abort();
+    bool wasAborted() const { return _wasAborted.load(); }
+    bool didFinish() const { return _didFinish.load(); }
+
+signals:
+    void bakeComplete(QString assetHash, QString assetPath, QString tempOutputDir, QVector<QString> outputFiles);
+    void bakeFailed(QString assetHash, QString assetPath, QString errors);
+    void bakeAborted(QString assetHash, QString assetPath);
+    
+private:
+    std::atomic<bool> _isBaking { false };
+    AssetHash _assetHash;
+    AssetPath _assetPath;
+    QString _filePath;
+    std::unique_ptr<Baker> _baker;
+    std::atomic<bool> _wasAborted { false };
+    std::atomic<bool> _didFinish { false };
+};
+
+#endif // hifi_BakeAssetTask_h
diff --git a/assignment-client/src/assets/UploadAssetTask.cpp b/assignment-client/src/assets/UploadAssetTask.cpp
index 7e8e94c34d..5e6d59d032 100644
--- a/assignment-client/src/assets/UploadAssetTask.cpp
+++ b/assignment-client/src/assets/UploadAssetTask.cpp
@@ -22,10 +22,11 @@
 
 
 UploadAssetTask::UploadAssetTask(QSharedPointer<ReceivedMessage> receivedMessage, SharedNodePointer senderNode,
-                                 const QDir& resourcesDir) :
+                                 const QDir& resourcesDir, uint64_t filesizeLimit) :
     _receivedMessage(receivedMessage),
     _senderNode(senderNode),
-    _resourcesDir(resourcesDir)
+    _resourcesDir(resourcesDir),
+    _filesizeLimit(filesizeLimit)
 {
     
 }
@@ -48,7 +49,7 @@ void UploadAssetTask::run() {
     auto replyPacket = NLPacket::create(PacketType::AssetUploadReply, -1, true);
     replyPacket->writePrimitive(messageID);
     
-    if (fileSize > MAX_UPLOAD_SIZE) {
+    if (fileSize > _filesizeLimit) {
         replyPacket->writePrimitive(AssetServerError::AssetTooLarge);
     } else {
         QByteArray fileData = buffer.read(fileSize);
diff --git a/assignment-client/src/assets/UploadAssetTask.h b/assignment-client/src/assets/UploadAssetTask.h
index 700eecbf9a..8c9e0d234a 100644
--- a/assignment-client/src/assets/UploadAssetTask.h
+++ b/assignment-client/src/assets/UploadAssetTask.h
@@ -26,7 +26,8 @@ class Node;
 
 class UploadAssetTask : public QRunnable {
 public:
-    UploadAssetTask(QSharedPointer<ReceivedMessage> message, QSharedPointer<Node> senderNode, const QDir& resourcesDir);
+    UploadAssetTask(QSharedPointer<ReceivedMessage> message, QSharedPointer<Node> senderNode, 
+                    const QDir& resourcesDir, uint64_t filesizeLimit);
 
     void run() override;
 
@@ -34,6 +35,7 @@ private:
     QSharedPointer<ReceivedMessage> _receivedMessage;
     QSharedPointer<Node> _senderNode;
     QDir _resourcesDir;
+    uint64_t _filesizeLimit;
 };
 
 #endif // hifi_UploadAssetTask_h
diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp
index 93b9b10eb7..9ed6c7fdbc 100644
--- a/assignment-client/src/audio/AudioMixer.cpp
+++ b/assignment-client/src/audio/AudioMixer.cpp
@@ -127,7 +127,7 @@ void AudioMixer::queueReplicatedAudioPacket(QSharedPointer<ReceivedMessage> mess
     // construct a "fake" audio received message from the byte array and packet list information
     auto audioData = message->getMessage().mid(NUM_BYTES_RFC4122_UUID);
 
-    PacketType rewrittenType = REPLICATED_PACKET_MAPPING.key(message->getType());
+    PacketType rewrittenType = PacketTypeEnum::getReplicatedPacketMapping().key(message->getType());
 
     if (rewrittenType == PacketType::Unknown) {
         qDebug() << "Cannot unwrap replicated packet type not present in REPLICATED_PACKET_WRAPPING";
diff --git a/assignment-client/src/audio/AudioMixerClientData.cpp b/assignment-client/src/audio/AudioMixerClientData.cpp
index 408ddf038c..9bba9c7f30 100644
--- a/assignment-client/src/audio/AudioMixerClientData.cpp
+++ b/assignment-client/src/audio/AudioMixerClientData.cpp
@@ -125,11 +125,11 @@ void AudioMixerClientData::optionallyReplicatePacket(ReceivedMessage& message, c
         // now make sure it's a packet type that we want to replicate
 
         // first check if it is an original type that we should replicate
-        PacketType mirroredType = REPLICATED_PACKET_MAPPING.value(message.getType());
+        PacketType mirroredType = PacketTypeEnum::getReplicatedPacketMapping().value(message.getType());
 
         if (mirroredType == PacketType::Unknown) {
             // if it wasn't check if it is a replicated type that we should re-replicate
-            if (REPLICATED_PACKET_MAPPING.key(message.getType()) != PacketType::Unknown) {
+            if (PacketTypeEnum::getReplicatedPacketMapping().key(message.getType()) != PacketType::Unknown) {
                 mirroredType = message.getType();
             } else {
                 qDebug() << "Packet passed to optionallyReplicatePacket was not a replicatable type - returning";
diff --git a/assignment-client/src/audio/AudioMixerSlave.cpp b/assignment-client/src/audio/AudioMixerSlave.cpp
index ed63bbc298..a131e266d2 100644
--- a/assignment-client/src/audio/AudioMixerSlave.cpp
+++ b/assignment-client/src/audio/AudioMixerSlave.cpp
@@ -558,7 +558,7 @@ float computeAzimuth(const AvatarAudioStream& listeningNodeStream, const Positio
         
         // 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 {   
diff --git a/assignment-client/src/audio/AudioMixerSlavePool.cpp b/assignment-client/src/audio/AudioMixerSlavePool.cpp
index 643361ac5d..e28c96e259 100644
--- a/assignment-client/src/audio/AudioMixerSlavePool.cpp
+++ b/assignment-client/src/audio/AudioMixerSlavePool.cpp
@@ -76,7 +76,7 @@ void AudioMixerSlavePool::processPackets(ConstIter begin, ConstIter end) {
 
 void AudioMixerSlavePool::mix(ConstIter begin, ConstIter end, unsigned int frame, float throttlingRatio) {
     _function = &AudioMixerSlave::mix;
-    _configure = [&](AudioMixerSlave& slave) {
+    _configure = [=](AudioMixerSlave& slave) {
         slave.configureMix(_begin, _end, _frame, _throttlingRatio);
     };
     _frame = frame;
@@ -97,7 +97,11 @@ void AudioMixerSlavePool::run(ConstIter begin, ConstIter end) {
 #else
     // fill the queue
     std::for_each(_begin, _end, [&](const SharedNodePointer& node) {
+#if defined(__clang__) && defined(Q_OS_LINUX)
+        _queue.push(node);
+#else
         _queue.emplace(node);
+#endif
     });
 
     {
diff --git a/assignment-client/src/avatars/AvatarMixer.cpp b/assignment-client/src/avatars/AvatarMixer.cpp
index f218daed03..c67e998dd4 100644
--- a/assignment-client/src/avatars/AvatarMixer.cpp
+++ b/assignment-client/src/avatars/AvatarMixer.cpp
@@ -85,7 +85,22 @@ void AvatarMixer::handleReplicatedPacket(QSharedPointer<ReceivedMessage> message
     auto nodeList = DependencyManager::get<NodeList>();
     auto nodeID = QUuid::fromRfc4122(message->peek(NUM_BYTES_RFC4122_UUID));
 
-    auto replicatedNode = addOrUpdateReplicatedNode(nodeID, message->getSenderSockAddr());
+    SharedNodePointer replicatedNode;
+
+    if (message->getType() == PacketType::ReplicatedKillAvatar) {
+        // this is a kill packet, which we should only process if we already have the node in our list
+        // since it of course does not make sense to add a node just to remove it an instant later
+        replicatedNode = nodeList->nodeWithUUID(nodeID);
+
+        if (!replicatedNode) {
+            return;
+        }
+    } else {
+        replicatedNode = addOrUpdateReplicatedNode(nodeID, message->getSenderSockAddr());
+    }
+
+    // we better have a node to work with at this point
+    assert(replicatedNode);
 
     if (message->getType() == PacketType::ReplicatedAvatarIdentity) {
         handleAvatarIdentityPacket(message, replicatedNode);
@@ -129,10 +144,10 @@ void AvatarMixer::optionallyReplicatePacket(ReceivedMessage& message, const Node
         // check if this is a packet type we replicate
         // which means it must be a packet type present in REPLICATED_PACKET_MAPPING or must be the
         // replicated version of one of those packet types
-        PacketType replicatedType = REPLICATED_PACKET_MAPPING.value(message.getType());
+        PacketType replicatedType = PacketTypeEnum::getReplicatedPacketMapping().value(message.getType());
 
         if (replicatedType == PacketType::Unknown) {
-            if (REPLICATED_PACKET_MAPPING.key(message.getType()) != PacketType::Unknown) {
+            if (PacketTypeEnum::getReplicatedPacketMapping().key(message.getType()) != PacketType::Unknown) {
                 replicatedType = message.getType();
             } else {
                 qDebug() << __FUNCTION__ << "called without replicatable packet type - returning";
@@ -285,6 +300,13 @@ void AvatarMixer::start() {
 // is guaranteed to not be accessed by other thread
 void AvatarMixer::manageIdentityData(const SharedNodePointer& node) {
     AvatarMixerClientData* nodeData = reinterpret_cast<AvatarMixerClientData*>(node->getLinkedData());
+
+    // there is no need to manage identity data we haven't received yet
+    // so bail early if we've never received an identity packet for this avatar
+    if (!nodeData || !nodeData->getAvatar().hasProcessedFirstIdentity()) {
+        return;
+    }
+
     bool sendIdentity = false;
     if (nodeData && nodeData->getAvatarSessionDisplayNameMustChange()) {
         AvatarData& avatar = nodeData->getAvatar();
diff --git a/assignment-client/src/avatars/AvatarMixerClientData.cpp b/assignment-client/src/avatars/AvatarMixerClientData.cpp
index 4d80bc7d17..a4bf8fa253 100644
--- a/assignment-client/src/avatars/AvatarMixerClientData.cpp
+++ b/assignment-client/src/avatars/AvatarMixerClientData.cpp
@@ -108,9 +108,6 @@ void AvatarMixerClientData::ignoreOther(SharedNodePointer self, SharedNodePointe
 void AvatarMixerClientData::removeFromRadiusIgnoringSet(SharedNodePointer self, const QUuid& other) {
     if (isRadiusIgnoring(other)) {
         _radiusIgnoredOthers.erase(other);
-        auto exitingSpaceBubblePacket = NLPacket::create(PacketType::ExitingSpaceBubble, NUM_BYTES_RFC4122_UUID);
-        exitingSpaceBubblePacket->write(other.toRfc4122());
-        DependencyManager::get<NodeList>()->sendUnreliablePacket(*exitingSpaceBubblePacket, *self);
     }
 }
 
diff --git a/assignment-client/src/avatars/AvatarMixerSlave.cpp b/assignment-client/src/avatars/AvatarMixerSlave.cpp
index 4ff447a95a..5d36a6d261 100644
--- a/assignment-client/src/avatars/AvatarMixerSlave.cpp
+++ b/assignment-client/src/avatars/AvatarMixerSlave.cpp
@@ -170,9 +170,9 @@ void AvatarMixerSlave::broadcastAvatarDataToAgent(const SharedNodePointer& node)
     auto avatarPacketList = NLPacketList::create(PacketType::BulkAvatarData);
 
     // Define the minimum bubble size
-    static const glm::vec3 minBubbleSize = glm::vec3(0.3f, 1.3f, 0.3f);
+    static const glm::vec3 minBubbleSize = avatar.getSensorToWorldScale() * glm::vec3(0.3f, 1.3f, 0.3f);
     // Define the scale of the box for the current node
-    glm::vec3 nodeBoxScale = (nodeData->getPosition() - nodeData->getGlobalBoundingBoxCorner()) * 2.0f;
+    glm::vec3 nodeBoxScale = (nodeData->getPosition() - nodeData->getGlobalBoundingBoxCorner()) * 2.0f * avatar.getSensorToWorldScale();
     // Set up the bounding box for the current node
     AABox nodeBox(nodeData->getGlobalBoundingBoxCorner(), nodeBoxScale);
     // Clamp the size of the bounding box to a minimum scale
@@ -209,7 +209,7 @@ void AvatarMixerSlave::broadcastAvatarDataToAgent(const SharedNodePointer& node)
         assert(avatarNode); // we can't have gotten here without the avatarData being a valid key in the map
         return nodeData->getLastBroadcastTime(avatarNode->getUUID());
     }, [&](AvatarSharedPointer avatar)->float{
-        glm::vec3 nodeBoxHalfScale = (avatar->getPosition() - avatar->getGlobalBoundingBoxCorner());
+        glm::vec3 nodeBoxHalfScale = (avatar->getPosition() - avatar->getGlobalBoundingBoxCorner() * avatar->getSensorToWorldScale());
         return glm::max(nodeBoxHalfScale.x, glm::max(nodeBoxHalfScale.y, nodeBoxHalfScale.z));
     }, [&](AvatarSharedPointer avatar)->bool {
         if (avatar == thisAvatar) {
@@ -244,9 +244,9 @@ void AvatarMixerSlave::broadcastAvatarDataToAgent(const SharedNodePointer& node)
             // Check to see if the space bubble is enabled
             // Don't bother with these checks if the other avatar has their bubble enabled and we're gettingAnyIgnored
             if (node->isIgnoreRadiusEnabled() || (avatarNode->isIgnoreRadiusEnabled() && !getsAnyIgnored)) {
-
+                float sensorToWorldScale = avatarNodeData->getAvatarSharedPointer()->getSensorToWorldScale();
                 // Define the scale of the box for the current other node
-                glm::vec3 otherNodeBoxScale = (avatarNodeData->getPosition() - avatarNodeData->getGlobalBoundingBoxCorner()) * 2.0f;
+                glm::vec3 otherNodeBoxScale = (avatarNodeData->getPosition() - avatarNodeData->getGlobalBoundingBoxCorner()) * 2.0f * sensorToWorldScale;
                 // Set up the bounding box for the current other node
                 AABox otherNodeBox(avatarNodeData->getGlobalBoundingBoxCorner(), otherNodeBoxScale);
                 // Clamp the size of the bounding box to a minimum scale
@@ -320,18 +320,23 @@ void AvatarMixerSlave::broadcastAvatarDataToAgent(const SharedNodePointer& node)
         ++numOtherAvatars;
 
         const AvatarMixerClientData* otherNodeData = reinterpret_cast<const AvatarMixerClientData*>(otherNode->getLinkedData());
+        const AvatarData* otherAvatar = otherNodeData->getConstAvatarData();
 
         // If the time that the mixer sent AVATAR DATA about Avatar B to Avatar A is BEFORE OR EQUAL TO
         // the time that Avatar B flagged an IDENTITY DATA change, send IDENTITY DATA about Avatar B to Avatar A.
-        if (nodeData->getLastBroadcastTime(otherNode->getUUID()) <= otherNodeData->getIdentityChangeTimestamp()) {
+        if (otherAvatar->hasProcessedFirstIdentity()
+            && nodeData->getLastBroadcastTime(otherNode->getUUID()) <= otherNodeData->getIdentityChangeTimestamp()) {
             identityBytesSent += sendIdentityPacket(otherNodeData, node);
+
+            // remember the last time we sent identity details about this other node to the receiver
+            nodeData->setLastBroadcastTime(otherNode->getUUID(), usecTimestampNow());
         }
 
-        const AvatarData* otherAvatar = otherNodeData->getConstAvatarData();
         glm::vec3 otherPosition = otherAvatar->getClientGlobalPosition();
 
+        
         // determine if avatar is in view, to determine how much data to include...
-        glm::vec3 otherNodeBoxScale = (otherPosition - otherNodeData->getGlobalBoundingBoxCorner()) * 2.0f;
+        glm::vec3 otherNodeBoxScale = (otherPosition - otherNodeData->getGlobalBoundingBoxCorner()) * 2.0f * otherAvatar->getSensorToWorldScale();
         AABox otherNodeBox(otherNodeData->getGlobalBoundingBoxCorner(), otherNodeBoxScale);
         bool isInView = nodeData->otherAvatarInView(otherNodeBox);
 
@@ -379,11 +384,11 @@ void AvatarMixerSlave::broadcastAvatarDataToAgent(const SharedNodePointer& node)
                 qCWarning(avatars) << "otherAvatar.toByteArray() without facial data resulted in very large buffer:" << bytes.size() << "... reduce to MinimumData";
                 bytes = otherAvatar->toByteArray(AvatarData::MinimumData, lastEncodeForOther, lastSentJointsForOther,
                                                  hasFlagsOut, dropFaceTracking, distanceAdjust, viewerPosition, &lastSentJointsForOther);
-            }
 
-            if (bytes.size() > MAX_ALLOWED_AVATAR_DATA) {
-                qCWarning(avatars) << "otherAvatar.toByteArray() MinimumData resulted in very large buffer:" << bytes.size() << "... FAIL!!";
-                includeThisAvatar = false;
+                if (bytes.size() > MAX_ALLOWED_AVATAR_DATA) {
+                    qCWarning(avatars) << "otherAvatar.toByteArray() MinimumData resulted in very large buffer:" << bytes.size() << "... FAIL!!";
+                    includeThisAvatar = false;
+                }
             }
         }
 
@@ -400,9 +405,6 @@ void AvatarMixerSlave::broadcastAvatarDataToAgent(const SharedNodePointer& node)
                 // set the last sent sequence number for this sender on the receiver
                 nodeData->setLastBroadcastSequenceNumber(otherNode->getUUID(),
                                                          otherNodeData->getLastReceivedSequenceNumber());
-
-                // remember the last time we sent details about this other node to the receiver
-                nodeData->setLastBroadcastTime(otherNode->getUUID(), start);
             }
         }
 
diff --git a/assignment-client/src/avatars/AvatarMixerSlavePool.cpp b/assignment-client/src/avatars/AvatarMixerSlavePool.cpp
index cb5ae7735a..25b88686b7 100644
--- a/assignment-client/src/avatars/AvatarMixerSlavePool.cpp
+++ b/assignment-client/src/avatars/AvatarMixerSlavePool.cpp
@@ -69,7 +69,7 @@ static AvatarMixerSlave slave;
 
 void AvatarMixerSlavePool::processIncomingPackets(ConstIter begin, ConstIter end) {
     _function = &AvatarMixerSlave::processIncomingPackets;
-    _configure = [&](AvatarMixerSlave& slave) { 
+    _configure = [=](AvatarMixerSlave& slave) { 
         slave.configure(begin, end);
     };
     run(begin, end);
@@ -79,7 +79,7 @@ void AvatarMixerSlavePool::broadcastAvatarData(ConstIter begin, ConstIter end,
                                                p_high_resolution_clock::time_point lastFrameTimestamp,
                                                float maxKbpsPerNode, float throttlingRatio) {
     _function = &AvatarMixerSlave::broadcastAvatarData;
-    _configure = [&](AvatarMixerSlave& slave) { 
+    _configure = [=](AvatarMixerSlave& slave) { 
         slave.configureBroadcast(begin, end, lastFrameTimestamp, maxKbpsPerNode, throttlingRatio);
    };
     run(begin, end);
@@ -97,7 +97,11 @@ void AvatarMixerSlavePool::run(ConstIter begin, ConstIter end) {
 #else
     // fill the queue
     std::for_each(_begin, _end, [&](const SharedNodePointer& node) {
+#if defined(__clang__) && defined(Q_OS_LINUX)
+        _queue.push(node);
+#else
         _queue.emplace(node);
+#endif
     });
 
     {
diff --git a/assignment-client/src/avatars/ScriptableAvatar.cpp b/assignment-client/src/avatars/ScriptableAvatar.cpp
index 57456b00c3..5060891284 100644
--- a/assignment-client/src/avatars/ScriptableAvatar.cpp
+++ b/assignment-client/src/avatars/ScriptableAvatar.cpp
@@ -13,12 +13,13 @@
 #include <QThread>
 #include <glm/gtx/transform.hpp>
 
+#include <shared/QtHelpers.h>
 #include <GLMHelpers.h>
 #include <AnimUtil.h>
 #include "ScriptableAvatar.h"
 
 
-QByteArray ScriptableAvatar::toByteArrayStateful(AvatarDataDetail dataDetail) {
+QByteArray ScriptableAvatar::toByteArrayStateful(AvatarDataDetail dataDetail, bool dropFaceTracking) {
     _globalPosition = getPosition();
     return AvatarData::toByteArrayStateful(dataDetail);
 }
@@ -34,7 +35,7 @@ void ScriptableAvatar::startAnimation(const QString& url, float fps, float prior
         return;
     }
     _animation = DependencyManager::get<AnimationCache>()->getAnimation(url);
-    _animationDetails = AnimationDetails("", QUrl(url), fps, 0, loop, hold, false, firstFrame, lastFrame, true, firstFrame);
+    _animationDetails = AnimationDetails("", QUrl(url), fps, 0, loop, hold, false, firstFrame, lastFrame, true, firstFrame, false);
     _maskedJoints = maskedJoints;
 }
 
@@ -49,7 +50,7 @@ void ScriptableAvatar::stopAnimation() {
 AnimationDetails ScriptableAvatar::getAnimationDetails() {
     if (QThread::currentThread() != thread()) {
         AnimationDetails result;
-        QMetaObject::invokeMethod(this, "getAnimationDetails", Qt::BlockingQueuedConnection,
+        BLOCKING_INVOKE_METHOD(this, "getAnimationDetails", 
                                   Q_RETURN_ARG(AnimationDetails, result));
         return result;
     }
diff --git a/assignment-client/src/avatars/ScriptableAvatar.h b/assignment-client/src/avatars/ScriptableAvatar.h
index 1028912e55..b1039b5ac0 100644
--- a/assignment-client/src/avatars/ScriptableAvatar.h
+++ b/assignment-client/src/avatars/ScriptableAvatar.h
@@ -28,7 +28,7 @@ public:
     Q_INVOKABLE AnimationDetails getAnimationDetails();
     virtual void setSkeletonModelURL(const QUrl& skeletonModelURL) override;
 
-    virtual QByteArray toByteArrayStateful(AvatarDataDetail dataDetail) override;
+    virtual QByteArray toByteArrayStateful(AvatarDataDetail dataDetail, bool dropFaceTracking = false) override;
 
     
 private slots:
diff --git a/assignment-client/src/entities/EntityPriorityQueue.cpp b/assignment-client/src/entities/EntityPriorityQueue.cpp
new file mode 100644
index 0000000000..999a05f2e2
--- /dev/null
+++ b/assignment-client/src/entities/EntityPriorityQueue.cpp
@@ -0,0 +1,53 @@
+//
+//  EntityPriorityQueue.cpp
+//  assignment-client/src/entities
+//
+//  Created by Andrew Meadows 2017.08.08
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include "EntityPriorityQueue.h"
+
+const float PrioritizedEntity::DO_NOT_SEND = -1.0e-6f;
+const float PrioritizedEntity::FORCE_REMOVE = -1.0e-5f;
+const float PrioritizedEntity::WHEN_IN_DOUBT_PRIORITY = 1.0f;
+
+void ConicalView::set(const ViewFrustum& viewFrustum) {
+    // The ConicalView has two parts: a central sphere (same as ViewFrustum) and a circular cone that bounds the frustum part.
+    // Why?  Because approximate intersection tests are much faster to compute for a cone than for a frustum.
+    _position = viewFrustum.getPosition();
+    _direction = viewFrustum.getDirection();
+
+    // We cache the sin and cos of the half angle of the cone that bounds the frustum.
+    // (the math here is left as an exercise for the reader)
+    float A = viewFrustum.getAspectRatio();
+    float t = tanf(0.5f * viewFrustum.getFieldOfView());
+    _cosAngle = 1.0f / sqrtf(1.0f + (A * A + 1.0f) * (t * t));
+    _sinAngle = sqrtf(1.0f - _cosAngle * _cosAngle);
+
+    _radius = viewFrustum.getCenterRadius();
+}
+
+float ConicalView::computePriority(const AACube& cube) const {
+    glm::vec3 p = cube.calcCenter() - _position; // position of bounding sphere in view-frame
+    float d = glm::length(p); // distance to center of bounding sphere
+    float r = 0.5f * cube.getScale(); // radius of bounding sphere
+    if (d < _radius + r) {
+        return r;
+    }
+    // We check the angle between the center of the cube and the _direction of the view.
+    // If it is less than the sum of the half-angle from center of cone to outer edge plus
+    // the half apparent angle of the bounding sphere then it is in view.
+    //
+    // The math here is left as an exercise for the reader with the following hints:
+    // (1) We actually check the dot product of the cube's local position rather than the angle and
+    // (2) we take advantage of this trig identity: cos(A+B) = cos(A)*cos(B) - sin(A)*sin(B)
+    if (glm::dot(p, _direction) > sqrtf(d * d - r * r) * _cosAngle - r * _sinAngle) {
+        const float AVOID_DIVIDE_BY_ZERO = 0.001f;
+        return r / (d + AVOID_DIVIDE_BY_ZERO);
+    }
+    return PrioritizedEntity::DO_NOT_SEND;
+}
diff --git a/assignment-client/src/entities/EntityPriorityQueue.h b/assignment-client/src/entities/EntityPriorityQueue.h
new file mode 100644
index 0000000000..e308d9b549
--- /dev/null
+++ b/assignment-client/src/entities/EntityPriorityQueue.h
@@ -0,0 +1,66 @@
+//
+//  EntityPriorityQueue.h
+//  assignment-client/src/entities
+//
+//  Created by Andrew Meadows 2017.08.08
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_EntityPriorityQueue_h
+#define hifi_EntityPriorityQueue_h
+
+#include <queue>
+
+#include <AACube.h>
+#include <EntityTreeElement.h>
+
+const float SQRT_TWO_OVER_TWO = 0.7071067811865f;
+const float DEFAULT_VIEW_RADIUS = 10.0f;
+
+// ConicalView is an approximation of a ViewFrustum for fast calculation of sort priority.
+class ConicalView {
+public:
+    ConicalView() {}
+    ConicalView(const ViewFrustum& viewFrustum) { set(viewFrustum); }
+    void set(const ViewFrustum& viewFrustum);
+    float computePriority(const AACube& cube) const;
+private:
+    glm::vec3 _position { 0.0f, 0.0f, 0.0f };
+    glm::vec3 _direction { 0.0f, 0.0f, 1.0f };
+    float _sinAngle { SQRT_TWO_OVER_TWO };
+    float _cosAngle { SQRT_TWO_OVER_TWO };
+    float _radius { DEFAULT_VIEW_RADIUS };
+};
+
+// PrioritizedEntity is a placeholder in a sorted queue.
+class PrioritizedEntity {
+public:
+    static const float DO_NOT_SEND;
+    static const float FORCE_REMOVE;
+    static const float WHEN_IN_DOUBT_PRIORITY;
+
+    PrioritizedEntity(EntityItemPointer entity, float priority, bool forceRemove = false) : _weakEntity(entity), _rawEntityPointer(entity.get()), _priority(priority), _forceRemove(forceRemove) {}
+    EntityItemPointer getEntity() const { return _weakEntity.lock(); }
+    EntityItem* getRawEntityPointer() const { return _rawEntityPointer; }
+    float getPriority() const { return _priority; }
+    bool shouldForceRemove() const { return _forceRemove; }
+
+    class Compare {
+    public:
+        bool operator() (const PrioritizedEntity& A, const PrioritizedEntity& B) { return A._priority < B._priority; }
+    };
+    friend class Compare;
+
+private:
+    EntityItemWeakPointer _weakEntity;
+    EntityItem* _rawEntityPointer;
+    float _priority;
+    bool _forceRemove;
+};
+
+using EntityPriorityQueue = std::priority_queue< PrioritizedEntity, std::vector<PrioritizedEntity>, PrioritizedEntity::Compare >;
+
+#endif // hifi_EntityPriorityQueue_h
diff --git a/assignment-client/src/entities/EntityServer.cpp b/assignment-client/src/entities/EntityServer.cpp
index ac686e2e0a..995a5bad27 100644
--- a/assignment-client/src/entities/EntityServer.cpp
+++ b/assignment-client/src/entities/EntityServer.cpp
@@ -16,6 +16,10 @@
 #include <ResourceCache.h>
 #include <ScriptCache.h>
 #include <EntityEditFilters.h>
+#include <NetworkingConstants.h>
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <AddressManager.h>
 
 #include "AssignmentParentFinder.h"
 #include "EntityNodeData.h"
@@ -29,15 +33,26 @@ const char* LOCAL_MODELS_PERSIST_FILE = "resources/models.svo";
 
 EntityServer::EntityServer(ReceivedMessage& message) :
     OctreeServer(message),
-    _entitySimulation(NULL)
+    _entitySimulation(NULL),
+    _dynamicDomainVerificationTimer(this)
 {
     DependencyManager::set<ResourceManager>();
     DependencyManager::set<ResourceCacheSharedItems>();
     DependencyManager::set<ScriptCache>();
 
     auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();
-    packetReceiver.registerListenerForTypes({ PacketType::EntityAdd, PacketType::EntityEdit, PacketType::EntityErase, PacketType::EntityPhysics },
-                                            this, "handleEntityPacket");
+    packetReceiver.registerListenerForTypes({ PacketType::EntityAdd,
+        PacketType::EntityEdit,
+        PacketType::EntityErase,
+        PacketType::EntityPhysics,
+        PacketType::ChallengeOwnership,
+        PacketType::ChallengeOwnershipRequest,
+        PacketType::ChallengeOwnershipReply },
+        this,
+        "handleEntityPacket");
+
+    connect(&_dynamicDomainVerificationTimer, &QTimer::timeout, this, &EntityServer::startDynamicDomainVerification);
+    _dynamicDomainVerificationTimer.setSingleShot(true);
 }
 
 EntityServer::~EntityServer() {
@@ -50,6 +65,12 @@ EntityServer::~EntityServer() {
     tree->removeNewlyCreatedHook(this);
 }
 
+void EntityServer::aboutToFinish() {
+    DependencyManager::get<ResourceManager>()->cleanup();
+
+    OctreeServer::aboutToFinish();
+}
+
 void EntityServer::handleEntityPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) {
     if (_octreeInboundPacketProcessor) {
         _octreeInboundPacketProcessor->queueReceivedPacket(message, senderNode);
@@ -87,6 +108,9 @@ void EntityServer::beforeRun() {
     connect(_pruneDeletedEntitiesTimer, SIGNAL(timeout()), this, SLOT(pruneDeletedEntities()));
     const int PRUNE_DELETED_MODELS_INTERVAL_MSECS = 1 * 1000; // once every second
     _pruneDeletedEntitiesTimer->start(PRUNE_DELETED_MODELS_INTERVAL_MSECS);
+
+    DomainHandler& domainHandler = DependencyManager::get<NodeList>()->getDomainHandler();
+    connect(&domainHandler, &DomainHandler::settingsReceiveFail, this, &EntityServer::domainSettingsRequestFailed);
 }
 
 void EntityServer::entityCreated(const EntityItem& newEntity, const SharedNodePointer& senderNode) {
@@ -290,6 +314,18 @@ void EntityServer::readAdditionalConfiguration(const QJsonObject& settingsSectio
         tree->setEntityMaxTmpLifetime(EntityTree::DEFAULT_MAX_TMP_ENTITY_LIFETIME);
     }
 
+    int minTime;
+    if (readOptionInt("dynamicDomainVerificationTimeMin", settingsSectionObject, minTime)) {
+        _MINIMUM_DYNAMIC_DOMAIN_VERIFICATION_TIMER_MS = minTime * 1000;
+    }
+
+    int maxTime;
+    if (readOptionInt("dynamicDomainVerificationTimeMax", settingsSectionObject, maxTime)) {
+        _MAXIMUM_DYNAMIC_DOMAIN_VERIFICATION_TIMER_MS = maxTime * 1000;
+    }
+
+    startDynamicDomainVerification();
+
     tree->setWantEditLogging(wantEditLogging);
     tree->setWantTerseEditLogging(wantTerseEditLogging);
 
@@ -404,3 +440,79 @@ QString EntityServer::serverSubclassStats() {
 
     return statsString;
 }
+
+void EntityServer::domainSettingsRequestFailed() {
+    auto nodeList = DependencyManager::get<NodeList>();
+    qCDebug(entities) << "The EntityServer couldn't get the Domain Settings. Starting dynamic domain verification with default values...";
+
+    _MINIMUM_DYNAMIC_DOMAIN_VERIFICATION_TIMER_MS = DEFAULT_MINIMUM_DYNAMIC_DOMAIN_VERIFICATION_TIMER_MS;
+    _MAXIMUM_DYNAMIC_DOMAIN_VERIFICATION_TIMER_MS = DEFAULT_MAXIMUM_DYNAMIC_DOMAIN_VERIFICATION_TIMER_MS;
+    startDynamicDomainVerification();
+}
+
+void EntityServer::startDynamicDomainVerification() {
+    qCDebug(entities) << "Starting Dynamic Domain Verification...";
+
+    QString thisDomainID = DependencyManager::get<AddressManager>()->getDomainId().remove(QRegExp("\\{|\\}"));
+
+    EntityTreePointer tree = std::static_pointer_cast<EntityTree>(_tree);
+    QHash<QString, EntityItemID> localMap(tree->getEntityCertificateIDMap());
+
+    QHashIterator<QString, EntityItemID> i(localMap);
+    qCDebug(entities) << localMap.size() << "entities in _entityCertificateIDMap";
+    while (i.hasNext()) {
+        i.next();
+
+        EntityItemPointer entity = tree->findEntityByEntityItemID(i.value());
+
+        if (entity) {
+            if (!entity->getProperties().verifyStaticCertificateProperties()) {
+                qCDebug(entities) << "During Dynamic Domain Verification, a certified entity with ID" << i.value() << "failed"
+                    << "static certificate verification.";
+                // Delete the entity if it doesn't pass static certificate verification
+                tree->deleteEntity(i.value(), true);
+            } else {
+
+                QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
+                QNetworkRequest networkRequest;
+                networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
+                networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
+                QUrl requestURL = NetworkingConstants::METAVERSE_SERVER_URL;
+                requestURL.setPath("/api/v1/commerce/proof_of_purchase_status/location");
+                QJsonObject request;
+                request["certificate_id"] = i.key();
+                networkRequest.setUrl(requestURL);
+
+                QNetworkReply* networkReply = NULL;
+                networkReply = networkAccessManager.put(networkRequest, QJsonDocument(request).toJson());
+
+                connect(networkReply, &QNetworkReply::finished, [=]() {
+                    QJsonObject jsonObject = QJsonDocument::fromJson(networkReply->readAll()).object();
+                    jsonObject = jsonObject["data"].toObject();
+
+                    if (networkReply->error() == QNetworkReply::NoError) {
+                        if (jsonObject["domain_id"].toString() != thisDomainID) {
+                            qCDebug(entities) << "Entity's cert's domain ID" << jsonObject["domain_id"].toString()
+                                << "doesn't match the current Domain ID" << thisDomainID << "; deleting entity" << i.value();
+                            tree->deleteEntity(i.value(), true);
+                        } else {
+                            qCDebug(entities) << "Entity passed dynamic domain verification:" << i.value();
+                        }
+                    } else {
+                        qCDebug(entities) << "Call to" << networkReply->url() << "failed with error" << networkReply->error() << "; deleting entity" << i.value()
+                            << "More info:" << jsonObject;
+                        tree->deleteEntity(i.value(), true);
+                    }
+
+                    networkReply->deleteLater();
+                });
+            }
+        } else {
+            qCWarning(entities) << "During DDV, an entity with ID" << i.value() << "was NOT found in the Entity Tree!";
+        }
+    }
+
+    int nextInterval = qrand() % ((_MAXIMUM_DYNAMIC_DOMAIN_VERIFICATION_TIMER_MS + 1) - _MINIMUM_DYNAMIC_DOMAIN_VERIFICATION_TIMER_MS) + _MINIMUM_DYNAMIC_DOMAIN_VERIFICATION_TIMER_MS;
+    qCDebug(entities) << "Restarting Dynamic Domain Verification timer for" << nextInterval / 1000 << "seconds";
+    _dynamicDomainVerificationTimer.start(nextInterval);
+}
diff --git a/assignment-client/src/entities/EntityServer.h b/assignment-client/src/entities/EntityServer.h
index 40676e79bd..05404b28c8 100644
--- a/assignment-client/src/entities/EntityServer.h
+++ b/assignment-client/src/entities/EntityServer.h
@@ -59,6 +59,8 @@ public:
     virtual void trackSend(const QUuid& dataID, quint64 dataLastEdited, const QUuid& sessionID) override;
     virtual void trackViewerGone(const QUuid& sessionID) override;
 
+    virtual void aboutToFinish() override;
+
 public slots:
     virtual void nodeAdded(SharedNodePointer node) override;
     virtual void nodeKilled(SharedNodePointer node) override;
@@ -71,6 +73,7 @@ protected:
 
 private slots:
     void handleEntityPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode);
+    void domainSettingsRequestFailed();
 
 private:
     SimpleEntitySimulationPointer _entitySimulation;
@@ -78,6 +81,13 @@ private:
 
     QReadWriteLock _viewerSendingStatsLock;
     QMap<QUuid, QMap<QUuid, ViewerSendingStats>> _viewerSendingStats;
+
+    static const int DEFAULT_MINIMUM_DYNAMIC_DOMAIN_VERIFICATION_TIMER_MS = 45 * 60 * 1000; // 45m
+    static const int DEFAULT_MAXIMUM_DYNAMIC_DOMAIN_VERIFICATION_TIMER_MS = 60 * 60 * 1000; // 1h
+    int _MINIMUM_DYNAMIC_DOMAIN_VERIFICATION_TIMER_MS = DEFAULT_MINIMUM_DYNAMIC_DOMAIN_VERIFICATION_TIMER_MS; // 45m
+    int _MAXIMUM_DYNAMIC_DOMAIN_VERIFICATION_TIMER_MS = DEFAULT_MAXIMUM_DYNAMIC_DOMAIN_VERIFICATION_TIMER_MS; // 1h
+    QTimer _dynamicDomainVerificationTimer;
+    void startDynamicDomainVerification();
 };
 
 #endif // hifi_EntityServer_h
diff --git a/assignment-client/src/entities/EntityTreeSendThread.cpp b/assignment-client/src/entities/EntityTreeSendThread.cpp
index 7febdc67e1..11e4d533fb 100644
--- a/assignment-client/src/entities/EntityTreeSendThread.cpp
+++ b/assignment-client/src/entities/EntityTreeSendThread.cpp
@@ -13,9 +13,18 @@
 
 #include <EntityNodeData.h>
 #include <EntityTypes.h>
+#include <OctreeUtils.h>
 
 #include "EntityServer.h"
 
+
+EntityTreeSendThread::EntityTreeSendThread(OctreeServer* myServer, const SharedNodePointer& node) :
+    OctreeSendThread(myServer, node)
+{
+    connect(std::static_pointer_cast<EntityTree>(myServer->getOctree()).get(), &EntityTree::editingEntityPointer, this, &EntityTreeSendThread::editingEntityPointer, Qt::QueuedConnection);
+    connect(std::static_pointer_cast<EntityTree>(myServer->getOctree()).get(), &EntityTree::deletingEntityPointer, this, &EntityTreeSendThread::deletingEntityPointer, Qt::QueuedConnection);
+}
+
 void EntityTreeSendThread::preDistributionProcessing() {
     auto node = _node.toStrongRef();
     auto nodeData = static_cast<EntityNodeData*>(node->getLinkedData());
@@ -80,6 +89,72 @@ void EntityTreeSendThread::preDistributionProcessing() {
     }
 }
 
+void EntityTreeSendThread::traverseTreeAndSendContents(SharedNodePointer node, OctreeQueryNode* nodeData,
+            bool viewFrustumChanged, bool isFullScene) {
+    if (viewFrustumChanged || _traversal.finished()) {
+        ViewFrustum viewFrustum;
+        nodeData->copyCurrentViewFrustum(viewFrustum);
+        EntityTreeElementPointer root = std::dynamic_pointer_cast<EntityTreeElement>(_myServer->getOctree()->getRoot());
+        int32_t lodLevelOffset = nodeData->getBoundaryLevelAdjust() + (viewFrustumChanged ? LOW_RES_MOVING_ADJUST : NO_BOUNDARY_ADJUST);
+        startNewTraversal(viewFrustum, root, lodLevelOffset, nodeData->getUsesFrustum());
+
+        // When the viewFrustum changed the sort order may be incorrect, so we re-sort
+        // and also use the opportunity to cull anything no longer in view
+        if (viewFrustumChanged && !_sendQueue.empty()) {
+            EntityPriorityQueue prevSendQueue;
+            _sendQueue.swap(prevSendQueue);
+            _entitiesInQueue.clear();
+            // Re-add elements from previous traversal if they still need to be sent
+            float lodScaleFactor = _traversal.getCurrentLODScaleFactor();
+            glm::vec3 viewPosition = _traversal.getCurrentView().getPosition();
+            while (!prevSendQueue.empty()) {
+                EntityItemPointer entity = prevSendQueue.top().getEntity();
+                bool forceRemove = prevSendQueue.top().shouldForceRemove();
+                prevSendQueue.pop();
+                if (entity) {
+                    if (!forceRemove) {
+                        bool success = false;
+                        AACube cube = entity->getQueryAACube(success);
+                        if (success) {
+                            if (_traversal.getCurrentView().cubeIntersectsKeyhole(cube)) {
+                                float priority = _conicalView.computePriority(cube);
+                                if (priority != PrioritizedEntity::DO_NOT_SEND) {
+                                    float distance = glm::distance(cube.calcCenter(), viewPosition) + MIN_VISIBLE_DISTANCE;
+                                    float angularDiameter = cube.getScale() / distance;
+                                    if (angularDiameter > MIN_ENTITY_ANGULAR_DIAMETER * lodScaleFactor) {
+                                        _sendQueue.push(PrioritizedEntity(entity, priority));
+                                        _entitiesInQueue.insert(entity.get());
+                                    }
+                                }
+                            }
+                        } else {
+                            _sendQueue.push(PrioritizedEntity(entity, PrioritizedEntity::WHEN_IN_DOUBT_PRIORITY));
+                            _entitiesInQueue.insert(entity.get());
+                        }
+                    } else {
+                        _sendQueue.push(PrioritizedEntity(entity, PrioritizedEntity::FORCE_REMOVE, true));
+                        _entitiesInQueue.insert(entity.get());
+                    }
+                }
+            }
+        }
+    }
+
+    if (!_traversal.finished()) {
+        quint64 startTime = usecTimestampNow();
+
+        #ifdef DEBUG
+        const uint64_t TIME_BUDGET = 400; // usec
+        #else
+        const uint64_t TIME_BUDGET = 200; // usec
+        #endif
+        _traversal.traverse(TIME_BUDGET);
+        OctreeServer::trackTreeTraverseTime((float)(usecTimestampNow() - startTime));
+    }
+
+    OctreeSendThread::traverseTreeAndSendContents(node, nodeData, viewFrustumChanged, isFullScene);
+}
+
 bool EntityTreeSendThread::addAncestorsToExtraFlaggedEntities(const QUuid& filteredEntityID,
                                                               EntityItem& entityItem, EntityNodeData& nodeData) {
     // check if this entity has a parent that is also an entity
@@ -100,7 +175,7 @@ bool EntityTreeSendThread::addAncestorsToExtraFlaggedEntities(const QUuid& filte
         return parentWasNew || ancestorsWereNew;
     }
 
-    // since we didn't have a parent niether of our parents or ancestors could be new additions
+    // since we didn't have a parent, neither of our parents or ancestors could be new additions
     return false;
 }
 
@@ -129,4 +204,297 @@ bool EntityTreeSendThread::addDescendantsToExtraFlaggedEntities(const QUuid& fil
     return hasNewChild || hasNewDescendants;
 }
 
+void EntityTreeSendThread::startNewTraversal(const ViewFrustum& view, EntityTreeElementPointer root, int32_t lodLevelOffset, 
+        bool usesViewFrustum) {
 
+    DiffTraversal::Type type = _traversal.prepareNewTraversal(view, root, lodLevelOffset, usesViewFrustum);
+    // there are three types of traversal:
+    //
+    //      (1) FirstTime = at login --> find everything in view
+    //      (2) Repeat = view hasn't changed --> find what has changed since last complete traversal
+    //      (3) Differential = view has changed --> find what has changed or in new view but not old
+    //
+    // The "scanCallback" we provide to the traversal depends on the type:
+    //
+    // The _conicalView is updated here as a cached view approximation used by the lambdas for efficient
+    // computation of entity sorting priorities.
+    //
+    _conicalView.set(_traversal.getCurrentView());
+
+    switch (type) {
+        case DiffTraversal::First:
+            // When we get to a First traversal, clear the _knownState
+            _knownState.clear();
+            if (usesViewFrustum) {
+                float lodScaleFactor = _traversal.getCurrentLODScaleFactor();
+                glm::vec3 viewPosition = _traversal.getCurrentView().getPosition();
+                _traversal.setScanCallback([=](DiffTraversal::VisibleElement& next) {
+                    next.element->forEachEntity([=](EntityItemPointer entity) {
+                        // Bail early if we've already checked this entity this frame
+                        if (_entitiesInQueue.find(entity.get()) != _entitiesInQueue.end()) {
+                            return;
+                        }
+                        bool success = false;
+                        AACube cube = entity->getQueryAACube(success);
+                        if (success) {
+                            if (_traversal.getCurrentView().cubeIntersectsKeyhole(cube)) {
+                                // Check the size of the entity, it's possible that a "too small to see" entity is included in a
+                                // larger octree cell because of its position (for example if it crosses the boundary of a cell it
+                                // pops to the next higher cell. So we want to check to see that the entity is large enough to be seen
+                                // before we consider including it.
+                                float distance = glm::distance(cube.calcCenter(), viewPosition) + MIN_VISIBLE_DISTANCE;
+                                float angularDiameter = cube.getScale() / distance;
+                                if (angularDiameter > MIN_ENTITY_ANGULAR_DIAMETER * lodScaleFactor) {
+                                    float priority = _conicalView.computePriority(cube);
+                                    _sendQueue.push(PrioritizedEntity(entity, priority));
+                                    _entitiesInQueue.insert(entity.get());
+                                }
+                            }
+                        } else {
+                            _sendQueue.push(PrioritizedEntity(entity, PrioritizedEntity::WHEN_IN_DOUBT_PRIORITY));
+                            _entitiesInQueue.insert(entity.get());
+                        }
+                    });
+                });
+            } else {
+                _traversal.setScanCallback([this](DiffTraversal::VisibleElement& next) {
+                    next.element->forEachEntity([this](EntityItemPointer entity) {
+                        // Bail early if we've already checked this entity this frame
+                        if (_entitiesInQueue.find(entity.get()) != _entitiesInQueue.end()) {
+                            return;
+                        }
+                        _sendQueue.push(PrioritizedEntity(entity, PrioritizedEntity::WHEN_IN_DOUBT_PRIORITY));
+                        _entitiesInQueue.insert(entity.get());
+                    });
+                });
+            }
+            break;
+        case DiffTraversal::Repeat:
+            if (usesViewFrustum) {
+                float lodScaleFactor = _traversal.getCurrentLODScaleFactor();
+                glm::vec3 viewPosition = _traversal.getCurrentView().getPosition();
+                _traversal.setScanCallback([=](DiffTraversal::VisibleElement& next) {
+                    uint64_t startOfCompletedTraversal = _traversal.getStartOfCompletedTraversal();
+                    if (next.element->getLastChangedContent() > startOfCompletedTraversal) {
+                        next.element->forEachEntity([=](EntityItemPointer entity) {
+                            // Bail early if we've already checked this entity this frame
+                            if (_entitiesInQueue.find(entity.get()) != _entitiesInQueue.end()) {
+                                return;
+                            }
+                            auto knownTimestamp = _knownState.find(entity.get());
+                            if (knownTimestamp == _knownState.end()) {
+                                bool success = false;
+                                AACube cube = entity->getQueryAACube(success);
+                                if (success) {
+                                    if (next.intersection == ViewFrustum::INSIDE || _traversal.getCurrentView().cubeIntersectsKeyhole(cube)) {
+                                        // See the DiffTraversal::First case for an explanation of the "entity is too small" check
+                                        float distance = glm::distance(cube.calcCenter(), viewPosition) + MIN_VISIBLE_DISTANCE;
+                                        float angularDiameter = cube.getScale() / distance;
+                                        if (angularDiameter > MIN_ENTITY_ANGULAR_DIAMETER * lodScaleFactor) {
+                                            float priority = _conicalView.computePriority(cube);
+                                            _sendQueue.push(PrioritizedEntity(entity, priority));
+                                            _entitiesInQueue.insert(entity.get());
+                                        }
+                                    }
+                                } else {
+                                    _sendQueue.push(PrioritizedEntity(entity, PrioritizedEntity::WHEN_IN_DOUBT_PRIORITY));
+                                    _entitiesInQueue.insert(entity.get());
+                                }
+                            } else if (entity->getLastEdited() > knownTimestamp->second) {
+                                // it is known and it changed --> put it on the queue with any priority
+                                // TODO: sort these correctly
+                                _sendQueue.push(PrioritizedEntity(entity, PrioritizedEntity::WHEN_IN_DOUBT_PRIORITY));
+                                _entitiesInQueue.insert(entity.get());
+                            }
+                        });
+                    }
+                });
+            } else {
+                _traversal.setScanCallback([this](DiffTraversal::VisibleElement& next) {
+                    uint64_t startOfCompletedTraversal = _traversal.getStartOfCompletedTraversal();
+                    if (next.element->getLastChangedContent() > startOfCompletedTraversal) {
+                        next.element->forEachEntity([this](EntityItemPointer entity) {
+                            // Bail early if we've already checked this entity this frame
+                            if (_entitiesInQueue.find(entity.get()) != _entitiesInQueue.end()) {
+                                return;
+                            }
+                            auto knownTimestamp = _knownState.find(entity.get());
+                            if (knownTimestamp == _knownState.end() || entity->getLastEdited() > knownTimestamp->second) {
+                                _sendQueue.push(PrioritizedEntity(entity, PrioritizedEntity::WHEN_IN_DOUBT_PRIORITY));
+                                _entitiesInQueue.insert(entity.get());
+                            }
+                        });
+                    }
+                });
+            }
+            break;
+        case DiffTraversal::Differential:
+            assert(usesViewFrustum);
+            float lodScaleFactor = _traversal.getCurrentLODScaleFactor();
+            glm::vec3 viewPosition = _traversal.getCurrentView().getPosition();
+            float completedLODScaleFactor = _traversal.getCompletedLODScaleFactor();
+            glm::vec3 completedViewPosition = _traversal.getCompletedView().getPosition();
+            _traversal.setScanCallback([=] (DiffTraversal::VisibleElement& next) {
+                next.element->forEachEntity([=](EntityItemPointer entity) {
+                    // Bail early if we've already checked this entity this frame
+                    if (_entitiesInQueue.find(entity.get()) != _entitiesInQueue.end()) {
+                        return;
+                    }
+                    auto knownTimestamp = _knownState.find(entity.get());
+                    if (knownTimestamp == _knownState.end()) {
+                        bool success = false;
+                        AACube cube = entity->getQueryAACube(success);
+                        if (success) {
+                            if (_traversal.getCurrentView().cubeIntersectsKeyhole(cube)) {
+                                // See the DiffTraversal::First case for an explanation of the "entity is too small" check
+                                float distance = glm::distance(cube.calcCenter(), viewPosition) + MIN_VISIBLE_DISTANCE;
+                                float angularDiameter = cube.getScale() / distance;
+                                if (angularDiameter > MIN_ENTITY_ANGULAR_DIAMETER * lodScaleFactor) {
+                                    if (!_traversal.getCompletedView().cubeIntersectsKeyhole(cube)) {
+                                        float priority = _conicalView.computePriority(cube);
+                                        _sendQueue.push(PrioritizedEntity(entity, priority));
+                                        _entitiesInQueue.insert(entity.get());
+                                    } else {
+                                        // If this entity was skipped last time because it was too small, we still need to send it
+                                        distance = glm::distance(cube.calcCenter(), completedViewPosition) + MIN_VISIBLE_DISTANCE;
+                                        angularDiameter = cube.getScale() / distance;
+                                        if (angularDiameter <= MIN_ENTITY_ANGULAR_DIAMETER * completedLODScaleFactor) {
+                                            // this object was skipped in last completed traversal
+                                            float priority = _conicalView.computePriority(cube);
+                                            _sendQueue.push(PrioritizedEntity(entity, priority));
+                                            _entitiesInQueue.insert(entity.get());
+                                        }
+                                    }
+                                }
+                            }
+                        } else {
+                            _sendQueue.push(PrioritizedEntity(entity, PrioritizedEntity::WHEN_IN_DOUBT_PRIORITY));
+                            _entitiesInQueue.insert(entity.get());
+                        }
+                    } else if (entity->getLastEdited() > knownTimestamp->second) {
+                        // it is known and it changed --> put it on the queue with any priority
+                        // TODO: sort these correctly
+                        _sendQueue.push(PrioritizedEntity(entity, PrioritizedEntity::WHEN_IN_DOUBT_PRIORITY));
+                        _entitiesInQueue.insert(entity.get());
+                    }
+                });
+            });
+            break;
+    }
+}
+
+bool EntityTreeSendThread::traverseTreeAndBuildNextPacketPayload(EncodeBitstreamParams& params, const QJsonObject& jsonFilters) {
+    if (_sendQueue.empty()) {
+        OctreeServer::trackEncodeTime(OctreeServer::SKIP_TIME);
+        return false;
+    }
+    quint64 encodeStart = usecTimestampNow();
+    if (!_packetData.hasContent()) {
+        // This is the beginning of a new packet.
+        // We pack minimal data for this to be accepted as an OctreeElement payload for the root element.
+        // The Octree header bytes look like this:
+        //
+        // 0x00  octalcode for root
+        // 0x00  colors (1 bit where recipient should call: child->readElementDataFromBuffer())
+        // 0xXX  childrenInTreeMask (when params.includeExistsBits is true: 1 bit where child is existant)
+        // 0x00  childrenInBufferMask (1 bit where recipient should call: child->readElementData() recursively)
+        const uint8_t zeroByte = 0;
+        _packetData.appendValue(zeroByte); // octalcode
+        _packetData.appendValue(zeroByte); // colors
+        if (params.includeExistsBits) {
+            uint8_t childrenExistBits = 0;
+            EntityTreeElementPointer root = std::dynamic_pointer_cast<EntityTreeElement>(_myServer->getOctree()->getRoot());
+            for (int32_t i = 0; i < NUMBER_OF_CHILDREN; ++i) {
+                if (root->getChildAtIndex(i)) {
+                    childrenExistBits += (1 << i);
+                }
+            }
+            _packetData.appendValue(childrenExistBits); // childrenInTreeMask
+        }
+        _packetData.appendValue(zeroByte); // childrenInBufferMask
+
+        // Pack zero for numEntities.
+        // But before we do: grab current byteOffset so we can come back later
+        // and update this with the real number.
+        _numEntities = 0;
+        _numEntitiesOffset = _packetData.getUncompressedByteOffset();
+        _packetData.appendValue(_numEntities);
+    }
+
+    LevelDetails entitiesLevel = _packetData.startLevel();
+    uint64_t sendTime = usecTimestampNow();
+    auto nodeData = static_cast<OctreeQueryNode*>(params.nodeData);
+    nodeData->stats.encodeStarted();
+    auto entityNode = _node.toStrongRef();
+    auto entityNodeData = static_cast<EntityNodeData*>(entityNode->getLinkedData());
+    while(!_sendQueue.empty()) {
+        PrioritizedEntity queuedItem = _sendQueue.top();
+        EntityItemPointer entity = queuedItem.getEntity();
+        if (entity) {
+            // Only send entities that match the jsonFilters, but keep track of everything we've tried to send so we don't try to send it again
+            bool entityMatchesFilters = entity->matchesJSONFilters(jsonFilters);
+            if (entityMatchesFilters || entityNodeData->isEntityFlaggedAsExtra(entity->getID())) {
+                if (!jsonFilters.isEmpty() && entityMatchesFilters) {
+                    // Record explicitly filtered-in entity so that extra entities can be flagged.
+                    entityNodeData->insertSentFilteredEntity(entity->getID());
+                }
+                OctreeElement::AppendState appendEntityState = entity->appendEntityData(&_packetData, params, _extraEncodeData);
+
+                if (appendEntityState != OctreeElement::COMPLETED) {
+                    if (appendEntityState == OctreeElement::PARTIAL) {
+                        ++_numEntities;
+                    }
+                    params.stopReason = EncodeBitstreamParams::DIDNT_FIT;
+                    break;
+                }
+                ++_numEntities;
+            }
+            if (queuedItem.shouldForceRemove()) {
+                _knownState.erase(entity.get());
+            } else {
+                _knownState[entity.get()] = sendTime;
+            }
+        }
+        _sendQueue.pop();
+        _entitiesInQueue.erase(entity.get());
+    }
+    nodeData->stats.encodeStopped();
+    if (_sendQueue.empty()) {
+        assert(_entitiesInQueue.empty());
+        params.stopReason = EncodeBitstreamParams::FINISHED;
+        _extraEncodeData->entities.clear();
+    }
+
+    if (_numEntities == 0) {
+        _packetData.discardLevel(entitiesLevel);
+        OctreeServer::trackEncodeTime((float)(usecTimestampNow() - encodeStart));
+        return false;
+    }
+    _packetData.endLevel(entitiesLevel);
+    _packetData.updatePriorBytes(_numEntitiesOffset, (const unsigned char*)&_numEntities, sizeof(_numEntities));
+    OctreeServer::trackEncodeTime((float)(usecTimestampNow() - encodeStart));
+    return true;
+}
+
+void EntityTreeSendThread::editingEntityPointer(const EntityItemPointer& entity) {
+    if (entity) {
+        if (_entitiesInQueue.find(entity.get()) == _entitiesInQueue.end() && _knownState.find(entity.get()) != _knownState.end()) {
+            bool success = false;
+            AACube cube = entity->getQueryAACube(success);
+            if (success) {
+                // We can force a removal from _knownState if the current view is used and entity is out of view
+                if (_traversal.doesCurrentUseViewFrustum() && !_traversal.getCurrentView().cubeIntersectsKeyhole(cube)) {
+                    _sendQueue.push(PrioritizedEntity(entity, PrioritizedEntity::FORCE_REMOVE, true));
+                    _entitiesInQueue.insert(entity.get());
+                }
+            } else {
+                _sendQueue.push(PrioritizedEntity(entity, PrioritizedEntity::WHEN_IN_DOUBT_PRIORITY, true));
+                _entitiesInQueue.insert(entity.get());
+            }
+        }
+    }
+}
+
+void EntityTreeSendThread::deletingEntityPointer(EntityItem* entity) {
+    _knownState.erase(entity);
+}
diff --git a/assignment-client/src/entities/EntityTreeSendThread.h b/assignment-client/src/entities/EntityTreeSendThread.h
index bfb4c743f1..a96a18494d 100644
--- a/assignment-client/src/entities/EntityTreeSendThread.h
+++ b/assignment-client/src/entities/EntityTreeSendThread.h
@@ -12,24 +12,56 @@
 #ifndef hifi_EntityTreeSendThread_h
 #define hifi_EntityTreeSendThread_h
 
+#include <unordered_set>
+
 #include "../octree/OctreeSendThread.h"
 
+#include <DiffTraversal.h>
+
+#include "EntityPriorityQueue.h"
+
 class EntityNodeData;
 class EntityItem;
 
 class EntityTreeSendThread : public OctreeSendThread {
+    Q_OBJECT
 
 public:
-    EntityTreeSendThread(OctreeServer* myServer, const SharedNodePointer& node) : OctreeSendThread(myServer, node) {};
+    EntityTreeSendThread(OctreeServer* myServer, const SharedNodePointer& node);
 
 protected:
-    virtual void preDistributionProcessing() override;
+    void traverseTreeAndSendContents(SharedNodePointer node, OctreeQueryNode* nodeData,
+            bool viewFrustumChanged, bool isFullScene) override;
 
 private:
     // the following two methods return booleans to indicate if any extra flagged entities were new additions to set
     bool addAncestorsToExtraFlaggedEntities(const QUuid& filteredEntityID, EntityItem& entityItem, EntityNodeData& nodeData);
     bool addDescendantsToExtraFlaggedEntities(const QUuid& filteredEntityID, EntityItem& entityItem, EntityNodeData& nodeData);
 
+    void startNewTraversal(const ViewFrustum& viewFrustum, EntityTreeElementPointer root, int32_t lodLevelOffset, 
+        bool usesViewFrustum);
+    bool traverseTreeAndBuildNextPacketPayload(EncodeBitstreamParams& params, const QJsonObject& jsonFilters) override;
+
+    void preDistributionProcessing() override;
+    bool hasSomethingToSend(OctreeQueryNode* nodeData) override { return !_sendQueue.empty(); }
+    bool shouldStartNewTraversal(OctreeQueryNode* nodeData, bool viewFrustumChanged) override { return viewFrustumChanged || _traversal.finished(); }
+    void preStartNewScene(OctreeQueryNode* nodeData, bool isFullScene) override {};
+    bool shouldTraverseAndSend(OctreeQueryNode* nodeData) override { return true; }
+
+    DiffTraversal _traversal;
+    EntityPriorityQueue _sendQueue;
+    std::unordered_set<EntityItem*> _entitiesInQueue;
+    std::unordered_map<EntityItem*, uint64_t> _knownState;
+    ConicalView _conicalView; // cached optimized view for fast priority calculations
+
+    // packet construction stuff
+    EntityTreeElementExtraEncodeDataPointer _extraEncodeData { new EntityTreeElementExtraEncodeData() };
+    int32_t _numEntitiesOffset { 0 };
+    uint16_t _numEntities { 0 };
+
+private slots:
+    void editingEntityPointer(const EntityItemPointer& entity);
+    void deletingEntityPointer(EntityItem* entity);
 };
 
 #endif // hifi_EntityTreeSendThread_h
diff --git a/assignment-client/src/octree/OctreeInboundPacketProcessor.cpp b/assignment-client/src/octree/OctreeInboundPacketProcessor.cpp
index 04409b3b21..bce6e7fe44 100644
--- a/assignment-client/src/octree/OctreeInboundPacketProcessor.cpp
+++ b/assignment-client/src/octree/OctreeInboundPacketProcessor.cpp
@@ -92,7 +92,19 @@ void OctreeInboundPacketProcessor::processPacket(QSharedPointer<ReceivedMessage>
     // Ask our tree subclass if it can handle the incoming packet...
     PacketType packetType = message->getType();
     
-    if (_myServer->getOctree()->handlesEditPacketType(packetType)) {
+    if (packetType == PacketType::ChallengeOwnership) {
+        _myServer->getOctree()->withWriteLock([&] {
+            _myServer->getOctree()->processChallengeOwnershipPacket(*message, sendingNode);
+        });
+    } else if (packetType == PacketType::ChallengeOwnershipRequest) {
+        _myServer->getOctree()->withWriteLock([&] {
+            _myServer->getOctree()->processChallengeOwnershipRequestPacket(*message, sendingNode);
+        });
+    } else if (packetType == PacketType::ChallengeOwnershipReply) {
+        _myServer->getOctree()->withWriteLock([&] {
+            _myServer->getOctree()->processChallengeOwnershipReplyPacket(*message, sendingNode);
+        });
+    } else if (_myServer->getOctree()->handlesEditPacketType(packetType)) {
         PerformanceWarning warn(debugProcessPacket, "processPacket KNOWN TYPE", debugProcessPacket);
         _receivedPacketCount++;
 
diff --git a/assignment-client/src/octree/OctreeSendThread.cpp b/assignment-client/src/octree/OctreeSendThread.cpp
index 7db06f12c0..3ae653307f 100644
--- a/assignment-client/src/octree/OctreeSendThread.cpp
+++ b/assignment-client/src/octree/OctreeSendThread.cpp
@@ -17,7 +17,6 @@
 #include <udt/PacketHeaders.h>
 #include <PerfStat.h>
 
-#include "OctreeQueryNode.h"
 #include "OctreeSendThread.h"
 #include "OctreeServer.h"
 #include "OctreeServerConsts.h"
@@ -27,8 +26,8 @@ quint64 startSceneSleepTime = 0;
 quint64 endSceneSleepTime = 0;
 
 OctreeSendThread::OctreeSendThread(OctreeServer* myServer, const SharedNodePointer& node) :
-    _myServer(myServer),
     _node(node),
+    _myServer(myServer),
     _nodeUuid(node->getUUID())
 {
     QString safeServerName("Octree");
@@ -48,7 +47,7 @@ OctreeSendThread::OctreeSendThread(OctreeServer* myServer, const SharedNodePoint
 
 OctreeSendThread::~OctreeSendThread() {
     setIsShuttingDown();
-    
+
     QString safeServerName("Octree");
     if (_myServer) {
         safeServerName = _myServer->getMyServerName();
@@ -81,11 +80,14 @@ bool OctreeSendThread::process() {
     // don't do any send processing until the initial load of the octree is complete...
     if (_myServer->isInitialLoadComplete()) {
         if (auto node = _node.lock()) {
-            _nodeMissingCount = 0;
             OctreeQueryNode* nodeData = static_cast<OctreeQueryNode*>(node->getLinkedData());
 
-            // Sometimes the node data has not yet been linked, in which case we can't really do anything
-            if (nodeData && !nodeData->isShuttingDown()) {
+            // If we don't have the OctreeQueryNode at all
+            // or it's uninitialized because we haven't received a query yet from the client
+            // or we don't know where we should send packets for this node
+            // or we're shutting down
+            // then we can't send an entity data packet
+            if (nodeData && nodeData->hasReceivedFirstQuery() && node->getActiveSocket() && !nodeData->isShuttingDown()) {
                 bool viewFrustumChanged = nodeData->updateCurrentViewFrustum();
                 packetDistributor(node, nodeData, viewFrustumChanged);
             }
@@ -129,8 +131,7 @@ AtomicUIntStat OctreeSendThread::_totalSpecialBytes { 0 };
 AtomicUIntStat OctreeSendThread::_totalSpecialPackets { 0 };
 
 
-int OctreeSendThread::handlePacketSend(SharedNodePointer node, OctreeQueryNode* nodeData, int& trueBytesSent,
-                                       int& truePacketsSent, bool dontSuppressDuplicate) {
+int OctreeSendThread::handlePacketSend(SharedNodePointer node, OctreeQueryNode* nodeData, bool dontSuppressDuplicate) {
     OctreeServer::didHandlePacketSend(this);
 
     // if we're shutting down, then exit early
@@ -141,15 +142,14 @@ int OctreeSendThread::handlePacketSend(SharedNodePointer node, OctreeQueryNode*
     bool debug = _myServer->wantsDebugSending();
     quint64 now = usecTimestampNow();
 
-    bool packetSent = false; // did we send a packet?
-    int packetsSent = 0;
+    int numPackets = 0;
 
     // Here's where we check to see if this packet is a duplicate of the last packet. If it is, we will silently
     // obscure the packet and not send it. This allows the callers and upper level logic to not need to know about
     // this rate control savings.
     if (!dontSuppressDuplicate && nodeData->shouldSuppressDuplicatePacket()) {
         nodeData->resetOctreePacket(); // we still need to reset it though!
-        return packetsSent; // without sending...
+        return numPackets; // without sending...
     }
 
     // If we've got a stats message ready to send, then see if we can piggyback them together
@@ -163,12 +163,15 @@ int OctreeSendThread::handlePacketSend(SharedNodePointer node, OctreeQueryNode*
             // copy octree message to back of stats message
             statsPacket.write(nodeData->getPacket().getData(), nodeData->getPacket().getDataSize());
 
-            // since a stats message is only included on end of scene, don't consider any of these bytes "wasted", since
+            int numBytes = statsPacket.getDataSize();
+            _totalBytes += numBytes;
+            _totalPackets++;
+            // since a stats message is only included on end of scene, don't consider any of these bytes "wasted"
             // there was nothing else to send.
             int thisWastedBytes = 0;
-            _totalWastedBytes += thisWastedBytes;
-            _totalBytes += statsPacket.getDataSize();
-            _totalPackets++;
+            //_totalWastedBytes += 0;
+            _trueBytesSent += numBytes;
+            numPackets++;
 
             if (debug) {
                 NLPacket& sentPacket = nodeData->getPacket();
@@ -191,18 +194,22 @@ int OctreeSendThread::handlePacketSend(SharedNodePointer node, OctreeQueryNode*
             // actually send it
             OctreeServer::didCallWriteDatagram(this);
             DependencyManager::get<NodeList>()->sendUnreliablePacket(statsPacket, *node);
-            packetSent = true;
         } else {
             // not enough room in the packet, send two packets
+
+            // first packet
             OctreeServer::didCallWriteDatagram(this);
             DependencyManager::get<NodeList>()->sendUnreliablePacket(statsPacket, *node);
 
-            // since a stats message is only included on end of scene, don't consider any of these bytes "wasted", since
+            int numBytes = statsPacket.getDataSize();
+            _totalBytes += numBytes;
+            _totalPackets++;
+            // since a stats message is only included on end of scene, don't consider any of these bytes "wasted"
             // there was nothing else to send.
             int thisWastedBytes = 0;
-            _totalWastedBytes += thisWastedBytes;
-            _totalBytes += statsPacket.getDataSize();
-            _totalPackets++;
+            //_totalWastedBytes += 0;
+            _trueBytesSent += numBytes;
+            numPackets++;
 
             if (debug) {
                 NLPacket& sentPacket = nodeData->getPacket();
@@ -221,19 +228,18 @@ int OctreeSendThread::handlePacketSend(SharedNodePointer node, OctreeQueryNode*
                         "] wasted bytes:" << thisWastedBytes << " [" << _totalWastedBytes << "]";
             }
 
-            trueBytesSent += statsPacket.getDataSize();
-            truePacketsSent++;
-            packetsSent++;
-
+            // second packet
             OctreeServer::didCallWriteDatagram(this);
             DependencyManager::get<NodeList>()->sendUnreliablePacket(nodeData->getPacket(), *node);
-            packetSent = true;
 
-            int packetSizeWithHeader = nodeData->getPacket().getDataSize();
-            thisWastedBytes = udt::MAX_PACKET_SIZE - packetSizeWithHeader;
-            _totalWastedBytes += thisWastedBytes;
-            _totalBytes += nodeData->getPacket().getDataSize();
+            numBytes = nodeData->getPacket().getDataSize();
+            _totalBytes += numBytes;
             _totalPackets++;
+            // we count wasted bytes here because we were unable to fit the stats packet
+            thisWastedBytes = udt::MAX_PACKET_SIZE - numBytes;
+            _totalWastedBytes += thisWastedBytes;
+            _trueBytesSent += numBytes;
+            numPackets++;
 
             if (debug) {
                 NLPacket& sentPacket = nodeData->getPacket();
@@ -259,13 +265,14 @@ int OctreeSendThread::handlePacketSend(SharedNodePointer node, OctreeQueryNode*
             // just send the octree packet
             OctreeServer::didCallWriteDatagram(this);
             DependencyManager::get<NodeList>()->sendUnreliablePacket(nodeData->getPacket(), *node);
-            packetSent = true;
 
-            int packetSizeWithHeader = nodeData->getPacket().getDataSize();
-            int thisWastedBytes = udt::MAX_PACKET_SIZE - packetSizeWithHeader;
-            _totalWastedBytes += thisWastedBytes;
-            _totalBytes += packetSizeWithHeader;
+            int numBytes = nodeData->getPacket().getDataSize();
+            _totalBytes += numBytes;
             _totalPackets++;
+            int thisWastedBytes = udt::MAX_PACKET_SIZE - numBytes;
+            _totalWastedBytes += thisWastedBytes;
+            numPackets++;
+            _trueBytesSent += numBytes;
 
             if (debug) {
                 NLPacket& sentPacket = nodeData->getPacket();
@@ -280,28 +287,42 @@ int OctreeSendThread::handlePacketSend(SharedNodePointer node, OctreeQueryNode*
 
                 qDebug() << "Sending packet at " << now << " [" << _totalPackets <<"]: sequence: " << sequence <<
                         " timestamp: " << timestamp <<
-                        " size: " << packetSizeWithHeader << " [" << _totalBytes <<
+                        " size: " << numBytes << " [" << _totalBytes <<
                         "] wasted bytes:" << thisWastedBytes << " [" << _totalWastedBytes << "]";
             }
         }
     }
 
     // remember to track our stats
-    if (packetSent) {
+    if (numPackets > 0) {
         nodeData->stats.packetSent(nodeData->getPacket().getPayloadSize());
-        trueBytesSent += nodeData->getPacket().getPayloadSize();
-        truePacketsSent++;
-        packetsSent++;
         nodeData->octreePacketSent();
         nodeData->resetOctreePacket();
     }
 
-    return packetsSent;
+    _truePacketsSent += numPackets;
+    return numPackets;
+}
+
+void OctreeSendThread::preStartNewScene(OctreeQueryNode* nodeData, bool isFullScene) {
+    // If we're starting a full scene, then definitely we want to empty the elementBag
+    if (isFullScene) {
+        nodeData->elementBag.deleteAll();
+    }
+
+    // This is the start of "resending" the scene.
+    bool dontRestartSceneOnMove = false; // this is experimental
+    if (dontRestartSceneOnMove) {
+        if (nodeData->elementBag.isEmpty()) {
+            nodeData->elementBag.insert(_myServer->getOctree()->getRoot());
+        }
+    } else {
+        nodeData->elementBag.insert(_myServer->getOctree()->getRoot());
+    }
 }
 
 /// Version of octree element distributor that sends the deepest LOD level at once
 int OctreeSendThread::packetDistributor(SharedNodePointer node, OctreeQueryNode* nodeData, bool viewFrustumChanged) {
-
     OctreeServer::didPacketDistributor(this);
 
     // if shutting down, exit early
@@ -309,19 +330,15 @@ int OctreeSendThread::packetDistributor(SharedNodePointer node, OctreeQueryNode*
         return 0;
     }
 
-    if (nodeData->elementBag.isEmpty()) {
+    if (shouldStartNewTraversal(nodeData, viewFrustumChanged)) {
         // if we're about to do a fresh pass,
         // give our pre-distribution processing a chance to do what it needs
         preDistributionProcessing();
     }
 
-    // calculate max number of packets that can be sent during this interval
-    int clientMaxPacketsPerInterval = std::max(1, (nodeData->getMaxQueryPacketsPerSecond() / INTERVALS_PER_SECOND));
-    int maxPacketsPerInterval = std::min(clientMaxPacketsPerInterval, _myServer->getPacketsPerClientPerInterval());
-
-    int truePacketsSent = 0;
-    int trueBytesSent = 0;
-    int packetsSentThisInterval = 0;
+    _truePacketsSent = 0;
+    _trueBytesSent = 0;
+    _packetsSentThisInterval = 0;
 
     bool isFullScene = nodeData->shouldForceFullScene();
     if (isFullScene) {
@@ -334,17 +351,9 @@ int OctreeSendThread::packetDistributor(SharedNodePointer node, OctreeQueryNode*
              && ((!viewFrustumChanged && nodeData->getViewFrustumJustStoppedChanging()) || nodeData->hasLodChanged()));
     }
 
-    bool somethingToSend = true; // assume we have something
-
-    // If our packet already has content in it, then we must use the color choice of the waiting packet.
-    // If we're starting a fresh packet, then...
-    //     If we're moving, and the client asked for low res, then we force monochrome, otherwise, use
-    //     the clients requested color state.
-
-    // If we have a packet waiting, and our desired want color, doesn't match the current waiting packets color
-    // then let's just send that waiting packet.
     if (nodeData->isPacketWaiting()) {
-        packetsSentThisInterval += handlePacketSend(node, nodeData, trueBytesSent, truePacketsSent);
+        // send the waiting packet
+        _packetsSentThisInterval += handlePacketSend(node, nodeData);
     } else {
         nodeData->resetOctreePacket();
     }
@@ -355,7 +364,7 @@ int OctreeSendThread::packetDistributor(SharedNodePointer node, OctreeQueryNode*
 
     // If the current view frustum has changed OR we have nothing to send, then search against
     // the current view frustum for things to send.
-    if (viewFrustumChanged || nodeData->elementBag.isEmpty()) {
+    if (shouldStartNewTraversal(nodeData, viewFrustumChanged)) {
 
         // if our view has changed, we need to reset these things...
         if (viewFrustumChanged) {
@@ -375,13 +384,7 @@ int OctreeSendThread::packetDistributor(SharedNodePointer node, OctreeQueryNode*
         //unsigned long encodeTime = nodeData->stats.getTotalEncodeTime();
         //unsigned long elapsedTime = nodeData->stats.getElapsedTime();
 
-        int packetsJustSent = handlePacketSend(node, nodeData, trueBytesSent, truePacketsSent, isFullScene);
-        packetsSentThisInterval += packetsJustSent;
-
-        // If we're starting a full scene, then definitely we want to empty the elementBag
-        if (isFullScene) {
-            nodeData->elementBag.deleteAll();
-        }
+        _packetsSentThisInterval += handlePacketSend(node, nodeData, isFullScene);
 
         // TODO: add these to stats page
         //::startSceneSleepTime = _usleepTime;
@@ -391,198 +394,49 @@ int OctreeSendThread::packetDistributor(SharedNodePointer node, OctreeQueryNode*
         nodeData->stats.sceneStarted(isFullScene, viewFrustumChanged,
                                      _myServer->getOctree()->getRoot(), _myServer->getJurisdiction());
 
-        // This is the start of "resending" the scene.
-        bool dontRestartSceneOnMove = false; // this is experimental
-        if (dontRestartSceneOnMove) {
-            if (nodeData->elementBag.isEmpty()) {
-                nodeData->elementBag.insert(_myServer->getOctree()->getRoot());
-            }
-        } else {
-            nodeData->elementBag.insert(_myServer->getOctree()->getRoot());
-        }
+        preStartNewScene(nodeData, isFullScene);
     }
 
     // If we have something in our elementBag, then turn them into packets and send them out...
-    if (!nodeData->elementBag.isEmpty()) {
-        int bytesWritten = 0;
+    if (shouldTraverseAndSend(nodeData)) {
         quint64 start = usecTimestampNow();
 
-        // TODO: add these to stats page
-        //quint64 startCompressTimeMsecs = OctreePacketData::getCompressContentTime() / 1000;
-        //quint64 startCompressCalls = OctreePacketData::getCompressContentCalls();
-
-        int extraPackingAttempts = 0;
-        bool completedScene = false;
-
-        while (somethingToSend && packetsSentThisInterval < maxPacketsPerInterval && !nodeData->isShuttingDown()) {
-            float lockWaitElapsedUsec = OctreeServer::SKIP_TIME;
-            float encodeElapsedUsec = OctreeServer::SKIP_TIME;
-            float compressAndWriteElapsedUsec = OctreeServer::SKIP_TIME;
-            float packetSendingElapsedUsec = OctreeServer::SKIP_TIME;
-
-            quint64 startInside = usecTimestampNow();
-
-            bool lastNodeDidntFit = false; // assume each node fits
-            if (!nodeData->elementBag.isEmpty()) {
-
-                quint64 lockWaitStart = usecTimestampNow();
-                _myServer->getOctree()->withReadLock([&]{
-                    quint64 lockWaitEnd = usecTimestampNow();
-                    lockWaitElapsedUsec = (float)(lockWaitEnd - lockWaitStart);
-                    quint64 encodeStart = usecTimestampNow();
-
-                    OctreeElementPointer subTree = nodeData->elementBag.extract();
-                    if (!subTree) {
-                        return;
-                    }
-
-                    float octreeSizeScale = nodeData->getOctreeSizeScale();
-                    int boundaryLevelAdjustClient = nodeData->getBoundaryLevelAdjust();
-
-                    int boundaryLevelAdjust = boundaryLevelAdjustClient +
-                                              (viewFrustumChanged ? LOW_RES_MOVING_ADJUST : NO_BOUNDARY_ADJUST);
-
-                    EncodeBitstreamParams params(INT_MAX, WANT_EXISTS_BITS, DONT_CHOP,
-                                                 viewFrustumChanged, boundaryLevelAdjust, octreeSizeScale,
-                                                 isFullScene, _myServer->getJurisdiction(), nodeData);
-                    nodeData->copyCurrentViewFrustum(params.viewFrustum);
-                    if (viewFrustumChanged) {
-                        nodeData->copyLastKnownViewFrustum(params.lastViewFrustum);
-                    }
-
-                    // Our trackSend() function is implemented by the server subclass, and will be called back
-                    // during the encodeTreeBitstream() as new entities/data elements are sent
-                    params.trackSend = [this, node](const QUuid& dataID, quint64 dataEdited) {
-                        _myServer->trackSend(dataID, dataEdited, node->getUUID());
-                    };
-
-                    // TODO: should this include the lock time or not? This stat is sent down to the client,
-                    // it seems like it may be a good idea to include the lock time as part of the encode time
-                    // are reported to client. Since you can encode without the lock
-                    nodeData->stats.encodeStarted();
-
-                    bytesWritten = _myServer->getOctree()->encodeTreeBitstream(subTree, &_packetData, nodeData->elementBag, params);
-
-                    quint64 encodeEnd = usecTimestampNow();
-                    encodeElapsedUsec = (float)(encodeEnd - encodeStart);
-
-                    // If after calling encodeTreeBitstream() there are no nodes left to send, then we know we've
-                    // sent the entire scene. We want to know this below so we'll actually write this content into
-                    // the packet and send it
-                    completedScene = nodeData->elementBag.isEmpty();
-
-                    if (params.stopReason == EncodeBitstreamParams::DIDNT_FIT) {
-                        lastNodeDidntFit = true;
-                        extraPackingAttempts++;
-                    }
-
-                    nodeData->stats.encodeStopped();
-                });
-            } else {
-                // If the bag was empty then we didn't even attempt to encode, and so we know the bytesWritten were 0
-                bytesWritten = 0;
-                somethingToSend = false; // this will cause us to drop out of the loop...
-            }
-
-            // If the last node didn't fit, but we're in compressed mode, then we actually want to see if we can fit a
-            // little bit more in this packet. To do this we write into the packet, but don't send it yet, we'll
-            // keep attempting to write in compressed mode to add more compressed segments
-
-            // We only consider sending anything if there is something in the _packetData to send... But
-            // if bytesWritten == 0 it means either the subTree couldn't fit or we had an empty bag... Both cases
-            // mean we should send the previous packet contents and reset it.
-            if (completedScene || lastNodeDidntFit) {
-
-                if (_packetData.hasContent()) {
-                    quint64 compressAndWriteStart = usecTimestampNow();
-
-                    // if for some reason the finalized size is greater than our available size, then probably the "compressed"
-                    // form actually inflated beyond our padding, and in this case we will send the current packet, then
-                    // write to out new packet...
-                    unsigned int writtenSize = _packetData.getFinalizedSize() + sizeof(OCTREE_PACKET_INTERNAL_SECTION_SIZE);
-
-                    if (writtenSize > nodeData->getAvailable()) {
-                        packetsSentThisInterval += handlePacketSend(node, nodeData, trueBytesSent, truePacketsSent);
-                    }
-
-                    nodeData->writeToPacket(_packetData.getFinalizedData(), _packetData.getFinalizedSize());
-                    quint64 compressAndWriteEnd = usecTimestampNow();
-                    compressAndWriteElapsedUsec = (float)(compressAndWriteEnd - compressAndWriteStart);
-                }
-
-                // If we're not running compressed, then we know we can just send now. Or if we're running compressed, but
-                // the packet doesn't have enough space to bother attempting to pack more...
-                bool sendNow = true;
-
-                if (!completedScene && (nodeData->getAvailable() >= MINIMUM_ATTEMPT_MORE_PACKING &&
-                                        extraPackingAttempts <= REASONABLE_NUMBER_OF_PACKING_ATTEMPTS)) {
-                    sendNow = false; // try to pack more
-                }
-
-                int targetSize = MAX_OCTREE_PACKET_DATA_SIZE;
-                if (sendNow) {
-                    quint64 packetSendingStart = usecTimestampNow();
-                    packetsSentThisInterval += handlePacketSend(node, nodeData, trueBytesSent, truePacketsSent);
-                    quint64 packetSendingEnd = usecTimestampNow();
-                    packetSendingElapsedUsec = (float)(packetSendingEnd - packetSendingStart);
-
-                    targetSize = nodeData->getAvailable() - sizeof(OCTREE_PACKET_INTERNAL_SECTION_SIZE);
-                    extraPackingAttempts = 0;
-                } else {
-                    // If we're in compressed mode, then we want to see if we have room for more in this wire packet.
-                    // but we've finalized the _packetData, so we want to start a new section, we will do that by
-                    // resetting the packet settings with the max uncompressed size of our current available space
-                    // in the wire packet. We also include room for our section header, and a little bit of padding
-                    // to account for the fact that whenc compressing small amounts of data, we sometimes end up with
-                    // a larger compressed size then uncompressed size
-                    targetSize = nodeData->getAvailable() - sizeof(OCTREE_PACKET_INTERNAL_SECTION_SIZE) - COMPRESS_PADDING;
-                }
-                _packetData.changeSettings(true, targetSize); // will do reset - NOTE: Always compressed
-
-            }
-            OctreeServer::trackTreeWaitTime(lockWaitElapsedUsec);
-            OctreeServer::trackEncodeTime(encodeElapsedUsec);
-            OctreeServer::trackCompressAndWriteTime(compressAndWriteElapsedUsec);
-            OctreeServer::trackPacketSendingTime(packetSendingElapsedUsec);
-
-            quint64 endInside = usecTimestampNow();
-            quint64 elapsedInsideUsecs = endInside - startInside;
-            OctreeServer::trackInsideTime((float)elapsedInsideUsecs);
-        }
-
-        if (somethingToSend && _myServer->wantsVerboseDebug()) {
-            qCDebug(octree) << "Hit PPS Limit, packetsSentThisInterval =" << packetsSentThisInterval
-                            << "  maxPacketsPerInterval = " << maxPacketsPerInterval
-                            << "  clientMaxPacketsPerInterval = " << clientMaxPacketsPerInterval;
-        }
+        traverseTreeAndSendContents(node, nodeData, viewFrustumChanged, isFullScene);
 
         // Here's where we can/should allow the server to send other data...
         // send the environment packet
         // TODO: should we turn this into a while loop to better handle sending multiple special packets
         if (_myServer->hasSpecialPacketsToSend(node) && !nodeData->isShuttingDown()) {
             int specialPacketsSent = 0;
-            trueBytesSent += _myServer->sendSpecialPackets(node, nodeData, specialPacketsSent);
+            int specialBytesSent = _myServer->sendSpecialPackets(node, nodeData, specialPacketsSent);
             nodeData->resetOctreePacket();   // because nodeData's _sequenceNumber has changed
-            truePacketsSent += specialPacketsSent;
-            packetsSentThisInterval += specialPacketsSent;
+            _truePacketsSent += specialPacketsSent;
+            _trueBytesSent += specialBytesSent;
+            _packetsSentThisInterval += specialPacketsSent;
 
             _totalPackets += specialPacketsSent;
-            _totalBytes += trueBytesSent;
+            _totalBytes += specialBytesSent;
 
             _totalSpecialPackets += specialPacketsSent;
-            _totalSpecialBytes += trueBytesSent;
+            _totalSpecialBytes += specialBytesSent;
         }
 
+        // calculate max number of packets that can be sent during this interval
+        int clientMaxPacketsPerInterval = std::max(1, (nodeData->getMaxQueryPacketsPerSecond() / INTERVALS_PER_SECOND));
+        int maxPacketsPerInterval = std::min(clientMaxPacketsPerInterval, _myServer->getPacketsPerClientPerInterval());
+
         // Re-send packets that were nacked by the client
-        while (nodeData->hasNextNackedPacket() && packetsSentThisInterval < maxPacketsPerInterval) {
+        while (nodeData->hasNextNackedPacket() && _packetsSentThisInterval < maxPacketsPerInterval) {
             const NLPacket* packet = nodeData->getNextNackedPacket();
             if (packet) {
                 DependencyManager::get<NodeList>()->sendUnreliablePacket(*packet, *node);
-                truePacketsSent++;
-                packetsSentThisInterval++;
+                int numBytes = packet->getDataSize();
+                _truePacketsSent++;
+                _trueBytesSent += numBytes;
+                _packetsSentThisInterval++;
 
-                _totalBytes += packet->getDataSize();
                 _totalPackets++;
+                _totalBytes += numBytes;
                 _totalWastedBytes += udt::MAX_PACKET_SIZE - packet->getDataSize();
             }
         }
@@ -591,32 +445,145 @@ int OctreeSendThread::packetDistributor(SharedNodePointer node, OctreeQueryNode*
         int elapsedmsec = (end - start) / USECS_PER_MSEC;
         OctreeServer::trackLoopTime(elapsedmsec);
 
-        // TODO: add these to stats page
-        //quint64 endCompressCalls = OctreePacketData::getCompressContentCalls();
-        //int elapsedCompressCalls = endCompressCalls - startCompressCalls;
-        //quint64 endCompressTimeMsecs = OctreePacketData::getCompressContentTime() / 1000;
-        //int elapsedCompressTimeMsecs = endCompressTimeMsecs - startCompressTimeMsecs;
-
         // if after sending packets we've emptied our bag, then we want to remember that we've sent all
         // the octree elements from the current view frustum
-        if (nodeData->elementBag.isEmpty()) {
+        if (!hasSomethingToSend(nodeData)) {
             nodeData->updateLastKnownViewFrustum();
             nodeData->setViewSent(true);
 
             // If this was a full scene then make sure we really send out a stats packet at this point so that
             // the clients will know the scene is stable
             if (isFullScene) {
-                int thisTrueBytesSent = 0;
-                int thisTruePacketsSent = 0;
                 nodeData->stats.sceneCompleted();
-                int packetsJustSent = handlePacketSend(node, nodeData, thisTrueBytesSent, thisTruePacketsSent, true);
-                _totalBytes += thisTrueBytesSent;
-                _totalPackets += thisTruePacketsSent;
-                truePacketsSent += packetsJustSent;
+                handlePacketSend(node, nodeData, true);
             }
         }
 
     } // end if bag wasn't empty, and so we sent stuff...
 
-    return truePacketsSent;
+    return _truePacketsSent;
+}
+
+bool OctreeSendThread::traverseTreeAndBuildNextPacketPayload(EncodeBitstreamParams& params, const QJsonObject& jsonFilters) {
+    bool somethingToSend = false;
+    OctreeQueryNode* nodeData = static_cast<OctreeQueryNode*>(params.nodeData);
+    if (!nodeData->elementBag.isEmpty()) {
+        quint64 encodeStart = usecTimestampNow();
+        quint64 lockWaitStart = encodeStart;
+
+        _myServer->getOctree()->withReadLock([&]{
+            OctreeServer::trackTreeWaitTime((float)(usecTimestampNow() - lockWaitStart));
+
+            OctreeElementPointer subTree = nodeData->elementBag.extract();
+            if (subTree) {
+                // NOTE: this is where the tree "contents" are actually packed
+                nodeData->stats.encodeStarted();
+                _myServer->getOctree()->encodeTreeBitstream(subTree, &_packetData, nodeData->elementBag, params);
+                nodeData->stats.encodeStopped();
+
+                somethingToSend = true;
+            }
+        });
+
+        OctreeServer::trackEncodeTime((float)(usecTimestampNow() - encodeStart));
+    } else {
+        OctreeServer::trackTreeWaitTime(OctreeServer::SKIP_TIME);
+        OctreeServer::trackEncodeTime(OctreeServer::SKIP_TIME);
+    }
+    return somethingToSend;
+}
+
+void OctreeSendThread::traverseTreeAndSendContents(SharedNodePointer node, OctreeQueryNode* nodeData, bool viewFrustumChanged, bool isFullScene) {
+    // calculate max number of packets that can be sent during this interval
+    int clientMaxPacketsPerInterval = std::max(1, (nodeData->getMaxQueryPacketsPerSecond() / INTERVALS_PER_SECOND));
+    int maxPacketsPerInterval = std::min(clientMaxPacketsPerInterval, _myServer->getPacketsPerClientPerInterval());
+
+    int extraPackingAttempts = 0;
+
+    // init params once outside the while loop
+    int boundaryLevelAdjustClient = nodeData->getBoundaryLevelAdjust();
+    int boundaryLevelAdjust = boundaryLevelAdjustClient +
+                            (viewFrustumChanged ? LOW_RES_MOVING_ADJUST : NO_BOUNDARY_ADJUST);
+    float octreeSizeScale = nodeData->getOctreeSizeScale();
+    EncodeBitstreamParams params(INT_MAX, WANT_EXISTS_BITS, DONT_CHOP,
+                                viewFrustumChanged, boundaryLevelAdjust, octreeSizeScale,
+                                isFullScene, _myServer->getJurisdiction(), nodeData);
+    // Our trackSend() function is implemented by the server subclass, and will be called back as new entities/data elements are sent
+    params.trackSend = [this](const QUuid& dataID, quint64 dataEdited) {
+        _myServer->trackSend(dataID, dataEdited, _nodeUuid);
+    };
+    nodeData->copyCurrentViewFrustum(params.viewFrustum);
+    if (viewFrustumChanged) {
+        nodeData->copyLastKnownViewFrustum(params.lastViewFrustum);
+    }
+
+    bool somethingToSend = true; // assume we have something
+    bool hadSomething = hasSomethingToSend(nodeData);
+    while (somethingToSend && _packetsSentThisInterval < maxPacketsPerInterval && !nodeData->isShuttingDown()) {
+        float compressAndWriteElapsedUsec = OctreeServer::SKIP_TIME;
+        float packetSendingElapsedUsec = OctreeServer::SKIP_TIME;
+
+        quint64 startInside = usecTimestampNow();
+
+        bool lastNodeDidntFit = false; // assume each node fits
+        params.stopReason = EncodeBitstreamParams::UNKNOWN; // reset params.stopReason before traversal
+
+        somethingToSend = traverseTreeAndBuildNextPacketPayload(params, nodeData->getJSONParameters());
+
+        if (params.stopReason == EncodeBitstreamParams::DIDNT_FIT) {
+            lastNodeDidntFit = true;
+            extraPackingAttempts++;
+        }
+
+        // If the bag had contents but is now empty then we know we've sent the entire scene.
+        bool completedScene = hadSomething && nodeData->elementBag.isEmpty();
+        if (completedScene || lastNodeDidntFit) {
+            // we probably want to flush what has accumulated in nodeData but:
+            // do we have more data to send? and is there room?
+            if (_packetData.hasContent()) {
+                // yes, more data to send
+                quint64 compressAndWriteStart = usecTimestampNow();
+                unsigned int additionalSize = _packetData.getFinalizedSize() + sizeof(OCTREE_PACKET_INTERNAL_SECTION_SIZE);
+                if (additionalSize > nodeData->getAvailable()) {
+                    // no room --> flush what we've got
+                    _packetsSentThisInterval += handlePacketSend(node, nodeData);
+                }
+
+                // either there is room, or we've flushed and reset nodeData's data buffer
+                // so we can transfer whatever is in _packetData to nodeData
+                nodeData->writeToPacket(_packetData.getFinalizedData(), _packetData.getFinalizedSize());
+                compressAndWriteElapsedUsec = (float)(usecTimestampNow()- compressAndWriteStart);
+            }
+
+            bool sendNow = completedScene ||
+                nodeData->getAvailable() < MINIMUM_ATTEMPT_MORE_PACKING ||
+                extraPackingAttempts > REASONABLE_NUMBER_OF_PACKING_ATTEMPTS;
+
+            int targetSize = MAX_OCTREE_PACKET_DATA_SIZE;
+            if (sendNow) {
+                quint64 packetSendingStart = usecTimestampNow();
+                _packetsSentThisInterval += handlePacketSend(node, nodeData);
+                packetSendingElapsedUsec = (float)(usecTimestampNow() - packetSendingStart);
+
+                targetSize = nodeData->getAvailable() - sizeof(OCTREE_PACKET_INTERNAL_SECTION_SIZE);
+                extraPackingAttempts = 0;
+            } else {
+                // We want to see if we have room for more in this wire packet but we've copied the _packetData,
+                // so we want to start a new section. We will do that by resetting the packet settings with the max
+                // size of our current available space in the wire packet plus room for our section header and a
+                // little bit of padding.
+                targetSize = nodeData->getAvailable() - sizeof(OCTREE_PACKET_INTERNAL_SECTION_SIZE) - COMPRESS_PADDING;
+            }
+            _packetData.changeSettings(true, targetSize); // will do reset - NOTE: Always compressed
+        }
+        OctreeServer::trackCompressAndWriteTime(compressAndWriteElapsedUsec);
+        OctreeServer::trackPacketSendingTime(packetSendingElapsedUsec);
+        OctreeServer::trackInsideTime((float)(usecTimestampNow() - startInside));
+    }
+
+    if (somethingToSend && _myServer->wantsVerboseDebug()) {
+        qCDebug(octree) << "Hit PPS Limit, packetsSentThisInterval =" << _packetsSentThisInterval
+                        << "  maxPacketsPerInterval = " << maxPacketsPerInterval
+                        << "  clientMaxPacketsPerInterval = " << clientMaxPacketsPerInterval;
+    }
 }
diff --git a/assignment-client/src/octree/OctreeSendThread.h b/assignment-client/src/octree/OctreeSendThread.h
index 06c9b5f1d6..bc7d2c2588 100644
--- a/assignment-client/src/octree/OctreeSendThread.h
+++ b/assignment-client/src/octree/OctreeSendThread.h
@@ -19,6 +19,7 @@
 #include <GenericThread.h>
 #include <Node.h>
 #include <OctreePacketData.h>
+#include "OctreeQueryNode.h"
 
 class OctreeQueryNode;
 class OctreeServer;
@@ -34,7 +35,7 @@ public:
 
     void setIsShuttingDown();
     bool isShuttingDown() { return _isShuttingDown; }
-    
+
     QUuid getNodeUuid() const { return _nodeUuid; }
 
     static AtomicUIntStat _totalBytes;
@@ -51,22 +52,30 @@ protected:
     /// Implements generic processing behavior for this thread.
     virtual bool process() override;
 
-    /// Called before a packetDistributor pass to allow for pre-distribution processing
-    virtual void preDistributionProcessing() {};
+    virtual void traverseTreeAndSendContents(SharedNodePointer node, OctreeQueryNode* nodeData,
+            bool viewFrustumChanged, bool isFullScene);
+    virtual bool traverseTreeAndBuildNextPacketPayload(EncodeBitstreamParams& params, const QJsonObject& jsonFilters);
 
-    OctreeServer* _myServer { nullptr };
+    OctreePacketData _packetData;
     QWeakPointer<Node> _node;
+    OctreeServer* _myServer { nullptr };
 
 private:
-    int handlePacketSend(SharedNodePointer node, OctreeQueryNode* nodeData, int& trueBytesSent, int& truePacketsSent, bool dontSuppressDuplicate = false);
+    /// Called before a packetDistributor pass to allow for pre-distribution processing
+    virtual void preDistributionProcessing() {};
+    int handlePacketSend(SharedNodePointer node, OctreeQueryNode* nodeData, bool dontSuppressDuplicate = false);
     int packetDistributor(SharedNodePointer node, OctreeQueryNode* nodeData, bool viewFrustumChanged);
-    
+
+    virtual bool hasSomethingToSend(OctreeQueryNode* nodeData) { return !nodeData->elementBag.isEmpty(); }
+    virtual bool shouldStartNewTraversal(OctreeQueryNode* nodeData, bool viewFrustumChanged) { return viewFrustumChanged || !hasSomethingToSend(nodeData); }
+    virtual void preStartNewScene(OctreeQueryNode* nodeData, bool isFullScene);
+    virtual bool shouldTraverseAndSend(OctreeQueryNode* nodeData) { return hasSomethingToSend(nodeData); }
 
     QUuid _nodeUuid;
 
-    OctreePacketData _packetData;
-
-    int _nodeMissingCount { 0 };
+    int _truePacketsSent { 0 }; // available for debug stats
+    int _trueBytesSent { 0 }; // available for debug stats
+    int _packetsSentThisInterval { 0 }; // used for bandwidth throttle condition
     bool _isShuttingDown { false };
 };
 
diff --git a/assignment-client/src/octree/OctreeServer.cpp b/assignment-client/src/octree/OctreeServer.cpp
index af5f2c904e..c535c48dda 100644
--- a/assignment-client/src/octree/OctreeServer.cpp
+++ b/assignment-client/src/octree/OctreeServer.cpp
@@ -22,7 +22,6 @@
 #include <HTTPConnection.h>
 #include <LogHandler.h>
 #include <shared/NetworkUtils.h>
-#include <NetworkingConstants.h>
 #include <NumericalConstants.h>
 #include <UUID.h>
 
@@ -35,7 +34,7 @@
 #include <QtCore/QDir>
 
 int OctreeServer::_clientCount = 0;
-const int MOVING_AVERAGE_SAMPLE_COUNTS = 1000000;
+const int MOVING_AVERAGE_SAMPLE_COUNTS = 1000;
 
 float OctreeServer::SKIP_TIME = -1.0f; // use this for trackXXXTime() calls for non-times
 
@@ -60,6 +59,8 @@ int OctreeServer::_longTreeWait = 0;
 int OctreeServer::_shortTreeWait = 0;
 int OctreeServer::_noTreeWait = 0;
 
+SimpleMovingAverage OctreeServer::_averageTreeTraverseTime(MOVING_AVERAGE_SAMPLE_COUNTS);
+
 SimpleMovingAverage OctreeServer::_averageNodeWaitTime(MOVING_AVERAGE_SAMPLE_COUNTS);
 
 SimpleMovingAverage OctreeServer::_averageCompressAndWriteTime(MOVING_AVERAGE_SAMPLE_COUNTS);
@@ -106,6 +107,8 @@ void OctreeServer::resetSendingStats() {
     _shortTreeWait = 0;
     _noTreeWait = 0;
 
+    _averageTreeTraverseTime.reset();
+
     _averageNodeWaitTime.reset();
 
     _averageCompressAndWriteTime.reset();
@@ -136,18 +139,19 @@ void OctreeServer::trackEncodeTime(float time) {
 
     if (time == SKIP_TIME) {
         _noEncode++;
-        time = 0.0f;
-    } else if (time <= MAX_SHORT_TIME) {
-        _shortEncode++;
-        _averageShortEncodeTime.updateAverage(time);
-    } else if (time <= MAX_LONG_TIME) {
-        _longEncode++;
-        _averageLongEncodeTime.updateAverage(time);
     } else {
-        _extraLongEncode++;
-        _averageExtraLongEncodeTime.updateAverage(time);
+        if (time <= MAX_SHORT_TIME) {
+            _shortEncode++;
+            _averageShortEncodeTime.updateAverage(time);
+        } else if (time <= MAX_LONG_TIME) {
+            _longEncode++;
+            _averageLongEncodeTime.updateAverage(time);
+        } else {
+            _extraLongEncode++;
+            _averageExtraLongEncodeTime.updateAverage(time);
+        }
+        _averageEncodeTime.updateAverage(time);
     }
-    _averageEncodeTime.updateAverage(time);
 }
 
 void OctreeServer::trackTreeWaitTime(float time) {
@@ -155,18 +159,19 @@ void OctreeServer::trackTreeWaitTime(float time) {
     const float MAX_LONG_TIME = 100.0f;
     if (time == SKIP_TIME) {
         _noTreeWait++;
-        time = 0.0f;
-    } else if (time <= MAX_SHORT_TIME) {
-        _shortTreeWait++;
-        _averageTreeShortWaitTime.updateAverage(time);
-    } else if (time <= MAX_LONG_TIME) {
-        _longTreeWait++;
-        _averageTreeLongWaitTime.updateAverage(time);
     } else {
-        _extraLongTreeWait++;
-        _averageTreeExtraLongWaitTime.updateAverage(time);
+        if (time <= MAX_SHORT_TIME) {
+            _shortTreeWait++;
+            _averageTreeShortWaitTime.updateAverage(time);
+        } else if (time <= MAX_LONG_TIME) {
+            _longTreeWait++;
+            _averageTreeLongWaitTime.updateAverage(time);
+        } else {
+            _extraLongTreeWait++;
+            _averageTreeExtraLongWaitTime.updateAverage(time);
+        }
+        _averageTreeWaitTime.updateAverage(time);
     }
-    _averageTreeWaitTime.updateAverage(time);
 }
 
 void OctreeServer::trackCompressAndWriteTime(float time) {
@@ -174,26 +179,27 @@ void OctreeServer::trackCompressAndWriteTime(float time) {
     const float MAX_LONG_TIME = 100.0f;
     if (time == SKIP_TIME) {
         _noCompress++;
-        time = 0.0f;
-    } else if (time <= MAX_SHORT_TIME) {
-        _shortCompress++;
-        _averageShortCompressTime.updateAverage(time);
-    } else if (time <= MAX_LONG_TIME) {
-        _longCompress++;
-        _averageLongCompressTime.updateAverage(time);
     } else {
-        _extraLongCompress++;
-        _averageExtraLongCompressTime.updateAverage(time);
+        if (time <= MAX_SHORT_TIME) {
+            _shortCompress++;
+            _averageShortCompressTime.updateAverage(time);
+        } else if (time <= MAX_LONG_TIME) {
+            _longCompress++;
+            _averageLongCompressTime.updateAverage(time);
+        } else {
+            _extraLongCompress++;
+            _averageExtraLongCompressTime.updateAverage(time);
+        }
+        _averageCompressAndWriteTime.updateAverage(time);
     }
-    _averageCompressAndWriteTime.updateAverage(time);
 }
 
 void OctreeServer::trackPacketSendingTime(float time) {
     if (time == SKIP_TIME) {
         _noSend++;
-        time = 0.0f;
+    } else {
+        _averagePacketSendingTime.updateAverage(time);
     }
-    _averagePacketSendingTime.updateAverage(time);
 }
 
 
@@ -202,18 +208,19 @@ void OctreeServer::trackProcessWaitTime(float time) {
     const float MAX_LONG_TIME = 100.0f;
     if (time == SKIP_TIME) {
         _noProcessWait++;
-        time = 0.0f;
-    } else if (time <= MAX_SHORT_TIME) {
-        _shortProcessWait++;
-        _averageProcessShortWaitTime.updateAverage(time);
-    } else if (time <= MAX_LONG_TIME) {
-        _longProcessWait++;
-        _averageProcessLongWaitTime.updateAverage(time);
     } else {
-        _extraLongProcessWait++;
-        _averageProcessExtraLongWaitTime.updateAverage(time);
+        if (time <= MAX_SHORT_TIME) {
+            _shortProcessWait++;
+            _averageProcessShortWaitTime.updateAverage(time);
+        } else if (time <= MAX_LONG_TIME) {
+            _longProcessWait++;
+            _averageProcessLongWaitTime.updateAverage(time);
+        } else {
+            _extraLongProcessWait++;
+            _averageProcessExtraLongWaitTime.updateAverage(time);
+        }
+        _averageProcessWaitTime.updateAverage(time);
     }
-    _averageProcessWaitTime.updateAverage(time);
 }
 
 OctreeServer::OctreeServer(ReceivedMessage& message) :
@@ -518,6 +525,10 @@ bool OctreeServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
                                          (double)_averageTreeExtraLongWaitTime.getAverage(),
                                          (double)(extraLongVsTotal * AS_PERCENT), _extraLongTreeWait);
 
+        // traverse
+        float averageTreeTraverseTime = getAverageTreeTraverseTime();
+        statsString += QString().sprintf("          Average tree traverse time:    %9.2f usecs\r\n\r\n", (double)averageTreeTraverseTime);
+
         // encode
         float averageEncodeTime = getAverageEncodeTime();
         statsString += QString().sprintf("                 Average encode time:    %9.2f usecs\r\n", (double)averageEncodeTime);
@@ -879,7 +890,7 @@ OctreeServer::UniqueSendThread OctreeServer::newSendThread(const SharedNodePoint
 
 OctreeServer::UniqueSendThread OctreeServer::createSendThread(const SharedNodePointer& node) {
     auto sendThread = newSendThread(node);
-    
+
     // we want to be notified when the thread finishes
     connect(sendThread.get(), &GenericThread::finished, this, &OctreeServer::removeSendThread);
     sendThread->initialize(true);
@@ -901,13 +912,13 @@ void OctreeServer::handleOctreeQueryPacket(QSharedPointer<ReceivedMessage> messa
         // need to make sure we have it in our nodeList.
         auto nodeList = DependencyManager::get<NodeList>();
         nodeList->updateNodeWithDataFromPacket(message, senderNode);
-        
+
         auto it = _sendThreads.find(senderNode->getUUID());
         if (it == _sendThreads.end()) {
             _sendThreads.emplace(senderNode->getUUID(), createSendThread(senderNode));
         } else if (it->second->isShuttingDown()) {
             _sendThreads.erase(it); // Remove right away and wait on thread to be
-            
+
             _sendThreads.emplace(senderNode->getUUID(), createSendThread(senderNode));
         }
     }
@@ -935,39 +946,7 @@ void OctreeServer::handleOctreeFileReplacement(QSharedPointer<ReceivedMessage> m
             // so here we just store a special file at our persist path
             // and then force a stop of the server so that it can pick it up when it relaunches
             if (!_persistAbsoluteFilePath.isEmpty()) {
-
-                // before we restart the server and make it try and load this data, let's make sure it is valid
-                auto compressedOctree = message->getMessage();
-                QByteArray jsonOctree;
-
-                // assume we have GZipped content
-                bool wasCompressed = gunzip(compressedOctree, jsonOctree);
-                if (!wasCompressed) {
-                    // the source was not compressed, assume we were sent regular JSON data
-                    jsonOctree = compressedOctree;
-                }
-
-                // check the JSON data to verify it is an object
-                if (QJsonDocument::fromJson(jsonOctree).isObject()) {
-                    if (!wasCompressed) {
-                        // source was not compressed, we compress it before we write it locally
-                        gzip(jsonOctree, compressedOctree);
-                    }
-
-                    // write the compressed octree data to a special file
-                    auto replacementFilePath = _persistAbsoluteFilePath.append(OctreePersistThread::REPLACEMENT_FILE_EXTENSION);
-                    QFile replacementFile(replacementFilePath);
-                    if (replacementFile.open(QIODevice::WriteOnly) && replacementFile.write(compressedOctree) != -1) {
-                        // we've now written our replacement file, time to take the server down so it can
-                        // process it when it comes back up
-                        qInfo() << "Wrote octree replacement file to" << replacementFilePath << "- stopping server";
-                        setFinished(true);
-                    } else {
-                        qWarning() << "Could not write replacement octree data to file - refusing to process";
-                    }
-                } else {
-                    qDebug() << "Received replacement octree file that is invalid - refusing to process";
-                }
+                replaceContentFromMessageData(message->getMessage());
             } else {
                 qDebug() << "Cannot perform octree file replacement since current persist file path is not yet known";
             }
@@ -977,6 +956,68 @@ void OctreeServer::handleOctreeFileReplacement(QSharedPointer<ReceivedMessage> m
     }
 }
 
+// Message->getMessage() contains a QByteArray representation of the URL to download from
+void OctreeServer::handleOctreeFileReplacementFromURL(QSharedPointer<ReceivedMessage> message) {
+    qInfo() << "Received request to replace content from a url";
+    if (!_isFinished && !_isShuttingDown) {
+        // This call comes from Interface, so we skip our domain server check
+        // but confirm that we have permissions to replace content sets
+        if (DependencyManager::get<NodeList>()->getThisNodeCanReplaceContent()) {
+            if (!_persistAbsoluteFilePath.isEmpty()) {
+                // Convert message data into our URL
+                QString url(message->getMessage());
+                QUrl modelsURL = QUrl(url, QUrl::StrictMode);
+                QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
+                QNetworkRequest request(modelsURL);
+                QNetworkReply* reply = networkAccessManager.get(request);
+                connect(reply, &QNetworkReply::finished, [this, reply, modelsURL]() {
+                    QNetworkReply::NetworkError networkError = reply->error();
+                    if (networkError == QNetworkReply::NoError) {
+                        QByteArray contents = reply->readAll();
+                        replaceContentFromMessageData(contents);
+                    } else {
+                        qDebug() << "Error downloading JSON from specified file";
+                    }
+                });
+            } else {
+                qDebug() << "Cannot perform octree file replacement since current persist file path is not yet known";
+            }
+        }
+    }
+}
+
+void OctreeServer::replaceContentFromMessageData(QByteArray content) {
+    //Assume we have compressed data
+    auto compressedOctree = content;
+    QByteArray jsonOctree;
+
+    bool wasCompressed = gunzip(compressedOctree, jsonOctree);
+    if (!wasCompressed) {
+        // the source was not compressed, assume we were sent regular JSON data
+        jsonOctree = compressedOctree;
+    }
+    // check the JSON data to verify it is an object
+    if (QJsonDocument::fromJson(jsonOctree).isObject()) {
+        if (!wasCompressed) {
+            // source was not compressed, we compress it before we write it locally
+            gzip(jsonOctree, compressedOctree);
+        }
+        // write the compressed octree data to a special file
+        auto replacementFilePath = _persistAbsoluteFilePath.append(OctreePersistThread::REPLACEMENT_FILE_EXTENSION);
+        QFile replacementFile(replacementFilePath);
+        if (replacementFile.open(QIODevice::WriteOnly) && replacementFile.write(compressedOctree) != -1) {
+            // we've now written our replacement file, time to take the server down so it can
+            // process it when it comes back up
+            qInfo() << "Wrote octree replacement file to" << replacementFilePath << "- stopping server";
+            setFinished(true);
+        } else {
+            qWarning() << "Could not write replacement octree data to file - refusing to process";
+        }
+    } else {
+        qDebug() << "Received replacement octree file that is invalid - refusing to process";
+    }
+}
+
 bool OctreeServer::readOptionBool(const QString& optionName, const QJsonObject& settingsSectionObject, bool& result) {
     result = false; // assume it doesn't exist
     bool optionAvailable = false;
@@ -1051,7 +1092,7 @@ void OctreeServer::readConfiguration() {
     if (getPayload().size() > 0) {
         parsePayload();
     }
-    
+
     const QJsonObject& settingsObject = DependencyManager::get<NodeList>()->getDomainHandler().getSettingsObject();
 
     QString settingsKey = getMyDomainSettingsKey();
@@ -1178,9 +1219,9 @@ void OctreeServer::run() {
     OctreeElement::resetPopulationStatistics();
     _tree = createTree();
     _tree->setIsServer(true);
-    
+
     qDebug() << "Waiting for connection to domain to request settings from domain-server.";
-   
+
     // wait until we have the domain-server settings, otherwise we bail
     DomainHandler& domainHandler = DependencyManager::get<NodeList>()->getDomainHandler();
     connect(&domainHandler, &DomainHandler::settingsReceived, this, &OctreeServer::domainSettingsRequestComplete);
@@ -1191,9 +1232,9 @@ void OctreeServer::run() {
 }
 
 void OctreeServer::domainSettingsRequestComplete() {
-    
+
     auto nodeList = DependencyManager::get<NodeList>();
-    
+
     // we need to ask the DS about agents so we can ping/reply with them
     nodeList->addSetOfNodeTypesToNodeInterestSet({ NodeType::Agent, NodeType::EntityScriptServer });
 
@@ -1202,26 +1243,27 @@ void OctreeServer::domainSettingsRequestComplete() {
     packetReceiver.registerListener(PacketType::OctreeDataNack, this, "handleOctreeDataNackPacket");
     packetReceiver.registerListener(PacketType::JurisdictionRequest, this, "handleJurisdictionRequestPacket");
     packetReceiver.registerListener(PacketType::OctreeFileReplacement, this, "handleOctreeFileReplacement");
-    
+    packetReceiver.registerListener(PacketType::OctreeFileReplacementFromUrl, this, "handleOctreeFileReplacementFromURL");
+
     readConfiguration();
-    
+
     beforeRun(); // after payload has been processed
-    
+
     connect(nodeList.data(), SIGNAL(nodeAdded(SharedNodePointer)), SLOT(nodeAdded(SharedNodePointer)));
     connect(nodeList.data(), SIGNAL(nodeKilled(SharedNodePointer)), SLOT(nodeKilled(SharedNodePointer)));
 
 #ifndef WIN32
     setvbuf(stdout, NULL, _IOLBF, 0);
 #endif
-    
+
     nodeList->linkedDataCreateCallback = [this](Node* node) {
         auto queryNodeData = createOctreeQueryNode();
         queryNodeData->init();
         node->setLinkedData(std::move(queryNodeData));
     };
-    
+
     srand((unsigned)time(0));
-    
+
     // if we want Persistence, set up the local file and persist thread
     if (_wantPersist) {
         // If persist filename does not exist, let's see if there is one beside the application binary
@@ -1316,24 +1358,24 @@ void OctreeServer::domainSettingsRequestComplete() {
             }
         }
         qDebug() << "Backups will be stored in: " << _backupDirectoryPath;
-        
+
         // now set up PersistThread
         _persistThread = new OctreePersistThread(_tree, _persistAbsoluteFilePath, _backupDirectoryPath, _persistInterval,
                                                  _wantBackup, _settings, _debugTimestampNow, _persistAsFileType);
         _persistThread->initialize(true);
     }
-    
+
     // set up our jurisdiction broadcaster...
     if (_jurisdiction) {
         _jurisdiction->setNodeType(getMyNodeType());
     }
     _jurisdictionSender = new JurisdictionSender(_jurisdiction, getMyNodeType());
     _jurisdictionSender->initialize(true);
-    
+
     // set up our OctreeServerPacketProcessor
     _octreeInboundPacketProcessor = new OctreeInboundPacketProcessor(this);
     _octreeInboundPacketProcessor->initialize(true);
-    
+
     // Convert now to tm struct for local timezone
     tm* localtm = localtime(&_started);
     const int MAX_TIME_LENGTH = 128;
@@ -1345,7 +1387,7 @@ void OctreeServer::domainSettingsRequestComplete() {
     if (gmtm) {
         strftime(utcBuffer, MAX_TIME_LENGTH, " [%m/%d/%Y %X UTC]", gmtm);
     }
-    
+
     qDebug() << "Now running... started at: " << localBuffer << utcBuffer;
 }
 
@@ -1356,7 +1398,7 @@ void OctreeServer::nodeAdded(SharedNodePointer node) {
 
 void OctreeServer::nodeKilled(SharedNodePointer node) {
     quint64 start  = usecTimestampNow();
-    
+
     // Shutdown send thread
     auto it = _sendThreads.find(node->getUUID());
     if (it != _sendThreads.end()) {
@@ -1402,13 +1444,13 @@ void OctreeServer::aboutToFinish() {
     if (_jurisdictionSender) {
         _jurisdictionSender->terminating();
     }
-    
+
     // Shut down all the send threads
     for (auto& it : _sendThreads) {
         auto& sendThread = *it.second;
         sendThread.setIsShuttingDown();
     }
-    
+
     // Clear will destruct all the unique_ptr to OctreeSendThreads which will call the GenericThread's dtor
     // which waits on the thread to be done before returning
     _sendThreads.clear(); // Cleans up all the send threads.
@@ -1528,7 +1570,7 @@ void OctreeServer::sendStatsPacket() {
     threadsStats["2. packetDistributor"] = (double)howManyThreadsDidPacketDistributor(oneSecondAgo);
     threadsStats["3. handlePacektSend"] = (double)howManyThreadsDidHandlePacketSend(oneSecondAgo);
     threadsStats["4. writeDatagram"] = (double)howManyThreadsDidCallWriteDatagram(oneSecondAgo);
-    
+
     QJsonObject statsArray1;
     statsArray1["1. configuration"] = getConfiguration();
     statsArray1["2. detailed_stats_url"] = getStatusLink();
@@ -1536,13 +1578,13 @@ void OctreeServer::sendStatsPacket() {
     statsArray1["4. persistFileLoadTime"] = getFileLoadTime();
     statsArray1["5. clients"] = getCurrentClientCount();
     statsArray1["6. threads"] = threadsStats;
-    
+
     // Octree Stats
     QJsonObject octreeStats;
     octreeStats["1. elementCount"] = (double)OctreeElement::getNodeCount();
     octreeStats["2. internalElementCount"] = (double)OctreeElement::getInternalNodeCount();
     octreeStats["3. leafElementCount"] = (double)OctreeElement::getLeafNodeCount();
-    
+
     // Stats Object 2
     QJsonObject dataObject1;
     dataObject1["1. totalPackets"] = (double)OctreeSendThread::_totalPackets;
@@ -1555,12 +1597,12 @@ void OctreeServer::sendStatsPacket() {
     QJsonObject timingArray1;
     timingArray1["1. avgLoopTime"] = getAverageLoopTime();
     timingArray1["2. avgInsideTime"] = getAverageInsideTime();
-    timingArray1["3. avgTreeLockTime"] = getAverageTreeWaitTime();
+    timingArray1["3. avgTreeTraverseTime"] = getAverageTreeTraverseTime();
     timingArray1["4. avgEncodeTime"] = getAverageEncodeTime();
     timingArray1["5. avgCompressAndWriteTime"] = getAverageCompressAndWriteTime();
     timingArray1["6. avgSendTime"] = getAveragePacketSendingTime();
     timingArray1["7. nodeWaitTime"] = getAverageNodeWaitTime();
-    
+
     QJsonObject statsObject2;
     statsObject2["data"] = dataObject1;
     statsObject2["timing"] = timingArray1;
@@ -1580,18 +1622,18 @@ void OctreeServer::sendStatsPacket() {
         timingArray2["4. avgProcessTimePerElement"] = (double)_octreeInboundPacketProcessor->getAverageProcessTimePerElement();
         timingArray2["5. avgLockWaitTimePerElement"] = (double)_octreeInboundPacketProcessor->getAverageLockWaitTimePerElement();
     }
-    
+
     QJsonObject statsObject3;
     statsObject3["data"] = dataArray2;
     statsObject3["timing"] = timingArray2;
-    
+
     // Merge everything
     QJsonObject jsonArray;
     jsonArray["1. misc"] = statsArray1;
     jsonArray["2. octree"] = octreeStats;
     jsonArray["3. outbound"] = statsObject2;
     jsonArray["4. inbound"] = statsObject3;
-    
+
     QJsonObject statsObject;
     statsObject[QString(getMyServerName()) + "Server"] = jsonArray;
     addPacketStatsAndSendStatsPacket(statsObject);
diff --git a/assignment-client/src/octree/OctreeServer.h b/assignment-client/src/octree/OctreeServer.h
index 8db8d845de..f930f299f3 100644
--- a/assignment-client/src/octree/OctreeServer.h
+++ b/assignment-client/src/octree/OctreeServer.h
@@ -96,6 +96,9 @@ public:
     static void trackTreeWaitTime(float time);
     static float getAverageTreeWaitTime() { return _averageTreeWaitTime.getAverage(); }
 
+    static void trackTreeTraverseTime(float time) { _averageTreeTraverseTime.updateAverage(time); }
+    static float getAverageTreeTraverseTime() { return _averageTreeTraverseTime.getAverage(); }
+
     static void trackNodeWaitTime(float time) { _averageNodeWaitTime.updateAverage(time); }
     static float getAverageNodeWaitTime() { return _averageNodeWaitTime.getAverage(); }
 
@@ -137,6 +140,7 @@ private slots:
     void handleOctreeDataNackPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode);
     void handleJurisdictionRequestPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode);
     void handleOctreeFileReplacement(QSharedPointer<ReceivedMessage> message);
+    void handleOctreeFileReplacementFromURL(QSharedPointer<ReceivedMessage> message);
     void removeSendThread();
 
 protected:
@@ -161,6 +165,8 @@ protected:
     UniqueSendThread createSendThread(const SharedNodePointer& node);
     virtual UniqueSendThread newSendThread(const SharedNodePointer& node);
 
+    void replaceContentFromMessageData(QByteArray content);
+
     int _argc;
     const char** _argv;
     char** _parsedArgV;
@@ -225,6 +231,8 @@ protected:
     static int _shortTreeWait;
     static int _noTreeWait;
 
+    static SimpleMovingAverage _averageTreeTraverseTime;
+
     static SimpleMovingAverage _averageNodeWaitTime;
 
     static SimpleMovingAverage _averageCompressAndWriteTime;
diff --git a/assignment-client/src/scripts/EntityScriptServer.cpp b/assignment-client/src/scripts/EntityScriptServer.cpp
index 489478ff9a..c8067ce81f 100644
--- a/assignment-client/src/scripts/EntityScriptServer.cpp
+++ b/assignment-client/src/scripts/EntityScriptServer.cpp
@@ -16,6 +16,7 @@
 #include <AudioConstants.h>
 #include <AudioInjectorManager.h>
 #include <ClientServerUtils.h>
+#include <DebugDraw.h>
 #include <EntityNodeData.h>
 #include <EntityScriptingInterface.h>
 #include <LogHandler.h>
@@ -29,6 +30,8 @@
 #include <UUID.h>
 #include <WebSocketServerClass.h>
 
+#include <EntityScriptClient.h> // for EntityScriptServerServices
+
 #include "EntityScriptServerLogging.h"
 #include "../entities/AssignmentParentFinder.h"
 
@@ -67,6 +70,12 @@ EntityScriptServer::EntityScriptServer(ReceivedMessage& message) : ThreadedAssig
     DependencyManager::set<ScriptCache>();
     DependencyManager::set<ScriptEngines>(ScriptEngine::ENTITY_SERVER_SCRIPT);
 
+    DependencyManager::set<EntityScriptServerServices>();
+
+
+    // Needed to ensure the creation of the DebugDraw instance on the main thread
+    DebugDraw::getInstance();
+
     auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();
     packetReceiver.registerListenerForTypes({ PacketType::OctreeStats, PacketType::EntityData, PacketType::EntityErase },
                                             this, "handleOctreePacket");
@@ -81,6 +90,7 @@ EntityScriptServer::EntityScriptServer(ReceivedMessage& message) : ThreadedAssig
     packetReceiver.registerListener(PacketType::ReloadEntityServerScript, this, "handleReloadEntityServerScriptPacket");
     packetReceiver.registerListener(PacketType::EntityScriptGetStatus, this, "handleEntityScriptGetStatusPacket");
     packetReceiver.registerListener(PacketType::EntityServerScriptLog, this, "handleEntityServerScriptLogPacket");
+    packetReceiver.registerListener(PacketType::EntityScriptCallMethod, this, "handleEntityScriptCallMethodPacket");
 
     static const int LOG_INTERVAL = MSECS_PER_SECOND / 10;
     auto timer = new QTimer(this);
@@ -98,7 +108,7 @@ static const QString ENTITY_SCRIPT_SERVER_LOGGING_NAME = "entity-script-server";
 void EntityScriptServer::handleReloadEntityServerScriptPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) {
     // These are temporary checks until we can ensure that nodes eventually disconnect if the Domain Server stops telling them
     // about each other.
-    if (senderNode->getCanRez() || senderNode->getCanRezTmp()) {
+    if (senderNode->getCanRez() || senderNode->getCanRezTmp() || senderNode->getCanRezCertified() || senderNode->getCanRezTmpCertified()) {
         auto entityID = QUuid::fromRfc4122(message->read(NUM_BYTES_RFC4122_UUID));
 
         if (_entityViewer.getTree() && !_shuttingDown) {
@@ -112,7 +122,7 @@ void EntityScriptServer::handleReloadEntityServerScriptPacket(QSharedPointer<Rec
 void EntityScriptServer::handleEntityScriptGetStatusPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) {
     // These are temporary checks until we can ensure that nodes eventually disconnect if the Domain Server stops telling them
     // about each other.
-    if (senderNode->getCanRez() || senderNode->getCanRezTmp()) {
+    if (senderNode->getCanRez() || senderNode->getCanRezTmp() || senderNode->getCanRezCertified() || senderNode->getCanRezTmpCertified()) {
         MessageID messageID;
         message->readPrimitive(&messageID);
         auto entityID = QUuid::fromRfc4122(message->read(NUM_BYTES_RFC4122_UUID));
@@ -227,6 +237,27 @@ void EntityScriptServer::pushLogs() {
     }
 }
 
+void EntityScriptServer::handleEntityScriptCallMethodPacket(QSharedPointer<ReceivedMessage> receivedMessage, SharedNodePointer senderNode) {
+
+    if (_entitiesScriptEngine && _entityViewer.getTree() && !_shuttingDown) {
+        auto entityID = QUuid::fromRfc4122(receivedMessage->read(NUM_BYTES_RFC4122_UUID));
+
+        auto method = receivedMessage->readString();
+
+        quint16 paramCount;
+        receivedMessage->readPrimitive(&paramCount);
+
+        QStringList params;
+        for (int param = 0; param < paramCount; param++) {
+            auto paramString = receivedMessage->readString();
+            params << paramString;
+        }
+
+        _entitiesScriptEngine->callEntityScriptMethod(entityID, method, params, senderNode->getUUID());
+    }
+}
+
+
 void EntityScriptServer::run() {
     // make sure we request our script once the agent connects to the domain
     auto nodeList = DependencyManager::get<NodeList>();
@@ -411,8 +442,7 @@ void EntityScriptServer::selectAudioFormat(const QString& selectedCodecName) {
 
 void EntityScriptServer::resetEntitiesScriptEngine() {
     auto engineName = QString("about:Entities %1").arg(++_entitiesScriptEngineCount);
-    auto newEngine = QSharedPointer<ScriptEngine>(new ScriptEngine(ScriptEngine::ENTITY_SERVER_SCRIPT, NO_SCRIPT, engineName),
-                                                  &ScriptEngine::deleteLater);
+    auto newEngine = scriptEngineFactory(ScriptEngine::ENTITY_SERVER_SCRIPT, NO_SCRIPT, engineName);
 
     auto webSocketServerConstructorValue = newEngine->newFunction(WebSocketServerClass::constructor);
     newEngine->globalObject().setProperty("WebSocketServer", webSocketServerConstructorValue);
@@ -433,11 +463,14 @@ void EntityScriptServer::resetEntitiesScriptEngine() {
 
 
     newEngine->runInThread();
-    DependencyManager::get<EntityScriptingInterface>()->setEntitiesScriptEngine(newEngine.data());
+    auto newEngineSP = qSharedPointerCast<EntitiesScriptEngineProvider>(newEngine);
+    DependencyManager::get<EntityScriptingInterface>()->setEntitiesScriptEngine(newEngineSP);
 
-    disconnect(_entitiesScriptEngine.data(), &ScriptEngine::entityScriptDetailsUpdated, this, &EntityScriptServer::updateEntityPPS);
+    disconnect(_entitiesScriptEngine.data(), &ScriptEngine::entityScriptDetailsUpdated,
+               this, &EntityScriptServer::updateEntityPPS);
     _entitiesScriptEngine.swap(newEngine);
-    connect(_entitiesScriptEngine.data(), &ScriptEngine::entityScriptDetailsUpdated, this, &EntityScriptServer::updateEntityPPS);
+    connect(_entitiesScriptEngine.data(), &ScriptEngine::entityScriptDetailsUpdated,
+            this, &EntityScriptServer::updateEntityPPS);
 }
 
 
@@ -555,6 +588,7 @@ void EntityScriptServer::aboutToFinish() {
     // cleanup the AudioInjectorManager (and any still running injectors)
     DependencyManager::destroy<AudioInjectorManager>();
     DependencyManager::destroy<ScriptEngines>();
+    DependencyManager::destroy<EntityScriptServerServices>();
 
     // cleanup codec & encoder
     if (_codec && _encoder) {
diff --git a/assignment-client/src/scripts/EntityScriptServer.h b/assignment-client/src/scripts/EntityScriptServer.h
index 84454375e5..f9c5e921f0 100644
--- a/assignment-client/src/scripts/EntityScriptServer.h
+++ b/assignment-client/src/scripts/EntityScriptServer.h
@@ -54,6 +54,9 @@ private slots:
 
     void pushLogs();
 
+    void handleEntityScriptCallMethodPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode);
+
+
 private:
     void negotiateAudioFormat();
     void selectAudioFormat(const QString& selectedCodecName);
@@ -72,7 +75,7 @@ private:
     bool _shuttingDown { false };
 
     static int _entitiesScriptEngineCount;
-    QSharedPointer<ScriptEngine> _entitiesScriptEngine;
+    ScriptEnginePointer _entitiesScriptEngine;
     EntityEditPacketSender _entityEditSender;
     EntityTreeHeadlessViewer _entityViewer;
 
diff --git a/cmake/android/AndroidManifest.xml.in b/cmake/android/AndroidManifest.xml.in
deleted file mode 100755
index aa834f3384..0000000000
--- a/cmake/android/AndroidManifest.xml.in
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- IMPORTANT: Do not manually manipulate this automatically generated file, changes will be gone after the next build! -->
-
-<manifest package="${ANDROID_APK_PACKAGE}" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="${ANDROID_APK_VERSION_NAME}" android:versionCode="${ANDROID_APK_VERSION_CODE}" android:installLocation="auto">
-  <application 
-    android:hardwareAccelerated="true" 
-    android:name="org.qtproject.qt5.android.bindings.QtApplication" 
-    android:label="@string/AppDisplayName" 
-    android:icon="@drawable/icon"
-    android:debuggable="${ANDROID_APK_DEBUGGABLE}">
-    
-    <!-- VR MODE -->
-    <meta-data android:name="com.samsung.android.vr.application.mode" android:value="vr_only"/>
-    
-    <activity 
-      android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation"
-      android:name="${ANDROID_ACTIVITY_NAME}"
-      android:label="@string/AppDisplayName"
-      android:screenOrientation="landscape"
-      android:launchMode="singleTop"
-      ${ANDROID_APK_THEME}>
-      
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN"/>
-        <category android:name="android.intent.category.LAUNCHER"/>
-      </intent-filter>
-      
-      <meta-data android:name="android.app.lib_name" android:value="-- %%INSERT_APP_LIB_NAME%% --"/>
-      <meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/>
-      <meta-data android:name="android.app.repository" android:value="default"/>
-      <meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>
-      <meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/>
-      <!-- Deploy Qt libs as part of package -->
-      <meta-data android:name="android.app.bundle_local_qt_libs" android:value="-- %%BUNDLE_LOCAL_QT_LIBS%% --"/>
-      <meta-data android:name="android.app.bundled_in_lib_resource_id" android:resource="@array/bundled_in_lib"/>
-      <meta-data android:name="android.app.bundled_in_assets_resource_id" android:resource="@array/bundled_in_assets"/>
-      <!-- Run with local libs -->
-      <meta-data android:name="android.app.use_local_qt_libs" android:value="-- %%USE_LOCAL_QT_LIBS%% --"/>
-      <meta-data android:name="android.app.libs_prefix" android:value="/data/local/tmp/qt/"/>
-      <meta-data android:name="android.app.load_local_libs" android:value="-- %%INSERT_LOCAL_LIBS%% --"/>
-      <meta-data android:name="android.app.load_local_jars" android:value="-- %%INSERT_LOCAL_JARS%% --"/>
-      <meta-data android:name="android.app.static_init_classes" android:value="-- %%INSERT_INIT_CLASSES%% --"/>
-      <!--  Messages maps -->
-      <meta-data android:value="@string/ministro_not_found_msg" android:name="android.app.ministro_not_found_msg"/>
-      <meta-data android:value="@string/ministro_needed_msg" android:name="android.app.ministro_needed_msg"/>
-      <meta-data android:value="@string/fatal_error_msg" android:name="android.app.fatal_error_msg"/>
-      <!--  Messages maps -->
-
-      <!-- Splash screen -->
-      <!-- <meta-data android:name="android.app.splash_screen_drawable" android:resource="@drawable/logo"/> -->
-      
-      ${ANDROID_EXTRA_ACTIVITY_XML}
-    </activity>
-    
-    <activity 
-      android:name="com.oculusvr.vrlib.PlatformActivity"
-      android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
-      android:launchMode="singleTask"
-      android:screenOrientation="landscape"
-      android:configChanges="screenSize|orientation|keyboardHidden|keyboard">
-    </activity>
-    
-    ${ANDROID_EXTRA_APPLICATION_XML}
-  </application>
-  <uses-sdk android:minSdkVersion="${ANDROID_API_LEVEL}" android:targetSdkVersion="${ANDROID_API_LEVEL}"/>
-
-  <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
-    Remove the comment if you do not require these default permissions. -->
-  <uses-permission android:name="android.permission.INTERNET" />
-  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-  <uses-permission android:name="android.permission.RECORD_AUDIO" />
-  
-  <!-- camera permission required for GEAR VR passthrough camera -->
-  <uses-permission android:name="android.permission.CAMERA" />
-
-  <!-- The following comment will be replaced upon deployment with default features based on the dependencies of the application.
-    Remove the comment if you do not require these default features. -->
-  
-  <!-- Tell the system this app requires OpenGL ES 3.0. -->
-  <uses-feature android:glEsVersion="0x00030000" android:required="true" />
-</manifest>
\ No newline at end of file
diff --git a/cmake/android/QtCreateAPK.cmake b/cmake/android/QtCreateAPK.cmake
deleted file mode 100644
index 30ee2f57bd..0000000000
--- a/cmake/android/QtCreateAPK.cmake
+++ /dev/null
@@ -1,159 +0,0 @@
-# 
-#  QtCreateAPK.cmake
-# 
-#  Created by Stephen Birarda on 11/18/14.
-#  Copyright 2013 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
-# 
-
-# 
-# OPTIONS
-# These options will modify how QtCreateAPK behaves. May be useful if somebody wants to fork.
-# For High Fidelity purposes these should not need to be changed.
-#
-set(ANDROID_THIS_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})	# Directory this CMake file is in
-
-if (POLICY CMP0026)
-  cmake_policy(SET CMP0026 OLD)
-endif () 
-
-macro(qt_create_apk)
-	if(ANDROID_APK_FULLSCREEN)
-		set(ANDROID_APK_THEME "android:theme=\"@android:style/Theme.NoTitleBar.Fullscreen\"")
-	else()
-		set(ANDROID_APK_THEME "")
-	endif()
-  
-	if (UPPER_CMAKE_BUILD_TYPE MATCHES RELEASE)
-		set(ANDROID_APK_DEBUGGABLE "false")
-		set(ANDROID_APK_RELEASE_LOCAL ${ANDROID_APK_RELEASE})
-	else ()
-		set(ANDROID_APK_DEBUGGABLE "true")
-		set(ANDROID_APK_RELEASE_LOCAL "0")
-	endif ()
-  
-	# Create "AndroidManifest.xml"
-	configure_file("${ANDROID_THIS_DIRECTORY}/AndroidManifest.xml.in" "${ANDROID_APK_BUILD_DIR}/AndroidManifest.xml")
-  
-  # create "strings.xml"
-  configure_file("${ANDROID_THIS_DIRECTORY}/strings.xml.in" "${ANDROID_APK_BUILD_DIR}/res/values/strings.xml")
-  
-  # find androiddeployqt
-  find_program(ANDROID_DEPLOY_QT androiddeployqt HINTS "${QT_DIR}/bin")
-  
-  # set the path to our app shared library
-  set(EXECUTABLE_DESTINATION_PATH "${ANDROID_APK_OUTPUT_DIR}/libs/${ANDROID_ABI}/lib${TARGET_NAME}.so")
-  
-  # add our dependencies to the deployment file
-  get_property(_DEPENDENCIES TARGET ${TARGET_NAME} PROPERTY INTERFACE_LINK_LIBRARIES)
-  
-  foreach(_IGNORE_COPY IN LISTS IGNORE_COPY_LIBS)
-    list(REMOVE_ITEM _DEPENDENCIES ${_IGNORE_COPY})
-  endforeach()
-  
-  foreach(_DEP IN LISTS _DEPENDENCIES)
-    if (NOT TARGET ${_DEP})
-      list(APPEND _DEPS_LIST ${_DEP})
-    else ()
-      if(NOT _DEP MATCHES "Qt5::.*")
-        get_property(_DEP_LOCATION TARGET ${_DEP} PROPERTY "LOCATION_${CMAKE_BUILD_TYPE}")
-        
-        # recurisvely add libraries which are dependencies of this target
-        get_property(_DEP_DEPENDENCIES TARGET ${_DEP} PROPERTY INTERFACE_LINK_LIBRARIES)
-      
-        foreach(_SUB_DEP IN LISTS _DEP_DEPENDENCIES)
-          if (NOT TARGET ${_SUB_DEP} AND NOT _SUB_DEP MATCHES "Qt5::.*")
-            list(APPEND _DEPS_LIST ${_SUB_DEP})
-          endif()
-        endforeach()
-        
-        list(APPEND _DEPS_LIST ${_DEP_LOCATION})
-      endif()
-    endif ()
-  endforeach()
-  
-  list(REMOVE_DUPLICATES _DEPS_LIST)
-  
-  # just copy static libs to apk libs folder - don't add to deps list
-  foreach(_LOCATED_DEP IN LISTS _DEPS_LIST)
-    if (_LOCATED_DEP MATCHES "\\.a$")
-      add_custom_command(
-        TARGET ${TARGET_NAME}
-        POST_BUILD
-	      COMMAND ${CMAKE_COMMAND} -E copy ${_LOCATED_DEP} "${ANDROID_APK_OUTPUT_DIR}/libs/${ANDROID_ABI}"
-		  )
-      list(REMOVE_ITEM _DEPS_LIST ${_LOCATED_DEP})
-    endif ()
-  endforeach()
-  
-  string(REPLACE ";" "," _DEPS "${_DEPS_LIST}")
-  
-  configure_file("${ANDROID_THIS_DIRECTORY}/deployment-file.json.in" "${TARGET_NAME}-deployment.json")
-  
-  # copy the res folder from the target to the apk build dir
-  add_custom_target(
-    ${TARGET_NAME}-copy-res
-    COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/res" "${ANDROID_APK_BUILD_DIR}/res"
-  )
-  
-  # copy the assets folder from the target to the apk build dir
-  add_custom_target(
-    ${TARGET_NAME}-copy-assets
-    COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/assets" "${ANDROID_APK_BUILD_DIR}/assets"
-  )
-  
-  # copy the java folder from src to the apk build dir
-  add_custom_target(
-    ${TARGET_NAME}-copy-java
-    COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/src/java" "${ANDROID_APK_BUILD_DIR}/src"
-  )
-  
-  # copy the libs folder from src to the apk build dir
-  add_custom_target(
-    ${TARGET_NAME}-copy-libs
-    COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/libs" "${ANDROID_APK_BUILD_DIR}/libs"
-  )
-  
-  # handle setup for ndk-gdb
-  add_custom_target(${TARGET_NAME}-gdb DEPENDS ${TARGET_NAME})
-  
-  if (ANDROID_APK_DEBUGGABLE)
-    get_property(TARGET_LOCATION TARGET ${TARGET_NAME} PROPERTY LOCATION)
-  
-    set(GDB_SOLIB_PATH ${ANDROID_APK_BUILD_DIR}/obj/local/${ANDROID_NDK_ABI_NAME}/)
-
-    # generate essential Android Makefiles
-    file(WRITE ${ANDROID_APK_BUILD_DIR}/jni/Android.mk "APP_ABI := ${ANDROID_NDK_ABI_NAME}\n")
-    file(WRITE ${ANDROID_APK_BUILD_DIR}/jni/Application.mk "APP_ABI := ${ANDROID_NDK_ABI_NAME}\n")
-  
-    # create gdb.setup
-    get_directory_property(PROJECT_INCLUDES DIRECTORY ${PROJECT_SOURCE_DIR} INCLUDE_DIRECTORIES)
-    string(REGEX REPLACE ";" " " PROJECT_INCLUDES "${PROJECT_INCLUDES}")
-    file(WRITE ${ANDROID_APK_BUILD_DIR}/libs/${ANDROID_NDK_ABI_NAME}/gdb.setup "set solib-search-path ${GDB_SOLIB_PATH}\n")
-    file(APPEND ${ANDROID_APK_BUILD_DIR}/libs/${ANDROID_NDK_ABI_NAME}/gdb.setup "directory ${PROJECT_INCLUDES}\n")
-  
-    # copy lib to obj
-    add_custom_command(TARGET ${TARGET_NAME}-gdb PRE_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory ${GDB_SOLIB_PATH})
-    add_custom_command(TARGET ${TARGET_NAME}-gdb PRE_BUILD COMMAND cp ${TARGET_LOCATION} ${GDB_SOLIB_PATH})
-  
-    # strip symbols
-    add_custom_command(TARGET ${TARGET_NAME}-gdb PRE_BUILD COMMAND ${CMAKE_STRIP} ${TARGET_LOCATION})
-  endif () 
-  
-  # use androiddeployqt to create the apk
-  add_custom_target(${TARGET_NAME}-apk
-    COMMAND ${ANDROID_DEPLOY_QT} --input "${TARGET_NAME}-deployment.json" --output "${ANDROID_APK_OUTPUT_DIR}" --android-platform android-${ANDROID_API_LEVEL} ${ANDROID_DEPLOY_QT_INSTALL} --verbose --deployment bundled "\\$(ARGS)"
-    DEPENDS ${TARGET_NAME} ${TARGET_NAME}-copy-res ${TARGET_NAME}-copy-assets ${TARGET_NAME}-copy-java ${TARGET_NAME}-copy-libs ${TARGET_NAME}-gdb
-  )
-  
-  # rename the APK if the caller asked us to
-  if (ANDROID_APK_CUSTOM_NAME) 
-    add_custom_command(
-      TARGET ${TARGET_NAME}-apk
-      POST_BUILD
-      COMMAND ${CMAKE_COMMAND} -E rename "${ANDROID_APK_OUTPUT_DIR}/bin/QtApp-debug.apk" "${ANDROID_APK_OUTPUT_DIR}/bin/${ANDROID_APK_CUSTOM_NAME}"
-    )
-  endif ()
-endmacro()
\ No newline at end of file
diff --git a/cmake/android/android.toolchain.cmake b/cmake/android/android.toolchain.cmake
deleted file mode 100755
index 806cef6b18..0000000000
--- a/cmake/android/android.toolchain.cmake
+++ /dev/null
@@ -1,1725 +0,0 @@
-# Copyright (c) 2010-2011, Ethan Rublee
-# Copyright (c) 2011-2014, Andrey Kamaev
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1.  Redistributions of source code must retain the above copyright notice,
-#     this list of conditions and the following disclaimer.
-#
-# 2.  Redistributions in binary form must reproduce the above copyright notice,
-#     this list of conditions and the following disclaimer in the documentation
-#     and/or other materials provided with the distribution.
-#
-# 3.  Neither the name of the copyright holder nor the names of its
-#     contributors may be used to endorse or promote products derived from this
-#     software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-# ------------------------------------------------------------------------------
-#  Android CMake toolchain file, for use with the Android NDK r5-r10d
-#  Requires cmake 2.6.3 or newer (2.8.9 or newer is recommended).
-#  See home page: https://github.com/taka-no-me/android-cmake
-#
-#  Usage Linux:
-#   $ export ANDROID_NDK=/absolute/path/to/the/android-ndk
-#   $ mkdir build && cd build
-#   $ cmake -DCMAKE_TOOLCHAIN_FILE=path/to/the/android.toolchain.cmake ..
-#   $ make -j8
-#
-#  Usage Windows:
-#     You need native port of make to build your project.
-#     Android NDK r7 (and newer) already has make.exe on board.
-#     For older NDK you have to install it separately.
-#     For example, this one: http://gnuwin32.sourceforge.net/packages/make.htm
-#
-#   $ SET ANDROID_NDK=C:\absolute\path\to\the\android-ndk
-#   $ mkdir build && cd build
-#   $ cmake.exe -G"MinGW Makefiles"
-#       -DCMAKE_TOOLCHAIN_FILE=path\to\the\android.toolchain.cmake
-#       -DCMAKE_MAKE_PROGRAM="%ANDROID_NDK%\prebuilt\windows\bin\make.exe" ..
-#   $ cmake.exe --build .
-#
-#
-#  Options (can be set as cmake parameters: -D<option_name>=<value>):
-#    ANDROID_NDK=/opt/android-ndk - path to the NDK root.
-#      Can be set as environment variable. Can be set only at first cmake run.
-#
-#    ANDROID_ABI=armeabi-v7a - specifies the target Application Binary
-#      Interface (ABI). This option nearly matches to the APP_ABI variable
-#      used by ndk-build tool from Android NDK.
-#
-#      Possible targets are:
-#        "armeabi" - ARMv5TE based CPU with software floating point operations
-#        "armeabi-v7a" - ARMv7 based devices with hardware FPU instructions
-#            this ABI target is used by default
-#        "armeabi-v7a with NEON" - same as armeabi-v7a, but
-#            sets NEON as floating-point unit
-#        "armeabi-v7a with VFPV3" - same as armeabi-v7a, but
-#            sets VFPV3 as floating-point unit (has 32 registers instead of 16)
-#        "armeabi-v6 with VFP" - tuned for ARMv6 processors having VFP
-#        "x86" - IA-32 instruction set
-#        "mips" - MIPS32 instruction set
-#
-#      64-bit ABIs for NDK r10 and newer:
-#        "arm64-v8a" - ARMv8 AArch64 instruction set
-#        "x86_64" - Intel64 instruction set (r1)
-#        "mips64" - MIPS64 instruction set (r6)
-#
-#    ANDROID_NATIVE_API_LEVEL=android-8 - level of Android API compile for.
-#      Option is read-only when standalone toolchain is used.
-#      Note: building for "android-L" requires explicit configuration.
-#
-#    ANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-4.9 - the name of compiler
-#      toolchain to be used. The list of possible values depends on the NDK
-#      version. For NDK r10c the possible values are:
-#
-#        * aarch64-linux-android-4.9
-#        * aarch64-linux-android-clang3.4
-#        * aarch64-linux-android-clang3.5
-#        * arm-linux-androideabi-4.6
-#        * arm-linux-androideabi-4.8
-#        * arm-linux-androideabi-4.9 (default)
-#        * arm-linux-androideabi-clang3.4
-#        * arm-linux-androideabi-clang3.5
-#        * mips64el-linux-android-4.9
-#        * mips64el-linux-android-clang3.4
-#        * mips64el-linux-android-clang3.5
-#        * mipsel-linux-android-4.6
-#        * mipsel-linux-android-4.8
-#        * mipsel-linux-android-4.9
-#        * mipsel-linux-android-clang3.4
-#        * mipsel-linux-android-clang3.5
-#        * x86-4.6
-#        * x86-4.8
-#        * x86-4.9
-#        * x86-clang3.4
-#        * x86-clang3.5
-#        * x86_64-4.9
-#        * x86_64-clang3.4
-#        * x86_64-clang3.5
-#
-#    ANDROID_FORCE_ARM_BUILD=OFF - set ON to generate 32-bit ARM instructions
-#      instead of Thumb. Is not available for "armeabi-v6 with VFP"
-#      (is forced to be ON) ABI.
-#
-#    ANDROID_NO_UNDEFINED=ON - set ON to show all undefined symbols as linker
-#      errors even if they are not used.
-#
-#    ANDROID_SO_UNDEFINED=OFF - set ON to allow undefined symbols in shared
-#      libraries. Automatically turned for NDK r5x and r6x due to GLESv2
-#      problems.
-#
-#    ANDROID_STL=gnustl_static - specify the runtime to use.
-#
-#      Possible values are:
-#        none           -> Do not configure the runtime.
-#        system         -> Use the default minimal system C++ runtime library.
-#                          Implies -fno-rtti -fno-exceptions.
-#                          Is not available for standalone toolchain.
-#        system_re      -> Use the default minimal system C++ runtime library.
-#                          Implies -frtti -fexceptions.
-#                          Is not available for standalone toolchain.
-#        gabi++_static  -> Use the GAbi++ runtime as a static library.
-#                          Implies -frtti -fno-exceptions.
-#                          Available for NDK r7 and newer.
-#                          Is not available for standalone toolchain.
-#        gabi++_shared  -> Use the GAbi++ runtime as a shared library.
-#                          Implies -frtti -fno-exceptions.
-#                          Available for NDK r7 and newer.
-#                          Is not available for standalone toolchain.
-#        stlport_static -> Use the STLport runtime as a static library.
-#                          Implies -fno-rtti -fno-exceptions for NDK before r7.
-#                          Implies -frtti -fno-exceptions for NDK r7 and newer.
-#                          Is not available for standalone toolchain.
-#        stlport_shared -> Use the STLport runtime as a shared library.
-#                          Implies -fno-rtti -fno-exceptions for NDK before r7.
-#                          Implies -frtti -fno-exceptions for NDK r7 and newer.
-#                          Is not available for standalone toolchain.
-#        gnustl_static  -> Use the GNU STL as a static library.
-#                          Implies -frtti -fexceptions.
-#        gnustl_shared  -> Use the GNU STL as a shared library.
-#                          Implies -frtti -fno-exceptions.
-#                          Available for NDK r7b and newer.
-#                          Silently degrades to gnustl_static if not available.
-#        c++_static     -> Use the LLVM libc++ runtime as a static library.
-#        c++_shared     -> Use the LLVM libc++ runtime as a shared library.
-#
-#    ANDROID_STL_FORCE_FEATURES=ON - turn rtti and exceptions support based on
-#      chosen runtime. If disabled, then the user is responsible for settings
-#      these options.
-#
-#  What?:
-#    android-cmake toolchain searches for NDK/toolchain in the following order:
-#      ANDROID_NDK - cmake parameter
-#      ANDROID_NDK - environment variable
-#      ANDROID_STANDALONE_TOOLCHAIN - cmake parameter
-#      ANDROID_STANDALONE_TOOLCHAIN - environment variable
-#      ANDROID_NDK - default locations
-#      ANDROID_STANDALONE_TOOLCHAIN - default locations
-#
-#    Make sure to do the following in your scripts:
-#      SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${my_cxx_flags}" )
-#      SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${my_cxx_flags}" )
-#    The flags will be prepopulated with critical flags, so don't loose them.
-#    Also be aware that toolchain also sets configuration-specific compiler
-#    flags and linker flags.
-#
-#    ANDROID and BUILD_ANDROID will be set to true, you may test any of these
-#    variables to make necessary Android-specific configuration changes.
-#
-#    Also ARMEABI or ARMEABI_V7A or X86 or MIPS or ARM64_V8A or X86_64 or MIPS64
-#    will be set true, mutually exclusive. NEON option will be set true
-#    if VFP is set to NEON.
-#
-# ------------------------------------------------------------------------------
-
-cmake_minimum_required( VERSION 2.6.3 )
-
-if( DEFINED CMAKE_CROSSCOMPILING )
- # subsequent toolchain loading is not really needed
- return()
-endif()
-
-if( CMAKE_TOOLCHAIN_FILE )
- # touch toolchain variable to suppress "unused variable" warning
-endif()
-
-# inherit settings in recursive loads
-get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE )
-if( _CMAKE_IN_TRY_COMPILE )
- include( "${CMAKE_CURRENT_SOURCE_DIR}/../android.toolchain.config.cmake" OPTIONAL )
-endif()
-
-# this one is important
-if( CMAKE_VERSION VERSION_GREATER "3.0.99" )
- set( CMAKE_SYSTEM_NAME Android )
-else()
- set( CMAKE_SYSTEM_NAME Linux )
-endif()
-
-# this one not so much
-set( CMAKE_SYSTEM_VERSION 1 )
-
-# rpath makes low sense for Android
-set( CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "" )
-set( CMAKE_SKIP_RPATH TRUE CACHE BOOL "If set, runtime paths are not added when using shared libraries." )
-
-# NDK search paths
-set( ANDROID_SUPPORTED_NDK_VERSIONS ${ANDROID_EXTRA_NDK_VERSIONS} -r10d -r10c -r10b -r10 -r9d -r9c -r9b -r9 -r8e -r8d -r8c -r8b -r8 -r7c -r7b -r7 -r6b -r6 -r5c -r5b -r5 "" )
-if( NOT DEFINED ANDROID_NDK_SEARCH_PATHS )
- if( CMAKE_HOST_WIN32 )
-  file( TO_CMAKE_PATH "$ENV{PROGRAMFILES}" ANDROID_NDK_SEARCH_PATHS )
-  set( ANDROID_NDK_SEARCH_PATHS "${ANDROID_NDK_SEARCH_PATHS}" "$ENV{SystemDrive}/NVPACK" )
- else()
-  file( TO_CMAKE_PATH "$ENV{HOME}" ANDROID_NDK_SEARCH_PATHS )
-  set( ANDROID_NDK_SEARCH_PATHS /opt "${ANDROID_NDK_SEARCH_PATHS}/NVPACK" )
- endif()
-endif()
-if( NOT DEFINED ANDROID_STANDALONE_TOOLCHAIN_SEARCH_PATH )
- set( ANDROID_STANDALONE_TOOLCHAIN_SEARCH_PATH /opt/android-toolchain )
-endif()
-
-# known ABIs
-set( ANDROID_SUPPORTED_ABIS_arm "armeabi-v7a;armeabi;armeabi-v7a with NEON;armeabi-v7a with VFPV3;armeabi-v6 with VFP" )
-set( ANDROID_SUPPORTED_ABIS_arm64 "arm64-v8a" )
-set( ANDROID_SUPPORTED_ABIS_x86 "x86" )
-set( ANDROID_SUPPORTED_ABIS_x86_64 "x86_64" )
-set( ANDROID_SUPPORTED_ABIS_mips "mips" )
-set( ANDROID_SUPPORTED_ABIS_mips64 "mips64" )
-
-# API level defaults
-set( ANDROID_DEFAULT_NDK_API_LEVEL 8 )
-set( ANDROID_DEFAULT_NDK_API_LEVEL_arm64 21 )
-set( ANDROID_DEFAULT_NDK_API_LEVEL_x86 9 )
-set( ANDROID_DEFAULT_NDK_API_LEVEL_x86_64 21 )
-set( ANDROID_DEFAULT_NDK_API_LEVEL_mips 9 )
-set( ANDROID_DEFAULT_NDK_API_LEVEL_mips64 21 )
-
-
-macro( __LIST_FILTER listvar regex )
-  if( ${listvar} )
-    foreach( __val ${${listvar}} )
-      if( __val MATCHES "${regex}" )
-        list( REMOVE_ITEM ${listvar} "${__val}" )
-      endif()
-    endforeach()
-  endif()
-endmacro()
-
-macro( __INIT_VARIABLE var_name )
-  set( __test_path 0 )
-  foreach( __var ${ARGN} )
-    if( __var STREQUAL "PATH" )
-      set( __test_path 1 )
-      break()
-    endif()
-  endforeach()
-
-  if( __test_path AND NOT EXISTS "${${var_name}}" )
-    unset( ${var_name} CACHE )
-  endif()
-
-  if( " ${${var_name}}" STREQUAL " " )
-    set( __values 0 )
-    foreach( __var ${ARGN} )
-      if( __var STREQUAL "VALUES" )
-        set( __values 1 )
-      elseif( NOT __var STREQUAL "PATH" )
-        if( __var MATCHES "^ENV_.*$" )
-          string( REPLACE "ENV_" "" __var "${__var}" )
-          set( __value "$ENV{${__var}}" )
-        elseif( DEFINED ${__var} )
-          set( __value "${${__var}}" )
-        elseif( __values )
-          set( __value "${__var}" )
-        else()
-          set( __value "" )
-        endif()
-
-        if( NOT " ${__value}" STREQUAL " " AND (NOT __test_path OR EXISTS "${__value}") )
-          set( ${var_name} "${__value}" )
-          break()
-        endif()
-      endif()
-    endforeach()
-    unset( __value )
-    unset( __values )
-  endif()
-
-  if( __test_path )
-    file( TO_CMAKE_PATH "${${var_name}}" ${var_name} )
-  endif()
-  unset( __test_path )
-endmacro()
-
-macro( __DETECT_NATIVE_API_LEVEL _var _path )
-  set( __ndkApiLevelRegex "^[\t ]*#define[\t ]+__ANDROID_API__[\t ]+([0-9]+)[\t ]*.*$" )
-  file( STRINGS ${_path} __apiFileContent REGEX "${__ndkApiLevelRegex}" )
-  if( NOT __apiFileContent )
-    message( SEND_ERROR "Could not get Android native API level. Probably you have specified invalid level value, or your copy of NDK/toolchain is broken." )
-  endif()
-  string( REGEX REPLACE "${__ndkApiLevelRegex}" "\\1" ${_var} "${__apiFileContent}" )
-  unset( __apiFileContent )
-  unset( __ndkApiLevelRegex )
-endmacro()
-
-macro( __DETECT_TOOLCHAIN_MACHINE_NAME _var _root )
- if( EXISTS "${_root}" )
-    file( GLOB __gccExePath RELATIVE "${_root}/bin/" "${_root}/bin/*-gcc${TOOL_OS_SUFFIX}" )
-    __LIST_FILTER( __gccExePath "^[.].*" )
-    list( LENGTH __gccExePath __gccExePathsCount )
-    if( NOT __gccExePathsCount EQUAL 1  AND NOT _CMAKE_IN_TRY_COMPILE )
-      message( WARNING "Could not determine machine name for compiler from ${_root}" )
-      set( ${_var} "" )
-    else()
-      get_filename_component( __gccExeName "${__gccExePath}" NAME_WE )
-      string( REPLACE "-gcc" "" ${_var} "${__gccExeName}" )
-    endif()
-    unset( __gccExePath )
-    unset( __gccExePathsCount )
-    unset( __gccExeName )
-  else()
-    set( ${_var} "" )
-  endif()
-endmacro()
-
-
-# fight against cygwin
-set( ANDROID_FORBID_SYGWIN TRUE CACHE BOOL "Prevent cmake from working under cygwin and using cygwin tools")
-mark_as_advanced( ANDROID_FORBID_SYGWIN )
-if( ANDROID_FORBID_SYGWIN )
- if( CYGWIN )
-  message( FATAL_ERROR "Android NDK and android-cmake toolchain are not welcome Cygwin. It is unlikely that this cmake toolchain will work under cygwin. But if you want to try then you can set cmake variable ANDROID_FORBID_SYGWIN to FALSE and rerun cmake." )
- endif()
-
- if( CMAKE_HOST_WIN32 )
-  # remove cygwin from PATH
-  set( __new_path "$ENV{PATH}")
-  __LIST_FILTER( __new_path "cygwin" )
-  set(ENV{PATH} "${__new_path}")
-  unset(__new_path)
- endif()
-endif()
-
-
-# detect current host platform
-if( NOT DEFINED ANDROID_NDK_HOST_X64 AND (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "amd64|x86_64|AMD64" OR CMAKE_HOST_APPLE) )
- set( ANDROID_NDK_HOST_X64 1 CACHE BOOL "Try to use 64-bit compiler toolchain" )
- mark_as_advanced( ANDROID_NDK_HOST_X64 )
-endif()
-
-set( TOOL_OS_SUFFIX "" )
-if( CMAKE_HOST_APPLE )
- set( ANDROID_NDK_HOST_SYSTEM_NAME "darwin-x86_64" )
- set( ANDROID_NDK_HOST_SYSTEM_NAME2 "darwin-x86" )
-elseif( CMAKE_HOST_WIN32 )
- set( ANDROID_NDK_HOST_SYSTEM_NAME "windows-x86_64" )
- set( ANDROID_NDK_HOST_SYSTEM_NAME2 "windows" )
- set( TOOL_OS_SUFFIX ".exe" )
-elseif( CMAKE_HOST_UNIX )
- set( ANDROID_NDK_HOST_SYSTEM_NAME "linux-x86_64" )
- set( ANDROID_NDK_HOST_SYSTEM_NAME2 "linux-x86" )
-else()
- message( FATAL_ERROR "Cross-compilation on your platform is not supported by this cmake toolchain" )
-endif()
-
-if( NOT ANDROID_NDK_HOST_X64 )
- set( ANDROID_NDK_HOST_SYSTEM_NAME ${ANDROID_NDK_HOST_SYSTEM_NAME2} )
-endif()
-
-# see if we have path to Android NDK
-if( NOT ANDROID_NDK AND NOT ANDROID_STANDALONE_TOOLCHAIN )
-  __INIT_VARIABLE( ANDROID_NDK PATH ENV_ANDROID_NDK )
-endif()
-if( NOT ANDROID_NDK )
- # see if we have path to Android standalone toolchain
- __INIT_VARIABLE( ANDROID_STANDALONE_TOOLCHAIN PATH ENV_ANDROID_STANDALONE_TOOLCHAIN )
-
- if( NOT ANDROID_STANDALONE_TOOLCHAIN )
-  #try to find Android NDK in one of the the default locations
-  set( __ndkSearchPaths )
-  foreach( __ndkSearchPath ${ANDROID_NDK_SEARCH_PATHS} )
-   foreach( suffix ${ANDROID_SUPPORTED_NDK_VERSIONS} )
-    list( APPEND __ndkSearchPaths "${__ndkSearchPath}/android-ndk${suffix}" )
-   endforeach()
-  endforeach()
-  __INIT_VARIABLE( ANDROID_NDK PATH VALUES ${__ndkSearchPaths} )
-  unset( __ndkSearchPaths )
-
-  if( ANDROID_NDK )
-   message( STATUS "Using default path for Android NDK: ${ANDROID_NDK}" )
-   message( STATUS "  If you prefer to use a different location, please define a cmake or environment variable: ANDROID_NDK" )
-  else()
-   #try to find Android standalone toolchain in one of the the default locations
-   __INIT_VARIABLE( ANDROID_STANDALONE_TOOLCHAIN PATH ANDROID_STANDALONE_TOOLCHAIN_SEARCH_PATH )
-
-   if( ANDROID_STANDALONE_TOOLCHAIN )
-    message( STATUS "Using default path for standalone toolchain ${ANDROID_STANDALONE_TOOLCHAIN}" )
-    message( STATUS "  If you prefer to use a different location, please define the variable: ANDROID_STANDALONE_TOOLCHAIN" )
-   endif( ANDROID_STANDALONE_TOOLCHAIN )
-  endif( ANDROID_NDK )
- endif( NOT ANDROID_STANDALONE_TOOLCHAIN )
-endif( NOT ANDROID_NDK )
-
-# remember found paths
-if( ANDROID_NDK )
- get_filename_component( ANDROID_NDK "${ANDROID_NDK}" ABSOLUTE )
- set( ANDROID_NDK "${ANDROID_NDK}" CACHE INTERNAL "Path of the Android NDK" FORCE )
- set( BUILD_WITH_ANDROID_NDK True )
- if( EXISTS "${ANDROID_NDK}/RELEASE.TXT" )
-  file( STRINGS "${ANDROID_NDK}/RELEASE.TXT" ANDROID_NDK_RELEASE_FULL LIMIT_COUNT 1 REGEX "r[0-9]+[a-z]?" )
-  string( REGEX MATCH "r([0-9]+)([a-z]?)" ANDROID_NDK_RELEASE "${ANDROID_NDK_RELEASE_FULL}" )
- else()
-  set( ANDROID_NDK_RELEASE "r1x" )
-  set( ANDROID_NDK_RELEASE_FULL "unreleased" )
- endif()
- string( REGEX REPLACE "r([0-9]+)([a-z]?)" "\\1*1000" ANDROID_NDK_RELEASE_NUM "${ANDROID_NDK_RELEASE}" )
- string( FIND " abcdefghijklmnopqastuvwxyz" "${CMAKE_MATCH_2}" __ndkReleaseLetterNum )
- math( EXPR ANDROID_NDK_RELEASE_NUM "${ANDROID_NDK_RELEASE_NUM}+${__ndkReleaseLetterNum}" )
-elseif( ANDROID_STANDALONE_TOOLCHAIN )
- get_filename_component( ANDROID_STANDALONE_TOOLCHAIN "${ANDROID_STANDALONE_TOOLCHAIN}" ABSOLUTE )
- # try to detect change
- if( CMAKE_AR )
-  string( LENGTH "${ANDROID_STANDALONE_TOOLCHAIN}" __length )
-  string( SUBSTRING "${CMAKE_AR}" 0 ${__length} __androidStandaloneToolchainPreviousPath )
-  if( NOT __androidStandaloneToolchainPreviousPath STREQUAL ANDROID_STANDALONE_TOOLCHAIN )
-   message( FATAL_ERROR "It is not possible to change path to the Android standalone toolchain on subsequent run." )
-  endif()
-  unset( __androidStandaloneToolchainPreviousPath )
-  unset( __length )
- endif()
- set( ANDROID_STANDALONE_TOOLCHAIN "${ANDROID_STANDALONE_TOOLCHAIN}" CACHE INTERNAL "Path of the Android standalone toolchain" FORCE )
- set( BUILD_WITH_STANDALONE_TOOLCHAIN True )
-else()
- list(GET ANDROID_NDK_SEARCH_PATHS 0 ANDROID_NDK_SEARCH_PATH)
- message( FATAL_ERROR "Could not find neither Android NDK nor Android standalone toolchain.
-    You should either set an environment variable:
-      export ANDROID_NDK=~/my-android-ndk
-    or
-      export ANDROID_STANDALONE_TOOLCHAIN=~/my-android-toolchain
-    or put the toolchain or NDK in the default path:
-      sudo ln -s ~/my-android-ndk ${ANDROID_NDK_SEARCH_PATH}/android-ndk
-      sudo ln -s ~/my-android-toolchain ${ANDROID_STANDALONE_TOOLCHAIN_SEARCH_PATH}" )
-endif()
-
-# android NDK layout
-if( BUILD_WITH_ANDROID_NDK )
- if( NOT DEFINED ANDROID_NDK_LAYOUT )
-  # try to automatically detect the layout
-  if( EXISTS "${ANDROID_NDK}/RELEASE.TXT")
-   set( ANDROID_NDK_LAYOUT "RELEASE" )
-  elseif( EXISTS "${ANDROID_NDK}/../../linux-x86/toolchain/" )
-   set( ANDROID_NDK_LAYOUT "LINARO" )
-  elseif( EXISTS "${ANDROID_NDK}/../../gcc/" )
-   set( ANDROID_NDK_LAYOUT "ANDROID" )
-  endif()
- endif()
- set( ANDROID_NDK_LAYOUT "${ANDROID_NDK_LAYOUT}" CACHE STRING "The inner layout of NDK" )
- mark_as_advanced( ANDROID_NDK_LAYOUT )
- if( ANDROID_NDK_LAYOUT STREQUAL "LINARO" )
-  set( ANDROID_NDK_HOST_SYSTEM_NAME ${ANDROID_NDK_HOST_SYSTEM_NAME2} ) # only 32-bit at the moment
-  set( ANDROID_NDK_TOOLCHAINS_PATH "${ANDROID_NDK}/../../${ANDROID_NDK_HOST_SYSTEM_NAME}/toolchain" )
-  set( ANDROID_NDK_TOOLCHAINS_SUBPATH  "" )
-  set( ANDROID_NDK_TOOLCHAINS_SUBPATH2 "" )
- elseif( ANDROID_NDK_LAYOUT STREQUAL "ANDROID" )
-  set( ANDROID_NDK_HOST_SYSTEM_NAME ${ANDROID_NDK_HOST_SYSTEM_NAME2} ) # only 32-bit at the moment
-  set( ANDROID_NDK_TOOLCHAINS_PATH "${ANDROID_NDK}/../../gcc/${ANDROID_NDK_HOST_SYSTEM_NAME}/arm" )
-  set( ANDROID_NDK_TOOLCHAINS_SUBPATH  "" )
-  set( ANDROID_NDK_TOOLCHAINS_SUBPATH2 "" )
- else() # ANDROID_NDK_LAYOUT STREQUAL "RELEASE"
-  set( ANDROID_NDK_TOOLCHAINS_PATH "${ANDROID_NDK}/toolchains" )
-  set( ANDROID_NDK_TOOLCHAINS_SUBPATH  "/prebuilt/${ANDROID_NDK_HOST_SYSTEM_NAME}" )
-  set( ANDROID_NDK_TOOLCHAINS_SUBPATH2 "/prebuilt/${ANDROID_NDK_HOST_SYSTEM_NAME2}" )
- endif()
- get_filename_component( ANDROID_NDK_TOOLCHAINS_PATH "${ANDROID_NDK_TOOLCHAINS_PATH}" ABSOLUTE )
-
- # try to detect change of NDK
- if( CMAKE_AR )
-  string( LENGTH "${ANDROID_NDK_TOOLCHAINS_PATH}" __length )
-  string( SUBSTRING "${CMAKE_AR}" 0 ${__length} __androidNdkPreviousPath )
-  if( NOT __androidNdkPreviousPath STREQUAL ANDROID_NDK_TOOLCHAINS_PATH )
-   message( FATAL_ERROR "It is not possible to change the path to the NDK on subsequent CMake run. You must remove all generated files from your build folder first.
-   " )
-  endif()
-  unset( __androidNdkPreviousPath )
-  unset( __length )
- endif()
-endif()
-
-
-# get all the details about standalone toolchain
-if( BUILD_WITH_STANDALONE_TOOLCHAIN )
- __DETECT_NATIVE_API_LEVEL( ANDROID_SUPPORTED_NATIVE_API_LEVELS "${ANDROID_STANDALONE_TOOLCHAIN}/sysroot/usr/include/android/api-level.h" )
- set( ANDROID_STANDALONE_TOOLCHAIN_API_LEVEL ${ANDROID_SUPPORTED_NATIVE_API_LEVELS} )
- set( __availableToolchains "standalone" )
- __DETECT_TOOLCHAIN_MACHINE_NAME( __availableToolchainMachines "${ANDROID_STANDALONE_TOOLCHAIN}" )
- if( NOT __availableToolchainMachines )
-  message( FATAL_ERROR "Could not determine machine name of your toolchain. Probably your Android standalone toolchain is broken." )
- endif()
- if( __availableToolchainMachines MATCHES x86_64 )
-  set( __availableToolchainArchs "x86_64" )
- elseif( __availableToolchainMachines MATCHES i686 )
-  set( __availableToolchainArchs "x86" )
- elseif( __availableToolchainMachines MATCHES aarch64 )
-  set( __availableToolchainArchs "arm64" )
- elseif( __availableToolchainMachines MATCHES arm )
-  set( __availableToolchainArchs "arm" )
- elseif( __availableToolchainMachines MATCHES mips64el )
-  set( __availableToolchainArchs "mips64" )
- elseif( __availableToolchainMachines MATCHES mipsel )
-  set( __availableToolchainArchs "mips" )
- endif()
- execute_process( COMMAND "${ANDROID_STANDALONE_TOOLCHAIN}/bin/${__availableToolchainMachines}-gcc${TOOL_OS_SUFFIX}" -dumpversion
-                  OUTPUT_VARIABLE __availableToolchainCompilerVersions OUTPUT_STRIP_TRAILING_WHITESPACE )
- string( REGEX MATCH "[0-9]+[.][0-9]+([.][0-9]+)?" __availableToolchainCompilerVersions "${__availableToolchainCompilerVersions}" )
- if( EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/bin/clang${TOOL_OS_SUFFIX}" )
-  list( APPEND __availableToolchains "standalone-clang" )
-  list( APPEND __availableToolchainMachines ${__availableToolchainMachines} )
-  list( APPEND __availableToolchainArchs ${__availableToolchainArchs} )
-  list( APPEND __availableToolchainCompilerVersions ${__availableToolchainCompilerVersions} )
- endif()
-endif()
-
-macro( __GLOB_NDK_TOOLCHAINS __availableToolchainsVar __availableToolchainsLst __toolchain_subpath )
- foreach( __toolchain ${${__availableToolchainsLst}} )
-  if( "${__toolchain}" MATCHES "-clang3[.][0-9]$" AND NOT EXISTS "${ANDROID_NDK_TOOLCHAINS_PATH}/${__toolchain}${__toolchain_subpath}" )
-   SET( __toolchainVersionRegex "^TOOLCHAIN_VERSION[\t ]+:=[\t ]+(.*)$" )
-   FILE( STRINGS "${ANDROID_NDK_TOOLCHAINS_PATH}/${__toolchain}/setup.mk" __toolchainVersionStr REGEX "${__toolchainVersionRegex}" )
-   if( __toolchainVersionStr )
-    string( REGEX REPLACE "${__toolchainVersionRegex}" "\\1" __toolchainVersionStr "${__toolchainVersionStr}" )
-    string( REGEX REPLACE "-clang3[.][0-9]$" "-${__toolchainVersionStr}" __gcc_toolchain "${__toolchain}" )
-   else()
-    string( REGEX REPLACE "-clang3[.][0-9]$" "-4.6" __gcc_toolchain "${__toolchain}" )
-   endif()
-   unset( __toolchainVersionStr )
-   unset( __toolchainVersionRegex )
-  else()
-   set( __gcc_toolchain "${__toolchain}" )
-  endif()
-  __DETECT_TOOLCHAIN_MACHINE_NAME( __machine "${ANDROID_NDK_TOOLCHAINS_PATH}/${__gcc_toolchain}${__toolchain_subpath}" )
-  if( __machine )
-   string( REGEX MATCH "[0-9]+[.][0-9]+([.][0-9x]+)?$" __version "${__gcc_toolchain}" )
-   if( __machine MATCHES x86_64 )
-    set( __arch "x86_64" )
-   elseif( __machine MATCHES i686 )
-    set( __arch "x86" )
-   elseif( __machine MATCHES aarch64 )
-    set( __arch "arm64" )
-   elseif( __machine MATCHES arm )
-    set( __arch "arm" )
-   elseif( __machine MATCHES mips64el )
-    set( __arch "mips64" )
-   elseif( __machine MATCHES mipsel )
-    set( __arch "mips" )
-   else()
-    set( __arch "" )
-   endif()
-   #message("machine: !${__machine}!\narch: !${__arch}!\nversion: !${__version}!\ntoolchain: !${__toolchain}!\n")
-   if (__arch)
-    list( APPEND __availableToolchainMachines "${__machine}" )
-    list( APPEND __availableToolchainArchs "${__arch}" )
-    list( APPEND __availableToolchainCompilerVersions "${__version}" )
-    list( APPEND ${__availableToolchainsVar} "${__toolchain}" )
-   endif()
-  endif()
-  unset( __gcc_toolchain )
- endforeach()
-endmacro()
-
-# get all the details about NDK
-if( BUILD_WITH_ANDROID_NDK )
- file( GLOB ANDROID_SUPPORTED_NATIVE_API_LEVELS RELATIVE "${ANDROID_NDK}/platforms" "${ANDROID_NDK}/platforms/android-*" )
- string( REPLACE "android-" "" ANDROID_SUPPORTED_NATIVE_API_LEVELS "${ANDROID_SUPPORTED_NATIVE_API_LEVELS}" )
- set( __availableToolchains "" )
- set( __availableToolchainMachines "" )
- set( __availableToolchainArchs "" )
- set( __availableToolchainCompilerVersions "" )
- if( ANDROID_TOOLCHAIN_NAME AND EXISTS "${ANDROID_NDK_TOOLCHAINS_PATH}/${ANDROID_TOOLCHAIN_NAME}/" )
-  # do not go through all toolchains if we know the name
-  set( __availableToolchainsLst "${ANDROID_TOOLCHAIN_NAME}" )
-  __GLOB_NDK_TOOLCHAINS( __availableToolchains __availableToolchainsLst "${ANDROID_NDK_TOOLCHAINS_SUBPATH}" )
-  if( NOT __availableToolchains AND NOT ANDROID_NDK_TOOLCHAINS_SUBPATH STREQUAL ANDROID_NDK_TOOLCHAINS_SUBPATH2 )
-   __GLOB_NDK_TOOLCHAINS( __availableToolchains __availableToolchainsLst "${ANDROID_NDK_TOOLCHAINS_SUBPATH2}" )
-   if( __availableToolchains )
-    set( ANDROID_NDK_TOOLCHAINS_SUBPATH ${ANDROID_NDK_TOOLCHAINS_SUBPATH2} )
-   endif()
-  endif()
- endif()
- if( NOT __availableToolchains )
-  file( GLOB __availableToolchainsLst RELATIVE "${ANDROID_NDK_TOOLCHAINS_PATH}" "${ANDROID_NDK_TOOLCHAINS_PATH}/*" )
-  if( __availableToolchainsLst )
-   list(SORT __availableToolchainsLst) # we need clang to go after gcc
-  endif()
-  __LIST_FILTER( __availableToolchainsLst "^[.]" )
-  __LIST_FILTER( __availableToolchainsLst "llvm" )
-  __LIST_FILTER( __availableToolchainsLst "renderscript" )
-  __GLOB_NDK_TOOLCHAINS( __availableToolchains __availableToolchainsLst "${ANDROID_NDK_TOOLCHAINS_SUBPATH}" )
-  if( NOT __availableToolchains AND NOT ANDROID_NDK_TOOLCHAINS_SUBPATH STREQUAL ANDROID_NDK_TOOLCHAINS_SUBPATH2 )
-   __GLOB_NDK_TOOLCHAINS( __availableToolchains __availableToolchainsLst "${ANDROID_NDK_TOOLCHAINS_SUBPATH2}" )
-   if( __availableToolchains )
-    set( ANDROID_NDK_TOOLCHAINS_SUBPATH ${ANDROID_NDK_TOOLCHAINS_SUBPATH2} )
-   endif()
-  endif()
- endif()
- if( NOT __availableToolchains )
-  message( FATAL_ERROR "Could not find any working toolchain in the NDK. Probably your Android NDK is broken." )
- endif()
-endif()
-
-# build list of available ABIs
-set( ANDROID_SUPPORTED_ABIS "" )
-set( __uniqToolchainArchNames ${__availableToolchainArchs} )
-list( REMOVE_DUPLICATES __uniqToolchainArchNames )
-list( SORT __uniqToolchainArchNames )
-foreach( __arch ${__uniqToolchainArchNames} )
- list( APPEND ANDROID_SUPPORTED_ABIS ${ANDROID_SUPPORTED_ABIS_${__arch}} )
-endforeach()
-unset( __uniqToolchainArchNames )
-if( NOT ANDROID_SUPPORTED_ABIS )
- message( FATAL_ERROR "No one of known Android ABIs is supported by this cmake toolchain." )
-endif()
-
-# choose target ABI
-__INIT_VARIABLE( ANDROID_ABI VALUES ${ANDROID_SUPPORTED_ABIS} )
-# verify that target ABI is supported
-list( FIND ANDROID_SUPPORTED_ABIS "${ANDROID_ABI}" __androidAbiIdx )
-if( __androidAbiIdx EQUAL -1 )
- string( REPLACE ";" "\", \"" PRINTABLE_ANDROID_SUPPORTED_ABIS  "${ANDROID_SUPPORTED_ABIS}" )
- message( FATAL_ERROR "Specified ANDROID_ABI = \"${ANDROID_ABI}\" is not supported by this cmake toolchain or your NDK/toolchain.
-   Supported values are: \"${PRINTABLE_ANDROID_SUPPORTED_ABIS}\"
-   " )
-endif()
-unset( __androidAbiIdx )
-
-# set target ABI options
-if( ANDROID_ABI STREQUAL "x86" )
- set( X86 true )
- set( ANDROID_NDK_ABI_NAME "x86" )
- set( ANDROID_ARCH_NAME "x86" )
- set( ANDROID_LLVM_TRIPLE "i686-none-linux-android" )
- set( CMAKE_SYSTEM_PROCESSOR "i686" )
-elseif( ANDROID_ABI STREQUAL "x86_64" )
- set( X86 true )
- set( X86_64 true )
- set( ANDROID_NDK_ABI_NAME "x86_64" )
- set( ANDROID_ARCH_NAME "x86_64" )
- set( CMAKE_SYSTEM_PROCESSOR "x86_64" )
- set( ANDROID_LLVM_TRIPLE "x86_64-none-linux-android" )
-elseif( ANDROID_ABI STREQUAL "mips64" )
- set( MIPS64 true )
- set( ANDROID_NDK_ABI_NAME "mips64" )
- set( ANDROID_ARCH_NAME "mips64" )
- set( ANDROID_LLVM_TRIPLE "mips64el-none-linux-android" )
- set( CMAKE_SYSTEM_PROCESSOR "mips64" )
-elseif( ANDROID_ABI STREQUAL "mips" )
- set( MIPS true )
- set( ANDROID_NDK_ABI_NAME "mips" )
- set( ANDROID_ARCH_NAME "mips" )
- set( ANDROID_LLVM_TRIPLE "mipsel-none-linux-android" )
- set( CMAKE_SYSTEM_PROCESSOR "mips" )
-elseif( ANDROID_ABI STREQUAL "arm64-v8a" )
- set( ARM64_V8A true )
- set( ANDROID_NDK_ABI_NAME "arm64-v8a" )
- set( ANDROID_ARCH_NAME "arm64" )
- set( ANDROID_LLVM_TRIPLE "aarch64-none-linux-android" )
- set( CMAKE_SYSTEM_PROCESSOR "aarch64" )
- set( VFPV3 true )
- set( NEON true )
-elseif( ANDROID_ABI STREQUAL "armeabi" )
- set( ARMEABI true )
- set( ANDROID_NDK_ABI_NAME "armeabi" )
- set( ANDROID_ARCH_NAME "arm" )
- set( ANDROID_LLVM_TRIPLE "armv5te-none-linux-androideabi" )
- set( CMAKE_SYSTEM_PROCESSOR "armv5te" )
-elseif( ANDROID_ABI STREQUAL "armeabi-v6 with VFP" )
- set( ARMEABI_V6 true )
- set( ANDROID_NDK_ABI_NAME "armeabi" )
- set( ANDROID_ARCH_NAME "arm" )
- set( ANDROID_LLVM_TRIPLE "armv5te-none-linux-androideabi" )
- set( CMAKE_SYSTEM_PROCESSOR "armv6" )
- # need always fallback to older platform
- set( ARMEABI true )
-elseif( ANDROID_ABI STREQUAL "armeabi-v7a")
- set( ARMEABI_V7A true )
- set( ANDROID_NDK_ABI_NAME "armeabi-v7a" )
- set( ANDROID_ARCH_NAME "arm" )
- set( ANDROID_LLVM_TRIPLE "armv7-none-linux-androideabi" )
- set( CMAKE_SYSTEM_PROCESSOR "armv7-a" )
-elseif( ANDROID_ABI STREQUAL "armeabi-v7a with VFPV3" )
- set( ARMEABI_V7A true )
- set( ANDROID_NDK_ABI_NAME "armeabi-v7a" )
- set( ANDROID_ARCH_NAME "arm" )
- set( ANDROID_LLVM_TRIPLE "armv7-none-linux-androideabi" )
- set( CMAKE_SYSTEM_PROCESSOR "armv7-a" )
- set( VFPV3 true )
-elseif( ANDROID_ABI STREQUAL "armeabi-v7a with NEON" )
- set( ARMEABI_V7A true )
- set( ANDROID_NDK_ABI_NAME "armeabi-v7a" )
- set( ANDROID_ARCH_NAME "arm" )
- set( ANDROID_LLVM_TRIPLE "armv7-none-linux-androideabi" )
- set( CMAKE_SYSTEM_PROCESSOR "armv7-a" )
- set( VFPV3 true )
- set( NEON true )
-else()
- message( SEND_ERROR "Unknown ANDROID_ABI=\"${ANDROID_ABI}\" is specified." )
-endif()
-
-if( CMAKE_BINARY_DIR AND EXISTS "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeSystem.cmake" )
- # really dirty hack
- # it is not possible to change CMAKE_SYSTEM_PROCESSOR after the first run...
- file( APPEND "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeSystem.cmake" "SET(CMAKE_SYSTEM_PROCESSOR \"${CMAKE_SYSTEM_PROCESSOR}\")\n" )
-endif()
-
-if( ANDROID_ARCH_NAME STREQUAL "arm" AND NOT ARMEABI_V6 )
- __INIT_VARIABLE( ANDROID_FORCE_ARM_BUILD VALUES OFF )
- set( ANDROID_FORCE_ARM_BUILD ${ANDROID_FORCE_ARM_BUILD} CACHE BOOL "Use 32-bit ARM instructions instead of Thumb-1" FORCE )
- mark_as_advanced( ANDROID_FORCE_ARM_BUILD )
-else()
- unset( ANDROID_FORCE_ARM_BUILD CACHE )
-endif()
-
-# choose toolchain
-if( ANDROID_TOOLCHAIN_NAME )
- list( FIND __availableToolchains "${ANDROID_TOOLCHAIN_NAME}" __toolchainIdx )
- if( __toolchainIdx EQUAL -1 )
-  list( SORT __availableToolchains )
-  string( REPLACE ";" "\n  * " toolchains_list "${__availableToolchains}" )
-  set( toolchains_list "  * ${toolchains_list}")
-  message( FATAL_ERROR "Specified toolchain \"${ANDROID_TOOLCHAIN_NAME}\" is missing in your NDK or broken. Please verify that your NDK is working or select another compiler toolchain.
-To configure the toolchain set CMake variable ANDROID_TOOLCHAIN_NAME to one of the following values:\n${toolchains_list}\n" )
- endif()
- list( GET __availableToolchainArchs ${__toolchainIdx} __toolchainArch )
- if( NOT __toolchainArch STREQUAL ANDROID_ARCH_NAME )
-  message( SEND_ERROR "Selected toolchain \"${ANDROID_TOOLCHAIN_NAME}\" is not able to compile binaries for the \"${ANDROID_ARCH_NAME}\" platform." )
- endif()
-else()
- set( __toolchainIdx -1 )
- set( __applicableToolchains "" )
- set( __toolchainMaxVersion "0.0.0" )
- list( LENGTH __availableToolchains __availableToolchainsCount )
- math( EXPR __availableToolchainsCount "${__availableToolchainsCount}-1" )
- foreach( __idx RANGE ${__availableToolchainsCount} )
-  list( GET __availableToolchainArchs ${__idx} __toolchainArch )
-  if( __toolchainArch STREQUAL ANDROID_ARCH_NAME )
-   list( GET __availableToolchainCompilerVersions ${__idx} __toolchainVersion )
-   string( REPLACE "x" "99" __toolchainVersion "${__toolchainVersion}")
-   if( __toolchainVersion VERSION_GREATER __toolchainMaxVersion )
-    set( __toolchainMaxVersion "${__toolchainVersion}" )
-    set( __toolchainIdx ${__idx} )
-   endif()
-  endif()
- endforeach()
- unset( __availableToolchainsCount )
- unset( __toolchainMaxVersion )
- unset( __toolchainVersion )
-endif()
-unset( __toolchainArch )
-if( __toolchainIdx EQUAL -1 )
- message( FATAL_ERROR "No one of available compiler toolchains is able to compile for ${ANDROID_ARCH_NAME} platform." )
-endif()
-list( GET __availableToolchains ${__toolchainIdx} ANDROID_TOOLCHAIN_NAME )
-list( GET __availableToolchainMachines ${__toolchainIdx} ANDROID_TOOLCHAIN_MACHINE_NAME )
-list( GET __availableToolchainCompilerVersions ${__toolchainIdx} ANDROID_COMPILER_VERSION )
-
-unset( __toolchainIdx )
-unset( __availableToolchains )
-unset( __availableToolchainMachines )
-unset( __availableToolchainArchs )
-unset( __availableToolchainCompilerVersions )
-
-# choose native API level
-__INIT_VARIABLE( ANDROID_NATIVE_API_LEVEL ENV_ANDROID_NATIVE_API_LEVEL ANDROID_API_LEVEL ENV_ANDROID_API_LEVEL ANDROID_STANDALONE_TOOLCHAIN_API_LEVEL ANDROID_DEFAULT_NDK_API_LEVEL_${ANDROID_ARCH_NAME} ANDROID_DEFAULT_NDK_API_LEVEL )
-string( REPLACE "android-" "" ANDROID_NATIVE_API_LEVEL "${ANDROID_NATIVE_API_LEVEL}" )
-string( STRIP "${ANDROID_NATIVE_API_LEVEL}" ANDROID_NATIVE_API_LEVEL )
-# adjust API level
-set( __real_api_level ${ANDROID_DEFAULT_NDK_API_LEVEL_${ANDROID_ARCH_NAME}} )
-foreach( __level ${ANDROID_SUPPORTED_NATIVE_API_LEVELS} )
- if( (__level LESS ANDROID_NATIVE_API_LEVEL OR __level STREQUAL ANDROID_NATIVE_API_LEVEL) AND NOT __level LESS __real_api_level )
-  set( __real_api_level ${__level} )
- endif()
-endforeach()
-if( __real_api_level AND NOT ANDROID_NATIVE_API_LEVEL STREQUAL __real_api_level )
- message( STATUS "Adjusting Android API level 'android-${ANDROID_NATIVE_API_LEVEL}' to 'android-${__real_api_level}'")
- set( ANDROID_NATIVE_API_LEVEL ${__real_api_level} )
-endif()
-unset(__real_api_level)
-# validate
-list( FIND ANDROID_SUPPORTED_NATIVE_API_LEVELS "${ANDROID_NATIVE_API_LEVEL}" __levelIdx )
-if( __levelIdx EQUAL -1 )
- message( SEND_ERROR "Specified Android native API level 'android-${ANDROID_NATIVE_API_LEVEL}' is not supported by your NDK/toolchain." )
-else()
- if( BUILD_WITH_ANDROID_NDK )
-  __DETECT_NATIVE_API_LEVEL( __realApiLevel "${ANDROID_NDK}/platforms/android-${ANDROID_NATIVE_API_LEVEL}/arch-${ANDROID_ARCH_NAME}/usr/include/android/api-level.h" )
-  if( NOT __realApiLevel EQUAL ANDROID_NATIVE_API_LEVEL AND NOT __realApiLevel GREATER 9000 )
-   message( SEND_ERROR "Specified Android API level (${ANDROID_NATIVE_API_LEVEL}) does not match to the level found (${__realApiLevel}). Probably your copy of NDK is broken." )
-  endif()
-  unset( __realApiLevel )
- endif()
- set( ANDROID_NATIVE_API_LEVEL "${ANDROID_NATIVE_API_LEVEL}" CACHE STRING "Android API level for native code" FORCE )
- set( CMAKE_ANDROID_API ${ANDROID_NATIVE_API_LEVEL} )
- if( CMAKE_VERSION VERSION_GREATER "2.8" )
-  list( SORT ANDROID_SUPPORTED_NATIVE_API_LEVELS )
-  set_property( CACHE ANDROID_NATIVE_API_LEVEL PROPERTY STRINGS ${ANDROID_SUPPORTED_NATIVE_API_LEVELS} )
- endif()
-endif()
-unset( __levelIdx )
-
-
-# remember target ABI
-set( ANDROID_ABI "${ANDROID_ABI}" CACHE STRING "The target ABI for Android. If arm, then armeabi-v7a is recommended for hardware floating point." FORCE )
-if( CMAKE_VERSION VERSION_GREATER "2.8" )
- list( SORT ANDROID_SUPPORTED_ABIS_${ANDROID_ARCH_NAME} )
- set_property( CACHE ANDROID_ABI PROPERTY STRINGS ${ANDROID_SUPPORTED_ABIS_${ANDROID_ARCH_NAME}} )
-endif()
-
-
-# runtime choice (STL, rtti, exceptions)
-if( NOT ANDROID_STL )
-  set( ANDROID_STL gnustl_static )
-endif()
-set( ANDROID_STL "${ANDROID_STL}" CACHE STRING "C++ runtime" )
-set( ANDROID_STL_FORCE_FEATURES ON CACHE BOOL "automatically configure rtti and exceptions support based on C++ runtime" )
-mark_as_advanced( ANDROID_STL ANDROID_STL_FORCE_FEATURES )
-
-if( BUILD_WITH_ANDROID_NDK )
- if( NOT "${ANDROID_STL}" MATCHES "^(none|system|system_re|gabi\\+\\+_static|gabi\\+\\+_shared|stlport_static|stlport_shared|gnustl_static|gnustl_shared|c\\+\\+_static|c\\+\\+_shared)$")
-  message( FATAL_ERROR "ANDROID_STL is set to invalid value \"${ANDROID_STL}\".
-The possible values are:
-  none           -> Do not configure the runtime.
-  system         -> Use the default minimal system C++ runtime library.
-  system_re      -> Same as system but with rtti and exceptions.
-  gabi++_static  -> Use the GAbi++ runtime as a static library.
-  gabi++_shared  -> Use the GAbi++ runtime as a shared library.
-  stlport_static -> Use the STLport runtime as a static library.
-  stlport_shared -> Use the STLport runtime as a shared library.
-  gnustl_static  -> (default) Use the GNU STL as a static library.
-  gnustl_shared  -> Use the GNU STL as a shared library.
-  c++_static     -> Use the LLVM libc++ runtime as a static library.
-  c++_shared     -> Use the LLVM libc++ runtime as a shared library.
-" )
- endif()
-elseif( BUILD_WITH_STANDALONE_TOOLCHAIN )
- if( NOT "${ANDROID_STL}" MATCHES "^(none|gnustl_static|gnustl_shared)$")
-  message( FATAL_ERROR "ANDROID_STL is set to invalid value \"${ANDROID_STL}\".
-The possible values are:
-  none           -> Do not configure the runtime.
-  gnustl_static  -> (default) Use the GNU STL as a static library.
-  gnustl_shared  -> Use the GNU STL as a shared library.
-" )
- endif()
-endif()
-
-unset( ANDROID_RTTI )
-unset( ANDROID_EXCEPTIONS )
-unset( ANDROID_STL_INCLUDE_DIRS )
-unset( __libstl )
-unset( __libsupcxx )
-
-if( NOT _CMAKE_IN_TRY_COMPILE AND ANDROID_NDK_RELEASE STREQUAL "r7b" AND ARMEABI_V7A AND NOT VFPV3 AND ANDROID_STL MATCHES "gnustl" )
- message( WARNING  "The GNU STL armeabi-v7a binaries from NDK r7b can crash non-NEON devices. The files provided with NDK r7b were not configured properly, resulting in crashes on Tegra2-based devices and others when trying to use certain floating-point functions (e.g., cosf, sinf, expf).
-You are strongly recommended to switch to another NDK release.
-" )
-endif()
-
-if( NOT _CMAKE_IN_TRY_COMPILE AND X86 AND ANDROID_STL MATCHES "gnustl" AND ANDROID_NDK_RELEASE STREQUAL "r6" )
-  message( WARNING  "The x86 system header file from NDK r6 has incorrect definition for ptrdiff_t. You are recommended to upgrade to a newer NDK release or manually patch the header:
-See https://android.googlesource.com/platform/development.git f907f4f9d4e56ccc8093df6fee54454b8bcab6c2
-  diff --git a/ndk/platforms/android-9/arch-x86/include/machine/_types.h b/ndk/platforms/android-9/arch-x86/include/machine/_types.h
-  index 5e28c64..65892a1 100644
-  --- a/ndk/platforms/android-9/arch-x86/include/machine/_types.h
-  +++ b/ndk/platforms/android-9/arch-x86/include/machine/_types.h
-  @@ -51,7 +51,11 @@ typedef long int       ssize_t;
-   #endif
-   #ifndef _PTRDIFF_T
-   #define _PTRDIFF_T
-  -typedef long           ptrdiff_t;
-  +#  ifdef __ANDROID__
-  +     typedef int            ptrdiff_t;
-  +#  else
-  +     typedef long           ptrdiff_t;
-  +#  endif
-   #endif
-" )
-endif()
-
-
-# setup paths and STL for standalone toolchain
-if( BUILD_WITH_STANDALONE_TOOLCHAIN )
- set( ANDROID_TOOLCHAIN_ROOT "${ANDROID_STANDALONE_TOOLCHAIN}" )
- set( ANDROID_CLANG_TOOLCHAIN_ROOT "${ANDROID_STANDALONE_TOOLCHAIN}" )
- set( ANDROID_SYSROOT "${ANDROID_STANDALONE_TOOLCHAIN}/sysroot" )
-
- if( NOT ANDROID_STL STREQUAL "none" )
-  set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_STANDALONE_TOOLCHAIN}/include/c++/${ANDROID_COMPILER_VERSION}" )
-  if( NOT EXISTS "${ANDROID_STL_INCLUDE_DIRS}" )
-   # old location ( pre r8c )
-   set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/include/c++/${ANDROID_COMPILER_VERSION}" )
-  endif()
-  if( ARMEABI_V7A AND EXISTS "${ANDROID_STL_INCLUDE_DIRS}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/${CMAKE_SYSTEM_PROCESSOR}/bits" )
-   list( APPEND ANDROID_STL_INCLUDE_DIRS "${ANDROID_STL_INCLUDE_DIRS}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/${CMAKE_SYSTEM_PROCESSOR}" )
-  elseif( ARMEABI AND NOT ANDROID_FORCE_ARM_BUILD AND EXISTS "${ANDROID_STL_INCLUDE_DIRS}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/thumb/bits" )
-   list( APPEND ANDROID_STL_INCLUDE_DIRS "${ANDROID_STL_INCLUDE_DIRS}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/thumb" )
-  else()
-   list( APPEND ANDROID_STL_INCLUDE_DIRS "${ANDROID_STL_INCLUDE_DIRS}/${ANDROID_TOOLCHAIN_MACHINE_NAME}" )
-  endif()
-  # always search static GNU STL to get the location of libsupc++.a
-  if( ARMEABI_V7A AND NOT ANDROID_FORCE_ARM_BUILD AND EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/thumb/libstdc++.a" )
-   set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/thumb" )
-  elseif( ARMEABI_V7A AND EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/libstdc++.a" )
-   set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}" )
-  elseif( ARMEABI AND NOT ANDROID_FORCE_ARM_BUILD AND EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/thumb/libstdc++.a" )
-   set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/thumb" )
-  elseif( EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/libstdc++.a" )
-   set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib" )
-  endif()
-  if( __libstl )
-   set( __libsupcxx "${__libstl}/libsupc++.a" )
-   set( __libstl    "${__libstl}/libstdc++.a" )
-  endif()
-  if( NOT EXISTS "${__libsupcxx}" )
-   message( FATAL_ERROR "The required libstdsupc++.a is missing in your standalone toolchain.
- Usually it happens because of bug in make-standalone-toolchain.sh script from NDK r7, r7b and r7c.
- You need to either upgrade to newer NDK or manually copy
-     $ANDROID_NDK/sources/cxx-stl/gnu-libstdc++/libs/${ANDROID_NDK_ABI_NAME}/libsupc++.a
- to
-     ${__libsupcxx}
-   " )
-  endif()
-  if( ANDROID_STL STREQUAL "gnustl_shared" )
-   if( ARMEABI_V7A AND EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/libgnustl_shared.so" )
-    set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/libgnustl_shared.so" )
-   elseif( ARMEABI AND NOT ANDROID_FORCE_ARM_BUILD AND EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/thumb/libgnustl_shared.so" )
-    set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/thumb/libgnustl_shared.so" )
-   elseif( EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/libgnustl_shared.so" )
-    set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/libgnustl_shared.so" )
-   endif()
-  endif()
- endif()
-endif()
-
-# clang
-if( "${ANDROID_TOOLCHAIN_NAME}" STREQUAL "standalone-clang" )
- set( ANDROID_COMPILER_IS_CLANG 1 )
- execute_process( COMMAND "${ANDROID_CLANG_TOOLCHAIN_ROOT}/bin/clang${TOOL_OS_SUFFIX}" --version OUTPUT_VARIABLE ANDROID_CLANG_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE )
- string( REGEX MATCH "[0-9]+[.][0-9]+" ANDROID_CLANG_VERSION "${ANDROID_CLANG_VERSION}")
-elseif( "${ANDROID_TOOLCHAIN_NAME}" MATCHES "-clang3[.][0-9]?$" )
- string( REGEX MATCH "3[.][0-9]$" ANDROID_CLANG_VERSION "${ANDROID_TOOLCHAIN_NAME}")
- string( REGEX REPLACE "-clang${ANDROID_CLANG_VERSION}$" "-${ANDROID_COMPILER_VERSION}" ANDROID_GCC_TOOLCHAIN_NAME "${ANDROID_TOOLCHAIN_NAME}" )
- if( NOT EXISTS "${ANDROID_NDK_TOOLCHAINS_PATH}/llvm-${ANDROID_CLANG_VERSION}${ANDROID_NDK_TOOLCHAINS_SUBPATH}/bin/clang${TOOL_OS_SUFFIX}" )
-  message( FATAL_ERROR "Could not find the Clang compiler driver" )
- endif()
- set( ANDROID_COMPILER_IS_CLANG 1 )
- set( ANDROID_CLANG_TOOLCHAIN_ROOT "${ANDROID_NDK_TOOLCHAINS_PATH}/llvm-${ANDROID_CLANG_VERSION}${ANDROID_NDK_TOOLCHAINS_SUBPATH}" )
-else()
- set( ANDROID_GCC_TOOLCHAIN_NAME "${ANDROID_TOOLCHAIN_NAME}" )
- unset( ANDROID_COMPILER_IS_CLANG CACHE )
-endif()
-
-string( REPLACE "." "" _clang_name "clang${ANDROID_CLANG_VERSION}" )
-if( NOT EXISTS "${ANDROID_CLANG_TOOLCHAIN_ROOT}/bin/${_clang_name}${TOOL_OS_SUFFIX}" )
- set( _clang_name "clang" )
-endif()
-
-
-# setup paths and STL for NDK
-if( BUILD_WITH_ANDROID_NDK )
- set( ANDROID_TOOLCHAIN_ROOT "${ANDROID_NDK_TOOLCHAINS_PATH}/${ANDROID_GCC_TOOLCHAIN_NAME}${ANDROID_NDK_TOOLCHAINS_SUBPATH}" )
- set( ANDROID_SYSROOT "${ANDROID_NDK}/platforms/android-${ANDROID_NATIVE_API_LEVEL}/arch-${ANDROID_ARCH_NAME}" )
-
- if( ANDROID_STL STREQUAL "none" )
-  # do nothing
- elseif( ANDROID_STL STREQUAL "system" )
-  set( ANDROID_RTTI             OFF )
-  set( ANDROID_EXCEPTIONS       OFF )
-  set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_NDK}/sources/cxx-stl/system/include" )
- elseif( ANDROID_STL STREQUAL "system_re" )
-  set( ANDROID_RTTI             ON )
-  set( ANDROID_EXCEPTIONS       ON )
-  set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_NDK}/sources/cxx-stl/system/include" )
- elseif( ANDROID_STL MATCHES "gabi" )
-  if( ANDROID_NDK_RELEASE_NUM LESS 7000 ) # before r7
-   message( FATAL_ERROR "gabi++ is not available in your NDK. You have to upgrade to NDK r7 or newer to use gabi++.")
-  endif()
-  set( ANDROID_RTTI             ON )
-  set( ANDROID_EXCEPTIONS       OFF )
-  set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_NDK}/sources/cxx-stl/gabi++/include" )
-  set( __libstl                 "${ANDROID_NDK}/sources/cxx-stl/gabi++/libs/${ANDROID_NDK_ABI_NAME}/libgabi++_static.a" )
- elseif( ANDROID_STL MATCHES "stlport" )
-  if( NOT ANDROID_NDK_RELEASE_NUM LESS 8004 ) # before r8d
-   set( ANDROID_EXCEPTIONS       ON )
-  else()
-   set( ANDROID_EXCEPTIONS       OFF )
-  endif()
-  if( ANDROID_NDK_RELEASE_NUM LESS 7000 ) # before r7
-   set( ANDROID_RTTI            OFF )
-  else()
-   set( ANDROID_RTTI            ON )
-  endif()
-  set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_NDK}/sources/cxx-stl/stlport/stlport" )
-  set( __libstl                 "${ANDROID_NDK}/sources/cxx-stl/stlport/libs/${ANDROID_NDK_ABI_NAME}/libstlport_static.a" )
- elseif( ANDROID_STL MATCHES "gnustl" )
-  set( ANDROID_EXCEPTIONS       ON )
-  set( ANDROID_RTTI             ON )
-  if( EXISTS "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${ANDROID_COMPILER_VERSION}" )
-   if( ARMEABI_V7A AND ANDROID_COMPILER_VERSION VERSION_EQUAL "4.7" AND ANDROID_NDK_RELEASE STREQUAL "r8d" )
-    # gnustl binary for 4.7 compiler is buggy :(
-    # TODO: look for right fix
-    set( __libstl                "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/4.6" )
-   else()
-    set( __libstl                "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${ANDROID_COMPILER_VERSION}" )
-   endif()
-  else()
-   set( __libstl                "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++" )
-  endif()
-  set( ANDROID_STL_INCLUDE_DIRS "${__libstl}/include" "${__libstl}/libs/${ANDROID_NDK_ABI_NAME}/include" "${__libstl}/include/backward" )
-  if( EXISTS "${__libstl}/libs/${ANDROID_NDK_ABI_NAME}/libgnustl_static.a" )
-   set( __libstl                "${__libstl}/libs/${ANDROID_NDK_ABI_NAME}/libgnustl_static.a" )
-  else()
-   set( __libstl                "${__libstl}/libs/${ANDROID_NDK_ABI_NAME}/libstdc++.a" )
-  endif()
- elseif( ANDROID_STL MATCHES "c\\+\\+_shared" OR ANDROID_STL MATCHES "c\\+\\+_static" )
-  set( ANDROID_EXCEPTIONS       ON )
-  set( ANDROID_RTTI             ON )
-  set( ANDROID_CXX_ROOT     "${ANDROID_NDK}/sources/cxx-stl/" )
-  set( ANDROID_LLVM_ROOT    "${ANDROID_CXX_ROOT}/llvm-libc++" )
-
-  if( X86 )
-   set( ANDROID_ABI_INCLUDE_DIRS "${ANDROID_CXX_ROOT}/gabi++/include" )
-  else()
-   set( ANDROID_ABI_INCLUDE_DIRS "${ANDROID_CXX_ROOT}/llvm-libc++abi/include" )
-  endif()
-
-  set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_LLVM_ROOT}/libcxx/include" "${ANDROID_ABI_INCLUDE_DIRS}" )
-
-  # android support sfiles
-  include_directories ( SYSTEM ${ANDROID_NDK}/sources/android/support/include )
-
-  if(ANDROID_STL MATCHES "c\\+\\+_shared")
-    set ( LLVM_LIBRARY_NAME "libc++_shared.so")
-  else()
-    set ( LLVM_LIBRARY_NAME "libc++_static.a" )
-  endif ()
-
-  if( EXISTS "${ANDROID_LLVM_ROOT}/libs/${ANDROID_NDK_ABI_NAME}/${LLVM_LIBRARY_NAME}" )
-   set( __libstl "${ANDROID_LLVM_ROOT}/libs/${ANDROID_NDK_ABI_NAME}/${LLVM_LIBRARY_NAME}" )
-  else()
-   message( FATAL_ERROR "Could not find libc++ library" )
-  endif()
- else()
-  message( FATAL_ERROR "Unknown runtime: ${ANDROID_STL}" )
- endif()
- # find libsupc++.a - rtti & exceptions
- if( ANDROID_STL STREQUAL "system_re" OR ANDROID_STL MATCHES "gnustl" )
-  set( __libsupcxx "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${ANDROID_COMPILER_VERSION}/libs/${ANDROID_NDK_ABI_NAME}/libsupc++.a" ) # r8b or newer
-  if( NOT EXISTS "${__libsupcxx}" )
-   set( __libsupcxx "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/libs/${ANDROID_NDK_ABI_NAME}/libsupc++.a" ) # r7-r8
-  endif()
-  if( NOT EXISTS "${__libsupcxx}" ) # before r7
-   if( ARMEABI_V7A )
-    if( ANDROID_FORCE_ARM_BUILD )
-     set( __libsupcxx "${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/libsupc++.a" )
-    else()
-     set( __libsupcxx "${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/thumb/libsupc++.a" )
-    endif()
-   elseif( ARMEABI AND NOT ANDROID_FORCE_ARM_BUILD )
-    set( __libsupcxx "${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/thumb/libsupc++.a" )
-   else()
-    set( __libsupcxx "${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/libsupc++.a" )
-   endif()
-  endif()
-  if( NOT EXISTS "${__libsupcxx}")
-   message( ERROR "Could not find libsupc++.a for a chosen platform. Either your NDK is not supported or is broken.")
-  endif()
- endif()
-endif()
-
-
-# case of shared STL linkage
-if( ANDROID_STL MATCHES "shared" AND DEFINED __libstl )
- string( REPLACE "_static.a" "_shared.so" __libstl "${__libstl}" )
- # TODO: check if .so file exists before the renaming
-endif()
-
-
-# ccache support
-__INIT_VARIABLE( _ndk_ccache NDK_CCACHE ENV_NDK_CCACHE )
-if( _ndk_ccache )
- if( DEFINED NDK_CCACHE AND NOT EXISTS NDK_CCACHE )
-  unset( NDK_CCACHE CACHE )
- endif()
- find_program( NDK_CCACHE "${_ndk_ccache}" DOC "The path to ccache binary")
-else()
- unset( NDK_CCACHE CACHE )
-endif()
-unset( _ndk_ccache )
-
-
-# setup the cross-compiler
-if( NOT CMAKE_C_COMPILER )
- if( NDK_CCACHE AND NOT ANDROID_SYSROOT MATCHES "[ ;\"]" )
-  set( CMAKE_C_COMPILER   "${NDK_CCACHE}" CACHE PATH "ccache as C compiler" )
-  set( CMAKE_CXX_COMPILER "${NDK_CCACHE}" CACHE PATH "ccache as C++ compiler" )
-  if( ANDROID_COMPILER_IS_CLANG )
-   set( CMAKE_C_COMPILER_ARG1   "${ANDROID_CLANG_TOOLCHAIN_ROOT}/bin/${_clang_name}${TOOL_OS_SUFFIX}"   CACHE PATH "C compiler")
-   set( CMAKE_CXX_COMPILER_ARG1 "${ANDROID_CLANG_TOOLCHAIN_ROOT}/bin/${_clang_name}++${TOOL_OS_SUFFIX}" CACHE PATH "C++ compiler")
-  else()
-   set( CMAKE_C_COMPILER_ARG1   "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-gcc${TOOL_OS_SUFFIX}" CACHE PATH "C compiler")
-   set( CMAKE_CXX_COMPILER_ARG1 "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-g++${TOOL_OS_SUFFIX}" CACHE PATH "C++ compiler")
-  endif()
- else()
-  if( ANDROID_COMPILER_IS_CLANG )
-   set( CMAKE_C_COMPILER   "${ANDROID_CLANG_TOOLCHAIN_ROOT}/bin/${_clang_name}${TOOL_OS_SUFFIX}"   CACHE PATH "C compiler")
-   set( CMAKE_CXX_COMPILER "${ANDROID_CLANG_TOOLCHAIN_ROOT}/bin/${_clang_name}++${TOOL_OS_SUFFIX}" CACHE PATH "C++ compiler")
-  else()
-   set( CMAKE_C_COMPILER   "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-gcc${TOOL_OS_SUFFIX}"    CACHE PATH "C compiler" )
-   set( CMAKE_CXX_COMPILER "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-g++${TOOL_OS_SUFFIX}"    CACHE PATH "C++ compiler" )
-  endif()
- endif()
- set( CMAKE_ASM_COMPILER "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-gcc${TOOL_OS_SUFFIX}"     CACHE PATH "assembler" )
- set( CMAKE_STRIP        "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-strip${TOOL_OS_SUFFIX}"   CACHE PATH "strip" )
- if( EXISTS "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-gcc-ar${TOOL_OS_SUFFIX}" )
-  # Use gcc-ar if we have it for better LTO support.
-  set( CMAKE_AR           "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-gcc-ar${TOOL_OS_SUFFIX}"      CACHE PATH "archive" )
- else()
-  set( CMAKE_AR           "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-ar${TOOL_OS_SUFFIX}"      CACHE PATH "archive" )
- endif()
- set( CMAKE_LINKER       "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-ld${TOOL_OS_SUFFIX}"      CACHE PATH "linker" )
- set( CMAKE_NM           "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-nm${TOOL_OS_SUFFIX}"      CACHE PATH "nm" )
- set( CMAKE_OBJCOPY      "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-objcopy${TOOL_OS_SUFFIX}" CACHE PATH "objcopy" )
- set( CMAKE_OBJDUMP      "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-objdump${TOOL_OS_SUFFIX}" CACHE PATH "objdump" )
- set( CMAKE_RANLIB       "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-ranlib${TOOL_OS_SUFFIX}"  CACHE PATH "ranlib" )
-endif()
-
-set( _CMAKE_TOOLCHAIN_PREFIX "${ANDROID_TOOLCHAIN_MACHINE_NAME}-" )
-if( CMAKE_VERSION VERSION_LESS 2.8.5 )
- set( CMAKE_ASM_COMPILER_ARG1 "-c" )
-endif()
-if( APPLE )
- find_program( CMAKE_INSTALL_NAME_TOOL NAMES install_name_tool )
- if( NOT CMAKE_INSTALL_NAME_TOOL )
-  message( FATAL_ERROR "Could not find install_name_tool, please check your installation." )
- endif()
- mark_as_advanced( CMAKE_INSTALL_NAME_TOOL )
-endif()
-
-# Force set compilers because standard identification works badly for us
-include( CMakeForceCompiler )
-CMAKE_FORCE_C_COMPILER( "${CMAKE_C_COMPILER}" GNU )
-if( ANDROID_COMPILER_IS_CLANG )
- set( CMAKE_C_COMPILER_ID Clang )
-endif()
-set( CMAKE_C_PLATFORM_ID Linux )
-if( X86_64 OR MIPS64 OR ARM64_V8A )
- set( CMAKE_C_SIZEOF_DATA_PTR 8 )
-else()
- set( CMAKE_C_SIZEOF_DATA_PTR 4 )
-endif()
-set( CMAKE_C_HAS_ISYSROOT 1 )
-set( CMAKE_C_COMPILER_ABI ELF )
-CMAKE_FORCE_CXX_COMPILER( "${CMAKE_CXX_COMPILER}" GNU )
-if( ANDROID_COMPILER_IS_CLANG )
- set( CMAKE_CXX_COMPILER_ID Clang)
-endif()
-set( CMAKE_CXX_PLATFORM_ID Linux )
-set( CMAKE_CXX_SIZEOF_DATA_PTR ${CMAKE_C_SIZEOF_DATA_PTR} )
-set( CMAKE_CXX_HAS_ISYSROOT 1 )
-set( CMAKE_CXX_COMPILER_ABI ELF )
-set( CMAKE_CXX_SOURCE_FILE_EXTENSIONS cc cp cxx cpp CPP c++ C )
-# force ASM compiler (required for CMake < 2.8.5)
-set( CMAKE_ASM_COMPILER_ID_RUN TRUE )
-set( CMAKE_ASM_COMPILER_ID GNU )
-set( CMAKE_ASM_COMPILER_WORKS TRUE )
-set( CMAKE_ASM_COMPILER_FORCED TRUE )
-set( CMAKE_COMPILER_IS_GNUASM 1)
-set( CMAKE_ASM_SOURCE_FILE_EXTENSIONS s S asm )
-
-foreach( lang C CXX ASM )
- if( ANDROID_COMPILER_IS_CLANG )
-  set( CMAKE_${lang}_COMPILER_VERSION ${ANDROID_CLANG_VERSION} )
- else()
-  set( CMAKE_${lang}_COMPILER_VERSION ${ANDROID_COMPILER_VERSION} )
- endif()
-endforeach()
-
-# flags and definitions
-remove_definitions( -DANDROID )
-add_definitions( -DANDROID )
-
-if( ANDROID_SYSROOT MATCHES "[ ;\"]" )
- if( CMAKE_HOST_WIN32 )
-  # try to convert path to 8.3 form
-  file( WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/cvt83.cmd" "@echo %~s1" )
-  execute_process( COMMAND "$ENV{ComSpec}" /c "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/cvt83.cmd" "${ANDROID_SYSROOT}"
-                   OUTPUT_VARIABLE __path OUTPUT_STRIP_TRAILING_WHITESPACE
-                   RESULT_VARIABLE __result ERROR_QUIET )
-  if( __result EQUAL 0 )
-   file( TO_CMAKE_PATH "${__path}" ANDROID_SYSROOT )
-   set( ANDROID_CXX_FLAGS "--sysroot=${ANDROID_SYSROOT}" )
-  else()
-   set( ANDROID_CXX_FLAGS "--sysroot=\"${ANDROID_SYSROOT}\"" )
-  endif()
- else()
-  set( ANDROID_CXX_FLAGS "'--sysroot=${ANDROID_SYSROOT}'" )
- endif()
- if( NOT _CMAKE_IN_TRY_COMPILE )
-  # quotes can break try_compile and compiler identification
-  message(WARNING "Path to your Android NDK (or toolchain) has non-alphanumeric symbols.\nThe build might be broken.\n")
- endif()
-else()
- set( ANDROID_CXX_FLAGS "--sysroot=${ANDROID_SYSROOT}" )
-endif()
-
-# NDK flags
-if (ARM64_V8A )
- set( ANDROID_CXX_FLAGS         "${ANDROID_CXX_FLAGS} -funwind-tables" )
- set( ANDROID_CXX_FLAGS_RELEASE "-fomit-frame-pointer -fstrict-aliasing" )
- set( ANDROID_CXX_FLAGS_DEBUG   "-fno-omit-frame-pointer -fno-strict-aliasing" )
- if( NOT ANDROID_COMPILER_IS_CLANG )
-  set( ANDROID_CXX_FLAGS_RELEASE "${ANDROID_CXX_FLAGS_RELEASE} -funswitch-loops -finline-limit=300" )
- endif()
-elseif( ARMEABI OR ARMEABI_V7A)
- set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -funwind-tables" )
- if( NOT ANDROID_FORCE_ARM_BUILD AND NOT ARMEABI_V6 )
-  set( ANDROID_CXX_FLAGS_RELEASE "-mthumb -fomit-frame-pointer -fno-strict-aliasing" )
-  set( ANDROID_CXX_FLAGS_DEBUG   "-marm -fno-omit-frame-pointer -fno-strict-aliasing" )
-  if( NOT ANDROID_COMPILER_IS_CLANG )
-   set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -finline-limit=64" )
-  endif()
- else()
-  # always compile ARMEABI_V6 in arm mode; otherwise there is no difference from ARMEABI
-  set( ANDROID_CXX_FLAGS_RELEASE "-marm -fomit-frame-pointer -fstrict-aliasing" )
-  set( ANDROID_CXX_FLAGS_DEBUG   "-marm -fno-omit-frame-pointer -fno-strict-aliasing" )
-  if( NOT ANDROID_COMPILER_IS_CLANG )
-   set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -funswitch-loops -finline-limit=300" )
-  endif()
- endif()
-elseif( X86 OR X86_64 )
- set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -funwind-tables" )
- if( NOT ANDROID_COMPILER_IS_CLANG )
-  set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -funswitch-loops -finline-limit=300" )
- endif()
- set( ANDROID_CXX_FLAGS_RELEASE "-fomit-frame-pointer -fstrict-aliasing" )
- set( ANDROID_CXX_FLAGS_DEBUG   "-fno-omit-frame-pointer -fno-strict-aliasing" )
-elseif( MIPS OR MIPS64 )
- set( ANDROID_CXX_FLAGS         "${ANDROID_CXX_FLAGS} -fno-strict-aliasing -finline-functions -funwind-tables -fmessage-length=0" )
- set( ANDROID_CXX_FLAGS_RELEASE "-fomit-frame-pointer" )
- set( ANDROID_CXX_FLAGS_DEBUG   "-fno-omit-frame-pointer" )
- if( NOT ANDROID_COMPILER_IS_CLANG )
-  set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -fno-inline-functions-called-once -fgcse-after-reload -frerun-cse-after-loop -frename-registers" )
-  set( ANDROID_CXX_FLAGS_RELEASE "${ANDROID_CXX_FLAGS_RELEASE} -funswitch-loops -finline-limit=300" )
- endif()
-elseif()
- set( ANDROID_CXX_FLAGS_RELEASE "" )
- set( ANDROID_CXX_FLAGS_DEBUG   "" )
-endif()
-
-set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -fsigned-char" ) # good/necessary when porting desktop libraries
-
-if( NOT X86 AND NOT ANDROID_COMPILER_IS_CLANG )
- set( ANDROID_CXX_FLAGS "-Wno-psabi ${ANDROID_CXX_FLAGS}" )
-endif()
-
-if( NOT ANDROID_COMPILER_VERSION VERSION_LESS "4.6" )
- set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -no-canonical-prefixes" ) # see https://android-review.googlesource.com/#/c/47564/
-endif()
-
-# ABI-specific flags
-if( ARMEABI_V7A )
- set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -march=armv7-a -mfloat-abi=softfp" )
- if( NEON )
-  set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -mfpu=neon" )
- elseif( VFPV3 )
-  set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -mfpu=vfpv3" )
- else()
-  set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -mfpu=vfpv3-d16" )
- endif()
-elseif( ARMEABI_V6 )
- set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -march=armv6 -mfloat-abi=softfp -mfpu=vfp" ) # vfp == vfpv2
-elseif( ARMEABI )
- set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -march=armv5te -mtune=xscale -msoft-float" )
-endif()
-
-if( ANDROID_STL MATCHES "gnustl" AND (EXISTS "${__libstl}" OR EXISTS "${__libsupcxx}") )
- set( CMAKE_CXX_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>" )
- set( CMAKE_CXX_CREATE_SHARED_MODULE  "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>" )
- set( CMAKE_CXX_LINK_EXECUTABLE       "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>" )
-else()
- set( CMAKE_CXX_CREATE_SHARED_LIBRARY "<CMAKE_CXX_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>" )
- set( CMAKE_CXX_CREATE_SHARED_MODULE  "<CMAKE_CXX_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>" )
- set( CMAKE_CXX_LINK_EXECUTABLE       "<CMAKE_CXX_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>" )
-endif()
-
-# STL
-if( EXISTS "${__libstl}" OR EXISTS "${__libsupcxx}" )
- if( EXISTS "${__libstl}" )
-  set( CMAKE_CXX_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY} \"${__libstl}\"" )
-  set( CMAKE_CXX_CREATE_SHARED_MODULE  "${CMAKE_CXX_CREATE_SHARED_MODULE} \"${__libstl}\"" )
-  set( CMAKE_CXX_LINK_EXECUTABLE       "${CMAKE_CXX_LINK_EXECUTABLE} \"${__libstl}\"" )
- endif()
- if( EXISTS "${__libsupcxx}" )
-  set( CMAKE_CXX_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY} \"${__libsupcxx}\"" )
-  set( CMAKE_CXX_CREATE_SHARED_MODULE  "${CMAKE_CXX_CREATE_SHARED_MODULE} \"${__libsupcxx}\"" )
-  set( CMAKE_CXX_LINK_EXECUTABLE       "${CMAKE_CXX_LINK_EXECUTABLE} \"${__libsupcxx}\"" )
-  # C objects:
-  set( CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_C_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>" )
-  set( CMAKE_C_CREATE_SHARED_MODULE  "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_C_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>" )
-  set( CMAKE_C_LINK_EXECUTABLE       "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>" )
-  set( CMAKE_C_CREATE_SHARED_LIBRARY "${CMAKE_C_CREATE_SHARED_LIBRARY} \"${__libsupcxx}\"" )
-  set( CMAKE_C_CREATE_SHARED_MODULE  "${CMAKE_C_CREATE_SHARED_MODULE} \"${__libsupcxx}\"" )
-  set( CMAKE_C_LINK_EXECUTABLE       "${CMAKE_C_LINK_EXECUTABLE} \"${__libsupcxx}\"" )
- endif()
- if( ANDROID_STL MATCHES "gnustl" )
-  if( NOT EXISTS "${ANDROID_LIBM_PATH}" )
-   set( ANDROID_LIBM_PATH -lm )
-  endif()
-  set( CMAKE_CXX_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY} ${ANDROID_LIBM_PATH}" )
-  set( CMAKE_CXX_CREATE_SHARED_MODULE  "${CMAKE_CXX_CREATE_SHARED_MODULE} ${ANDROID_LIBM_PATH}" )
-  set( CMAKE_CXX_LINK_EXECUTABLE       "${CMAKE_CXX_LINK_EXECUTABLE} ${ANDROID_LIBM_PATH}" )
- endif()
-endif()
-
-# variables controlling optional build flags
-if( ANDROID_NDK_RELEASE_NUM LESS 7000 ) # before r7
- # libGLESv2.so in NDK's prior to r7 refers to missing external symbols.
- # So this flag option is required for all projects using OpenGL from native.
- __INIT_VARIABLE( ANDROID_SO_UNDEFINED                      VALUES ON )
-else()
- __INIT_VARIABLE( ANDROID_SO_UNDEFINED                      VALUES OFF )
-endif()
-__INIT_VARIABLE( ANDROID_NO_UNDEFINED                       VALUES ON )
-__INIT_VARIABLE( ANDROID_FUNCTION_LEVEL_LINKING             VALUES ON )
-__INIT_VARIABLE( ANDROID_GOLD_LINKER                        VALUES ON )
-__INIT_VARIABLE( ANDROID_NOEXECSTACK                        VALUES ON )
-__INIT_VARIABLE( ANDROID_RELRO                              VALUES ON )
-
-set( ANDROID_NO_UNDEFINED           ${ANDROID_NO_UNDEFINED}           CACHE BOOL "Show all undefined symbols as linker errors" )
-set( ANDROID_SO_UNDEFINED           ${ANDROID_SO_UNDEFINED}           CACHE BOOL "Allows or disallows undefined symbols in shared libraries" )
-set( ANDROID_FUNCTION_LEVEL_LINKING ${ANDROID_FUNCTION_LEVEL_LINKING} CACHE BOOL "Put each function in separate section and enable garbage collection of unused input sections at link time" )
-set( ANDROID_GOLD_LINKER            ${ANDROID_GOLD_LINKER}            CACHE BOOL "Enables gold linker" )
-set( ANDROID_NOEXECSTACK            ${ANDROID_NOEXECSTACK}            CACHE BOOL "Allows or disallows undefined symbols in shared libraries" )
-set( ANDROID_RELRO                  ${ANDROID_RELRO}                  CACHE BOOL "Enables RELRO - a memory corruption mitigation technique" )
-mark_as_advanced( ANDROID_NO_UNDEFINED ANDROID_SO_UNDEFINED ANDROID_FUNCTION_LEVEL_LINKING ANDROID_GOLD_LINKER ANDROID_NOEXECSTACK ANDROID_RELRO )
-
-# linker flags
-set( ANDROID_LINKER_FLAGS "" )
-
-if( ARMEABI_V7A )
- # this is *required* to use the following linker flags that routes around
- # a CPU bug in some Cortex-A8 implementations:
- set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -Wl,--fix-cortex-a8" )
-endif()
-
-if( ANDROID_NO_UNDEFINED )
- if( MIPS )
-  # there is some sysroot-related problem in mips linker...
-  if( NOT ANDROID_SYSROOT MATCHES "[ ;\"]" )
-   set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -Wl,--no-undefined -Wl,-rpath-link,${ANDROID_SYSROOT}/usr/lib" )
-  endif()
- else()
-  set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -Wl,--no-undefined" )
- endif()
-endif()
-
-if( ANDROID_SO_UNDEFINED )
- set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -Wl,-allow-shlib-undefined" )
-endif()
-
-if( ANDROID_FUNCTION_LEVEL_LINKING )
- set( ANDROID_CXX_FLAGS    "${ANDROID_CXX_FLAGS} -fdata-sections -ffunction-sections" )
- set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -Wl,--gc-sections" )
-endif()
-
-if( ANDROID_COMPILER_VERSION VERSION_EQUAL "4.6" )
- if( ANDROID_GOLD_LINKER AND (CMAKE_HOST_UNIX OR ANDROID_NDK_RELEASE_NUM GREATER 8002) AND (ARMEABI OR ARMEABI_V7A OR X86) )
-  set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -fuse-ld=gold" )
- elseif( ANDROID_NDK_RELEASE_NUM GREATER 8002 ) # after r8b
-  set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -fuse-ld=bfd" )
- elseif( ANDROID_NDK_RELEASE STREQUAL "r8b" AND ARMEABI AND NOT _CMAKE_IN_TRY_COMPILE )
-  message( WARNING "The default bfd linker from arm GCC 4.6 toolchain can fail with 'unresolvable R_ARM_THM_CALL relocation' error message. See https://code.google.com/p/android/issues/detail?id=35342
-  On Linux and OS X host platform you can workaround this problem using gold linker (default).
-  Rerun cmake with -DANDROID_GOLD_LINKER=ON option in case of problems.
-" )
- endif()
-endif() # version 4.6
-
-if( ANDROID_NOEXECSTACK )
- if( ANDROID_COMPILER_IS_CLANG )
-  set( ANDROID_CXX_FLAGS    "${ANDROID_CXX_FLAGS} -Xclang -mnoexecstack" )
- else()
-  set( ANDROID_CXX_FLAGS    "${ANDROID_CXX_FLAGS} -Wa,--noexecstack" )
- endif()
- set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -Wl,-z,noexecstack" )
-endif()
-
-if( ANDROID_RELRO )
- set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -Wl,-z,relro -Wl,-z,now" )
-endif()
-
-if( ANDROID_COMPILER_IS_CLANG )
- set( ANDROID_CXX_FLAGS "-target ${ANDROID_LLVM_TRIPLE} -Qunused-arguments ${ANDROID_CXX_FLAGS}" )
- if( BUILD_WITH_ANDROID_NDK )
-  set( ANDROID_CXX_FLAGS "-gcc-toolchain ${ANDROID_TOOLCHAIN_ROOT} ${ANDROID_CXX_FLAGS}" )
- endif()
-endif()
-
-# cache flags
-set( CMAKE_CXX_FLAGS           ""                        CACHE STRING "c++ flags" )
-set( CMAKE_C_FLAGS             ""                        CACHE STRING "c flags" )
-set( CMAKE_CXX_FLAGS_RELEASE   "-O3 -DNDEBUG"            CACHE STRING "c++ Release flags" )
-set( CMAKE_C_FLAGS_RELEASE     "-O3 -DNDEBUG"            CACHE STRING "c Release flags" )
-set( CMAKE_CXX_FLAGS_DEBUG     "-O0 -g -DDEBUG -D_DEBUG" CACHE STRING "c++ Debug flags" )
-set( CMAKE_C_FLAGS_DEBUG       "-O0 -g -DDEBUG -D_DEBUG" CACHE STRING "c Debug flags" )
-set( CMAKE_SHARED_LINKER_FLAGS ""                        CACHE STRING "shared linker flags" )
-set( CMAKE_MODULE_LINKER_FLAGS ""                        CACHE STRING "module linker flags" )
-set( CMAKE_EXE_LINKER_FLAGS    "-Wl,-z,nocopyreloc"      CACHE STRING "executable linker flags" )
-
-# put flags to cache (for debug purpose only)
-set( ANDROID_CXX_FLAGS         "${ANDROID_CXX_FLAGS}"         CACHE INTERNAL "Android specific c/c++ flags" )
-set( ANDROID_CXX_FLAGS_RELEASE "${ANDROID_CXX_FLAGS_RELEASE}" CACHE INTERNAL "Android specific c/c++ Release flags" )
-set( ANDROID_CXX_FLAGS_DEBUG   "${ANDROID_CXX_FLAGS_DEBUG}"   CACHE INTERNAL "Android specific c/c++ Debug flags" )
-set( ANDROID_LINKER_FLAGS      "${ANDROID_LINKER_FLAGS}"      CACHE INTERNAL "Android specific c/c++ linker flags" )
-
-# finish flags
-set( CMAKE_CXX_FLAGS           "${ANDROID_CXX_FLAGS} ${CMAKE_CXX_FLAGS}" )
-set( CMAKE_C_FLAGS             "${ANDROID_CXX_FLAGS} ${CMAKE_C_FLAGS}" )
-set( CMAKE_CXX_FLAGS_RELEASE   "${ANDROID_CXX_FLAGS_RELEASE} ${CMAKE_CXX_FLAGS_RELEASE}" )
-set( CMAKE_C_FLAGS_RELEASE     "${ANDROID_CXX_FLAGS_RELEASE} ${CMAKE_C_FLAGS_RELEASE}" )
-set( CMAKE_CXX_FLAGS_DEBUG     "${ANDROID_CXX_FLAGS_DEBUG} ${CMAKE_CXX_FLAGS_DEBUG}" )
-set( CMAKE_C_FLAGS_DEBUG       "${ANDROID_CXX_FLAGS_DEBUG} ${CMAKE_C_FLAGS_DEBUG}" )
-set( CMAKE_SHARED_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} ${CMAKE_SHARED_LINKER_FLAGS}" )
-set( CMAKE_MODULE_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} ${CMAKE_MODULE_LINKER_FLAGS}" )
-set( CMAKE_EXE_LINKER_FLAGS    "${ANDROID_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS}" )
-
-if( MIPS AND BUILD_WITH_ANDROID_NDK AND ANDROID_NDK_RELEASE STREQUAL "r8" )
- set( CMAKE_SHARED_LINKER_FLAGS "-Wl,-T,${ANDROID_NDK_TOOLCHAINS_PATH}/${ANDROID_GCC_TOOLCHAIN_NAME}/mipself.xsc ${CMAKE_SHARED_LINKER_FLAGS}" )
- set( CMAKE_MODULE_LINKER_FLAGS "-Wl,-T,${ANDROID_NDK_TOOLCHAINS_PATH}/${ANDROID_GCC_TOOLCHAIN_NAME}/mipself.xsc ${CMAKE_MODULE_LINKER_FLAGS}" )
- set( CMAKE_EXE_LINKER_FLAGS    "-Wl,-T,${ANDROID_NDK_TOOLCHAINS_PATH}/${ANDROID_GCC_TOOLCHAIN_NAME}/mipself.x ${CMAKE_EXE_LINKER_FLAGS}" )
-endif()
-
-# pie/pic
-if( NOT (ANDROID_NATIVE_API_LEVEL LESS 16) AND (NOT DEFINED ANDROID_APP_PIE OR ANDROID_APP_PIE) AND (CMAKE_VERSION VERSION_GREATER 2.8.8) )
- set( CMAKE_POSITION_INDEPENDENT_CODE TRUE )
- set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fPIE -pie")
-else()
- set( CMAKE_POSITION_INDEPENDENT_CODE FALSE )
- set( CMAKE_CXX_FLAGS "-fpic ${CMAKE_CXX_FLAGS}" )
- set( CMAKE_C_FLAGS   "-fpic ${CMAKE_C_FLAGS}" )
-endif()
-
-# configure rtti
-if( DEFINED ANDROID_RTTI AND ANDROID_STL_FORCE_FEATURES )
- if( ANDROID_RTTI )
-  set( CMAKE_CXX_FLAGS "-frtti ${CMAKE_CXX_FLAGS}" )
- else()
-  set( CMAKE_CXX_FLAGS "-fno-rtti ${CMAKE_CXX_FLAGS}" )
- endif()
-endif()
-
-# configure exceptios
-if( DEFINED ANDROID_EXCEPTIONS AND ANDROID_STL_FORCE_FEATURES )
- if( ANDROID_EXCEPTIONS )
-  set( CMAKE_CXX_FLAGS "-fexceptions ${CMAKE_CXX_FLAGS}" )
-  set( CMAKE_C_FLAGS "-fexceptions ${CMAKE_C_FLAGS}" )
- else()
-  set( CMAKE_CXX_FLAGS "-fno-exceptions ${CMAKE_CXX_FLAGS}" )
-  set( CMAKE_C_FLAGS "-fno-exceptions ${CMAKE_C_FLAGS}" )
- endif()
-endif()
-
-# global includes and link directories
-include_directories( SYSTEM "${ANDROID_SYSROOT}/usr/include" ${ANDROID_STL_INCLUDE_DIRS} )
-get_filename_component(__android_install_path "${CMAKE_INSTALL_PREFIX}/libs/${ANDROID_NDK_ABI_NAME}" ABSOLUTE) # avoid CMP0015 policy warning
-link_directories( "${__android_install_path}" )
-
-# detect if need link crtbegin_so.o explicitly
-if( NOT DEFINED ANDROID_EXPLICIT_CRT_LINK )
- set( __cmd "${CMAKE_CXX_CREATE_SHARED_LIBRARY}" )
- string( REPLACE "<CMAKE_CXX_COMPILER>" "${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ARG1}" __cmd "${__cmd}" )
- string( REPLACE "<CMAKE_C_COMPILER>"   "${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1}"   __cmd "${__cmd}" )
- string( REPLACE "<CMAKE_SHARED_LIBRARY_CXX_FLAGS>" "${CMAKE_CXX_FLAGS}" __cmd "${__cmd}" )
- string( REPLACE "<LANGUAGE_COMPILE_FLAGS>" "" __cmd "${__cmd}" )
- string( REPLACE "<LINK_FLAGS>" "${CMAKE_SHARED_LINKER_FLAGS}" __cmd "${__cmd}" )
- string( REPLACE "<CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS>" "-shared" __cmd "${__cmd}" )
- string( REPLACE "<CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG>" "" __cmd "${__cmd}" )
- string( REPLACE "<TARGET_SONAME>" "" __cmd "${__cmd}" )
- string( REPLACE "<TARGET>" "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/toolchain_crtlink_test.so" __cmd "${__cmd}" )
- string( REPLACE "<OBJECTS>" "\"${ANDROID_SYSROOT}/usr/lib/crtbegin_so.o\"" __cmd "${__cmd}" )
- string( REPLACE "<LINK_LIBRARIES>" "" __cmd "${__cmd}" )
- separate_arguments( __cmd )
- foreach( __var ANDROID_NDK ANDROID_NDK_TOOLCHAINS_PATH ANDROID_STANDALONE_TOOLCHAIN )
-  if( ${__var} )
-   set( __tmp "${${__var}}" )
-   separate_arguments( __tmp )
-   string( REPLACE "${__tmp}" "${${__var}}" __cmd "${__cmd}")
-  endif()
- endforeach()
- string( REPLACE "'" "" __cmd "${__cmd}" )
- string( REPLACE "\"" "" __cmd "${__cmd}" )
- execute_process( COMMAND ${__cmd} RESULT_VARIABLE __cmd_result OUTPUT_QUIET ERROR_QUIET )
- if( __cmd_result EQUAL 0 )
-  set( ANDROID_EXPLICIT_CRT_LINK ON )
- else()
-  set( ANDROID_EXPLICIT_CRT_LINK OFF )
- endif()
-endif()
-
-if( ANDROID_EXPLICIT_CRT_LINK )
- set( CMAKE_CXX_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY} \"${ANDROID_SYSROOT}/usr/lib/crtbegin_so.o\"" )
- set( CMAKE_CXX_CREATE_SHARED_MODULE  "${CMAKE_CXX_CREATE_SHARED_MODULE} \"${ANDROID_SYSROOT}/usr/lib/crtbegin_so.o\"" )
-endif()
-
-# setup output directories
-set( CMAKE_INSTALL_PREFIX "${ANDROID_TOOLCHAIN_ROOT}/user" CACHE STRING "path for installing" )
-
-if( DEFINED LIBRARY_OUTPUT_PATH_ROOT
-      OR EXISTS "${CMAKE_SOURCE_DIR}/AndroidManifest.xml"
-      OR (EXISTS "${CMAKE_SOURCE_DIR}/../AndroidManifest.xml" AND EXISTS "${CMAKE_SOURCE_DIR}/../jni/") )
-  set( LIBRARY_OUTPUT_PATH_ROOT ${CMAKE_SOURCE_DIR} CACHE PATH "Root for binaries output, set this to change where Android libs are installed to" )
-  if( NOT _CMAKE_IN_TRY_COMPILE )
-    if( EXISTS "${CMAKE_SOURCE_DIR}/jni/CMakeLists.txt" )
-      set( EXECUTABLE_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/bin/${ANDROID_NDK_ABI_NAME}" CACHE PATH "Output directory for applications" )
-    else()
-      set( EXECUTABLE_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/bin" CACHE PATH "Output directory for applications" )
-    endif()
-    set( LIBRARY_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/libs/${ANDROID_NDK_ABI_NAME}" CACHE PATH "Output directory for Android libs" )
-  endif()
-endif()
-
-# copy shaed stl library to build directory
-if( NOT _CMAKE_IN_TRY_COMPILE AND __libstl MATCHES "[.]so$" AND DEFINED LIBRARY_OUTPUT_PATH )
-  get_filename_component( __libstlname "${__libstl}" NAME )
-  execute_process( COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${__libstl}" "${LIBRARY_OUTPUT_PATH}/${__libstlname}" RESULT_VARIABLE __fileCopyProcess )
-  if( NOT __fileCopyProcess EQUAL 0 OR NOT EXISTS "${LIBRARY_OUTPUT_PATH}/${__libstlname}")
-    message( SEND_ERROR "Failed copying of ${__libstl} to the ${LIBRARY_OUTPUT_PATH}/${__libstlname}" )
-  endif()
-  unset( __fileCopyProcess )
-  unset( __libstlname )
-endif()
-
-
-# set these global flags for cmake client scripts to change behavior
-set( ANDROID True )
-set( BUILD_ANDROID True )
-
-# where is the target environment
-set( CMAKE_FIND_ROOT_PATH "${ANDROID_TOOLCHAIN_ROOT}/bin" "${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_TOOLCHAIN_MACHINE_NAME}" "${ANDROID_SYSROOT}" "${CMAKE_INSTALL_PREFIX}" "${CMAKE_INSTALL_PREFIX}/share" )
-
-# only search for libraries and includes in the ndk toolchain
-set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY )
-set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY )
-set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY )
-
-
-# macro to find packages on the host OS
-macro( find_host_package )
- set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER )
- set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY NEVER )
- set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER )
- if( CMAKE_HOST_WIN32 )
-  SET( WIN32 1 )
-  SET( UNIX )
- elseif( CMAKE_HOST_APPLE )
-  SET( APPLE 1 )
-  SET( UNIX )
- endif()
- find_package( ${ARGN} )
- SET( WIN32 )
- SET( APPLE )
- SET( UNIX 1 )
- set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY )
- set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY )
- set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY )
-endmacro()
-
-
-# macro to find programs on the host OS
-macro( find_host_program )
- set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER )
- set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY NEVER )
- set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER )
- if( CMAKE_HOST_WIN32 )
-  SET( WIN32 1 )
-  SET( UNIX )
- elseif( CMAKE_HOST_APPLE )
-  SET( APPLE 1 )
-  SET( UNIX )
- endif()
- find_program( ${ARGN} )
- SET( WIN32 )
- SET( APPLE )
- SET( UNIX 1 )
- set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY )
- set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY )
- set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY )
-endmacro()
-
-
-# export toolchain settings for the try_compile() command
-if( NOT _CMAKE_IN_TRY_COMPILE )
- set( __toolchain_config "")
- foreach( __var NDK_CCACHE  LIBRARY_OUTPUT_PATH_ROOT  ANDROID_FORBID_SYGWIN
-                ANDROID_NDK_HOST_X64
-                ANDROID_NDK
-                ANDROID_NDK_LAYOUT
-                ANDROID_STANDALONE_TOOLCHAIN
-                ANDROID_TOOLCHAIN_NAME
-                ANDROID_ABI
-                ANDROID_NATIVE_API_LEVEL
-                ANDROID_STL
-                ANDROID_STL_FORCE_FEATURES
-                ANDROID_FORCE_ARM_BUILD
-                ANDROID_NO_UNDEFINED
-                ANDROID_SO_UNDEFINED
-                ANDROID_FUNCTION_LEVEL_LINKING
-                ANDROID_GOLD_LINKER
-                ANDROID_NOEXECSTACK
-                ANDROID_RELRO
-                ANDROID_LIBM_PATH
-                ANDROID_EXPLICIT_CRT_LINK
-                ANDROID_APP_PIE
-                )
-  if( DEFINED ${__var} )
-   if( ${__var} MATCHES " ")
-    set( __toolchain_config "${__toolchain_config}set( ${__var} \"${${__var}}\" CACHE INTERNAL \"\" )\n" )
-   else()
-    set( __toolchain_config "${__toolchain_config}set( ${__var} ${${__var}} CACHE INTERNAL \"\" )\n" )
-   endif()
-  endif()
- endforeach()
- file( WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/android.toolchain.config.cmake" "${__toolchain_config}" )
- unset( __toolchain_config )
-endif()
-
-
-# force cmake to produce / instead of \ in build commands for Ninja generator
-if( CMAKE_GENERATOR MATCHES "Ninja" AND CMAKE_HOST_WIN32 )
- # it is a bad hack after all
- # CMake generates Ninja makefiles with UNIX paths only if it thinks that we are going to build with MinGW
- set( CMAKE_COMPILER_IS_MINGW TRUE ) # tell CMake that we are MinGW
- set( CMAKE_CROSSCOMPILING TRUE )    # stop recursion
- enable_language( C )
- enable_language( CXX )
- # unset( CMAKE_COMPILER_IS_MINGW ) # can't unset because CMake does not convert back-slashes in response files without it
- unset( MINGW )
-endif()
-
-
-# Variables controlling behavior or set by cmake toolchain:
-#   ANDROID_ABI : "armeabi-v7a" (default), "armeabi", "armeabi-v7a with NEON", "armeabi-v7a with VFPV3", "armeabi-v6 with VFP", "x86", "mips", "arm64-v8a", "x86_64", "mips64"
-#   ANDROID_NATIVE_API_LEVEL : 3,4,5,8,9,14,15,16,17,18,19,21 (depends on NDK version)
-#   ANDROID_STL : gnustl_static/gnustl_shared/stlport_static/stlport_shared/gabi++_static/gabi++_shared/system_re/system/none
-#   ANDROID_FORBID_SYGWIN : ON/OFF
-#   ANDROID_NO_UNDEFINED : ON/OFF
-#   ANDROID_SO_UNDEFINED : OFF/ON  (default depends on NDK version)
-#   ANDROID_FUNCTION_LEVEL_LINKING : ON/OFF
-#   ANDROID_GOLD_LINKER : ON/OFF
-#   ANDROID_NOEXECSTACK : ON/OFF
-#   ANDROID_RELRO : ON/OFF
-#   ANDROID_FORCE_ARM_BUILD : ON/OFF
-#   ANDROID_STL_FORCE_FEATURES : ON/OFF
-#   ANDROID_LIBM_PATH : path to libm.so (set to something like $(TOP)/out/target/product/<product_name>/obj/lib/libm.so) to workaround unresolved `sincos`
-# Can be set only at the first run:
-#   ANDROID_NDK : path to your NDK install
-#   NDK_CCACHE : path to your ccache executable
-#   ANDROID_TOOLCHAIN_NAME : the NDK name of compiler toolchain
-#   ANDROID_NDK_HOST_X64 : try to use x86_64 toolchain (default for x64 host systems)
-#   ANDROID_NDK_LAYOUT : the inner NDK structure (RELEASE, LINARO, ANDROID)
-#   LIBRARY_OUTPUT_PATH_ROOT : <any valid path>
-#   ANDROID_STANDALONE_TOOLCHAIN
-#
-# Primary read-only variables:
-#   ANDROID : always TRUE
-#   ARMEABI : TRUE for arm v6 and older devices
-#   ARMEABI_V6 : TRUE for arm v6
-#   ARMEABI_V7A : TRUE for arm v7a
-#   ARM64_V8A : TRUE for arm64-v8a
-#   NEON : TRUE if NEON unit is enabled
-#   VFPV3 : TRUE if VFP version 3 is enabled
-#   X86 : TRUE if configured for x86
-#   X86_64 : TRUE if configured for x86_64
-#   MIPS : TRUE if configured for mips
-#   MIPS64 : TRUE if configured for mips64
-#   BUILD_WITH_ANDROID_NDK : TRUE if NDK is used
-#   BUILD_WITH_STANDALONE_TOOLCHAIN : TRUE if standalone toolchain is used
-#   ANDROID_NDK_HOST_SYSTEM_NAME : "windows", "linux-x86" or "darwin-x86" depending on host platform
-#   ANDROID_NDK_ABI_NAME : "armeabi", "armeabi-v7a", "x86", "mips", "arm64-v8a", "x86_64", "mips64" depending on ANDROID_ABI
-#   ANDROID_NDK_RELEASE : from r5 to r10d; set only for NDK
-#   ANDROID_NDK_RELEASE_NUM : numeric ANDROID_NDK_RELEASE version (1000*major+minor)
-#   ANDROID_ARCH_NAME : "arm", "x86", "mips", "arm64", "x86_64", "mips64" depending on ANDROID_ABI
-#   ANDROID_SYSROOT : path to the compiler sysroot
-#   TOOL_OS_SUFFIX : "" or ".exe" depending on host platform
-#   ANDROID_COMPILER_IS_CLANG : TRUE if clang compiler is used
-#
-# Secondary (less stable) read-only variables:
-#   ANDROID_COMPILER_VERSION : GCC version used (not Clang version)
-#   ANDROID_CLANG_VERSION : version of clang compiler if clang is used
-#   ANDROID_CXX_FLAGS : C/C++ compiler flags required by Android platform
-#   ANDROID_SUPPORTED_ABIS : list of currently allowed values for ANDROID_ABI
-#   ANDROID_TOOLCHAIN_MACHINE_NAME : "arm-linux-androideabi", "arm-eabi" or "i686-android-linux"
-#   ANDROID_TOOLCHAIN_ROOT : path to the top level of toolchain (standalone or placed inside NDK)
-#   ANDROID_CLANG_TOOLCHAIN_ROOT : path to clang tools
-#   ANDROID_SUPPORTED_NATIVE_API_LEVELS : list of native API levels found inside NDK
-#   ANDROID_STL_INCLUDE_DIRS : stl include paths
-#   ANDROID_RTTI : if rtti is enabled by the runtime
-#   ANDROID_EXCEPTIONS : if exceptions are enabled by the runtime
-#   ANDROID_GCC_TOOLCHAIN_NAME : read-only, differs from ANDROID_TOOLCHAIN_NAME only if clang is used
-#
-# Defaults:
-#   ANDROID_DEFAULT_NDK_API_LEVEL
-#   ANDROID_DEFAULT_NDK_API_LEVEL_${ARCH}
-#   ANDROID_NDK_SEARCH_PATHS
-#   ANDROID_SUPPORTED_ABIS_${ARCH}
-#   ANDROID_SUPPORTED_NDK_VERSIONS
diff --git a/cmake/android/deployment-file.json.in b/cmake/android/deployment-file.json.in
deleted file mode 100644
index 81ed8a6ecc..0000000000
--- a/cmake/android/deployment-file.json.in
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-   "qt": "@QT_DIR@",
-   "sdk": "@ANDROID_SDK_ROOT@",
-   "ndk": "@ANDROID_NDK@",
-   "toolchain-prefix": "@ANDROID_TOOLCHAIN_MACHINE_NAME@",
-   "tool-prefix": "@ANDROID_TOOLCHAIN_MACHINE_NAME@",
-   "toolchain-version": "@ANDROID_COMPILER_VERSION@",
-   "ndk-host": "@ANDROID_NDK_HOST_SYSTEM_NAME@",
-   "target-architecture": "@ANDROID_ABI@",
-   "application-binary": "@EXECUTABLE_DESTINATION_PATH@",
-   "android-extra-libs": "@_DEPS@",
-   "android-package-source-directory": "@ANDROID_APK_BUILD_DIR@"
-}
diff --git a/cmake/android/strings.xml.in b/cmake/android/strings.xml.in
deleted file mode 100644
index 6e6ce7b12e..0000000000
--- a/cmake/android/strings.xml.in
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-
-<!-- IMPORTANT: Do not manually manipulate this automatically generated file, changes will be gone after the next build! -->
-
-<resources>
-  <string name="AppDisplayName">${ANDROID_APP_DISPLAY_NAME}</string>
-    
-  <string name="ministro_not_found_msg">Can\'t find Ministro service.\nThe application can\'t start.</string>
-  <string name="ministro_needed_msg">This application requires Ministro service. Would you like to install it?</string>
-  <string name="fatal_error_msg">Your application encountered a fatal error and cannot continue.</string>
-</resources>
diff --git a/cmake/compiler.cmake b/cmake/compiler.cmake
new file mode 100644
index 0000000000..968a65a6dd
--- /dev/null
+++ b/cmake/compiler.cmake
@@ -0,0 +1,106 @@
+set(CMAKE_CXX_FLAGS_DEBUG  "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
+
+if (WIN32)
+  if (NOT "${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+    message( FATAL_ERROR "Only 64 bit builds supported." )
+  endif()
+
+  add_definitions(-DNOMINMAX -D_CRT_SECURE_NO_WARNINGS)
+
+  if (NOT WINDOW_SDK_PATH)
+    set(DEBUG_DISCOVERED_SDK_PATH TRUE)
+  endif()
+
+  # sets path for Microsoft SDKs
+  # if you get build error about missing 'glu32' this path is likely wrong
+  if (MSVC_VERSION GREATER_EQUAL 1910) # VS 2017
+    set(WINDOW_SDK_PATH "C:/Program Files (x86)/Windows Kits/10/Lib/${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}/x64" CACHE PATH "Windows SDK PATH")
+  elseif (MSVC_VERSION GREATER_EQUAL 1800) # VS 2013
+    set(WINDOW_SDK_PATH "C:\\Program Files (x86)\\Windows Kits\\8.1\\Lib\\winv6.3\\um\\${WINDOW_SDK_FOLDER}" CACHE PATH "Windows SDK PATH")
+  else()
+    message( FATAL_ERROR "Visual Studio 2013 or higher required." )
+  endif()
+
+  if (DEBUG_DISCOVERED_SDK_PATH)
+    message(STATUS "The discovered Windows SDK path is ${WINDOW_SDK_PATH}")
+  endif ()
+
+  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")
+  # /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.
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE")
+  # always produce symbols as PDB files
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zi")
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DEBUG /OPT:REF /OPT:ICF")
+else ()
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -fno-strict-aliasing -Wno-unused-parameter")
+  if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ggdb -Woverloaded-virtual -Wdouble-promotion")
+      if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "5.1") # gcc 5.1 and on have suggest-override
+          set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsuggest-override")
+      endif ()
+      if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.3")
+          # GLM 0.9.8 on Ubuntu 14 (gcc 4.4) has issues with the simd declarations
+          add_definitions(-DGLM_FORCE_PURE)
+      endif()
+  endif ()
+endif()
+
+if (ANDROID)
+    # assume that the toolchain selected for android has C++11 support
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+elseif ((NOT MSVC12) AND (NOT MSVC14))
+    include(CheckCXXCompilerFlag)
+    CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
+    CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
+    if (COMPILER_SUPPORTS_CXX11)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+    elseif(COMPILER_SUPPORTS_CXX0X)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+    else()
+        message(FATAL_ERROR  "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
+    endif()
+endif ()
+
+if (APPLE)
+  set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11")
+  set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --stdlib=libc++")
+endif ()
+
+if (NOT ANDROID_LIB_DIR)
+  set(ANDROID_LIB_DIR $ENV{ANDROID_LIB_DIR})
+endif ()
+
+if (APPLE)
+  exec_program(sw_vers ARGS -productVersion  OUTPUT_VARIABLE OSX_VERSION)
+  string(REGEX MATCH "^[0-9]+\\.[0-9]+" OSX_VERSION ${OSX_VERSION})
+  message(STATUS "Detected OS X version = ${OSX_VERSION}")
+
+  set(OSX_SDK "${OSX_VERSION}" CACHE String "OS X SDK version to look for inside Xcode bundle or at OSX_SDK_PATH")
+
+  # set our OS X deployment target
+  set(CMAKE_OSX_DEPLOYMENT_TARGET 10.8)
+
+  # find the SDK path for the desired SDK
+  find_path(
+    _OSX_DESIRED_SDK_PATH
+    NAME MacOSX${OSX_SDK}.sdk
+    HINTS ${OSX_SDK_PATH}
+    PATHS /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/
+          /Applications/Xcode-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/
+  )
+
+  if (NOT _OSX_DESIRED_SDK_PATH)
+    message(STATUS "Could not find OS X ${OSX_SDK} SDK. Will fall back to default. If you want a specific SDK, please pass OSX_SDK and optionally OSX_SDK_PATH to CMake.")
+  else ()
+    message(STATUS "Found OS X ${OSX_SDK} SDK at ${_OSX_DESIRED_SDK_PATH}/MacOSX${OSX_SDK}.sdk")
+
+    # set that as the SDK to use
+    set(CMAKE_OSX_SYSROOT ${_OSX_DESIRED_SDK_PATH}/MacOSX${OSX_SDK}.sdk)
+  endif ()
+endif ()
\ No newline at end of file
diff --git a/cmake/externals/LibOVR/CMakeLists.txt b/cmake/externals/LibOVR/CMakeLists.txt
index c98aa8a04a..97508be0c5 100644
--- a/cmake/externals/LibOVR/CMakeLists.txt
+++ b/cmake/externals/LibOVR/CMakeLists.txt
@@ -33,7 +33,6 @@ if (WIN32)
   include(SelectLibraryConfigurations)
   select_library_configurations(LIBOVR)
   set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${${EXTERNAL_NAME_UPPER}_LIBRARIES} CACHE TYPE INTERNAL)
-  message("Libs ${EXTERNAL_NAME_UPPER}_LIBRARIES ${${EXTERNAL_NAME_UPPER}_LIBRARIES}")
 
 elseif(APPLE)
   
diff --git a/cmake/externals/draco/CMakeLists.txt b/cmake/externals/draco/CMakeLists.txt
new file mode 100644
index 0000000000..6a894e76b6
--- /dev/null
+++ b/cmake/externals/draco/CMakeLists.txt
@@ -0,0 +1,41 @@
+set(EXTERNAL_NAME draco)
+
+if (ANDROID)
+  set(ANDROID_CMAKE_ARGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}" "-DANDROID_NATIVE_API_LEVEL=19")
+endif ()
+
+if (APPLE)
+  set(EXTRA_CMAKE_FLAGS -DCMAKE_CXX_FLAGS=-stdlib=libc++ -DCMAKE_EXE_LINKER_FLAGS=-stdlib=libc++)
+endif ()
+
+include(ExternalProject)
+ExternalProject_Add(
+  ${EXTERNAL_NAME}
+  URL http://hifi-public.s3.amazonaws.com/dependencies/draco-1.1.0.zip
+  URL_MD5 208f8b04c91d5f1c73d731a3ea37c5bb
+  CONFIGURE_COMMAND CMAKE_ARGS  ${ANDROID_CMAKE_ARGS} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>-$<CONFIG> ${EXTRA_CMAKE_FLAGS}
+  LOG_DOWNLOAD 1
+  LOG_CONFIGURE 1
+  LOG_BUILD 1
+)
+
+# Hide this external target (for ide users)
+set_target_properties(${EXTERNAL_NAME} PROPERTIES FOLDER "hidden/externals")
+
+ExternalProject_Get_Property(${EXTERNAL_NAME} INSTALL_DIR)
+set(SUFFIXED_INSTALL_DIR "${INSTALL_DIR}-$<CONFIG>")
+
+string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
+
+set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${SUFFIXED_INSTALL_DIR}/include CACHE PATH "List of Draco include directories")
+
+if (UNIX)
+  set(LIB_PREFIX "lib")
+  set(LIB_EXT "a")
+elseif (WIN32)
+  set(LIB_EXT "lib")
+endif ()
+
+set(${EXTERNAL_NAME_UPPER}_LIBRARY ${SUFFIXED_INSTALL_DIR}/lib/${LIB_PREFIX}draco.${LIB_EXT} CACHE FILEPATH "Path to Draco release library")
+set(${EXTERNAL_NAME_UPPER}_ENCODER_LIBRARY ${SUFFIXED_INSTALL_DIR}/lib/${LIB_PREFIX}dracoenc.${LIB_EXT} CACHE FILEPATH "Path to Draco encoder release library")
+set(${EXTERNAL_NAME_UPPER}_DECODER_LIBRARY ${SUFFIXED_INSTALL_DIR}/lib/${LIB_PREFIX}dracodec.${LIB_EXT} CACHE FILEPATH "Path to Draco decoder release library")
diff --git a/cmake/externals/glew/CMakeLists.txt b/cmake/externals/glew/CMakeLists.txt
index 28a599bfa6..6c3208981d 100644
--- a/cmake/externals/glew/CMakeLists.txt
+++ b/cmake/externals/glew/CMakeLists.txt
@@ -9,7 +9,7 @@ ExternalProject_Add(
   ${EXTERNAL_NAME}
   URL http://hifi-public.s3.amazonaws.com/dependencies/glew_simple_1.13.0.zip
   URL_MD5 73f833649e904257b35bf4e84f8bdfb5
-  CONFIGURE_COMMAND CMAKE_ARGS  ${ANDROID_CMAKE_ARGS} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+  CONFIGURE_COMMAND CMAKE_ARGS  ${ANDROID_CMAKE_ARGS} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_POSITION_INDEPENDENT_CODE=ON
   LOG_DOWNLOAD 1
   LOG_CONFIGURE 1
   LOG_BUILD 1
diff --git a/cmake/externals/glm/CMakeLists.txt b/cmake/externals/glm/CMakeLists.txt
index 79a44fa48e..bc8089074f 100644
--- a/cmake/externals/glm/CMakeLists.txt
+++ b/cmake/externals/glm/CMakeLists.txt
@@ -6,7 +6,7 @@ ExternalProject_Add(
   URL https://hifi-public.s3.amazonaws.com/dependencies/glm-0.9.8.zip
   URL_MD5 579ac77a3110befa3244d68c0ceb7281
   BINARY_DIR ${EXTERNAL_PROJECT_PREFIX}/build
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> ${EXTERNAL_ARGS}
   LOG_DOWNLOAD 1
   LOG_CONFIGURE 1
   LOG_BUILD 1
diff --git a/cmake/externals/hifiAudioCodec/CMakeLists.txt b/cmake/externals/hifiAudioCodec/CMakeLists.txt
index a30396c6fd..e3ba36a440 100644
--- a/cmake/externals/hifiAudioCodec/CMakeLists.txt
+++ b/cmake/externals/hifiAudioCodec/CMakeLists.txt
@@ -5,43 +5,41 @@ set(EXTERNAL_NAME hifiAudioCodec)
 
 string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
 
-if (NOT ANDROID)
-
-  if (WIN32 OR APPLE)
-    ExternalProject_Add(
-      ${EXTERNAL_NAME}
-      URL http://s3.amazonaws.com/hifi-public/dependencies/codecSDK-1.zip
-      URL_MD5 23ec3fe51eaa155ea159a4971856fc13
-      CONFIGURE_COMMAND ""
-      BUILD_COMMAND ""
-      INSTALL_COMMAND ""
-      LOG_DOWNLOAD 1
-    )
-  else ()
-    ExternalProject_Add(
-      ${EXTERNAL_NAME}
-      URL http://s3.amazonaws.com/hifi-public/dependencies/codecSDK-linux.zip
-      URL_MD5 7d37914a18aa4de971d2f45dd3043bde
-      CONFIGURE_COMMAND ""
-      BUILD_COMMAND ""
-      INSTALL_COMMAND ""
-      LOG_DOWNLOAD 1
-    )
-  endif()
-
-  # Hide this external target (for ide users)
-  set_target_properties(${EXTERNAL_NAME} PROPERTIES FOLDER "hidden/externals")
-
-  ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR)
-
-  set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${SOURCE_DIR}/include CACHE TYPE INTERNAL)
-
-  if (WIN32)
-    set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/Release/audio.lib CACHE TYPE INTERNAL)
-  elseif(APPLE)
-    set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/Release/libaudio.a CACHE TYPE INTERNAL)
-  elseif(NOT ANDROID)
-    set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/Release/libaudio.a CACHE TYPE INTERNAL)
-  endif()
-
+if (WIN32)
+  set(DOWNLOAD_URL http://s3.amazonaws.com/hifi-public/dependencies/codecSDK-win-2.0.zip)
+  set(DOWNLOAD_MD5 9199d4dbd6b16bed736b235efe980e67)
+elseif (APPLE)
+  set(DOWNLOAD_URL http://s3.amazonaws.com/hifi-public/dependencies/codecSDK-mac-2.0.zip)
+  set(DOWNLOAD_MD5 21649881e7d5dc94f922179be96f76ba)
+elseif (ANDROID)
+  set(DOWNLOAD_URL http://s3.amazonaws.com/hifi-public/dependencies/codecSDK-android-2.0.zip)
+  set(DOWNLOAD_MD5 aef2a852600d498d58aa586668191683)
+elseif (UNIX)
+  set(DOWNLOAD_URL http://s3.amazonaws.com/hifi-public/dependencies/codecSDK-linux-2.0.zip)
+  set(DOWNLOAD_MD5 67fb7755f9bcafb98a9fceea53bc7481)
+else()
+  return()
+endif()
+
+ExternalProject_Add(
+  ${EXTERNAL_NAME}
+  URL ${DOWNLOAD_URL}
+  URL_MD5 ${DOWNLOAD_MD5}
+  CONFIGURE_COMMAND ""
+  BUILD_COMMAND ""
+  INSTALL_COMMAND ""
+  LOG_DOWNLOAD 1
+)
+
+# Hide this external target (for ide users)
+set_target_properties(${EXTERNAL_NAME} PROPERTIES FOLDER "hidden/externals")
+
+ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR)
+
+set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${SOURCE_DIR}/include CACHE TYPE INTERNAL)
+
+if (WIN32)
+  set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/Release/audio.lib CACHE TYPE INTERNAL)
+else()
+  set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/Release/libaudio.a CACHE TYPE INTERNAL)
 endif()
diff --git a/cmake/externals/nvtt/CMakeLists.txt b/cmake/externals/nvtt/CMakeLists.txt
index fa9d7b5ea1..00722bd1e0 100644
--- a/cmake/externals/nvtt/CMakeLists.txt
+++ b/cmake/externals/nvtt/CMakeLists.txt
@@ -31,7 +31,7 @@ else ()
     ${EXTERNAL_NAME}
     URL http://hifi-public.s3.amazonaws.com/dependencies/nvidia-texture-tools-2.1.0.hifi.zip
     URL_MD5 5794b950f8b265a9a41b2839b3bf7ebb
-    CONFIGURE_COMMAND CMAKE_ARGS  ${ANDROID_CMAKE_ARGS} -DNVTT_SHARED=1 -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+    CONFIGURE_COMMAND CMAKE_ARGS  ${ANDROID_CMAKE_ARGS} -DNVTT_SHARED=1 -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_POSITION_INDEPENDENT_CODE=ON
     LOG_DOWNLOAD 1
     LOG_CONFIGURE 1
     LOG_BUILD 1
diff --git a/cmake/externals/quazip/CMakeLists.txt b/cmake/externals/quazip/CMakeLists.txt
index 7af13dafa7..0d66b365a2 100644
--- a/cmake/externals/quazip/CMakeLists.txt
+++ b/cmake/externals/quazip/CMakeLists.txt
@@ -4,14 +4,6 @@ cmake_policy(SET CMP0046 OLD)
 
 include(ExternalProject)
 
-if (WIN32)
-    # windows shell does not like backslashes expanded on the command line,
-    # so convert all backslashes in the QT path to forward slashes
-    string(REPLACE \\ / QT_CMAKE_PREFIX_PATH $ENV{QT_CMAKE_PREFIX_PATH})
-elseif ($ENV{QT_CMAKE_PREFIX_PATH})
-    set(QT_CMAKE_PREFIX_PATH $ENV{QT_CMAKE_PREFIX_PATH})
-endif ()
-
 set(QUAZIP_CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${QT_CMAKE_PREFIX_PATH} -DCMAKE_INSTALL_NAME_DIR:PATH=<INSTALL_DIR>/lib -DZLIB_ROOT=${ZLIB_ROOT} -DCMAKE_POSITION_INDEPENDENT_CODE=ON)
 
 if (APPLE)
@@ -21,8 +13,8 @@ endif ()
 
 ExternalProject_Add(
   ${EXTERNAL_NAME}
-  URL https://s3-us-west-1.amazonaws.com/hifi-production/dependencies/quazip-0.7.2.zip
-  URL_MD5 2955176048a31262c09259ca8d309d19
+  URL https://hifi-public.s3.amazonaws.com/dependencies/quazip-0.7.3.zip
+  URL_MD5 ed03754d39b9da1775771819b8001d45
   BINARY_DIR ${EXTERNAL_PROJECT_PREFIX}/build
   CMAKE_ARGS ${QUAZIP_CMAKE_ARGS}
   LOG_DOWNLOAD 1
@@ -34,9 +26,9 @@ add_dependencies(quazip zlib)
 
 # Hide this external target (for ide users)
 set_target_properties(${EXTERNAL_NAME} PROPERTIES 
-	FOLDER "hidden/externals"
-	INSTALL_NAME_DIR ${INSTALL_DIR}/lib
-	BUILD_WITH_INSTALL_RPATH True)
+    FOLDER "hidden/externals"
+    INSTALL_NAME_DIR ${INSTALL_DIR}/lib
+    BUILD_WITH_INSTALL_RPATH True)
 
 ExternalProject_Get_Property(${EXTERNAL_NAME} INSTALL_DIR)
 set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIR ${INSTALL_DIR}/include CACHE PATH "List of QuaZip include directories")
diff --git a/cmake/externals/tbb/CMakeLists.txt b/cmake/externals/tbb/CMakeLists.txt
index 74f7e10859..9664fe7250 100644
--- a/cmake/externals/tbb/CMakeLists.txt
+++ b/cmake/externals/tbb/CMakeLists.txt
@@ -2,57 +2,27 @@ set(EXTERNAL_NAME tbb)
 
 include(ExternalProject)
 
-if (ANDROID)
-
-  find_program(NDK_BUILD_COMMAND NAMES ndk-build DOC "Path to the ndk-build command")
-
-  ExternalProject_Add(
-    ${EXTERNAL_NAME}
-    URL http://hifi-public.s3.amazonaws.com/dependencies/tbb43_20150316oss_src.tgz
-    URL_MD5 bf090eaa86cf89ea014b7b462786a440
-    BUILD_COMMAND ${NDK_BUILD_COMMAND} --directory=jni target=android tbb tbbmalloc arch=arm
-    BUILD_IN_SOURCE 1
-    CONFIGURE_COMMAND ""
-    INSTALL_COMMAND ${CMAKE_COMMAND} -DTBB_LIBS_SUFFIX=so -P ${CMAKE_CURRENT_SOURCE_DIR}/TBBLibCopy.cmake
-    LOG_DOWNLOAD 1
-    LOG_CONFIGURE 1
-    LOG_BUILD 1
-  )
+if (WIN32)
+  set(DOWNLOAD_URL http://hifi-public.s3.amazonaws.com/dependencies/tbb2017_20170604oss_win_slim.zip)
+  set(DOWNLOAD_MD5 065934458e3db88397f3d10e7eea536c)
 elseif (APPLE)
-  find_program(MAKE_COMMAND NAMES make DOC "Path to the make command")
-
-  ExternalProject_Add(
-    ${EXTERNAL_NAME}
-    URL http://hifi-public.s3.amazonaws.com/dependencies/tbb43_20150316oss_src.tgz
-    URL_MD5 bf090eaa86cf89ea014b7b462786a440
-    BUILD_COMMAND ${MAKE_COMMAND} tbb_os=macos
-    BUILD_IN_SOURCE 1
-    CONFIGURE_COMMAND ""
-    INSTALL_COMMAND ${CMAKE_COMMAND} -DTBB_LIBS_SUFFIX=dylib -P ${CMAKE_CURRENT_SOURCE_DIR}/TBBLibCopy.cmake
-    LOG_DOWNLOAD 1
-    LOG_CONFIGURE 1
-    LOG_BUILD 1
-  )
+  set(DOWNLOAD_URL http://s3.amazonaws.com/hifi-public/dependencies/tbb2017_20170604oss_mac_slim.tar.gz)
+  set(DOWNLOAD_MD5 62bde626b396f8e1a85c6a8ded1d8105)
 else ()
-  if (WIN32)
-    set(DOWNLOAD_URL http://s3.amazonaws.com/hifi-public/dependencies/tbb43_20150316oss_win.zip)
-    set(DOWNLOAD_MD5 d250d40bb93b255f75bcbb19e976a440)
-  else ()
-    set(DOWNLOAD_URL http://s3.amazonaws.com/hifi-public/dependencies/tbb43_20150316oss_lin.tgz)
-    set(DOWNLOAD_MD5 7830ba2bc62438325fba2ec0c95367a5)
-  endif ()
-
-  ExternalProject_Add(
-    ${EXTERNAL_NAME}
-    URL ${DOWNLOAD_URL}
-    URL_MD5 ${DOWNLOAD_MD5}
-    BUILD_COMMAND ""
-    CONFIGURE_COMMAND ""
-    INSTALL_COMMAND ""
-    LOG_DOWNLOAD ON
-  )
+  set(DOWNLOAD_URL http://hifi-public.s3.amazonaws.com/dependencies/tbb2017_20170604oss_lin_slim.tar.gz)
+  set(DOWNLOAD_MD5 2a5c721f40fa3503ffc12c18dd00011c)
 endif ()
 
+ExternalProject_Add(
+  ${EXTERNAL_NAME}
+  URL ${DOWNLOAD_URL}
+  URL_MD5 ${DOWNLOAD_MD5}
+  BUILD_COMMAND ""
+  CONFIGURE_COMMAND ""
+  INSTALL_COMMAND ""
+  LOG_DOWNLOAD ON
+)
+
 # Hide this external target (for ide users)
 set_target_properties(${EXTERNAL_NAME} PROPERTIES FOLDER "hidden/externals")
 
@@ -70,22 +40,32 @@ if (APPLE)
     change-install-name
     COMMENT "Calling install_name_tool on TBB libraries to fix install name for dylib linking"
     COMMAND ${CMAKE_COMMAND} -DINSTALL_NAME_LIBRARY_DIR=${_TBB_LIB_DIR} -P ${EXTERNAL_PROJECT_DIR}/OSXInstallNameChange.cmake
-    DEPENDEES install
+    DEPENDEES download
     WORKING_DIRECTORY <SOURCE_DIR>
     LOG 1
   )
-
 elseif (WIN32)
-  if ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-    set(_TBB_LIB_DIR "${SOURCE_DIR}/lib/intel64/vc12")
-    set(${EXTERNAL_NAME_UPPER}_DLL_PATH "${SOURCE_DIR}/bin/intel64/vc12" CACHE PATH "Path to TBB DLLs")
+  if (MSVC_VERSION GREATER_EQUAL 1900)
+    set(_TBB_MSVC_DIR "vc14")
+  elseif (MSVC_VERSION GREATER_EQUAL 1800)
+    set(_TBB_MSVC_DIR "vc12")
+  elseif (MSVC_VERSION GREATER_EQUAL 1700)
+    set(_TBB_MSVC_DIR "vc11")
   else()
-    set(_TBB_LIB_DIR "${SOURCE_DIR}/lib/ia32/vc12")
-    set(${EXTERNAL_NAME_UPPER}_DLL_PATH "${SOURCE_DIR}/bin/ia32/vc12" CACHE PATH "Path to TBB DLLs")
+    message(FATAL_ERROR "MSVC ${MSVC_VERSION} not supported by Intel TBB")
   endif()
+
+  if ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+    set(_TBB_LIB_DIR "${SOURCE_DIR}/lib/intel64/${_TBB_MSVC_DIR}")
+    set(${EXTERNAL_NAME_UPPER}_DLL_PATH "${SOURCE_DIR}/bin/intel64/${_TBB_MSVC_DIR}" CACHE PATH "Path to TBB DLLs")
+  else()
+    set(_TBB_LIB_DIR "${SOURCE_DIR}/lib/ia32/${_TBB_MSVC_DIR}")
+    set(${EXTERNAL_NAME_UPPER}_DLL_PATH "${SOURCE_DIR}/bin/ia32/${_TBB_MSVC_DIR}" CACHE PATH "Path to TBB DLLs")
+  endif()
+
   set(_LIB_EXT "lib")
 elseif (ANDROID)
-  set(_TBB_LIB_DIR "${SOURCE_DIR}/lib")
+  set(_TBB_LIB_DIR "${SOURCE_DIR}/lib/android")
   set(_LIB_PREFIX "lib")
   set(_LIB_EXT "so")
 elseif (UNIX)
@@ -103,15 +83,15 @@ elseif (UNIX)
     OUTPUT_VARIABLE GCC_VERSION
   )
 
-  if (GCC_VERSION VERSION_GREATER 4.4 OR GCC_VERSION VERSION_EQUAL 4.4)
+  if (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7)
+    set(_TBB_LIB_DIR "${SOURCE_DIR}/lib/${_TBB_ARCH_DIR}/gcc4.7")
+  elseif (GCC_VERSION VERSION_GREATER 4.4 OR GCC_VERSION VERSION_EQUAL 4.4)
     set(_TBB_LIB_DIR "${SOURCE_DIR}/lib/${_TBB_ARCH_DIR}/gcc4.4")
   elseif (GCC_VERSION VERSION_GREATER 4.1 OR GCC_VERSION VERSION_EQUAL 4.1)
     set(_TBB_LIB_DIR "${SOURCE_DIR}/lib/${_TBB_ARCH_DIR}/gcc4.1")
   else ()
     message(STATUS "Could not find a compatible version of Threading Building Blocks library for your compiler.")
   endif ()
-
-
 endif ()
 
 if (DEFINED _TBB_LIB_DIR)
@@ -124,3 +104,4 @@ endif ()
 if (DEFINED ${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE)
   set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${SOURCE_DIR}/include CACHE TYPE "List of tbb include directories")
 endif ()
+
diff --git a/cmake/externals/wasapi/CMakeLists.txt b/cmake/externals/wasapi/CMakeLists.txt
index 1bf195fc84..4c0ffaf88f 100644
--- a/cmake/externals/wasapi/CMakeLists.txt
+++ b/cmake/externals/wasapi/CMakeLists.txt
@@ -6,8 +6,8 @@ if (WIN32)
   include(ExternalProject)
   ExternalProject_Add(
     ${EXTERNAL_NAME}
-    URL http://hifi-public.s3.amazonaws.com/dependencies/qtaudio_wasapi8.zip
-    URL_MD5 b01510437ea15527156bc25cdf733bd9
+    URL http://hifi-public.s3.amazonaws.com/dependencies/qtaudio_wasapi10.zip
+    URL_MD5 4f40e49715a420fb67b45b9cee19052c
     CONFIGURE_COMMAND ""
     BUILD_COMMAND ""
     INSTALL_COMMAND ""
diff --git a/cmake/init.cmake b/cmake/init.cmake
new file mode 100644
index 0000000000..9d7b0fd94c
--- /dev/null
+++ b/cmake/init.cmake
@@ -0,0 +1,56 @@
+if (WIN32)
+  cmake_policy(SET CMP0020 NEW)
+endif (WIN32)
+
+if (POLICY CMP0043)
+  cmake_policy(SET CMP0043 OLD)
+endif ()
+
+if (POLICY CMP0042)
+  cmake_policy(SET CMP0042 OLD)
+endif ()
+
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "CMakeTargets")
+# Hide automoc folders (for IDEs)
+set(AUTOGEN_TARGETS_FOLDER "hidden/generated")
+# Find includes in corresponding build directories
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+if (CMAKE_BUILD_TYPE)
+  string(TOUPPER ${CMAKE_BUILD_TYPE} UPPER_CMAKE_BUILD_TYPE)
+else ()
+  set(UPPER_CMAKE_BUILD_TYPE DEBUG)
+endif ()
+
+# CMAKE_CURRENT_SOURCE_DIR is the parent folder here
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/")
+
+set(HF_CMAKE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+set(MACRO_DIR "${HF_CMAKE_DIR}/macros")
+set(EXTERNAL_PROJECT_DIR "${HF_CMAKE_DIR}/externals")
+
+file(GLOB HIFI_CUSTOM_MACROS "cmake/macros/*.cmake")
+foreach(CUSTOM_MACRO ${HIFI_CUSTOM_MACROS})
+  include(${CUSTOM_MACRO})
+endforeach()
+unset(HIFI_CUSTOM_MACROS) 
+
+if (ANDROID)
+    set(BUILD_SHARED_LIBS ON)
+    set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE BOTH)
+
+    string(REGEX REPLACE "\\\\" "/" ANDROID_NDK ${ANDROID_NDK})
+    string(REGEX REPLACE "\\\\" "/" CMAKE_TOOLCHAIN_FILE ${CMAKE_TOOLCHAIN_FILE})
+    string(REGEX REPLACE "\\\\" "/" ANDROID_TOOLCHAIN ${ANDROID_TOOLCHAIN})
+    string(REGEX REPLACE "\\\\" "/" CMAKE_MAKE_PROGRAM ${CMAKE_MAKE_PROGRAM})
+    list(APPEND EXTERNAL_ARGS -DANDROID_ABI=${ANDROID_ABI})
+    list(APPEND EXTERNAL_ARGS -DANDROID_NDK=${ANDROID_NDK})
+    list(APPEND EXTERNAL_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
+    list(APPEND EXTERNAL_ARGS -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM})
+    list(APPEND EXTERNAL_ARGS -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE})
+    list(APPEND EXTERNAL_ARGS -DHIFI_ANDROID=${HIFI_ANDROID})
+    list(APPEND EXTERNAL_ARGS -DANDROID_PLATFORM=${ANDROID_PLATFORM})
+    list(APPEND EXTERNAL_ARGS -DANDROID_TOOLCHAIN=${ANDROID_TOOLCHAIN})
+    list(APPEND EXTERNAL_ARGS -DANDROID_STL=${ANDROID_STL})
+endif ()
diff --git a/cmake/macros/AutoScribeShader.cmake b/cmake/macros/AutoScribeShader.cmake
index c43ade45d2..1919ecf00a 100755
--- a/cmake/macros/AutoScribeShader.cmake
+++ b/cmake/macros/AutoScribeShader.cmake
@@ -62,7 +62,9 @@ function(AUTOSCRIBE_SHADER SHADER_FILE)
     # since it's unrunnable by the cross-compiling build machine
 
     # so, we require the compiling user to point us at a compiled executable version for their native toolchain
-    find_program(NATIVE_SCRIBE scribe PATHS ${SCRIBE_PATH} ENV SCRIBE_PATH)
+    if (NOT NATIVE_SCRIBE)
+        find_program(NATIVE_SCRIBE scribe PATHS ${SCRIBE_PATH} ENV SCRIBE_PATH)
+    endif()
 
     if (NOT NATIVE_SCRIBE)
       message(FATAL_ERROR "The High Fidelity scribe tool is required for shader pre-processing. \
@@ -116,6 +118,7 @@ macro(AUTOSCRIBE_SHADER_LIB)
   foreach(SHADER_FILE ${SHADER_SOURCE_FILES})
     AUTOSCRIBE_SHADER(${SHADER_FILE} ${SHADER_INCLUDE_FILES})
     file(TO_CMAKE_PATH "${AUTOSCRIBE_SHADER_RETURN}" AUTOSCRIBE_GENERATED_FILE)
+    set_property(SOURCE ${AUTOSCRIBE_GENERATED_FILE} PROPERTY SKIP_AUTOMOC ON)
     list(APPEND AUTOSCRIBE_SHADER_SRC ${AUTOSCRIBE_GENERATED_FILE})
   endforeach()
   #message(${TARGET_NAME} ${AUTOSCRIBE_SHADER_SRC})
diff --git a/cmake/macros/GenerateInstallers.cmake b/cmake/macros/GenerateInstallers.cmake
index 0def701739..6c131168d5 100644
--- a/cmake/macros/GenerateInstallers.cmake
+++ b/cmake/macros/GenerateInstallers.cmake
@@ -22,23 +22,17 @@ macro(GENERATE_INSTALLERS)
   set(CPACK_PACKAGE_FILE_NAME "HighFidelity-Beta-${BUILD_VERSION}")
   set(CPACK_NSIS_DISPLAY_NAME ${_DISPLAY_NAME})
   set(CPACK_NSIS_PACKAGE_NAME ${_DISPLAY_NAME})
+  if (PR_BUILD)
+    set(CPACK_NSIS_COMPRESSOR "/SOLID bzip2")
+  endif ()
   set(CPACK_PACKAGE_INSTALL_DIRECTORY ${_DISPLAY_NAME})
 
+
   if (WIN32)
-    # include CMake module that will install compiler system libraries
-    # so that we have msvcr120 and msvcp120 installed with targets
-    set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION ${INTERFACE_INSTALL_DIR})
-
-    # as long as we're including sixense plugin with installer
-    # we need re-distributables for VS 2011 as well
-    # this should be removed if/when sixense support is pulled
-    set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS
-      "${EXTERNALS_BINARY_DIR}/sixense/project/src/sixense/samples/win64/msvcr100.dll"
-      "${EXTERNALS_BINARY_DIR}/sixense/project/src/sixense/samples/win64/msvcp100.dll"
-    )
-
+    # Do not install the Visual Studio C runtime libraries.  The installer will do this automatically
+    set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE)
+    
     include(InstallRequiredSystemLibraries)
-
     set(CPACK_NSIS_MUI_ICON "${HF_CMAKE_DIR}/installer/installer.ico")
 
     # install and reference the Add/Remove icon
@@ -90,3 +84,4 @@ macro(GENERATE_INSTALLERS)
 
   include(CPack)
 endmacro()
+
diff --git a/cmake/macros/GenerateQrc.cmake b/cmake/macros/GenerateQrc.cmake
new file mode 100644
index 0000000000..0283b3ea9b
--- /dev/null
+++ b/cmake/macros/GenerateQrc.cmake
@@ -0,0 +1,20 @@
+
+function(GENERATE_QRC)
+  set(oneValueArgs OUTPUT PREFIX PATH)
+  set(multiValueArgs GLOBS)
+  cmake_parse_arguments(GENERATE_QRC "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
+  if ("${GENERATE_QRC_PREFIX}" STREQUAL "")
+    set(QRC_PREFIX_PATH /)
+  else()
+    set(QRC_PREFIX_PATH ${GENERATE_QRC_PREFIX})
+  endif()
+  
+  foreach(GLOB ${GENERATE_QRC_GLOBS})
+    file(GLOB_RECURSE FOUND_FILES RELATIVE ${GENERATE_QRC_PATH} ${GLOB})
+    foreach(FILENAME ${FOUND_FILES})
+      set(QRC_CONTENTS "${QRC_CONTENTS}<file alias=\"${FILENAME}\">${GENERATE_QRC_PATH}/${FILENAME}</file>\n")
+    endforeach() 
+  endforeach()
+  
+  configure_file("${HF_CMAKE_DIR}/templates/resources.qrc.in" ${GENERATE_QRC_OUTPUT})
+endfunction()
diff --git a/cmake/macros/InstallBesideConsole.cmake b/cmake/macros/InstallBesideConsole.cmake
index d5777fff12..3c991acf86 100644
--- a/cmake/macros/InstallBesideConsole.cmake
+++ b/cmake/macros/InstallBesideConsole.cmake
@@ -22,9 +22,12 @@ macro(install_beside_console)
     else ()
       # setup install of executable and things copied by fixup/windeployqt
       install(
-        FILES "$<TARGET_FILE_DIR:${TARGET_NAME}>/"
+        DIRECTORY "$<TARGET_FILE_DIR:${TARGET_NAME}>/"
         DESTINATION ${COMPONENT_INSTALL_DIR}
         COMPONENT ${SERVER_COMPONENT}
+        PATTERN "*.pdb" EXCLUDE
+        PATTERN "*.lib" EXCLUDE
+        PATTERN "*.exp" EXCLUDE
       )
 
       # on windows for PR and production builds, sign the executable
diff --git a/cmake/macros/MemoryDebugger.cmake b/cmake/macros/MemoryDebugger.cmake
index 6df41257f2..ed80e03c6b 100644
--- a/cmake/macros/MemoryDebugger.cmake
+++ b/cmake/macros/MemoryDebugger.cmake
@@ -14,9 +14,17 @@ endif ()
 
 if (HIFI_MEMORY_DEBUGGING)
   if (UNIX)
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -U_FORTIFY_SOURCE -fno-stack-protector -fno-omit-frame-pointer")
-    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libasan -static-libstdc++ -fsanitize=address")
-    SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libasan -static-libstdc++ -fsanitize=address")
+    if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+        # for clang on Linux
+        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-omit-frame-pointer -fsanitize=undefined -fsanitize=address -fsanitize-recover=address")
+        SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=undefined -fsanitize=address -fsanitize-recover=address")
+        SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=undefined -fsanitize=address -fsanitize-recover=address")
+    else ()
+        # for gcc on Linux
+        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined -fsanitize=address -U_FORTIFY_SOURCE -fno-stack-protector -fno-omit-frame-pointer")
+        SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libasan -static-libstdc++ -fsanitize=undefined -fsanitize=address")
+        SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libasan -static-libstdc++ -fsanitize=undefined -fsanitize=address")
+    endif()
   endif (UNIX)
 endif ()
 endmacro(SETUP_MEMORY_DEBUGGER)
diff --git a/cmake/macros/SetPackagingParameters.cmake b/cmake/macros/SetPackagingParameters.cmake
index 82a4a7d080..8faa4e6d96 100644
--- a/cmake/macros/SetPackagingParameters.cmake
+++ b/cmake/macros/SetPackagingParameters.cmake
@@ -111,14 +111,14 @@ macro(SET_PACKAGING_PARAMETERS)
 
     # shortcut names
     if (PRODUCTION_BUILD)
-      set(INTERFACE_SHORTCUT_NAME "Interface")
+      set(INTERFACE_SHORTCUT_NAME "High Fidelity Interface")
       set(CONSOLE_SHORTCUT_NAME "Sandbox")
     else ()
-      set(INTERFACE_SHORTCUT_NAME "Interface - ${BUILD_VERSION}")
+      set(INTERFACE_SHORTCUT_NAME "High Fidelity Interface - ${BUILD_VERSION}")
       set(CONSOLE_SHORTCUT_NAME "Sandbox - ${BUILD_VERSION}")
     endif ()
 
-    set(INTERFACE_HF_SHORTCUT_NAME "High Fidelity ${INTERFACE_SHORTCUT_NAME}")
+    set(INTERFACE_HF_SHORTCUT_NAME "${INTERFACE_SHORTCUT_NAME}")
     set(CONSOLE_HF_SHORTCUT_NAME "High Fidelity ${CONSOLE_SHORTCUT_NAME}")
 
     set(PRE_SANDBOX_INTERFACE_SHORTCUT_NAME "High Fidelity")
@@ -126,7 +126,13 @@ macro(SET_PACKAGING_PARAMETERS)
 
     # check if we need to find signtool
     if (PRODUCTION_BUILD OR PR_BUILD)
-      find_program(SIGNTOOL_EXECUTABLE signtool PATHS "C:/Program Files (x86)/Windows Kits/8.1" PATH_SUFFIXES "bin/x64")
+      if (MSVC_VERSION GREATER_EQUAL 1910) # VS 2017
+        find_program(SIGNTOOL_EXECUTABLE signtool PATHS "C:/Program Files (x86)/Windows Kits/10" PATH_SUFFIXES "bin/${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}/x64")
+      elseif (MSVC_VERSION GREATER_EQUAL 1800) # VS 2013
+        find_program(SIGNTOOL_EXECUTABLE signtool PATHS "C:/Program Files (x86)/Windows Kits/8.1" PATH_SUFFIXES "bin/x64")
+      else()
+        message( FATAL_ERROR "Visual Studio 2013 or higher required." )
+      endif()
 
       if (NOT SIGNTOOL_EXECUTABLE)
         message(FATAL_ERROR "Code signing of executables was requested but signtool.exe could not be found.")
@@ -141,6 +147,7 @@ macro(SET_PACKAGING_PARAMETERS)
     set(CONSOLE_STARTUP_REG_KEY "ConsoleStartupShortcut")
     set(CLIENT_LAUNCH_NOW_REG_KEY "ClientLaunchAfterInstall")
     set(SERVER_LAUNCH_NOW_REG_KEY "ServerLaunchAfterInstall")
+    set(CUSTOM_INSTALL_REG_KEY "CustomInstall")
   endif ()
 
   # setup component categories for installer
@@ -155,5 +162,6 @@ macro(SET_PACKAGING_PARAMETERS)
   # create a header file our targets can use to find out the application version
   file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/includes")
   configure_file("${HF_CMAKE_DIR}/templates/BuildInfo.h.in" "${CMAKE_BINARY_DIR}/includes/BuildInfo.h")
+  include_directories("${CMAKE_BINARY_DIR}/includes")
 
 endmacro(SET_PACKAGING_PARAMETERS)
diff --git a/cmake/macros/SetupHifiClientServerPlugin.cmake b/cmake/macros/SetupHifiClientServerPlugin.cmake
index 37b000efb5..bc66484c30 100644
--- a/cmake/macros/SetupHifiClientServerPlugin.cmake
+++ b/cmake/macros/SetupHifiClientServerPlugin.cmake
@@ -9,11 +9,13 @@ macro(SETUP_HIFI_CLIENT_SERVER_PLUGIN)
   set(${TARGET_NAME}_SHARED 1)
   setup_hifi_library(${ARGV})
 
-  if (NOT DEFINED SERVER_ONLY)
+  if (BUILD_CLIENT)
     add_dependencies(interface ${TARGET_NAME})
   endif()
 
-  add_dependencies(assignment-client ${TARGET_NAME})
+  if (BUILD_SERVER)
+    add_dependencies(assignment-client ${TARGET_NAME})
+  endif()
 
   set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Plugins")
 
diff --git a/cmake/macros/SetupHifiLibrary.cmake b/cmake/macros/SetupHifiLibrary.cmake
index d0fc58af0c..04687e2c84 100644
--- a/cmake/macros/SetupHifiLibrary.cmake
+++ b/cmake/macros/SetupHifiLibrary.cmake
@@ -12,7 +12,7 @@ macro(SETUP_HIFI_LIBRARY)
   project(${TARGET_NAME})
 
   # grab the implementation and header files
-  file(GLOB_RECURSE LIB_SRCS "src/*.h" "src/*.cpp" "src/*.c")
+  file(GLOB_RECURSE LIB_SRCS "src/*.h" "src/*.cpp" "src/*.c" "src/*.qrc")
   list(APPEND ${TARGET_NAME}_SRCS ${LIB_SRCS})
 
   # add compiler flags to AVX source files
@@ -65,7 +65,7 @@ macro(SETUP_HIFI_LIBRARY)
   list(APPEND ${TARGET_NAME}_DEPENDENCY_QT_MODULES Core)
 
   # find these Qt modules and link them to our own target
-  find_package(Qt5 COMPONENTS ${${TARGET_NAME}_DEPENDENCY_QT_MODULES} REQUIRED)
+  find_package(Qt5 COMPONENTS ${${TARGET_NAME}_DEPENDENCY_QT_MODULES} REQUIRED CMAKE_FIND_ROOT_PATH_BOTH)
 
   foreach(QT_MODULE ${${TARGET_NAME}_DEPENDENCY_QT_MODULES})
     target_link_libraries(${TARGET_NAME} Qt5::${QT_MODULE})
diff --git a/cmake/macros/SetupHifiPlugin.cmake b/cmake/macros/SetupHifiPlugin.cmake
index 7e56ea3db2..023c7603dc 100644
--- a/cmake/macros/SetupHifiPlugin.cmake
+++ b/cmake/macros/SetupHifiPlugin.cmake
@@ -8,7 +8,9 @@
 macro(SETUP_HIFI_PLUGIN)
     set(${TARGET_NAME}_SHARED 1)
     setup_hifi_library(${ARGV})
-    add_dependencies(interface ${TARGET_NAME})
+    if (BUILD_CLIENT)
+        add_dependencies(interface ${TARGET_NAME})
+    endif()
     target_link_libraries(${TARGET_NAME} ${CMAKE_THREAD_LIBS_INIT})
     set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Plugins")
 
diff --git a/cmake/macros/SetupQt.cmake b/cmake/macros/SetupQt.cmake
new file mode 100644
index 0000000000..ac67e12044
--- /dev/null
+++ b/cmake/macros/SetupQt.cmake
@@ -0,0 +1,90 @@
+# 
+#  Copyright 2015 High Fidelity, Inc.
+#  Created by Bradley Austin Davis on 2015/10/10
+#
+#  Distributed under the Apache License, Version 2.0.
+#  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+# 
+
+function(set_from_env _RESULT_NAME _ENV_VAR_NAME _DEFAULT_VALUE)
+    if (NOT DEFINED ${_RESULT_NAME}) 
+        if ("$ENV{${_ENV_VAR_NAME}}" STREQUAL "")
+            set (${_RESULT_NAME} ${_DEFAULT_VALUE} PARENT_SCOPE)
+        else()
+            set (${_RESULT_NAME} $ENV{${_ENV_VAR_NAME}} PARENT_SCOPE)
+        endif()
+    endif()
+endfunction()
+
+# Construct a default QT location from a root path, a version and an architecture
+function(calculate_default_qt_dir _RESULT_NAME)
+    if (ANDROID)
+        set(QT_DEFAULT_ARCH "android_armv7")
+    elseif(UWP)
+        set(QT_DEFAULT_ARCH "winrt_x64_msvc2017")
+    elseif(APPLE)
+        set(QT_DEFAULT_ARCH "clang_64")
+    elseif(WIN32)
+        set(QT_DEFAULT_ARCH "msvc2017_64")
+    else()
+        set(QT_DEFAULT_ARCH "gcc_64")
+    endif()
+
+    if (WIN32 OR (ANDROID AND ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows")))
+        set(QT_DEFAULT_ROOT "c:/Qt")
+    else()
+        set(QT_DEFAULT_ROOT "$ENV{HOME}/Qt")
+    endif()
+
+    set_from_env(QT_ROOT QT_ROOT ${QT_DEFAULT_ROOT})
+    set_from_env(QT_VERSION QT_VERSION "5.9.1")
+    set_from_env(QT_ARCH QT_ARCH ${QT_DEFAULT_ARCH})
+
+    set(${_RESULT_NAME} "${QT_ROOT}/${QT_VERSION}/${QT_ARCH}" PARENT_SCOPE)
+endfunction()
+
+# Sets the QT_CMAKE_PREFIX_PATH and QT_DIR variables
+# Also enables CMAKE_AUTOMOC and CMAKE_AUTORCC
+macro(setup_qt)
+    # if QT_CMAKE_PREFIX_PATH was not specified before hand,
+    # try to use the environment variable
+    if (NOT QT_CMAKE_PREFIX_PATH)
+        set(QT_CMAKE_PREFIX_PATH "$ENV{QT_CMAKE_PREFIX_PATH}")
+    endif()
+    if (("QT_CMAKE_PREFIX_PATH" STREQUAL "") OR (NOT EXISTS "${QT_CMAKE_PREFIX_PATH}"))
+        calculate_default_qt_dir(QT_DIR)
+        set(QT_CMAKE_PREFIX_PATH "${QT_DIR}/lib/cmake")
+    else()
+        # figure out where the qt dir is
+        get_filename_component(QT_DIR "${QT_CMAKE_PREFIX_PATH}/../../" ABSOLUTE)
+    endif()
+
+    if (WIN32)
+        # windows shell does not like backslashes expanded on the command line,
+        # so convert all backslashes in the QT path to forward slashes
+        string(REPLACE \\ / QT_CMAKE_PREFIX_PATH ${QT_CMAKE_PREFIX_PATH})
+        string(REPLACE \\ / QT_DIR ${QT_DIR})
+    endif()
+
+    # This check doesn't work on Mac
+    #if (NOT EXISTS "${QT_DIR}/include/QtCore/QtGlobal")
+    #    message(FATAL_ERROR "Unable to locate Qt includes in ${QT_DIR}")
+    #endif()
+    
+    if (NOT EXISTS "${QT_CMAKE_PREFIX_PATH}/Qt5Core/Qt5CoreConfig.cmake")
+        message(FATAL_ERROR "Unable to locate Qt cmake config in ${QT_CMAKE_PREFIX_PATH}")
+    endif()
+    
+    message(STATUS "The Qt build in use is: \"${QT_DIR}\"")
+
+    # Instruct CMake to run moc automatically when needed.
+    set(CMAKE_AUTOMOC ON)
+
+    # Instruct CMake to run rcc automatically when needed
+    set(CMAKE_AUTORCC ON)
+    
+    if (WIN32)
+        add_paths_to_fixup_libs("${QT_DIR}/bin")
+    endif ()
+
+endmacro()
diff --git a/cmake/macros/TargetGlew.cmake b/cmake/macros/TargetGlew.cmake
index 5f71f021ec..bc4d5cb033 100644
--- a/cmake/macros/TargetGlew.cmake
+++ b/cmake/macros/TargetGlew.cmake
@@ -6,9 +6,11 @@
 #  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 # 
 macro(TARGET_GLEW)
-    add_dependency_external_projects(glew)
-    find_package(GLEW REQUIRED)
-    add_definitions(-DGLEW_STATIC) 
-    target_include_directories(${TARGET_NAME} PUBLIC ${GLEW_INCLUDE_DIRS})
-    target_link_libraries(${TARGET_NAME} ${GLEW_LIBRARY})
+    if (NOT ANDROID)
+        add_definitions(-DGLEW_STATIC) 
+        add_dependency_external_projects(glew)
+        find_package(GLEW REQUIRED)
+        target_include_directories(${TARGET_NAME} PUBLIC ${GLEW_INCLUDE_DIRS})
+        target_link_libraries(${TARGET_NAME} ${GLEW_LIBRARY})
+    endif()
 endmacro()
\ No newline at end of file
diff --git a/cmake/macros/TargetLeapMotion.cmake b/cmake/macros/TargetLeapMotion.cmake
new file mode 100644
index 0000000000..674ec8f62d
--- /dev/null
+++ b/cmake/macros/TargetLeapMotion.cmake
@@ -0,0 +1,12 @@
+#
+#  Created by David Rowe on 16 Jun 2017.
+#  Copyright 2017 High Fidelity, Inc.
+#
+#  Distributed under the Apache License, Version 2.0.
+#  See the accompanying file LICENSE or http:#www.apache.org/licenses/LICENSE-2.0.html
+#
+
+macro(TARGET_LEAPMOTION)
+    target_include_directories(${TARGET_NAME} PRIVATE ${LEAPMOTION_INCLUDE_DIRS})
+    target_link_libraries(${TARGET_NAME} ${LEAPMOTION_LIBRARIES})
+endmacro()
diff --git a/cmake/macros/TargetOpenGL.cmake b/cmake/macros/TargetOpenGL.cmake
index 73c92e651a..6ad92259bb 100644
--- a/cmake/macros/TargetOpenGL.cmake
+++ b/cmake/macros/TargetOpenGL.cmake
@@ -6,15 +6,13 @@
 #  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 # 
 macro(TARGET_OPENGL)
-    add_definitions(-DGLEW_STATIC) 
     if (APPLE)
       # link in required OS X frameworks and include the right GL headers
       find_library(OpenGL OpenGL)
       target_link_libraries(${TARGET_NAME} ${OpenGL})
     elseif(ANDROID)
-      target_link_libraries(${TARGET_NAME} "-lGLESv3" "-lEGL")
+      target_link_libraries(${TARGET_NAME} GLESv3 EGL)
     else()
-      target_nsight()
       find_package(OpenGL REQUIRED)
       if (${OPENGL_INCLUDE_DIR})
         include_directories(SYSTEM "${OPENGL_INCLUDE_DIR}")
@@ -22,4 +20,6 @@ macro(TARGET_OPENGL)
       target_link_libraries(${TARGET_NAME} "${OPENGL_LIBRARY}")
       target_include_directories(${TARGET_NAME} PUBLIC ${OPENGL_INCLUDE_DIR})
     endif()
+    target_nsight()
+    target_glew()
 endmacro()
diff --git a/cmake/macros/TargetOpenSSL.cmake b/cmake/macros/TargetOpenSSL.cmake
new file mode 100644
index 0000000000..7ee0283a48
--- /dev/null
+++ b/cmake/macros/TargetOpenSSL.cmake
@@ -0,0 +1,32 @@
+#
+#  Copyright 2015 High Fidelity, Inc.
+#  Created by Bradley Austin Davis on 2015/10/10
+#
+#  Distributed under the Apache License, Version 2.0.
+#  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+#
+macro(TARGET_OPENSSL)
+    
+    if (ANDROID)
+
+        # FIXME use a distributable binary
+        set(OPENSSL_INSTALL_DIR C:/Android/openssl)
+        set(OPENSSL_INCLUDE_DIR "${OPENSSL_INSTALL_DIR}/include" CACHE TYPE INTERNAL)
+        set(OPENSSL_LIBRARIES "${OPENSSL_INSTALL_DIR}/lib/libcrypto.a;${OPENSSL_INSTALL_DIR}/lib/libssl.a" CACHE TYPE INTERNAL)
+
+    else()
+
+        find_package(OpenSSL REQUIRED)
+
+        if (APPLE AND ${OPENSSL_INCLUDE_DIR} STREQUAL "/usr/include")
+            # this is a user on OS X using system OpenSSL, which is going to throw warnings since they're deprecating for their common crypto
+            message(WARNING "The found version of OpenSSL is the OS X system version. This will produce deprecation warnings."
+            "\nWe recommend you install a newer version (at least 1.0.1h) in a different directory and set OPENSSL_ROOT_DIR in your env so Cmake can find it.")
+        endif()
+
+    endif()
+
+    include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}")
+    target_link_libraries(${TARGET_NAME} ${OPENSSL_LIBRARIES})
+
+endmacro()
diff --git a/cmake/macros/TargetTBB.cmake b/cmake/macros/TargetTBB.cmake
new file mode 100644
index 0000000000..e9c4639c3d
--- /dev/null
+++ b/cmake/macros/TargetTBB.cmake
@@ -0,0 +1,24 @@
+#
+#  Copyright 2015 High Fidelity, Inc.
+#  Created by Bradley Austin Davis on 2015/10/10
+#
+#  Distributed under the Apache License, Version 2.0.
+#  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+#
+macro(TARGET_TBB)
+
+if (ANDROID)
+    set(TBB_INSTALL_DIR C:/tbb-2018/built)
+    set(TBB_LIBRARY ${HIFI_ANDROID_PRECOMPILED}/libtbb.so CACHE FILEPATH "TBB library location")
+    set(TBB_MALLOC_LIBRARY ${HIFI_ANDROID_PRECOMPILED}/libtbbmalloc.so CACHE FILEPATH "TBB malloc library location")
+    set(TBB_INCLUDE_DIRS ${TBB_INSTALL_DIR}/include CACHE TYPE "List of tbb include directories" CACHE FILEPATH "TBB includes location")
+    set(TBB_LIBRARIES ${TBB_LIBRARY} ${TBB_MALLOC_LIBRARY})
+else()
+    add_dependency_external_projects(tbb)
+    find_package(TBB REQUIRED)
+endif()
+
+target_link_libraries(${TARGET_NAME} ${TBB_LIBRARIES})
+target_include_directories(${TARGET_NAME} SYSTEM PUBLIC ${TBB_INCLUDE_DIRS})
+
+endmacro()
diff --git a/cmake/modules/FindDraco.cmake b/cmake/modules/FindDraco.cmake
new file mode 100644
index 0000000000..342797b62e
--- /dev/null
+++ b/cmake/modules/FindDraco.cmake
@@ -0,0 +1,30 @@
+#
+#  FindDraco.cmake
+#
+#  Try to find Draco libraries and include path.
+#  Once done this will define
+#
+#  DRACO_FOUND
+#  DRACO_INCLUDE_DIRS
+#  DRACO_LIBRARY
+#  DRACO_ENCODER_LIBRARY
+#  DRACO_DECODER_LIBRARY
+#
+#  Created on 8/8/2017 by Stephen Birarda
+#  Copyright 2017 High Fidelity, Inc.
+#
+#  Distributed under the Apache License, Version 2.0.
+#  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+#
+
+include("${MACRO_DIR}/HifiLibrarySearchHints.cmake")
+hifi_library_search_hints("draco")
+
+find_path(DRACO_INCLUDE_DIRS draco/core/draco_types.h PATH_SUFFIXES include/draco/src include HINTS ${DRACO_SEARCH_DIRS})
+
+find_library(DRACO_LIBRARY draco PATH_SUFFIXES "lib" HINTS ${DRACO_SEARCH_DIRS})
+find_library(DRACO_ENCODER_LIBRARY draco PATH_SUFFIXES "lib" HINTS ${DRACO_SEARCH_DIRS})
+find_library(DRACO_DECODER_LIBRARY draco PATH_SUFFIXES "lib" HINTS ${DRACO_SEARCH_DIRS})
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(DRACO DEFAULT_MSG DRACO_INCLUDE_DIRS DRACO_LIBRARY DRACO_ENCODER_LIBRARY DRACO_DECODER_LIBRARY)
diff --git a/cmake/modules/FindFBX.cmake b/cmake/modules/FindFBX.cmake
deleted file mode 100644
index 2e84d1ea19..0000000000
--- a/cmake/modules/FindFBX.cmake
+++ /dev/null
@@ -1,117 +0,0 @@
-# Locate the FBX SDK
-#
-# Defines the following variables:
-#
-#    FBX_FOUND - Found the FBX SDK
-#    FBX_VERSION - Version number
-#    FBX_INCLUDE_DIRS - Include directories
-#    FBX_LIBRARIES - The libraries to link to
-#
-# Accepts the following variables as input:
-#
-#    FBX_VERSION - as a CMake variable, e.g. 2017.0.1
-#    FBX_ROOT - (as a CMake or environment variable)
-#               The root directory of the FBX SDK install
-
-# adapted from https://github.com/ufz-vislab/VtkFbxConverter/blob/master/FindFBX.cmake
-# which uses the MIT license (https://github.com/ufz-vislab/VtkFbxConverter/blob/master/LICENSE.txt)
-
-if (NOT FBX_VERSION)
-  if (WIN32)
-    set(FBX_VERSION 2017.1)
-  else()
-    set(FBX_VERSION 2017.0.1)
-  endif()
-endif()
-
-string(REGEX REPLACE "^([0-9]+).*$" "\\1" FBX_VERSION_MAJOR "${FBX_VERSION}")
-string(REGEX REPLACE "^[0-9]+\\.([0-9]+).*$" "\\1" FBX_VERSION_MINOR  "${FBX_VERSION}")
-string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*$" "\\1" FBX_VERSION_PATCH "${FBX_VERSION}")
-
-set(FBX_MAC_LOCATIONS "/Applications/Autodesk/FBX\ SDK/${FBX_VERSION}")
-set(FBX_LINUX_LOCATIONS "/usr/local/lib/gcc4/x64/debug/")
-
-if (WIN32)
-  string(REGEX REPLACE "\\\\" "/" WIN_PROGRAM_FILES_X64_DIRECTORY $ENV{ProgramW6432})
-endif()
-
-set(FBX_WIN_LOCATIONS "${WIN_PROGRAM_FILES_X64_DIRECTORY}/Autodesk/FBX/FBX SDK/${FBX_VERSION}")
-
-set(FBX_SEARCH_LOCATIONS $ENV{FBX_ROOT} ${FBX_ROOT} ${FBX_MAC_LOCATIONS} ${FBX_WIN_LOCATIONS} ${FBX_LINUX_LOCATIONS})
-
-function(_fbx_append_debugs _endvar _library)
-  if (${_library} AND ${_library}_DEBUG)
-    set(_output optimized ${${_library}} debug ${${_library}_DEBUG})
-  else()
-    set(_output ${${_library}})
-  endif()
-
-  set(${_endvar} ${_output} PARENT_SCOPE)
-endfunction()
-
-if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
-  set(fbx_compiler clang)
-elseif (${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
-  set(fbx_compiler gcc4)
-endif()
-
-function(_fbx_find_library _name _lib _suffix)
-  if (MSVC12)
-    set(VS_PREFIX vs2013)
-  endif()
-
-  if (MSVC11)
-    set(VS_PREFIX vs2012)
-  endif()
-
-  if (MSVC10)
-    set(VS_PREFIX vs2010)
-  endif()
-
-  if (MSVC90)
-    set(VS_PREFIX vs2008)
-  endif()
-
-  find_library(${_name}
-    NAMES ${_lib}
-    HINTS ${FBX_SEARCH_LOCATIONS}
-    PATH_SUFFIXES lib/${fbx_compiler}/${_suffix} lib/${fbx_compiler}/ub/${_suffix} lib/${VS_PREFIX}/x64/${_suffix}
-  )
-
-  mark_as_advanced(${_name})
-endfunction()
-
-find_path(FBX_INCLUDE_DIR fbxsdk.h
-  PATHS ${FBX_SEARCH_LOCATIONS}
-  PATH_SUFFIXES include
-)
-mark_as_advanced(FBX_INCLUDE_DIR)
-
-if (WIN32)
-  _fbx_find_library(FBX_LIBRARY libfbxsdk-md release)
-  _fbx_find_library(FBX_LIBRARY_DEBUG libfbxsdk-md debug)
-elseif (APPLE)
-  find_library(CARBON NAMES Carbon)
-  find_library(SYSTEM_CONFIGURATION NAMES SystemConfiguration)
-  _fbx_find_library(FBX_LIBRARY libfbxsdk.a release)
-  _fbx_find_library(FBX_LIBRARY_DEBUG libfbxsdk.a debug)
-else ()
-  _fbx_find_library(FBX_LIBRARY libfbxsdk.a release)
-endif()
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(FBX DEFAULT_MSG FBX_LIBRARY FBX_INCLUDE_DIR)
-
-if (FBX_FOUND)
-  set(FBX_INCLUDE_DIRS ${FBX_INCLUDE_DIR})
-  _fbx_append_debugs(FBX_LIBRARIES FBX_LIBRARY)
-  add_definitions(-DFBXSDK_NEW_API)
-
-  if (WIN32)
-    add_definitions(-DK_PLUGIN -DK_FBXSDK -DK_NODLL)
-    set(CMAKE_EXE_LINKER_FLAGS /NODEFAULTLIB:\"LIBCMT\")
-    set(FBX_LIBRARIES ${FBX_LIBRARIES} Wininet.lib)
-  elseif (APPLE)
-    set(FBX_LIBRARIES ${FBX_LIBRARIES} ${CARBON} ${SYSTEM_CONFIGURATION})
-  endif()
-endif()
diff --git a/cmake/modules/FindOpenSSL.cmake b/cmake/modules/FindOpenSSL.cmake
index 69b6c367ca..0619c4d587 100644
--- a/cmake/modules/FindOpenSSL.cmake
+++ b/cmake/modules/FindOpenSSL.cmake
@@ -34,26 +34,11 @@ if (UNIX)
 endif ()
 
 if (WIN32)
-
-  file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _programfiles)
-
-  if ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-    # http://www.slproweb.com/products/Win32OpenSSL.html
-    set(_OPENSSL_ROOT_HINTS ${OPENSSL_ROOT_DIR} $ENV{OPENSSL_ROOT_DIR} $ENV{HIFI_LIB_DIR}/openssl
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (64-bit)_is1;Inno Setup: App Path]"
-    )
-    set(_OPENSSL_ROOT_PATHS "${_programfiles}/OpenSSL" "${_programfiles}/OpenSSL-Win64" "C:/OpenSSL/" "C:/OpenSSL-Win64/")
+  if (("${CMAKE_SIZEOF_VOID_P}" EQUAL "8"))
+    set(_OPENSSL_ROOT_HINTS_AND_PATHS $ENV{VCPKG_ROOT}/installed/x64-windows)
   else()
-    # http://www.slproweb.com/products/Win32OpenSSL.html
-    set(_OPENSSL_ROOT_HINTS ${OPENSSL_ROOT_DIR} $ENV{OPENSSL_ROOT_DIR} $ENV{HIFI_LIB_DIR}/openssl
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]"
-    )
-    set(_OPENSSL_ROOT_PATHS "${_programfiles}/OpenSSL" "${_programfiles}/OpenSSL-Win32" "C:/OpenSSL/" "C:/OpenSSL-Win32/")
+    set(_OPENSSL_ROOT_HINTS_AND_PATHS $ENV{VCPKG_ROOT}/installed/x86-windows)
   endif()
-
-  unset(_programfiles)
-  set(_OPENSSL_ROOT_HINTS_AND_PATHS HINTS ${_OPENSSL_ROOT_HINTS} PATHS ${_OPENSSL_ROOT_PATHS})
-
 else ()
   include("${MACRO_DIR}/HifiLibrarySearchHints.cmake")
   hifi_library_search_hints("openssl")
@@ -67,48 +52,15 @@ find_path(OPENSSL_INCLUDE_DIR NAMES openssl/ssl.h HINTS ${_OPENSSL_ROOT_HINTS_AN
 
 if (WIN32 AND NOT CYGWIN)
   if (MSVC)
-
-    # In Visual C++ naming convention each of these four kinds of Windows libraries has it's standard suffix:
-    #   * MD for dynamic-release
-    #   * MDd for dynamic-debug
-    #   * MT for static-release
-    #   * MTd for static-debug
-
-    # Implementation details:
-    # We are using the libraries located in the VC subdir instead of the parent directory eventhough :
-    # libeay32MD.lib is identical to ../libeay32.lib, and
-    # ssleay32MD.lib is identical to ../ssleay32.lib
-
-    # The Kitware FindOpenSSL module has been modified here by High Fidelity to look specifically for static libraries
-
-    find_library(LIB_EAY_DEBUG NAMES libeay32MTd
-      ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES "lib/VC/static"
-    )
-
-    find_library(LIB_EAY_RELEASE NAMES libeay32MT
-      ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES "lib/VC/static"
-    )
-
-    find_library(SSL_EAY_DEBUG NAMES ssleay32MTd
-      ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES "lib/VC/static"
-    )
-
-    find_library(SSL_EAY_RELEASE NAMES ssleay32MT
-      ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES "lib/VC/static"
-    )
-
-    set(LIB_EAY_LIBRARY_DEBUG "${LIB_EAY_DEBUG}")
-    set(LIB_EAY_LIBRARY_RELEASE "${LIB_EAY_RELEASE}")
-    set(SSL_EAY_LIBRARY_DEBUG "${SSL_EAY_DEBUG}")
-    set(SSL_EAY_LIBRARY_RELEASE "${SSL_EAY_RELEASE}")
+    # Using vcpkg builds of openssl
+    find_library(LIB_EAY_LIBRARY_RELEASE NAMES libeay32 HINTS ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES "lib")
+    find_library(SSL_EAY_LIBRARY_RELEASE NAMES ssleay32 HINTS ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES "lib")
 
     include(SelectLibraryConfigurations)
     select_library_configurations(LIB_EAY)
     select_library_configurations(SSL_EAY)
-
     set(OPENSSL_LIBRARIES ${SSL_EAY_LIBRARY} ${LIB_EAY_LIBRARY})
-
-    find_path(OPENSSL_DLL_PATH NAMES ssleay32.dll PATH_SUFFIXES "bin" ${_OPENSSL_ROOT_HINTS_AND_PATHS})
+    find_path(OPENSSL_DLL_PATH NAMES ssleay32.dll PATH_SUFFIXES "bin" HINTS ${_OPENSSL_ROOT_HINTS_AND_PATHS} NO_DEFAULT_PATH)
   endif()
 else()
 
diff --git a/cmake/modules/FindTBB.cmake b/cmake/modules/FindTBB.cmake
index 1ccdcd792d..12d4deec36 100644
--- a/cmake/modules/FindTBB.cmake
+++ b/cmake/modules/FindTBB.cmake
@@ -1,6 +1,6 @@
-# 
+#
 #  FindTBB.cmake
-# 
+#
 #  Try to find the Intel Threading Building Blocks library
 #
 #  You can provide a TBB_ROOT_DIR which contains lib and include directories
@@ -16,7 +16,7 @@
 #
 #  Distributed under the Apache License, Version 2.0.
 #  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-# 
+#
 
 include("${MACRO_DIR}/HifiLibrarySearchHints.cmake")
 hifi_library_search_hints("tbb")
@@ -34,31 +34,43 @@ elseif (UNIX AND NOT ANDROID)
   else()
     set(_TBB_ARCH_DIR "ia32")
   endif()
-  
+
   execute_process(
     COMMAND ${CMAKE_C_COMPILER} -dumpversion
     OUTPUT_VARIABLE GCC_VERSION
   )
-  
-  if (GCC_VERSION VERSION_GREATER 4.4 OR GCC_VERSION VERSION_EQUAL 4.4)
+
+  if (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7)
+    set(_TBB_LIB_DIR "lib/${_TBB_ARCH_DIR}/gcc4.7")
+  elseif (GCC_VERSION VERSION_GREATER 4.4 OR GCC_VERSION VERSION_EQUAL 4.4)
     set(_TBB_LIB_DIR "lib/${_TBB_ARCH_DIR}/gcc4.4")
   elseif (GCC_VERSION VERSION_GREATER 4.1 OR GCC_VERSION VERSION_EQUAL 4.1)
     set(_TBB_LIB_DIR "lib/${_TBB_ARCH_DIR}/gcc4.1")
   else ()
     message(FATAL_ERROR "Could not find a compatible version of Threading Building Blocks library for your compiler.")
   endif ()
-  
+
 elseif (WIN32)
   if(CMAKE_SIZEOF_VOID_P EQUAL 8)
     set(_TBB_ARCH_DIR "intel64")
   else()
     set(_TBB_ARCH_DIR "ia32")
   endif()
-  
-  set(_TBB_LIB_DIR "lib/${_TBB_ARCH_DIR}/vc12")
-  
-  find_path(TBB_DLL_PATH tbb_debug.dll PATH_SUFFIXES "bin/${_TBB_ARCH_DIR}/vc12" HINTS ${TBB_SEARCH_DIRS})
-  
+
+  if (MSVC_VERSION GREATER_EQUAL 1900)
+    set(_TBB_MSVC_DIR "vc14")
+  elseif (MSVC_VERSION GREATER_EQUAL 1800)
+    set(_TBB_MSVC_DIR "vc12")
+  elseif (MSVC_VERSION GREATER_EQUAL 1700)
+    set(_TBB_MSVC_DIR "vc11")
+  else()
+    message(FATAL_ERROR "MSVC ${MSVC_VERSION} not supported by Intel TBB")
+  endif()
+
+  set(_TBB_LIB_DIR "lib/${_TBB_ARCH_DIR}/${_TBB_MSVC_DIR}")
+
+  find_path(TBB_DLL_PATH tbb_debug.dll PATH_SUFFIXES "bin/${_TBB_ARCH_DIR}/${_TBB_MSVC_DIR}" HINTS ${TBB_SEARCH_DIRS})
+
 elseif (ANDROID)
   set(_TBB_DEFAULT_INSTALL_DIR "/tbb")
   set(_TBB_LIB_NAME "tbb")
diff --git a/cmake/templates/CPackProperties.cmake.in b/cmake/templates/CPackProperties.cmake.in
index c1e3d9d773..b91d78f628 100644
--- a/cmake/templates/CPackProperties.cmake.in
+++ b/cmake/templates/CPackProperties.cmake.in
@@ -40,6 +40,7 @@ set(CONSOLE_DESKTOP_SHORTCUT_REG_KEY "@CONSOLE_DESKTOP_SHORTCUT_REG_KEY@")
 set(CONSOLE_STARTUP_REG_KEY "@CONSOLE_STARTUP_REG_KEY@")
 set(SERVER_LAUNCH_NOW_REG_KEY "@SERVER_LAUNCH_NOW_REG_KEY@")
 set(CLIENT_LAUNCH_NOW_REG_KEY "@CLIENT_LAUNCH_NOW_REG_KEY@")
+set(CUSTOM_INSTALL_REG_KEY "@CUSTOM_INSTALL_REG_KEY@")
 set(INSTALLER_HEADER_IMAGE "@INSTALLER_HEADER_IMAGE@")
 set(UNINSTALLER_HEADER_IMAGE "@UNINSTALLER_HEADER_IMAGE@")
 set(ADD_REMOVE_ICON_PATH "@ADD_REMOVE_ICON_PATH@")
diff --git a/cmake/templates/FixupBundlePostBuild.cmake.in b/cmake/templates/FixupBundlePostBuild.cmake.in
index 57d1fd787f..d4726884c2 100644
--- a/cmake/templates/FixupBundlePostBuild.cmake.in
+++ b/cmake/templates/FixupBundlePostBuild.cmake.in
@@ -11,34 +11,28 @@
 
 include(BundleUtilities)
 
-# replace copy_resolved_item_into_bundle
-#
-# The official version of copy_resolved_item_into_bundle will print out a "warning:" when
-# the resolved item matches the resolved embedded item. This not not really an issue that
-# should rise to the level of a "warning" so we replace this message with a "status:"
-#
-function(copy_resolved_item_into_bundle resolved_item resolved_embedded_item)
-  if (WIN32)
-    # ignore case on Windows
-    string(TOLOWER "${resolved_item}" resolved_item_compare)
-    string(TOLOWER "${resolved_embedded_item}" resolved_embedded_item_compare)
-  else()
-    set(resolved_item_compare "${resolved_item}")
-    set(resolved_embedded_item_compare "${resolved_embedded_item}")
+function(gp_resolved_file_type_override resolved_file type_var)
+  if( file MATCHES ".*VCRUNTIME140.*" )
+    set(type "system" PARENT_SCOPE)
   endif()
-
-  if ("${resolved_item_compare}" STREQUAL "${resolved_embedded_item_compare}")
-    # this is our only change from the original version
-    message(STATUS "status: resolved_item == resolved_embedded_item - not copying...")
-  else()
-    #message(STATUS "copying COMMAND ${CMAKE_COMMAND} -E copy ${resolved_item} ${resolved_embedded_item}")
-    execute_process(COMMAND ${CMAKE_COMMAND} -E copy "${resolved_item}" "${resolved_embedded_item}")
-    if(UNIX AND NOT APPLE)
-        file(RPATH_REMOVE FILE "${resolved_embedded_item}")
-    endif()
+  if( file MATCHES ".*concrt140.*" )
+    set(type "system" PARENT_SCOPE)
+  endif()
+  if( file MATCHES ".*msvcp140.*" )
+    set(type "system" PARENT_SCOPE)
+  endif()
+  if( file MATCHES ".*vcruntime140.*" )
+    set(type "system" PARENT_SCOPE)
+  endif()
+  if( file MATCHES ".*api-ms-win-crt-conio.*" )
+    set(type "system" PARENT_SCOPE)
+  endif()
+  if( file MATCHES ".*api-ms-win-core-winrt.*" )
+    set(type "system" PARENT_SCOPE)
   endif()
 endfunction()
 
+
 message(STATUS "FIXUP_LIBS for fixup_bundle called for bundle ${BUNDLE_EXECUTABLE} are @FIXUP_LIBS@")
 message(STATUS "Scanning for plugins from ${BUNDLE_PLUGIN_DIR}")
 
@@ -52,3 +46,4 @@ endif()
 
 file(GLOB EXTRA_PLUGINS "${BUNDLE_PLUGIN_DIR}/*.${PLUGIN_EXTENSION}")
 fixup_bundle("${BUNDLE_EXECUTABLE}" "${EXTRA_PLUGINS}" "@FIXUP_LIBS@")
+
diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in
index 710fd81316..8abb202bd4 100644
--- a/cmake/templates/NSIS.template.in
+++ b/cmake/templates/NSIS.template.in
@@ -345,14 +345,21 @@ SectionEnd
   !insertmacro MUI_PAGE_WELCOME
 
   !insertmacro MUI_PAGE_LICENSE "@CPACK_RESOURCE_FILE_LICENSE@"
+
+  Page custom InstallTypesPage ReadInstallTypes
+
+  !define MUI_PAGE_CUSTOMFUNCTION_PRE AbortFunction
   !insertmacro MUI_PAGE_DIRECTORY
 
   ;Start Menu Folder Page Configuration
   !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM"
   !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@"
   !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
+
+  !define MUI_PAGE_CUSTOMFUNCTION_PRE AbortFunction
   !insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
 
+  !define MUI_PAGE_CUSTOMFUNCTION_PRE AbortFunction
   @CPACK_NSIS_PAGE_COMPONENTS@
 
   Page custom PostInstallOptionsPage ReadPostInstallOptions
@@ -438,12 +445,18 @@ Var DesktopServerCheckbox
 Var ServerStartupCheckbox
 Var LaunchServerNowCheckbox
 Var LaunchClientNowCheckbox
+Var CleanInstallCheckbox
 Var CurrentOffset
 Var OffsetUnits
 Var CopyFromProductionCheckbox
+Var ExpressInstallRadioButton
+Var CustomInstallRadioButton
+Var InstallTypeDialog
+Var Express
+Var CustomInstallTemporaryState
 
-!macro SetPostInstallOption Checkbox OptionName Default
-  ; reads the value for the given post install option to the registry
+!macro SetInstallOption Checkbox OptionName Default
+  ; reads the value for the given install option to the registry
   ReadRegStr $0 HKLM "@REGISTRY_HKLM_INSTALL_ROOT@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@\@POST_INSTALL_OPTIONS_REG_GROUP@" "${OptionName}"
 
   ${If} $0 == "NO"
@@ -458,6 +471,65 @@ Var CopyFromProductionCheckbox
   ${EndIf}
 !macroend
 
+Function InstallTypesPage
+  !insertmacro MUI_HEADER_TEXT "Choose Installation Type" "Express or Custom Install"
+
+  nsDialogs::Create 1018
+  Pop $InstallTypeDialog
+
+  ${If} $InstallTypeDialog == error
+    Abort
+  ${EndIf}
+
+  StrCpy $CurrentOffset 0
+  StrCpy $OffsetUnits u
+  StrCpy $Express "0"
+
+  ${NSD_CreateRadioButton} 30% $CurrentOffset$OffsetUnits 100% 10u "Express Install (Recommended)"; $\nInstalls High Fidelity Interface and High Fidelity Sandbox"
+  pop $ExpressInstallRadioButton
+  ${NSD_OnClick} $ExpressInstallRadioButton ChangeExpressLabel
+  IntOp $CurrentOffset $CurrentOffset + 15
+
+  ${NSD_CreateRadiobutton} 30% $CurrentOffset$OffsetUnits 100% 10u "Custom Install (Advanced)"
+  pop $CustomInstallRadioButton
+  ${NSD_OnClick} $CustomInstallRadioButton ChangeCustomLabel
+
+  ; check install type from the registry, express install by default
+  !insertmacro SetInstallOption $CustomInstallRadioButton @CUSTOM_INSTALL_REG_KEY@ ${BST_UNCHECKED}
+
+  ; set the express install value based on the custom install value from registry
+  ${NSD_GetState} $CustomInstallRadioButton $CustomInstallTemporaryState
+
+  ${If} $CustomInstallTemporaryState == ${BST_UNCHECKED}
+    ${NSD_Check} $ExpressInstallRadioButton
+  ${EndIf}
+
+  Call ChangeExpressLabel
+
+  nsDialogs::Show
+FunctionEnd
+
+Function ChangeExpressLabel
+  Push $R1
+  GetDlgItem $R1 $HWNDPARENT 1
+  SendMessage $R1 ${WM_SETTEXT} 0 "STR:Install"
+  Pop $R1
+FunctionEnd
+
+Function ChangeCustomLabel
+  Push $R1
+  GetDlgItem $R1 $HWNDPARENT 1
+  SendMessage $R1 ${WM_SETTEXT} 0 "STR:Next >"
+  Pop $R1
+FunctionEnd
+
+Function AbortFunction
+  ; Check if Express is set, if so, abort the post install options page
+  StrCmp $Express "1" 0 end
+  Abort
+  end:
+FunctionEnd
+
 Function PostInstallOptionsPage
   !insertmacro MUI_HEADER_TEXT "Setup Options" ""
 
@@ -468,6 +540,11 @@ Function PostInstallOptionsPage
     Abort
   ${EndIf}
 
+  ; Check if Express is set, if so, abort the post install options page
+  StrCmp $Express "1" 0 end
+  Abort
+  end:
+
   StrCpy $CurrentOffset 0
   StrCpy $OffsetUnits u
 
@@ -477,25 +554,16 @@ Function PostInstallOptionsPage
     IntOp $CurrentOffset $CurrentOffset + 15
 
     ; set the checkbox state depending on what is present in the registry
-    !insertmacro SetPostInstallOption $DesktopClientCheckbox @CLIENT_DESKTOP_SHORTCUT_REG_KEY@ ${BST_CHECKED}
+    !insertmacro SetInstallOption $DesktopClientCheckbox @CLIENT_DESKTOP_SHORTCUT_REG_KEY@ ${BST_CHECKED}
   ${EndIf}
 
   ${If} ${SectionIsSelected} ${@SERVER_COMPONENT_NAME@}
     ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Create a desktop shortcut for @CONSOLE_HF_SHORTCUT_NAME@"
     Pop $DesktopServerCheckbox
-
-    ; set the checkbox state depending on what is present in the registry
-    !insertmacro SetPostInstallOption $DesktopServerCheckbox @CONSOLE_DESKTOP_SHORTCUT_REG_KEY@ ${BST_UNCHECKED}
-
     IntOp $CurrentOffset $CurrentOffset + 15
 
-    ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch @CONSOLE_HF_SHORTCUT_NAME@ on startup"
-    Pop $ServerStartupCheckbox
-
     ; set the checkbox state depending on what is present in the registry
-    !insertmacro SetPostInstallOption $ServerStartupCheckbox @CONSOLE_STARTUP_REG_KEY@ ${BST_CHECKED}
-
-    IntOp $CurrentOffset $CurrentOffset + 15
+    !insertmacro SetInstallOption $DesktopServerCheckbox @CONSOLE_DESKTOP_SHORTCUT_REG_KEY@ ${BST_UNCHECKED}
   ${EndIf}
 
   ${If} ${SectionIsSelected} ${@SERVER_COMPONENT_NAME@}
@@ -503,7 +571,7 @@ Function PostInstallOptionsPage
     Pop $LaunchServerNowCheckbox
 
     ; set the checkbox state depending on what is present in the registry
-    !insertmacro SetPostInstallOption $LaunchServerNowCheckbox @SERVER_LAUNCH_NOW_REG_KEY@ ${BST_CHECKED}
+    !insertmacro SetInstallOption $LaunchServerNowCheckbox @SERVER_LAUNCH_NOW_REG_KEY@ ${BST_CHECKED}
     ${StrContains} $substringResult "/forceNoLaunchServer" $CMDLINE
     ${IfNot} $substringResult == ""
         ${NSD_SetState} $LaunchServerNowCheckbox ${BST_UNCHECKED}
@@ -513,15 +581,31 @@ Function PostInstallOptionsPage
   ${EndIf}
 
   ${If} ${SectionIsSelected} ${@CLIENT_COMPONENT_NAME@}
-	  ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch @INTERFACE_HF_SHORTCUT_NAME@ after install"
-	  Pop $LaunchClientNowCheckbox
+    ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch @INTERFACE_HF_SHORTCUT_NAME@ after install"
+    Pop $LaunchClientNowCheckbox
+    IntOp $CurrentOffset $CurrentOffset + 30
 
-	  ; set the checkbox state depending on what is present in the registry
-	  !insertmacro SetPostInstallOption $LaunchClientNowCheckbox @CLIENT_LAUNCH_NOW_REG_KEY@ ${BST_CHECKED}
-      ${StrContains} $substringResult "/forceNoLaunchClient" $CMDLINE
-      ${IfNot} $substringResult == ""
-          ${NSD_SetState} $LaunchClientNowCheckbox ${BST_UNCHECKED}
-      ${EndIf}
+    ; set the checkbox state depending on what is present in the registry
+    !insertmacro SetInstallOption $LaunchClientNowCheckbox @CLIENT_LAUNCH_NOW_REG_KEY@ ${BST_CHECKED}
+    ${StrContains} $substringResult "/forceNoLaunchClient" $CMDLINE
+    ${IfNot} $substringResult == ""
+    ${NSD_SetState} $LaunchClientNowCheckbox ${BST_UNCHECKED}
+    ${EndIf}
+  ${EndIf}
+
+  ${If} ${SectionIsSelected} ${@SERVER_COMPONENT_NAME@}
+    ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch @CONSOLE_HF_SHORTCUT_NAME@ on startup"
+    Pop $ServerStartupCheckbox
+    IntOp $CurrentOffset $CurrentOffset + 15
+
+    ; set the checkbox state depending on what is present in the registry
+    !insertmacro SetInstallOption $ServerStartupCheckbox @CONSOLE_STARTUP_REG_KEY@ ${BST_CHECKED}
+  ${EndIf}
+
+  ${If} ${SectionIsSelected} ${@CLIENT_COMPONENT_NAME@}
+    ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Perform a clean install (Delete older settings and content)"
+    Pop $CleanInstallCheckbox
+    IntOp $CurrentOffset $CurrentOffset + 15
   ${EndIf}
 
   ${If} @PR_BUILD@ == 1
@@ -541,14 +625,14 @@ Function PostInstallOptionsPage
     ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Copy settings and content from production install"
     Pop $CopyFromProductionCheckbox
 
-    ${NSD_SetState} $CopyFromProductionCheckbox ${BST_CHECKED}
+    ${NSD_SetState} $CopyFromProductionCheckbox ${BST_UNCHECKED}
   ${EndIf}
 
   nsDialogs::Show
 FunctionEnd
 
-!macro WritePostInstallOption OptionName Option
-  ; writes the value for the given post install option to the registry
+!macro WriteInstallOption OptionName Option
+  ; writes the value for the given install option to the registry
   WriteRegStr HKLM "@REGISTRY_HKLM_INSTALL_ROOT@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@\@POST_INSTALL_OPTIONS_REG_GROUP@" "${OptionName}" ${Option}
 !macroend
 
@@ -558,6 +642,35 @@ Var ServerStartupState
 Var LaunchServerNowState
 Var LaunchClientNowState
 Var CopyFromProductionState
+Var CleanInstallState
+Var ExpressInstallState
+Var CustomInstallState
+
+Function ReadInstallTypes
+  ; check if the user asked for express/custom install
+  ${NSD_GetState} $ExpressInstallRadioButton $ExpressInstallState
+  ${NSD_GetState} $CustomInstallRadioButton $CustomInstallState
+
+  ${If} $ExpressInstallState == ${BST_CHECKED}
+    StrCpy $Express "1"
+
+    StrCpy $DesktopClientState ${BST_CHECKED}
+    StrCpy $ServerStartupState ${BST_CHECKED}
+    StrCpy $LaunchServerNowState ${BST_CHECKED}
+    StrCpy $LaunchClientNowState ${BST_CHECKED}
+    StrCpy $CleanInstallState ${BST_UNCHECKED}
+    StrCpy $DesktopServerState ${BST_UNCHECKED}
+
+    ${If} @PR_BUILD@ == 1
+      StrCpy $CopyFromProductionState ${BST_UNCHECKED}
+    ${EndIf}
+
+    !insertmacro WriteInstallOption "@CUSTOM_INSTALL_REG_KEY@" NO
+  ${Else}
+    !insertmacro WriteInstallOption "@CUSTOM_INSTALL_REG_KEY@" YES
+  ${EndIf}
+
+FunctionEnd
 
 Function ReadPostInstallOptions
   ${If} ${SectionIsSelected} ${@CLIENT_COMPONENT_NAME@}
@@ -579,13 +692,18 @@ Function ReadPostInstallOptions
   ${EndIf}
 
   ${If} ${SectionIsSelected} ${@SERVER_COMPONENT_NAME@}
-	  ; check if we need to launch the server post-install
-	  ${NSD_GetState} $LaunchServerNowCheckbox $LaunchServerNowState
+    ; check if we need to launch the server post-install
+    ${NSD_GetState} $LaunchServerNowCheckbox $LaunchServerNowState
   ${EndIf}
 
   ${If} ${SectionIsSelected} ${@CLIENT_COMPONENT_NAME@}
-	  ; check if we need to launch the client post-install
-	  ${NSD_GetState} $LaunchClientNowCheckbox $LaunchClientNowState
+    ; check if we need to launch the client post-install
+    ${NSD_GetState} $LaunchClientNowCheckbox $LaunchClientNowState
+  ${EndIf}
+
+  ${If} ${SectionIsSelected} ${@CLIENT_COMPONENT_NAME@}
+    ; check if the user asked for a clean install
+    ${NSD_GetState} $CleanInstallCheckbox $CleanInstallState
   ${EndIf}
 FunctionEnd
 
@@ -594,9 +712,9 @@ Function HandlePostInstallOptions
     ; check if the user asked for a desktop shortcut to High Fidelity
     ${If} $DesktopClientState == ${BST_CHECKED}
       CreateShortCut "$DESKTOP\@INTERFACE_HF_SHORTCUT_NAME@.lnk" "$INSTDIR\@INTERFACE_WIN_EXEC_NAME@"
-      !insertmacro WritePostInstallOption "@CLIENT_DESKTOP_SHORTCUT_REG_KEY@" YES
+      !insertmacro WriteInstallOption "@CLIENT_DESKTOP_SHORTCUT_REG_KEY@" YES
     ${Else}
-      !insertmacro WritePostInstallOption @CLIENT_DESKTOP_SHORTCUT_REG_KEY@ NO
+      !insertmacro WriteInstallOption @CLIENT_DESKTOP_SHORTCUT_REG_KEY@ NO
     ${EndIf}
 
   ${EndIf}
@@ -605,11 +723,12 @@ Function HandlePostInstallOptions
     ; check if the user asked for a desktop shortcut to Sandbox
     ${If} $DesktopServerState == ${BST_CHECKED}
       CreateShortCut "$DESKTOP\@CONSOLE_HF_SHORTCUT_NAME@.lnk" "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@"
-      !insertmacro WritePostInstallOption @CONSOLE_DESKTOP_SHORTCUT_REG_KEY@ YES
+      !insertmacro WriteInstallOption @CONSOLE_DESKTOP_SHORTCUT_REG_KEY@ YES
     ${Else}
-      !insertmacro WritePostInstallOption @CONSOLE_DESKTOP_SHORTCUT_REG_KEY@ NO
+      !insertmacro WriteInstallOption @CONSOLE_DESKTOP_SHORTCUT_REG_KEY@ NO
     ${EndIf}
 
+
     ; check if the user asked to have Sandbox launched every startup
     ${If} $ServerStartupState == ${BST_CHECKED}
       ; in case we added a shortcut in the global context, pull that now
@@ -623,9 +742,18 @@ Function HandlePostInstallOptions
       ; reset the shell var context back
       SetShellVarContext all
 
-      !insertmacro WritePostInstallOption @CONSOLE_STARTUP_REG_KEY@ YES
+      !insertmacro WriteInstallOption @CONSOLE_STARTUP_REG_KEY@ YES
     ${Else}
-      !insertmacro WritePostInstallOption @CONSOLE_STARTUP_REG_KEY@ NO
+      !insertmacro WriteInstallOption @CONSOLE_STARTUP_REG_KEY@ NO
+    ${EndIf}
+  ${EndIf}
+
+  ${If} ${SectionIsSelected} ${@CLIENT_COMPONENT_NAME@}
+    ; check if the user asked for a clean install
+    ${If} $CleanInstallState == ${BST_CHECKED}
+      SetShellVarContext current
+      RMDir /r "$APPDATA\@BUILD_ORGANIZATION@"
+      RMDir /r "$LOCALAPPDATA\@BUILD_ORGANIZATION@"
     ${EndIf}
   ${EndIf}
 
@@ -658,28 +786,28 @@ Function HandlePostInstallOptions
   ${EndIf}
 
   ${If} $LaunchServerNowState == ${BST_CHECKED}
-    !insertmacro WritePostInstallOption @SERVER_LAUNCH_NOW_REG_KEY@ YES
+    !insertmacro WriteInstallOption @SERVER_LAUNCH_NOW_REG_KEY@ YES
 
     ; both launches use the explorer trick in case the user has elevated permissions for the installer
     ${If} $LaunchClientNowState == ${BST_CHECKED}
-      !insertmacro WritePostInstallOption @CLIENT_LAUNCH_NOW_REG_KEY@ YES
+      !insertmacro WriteInstallOption @CLIENT_LAUNCH_NOW_REG_KEY@ YES
       ; create shortcut with ARGUMENTS
       CreateShortCut "$TEMP\SandboxShortcut.lnk" "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@" "-- --launchInterface"
       Exec '"$WINDIR\explorer.exe" "$TEMP\SandboxShortcut.lnk"'
     ${Else}
-      !insertmacro WritePostInstallOption @CLIENT_LAUNCH_NOW_REG_KEY@ NO
+      !insertmacro WriteInstallOption @CLIENT_LAUNCH_NOW_REG_KEY@ NO
       Exec '"$WINDIR\explorer.exe" "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@"'
     ${EndIf}
 
   ${Else}
-    !insertmacro WritePostInstallOption @SERVER_LAUNCH_NOW_REG_KEY@ NO
+    !insertmacro WriteInstallOption @SERVER_LAUNCH_NOW_REG_KEY@ NO
 
     ; launch uses the explorer trick in case the user has elevated permissions for the installer
     ${If} $LaunchClientNowState == ${BST_CHECKED}
-      !insertmacro WritePostInstallOption @CLIENT_LAUNCH_NOW_REG_KEY@ YES
+      !insertmacro WriteInstallOption @CLIENT_LAUNCH_NOW_REG_KEY@ YES
       Exec '"$WINDIR\explorer.exe" "$INSTDIR\@INTERFACE_WIN_EXEC_NAME@"'
     ${Else}
-      !insertmacro WritePostInstallOption @CLIENT_LAUNCH_NOW_REG_KEY@ NO
+      !insertmacro WriteInstallOption @CLIENT_LAUNCH_NOW_REG_KEY@ NO
     ${EndIf}
 
   ${EndIf}
@@ -708,6 +836,9 @@ Section "-Core installation"
   Delete "$INSTDIR\ui_resources_200_percent.pak"
   Delete "$INSTDIR\vccorlib120.dll"
   Delete "$INSTDIR\version"
+  Delete "$INSTDIR\msvcr140.dll"
+  Delete "$INSTDIR\msvcp140.dll"
+  Delete "$INSTDIR\vcruntime140.dll"
   Delete "$INSTDIR\xinput1_3.dll"
 
   ; Delete old desktop shortcuts before they were renamed during Sandbox rename
@@ -726,6 +857,8 @@ Section "-Core installation"
   ; Rename the incorrectly cased Raleway font
   Rename "$INSTDIR\resources\qml\styles-uit\RalewaySemibold.qml" "$INSTDIR\resources\qml\styles-uit\RalewaySemiBold.qml"
 
+  ExecWait "$INSTDIR\vcredist_x64.exe /install /q /norestart"
+
   ; Remove the Old Interface directory and vcredist_x64.exe (from installs prior to Server Console)
   RMDir /r "$INSTDIR\Interface"
   Delete "$INSTDIR\vcredist_x64.exe"
@@ -826,7 +959,7 @@ Section "-Core installation"
 
   !insertmacro MUI_STARTMENU_WRITE_END
 
-@CPACK_NSIS_EXTRA_INSTALL_COMMANDS@
+  @CPACK_NSIS_EXTRA_INSTALL_COMMANDS@
 
   ; Handle whichever post install options were set
   Call HandlePostInstallOptions
@@ -845,9 +978,18 @@ SectionEnd
     ${If} $R0 == 0
 
       ; the process is running, ask the user to close it
+      
+      ${If} "${displayName}" == "@CONSOLE_DISPLAY_NAME@"
       MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION \
-        "${displayName} cannot be ${action} while ${displayName} is running.$\r$\nPlease close it and click Retry to continue." \
+        "${displayName} cannot be ${action} while ${displayName} is running.$\r$\nPlease close it in the system tray and click Retry to continue." \
         /SD IDCANCEL IDRETRY Prompt_${UniqueID} IDCANCEL 0
+      ${EndIf}
+
+      ${If} "${displayName}" == "@INTERFACE_DISPLAY_NAME@"
+      MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION \
+        "${displayName} cannot be ${action} while ${displayName} is running.$\r$\nPlease close it in the task bar and click Retry to continue." \
+        /SD IDCANCEL IDRETRY Prompt_${UniqueID} IDCANCEL 0
+      ${EndIf}
 
       ; If the user decided to cancel, stop the current installer/uninstaller
       Abort
diff --git a/cmake/templates/resources.qrc.in b/cmake/templates/resources.qrc.in
new file mode 100644
index 0000000000..6466b9ec51
--- /dev/null
+++ b/cmake/templates/resources.qrc.in
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="@QRC_PREFIX_PATH@">
+@QRC_CONTENTS@
+</qresource>
+</RCC>
diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json
index bc67a31c02..d55da6c848 100644
--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@@ -1,6 +1,12 @@
 {
-  "version": 1.7,
+  "version": 2.0,
   "settings": [
+    {
+      "name": "label",
+      "label": "Label",
+      "settings": [
+      ]
+    },
     {
       "name": "metaverse",
       "label": "Metaverse / Networking",
@@ -14,7 +20,8 @@
         {
           "name": "id",
           "label": "Domain ID",
-          "help": "This is your High Fidelity domain ID. If you do not want your domain to be registered in the High Fidelity metaverse you can leave this blank."
+          "help": "This is your High Fidelity domain ID. If you do not want your domain to be registered in the High Fidelity metaverse you can leave this blank.",
+          "advanced": true
         },
         {
           "name": "automatic_networking",
@@ -50,6 +57,7 @@
     {
       "label": "Places / Paths",
       "html_id": "places_paths",
+      "restart": false,
       "settings": [
         {
           "name": "paths",
@@ -75,16 +83,19 @@
     {
       "name": "descriptors",
       "label": "Description",
+      "restart": false,
       "help": "This data will be queryable from your server. It may be collected by High Fidelity and used to share your domain with others.",
       "settings": [
         {
           "name": "description",
           "label": "Description",
+          "advanced": true,
           "help": "A description of your domain (256 character limit)."
         },
         {
           "name": "maturity",
           "label": "Maturity",
+          "advanced": true,
           "help": "A maturity rating, available as a guideline for content on your domain.",
           "default": "unrated",
           "type": "select",
@@ -110,11 +121,11 @@
               "label": "Adult (18+)"
             }
           ]
-
         },
         {
           "name": "hosts",
           "label": "Hosts",
+          "advanced": true,
           "type": "table",
           "can_add_new_rows": true,
           "help": "Usernames of hosts who can reliably show your domain to new visitors.",
@@ -130,6 +141,7 @@
         {
           "name": "tags",
           "label": "Tags",
+          "advanced": true,
           "type": "table",
           "can_add_new_rows": true,
           "help": "Common categories under which your domain falls.",
@@ -159,15 +171,15 @@
           "label": "HTTP Password",
           "type": "password",
           "help": "Password used for basic HTTP authentication. Leave this alone if you do not want to change it.",
-          "password_placeholder" : "******",
+          "password_placeholder": "******",
           "value-hidden": true
         },
         {
-            "name": "verify_http_password",
-            "label": "Verify HTTP Password",
-            "type": "password",
-            "help": "Must match the password entered above for change to be saved.",
-            "value-hidden": true
+          "name": "verify_http_password",
+          "label": "Verify HTTP Password",
+          "type": "password",
+          "help": "Must match the password entered above for change to be saved.",
+          "value-hidden": true
         },
         {
           "name": "maximum_user_capacity",
@@ -206,21 +218,19 @@
           "name": "standard_permissions",
           "type": "table",
           "label": "Domain-Wide User Permissions",
-          "help": "Indicate which types of users can have which <a data-toggle='tooltip' data-html=true title='<p><strong>Domain-Wide User Permissions</strong></p><ul><li><strong>Connect</strong><br />Sets whether a user can connect to the domain.</li><li><strong>Lock / Unlock</strong><br />Sets whether a user change the &ldquo;locked&rdquo; property of an entity (either from on to off or off to on).</li><li><strong>Rez</strong><br />Sets whether a user can create new entities.</li><li><strong>Rez Temporary</strong><br />Sets whether a user can create new entities with a finite lifetime.</li><li><strong>Write Assets</strong><br />Sets whether a user can make changes to the domain&rsquo;s asset-server assets.</li><li><strong>Ignore Max Capacity</strong><br />Sets whether a user can connect even if the domain has reached or exceeded its maximum allowed agents.</li></ul><p>Note that permissions assigned to a specific user will supersede any parameter-level permissions that might otherwise apply to that user. Additionally, if more than one parameter is applicable to a given user, the permissions given to that user will be the sum of all applicable parameters. For example, let&rsquo;s say only localhost users can connect and only logged in users can lock and unlock entities. If a user is both logged in and on localhost then they will be able to both connect and lock/unlock entities.</p>'>domain-wide permissions</a>.",
+          "help": "Indicate which types of users can have which <a data-toggle='tooltip' data-html=true title='<p><strong>Domain-Wide User Permissions</strong></p><ul><li><strong>Connect</strong><br />Sets whether a user can connect to the domain.</li><li><strong>Lock / Unlock</strong><br />Sets whether a user change the &ldquo;locked&rdquo; property of an entity (either from on to off or off to on).</li><li><strong>Rez</strong><br />Sets whether a user can create new entities.</li><li><strong>Rez Temporary</strong><br />Sets whether a user can create new entities with a finite lifetime.</li><li><strong>Rez Certified</strong><br />Sets whether a user can create new certified entities.</li><li><strong>Rez Temporary Certified</strong><br />Sets whether a user can create new certified entities with a finite lifetime.</li><li><strong>Write Assets</strong><br />Sets whether a user can make changes to the domain&rsquo;s asset-server assets.</li><li><strong>Ignore Max Capacity</strong><br />Sets whether a user can connect even if the domain has reached or exceeded its maximum allowed agents.</li><li><strong>Replace Content</strong><br>Sets whether a user can replace entire content sets by wiping existing domain content.</li></ul><p>Note that permissions assigned to a specific user will supersede any parameter-level permissions that might otherwise apply to that user. Additionally, if more than one parameter is applicable to a given user, the permissions given to that user will be the sum of all applicable parameters. For example, let&rsquo;s say only localhost users can connect and only logged in users can lock and unlock entities. If a user is both logged in and on localhost then they will be able to both connect and lock/unlock entities.</p>'>domain-wide permissions</a>.",
           "caption": "Standard Permissions",
           "can_add_new_rows": false,
-
           "groups": [
             {
               "label": "Type of User",
               "span": 1
             },
             {
-              "label": "Permissions <a data-toggle='tooltip' data-html='true' title='<p><strong>Domain-Wide User Permissions</strong></p><ul><li><strong>Connect</strong><br />Sets whether a user can connect to the domain.</li><li><strong>Lock / Unlock</strong><br />Sets whether a user change the &ldquo;locked&rdquo; property of an entity (either from on to off or off to on).</li><li><strong>Rez</strong><br />Sets whether a user can create new entities.</li><li><strong>Rez Temporary</strong><br />Sets whether a user can create new entities with a finite lifetime.</li><li><strong>Write Assets</strong><br />Sets whether a user can make changes to the domain&rsquo;s asset-server assets.</li><li><strong>Ignore Max Capacity</strong><br />Sets whether a user can connect even if the domain has reached or exceeded its maximum allowed agents.</li></ul><p>Note that permissions assigned to a specific user will supersede any parameter-level permissions that might otherwise apply to that user. Additionally, if more than one parameter is applicable to a given user, the permissions given to that user will be the sum of all applicable parameters. For example, let&rsquo;s say only localhost users can connect and only logged in users can lock and unlock entities. If a user is both logged in and on localhost then they will be able to both connect and lock/unlock entities.</p>'>?</a>",
-              "span": 7
+              "label": "Permissions <a data-toggle='tooltip' data-html='true' title='<p><strong>Domain-Wide User Permissions</strong></p><ul><li><strong>Connect</strong><br />Sets whether a user can connect to the domain.</li><li><strong>Lock / Unlock</strong><br />Sets whether a user change the &ldquo;locked&rdquo; property of an entity (either from on to off or off to on).</li><li><strong>Rez</strong><br />Sets whether a user can create new entities.</li><li><strong>Rez Temporary</strong><br />Sets whether a user can create new entities with a finite lifetime.</li><li><strong>Rez Certified</strong><br />Sets whether a user can create new certified entities.</li><li><strong>Rez Temporary Certified</strong><br />Sets whether a user can create new certified entities with a finite lifetime.</li><li><strong>Write Assets</strong><br />Sets whether a user can make changes to the domain&rsquo;s asset-server assets.</li><li><strong>Ignore Max Capacity</strong><br />Sets whether a user can connect even if the domain has reached or exceeded its maximum allowed agents.</li><li><strong>Replace Content</strong><br>Sets whether a user can replace entire content sets by wiping existing domain content.</li></ul><p>Note that permissions assigned to a specific user will supersede any parameter-level permissions that might otherwise apply to that user. Additionally, if more than one parameter is applicable to a given user, the permissions given to that user will be the sum of all applicable parameters. For example, let&rsquo;s say only localhost users can connect and only logged in users can lock and unlock entities. If a user is both logged in and on localhost then they will be able to both connect and lock/unlock entities.</p>'>?</a>",
+              "span": 10
             }
           ],
-
           "columns": [
             {
               "name": "permissions_id",
@@ -254,6 +264,20 @@
               "editable": true,
               "default": false
             },
+            {
+              "name": "id_can_rez_certified",
+              "label": "Rez Certified",
+              "type": "checkbox",
+              "editable": true,
+              "default": false
+            },
+            {
+              "name": "id_can_rez_tmp_certified",
+              "label": "Rez Temporary Certified",
+              "type": "checkbox",
+              "editable": true,
+              "default": false
+            },
             {
               "name": "id_can_write_to_asset_server",
               "label": "Write Assets",
@@ -274,11 +298,17 @@
               "type": "checkbox",
               "editable": true,
               "default": false
+            },
+            {
+              "name": "id_can_replace_content",
+              "label": "Replace Content",
+              "type": "checkbox",
+              "editable": true,
+              "default": false
             }
           ],
-
           "non-deletable-row-key": "permissions_id",
-          "non-deletable-row-values": ["localhost", "anonymous", "logged-in"]
+          "non-deletable-row-values": [ "localhost", "anonymous", "logged-in" ]
         },
         {
           "name": "group_permissions",
@@ -289,18 +319,16 @@
           "can_add_new_rows": false,
           "new_category_placeholder": "Add Group",
           "new_category_message": "Save and reload to see ranks",
-
           "groups": [
             {
               "label": "Rank",
               "span": 1
             },
             {
-              "label": "Permissions <a data-toggle='tooltip' data-html='true' title='<p><strong>Domain-Wide User Permissions</strong></p><ul><li><strong>Connect</strong><br />Sets whether users in specific groups can connect to the domain.</li><li><strong>Lock / Unlock</strong><br />Sets whether users in specific groups can change the &ldquo;locked&rdquo; property of an entity (either from on to off or off to on).</li><li><strong>Rez</strong><br />Sets whether users in specific groups can create new entities.</li><li><strong>Rez Temporary</strong><br />Sets whether users in specific groups can create new entities with a finite lifetime.</li><li><strong>Write Assets</strong><br />Sets whether users in specific groups can make changes to the domain&rsquo;s asset-server assets.</li><li><strong>Ignore Max Capacity</strong><br />Sets whether user in specific groups can connect even if the domain has reached or exceeded its maximum allowed agents.</li></ul><p>Permissions granted to a specific user will be a union of the permissions granted to the groups they are in, as well as permissions from the previous section.  Group permissions are only granted if the user doesn&rsquo;t have their own row in the per-account section, below.</p>'>?</a>",
-              "span": 7
+              "label": "Permissions <a data-toggle='tooltip' data-html='true' title='<p><strong>Domain-Wide User Permissions</strong></p><ul><li><strong>Connect</strong><br />Sets whether users in specific groups can connect to the domain.</li><li><strong>Lock / Unlock</strong><br />Sets whether users in specific groups can change the &ldquo;locked&rdquo; property of an entity (either from on to off or off to on).</li><li><strong>Rez</strong><br />Sets whether users in specific groups can create new entities.</li><li><strong>Rez Temporary</strong><br />Sets whether users in specific groups can create new entities with a finite lifetime.</li><li><strong>Rez Temporary</strong><br />Sets whether users in specific groups can create new entities with a finite lifetime.</li><li><strong>Rez Certified</strong><br />Sets whether a users in specific groups can create new certified entities.</li><li><strong>Rez Temporary Certified</strong><br />Sets whether a user can create new certified entities with a finite lifetime.</li><li><strong>Write Assets</strong><br />Sets whether users in specific groups can make changes to the domain&rsquo;s asset-server assets.</li><li><strong>Ignore Max Capacity</strong><br />Sets whether user in specific groups can connect even if the domain has reached or exceeded its maximum allowed agents.</li><li><strong>Replace Content</strong><br>Sets whether a user can replace entire content sets by wiping existing domain content.</li></ul><p>Permissions granted to a specific user will be a union of the permissions granted to the groups they are in, as well as permissions from the previous section.  Group permissions are only granted if the user doesn&rsquo;t have their own row in the per-account section, below.</p>'>?</a>",
+              "span": 10
             }
           ],
-
           "columns": [
             {
               "name": "permissions_id",
@@ -359,6 +387,20 @@
               "editable": true,
               "default": false
             },
+            {
+              "name": "id_can_rez_certified",
+              "label": "Rez Certified",
+              "type": "checkbox",
+              "editable": true,
+              "default": false
+            },
+            {
+              "name": "id_can_rez_tmp_certified",
+              "label": "Rez Temporary Certified",
+              "type": "checkbox",
+              "editable": true,
+              "default": false
+            },
             {
               "name": "id_can_write_to_asset_server",
               "label": "Write Assets",
@@ -379,6 +421,13 @@
               "type": "checkbox",
               "editable": true,
               "default": false
+            },
+            {
+              "name": "id_can_replace_content",
+              "label": "Replace Content",
+              "type": "checkbox",
+              "editable": true,
+              "default": false
             }
           ]
         },
@@ -391,18 +440,16 @@
           "can_add_new_rows": false,
           "new_category_placeholder": "Add Blacklist Group",
           "new_category_message": "Save and reload to see ranks",
-
           "groups": [
             {
               "label": "Rank",
               "span": 1
             },
             {
-              "label": "Permissions <a data-toggle='tooltip' data-html='true' title='<p><strong>Domain-Wide User Permissions</strong></p><ul><li><strong>Connect</strong><br />Sets whether users in specific groups can connect to the domain.</li><li><strong>Lock / Unlock</strong><br />Sets whether users in specific groups can change the &ldquo;locked&rdquo; property of an entity (either from on to off or off to on).</li><li><strong>Rez</strong><br />Sets whether users in specific groups can create new entities.</li><li><strong>Rez Temporary</strong><br />Sets whether users in specific groups can create new entities with a finite lifetime.</li><li><strong>Write Assets</strong><br />Sets whether users in specific groups can make changes to the domain&rsquo;s asset-server assets.</li><li><strong>Ignore Max Capacity</strong><br />Sets whether user in specific groups can connect even if the domain has reached or exceeded its maximum allowed agents.</li></ul><p>Permissions granted to a specific user will be a union of the permissions granted to the groups they are in.  Group permissions are only granted if the user doesn&rsquo;t have their own row in the per-account section, below.</p>'>?</a>",
-              "span": 7
+              "label": "Permissions <a data-toggle='tooltip' data-html='true' title='<p><strong>Domain-Wide User Permissions</strong></p><ul><li><strong>Connect</strong><br />Sets whether users in specific groups can connect to the domain.</li><li><strong>Lock / Unlock</strong><br />Sets whether users in specific groups can change the &ldquo;locked&rdquo; property of an entity (either from on to off or off to on).</li><li><strong>Rez</strong><br />Sets whether users in specific groups can create new entities.</li><li><strong>Rez Temporary</strong><br />Sets whether users in specific groups can create new entities with a finite lifetime.</li><li><strong>Rez Certified</strong><br />Sets whether a users in specific groups can create new certified entities.</li><li><strong>Rez Temporary Certified</strong><br />Sets whether a user can create new certified entities with a finite lifetime.</li><li><strong>Write Assets</strong><br />Sets whether users in specific groups can make changes to the domain&rsquo;s asset-server assets.</li><li><strong>Ignore Max Capacity</strong><br />Sets whether user in specific groups can connect even if the domain has reached or exceeded its maximum allowed agents.</li><li><strong>Replace Content</strong><br>Sets whether users in specific groups can replace entire content sets by wiping existing domain content.</li></ul><p>Permissions granted to a specific user will be a union of the permissions granted to the groups they are in.  Group permissions are only granted if the user doesn&rsquo;t have their own row in the per-account section, below.</p>'>?</a>",
+              "span": 10
             }
           ],
-
           "columns": [
             {
               "name": "permissions_id",
@@ -458,6 +505,20 @@
               "editable": true,
               "default": false
             },
+            {
+              "name": "id_can_rez_certified",
+              "label": "Rez Certified",
+              "type": "checkbox",
+              "editable": true,
+              "default": false
+            },
+            {
+              "name": "id_can_rez_tmp_certified",
+              "label": "Rez Temporary Certified",
+              "type": "checkbox",
+              "editable": true,
+              "default": false
+            },
             {
               "name": "id_can_write_to_asset_server",
               "label": "Write Assets",
@@ -478,6 +539,13 @@
               "type": "checkbox",
               "editable": true,
               "default": false
+            },
+            {
+              "name": "id_can_replace_content",
+              "label": "Replace Content",
+              "type": "checkbox",
+              "editable": true,
+              "default": false
             }
           ]
         },
@@ -486,18 +554,16 @@
           "type": "table",
           "caption": "Permissions for Specific Users",
           "can_add_new_rows": true,
-
           "groups": [
             {
               "label": "User",
               "span": 1
             },
             {
-              "label": "Permissions <a data-toggle='tooltip' data-html='true' title='<p><strong>Domain-Wide User Permissions</strong></p><ul><li><strong>Connect</strong><br />Sets whether a user can connect to the domain.</li><li><strong>Lock / Unlock</strong><br />Sets whether a user change the &ldquo;locked&rdquo; property of an entity (either from on to off or off to on).</li><li><strong>Rez</strong><br />Sets whether a user can create new entities.</li><li><strong>Rez Temporary</strong><br />Sets whether a user can create new entities with a finite lifetime.</li><li><strong>Write Assets</strong><br />Sets whether a user can make changes to the domain&rsquo;s asset-server assets.</li><li><strong>Ignore Max Capacity</strong><br />Sets whether a user can connect even if the domain has reached or exceeded its maximum allowed agents.</li></ul><p>Note that permissions assigned to a specific user will supersede any parameter-level or group permissions that might otherwise apply to that user.</p>'>?</a>",
-              "span": 7
+              "label": "Permissions <a data-toggle='tooltip' data-html='true' title='<p><strong>Domain-Wide User Permissions</strong></p><ul><li><strong>Connect</strong><br />Sets whether a user can connect to the domain.</li><li><strong>Lock / Unlock</strong><br />Sets whether a user change the &ldquo;locked&rdquo; property of an entity (either from on to off or off to on).</li><li><strong>Rez</strong><br />Sets whether a user can create new entities.</li><li><strong>Rez Temporary</strong><br />Sets whether a user can create new entities with a finite lifetime.</li><li><strong>Rez Temporary</strong><br />Sets whether a user can create new entities with a finite lifetime.</li><li><strong>Rez Certified</strong><br />Sets whether a user can create new certified entities.</li><li><strong>Rez Temporary Certified</strong><br />Sets whether a user can create new certified entities with a finite lifetime.</li><li><strong>Write Assets</strong><br />Sets whether a user can make changes to the domain&rsquo;s asset-server assets.</li><li><strong>Ignore Max Capacity</strong><br />Sets whether a user can connect even if the domain has reached or exceeded its maximum allowed agents.</li><li><strong>Replace Content</strong><br>Sets whether a user can replace entire content sets by wiping existing domain content.</li></ul><p>Note that permissions assigned to a specific user will supersede any parameter-level or group permissions that might otherwise apply to that user.</p>'>?</a>",
+              "span": 10
             }
           ],
-
           "columns": [
             {
               "name": "permissions_id",
@@ -531,6 +597,20 @@
               "editable": true,
               "default": false
             },
+            {
+              "name": "id_can_rez_certified",
+              "label": "Rez Certified",
+              "type": "checkbox",
+              "editable": true,
+              "default": false
+            },
+            {
+              "name": "id_can_rez_tmp_certified",
+              "label": "Rez Temporary Certified",
+              "type": "checkbox",
+              "editable": true,
+              "default": false
+            },
             {
               "name": "id_can_write_to_asset_server",
               "label": "Write Assets",
@@ -551,6 +631,13 @@
               "type": "checkbox",
               "editable": true,
               "default": false
+            },
+            {
+              "name": "id_can_replace_content",
+              "label": "Replace Content",
+              "type": "checkbox",
+              "editable": true,
+              "default": false
             }
           ]
         },
@@ -565,11 +652,10 @@
               "span": 1
             },
             {
-              "label": "Permissions <a data-toggle='tooltip' data-html='true' title='<p><strong>Domain-Wide IP Permissions</strong></p><ul><li><strong>Connect</strong><br />Sets whether users from specific IPs can connect to the domain.</li><li><strong>Lock / Unlock</strong><br />Sets whether users from specific IPs can change the &ldquo;locked&rdquo; property of an entity (either from on to off or off to on).</li><li><strong>Rez</strong><br />Sets whether users from specific IPs can create new entities.</li><li><strong>Rez Temporary</strong><br />Sets whether users from specific IPs can create new entities with a finite lifetime.</li><li><strong>Write Assets</strong><br />Sets whether users from specific IPs can make changes to the domain&rsquo;s asset-server assets.</li><li><strong>Ignore Max Capacity</strong><br />Sets whether users from specific IPs can connect even if the domain has reached or exceeded its maximum allowed agents.</li></ul><p>Note that permissions assigned to a specific IP will supersede any parameter-level permissions that might otherwise apply to that user (from groups or standard permissions above). IP address permissions are overriden if the user has their own row in the users section.</p>'>?</a>",
-              "span": 7
+              "label": "Permissions <a data-toggle='tooltip' data-html='true' title='<p><strong>Domain-Wide IP Permissions</strong></p><ul><li><strong>Connect</strong><br />Sets whether users from specific IPs can connect to the domain.</li><li><strong>Lock / Unlock</strong><br />Sets whether users from specific IPs can change the &ldquo;locked&rdquo; property of an entity (either from on to off or off to on).</li><li><strong>Rez</strong><br />Sets whether users from specific IPs can create new entities.</li><li><strong>Rez Temporary</strong><br />Sets whether users from specific IPs can create new entities with a finite lifetime.</li><li><strong>Rez Temporary</strong><br />Sets whether a user can create new entities with a finite lifetime.</li><li><strong>Rez Certified</strong><br />Sets whether users from specific IPs can create new certified entities.</li><li><strong>Rez Temporary Certified</strong><br />Sets whether users from specific IPs can create new certified entities with a finite lifetime.</li><li><strong>Write Assets</strong><br />Sets whether users from specific IPs can make changes to the domain&rsquo;s asset-server assets.</li><li><strong>Ignore Max Capacity</strong><br />Sets whether users from specific IPs can connect even if the domain has reached or exceeded its maximum allowed agents.</li><li><strong>Replace Content</strong><br>Sets whether users from specific IPs can replace entire content sets by wiping existing domain content.</li></ul><p>Note that permissions assigned to a specific IP will supersede any parameter-level permissions that might otherwise apply to that user (from groups or standard permissions above). IP address permissions are overriden if the user has their own row in the users section.</p>'>?</a>",
+              "span": 10
             }
           ],
-
           "columns": [
             {
               "name": "permissions_id",
@@ -603,6 +689,20 @@
               "editable": true,
               "default": false
             },
+            {
+              "name": "id_can_rez_certified",
+              "label": "Rez Certified",
+              "type": "checkbox",
+              "editable": true,
+              "default": false
+            },
+            {
+              "name": "id_can_rez_tmp_certified",
+              "label": "Rez Temporary Certified",
+              "type": "checkbox",
+              "editable": true,
+              "default": false
+            },
             {
               "name": "id_can_write_to_asset_server",
               "label": "Write Assets",
@@ -623,6 +723,13 @@
               "type": "checkbox",
               "editable": true,
               "default": false
+            },
+            {
+              "name": "id_can_replace_content",
+              "label": "Replace Content",
+              "type": "checkbox",
+              "editable": true,
+              "default": false
             }
           ]
         },
@@ -637,11 +744,10 @@
               "span": 1
             },
             {
-              "label": "Permissions <a data-toggle='tooltip' data-html='true' title='<p><strong>Domain-Wide MAC Permissions</strong></p><ul><li><strong>Connect</strong><br />Sets whether users with specific MACs can connect to the domain.</li><li><strong>Lock / Unlock</strong><br />Sets whether users from specific MACs can change the &ldquo;locked&rdquo; property of an entity (either from on to off or off to on).</li><li><strong>Rez</strong><br />Sets whether users with specific MACs can create new entities.</li><li><strong>Rez Temporary</strong><br />Sets whether users with specific MACs can create new entities with a finite lifetime.</li><li><strong>Write Assets</strong><br />Sets whether users with specific MACs can make changes to the domain&rsquo;s asset-server assets.</li><li><strong>Ignore Max Capacity</strong><br />Sets whether users with specific MACs can connect even if the domain has reached or exceeded its maximum allowed agents.</li></ul><p>Note that permissions assigned to a specific MAC will supersede any parameter-level permissions that might otherwise apply to that user (from groups or standard permissions above). MAC address permissions are overriden if the user has their own row in the users section.</p>'>?</a>",
-              "span": 7
+              "label": "Permissions <a data-toggle='tooltip' data-html='true' title='<p><strong>Domain-Wide MAC Permissions</strong></p><ul><li><strong>Connect</strong><br />Sets whether users with specific MACs can connect to the domain.</li><li><strong>Lock / Unlock</strong><br />Sets whether users from specific MACs can change the &ldquo;locked&rdquo; property of an entity (either from on to off or off to on).</li><li><strong>Rez</strong><br />Sets whether users with specific MACs can create new entities.</li><li><strong>Rez Temporary</strong><br />Sets whether users with specific MACs can create new entities with a finite lifetime.</li><li><strong>Rez Certified</strong><br />Sets whether users with specific MACs can create new certified entities.</li><li><strong>Rez Temporary Certified</strong><br />Sets whether users with specific MACs can create new certified entities with a finite lifetime.</li><li><strong>Write Assets</strong><br />Sets whether users with specific MACs can make changes to the domain&rsquo;s asset-server assets.</li><li><strong>Ignore Max Capacity</strong><br />Sets whether users with specific MACs can connect even if the domain has reached or exceeded its maximum allowed agents.</li><li><strong>Replace Content</strong><br>Sets whether users with specific MACs can replace entire content sets by wiping existing domain content.</li></ul><p>Note that permissions assigned to a specific MAC will supersede any parameter-level permissions that might otherwise apply to that user (from groups or standard permissions above). MAC address permissions are overriden if the user has their own row in the users section.</p>'>?</a>",
+              "span": 10
             }
           ],
-
           "columns": [
             {
               "name": "permissions_id",
@@ -675,6 +781,20 @@
               "editable": true,
               "default": false
             },
+            {
+              "name": "id_can_rez_certified",
+              "label": "Rez Certified",
+              "type": "checkbox",
+              "editable": true,
+              "default": false
+            },
+            {
+              "name": "id_can_rez_tmp_certified",
+              "label": "Rez Temporary Certified",
+              "type": "checkbox",
+              "editable": true,
+              "default": false
+            },
             {
               "name": "id_can_write_to_asset_server",
               "label": "Write Assets",
@@ -695,6 +815,13 @@
               "type": "checkbox",
               "editable": true,
               "default": false
+            },
+            {
+              "name": "id_can_replace_content",
+              "label": "Replace Content",
+              "type": "checkbox",
+              "editable": true,
+              "default": false
             }
           ]
         },
@@ -709,11 +836,10 @@
               "span": 1
             },
             {
-              "label": "Permissions <a data-toggle='tooltip' data-html='true' title='<p><strong>Domain-Wide Machine Fingerprint Permissions</strong></p><ul><li><strong>Connect</strong><br />Sets whether users with specific Machine Fingerprints can connect to the domain.</li><li><strong>Lock / Unlock</strong><br />Sets whether users from specific Machine Fingerprints can change the &ldquo;locked&rdquo; property of an entity (either from on to off or off to on).</li><li><strong>Rez</strong><br />Sets whether users with specific Machine Fingerprints can create new entities.</li><li><strong>Rez Temporary</strong><br />Sets whether users with specific Machine Fingerprints can create new entities with a finite lifetime.</li><li><strong>Write Assets</strong><br />Sets whether users with specific Machine Fingerprints can make changes to the domain&rsquo;s asset-server assets.</li><li><strong>Ignore Max Capacity</strong><br />Sets whether users with specific Machine Fingerprints can connect even if the domain has reached or exceeded its maximum allowed agents.</li></ul><p>Note that permissions assigned to a specific Machine Fingerprint will supersede any parameter-level permissions that might otherwise apply to that user (from groups or standard permissions above). Machine Fingerprint address permissions are overriden if the user has their own row in the users section.</p>'>?</a>",
-              "span": 7
+              "label": "Permissions <a data-toggle='tooltip' data-html='true' title='<p><strong>Domain-Wide Machine Fingerprint Permissions</strong></p><ul><li><strong>Connect</strong><br />Sets whether users with specific Machine Fingerprints can connect to the domain.</li><li><strong>Lock / Unlock</strong><br />Sets whether users from specific Machine Fingerprints can change the &ldquo;locked&rdquo; property of an entity (either from on to off or off to on).</li><li><strong>Rez</strong><br />Sets whether users with specific Machine Fingerprints can create new entities.</li><li><strong>Rez Temporary</strong><br />Sets whether users with specific Machine Fingerprints can create new entities with a finite lifetime.</li><li><strong>Rez Certified</strong><br />Sets whether users with specific Machine Fingerprints can create new certified entities.</li><li><strong>Rez Temporary Certified</strong><br />Sets whether users with specific Machine Fingerprints can create new certified entities with a finite lifetime.</li><li><strong>Write Assets</strong><br />Sets whether users with specific Machine Fingerprints can make changes to the domain&rsquo;s asset-server assets.</li><li><strong>Ignore Max Capacity</strong><br />Sets whether users with specific Machine Fingerprints can connect even if the domain has reached or exceeded its maximum allowed agents.</li><li><strong>Replace Content</strong><br>Sets whether users with specific Machine Fingerprints can replace entire content sets by wiping existing domain content.</li></ul><p>Note that permissions assigned to a specific Machine Fingerprint will supersede any parameter-level permissions that might otherwise apply to that user (from groups or standard permissions above). Machine Fingerprint address permissions are overriden if the user has their own row in the users section.</p>'>?</a>",
+              "span": 10
             }
           ],
-
           "columns": [
             {
               "name": "permissions_id",
@@ -747,6 +873,20 @@
               "editable": true,
               "default": false
             },
+            {
+              "name": "id_can_rez_certified",
+              "label": "Rez Certified",
+              "type": "checkbox",
+              "editable": true,
+              "default": false
+            },
+            {
+              "name": "id_can_rez_tmp_certified",
+              "label": "Rez Temporary Certified",
+              "type": "checkbox",
+              "editable": true,
+              "default": false
+            },
             {
               "name": "id_can_write_to_asset_server",
               "label": "Write Assets",
@@ -767,6 +907,13 @@
               "type": "checkbox",
               "editable": true,
               "default": false
+            },
+            {
+              "name": "id_can_replace_content",
+              "label": "Replace Content",
+              "type": "checkbox",
+              "editable": true,
+              "default": false
             }
           ]
         }
@@ -782,7 +929,6 @@
           "label": "Persistent Scripts",
           "help": "Add the URLs for scripts that you would like to ensure are always running in your domain.",
           "can_add_new_rows": true,
-
           "columns": [
             {
               "name": "url",
@@ -804,7 +950,7 @@
     {
       "name": "asset_server",
       "label": "Asset Server (ATP)",
-      "assignment-types": [3],
+      "assignment-types": [ 3 ],
       "settings": [
         {
           "name": "enabled",
@@ -821,13 +967,21 @@
           "help": "The path to the directory assets are stored in.<br/>If this path is relative, it will be relative to the application data directory.<br/>If you change this path you will need to manually copy any existing assets from the previous directory.",
           "default": "",
           "advanced": true
+        },
+        {
+          "name": "assets_filesize_limit",
+          "type": "int",
+          "label": "File Size Limit",
+          "help": "The file size limit of an asset that can be imported into the asset server in MBytes. 0 (default) means no limit on file size.",
+          "default": 0,
+          "advanced": true
         }
       ]
     },
     {
       "name": "entity_script_server",
       "label": "Entity Script Server (ESS)",
-      "assignment-types": [5],
+      "assignment-types": [ 5 ],
       "settings": [
         {
           "name": "entity_pps_per_script",
@@ -850,7 +1004,7 @@
     {
       "name": "avatars",
       "label": "Avatars",
-      "assignment-types": [1, 2],
+      "assignment-types": [ 1, 2 ],
       "settings": [
         {
           "name": "min_avatar_scale",
@@ -889,7 +1043,7 @@
     {
       "name": "audio_threading",
       "label": "Audio Threading",
-      "assignment-types": [0],
+      "assignment-types": [ 0 ],
       "settings": [
         {
           "name": "auto_threads",
@@ -912,7 +1066,7 @@
     {
       "name": "audio_env",
       "label": "Audio Environment",
-      "assignment-types": [0],
+      "assignment-types": [ 0 ],
       "settings": [
         {
           "name": "attenuation_per_doubling_in_distance",
@@ -944,7 +1098,6 @@
           "help": "In this table you can define a set of zones in which you can specify various audio properties.",
           "numbered": false,
           "can_add_new_rows": true,
-
           "key": {
             "name": "name",
             "label": "Name",
@@ -997,7 +1150,6 @@
           "numbered": true,
           "can_order": true,
           "can_add_new_rows": true,
-
           "columns": [
             {
               "name": "source",
@@ -1026,7 +1178,6 @@
           "help": "In this table you can set reverb levels for audio zones.  For a medium-sized (e.g., 100 square meter) meeting room, try a decay time of around 1.5 seconds and a wet/dry mix of 25%. For an airplane hangar or cathedral, try a decay time of 4 seconds and a wet/dry mix of 50%.",
           "numbered": true,
           "can_add_new_rows": true,
-
           "columns": [
             {
               "name": "zone",
@@ -1061,7 +1212,9 @@
     {
       "name": "audio_buffer",
       "label": "Audio Buffers",
-      "assignment-types": [0],
+      "assignment-types": [
+        0
+      ],
       "settings": [
         {
           "name": "dynamic_jitter_buffer",
@@ -1080,35 +1233,37 @@
           "advanced": true
         },
         {
-            "name": "max_frames_over_desired",
-            "deprecated": true
+          "name": "max_frames_over_desired",
+          "deprecated": true
         },
         {
-            "name": "window_starve_threshold",
-            "deprecated": true
+          "name": "window_starve_threshold",
+          "deprecated": true
         },
         {
-            "name": "window_seconds_for_desired_calc_on_too_many_starves",
-            "deprecated": true
+          "name": "window_seconds_for_desired_calc_on_too_many_starves",
+          "deprecated": true
         },
         {
-            "name": "window_seconds_for_desired_reduction",
-            "deprecated": true
+          "name": "window_seconds_for_desired_reduction",
+          "deprecated": true
         },
         {
-            "name": "use_stdev_for_desired_calc",
-            "deprecated": true
+          "name": "use_stdev_for_desired_calc",
+          "deprecated": true
         },
         {
-            "name": "repetition_with_fade",
-            "deprecated": true
+          "name": "repetition_with_fade",
+          "deprecated": true
         }
       ]
     },
     {
       "name": "entity_server_settings",
       "label": "Entity Server Settings",
-      "assignment-types": [6],
+      "assignment-types": [
+        6
+      ],
       "settings": [
         {
           "name": "maxTmpLifetime",
@@ -1118,6 +1273,22 @@
           "default": "3600",
           "advanced": true
         },
+        {
+          "name": "dynamicDomainVerificationTimeMin",
+          "label": "Dynamic Domain Verification Time (seconds) - Minimum",
+          "help": "The lower limit on the amount of time that passes before Dynamic Domain Verification on entities occurs. Units are seconds.",
+          "placeholder": "2700",
+          "default": "2700",
+          "advanced": true
+        },
+        {
+          "name": "dynamicDomainVerificationTimeMax",
+          "label": "Dynamic Domain Verification Time (seconds) - Maximum",
+          "help": "The upper limit on the amount of time that passes before Dynamic Domain Verification on entities occurs. Units are seconds.",
+          "placeholder": "3600",
+          "default": "3600",
+          "advanced": true
+        },
         {
           "name": "entityScriptSourceWhitelist",
           "label": "Entity Scripts Allowed from:",
@@ -1165,13 +1336,32 @@
           "help": "In this table you can define a set of rules for how frequently to backup copies of your entites content file.",
           "numbered": false,
           "can_add_new_rows": true,
-
-          "default":  [
-                          {"Name":"Half Hourly Rolling","backupInterval":1800,"format":".backup.halfhourly.%N","maxBackupVersions":5},
-                          {"Name":"Daily Rolling","backupInterval":86400,"format":".backup.daily.%N","maxBackupVersions":7},
-                          {"Name":"Weekly Rolling","backupInterval":604800,"format":".backup.weekly.%N","maxBackupVersions":4},
-                          {"Name":"Thirty Day Rolling","backupInterval":2592000,"format":".backup.thirtyday.%N","maxBackupVersions":12}
-                      ],
+          "default": [
+            {
+              "Name": "Half Hourly Rolling",
+              "backupInterval": 1800,
+              "format": ".backup.halfhourly.%N",
+              "maxBackupVersions": 5
+            },
+            {
+              "Name": "Daily Rolling",
+              "backupInterval": 86400,
+              "format": ".backup.daily.%N",
+              "maxBackupVersions": 7
+            },
+            {
+              "Name": "Weekly Rolling",
+              "backupInterval": 604800,
+              "format": ".backup.weekly.%N",
+              "maxBackupVersions": 4
+            },
+            {
+              "Name": "Thirty Day Rolling",
+              "backupInterval": 2592000,
+              "format": ".backup.thirtyday.%N",
+              "maxBackupVersions": 12
+            }
+          ],
           "columns": [
             {
               "name": "Name",
@@ -1307,7 +1497,9 @@
     {
       "name": "avatar_mixer",
       "label": "Avatar Mixer",
-      "assignment-types": [1],
+      "assignment-types": [
+        1
+      ],
       "settings": [
         {
           "name": "max_node_send_bandwidth",
@@ -1360,7 +1552,10 @@
         {
           "name": "downstream_servers",
           "label": "Receiving Servers",
-          "assignment-types": [0,1],
+          "assignment-types": [
+            0,
+            1
+          ],
           "type": "table",
           "advanced": true,
           "can_add_new_rows": true,
@@ -1400,7 +1595,10 @@
         {
           "name": "upstream_servers",
           "label": "Broadcasting Servers",
-          "assignment-types": [0,1],
+          "assignment-types": [
+            0,
+            1
+          ],
           "type": "table",
           "advanced": true,
           "can_add_new_rows": true,
@@ -1438,6 +1636,29 @@
           ]
         }
       ]
+    },
+    {
+      "name": "wizard",
+      "label": "Setup Wizard",
+      "restart": false,
+      "hidden": true,
+      "settings": [
+        {
+          "name": "cloud_domain",
+          "type": "checkbox",
+          "default": false
+        },
+        {
+          "name": "steps_completed",
+          "type": "int",
+          "default": 0
+        },
+        {
+          "name": "completed_once",
+          "type": "checkbox",
+          "default": false
+        }
+      ]
     }
   ]
 }
diff --git a/domain-server/resources/web/assignment/placeholder.js b/domain-server/resources/web/assignment/placeholder.js
index 2c1d8253aa..bf64539bea 100644
--- a/domain-server/resources/web/assignment/placeholder.js
+++ b/domain-server/resources/web/assignment/placeholder.js
@@ -1,3 +1,3 @@
 // Here you can put a script that will be run by an assignment-client (AC)
-// For examples, please go to http://public.highfidelity.io/scripts
+// For examples, please go to https://github.com/highfidelity/hifi/tree/master/script-archive/acScripts
 // The directory named acScripts contains assignment-client specific scripts you can try.
diff --git a/domain-server/resources/web/content/index.shtml b/domain-server/resources/web/content/index.shtml
index e1ba5499b6..0e48c1eff8 100644
--- a/domain-server/resources/web/content/index.shtml
+++ b/domain-server/resources/web/content/index.shtml
@@ -19,12 +19,13 @@
               Upload an entities file (e.g.: models.json.gz) to replace the content of this domain.<br>
               Note: <strong>Your domain's content will be replaced by the content you upload</strong>, but the backup files of your domain's content will not immediately be changed.
             </p>
-            <p>
-              If your domain has any content that you would like to re-use at a later date, save a manual backup of your models.json.gz file, which is usually stored at the following paths:<br>
-              <pre>C:/Users/[username]/AppData/Roaming/High Fidelity/assignment-client/entities/models.json.gz</pre>
-              <pre>/Users/[username]/Library/Application Support/High Fidelity/assignment-client/entities/models.json.gz</pre>
-              <pre>/home/[username]/.local/share/High Fidelity/assignment-client/entities/models.json.gz</pre>
-            </p>
+            <p>If your domain has any content that you would like to re-use at a later date, save a manual backup of your models.json.gz file, which is usually stored at the following paths:</p>
+            <label class="control-label">Windows</label>
+            <pre>C:/Users/[username]/AppData/Roaming/High Fidelity/assignment-client/entities/models.json.gz</pre>
+            <label class="control-label">OSX</label>
+            <pre>/Users/[username]/Library/Application Support/High Fidelity/assignment-client/entities/models.json.gz</pre>
+            <label class="control-label">Linux</label>
+            <pre>/home/[username]/.local/share/High Fidelity/assignment-client/entities/models.json.gz</pre>
             <br>
             <input type="file" name="entities-file" class="form-control-file" accept=".json, .gz">
             <br>
diff --git a/domain-server/resources/web/css/style.css b/domain-server/resources/web/css/style.css
index 553f408e15..547b903b15 100644
--- a/domain-server/resources/web/css/style.css
+++ b/domain-server/resources/web/css/style.css
@@ -1,6 +1,7 @@
 body {
   position: relative;
   padding-bottom: 30px;
+  margin-top: 70px;
 }
 
 [hidden] {
@@ -27,14 +28,14 @@ body {
 .table .value-row td,
 .table .value-category td,
 .table .inputs td {
-    vertical-align: middle;
+  vertical-align: middle;
 }
 
 .table .table-checkbox {
-    /* Fix IE sizing checkboxes to fill table cell */
-    width: auto;
-    margin-left: auto;
-    margin-right: auto;
+  /* Fix IE sizing checkboxes to fill table cell */
+  width: auto;
+  margin-left: auto;
+  margin-right: auto;
 }
 
 .value-category:not(.inputs) {
@@ -80,8 +81,10 @@ span.port {
 }
 
 #setup-sidebar.affix {
-  position: fixed;
-  top: 15px;
+  /* This overrides a case where going to the bottom of the page,
+   * then scrolling up, causes `position: relative` to be added to the style
+   */
+  position: fixed !important;
 }
 
 #setup-sidebar button {
@@ -145,55 +148,55 @@ table {
 }
 
 caption {
-    color: #333;
-    font-weight: 700;
-    padding-top: 0;
+  color: #333;
+  font-weight: 700;
+  padding-top: 0;
 }
 
 table > tbody > .headers > td {
-    vertical-align: middle;
+  vertical-align: middle;
 }
 
 table .headers + .headers td {
-    font-size: 13px;
-    color: #222;
+  font-size: 13px;
+  color: #222;
 }
 
 #security table .headers td + td {
-    text-align: center;
+  text-align: center;
 }
 
 .tooltip.top .tooltip-arrow {
-    border-top-color: #fff;
-    border-width: 10px 10px 0;
-    margin-bottom: -5px;
+  border-top-color: #fff;
+  border-width: 10px 10px 0;
+  margin-bottom: -5px;
 }
 
 .tooltip-inner {
-    padding: 20px 20px 10px 20px;
-    font-size: 14px;
-    text-align: left;
-    color: #333;
-    background-color: #fff;
-    box-shadow: 0 3px 8px 8px #e8e8e8;
+  padding: 20px 20px 10px 20px;
+  font-size: 14px;
+  text-align: left;
+  color: #333;
+  background-color: #fff;
+  box-shadow: 0 3px 8px 8px #e8e8e8;
 }
 
 .tooltip.in {
-    opacity: 1;
+  opacity: 1;
 }
 
 .tooltip-inner ul {
-    padding-left: 0;
-    margin-bottom: 15px;
+  padding-left: 0;
+  margin-bottom: 15px;
 }
 
 .tooltip-inner li {
-    list-style-type: none;
-    margin-bottom: 5px;
+  list-style-type: none;
+  margin-bottom: 5px;
 }
 
 #security .tooltip-inner {
-    max-width: 520px;
+  max-width: 520px;
 }
 
 #xs-advanced-container {
@@ -241,6 +244,20 @@ table .headers + .headers td {
   animation-delay: -0.16s;
 }
 
+.col-centered {
+  float: none;
+  margin: 0 auto;
+}
+
+.centered-hack-parent {
+  text-align: center;
+}
+
+.centered-hack {
+  text-align: left;
+  display: inline-block;
+}
+
 @-webkit-keyframes bouncedelay {
   0%, 80%, 100% { -webkit-transform: scale(0.0) }
   40% { -webkit-transform: scale(1.0) }
@@ -255,3 +272,49 @@ table .headers + .headers td {
     -webkit-transform: scale(1.0);
   }
 }
+
+/* From https://gist.github.com/alexandrevicenzi/680147013e902a4eaa5d */
+.glyphicon-refresh-animate {
+  -animation: spin .7s infinite linear;
+  -ms-animation: spin .7s infinite linear;
+  -webkit-animation: spinw .7s infinite linear;
+  -moz-animation: spinm .7s infinite linear;
+}
+
+@keyframes spin {
+  from { transform: scale(1) rotate(0deg); }
+  to { transform: scale(1) rotate(360deg); }
+}
+
+@-webkit-keyframes spinw {
+  from { -webkit-transform: rotate(0deg); }
+  to { -webkit-transform: rotate(360deg); }
+}
+
+@-moz-keyframes spinm {
+  from { -moz-transform: rotate(0deg); }
+  to { -moz-transform: rotate(360deg); }
+}
+
+.warning-text {
+  padding-top: 10px;
+  color: #EB5757;
+}
+
+.account-connected-header {
+  color: #6FCF97;
+  font-size: 30px;
+  margin-right: 20px;
+}
+
+.blue-link {
+  font-size: 14px;
+  text-decoration-line: underline;
+  font-weight: normal;
+  color: #2F80ED;
+}
+
+#manage-cloud-domains-link {
+  text-align: center;
+  margin-top: 20px;
+}
diff --git a/domain-server/resources/web/favicon.ico b/domain-server/resources/web/favicon.ico
new file mode 100644
index 0000000000..becc1b8e8b
Binary files /dev/null and b/domain-server/resources/web/favicon.ico differ
diff --git a/domain-server/resources/web/header.html b/domain-server/resources/web/header.html
index a37e9a6ff0..1e32e9f02f 100644
--- a/domain-server/resources/web/header.html
+++ b/domain-server/resources/web/header.html
@@ -13,7 +13,7 @@
     <script src='/js/sweetalert.min.js'></script>
   </head>
   <body>
-    <nav class="navbar navbar-default" role="navigation">
+    <nav class="navbar navbar-default navbar-fixed-top" role="navigation">
       <div class="container-fluid">
         <!-- Brand and toggle get grouped for better mobile display -->
         <div class="navbar-header">
@@ -23,7 +23,6 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="/">domain-server</a>
         </div>
 
         <!-- Collect the nav links, forms, and other content for toggling -->
@@ -40,6 +39,7 @@
             <li><a href="/settings/">Settings</a></li>
           </ul>
           <ul class="nav navbar-right navbar-nav">
+            <li><a id="visit-domain-link" class="blue-link" target="_blank" style="display: none;">Visit domain in VR</a></li>
             <li><a href="#" id="restart-server"><span class="glyphicon glyphicon-refresh"></span> Restart</a></li>
           </ul>
         </div>
diff --git a/domain-server/resources/web/images/checkmark.svg b/domain-server/resources/web/images/checkmark.svg
new file mode 100644
index 0000000000..f4403921ee
--- /dev/null
+++ b/domain-server/resources/web/images/checkmark.svg
@@ -0,0 +1,25 @@
+<svg width="676" height="676" viewBox="0 0 676 676" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<title>CongratulationImage</title>
+<desc>Created using Figma</desc>
+<g id="Canvas" transform="matrix(4 0 0 4 -21208 -17980)">
+<g id="CongratulationImage">
+<g id="Ellipse">
+<use xlink:href="#path0_fill" transform="translate(5302 4495)" fill="#FFFFFF"/>
+<mask id="mask0_outline_ins">
+<use xlink:href="#path0_fill" fill="white" transform="translate(5302 4495)"/>
+</mask>
+<g mask="url(#mask0_outline_ins)">
+<use xlink:href="#path1_stroke_2x" transform="translate(5302 4495)" fill="#219653"/>
+</g>
+</g>
+<g id="Vector 2">
+<use xlink:href="#path2_stroke" transform="translate(5355 4559)" fill="#219653"/>
+</g>
+</g>
+</g>
+<defs>
+<path id="path0_fill" d="M 169 84.5C 169 131.168 131.168 169 84.5 169C 37.8319 169 0 131.168 0 84.5C 0 37.8319 37.8319 0 84.5 0C 131.168 0 169 37.8319 169 84.5Z"/>
+<path id="path1_stroke_2x" d="M 154 84.5C 154 122.884 122.884 154 84.5 154L 84.5 184C 139.452 184 184 139.452 184 84.5L 154 84.5ZM 84.5 154C 46.1162 154 15 122.884 15 84.5L -15 84.5C -15 139.452 29.5477 184 84.5 184L 84.5 154ZM 15 84.5C 15 46.1162 46.1162 15 84.5 15L 84.5 -15C 29.5477 -15 -15 29.5477 -15 84.5L 15 84.5ZM 84.5 15C 122.884 15 154 46.1162 154 84.5L 184 84.5C 184 29.5477 139.452 -15 84.5 -15L 84.5 15Z"/>
+<path id="path2_stroke" d="M 5.18747 19.8031C 2.19593 16.9382 -2.5517 17.0408 -5.41666 20.0323C -8.28162 23.0238 -8.17901 27.7715 -5.18747 30.6364L 5.18747 19.8031ZM 20.6541 45L 15.4667 50.4167C 18.3816 53.2083 22.9831 53.1924 25.8787 50.3809L 20.6541 45ZM 72.2246 5.38085C 75.1964 2.49539 75.2663 -2.25283 72.3809 -5.2246C 69.4954 -8.19636 64.7472 -8.26632 61.7754 -5.38085L 72.2246 5.38085ZM -5.18747 30.6364L 15.4667 50.4167L 25.8416 39.5833L 5.18747 19.8031L -5.18747 30.6364ZM 25.8787 50.3809L 72.2246 5.38085L 61.7754 -5.38085L 15.4295 39.6191L 25.8787 50.3809Z"/>
+</defs>
+</svg>
diff --git a/domain-server/resources/web/js/domain-server.js b/domain-server/resources/web/js/domain-server.js
index 1577d6f4c6..ad1509b038 100644
--- a/domain-server/resources/web/js/domain-server.js
+++ b/domain-server/resources/web/js/domain-server.js
@@ -32,7 +32,6 @@ $(document).ready(function(){
   $('ul.nav a').filter(function() {
       return this.href == url;
   }).parent().addClass('active');  
-
   $('body').on('click', '#restart-server', function(e) {    
     swal( {
       title: "Are you sure?",
@@ -46,4 +45,4 @@ $(document).ready(function(){
     });
     return false;
   });
-});
\ No newline at end of file
+});
diff --git a/domain-server/resources/web/settings/js/sha256.js b/domain-server/resources/web/js/sha256.js
similarity index 100%
rename from domain-server/resources/web/settings/js/sha256.js
rename to domain-server/resources/web/js/sha256.js
diff --git a/domain-server/resources/web/js/shared.js b/domain-server/resources/web/js/shared.js
new file mode 100644
index 0000000000..66159209ea
--- /dev/null
+++ b/domain-server/resources/web/js/shared.js
@@ -0,0 +1,462 @@
+var Settings = {
+  showAdvanced: false,
+  ADVANCED_CLASS: 'advanced-setting',
+  DEPRECATED_CLASS: 'deprecated-setting',
+  TRIGGER_CHANGE_CLASS: 'trigger-change',
+  DATA_ROW_CLASS: 'value-row',
+  DATA_COL_CLASS: 'value-col',
+  DATA_CATEGORY_CLASS: 'value-category',
+  ADD_ROW_BUTTON_CLASS: 'add-row',
+  ADD_ROW_SPAN_CLASSES: 'glyphicon glyphicon-plus add-row',
+  DEL_ROW_BUTTON_CLASS: 'del-row',
+  DEL_ROW_SPAN_CLASSES: 'glyphicon glyphicon-remove del-row',
+  ADD_CATEGORY_BUTTON_CLASS: 'add-category',
+  ADD_CATEGORY_SPAN_CLASSES: 'glyphicon glyphicon-plus add-category',
+  TOGGLE_CATEGORY_COLUMN_CLASS: 'toggle-category',
+  TOGGLE_CATEGORY_SPAN_CLASS: 'toggle-category-icon',
+  TOGGLE_CATEGORY_SPAN_CLASSES: 'glyphicon toggle-category-icon',
+  TOGGLE_CATEGORY_EXPANDED_CLASS: 'glyphicon-triangle-bottom',
+  TOGGLE_CATEGORY_CONTRACTED_CLASS: 'glyphicon-triangle-right',
+  DEL_CATEGORY_BUTTON_CLASS: 'del-category',
+  DEL_CATEGORY_SPAN_CLASSES: 'glyphicon glyphicon-remove del-category',
+  MOVE_UP_BUTTON_CLASS: 'move-up',
+  MOVE_UP_SPAN_CLASSES: 'glyphicon glyphicon-chevron-up move-up',
+  MOVE_DOWN_BUTTON_CLASS: 'move-down',
+  MOVE_DOWN_SPAN_CLASSES: 'glyphicon glyphicon-chevron-down move-down',
+  TABLE_BUTTONS_CLASS: 'buttons',
+  ADD_DEL_BUTTONS_CLASS: 'add-del-buttons',
+  ADD_DEL_BUTTONS_CLASSES: 'buttons add-del-buttons',
+  REORDER_BUTTONS_CLASS: 'reorder-buttons',
+  REORDER_BUTTONS_CLASSES: 'buttons reorder-buttons',
+  NEW_ROW_CLASS: 'new-row',
+  CONNECT_ACCOUNT_BTN_ID: 'connect-account-btn',
+  DISCONNECT_ACCOUNT_BTN_ID: 'disconnect-account-btn',
+  CREATE_DOMAIN_ID_BTN_ID: 'create-domain-btn',
+  CHOOSE_DOMAIN_ID_BTN_ID: 'choose-domain-btn',
+  GET_TEMPORARY_NAME_BTN_ID: 'get-temp-name-btn',
+  DOMAIN_ID_SELECTOR: '[name="metaverse.id"]',
+  ACCESS_TOKEN_SELECTOR: '[name="metaverse.access_token"]',
+  PLACES_TABLE_ID: 'places-table',
+  ADD_PLACE_BTN_ID: 'add-place-btn',
+  FORM_ID: 'settings-form',
+  INVALID_ROW_CLASS: 'invalid-input',
+  DATA_ROW_INDEX: 'data-row-index'
+};
+
+var URLs = {
+  // STABLE METAVERSE_URL: https://metaverse.highfidelity.com
+  // STAGING METAVERSE_URL: https://staging.highfidelity.com
+  METAVERSE_URL: 'https://metaverse.highfidelity.com',
+  PLACE_URL: 'https://hifi.place',
+};
+
+var Strings = {
+  LOADING_SETTINGS_ERROR: "There was a problem loading the domain settings.\nPlease refresh the page to try again.",
+
+  CHOOSE_DOMAIN_BUTTON: "Choose from my domains",
+  CREATE_DOMAIN_BUTTON: "Create new domain ID",
+  CREATE_DOMAIN_SUCCESS_JUST_CONNECTED: "We connnected your High Fidelity account and created a new domain ID for this machine.",
+  CREATE_DOMAIN_SUCCESS: "We created a new domain ID for this machine.",
+
+  // When a place modification fails, they will be brought back to the previous
+  // dialog with new path still set, allowing them to retry immediately, and without
+  // having to type the new path in again.
+  EDIT_PLACE_TITLE: "Modify Viewpoint or Path",
+  EDIT_PLACE_ERROR: "Failed to update place path. Please try again.",
+  EDIT_PLACE_CONFIRM_BUTTON: "Save",
+  EDIT_PLACE_CONFIRM_BUTTON_PENDING: "Saving...",
+  EDIT_PLACE_CANCEL_BUTTON: "Cancel",
+
+  REMOVE_PLACE_TITLE: "Are you sure you want to remove <strong>{{place}}</strong>?",
+  REMOVE_PLACE_ERROR: "Failed to remove place. Please try again.",
+  REMOVE_PLACE_DELETE_BUTTON: "Delete",
+  REMOVE_PLACE_DELETE_BUTTON_PENDING: "Deleting...",
+  REMOVE_PLACE_CANCEL_BUTTON: "Cancel",
+
+  ADD_PLACE_TITLE: "Choose a place",
+  ADD_PLACE_MESSAGE: "Choose the High Fidelity place to point at this domain server.",
+  ADD_PLACE_CONFIRM_BUTTON: "Choose place",
+  ADD_PLACE_CONFIRM_BUTTON_PENDING: "Saving...",
+  ADD_PLACE_CANCEL_BUTTON: "Cancel",
+  ADD_PLACE_UNKNOWN_ERROR: "There was an error adding this place name.",
+
+  ADD_PLACE_NO_PLACES_MESSAGE: "<p>You do not have any places in your High Fidelity account."
+      + "<br/><br/>Go to your <a href='https://metaverse.highfidelity.com/user/places/new'>places page</a> to create a new one. Once your place is created re-open this dialog to select it.</p>",
+  ADD_PLACE_NO_PLACES_BUTTON: "Create new place",
+  ADD_PLACE_UNABLE_TO_LOAD_ERROR: "We were unable to load your place names. Please try again later.",
+  ADD_PLACE_LOADING_DIALOG: "Loading your places...",
+
+  ADD_PLACE_NOT_CONNECTED_TITLE: "Access token required",
+  ADD_PLACE_NOT_CONNECTED_MESSAGE: "You must have an access token to query your High Fidelity places.<br><br>Please follow the instructions on the settings page to add an access token.",
+};
+
+var DOMAIN_ID_TYPE_NONE = 0;
+var DOMAIN_ID_TYPE_TEMP = 1;
+var DOMAIN_ID_TYPE_FULL = 2;
+var DOMAIN_ID_TYPE_UNKNOWN = 3;
+
+function domainIDIsSet() {
+  return Settings.data.values.metaverse.id.length > 0;
+}
+
+function getCurrentDomainIDType() {
+  if (!domainIDIsSet()) {
+    return DOMAIN_ID_TYPE_NONE;
+  }
+  if (typeof DomainInfo === 'undefined') {
+    return DOMAIN_ID_TYPE_UNKNOWN;
+  }
+  if (DomainInfo !== null) {
+    if (DomainInfo.name !== undefined) {
+      return DOMAIN_ID_TYPE_TEMP;
+    }
+    return DOMAIN_ID_TYPE_FULL;
+  }
+  return DOMAIN_ID_TYPE_UNKNOWN;
+}
+
+function showLoadingDialog(msg) {
+  var message = '<div class="text-center">';
+  message += '<span class="glyphicon glyphicon-refresh glyphicon-refresh-animate"></span> ' + msg;
+  message += '</div>';
+
+  return bootbox.dialog({
+    message: message,
+    closeButton: false
+  });
+}
+
+function sendUpdatePlaceRequest(id, path, domainID, clearDomainID, onSuccess, onError) {
+  var data = {
+    place_id: id,
+    path: path
+  };
+  if (domainID) {
+    data.domain_id = domainID;
+  }
+  if (clearDomainID) {
+    data.domain_id = null;
+  }
+  $.ajax({
+    url: '/api/places',
+    type: 'PUT',
+    data: data,
+    success: onSuccess,
+    error: onError
+  });
+}
+
+var pendingDomainRequest = null;
+function getDomainFromAPI(callback) {
+  if (pendingDomainRequest !== null) {
+    pendingDomainRequest.success(callback);
+    pendingDomainRequest.error(function() { callback({ status: 'fail' }) });
+    return pendingDomainRequest;
+  }
+
+  if (callback === undefined) {
+    callback = function() {};
+  }
+
+  var domainID = Settings.data.values.metaverse.id;
+  if (domainID === null || domainID === undefined || domainID === '') {
+    callback({ status: 'fail' });
+    return null;
+  }
+
+  pendingDomainRequest = $.ajax({
+    url: "/api/domains/" + domainID,
+    dataType: 'json',
+    success: function(data) {
+      pendingDomainRequest = null;
+
+      if (data.status === 'success') {
+        DomainInfo = data.domain;
+      } else {
+        DomainInfo = null;
+      }
+      callback(data);
+    },
+    error: function() {
+      pendingDomainRequest = null;
+
+      DomainInfo = null;
+      callback({ status: 'fail' });
+    }
+  });
+
+  return pendingDomainRequest;
+}
+
+function chooseFromHighFidelityPlaces(accessToken, forcePathTo, onSuccessfullyAdded) {
+  if (accessToken) {
+
+    var loadingDialog = showLoadingDialog(Strings.ADD_PLACE_LOADING_DIALOG);
+
+    function loadPlaces() {
+      $.ajax("/api/places", {
+        dataType: 'json',
+        jsonp: false,
+        success: function(data) {
+          if (data.status == 'success') {
+            var modal_buttons = {
+              cancel: {
+                label: Strings.ADD_PLACE_CANCEL_BUTTON,
+                className: 'add-place-cancel-button btn-default'
+              }
+            };
+
+            var dialog;
+            var modal_body;
+
+            if (data.data.places.length) {
+              var places_by_id = {};
+
+              modal_body = $('<div>');
+
+              modal_body.append($("<p>Choose a place name that you own or <a href='" + URLs.METAVERSE_URL + "/user/places' target='_blank'>register a new place name</a></p>"));
+
+              var currentDomainIDType = getCurrentDomainIDType();
+              if (currentDomainIDType === DOMAIN_ID_TYPE_TEMP) {
+                var warning = "<div class='domain-loading-error alert alert-warning'>";
+                warning += "If you choose a place name it will replace your current temporary place name.";
+                warning += "</div>";
+                modal_body.append(warning);
+              }
+
+              // setup a select box for the returned places
+              modal_body.append($("<label for='place-name-select'>Places</label>"));
+              place_select = $("<select id='place-name-select' class='form-control'></select>");
+              _.each(data.data.places, function(place) {
+                places_by_id[place.id] = place;
+                place_select.append("<option value='" + place.id + "'>" + place.name + "</option>");
+              })
+              modal_body.append(place_select);
+              modal_body.append($("<p id='place-name-warning' class='warning-text' style='display: none'>This place name already points to a place or path. Saving this would overwrite the previous settings associated with it.</p>"));
+
+              if (forcePathTo === undefined || forcePathTo === null) {
+                var path = "<div class='form-group'>";
+                path += "<label for='place-path-input' class='control-label'>Path</label>";
+                path += "<input type='text' id='place-path-input' class='form-control' value='/'>";
+                path += "</div>";
+                modal_body.append($(path));
+              }
+
+              var place_select = modal_body.find("#place-name-select")
+              place_select.change(function(ev) {
+                var warning = modal_body.find("#place-name-warning");
+                var place = places_by_id[$(this).val()];
+                if (place === undefined || place.pointee === null) {
+                  warning.hide();
+                } else {
+                  warning.show();
+                }
+              });
+              place_select.trigger('change');
+
+              modal_buttons["success"] = {
+                label: Strings.ADD_PLACE_CONFIRM_BUTTON,
+                className: 'add-place-confirm-button btn btn-primary',
+                callback: function() {
+                  var placeID = $('#place-name-select').val();
+                  // set the place ID on the form
+                  $(Settings.place_ID_SELECTOR).val(placeID).change();
+
+                  if (forcePathTo === undefined || forcePathTo === null) {
+                    var placePath = $('#place-path-input').val();
+                  } else {
+                    var placePath = forcePathTo;
+                  }
+
+                  $('.add-place-confirm-button').attr('disabled', 'disabled');
+                  $('.add-place-confirm-button').html(Strings.ADD_PLACE_CONFIRM_BUTTON_PENDING);
+                  $('.add-place-cancel-button').attr('disabled', 'disabled');
+
+                  function finalizeSaveDomainID(domainID) {
+                    var jsonSettings = {
+                      metaverse: {
+                        id: domainID
+                      }
+                    }
+                    var dialog = showLoadingDialog("Waiting for Domain Server to restart...");
+                    $.ajax('/settings.json', {
+                      data: JSON.stringify(jsonSettings),
+                      contentType: 'application/json',
+                      type: 'POST'
+                    }).done(function(data) {
+                      if (data.status == "success") {
+                        waitForDomainServerRestart(function() {
+                          dialog.modal('hide');
+                          if (onSuccessfullyAdded) {
+                            onSuccessfullyAdded(places_by_id[placeID].name, domainID);
+                          }
+                        });
+                      } else {
+                        bootbox.alert("Failed to add place");
+                      }
+                    }).fail(function() {
+                      bootbox.alert("Failed to add place");
+                    });
+                  }
+
+                  // If domainID is not specified, the current domain id will be used.
+                  function finishSettingUpPlace(domainID) {
+                    sendUpdatePlaceRequest(
+                      placeID,
+                      placePath,
+                      domainID,
+                      false,
+                      function(data) {
+                        dialog.modal('hide')
+                        if (domainID) {
+                          $(Settings.DOMAIN_ID_SELECTOR).val(domainID).change();
+                          finalizeSaveDomainID(domainID);
+                        } else {
+                          if (onSuccessfullyAdded) {
+                            onSuccessfullyAdded(places_by_id[placeID].name);
+                          }
+                        }
+                      },
+                      function(data) {
+                        $('.add-place-confirm-button').removeAttr('disabled');
+                        $('.add-place-confirm-button').html(Strings.ADD_PLACE_CONFIRM_BUTTON);
+                        $('.add-place-cancel-button').removeAttr('disabled');
+                        bootbox.alert(Strings.ADD_PLACE_UNKNOWN_ERROR);
+                      }
+                    );
+                  }
+
+                  function maybeCreateNewDomainID() {
+                    console.log("Maybe creating domain id", currentDomainIDType)
+                    if (currentDomainIDType === DOMAIN_ID_TYPE_FULL) {
+                      finishSettingUpPlace();
+                    } else {
+                      sendCreateDomainRequest(function(domainID) {
+                        console.log("Created domain", domainID);
+                        finishSettingUpPlace(domainID);
+                      }, function() {
+                        $('.add-place-confirm-button').removeAttr('disabled');
+                        $('.add-place-confirm-button').html(Strings.ADD_PLACE_CONFIRM_BUTTON);
+                        $('.add-place-cancel-button').removeAttr('disabled');
+                        bootbox.alert(Strings.ADD_PLACE_UNKNOWN_ERROR);
+                        bootbox.alert("FAIL");
+                      });
+                    }
+                  }
+
+                  maybeCreateNewDomainID();
+
+                  return false;
+                }
+              }
+            } else {
+              modal_buttons["success"] = {
+                label: Strings.ADD_PLACE_NO_PLACES_BUTTON,
+                callback: function() {
+                  window.open(URLs.METAVERSE_URL + "/user/places", '_blank');
+                }
+              }
+              modal_body = Strings.ADD_PLACE_NO_PLACES_MESSAGE;
+            }
+
+            dialog = bootbox.dialog({
+              title: Strings.ADD_PLACE_TITLE,
+              message: modal_body,
+              closeButton: false,
+              buttons: modal_buttons
+            });
+          } else {
+            bootbox.alert(Strings.ADD_PLACE_UNABLE_TO_LOAD_ERROR);
+          }
+        },
+        error: function() {
+          bootbox.alert(Strings.ADD_PLACE_UNABLE_TO_LOAD_ERROR);
+        },
+        complete: function() {
+          loadingDialog.modal('hide');
+        }
+      });
+    }
+
+    var domainType = getCurrentDomainIDType();
+    if (domainType !== DOMAIN_ID_TYPE_UNKNOWN) {
+      loadPlaces();
+    } else {
+      getDomainFromAPI(function(data) {
+        if (data.status === 'success') {
+          var domainType = getCurrentDomainIDType();
+          loadPlaces();
+        } else {
+          loadingDialog.modal('hide');
+          bootbox.confirm("We were not able to load your domain information from the Metaverse. Would you like to retry?", function(response) {
+            if (response) {
+              chooseFromHighFidelityPlaces(accessToken, forcePathTo, onSuccessfullyAdded);
+            }
+          });
+        }
+      })
+    }
+
+  } else {
+    bootbox.alert({
+      title: Strings.ADD_PLACE_NOT_CONNECTED_TITLE,
+      message: Strings.ADD_PLACE_NOT_CONNECTED_MESSAGE
+    })
+  }
+}
+
+function sendCreateDomainRequest(onSuccess, onError) {
+  $.ajax({
+    url: '/api/domains',
+    dataType: 'json',
+    type: 'POST',
+    data: { label: "" },
+    success: function(data) {
+      onSuccess(data.domain.id);
+    },
+    error: onError
+  });
+}
+
+function waitForDomainServerRestart(callback) {
+  function checkForDomainUp() {
+    $.ajax('', {
+      success: function() {
+        callback();
+      },
+      error: function() {
+        setTimeout(checkForDomainUp, 50);
+      }
+    });
+  }
+
+  setTimeout(checkForDomainUp, 10);
+
+}
+
+function prepareAccessTokenPrompt(callback) {
+  swal({
+    title: "Connect Account",
+    type: "input",
+    text: "Paste your created access token here." +
+      "</br></br>If you did not successfully create an access token click cancel below and attempt to connect your account again.</br></br>",
+    showCancelButton: true,
+    closeOnConfirm: false,
+    html: true
+  }, function(inputValue){
+    if (inputValue === false) {
+      return false;
+    }
+
+    if (inputValue === "") {
+      swal.showInputError("Please paste your access token in the input field.")
+      return false
+    }
+
+    if (callback) {
+      callback(inputValue);
+    }
+
+    swal.close();
+  });
+}
diff --git a/domain-server/resources/web/js/tables.js b/domain-server/resources/web/js/tables.js
index 09f85a7047..600e5a5f8e 100644
--- a/domain-server/resources/web/js/tables.js
+++ b/domain-server/resources/web/js/tables.js
@@ -2,11 +2,11 @@ $(document).ready(function(){
   // setup the underscore templates
   var nodeTemplate = _.template($('#nodes-template').html());
   var queuedTemplate = _.template($('#queued-template').html());
-  
+
   // setup a function to grab the assignments
   function getNodesAndAssignments() {
     $.getJSON("nodes.json", function(json){
-      
+
       json.nodes.sort(function(a, b){
           if (a.type === b.type) {
             if (a.uptime < b.uptime) {
@@ -16,36 +16,50 @@ $(document).ready(function(){
             } else {
               return 0;
             }
-          } 
-              
+          }
+
           if (a.type === "agent" && b.type !== "agent") {
             return 1;
           } else if (b.type === "agent" && a.type !== "agent") {
             return -1;
           }
-          
+
           if (a.type > b.type) {
             return 1;
           }
-          
+
           if (a.type < b.type) {
             return -1;
-          }   
+          }
       });
-      
+
       $('#nodes-table tbody').html(nodeTemplate(json));
+    }).fail(function(jqXHR, textStatus, errorThrown) {
+      // we assume a 401 means the DS has restarted
+      // and no longer has our OAuth produced uuid
+      // so just reload and re-auth
+      if (jqXHR.status == 401) {
+        location.reload();
+      }
     });
-    
-    $.getJSON("assignments.json", function(json){      
+
+    $.getJSON("assignments.json", function(json){
       $('#assignments-table tbody').html(queuedTemplate(json));
+    }).fail(function(jqXHR, textStatus, errorThrown) {
+      // we assume a 401 means the DS has restarted
+      // and no longer has our OAuth produced uuid
+      // so just reload and re-auth
+      if (jqXHR.status == 401) {
+        location.reload();
+      }
     });
   }
-  
+
   // do the first GET on page load
   getNodesAndAssignments();
   // grab the new assignments JSON every two seconds
   var getNodesAndAssignmentsInterval = setInterval(getNodesAndAssignments, 2000);
-  
+
   // hook the node delete to the X button
   $(document.body).on('click', '.glyphicon-remove', function(){
     // fire off a delete for this node
@@ -57,10 +71,10 @@ $(document).ready(function(){
         }
     });
   });
-  
+
   $(document.body).on('click', '#kill-all-btn', function() {
     var confirmed_kill = confirm("Are you sure?");
-    
+
     if (confirmed_kill == true) {
       $.ajax({
         url: "/nodes/",
diff --git a/domain-server/resources/web/settings/index.shtml b/domain-server/resources/web/settings/index.shtml
index b74c3591f0..5a8184db30 100644
--- a/domain-server/resources/web/settings/index.shtml
+++ b/domain-server/resources/web/settings/index.shtml
@@ -9,16 +9,18 @@
 
   <div class="row">
     <div class="col-md-3 col-sm-3" id="setup-sidebar-col">
-      <div id="setup-sidebar" class="hidden-xs" data-spy="affix" data-offset-top="55" data-clampedwidth="#setup-sidebar-col">
+      <div id="setup-sidebar" data-clampedwidth="#setup-sidebar-col">
         <script id="list-group-template" type="text/template">
           <% _.each(descriptions, function(group){ %>
-            <% panelID = group.name ? group.name : group.html_id %>
-            <li>
-              <a href="#<%- panelID %>" class="list-group-item">
-                <span class="badge"></span>
-                <%- group.label %>
-              </a>
-            </li>
+            <% if (!group.hidden) { %>
+              <% panelID = group.name ? group.name : group.html_id %>
+              <li>
+                <a href="#<%- panelID %>" class="list-group-item">
+                  <span class="badge"></span>
+                  <%- group.label %>
+                </a>
+              </li>
+            <% } %>
           <% }); %>
         </script>
 
@@ -26,49 +28,63 @@
         </ul>
 
         <button id="advanced-toggle-button" class="btn btn-info advanced-toggle">Show advanced</button>
-        <button class="btn btn-success save-button">Save</button>
+        <button class="btn btn-success save-button" disabled>Save</button>
+        <div id="manage-cloud-domains-link" style="display: none;">
+          <a href="https://highfidelity.com/user/cloud_domains" target="_blank" class="blue-link">Manage Cloud Hosted Domains</a>
+        </div>
       </div>
     </div>
 
     <div class="col-md-9 col-sm-9 col-xs-12">
+
       <div id="xs-advanced-container" class="col-xs-12 hidden-sm hidden-md hidden-lg">
         <button id="advanced-toggle-button-xs" class="btn btn-info advanced-toggle">Show advanced</button>
       </div>
 
       <div class="col-xs-12">
+
+        <div id="cloud-domains-alert" class="alert alert-info alert-dismissible" role="alert" style="display: none;">
+          <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+          <span class="alert-link">
+            <a href="https://highfidelity.com/user/cloud_domains" target="_blank" class="blue-link">Visit Cloud Hosted Domains</a> to manage all your cloud domains
+          </span>
+        </div>
+
         <form id="settings-form" role="form">
 
         <script id="panels-template" type="text/template">
           <% _.each(descriptions, function(group){ %>
-            <% var settings = _.partition(group.settings, function(value, index) { return !value.deprecated })[0] %>
-            <% split_settings = _.partition(settings, function(value, index) { return !value.advanced }) %>
-            <% isAdvanced = _.isEmpty(split_settings[0]) %>
-            <% if (isAdvanced) { %>
-              <% $("a[href=#" + group.name + "]").addClass('advanced-setting').hide() %>
-            <% } %>
+            <% if (!group.hidden) { %>
+              <% var settings = _.partition(group.settings, function(value, index) { return !value.deprecated })[0] %>
+              <% split_settings = _.partition(settings, function(value, index) { return !value.advanced }) %>
+              <% isAdvanced = _.isEmpty(split_settings[0]) && !_.isEmpty(split_settings[1]) %>
+              <% if (isAdvanced) { %>
+                <% $("a[href=#" + group.name + "]").addClass('advanced-setting').hide() %>
+              <% } %>
 
-            <% isGrouped = !!group.name %>
-            <% panelID = isGrouped ? group.name : group.html_id %>
+              <% isGrouped = !!group.name %>
+              <% panelID = isGrouped ? group.name : group.html_id %>
 
-            <div class="panel panel-default<%- (isAdvanced) ? ' advanced-setting' : '' %><%- (isGrouped) ? ' grouped' : '' %>"
-                 id="<%- panelID %>">
-              <div class="panel-heading">
-                <h3 class="panel-title"><%- group.label %></h3>
-              </div>
-              <div class="panel-body">
-                <% _.each(split_settings[0], function(setting) { %>
-                  <% keypath = isGrouped ? group.name + "." + setting.name : setting.name %>
-                  <%= getFormGroup(keypath, setting, values, false) %>
-                <% }); %>
-                <% if (!_.isEmpty(split_settings[1])) { %>
-                  <% $("#advanced-toggle-button").show() %>
-                  <% _.each(split_settings[1], function(setting) { %>
+              <div class="panel panel-default<%- (isAdvanced) ? ' advanced-setting' : '' %><%- (isGrouped) ? ' grouped' : '' %>"
+                   id="<%- panelID %>">
+                <div class="panel-heading">
+                  <h3 class="panel-title"><%- group.label %></h3>
+                </div>
+                <div class="panel-body">
+                  <% _.each(split_settings[0], function(setting) { %>
                     <% keypath = isGrouped ? group.name + "." + setting.name : setting.name %>
-                    <%= getFormGroup(keypath, setting, values, true) %>
+                    <%= getFormGroup(keypath, setting, values, false) %>
                   <% }); %>
-                <% }%>
+                  <% if (!_.isEmpty(split_settings[1])) { %>
+                    <% $("#advanced-toggle-button").show() %>
+                    <% _.each(split_settings[1], function(setting) { %>
+                      <% keypath = isGrouped ? group.name + "." + setting.name : setting.name %>
+                      <%= getFormGroup(keypath, setting, values, true) %>
+                    <% }); %>
+                  <% }%>
+                </div>
               </div>
-            </div>
+            <% } %>
           <% }); %>
         </script>
         <div id="panels"></div>
@@ -85,8 +101,9 @@
 <script src='/js/underscore-min.js'></script>
 <script src='/js/underscore-keypath.min.js'></script>
 <script src='/js/bootbox.min.js'></script>
-<script src='js/bootstrap-switch.min.js'></script>
-<script src='js/settings.js'></script>
+<script src='/js/sha256.js'></script>
 <script src='js/form2js.min.js'></script>
-<script src='js/sha256.js'></script>
+<script src='js/bootstrap-switch.min.js'></script>
+<script src='/js/shared.js'></script>
+<script src='js/settings.js'></script>
 <!--#include virtual="page-end.html"-->
diff --git a/domain-server/resources/web/settings/js/settings.js b/domain-server/resources/web/settings/js/settings.js
index 14347b6be1..7f99b367a3 100644
--- a/domain-server/resources/web/settings/js/settings.js
+++ b/domain-server/resources/web/settings/js/settings.js
@@ -1,47 +1,4 @@
-var Settings = {
-  showAdvanced: false,
-  METAVERSE_URL: 'https://metaverse.highfidelity.com',
-  ADVANCED_CLASS: 'advanced-setting',
-  DEPRECATED_CLASS: 'deprecated-setting',
-  TRIGGER_CHANGE_CLASS: 'trigger-change',
-  DATA_ROW_CLASS: 'value-row',
-  DATA_COL_CLASS: 'value-col',
-  DATA_CATEGORY_CLASS: 'value-category',
-  ADD_ROW_BUTTON_CLASS: 'add-row',
-  ADD_ROW_SPAN_CLASSES: 'glyphicon glyphicon-plus add-row',
-  DEL_ROW_BUTTON_CLASS: 'del-row',
-  DEL_ROW_SPAN_CLASSES: 'glyphicon glyphicon-remove del-row',
-  ADD_CATEGORY_BUTTON_CLASS: 'add-category',
-  ADD_CATEGORY_SPAN_CLASSES: 'glyphicon glyphicon-plus add-category',
-  TOGGLE_CATEGORY_COLUMN_CLASS: 'toggle-category',
-  TOGGLE_CATEGORY_SPAN_CLASS: 'toggle-category-icon',
-  TOGGLE_CATEGORY_SPAN_CLASSES: 'glyphicon toggle-category-icon',
-  TOGGLE_CATEGORY_EXPANDED_CLASS: 'glyphicon-triangle-bottom',
-  TOGGLE_CATEGORY_CONTRACTED_CLASS: 'glyphicon-triangle-right',
-  DEL_CATEGORY_BUTTON_CLASS: 'del-category',
-  DEL_CATEGORY_SPAN_CLASSES: 'glyphicon glyphicon-remove del-category',
-  MOVE_UP_BUTTON_CLASS: 'move-up',
-  MOVE_UP_SPAN_CLASSES: 'glyphicon glyphicon-chevron-up move-up',
-  MOVE_DOWN_BUTTON_CLASS: 'move-down',
-  MOVE_DOWN_SPAN_CLASSES: 'glyphicon glyphicon-chevron-down move-down',
-  TABLE_BUTTONS_CLASS: 'buttons',
-  ADD_DEL_BUTTONS_CLASS: 'add-del-buttons',
-  ADD_DEL_BUTTONS_CLASSES: 'buttons add-del-buttons',
-  REORDER_BUTTONS_CLASS: 'reorder-buttons',
-  REORDER_BUTTONS_CLASSES: 'buttons reorder-buttons',
-  NEW_ROW_CLASS: 'new-row',
-  CONNECT_ACCOUNT_BTN_ID: 'connect-account-btn',
-  DISCONNECT_ACCOUNT_BTN_ID: 'disconnect-account-btn',
-  CREATE_DOMAIN_ID_BTN_ID: 'create-domain-btn',
-  CHOOSE_DOMAIN_ID_BTN_ID: 'choose-domain-btn',
-  GET_TEMPORARY_NAME_BTN_ID: 'get-temp-name-btn',
-  DOMAIN_ID_SELECTOR: '[name="metaverse.id"]',
-  ACCESS_TOKEN_SELECTOR: '[name="metaverse.access_token"]',
-  PLACES_TABLE_ID: 'places-table',
-  FORM_ID: 'settings-form',
-  INVALID_ROW_CLASS: 'invalid-input',
-  DATA_ROW_INDEX: 'data-row-index'
-};
+var DomainInfo = null;
 
 var viewHelpers = {
   getFormGroup: function(keypath, setting, values, isAdvanced) {
@@ -94,11 +51,10 @@ var viewHelpers = {
       } else {
         if (input_type === 'select') {
           form_group += "<select class='form-control' data-hidden-input='" + keypath + "'>'"
-
           _.each(setting.options, function(option) {
             form_group += "<option value='" + option.value + "'" +
             (option.value == setting_value ? 'selected' : '') + ">" + option.label + "</option>"
-          })
+          });
 
           form_group += "</select>"
 
@@ -141,11 +97,12 @@ var qs = (function(a) {
     var b = {};
     for (var i = 0; i < a.length; ++i)
     {
-        var p=a[i].split('=', 2);
-        if (p.length == 1)
-            b[p[0]] = "";
-        else
-            b[p[0]] = decodeURIComponent(p[1].replace(/\+/g, " "));
+      var p=a[i].split('=', 2);
+      if (p.length == 1) {
+        b[p[0]] = "";
+      } else {
+        b[p[0]] = decodeURIComponent(p[1].replace(/\+/g, " "));
+      }
     }
     return b;
 })(window.location.search.substr(1).split('&'));
@@ -159,6 +116,10 @@ $(document).ready(function(){
   * Author: LV
   */
 
+  $.ajaxSetup({
+    timeout: 20000,
+  });
+
   $('[data-clampedwidth]').each(function () {
     var elem = $(this);
     var parentPanel = elem.data('clampedwidth');
@@ -327,7 +288,11 @@ $(document).ready(function(){
 
   $('#' + Settings.FORM_ID).on('click', '#' + Settings.CONNECT_ACCOUNT_BTN_ID, function(e){
     $(this).blur();
-    prepareAccessTokenPrompt();
+    prepareAccessTokenPrompt(function(accessToken) {
+      // we have an access token - set the access token input with this and save settings
+      $(Settings.ACCESS_TOKEN_SELECTOR).val(accessToken).change();
+      saveSettings();
+    });
   });
 
   var panelsSource = $('#panels-template').html()
@@ -336,7 +301,14 @@ $(document).ready(function(){
   var sidebarTemplate = $('#list-group-template').html()
   Settings.sidebarTemplate = _.template(sidebarTemplate)
 
-  // $('body').scrollspy({ target: '#setup-sidebar'})
+  var navbarHeight = $('.navbar').outerHeight(true);
+
+  $('#setup-sidebar').affix({
+    offset: {
+      top: 1,
+      bottom: navbarHeight
+    }
+  });
 
   reloadSettings(function(success){
     if (success) {
@@ -345,12 +317,39 @@ $(document).ready(function(){
       swal({
         title: '',
         type: 'error',
-        text: "There was a problem loading the domain settings.\nPlease refresh the page to try again.",
+        text: Strings.LOADING_SETTINGS_ERROR
       });
     }
+    $('body').scrollspy({
+      target: '#setup-sidebar',
+      offset: navbarHeight
+    });
   });
 });
 
+function getShareName(callback) {
+  getDomainFromAPI(function(data){
+    // check if we have owner_places (for a real domain) or a name (for a temporary domain)
+    if (data && data.status == "success") {
+      var shareName;
+      if (data.domain.default_place_name) {
+        shareName = data.domain.default_place_name;
+      } else if (data.domain.name) {
+        shareName = data.domain.name;
+      } else if (data.domain.network_address) {
+        shareName = data.domain.network_address;
+        if (data.domain.network_port !== 40102) {
+          shareName += ':' + data.domain.network_port;
+        }
+      }
+
+      callback(true, shareName);
+    } else {
+      callback(false);
+    }
+  })
+}
+
 function handleAction() {
   // check if we were passed an action to handle
   var action = qs["action"];
@@ -359,16 +358,8 @@ function handleAction() {
     // figure out if we already have a stored domain ID
     if (Settings.data.values.metaverse.id.length > 0) {
       // we need to ask the API what a shareable name for this domain is
-      getDomainFromAPI(function(data){
-        // check if we have owner_places (for a real domain) or a name (for a temporary domain)
-        if (data && data.status == "success") {
-          var shareName;
-          if (data.domain.owner_places) {
-            shareName = data.domain.owner_places[0].name
-          } else if (data.domain.name) {
-            shareName = data.domain.name;
-          }
-
+      getShareName(function(success, shareName){
+        if (success) {
           var shareLink = "hifi://" + shareName;
 
           console.log(shareLink);
@@ -439,43 +430,45 @@ function postSettings(jsonSettings) {
   });
 }
 
+function accessTokenIsSet() {
+  return Settings.data.values.metaverse.access_token.length > 0;
+}
+
 function setupHFAccountButton() {
-  // figure out how we should handle the HF connect button
-  var accessToken = Settings.data.values.metaverse.access_token;
 
-  // setup an object for the settings we want our button to have
-  var buttonSetting = {
-    type: 'button',
-    name: 'connected_account',
-    label: 'Connected Account',
-  }
-
-  var hasAccessToken = accessToken.length > 0;
+  var hasAccessToken = accessTokenIsSet();
+  var el;
 
   if (hasAccessToken) {
-    buttonSetting.help = "Click the button above to clear your OAuth token and disconnect your High Fidelity account.";
-    buttonSetting.classes = "btn-danger";
-    buttonSetting.button_label = "Disconnect High Fidelity Account";
-    buttonSetting.html_id = Settings.DISCONNECT_ACCOUNT_BTN_ID;
+    el = "<p>";
+    el += "<span class='account-connected-header'>High Fidelity Account Connected</span>";
+    el += "<button id='" + Settings.DISCONNECT_ACCOUNT_BTN_ID + "' class='btn'>Disconnect</button>";
+    el += "</p>";
+    el = $(el);
   } else {
-    buttonSetting.help = "Click the button above to connect your High Fidelity account.";
+    // setup an object for the settings we want our button to have
+    var buttonSetting = {
+      type: 'button',
+      name: 'connected_account',
+      label: 'Connected Account',
+    }
+    buttonSetting.help = "";
     buttonSetting.classes = "btn-primary";
     buttonSetting.button_label = "Connect High Fidelity Account";
     buttonSetting.html_id = Settings.CONNECT_ACCOUNT_BTN_ID;
 
-    buttonSetting.href = Settings.METAVERSE_URL + "/user/tokens/new?for_domain_server=true";
+    buttonSetting.href = URLs.METAVERSE_URL + "/user/tokens/new?for_domain_server=true";
 
     // since we do not have an access token we change hide domain ID and auto networking settings
     // without an access token niether of them can do anything
     $("[data-keypath='metaverse.id']").hide();
-    $("[data-keypath='metaverse.automatic_networking']").hide();
+
+    // use the existing getFormGroup helper to ask for a button
+    el = viewHelpers.getFormGroup('', buttonSetting, Settings.data.values);
   }
 
-  // use the existing getFormGroup helper to ask for a button
-  var buttonGroup = viewHelpers.getFormGroup('', buttonSetting, Settings.data.values);
-
   // add the button group to the top of the metaverse panel
-  $('#metaverse .panel-body').prepend(buttonGroup);
+  $('#metaverse .panel-body').prepend(el);
 }
 
 function disonnectHighFidelityAccount() {
@@ -496,61 +489,6 @@ function disonnectHighFidelityAccount() {
   });
 }
 
-function prepareAccessTokenPrompt() {
-  swal({
-    title: "Connect Account",
-    type: "input",
-    text: "Paste your created access token here." +
-      "</br></br>If you did not successfully create an access token click cancel below and attempt to connect your account again.</br></br>",
-    showCancelButton: true,
-    closeOnConfirm: false,
-    html: true
-  }, function(inputValue){
-    if (inputValue === false) return false;
-
-    if (inputValue === "") {
-      swal.showInputError("Please paste your access token in the input field.")
-      return false
-    }
-
-    // we have an input value - set the access token input with this and save settings
-    $(Settings.ACCESS_TOKEN_SELECTOR).val(inputValue).change();
-
-    // if the user doesn't have a domain ID set, give them the option to create one now
-    if (!Settings.data.values.metaverse.id) {
-      // show domain ID selection alert
-      showDomainIDChoiceAlert();
-    } else {
-      swal.close();
-      saveSettings();
-    }
-  });
-}
-
-function showDomainIDChoiceAlert() {
-  swal({
-    title: 'Domain ID',
-    type: 'info',
-    text: "You do not currently have a domain ID." +
-      "</br></br>This is required to point place names at your domain and to use automatic networking.</br></br>" +
-      "Would you like to create a domain ID via the Metaverse API?</br></br>",
-    showCancelButton: true,
-    confirmButtonText: "Create new domain ID",
-    cancelButtonText: "Skip",
-    closeOnConfirm: false,
-    html: true
-  }, function(isConfirm){
-    if (isConfirm) {
-      // show the swal to create a new domain via API
-      showDomainCreationAlert(true);
-    } else {
-      // user cancelled, close this swal and save the access token we got
-      swal.close();
-      saveSettings();
-    }
-  });
-}
-
 function showSpinnerAlert(title) {
   swal({
     title: title,
@@ -586,41 +524,38 @@ function showDomainCreationAlert(justConnected) {
   });
 }
 
-function createNewDomainID(description, justConnected) {
+function createNewDomainID(label, justConnected) {
   // get the JSON object ready that we'll use to create a new domain
   var domainJSON = {
-    "domain": {
-       "private_description": description
-    },
-    "access_token": $(Settings.ACCESS_TOKEN_SELECTOR).val()
+   "label": label
+    //"access_token": $(Settings.ACCESS_TOKEN_SELECTOR).val()
   }
 
-  $.post(Settings.METAVERSE_URL + "/api/v1/domains", domainJSON, function(data){
-    if (data.status == "success") {
-      // we successfully created a domain ID, set it on that field
-      var domainID = data.domain.id;
-      $(Settings.DOMAIN_ID_SELECTOR).val(domainID).change();
+  $.post("/api/domains", domainJSON, function(data){
+    // we successfully created a domain ID, set it on that field
+    var domainID = data.domain_id;
+    console.log("Setting domain id to ", data, domainID);
+    $(Settings.DOMAIN_ID_SELECTOR).val(domainID).change();
 
-      if (justConnected) {
-        var successText = "We connnected your High Fidelity account and created a new domain ID for this machine."
-      } else {
-        var successText = "We created a new domain ID for this machine."
-      }
-
-      successText += "</br></br>Click the button below to save your new settings and restart your domain-server.";
-
-      // show a sweet alert to say we are all finished up and that we need to save
-      swal({
-        title: 'Success!',
-        type: 'success',
-        text: successText,
-        html: true,
-        confirmButtonText: 'Save'
-      }, function(){
-        saveSettings();
-      });
+    if (justConnected) {
+      var successText = Strings.CREATE_DOMAIN_SUCCESS_JUST_CONNECTED
+    } else {
+      var successText = Strings.CREATE_DOMAIN_SUCCESS;
     }
-  }).fail(function(){
+
+    successText += "</br></br>Click the button below to save your new settings and restart your domain-server.";
+
+    // show a sweet alert to say we are all finished up and that we need to save
+    swal({
+      title: 'Success!',
+      type: 'success',
+      text: successText,
+      html: true,
+      confirmButtonText: 'Save'
+    }, function(){
+      saveSettings();
+    });
+  }, 'json').fail(function(){
 
     var errorText = "There was a problem creating your new domain ID. Do you want to try again or";
 
@@ -654,6 +589,275 @@ function createNewDomainID(description, justConnected) {
   });
 }
 
+function createDomainSpinner() {
+  var spinner = '<p class="loading-domain-info-spinner text-center" style="display: none">';
+  spinner += 'Loading  <span class="glyphicon glyphicon-refresh glyphicon-refresh-animate"></span>';
+  spinner += '</p>';
+  return spinner;
+}
+
+function createDomainLoadingError(message) {
+  var errorEl = $("<div class='domain-loading-error alert alert-warning' style='display: none'></div>");
+  errorEl.append(message + "  ");
+
+  var retryLink = $("<a href='#'>Please click here to try again.</a>");
+  retryLink.click(function(ev) {
+    ev.preventDefault();
+    reloadDomainInfo();
+  });
+  errorEl.append(retryLink);
+
+  return errorEl;
+}
+
+function parseJSONResponse(xhr) {
+  try {
+    return JSON.parse(xhr.responseText);
+  } catch (e) {
+  }
+  return null;
+}
+
+function showOrHideLabel() {
+  var type = getCurrentDomainIDType();
+  if (!accessTokenIsSet() || (type !== DOMAIN_ID_TYPE_FULL && type !== DOMAIN_ID_TYPE_UNKNOWN)) {
+    $(".panel#label").hide();
+    return false;
+  }
+  $(".panel#label").show();
+  return true;
+}
+
+function setupDomainLabelSetting() {
+  if (!showOrHideLabel()) {
+    return;
+  }
+
+  var html = "<div>"
+  html += "<label class='control-label'>Specify a label for your domain</label> <a class='domain-loading-hide' href='#'>Edit</a>";
+  html += "<input id='network-label' type='text' class='form-control domain-loading-hide' disabled></input>";
+  html += "</div>";
+
+  html = $(html);
+
+  html.find('a').click(function(ev) {
+    ev.preventDefault();
+
+    var label = DomainInfo.label === null ? "" : DomainInfo.label;
+    var modal_body = "<div class='form'>";
+    modal_body += "<label class='control-label'>Label</label>";
+    modal_body += "<input type='text' id='domain-label-input' class='form-control' value='" + label + "'>";
+    modal_body += "<div id='domain-label-error' class='error-message' data-property='label'></div>";
+    modal_body += "</div>";
+
+    var dialog = bootbox.dialog({
+      title: 'Edit Label',
+      message: modal_body,
+      closeButton: false,
+      buttons: [
+        {
+          label: 'Cancel',
+          className: 'edit-label-cancel-btn',
+          callback: function() {
+            dialog.modal('hide');
+          }
+        },
+        {
+          label: 'Save',
+          className: 'edit-label-save-btn btn btn-primary',
+          callback: function() {
+            var data = {
+              label: $('#domain-label-input').val()
+            };
+
+            $('.edit-label-cancel-btn').attr('disabled', 'disabled');
+            $('.edit-label-save-btn').attr('disabled', 'disabled');
+            $('.edit-label-save-btn').html("Saving...");
+
+            $('.error-message').hide();
+
+            $.ajax({
+              url: '/api/domains',
+              type: 'PUT',
+              data: data,
+              success: function(xhr) {
+                dialog.modal('hide');
+                reloadDomainInfo();
+              },
+              error: function(xhr) {
+                var data = parseJSONResponse(xhr);
+                console.log(data, data.status, data.data);
+                if (data.status === "fail") {
+                  for (var key in data.data) {
+                    var errorMsg = data.data[key];
+                    var errorEl = $('.error-message[data-property="' + key + '"');
+                    errorEl.html(errorMsg);
+                    errorEl.show();
+                  }
+                }
+                $('.edit-label-cancel-btn').removeAttr('disabled');
+                $('.edit-label-save-btn').removeAttr('disabled');
+                $('.edit-label-save-btn').html("Save");
+              }
+            });
+            return false;
+          }
+        }
+      ],
+      callback: function(result) {
+        console.log("result: ", result);
+      }
+    });
+  });
+
+  var spinner = createDomainSpinner();
+  var errorEl = createDomainLoadingError("Error loading label.");
+
+  html.append(spinner);
+  html.append(errorEl);
+
+  $('div#label .panel-body').append(html);
+}
+
+function showOrHideAutomaticNetworking() {
+  var type = getCurrentDomainIDType();
+  if (!accessTokenIsSet() || (type !== DOMAIN_ID_TYPE_FULL && type !== DOMAIN_ID_TYPE_UNKNOWN)) {
+    $("[data-keypath='metaverse.automatic_networking']").hide();
+    return false;
+  }
+  $("[data-keypath='metaverse.automatic_networking']").show();
+  return true;
+}
+
+function setupDomainNetworkingSettings() {
+  if (!showOrHideAutomaticNetworking()) {
+    return;
+  }
+
+  var autoNetworkingSetting = Settings.data.values.metaverse.automatic_networking;
+  if (autoNetworkingSetting === 'full') {
+    return;
+  }
+
+  var includeAddress = autoNetworkingSetting === 'disabled';
+
+  if (includeAddress) {
+    var label = "Network Address and Port";
+  } else {
+    var label = "Network Port";
+  }
+
+  var lowerName = name.toLowerCase();
+  var form = '<div id="network-address-port">';
+  form += '<label class="control-label">' + label + '</label>';
+  form += ' <a id="edit-network-address-port" class="domain-loading-hide" href="#">Edit</a>';
+  form += '<input type="text" class="domain-loading-hide form-control" disabled></input>';
+  form += '<div class="domain-loading-hide help-block">This defines how nodes will connect to your domain. You can read more about automatic networking <a href="">here</a>.</div>';
+  form += '</div>';
+
+  form = $(form);
+
+  form.find('#edit-network-address-port').click(function(ev) {
+    ev.preventDefault();
+
+    var address = DomainInfo.network_address === null ? '' : DomainInfo.network_address;
+    var port = DomainInfo.network_port === null ? '' : DomainInfo.network_port;
+    var modal_body = "<div class='form-group'>";
+    if (includeAddress) {
+      modal_body += "<label class='control-label'>Address</label>";
+      modal_body += "<input type='text' id='network-address-input' class='form-control' value='" + address + "'>";
+      modal_body += "<div id='network-address-error' class='error-message' data-property='network_address'></div>";
+    }
+    modal_body += "<label class='control-label'>Port</label>";
+    modal_body += "<input type='text' id='network-port-input' class='form-control' value='" + port + "'>";
+    modal_body += "<div id='network-port-error' class='error-message' data-property='network_port'></div>";
+    modal_body += "</div>";
+
+    var dialog = bootbox.dialog({
+      title: 'Edit Network',
+      message: modal_body,
+      closeButton: false,
+      buttons: [
+        {
+          label: 'Cancel',
+          className: 'edit-network-cancel-btn',
+          callback: function() {
+            dialog.modal('hide');
+          }
+        },
+        {
+          label: 'Save',
+          className: 'edit-network-save-btn btn btn-primary',
+          callback: function() {
+            var data = {
+              network_port: $('#network-port-input').val()
+            };
+            if (includeAddress) {
+              data.network_address = $('#network-address-input').val();
+            }
+
+            $('.edit-network-cancel-btn').attr('disabled', 'disabled');
+            $('.edit-network-save-btn').attr('disabled', 'disabled');
+            $('.edit-network-save-btn').html("Saving...");
+
+            console.log('data', data);
+
+            $('.error-message').hide();
+
+            $.ajax({
+              url: '/api/domains',
+              type: 'PUT',
+              data: data,
+              success: function(xhr) {
+                console.log(xhr, parseJSONResponse(xhr));
+                dialog.modal('hide');
+                reloadDomainInfo();
+              },
+              error:function(xhr) {
+                var data = parseJSONResponse(xhr);
+                console.log(data, data.status, data.data);
+                if (data.status === "fail") {
+                  for (var key in data.data) {
+                    var errorMsg = data.data[key];
+                    console.log(key, errorMsg);
+                    var errorEl = $('.error-message[data-property="' + key + '"');
+                    console.log(errorEl);
+                    errorEl.html(errorMsg);
+                    errorEl.show();
+                  }
+                }
+                $('.edit-network-cancel-btn').removeAttr('disabled');
+                $('.edit-network-save-btn').removeAttr('disabled');
+                $('.edit-network-save-btn').html("Save");
+              }
+            });
+            return false;
+          }
+        }
+      ],
+      callback: function(result) {
+        console.log("result: ", result);
+      }
+    });
+  });
+
+  var spinner = createDomainSpinner();
+
+  var errorMessage = ''
+  if (includeAddress) {
+    errorMessage = "We were unable to load the network address and port.";
+  } else {
+    errorMessage = "We were unable to load the network port."
+  }
+  var errorEl = createDomainLoadingError(errorMessage);
+
+  var autoNetworkingEl = $('div[data-keypath="metaverse.automatic_networking"]');
+  autoNetworkingEl.after(spinner);
+  autoNetworkingEl.after(errorEl);
+  autoNetworkingEl.after(form);
+}
+
+
 function setupPlacesTable() {
   // create a dummy table using our view helper
   var placesTableSetting = {
@@ -662,9 +866,10 @@ function setupPlacesTable() {
     label: 'Places',
     html_id: Settings.PLACES_TABLE_ID,
     help: "The following places currently point to this domain.</br>To point places to this domain, "
-      + " go to the <a href='" + Settings.METAVERSE_URL + "/user/places'>My Places</a> "
+      + " go to the <a href='" + URLs.METAVERSE_URL + "/user/places'>My Places</a> "
       + "page in your High Fidelity Metaverse account.",
     read_only: true,
+    can_add_new_rows: false,
     columns: [
       {
         "name": "name",
@@ -672,10 +877,10 @@ function setupPlacesTable() {
       },
       {
         "name": "path",
-        "label": "Path"
+        "label": "Viewpoint or Path"
       },
       {
-        "name": "edit",
+        "name": "remove",
         "label": "",
         "class": "buttons"
       }
@@ -687,51 +892,110 @@ function setupPlacesTable() {
 
   // append the places table in the right place
   $('#places_paths .panel-body').prepend(placesTableGroup);
+  //$('#' + Settings.PLACES_TABLE_ID).append("<tr><td colspan=3></td></tr>");
+
+  var spinner = createDomainSpinner();
+  $('#' + Settings.PLACES_TABLE_ID).after($(spinner));
+
+  var errorEl = createDomainLoadingError("There was an error retreiving your places.");
+  $("#" + Settings.PLACES_TABLE_ID).after(errorEl);
 
   // do we have a domain ID?
-  if (Settings.data.values.metaverse.id.length > 0) {
-    // now, ask the API for what places, if any, point to this domain
-    reloadPlacesOrTemporaryName();
-  } else {
+  if (Settings.data.values.metaverse.id.length == 0) {
     // we don't have a domain ID - add a button to offer the user a chance to get a temporary one
     var temporaryPlaceButton = dynamicButton(Settings.GET_TEMPORARY_NAME_BTN_ID, 'Get a temporary place name');
     $('#' + Settings.PLACES_TABLE_ID).after(temporaryPlaceButton);
   }
-
+  if (accessTokenIsSet()) {
+    appendAddButtonToPlacesTable();
+  }
 }
 
-function placeTableRow(name, path, isTemporary) {
+function placeTableRow(name, path, isTemporary, placeID) {
   var name_link = "<a href='hifi://" + name + "'>" + (isTemporary ? name + " (temporary)" : name) + "</a>";
 
-  if (isTemporary) {
-    var editColumn = "<td class='buttons'></td>";
-  } else {
-    var editColumn = "<td class='buttons'><a class='glyphicon glyphicon-pencil'"
-      + " href='" + Settings.METAVERSE_URL + "/user/places/" + name + "/edit" + "'</a></td>";
+  function placeEditClicked() {
+    editHighFidelityPlace(placeID, name, path);
   }
 
-  return "<tr><td>" + name_link + "</td><td>" + path + "</td>" + editColumn + "</tr>";
+  function placeDeleteClicked() {
+    var el = $(this);
+    var confirmString = Strings.REMOVE_PLACE_TITLE.replace("{{place}}", name);
+    var dialog = bootbox.dialog({
+      message: confirmString,
+      closeButton: false,
+      buttons: [
+        {
+          label: Strings.REMOVE_PLACE_CANCEL_BUTTON,
+          className: "delete-place-cancel-btn",
+          callback: function() {
+            dialog.modal('hide');
+          }
+        },
+        {
+          label: Strings.REMOVE_PLACE_DELETE_BUTTON,
+          className: "delete-place-confirm-btn btn btn-danger",
+          callback: function() {
+            $('.delete-place-cancel-btn').attr('disabled', 'disabled');
+            $('.delete-place-confirm-btn').attr('disabled', 'disabled');
+            $('.delete-place-confirm-btn').html(Strings.REMOVE_PLACE_DELETE_BUTTON_PENDING);
+            sendUpdatePlaceRequest(
+              placeID,
+              '',
+              null,
+              true,
+              function() {
+                reloadDomainInfo();
+                dialog.modal('hide');
+              }, function() {
+                $('.delete-place-cancel-btn').removeAttr('disabled');
+                $('.delete-place-confirm-btn').removeAttr('disabled');
+                $('.delete-place-confirm-btn').html(Strings.REMOVE_PLACE_DELETE_BUTTON);
+                bootbox.alert(Strings.REMOVE_PLACE_ERROR);
+              });
+            return false;
+          }
+        },
+      ]
+    });
+  }
+
+  if (isTemporary) {
+    var editLink = "";
+    var deleteColumn = "<td class='buttons'></td>";
+  } else {
+    var editLink = " <a class='place-edit' href='javascript:void(0);'>Edit</a>";
+    var deleteColumn = "<td class='buttons'><a class='place-delete glyphicon glyphicon-remove'></a></td>";
+  }
+
+  var row = $("<tr><td>" + name_link + "</td><td>" + path + editLink + "</td>" + deleteColumn + "</tr>");
+  row.find(".place-edit").click(placeEditClicked);
+  row.find(".place-delete").click(placeDeleteClicked);
+
+  return row;
 }
 
 function placeTableRowForPlaceObject(place) {
   var placePathOrIndex = (place.path ? place.path : "/");
-  return placeTableRow(place.name, placePathOrIndex, false);
+  return placeTableRow(place.name, placePathOrIndex, false, place.id);
 }
 
-function getDomainFromAPI(callback) {
-  // we only need to do this if we have a current domain ID
-  var domainID = Settings.data.values.metaverse.id;
-  if (domainID.length > 0) {
-    var domainURL = Settings.METAVERSE_URL + "/api/v1/domains/" + domainID;
+function reloadDomainInfo() {
+  $('#' + Settings.PLACES_TABLE_ID + " tbody tr").not('.headers').remove();
 
-    $.getJSON(domainURL, callback).fail(callback);
-  }
-}
+  $('.domain-loading-show').show();
+  $('.domain-loading-hide').hide();
+  $('.domain-loading-error').hide();
+  $('.loading-domain-info-spinner').show();
+  $('#' + Settings.PLACES_TABLE_ID).append("<tr colspan=3>Hello</tr>");
 
-function reloadPlacesOrTemporaryName() {
   getDomainFromAPI(function(data){
+    $('.loading-domain-info-spinner').hide();
+    $('.domain-loading-show').hide();
+
     // check if we have owner_places (for a real domain) or a name (for a temporary domain)
     if (data.status == "success") {
+      $('.domain-loading-hide').show();
       if (data.domain.owner_places) {
         // add a table row for each of these names
         _.each(data.domain.owner_places, function(place){
@@ -741,6 +1005,30 @@ function reloadPlacesOrTemporaryName() {
         // add a table row for this temporary domain name
         $('#' + Settings.PLACES_TABLE_ID + " tbody").append(placeTableRow(data.domain.name, '/', true));
       }
+
+      // Update label
+      if (showOrHideLabel()) {
+        var label = data.domain.label;
+        label = label === null ? '' : label;
+        $('#network-label').val(label);
+      }
+
+      // Update automatic networking
+      if (showOrHideAutomaticNetworking()) {
+        var autoNetworkingSetting = Settings.data.values.metaverse.automatic_networking;
+        var address = data.domain.network_address === null ? "" : data.domain.network_address;
+        var port = data.domain.network_port === null ? "" : data.domain.network_port;
+        if (autoNetworkingSetting === 'disabled') {
+          $('#network-address-port input').val(address + ":" + port);
+        } else if (autoNetworkingSetting === 'ip') {
+          $('#network-address-port input').val(port);
+        }
+      }
+
+      appendAddButtonToPlacesTable();
+
+    } else {
+      $('.domain-loading-error').show();
     }
   })
 }
@@ -748,88 +1036,172 @@ function reloadPlacesOrTemporaryName() {
 function appendDomainIDButtons() {
   var domainIDInput = $(Settings.DOMAIN_ID_SELECTOR);
 
-  var createButton = dynamicButton(Settings.CREATE_DOMAIN_ID_BTN_ID, "Create new domain ID");
+  var createButton = dynamicButton(Settings.CREATE_DOMAIN_ID_BTN_ID, Strings.CREATE_DOMAIN_BUTTON);
   createButton.css('margin-top', '10px');
-  var chooseButton = dynamicButton(Settings.CHOOSE_DOMAIN_ID_BTN_ID, "Choose from my domains");
+  var chooseButton = dynamicButton(Settings.CHOOSE_DOMAIN_ID_BTN_ID, Strings.CHOOSE_DOMAIN_BUTTON);
   chooseButton.css('margin', '10px 0px 0px 10px');
 
   domainIDInput.after(chooseButton);
   domainIDInput.after(createButton);
 }
 
+function editHighFidelityPlace(placeID, name, path) {
+  var dialog;
+
+  var modal_body = "<div class='form-group'>";
+  modal_body += "<input type='text' id='place-path-input' class='form-control' value='" + path + "'>";
+  modal_body += "</div>";
+
+  var modal_buttons = [
+    {
+      label: Strings.EDIT_PLACE_CANCEL_BUTTON,
+      className: "edit-place-cancel-button",
+      callback: function() {
+        dialog.modal('hide');
+      }
+    },
+    {
+      label: Strings.EDIT_PLACE_CONFIRM_BUTTON,
+      className: 'edit-place-save-button btn btn-primary',
+      callback: function() {
+        var placePath = $('#place-path-input').val();
+
+        if (path == placePath) {
+          return true;
+        }
+
+        $('.edit-place-cancel-button').attr('disabled', 'disabled');
+        $('.edit-place-save-button').attr('disabled', 'disabled');
+        $('.edit-place-save-button').html(Strings.EDIT_PLACE_BUTTON_PENDING);
+
+        sendUpdatePlaceRequest(
+          placeID,
+          placePath,
+          null,
+          false,
+          function() {
+            dialog.modal('hide')
+            reloadDomainInfo();
+          },
+          function() {
+            $('.edit-place-cancel-button').removeAttr('disabled');
+            $('.edit-place-save-button').removeAttr('disabled');
+            $('.edit-place-save-button').html(Strings.EDIT_PLACE_CONFIRM_BUTTON);
+          }
+        );
+
+        return false;
+      }
+    }
+  ];
+
+  dialog = bootbox.dialog({
+    title: Strings.EDIT_PLACE_TITLE,
+    closeButton: false,
+    message: modal_body,
+    buttons: modal_buttons
+  })
+}
+
+function appendAddButtonToPlacesTable() {
+    var addRow = $("<tr> <td></td> <td></td> <td class='buttons'><a href='#' class='place-add glyphicon glyphicon-plus'></a></td> </tr>");
+    addRow.find(".place-add").click(function(ev) {
+      ev.preventDefault();
+      chooseFromHighFidelityPlaces(Settings.initialValues.metaverse.access_token, null, function(placeName, newDomainID) {
+        if (newDomainID) {
+          Settings.data.values.metaverse.id = newDomainID;
+          var domainIDEl = $("[data-keypath='metaverse.id']");
+          domainIDEl.val(newDomainID);
+          Settings.initialValues.metaverse.id = newDomainID;
+          badgeSidebarForDifferences(domainIDEl);
+        }
+        reloadDomainInfo();
+      });
+    });
+    $('#' + Settings.PLACES_TABLE_ID + " tbody").append(addRow);
+}
+
 function chooseFromHighFidelityDomains(clickedButton) {
   // setup the modal to help user pick their domain
   if (Settings.initialValues.metaverse.access_token) {
 
     // add a spinner to the choose button
-    clickedButton.html("Loading domains...")
-    clickedButton.attr('disabled', 'disabled')
+    clickedButton.html("Loading domains...");
+    clickedButton.attr('disabled', 'disabled');
 
     // get a list of user domains from data-web
-    data_web_domains_url = Settings.METAVERSE_URL + "/api/v1/domains?access_token="
-    $.getJSON(data_web_domains_url + Settings.initialValues.metaverse.access_token, function(data){
+    $.ajax({
+      url: "/api/domains",
+      dataType: 'json',
+      jsonp: false,
+      success: function(data){
 
-      modal_buttons = {
-        cancel: {
-          label: 'Cancel',
-          className: 'btn-default'
-        }
-      }
-
-      if (data.data.domains.length) {
-        // setup a select box for the returned domains
-        modal_body = "<p>Choose the High Fidelity domain you want this domain-server to represent.<br/>This will set your domain ID on the settings page.</p>"
-        domain_select = $("<select id='domain-name-select' class='form-control'></select>")
-        _.each(data.data.domains, function(domain){
-          var domainString = "";
-
-          if (domain.private_description) {
-            domainString += '"' + domain.private_description + '" - ';
+        var modal_buttons = {
+          cancel: {
+            label: 'Cancel',
+            className: 'btn-default'
           }
+        }
 
-          domainString += domain.id;
+        if (data.data.domains.length) {
+          // setup a select box for the returned domains
+          modal_body = "<p>Choose the High Fidelity domain you want this domain-server to represent.<br/>This will set your domain ID on the settings page.</p>";
+          domain_select = $("<select id='domain-name-select' class='form-control'></select>");
+          _.each(data.data.domains, function(domain){
+            var domainString = "";
 
-          domain_select.append("<option value='" + domain.id + "'>" + domainString + "</option>");
+            if (domain.label) {
+              domainString += '"' + domain.label+ '" - ';
+            }
+
+            domainString += domain.id;
+
+            domain_select.append("<option value='" + domain.id + "'>" + domainString + "</option>");
+          })
+          modal_body += "<label for='domain-name-select'>Domains</label>" + domain_select[0].outerHTML
+          modal_buttons["success"] = {
+            label: 'Choose domain',
+            callback: function() {
+              domainID = $('#domain-name-select').val()
+              // set the domain ID on the form
+              $(Settings.DOMAIN_ID_SELECTOR).val(domainID).change();
+            }
+          }
+        } else {
+          modal_buttons["success"] = {
+            label: 'Create new domain',
+            callback: function() {
+              window.open(URLs.METAVERSE_URL + "/user/domains", '_blank');
+            }
+          }
+          modal_body = "<p>You do not have any domains in your High Fidelity account." +
+            "<br/><br/>Go to your domains page to create a new one. Once your domain is created re-open this dialog to select it.</p>"
+        }
+
+        bootbox.dialog({
+          title: "Choose matching domain",
+          message: modal_body,
+          buttons: modal_buttons
         })
-        modal_body += "<label for='domain-name-select'>Domains</label>" + domain_select[0].outerHTML
-        modal_buttons["success"] = {
-          label: 'Choose domain',
-          callback: function() {
-            domainID = $('#domain-name-select').val()
-            // set the domain ID on the form
-            $(Settings.DOMAIN_ID_SELECTOR).val(domainID).change();
-          }
-        }
-      } else {
-        modal_buttons["success"] = {
-          label: 'Create new domain',
-          callback: function() {
-            window.open(Settings.METAVERSE_URL + "/user/domains", '_blank');
-          }
-        }
-        modal_body = "<p>You do not have any domains in your High Fidelity account." +
-          "<br/><br/>Go to your domains page to create a new one. Once your domain is created re-open this dialog to select it.</p>"
+      },
+      error: function() {
+        bootbox.alert("Failed to retrieve your domains from the High Fidelity Metaverse");
+      },
+      complete: function() {
+        // remove the spinner from the choose button
+        clickedButton.html("Choose from my domains")
+        clickedButton.removeAttr('disabled')
       }
+    });
 
-      bootbox.dialog({
-        title: "Choose matching domain",
-        message: modal_body,
-        buttons: modal_buttons
-      })
-
-      // remove the spinner from the choose button
-      clickedButton.html("Choose from my domains")
-      clickedButton.removeAttr('disabled')
-    })
-
-  } else {
-    bootbox.alert({
-      message: "You must have an access token to query your High Fidelity domains.<br><br>" +
+    } else {
+      bootbox.alert({
+        message: "You must have an access token to query your High Fidelity domains.<br><br>" +
         "Please follow the instructions on the settings page to add an access token.",
-      title: "Access token required"
-    })
+        title: "Access token required"
+      })
+    }
   }
-}
 
 function createTemporaryDomain() {
   swal({
@@ -846,7 +1218,7 @@ function createTemporaryDomain() {
       showSpinnerAlert('Creating temporary place name');
 
       // make a get request to get a temporary domain
-      $.post(Settings.METAVERSE_URL + '/api/v1/domains/temporary', function(data){
+      $.post(URLs.METAVERSE_URL + '/api/v1/domains/temporary', function(data){
         if (data.status == "success") {
           var domain = data.data.domain;
 
@@ -892,6 +1264,31 @@ function reloadSettings(callback) {
     // call our method to setup the place names table
     setupPlacesTable();
 
+    setupDomainNetworkingSettings();
+    setupDomainLabelSetting();
+
+    if (Settings.data.values.metaverse.id.length > 0) {
+      // now, ask the API for what places, if any, point to this domain
+      reloadDomainInfo();
+
+      // we need to ask the API what a shareable name for this domain is
+      getShareName(function(success, shareName) {
+        if (success) {
+          var shareLink = "https://hifi.place/" + shareName;
+          $('#visit-domain-link').attr("href", shareLink).show();
+        }
+      });
+    }
+
+    if (Settings.data.values.wizard.cloud_domain) {
+      $('#manage-cloud-domains-link').show();
+
+      var cloudWizardExit = qs["cloud-wizard-exit"];
+      if (cloudWizardExit != undefined) {
+        $('#cloud-domains-alert').show();
+      }
+    }
+
     // setup any bootstrap switches
     $('.toggle-checkbox').bootstrapSwitch();
 
@@ -1044,6 +1441,7 @@ function saveSettings() {
     if (canPost) {
       if (formJSON["security"]) {
         var username = formJSON["security"]["http_username"];
+
         var password = formJSON["security"]["http_password"];
 
         if ((password == sha256_digest("")) && (username == undefined || (username && username.length != 0))) {
@@ -1356,6 +1754,7 @@ function getDescriptionForKey(key) {
 var SAVE_BUTTON_LABEL_SAVE = "Save";
 var SAVE_BUTTON_LABEL_RESTART = "Save and restart";
 var reasonsForRestart = [];
+var numChangesBySection = {};
 
 function badgeSidebarForDifferences(changedElement) {
   // figure out which group this input is in
@@ -1405,6 +1804,20 @@ function badgeSidebarForDifferences(changedElement) {
     badgeValue = ""
   }
 
+  numChangesBySection[panelParentID] = badgeValue;
+
+  var hasChanges = badgeValue > 0;
+
+  if (!hasChanges) {
+    for (var key in numChangesBySection) {
+      if (numChangesBySection[key] > 0) {
+        hasChanges = true;
+        break;
+      }
+    }
+  }
+
+  $(".save-button").prop("disabled", !hasChanges);
   $(".save-button").html(reasonsForRestart.length > 0 ? SAVE_BUTTON_LABEL_RESTART : SAVE_BUTTON_LABEL_SAVE);
   $("a[href='#" + panelParentID + "'] .badge").html(badgeValue);
 }
diff --git a/domain-server/resources/web/wizard/css/style.css b/domain-server/resources/web/wizard/css/style.css
new file mode 100644
index 0000000000..dfb576ebba
--- /dev/null
+++ b/domain-server/resources/web/wizard/css/style.css
@@ -0,0 +1,103 @@
+label {
+  font-style: normal;
+  font-weight: normal;
+  line-height: 24px;
+  font-size: 16px;
+
+  color: #373A3C;
+}
+
+.step-title {
+  margin-bottom: 20px;
+  line-height: 26px;
+  font-size: 24px;
+
+  color: #373A3C;
+}
+
+.step-description {
+  line-height: 24px;
+  font-size: 16px;
+
+  color: #818A91;
+}
+
+.step-info {
+  font-style: normal;
+  font-weight: normal;
+  line-height: 24px;
+  font-size: 16px;
+
+  color: #373A3C;
+}
+
+.wizard-link {
+  font-size: 16px;
+  font-weight: normal;
+  color: #2F80ED;
+}
+
+#admin-row {
+  margin-top: 20px;
+  margin-bottom: 20px;
+}
+
+#connect-question {
+  margin-top: 10px;
+}
+
+#connect-account-btn {
+  margin-top: 30px;
+  margin-bottom: 205px;
+}
+
+#place-name-group {
+  margin-top: 42px;
+  margin-bottom: 140px;
+  display: inline-block;
+}
+
+#place-name-link {
+  line-height: 38px;
+  font-size: 32px;
+
+  display: inline-block;
+
+  color: #373A3C;
+}
+
+#place-name-edit {
+  text-align: right;
+}
+
+#change-place-name {
+  line-height: 24px;
+  font-size: 18px;
+}
+
+#rez-options-row {
+  margin-bottom: 60px;
+}
+
+#verify-password-row {
+  margin-bottom: 33px;
+}
+
+#checkmark-image {
+  margin-top: 66px;
+  margin-bottom: 59px;
+  width: 169px;
+  height: 169px;
+}
+
+#congratulation-text {
+  margin-bottom: 59px;
+}
+
+#visit-domain-checkbox {
+  margin-bottom: 23px;
+}
+
+#visit-domain-checkbox label {
+  margin: 0 0;
+}
diff --git a/domain-server/resources/web/wizard/header.html b/domain-server/resources/web/wizard/header.html
new file mode 100644
index 0000000000..e9149fa7e1
--- /dev/null
+++ b/domain-server/resources/web/wizard/header.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>domain-server</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+    <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
+    <link href="/css/style.css" rel="stylesheet" media="screen">
+    <link href="/wizard/css/style.css" rel="stylesheet" media="screen">
+    <link href="/css/sweetalert.css" rel="stylesheet" media="screen">
+    <link href="/css/bootstrap-switch.min.css" rel="stylesheet" media="screen">
+
+    <script src='/js/sweetalert.min.js'></script>
+  </head>
+  <body>
+    <nav class="navbar navbar-default navbar-fixed-top" role="navigation">
+      <div class="container-fluid">
+        <!-- Collect the nav links, forms, and other content for toggling -->
+        <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+          <a class="navbar-brand step-info" href="#">Setup Wizard (Domain Server Settings)</a>
+
+          <div class="navbar-form navbar-right">
+            <button id="skip-wizard-button" type="button" class="btn btn-default" style="display:none;">Skip Wizard</button>
+          </div>
+        </div>
+      </div><!-- /.container-fluid -->
+    </nav>
+
+    <div class="container">
diff --git a/domain-server/resources/web/wizard/index.shtml b/domain-server/resources/web/wizard/index.shtml
new file mode 100644
index 0000000000..9d4d8b7381
--- /dev/null
+++ b/domain-server/resources/web/wizard/index.shtml
@@ -0,0 +1,225 @@
+<!--#include virtual="wizard/header.html"-->
+<div class="wizard-step desktop-only col-md-6 col-centered" style="display: none;">
+  <h4 class="step-title"></h4>
+  <dl class="row">
+    <dd class="col-md-12">
+      <span class='step-description'>By connecting your High Fidelity Account you will be granting access to your account information.</span>
+    </dd>
+  </dl>
+  <dl class="row">
+    <dd class="col-md-12">
+      <a id="connect-account-btn" role="button" class="btn btn-primary btn-md btn-block" target="_blank">Connect your High Fidelity account</a>
+    </dd>
+  </dl>
+
+  <dl class="row">
+    <dd class="col-md-3">
+      <button type="button" class="btn btn-md btn-block btn-default next-button">Skip</button>
+    </dd>
+  </dl>
+</div>
+
+<div class="wizard-step col-md-8 col-centered" style="display: none;">
+  <h4 class="step-title"></h4>
+  <div class="row">
+    <div class="col-md-12">
+      <span class='step-description'>
+        <a target='_blank' href='https://docs.highfidelity.com/create-and-explore/start-working-in-your-sandbox/place-names'>Place names</a> are similar to web addresses. Users who want to visit your domain can
+        enter its Place Name in High Fidelity's Interface. You can choose a Place Name for your domain.</br>
+        People can also use your <b>domain's IP address (shown below)</b> to visit your High Fidelity domain.
+      </span>
+    </div>
+  </div>
+
+  <div class="row">
+    <div class="centered-hack-parent">
+      <div id="place-name-group" class="centered-hack">
+        <p id="place-name-link"></p>
+          <div id="place-name-edit">
+            <span class='glyphicon glyphicon-pencil'></span>
+            <a href="#" id="change-place-name">Choose a custom Place Name instead</a>
+          </div>
+      </div>
+    </div>
+  </div>
+
+  <dl class="row">
+    <dd class="col-md-3">
+      <button type="button" class="btn btn-md btn-block btn-default back-button">Back</button>
+    </dd>
+    <dd class="col-md-3 col-md-offset-6">
+      <button type="button" class="btn btn-md btn-block btn-primary next-button">Next</button>
+    </dd>
+  </dl>
+</div>
+
+<div class="wizard-step col-md-9 col-centered" style="display: none;">
+  <h4 class="step-title"></h4>
+  <div class="row">
+    <p id="permissions-description" class="col-md-12 step-info"><b>Localhost</b> has been granted administrator privileges to this domain. (Localhost is any</br>user on the same machine as the High Fidelity Server)</p>
+  </div>
+  <div id="admin-row" class="row">
+    <p class="col-md-6">
+      <span class="step-info"><span id="admin-description"><b>Add your High Fidelity username</b> and any other usernames</span> to grant <span class='wizard-link' data-toggle="tooltip" title="Users who will have all the permissions for this domain.">administrator privileges</span></span>
+    </p>
+    <div class="col-md-6">
+      <input id="admin-usernames" type="text" class="form-control">
+      <span class="help-block text-right">separate by commas (user1, user2,..)</span>
+    </div>
+  </div>
+
+  <div class="row">
+    <div class="col-md-12">
+      <span class="step-description">Grant basic permissions to other users. You can change these later.</span>
+    </div>
+  </div>
+
+  <div class="row">
+    <div class="col-md-12">
+      <p id="connect-question" class="step-info">
+        Who can <a href='#' class='wizard-link  perms-link'>connect</a> to your domain?
+        <span class='glyphicon glyphicon-info-sign' data-toggle='tooltip' title='You can set this to allow a user to connect to this domain.'></span>
+      </p>
+    </div>
+  </div>
+  <div class="row">
+    <p class="col-md-2">
+      <label>
+        <input id="connect-none" name="connect-radio" type="radio" value="none" checked> None
+      </label>
+    </p>
+    <p class="col-md-3">
+      <label>
+        <input id="connect-friends" name="connect-radio" type="radio" value="friends"> Friends
+      </label>
+    </p>
+    <p class="col-md-5">
+      <label>
+        <input id="connect-logged-in" name="connect-radio" type="radio" value="logged-in"> Users logged into High Fidelity
+      </label>
+    </p>
+    <p class="col-md-2">
+      <label>
+        <input id="connect-everyone" name="connect-radio" type="radio" value="everyone"> Everyone
+      </label>
+    </p>
+  </div>
+
+  <div class="row">
+    <div class="col-md-12">
+      <p class="step-info">
+        Who can <a href='#' class='wizard-link perms-link'>rez items</a> in your domain?
+        <span class='glyphicon glyphicon-info-sign' data-toggle='tooltip' title='You can set this to allow a user to create entities in this domain.'></span>
+      </p>
+    </div>
+  </div>
+  <div id="rez-options-row" class="row">
+    <p class="col-md-2">
+      <label>
+        <input id="rez-none" name="rez-radio" type="radio" value="none" checked> None
+      </label>
+    </p>
+    <p class="col-md-3">
+      <label>
+        <input id="rez-friends" name="rez-radio" type="radio" value="friends" disabled> Friends
+      </label>
+    </p>
+    <p class="col-md-5">
+      <label>
+        <input id="rez-logged-in" name="rez-radio" type="radio" value="logged-in" disabled> Users logged into High Fidelity
+      </label>
+    </p>
+    <p class="col-md-2">
+      <label>
+        <input id="rez-everyone" name="rez-radio" type="radio" value="everyone" disabled> Everyone
+      </label>
+    </p>
+  </div>
+
+  <div class="row">
+    <dd class="col-md-3">
+      <button type="button" class="btn btn-md btn-block btn-default back-button">Back</button>
+    </dd>
+    <dd class="col-md-3 col-md-offset-6">
+      <button id="save-permissions" type="button" class="btn btn-md btn-block btn-primary">Next</button>
+    </dd>
+  </div>
+</div>
+
+<div class="wizard-step cloud-only col-md-7 col-centered" style="display: none;">
+  <h4 class="step-title"></h4>
+  <dl class="row">
+    <dd class="col-md-12">
+      <span class='step-description'>
+        Your server settings are currently accessible without a username and password.
+        Adding credentials will ensure that only authorized users have access to modify the settings.
+      </span>
+    </dd>
+  </dl>
+
+  <div class="row">
+    <p class="col-md-12 step-info">Create a username and password to secure the access to your domain server settings.</p>
+  </div>
+  <dl class="row">
+    <dt class="col-md-4 step-info">Username</dt>
+    <dd class="col-md-8">
+      <input id="http_username" type="text" class="form-control">
+      <span class='help-block'>This does not have to be your High Fidelity username</span>
+    </dd>
+  </dl>
+  <dl class="row">
+    <dt class="col-md-4 step-info">Enter password</dt>
+    <dd class="col-md-8">
+      <input id="http_password" type="password" class="form-control">
+      <span class='help-block'>This should not be the same as your High Fidelity password</span>
+    </dd>
+  </dl>
+  <dl id="verify-password-row" class="row">
+    <dt class="col-md-4 step-info">Re-enter password</dt>
+    <dd class="col-md-8">
+      <input id="verify_http_password" type="password" class="form-control">
+    </dd>
+  </dl>
+
+  <dl class="row">
+    <dd class="col-md-3">
+      <button type="button" class="btn btn-md btn-block btn-default back-button">Back</button>
+    </dd>
+    <dd class="col-md-3 col-md-offset-6">
+      <button id="save-username-password" type="button" class="btn btn-md btn-block btn-primary">Finish</button>
+    </dd>
+  </dl>
+</div>
+
+<div class="wizard-step cloud-only col-xs-12 col-sm-12 col-md-9 col-lg-7 col-centered" style="display: none;">
+  <div class="row">
+    <div class="col-xs-12" align="center">
+      <img id="checkmark-image" src="../images/checkmark.svg">
+    </div>
+  </div>
+
+  <div id="congratulation-text" class="row">
+    <div class="col-xs-12">
+      <p class="step-info">Congratulations! You have successfully setup and configured your cloud hosted domain.</p>
+    </div>
+  </div>
+
+  <dl class="row">
+    <div class="col-xs-12">
+      <div class="pull-right">
+        <div id="visit-domain-checkbox">
+          <label><input id="go-to-domain" class="form-check-input" type="checkbox"> Visit domain in VR now</label>
+        </div>
+        <button id="explore-settings" type="button" class="btn btn-md btn-primary">Explore all domain server settings</button>
+      </div>
+    </div>
+  </dl>
+</div>
+
+<!--#include virtual="footer.html"-->
+<script src='/js/underscore-min.js'></script>
+<script src='/js/bootbox.min.js'></script>
+<script src='/js/sha256.js'></script>
+<script src='/js/shared.js'></script>
+<script src='js/wizard.js'></script>
+<!--#include virtual="page-end.html"-->
diff --git a/domain-server/resources/web/wizard/js/wizard.js b/domain-server/resources/web/wizard/js/wizard.js
new file mode 100644
index 0000000000..57e85973f4
--- /dev/null
+++ b/domain-server/resources/web/wizard/js/wizard.js
@@ -0,0 +1,520 @@
+var Metaverse = {
+  accessToken: null
+}
+
+var currentStepNumber;
+
+$(document).ready(function(){
+  Strings.ADD_PLACE_NOT_CONNECTED_MESSAGE = "You must have an access token to query your High Fidelity places.<br><br>" +
+    "Please go back and connect your account.";
+
+  $('#connect-account-btn').attr('href', URLs.METAVERSE_URL + "/user/tokens/new?for_domain_server=true");
+
+  $('[data-toggle="tooltip"]').tooltip();
+  
+  $('.perms-link').on('click', function() {
+    var modal_body = '<div>';
+    modal_body += '<b>None</b> - No one will have permissions. Only you and the users your have given administrator privileges to will have permissions.</br></br>';
+    modal_body += '<b>Friends</b> - Users who are your Friends in High Fidelity.</br></br>';
+    modal_body += '<b>Users logged into High Fidelity</b> - Users who are currently logged into High Fidelity.</br></br>';
+    modal_body += '<b>Everyone</b> - Anyone who uses High Fidelity.';
+    modal_body += '</div>';
+
+    dialog = bootbox.dialog({
+      title: "User definition",
+      message: modal_body,
+      closeButton: true
+    });
+    return false;
+  });
+
+  $('body').on('click', '.next-button', function() {
+    goToNextStep();
+  });
+
+  $('body').on('click', '.back-button', function() {
+    goToPreviousStep();
+  });
+
+  $('body').on('click', '#skip-wizard-button', function() {
+    skipWizard();
+  })
+
+  $('body').on('click', '#connect-account-btn', function() {
+    $(this).blur();
+    prepareAccessTokenPrompt(function(accessToken) {
+      Metaverse.accessToken = accessToken;
+      saveAccessToken();
+    });
+  });
+
+  $('body').on('click', '#save-permissions', function() {
+    savePermissions();
+  });
+
+  function triggerSaveUsernamePassword(event) {
+      if (event.keyCode === 13) {
+          $("#save-username-password").click();
+      }
+  }
+  $("#http_username").keyup(triggerSaveUsernamePassword);
+  $("#http_password").keyup(triggerSaveUsernamePassword);
+  $("#verify_http_password").keyup(triggerSaveUsernamePassword);
+  $('body').on('click', '#save-username-password', function() {
+    saveUsernamePassword();
+  });
+
+  $('body').on('click', '#change-place-name', function() {
+    chooseFromHighFidelityPlaces(Settings.data.values.metaverse.access_token, "/0,-10,0", function(placeName) {
+      updatePlaceNameLink(placeName);
+    });
+  });
+
+  $('body').on('click', '#explore-settings', function() {
+    exploreSettings();
+  });
+
+  $('input[type=radio][name=connect-radio]').change(function() {
+    var inputs = $('input[type=radio][name=rez-radio]');
+    var disabled = [];
+
+    switch (this.value) {
+      case 'none':
+        disabled = inputs.splice(1);
+        break;
+      case 'friends':
+        disabled = inputs.splice(2);
+        break;
+      case 'logged-in':
+        disabled = inputs.splice(3);
+        break;
+      case 'everyone':
+        disabled = inputs.splice(4);
+        break;
+    }
+
+    $.each(inputs, function() {
+      $(this).prop('disabled', false);
+    });
+    $.each(disabled, function() {
+      if ($(this).prop('checked')) {
+        $(inputs.last()).prop('checked', true);
+      }
+      $(this).prop('disabled', true);
+    });
+  });
+
+  reloadSettings(function(success) {
+    if (success) {
+      getDomainFromAPI();
+      setupWizardSteps();
+      updatePlaceNameDisplay();
+      updateUsernameDisplay();
+    } else {
+      swal({
+        title: '',
+        type: 'error',
+        text: "There was a problem loading the domain settings.\nPlease refresh the page to try again.",
+      });
+    }
+  });
+});
+
+function setupWizardSteps() {
+  currentStepNumber = Settings.data.values.wizard.steps_completed;
+  var steps = null;
+
+  if (Settings.data.values.wizard.cloud_domain) {
+    $('.desktop-only').remove();
+    $('.wizard-step:first').find('.back-button').hide();
+
+    steps = $('.wizard-step');
+    $(steps).each(function(i) {
+      $(this).children(".step-title").text("Step " + (i + 1) + " of " + (steps.length - 1));
+    });
+
+    $('#permissions-description').html('You <span id="username-display"></span>have been assigned administrator privileges to this domain.');
+    $('#admin-description').html('Add more High Fidelity usernames');
+  } else {
+    $('.cloud-only').remove();
+    $('#save-permissions').text("Finish");
+
+    steps = $('.wizard-step');
+    $(steps).each(function(i) {
+      $(this).children(".step-title").text("Step " + (i + 1) + " of " + steps.length);
+    });
+
+    if (currentStepNumber == 0) {
+      $('#skip-wizard-button').show();
+    }
+  }
+
+  var currentStep = steps[currentStepNumber];
+  $(currentStep).show();
+}
+
+function updatePlaceNameLink(address) {
+  if (address) {
+    $('#place-name-link').html('Your domain is reachable at: <a target="_blank" href="' + URLs.PLACE_URL + '/' + address + '">' + address + '</a>');
+  }
+}
+
+function updatePlaceNameDisplay() {
+  if (Settings.data.values.metaverse.id) {
+    $.getJSON(URLs.METAVERSE_URL + '/api/v1/domains/' + Settings.data.values.metaverse.id, function(data) {
+
+      if (data.status === 'success') {
+        if (data.domain.default_place_name) {
+          // Place name
+          updatePlaceNameLink(data.domain.default_place_name);
+        } else if (data.domain.name) {
+          // Temporary name
+          updatePlaceNameLink(data.domain.name);
+        } else if (data.domain.network_address) {
+          if (data.domain.network_port !== 40102) {
+            // IP:PORT
+            updatePlaceNameLink(data.domain.network_address + ':' + data.domain.network_port);
+          } else {
+            // IP
+            updatePlaceNameLink(data.domain.network_address);
+          }
+        }
+      } else {
+        console.warn('Request Failed');
+      }
+    }).fail(function() {
+      console.warn('Request Failed');
+    });
+  } else {
+    console.warn('No metaverse domain ID!');
+  }
+}
+
+function updateUsernameDisplay() {
+  var permissions = Settings.data.values.security.permissions;
+  if (permissions.length > 0) {
+    $('#username-display').html('<b>(' + permissions[0].permissions_id + ')</b> ');
+  }
+}
+
+function reloadSettings(callback) {
+  $.getJSON('/settings.json', function(data){
+    Settings.data = data;
+
+    if (callback) {
+      // call the callback now that settings are loaded
+      callback(true);
+    }
+  }).fail(function() {
+    if (callback) {
+      // call the failure object since settings load failed
+      callback(false)
+    }
+  });
+}
+
+function postSettings(jsonSettings, callback) {
+  console.log("----- SAVING ------");
+  console.log(JSON.stringify(jsonSettings));
+
+  // POST the form JSON to the domain-server settings.json endpoint so the settings are saved
+  $.ajax('/settings.json', {
+    data: JSON.stringify(jsonSettings),
+    contentType: 'application/json',
+    type: 'POST'
+  }).done(function(data){
+    if (data.status == "success") {
+      if (callback) {
+        callback();
+      }
+      reloadSettings();
+    } else {
+      swal("Error", Strings.LOADING_SETTINGS_ERROR)
+      reloadSettings();
+    }
+  }).fail(function(){
+    swal("Error", Strings.LOADING_SETTINGS_ERROR)
+    reloadSettings();
+  });
+}
+
+function goToNextStep() {
+  $('#skip-wizard-button').hide();
+
+  var currentStep = $('body').find('.wizard-step:visible');
+  var nextStep = currentStep.next('.wizard-step');
+
+  var formJSON = {
+    "wizard": {}
+  }
+
+  if (nextStep.length > 0) {
+    currentStep.hide();
+    nextStep.show();
+
+    currentStepNumber += 1;
+
+    postSettings({
+      "wizard": {
+        "steps_completed": currentStepNumber.toString()
+      }
+    });
+  } else {
+    postSettings({
+      "wizard": {
+        "steps_completed": "0",
+        "completed_once": true
+      }
+    }, redirectToSettings);
+  }
+}
+
+function goToPreviousStep() {
+  var currentStep = $('body').find('.wizard-step:visible');
+  var previousStep = currentStep.prev('.wizard-step');
+
+  var formJSON = {
+    "wizard": {}
+  }
+
+  if (previousStep.length > 0) {
+    currentStep.hide();
+    previousStep.show();
+
+    currentStepNumber -= 1;
+
+    postSettings({
+      "wizard": {
+        "steps_completed": currentStepNumber.toString()
+      }
+    });
+  }
+}
+
+function skipWizard() {
+  postSettings({
+    "wizard": {
+      "steps_completed": "0",
+      "completed_once": true
+    }
+  }, redirectToSettings);
+}
+
+function redirectToSettings() {
+  var redirectURL = "/settings" + location.search;
+  if (Settings.data.values.wizard.cloud_domain) {
+    if (location.search.length > 0) {
+      redirectURL += "&";
+    } else {
+      redirectURL += "?";
+    }
+    redirectURL += "cloud-wizard-exit";
+  }
+  location.href = redirectURL;
+}
+
+function saveAccessToken() {
+  var formJSON = {
+    "metaverse": {}
+  }
+  if (Metaverse.accessToken) {
+    formJSON.metaverse.access_token = Metaverse.accessToken;
+  }
+
+  // remove focus from the button
+  $(this).blur();
+
+  // POST the form JSON to the domain-server settings.json endpoint so the settings are saved
+  postSettings(formJSON, goToNextStep);
+}
+
+function getSettingDescriptionForKey(groupKey, settingKey) {
+  for (var i in Settings.data.descriptions) {
+    var group = Settings.data.descriptions[i];
+    if (group.name === groupKey) {
+      for (var j in group.settings) {
+        var setting = group.settings[j];
+        if (setting.name === settingKey) {
+          return setting;
+        }
+      }
+    }
+  }
+}
+
+function savePermissions() {
+  var localhostPermissions = (Settings.data.values.wizard.cloud_domain !== true)
+  var anonymousCanConnect = false;
+  var friendsCanConnect = false;
+  var loggedInCanConnect = false;
+  var anonymousCanRez = false;
+  var friendsCanRez = false;
+  var loggedInCanRez = false;
+
+  var connectValue = $('input[name=connect-radio]:checked').val();
+  var rezValue = $('input[name=rez-radio]:checked').val();
+
+  switch (connectValue) {
+    case "friends":
+      friendsCanConnect = true;
+      break;
+    case "logged-in":
+      friendsCanConnect = true;
+      loggedInCanConnect = true;
+      break;
+    case "everyone":
+      anonymousCanConnect = true;
+      friendsCanConnect = true;
+      loggedInCanConnect = true;
+      break;
+  }
+
+  switch (rezValue) {
+    case "friends":
+      friendsCanRez = true;
+      break;
+    case "logged-in":
+      friendsCanRez = true;
+      loggedInCanRez = true;
+      break;
+    case "everyone":
+      anonymousCanRez = true;
+      friendsCanRez = true;
+      loggedInCanRez = true;
+      break;
+  }
+
+  var admins = $('#admin-usernames').val().split(',');
+
+  var existingAdmins = Settings.data.values.security.permissions.map(function(value) {
+    return value.permissions_id;
+  });
+  admins = admins.concat(existingAdmins);
+
+  // Filter out unique values
+  admins = _.uniq(admins.map(function(username) {
+    return username.trim();
+  })).filter(function(username) {
+    return username !== "";
+  });
+
+  var formJSON = {
+    "security": {
+      "standard_permissions": [
+        {
+          "id_can_connect": anonymousCanConnect,
+          "id_can_rez": anonymousCanRez,
+          "id_can_rez_certified": anonymousCanRez,
+          "id_can_rez_tmp": anonymousCanRez,
+          "id_can_rez_tmp_certified": anonymousCanRez,
+          "permissions_id": "anonymous"
+        },
+        {
+          "id_can_connect": friendsCanConnect,
+          "id_can_rez": friendsCanRez,
+          "id_can_rez_certified": friendsCanRez,
+          "id_can_rez_tmp": friendsCanRez,
+          "id_can_rez_tmp_certified": friendsCanRez,
+          "permissions_id": "friends"
+        },
+        {
+          "id_can_connect": loggedInCanConnect,
+          "id_can_rez": loggedInCanRez,
+          "id_can_rez_certified": loggedInCanRez,
+          "id_can_rez_tmp": loggedInCanRez,
+          "id_can_rez_tmp_certified": loggedInCanRez,
+          "permissions_id": "logged-in"
+        },
+        {
+          "id_can_adjust_locks": localhostPermissions,
+          "id_can_connect": localhostPermissions,
+          "id_can_connect_past_max_capacity": localhostPermissions,
+          "id_can_kick": localhostPermissions,
+          "id_can_replace_content": localhostPermissions,
+          "id_can_rez": localhostPermissions,
+          "id_can_rez_certified": localhostPermissions,
+          "id_can_rez_tmp": localhostPermissions,
+          "id_can_rez_tmp_certified": localhostPermissions,
+          "id_can_write_to_asset_server": localhostPermissions,
+          "permissions_id": "localhost"
+        }
+      ]
+    }
+  }
+
+  if (admins.length > 0) {
+    formJSON.security.permissions = [];
+
+    var permissionsDesc = getSettingDescriptionForKey("security", "permissions");
+    for (var i in admins) {
+      var admin = admins[i];
+      var perms = {};
+      for (var i in permissionsDesc.columns) {
+        var name = permissionsDesc.columns[i].name;
+        if (name === "permissions_id") {
+          perms[name] = admin;
+        } else {
+          perms[name] = true;
+        }
+      }
+      formJSON.security.permissions.push(perms);
+    }
+  }
+
+  // remove focus from the button
+  $(this).blur();
+
+  postSettings(formJSON, goToNextStep);
+}
+
+function saveUsernamePassword() {
+  var username = $("#http_username").val();
+  var password = $("#http_password").val();
+  var verify_password = $("#verify_http_password").val();
+
+  if (username.length == 0) {
+    bootbox.alert({ "message": "You must set a username!", "title": "Username Error" });
+    return;
+  }
+
+  if (password.length == 0) {
+    bootbox.alert({ "message": "You must set a password!", "title": "Password Error" });
+    return;
+  }
+
+  if (password != verify_password) {
+    bootbox.alert({ "message": "Passwords must match!", "title": "Password Error" });
+    return;
+  }
+
+  currentStepNumber += 1;
+
+  var formJSON = {
+    "security": {
+      "http_username": username,
+      "http_password": sha256_digest(password)
+    },
+    "wizard": {
+      "steps_completed": currentStepNumber.toString()
+    }
+  }
+
+  // remove focus from the button
+  $(this).blur();
+
+  // POST the form JSON to the domain-server settings.json endpoint so the settings are saved
+  postSettings(formJSON, function() {
+    location.reload();
+  });
+}
+
+function exploreSettings() {
+  if ($('#go-to-domain').is(":checked")) {
+    var link = $('#place-name-link a:first');
+    if (link.length > 0) {
+      window.open(link.attr("href"));
+    }
+  }
+
+  goToNextStep();
+}
diff --git a/domain-server/src/DomainGatekeeper.cpp b/domain-server/src/DomainGatekeeper.cpp
index 62f56184f4..188c420a5d 100644
--- a/domain-server/src/DomainGatekeeper.cpp
+++ b/domain-server/src/DomainGatekeeper.cpp
@@ -54,6 +54,7 @@ void DomainGatekeeper::processConnectRequestPacket(QSharedPointer<ReceivedMessag
     if (message->getSize() == 0) {
         return;
     }
+    
     QDataStream packetStream(message->getMessage());
 
     // read a NodeConnectionData object from the packet so we can pass around this data while we're inspecting it
@@ -268,24 +269,27 @@ void DomainGatekeeper::updateNodePermissions() {
             userPerms.permissions |= NodePermissions::Permission::canAdjustLocks;
             userPerms.permissions |= NodePermissions::Permission::canRezPermanentEntities;
             userPerms.permissions |= NodePermissions::Permission::canRezTemporaryEntities;
+            userPerms.permissions |= NodePermissions::Permission::canRezPermanentCertifiedEntities;
+            userPerms.permissions |= NodePermissions::Permission::canRezTemporaryCertifiedEntities;
             userPerms.permissions |= NodePermissions::Permission::canWriteToAssetServer;
+            userPerms.permissions |= NodePermissions::Permission::canReplaceDomainContent;
         } else {
-            // this node is an agent
-            const QHostAddress& addr = node->getLocalSocket().getAddress();
-            bool isLocalUser = (addr == limitedNodeList->getLocalSockAddr().getAddress() ||
-                                addr == QHostAddress::LocalHost);
-
             // at this point we don't have a sending socket for packets from this node - assume it is the active socket
             // or the public socket if we haven't activated a socket for the node yet
             HifiSockAddr connectingAddr = node->getActiveSocket() ? *node->getActiveSocket() : node->getPublicSocket();
 
             QString hardwareAddress;
             QUuid machineFingerprint;
+            bool isLocalUser { false };
 
             DomainServerNodeData* nodeData = static_cast<DomainServerNodeData*>(node->getLinkedData());
             if (nodeData) {
                 hardwareAddress = nodeData->getHardwareAddress();
                 machineFingerprint = nodeData->getMachineFingerprint();
+
+                auto sendingAddress = nodeData->getSendingSockAddr().getAddress();
+                isLocalUser = (sendingAddress == limitedNodeList->getLocalSockAddr().getAddress() ||
+                               sendingAddress == QHostAddress::LocalHost);
             }
 
             userPerms = setPermissionsForUser(isLocalUser, verifiedUsername, connectingAddr.getAddress(), hardwareAddress, machineFingerprint);
@@ -356,7 +360,10 @@ SharedNodePointer DomainGatekeeper::processAssignmentConnectRequest(const NodeCo
     userPerms.permissions |= NodePermissions::Permission::canAdjustLocks;
     userPerms.permissions |= NodePermissions::Permission::canRezPermanentEntities;
     userPerms.permissions |= NodePermissions::Permission::canRezTemporaryEntities;
+    userPerms.permissions |= NodePermissions::Permission::canRezPermanentCertifiedEntities;
+    userPerms.permissions |= NodePermissions::Permission::canRezTemporaryCertifiedEntities;
     userPerms.permissions |= NodePermissions::Permission::canWriteToAssetServer;
+    userPerms.permissions |= NodePermissions::Permission::canReplaceDomainContent;
     newNode->setPermissions(userPerms);
     return newNode;
 }
@@ -385,7 +392,7 @@ SharedNodePointer DomainGatekeeper::processAgentConnectRequest(const NodeConnect
             // user is attempting to prove their identity to us, but we don't have enough information
             sendConnectionTokenPacket(username, nodeConnection.senderSockAddr);
             // ask for their public key right now to make sure we have it
-            requestUserPublicKey(username);
+            requestUserPublicKey(username, true);
             getGroupMemberships(username); // optimistically get started on group memberships
 #ifdef WANT_DEBUG
             qDebug() << "stalling login because we have no username-signature:" << username;
@@ -521,7 +528,10 @@ bool DomainGatekeeper::verifyUserSignature(const QString& username,
                                            const HifiSockAddr& senderSockAddr) {
     // it's possible this user can be allowed to connect, but we need to check their username signature
     auto lowerUsername = username.toLower();
-    QByteArray publicKeyArray = _userPublicKeys.value(lowerUsername);
+    KeyFlagPair publicKeyPair = _userPublicKeys.value(lowerUsername);
+
+    QByteArray publicKeyArray = publicKeyPair.first;
+    bool isOptimisticKey = publicKeyPair.second;
 
     const QUuid& connectionToken = _connectionTokenHash.value(lowerUsername);
 
@@ -555,10 +565,16 @@ bool DomainGatekeeper::verifyUserSignature(const QString& username,
                 return true;
 
             } else {
-                if (!senderSockAddr.isNull()) {
-                    qDebug() << "Error decrypting username signature for " << username << "- denying connection.";
+                // we only send back a LoginError if this wasn't an "optimistic" key
+                // (a key that we hoped would work but is probably stale)
+
+                if (!senderSockAddr.isNull() && !isOptimisticKey) {
+                    qDebug() << "Error decrypting username signature for" << username << "- denying connection.";
                     sendConnectionDeniedPacket("Error decrypting username signature.", senderSockAddr,
                         DomainHandler::ConnectionRefusedReason::LoginError);
+                } else if (!senderSockAddr.isNull()) {
+                    qDebug() << "Error decrypting username signature for" << username << "with optimisitic key -"
+                        << "re-requesting public key and delaying connection";
                 }
 
                 // free up the public key, we don't need it anymore
@@ -604,20 +620,7 @@ bool DomainGatekeeper::isWithinMaxCapacity() {
     return true;
 }
 
-
-void DomainGatekeeper::preloadAllowedUserPublicKeys() {
-    QStringList allowedUsers = _server->_settingsManager.getAllNames();
-
-    if (allowedUsers.size() > 0) {
-        // in the future we may need to limit how many requests here - for now assume that lists of allowed users are not
-        // going to create > 100 requests
-        foreach(const QString& username, allowedUsers) {
-            requestUserPublicKey(username);
-        }
-    }
-}
-
-void DomainGatekeeper::requestUserPublicKey(const QString& username) {
+void DomainGatekeeper::requestUserPublicKey(const QString& username, bool isOptimistic) {
     // don't request public keys for the standard psuedo-account-names
     if (NodePermissions::standardNames.contains(username, Qt::CaseInsensitive)) {
         return;
@@ -628,7 +631,7 @@ void DomainGatekeeper::requestUserPublicKey(const QString& username) {
         // public-key request for this username is already flight, not rerequesting
         return;
     }
-    _inFlightPublicKeyRequests += lowerUsername;
+    _inFlightPublicKeyRequests.insert(lowerUsername, isOptimistic);
 
     // even if we have a public key for them right now, request a new one in case it has just changed
     JSONCallbackParameters callbackParams;
@@ -640,7 +643,7 @@ void DomainGatekeeper::requestUserPublicKey(const QString& username) {
 
     const QString USER_PUBLIC_KEY_PATH = "api/v1/users/%1/public_key";
 
-    qDebug() << "Requesting public key for user" << username;
+    qDebug().nospace() << "Requesting " << (isOptimistic ? "optimistic " : " ") << "public key for user " << username;
 
     DependencyManager::get<AccountManager>()->sendRequest(USER_PUBLIC_KEY_PATH.arg(username),
                                               AccountManagerAuth::None,
@@ -662,16 +665,21 @@ void DomainGatekeeper::publicKeyJSONCallback(QNetworkReply& requestReply) {
     QJsonObject jsonObject = QJsonDocument::fromJson(requestReply.readAll()).object();
     QString username = extractUsernameFromPublicKeyRequest(requestReply);
 
+    bool isOptimisticKey = _inFlightPublicKeyRequests.take(username);
+
     if (jsonObject["status"].toString() == "success" && !username.isEmpty()) {
         // pull the public key as a QByteArray from this response
         const QString JSON_DATA_KEY = "data";
         const QString JSON_PUBLIC_KEY_KEY = "public_key";
 
-        _userPublicKeys[username.toLower()] =
-            QByteArray::fromBase64(jsonObject[JSON_DATA_KEY].toObject()[JSON_PUBLIC_KEY_KEY].toString().toUtf8());
-    }
+        qDebug().nospace() << "Extracted " << (isOptimisticKey ? "optimistic " : " ") << "public key for " << username.toLower();
 
-    _inFlightPublicKeyRequests.remove(username);
+        _userPublicKeys[username.toLower()] =
+            {
+                QByteArray::fromBase64(jsonObject[JSON_DATA_KEY].toObject()[JSON_PUBLIC_KEY_KEY].toString().toUtf8()),
+                isOptimisticKey
+            };
+    }
 }
 
 void DomainGatekeeper::publicKeyJSONErrorCallback(QNetworkReply& requestReply) {
@@ -806,9 +814,15 @@ void DomainGatekeeper::processICEPeerInformationPacket(QSharedPointer<ReceivedMe
 
 void DomainGatekeeper::processICEPingPacket(QSharedPointer<ReceivedMessage> message) {
     auto limitedNodeList = DependencyManager::get<LimitedNodeList>();
-    auto pingReplyPacket = limitedNodeList->constructICEPingReplyPacket(*message, limitedNodeList->getSessionUUID());
 
-    limitedNodeList->sendPacket(std::move(pingReplyPacket), message->getSenderSockAddr());
+    // before we respond to this ICE ping packet, make sure we have a peer in the list that matches
+    QUuid icePeerID = QUuid::fromRfc4122({ message->getRawMessage(), NUM_BYTES_RFC4122_UUID });
+    
+    if (_icePeers.contains(icePeerID)) {
+        auto pingReplyPacket = limitedNodeList->constructICEPingReplyPacket(*message, limitedNodeList->getSessionUUID());
+
+        limitedNodeList->sendPacket(std::move(pingReplyPacket), message->getSenderSockAddr());
+    }
 }
 
 void DomainGatekeeper::processICEPingReplyPacket(QSharedPointer<ReceivedMessage> message) {
@@ -927,9 +941,12 @@ void DomainGatekeeper::getDomainOwnerFriendsList() {
     callbackParams.errorCallbackMethod = "getDomainOwnerFriendsListErrorCallback";
 
     const QString GET_FRIENDS_LIST_PATH = "api/v1/user/friends";
-    DependencyManager::get<AccountManager>()->sendRequest(GET_FRIENDS_LIST_PATH, AccountManagerAuth::Required,
-                                                          QNetworkAccessManager::GetOperation, callbackParams, QByteArray(),
-                                                          NULL, QVariantMap());
+    if (DependencyManager::get<AccountManager>()->hasValidAccessToken()) {
+        DependencyManager::get<AccountManager>()->sendRequest(GET_FRIENDS_LIST_PATH, AccountManagerAuth::Required,
+                                                              QNetworkAccessManager::GetOperation, callbackParams, QByteArray(),
+                                                              NULL, QVariantMap());
+    }
+    
 }
 
 void DomainGatekeeper::getDomainOwnerFriendsListJSONCallback(QNetworkReply& requestReply) {
diff --git a/domain-server/src/DomainGatekeeper.h b/domain-server/src/DomainGatekeeper.h
index 163f255411..09db075e07 100644
--- a/domain-server/src/DomainGatekeeper.h
+++ b/domain-server/src/DomainGatekeeper.h
@@ -39,8 +39,6 @@ public:
                                 const QUuid& walletUUID, const QString& nodeVersion);
     QUuid assignmentUUIDForPendingAssignment(const QUuid& tempUUID);
     
-    void preloadAllowedUserPublicKeys();
-    
     void removeICEPeer(const QUuid& peerUUID) { _icePeers.remove(peerUUID); }
 
     static void sendProtocolMismatchConnectionDenial(const HifiSockAddr& senderSockAddr);
@@ -93,7 +91,7 @@ private:
     
     void pingPunchForConnectingPeer(const SharedNetworkPeer& peer);
     
-    void requestUserPublicKey(const QString& username);
+    void requestUserPublicKey(const QString& username, bool isOptimistic = false);
     
     DomainServer* _server;
     
@@ -102,8 +100,17 @@ private:
     QHash<QUuid, SharedNetworkPeer> _icePeers;
     
     QHash<QString, QUuid> _connectionTokenHash;
-    QHash<QString, QByteArray> _userPublicKeys;
-    QSet<QString> _inFlightPublicKeyRequests; // keep track of which we've already asked for
+
+    // the word "optimistic" below is used for keys that we request during user connection before the user has
+    // had a chance to upload a new public key
+
+    // we don't send back user signature decryption errors for those keys so that there isn't a thrasing of key re-generation
+    // and connection refusal
+
+    using KeyFlagPair = QPair<QByteArray, bool>;
+
+    QHash<QString, KeyFlagPair> _userPublicKeys; // keep track of keys and flag them as optimistic or not
+    QHash<QString, bool> _inFlightPublicKeyRequests; // keep track of keys we've asked for (and if it was optimistic)
     QSet<QString> _domainOwnerFriends; // keep track of friends of the domain owner
     QSet<QString> _inFlightGroupMembershipsRequests; // keep track of which we've already asked for
 
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 8e3d04897b..c2fe3af7c1 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -40,11 +40,13 @@
 #include <LogHandler.h>
 #include <PathUtils.h>
 #include <NumericalConstants.h>
+#include <Trace.h>
+#include <StatTracker.h>
 
 #include "DomainServerNodeData.h"
 #include "NodeConnectionData.h"
-#include <Trace.h>
-#include <StatTracker.h>
+
+const QString ACCESS_TOKEN_KEY_PATH = "metaverse.access_token";
 
 int const DomainServer::EXIT_CODE_REBOOT = 234923;
 
@@ -54,6 +56,82 @@ const QString ICE_SERVER_DEFAULT_HOSTNAME = "ice.highfidelity.com";
 const QString ICE_SERVER_DEFAULT_HOSTNAME = "dev-ice.highfidelity.com";
 #endif
 
+bool DomainServer::forwardMetaverseAPIRequest(HTTPConnection* connection,
+                                              const QString& metaversePath,
+                                              const QString& requestSubobjectKey,
+                                              std::initializer_list<QString> requiredData,
+                                              std::initializer_list<QString> optionalData,
+                                              bool requireAccessToken) {
+
+    auto accessTokenVariant = valueForKeyPath(_settingsManager.getSettingsMap(), ACCESS_TOKEN_KEY_PATH);
+    if (accessTokenVariant == nullptr && requireAccessToken) {
+        connection->respond(HTTPConnection::StatusCode400, "User access token has not been set");
+        return true;
+    }
+
+    QJsonObject subobject;
+
+    auto params = connection->parseUrlEncodedForm();
+
+    for (auto& key : requiredData) {
+        auto it = params.find(key);
+        if (it == params.end()) {
+            auto error = "Bad request, expected param '" + key + "'";
+            connection->respond(HTTPConnection::StatusCode400, error.toLatin1());
+            return true;
+        }
+        subobject.insert(key, it.value());
+    }
+
+    for (auto& key : optionalData) {
+        auto it = params.find(key);
+        if (it != params.end()) {
+            subobject.insert(key, it.value());
+        }
+    }
+
+    QJsonObject root;
+    root.insert(requestSubobjectKey, subobject);
+    QJsonDocument doc { root };
+
+    QUrl url { NetworkingConstants::METAVERSE_SERVER_URL.toString() + metaversePath };
+
+    QNetworkRequest req(url);
+    req.setHeader(QNetworkRequest::UserAgentHeader, HIGH_FIDELITY_USER_AGENT);
+    req.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
+
+    if (accessTokenVariant != nullptr) {
+        auto accessTokenHeader = QString("Bearer ") + accessTokenVariant->toString();
+        req.setRawHeader("Authorization", accessTokenHeader.toLatin1());
+    }
+
+    QNetworkReply* reply;
+    auto method = connection->requestOperation();
+    if (method == QNetworkAccessManager::GetOperation) {
+        reply = NetworkAccessManager::getInstance().get(req);
+    } else if (method == QNetworkAccessManager::PostOperation) {
+        reply = NetworkAccessManager::getInstance().post(req, doc.toJson());
+    } else if (method == QNetworkAccessManager::PutOperation) {
+        reply = NetworkAccessManager::getInstance().put(req, doc.toJson());
+    } else {
+        connection->respond(HTTPConnection::StatusCode400, "Error forwarding request, unsupported method");
+        return true;
+    }
+
+    connect(reply, &QNetworkReply::finished, this, [reply, connection]() {
+        if (reply->error() != QNetworkReply::NoError) {
+            auto data = reply->readAll();
+            qDebug() << "Got error response from metaverse server (" << reply->url() << "): " << data << reply->errorString();
+            connection->respond(HTTPConnection::StatusCode400, data);
+            return;
+        }
+
+        connection->respond(HTTPConnection::StatusCode200, reply->readAll());
+    });
+
+    return true;
+}
+
 DomainServer::DomainServer(int argc, char* argv[]) :
     QCoreApplication(argc, argv),
     _gatekeeper(this),
@@ -160,10 +238,10 @@ DomainServer::DomainServer(int argc, char* argv[]) :
         getTemporaryName();
     }
 
-    _gatekeeper.preloadAllowedUserPublicKeys(); // so they can connect on first request
-
+    // send signal to DomainMetadata when descriptors changed
     _metadata = new DomainMetadata(this);
-
+    connect(&_settingsManager, &DomainServerSettingsManager::settingsUpdated,
+            _metadata, &DomainMetadata::descriptorsChanged);
 
     qDebug() << "domain-server is running";
     static const QString AC_SUBNET_WHITELIST_SETTING_PATH = "security.ac_subnet_whitelist";
@@ -221,6 +299,8 @@ void DomainServer::parseCommandLine() {
     const QCommandLineOption masterConfigOption("master-config", "Deprecated config-file option");
     parser.addOption(masterConfigOption);
 
+    const QCommandLineOption parentPIDOption(PARENT_PID_OPTION, "PID of the parent process", "parent-pid");
+    parser.addOption(parentPIDOption);
 
     if (!parser.parse(QCoreApplication::arguments())) {
         qWarning() << parser.errorText() << endl;
@@ -249,6 +329,17 @@ void DomainServer::parseCommandLine() {
         _overrideDomainID = true;
         qDebug() << "domain-server ID is" << _overridingDomainID;
     }
+
+
+    if (parser.isSet(parentPIDOption)) {
+        bool ok = false;
+        int parentPID = parser.value(parentPIDOption).toInt(&ok);
+
+        if (ok) {
+            qDebug() << "Parent process PID is" << parentPID;
+            watchParentProcess(parentPID);
+        }
+    }
 }
 
 DomainServer::~DomainServer() {
@@ -445,7 +536,7 @@ const QString DISABLED_AUTOMATIC_NETWORKING_VALUE = "disabled";
 
 
 
-bool DomainServer::packetVersionMatch(const udt::Packet& packet) {
+bool DomainServer::isPacketVerified(const udt::Packet& packet) {
     PacketType headerType = NLPacket::typeInHeader(packet);
     PacketVersion headerVersion = NLPacket::versionInHeader(packet);
 
@@ -458,7 +549,48 @@ bool DomainServer::packetVersionMatch(const udt::Packet& packet) {
         DomainGatekeeper::sendProtocolMismatchConnectionDenial(packet.getSenderSockAddr());
     }
 
-    // let the normal nodeList implementation handle all other packets.
+    if (!PacketTypeEnum::getNonSourcedPackets().contains(headerType)) {
+        // this is a sourced packet - first check if we have a node that matches
+        QUuid sourceID = NLPacket::sourceIDInHeader(packet);
+        SharedNodePointer sourceNode = nodeList->nodeWithUUID(sourceID);
+
+        if (sourceNode) {
+            // unverified DS packets (due to a lack of connection secret between DS + node)
+            // must come either from the same public IP address or a local IP address (set by RFC 1918)
+
+            DomainServerNodeData* nodeData = static_cast<DomainServerNodeData*>(sourceNode->getLinkedData());
+
+            bool exactAddressMatch = nodeData->getSendingSockAddr() == packet.getSenderSockAddr();
+            bool bothPrivateAddresses = nodeData->getSendingSockAddr().hasPrivateAddress()
+                && packet.getSenderSockAddr().hasPrivateAddress();
+
+            if (nodeData && (exactAddressMatch || bothPrivateAddresses)) {
+                // to the best of our ability we've verified that this packet comes from the right place
+                // let the NodeList do its checks now (but pass it the sourceNode so it doesn't need to look it up again)
+                return nodeList->isPacketVerifiedWithSource(packet, sourceNode.data());
+            } else {
+                static const QString UNKNOWN_REGEX = "Packet of type \\d+ \\([\\sa-zA-Z:]+\\) received from unmatched IP for UUID";
+                static QString repeatedMessage
+                    = LogHandler::getInstance().addRepeatedMessageRegex(UNKNOWN_REGEX);
+
+                qDebug() << "Packet of type" << headerType
+                    << "received from unmatched IP for UUID" << uuidStringWithoutCurlyBraces(sourceID);
+
+                return false;
+            }
+        } else {
+            static const QString UNKNOWN_REGEX = "Packet of type \\d+ \\([\\sa-zA-Z:]+\\) received from unknown node with UUID";
+            static QString repeatedMessage
+                = LogHandler::getInstance().addRepeatedMessageRegex(UNKNOWN_REGEX);
+
+            qDebug() << "Packet of type" << headerType
+                << "received from unknown node with UUID" << uuidStringWithoutCurlyBraces(sourceID);
+
+            return false;
+        }
+    }
+
+    // fallback to allow the normal NodeList implementation to verify packets
     return nodeList->isPacketVerified(packet);
 }
 
@@ -557,11 +689,9 @@ void DomainServer::setupNodeListAndAssignments() {
     addStaticAssignmentsToQueue();
 
     // set a custom packetVersionMatch as the verify packet operator for the udt::Socket
-    nodeList->setPacketFilterOperator(&DomainServer::packetVersionMatch);
+    nodeList->setPacketFilterOperator(&DomainServer::isPacketVerified);
 }
 
-const QString ACCESS_TOKEN_KEY_PATH = "metaverse.access_token";
-
 bool DomainServer::resetAccountManagerAccessToken() {
     if (!_oauthProviderURL.isEmpty()) {
         // check for an access-token in our settings, can optionally be overidden by env value
@@ -698,7 +828,7 @@ void DomainServer::setupICEHeartbeatForFullNetworking() {
 }
 
 void DomainServer::updateICEServerAddresses() {
-    if (_iceAddressLookupID == -1) {
+    if (_iceAddressLookupID == INVALID_ICE_LOOKUP_ID) {
         _iceAddressLookupID = QHostInfo::lookupHost(_iceServerAddr, this, SLOT(handleICEHostInfo(QHostInfo)));
     }
 }
@@ -840,7 +970,6 @@ void DomainServer::populateDefaultStaticAssignmentsExcludingTypes(const QSet<Ass
 }
 
 void DomainServer::processListRequestPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer sendingNode) {
-
     QDataStream packetStream(message->getMessage());
     NodeConnectionData nodeRequestData = NodeConnectionData::fromDataStream(packetStream, message->getSenderSockAddr(), false);
 
@@ -886,7 +1015,8 @@ bool DomainServer::isInInterestSet(const SharedNodePointer& nodeA, const SharedN
 
         bool isAgentWithoutRights = nodeA->getType() == NodeType::Agent
             && nodeB->getType() == NodeType::EntityScriptServer
-            && !nodeA->getCanRez() && !nodeA->getCanRezTmp();
+            && !nodeA->getCanRez() && !nodeA->getCanRezTmp()
+            && !nodeA->getCanRezCertified() && !nodeA->getCanRezTmpCertified();
 
         if (isAgentWithoutRights) {
             return false;
@@ -895,7 +1025,7 @@ bool DomainServer::isInInterestSet(const SharedNodePointer& nodeA, const SharedN
         bool isScriptServerForIneffectiveAgent =
             (nodeA->getType() == NodeType::EntityScriptServer && nodeB->getType() == NodeType::Agent)
             && ((nodeBData && !nodeBData->getNodeInterestSet().contains(NodeType::EntityScriptServer))
-                || (!nodeB->getCanRez() && !nodeB->getCanRezTmp()));
+                || (!nodeB->getCanRez() && !nodeB->getCanRezTmp() && !nodeB->getCanRezCertified() && !nodeB->getCanRezTmpCertified()));
 
         return !isScriptServerForIneffectiveAgent;
     } else {
@@ -1657,6 +1787,8 @@ QString DomainServer::pathForRedirect(QString path) const {
     return "http://" + _hostname + ":" + QString::number(_httpManager.serverPort()) + path;
 }
 
+
+
 const QString URI_OAUTH = "/oauth";
 bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url, bool skipSubHandler) {
     const QString JSON_MIME_TYPE = "application/json";
@@ -1666,15 +1798,23 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
     const QString URI_SETTINGS = "/settings";
     const QString URI_ENTITY_FILE_UPLOAD = "/content/upload";
     const QString URI_RESTART = "/restart";
+    const QString URI_API_PLACES = "/api/places";
+    const QString URI_API_DOMAINS = "/api/domains";
+    const QString URI_API_DOMAINS_ID = "/api/domains/";
 
     const QString UUID_REGEX_STRING = "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}";
 
     auto nodeList = DependencyManager::get<LimitedNodeList>();
 
-    // allow sub-handlers to handle requests that do not require authentication
-    if (_settingsManager.handlePublicHTTPRequest(connection, url)) {
+    auto getSetting = [this](QString keyPath, QVariant& value) -> bool {
+        QVariantMap& settingsMap = _settingsManager.getSettingsMap();
+        QVariant* var = valueForKeyPath(settingsMap, keyPath);
+        if (var == nullptr) {
+            return false;
+        }
+        value = *var;
         return true;
-    }
+    };
 
     // check if this is a request for a scripted assignment (with a temp unique UUID)
     const QString ASSIGNMENT_REGEX_STRING = QString("\\%1\\/(%2)\\/?$").arg(URI_ASSIGNMENT).arg(UUID_REGEX_STRING);
@@ -1736,6 +1876,31 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
         return true;
     }
 
+    // Check if we should redirect/prevent access to the wizard
+    if (connection->requestOperation() == QNetworkAccessManager::GetOperation) {
+        const QString URI_WIZARD = "/wizard/";
+        const QString WIZARD_COMPLETED_ONCE_KEY_PATH = "wizard.completed_once";
+        const QVariant* wizardCompletedOnce = valueForKeyPath(_settingsManager.getSettingsMap(), WIZARD_COMPLETED_ONCE_KEY_PATH);
+        const bool completedOnce = wizardCompletedOnce && wizardCompletedOnce->toBool();
+
+        if (url.path() != URI_WIZARD && url.path().endsWith('/') && !completedOnce) {
+            // First visit, redirect to the wizard
+            QUrl redirectedURL = url;
+            redirectedURL.setPath(URI_WIZARD);
+
+            Headers redirectHeaders;
+            redirectHeaders.insert("Location", redirectedURL.toEncoded());
+
+            connection->respond(HTTPConnection::StatusCode302,
+                                QByteArray(), HTTPConnection::DefaultContentType, redirectHeaders);
+            return true;
+        } else if (url.path() == URI_WIZARD && completedOnce) {
+            // Wizard already completed, return 404
+            connection->respond(HTTPConnection::StatusCode404, "Resource not found.");
+            return true;
+        }
+    }
+
     if (connection->requestOperation() == QNetworkAccessManager::GetOperation) {
         if (url.path() == "/assignments.json") {
             // user is asking for json list of assignments
@@ -1825,6 +1990,13 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
             connection->respond(HTTPConnection::StatusCode200);
             restart();
             return true;
+        } else if (url.path() == URI_API_DOMAINS) {
+            return forwardMetaverseAPIRequest(connection, "/api/v1/domains", "");
+        } else if (url.path().startsWith(URI_API_DOMAINS_ID)) {
+            auto id = url.path().mid(URI_API_DOMAINS_ID.length());
+            return forwardMetaverseAPIRequest(connection, "/api/v1/domains/" + id, "", {}, {}, false);
+        } else if (url.path() == URI_API_PLACES) {
+            return forwardMetaverseAPIRequest(connection, "/api/v1/user/places", "");
         } else {
             // check if this is for json stats for a node
             const QString NODE_JSON_REGEX_STRING = QString("\\%1\\/(%2).json\\/?$").arg(URI_NODES).arg(UUID_REGEX_STRING);
@@ -1904,8 +2076,6 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
             // this is an entity file upload, ask the HTTPConnection to parse the data
             QList<FormData> formData = connection->parseFormData();
 
-            Headers redirectHeaders;
-
             if (formData.size() > 0 && formData[0].second.size() > 0) {
                 // invoke our method to hand the new octree file off to the octree server
                 QMetaObject::invokeMethod(this, "handleOctreeFileReplacement",
@@ -1919,7 +2089,98 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
             }
 
             return true;
+
+        } else if (url.path() == "/domain_settings") {
+            auto accessTokenVariant = valueForKeyPath(_settingsManager.getSettingsMap(), ACCESS_TOKEN_KEY_PATH);
+            if (!accessTokenVariant) {
+                connection->respond(HTTPConnection::StatusCode400);
+                return true;
+            }
+
+        } else if (url.path() == URI_API_DOMAINS) {
+
+            return forwardMetaverseAPIRequest(connection, "/api/v1/domains", "domain", { "label" });
         }
+    } else if (connection->requestOperation() == QNetworkAccessManager::PutOperation) {
+        if (url.path() == URI_API_DOMAINS) {
+            QVariant domainSetting;
+            if (!getSetting(METAVERSE_DOMAIN_ID_KEY_PATH, domainSetting)) {
+                connection->respond(HTTPConnection::StatusCode400, "Domain id has not been set");
+                return true;
+            }
+            auto domainID = domainSetting.toString();
+            return forwardMetaverseAPIRequest(connection, "/api/v1/domains/" + domainID, "domain",
+                                              { }, { "network_address", "network_port", "label" });
+        }  else if (url.path() == URI_API_PLACES) {
+            auto accessTokenVariant = valueForKeyPath(_settingsManager.getSettingsMap(), ACCESS_TOKEN_KEY_PATH);
+            if (!accessTokenVariant->isValid()) {
+                connection->respond(HTTPConnection::StatusCode400, "User access token has not been set");
+                return true;
+            }
+
+            auto params = connection->parseUrlEncodedForm();
+
+            auto it = params.find("place_id");
+            if (it == params.end()) {
+                connection->respond(HTTPConnection::StatusCode400);
+                return true;
+            }
+            QString place_id = it.value();
+
+            it = params.find("path");
+            if (it == params.end()) {
+                connection->respond(HTTPConnection::StatusCode400);
+                return true;
+            }
+            QString path = it.value();
+
+            it = params.find("domain_id");
+            QString domainID;
+            if (it == params.end()) {
+                QVariant domainSetting;
+                if (!getSetting(METAVERSE_DOMAIN_ID_KEY_PATH, domainSetting)) {
+                    connection->respond(HTTPConnection::StatusCode400);
+                    return true;
+                }
+                domainID = domainSetting.toString();
+            } else {
+                domainID = it.value();
+            }
+
+            QJsonObject root {
+                {
+                    "place",
+                    QJsonObject({
+                        { "pointee_query", domainID },
+                        { "path", path }
+                     })
+                }
+            };
+            QJsonDocument doc(root);
+
+
+            QUrl url { NetworkingConstants::METAVERSE_SERVER_URL.toString() + "/api/v1/places/" + place_id };
+
+            url.setQuery("access_token=" + accessTokenVariant->toString());
+
+            QNetworkRequest req(url);
+            req.setHeader(QNetworkRequest::UserAgentHeader, HIGH_FIDELITY_USER_AGENT);
+            req.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
+            QNetworkReply* reply = NetworkAccessManager::getInstance().put(req, doc.toJson());
+
+            connect(reply, &QNetworkReply::finished, this, [reply, connection]() {
+                if (reply->error() != QNetworkReply::NoError) {
+                    qDebug() << "Got error response from metaverse server: " << reply->readAll();
+                    connection->respond(HTTPConnection::StatusCode500,
+                                        "Error communicating with Metaverse");
+                    return;
+                }
+
+                connection->respond(HTTPConnection::StatusCode200, reply->readAll());
+            });
+            return true;
+        }
+
     } else if (connection->requestOperation() == QNetworkAccessManager::DeleteOperation) {
         const QString ALL_NODE_DELETE_REGEX_STRING = QString("\\%1\\/?$").arg(URI_NODES);
         const QString NODE_DELETE_REGEX_STRING = QString("\\%1\\/(%2)\\/$").arg(URI_NODES).arg(UUID_REGEX_STRING);
@@ -1959,10 +2220,10 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
     return _settingsManager.handleAuthenticatedHTTPRequest(connection, url);
 }
 
-const QString HIFI_SESSION_COOKIE_KEY = "DS_WEB_SESSION_UUID";
+static const QString HIFI_SESSION_COOKIE_KEY = "DS_WEB_SESSION_UUID";
+static const QString STATE_QUERY_KEY = "state";
 
 bool DomainServer::handleHTTPSRequest(HTTPSConnection* connection, const QUrl &url, bool skipSubHandler) {
-    qDebug() << "HTTPS request received at" << url.toString();
     if (url.path() == URI_OAUTH) {
 
         QUrlQuery codeURLQuery(url);
@@ -1970,10 +2231,9 @@ bool DomainServer::handleHTTPSRequest(HTTPSConnection* connection, const QUrl &u
         const QString CODE_QUERY_KEY = "code";
         QString authorizationCode = codeURLQuery.queryItemValue(CODE_QUERY_KEY);
 
-        const QString STATE_QUERY_KEY = "state";
         QUuid stateUUID = QUuid(codeURLQuery.queryItemValue(STATE_QUERY_KEY));
 
-        if (!authorizationCode.isEmpty() && !stateUUID.isNull()) {
+        if (!authorizationCode.isEmpty() && !stateUUID.isNull() && _webAuthenticationStateSet.remove(stateUUID)) {
             // fire off a request with this code and state to get an access token for the user
 
             const QString OAUTH_TOKEN_REQUEST_PATH = "/oauth/token";
@@ -1991,47 +2251,83 @@ bool DomainServer::handleHTTPSRequest(HTTPSConnection* connection, const QUrl &u
             tokenRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
 
             QNetworkReply* tokenReply = NetworkAccessManager::getInstance().post(tokenRequest, tokenPostBody.toLocal8Bit());
+            connect(tokenReply, &QNetworkReply::finished, this, &DomainServer::tokenGrantFinished);
 
-            if (_webAuthenticationStateSet.remove(stateUUID)) {
-                // this is a web user who wants to auth to access web interface
-                // we hold the response back to them until we get their profile information
-                // and can decide if they are let in or not
+            // add this connection to our list of pending connections so that we can hold the response
+            _pendingOAuthConnections.insert(stateUUID, connection);
 
-                QEventLoop loop;
-                connect(tokenReply, &QNetworkReply::finished, &loop, &QEventLoop::quit);
+            // set the state UUID on the reply so that we can associate the response with the connection later
+            tokenReply->setProperty(STATE_QUERY_KEY.toLocal8Bit(), stateUUID);
 
-                // start the loop for the token request
-                loop.exec();
+            return true;
+        } else {
+            connection->respond(HTTPConnection::StatusCode400);
 
-                QNetworkReply* profileReply = profileRequestGivenTokenReply(tokenReply);
+            return true;
+        }
+    } else {
+        return false;
+    }
+}
 
-                // stop the loop once the profileReply is complete
-                connect(profileReply, &QNetworkReply::finished, &loop, &QEventLoop::quit);
+HTTPSConnection* DomainServer::connectionFromReplyWithState(QNetworkReply* reply) {
+    // grab the UUID state property from the reply
+    QUuid stateUUID = reply->property(STATE_QUERY_KEY.toLocal8Bit()).toUuid();
 
-                // restart the loop for the profile request
-                loop.exec();
+    if (!stateUUID.isNull()) {
+        return _pendingOAuthConnections.take(stateUUID);
+    } else {
+        return nullptr;
+    }
+}
 
+void DomainServer::tokenGrantFinished() {
+    auto tokenReply = qobject_cast<QNetworkReply*>(sender());
+
+    if (tokenReply) {
+        if (tokenReply->error() == QNetworkReply::NoError) {
+            // now that we have a token for this profile, send off a profile request
+            QNetworkReply* profileReply = profileRequestGivenTokenReply(tokenReply);
+
+            // forward along the state UUID that we kept with the token request
+            profileReply->setProperty(STATE_QUERY_KEY.toLocal8Bit(), tokenReply->property(STATE_QUERY_KEY.toLocal8Bit()));
+
+            connect(profileReply, &QNetworkReply::finished, this, &DomainServer::profileRequestFinished);
+        } else {
+            // the token grant failed, send back a 500 (assuming the connection is still around)
+            auto connection = connectionFromReplyWithState(tokenReply);
+
+            if (connection) {
+                connection->respond(HTTPConnection::StatusCode500);
+            }
+        }
+
+        tokenReply->deleteLater();
+    }
+}
+
+void DomainServer::profileRequestFinished() {
+
+    auto profileReply = qobject_cast<QNetworkReply*>(sender());
+
+    if (profileReply) {
+        auto connection = connectionFromReplyWithState(profileReply);
+
+        if (connection) {
+            if (profileReply->error() == QNetworkReply::NoError) {
                 // call helper method to get cookieHeaders
                 Headers cookieHeaders = setupCookieHeadersFromProfileReply(profileReply);
 
                 connection->respond(HTTPConnection::StatusCode302, QByteArray(),
                                     HTTPConnection::DefaultContentType, cookieHeaders);
 
-                delete tokenReply;
-                delete profileReply;
-
-                // we've redirected the user back to our homepage
-                return true;
-
+            } else {
+                // the profile request failed, send back a 500 (assuming the connection is still around)
+                connection->respond(HTTPConnection::StatusCode500);
             }
         }
 
-        // respond with a 200 code indicating that login is complete
-        connection->respond(HTTPConnection::StatusCode200);
-
-        return true;
-    } else {
-        return false;
+        profileReply->deleteLater();
     }
 }
 
@@ -2091,22 +2387,31 @@ bool DomainServer::isAuthenticatedRequest(HTTPConnection* connection, const QUrl
             // the user does not have allowed username or role, return 401
             return false;
         } else {
-            // re-direct this user to OAuth page
+            static const QByteArray REQUESTED_WITH_HEADER = "X-Requested-With";
+            static const QString XML_REQUESTED_WITH = "XMLHttpRequest";
 
-            // generate a random state UUID to use
-            QUuid stateUUID = QUuid::createUuid();
+            if (connection->requestHeaders().value(REQUESTED_WITH_HEADER) == XML_REQUESTED_WITH) {
+                // unauthorized XHR requests get a 401 and not a 302, since there isn't an XHR
+                // path to OAuth authorize
+                connection->respond(HTTPConnection::StatusCode401, UNAUTHENTICATED_BODY);
+            } else {
+                // re-direct this user to OAuth page
 
-            // add it to the set so we can handle the callback from the OAuth provider
-            _webAuthenticationStateSet.insert(stateUUID);
+                // generate a random state UUID to use
+                QUuid stateUUID = QUuid::createUuid();
 
-            QUrl authURL = oauthAuthorizationURL(stateUUID);
+                // add it to the set so we can handle the callback from the OAuth provider
+                _webAuthenticationStateSet.insert(stateUUID);
 
-            Headers redirectHeaders;
+                QUrl authURL = oauthAuthorizationURL(stateUUID);
 
-            redirectHeaders.insert("Location", authURL.toEncoded());
+                Headers redirectHeaders;
 
-            connection->respond(HTTPConnection::StatusCode302,
-                                QByteArray(), HTTPConnection::DefaultContentType, redirectHeaders);
+                redirectHeaders.insert("Location", authURL.toEncoded());
+
+                connection->respond(HTTPConnection::StatusCode302,
+                                    QByteArray(), HTTPConnection::DefaultContentType, redirectHeaders);
+            }
 
             // we don't know about this user yet, so they are not yet authenticated
             return false;
@@ -2179,6 +2484,8 @@ QNetworkReply* DomainServer::profileRequestGivenTokenReply(QNetworkReply* tokenR
     profileURL.setPath("/api/v1/user/profile");
     profileURL.setQuery(QString("%1=%2").arg(OAUTH_JSON_ACCESS_TOKEN_KEY, accessToken));
 
+    qDebug() << "Sending profile request to: " << profileURL;
+
     QNetworkRequest profileRequest(profileURL);
     profileRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
     profileRequest.setHeader(QNetworkRequest::UserAgentHeader, HIGH_FIDELITY_USER_AGENT);
@@ -2680,9 +2987,20 @@ void DomainServer::handleKeypairChange() {
 
 void DomainServer::handleICEHostInfo(const QHostInfo& hostInfo) {
     // clear the ICE address lookup ID so that it can fire again
-    _iceAddressLookupID = -1;
+    _iceAddressLookupID = INVALID_ICE_LOOKUP_ID;
 
-    if (hostInfo.error() != QHostInfo::NoError) {
+    // enumerate the returned addresses and collect only valid IPv4 addresses
+    QList<QHostAddress> sanitizedAddresses = hostInfo.addresses();
+    auto it = sanitizedAddresses.begin();
+    while (it != sanitizedAddresses.end()) {
+        if (!it->isNull() && it->protocol() == QAbstractSocket::IPv4Protocol) {
+            ++it;
+        } else {
+            it = sanitizedAddresses.erase(it);
+        }
+    }
+
+    if (hostInfo.error() != QHostInfo::NoError || sanitizedAddresses.empty()) {
         qWarning() << "IP address lookup failed for" << _iceServerAddr << ":" << hostInfo.errorString();
 
         // if we don't have an ICE server to use yet, trigger a retry
@@ -2695,7 +3013,7 @@ void DomainServer::handleICEHostInfo(const QHostInfo& hostInfo) {
     } else {
         int countBefore = _iceServerAddresses.count();
 
-        _iceServerAddresses = hostInfo.addresses();
+        _iceServerAddresses = sanitizedAddresses;
 
         if (countBefore == 0) {
             qInfo() << "Found" << _iceServerAddresses.count() << "ice-server IP addresses for" << _iceServerAddr;
diff --git a/domain-server/src/DomainServer.h b/domain-server/src/DomainServer.h
index 8851e3380b..b45b8a4816 100644
--- a/domain-server/src/DomainServer.h
+++ b/domain-server/src/DomainServer.h
@@ -39,6 +39,8 @@ typedef QMultiHash<QUuid, WalletTransaction*> TransactionHash;
 using Subnet = QPair<QHostAddress, int>;
 using SubnetList = std::vector<Subnet>;
 
+const int INVALID_ICE_LOOKUP_ID = -1;
+
 enum ReplicationServerDirection {
     Upstream,
     Downstream
@@ -71,6 +73,7 @@ public slots:
 
     void restart();
 
+private slots:
     void processRequestAssignmentPacket(QSharedPointer<ReceivedMessage> packet);
     void processListRequestPacket(QSharedPointer<ReceivedMessage> packet, SharedNodePointer sendingNode);
     void processNodeJSONStatsPacket(QSharedPointer<ReceivedMessage> packetList, SharedNodePointer sendingNode);
@@ -79,7 +82,6 @@ public slots:
     void processICEServerHeartbeatDenialPacket(QSharedPointer<ReceivedMessage> message);
     void processICEServerHeartbeatACK(QSharedPointer<ReceivedMessage> message);
 
-private slots:
     void setupPendingAssignmentCredits();
     void sendPendingTransactionsToServer();
 
@@ -111,6 +113,9 @@ private slots:
     void updateDownstreamNodes();
     void updateUpstreamNodes();
 
+    void tokenGrantFinished();
+    void profileRequestFinished();
+
 signals:
     void iceServerChanged();
     void userConnected();
@@ -126,7 +131,7 @@ private:
 
     void getTemporaryName(bool force = false);
 
-    static bool packetVersionMatch(const udt::Packet& packet);
+    static bool isPacketVerified(const udt::Packet& packet);
 
     bool resetAccountManagerAccessToken();
 
@@ -178,6 +183,15 @@ private:
 
     void updateReplicationNodes(ReplicationServerDirection direction);
 
+    HTTPSConnection* connectionFromReplyWithState(QNetworkReply* reply);
+
+    bool forwardMetaverseAPIRequest(HTTPConnection* connection,
+                                    const QString& metaversePath,
+                                    const QString& requestSubobject,
+                                    std::initializer_list<QString> requiredData = { },
+                                    std::initializer_list<QString> optionalData = { },
+                                    bool requireAccessToken = true);
+
     SubnetList _acSubnetWhitelist;
 
     std::vector<QString> _replicatedUsernames;
@@ -218,7 +232,7 @@ private:
 
     QList<QHostAddress> _iceServerAddresses;
     QSet<QHostAddress> _failedIceServerAddresses;
-    int _iceAddressLookupID { -1 };
+    int _iceAddressLookupID { INVALID_ICE_LOOKUP_ID };
     int _noReplyICEHeartbeats { 0 };
     int _numHeartbeatDenials { 0 };
     bool _connectedToICEServer { false };
@@ -235,6 +249,8 @@ private:
 
     bool _sendICEServerAddressToMetaverseAPIInProgress { false };
     bool _sendICEServerAddressToMetaverseAPIRedo { false };
+
+    QHash<QUuid, QPointer<HTTPSConnection>> _pendingOAuthConnections;
 };
 
 
diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index 9279648319..6c50e5245d 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -29,6 +29,7 @@
 #include <NLPacketList.h>
 #include <NumericalConstants.h>
 #include <SettingHandle.h>
+#include <SettingHelpers.h>
 #include <AvatarData.h> //for KillAvatarReason
 #include <FingerprintUtils.h>
 #include "DomainServerNodeData.h"
@@ -43,12 +44,7 @@ const QString DESCRIPTION_COLUMNS_KEY = "columns";
 
 const QString SETTINGS_VIEWPOINT_KEY = "viewpoint";
 
-static Setting::Handle<double> JSON_SETTING_VERSION("json-settings/version", 0.0);
-
-DomainServerSettingsManager::DomainServerSettingsManager() :
-    _descriptionArray(),
-    _configMap()
-{
+DomainServerSettingsManager::DomainServerSettingsManager() {
     // load the description object from the settings description
     QFile descriptionFile(QCoreApplication::applicationDirPath() + SETTINGS_DESCRIPTION_RELATIVE_PATH);
     descriptionFile.open(QIODevice::ReadOnly);
@@ -100,18 +96,41 @@ void DomainServerSettingsManager::processSettingsRequestPacket(QSharedPointer<Re
 void DomainServerSettingsManager::setupConfigMap(const QStringList& argumentList) {
     _argumentList = argumentList;
 
-    // after 1.7 we no longer use the master or merged configs - this is kept in place for migration
-    _configMap.loadMasterAndUserConfig(_argumentList);
+    _configMap.loadConfig(_argumentList);
+
+    static const auto VERSION_SETTINGS_KEYPATH = "version";
+    QVariant* versionVariant = _configMap.valueForKeyPath(VERSION_SETTINGS_KEYPATH);
+
+    if (!versionVariant) {
+        versionVariant = _configMap.valueForKeyPath(VERSION_SETTINGS_KEYPATH, true);
+        *versionVariant = _descriptionVersion;
+        persistToFile();
+        qDebug() << "No version in config file, setting to current version" << _descriptionVersion;
+    }
+
+    {
+        // Backward compatibility migration code
+        // The config version used to be stored in a different file
+        // This moves it to the actual config file.
+        Setting::Handle<double> JSON_SETTING_VERSION("json-settings/version", 0.0);
+        if (JSON_SETTING_VERSION.isSet()) {
+            auto version = JSON_SETTING_VERSION.get();
+            *versionVariant = version;
+            persistToFile();
+            QFile::remove(settingsFilename());
+        }
+    }
 
     // What settings version were we before and what are we using now?
     // Do we need to do any re-mapping?
-    double oldVersion = JSON_SETTING_VERSION.get();
+    double oldVersion = versionVariant->toDouble();
 
     if (oldVersion != _descriptionVersion) {
         const QString ALLOWED_USERS_SETTINGS_KEYPATH = "security.allowed_users";
         const QString RESTRICTED_ACCESS_SETTINGS_KEYPATH = "security.restricted_access";
         const QString ALLOWED_EDITORS_SETTINGS_KEYPATH = "security.allowed_editors";
         const QString EDITORS_ARE_REZZERS_KEYPATH = "security.editors_are_rezzers";
+        const QString EDITORS_CAN_REPLACE_CONTENT_KEYPATH = "security.editors_can_replace_content";
 
         qDebug() << "Previous domain-server settings version was"
             << QString::number(oldVersion, 'g', 8) << "and the new version is"
@@ -136,12 +155,6 @@ void DomainServerSettingsManager::setupConfigMap(const QStringList& argumentList
                 QVariant* restrictedAccess = _configMap.valueForKeyPath(RESTRICTED_ACCESS_SETTINGS_KEYPATH, true);
 
                 *restrictedAccess = QVariant(true);
-
-                // write the new settings to the json file
-                persistToFile();
-
-                // reload the master and user config so that the merged config is right
-                _configMap.loadMasterAndUserConfig(_argumentList);
             }
         }
 
@@ -171,12 +184,6 @@ void DomainServerSettingsManager::setupConfigMap(const QStringList& argumentList
 
                     *entityServerVariant = entityServerMap;
                 }
-
-                // write the new settings to the json file
-                persistToFile();
-
-                // reload the master and user config so that the merged config is right
-                _configMap.loadMasterAndUserConfig(_argumentList);
             }
 
         }
@@ -194,12 +201,6 @@ void DomainServerSettingsManager::setupConfigMap(const QStringList& argumentList
                 qDebug() << "Migrating plaintext password to SHA256 hash in domain-server settings.";
 
                 *passwordVariant = QCryptographicHash::hash(plaintextPassword.toUtf8(), QCryptographicHash::Sha256).toHex();
-
-                // write the new settings to file
-                persistToFile();
-
-                // reload the master and user config so the merged config is correct
-                _configMap.loadMasterAndUserConfig(_argumentList);
             }
         }
 
@@ -282,24 +283,36 @@ void DomainServerSettingsManager::setupConfigMap(const QStringList& argumentList
             packPermissions();
         }
 
-        if (oldVersion < 1.7) {
-            // This was prior to the removal of the master config file
-            // So we write the merged config to the user config file, and stop reading from the user config file
-
-            qDebug() << "Migrating merged config to user config file. The master config file is deprecated.";
-
-            // replace the user config by the merged config
-            _configMap.getConfig() = _configMap.getMergedConfig();
-
-            // persist the new config so the user config file has the correctly merged config
-            persistToFile();
+        if (oldVersion < 1.8) {
+            unpackPermissions();
+            // This was prior to addition of domain content replacement, add that to localhost permissions by default
+            _standardAgentPermissions[NodePermissions::standardNameLocalhost]->set(NodePermissions::Permission::canReplaceDomainContent);
+            packPermissions();
         }
+
+        if (oldVersion < 1.9) {
+            unpackPermissions();
+            // This was prior to addition of canRez(Tmp)Certified; add those to localhost permissions by default
+            _standardAgentPermissions[NodePermissions::standardNameLocalhost]->set(NodePermissions::Permission::canRezPermanentCertifiedEntities);
+            _standardAgentPermissions[NodePermissions::standardNameLocalhost]->set(NodePermissions::Permission::canRezTemporaryCertifiedEntities);
+            packPermissions();
+        }
+        if (oldVersion < 2.0) {
+            const QString WIZARD_COMPLETED_ONCE = "wizard.completed_once";
+
+            QVariant* wizardCompletedOnce = _configMap.valueForKeyPath(WIZARD_COMPLETED_ONCE, true);
+
+            *wizardCompletedOnce = QVariant(true);
+        }
+
+        // write the current description version to our settings
+        *versionVariant = _descriptionVersion;
+
+        // write the new settings to the json file
+        persistToFile();
     }
 
     unpackPermissions();
-
-    // write the current description version to our settings
-    JSON_SETTING_VERSION.set(_descriptionVersion);
 }
 
 QVariantMap& DomainServerSettingsManager::getDescriptorsMap() {
@@ -944,29 +957,6 @@ QVariant DomainServerSettingsManager::valueOrDefaultValueForKeyPath(const QStrin
     return QVariant();
 }
 
-bool DomainServerSettingsManager::handlePublicHTTPRequest(HTTPConnection* connection, const QUrl &url) {
-    if (connection->requestOperation() == QNetworkAccessManager::GetOperation && url.path() == SETTINGS_PATH_JSON) {
-        // this is a GET operation for our settings
-
-        // check if there is a query parameter for settings affecting a particular type of assignment
-        const QString SETTINGS_TYPE_QUERY_KEY = "type";
-        QUrlQuery settingsQuery(url);
-        QString typeValue = settingsQuery.queryItemValue(SETTINGS_TYPE_QUERY_KEY);
-
-        if (!typeValue.isEmpty()) {
-            QJsonObject responseObject = responseObjectForType(typeValue);
-
-            connection->respond(HTTPConnection::StatusCode200, QJsonDocument(responseObject).toJson(), "application/json");
-
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    return false;
-}
-
 bool DomainServerSettingsManager::handleAuthenticatedHTTPRequest(HTTPConnection *connection, const QUrl &url) {
     if (connection->requestOperation() == QNetworkAccessManager::PostOperation && url.path() == SETTINGS_PATH_JSON) {
         // this is a POST operation to change one or more settings
@@ -1198,6 +1188,8 @@ bool DomainServerSettingsManager::recurseJSONObjectAndOverwriteSettings(const QJ
     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";
 
     auto& settingsVariant = _configMap.getConfig();
     bool needRestart = false;
@@ -1249,7 +1241,8 @@ bool DomainServerSettingsManager::recurseJSONObjectAndOverwriteSettings(const QJ
 
             if (!matchingDescriptionObject.isEmpty()) {
                 updateSetting(rootKey, rootValue, *thisMap, matchingDescriptionObject);
-                if (rootKey != SECURITY_ROOT_KEY && rootKey != BROADCASTING_KEY) {
+                if (rootKey != SECURITY_ROOT_KEY && rootKey != BROADCASTING_KEY &&
+                    rootKey != SETTINGS_PATHS_KEY && rootKey != WIZARD_KEY) {
                     needRestart = true;
                 }
             } else {
@@ -1265,8 +1258,9 @@ bool DomainServerSettingsManager::recurseJSONObjectAndOverwriteSettings(const QJ
                 if (!matchingDescriptionObject.isEmpty()) {
                     const QJsonValue& settingValue = rootValue.toObject()[settingKey];
                     updateSetting(settingKey, settingValue, *thisMap, matchingDescriptionObject);
-                    if ((rootKey != SECURITY_ROOT_KEY && rootKey != BROADCASTING_KEY)
-                        || settingKey == AC_SUBNET_WHITELIST_KEY) {
+                    if ((rootKey != SECURITY_ROOT_KEY && rootKey != BROADCASTING_KEY &&
+                         rootKey != DESCRIPTION_ROOT_KEY && rootKey != WIZARD_KEY) ||
+                        settingKey == AC_SUBNET_WHITELIST_KEY) {
                         needRestart = true;
                     }
                 } else {
@@ -1282,9 +1276,6 @@ bool DomainServerSettingsManager::recurseJSONObjectAndOverwriteSettings(const QJ
         }
     }
 
-    // re-merge the user and master configs after a settings change
-    _configMap.mergeMasterAndUserConfigs();
-
     return needRestart;
 }
 
diff --git a/domain-server/src/DomainServerSettingsManager.h b/domain-server/src/DomainServerSettingsManager.h
index 4c7d8dfbc9..d2f6d1e526 100644
--- a/domain-server/src/DomainServerSettingsManager.h
+++ b/domain-server/src/DomainServerSettingsManager.h
@@ -43,7 +43,6 @@ class DomainServerSettingsManager : public QObject {
     Q_OBJECT
 public:
     DomainServerSettingsManager();
-    bool handlePublicHTTPRequest(HTTPConnection* connection, const QUrl& url);
     bool handleAuthenticatedHTTPRequest(HTTPConnection* connection, const QUrl& url);
 
     void setupConfigMap(const QStringList& argumentList);
diff --git a/gvr-interface/src/RenderingClient.cpp b/gvr-interface/src/RenderingClient.cpp
index b7c6f30a73..f04be5cb7f 100644
--- a/gvr-interface/src/RenderingClient.cpp
+++ b/gvr-interface/src/RenderingClient.cpp
@@ -63,10 +63,7 @@ void RenderingClient::sendAvatarPacket() {
 }
 
 void RenderingClient::cleanupBeforeQuit() {
-    
-    QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(),
-                              "stop", Qt::BlockingQueuedConnection);
-    
+    DependencyManager::get<AudioClient>()->cleanupBeforeQuit();
     // destroy the AudioClient so it and its thread will safely go down
     DependencyManager::destroy<AudioClient>();
 }
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index dcb1cacef9..4c1b8d8d92 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -1,6 +1,20 @@
 set(TARGET_NAME interface)
 project(${TARGET_NAME})
 
+file(GLOB_RECURSE QML_SRC resources/qml/*.qml resources/qml/*.js)
+add_custom_target(qml SOURCES ${QML_SRC})
+GroupSources("resources/qml")
+
+function(JOIN VALUES GLUE OUTPUT)
+  string (REGEX REPLACE "([^\\]|^);" "\\1${GLUE}" _TMP_STR "${VALUES}")
+  string (REGEX REPLACE "[\\](.)" "\\1" _TMP_STR "${_TMP_STR}") #fixes escaping
+  set (${OUTPUT} "${_TMP_STR}" PARENT_SCOPE)
+endfunction()
+
+
+set(INTERFACE_QML_QRC ${CMAKE_CURRENT_BINARY_DIR}/qml.qrc)
+generate_qrc(OUTPUT ${INTERFACE_QML_QRC} PATH ${CMAKE_CURRENT_SOURCE_DIR}/resources GLOBS *.qml *.qss *.js *.html *.ttf *.gif *.svg *.png *.jpg)      
+
 # set a default root dir for each of our optional externals if it was not passed
 set(OPTIONAL_EXTERNALS "LeapMotion")
 
@@ -18,6 +32,7 @@ find_package(Qt5LinguistTools REQUIRED)
 find_package(Qt5LinguistToolsMacros)
 
 if (WIN32)
+  set(CMAKE_CXX_FLAGS_DEBUG  "${CMAKE_CXX_FLAGS_DEBUG} -bigobj")
   add_definitions(-D_USE_MATH_DEFINES) # apparently needed to get M_PI and other defines from cmath/math.h
   add_definitions(-DWINDOWS_LEAN_AND_MEAN) # needed to make sure windows doesn't go to crazy with its defines
 endif()
@@ -65,9 +80,7 @@ qt5_wrap_ui(QT_UI_HEADERS "${QT_UI_FILES}")
 # add them to the interface source files
 set(INTERFACE_SRCS ${INTERFACE_SRCS} "${QT_UI_HEADERS}" "${QT_RESOURCES}")
 
-file(GLOB_RECURSE QML_SRC resources/qml/*.qml resources/qml/*.js)
-add_custom_target(qml SOURCES ${QML_SRC})
-GroupSources("resources/qml")
+list(APPEND INTERFACE_SRCS ${INTERFACE_QML_QRC})
 
 if (UNIX)
   install(
@@ -130,10 +143,10 @@ if (APPLE)
 
   # append the discovered resources to our list of interface sources
   list(APPEND INTERFACE_SRCS ${DISCOVERED_RESOURCES})
-
-  set(INTERFACE_SRCS ${INTERFACE_SRCS} "${CMAKE_CURRENT_SOURCE_DIR}/icon/${INTERFACE_ICON_FILENAME}")
+  list(APPEND INTERFACE_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/icon/${INTERFACE_ICON_FILENAME})
 endif()
 
+
 # create the executable, make it a bundle on OS X
 if (APPLE)
   add_executable(${TARGET_NAME} MACOSX_BUNDLE ${INTERFACE_SRCS} ${QM})
@@ -170,8 +183,6 @@ else ()
   add_executable(${TARGET_NAME} ${INTERFACE_SRCS} ${QM})
 endif ()
 
-target_include_directories(${TARGET_NAME} PRIVATE "${CMAKE_BINARY_DIR}/includes")
-
 if (WIN32)
   # These are external plugins, but we need to do the 'add dependency' here so that their
   # binary directories get added to the fixup path
@@ -183,6 +194,12 @@ if (WIN32)
   add_dependency_external_projects(steamworks)
 endif()
 
+# include OPENSSL
+include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}")
+
+# append OpenSSL to our list of libraries to link
+target_link_libraries(${TARGET_NAME} ${OPENSSL_LIBRARIES})
+
 # disable /OPT:REF and /OPT:ICF for the Debug builds
 # This will prevent the following linker warnings
 # LINK : warning LNK4075: ignoring '/INCREMENTAL' due to '/OPT:ICF' specification
@@ -193,9 +210,10 @@ endif()
 # link required hifi libraries
 link_hifi_libraries(
   shared octree ktx gpu gl gpu-gl procedural model render
+  pointers
   recording fbx networking model-networking entities avatars trackers
   audio audio-client animation script-engine physics
-  render-utils entities-renderer avatars-renderer ui auto-updater
+  render-utils entities-renderer avatars-renderer ui auto-updater midi
   controllers plugins image trackers
   ui-plugins display-plugins input-plugins
   ${NON_ANDROID_LIBRARIES}
@@ -207,10 +225,6 @@ target_include_directories(${TARGET_NAME} PRIVATE "${CMAKE_BINARY_DIR}/libraries
 target_bullet()
 target_opengl()
 
-if (NOT ANDROID)
-  target_glew()
-endif ()
-
 # perform standard include and linking for found externals
 foreach(EXTERNAL ${OPTIONAL_EXTERNALS})
 
@@ -261,7 +275,13 @@ target_link_libraries(
 )
 
 if (UNIX)
-    target_link_libraries(${TARGET_NAME} pthread)
+    if (CMAKE_SYSTEM_NAME MATCHES "Linux")
+        # Linux
+        target_link_libraries(${TARGET_NAME} pthread atomic)
+    else ()
+        # OSX
+        target_link_libraries(${TARGET_NAME} pthread)
+    endif ()
 endif(UNIX)
 
 # assume we are using a Qt build without bearer management
@@ -309,9 +329,12 @@ else (APPLE)
 
     # setup install of executable and things copied by fixup/windeployqt
     install(
-      FILES "$<TARGET_FILE_DIR:${TARGET_NAME}>/"
+      DIRECTORY "$<TARGET_FILE_DIR:${TARGET_NAME}>/"
       DESTINATION ${INTERFACE_INSTALL_DIR}
       COMPONENT ${CLIENT_COMPONENT}
+      PATTERN "*.pdb" EXCLUDE
+      PATTERN "*.lib" EXCLUDE
+      PATTERN "*.exp" EXCLUDE
     )
 
     set(SCRIPTS_INSTALL_DIR "${INTERFACE_INSTALL_DIR}")
diff --git a/interface/external/leapmotion/readme.txt b/interface/external/leapmotion/readme.txt
index 51a65caf22..97502d694c 100644
--- a/interface/external/leapmotion/readme.txt
+++ b/interface/external/leapmotion/readme.txt
@@ -10,7 +10,7 @@ Interface has been tested with SDK versions:
 1. Copy the LeapSDK folders from the LeapDeveloperKit installation directory (Lib, Include) into the interface/externals/leapmotion folder.
    This readme.txt should be there as well.
    
-   The files neeeded in the folders are:
+   The files needed in the folders are:
    
    include/
    - Leap.h
@@ -21,8 +21,8 @@ Interface has been tested with SDK versions:
      x86/
      - Leap.dll
      - Leap.lib
-     - mscvcp120.dll (optional if you already have the Msdev 2012 SDK redistriuable installed)
-     - mscvcr120.dll (optional if you already have the Msdev 2012 SDK redistriuable installed)
+     - mscvcp120.dll (optional if you already have the Msdev 2012 SDK redistributable installed)
+     - mscvcr120.dll (optional if you already have the Msdev 2012 SDK redistributable installed)
    - lipLeap.dylib
      libc++/
      -libLeap.dylib
@@ -30,4 +30,4 @@ Interface has been tested with SDK versions:
    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 our CMake find module expects you to set the ENV variable 'HIFI_LIB_DIR' to a directory containing a subfolder 'leapmotion' that contains the 2 folders mentioned above (Include, Lib).
     
-2. Clear your build directory, run cmake and build, and you should be all set.
\ No newline at end of file
+2. Clear your build directory, run cmake and build, and you should be all set.
diff --git a/interface/resources/avatar/avatar-animation.json b/interface/resources/avatar/avatar-animation.json
index a493d8e9af..ee2b916d1e 100644
--- a/interface/resources/avatar/avatar-animation.json
+++ b/interface/resources/avatar/avatar-animation.json
@@ -126,24 +126,6 @@
                                     "weightVar": "headWeight",
                                     "weight": 4.0,
                                     "flexCoefficients": [1, 0.5, 0.25, 0.2, 0.1]
-                                },
-                                {
-                                    "jointName": "LeftArm",
-                                    "positionVar": "leftArmPosition",
-                                    "rotationVar": "leftArmRotation",
-                                    "typeVar": "leftArmType",
-                                    "weightVar": "leftArmWeight",
-                                    "weight": 0.75,
-                                    "flexCoefficients": [1.0, 0.35, 0.2, 0.1, 0.05, 0.0, 0.0, 0.0]
-                                },
-                                {
-                                    "jointName": "RightArm",
-                                    "positionVar": "rightArmPosition",
-                                    "rotationVar": "rightArmRotation",
-                                    "typeVar": "rightArmType",
-                                    "weightVar": "rightArmWeight",
-                                    "weight": 0.75,
-                                    "flexCoefficients": [1.0, 0.35, 0.2, 0.1, 0.05, 0.0, 0.0, 0.0]
                                 }
                             ]
                         },
diff --git a/interface/resources/controllers/keyboardMouse.json b/interface/resources/controllers/keyboardMouse.json
index 8baf56684a..54d2467f78 100644
--- a/interface/resources/controllers/keyboardMouse.json
+++ b/interface/resources/controllers/keyboardMouse.json
@@ -15,7 +15,7 @@
         { "comment" : "Mouse turn need to be small continuous increments",
           "from": { "makeAxis" : [
                 [ "Keyboard.MouseMoveLeft" ],
-                [ "Keyboard.MouseMoveRight" ] 
+                [ "Keyboard.MouseMoveRight" ]
             ]
           },
           "when": [ "Application.InHMD", "Application.SnapTurn", "Keyboard.RightMouseButton" ],
@@ -31,8 +31,8 @@
         { "comment" : "Touchpad turn need to be small continuous increments, but without the RMB constraint",
           "from": { "makeAxis" : [
                 [ "Keyboard.TouchpadLeft" ],
-                [ "Keyboard.TouchpadRight" ] 
-            ] 
+                [ "Keyboard.TouchpadRight" ]
+            ]
           },
           "when": [ "Application.InHMD", "Application.SnapTurn" ],
           "to": "Actions.StepYaw",
@@ -81,7 +81,11 @@
 
         { "from": { "makeAxis" : ["Keyboard.MouseMoveLeft", "Keyboard.MouseMoveRight"] },
           "when": "Keyboard.RightMouseButton",
-          "to": "Actions.Yaw"
+          "to": "Actions.Yaw",
+          "filters":
+            [
+                { "type": "scale", "scale": 0.6 }
+            ]
         },
 
         { "from": "Keyboard.W", "to": "Actions.LONGITUDINAL_FORWARD" },
@@ -102,8 +106,19 @@
         { "from": "Keyboard.PgDown", "to": "Actions.VERTICAL_DOWN" },
         { "from": "Keyboard.PgUp", "to": "Actions.VERTICAL_UP" },
 
-        { "from": "Keyboard.MouseMoveUp", "when": "Keyboard.RightMouseButton", "to": "Actions.PITCH_UP" },
-        { "from": "Keyboard.MouseMoveDown", "when": "Keyboard.RightMouseButton", "to": "Actions.PITCH_DOWN" },
+        { "from": "Keyboard.MouseMoveUp", "when": "Keyboard.RightMouseButton", "to": "Actions.PITCH_UP",
+          "filters":
+            [
+                { "type": "scale", "scale": 0.6 }
+            ]
+
+        },
+        { "from": "Keyboard.MouseMoveDown", "when": "Keyboard.RightMouseButton", "to": "Actions.PITCH_DOWN",
+          "filters":
+            [
+                { "type": "scale", "scale": 0.6 }
+            ]
+        },
 
         { "from": "Keyboard.TouchpadDown", "to": "Actions.PITCH_DOWN" },
         { "from": "Keyboard.TouchpadUp", "to": "Actions.PITCH_UP" },
@@ -116,6 +131,6 @@
         { "from": "Keyboard.Space", "to": "Actions.SHIFT" },
         { "from": "Keyboard.R", "to": "Actions.ACTION1" },
         { "from": "Keyboard.T", "to": "Actions.ACTION2" },
-        { "from": "Keyboard.RightMouseClicked", "to": "Actions.ContextMenu" }
+        { "from": "Keyboard.Tab", "to": "Actions.ContextMenu" }
     ]
 }
diff --git a/interface/resources/controllers/leapmotion.json b/interface/resources/controllers/leapmotion.json
new file mode 100644
index 0000000000..25cb575946
--- /dev/null
+++ b/interface/resources/controllers/leapmotion.json
@@ -0,0 +1,48 @@
+{
+    "name": "Leap Motion to Standard",
+    "channels": [
+        { "from": "LeapMotion.LeftHand", "to": "Standard.LeftHand" },
+        { "from": "LeapMotion.LeftHandThumb1", "to": "Standard.LeftHandThumb1"},
+        { "from": "LeapMotion.LeftHandThumb2", "to": "Standard.LeftHandThumb2"},
+        { "from": "LeapMotion.LeftHandThumb3", "to": "Standard.LeftHandThumb3"},
+        { "from": "LeapMotion.LeftHandThumb4", "to": "Standard.LeftHandThumb4"},
+        { "from": "LeapMotion.LeftHandIndex1", "to": "Standard.LeftHandIndex1"},
+        { "from": "LeapMotion.LeftHandIndex2", "to": "Standard.LeftHandIndex2"},
+        { "from": "LeapMotion.LeftHandIndex3", "to": "Standard.LeftHandIndex3"},
+        { "from": "LeapMotion.LeftHandIndex4", "to": "Standard.LeftHandIndex4"},
+        { "from": "LeapMotion.LeftHandMiddle1", "to": "Standard.LeftHandMiddle1"},
+        { "from": "LeapMotion.LeftHandMiddle2", "to": "Standard.LeftHandMiddle2"},
+        { "from": "LeapMotion.LeftHandMiddle3", "to": "Standard.LeftHandMiddle3"},
+        { "from": "LeapMotion.LeftHandMiddle4", "to": "Standard.LeftHandMiddle4"},
+        { "from": "LeapMotion.LeftHandRing1", "to": "Standard.LeftHandRing1"},
+        { "from": "LeapMotion.LeftHandRing2", "to": "Standard.LeftHandRing2"},
+        { "from": "LeapMotion.LeftHandRing3", "to": "Standard.LeftHandRing3"},
+        { "from": "LeapMotion.LeftHandRing4", "to": "Standard.LeftHandRing4"},
+        { "from": "LeapMotion.LeftHandPinky1", "to": "Standard.LeftHandPinky1"},
+        { "from": "LeapMotion.LeftHandPinky2", "to": "Standard.LeftHandPinky2"},
+        { "from": "LeapMotion.LeftHandPinky3", "to": "Standard.LeftHandPinky3"},
+        { "from": "LeapMotion.LeftHandPinky4", "to": "Standard.LeftHandPinky4"},
+
+        { "from": "LeapMotion.RightHand", "to": "Standard.RightHand" },
+        { "from": "LeapMotion.RightHandThumb1", "to": "Standard.RightHandThumb1"},
+        { "from": "LeapMotion.RightHandThumb2", "to": "Standard.RightHandThumb2"},
+        { "from": "LeapMotion.RightHandThumb3", "to": "Standard.RightHandThumb3"},
+        { "from": "LeapMotion.RightHandThumb4", "to": "Standard.RightHandThumb4"},
+        { "from": "LeapMotion.RightHandIndex1", "to": "Standard.RightHandIndex1"},
+        { "from": "LeapMotion.RightHandIndex2", "to": "Standard.RightHandIndex2"},
+        { "from": "LeapMotion.RightHandIndex3", "to": "Standard.RightHandIndex3"},
+        { "from": "LeapMotion.RightHandIndex4", "to": "Standard.RightHandIndex4"},
+        { "from": "LeapMotion.RightHandMiddle1", "to": "Standard.RightHandMiddle1"},
+        { "from": "LeapMotion.RightHandMiddle2", "to": "Standard.RightHandMiddle2"},
+        { "from": "LeapMotion.RightHandMiddle3", "to": "Standard.RightHandMiddle3"},
+        { "from": "LeapMotion.RightHandMiddle4", "to": "Standard.RightHandMiddle4"},
+        { "from": "LeapMotion.RightHandRing1", "to": "Standard.RightHandRing1"},
+        { "from": "LeapMotion.RightHandRing2", "to": "Standard.RightHandRing2"},
+        { "from": "LeapMotion.RightHandRing3", "to": "Standard.RightHandRing3"},
+        { "from": "LeapMotion.RightHandRing4", "to": "Standard.RightHandRing4"},
+        { "from": "LeapMotion.RightHandPinky1", "to": "Standard.RightHandPinky1"},
+        { "from": "LeapMotion.RightHandPinky2", "to": "Standard.RightHandPinky2"},
+        { "from": "LeapMotion.RightHandPinky3", "to": "Standard.RightHandPinky3"},
+        { "from": "LeapMotion.RightHandPinky4", "to": "Standard.RightHandPinky4"}
+    ]
+}
diff --git a/interface/resources/controllers/standard.json b/interface/resources/controllers/standard.json
index 75b4821118..28f15605e0 100644
--- a/interface/resources/controllers/standard.json
+++ b/interface/resources/controllers/standard.json
@@ -25,7 +25,7 @@
         },
 
         { "from": "Standard.RX",
-          "when": [ "Application.InHMD", "Application.SnapTurn" ],
+          "when": [ "Application.SnapTurn" ],
           "to": "Actions.StepYaw",
           "filters":
             [
@@ -58,7 +58,48 @@
         { "from": "Standard.RT", "to": "Actions.RightHandClick" },
 
         { "from": "Standard.LeftHand", "to": "Actions.LeftHand" },
+        { "from": "Standard.LeftHandThumb1", "to": "Actions.LeftHandThumb1"},
+        { "from": "Standard.LeftHandThumb2", "to": "Actions.LeftHandThumb2"},
+        { "from": "Standard.LeftHandThumb3", "to": "Actions.LeftHandThumb3"},
+        { "from": "Standard.LeftHandThumb4", "to": "Actions.LeftHandThumb4"},
+        { "from": "Standard.LeftHandIndex1", "to": "Actions.LeftHandIndex1"},
+        { "from": "Standard.LeftHandIndex2", "to": "Actions.LeftHandIndex2"},
+        { "from": "Standard.LeftHandIndex3", "to": "Actions.LeftHandIndex3"},
+        { "from": "Standard.LeftHandIndex4", "to": "Actions.LeftHandIndex4"},
+        { "from": "Standard.LeftHandMiddle1", "to": "Actions.LeftHandMiddle1"},
+        { "from": "Standard.LeftHandMiddle2", "to": "Actions.LeftHandMiddle2"},
+        { "from": "Standard.LeftHandMiddle3", "to": "Actions.LeftHandMiddle3"},
+        { "from": "Standard.LeftHandMiddle4", "to": "Actions.LeftHandMiddle4"},
+        { "from": "Standard.LeftHandRing1", "to": "Actions.LeftHandRing1"},
+        { "from": "Standard.LeftHandRing2", "to": "Actions.LeftHandRing2"},
+        { "from": "Standard.LeftHandRing3", "to": "Actions.LeftHandRing3"},
+        { "from": "Standard.LeftHandRing4", "to": "Actions.LeftHandRing4"},
+        { "from": "Standard.LeftHandPinky1", "to": "Actions.LeftHandPinky1"},
+        { "from": "Standard.LeftHandPinky2", "to": "Actions.LeftHandPinky2"},
+        { "from": "Standard.LeftHandPinky3", "to": "Actions.LeftHandPinky3"},
+        { "from": "Standard.LeftHandPinky4", "to": "Actions.LeftHandPinky4"},
+
         { "from": "Standard.RightHand", "to": "Actions.RightHand" },
+        { "from": "Standard.RightHandThumb1", "to": "Actions.RightHandThumb1"},
+        { "from": "Standard.RightHandThumb2", "to": "Actions.RightHandThumb2"},
+        { "from": "Standard.RightHandThumb3", "to": "Actions.RightHandThumb3"},
+        { "from": "Standard.RightHandThumb4", "to": "Actions.RightHandThumb4"},
+        { "from": "Standard.RightHandIndex1", "to": "Actions.RightHandIndex1"},
+        { "from": "Standard.RightHandIndex2", "to": "Actions.RightHandIndex2"},
+        { "from": "Standard.RightHandIndex3", "to": "Actions.RightHandIndex3"},
+        { "from": "Standard.RightHandIndex4", "to": "Actions.RightHandIndex4"},
+        { "from": "Standard.RightHandMiddle1", "to": "Actions.RightHandMiddle1"},
+        { "from": "Standard.RightHandMiddle2", "to": "Actions.RightHandMiddle2"},
+        { "from": "Standard.RightHandMiddle3", "to": "Actions.RightHandMiddle3"},
+        { "from": "Standard.RightHandMiddle4", "to": "Actions.RightHandMiddle4"},
+        { "from": "Standard.RightHandRing1", "to": "Actions.RightHandRing1"},
+        { "from": "Standard.RightHandRing2", "to": "Actions.RightHandRing2"},
+        { "from": "Standard.RightHandRing3", "to": "Actions.RightHandRing3"},
+        { "from": "Standard.RightHandRing4", "to": "Actions.RightHandRing4"},
+        { "from": "Standard.RightHandPinky1", "to": "Actions.RightHandPinky1"},
+        { "from": "Standard.RightHandPinky2", "to": "Actions.RightHandPinky2"},
+        { "from": "Standard.RightHandPinky3", "to": "Actions.RightHandPinky3"},
+        { "from": "Standard.RightHandPinky4", "to": "Actions.RightHandPinky4"},
 
         { "from": "Standard.LeftFoot", "to": "Actions.LeftFoot" },
         { "from": "Standard.RightFoot", "to": "Actions.RightFoot" },
@@ -68,6 +109,23 @@
 
         { "from": "Standard.Head", "to": "Actions.Head" },
         { "from": "Standard.LeftArm", "to": "Actions.LeftArm" },
-        { "from": "Standard.RightArm", "to": "Actions.RightArm" }
+        { "from": "Standard.RightArm", "to": "Actions.RightArm" },
+        
+        { "from": "Standard.TrackedObject00", "to" : "Actions.TrackedObject00" },
+        { "from": "Standard.TrackedObject01", "to" : "Actions.TrackedObject01" },
+        { "from": "Standard.TrackedObject02", "to" : "Actions.TrackedObject02" },
+        { "from": "Standard.TrackedObject03", "to" : "Actions.TrackedObject03" },
+        { "from": "Standard.TrackedObject04", "to" : "Actions.TrackedObject04" },
+        { "from": "Standard.TrackedObject05", "to" : "Actions.TrackedObject05" },
+        { "from": "Standard.TrackedObject06", "to" : "Actions.TrackedObject06" },
+        { "from": "Standard.TrackedObject07", "to" : "Actions.TrackedObject07" },
+        { "from": "Standard.TrackedObject08", "to" : "Actions.TrackedObject08" },
+        { "from": "Standard.TrackedObject09", "to" : "Actions.TrackedObject09" },
+        { "from": "Standard.TrackedObject10", "to" : "Actions.TrackedObject10" },
+        { "from": "Standard.TrackedObject11", "to" : "Actions.TrackedObject11" },
+        { "from": "Standard.TrackedObject12", "to" : "Actions.TrackedObject12" },
+        { "from": "Standard.TrackedObject13", "to" : "Actions.TrackedObject13" },
+        { "from": "Standard.TrackedObject14", "to" : "Actions.TrackedObject14" },
+        { "from": "Standard.TrackedObject15", "to" : "Actions.TrackedObject15" }
     ]
-}
+}
\ No newline at end of file
diff --git a/interface/resources/controllers/vive.json b/interface/resources/controllers/vive.json
index a0e9bd30d4..02fc09c815 100644
--- a/interface/resources/controllers/vive.json
+++ b/interface/resources/controllers/vive.json
@@ -1,6 +1,15 @@
 {
     "name": "Vive to Standard",
     "channels": [
+        { "from": "Vive.LY", "to": "Standard.LeftIndexPoint",
+            "peek": true,
+            "filters": [ { "type": "hysteresis", "min": 0.7, "max": 0.75 } ]
+        },
+        { "from": "Vive.RY", "to": "Standard.RightIndexPoint",
+            "peek": true,
+            "filters": [ { "type": "hysteresis", "min": 0.7, "max": 0.75 } ]
+        },
+
         { "from": "Vive.LY", "when": "Vive.LSY", "filters": ["invert"], "to": "Standard.LY" },
         { "from": "Vive.LX", "when": "Vive.LSX", "to": "Standard.LX" },
         {
@@ -13,6 +22,10 @@
 
         { "from": "Vive.LeftGrip", "to": "Standard.LeftGrip" },
         { "from": "Vive.LS", "to": "Standard.LS" },
+        { "from": "Vive.LSTouch", "to": "Standard.LeftThumbUp",
+            "peek": true,
+            "filters": [ { "type": "logicalNot" } ]
+        },
         { "from": "Vive.LSTouch", "to": "Standard.LSTouch" },
 
         { "from": "Vive.RY", "when": "Vive.RSY", "filters": ["invert"], "to": "Standard.RY" },
@@ -27,6 +40,10 @@
 
         { "from": "Vive.RightGrip", "to": "Standard.RightGrip" },
         { "from": "Vive.RS", "to": "Standard.RS" },
+        { "from": "Vive.RSTouch", "to": "Standard.RightThumbUp",
+            "peek": true,
+            "filters": [ { "type": "logicalNot" } ]
+        },
         { "from": "Vive.RSTouch", "to": "Standard.RSTouch" },
 
         { "from": "Vive.LSCenter", "to": "Standard.LeftPrimaryThumb" },
@@ -34,36 +51,49 @@
         { "from": "Vive.RSCenter", "to": "Standard.RightPrimaryThumb" },
         { "from": "Vive.RightApplicationMenu", "to": "Standard.RightSecondaryThumb" },
 
-        { "from": "Vive.LeftHand", "to": "Standard.LeftHand", "when": [ "Application.InHMD" ] },
-        { "from": "Vive.RightHand", "to": "Standard.RightHand", "when": [ "Application.InHMD" ] },
+        { "from": "Vive.LeftHand", "to": "Standard.LeftHand"},
+        { "from": "Vive.RightHand", "to": "Standard.RightHand"},
 
         {
             "from": "Vive.LeftFoot", "to" : "Standard.LeftFoot",
-            "filters" : [{"type" :  "lowVelocity", "rotation" : 1.0, "translation": 1.0}],
-            "when": [ "Application.InHMD" ]
+            "filters" : [{"type" :  "lowVelocity", "rotation" : 1.0, "translation": 1.0}]
         },
 
         {
             "from": "Vive.RightFoot", "to" : "Standard.RightFoot",
-            "filters" : [{"type" :  "lowVelocity", "rotation" : 1.0, "translation": 1.0}],
-            "when": [ "Application.InHMD" ]
+            "filters" : [{"type" :  "lowVelocity", "rotation" : 1.0, "translation": 1.0}]
         },
 
         {
             "from": "Vive.Hips", "to" : "Standard.Hips",
-            "filters" : [{"type" :  "lowVelocity", "rotation" : 0.01, "translation": 0.01}],
-            "when": [ "Application.InHMD" ]
+            "filters" : [{"type" :  "lowVelocity", "rotation" : 0.01, "translation": 0.01}]
         },
 
         {
             "from": "Vive.Spine2", "to" : "Standard.Spine2",
-            "filters" : [{"type" :  "lowVelocity", "rotation" : 0.01, "translation": 0.01}],
-            "when": [ "Application.InHMD" ]
+            "filters" : [{"type" :  "lowVelocity", "rotation" : 0.01, "translation": 0.01}]
         },
 
-        { "from": "Vive.Head", "to" : "Standard.Head", "when": [ "Application.InHMD" ] },
+        { "from": "Vive.Head", "to" : "Standard.Head"},
 
-        { "from": "Vive.RightArm", "to" : "Standard.RightArm", "when": [ "Application.InHMD" ] },
-        { "from": "Vive.LeftArm", "to" : "Standard.LeftArm", "when": [ "Application.InHMD" ] }
+        { "from": "Vive.RightArm", "to" : "Standard.RightArm" },
+        { "from": "Vive.LeftArm", "to" : "Standard.LeftArm" },
+        
+        { "from": "Vive.TrackedObject00", "to" : "Standard.TrackedObject00" },
+        { "from": "Vive.TrackedObject01", "to" : "Standard.TrackedObject01" },
+        { "from": "Vive.TrackedObject02", "to" : "Standard.TrackedObject02" },
+        { "from": "Vive.TrackedObject03", "to" : "Standard.TrackedObject03" },
+        { "from": "Vive.TrackedObject04", "to" : "Standard.TrackedObject04" },
+        { "from": "Vive.TrackedObject05", "to" : "Standard.TrackedObject05" },
+        { "from": "Vive.TrackedObject06", "to" : "Standard.TrackedObject06" },
+        { "from": "Vive.TrackedObject07", "to" : "Standard.TrackedObject07" },
+        { "from": "Vive.TrackedObject08", "to" : "Standard.TrackedObject08" },
+        { "from": "Vive.TrackedObject09", "to" : "Standard.TrackedObject09" },
+        { "from": "Vive.TrackedObject10", "to" : "Standard.TrackedObject10" },
+        { "from": "Vive.TrackedObject11", "to" : "Standard.TrackedObject11" },
+        { "from": "Vive.TrackedObject12", "to" : "Standard.TrackedObject12" },
+        { "from": "Vive.TrackedObject13", "to" : "Standard.TrackedObject13" },
+        { "from": "Vive.TrackedObject14", "to" : "Standard.TrackedObject14" },
+        { "from": "Vive.TrackedObject15", "to" : "Standard.TrackedObject15" }
     ]
 }
diff --git a/interface/resources/fonts/hifi-glyphs.ttf b/interface/resources/fonts/hifi-glyphs.ttf
index ddb0743bf8..4cc5a0fe4f 100644
Binary files a/interface/resources/fonts/hifi-glyphs.ttf and b/interface/resources/fonts/hifi-glyphs.ttf differ
diff --git a/interface/resources/fonts/hifi-glyphs/icons-reference.html b/interface/resources/fonts/hifi-glyphs/icons-reference.html
new file mode 100644
index 0000000000..99e826e0b9
--- /dev/null
+++ b/interface/resources/fonts/hifi-glyphs/icons-reference.html
@@ -0,0 +1,1056 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width,initial-scale=1">
+    <title>Font Reference - HiFi Glyphs</title>
+    <link href="http://fonts.googleapis.com/css?family=Dosis:400,500,700" rel="stylesheet" type="text/css">
+    <link rel="stylesheet" href="styles.css">
+    <style type="text/css">html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;outline:0;font-weight:inherit;font-style:inherit;font-family:inherit;font-size:100%;vertical-align:baseline}body{line-height:1;color:#000;background:#fff}ol,ul{list-style:none}table{border-collapse:separate;border-spacing:0;vertical-align:middle}caption,th,td{text-align:left;font-weight:normal;vertical-align:middle}a img{border:none}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}body{font-family:'Dosis','Tahoma',sans-serif}.container{margin:15px auto;width:80%}h1{margin:40px 0 20px;font-weight:700;font-size:38px;line-height:32px;color:#fb565e}h2{font-size:18px;padding:0 0 21px 5px;margin:45px 0 0 0;text-transform:uppercase;font-weight:500}.small{font-size:14px;color:#a5adb4;}.small a{color:#a5adb4;}.small a:hover{color:#fb565e}.glyphs.character-mapping{margin:0 0 20px 0;padding:20px 0 20px 30px;color:rgba(0,0,0,0.5);border:1px solid #d8e0e5;-webkit-border-radius:3px;border-radius:3px;}.glyphs.character-mapping li{margin:0 30px 20px 0;display:inline-block;width:90px}.glyphs.character-mapping .icon{margin:10px 0 10px 15px;padding:15px;position:relative;width:55px;height:55px;color:#162a36 !important;overflow:hidden;-webkit-border-radius:3px;border-radius:3px;font-size:32px;}.glyphs.character-mapping .icon svg{fill:#000}.glyphs.character-mapping input{margin:0;padding:5px 0;line-height:12px;font-size:12px;display:block;width:100%;border:1px solid #d8e0e5;-webkit-border-radius:5px;border-radius:5px;text-align:center;outline:0;}.glyphs.character-mapping input:focus{border:1px solid #fbde4a;-webkit-box-shadow:inset 0 0 3px #fbde4a;box-shadow:inset 0 0 3px #fbde4a}.glyphs.character-mapping input:hover{-webkit-box-shadow:inset 0 0 3px #fbde4a;box-shadow:inset 0 0 3px #fbde4a}.glyphs.css-mapping{margin:0 0 60px 0;padding:30px 0 20px 30px;color:rgba(0,0,0,0.5);border:1px solid #d8e0e5;-webkit-border-radius:3px;border-radius:3px;}.glyphs.css-mapping li{margin:0 30px 20px 0;padding:0;display:inline-block;overflow:hidden}.glyphs.css-mapping .icon{margin:0;margin-right:10px;padding:13px;height:50px;width:50px;color:#162a36 !important;overflow:hidden;float:left;font-size:24px}.glyphs.css-mapping input{margin:0;margin-top:5px;padding:8px;line-height:16px;font-size:16px;display:block;width:150px;height:40px;border:1px solid #d8e0e5;-webkit-border-radius:5px;border-radius:5px;background:#fff;outline:0;float:right;}.glyphs.css-mapping input:focus{border:1px solid #fbde4a;-webkit-box-shadow:inset 0 0 3px #fbde4a;box-shadow:inset 0 0 3px #fbde4a}.glyphs.css-mapping input:hover{-webkit-box-shadow:inset 0 0 3px #fbde4a;box-shadow:inset 0 0 3px #fbde4a}</style>
+  </head>
+  <body>
+    <div class="container">
+      <h1>HiFi Glyphs</h1>
+      <p class="small">This font was created in<a href="http://highfidelity.com/">High Fidelity</a></p>
+      <h2>CSS mapping</h2>
+      <ul class="glyphs css-mapping">
+        <li>
+          <div class="icon icon-hmd"></div>
+          <input type="text" readonly="readonly" value="hmd">
+        </li>
+        <li>
+          <div class="icon icon-2d-screen"></div>
+          <input type="text" readonly="readonly" value="2d-screen">
+        </li>
+        <li>
+          <div class="icon icon-keyboard"></div>
+          <input type="text" readonly="readonly" value="keyboard">
+        </li>
+        <li>
+          <div class="icon icon-hand-controllers"></div>
+          <input type="text" readonly="readonly" value="hand-controllers">
+        </li>
+        <li>
+          <div class="icon icon-headphones-mic"></div>
+          <input type="text" readonly="readonly" value="headphones-mic">
+        </li>
+        <li>
+          <div class="icon icon-gamepad"></div>
+          <input type="text" readonly="readonly" value="gamepad">
+        </li>
+        <li>
+          <div class="icon icon-headphones"></div>
+          <input type="text" readonly="readonly" value="headphones">
+        </li>
+        <li>
+          <div class="icon icon-mic"></div>
+          <input type="text" readonly="readonly" value="mic">
+        </li>
+        <li>
+          <div class="icon icon-upload"></div>
+          <input type="text" readonly="readonly" value="upload">
+        </li>
+        <li>
+          <div class="icon icon-script"></div>
+          <input type="text" readonly="readonly" value="script">
+        </li>
+        <li>
+          <div class="icon icon-text"></div>
+          <input type="text" readonly="readonly" value="text">
+        </li>
+        <li>
+          <div class="icon icon-cube"></div>
+          <input type="text" readonly="readonly" value="cube">
+        </li>
+        <li>
+          <div class="icon icon-sphere"></div>
+          <input type="text" readonly="readonly" value="sphere">
+        </li>
+        <li>
+          <div class="icon icon-zone"></div>
+          <input type="text" readonly="readonly" value="zone">
+        </li>
+        <li>
+          <div class="icon icon-light"></div>
+          <input type="text" readonly="readonly" value="light">
+        </li>
+        <li>
+          <div class="icon icon-web"></div>
+          <input type="text" readonly="readonly" value="web">
+        </li>
+        <li>
+          <div class="icon icon-web-2"></div>
+          <input type="text" readonly="readonly" value="web-2">
+        </li>
+        <li>
+          <div class="icon icon-edit"></div>
+          <input type="text" readonly="readonly" value="edit">
+        </li>
+        <li>
+          <div class="icon icon-market"></div>
+          <input type="text" readonly="readonly" value="market">
+        </li>
+        <li>
+          <div class="icon icon-directory"></div>
+          <input type="text" readonly="readonly" value="directory">
+        </li>
+        <li>
+          <div class="icon icon-menu"></div>
+          <input type="text" readonly="readonly" value="menu">
+        </li>
+        <li>
+          <div class="icon icon-close"></div>
+          <input type="text" readonly="readonly" value="close">
+        </li>
+        <li>
+          <div class="icon icon-close-inverted"></div>
+          <input type="text" readonly="readonly" value="close-inverted">
+        </li>
+        <li>
+          <div class="icon icon-pin"></div>
+          <input type="text" readonly="readonly" value="pin">
+        </li>
+        <li>
+          <div class="icon icon-pin-inverted"></div>
+          <input type="text" readonly="readonly" value="pin-inverted">
+        </li>
+        <li>
+          <div class="icon icon-resize-handle"></div>
+          <input type="text" readonly="readonly" value="resize-handle">
+        </li>
+        <li>
+          <div class="icon icon-diclosure-expand"></div>
+          <input type="text" readonly="readonly" value="diclosure-expand">
+        </li>
+        <li>
+          <div class="icon icon-reload-small"></div>
+          <input type="text" readonly="readonly" value="reload-small">
+        </li>
+        <li>
+          <div class="icon icon-close-small"></div>
+          <input type="text" readonly="readonly" value="close-small">
+        </li>
+        <li>
+          <div class="icon icon-backward"></div>
+          <input type="text" readonly="readonly" value="backward">
+        </li>
+        <li>
+          <div class="icon icon-reload"></div>
+          <input type="text" readonly="readonly" value="reload">
+        </li>
+        <li>
+          <div class="icon icon-minimize"></div>
+          <input type="text" readonly="readonly" value="minimize">
+        </li>
+        <li>
+          <div class="icon icon-maximize"></div>
+          <input type="text" readonly="readonly" value="maximize">
+        </li>
+        <li>
+          <div class="icon icon-maximize-inverted"></div>
+          <input type="text" readonly="readonly" value="maximize-inverted">
+        </li>
+        <li>
+          <div class="icon icon-disclosure-button-expand"></div>
+          <input type="text" readonly="readonly" value="disclosure-button-expand">
+        </li>
+        <li>
+          <div class="icon icon-disclosure-button-collapse"></div>
+          <input type="text" readonly="readonly" value="disclosure-button-collapse">
+        </li>
+        <li>
+          <div class="icon icon-script-stop"></div>
+          <input type="text" readonly="readonly" value="script-stop">
+        </li>
+        <li>
+          <div class="icon icon-script-reload"></div>
+          <input type="text" readonly="readonly" value="script-reload">
+        </li>
+        <li>
+          <div class="icon icon-script-run"></div>
+          <input type="text" readonly="readonly" value="script-run">
+        </li>
+        <li>
+          <div class="icon icon-script-new"></div>
+          <input type="text" readonly="readonly" value="script-new">
+        </li>
+        <li>
+          <div class="icon icon-hifi-forum"></div>
+          <input type="text" readonly="readonly" value="hifi-forum">
+        </li>
+        <li>
+          <div class="icon icon-hifi-logo-small"></div>
+          <input type="text" readonly="readonly" value="hifi-logo-small">
+        </li>
+        <li>
+          <div class="icon icon-avatar-1"></div>
+          <input type="text" readonly="readonly" value="avatar-1">
+        </li>
+        <li>
+          <div class="icon icon-placemark"></div>
+          <input type="text" readonly="readonly" value="placemark">
+        </li>
+        <li>
+          <div class="icon icon-box"></div>
+          <input type="text" readonly="readonly" value="box">
+        </li>
+        <li>
+          <div class="icon icon-community"></div>
+          <input type="text" readonly="readonly" value="community">
+        </li>
+        <li>
+          <div class="icon icon-grab-handle"></div>
+          <input type="text" readonly="readonly" value="grab-handle">
+        </li>
+        <li>
+          <div class="icon icon-search"></div>
+          <input type="text" readonly="readonly" value="search">
+        </li>
+        <li>
+          <div class="icon icon-disclosure-collapse"></div>
+          <input type="text" readonly="readonly" value="disclosure-collapse">
+        </li>
+        <li>
+          <div class="icon icon-script-upload"></div>
+          <input type="text" readonly="readonly" value="script-upload">
+        </li>
+        <li>
+          <div class="icon icon-code"></div>
+          <input type="text" readonly="readonly" value="code">
+        </li>
+        <li>
+          <div class="icon icon-avatar"></div>
+          <input type="text" readonly="readonly" value="avatar">
+        </li>
+        <li>
+          <div class="icon icon-arrows-h"></div>
+          <input type="text" readonly="readonly" value="arrows-h">
+        </li>
+        <li>
+          <div class="icon icon-arrows-v"></div>
+          <input type="text" readonly="readonly" value="arrows-v">
+        </li>
+        <li>
+          <div class="icon icon-arrows"></div>
+          <input type="text" readonly="readonly" value="arrows">
+        </li>
+        <li>
+          <div class="icon icon-compress"></div>
+          <input type="text" readonly="readonly" value="compress">
+        </li>
+        <li>
+          <div class="icon icon-expand"></div>
+          <input type="text" readonly="readonly" value="expand">
+        </li>
+        <li>
+          <div class="icon icon-placemark-1"></div>
+          <input type="text" readonly="readonly" value="placemark-1">
+        </li>
+        <li>
+          <div class="icon icon-circle"></div>
+          <input type="text" readonly="readonly" value="circle">
+        </li>
+        <li>
+          <div class="icon icon-hand-pointer"></div>
+          <input type="text" readonly="readonly" value="hand-pointer">
+        </li>
+        <li>
+          <div class="icon icon-plus-square-o"></div>
+          <input type="text" readonly="readonly" value="plus-square-o">
+        </li>
+        <li>
+          <div class="icon icon-square"></div>
+          <input type="text" readonly="readonly" value="square">
+        </li>
+        <li>
+          <div class="icon icon-align-center"></div>
+          <input type="text" readonly="readonly" value="align-center">
+        </li>
+        <li>
+          <div class="icon icon-align-justify"></div>
+          <input type="text" readonly="readonly" value="align-justify">
+        </li>
+        <li>
+          <div class="icon icon-align-left"></div>
+          <input type="text" readonly="readonly" value="align-left">
+        </li>
+        <li>
+          <div class="icon icon-align-right"></div>
+          <input type="text" readonly="readonly" value="align-right">
+        </li>
+        <li>
+          <div class="icon icon-bars"></div>
+          <input type="text" readonly="readonly" value="bars">
+        </li>
+        <li>
+          <div class="icon icon-circle-slash"></div>
+          <input type="text" readonly="readonly" value="circle-slash">
+        </li>
+        <li>
+          <div class="icon icon-sync"></div>
+          <input type="text" readonly="readonly" value="sync">
+        </li>
+        <li>
+          <div class="icon icon-key"></div>
+          <input type="text" readonly="readonly" value="key">
+        </li>
+        <li>
+          <div class="icon icon-link"></div>
+          <input type="text" readonly="readonly" value="link">
+        </li>
+        <li>
+          <div class="icon icon-location"></div>
+          <input type="text" readonly="readonly" value="location">
+        </li>
+        <li>
+          <div class="icon icon-carat-r"></div>
+          <input type="text" readonly="readonly" value="carat-r">
+        </li>
+        <li>
+          <div class="icon icon-carat-l"></div>
+          <input type="text" readonly="readonly" value="carat-l">
+        </li>
+        <li>
+          <div class="icon icon-folder-lg"></div>
+          <input type="text" readonly="readonly" value="folder-lg">
+        </li>
+        <li>
+          <div class="icon icon-folder-sm"></div>
+          <input type="text" readonly="readonly" value="folder-sm">
+        </li>
+        <li>
+          <div class="icon icon-level-up"></div>
+          <input type="text" readonly="readonly" value="level-up">
+        </li>
+        <li>
+          <div class="icon icon-info"></div>
+          <input type="text" readonly="readonly" value="info">
+        </li>
+        <li>
+          <div class="icon icon-question"></div>
+          <input type="text" readonly="readonly" value="question">
+        </li>
+        <li>
+          <div class="icon icon-alert"></div>
+          <input type="text" readonly="readonly" value="alert">
+        </li>
+        <li>
+          <div class="icon icon-home"></div>
+          <input type="text" readonly="readonly" value="home">
+        </li>
+        <li>
+          <div class="icon icon-error"></div>
+          <input type="text" readonly="readonly" value="error">
+        </li>
+        <li>
+          <div class="icon icon-settings"></div>
+          <input type="text" readonly="readonly" value="settings">
+        </li>
+        <li>
+          <div class="icon icon-trash"></div>
+          <input type="text" readonly="readonly" value="trash">
+        </li>
+        <li>
+          <div class="icon icon-object-group"></div>
+          <input type="text" readonly="readonly" value="object-group">
+        </li>
+        <li>
+          <div class="icon icon-cm"></div>
+          <input type="text" readonly="readonly" value="cm">
+        </li>
+        <li>
+          <div class="icon icon-msvg"></div>
+          <input type="text" readonly="readonly" value="msvg">
+        </li>
+        <li>
+          <div class="icon icon-deg"></div>
+          <input type="text" readonly="readonly" value="deg">
+        </li>
+        <li>
+          <div class="icon icon-px"></div>
+          <input type="text" readonly="readonly" value="px">
+        </li>
+        <li>
+          <div class="icon icon-m-sq"></div>
+          <input type="text" readonly="readonly" value="m-sq">
+        </li>
+        <li>
+          <div class="icon icon-m-cubed"></div>
+          <input type="text" readonly="readonly" value="m-cubed">
+        </li>
+        <li>
+          <div class="icon icon-acceleration"></div>
+          <input type="text" readonly="readonly" value="acceleration">
+        </li>
+        <li>
+          <div class="icon icon-particles"></div>
+          <input type="text" readonly="readonly" value="particles">
+        </li>
+        <li>
+          <div class="icon icon-voxels"></div>
+          <input type="text" readonly="readonly" value="voxels">
+        </li>
+        <li>
+          <div class="icon icon-lock"></div>
+          <input type="text" readonly="readonly" value="lock">
+        </li>
+        <li>
+          <div class="icon icon-visible"></div>
+          <input type="text" readonly="readonly" value="visible">
+        </li>
+        <li>
+          <div class="icon icon-model"></div>
+          <input type="text" readonly="readonly" value="model">
+        </li>
+        <li>
+          <div class="icon icon-forward"></div>
+          <input type="text" readonly="readonly" value="forward">
+        </li>
+        <li>
+          <div class="icon icon-avatar-2"></div>
+          <input type="text" readonly="readonly" value="avatar-2">
+        </li>
+        <li>
+          <div class="icon icon-arrow-dn"></div>
+          <input type="text" readonly="readonly" value="arrow-dn">
+        </li>
+        <li>
+          <div class="icon icon-arrow-up"></div>
+          <input type="text" readonly="readonly" value="arrow-up">
+        </li>
+        <li>
+          <div class="icon icon-time"></div>
+          <input type="text" readonly="readonly" value="time">
+        </li>
+        <li>
+          <div class="icon icon-transparency"></div>
+          <input type="text" readonly="readonly" value="transparency">
+        </li>
+        <li>
+          <div class="icon icon-unmuted"></div>
+          <input type="text" readonly="readonly" value="unmuted">
+        </li>
+        <li>
+          <div class="icon icon-user"></div>
+          <input type="text" readonly="readonly" value="user">
+        </li>
+        <li>
+          <div class="icon icon-edit-pencil"></div>
+          <input type="text" readonly="readonly" value="edit-pencil">
+        </li>
+        <li>
+          <div class="icon icon-muted"></div>
+          <input type="text" readonly="readonly" value="muted">
+        </li>
+        <li>
+          <div class="icon icon-vol-0"></div>
+          <input type="text" readonly="readonly" value="vol-0">
+        </li>
+        <li>
+          <div class="icon icon-vol-1"></div>
+          <input type="text" readonly="readonly" value="vol-1">
+        </li>
+        <li>
+          <div class="icon icon-vol-2"></div>
+          <input type="text" readonly="readonly" value="vol-2">
+        </li>
+        <li>
+          <div class="icon icon-vol-3"></div>
+          <input type="text" readonly="readonly" value="vol-3">
+        </li>
+        <li>
+          <div class="icon icon-vol-4"></div>
+          <input type="text" readonly="readonly" value="vol-4">
+        </li>
+        <li>
+          <div class="icon icon-vol-x-0"></div>
+          <input type="text" readonly="readonly" value="vol-x-0">
+        </li>
+        <li>
+          <div class="icon icon-vol-x-1"></div>
+          <input type="text" readonly="readonly" value="vol-x-1">
+        </li>
+        <li>
+          <div class="icon icon-vol-x-2"></div>
+          <input type="text" readonly="readonly" value="vol-x-2">
+        </li>
+        <li>
+          <div class="icon icon-vol-x-3"></div>
+          <input type="text" readonly="readonly" value="vol-x-3">
+        </li>
+        <li>
+          <div class="icon icon-vol-x-4"></div>
+          <input type="text" readonly="readonly" value="vol-x-4">
+        </li>
+        <li>
+          <div class="icon icon-share-ext"></div>
+          <input type="text" readonly="readonly" value="share-ext">
+        </li>
+        <li>
+          <div class="icon icon-ellipsis"></div>
+          <input type="text" readonly="readonly" value="ellipsis">
+        </li>
+        <li>
+          <div class="icon icon-check"></div>
+          <input type="text" readonly="readonly" value="check">
+        </li>
+        <li>
+          <div class="icon icon-sliders"></div>
+          <input type="text" readonly="readonly" value="sliders">
+        </li>
+        <li>
+          <div class="icon icon-polyline"></div>
+          <input type="text" readonly="readonly" value="polyline">
+        </li>
+        <li>
+          <div class="icon icon-source"></div>
+          <input type="text" readonly="readonly" value="source">
+        </li>
+        <li>
+          <div class="icon icon-playback-play"></div>
+          <input type="text" readonly="readonly" value="playback-play">
+        </li>
+        <li>
+          <div class="icon icon-stop-square"></div>
+          <input type="text" readonly="readonly" value="stop-square">
+        </li>
+        <li>
+          <div class="icon icon-avatar-t-pose"></div>
+          <input type="text" readonly="readonly" value="avatar-t-pose">
+        </li>
+        <li>
+          <div class="icon icon-check-2-01"></div>
+          <input type="text" readonly="readonly" value="check-2-01">
+        </li>
+      </ul>
+      <h2>Character mapping</h2>
+      <ul class="glyphs character-mapping">
+        <li>
+          <div data-icon="b" class="icon"></div>
+          <input type="text" readonly="readonly" value="b">
+        </li>
+        <li>
+          <div data-icon="c" class="icon"></div>
+          <input type="text" readonly="readonly" value="c">
+        </li>
+        <li>
+          <div data-icon="d" class="icon"></div>
+          <input type="text" readonly="readonly" value="d">
+        </li>
+        <li>
+          <div data-icon="e" class="icon"></div>
+          <input type="text" readonly="readonly" value="e">
+        </li>
+        <li>
+          <div data-icon="f" class="icon"></div>
+          <input type="text" readonly="readonly" value="f">
+        </li>
+        <li>
+          <div data-icon="g" class="icon"></div>
+          <input type="text" readonly="readonly" value="g">
+        </li>
+        <li>
+          <div data-icon="h" class="icon"></div>
+          <input type="text" readonly="readonly" value="h">
+        </li>
+        <li>
+          <div data-icon="i" class="icon"></div>
+          <input type="text" readonly="readonly" value="i">
+        </li>
+        <li>
+          <div data-icon="j" class="icon"></div>
+          <input type="text" readonly="readonly" value="j">
+        </li>
+        <li>
+          <div data-icon="k" class="icon"></div>
+          <input type="text" readonly="readonly" value="k">
+        </li>
+        <li>
+          <div data-icon="l" class="icon"></div>
+          <input type="text" readonly="readonly" value="l">
+        </li>
+        <li>
+          <div data-icon="m" class="icon"></div>
+          <input type="text" readonly="readonly" value="m">
+        </li>
+        <li>
+          <div data-icon="n" class="icon"></div>
+          <input type="text" readonly="readonly" value="n">
+        </li>
+        <li>
+          <div data-icon="o" class="icon"></div>
+          <input type="text" readonly="readonly" value="o">
+        </li>
+        <li>
+          <div data-icon="p" class="icon"></div>
+          <input type="text" readonly="readonly" value="p">
+        </li>
+        <li>
+          <div data-icon="q" class="icon"></div>
+          <input type="text" readonly="readonly" value="q">
+        </li>
+        <li>
+          <div data-icon="r" class="icon"></div>
+          <input type="text" readonly="readonly" value="r">
+        </li>
+        <li>
+          <div data-icon="s" class="icon"></div>
+          <input type="text" readonly="readonly" value="s">
+        </li>
+        <li>
+          <div data-icon="t" class="icon"></div>
+          <input type="text" readonly="readonly" value="t">
+        </li>
+        <li>
+          <div data-icon="u" class="icon"></div>
+          <input type="text" readonly="readonly" value="u">
+        </li>
+        <li>
+          <div data-icon="v" class="icon"></div>
+          <input type="text" readonly="readonly" value="v">
+        </li>
+        <li>
+          <div data-icon="w" class="icon"></div>
+          <input type="text" readonly="readonly" value="w">
+        </li>
+        <li>
+          <div data-icon="x" class="icon"></div>
+          <input type="text" readonly="readonly" value="x">
+        </li>
+        <li>
+          <div data-icon="y" class="icon"></div>
+          <input type="text" readonly="readonly" value="y">
+        </li>
+        <li>
+          <div data-icon="z" class="icon"></div>
+          <input type="text" readonly="readonly" value="z">
+        </li>
+        <li>
+          <div data-icon="A" class="icon"></div>
+          <input type="text" readonly="readonly" value="A">
+        </li>
+        <li>
+          <div data-icon="B" class="icon"></div>
+          <input type="text" readonly="readonly" value="B">
+        </li>
+        <li>
+          <div data-icon="a" class="icon"></div>
+          <input type="text" readonly="readonly" value="a">
+        </li>
+        <li>
+          <div data-icon="C" class="icon"></div>
+          <input type="text" readonly="readonly" value="C">
+        </li>
+        <li>
+          <div data-icon="E" class="icon"></div>
+          <input type="text" readonly="readonly" value="E">
+        </li>
+        <li>
+          <div data-icon="F" class="icon"></div>
+          <input type="text" readonly="readonly" value="F">
+        </li>
+        <li>
+          <div data-icon="I" class="icon"></div>
+          <input type="text" readonly="readonly" value="I">
+        </li>
+        <li>
+          <div data-icon="J" class="icon"></div>
+          <input type="text" readonly="readonly" value="J">
+        </li>
+        <li>
+          <div data-icon="K" class="icon"></div>
+          <input type="text" readonly="readonly" value="K">
+        </li>
+        <li>
+          <div data-icon="L" class="icon"></div>
+          <input type="text" readonly="readonly" value="L">
+        </li>
+        <li>
+          <div data-icon="M" class="icon"></div>
+          <input type="text" readonly="readonly" value="M">
+        </li>
+        <li>
+          <div data-icon="N" class="icon"></div>
+          <input type="text" readonly="readonly" value="N">
+        </li>
+        <li>
+          <div data-icon="O" class="icon"></div>
+          <input type="text" readonly="readonly" value="O">
+        </li>
+        <li>
+          <div data-icon="P" class="icon"></div>
+          <input type="text" readonly="readonly" value="P">
+        </li>
+        <li>
+          <div data-icon="Q" class="icon"></div>
+          <input type="text" readonly="readonly" value="Q">
+        </li>
+        <li>
+          <div data-icon="2" class="icon"></div>
+          <input type="text" readonly="readonly" value="2">
+        </li>
+        <li>
+          <div data-icon="S" class="icon"></div>
+          <input type="text" readonly="readonly" value="S">
+        </li>
+        <li>
+          <div data-icon="T" class="icon"></div>
+          <input type="text" readonly="readonly" value="T">
+        </li>
+        <li>
+          <div data-icon="U" class="icon"></div>
+          <input type="text" readonly="readonly" value="U">
+        </li>
+        <li>
+          <div data-icon="V" class="icon"></div>
+          <input type="text" readonly="readonly" value="V">
+        </li>
+        <li>
+          <div data-icon="0" class="icon"></div>
+          <input type="text" readonly="readonly" value="0">
+        </li>
+        <li>
+          <div data-icon="X" class="icon"></div>
+          <input type="text" readonly="readonly" value="X">
+        </li>
+        <li>
+          <div data-icon="Y" class="icon"></div>
+          <input type="text" readonly="readonly" value="Y">
+        </li>
+        <li>
+          <div data-icon="Z" class="icon"></div>
+          <input type="text" readonly="readonly" value="Z">
+        </li>
+        <li>
+          <div data-icon="R" class="icon"></div>
+          <input type="text" readonly="readonly" value="R">
+        </li>
+        <li>
+          <div data-icon="W" class="icon"></div>
+          <input type="text" readonly="readonly" value="W">
+        </li>
+        <li>
+          <div data-icon="<" class="icon"></div>
+          <input type="text" readonly="readonly" value="&lt;">
+        </li>
+        <li>
+          <div data-icon=":" class="icon"></div>
+          <input type="text" readonly="readonly" value=":">
+        </li>
+        <li>
+          <div data-icon=";" class="icon"></div>
+          <input type="text" readonly="readonly" value=";">
+        </li>
+        <li>
+          <div data-icon="`" class="icon"></div>
+          <input type="text" readonly="readonly" value="`">
+        </li>
+        <li>
+          <div data-icon="!" class="icon"></div>
+          <input type="text" readonly="readonly" value="!">
+        </li>
+        <li>
+          <div data-icon="&#34;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&quot;">
+        </li>
+        <li>
+          <div data-icon="#" class="icon"></div>
+          <input type="text" readonly="readonly" value="#">
+        </li>
+        <li>
+          <div data-icon="$" class="icon"></div>
+          <input type="text" readonly="readonly" value="$">
+        </li>
+        <li>
+          <div data-icon="9" class="icon"></div>
+          <input type="text" readonly="readonly" value="9">
+        </li>
+        <li>
+          <div data-icon="%" class="icon"></div>
+          <input type="text" readonly="readonly" value="%">
+        </li>
+        <li>
+          <div data-icon="'" class="icon"></div>
+          <input type="text" readonly="readonly" value="&#39;">
+        </li>
+        <li>
+          <div data-icon="8" class="icon"></div>
+          <input type="text" readonly="readonly" value="8">
+        </li>
+        <li>
+          <div data-icon=")" class="icon"></div>
+          <input type="text" readonly="readonly" value=")">
+        </li>
+        <li>
+          <div data-icon="*" class="icon"></div>
+          <input type="text" readonly="readonly" value="*">
+        </li>
+        <li>
+          <div data-icon="^" class="icon"></div>
+          <input type="text" readonly="readonly" value="^">
+        </li>
+        <li>
+          <div data-icon="7" class="icon"></div>
+          <input type="text" readonly="readonly" value="7">
+        </li>
+        <li>
+          <div data-icon="," class="icon"></div>
+          <input type="text" readonly="readonly" value=",">
+        </li>
+        <li>
+          <div data-icon="(" class="icon"></div>
+          <input type="text" readonly="readonly" value="(">
+        </li>
+        <li>
+          <div data-icon="-" class="icon"></div>
+          <input type="text" readonly="readonly" value="-">
+        </li>
+        <li>
+          <div data-icon="." class="icon"></div>
+          <input type="text" readonly="readonly" value=".">
+        </li>
+        <li>
+          <div data-icon="/" class="icon"></div>
+          <input type="text" readonly="readonly" value="/">
+        </li>
+        <li>
+          <div data-icon="3" class="icon"></div>
+          <input type="text" readonly="readonly" value="3">
+        </li>
+        <li>
+          <div data-icon="4" class="icon"></div>
+          <input type="text" readonly="readonly" value="4">
+        </li>
+        <li>
+          <div data-icon=">" class="icon"></div>
+          <input type="text" readonly="readonly" value="&gt;">
+        </li>
+        <li>
+          <div data-icon="?" class="icon"></div>
+          <input type="text" readonly="readonly" value="?">
+        </li>
+        <li>
+          <div data-icon="1" class="icon"></div>
+          <input type="text" readonly="readonly" value="1">
+        </li>
+        <li>
+          <div data-icon="[" class="icon"></div>
+          <input type="text" readonly="readonly" value="[">
+        </li>
+        <li>
+          <div data-icon="]" class="icon"></div>
+          <input type="text" readonly="readonly" value="]">
+        </li>
+        <li>
+          <div data-icon="+" class="icon"></div>
+          <input type="text" readonly="readonly" value="+">
+        </li>
+        <li>
+          <div data-icon="_" class="icon"></div>
+          <input type="text" readonly="readonly" value="_">
+        </li>
+        <li>
+          <div data-icon="=" class="icon"></div>
+          <input type="text" readonly="readonly" value="=">
+        </li>
+        <li>
+          <div data-icon="@" class="icon"></div>
+          <input type="text" readonly="readonly" value="@">
+        </li>
+        <li>
+          <div data-icon="{" class="icon"></div>
+          <input type="text" readonly="readonly" value="{">
+        </li>
+        <li>
+          <div data-icon="&#xe000;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe000;">
+        </li>
+        <li>
+          <div data-icon="}" class="icon"></div>
+          <input type="text" readonly="readonly" value="}">
+        </li>
+        <li>
+          <div data-icon="~" class="icon"></div>
+          <input type="text" readonly="readonly" value="~">
+        </li>
+        <li>
+          <div data-icon="\" class="icon"></div>
+          <input type="text" readonly="readonly" value="\">
+        </li>
+        <li>
+          <div data-icon="|" class="icon"></div>
+          <input type="text" readonly="readonly" value="|">
+        </li>
+        <li>
+          <div data-icon="&#xe001;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe001;">
+        </li>
+        <li>
+          <div data-icon="&#xe002;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe002;">
+        </li>
+        <li>
+          <div data-icon="&#xe003;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe003;">
+        </li>
+        <li>
+          <div data-icon="&#xe004;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe004;">
+        </li>
+        <li>
+          <div data-icon="&#xe005;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe005;">
+        </li>
+        <li>
+          <div data-icon="&#xe006;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe006;">
+        </li>
+        <li>
+          <div data-icon="&#xe007;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe007;">
+        </li>
+        <li>
+          <div data-icon="&#xe008;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe008;">
+        </li>
+        <li>
+          <div data-icon="D" class="icon"></div>
+          <input type="text" readonly="readonly" value="D">
+        </li>
+        <li>
+          <div data-icon="&#xe009;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe009;">
+        </li>
+        <li>
+          <div data-icon="5" class="icon"></div>
+          <input type="text" readonly="readonly" value="5">
+        </li>
+        <li>
+          <div data-icon="6" class="icon"></div>
+          <input type="text" readonly="readonly" value="6">
+        </li>
+        <li>
+          <div data-icon="&#xe00a;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe00a;">
+        </li>
+        <li>
+          <div data-icon="&#xe00b;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe00b;">
+        </li>
+        <li>
+          <div data-icon="G" class="icon"></div>
+          <input type="text" readonly="readonly" value="G">
+        </li>
+        <li>
+          <div data-icon="&#xe00c;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe00c;">
+        </li>
+        <li>
+          <div data-icon="&#xe00d;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe00d;">
+        </li>
+        <li>
+          <div data-icon="H" class="icon"></div>
+          <input type="text" readonly="readonly" value="H">
+        </li>
+        <li>
+          <div data-icon="&#xe00e;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe00e;">
+        </li>
+        <li>
+          <div data-icon="&#xe00f;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe00f;">
+        </li>
+        <li>
+          <div data-icon="&#xe010;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe010;">
+        </li>
+        <li>
+          <div data-icon="&#xe011;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe011;">
+        </li>
+        <li>
+          <div data-icon="&#xe012;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe012;">
+        </li>
+        <li>
+          <div data-icon="&#xe013;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe013;">
+        </li>
+        <li>
+          <div data-icon="&#xe014;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe014;">
+        </li>
+        <li>
+          <div data-icon="&#xe015;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe015;">
+        </li>
+        <li>
+          <div data-icon="&#xe016;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe016;">
+        </li>
+        <li>
+          <div data-icon="&#xe017;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe017;">
+        </li>
+        <li>
+          <div data-icon="&#xe018;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe018;">
+        </li>
+        <li>
+          <div data-icon="&#xe019;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe019;">
+        </li>
+        <li>
+          <div data-icon="&#xe01a;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe01a;">
+        </li>
+        <li>
+          <div data-icon="&" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;">
+        </li>
+        <li>
+          <div data-icon="&#xe01b;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe01b;">
+        </li>
+        <li>
+          <div data-icon="&#xe01c;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe01c;">
+        </li>
+        <li>
+          <div data-icon="&#xe01d;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe01d;">
+        </li>
+        <li>
+          <div data-icon="&#xe01e;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe01e;">
+        </li>
+        <li>
+          <div data-icon="&#xe01f;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe01f;">
+        </li>
+        <li>
+          <div data-icon="&#xe020;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe020;">
+        </li>
+      </ul>
+    </div>
+    <script>(function() {
+  var glyphs, i, len, ref;
+
+  ref = document.getElementsByClassName('glyphs');
+  for (i = 0, len = ref.length; i < len; i++) {
+    glyphs = ref[i];
+    glyphs.addEventListener('click', function(event) {
+      if (event.target.tagName === 'INPUT') {
+        return event.target.select();
+      }
+    });
+  }
+
+}).call(this);
+
+    </script>
+  </body>
+</html>
diff --git a/interface/resources/fonts/hifi-glyphs/styles.css b/interface/resources/fonts/hifi-glyphs/styles.css
new file mode 100644
index 0000000000..66277740fc
--- /dev/null
+++ b/interface/resources/fonts/hifi-glyphs/styles.css
@@ -0,0 +1,421 @@
+@charset "UTF-8";
+
+@font-face {
+  font-family: "hifi-glyphs";
+  src:url("fonts/hifi-glyphs.eot");
+  src:url("fonts/hifi-glyphs.eot?#iefix") format("embedded-opentype"),
+    url("fonts/hifi-glyphs.woff") format("woff"),
+    url("fonts/hifi-glyphs.ttf") format("truetype"),
+    url("fonts/hifi-glyphs.svg#hifi-glyphs") format("svg");
+  font-weight: normal;
+  font-style: normal;
+
+}
+
+[data-icon]:before {
+  font-family: "hifi-glyphs" !important;
+  content: attr(data-icon);
+  font-style: normal !important;
+  font-weight: normal !important;
+  font-variant: normal !important;
+  text-transform: none !important;
+  speak: none;
+  line-height: 1;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+[class^="icon-"]:before,
+[class*=" icon-"]:before {
+  font-family: "hifi-glyphs" !important;
+  font-style: normal !important;
+  font-weight: normal !important;
+  font-variant: normal !important;
+  text-transform: none !important;
+  speak: none;
+  line-height: 1;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-hmd:before {
+  content: "\62";
+}
+.icon-2d-screen:before {
+  content: "\63";
+}
+.icon-keyboard:before {
+  content: "\64";
+}
+.icon-hand-controllers:before {
+  content: "\65";
+}
+.icon-headphones-mic:before {
+  content: "\66";
+}
+.icon-gamepad:before {
+  content: "\67";
+}
+.icon-headphones:before {
+  content: "\68";
+}
+.icon-mic:before {
+  content: "\69";
+}
+.icon-upload:before {
+  content: "\6a";
+}
+.icon-script:before {
+  content: "\6b";
+}
+.icon-text:before {
+  content: "\6c";
+}
+.icon-cube:before {
+  content: "\6d";
+}
+.icon-sphere:before {
+  content: "\6e";
+}
+.icon-zone:before {
+  content: "\6f";
+}
+.icon-light:before {
+  content: "\70";
+}
+.icon-web:before {
+  content: "\71";
+}
+.icon-web-2:before {
+  content: "\72";
+}
+.icon-edit:before {
+  content: "\73";
+}
+.icon-market:before {
+  content: "\74";
+}
+.icon-directory:before {
+  content: "\75";
+}
+.icon-menu:before {
+  content: "\76";
+}
+.icon-close:before {
+  content: "\77";
+}
+.icon-close-inverted:before {
+  content: "\78";
+}
+.icon-pin:before {
+  content: "\79";
+}
+.icon-pin-inverted:before {
+  content: "\7a";
+}
+.icon-resize-handle:before {
+  content: "\41";
+}
+.icon-diclosure-expand:before {
+  content: "\42";
+}
+.icon-reload-small:before {
+  content: "\61";
+}
+.icon-close-small:before {
+  content: "\43";
+}
+.icon-backward:before {
+  content: "\45";
+}
+.icon-reload:before {
+  content: "\46";
+}
+.icon-minimize:before {
+  content: "\49";
+}
+.icon-maximize:before {
+  content: "\4a";
+}
+.icon-maximize-inverted:before {
+  content: "\4b";
+}
+.icon-disclosure-button-expand:before {
+  content: "\4c";
+}
+.icon-disclosure-button-collapse:before {
+  content: "\4d";
+}
+.icon-script-stop:before {
+  content: "\4e";
+}
+.icon-script-reload:before {
+  content: "\4f";
+}
+.icon-script-run:before {
+  content: "\50";
+}
+.icon-script-new:before {
+  content: "\51";
+}
+.icon-hifi-forum:before {
+  content: "\32";
+}
+.icon-hifi-logo-small:before {
+  content: "\53";
+}
+.icon-avatar-1:before {
+  content: "\54";
+}
+.icon-placemark:before {
+  content: "\55";
+}
+.icon-box:before {
+  content: "\56";
+}
+.icon-community:before {
+  content: "\30";
+}
+.icon-grab-handle:before {
+  content: "\58";
+}
+.icon-search:before {
+  content: "\59";
+}
+.icon-disclosure-collapse:before {
+  content: "\5a";
+}
+.icon-script-upload:before {
+  content: "\52";
+}
+.icon-code:before {
+  content: "\57";
+}
+.icon-avatar:before {
+  content: "\3c";
+}
+.icon-arrows-h:before {
+  content: "\3a";
+}
+.icon-arrows-v:before {
+  content: "\3b";
+}
+.icon-arrows:before {
+  content: "\60";
+}
+.icon-compress:before {
+  content: "\21";
+}
+.icon-expand:before {
+  content: "\22";
+}
+.icon-placemark-1:before {
+  content: "\23";
+}
+.icon-circle:before {
+  content: "\24";
+}
+.icon-hand-pointer:before {
+  content: "\39";
+}
+.icon-plus-square-o:before {
+  content: "\25";
+}
+.icon-square:before {
+  content: "\27";
+}
+.icon-align-center:before {
+  content: "\38";
+}
+.icon-align-justify:before {
+  content: "\29";
+}
+.icon-align-left:before {
+  content: "\2a";
+}
+.icon-align-right:before {
+  content: "\5e";
+}
+.icon-bars:before {
+  content: "\37";
+}
+.icon-circle-slash:before {
+  content: "\2c";
+}
+.icon-sync:before {
+  content: "\28";
+}
+.icon-key:before {
+  content: "\2d";
+}
+.icon-link:before {
+  content: "\2e";
+}
+.icon-location:before {
+  content: "\2f";
+}
+.icon-carat-r:before {
+  content: "\33";
+}
+.icon-carat-l:before {
+  content: "\34";
+}
+.icon-folder-lg:before {
+  content: "\3e";
+}
+.icon-folder-sm:before {
+  content: "\3f";
+}
+.icon-level-up:before {
+  content: "\31";
+}
+.icon-info:before {
+  content: "\5b";
+}
+.icon-question:before {
+  content: "\5d";
+}
+.icon-alert:before {
+  content: "\2b";
+}
+.icon-home:before {
+  content: "\5f";
+}
+.icon-error:before {
+  content: "\3d";
+}
+.icon-settings:before {
+  content: "\40";
+}
+.icon-trash:before {
+  content: "\7b";
+}
+.icon-object-group:before {
+  content: "\e000";
+}
+.icon-cm:before {
+  content: "\7d";
+}
+.icon-msvg:before {
+  content: "\7e";
+}
+.icon-deg:before {
+  content: "\5c";
+}
+.icon-px:before {
+  content: "\7c";
+}
+.icon-m-sq:before {
+  content: "\e001";
+}
+.icon-m-cubed:before {
+  content: "\e002";
+}
+.icon-acceleration:before {
+  content: "\e003";
+}
+.icon-particles:before {
+  content: "\e004";
+}
+.icon-voxels:before {
+  content: "\e005";
+}
+.icon-lock:before {
+  content: "\e006";
+}
+.icon-visible:before {
+  content: "\e007";
+}
+.icon-model:before {
+  content: "\e008";
+}
+.icon-forward:before {
+  content: "\44";
+}
+.icon-avatar-2:before {
+  content: "\e009";
+}
+.icon-arrow-dn:before {
+  content: "\35";
+}
+.icon-arrow-up:before {
+  content: "\36";
+}
+.icon-time:before {
+  content: "\e00a";
+}
+.icon-transparency:before {
+  content: "\e00b";
+}
+.icon-unmuted:before {
+  content: "\47";
+}
+.icon-user:before {
+  content: "\e00c";
+}
+.icon-edit-pencil:before {
+  content: "\e00d";
+}
+.icon-muted:before {
+  content: "\48";
+}
+.icon-vol-0:before {
+  content: "\e00e";
+}
+.icon-vol-1:before {
+  content: "\e00f";
+}
+.icon-vol-2:before {
+  content: "\e010";
+}
+.icon-vol-3:before {
+  content: "\e011";
+}
+.icon-vol-4:before {
+  content: "\e012";
+}
+.icon-vol-x-0:before {
+  content: "\e013";
+}
+.icon-vol-x-1:before {
+  content: "\e014";
+}
+.icon-vol-x-2:before {
+  content: "\e015";
+}
+.icon-vol-x-3:before {
+  content: "\e016";
+}
+.icon-vol-x-4:before {
+  content: "\e017";
+}
+.icon-share-ext:before {
+  content: "\e018";
+}
+.icon-ellipsis:before {
+  content: "\e019";
+}
+.icon-check:before {
+  content: "\e01a";
+}
+.icon-sliders:before {
+  content: "\26";
+}
+.icon-polyline:before {
+  content: "\e01b";
+}
+.icon-source:before {
+  content: "\e01c";
+}
+.icon-playback-play:before {
+  content: "\e01d";
+}
+.icon-stop-square:before {
+  content: "\e01e";
+}
+.icon-avatar-t-pose:before {
+  content: "\e01f";
+}
+.icon-check-2-01:before {
+  content: "\e020";
+}
diff --git a/interface/resources/html/commerce/backup_instructions.html b/interface/resources/html/commerce/backup_instructions.html
new file mode 100644
index 0000000000..560894e33d
--- /dev/null
+++ b/interface/resources/html/commerce/backup_instructions.html
@@ -0,0 +1,609 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<style>
+
+    body
+    {
+    	margin: 0;
+    	padding: 0;
+    	color: #333;
+    	background-color: #eee;
+      font: 300 16px/22px "Lato", "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+      background: rgba(74,219,255,1);
+      background: -moz-linear-gradient(-45deg, rgba(74,219,255,1) 0%, rgba(61,171,255,1) 41%, rgba(54,124,209,1) 100%);
+      background: -webkit-gradient(left top, right bottom, color-stop(0%, rgba(74,219,255,1)), color-stop(41%, rgba(61,171,255,1)), color-stop(100%, rgba(54,124,209,1)));
+      background: -webkit-linear-gradient(-45deg, rgba(74,219,255,1) 0%, rgba(61,171,255,1) 41%, rgba(54,124,209,1) 100%);
+      background: -o-linear-gradient(-45deg, rgba(74,219,255,1) 0%, rgba(61,171,255,1) 41%, rgba(54,124,209,1) 100%);
+      background: -ms-linear-gradient(-45deg, rgba(74,219,255,1) 0%, rgba(61,171,255,1) 41%, rgba(54,124,209,1) 100%);
+      background: linear-gradient(135deg, rgba(74,219,255,1) 0%, rgba(61,171,255,1) 41%, rgba(54,124,209,1) 100%);
+      filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#4adbff', endColorstr='#367cd1', GradientType=1 );
+    }
+
+    h1,h2,h3,h4,h5,h6
+    {
+    	margin: 0 0 .5em;
+    	font-weight: 500;
+    	line-height: 1.1;
+    }
+
+    h1 { font-size: 2.25em; } /* 36px */
+    h2 { font-size: 1.75em; } /* 28px */
+    h3 { font-size: 1.375em; } /* 22px */
+    h4 { font-size: 1.125em; } /* 18px */
+    h5 { font-size: 1em; } /* 16px */
+    h6 { font-size: .875em; } /* 14px */
+
+    p
+    {
+    	margin: 0 0 1.5em;
+    	line-height: 1.5;
+    }
+
+    blockquote
+    {
+    	padding: 1em 2em;
+    	margin: 0 0 2em;
+    	border-left: 5px solid #eee;
+    }
+
+    hr
+    {
+    	height: 0;
+    	margin-top: 1em;
+    	margin-bottom: 2em;
+    	border: 0;
+    	border-top: 1px solid #ddd;
+    }
+
+    table
+    {
+    	background-color: transparent;
+    	border-spacing: 0;
+    	border-collapse: collapse;
+    	border-top: 1px solid #ddd;
+    }
+
+    th, td
+    {
+    	padding: .5em 1em;
+    	vertical-align: top;
+    	text-align: left;
+    	border-bottom: 1px solid #ddd;
+    }
+
+    a:link { color: #0093C5; }
+    a:visited { color: #0093C5; }
+    a:focus { color: black; }
+    a:hover { color: #00B4EF; }
+    a:active { color: #00B4EF; }
+
+    /* -----------------------
+    Layout styles
+    ------------------------*/
+
+    .container
+    {
+    	max-width: 50em;
+    	margin: 0 auto;
+    	background-color: #fff;
+    }
+
+    .header
+    {
+    	color: #fff;
+    	background: #333;
+    	padding: 1em 1.25em;
+    }
+
+    .header-heading { margin: 0; }
+
+    .nav-bar
+    {
+    	background: #000;
+    	padding: 0;
+    }
+
+    .content { padding: 1em 1.25em; }
+
+    .footer
+    {
+    	color: #fff;
+    	background: #000;
+
+    }
+
+    .alert
+    {
+      padding: 1em 1.25em;
+      border-radius: 2px;
+      border-width: thin;
+      border-color: #ccc;
+      background: #eee;
+    }
+    /* -----------------------
+    Nav
+    ------------------------*/
+
+    .nav
+    {
+    	margin: 0;
+    	padding: 0;
+    	list-style: none;
+    }
+
+    .nav li
+    {
+    	display: inline;
+    	margin: 0;
+    }
+
+    .nav a
+    {
+    	display: block;
+    	padding: .7em 1.25em;
+    	color: #fff;
+    	text-decoration: none;
+    	border-bottom: 1px solid gray;
+    }
+
+    .nav a:link { color: white; }
+    .nav a:visited { color: white; }
+
+    .nav a:focus
+    {
+    	color: black;
+    	background-color: white;
+    }
+
+    .nav a:hover
+    {
+    	color: white;
+    	background-color: green;
+    }
+
+    .nav a:active
+    {
+    	color: white;
+    	background-color: red;
+    }
+
+    /* -----------------------
+    Single styles
+    ------------------------*/
+
+    .img-responsive { max-width: 100%; }
+
+    .btn
+    {
+    	color: #fff !important;
+    	background-color: royalblue;
+    	border-color: #222;
+    	display: inline-block;
+    	padding: .5em 1em;
+    	margin-bottom: 0;
+    	font-weight: 400;
+    	line-height: 1.2;
+    	text-align: center;
+    	white-space: nowrap;
+    	vertical-align: middle;
+    	cursor: pointer;
+    	border: 1px solid transparent;
+    	border-radius: .2em;
+    	text-decoration: none;
+    }
+
+    .btn:hover
+    {
+    	color: #fff !important;
+    	background-color: #0093C5;
+    }
+
+    .btn:focus
+    {
+    	color: #fff !important;
+    	background-color: black;
+    }
+
+    .btn:active
+    {
+    	color: #fff !important;
+    	background-color: black;
+    }
+
+    .table
+    {
+    	width: 100%;
+    	max-width: 100%;
+    	margin-bottom: 20px;
+    }
+
+    .list-unstyled
+    {
+    	padding-left: 0;
+    	list-style: none;
+    }
+
+    .list-inline
+    {
+    	padding-left: 0;
+    	margin-left: -5px;
+    	list-style: none;
+    }
+
+    .list-inline > li
+    {
+    	display: inline-block;
+    	padding-right: 5px;
+    	padding-left: 5px;
+    }
+
+
+
+    /* -----------------------
+    Wide styles
+    ------------------------*/
+
+    @media (min-width: 42em)
+    {
+    	.header { padding: 1.5em 3em; }
+    	.nav-bar { padding: 1em 3em; }
+    	.content { padding: 2em 3em; }
+    	.footer { padding: 2em 3em; }
+
+    	.nav li
+    	{
+    		display: inline;
+    		margin: 0 1em 0 0;
+    	}
+
+    	.nav a
+    	{
+    		display: inline;
+    		padding: 0;
+    		border-bottom: 0;
+    	}
+  }
+</style>
+<title>Backing Up Your Private Keys | High Fidelity</title>
+</head>
+
+<body>
+  <div class="container">
+    <div class="header">
+      <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 1200 95" style="enable-background:new 0 0 1200 95;" xml:space="preserve">
+      <style type="text/css">
+      	.st15{fill:#10bcff;}
+      	.st16{fill:#939598;}
+      </style>
+      <g id="Layer_1_1_">
+      	<path class="st15" d="M144,35.8v29.2h-6.3V52.3h-10.3v12.8h-6.3V35.8h6.3v11.3h10.3V35.8H144z"/>
+      	<path class="st15" d="M155.1,65.1h-6.3V35.8h6.3V65.1z"/>
+      	<path class="st15" d="M173.2,40.5c-1.5,0-2.7,0.1-3.8,0.4c-1,0.3-1.8,0.8-2.5,1.4c-0.6,0.6-1.1,1.6-1.4,2.7s-0.4,2.5-0.4,4.2v2.7
+      		c0,1.8,0.1,3.2,0.4,4.3c0.2,1.1,0.6,2,1.2,2.6c0.5,0.6,1.3,1.1,2.2,1.3c0.9,0.2,2,0.4,3.3,0.4c0.4,0,0.8,0,1.2-0.1
+      		c0.4,0,0.8-0.1,1.3-0.1v-7.9h-3.7l0.6-4.8h9v16.7c-1.1,0.4-2.5,0.7-4.3,0.9c-1.7,0.2-3.4,0.4-5.2,0.4c-2.2,0-4.1-0.3-5.7-0.8
+      		c-1.6-0.5-2.8-1.4-3.8-2.5c-1-1.1-1.7-2.5-2.2-4.2c-0.5-1.7-0.6-3.7-0.6-5.9v-3c0-2.1,0.2-3.9,0.6-5.6c0.5-1.7,1.2-3.1,2.3-4.3
+      		c1.1-1.2,2.5-2.1,4.2-2.8c1.7-0.6,3.9-1,6.5-1c1.4,0,2.8,0.1,4.2,0.4c1.4,0.2,2.5,0.5,3.4,0.8l-1,4.7c-0.8-0.2-1.7-0.4-2.6-0.6
+      		C175.5,40.5,174.5,40.5,173.2,40.5z"/>
+      	<path class="st15" d="M208.8,35.8v29.2h-6.3V52.3h-10.3v12.8H186V35.8h6.3v11.3h10.3V35.8H208.8z"/>
+      	<path class="st15" d="M242.2,35.8l-0.7,5.1h-10.9V47h10.1l-0.7,5.1h-9.4v13h-6.3V35.8H242.2z"/>
+      	<path class="st15" d="M252.3,65.1h-6.3V35.8h6.3V65.1z"/>
+      	<path class="st15" d="M257.4,35.8h9.6c2.5,0,4.5,0.4,6.2,1s3,1.6,4,2.7c1,1.2,1.7,2.5,2.1,4.2c0.4,1.7,0.6,3.4,0.6,5.3v2.8
+      		c0,1.9-0.2,3.7-0.6,5.4c-0.4,1.7-1.1,3-2.1,4.2c-1,1.2-2.3,2.1-4,2.7c-1.7,0.6-3.7,1-6.2,1h-9.5L257.4,35.8L257.4,35.8z M263.6,60
+      		h2.7c1.2,0,2.2-0.1,3.1-0.4c0.9-0.3,1.7-0.8,2.2-1.4s1-1.5,1.3-2.6c0.3-1.1,0.4-2.4,0.4-4.1v-2.2c0-1.7-0.1-3-0.4-4.1
+      		c-0.3-1.1-0.7-1.9-1.3-2.6s-1.3-1.1-2.2-1.4c-0.9-0.2-1.9-0.4-3.1-0.4h-2.7V60z"/>
+      	<path class="st15" d="M302,35.8l-0.6,4.9h-11.3v6.4h10.6l-0.6,4.9h-10v8.2h11.9l-0.6,4.9h-17.6V35.8H302z"/>
+      	<path class="st15" d="M312.4,35.8V60h11.9l-0.7,5.1h-17.4V35.8H312.4z"/>
+      	<path class="st15" d="M334.6,65.1h-6.3V35.8h6.3V65.1z"/>
+      	<path class="st15" d="M361.6,35.8l-0.7,5.1H353v24.2h-6.3V40.9h-8.6l0.7-5.1C338.8,35.8,361.6,35.8,361.6,35.8z"/>
+      	<path class="st15" d="M376.5,47.2l6.1-11.4h6.4l-9.6,16.5v12.8h-6.3V52.3l-9.5-16.5h6.9L376.5,47.2z"/>
+      	<g>
+      		<path class="st15" d="M58.8,92c-5.9,0-11.7-1.2-17.1-3.4c-5.3-2.2-9.9-5.4-13.9-9.4c-4-4-7.2-8.7-9.4-13.9C16,59.7,14.8,54,14.8,48
+      			c0-5.9,1.2-11.7,3.4-17.1c2.2-5.3,5.4-9.9,9.4-13.9s8.7-7.2,13.9-9.4C47,5.3,52.7,4.2,58.7,4.2s11.7,1.2,17.1,3.4
+      			C81,9.8,85.7,13,89.7,17s7.2,8.7,9.4,13.9c2.3,5.4,3.4,11.2,3.4,17.1s-1.2,11.7-3.4,17.1c-2.2,5.3-5.4,9.9-9.4,13.9
+      			c-4,4-8.7,7.2-13.9,9.4C70.5,90.8,64.7,92,58.8,92z M58.8,8.7C37.1,8.7,19.4,26.4,19.4,48s17.7,39.4,39.4,39.4S98.1,69.7,98.1,48
+      			S80.5,8.7,58.8,8.7z"/>
+      		<path class="st15" d="M72.2,66.7V35.9c1.9-0.6,3.3-2.5,3.3-4.6c0-2.7-2.2-4.8-4.8-4.8c-2.7,0-4.8,2.2-4.8,4.8
+      			c0,2.1,1.2,3.8,3.1,4.5v14.4l-20.1-9.3V29.5c1.9-0.6,3.3-2.5,3.3-4.6c0-2.7-2.2-4.8-4.8-4.8c-2.7,0-4.8,2.2-4.8,4.8
+      			c0,2.1,1.2,3.8,3.1,4.5v31c-1.8,0.7-3.1,2.5-3.1,4.5c0,2.7,2.2,4.8,4.8,4.8c2.7,0,4.8-2.2,4.8-4.8c0-2.1-1.4-4-3.3-4.6V44.7
+      			l20.1,9.3v12.7c-1.8,0.7-3.1,2.5-3.1,4.5c0,2.7,2.2,4.8,4.8,4.8c2.7,0,4.8-2.2,4.8-4.8C75.5,69.1,74.1,67.4,72.2,66.7z"/>
+      	</g>
+      </g>
+      <path class="st16" d="M418.8,34h2.6v38.6h-2.6V34z"/>
+      <path class="st16" d="M471.1,35.3v29.9h-2.7V50.8h-15.6v14.4h-2.7V35.3h2.7v13h15.6v-13H471.1z"/>
+      <path class="st16" d="M480.1,55.4c0,1.5,0.2,2.7,0.4,3.8c0.3,1,0.7,1.9,1.3,2.5c0.6,0.7,1.5,1.1,2.5,1.4s2.4,0.4,4,0.4
+      	c0.9,0,1.8-0.1,2.8-0.2c1-0.1,1.8-0.3,2.5-0.4l-0.3,2.1c-0.6,0.2-1.5,0.4-2.5,0.5c-1,0.1-2,0.2-3,0.2c-1.9,0-3.5-0.2-4.8-0.7
+      	c-1.3-0.4-2.4-1.1-3.2-1.9c-0.8-0.9-1.4-1.9-1.7-3.2c-0.4-1.3-0.5-2.8-0.5-4.5v-1.6c0-1.6,0.2-3,0.5-4.3c0.3-1.3,0.9-2.4,1.6-3.3
+      	c0.7-0.9,1.7-1.6,2.8-2.1c1.1-0.5,2.5-0.7,4.2-0.7c1.4,0,2.7,0.2,3.7,0.7c1,0.4,1.9,1,2.6,1.8c0.7,0.8,1.2,1.7,1.5,2.7
+      	c0.3,1,0.5,2.2,0.5,3.5v1.2c0,0.8-0.1,1.4-0.4,1.8c-0.2,0.3-0.8,0.5-1.6,0.5H480.1z M486.5,45.4c-1.1,0-2,0.1-2.8,0.4
+      	c-0.8,0.3-1.5,0.7-2,1.4s-0.9,1.4-1.2,2.5c-0.3,1-0.4,2.3-0.4,3.7h12.3v-1.5c0-2.2-0.5-3.8-1.4-4.9C490.1,46,488.6,45.4,486.5,45.4z
+      	"/>
+      <path class="st16" d="M500.8,34h2.6v31.2h-2.6V34z"/>
+      <path class="st16" d="M528.3,55.5c0,1.8-0.2,3.3-0.7,4.6c-0.4,1.3-1.1,2.3-1.9,3.2c-0.8,0.8-1.8,1.4-2.9,1.8
+      	c-1.1,0.4-2.4,0.6-3.7,0.6c-0.7,0-1.3,0-1.8-0.1c-0.5-0.1-1.1-0.1-1.6-0.3c-0.5-0.1-1-0.3-1.5-0.5c-0.5-0.2-1-0.4-1.6-0.7V75h-2.6
+      	V43.7h2.2l0.3,2.9c1.5-2.3,4-3.4,7.4-3.4c1.2,0,2.4,0.2,3.4,0.5c1,0.4,1.9,1,2.6,1.8c0.7,0.8,1.3,1.9,1.7,3.2
+      	c0.4,1.3,0.6,2.9,0.6,4.8V55.5z M525.7,54.1c0-1.3-0.1-2.5-0.3-3.6c-0.2-1.1-0.5-2-1-2.7c-0.5-0.7-1.1-1.3-2-1.7
+      	c-0.8-0.4-1.8-0.6-3.1-0.6c-1.3,0-2.3,0.2-3.2,0.5c-0.9,0.3-1.5,0.8-2.1,1.4c-0.5,0.6-0.9,1.4-1.1,2.3c-0.2,0.9-0.3,2-0.3,3.2v9
+      	c1,0.5,1.9,0.9,2.8,1.2c0.9,0.2,2,0.4,3.2,0.4c1.3,0,2.4-0.2,3.3-0.5c0.9-0.3,1.6-0.9,2.1-1.6c0.5-0.7,0.9-1.6,1.2-2.6
+      	c0.2-1.1,0.4-2.3,0.4-3.6V54.1z"/>
+      </svg>
+    </div>
+    <div class="content">
+      <div class="main">
+
+        <h1>Backing Up Your Private Keys</h1>
+        <hr>
+
+        <!-- Paragraphs -->
+        <h3>What are private keys?</h3>
+          <p>A private key is a secret piece of text that is used to prove ownership, unlock confidential information and sign transactions.</p>
+          <p>In High Fidelity, your private keys are used to securely access the contents of your Wallet and Purchases.</p>
+
+        <hr>
+        <h3>Where are my private keys stored?"</h3>
+          <p>By default, your private keys are only stored on your hard drive in High Fidelity Interface's <code>AppData</code> directory.</p>
+          <p>Here is the file path of your hifikey - you can browse to it using your file explorer.</p>
+          <div class="alert"> <code>HIFIKEY_PATH_REPLACEME</code> </div>
+
+        <hr>
+        <h3>How should I make a backup of my private keys?</h3>
+          <p>You should backup your <code>.hifikey</code> file above by copying it to a USB flash drive, or to a service like Dropbox or Google Drive. Restore your backup by replacing the file in Interface's AppData directory with your backed-up copy.</p>
+          <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 497.3 186.1" style="enable-background:new 0 0 497.3 186.1;" xml:space="preserve">
+          <style type="text/css">
+            .st0{fill:#CECECE;}
+            .st1{fill:#FFFFFF;}
+            .st2{fill:#FEFEFE;}
+            .st3{fill:#0DA860;}
+            .st4{fill:#F9C942;}
+            .st5{fill:#367CF3;}
+            .st6{fill:#2D6FDC;}
+            .st7{fill:#E4B83D;}
+            .st8{fill:#08137C;}
+            .st9{fill:#EF3B4E;}
+            .st10{fill:#B8355B;}
+            .st11{fill:#A7C5D1;}
+            .st12{fill:#7C909B;}
+            .st13{fill:#CBF2FD;}
+            .st14{fill:#000222;}
+          </style>
+          <circle class="st0" cx="255" cy="69.5" r="61.1"/>
+          <circle class="st0" cx="88" cy="69.5" r="61.1"/>
+          <circle class="st1" cx="88" cy="65.5" r="61.1"/>
+          <path class="st2" d="M133.4,78c0-0.1-0.1-0.2-0.1-0.3c-5-8.7-10-17.4-15-26c-4.7-8.2-9.4-16.3-14.1-24.5c-0.2-0.3-0.4-0.4-0.7-0.4
+            c-10.2,0-20.4,0-30.6,0c-0.2,0-0.3,0-0.5,0c-0.1,0.1-0.2,0.2-0.2,0.3c-9.7,16.8-19.4,33.6-29.1,50.5c-0.2,0.3-0.2,0.5,0,0.8
+            c4.2,7.2,8.4,14.5,12.6,21.7c1,1.7,2,3.5,3,5.2c0.1,0.1,0.3,0.1,0.5,0.1c19.4,0,38.8,0,58.2,0c0.4,0,0.6-0.1,0.8-0.4
+            c4.3-7.4,8.6-14.9,12.9-22.3C131.6,81.1,132.5,79.6,133.4,78z"/>
+          <path class="st3" d="M58.5,105.3c-1-1.7-2-3.4-3-5.2c-4.2-7.2-8.4-14.5-12.6-21.7c-0.2-0.3-0.2-0.5,0-0.8
+            C52.6,60.8,62.3,43.9,72,27.1c0.1-0.1,0.1-0.2,0.2-0.3c0.1,0.1,0.2,0.2,0.2,0.4c5.1,8.9,10.3,17.8,15.4,26.6
+            c0.1,0.1,0.2,0.2,0.2,0.4c-0.1,0.1-0.2,0.2-0.2,0.3c-3.2,5.5-6.4,11-9.6,16.5c-1.3,2.3-2.6,4.6-4,6.9c-0.1,0.1-0.2,0.2-0.2,0.3
+            c-1.9,3.3-3.8,6.6-5.7,9.9c-2.7,4.7-5.5,9.4-8.2,14.2c-0.5,0.9-1.1,1.8-1.5,2.7c0,0,0,0,0,0c0,0.1-0.1,0.1-0.1,0.2
+            C58.6,105.2,58.5,105.3,58.5,105.3z"/>
+          <path class="st4" d="M88.1,54.2c0-0.2-0.1-0.3-0.2-0.4C82.8,44.9,77.6,36,72.5,27.2c-0.1-0.1-0.2-0.2-0.2-0.4c0.2-0.1,0.3,0,0.5,0
+            c10.2,0,20.4,0,30.6,0c0.3,0,0.5,0.1,0.7,0.4c4.7,8.2,9.4,16.3,14.1,24.5c5,8.7,10,17.4,15,26c0.1,0.1,0.1,0.2,0.1,0.3
+            c-0.1,0-0.1,0-0.2,0c0-0.1-0.1-0.1-0.2-0.1c-3.6-1.1-7.2-2.2-10.7-3.3c-2.5-0.8-4.9-1.5-7.4-2.3c-4.2-1.3-8.4-2.6-12.6-3.9
+            c-2.3-0.7-4.6-1.4-6.8-2.1c-0.1,0-0.3-0.1-0.4,0c0,0-0.1-0.1-0.1-0.1c-1.6-2.7-3.1-5.4-4.7-8.1C89.6,56.8,88.8,55.5,88.1,54.2z"/>
+          <path class="st5" d="M133.2,78c0.1,0,0.1,0,0.2,0c-0.9,1.5-1.8,3.1-2.6,4.6c-4.3,7.4-8.6,14.8-12.9,22.3c-0.2,0.3-0.4,0.4-0.8,0.4
+            c-19.4,0-38.8,0-58.2,0c-0.2,0-0.3,0.1-0.5-0.1c0,0,0.1-0.1,0.1-0.1c0.1,0,0.1-0.1,0.1-0.2c0,0,0,0,0,0c0.3-0.1,0.5-0.3,0.8-0.5
+            c1.1-1,2.3-2.1,3.4-3.2c1.6-1.5,3.2-3,4.8-4.5c1.1-1.1,2.3-2.1,3.4-3.2c1.6-1.5,3.3-3,4.9-4.5c1.2-1.1,2.3-2.1,3.5-3.2
+            c1.8-1.7,3.6-3.4,5.4-5c0.8-0.8,1.7-1.5,2.5-2.4c0.2-0.2,0.5-0.2,0.5-0.5c1.5,0,3,0,4.5,0c3.1,0,6.2,0,9.3,0
+            c0.2,0.1,0.3,0.1,0.5,0.1c10.1,0,20.3,0,30.4,0C132.9,78,133.1,78,133.2,78z"/>
+          <path class="st2" d="M101.8,78c-3.1,0-6.2,0-9.3,0c-1.5,0-3,0-4.5,0c-0.2,0-0.4,0-0.5,0c-3.9,0-7.8,0-11.7,0c-0.5,0-0.9,0-1.4,0
+            c1.3-2.3,2.6-4.6,4-6.9c3.2-5.5,6.4-11,9.6-16.5c0.1-0.1,0.1-0.2,0.2-0.3c0.8,1.3,1.5,2.6,2.3,3.9c1.6,2.7,3.1,5.4,4.7,8.1
+            c0,0,0.1,0.1,0.1,0.1c1.2,2,2.3,4,3.5,6C99.6,74.2,100.7,76.1,101.8,78z"/>
+          <path class="st6" d="M74.3,78c0.5,0,0.9,0,1.4,0c3.9,0,7.8,0,11.7,0c0.2,0,0.4,0,0.5,0c-0.1,0.3-0.3,0.4-0.5,0.5
+            c-0.8,0.8-1.7,1.6-2.5,2.4c-1.8,1.7-3.6,3.4-5.4,5c-1.2,1.1-2.3,2.1-3.5,3.2c-1.6,1.5-3.2,3-4.9,4.5c-1.2,1.1-2.3,2.1-3.4,3.2
+            c-1.6,1.5-3.2,3-4.8,4.5c-1.1,1.1-2.3,2.1-3.4,3.2c-0.2,0.2-0.4,0.4-0.8,0.5c0.4-0.9,1-1.8,1.5-2.7c2.7-4.7,5.4-9.4,8.2-14.2
+            c1.9-3.3,3.8-6.6,5.7-9.9C74.2,78.1,74.2,78.1,74.3,78z"/>
+          <path class="st6" d="M58.7,105c0,0.1,0,0.2-0.1,0.2C58.6,105.1,58.7,105.1,58.7,105z"/>
+          <path class="st7" d="M101.8,78c-1.1-1.9-2.2-3.8-3.3-5.7c-1.1-2-2.3-4-3.5-6c0.1-0.2,0.3-0.1,0.4,0c2.3,0.7,4.6,1.4,6.8,2.1
+            c4.2,1.3,8.4,2.6,12.6,3.9c2.5,0.8,4.9,1.5,7.4,2.3c3.6,1.1,7.2,2.2,10.7,3.3c0.1,0,0.2,0,0.2,0.1c-0.2,0-0.3,0-0.5,0
+            c-10.1,0-20.3,0-30.4,0C102.1,78,101.9,78.1,101.8,78z"/>
+          <g>
+            <path class="st1" d="M315.5,65.6c0.1-33.6-27.3-60.9-61-61c-33.6-0.1-61,27.2-61,60.9c-0.1,33.6,27.2,61,61,61.1
+              C288.1,126.6,315.5,99.3,315.5,65.6z"/>
+            <path class="st1" d="M315.5,65.6c-0.1,33.7-27.4,61.1-61,61c-33.7-0.1-61-27.4-61-61.1c0.1-33.7,27.4-61,61-60.9
+              C288.3,4.6,315.6,31.9,315.5,65.6z M297.6,45.8c-0.1-0.1-0.2-0.1-0.3-0.2c-7-4.4-14-8.9-20.9-13.4c-0.3-0.2-0.4-0.1-0.7,0
+              c-6.9,4.4-13.9,8.8-20.8,13.3c-0.4,0.3-0.4,0.3,0,0.5c6.9,4.4,13.8,8.8,20.7,13.2c0.1,0.1,0.3,0.2,0.4,0.3
+              c-7.2,4.6-14.3,9.1-21.5,13.7c0.2,0.1,0.3,0.2,0.5,0.3c6.9,4.4,13.8,8.8,20.7,13.2c0.3,0.2,0.5,0.2,0.8,0c6.7-4.3,13.3-8.5,20-12.7
+              c0.4-0.2,0.8-0.5,1.2-0.8c-7.2-4.6-14.4-9.1-21.6-13.7C283.2,55,290.4,50.4,297.6,45.8z M254.5,73.3c-7.2-4.6-14.4-9.2-21.6-13.7
+              c0.2-0.1,0.4-0.2,0.5-0.3c6.9-4.4,13.7-8.7,20.6-13.1c0.4-0.3,0.4-0.3,0-0.6c-6.9-4.4-13.8-8.8-20.7-13.2c-0.3-0.2-0.5-0.2-0.8,0
+              c-6.9,4.4-13.8,8.8-20.7,13.2c-0.4,0.3-0.4,0.3,0,0.6c5.3,3.4,10.6,6.8,15.9,10.1c1.7,1.1,3.4,2.2,5.2,3.3
+              c-7.2,4.6-14.4,9.1-21.6,13.7c0.2,0.1,0.3,0.2,0.5,0.3c6.9,4.4,13.8,8.8,20.7,13.2c0.3,0.2,0.5,0.2,0.8,0
+              c5.1-3.3,10.2-6.5,15.4-9.8C250.6,75.8,252.5,74.5,254.5,73.3z M275.9,91.6c-0.1-0.1-0.2-0.2-0.3-0.2c-6.9-4.4-13.9-8.8-20.8-13.3
+              c-0.2-0.2-0.4-0.2-0.7,0c-6.9,4.4-13.9,8.9-20.8,13.3c-0.1,0.1-0.2,0.2-0.4,0.3c0.2,0.1,0.3,0.2,0.4,0.3
+              c6.9,4.4,13.9,8.8,20.8,13.3c0.3,0.2,0.5,0.1,0.7,0c6.9-4.4,13.8-8.8,20.7-13.2C275.7,91.8,275.8,91.7,275.9,91.6z"/>
+            <path class="st8" d="M297.6,45.8c-7.2,4.6-14.4,9.1-21.6,13.7c7.2,4.6,14.4,9.1,21.6,13.7c-0.4,0.3-0.8,0.5-1.2,0.8
+              c-6.7,4.2-13.3,8.5-20,12.7c-0.3,0.2-0.5,0.2-0.8,0c-6.9-4.4-13.8-8.8-20.7-13.2c-0.1-0.1-0.3-0.2-0.5-0.3
+              c7.2-4.6,14.3-9.1,21.5-13.7c-0.2-0.1-0.3-0.2-0.4-0.3c-6.9-4.4-13.8-8.8-20.7-13.2c-0.4-0.3-0.4-0.3,0-0.5
+              c6.9-4.4,13.9-8.8,20.8-13.3c0.2-0.2,0.4-0.2,0.7,0c7,4.5,14,8.9,20.9,13.4C297.4,45.7,297.4,45.7,297.6,45.8z"/>
+            <path class="st8" d="M254.5,73.3c-2,1.3-3.9,2.5-5.8,3.7c-5.1,3.3-10.3,6.5-15.4,9.8c-0.3,0.2-0.5,0.2-0.8,0
+              c-6.9-4.4-13.8-8.8-20.7-13.2c-0.1-0.1-0.3-0.2-0.5-0.3c7.2-4.6,14.3-9.1,21.6-13.7c-1.8-1.1-3.5-2.2-5.2-3.3
+              c-5.3-3.4-10.6-6.8-15.9-10.1c-0.4-0.3-0.4-0.3,0-0.6c6.9-4.4,13.8-8.8,20.7-13.2c0.3-0.2,0.5-0.2,0.8,0
+              c6.9,4.4,13.8,8.8,20.7,13.2c0.4,0.3,0.4,0.3,0,0.6c-6.9,4.4-13.7,8.7-20.6,13.1c-0.2,0.1-0.3,0.2-0.5,0.3
+              C240.1,64.1,247.2,68.7,254.5,73.3z"/>
+            <path class="st8" d="M275.9,91.6c-0.1,0.2-0.3,0.2-0.4,0.3c-6.9,4.4-13.8,8.8-20.7,13.2c-0.2,0.2-0.4,0.2-0.7,0
+              c-6.9-4.4-13.9-8.9-20.8-13.3c-0.1-0.1-0.2-0.1-0.4-0.3c0.1-0.1,0.3-0.2,0.4-0.3c6.9-4.4,13.9-8.8,20.8-13.3c0.3-0.2,0.4-0.1,0.7,0
+              c6.9,4.4,13.9,8.9,20.8,13.3C275.7,91.4,275.8,91.5,275.9,91.6z"/>
+          </g>
+          <path class="st9" d="M389.9,117c-6.8-6.8-13.7-13.6-20.5-20.5c-1.9-2-1.8-5.6,0.1-7.7c0.2-0.3,0.5-0.5,0.8-0.8
+            c15.9-15.9,31.8-31.7,47.6-47.6c2.6-2.6,5.9-1.9,7.8-0.1c0.3,0.3,0.6,0.6,0.9,0.9c6.2,6.2,12.5,12.5,18.7,18.7
+            c0.3,0.3,0.6,0.6,0.9,1c0.1,0.3,0.3,0.6,0.4,0.8c0.8,1.7,0.4,4-0.9,5.2c-16.4,16.3-32.7,32.7-49.1,49c-0.2,0.2-0.4,0.4-0.7,0.6
+            C394,117.8,392,117.9,389.9,117z M423.3,62.2c-2,0.5-3.9,1-5.8,1.6c-1.6,0.4-1.6,0.4-0.4,1.6c0.4,0.4,0.5,0.7,0,1.1
+            c-5,5-9.9,9.9-14.9,14.9c-0.1,0.1-0.3,0.4-0.5,0.2c-0.1-0.1-0.1-0.3-0.1-0.5c0-1.5-0.1-2.9-0.1-4.4c0-0.6,0.2-1.1,0.7-1.6
+            c1.2-1.2,2.4-2.4,3.6-3.6c0.3-0.3,0.6-0.5,1.2-0.4c1.7,0.2,3.2-1.2,3.2-2.9c0-1.9-1.4-3.2-3.2-3.1c-1.8,0.1-3.1,1.6-2.8,3.4
+            c0.1,0.4-0.1,0.7-0.4,1c-1.2,1.1-2.3,2.3-3.5,3.4c-1.2,1.1-1.7,2.4-1.6,4c0.1,2.2,0.1,4.5,0.1,6.7c0,1.3-1,2-1.7,2.7
+            c-0.5,0.5-1,0-1.5-0.1c-2.2-0.5-4.4,0.7-5.3,2.7c-0.9,2.2-0.1,4.5,1.8,5.7c1.8,1.1,3.8,0.9,5.6-0.5c1.2-1,1.8-3.1,1.2-4.9
+            c-0.2-0.6-0.1-1,0.3-1.4c1.7-1.6,3.3-3.3,4.9-4.9c0.5-0.5,1-0.7,1.6-0.7c2.1,0,4.2,0,6.3,0.2c1.7,0.1,3.3-0.3,4.5-1.6
+            c0.4-0.5,0.9-0.9,1.4-1.4c0.5-0.6,0.9-0.6,1.3,0c0.3,0.4,0.6,0.5,1,0c1.1-1.1,2.2-2.2,3.3-3.3c0.4-0.4,0.4-0.6,0-1
+            c-1.1-1.1-2.2-2.2-3.3-3.3c-0.4-0.4-0.7-0.3-1,0.1c-1,1-2,2.1-3.1,3.1c-0.5,0.5-0.7,0.8,0,1.3c0.3,0.2,0.6,0.5,0.2,0.9
+            c-0.6,0.6-1.3,1.3-1.9,1.9c-0.4,0.3-0.9,0.6-1.5,0.5c-1.5-0.2-2.9-0.1-4.4-0.1c-0.2,0-0.5,0.1-0.6-0.1c0-0.1,0-0.1,0-0.2
+            c3.7-3.7,7.4-7.4,11.1-11.1c0.4-0.4,0.6-0.2,0.9,0.1c1.3,1.2,1.3,1.1,1.7-0.5C422.3,66,422.8,64.1,423.3,62.2z"/>
+          <path class="st10" d="M389.9,117c2.1,0.9,4.1,0.9,6-0.4c0.3-0.2,0.5-0.4,0.7-0.6c16.4-16.3,32.7-32.7,49.1-49
+            c1.3-1.3,1.7-3.5,0.9-5.2c-0.1-0.3-0.2-0.6-0.4-0.8c1.4,1.4,2.7,2.7,4.1,4.1c0.6,0.6,1.3,1.2,1.8,1.9c1.7,2.2,1.5,4.8-0.5,6.8
+            c-7.8,7.8-15.7,15.7-23.5,23.5c-8.3,8.3-16.5,16.5-24.8,24.8c-1,1-2.1,1.6-3.4,1.9c-1.8,0.3-3.4-0.1-4.7-1.4
+            C393.5,120.5,391.7,118.8,389.9,117z"/>
+          <path class="st11" d="M445.3,59.9c-6.2-6.2-12.5-12.5-18.7-18.7c5-5,10.1-10,15.1-15.1c0.6-0.6,0.8-0.6,1.4,0c6,6,12,12,18,18
+            C455.9,49.4,450.6,54.7,445.3,59.9z M439.3,37.5c-0.5-0.5-0.9-1-1.4-1.4c-0.5-0.5-1.1-0.5-1.6,0c-0.4,0.4-0.8,0.8-1.2,1.2
+            c-0.5,0.6-0.5,1.1,0,1.7c0.5,0.6,1.1,1.1,1.7,1.7c2,2.2,2,1.7,3.9-0.1c0,0,0,0,0.1-0.1c0.5-0.5,0.5-1.1,0-1.6
+            C440.3,38.4,439.8,38,439.3,37.5z M449,47.2c-0.5-0.5-1-1-1.5-1.5c-0.7-0.6-1.1-0.5-2.5,1c-0.8,0.8-0.9,1.3-0.3,1.9
+            c0.9,1,1.9,1.9,2.9,2.9c0.7,0.6,1.1,0.5,2.5-1c0.8-0.8,0.9-1.3,0.3-1.9C449.9,48.1,449.5,47.6,449,47.2z"/>
+          <path class="st12" d="M445.3,59.9c5.3-5.3,10.5-10.5,15.8-15.8c1.5,1.5,3,3,4.5,4.4c0.5,0.5,0.4,0.7,0,1.1
+            c-4.9,4.8-9.7,9.7-14.6,14.5c-0.2,0.2-0.5,0.5-0.7,0.7c-1.4-1.4-2.7-2.7-4.1-4.1C445.9,60.6,445.6,60.2,445.3,59.9z"/>
+          <path class="st1" d="M423.3,62.2c-0.5,2-1,3.8-1.5,5.6c-0.5,1.7-0.5,1.7-1.7,0.5c-0.3-0.3-0.6-0.4-0.9-0.1
+            c-3.7,3.7-7.4,7.4-11.1,11.1c0,0,0,0.1,0,0.2c0.2,0.2,0.4,0.1,0.6,0.1c1.5,0.1,2.9-0.1,4.4,0.1c0.6,0.1,1.1-0.2,1.5-0.5
+            c0.7-0.6,1.3-1.2,1.9-1.9c0.4-0.4,0.1-0.7-0.2-0.9c-0.6-0.5-0.5-0.8,0-1.3c1.1-1,2.1-2,3.1-3.1c0.4-0.4,0.6-0.5,1-0.1
+            c1.1,1.1,2.2,2.2,3.3,3.3c0.4,0.4,0.4,0.6,0,1c-1.1,1.1-2.2,2.2-3.3,3.3c-0.4,0.4-0.7,0.4-1,0c-0.5-0.6-0.9-0.6-1.3,0
+            c-0.4,0.5-0.9,0.9-1.4,1.4c-1.2,1.4-2.7,1.7-4.5,1.6c-2.1-0.1-4.2-0.1-6.3-0.2c-0.6,0-1.2,0.3-1.6,0.7c-1.6,1.7-3.3,3.3-4.9,4.9
+            c-0.4,0.4-0.6,0.8-0.3,1.4c0.6,1.7,0,3.9-1.2,4.9c-1.8,1.4-3.8,1.6-5.6,0.5c-2-1.2-2.7-3.6-1.8-5.7c0.8-2.1,3.1-3.2,5.3-2.7
+            c0.5,0.1,1,0.6,1.5,0.1c0.8-0.8,1.8-1.4,1.7-2.7c-0.1-2.2-0.1-4.5-0.1-6.7c0-1.6,0.5-2.9,1.6-4c1.2-1.1,2.3-2.3,3.5-3.4
+            c0.3-0.3,0.4-0.6,0.4-1c-0.2-1.8,1.1-3.3,2.8-3.4c1.8-0.1,3.2,1.3,3.2,3.1c0,1.7-1.5,3.1-3.2,2.9c-0.5-0.1-0.8,0.1-1.2,0.4
+            c-1.2,1.2-2.4,2.4-3.6,3.6c-0.5,0.4-0.7,0.9-0.7,1.6c0,1.5,0.1,2.9,0.1,4.4c0,0.2,0,0.4,0.1,0.5c0.2,0.1,0.3-0.1,0.5-0.2
+            c5-5,9.9-9.9,14.9-14.9c0.4-0.4,0.4-0.7,0-1.1c-1.1-1.2-1.1-1.2,0.4-1.6C419.4,63.2,421.3,62.7,423.3,62.2z"/>
+          <path class="st13" d="M439.3,37.5c0.5,0.5,0.9,0.9,1.4,1.4c0.5,0.5,0.5,1,0,1.6c0,0,0,0-0.1,0.1c-1.9,1.9-1.9,2.3-3.9,0.1
+            c-0.5-0.6-1.1-1.1-1.7-1.7c-0.6-0.6-0.6-1.1,0-1.7c0.4-0.4,0.8-0.8,1.2-1.2c0.5-0.5,1.1-0.5,1.6,0C438.4,36.6,438.9,37.1,439.3,37.5
+            z"/>
+          <path class="st13" d="M449,47.2c0.5,0.5,0.9,0.9,1.4,1.4c0.6,0.6,0.5,1.1-0.3,1.9c-1.4,1.5-1.8,1.6-2.5,1c-1-0.9-1.9-1.9-2.9-2.9
+            c-0.6-0.6-0.5-1.1,0.3-1.9c1.4-1.5,1.8-1.6,2.5-1C448,46.2,448.5,46.7,449,47.2z"/>
+          <g>
+            <path class="st14" d="M32.1,158.8l0.2-1.2h4.2v7.7c-0.2,0.1-0.5,0.2-0.8,0.3c-0.3,0.1-0.7,0.2-1,0.2c-0.4,0.1-0.7,0.1-1.1,0.1
+              s-0.7,0-1,0c-1.4,0-2.6-0.2-3.5-0.5c-0.9-0.4-1.5-0.8-2-1.5c-0.5-0.6-0.8-1.4-0.9-2.3c-0.1-0.9-0.2-1.9-0.2-2.9v-1.6
+              c0-1.2,0.1-2.2,0.3-3.1c0.2-0.9,0.6-1.7,1.1-2.3s1.2-1.1,2.1-1.4c0.9-0.3,2-0.5,3.3-0.5c0.6,0,1.2,0.1,1.8,0.2
+              c0.6,0.1,1.1,0.2,1.6,0.4l-0.3,1.1c-0.4-0.1-0.9-0.2-1.4-0.3c-0.5-0.1-1.1-0.1-1.7-0.1c-1,0-1.8,0.1-2.4,0.3s-1.2,0.5-1.6,1
+              c-0.4,0.5-0.7,1.1-0.9,1.9s-0.3,1.8-0.3,3v1.5c0,1.2,0.1,2.1,0.3,2.9c0.2,0.8,0.5,1.4,0.9,1.8c0.4,0.5,0.9,0.8,1.6,1
+              c0.7,0.2,1.5,0.3,2.4,0.3c0.5,0,0.9,0,1.4-0.1c0.4,0,0.8-0.1,1.2-0.2v-5.6H32.1z"/>
+            <path class="st14" d="M44.5,154.2c1,0,1.7,0.1,2.4,0.4c0.6,0.2,1.1,0.6,1.5,1.1c0.4,0.5,0.6,1,0.8,1.7c0.2,0.7,0.2,1.4,0.2,2.2v1.2
+              c0,0.8-0.1,1.5-0.3,2.2c-0.2,0.7-0.5,1.2-0.8,1.7c-0.4,0.5-0.9,0.8-1.5,1.1c-0.6,0.2-1.4,0.4-2.3,0.4c-1,0-1.7-0.1-2.4-0.4
+              c-0.6-0.2-1.1-0.6-1.5-1.1s-0.6-1-0.8-1.7c-0.2-0.7-0.2-1.4-0.2-2.2v-1.2c0-0.8,0.1-1.5,0.3-2.2c0.2-0.7,0.5-1.2,0.9-1.7
+              s0.9-0.8,1.5-1.1C42.8,154.3,43.6,154.2,44.5,154.2z M44.5,164.8c0.7,0,1.2-0.1,1.7-0.2s0.8-0.4,1.1-0.7c0.3-0.3,0.5-0.8,0.6-1.3
+              c0.1-0.5,0.2-1.2,0.2-1.9v-1c0-0.8-0.1-1.4-0.2-2s-0.3-1-0.6-1.3c-0.3-0.3-0.6-0.6-1.1-0.7s-1-0.2-1.6-0.2c-0.7,0-1.2,0.1-1.7,0.2
+              c-0.5,0.2-0.8,0.4-1.1,0.7c-0.3,0.3-0.5,0.8-0.6,1.3c-0.1,0.5-0.2,1.2-0.2,1.9v1c0,0.8,0.1,1.4,0.2,1.9c0.1,0.5,0.3,1,0.6,1.3
+              c0.3,0.3,0.6,0.6,1.1,0.7C43.2,164.7,43.8,164.8,44.5,164.8z"/>
+            <path class="st14" d="M57.1,154.2c1,0,1.7,0.1,2.4,0.4c0.6,0.2,1.1,0.6,1.5,1.1c0.4,0.5,0.6,1,0.8,1.7c0.2,0.7,0.2,1.4,0.2,2.2v1.2
+              c0,0.8-0.1,1.5-0.3,2.2c-0.2,0.7-0.5,1.2-0.8,1.7c-0.4,0.5-0.9,0.8-1.5,1.1c-0.6,0.2-1.4,0.4-2.3,0.4c-1,0-1.7-0.1-2.4-0.4
+              c-0.6-0.2-1.1-0.6-1.5-1.1s-0.6-1-0.8-1.7c-0.2-0.7-0.2-1.4-0.2-2.2v-1.2c0-0.8,0.1-1.5,0.3-2.2c0.2-0.7,0.5-1.2,0.9-1.7
+              s0.9-0.8,1.5-1.1C55.4,154.3,56.2,154.2,57.1,154.2z M57.1,164.8c0.7,0,1.2-0.1,1.7-0.2s0.8-0.4,1.1-0.7c0.3-0.3,0.5-0.8,0.6-1.3
+              c0.1-0.5,0.2-1.2,0.2-1.9v-1c0-0.8-0.1-1.4-0.2-2s-0.3-1-0.6-1.3c-0.3-0.3-0.6-0.6-1.1-0.7s-1-0.2-1.6-0.2c-0.7,0-1.2,0.1-1.7,0.2
+              c-0.5,0.2-0.8,0.4-1.1,0.7c-0.3,0.3-0.5,0.8-0.6,1.3c-0.1,0.5-0.2,1.2-0.2,1.9v1c0,0.8,0.1,1.4,0.2,1.9c0.1,0.5,0.3,1,0.6,1.3
+              c0.3,0.3,0.6,0.6,1.1,0.7C55.9,164.7,56.4,164.8,57.1,164.8z"/>
+            <path class="st14" d="M74.3,165.5c0,0.8-0.1,1.6-0.3,2.3c-0.2,0.7-0.5,1.2-0.9,1.7c-0.4,0.5-0.9,0.8-1.6,1.1
+              c-0.6,0.2-1.4,0.4-2.3,0.4c-1.3,0-2.7-0.2-4-0.6l0.3-1.1c0.6,0.2,1.2,0.3,1.8,0.4c0.6,0.1,1.2,0.1,1.9,0.1s1.3-0.1,1.8-0.3
+              c0.5-0.2,0.8-0.5,1.1-0.9c0.3-0.4,0.5-0.9,0.6-1.4c0.1-0.6,0.2-1.2,0.2-1.9v-1.3c-0.1,0.2-0.3,0.5-0.5,0.7
+              c-0.2,0.2-0.5,0.4-0.8,0.6c-0.3,0.2-0.7,0.3-1.1,0.4c-0.4,0.1-0.9,0.1-1.5,0.1c-0.6,0-1.2-0.1-1.8-0.3c-0.5-0.2-1-0.5-1.4-0.9
+              c-0.4-0.4-0.7-1-0.9-1.6c-0.2-0.7-0.3-1.5-0.3-2.5v-0.7c0-0.9,0.1-1.7,0.4-2.4s0.6-1.2,1.1-1.7c0.5-0.5,1-0.8,1.6-1
+              c0.6-0.2,1.3-0.3,2.1-0.3c0.8,0,1.6,0.1,2.3,0.3c0.7,0.2,1.4,0.4,2,0.8V165.5z M66.1,160.1c0,0.7,0.1,1.3,0.2,1.9s0.3,1,0.5,1.4
+              c0.3,0.4,0.6,0.7,1,0.8s0.9,0.3,1.6,0.3c1.2,0,2.1-0.3,2.7-0.9c0.6-0.6,0.9-1.6,0.9-3V156c-0.4-0.2-0.8-0.4-1.3-0.5
+              c-0.4-0.1-1-0.2-1.6-0.2c-1.3,0-2.3,0.3-3,1s-1,1.8-1,3.4V160.1z"/>
+            <path class="st14" d="M77.8,149.3h1.3v16.3h-1.3V149.3z"/>
+            <path class="st14" d="M83.6,160.5c0,0.8,0.1,1.4,0.2,2c0.1,0.5,0.4,1,0.7,1.3c0.3,0.3,0.8,0.6,1.3,0.7c0.5,0.2,1.2,0.2,2.1,0.2
+              c0.5,0,0.9,0,1.5-0.1c0.5-0.1,1-0.1,1.3-0.2l-0.2,1.1c-0.3,0.1-0.8,0.2-1.3,0.3c-0.5,0.1-1.1,0.1-1.6,0.1c-1,0-1.8-0.1-2.5-0.3
+              c-0.7-0.2-1.2-0.6-1.7-1s-0.7-1-0.9-1.7c-0.2-0.7-0.3-1.5-0.3-2.4v-0.9c0-0.8,0.1-1.6,0.3-2.3c0.2-0.7,0.5-1.3,0.8-1.7
+              c0.4-0.5,0.9-0.9,1.5-1.1c0.6-0.3,1.3-0.4,2.2-0.4c0.7,0,1.4,0.1,1.9,0.3c0.5,0.2,1,0.5,1.3,0.9s0.6,0.9,0.8,1.4
+              c0.2,0.5,0.2,1.2,0.2,1.8v0.6c0,0.4-0.1,0.7-0.2,0.9c-0.1,0.2-0.4,0.3-0.8,0.3H83.6z M86.9,155.3c-0.6,0-1,0.1-1.5,0.2
+              s-0.8,0.4-1,0.7c-0.3,0.3-0.5,0.8-0.6,1.3c-0.1,0.5-0.2,1.2-0.2,2h6.5v-0.8c0-1.1-0.2-2-0.7-2.6S88,155.3,86.9,155.3z"/>
+            <path class="st14" d="M100.2,150h4.9c1.3,0,2.3,0.2,3.1,0.5c0.8,0.3,1.5,0.8,2,1.4c0.5,0.6,0.8,1.3,1,2.2c0.2,0.8,0.3,1.7,0.3,2.7
+              v2c0,1-0.1,1.9-0.3,2.8c-0.2,0.8-0.6,1.6-1.1,2.2c-0.5,0.6-1.1,1.1-2,1.4s-1.8,0.5-3.1,0.5h-4.8V150z M101.6,164.5h3.3
+              c0.8,0,1.5-0.1,2.2-0.3c0.6-0.2,1.2-0.5,1.6-0.9c0.4-0.4,0.8-1,1-1.8c0.2-0.7,0.3-1.6,0.3-2.8V157c0-1.1-0.1-2-0.3-2.7
+              c-0.2-0.7-0.5-1.3-0.9-1.8c-0.4-0.4-0.9-0.8-1.6-1c-0.6-0.2-1.4-0.3-2.2-0.3h-3.4V164.5z"/>
+            <path class="st14" d="M120.7,155.6c-0.2,0-0.4-0.1-0.7-0.1c-0.2,0-0.4,0-0.6,0c-1.1,0-1.9,0.3-2.4,1c-0.5,0.7-0.8,1.7-0.8,3.2v6.1
+              h-1.4v-11.2h1.1l0.2,1.8c0.7-1.3,1.9-1.9,3.5-1.9c0.2,0,0.5,0,0.7,0.1c0.2,0,0.4,0.1,0.6,0.1L120.7,155.6z"/>
+            <path class="st14" d="M123.8,150.1c0.7,0,1,0.3,1,1c0,0.6-0.3,1-1,1c-0.6,0-1-0.3-1-1C122.9,150.4,123.2,150.1,123.8,150.1z
+               M123.2,154.4h1.4v11.2h-1.4V154.4z"/>
+            <path class="st14" d="M127.1,154.4h1.5l3.8,9.9l3.8-9.9h1.5l-4.5,11.2h-1.5L127.1,154.4z"/>
+            <path class="st14" d="M140.6,160.5c0,0.8,0.1,1.4,0.2,2c0.1,0.5,0.4,1,0.7,1.3c0.3,0.3,0.8,0.6,1.3,0.7c0.5,0.2,1.2,0.2,2.1,0.2
+              c0.5,0,0.9,0,1.5-0.1c0.5-0.1,1-0.1,1.3-0.2l-0.2,1.1c-0.3,0.1-0.8,0.2-1.3,0.3c-0.5,0.1-1.1,0.1-1.6,0.1c-1,0-1.8-0.1-2.5-0.3
+              c-0.7-0.2-1.2-0.6-1.7-1s-0.7-1-0.9-1.7c-0.2-0.7-0.3-1.5-0.3-2.4v-0.9c0-0.8,0.1-1.6,0.3-2.3c0.2-0.7,0.5-1.3,0.8-1.7
+              c0.4-0.5,0.9-0.9,1.5-1.1c0.6-0.3,1.3-0.4,2.2-0.4c0.7,0,1.4,0.1,1.9,0.3c0.5,0.2,1,0.5,1.3,0.9s0.6,0.9,0.8,1.4
+              c0.2,0.5,0.2,1.2,0.2,1.8v0.6c0,0.4-0.1,0.7-0.2,0.9c-0.1,0.2-0.4,0.3-0.8,0.3H140.6z M143.9,155.3c-0.6,0-1,0.1-1.5,0.2
+              s-0.8,0.4-1,0.7c-0.3,0.3-0.5,0.8-0.6,1.3c-0.1,0.5-0.2,1.2-0.2,2h6.5v-0.8c0-1.1-0.2-2-0.7-2.6S145,155.3,143.9,155.3z"/>
+          </g>
+          <g>
+            <path class="st14" d="M217.3,150h4.9c1.3,0,2.3,0.2,3.1,0.5c0.8,0.3,1.5,0.8,2,1.4c0.5,0.6,0.8,1.3,1,2.2c0.2,0.8,0.3,1.7,0.3,2.7
+              v2c0,1-0.1,1.9-0.3,2.8c-0.2,0.8-0.6,1.6-1.1,2.2c-0.5,0.6-1.1,1.1-2,1.4s-1.8,0.5-3.1,0.5h-4.8V150z M218.8,164.5h3.3
+              c0.8,0,1.5-0.1,2.2-0.3c0.6-0.2,1.2-0.5,1.6-0.9c0.4-0.4,0.8-1,1-1.8c0.2-0.7,0.3-1.6,0.3-2.8V157c0-1.1-0.1-2-0.3-2.7
+              c-0.2-0.7-0.5-1.3-0.9-1.8c-0.4-0.4-0.9-0.8-1.6-1c-0.6-0.2-1.4-0.3-2.2-0.3h-3.4V164.5z"/>
+            <path class="st14" d="M237.9,155.6c-0.2,0-0.4-0.1-0.7-0.1c-0.2,0-0.4,0-0.6,0c-1.1,0-1.9,0.3-2.4,1c-0.5,0.7-0.8,1.7-0.8,3.2v6.1
+              H232v-11.2h1.1l0.2,1.8c0.7-1.3,1.9-1.9,3.5-1.9c0.2,0,0.5,0,0.7,0.1c0.2,0,0.4,0.1,0.6,0.1L237.9,155.6z"/>
+            <path class="st14" d="M244.3,154.2c1,0,1.7,0.1,2.4,0.4c0.6,0.2,1.1,0.6,1.5,1.1c0.4,0.5,0.6,1,0.8,1.7c0.2,0.7,0.2,1.4,0.2,2.2
+              v1.2c0,0.8-0.1,1.5-0.3,2.2c-0.2,0.7-0.5,1.2-0.8,1.7c-0.4,0.5-0.9,0.8-1.5,1.1c-0.6,0.2-1.4,0.4-2.3,0.4c-1,0-1.7-0.1-2.4-0.4
+              c-0.6-0.2-1.1-0.6-1.5-1.1s-0.6-1-0.8-1.7c-0.2-0.7-0.2-1.4-0.2-2.2v-1.2c0-0.8,0.1-1.5,0.3-2.2c0.2-0.7,0.5-1.2,0.9-1.7
+              s0.9-0.8,1.5-1.1C242.7,154.3,243.4,154.2,244.3,154.2z M244.3,164.8c0.7,0,1.2-0.1,1.7-0.2s0.8-0.4,1.1-0.7
+              c0.3-0.3,0.5-0.8,0.6-1.3c0.1-0.5,0.2-1.2,0.2-1.9v-1c0-0.8-0.1-1.4-0.2-2s-0.3-1-0.6-1.3c-0.3-0.3-0.6-0.6-1.1-0.7s-1-0.2-1.6-0.2
+              c-0.7,0-1.2,0.1-1.7,0.2c-0.5,0.2-0.8,0.4-1.1,0.7c-0.3,0.3-0.5,0.8-0.6,1.3c-0.1,0.5-0.2,1.2-0.2,1.9v1c0,0.8,0.1,1.4,0.2,1.9
+              c0.1,0.5,0.3,1,0.6,1.3c0.3,0.3,0.6,0.6,1.1,0.7C243.1,164.7,243.7,164.8,244.3,164.8z"/>
+            <path class="st14" d="M261.9,160.6c0,0.9-0.1,1.7-0.4,2.4c-0.2,0.7-0.6,1.2-1,1.7s-0.9,0.8-1.5,1s-1.2,0.3-1.9,0.3
+              c-0.4,0-0.7,0-1,0c-0.3,0-0.6-0.1-0.8-0.1c-0.3-0.1-0.5-0.2-0.8-0.3c-0.3-0.1-0.5-0.2-0.8-0.4v5.7h-1.3v-16.3h1.1l0.2,1.5
+              c0.8-1.2,2.1-1.8,3.9-1.8c0.6,0,1.2,0.1,1.8,0.3c0.5,0.2,1,0.5,1.4,0.9c0.4,0.4,0.7,1,0.9,1.7c0.2,0.7,0.3,1.5,0.3,2.5V160.6z
+               M260.5,159.9c0-0.7,0-1.3-0.1-1.9s-0.3-1-0.5-1.4c-0.3-0.4-0.6-0.7-1-0.9c-0.4-0.2-1-0.3-1.6-0.3c-0.7,0-1.2,0.1-1.7,0.3
+              c-0.4,0.2-0.8,0.4-1.1,0.7s-0.5,0.7-0.6,1.2c-0.1,0.5-0.2,1-0.2,1.7v4.7c0.5,0.3,1,0.5,1.5,0.6c0.5,0.1,1,0.2,1.7,0.2
+              c0.7,0,1.3-0.1,1.7-0.3s0.8-0.5,1.1-0.8c0.3-0.4,0.5-0.8,0.6-1.4s0.2-1.2,0.2-1.9V159.9z"/>
+            <path class="st14" d="M269.4,165.9c-0.7,0-1.5-0.1-2.2-0.3c-0.7-0.2-1.4-0.5-2.1-0.8v-15.5h1.3v6.6c0.4-0.6,0.9-1.1,1.5-1.3
+              c0.6-0.3,1.3-0.4,2.2-0.4c0.7,0,1.3,0.1,1.8,0.3c0.6,0.2,1,0.5,1.4,0.9s0.7,1,0.9,1.6c0.2,0.7,0.3,1.5,0.3,2.5v1
+              c0,1.8-0.4,3.2-1.3,4.1C272.4,165.5,271.1,165.9,269.4,165.9z M269.3,164.8c0.7,0,1.3-0.1,1.8-0.3c0.5-0.2,0.9-0.4,1.2-0.8
+              c0.3-0.4,0.5-0.8,0.7-1.4c0.1-0.6,0.2-1.2,0.2-2v-0.5c0-0.7-0.1-1.3-0.2-1.9c-0.1-0.6-0.3-1-0.5-1.4s-0.6-0.7-1-0.9
+              c-0.4-0.2-1-0.3-1.6-0.3c-0.5,0-1,0.1-1.4,0.2s-0.8,0.4-1.1,0.7c-0.3,0.3-0.5,0.7-0.7,1.2c-0.2,0.5-0.3,1.1-0.3,1.8v4.9
+              c0.4,0.2,0.9,0.4,1.3,0.5C268.2,164.7,268.7,164.8,269.3,164.8z"/>
+            <path class="st14" d="M282.3,154.2c1,0,1.7,0.1,2.4,0.4c0.6,0.2,1.1,0.6,1.5,1.1c0.4,0.5,0.6,1,0.8,1.7c0.2,0.7,0.2,1.4,0.2,2.2
+              v1.2c0,0.8-0.1,1.5-0.3,2.2c-0.2,0.7-0.5,1.2-0.8,1.7c-0.4,0.5-0.9,0.8-1.5,1.1c-0.6,0.2-1.4,0.4-2.3,0.4c-1,0-1.7-0.1-2.4-0.4
+              c-0.6-0.2-1.1-0.6-1.5-1.1s-0.6-1-0.8-1.7c-0.2-0.7-0.2-1.4-0.2-2.2v-1.2c0-0.8,0.1-1.5,0.3-2.2c0.2-0.7,0.5-1.2,0.9-1.7
+              s0.9-0.8,1.5-1.1C280.6,154.3,281.4,154.2,282.3,154.2z M282.3,164.8c0.7,0,1.2-0.1,1.7-0.2s0.8-0.4,1.1-0.7
+              c0.3-0.3,0.5-0.8,0.6-1.3c0.1-0.5,0.2-1.2,0.2-1.9v-1c0-0.8-0.1-1.4-0.2-2s-0.3-1-0.6-1.3c-0.3-0.3-0.6-0.6-1.1-0.7s-1-0.2-1.6-0.2
+              c-0.7,0-1.2,0.1-1.7,0.2c-0.5,0.2-0.8,0.4-1.1,0.7c-0.3,0.3-0.5,0.8-0.6,1.3c-0.1,0.5-0.2,1.2-0.2,1.9v1c0,0.8,0.1,1.4,0.2,1.9
+              c0.1,0.5,0.3,1,0.6,1.3c0.3,0.3,0.6,0.6,1.1,0.7C281.1,164.7,281.6,164.8,282.3,164.8z"/>
+            <path class="st14" d="M288.8,154.4h1.5l3.1,4.4l3.1-4.4h1.5l-3.9,5.4l4.2,5.8h-1.6l-3.4-4.9l-3.4,4.9h-1.5l4.2-5.9L288.8,154.4z"/>
+          </g>
+          <g>
+            <path class="st14" d="M379.5,166c-1.1,0-2-0.1-2.8-0.4s-1.3-0.7-1.7-1.2c-0.4-0.6-0.7-1.2-0.9-2c-0.2-0.8-0.2-1.8-0.2-2.8V150h1.4
+              v9.5c0,1,0.1,1.9,0.2,2.5c0.2,0.7,0.4,1.2,0.7,1.6c0.3,0.4,0.8,0.7,1.3,0.9c0.5,0.2,1.2,0.3,2,0.3c0.8,0,1.5-0.1,2-0.3
+              c0.5-0.2,1-0.5,1.3-0.9c0.3-0.4,0.6-1,0.7-1.6s0.2-1.5,0.2-2.5V150h1.4v9.5c0,1.1-0.1,2-0.3,2.8s-0.5,1.5-0.9,2
+              c-0.4,0.5-1,0.9-1.7,1.2S380.6,166,379.5,166z"/>
+            <path class="st14" d="M394.4,157.1c0.7,0.1,1.3,0.3,1.8,0.5c0.5,0.2,0.9,0.5,1.2,0.9s0.5,0.8,0.6,1.2c0.1,0.5,0.2,0.9,0.2,1.5v0.3
+              c0,0.6-0.1,1.2-0.3,1.8c-0.2,0.5-0.6,1-1,1.4c-0.5,0.4-1,0.7-1.8,0.9c-0.7,0.2-1.5,0.3-2.5,0.3c-0.8,0-1.6-0.1-2.4-0.2
+              c-0.8-0.1-1.4-0.3-2-0.5l0.3-1.2c0.6,0.2,1.2,0.3,1.9,0.4c0.7,0.1,1.4,0.2,2.2,0.2c1.5,0,2.6-0.3,3.2-0.8c0.6-0.5,1-1.4,1-2.5
+              c0-0.4,0-0.7-0.1-1c-0.1-0.3-0.2-0.6-0.4-0.9c-0.2-0.3-0.5-0.5-0.9-0.6c-0.4-0.2-0.9-0.3-1.4-0.4l-2-0.3c-1.3-0.2-2.3-0.6-2.8-1.3
+              c-0.6-0.7-0.8-1.6-0.8-2.7V154c0-0.7,0.1-1.3,0.4-1.8c0.3-0.5,0.6-1,1.1-1.3c0.5-0.4,1.1-0.6,1.8-0.8c0.7-0.2,1.5-0.3,2.3-0.3
+              c0.7,0,1.5,0.1,2.1,0.2c0.7,0.1,1.2,0.3,1.7,0.5l-0.3,1.1c-0.5-0.2-1.1-0.3-1.7-0.4s-1.3-0.2-2-0.2c-1.5,0-2.5,0.3-3.2,0.8
+              c-0.6,0.5-1,1.3-1,2.3c0,0.8,0.2,1.4,0.6,1.8c0.4,0.4,1.1,0.7,2.2,0.8L394.4,157.1z"/>
+            <path class="st14" d="M401.4,165.7V150h5.5c0.8,0,1.5,0.1,2,0.3c0.5,0.2,1,0.5,1.3,0.8c0.3,0.3,0.6,0.7,0.7,1.2
+              c0.1,0.4,0.2,0.9,0.2,1.4v0.5c0,0.8-0.2,1.5-0.6,2c-0.4,0.5-0.9,0.9-1.6,1.2c0.5,0.1,0.8,0.3,1.2,0.5c0.3,0.2,0.6,0.5,0.8,0.9
+              c0.2,0.3,0.4,0.7,0.5,1.1c0.1,0.4,0.2,0.8,0.2,1.3v0.5c0,0.6-0.1,1.1-0.3,1.6c-0.2,0.5-0.5,0.9-0.9,1.3c-0.4,0.4-0.9,0.6-1.5,0.8
+              s-1.3,0.3-2.1,0.3H401.4z M402.8,156.9h4.2c0.9,0,1.7-0.2,2.2-0.7c0.5-0.4,0.7-1.1,0.7-1.8v-0.5c0-1.8-1-2.8-3.1-2.8h-3.9V156.9z
+               M402.8,164.5h4.2c1.1,0,1.9-0.2,2.4-0.7c0.5-0.4,0.8-1.2,0.8-2.2v-0.5c0-2-1.1-3.1-3.3-3.1h-4.2V164.5z"/>
+            <path class="st14" d="M421.6,150v7.1l7-7.1h1.6l-7.5,7.5l8,8.1h-1.8l-7.3-7.5v7.5h-1.3V150H421.6z"/>
+            <path class="st14" d="M433.1,160.5c0,0.8,0.1,1.4,0.2,2c0.1,0.5,0.4,1,0.7,1.3c0.3,0.3,0.8,0.6,1.3,0.7c0.5,0.2,1.2,0.2,2.1,0.2
+              c0.5,0,0.9,0,1.5-0.1c0.5-0.1,1-0.1,1.3-0.2l-0.2,1.1c-0.3,0.1-0.8,0.2-1.3,0.3c-0.5,0.1-1.1,0.1-1.6,0.1c-1,0-1.8-0.1-2.5-0.3
+              c-0.7-0.2-1.2-0.6-1.7-1s-0.7-1-0.9-1.7c-0.2-0.7-0.3-1.5-0.3-2.4v-0.9c0-0.8,0.1-1.6,0.3-2.3c0.2-0.7,0.5-1.3,0.8-1.7
+              c0.4-0.5,0.9-0.9,1.5-1.1c0.6-0.3,1.3-0.4,2.2-0.4c0.7,0,1.4,0.1,1.9,0.3c0.5,0.2,1,0.5,1.3,0.9s0.6,0.9,0.8,1.4
+              c0.2,0.5,0.2,1.2,0.2,1.8v0.6c0,0.4-0.1,0.7-0.2,0.9c-0.1,0.2-0.4,0.3-0.8,0.3H433.1z M436.4,155.3c-0.6,0-1,0.1-1.5,0.2
+              s-0.8,0.4-1,0.7s-0.5,0.8-0.6,1.3c-0.1,0.5-0.2,1.2-0.2,2h6.5v-0.8c0-1.1-0.2-2-0.7-2.6S437.5,155.3,436.4,155.3z"/>
+            <path class="st14" d="M451.7,154.4h1.5l-4.9,12.6c-0.3,0.8-0.6,1.4-0.9,1.9c-0.3,0.5-0.6,0.9-0.9,1.2c-0.3,0.3-0.6,0.5-1,0.6
+              c-0.4,0.1-0.7,0.2-1.2,0.2c-0.3,0-0.6,0-0.9-0.1c-0.3-0.1-0.5-0.1-0.8-0.2l0.2-1c0.2,0,0.4,0.1,0.6,0.1c0.2,0,0.5,0,0.7,0
+              c0.3,0,0.6,0,0.9-0.1c0.3-0.1,0.5-0.2,0.7-0.4c0.2-0.2,0.4-0.5,0.6-0.8c0.2-0.4,0.4-0.9,0.6-1.5l0.4-1.2l-4.8-11.4h1.5l3.9,9.7
+              L451.7,154.4z"/>
+          </g>
+          </svg>
+        <hr>
+
+        <h3>What happens if I lose my passphrase?</h3>
+          <p>Your passphrase is used to encrypt your private keys. If you lose your passphrase, you will no longer be able to decrypt your private key file nor have access to the contents of your Wallet or My Purchases.</p>
+          <p>In order to guarantee your privacy, nobody can help you recover your passphrase, including High Fidelity.
+
+          <p><b>Please write it down and store it securely.</b></p>
+          <p>&nbsp;</p>
+        <hr>
+
+        <h2>Want to learn more?</h2>
+        <p>You can find out much more about the blockchain and about commerce in High Fidelity by visiting our Docs site:</p>
+        <p><a href="http://docs.highfidelity.com" class="btn">Visit High Fidelity's Docs</a></p>
+        <hr>
+
+      </div>
+    </div>
+    <div class="footer">
+      High Fidelity | <a href="http://highfidelity.com" target="_blank">highfidelity.com</a>
+    </div>
+  </div>
+</body>
+</html>
diff --git a/interface/resources/html/img/tablet-help-gamepad.jpg b/interface/resources/html/img/tablet-help-gamepad.jpg
index 5abb38d66b..87d79c2d67 100644
Binary files a/interface/resources/html/img/tablet-help-gamepad.jpg and b/interface/resources/html/img/tablet-help-gamepad.jpg differ
diff --git a/interface/resources/html/img/tablet-help-keyboard.jpg b/interface/resources/html/img/tablet-help-keyboard.jpg
index 40c6017561..51edf3c1d3 100644
Binary files a/interface/resources/html/img/tablet-help-keyboard.jpg and b/interface/resources/html/img/tablet-help-keyboard.jpg differ
diff --git a/interface/resources/html/img/tablet-help-oculus.jpg b/interface/resources/html/img/tablet-help-oculus.jpg
index b4f54396e0..92f92ae813 100644
Binary files a/interface/resources/html/img/tablet-help-oculus.jpg and b/interface/resources/html/img/tablet-help-oculus.jpg differ
diff --git a/interface/resources/html/img/tablet-help-vive.jpg b/interface/resources/html/img/tablet-help-vive.jpg
index 98e57eef47..abfbd8554a 100644
Binary files a/interface/resources/html/img/tablet-help-vive.jpg and b/interface/resources/html/img/tablet-help-vive.jpg differ
diff --git a/interface/resources/html/raiseAndLowerKeyboard.js b/interface/resources/html/raiseAndLowerKeyboard.js
index 27ead23124..23f3a7e9a8 100644
--- a/interface/resources/html/raiseAndLowerKeyboard.js
+++ b/interface/resources/html/raiseAndLowerKeyboard.js
@@ -14,12 +14,17 @@
     var isWindowFocused = true;
     var isKeyboardRaised = false;
     var isNumericKeyboard = false;
-    var KEYBOARD_HEIGHT = 200;
+    var isPasswordField = false;
+
+    function shouldSetPasswordField() {
+        var nodeType = document.activeElement.type;
+        return nodeType === "password";
+    }
 
     function shouldRaiseKeyboard() {
         var nodeName = document.activeElement.nodeName;
         var nodeType = document.activeElement.type;
-        if (nodeName === "INPUT" && ["email", "number", "password", "tel", "text", "url"].indexOf(nodeType) !== -1
+        if (nodeName === "INPUT" && ["email", "number", "password", "tel", "text", "url", "search"].indexOf(nodeType) !== -1
             || document.activeElement.nodeName === "TEXTAREA") {
             return true;
         } else {
@@ -38,15 +43,30 @@
         return document.activeElement.type === "number";
     };
 
+    function scheduleBringToView(timeout) {
+
+        var timer = setTimeout(function () {
+            clearTimeout(timer);
+
+            var elementRect = document.activeElement.getBoundingClientRect();
+            var absoluteElementTop = elementRect.top + window.scrollY;
+            var middle = absoluteElementTop - (window.innerHeight / 2);
+
+            window.scrollTo(0, middle);
+        }, timeout);
+    }
+
     setInterval(function () {
         var keyboardRaised = shouldRaiseKeyboard();
         var numericKeyboard = shouldSetNumeric();
+        var passwordField = shouldSetPasswordField();
 
-        if (isWindowFocused && (keyboardRaised !== isKeyboardRaised || numericKeyboard !== isNumericKeyboard)) {
+        if (isWindowFocused &&
+            (keyboardRaised !== isKeyboardRaised || numericKeyboard !== isNumericKeyboard || passwordField !== isPasswordField)) {
 
             if (typeof EventBridge !== "undefined" && EventBridge !== null) {
                 EventBridge.emitWebEvent(
-                    keyboardRaised ? ("_RAISE_KEYBOARD" + (numericKeyboard ? "_NUMERIC" : "")) : "_LOWER_KEYBOARD"
+                    keyboardRaised ? ("_RAISE_KEYBOARD" + (numericKeyboard ? "_NUMERIC" : "") + (passwordField ? "_PASSWORD" : "")) : "_LOWER_KEYBOARD"
                 );
             } else {
                 if (numWarnings < MAX_WARNINGS) {
@@ -56,20 +76,23 @@
             }
 
             if (!isKeyboardRaised) {
-                var delta = document.activeElement.getBoundingClientRect().bottom + 10
-                    - (document.body.clientHeight - KEYBOARD_HEIGHT);
-                if (delta > 0) {
-                    setTimeout(function () {
-                        document.body.scrollTop += delta;
-                    }, 500);  // Allow time for keyboard to be raised in QML.
-                }
+                scheduleBringToView(250); // Allow time for keyboard to be raised in QML.
+                                          // 2DO: should it be rather done from 'client area height changed' event?
             }
 
             isKeyboardRaised = keyboardRaised;
             isNumericKeyboard = numericKeyboard;
+            isPasswordField = passwordField;
         }
     }, POLL_FREQUENCY);
 
+    window.addEventListener("click", function () {
+        var keyboardRaised = shouldRaiseKeyboard();
+        if(keyboardRaised && isKeyboardRaised) {
+            scheduleBringToView(150);
+        }
+    });
+
     window.addEventListener("focus", function () {
         isWindowFocused = true;
     });
diff --git a/interface/resources/html/tabletHelp.html b/interface/resources/html/tabletHelp.html
index cbd7ffcfe7..a6588be083 100644
--- a/interface/resources/html/tabletHelp.html
+++ b/interface/resources/html/tabletHelp.html
@@ -6,7 +6,14 @@
         <title>Welcome to Interface</title>
 
         <style>
-          body {
+            @font-face {
+                font-family: 'Raleway Light';
+                src: url('../fonts/Raleway-Light.ttf') format('truetype');
+                font-weight: normal;
+                font-style: normal;
+            }
+
+            body {
                 background: black;
                 width: 100%;
                 overflow-x: hidden;
@@ -15,6 +22,14 @@
                 padding: 0;
             }
 
+            a:link {color:inherit}
+            a:active {color:inherit}
+            a:visited {color:inherit}
+            a:hover {
+                color:inherit;
+                cursor: pointer;
+            }
+
             #left_button {
                 position: absolute;
                 left: 70;
@@ -38,6 +53,15 @@
                 position: absolute;
                 top: 0; left: 0; bottom: 0; right: 0;
             }
+
+            #report_problem {
+                position: fixed;
+                top: 10;
+                right: 10;
+                font-family: "Raleway Light", sans-serif;
+                text-decoration: none;
+                color: #ddd;
+            }
         </style>
         <script>
             var handControllerImageURL = null;
@@ -152,6 +176,7 @@
             <a href="#" id="left_button" onmousedown="cycleLeft()"></a>
             <a href="#" id="right_button" onmousedown="cycleRight()"></a>
         </div>
+        <a href="mailto:support@highfidelity.com" id="report_problem">Report Problem</a>
     </body>
 
 </html>
diff --git a/interface/resources/icons/tablet-icons/clap-a.svg b/interface/resources/icons/tablet-icons/clap-a.svg
new file mode 100644
index 0000000000..60df3e0795
--- /dev/null
+++ b/interface/resources/icons/tablet-icons/clap-a.svg
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="225pt"
+   height="225pt"
+   viewBox="0 0 79.374998 79.374998"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="clap-a.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8"
+     inkscape:cx="240.0566"
+     inkscape:cy="147.59313"
+     inkscape:document-units="mm"
+     inkscape:current-layer="g3790"
+     showgrid="false"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:pagecheckerboard="true"
+     units="pt" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-217.62501)">
+    <g
+       id="g3790"
+       transform="translate(-276.67857,-1.5119048)"
+       style="fill:#000000">
+      <path
+         sodipodi:nodetypes="ccscccsccscssscscsscsccc"
+         inkscape:connector-curvature="0"
+         id="path3764"
+         d="m 287.04656,288.04665 23.71378,9.0592 c 0,0 0.39967,-4.79605 4.5296,-6.92762 4.12992,-2.13158 7.40168,-15.99614 7.40168,-15.99614 l 2.5266,-9.92668 4.1934,-9.24819 c 0,0 -1.13082,-3.82467 -4.67519,-0.19524 -8.8408,9.05294 -3.51813,14.25651 -8.14833,14.16202 -3.77977,-0.75596 -0.13245,-10.86933 0.26722,-16.16497 0.26644,-3.06413 0.69941,-12.98928 0.29974,-18.85112 -0.39966,-5.86184 -0.93256,-6.66118 -2.66446,-6.52795 -1.73191,0.13322 -2.93093,0.93257 -4.39638,9.05919 -1.46546,8.12664 -3.33058,15.72038 -3.06414,18.91774 0.26644,3.19737 -4.36307,0.64443 -2.89762,-5.48385 1.46546,-6.12827 4.82299,-19.49577 4.95621,-21.36089 0.13322,-1.86512 -0.52548,-5.99423 -3.45641,-1.46464 -2.93091,4.52961 -8.39307,31.77464 -8.39307,31.77464 0,0 -4.61911,1.35544 4.75249,-29.62183 0.37058,-1.22492 -1.2231,-1.82036 -2.02245,-0.35491 -0.79933,1.46547 -2.93556,6.41177 -3.60169,9.47592 -0.66612,3.06413 -4.12526,18.76747 -5.99039,20.76582 -1.86514,1.99836 -0.77914,-1.64516 2.43172,-19.62594 -3.46015,-8.7099 -7.6029,16.6051 -8.29355,25.75422 -1.73191,11.05755 2.66446,14.65459 2.53124,22.78122 z"
+         style="fill:#000000;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccscsssccccccssc"
+         inkscape:connector-curvature="0"
+         id="path3766"
+         d="m 326.28601,276.79194 4.85752,2.59518 c 0,0 5.99506,0.26645 7.86018,1.19902 1.86513,0.93256 14.52136,-19.31742 14.52136,-19.31742 0,0 -1.59867,-0.39967 -3.19735,-5.32893 -1.59868,-4.92926 -7.59374,-19.98353 -9.45888,-23.44734 -1.86513,-3.46381 -2.53124,-4.66283 -3.4638,-7.46051 -0.93257,-2.7977 -2.13159,-5.0625 -3.73027,-0.13323 -1.59868,4.92927 -1.66343,10.45537 -0.46441,13.91919 1.38613,5.18454 3.8952,15.07683 1.97631,17.7369 -3.13067,-0.0635 -4.1718,-8.94257 -4.84078,-11.98701 l -10.45574,-8.48036 -1.15458,18.13553 c 0,0 3.30736,-4.0697 9.65298,-5.19422 4.51067,-0.79933 2.81751,6.4678 1.21188,14.09965 -1.34794,6.40707 -3.31442,13.66355 -3.31442,13.66355 z"
+         style="fill:#000000;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0"
+         id="path3768"
+         d="m 291.74698,236.36722 c 0,0 -1.36535,-0.56172 -0.0701,-3.22296 1.29528,-2.66125 3.72103,-1.62503 4.12138,-1.41306 -1.04349,0.50764 -3.37926,4.82292 -4.05132,4.63602 z"
+         style="fill:#000000;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3770"
+         d="m 278.60514,277.01718 c 0,0 -0.98806,-8.05217 1.36702,-17.09567 5.11868,-12.29479 -7.76345,3.61446 -1.36702,17.09567 z"
+         style="fill:#000000;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="ccc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3772"
+         d="m 283.64252,261.72126 c 0,-0.0431 -1.44898,3.96362 -0.80247,9.53246 0.42679,3.67631 0.64575,8.36037 1.90705,11.72782 3.10143,7.14376 -8.41694,-7.43352 -1.10458,-21.26028 z"
+         style="fill:#000000;stroke:#000000;stroke-width:0.11350404px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="cscc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3774"
+         d="m 318.12446,294.21149 c 0,0 6.68844,-4.71017 9.13772,-13.37686 -5.91279,4.63412 -6.77642,9.57974 -9.13772,13.37686 z"
+         style="fill:#000000;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="ccc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3778"
+         d="m 344.21877,231.00112 c 0,0 1.60041,9.36884 7.07841,21.7522 5.35526,12.10587 4.05178,-4.80879 -7.07841,-21.7522 z"
+         style="fill:#000000;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="csc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3780"
+         d="m 349.44951,230.90023 c -0.11119,-0.0477 0.96041,8.99393 4.75948,15.37263 1.48524,4.17497 3.73499,-6.08181 -4.75948,-15.37263 z"
+         style="fill:#000000;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="ccc" />
+    </g>
+  </g>
+</svg>
diff --git a/interface/resources/icons/tablet-icons/clap-i.svg b/interface/resources/icons/tablet-icons/clap-i.svg
new file mode 100644
index 0000000000..fbd9ed0f9c
--- /dev/null
+++ b/interface/resources/icons/tablet-icons/clap-i.svg
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="225pt"
+   height="225pt"
+   viewBox="0 0 79.374998 79.374998"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="clap-i.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8"
+     inkscape:cx="240.0566"
+     inkscape:cy="147.59313"
+     inkscape:document-units="mm"
+     inkscape:current-layer="g3790"
+     showgrid="false"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:pagecheckerboard="true"
+     units="pt" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-217.62501)">
+    <g
+       id="g3790"
+       transform="translate(-276.67857,-1.5119048)"
+       style="fill:#000000">
+      <path
+         sodipodi:nodetypes="ccscccsccscssscscsscsccc"
+         inkscape:connector-curvature="0"
+         id="path3764"
+         d="m 287.04656,288.04665 23.71378,9.0592 c 0,0 0.39967,-4.79605 4.5296,-6.92762 4.12992,-2.13158 7.40168,-15.99614 7.40168,-15.99614 l 2.5266,-9.92668 4.1934,-9.24819 c 0,0 -1.13082,-3.82467 -4.67519,-0.19524 -8.8408,9.05294 -3.51813,14.25651 -8.14833,14.16202 -3.77977,-0.75596 -0.13245,-10.86933 0.26722,-16.16497 0.26644,-3.06413 0.69941,-12.98928 0.29974,-18.85112 -0.39966,-5.86184 -0.93256,-6.66118 -2.66446,-6.52795 -1.73191,0.13322 -2.93093,0.93257 -4.39638,9.05919 -1.46546,8.12664 -3.33058,15.72038 -3.06414,18.91774 0.26644,3.19737 -4.36307,0.64443 -2.89762,-5.48385 1.46546,-6.12827 4.82299,-19.49577 4.95621,-21.36089 0.13322,-1.86512 -0.52548,-5.99423 -3.45641,-1.46464 -2.93091,4.52961 -8.39307,31.77464 -8.39307,31.77464 0,0 -4.61911,1.35544 4.75249,-29.62183 0.37058,-1.22492 -1.2231,-1.82036 -2.02245,-0.35491 -0.79933,1.46547 -2.93556,6.41177 -3.60169,9.47592 -0.66612,3.06413 -4.12526,18.76747 -5.99039,20.76582 -1.86514,1.99836 -0.77914,-1.64516 2.43172,-19.62594 -3.46015,-8.7099 -7.6029,16.6051 -8.29355,25.75422 -1.73191,11.05755 2.66446,14.65459 2.53124,22.78122 z"
+         style="fill:#ffffff;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccscsssccccccssc"
+         inkscape:connector-curvature="0"
+         id="path3766"
+         d="m 326.28601,276.79194 4.85752,2.59518 c 0,0 5.99506,0.26645 7.86018,1.19902 1.86513,0.93256 14.52136,-19.31742 14.52136,-19.31742 0,0 -1.59867,-0.39967 -3.19735,-5.32893 -1.59868,-4.92926 -7.59374,-19.98353 -9.45888,-23.44734 -1.86513,-3.46381 -2.53124,-4.66283 -3.4638,-7.46051 -0.93257,-2.7977 -2.13159,-5.0625 -3.73027,-0.13323 -1.59868,4.92927 -1.66343,10.45537 -0.46441,13.91919 1.38613,5.18454 3.8952,15.07683 1.97631,17.7369 -3.13067,-0.0635 -4.1718,-8.94257 -4.84078,-11.98701 l -10.45574,-8.48036 -1.15458,18.13553 c 0,0 3.30736,-4.0697 9.65298,-5.19422 4.51067,-0.79933 2.81751,6.4678 1.21188,14.09965 -1.34794,6.40707 -3.31442,13.66355 -3.31442,13.66355 z"
+         style="fill:#ffffff;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0"
+         id="path3768"
+         d="m 291.74698,236.36722 c 0,0 -1.36535,-0.56172 -0.0701,-3.22296 1.29528,-2.66125 3.72103,-1.62503 4.12138,-1.41306 -1.04349,0.50764 -3.37926,4.82292 -4.05132,4.63602 z"
+         style="fill:#ffffff;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3770"
+         d="m 278.60514,277.01718 c 0,0 -0.98806,-8.05217 1.36702,-17.09567 5.11868,-12.29479 -7.76345,3.61446 -1.36702,17.09567 z"
+         style="fill:#ffffff;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="ccc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3772"
+         d="m 283.64252,261.72126 c 0,-0.0431 -1.44898,3.96362 -0.80247,9.53246 0.42679,3.67631 0.64575,8.36037 1.90705,11.72782 3.10143,7.14376 -8.41694,-7.43352 -1.10458,-21.26028 z"
+         style="fill:#ffffff;stroke:#000000;stroke-width:0.11350404px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="cscc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3774"
+         d="m 318.12446,294.21149 c 0,0 6.68844,-4.71017 9.13772,-13.37686 -5.91279,4.63412 -6.77642,9.57974 -9.13772,13.37686 z"
+         style="fill:#ffffff;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="ccc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3778"
+         d="m 344.21877,231.00112 c 0,0 1.60041,9.36884 7.07841,21.7522 5.35526,12.10587 4.05178,-4.80879 -7.07841,-21.7522 z"
+         style="fill:#ffffff;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="csc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3780"
+         d="m 349.44951,230.90023 c -0.11119,-0.0477 0.96041,8.99393 4.75948,15.37263 1.48524,4.17497 3.73499,-6.08181 -4.75948,-15.37263 z"
+         style="fill:#ffffff;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="ccc" />
+    </g>
+  </g>
+</svg>
diff --git a/interface/resources/icons/tablet-icons/edit-disabled.svg b/interface/resources/icons/tablet-icons/edit-disabled.svg
new file mode 100644
index 0000000000..4869b30dd9
--- /dev/null
+++ b/interface/resources/icons/tablet-icons/edit-disabled.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.0, 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 50 50" style="enable-background:new 0 0 50 50;" xml:space="preserve" opacity="0.33">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<g id="Layer_2">
+</g>
+<g>
+	<path class="st0" d="M20.7,29.7c-2.2,2.2-4.4,4.4-6.7,6.7c-0.5-0.5-1.1-1.1-1.6-1.6c2.2-2.2,4.4-4.4,6.7-6.7l-1.8-1.8
+		c-2.6,2.5-5.1,5.1-7.7,7.6c-0.5,0.5-0.9,1.1-1,1.8C8.3,37.8,8,39.8,7.7,42c0.2,0,0.4,0,0.5,0c2-0.4,4-0.8,5.9-1.2
+		c0.4-0.1,0.8-0.3,1.1-0.6c2.7-2.6,5.3-5.3,8-8L20.7,29.7z"/>
+	<path class="st0" d="M31.1,11c0.8-0.8,1.8-1.8,2.7-2.7C34.2,8,34.6,8,34.9,8.4c1.6,1.6,3.1,3.1,4.7,4.7c0.4,0.4,0.4,0.8,0,1.2
+		c-0.9,0.9-1.8,1.8-2.7,2.7C35,15,33.1,13,31.1,11z"/>
+	<path class="st0" d="M33,25.9c-0.4,0.1-0.6,0-0.9-0.2c-0.6-0.6-1.3-1.3-1.9-1.9c1.5-1.5,3.1-3.1,4.6-4.6c0.1-0.1,0.3-0.3,0.3-0.3
+		c-2-2-3.9-4-5.9-6.1c-0.1,0.2-0.2,0.3-0.4,0.5c-1.5,1.5-3,3-4.6,4.6c-2.8-2.8-5.6-5.6-8.4-8.4c-0.2-0.2-0.4-0.4-0.6-0.6
+		c-1.5-1.2-3.5-1-4.8,0.4c-1.2,1.4-1.1,3.5,0.2,4.8c4.2,4.2,8.3,8.3,12.5,12.5c1.4,1.4,2.7,2.7,4.1,4.1c0.2,0.2,0.2,0.4,0.2,0.7
+		c-0.2,0.6-0.3,1.2-0.3,1.9c-0.3,4,2.3,7.5,6.1,8.5c1.6,0.4,3.2,0.3,4.8-0.3c-0.1-0.2-0.3-0.2-0.4-0.4c-1.2-1.2-2.3-2.3-3.5-3.5
+		c-0.8-0.9-0.9-2.1-0.1-3c0.6-0.7,1.3-1.3,2-2c0.9-0.8,2-0.8,2.9,0c0.2,0.2,0.3,0.3,0.5,0.5c1.2,1.2,2.3,2.3,3.5,3.5
+		c0.1,0,0.1,0,0.2,0c0.1-0.7,0.3-1.3,0.3-2C43.9,28.7,38.5,24.3,33,25.9z M12.9,12.6c-0.6,0-1.2-0.5-1.2-1.2s0.5-1.2,1.2-1.2
+		c0.6,0,1.2,0.6,1.2,1.2C14.1,12,13.6,12.6,12.9,12.6z M29.3,16.3c0.5,0.5,1,1.1,1.6,1.6c-1.1,1.1-2.2,2.2-3.3,3.3
+		c-0.5-0.5-1.1-1.1-1.6-1.6C27.1,18.5,28.2,17.4,29.3,16.3z"/>
+</g>
+</svg>
diff --git a/interface/resources/icons/tablet-icons/spectator-a.svg b/interface/resources/icons/tablet-icons/spectator-a.svg
new file mode 100644
index 0000000000..22ebde999b
--- /dev/null
+++ b/interface/resources/icons/tablet-icons/spectator-a.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.1.0, 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 50 50" style="enable-background:new 0 0 50 50;" xml:space="preserve">
+<path d="M43.9,13.3c-1.3-0.6-2.4-0.3-3.5,0.4c-1.6,1.2-3.3,2.4-5,3.5c-1.4-3.4-3.3-5-6.3-5c-5.9-0.1-11.9-0.1-17.9,0
+	c-3.8,0.1-6.4,3.1-6.4,7.3c0,3.7-0.1,7.6,0,11.4c0,1.1,0.2,2.1,0.6,3.1c1.2,2.7,3.3,3.8,6,3.8c5.6,0,11-0.1,16.5,0
+	c3.5,0.1,6-1.5,7.4-5.1c1.7,1.2,3.4,2.4,5.1,3.5c1.1,0.7,2.2,1.1,3.5,0.3c1.2-0.7,1.6-1.9,1.6-3.3c0-5.6,0-11,0-16.6
+	C45.5,15.3,45.2,14.1,43.9,13.3z M32.2,30.5c0,2.5-1,3.6-3.4,3.6c-2.9,0-5.8,0-8.7,0s-5.6,0-8.5,0.1c-2.4-0.1-3.4-1.2-3.4-3.7
+	c0-3.7,0-7.5,0-11.2c0-2.2,1.1-3.4,3.1-3.4c5.9,0,11.9,0,17.8,0c2,0,3.1,1.2,3.1,3.4C32.2,23,32.2,26.8,32.2,30.5z M41.9,32.8
+	c-2.1-1.4-4.2-2.9-6.3-4.3c-0.1-0.1-0.2-0.4-0.2-0.7c0-1.9,0-3.7,0-5.5c0-0.3,0.1-0.7,0.3-0.8c2-1.4,4-2.8,6.2-4.3
+	C41.9,22.3,41.9,27.4,41.9,32.8z"/>
+<path d="M27.4,25C27.4,24.7,27.4,25.2,27.4,25c0-1.1-0.1-2-0.2-2.7c-0.2-1.4-0.7-2.7-1.6-4c-0.2-0.3-0.5-0.5-1-0.6
+	c-0.4-0.1-0.9,0-1.3,0.2c-0.5,0.3-0.7,1.3-0.3,1.8c1.2,1.6,1.4,3,1.4,4.8c0.1,2.1-0.2,3.4-1.5,5.2c-0.2,0.3-0.2,1.1,0.1,1.6
+	c0.1,0.2,0.3,0.4,0.6,0.6c0.2,0.1,0.3,0.1,0.5,0.1c0.5,0,1-0.3,1.3-0.9C27,29.3,27.3,27.3,27.4,25L27.4,25z"/>
+<ellipse cx="15.2" cy="24.7" rx="2.1" ry="2.4"/>
+<path d="M22.3,24.8C22.3,24.7,22.3,25,22.3,24.8c0-0.7-0.1-1.5-0.1-1.9c-0.2-1-0.6-2.1-1.3-3c-0.1-0.2-0.4-0.5-0.9-0.5
+	c-0.7,0-0.9,0.2-1.2,0.4c-0.4,0.2-0.5,0.9-0.2,1.3c0.9,1.2,1,2.1,1.1,3.5c0,1.6-0.2,2.5-1.1,3.8c-0.1,0.2-0.1,0.7,0,1.2
+	c0.1,0.2,0.2,0.3,0.5,0.4c0.1,0,0.2,0.1,0.3,0.1c0.5,0.2,1.2,0.1,1.5-0.5C21.7,28,22.2,26.5,22.3,24.8L22.3,24.8z"/>
+</svg>
diff --git a/interface/resources/icons/tablet-icons/spectator-i.svg b/interface/resources/icons/tablet-icons/spectator-i.svg
new file mode 100644
index 0000000000..3e6c1a7dd9
--- /dev/null
+++ b/interface/resources/icons/tablet-icons/spectator-i.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.1.0, 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 50 50" style="enable-background:new 0 0 50 50;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M43.9,13.3c-1.3-0.6-2.4-0.3-3.5,0.4c-1.6,1.2-3.3,2.4-5,3.5c-1.4-3.4-3.3-5-6.3-5c-5.9-0.1-11.9-0.1-17.9,0
+	c-3.8,0.1-6.4,3.1-6.4,7.3c0,3.7-0.1,7.6,0,11.4c0,1.1,0.2,2.1,0.6,3.1c1.2,2.7,3.3,3.8,6,3.8c5.6,0,11-0.1,16.5,0
+	c3.5,0.1,6-1.5,7.4-5.1c1.7,1.2,3.4,2.4,5.1,3.5c1.1,0.7,2.2,1.1,3.5,0.3c1.2-0.7,1.6-1.9,1.6-3.3c0-5.6,0-11,0-16.6
+	C45.5,15.3,45.2,14.1,43.9,13.3z M32.2,30.5c0,2.5-1,3.6-3.4,3.6c-2.9,0-5.8,0-8.7,0s-5.6,0-8.5,0.1c-2.4-0.1-3.4-1.2-3.4-3.7
+	c0-3.7,0-7.5,0-11.2c0-2.2,1.1-3.4,3.1-3.4c5.9,0,11.9,0,17.8,0c2,0,3.1,1.2,3.1,3.4C32.2,23,32.2,26.8,32.2,30.5z M41.9,32.8
+	c-2.1-1.4-4.2-2.9-6.3-4.3c-0.1-0.1-0.2-0.4-0.2-0.7c0-1.9,0-3.7,0-5.5c0-0.3,0.1-0.7,0.3-0.8c2-1.4,4-2.8,6.2-4.3
+	C41.9,22.3,41.9,27.4,41.9,32.8z"/>
+<path class="st0" d="M27.4,25C27.4,24.7,27.4,25.2,27.4,25c0-1.1-0.1-2-0.2-2.7c-0.2-1.4-0.7-2.7-1.6-4c-0.2-0.3-0.5-0.5-1-0.6
+	c-0.4-0.1-0.9,0-1.3,0.2c-0.5,0.3-0.7,1.3-0.3,1.8c1.2,1.6,1.4,3,1.4,4.8c0.1,2.1-0.2,3.4-1.5,5.2c-0.2,0.3-0.2,1.1,0.1,1.6
+	c0.1,0.2,0.3,0.4,0.6,0.6c0.2,0.1,0.3,0.1,0.5,0.1c0.5,0,1-0.3,1.3-0.9C27,29.3,27.3,27.3,27.4,25L27.4,25z"/>
+<ellipse class="st0" cx="15.2" cy="24.7" rx="2.1" ry="2.4"/>
+<path class="st0" d="M22.3,24.8C22.3,24.7,22.3,25,22.3,24.8c0-0.7-0.1-1.5-0.1-1.9c-0.2-1-0.6-2.1-1.3-3c-0.1-0.2-0.4-0.5-0.9-0.5
+	c-0.7,0-0.9,0.2-1.2,0.4c-0.4,0.2-0.5,0.9-0.2,1.3c0.9,1.2,1,2.1,1.1,3.5c0,1.6-0.2,2.5-1.1,3.8c-0.1,0.2-0.1,0.7,0,1.2
+	c0.1,0.2,0.2,0.3,0.5,0.4c0.1,0,0.2,0.1,0.3,0.1c0.5,0.2,1.2,0.1,1.5-0.5C21.7,28,22.2,26.5,22.3,24.8L22.3,24.8z"/>
+</svg>
diff --git a/interface/resources/icons/tablet-icons/wallet-a.svg b/interface/resources/icons/tablet-icons/wallet-a.svg
new file mode 100644
index 0000000000..50ea64848f
--- /dev/null
+++ b/interface/resources/icons/tablet-icons/wallet-a.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" x="0px" y="0px" viewBox="0 0 96 96" style="enable-background:new 0 0 96 96;" xml:space="preserve"><g><path d="M2.4,70.5c0,6.1,4.9,11,11,11H76c6.1,0,11-4.9,11-11V59.6c3.7-0.7,6.6-3.9,6.6-7.9v-7.5c0-3.9-2.8-7.2-6.6-7.9V25.5   c0-6.1-4.9-11-11-11H13.4c-6.1,0-11,4.9-11,11V70.5z M87.6,51.8c0,1.1-0.9,2-2,2H72.2c-2.8,0-5-2.2-5-5v-1.5c0-2.8,2.2-5,5-5h13.3   c1.1,0,2,0.9,2,2V51.8z M8.4,25.5c0-2.8,2.2-5,5-5H76c2.8,0,5,2.2,5,5v10.7h-8.7c-6.1,0-11,4.9-11,11v1.5c0,6.1,4.9,11,11,11H81   v10.7c0,2.8-2.2,5-5,5H13.4c-2.8,0-5-2.2-5-5V25.5z"></path></g></svg>
\ No newline at end of file
diff --git a/interface/resources/icons/tablet-icons/wallet-i.svg b/interface/resources/icons/tablet-icons/wallet-i.svg
new file mode 100644
index 0000000000..4e27e41b44
--- /dev/null
+++ b/interface/resources/icons/tablet-icons/wallet-i.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.1.0, 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 96 96" style="enable-background:new 0 0 96 96;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<g>
+	<path class="st0" d="M2.4,70.5c0,6.1,4.9,11,11,11H76c6.1,0,11-4.9,11-11V59.6c3.7-0.7,6.6-3.9,6.6-7.9v-7.5c0-3.9-2.8-7.2-6.6-7.9
+		V25.5c0-6.1-4.9-11-11-11H13.4c-6.1,0-11,4.9-11,11C2.4,25.5,2.4,70.5,2.4,70.5z M87.6,51.8c0,1.1-0.9,2-2,2H72.2c-2.8,0-5-2.2-5-5
+		v-1.5c0-2.8,2.2-5,5-5h13.3c1.1,0,2,0.9,2,2L87.6,51.8L87.6,51.8z M8.4,25.5c0-2.8,2.2-5,5-5H76c2.8,0,5,2.2,5,5v10.7h-8.7
+		c-6.1,0-11,4.9-11,11v1.5c0,6.1,4.9,11,11,11H81v10.7c0,2.8-2.2,5-5,5H13.4c-2.8,0-5-2.2-5-5V25.5z"/>
+</g>
+</svg>
diff --git a/interface/resources/images/calibration-help.png b/interface/resources/images/calibration-help.png
new file mode 100644
index 0000000000..e3734a7d9c
Binary files /dev/null and b/interface/resources/images/calibration-help.png differ
diff --git a/interface/resources/images/cursor-arrow.png b/interface/resources/images/cursor-arrow.png
new file mode 100644
index 0000000000..408881b585
Binary files /dev/null and b/interface/resources/images/cursor-arrow.png differ
diff --git a/interface/resources/images/cursor-link.png b/interface/resources/images/cursor-link.png
new file mode 100644
index 0000000000..67ff4c7b67
Binary files /dev/null and b/interface/resources/images/cursor-link.png differ
diff --git a/interface/resources/images/cursor-none.png b/interface/resources/images/cursor-none.png
new file mode 100644
index 0000000000..0b3f499242
Binary files /dev/null and b/interface/resources/images/cursor-none.png differ
diff --git a/interface/resources/images/cursor-reticle.png b/interface/resources/images/cursor-reticle.png
new file mode 100644
index 0000000000..2d9ba8fd65
Binary files /dev/null and b/interface/resources/images/cursor-reticle.png differ
diff --git a/interface/resources/images/fadeMask.png b/interface/resources/images/fadeMask.png
new file mode 100644
index 0000000000..9c342ba788
Binary files /dev/null and b/interface/resources/images/fadeMask.png differ
diff --git a/interface/resources/images/inspect-icon.png b/interface/resources/images/inspect-icon.png
new file mode 100644
index 0000000000..9259de23e9
Binary files /dev/null and b/interface/resources/images/inspect-icon.png differ
diff --git a/interface/resources/images/lowerKeyboard.png b/interface/resources/images/lowerKeyboard.png
new file mode 100644
index 0000000000..d379b028ab
Binary files /dev/null and b/interface/resources/images/lowerKeyboard.png differ
diff --git a/interface/resources/images/static.gif b/interface/resources/images/static.gif
new file mode 100644
index 0000000000..fbe46f48e6
Binary files /dev/null and b/interface/resources/images/static.gif differ
diff --git a/interface/resources/meshes/defaultAvatar_full.fst b/interface/resources/meshes/defaultAvatar_full.fst
index eb8e356196..aa1c17fc40 100644
--- a/interface/resources/meshes/defaultAvatar_full.fst
+++ b/interface/resources/meshes/defaultAvatar_full.fst
@@ -2,14 +2,14 @@ name = mannequin
 type = body+head
 scale = 1
 filename = mannequin/mannequin.baked.fbx
-joint = jointEyeLeft = LeftEye
-joint = jointRightHand = RightHand
-joint = jointHead = Head
-joint = jointEyeRight = RightEye
-joint = jointLean = Spine
-joint = jointNeck = Neck
-joint = jointLeftHand = LeftHand
 joint = jointRoot = Hips
+joint = jointLean = Spine
+joint = jointLeftHand = LeftHand
+joint = jointHead = Head
+joint = jointEyeLeft = LeftEye
+joint = jointEyeRight = RightEye
+joint = jointRightHand = RightHand
+joint = jointNeck = Neck
 freeJoint = LeftArm
 freeJoint = LeftForeArm
 freeJoint = RightArm
@@ -18,72 +18,72 @@ bs = EyeBlink_L = blink = 1
 bs = JawOpen = mouth_Open = 1
 bs = LipsFunnel = Oo = 1
 bs = BrowsU_L = brow_Up = 1
-jointIndex = RightHandIndex2 = 27
-jointIndex = LeftHandIndex2 = 51
-jointIndex = RightUpLeg = 6
-jointIndex = RightToe_End = 10
-jointIndex = RightEye = 65
-jointIndex = LeftHandPinky1 = 42
-jointIndex = RightHandRing1 = 22
-jointIndex = face = 67
-jointIndex = LeftUpLeg = 1
-jointIndex = LeftHand = 41
-jointIndex = LeftHandMiddle1 = 58
-jointIndex = LeftHandIndex1 = 50
-jointIndex = LeftEye = 64
-jointIndex = RightHandIndex1 = 26
-jointIndex = LeftHandPinky4 = 45
-jointIndex = RightArm = 15
-jointIndex = LeftShoulder = 38
 jointIndex = RightHandPinky2 = 19
-jointIndex = RightHandThumb1 = 30
-jointIndex = RightForeArm = 16
-jointIndex = LeftHandMiddle3 = 60
-jointIndex = Neck = 62
-jointIndex = LeftHandThumb1 = 54
-jointIndex = RightHandMiddle2 = 35
 jointIndex = LeftHandMiddle4 = 61
-jointIndex = mannequin = 68
-jointIndex = Spine1 = 12
+jointIndex = LeftHand = 41
+jointIndex = LeftHandRing4 = 49
+jointIndex = RightHandMiddle3 = 36
+jointIndex = LeftHandThumb4 = 57
+jointIndex = RightToe_End = 10
+jointIndex = LeftHandRing1 = 46
+jointIndex = LeftForeArm = 40
+jointIndex = RightHandIndex4 = 29
+jointIndex = LeftShoulder = 38
+jointIndex = RightHandMiddle4 = 37
+jointIndex = RightShoulder = 14
+jointIndex = LeftLeg = 2
+jointIndex = LeftToe_End = 5
+jointIndex = Hips = 0
 jointIndex = RightFoot = 8
+jointIndex = RightHandThumb2 = 31
+jointIndex = LeftHandMiddle3 = 60
+jointIndex = RightHandThumb1 = 30
+jointIndex = Neck = 62
+jointIndex = Spine = 11
+jointIndex = RightHandThumb4 = 33
+jointIndex = RightHandMiddle1 = 34
+jointIndex = LeftHandIndex4 = 53
+jointIndex = face = 68
+jointIndex = RightHandRing3 = 24
+jointIndex = LeftHandPinky4 = 45
+jointIndex = LeftHandMiddle2 = 59
+jointIndex = RightHandThumb3 = 32
+jointIndex = LeftHandPinky3 = 44
+jointIndex = HeadTop_End = 66
+jointIndex = Spine1 = 12
+jointIndex = LeftHandRing3 = 48
+jointIndex = mannequin1 = 67
+jointIndex = RightEye = 65
+jointIndex = RightHandRing4 = 25
+jointIndex = RightHandPinky4 = 21
+jointIndex = LeftHandRing2 = 47
+jointIndex = RightHandIndex3 = 28
+jointIndex = RightUpLeg = 6
+jointIndex = LeftArm = 39
+jointIndex = LeftHandThumb3 = 56
+jointIndex = RightHandIndex2 = 27
+jointIndex = RightForeArm = 16
+jointIndex = RightArm = 15
+jointIndex = RightHandRing2 = 23
+jointIndex = LeftHandMiddle1 = 58
+jointIndex = Spine2 = 13
+jointIndex = LeftHandThumb2 = 55
+jointIndex = RightHandMiddle2 = 35
+jointIndex = RightHandPinky1 = 18
+jointIndex = LeftUpLeg = 1
+jointIndex = RightLeg = 7
+jointIndex = LeftHandIndex2 = 51
 jointIndex = RightHand = 17
 jointIndex = LeftHandIndex3 = 52
-jointIndex = RightHandIndex3 = 28
-jointIndex = RightHandMiddle4 = 37
-jointIndex = LeftLeg = 2
-jointIndex = RightHandMiddle1 = 34
-jointIndex = Spine2 = 13
-jointIndex = LeftHandMiddle2 = 59
-jointIndex = LeftHandPinky3 = 44
-jointIndex = LeftHandThumb3 = 56
-jointIndex = LeftHandRing4 = 49
-jointIndex = RightHandThumb2 = 31
-jointIndex = LeftHandRing3 = 48
-jointIndex = HeadTop_End = 66
-jointIndex = LeftHandThumb4 = 57
-jointIndex = RightHandThumb3 = 32
-jointIndex = RightHandPinky1 = 18
-jointIndex = RightLeg = 7
-jointIndex = RightHandMiddle3 = 36
-jointIndex = RightHandPinky3 = 20
-jointIndex = LeftToeBase = 4
-jointIndex = LeftForeArm = 40
-jointIndex = RightShoulder = 14
-jointIndex = LeftHandRing2 = 47
-jointIndex = LeftHandThumb2 = 55
-jointIndex = Head = 63
-jointIndex = RightHandRing4 = 25
-jointIndex = LeftHandRing1 = 46
 jointIndex = LeftFoot = 3
-jointIndex = RightHandRing3 = 24
-jointIndex = RightHandThumb4 = 33
-jointIndex = LeftArm = 39
-jointIndex = LeftToe_End = 5
+jointIndex = RightHandPinky3 = 20
+jointIndex = RightHandIndex1 = 26
+jointIndex = LeftHandPinky1 = 42
 jointIndex = RightToeBase = 9
-jointIndex = RightHandPinky4 = 21
-jointIndex = Spine = 11
-jointIndex = LeftHandIndex4 = 53
+jointIndex = LeftHandIndex1 = 50
+jointIndex = LeftToeBase = 4
 jointIndex = LeftHandPinky2 = 43
-jointIndex = RightHandIndex4 = 29
-jointIndex = Hips = 0
-jointIndex = RightHandRing2 = 23
+jointIndex = RightHandRing1 = 22
+jointIndex = LeftHandThumb1 = 54
+jointIndex = LeftEye = 64
+jointIndex = Head = 63
diff --git a/interface/resources/meshes/mannequin/Eyes.ktx b/interface/resources/meshes/mannequin/Eyes.ktx
old mode 100755
new mode 100644
index 4da922936b..ada45776a0
Binary files a/interface/resources/meshes/mannequin/Eyes.ktx and b/interface/resources/meshes/mannequin/Eyes.ktx differ
diff --git a/interface/resources/meshes/mannequin/lambert1_Base_Color.ktx b/interface/resources/meshes/mannequin/lambert1_Base_Color.ktx
old mode 100755
new mode 100644
index fcca382445..f151352592
Binary files a/interface/resources/meshes/mannequin/lambert1_Base_Color.ktx and b/interface/resources/meshes/mannequin/lambert1_Base_Color.ktx differ
diff --git a/interface/resources/meshes/mannequin/lambert1_Normal_OpenGL.ktx b/interface/resources/meshes/mannequin/lambert1_Normal_OpenGL.ktx
old mode 100755
new mode 100644
index 3ae717c5d7..fb738063ae
Binary files a/interface/resources/meshes/mannequin/lambert1_Normal_OpenGL.ktx and b/interface/resources/meshes/mannequin/lambert1_Normal_OpenGL.ktx differ
diff --git a/interface/resources/meshes/mannequin/lambert1_Roughness.ktx b/interface/resources/meshes/mannequin/lambert1_Roughness.ktx
old mode 100755
new mode 100644
index fe9b42a54b..afe96d1631
Binary files a/interface/resources/meshes/mannequin/lambert1_Roughness.ktx and b/interface/resources/meshes/mannequin/lambert1_Roughness.ktx differ
diff --git a/interface/resources/meshes/mannequin/mannequin.baked.fbx b/interface/resources/meshes/mannequin/mannequin.baked.fbx
old mode 100755
new mode 100644
index b405b4cfbb..2b0e1cf04b
Binary files a/interface/resources/meshes/mannequin/mannequin.baked.fbx and b/interface/resources/meshes/mannequin/mannequin.baked.fbx differ
diff --git a/interface/resources/meshes/tablet-with-home-button.fbx b/interface/resources/meshes/tablet-with-home-button.fbx
index 13ab8bab0c..70b8008bad 100644
Binary files a/interface/resources/meshes/tablet-with-home-button.fbx and b/interface/resources/meshes/tablet-with-home-button.fbx differ
diff --git a/interface/resources/qml/AddressBarDialog.qml b/interface/resources/qml/AddressBarDialog.qml
index c19e16cd36..60d2bacc62 100644
--- a/interface/resources/qml/AddressBarDialog.qml
+++ b/interface/resources/qml/AddressBarDialog.qml
@@ -87,7 +87,7 @@ Window {
         onReceivedHifiSchemeURL: resetAfterTeleport();
 
         // Update location after using back and forward buttons.
-        onMetaverseServerUrlChanged: updateLocationTextTimer.start();
+        onHostChanged: updateLocationTextTimer.start();
 
         ListModel { id: suggestions }
 
diff --git a/interface/resources/qml/AvatarInputs.qml b/interface/resources/qml/AvatarInputs.qml
index d86d4fd022..be4bf03465 100644
--- a/interface/resources/qml/AvatarInputs.qml
+++ b/interface/resources/qml/AvatarInputs.qml
@@ -17,6 +17,7 @@ import "./hifi/audio" as HifiAudio
 Hifi.AvatarInputs {
     id: root;
     objectName: "AvatarInputs"
+    property int modality: Qt.NonModal
     width: audio.width;
     height: audio.height;
     x: 10; y: 5;
diff --git a/interface/resources/qml/LoginDialog.qml b/interface/resources/qml/LoginDialog.qml
index 2e7ff39ed6..e21e8b7354 100644
--- a/interface/resources/qml/LoginDialog.qml
+++ b/interface/resources/qml/LoginDialog.qml
@@ -27,6 +27,8 @@ ModalWindow {
     destroyOnHidden: true
     visible: true
 
+    readonly property bool isTablet: false
+
     property string iconText: ""
     property int iconSize: 50
 
@@ -35,6 +37,10 @@ ModalWindow {
 
     keyboardOverride: true  // Disable ModalWindow's keyboard.
 
+    function tryDestroy() {
+        root.destroy()
+    }
+
     LoginDialog {
         id: loginDialog
 
diff --git a/interface/resources/qml/LoginDialog/CompleteProfileBody.qml b/interface/resources/qml/LoginDialog/CompleteProfileBody.qml
index e06ce239ab..fe4c511f1d 100644
--- a/interface/resources/qml/LoginDialog/CompleteProfileBody.qml
+++ b/interface/resources/qml/LoginDialog/CompleteProfileBody.qml
@@ -29,11 +29,12 @@ Item {
         readonly property int maxHeight: 720
 
         function resize() {
-            var targetWidth = Math.max(titleWidth, Math.max(additionalTextContainer.contentWidth,
-                                                            termsContainer.contentWidth))
+            if (root.isTablet === false) {
+                var targetWidth = Math.max(titleWidth, Math.max(additionalTextContainer.contentWidth,
+                                                                termsContainer.contentWidth))
+                parent.width = root.width = Math.max(d.minWidth, Math.min(d.maxWidth, targetWidth))
+            }
             var targetHeight = 5 * hifi.dimensions.contentSpacing.y + buttons.height + additionalTextContainer.height + termsContainer.height
-
-            parent.width = root.width = Math.max(d.minWidth, Math.min(d.maxWidth, targetWidth))
             parent.height = root.height = Math.max(d.minHeight, Math.min(d.maxHeight, targetHeight))
         }
     }
@@ -61,11 +62,8 @@ Item {
 
         Button {
             anchors.verticalCenter: parent.verticalCenter
-
             text: qsTr("Cancel")
-
-
-            onClicked: root.destroy()
+            onClicked: root.tryDestroy()
         }
     }
 
@@ -96,17 +94,19 @@ Item {
         id: termsContainer
         anchors {
             top: additionalTextContainer.bottom
-            left: parent.left
             margins: 0
             topMargin: 2 * hifi.dimensions.contentSpacing.y
+            horizontalCenter: parent.horizontalCenter
         }
+        width: parent.width
 
         text: qsTr("By creating this user profile, you agree to <a href='https://highfidelity.com/terms'>High Fidelity's Terms of Service</a>")
         wrapMode: Text.WordWrap
         color: hifi.colors.baseGrayHighlight
         lineHeight: 1
         lineHeightMode: Text.ProportionalHeight
-        horizontalAlignment: Text.AlignHCenter
+        fontSizeMode: Text.HorizontalFit
+        horizontalAlignment: Text.AlignVCenter
 
         onLinkActivated: loginDialog.openUrl(link)
     }
@@ -128,8 +128,10 @@ Item {
             console.log("Create Failed: " + error)
 
             bodyLoader.source = "UsernameCollisionBody.qml"
-            bodyLoader.item.width = root.pane.width
-            bodyLoader.item.height = root.pane.height
+            if (!root.isTablet) {
+                bodyLoader.item.width = root.pane.width
+                bodyLoader.item.height = root.pane.height
+            }
         }
         onHandleLoginCompleted: {
             console.log("Login Succeeded")
diff --git a/interface/resources/qml/LoginDialog/LinkAccountBody.qml b/interface/resources/qml/LoginDialog/LinkAccountBody.qml
index e27635dbbd..300bcd46f0 100644
--- a/interface/resources/qml/LoginDialog/LinkAccountBody.qml
+++ b/interface/resources/qml/LoginDialog/LinkAccountBody.qml
@@ -9,7 +9,7 @@
 //
 
 import Hifi 1.0
-import QtQuick 2.4
+import QtQuick 2.7
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4 as OriginalStyles
 
@@ -45,8 +45,7 @@ Item {
         function resize() {
             var targetWidth = Math.max(titleWidth, form.contentWidth);
             var targetHeight =  hifi.dimensions.contentSpacing.y + mainTextContainer.height +
-                            4 * hifi.dimensions.contentSpacing.y + form.height +
-                                hifi.dimensions.contentSpacing.y + buttons.height;
+                    4 * hifi.dimensions.contentSpacing.y + form.height;
 
             if (additionalInformation.visible) {
                 targetWidth = Math.max(targetWidth, additionalInformation.width);
@@ -66,9 +65,6 @@ Item {
         if (loginDialog.isSteamRunning()) {
             additionalInformation.visible = !isLoading
         }
-
-        leftButton.visible = !isLoading
-        buttons.visible = !isLoading
     }
 
     BusyIndicator {
@@ -108,30 +104,28 @@ Item {
 
     Column {
         id: form
+        width: parent.width
+        onHeightChanged: d.resize(); onWidthChanged: d.resize();
+
         anchors {
             top: mainTextContainer.bottom
-            left: parent.left
-            margins: 0
             topMargin: 2 * hifi.dimensions.contentSpacing.y
         }
         spacing: 2 * hifi.dimensions.contentSpacing.y
 
-        Row {
-            spacing: hifi.dimensions.contentSpacing.x
 
-            TextField {
-                id: usernameField
-                anchors {
-                    verticalCenter: parent.verticalCenter
-                }
-                width: 350
-
-                label: "Username or Email"
-            }
+        TextField {
+            id: usernameField
+            width: parent.width
+            focus: true
+            label: "Username or Email"
+            activeFocusOnPress: true
 
             ShortcutText {
                 anchors {
-                    verticalCenter: parent.verticalCenter
+                    verticalCenter: usernameField.textFieldLabel.verticalCenter
+                    left: usernameField.textFieldLabel.right
+                    leftMargin: 10
                 }
 
                 text: "<a href='https://highfidelity.com/users/password/new'>Forgot Username?</a>"
@@ -142,24 +136,24 @@ Item {
 
                 onLinkActivated: loginDialog.openUrl(link)
             }
-        }
-        Row {
-            spacing: hifi.dimensions.contentSpacing.x
-
-            TextField {
-                id: passwordField
-                anchors {
-                    verticalCenter: parent.verticalCenter
-                }
-                width: 350
-
-                label: "Password"
-                echoMode: TextInput.Password
+            onFocusChanged: {
+                root.text = "";
             }
+        }
+
+        TextField {
+            id: passwordField
+            width: parent.width
+
+            label: "Password"
+            echoMode: showPassword.checked ? TextInput.Normal : TextInput.Password
+            activeFocusOnPress: true
 
             ShortcutText {
                 anchors {
-                    verticalCenter: parent.verticalCenter
+                    verticalCenter: passwordField.textFieldLabel.verticalCenter
+                    left: passwordField.textFieldLabel.right
+                    leftMargin: 10
                 }
 
                 text: "<a href='https://highfidelity.com/users/password/new'>Forgot Password?</a>"
@@ -170,100 +164,95 @@ Item {
 
                 onLinkActivated: loginDialog.openUrl(link)
             }
+            onFocusChanged: {
+                root.text = "";
+                root.isPassword = true;
+            }
         }
 
-    }
-
-    InfoItem {
-        id: additionalInformation
-        anchors {
-            top: form.bottom
-            left: parent.left
-            margins: 0
-            topMargin: hifi.dimensions.contentSpacing.y
+        CheckBoxQQC2 {
+            id: showPassword
+            text: "Show password"
         }
 
-        visible: loginDialog.isSteamRunning()
+        InfoItem {
+            id: additionalInformation
 
-        text: qsTr("Your steam account informations will not be exposed to other users.")
-        wrapMode: Text.WordWrap
-        color: hifi.colors.baseGrayHighlight
-        lineHeight: 1
-        lineHeightMode: Text.ProportionalHeight
-        horizontalAlignment: Text.AlignHCenter
-    }
+            visible: loginDialog.isSteamRunning()
 
-    // Override ScrollingWindow's keyboard that would be at very bottom of dialog.
-    Keyboard {
-        raised: keyboardEnabled && keyboardRaised
-        numeric: punctuationMode
-        anchors {
-            left: parent.left
-            right: parent.right
-            bottom: buttons.top
-            bottomMargin: keyboardRaised ? 2 * hifi.dimensions.contentSpacing.y : 0
-        }
-    }
-
-    Row {
-        id: leftButton
-        anchors {
-            left: parent.left
-            bottom: parent.bottom
-            bottomMargin: hifi.dimensions.contentSpacing.y
+            text: qsTr("Your steam account informations will not be exposed to other users.")
+            wrapMode: Text.WordWrap
+            color: hifi.colors.baseGrayHighlight
+            lineHeight: 1
+            lineHeightMode: Text.ProportionalHeight
+            horizontalAlignment: Text.AlignHCenter
         }
 
-        spacing: hifi.dimensions.contentSpacing.x
-        onHeightChanged: d.resize(); onWidthChanged: d.resize();
+        Row {
+            id: buttons
+            spacing: hifi.dimensions.contentSpacing.y*2
+            onHeightChanged: d.resize(); onWidthChanged: d.resize();
+            anchors.horizontalCenter: parent.horizontalCenter
 
-        Button {
-          anchors.verticalCenter: parent.verticalCenter
+            Button {
+                id: linkAccountButton
+                anchors.verticalCenter: parent.verticalCenter
+                width: 200
 
-          text: qsTr("Sign Up")
-          visible: !loginDialog.isSteamRunning()
+                text: qsTr(loginDialog.isSteamRunning() ? "Link Account" : "Login")
+                color: hifi.buttons.blue
 
-          onClicked: {
-              bodyLoader.setSource("SignUpBody.qml")
-              bodyLoader.item.width = root.pane.width
-              bodyLoader.item.height = root.pane.height
-          }
-        }
-    }
+                onClicked: linkAccountBody.login()
+            }
 
-    Row {
-        id: buttons
-        anchors {
-            right: parent.right
-            bottom: parent.bottom
-            bottomMargin: hifi.dimensions.contentSpacing.y
-        }
-        spacing: hifi.dimensions.contentSpacing.x
-        onHeightChanged: d.resize(); onWidthChanged: d.resize();
-
-        Button {
-            id: linkAccountButton
-            anchors.verticalCenter: parent.verticalCenter
-            width: 200
-
-            text: qsTr(loginDialog.isSteamRunning() ? "Link Account" : "Login")
-            color: hifi.buttons.blue
-
-            onClicked: linkAccountBody.login()
+            Button {
+                anchors.verticalCenter: parent.verticalCenter
+                text: qsTr("Cancel")
+                onClicked: root.tryDestroy()
+            }
         }
 
-        Button {
-            anchors.verticalCenter: parent.verticalCenter
+        Row {
+            id: leftButton
 
-            text: qsTr("Cancel")
+            anchors.horizontalCenter: parent.horizontalCenter
+            spacing: hifi.dimensions.contentSpacing.y*2
+            onHeightChanged: d.resize(); onWidthChanged: d.resize();
 
-            onClicked: root.destroy()
+            RalewaySemiBold {
+                size: hifi.fontSizes.inputLabel
+                anchors.verticalCenter: parent.verticalCenter
+                text: qsTr("Don't have an account?")
+            }
+
+            Button {
+                anchors.verticalCenter: parent.verticalCenter
+
+                text: qsTr("Sign Up")
+                visible: !loginDialog.isSteamRunning()
+
+                onClicked: {
+                    bodyLoader.setSource("SignUpBody.qml")
+                    if (!root.isTablet) {
+                        bodyLoader.item.width = root.pane.width
+                        bodyLoader.item.height = root.pane.height
+                    }
+                }
+            }
         }
     }
 
     Component.onCompleted: {
         root.title = qsTr("Sign Into High Fidelity")
         root.iconText = "<"
-        keyboardEnabled = HMD.active;
+
+        //dont rise local keyboard
+        keyboardEnabled = !root.isTablet && HMD.active;
+        //but rise Tablet's one instead for Tablet interface
+        if (root.isTablet) {
+            root.keyboardEnabled = HMD.active;
+            root.keyboardRaised = Qt.binding( function() { return keyboardRaised; })
+        }
         d.resize();
 
         if (failAfterSignUp) {
@@ -311,11 +300,11 @@ Item {
         }
 
         switch (event.key) {
-            case Qt.Key_Enter:
-            case Qt.Key_Return:
-                event.accepted = true
-                linkAccountBody.login()
-                break
+        case Qt.Key_Enter:
+        case Qt.Key_Return:
+            event.accepted = true
+            linkAccountBody.login()
+            break
         }
     }
 }
diff --git a/interface/resources/qml/LoginDialog/SignInBody.qml b/interface/resources/qml/LoginDialog/SignInBody.qml
index 167ed1640a..c4b6c2aee1 100644
--- a/interface/resources/qml/LoginDialog/SignInBody.qml
+++ b/interface/resources/qml/LoginDialog/SignInBody.qml
@@ -9,7 +9,7 @@
 //
 
 import Hifi 1.0
-import QtQuick 2.4
+import QtQuick 2.7
 import QtQuick.Controls.Styles 1.4 as OriginalStyles
 
 import "../controls-uit"
@@ -18,8 +18,8 @@ import "../styles-uit"
 Item {
     id: signInBody
     clip: true
-    width: root.pane.width
     height: root.pane.height
+    width: root.pane.width
 
     property bool required: false
 
@@ -29,7 +29,7 @@ Item {
     }
 
     function cancel() {
-        root.destroy()
+        root.tryDestroy()
     }
 
     QtObject {
@@ -121,8 +121,10 @@ Item {
             console.log("Login Failed")
 
             bodyLoader.source = "CompleteProfileBody.qml"
-            bodyLoader.item.width = root.pane.width
-            bodyLoader.item.height = root.pane.height
+            if (!root.isTablet) {
+                bodyLoader.item.width = root.pane.width
+                bodyLoader.item.height = root.pane.height
+            }
         }
     }
 }
diff --git a/interface/resources/qml/LoginDialog/SignUpBody.qml b/interface/resources/qml/LoginDialog/SignUpBody.qml
index c0ff2d77cb..9d55998b40 100644
--- a/interface/resources/qml/LoginDialog/SignUpBody.qml
+++ b/interface/resources/qml/LoginDialog/SignUpBody.qml
@@ -9,7 +9,7 @@
 //
 
 import Hifi 1.0
-import QtQuick 2.4
+import QtQuick 2.7
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4 as OriginalStyles
 
@@ -44,8 +44,7 @@ Item {
         function resize() {
             var targetWidth = Math.max(titleWidth, form.contentWidth);
             var targetHeight =  hifi.dimensions.contentSpacing.y + mainTextContainer.height +
-                                4 * hifi.dimensions.contentSpacing.y + form.height +
-                                hifi.dimensions.contentSpacing.y + buttons.height;
+                                4 * hifi.dimensions.contentSpacing.y + form.height;
 
             parent.width = root.width = Math.max(d.minWidth, Math.min(d.maxWidth, targetWidth));
             parent.height = root.height = Math.max(d.minHeight, Math.min(d.maxHeight, targetHeight))
@@ -96,44 +95,36 @@ Item {
 
     Column {
         id: form
+        width: parent.width
+        onHeightChanged: d.resize(); onWidthChanged: d.resize();
+
         anchors {
             top: mainTextContainer.bottom
-            left: parent.left
-            margins: 0
             topMargin: 2 * hifi.dimensions.contentSpacing.y
         }
         spacing: 2 * hifi.dimensions.contentSpacing.y
 
-        Row {
-            spacing: hifi.dimensions.contentSpacing.x
-
-            TextField {
-                id: emailField
-                anchors {
-                    verticalCenter: parent.verticalCenter
-                }
-                width: 350
-
-                label: "Email"
+        TextField {
+            id: emailField
+            width: parent.width
+            label: "Email"
+            activeFocusOnPress: true
+            onFocusChanged: {
+                root.text = "";
             }
         }
 
-        Row {
-            spacing: hifi.dimensions.contentSpacing.x
-
-            TextField {
-                id: usernameField
-                anchors {
-                    verticalCenter: parent.verticalCenter
-                }
-                width: 350
-
-                label: "Username"
-            }
+        TextField {
+            id: usernameField
+            width: parent.width
+            label: "Username"
+            activeFocusOnPress: true
 
             ShortcutText {
                 anchors {
-                    verticalCenter: parent.verticalCenter
+                    verticalCenter: parent.textFieldLabel.verticalCenter
+                    left: parent.textFieldLabel.right
+                    leftMargin: 10
                 }
 
                 text: qsTr("No spaces / special chars.")
@@ -142,26 +133,24 @@ Item {
                 horizontalAlignment: Text.AlignHCenter
 
                 color: hifi.colors.blueAccent
+                onFocusChanged: {
+                    root.text = "";
+                }
             }
         }
 
-        Row {
-            spacing: hifi.dimensions.contentSpacing.x
-
-            TextField {
-                id: passwordField
-                anchors {
-                    verticalCenter: parent.verticalCenter
-                }
-                width: 350
-
-                label: "Password"
-                echoMode: TextInput.Password
-            }
+        TextField {
+            id: passwordField
+            width: parent.width
+            label: "Password"
+            echoMode: TextInput.Password
+            activeFocusOnPress: true
 
             ShortcutText {
                 anchors {
-                    verticalCenter: parent.verticalCenter
+                    verticalCenter: parent.textFieldLabel.verticalCenter
+                    left: parent.textFieldLabel.right
+                    leftMargin: 10
                 }
 
                 text: qsTr("At least 6 characters")
@@ -171,80 +160,72 @@ Item {
 
                 color: hifi.colors.blueAccent
             }
-        }
 
-    }
-
-    // Override ScrollingWindow's keyboard that would be at very bottom of dialog.
-    Keyboard {
-        raised: keyboardEnabled && keyboardRaised
-        numeric: punctuationMode
-        anchors {
-            left: parent.left
-            right: parent.right
-            bottom: buttons.top
-            bottomMargin: keyboardRaised ? 2 * hifi.dimensions.contentSpacing.y : 0
-        }
-    }
-
-    Row {
-        id: leftButton
-        anchors {
-            left: parent.left
-            bottom: parent.bottom
-            bottomMargin: hifi.dimensions.contentSpacing.y
-        }
-
-        spacing: hifi.dimensions.contentSpacing.x
-        onHeightChanged: d.resize(); onWidthChanged: d.resize();
-
-        Button {
-            anchors.verticalCenter: parent.verticalCenter
-
-            text: qsTr("Existing User")
-
-            onClicked: {
-                bodyLoader.setSource("LinkAccountBody.qml")
-                bodyLoader.item.width = root.pane.width
-                bodyLoader.item.height = root.pane.height
+            onFocusChanged: {
+                root.text = "";
+                root.isPassword = focus
             }
         }
-    }
 
-    Row {
-        id: buttons
-        anchors {
-            right: parent.right
-            bottom: parent.bottom
-            bottomMargin: hifi.dimensions.contentSpacing.y
-        }
-        spacing: hifi.dimensions.contentSpacing.x
-        onHeightChanged: d.resize(); onWidthChanged: d.resize();
+        Row {
+            id: leftButton
+            anchors.horizontalCenter: parent.horizontalCenter
 
-        Button {
-            id: linkAccountButton
-            anchors.verticalCenter: parent.verticalCenter
-            width: 200
+            spacing: hifi.dimensions.contentSpacing.x
+            onHeightChanged: d.resize(); onWidthChanged: d.resize();
 
-            text: qsTr("Sign Up")
-            color: hifi.buttons.blue
+            Button {
+                anchors.verticalCenter: parent.verticalCenter
 
-            onClicked: signupBody.signup()
+                text: qsTr("Existing User")
+
+                onClicked: {
+                    bodyLoader.setSource("LinkAccountBody.qml")
+                    if (!root.isTablet) {
+                        bodyLoader.item.width = root.pane.width
+                        bodyLoader.item.height = root.pane.height
+                    }
+                }
+            }
         }
 
-        Button {
-            anchors.verticalCenter: parent.verticalCenter
+        Row {
+            id: buttons
+            anchors.horizontalCenter: parent.horizontalCenter
+            spacing: hifi.dimensions.contentSpacing.x
+            onHeightChanged: d.resize(); onWidthChanged: d.resize();
 
-            text: qsTr("Cancel")
+            Button {
+                id: linkAccountButton
+                anchors.verticalCenter: parent.verticalCenter
+                width: 200
 
-            onClicked: root.destroy()
+                text: qsTr("Sign Up")
+                color: hifi.buttons.blue
+
+                onClicked: signupBody.signup()
+            }
+
+            Button {
+                anchors.verticalCenter: parent.verticalCenter
+
+                text: qsTr("Cancel")
+
+                onClicked: root.tryDestroy()
+            }
         }
     }
 
     Component.onCompleted: {
         root.title = qsTr("Create an Account")
         root.iconText = "<"
-        keyboardEnabled = HMD.active;
+        //dont rise local keyboard
+        keyboardEnabled = !root.isTablet && HMD.active;
+        //but rise Tablet's one instead for Tablet interface
+        if (root.isTablet) {
+            root.keyboardEnabled = HMD.active;
+            root.keyboardRaised = Qt.binding( function() { return keyboardRaised; })
+        }
         d.resize();
 
         emailField.forceActiveFocus();
@@ -275,8 +256,10 @@ Item {
         onHandleLoginFailed: {
             // we failed to login, show the LoginDialog so the user will try again
             bodyLoader.setSource("LinkAccountBody.qml", { "failAfterSignUp": true })
-            bodyLoader.item.width = root.pane.width
-            bodyLoader.item.height = root.pane.height
+            if (!root.isTablet) {
+                bodyLoader.item.width = root.pane.width
+                bodyLoader.item.height = root.pane.height
+            }
         }
     }
 
diff --git a/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml b/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml
index 18c831b3a9..5c212578b8 100644
--- a/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml
+++ b/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml
@@ -79,7 +79,7 @@ Item {
             margins: 0
             topMargin: hifi.dimensions.contentSpacing.y
         }
-        width: 250
+        width: parent.width
 
         placeholderText: "Choose your own"
     }
@@ -102,7 +102,7 @@ Item {
             bottom: parent.bottom
             right: parent.right
             margins: 0
-            topMargin: hifi.dimensions.contentSpacing.y
+            bottomMargin: hifi.dimensions.contentSpacing.y
         }
         spacing: hifi.dimensions.contentSpacing.x
         onHeightChanged: d.resize(); onWidthChanged: d.resize();
@@ -122,14 +122,21 @@ Item {
 
             text: qsTr("Cancel")
 
-            onClicked: root.destroy()
+            onClicked: root.tryDestroy()
         }
     }
 
     Component.onCompleted: {
         root.title = qsTr("Complete Your Profile")
         root.iconText = "<"
-        keyboardEnabled = HMD.active;
+        //dont rise local keyboard
+        keyboardEnabled = !root.isTablet && HMD.active;
+        //but rise Tablet's one instead for Tablet interface
+        if (root.isTablet) {
+            root.keyboardEnabled = HMD.active;
+            root.keyboardRaised = Qt.binding( function() { return keyboardRaised; })
+        }
+
         d.resize();
     }
 
diff --git a/interface/resources/qml/LoginDialog/WelcomeBody.qml b/interface/resources/qml/LoginDialog/WelcomeBody.qml
index eb91956532..551ec263b7 100644
--- a/interface/resources/qml/LoginDialog/WelcomeBody.qml
+++ b/interface/resources/qml/LoginDialog/WelcomeBody.qml
@@ -77,7 +77,7 @@ Item {
 
             text: qsTr("Close");
 
-            onClicked: root.destroy()
+            onClicked: root.tryDestroy()
         }
     }
 
diff --git a/interface/resources/qml/Stats.qml b/interface/resources/qml/Stats.qml
index 119f24c71f..4626d9bcda 100644
--- a/interface/resources/qml/Stats.qml
+++ b/interface/resources/qml/Stats.qml
@@ -8,6 +8,9 @@ Item {
 
     anchors.leftMargin: 300
     objectName: "StatsItem"
+    property int modality: Qt.NonModal
+    implicitHeight: row.height
+    implicitWidth: row.width
 
     Component.onCompleted: {
         stats.parentChanged.connect(fill);
@@ -18,8 +21,9 @@ Item {
     }
 
     function fill() {
-        // Explicitly fill in order to avoid warnings at shutdown
-        anchors.fill = parent;
+        // This will cause a  warning at shutdown, need to find another way to remove
+        // the warning other than filling the anchors to the parent
+        anchors.horizontalCenter = parent.horizontalCenter
     }
 
     Hifi.Stats {
@@ -55,7 +59,11 @@ Item {
                         text: "Avatars: " + root.avatarCount
                     }
                     StatText {
-                        text: "Frame Rate: " + root.framerate.toFixed(2);
+                        text: "Game Rate: " + root.gameLoopRate
+                    }
+                    StatText {
+                        visible: root.expanded
+                        text: root.gameUpdateStats
                     }
                     StatText {
                         text: "Render Rate: " + root.renderrate.toFixed(2);
@@ -64,21 +72,17 @@ Item {
                         text: "Present Rate: " + root.presentrate.toFixed(2);
                     }
                     StatText {
-                        text: "Present New Rate: " + root.presentnewrate.toFixed(2);
+                        visible: root.expanded
+                        text: "    Present New Rate: " + root.presentnewrate.toFixed(2);
                     }
                     StatText {
-                        text: "Present Drop Rate: " + root.presentdroprate.toFixed(2);
+                        visible: root.expanded
+                        text: "    Present Drop Rate: " + root.presentdroprate.toFixed(2);
                     }
                     StatText {
                         text: "Stutter Rate: " + root.stutterrate.toFixed(3);
                         visible: root.stutterrate != -1;
                     }
-                    StatText {
-                        text: "Simrate: " + root.simrate
-                    }
-                    StatText {
-                        text: "Avatar Simrate: " + root.avatarSimrate
-                    }
                     StatText {
                         text: "Missed Frame Count: " + root.appdropped;
                         visible: root.appdropped > 0;
@@ -206,6 +210,10 @@ Item {
                         text: "Audio Codec: " + root.audioCodec + " Noise Gate: " +
                             root.audioNoiseGate;
                     }
+                    StatText {
+                        visible: root.expanded;
+                        text: "Entity Servers In: " + root.entityPacketsInKbps + " kbps";
+                    }
                     StatText {
                         visible: root.expanded;
                         text: "Downloads: " + root.downloads + "/" + root.downloadLimit +
@@ -257,9 +265,6 @@ Item {
                     StatText {
                         text: "GPU: " + root.gpuFrameTime.toFixed(1) + " ms"
                     }
-                    StatText {
-                        text: "Avatar: " + root.avatarSimulationTime.toFixed(1) + " ms"
-                    }
                     StatText {
                         text: "Triangles: " + root.triangles +
                             " / Material Switches: " + root.materialSwitches
diff --git a/interface/resources/qml/TabletBrowser.qml b/interface/resources/qml/TabletBrowser.qml
index c3d879c513..8dbcc8f4f8 100644
--- a/interface/resources/qml/TabletBrowser.qml
+++ b/interface/resources/qml/TabletBrowser.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.5
 import QtQuick.Controls 1.4
 import QtWebChannel 1.0
-import QtWebEngine 1.2
+import QtWebEngine 1.5
 
 import "controls"
 import "controls-uit" as HifiControls
@@ -13,11 +13,11 @@ Item {
     id: root
     HifiConstants { id: hifi }
     HifiStyles.HifiConstants { id: hifistyles }
-    //width: parent.width
+
     height: 600
     property variant permissionsBar: {'securityOrigin':'none','feature':'none'}
     property alias url: webview.url
-    property WebEngineView webView: webview
+
     property bool canGoBack: webview.canGoBack
     property bool canGoForward: webview.canGoForward
 
@@ -39,7 +39,7 @@ Item {
         width: parent.width
         height: keyboardEnabled && keyboardRaised ? parent.height - keyboard.height : parent.height
 
-        profile: HFTabletWebEngineProfile;
+        profile: HFWebEngineProfile;
 
         property string userScriptUrl: ""
 
@@ -123,5 +123,4 @@ Item {
             break;
         }
     }
-    
 }
diff --git a/interface/resources/qml/TabletLoginDialog/CompleteProfileBody.qml b/interface/resources/qml/TabletLoginDialog/CompleteProfileBody.qml
deleted file mode 100644
index 6024563bcf..0000000000
--- a/interface/resources/qml/TabletLoginDialog/CompleteProfileBody.qml
+++ /dev/null
@@ -1,124 +0,0 @@
-//
-//  CompleteProfileBody.qml
-//
-//  Created by Clement on 7/18/16
-//  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
-//
-
-import Hifi 1.0
-import QtQuick 2.4
-import QtQuick.Controls.Styles 1.4 as OriginalStyles
-
-import "../controls-uit"
-import "../styles-uit"
-
-Item {
-    id: completeProfileBody
-    clip: true
-
-    QtObject {
-        id: d
-        function resize() {}
-    }
-
-    Row {
-        id: buttons
-        anchors {
-            top: parent.top
-            horizontalCenter: parent.horizontalCenter
-            margins: 0
-            topMargin: 2 * hifi.dimensions.contentSpacing.y
-        }
-        spacing: hifi.dimensions.contentSpacing.x
-        onHeightChanged: d.resize(); onWidthChanged: d.resize();
-
-        Button {
-            anchors.verticalCenter: parent.verticalCenter
-            width: 200
-
-            text: qsTr("Create your profile")
-            color: hifi.buttons.blue
-
-            onClicked: loginDialog.createAccountFromStream()
-        }
-
-        Button {
-            anchors.verticalCenter: parent.verticalCenter
-
-            text: qsTr("Cancel")
-
-            onClicked: bodyLoader.popup()
-        }
-    }
-
-    ShortcutText {
-        id: additionalTextContainer
-        anchors {
-            top: buttons.bottom
-            horizontalCenter: parent.horizontalCenter
-            margins: 0
-            topMargin: hifi.dimensions.contentSpacing.y
-        }
-
-        text: "<a href='https://fake.link'>Already have a High Fidelity profile? Link to an existing profile here.</a>"
-
-        wrapMode: Text.WordWrap
-        lineHeight: 2
-        lineHeightMode: Text.ProportionalHeight
-        horizontalAlignment: Text.AlignHCenter
-
-        onLinkActivated: {
-            bodyLoader.setSource("LinkAccountBody.qml")
-        }
-    }
-
-    InfoItem {
-        id: termsContainer
-        anchors {
-            top: additionalTextContainer.bottom
-            left: parent.left
-            margins: 0
-            topMargin: 2 * hifi.dimensions.contentSpacing.y
-        }
-
-        text: qsTr("By creating this user profile, you agree to <a href='https://highfidelity.com/terms'>High Fidelity's Terms of Service</a>")
-        wrapMode: Text.WordWrap
-        color: hifi.colors.baseGrayHighlight
-        lineHeight: 1
-        lineHeightMode: Text.ProportionalHeight
-        horizontalAlignment: Text.AlignHCenter
-
-        onLinkActivated: loginDialog.openUrl(link)
-    }
-
-    Component.onCompleted: {
-        loginDialogRoot.title = qsTr("Complete Your Profile")
-        loginDialogRoot.iconText = "<"
-        d.resize();
-    }
-
-    Connections {
-        target: loginDialog
-        onHandleCreateCompleted: {
-            console.log("Create Succeeded")
-
-            loginDialog.loginThroughSteam()
-        }
-        onHandleCreateFailed: {
-            console.log("Create Failed: " + error)
-
-            bodyLoadersetSource("UsernameCollisionBody.qml")
-        }
-        onHandleLoginCompleted: {
-            console.log("Login Succeeded")
-
-            bodyLoader.setSource("WelcomeBody.qml", { "welcomeBack" : false })
-        }
-        onHandleLoginFailed: {
-            console.log("Login Failed")
-        }
-    }
-}
diff --git a/interface/resources/qml/TabletLoginDialog/LinkAccountBody.qml b/interface/resources/qml/TabletLoginDialog/LinkAccountBody.qml
deleted file mode 100644
index 8010a34250..0000000000
--- a/interface/resources/qml/TabletLoginDialog/LinkAccountBody.qml
+++ /dev/null
@@ -1,296 +0,0 @@
-//
-//  LinkAccountBody.qml
-//
-//  Created by Clement on 7/18/16
-//  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
-//
-
-import Hifi 1.0
-import QtQuick 2.4
-import QtQuick.Controls 1.4
-import QtQuick.Controls.Styles 1.4 as OriginalStyles
-
-import "../controls-uit"
-import "../styles-uit"
-
-Item {
-    id: linkAccountBody
-    clip: true
-    height: parent.height
-    width: parent.width
-    property bool failAfterSignUp: false
-
-    function login() {
-        mainTextContainer.visible = false
-        toggleLoading(true)
-        loginDialog.login(usernameField.text, passwordField.text)
-    }
-
-    property bool keyboardEnabled: false
-    property bool keyboardRaised: false
-    property bool punctuationMode: false
-
-    onKeyboardRaisedChanged: d.resize();
-
-    QtObject {
-        id: d
-        function resize() {}
-    }
-
-    function toggleLoading(isLoading) {
-        linkAccountSpinner.visible = isLoading
-        form.visible = !isLoading
-
-        if (loginDialog.isSteamRunning()) {
-            additionalInformation.visible = !isLoading
-        }
-
-        leftButton.visible = !isLoading
-        buttons.visible = !isLoading
-    }
-
-    BusyIndicator {
-        id: linkAccountSpinner
-
-        anchors {
-            top: parent.top
-            horizontalCenter: parent.horizontalCenter
-            topMargin: hifi.dimensions.contentSpacing.y
-        }
-
-        visible: false
-        running: true
-
-        width: 48
-        height: 48
-    }
-
-    ShortcutText {
-        id: mainTextContainer
-        anchors {
-            top: parent.top
-            left: parent.left
-            margins: 0
-            topMargin: hifi.dimensions.contentSpacing.y
-        }
-
-        visible: false
-
-        text: qsTr("Username or password incorrect.")
-        wrapMode: Text.WordWrap
-        color: hifi.colors.redAccent
-        lineHeight: 1
-        lineHeightMode: Text.ProportionalHeight
-        horizontalAlignment: Text.AlignHCenter
-    }
-
-    Column {
-        id: form
-        anchors {
-            top: mainTextContainer.bottom
-            left: parent.left
-            margins: 0
-            topMargin: 2 * hifi.dimensions.contentSpacing.y
-        }
-        spacing: 2 * hifi.dimensions.contentSpacing.y
-
-        Row {
-            spacing: hifi.dimensions.contentSpacing.x
-
-            TextField {
-                id: usernameField
-                anchors {
-                    verticalCenter: parent.verticalCenter
-                }
-                width: 350
-
-                label: "Username or Email"
-            }
-
-            ShortcutText {
-                anchors {
-                    verticalCenter: parent.verticalCenter
-                }
-
-                text: "<a href='https://highfidelity.com/users/password/new'>Forgot Username?</a>"
-
-                verticalAlignment: Text.AlignVCenter
-                horizontalAlignment: Text.AlignHCenter
-                linkColor: hifi.colors.blueAccent
-
-                onLinkActivated: loginDialog.openUrl(link)
-            }
-        }
-        Row {
-            spacing: hifi.dimensions.contentSpacing.x
-
-            TextField {
-                id: passwordField
-                anchors {
-                    verticalCenter: parent.verticalCenter
-                }
-                width: 350
-
-                label: "Password"
-                echoMode: TextInput.Password
-            }
-
-            ShortcutText {
-                anchors {
-                    verticalCenter: parent.verticalCenter
-                }
-
-                text: "<a href='https://highfidelity.com/users/password/new'>Forgot Password?</a>"
-
-                verticalAlignment: Text.AlignVCenter
-                horizontalAlignment: Text.AlignHCenter
-                linkColor: hifi.colors.blueAccent
-
-                onLinkActivated: loginDialog.openUrl(link)
-            }
-        }
-
-    }
-
-    InfoItem {
-        id: additionalInformation
-        anchors {
-            top: form.bottom
-            left: parent.left
-            margins: 0
-            topMargin: hifi.dimensions.contentSpacing.y
-        }
-
-        visible: loginDialog.isSteamRunning()
-
-        text: qsTr("Your steam account informations will not be exposed to other users.")
-        wrapMode: Text.WordWrap
-        color: hifi.colors.baseGrayHighlight
-        lineHeight: 1
-        lineHeightMode: Text.ProportionalHeight
-        horizontalAlignment: Text.AlignHCenter
-    }
-
-    // Override ScrollingWindow's keyboard that would be at very bottom of dialog.
-    Keyboard {
-        raised: keyboardEnabled && keyboardRaised
-        numeric: punctuationMode
-        anchors {
-            left: parent.left
-            right: parent.right
-            bottom: buttons.top
-            bottomMargin: keyboardRaised ? 2 * hifi.dimensions.contentSpacing.y : 0
-        }
-    }
-
-    Row {
-        id: leftButton
-        anchors {
-            left: parent.left
-            bottom: parent.bottom
-            bottomMargin: hifi.dimensions.contentSpacing.y
-        }
-
-        spacing: hifi.dimensions.contentSpacing.x
-        onHeightChanged: d.resize(); onWidthChanged: d.resize();
-
-        Button {
-          anchors.verticalCenter: parent.verticalCenter
-
-          text: qsTr("Sign Up")
-          visible: !loginDialog.isSteamRunning()
-
-          onClicked: {
-              bodyLoader.setSource("SignUpBody.qml")
-          }
-        }
-    }
-
-    Row {
-        id: buttons
-        anchors {
-            right: parent.right
-            bottom: parent.bottom
-            bottomMargin: hifi.dimensions.contentSpacing.y
-        }
-        spacing: hifi.dimensions.contentSpacing.x
-        onHeightChanged: d.resize(); onWidthChanged: d.resize();
-
-        Button {
-            id: linkAccountButton
-            anchors.verticalCenter: parent.verticalCenter
-            width: 200
-
-            text: qsTr(loginDialog.isSteamRunning() ? "Link Account" : "Login")
-            color: hifi.buttons.blue
-
-            onClicked: linkAccountBody.login()
-        }
-
-        Button {
-            anchors.verticalCenter: parent.verticalCenter
-            text: qsTr("Cancel")
-            onClicked: {
-                bodyLoader.popup()
-            }
-        }
-    }
-
-    Component.onCompleted: {
-        loginDialogRoot.title = qsTr("Sign Into High Fidelity")
-        loginDialogRoot.iconText = "<"
-        keyboardEnabled = HMD.active;
-        d.resize();
-
-        if (failAfterSignUp) {
-            mainTextContainer.text = "Account created successfully."
-            mainTextContainer.visible = true
-        }
-
-        usernameField.forceActiveFocus();
-    }
-
-    Connections {
-        target: loginDialog
-        onHandleLoginCompleted: {
-            console.log("Login Succeeded, linking steam account")
-
-            if (loginDialog.isSteamRunning()) {
-                loginDialog.linkSteam()
-            } else {
-                bodyLoader.setSource("WelcomeBody.qml", { "welcomeBack" : true })
-            }
-        }
-        onHandleLoginFailed: {
-            console.log("Login Failed")
-            mainTextContainer.visible = true
-            toggleLoading(false)
-        }
-        onHandleLinkCompleted: {
-            console.log("Link Succeeded")
-
-            bodyLoader.setSource("WelcomeBody.qml", { "welcomeBack" : true })
-        }
-        onHandleLinkFailed: {
-            console.log("Link Failed")
-            toggleLoading(false)
-        }
-    }
-
-    Keys.onPressed: {
-        if (!visible) {
-            return
-        }
-
-        switch (event.key) {
-            case Qt.Key_Enter:
-            case Qt.Key_Return:
-                event.accepted = true
-                linkAccountBody.login()
-                break
-        }
-    }
-}
diff --git a/interface/resources/qml/TabletLoginDialog/SignInBody.qml b/interface/resources/qml/TabletLoginDialog/SignInBody.qml
deleted file mode 100644
index 9cdf69c7bc..0000000000
--- a/interface/resources/qml/TabletLoginDialog/SignInBody.qml
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-//  SignInBody.qml
-//
-//  Created by Clement on 7/18/16
-//  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
-//
-
-import Hifi 1.0
-import QtQuick 2.4
-import QtQuick.Controls.Styles 1.4 as OriginalStyles
-
-import "../controls-uit"
-import "../styles-uit"
-
-Item {
-    id: signInBody
-    clip: true
-
-    property bool required: false
-
-    function login() {
-        console.log("Trying to log in")
-        loginDialog.loginThroughSteam()
-    }
-
-    function cancel() {
-        bodyLoader.popup()
-    }
-
-    QtObject {
-        id: d
-        function resize() {}
-    }
-
-    InfoItem {
-        id: mainTextContainer
-        anchors {
-            top: parent.top
-            horizontalCenter: parent.horizontalCenter
-            margins: 0
-            topMargin: hifi.dimensions.contentSpacing.y
-        }
-
-        text: required ? qsTr("This domain's owner requires that you sign in:")
-                       : qsTr("Sign in to access your user account:")
-        wrapMode: Text.WordWrap
-        color: hifi.colors.baseGrayHighlight
-        lineHeight: 2
-        lineHeightMode: Text.ProportionalHeight
-        horizontalAlignment: Text.AlignHCenter
-    }
-
-    Row {
-        id: buttons
-        anchors {
-            top: mainTextContainer.bottom
-            horizontalCenter: parent.horizontalCenter
-            margins: 0
-            topMargin: 2 * hifi.dimensions.contentSpacing.y
-        }
-        spacing: hifi.dimensions.contentSpacing.x
-        onHeightChanged: d.resize(); onWidthChanged: d.resize();
-
-        Button {
-            anchors.verticalCenter: parent.verticalCenter
-
-            width: undefined // invalidate so that the image's size sets the width
-            height: undefined // invalidate so that the image's size sets the height
-            focus: true
-
-            style: OriginalStyles.ButtonStyle {
-                background: Image {
-                    id: buttonImage
-                    source: "../../images/steam-sign-in.png"
-                }
-            }
-            onClicked: signInBody.login()
-        }
-        Button {
-            anchors.verticalCenter: parent.verticalCenter
-
-            text: qsTr("Cancel");
-
-            onClicked: signInBody.cancel()
-        }
-    }
-
-    Component.onCompleted: {
-        loginDialogRoot.title = required ? qsTr("Sign In Required")
-                              : qsTr("Sign In")
-        loginDialogRoot.iconText = ""
-        d.resize();
-    }
-
-    Connections {
-        target: loginDialog
-        onHandleLoginCompleted: {
-            console.log("Login Succeeded")
-            bodyLoader.setSource("WelcomeBody.qml", { "welcomeBack" : true })
-        }
-        onHandleLoginFailed: {
-            console.log("Login Failed")
-            bodyLoader.setSource("CompleteProfileBody.qml")
-        }
-    }
-}
diff --git a/interface/resources/qml/TabletLoginDialog/SignUpBody.qml b/interface/resources/qml/TabletLoginDialog/SignUpBody.qml
deleted file mode 100644
index 2cfc0e736a..0000000000
--- a/interface/resources/qml/TabletLoginDialog/SignUpBody.qml
+++ /dev/null
@@ -1,276 +0,0 @@
-//
-//  SignUpBody.qml
-//
-//  Created by Stephen Birarda on 7 Dec 2016
-//  Copyright 2016 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 Hifi 1.0
-import QtQuick 2.4
-import QtQuick.Controls 1.4
-import QtQuick.Controls.Styles 1.4 as OriginalStyles
-
-import "../controls-uit"
-import "../styles-uit"
-
-Item {
-    id: signupBody
-    clip: true
-//    height: parent.height
-//    width: parent.width
-
-    function signup() {
-        mainTextContainer.visible = false
-        toggleLoading(true)
-        loginDialog.signup(emailField.text, usernameField.text, passwordField.text)
-    }
-
-    property bool keyboardEnabled: false
-    property bool keyboardRaised: false
-    property bool punctuationMode: false
-
-    onKeyboardRaisedChanged: d.resize();
-
-    QtObject {
-        id: d
-        function resize() {}
-    }
-
-    function toggleLoading(isLoading) {
-        linkAccountSpinner.visible = isLoading
-        form.visible = !isLoading
-
-        leftButton.visible = !isLoading
-        buttons.visible = !isLoading
-    }
-
-    BusyIndicator {
-        id: linkAccountSpinner
-
-        anchors {
-            top: parent.top
-            horizontalCenter: parent.horizontalCenter
-            topMargin: hifi.dimensions.contentSpacing.y
-        }
-
-        visible: false
-        running: true
-
-        width: 48
-        height: 48
-    }
-
-    ShortcutText {
-        id: mainTextContainer
-        anchors {
-            top: parent.top
-            left: parent.left
-            margins: 0
-            topMargin: hifi.dimensions.contentSpacing.y
-        }
-
-        visible: false
-
-        text: qsTr("There was an unknown error while creating your account.")
-        wrapMode: Text.WordWrap
-        color: hifi.colors.redAccent
-        horizontalAlignment: Text.AlignLeft
-    }
-
-    Column {
-        id: form
-        anchors {
-            top: mainTextContainer.bottom
-            left: parent.left
-            margins: 0
-            topMargin: 2 * hifi.dimensions.contentSpacing.y
-        }
-        spacing: 2 * hifi.dimensions.contentSpacing.y
-
-        Row {
-            spacing: hifi.dimensions.contentSpacing.x
-
-            TextField {
-                id: emailField
-                anchors {
-                    verticalCenter: parent.verticalCenter
-                }
-                width: 300
-
-                label: "Email"
-            }
-        }
-
-        Row {
-            spacing: hifi.dimensions.contentSpacing.x
-
-            TextField {
-                id: usernameField
-                anchors {
-                    verticalCenter: parent.verticalCenter
-                }
-                width: 300
-
-                label: "Username"
-            }
-
-            ShortcutText {
-                anchors {
-                    verticalCenter: parent.verticalCenter
-                }
-
-                text: qsTr("No spaces / special chars.")
-
-                verticalAlignment: Text.AlignVCenter
-                horizontalAlignment: Text.AlignHCenter
-
-                color: hifi.colors.blueAccent
-            }
-        }
-
-        Row {
-            spacing: hifi.dimensions.contentSpacing.x
-
-            TextField {
-                id: passwordField
-                anchors {
-                    verticalCenter: parent.verticalCenter
-                }
-                width: 300
-
-                label: "Password"
-                echoMode: TextInput.Password
-            }
-
-            ShortcutText {
-                anchors {
-                    verticalCenter: parent.verticalCenter
-                }
-
-                text: qsTr("At least 6 characters")
-
-                verticalAlignment: Text.AlignVCenter
-                horizontalAlignment: Text.AlignHCenter
-
-                color: hifi.colors.blueAccent
-            }
-        }
-
-    }
-
-    // Override ScrollingWindow's keyboard that would be at very bottom of dialog.
-    Keyboard {
-        raised: keyboardEnabled && keyboardRaised
-        numeric: punctuationMode
-        anchors {
-            left: parent.left
-            right: parent.right
-            bottom: buttons.top
-            bottomMargin: keyboardRaised ? 2 * hifi.dimensions.contentSpacing.y : 0
-        }
-    }
-
-    Row {
-        id: leftButton
-        anchors {
-            left: parent.left
-            bottom: parent.bottom
-            bottomMargin: hifi.dimensions.contentSpacing.y
-        }
-
-        spacing: hifi.dimensions.contentSpacing.x
-        onHeightChanged: d.resize(); onWidthChanged: d.resize();
-
-        Button {
-            anchors.verticalCenter: parent.verticalCenter
-
-            text: qsTr("Existing User")
-
-            onClicked: {
-                bodyLoader.setSource("LinkAccountBody.qml")
-            }
-        }
-    }
-
-    Row {
-        id: buttons
-        anchors {
-            right: parent.right
-            bottom: parent.bottom
-            bottomMargin: hifi.dimensions.contentSpacing.y
-        }
-        spacing: hifi.dimensions.contentSpacing.x
-        onHeightChanged: d.resize(); onWidthChanged: d.resize();
-
-        Button {
-            id: linkAccountButton
-            anchors.verticalCenter: parent.verticalCenter
-            width: 200
-
-            text: qsTr("Sign Up")
-            color: hifi.buttons.blue
-
-            onClicked: signupBody.signup()
-        }
-
-        Button {
-            anchors.verticalCenter: parent.verticalCenter
-
-            text: qsTr("Cancel")
-
-            onClicked: bodyLoader.popup()
-        }
-    }
-
-    Component.onCompleted: {
-        loginDialogRoot.title = qsTr("Create an Account")
-        loginDialogRoot.iconText = "<"
-        keyboardEnabled = HMD.active;
-        d.resize();
-
-        emailField.forceActiveFocus();
-    }
-
-    Connections {
-        target: loginDialog
-        onHandleSignupCompleted: {
-            console.log("Sign Up Succeeded");
-
-            // now that we have an account, login with that username and password
-            loginDialog.login(usernameField.text, passwordField.text)
-        }
-        onHandleSignupFailed: {
-            console.log("Sign Up Failed")
-            toggleLoading(false)
-
-            mainTextContainer.text = errorString
-            mainTextContainer.visible = true
-
-            d.resize();
-        }
-        onHandleLoginCompleted: {
-            bodyLoader.setSource("WelcomeBody.qml", { "welcomeBack": false })
-        }
-        onHandleLoginFailed: {
-            // we failed to login, show the LoginDialog so the user will try again
-            bodyLoader.setSource("LinkAccountBody.qml", { "failAfterSignUp": true })
-        }
-    }
-
-    Keys.onPressed: {
-        if (!visible) {
-            return
-        }
-
-        switch (event.key) {
-        case Qt.Key_Enter:
-        case Qt.Key_Return:
-            event.accepted = true
-            signupBody.signup()
-            break
-        }
-    }
-}
diff --git a/interface/resources/qml/TabletLoginDialog/UsernameCollisionBody.qml b/interface/resources/qml/TabletLoginDialog/UsernameCollisionBody.qml
deleted file mode 100644
index 9e5b01d339..0000000000
--- a/interface/resources/qml/TabletLoginDialog/UsernameCollisionBody.qml
+++ /dev/null
@@ -1,157 +0,0 @@
-//
-//  UsernameCollisionBody.qml
-//
-//  Created by Clement on 7/18/16
-//  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
-//
-
-import Hifi 1.0
-import QtQuick 2.4
-import QtQuick.Controls 1.4
-import QtQuick.Controls.Styles 1.4 as OriginalStyles
-
-import "../controls-uit"
-import "../styles-uit"
-
-Item {
-    id: usernameCollisionBody
-    clip: true
-    width: parent.width
-    height: parent.height
-
-    function create() {
-        mainTextContainer.visible = false
-        loginDialog.createAccountFromStream(textField.text)
-    }
-
-
-    property bool keyboardEnabled: false
-    property bool keyboardRaised: false
-    property bool punctuationMode: false
-
-    onKeyboardRaisedChanged: d.resize();
-
-    QtObject {
-        id: d
-        function resize() {}
-    }
-
-    ShortcutText {
-        id: mainTextContainer
-        anchors {
-            top: parent.top
-            left: parent.left
-            margins: 0
-            topMargin: hifi.dimensions.contentSpacing.y
-        }
-
-        text: qsTr("Your Steam username is not available.")
-        wrapMode: Text.WordWrap
-        color: hifi.colors.redAccent
-        lineHeight: 1
-        lineHeightMode: Text.ProportionalHeight
-        horizontalAlignment: Text.AlignHCenter
-    }
-
-
-    TextField {
-        id: textField
-        anchors {
-            top: mainTextContainer.bottom
-            left: parent.left
-            margins: 0
-            topMargin: hifi.dimensions.contentSpacing.y
-        }
-        width: 250
-
-        placeholderText: "Choose your own"
-    }
-
-    // Override ScrollingWindow's keyboard that would be at very bottom of dialog.
-    Keyboard {
-        raised: keyboardEnabled && keyboardRaised
-        numeric: punctuationMode
-        anchors {
-            left: parent.left
-            right: parent.right
-            bottom: buttons.top
-            bottomMargin: keyboardRaised ? 2 * hifi.dimensions.contentSpacing.y : 0
-        }
-    }
-
-    Row {
-        id: buttons
-        anchors {
-            bottom: parent.bottom
-            right: parent.right
-            margins: 0
-            topMargin: hifi.dimensions.contentSpacing.y
-        }
-        spacing: hifi.dimensions.contentSpacing.x
-        onHeightChanged: d.resize(); onWidthChanged: d.resize();
-
-        Button {
-            anchors.verticalCenter: parent.verticalCenter
-            width: 200
-
-            text: qsTr("Create your profile")
-            color: hifi.buttons.blue
-
-            onClicked: usernameCollisionBody.create()
-        }
-
-        Button {
-            anchors.verticalCenter: parent.verticalCenter
-
-            text: qsTr("Cancel")
-            onClicked: bodyLoader.popup()
-        }
-    }
-
-    Component.onCompleted: {
-        loginDialogRoot.title = qsTr("Complete Your Profile")
-        loginDialogRoot.iconText = "<"
-        keyboardEnabled = HMD.active;
-        d.resize();
-    }
-
-    Connections {
-        target: loginDialog
-        onHandleCreateCompleted: {
-            console.log("Create Succeeded")
-
-            loginDialog.loginThroughSteam()
-        }
-        onHandleCreateFailed: {
-            console.log("Create Failed: " + error)
-
-            mainTextContainer.visible = true
-            mainTextContainer.text = "\"" + textField.text + qsTr("\" is invalid or already taken.")
-        }
-        onHandleLoginCompleted: {
-            console.log("Login Succeeded")
-
-            bodyLoader.setSource("WelcomeBody.qml", { "welcomeBack" : false })
-        }
-        onHandleLoginFailed: {
-            console.log("Login Failed")
-        }
-    }
-
-    Keys.onPressed: {
-        if (!visible) {
-            return
-        }
-
-        switch (event.key) {
-            case Qt.Key_Enter:
-            case Qt.Key_Return:
-                event.accepted = true
-                usernameCollisionBody.create()
-                break
-        }
-    }
-}
diff --git a/interface/resources/qml/TabletLoginDialog/WelcomeBody.qml b/interface/resources/qml/TabletLoginDialog/WelcomeBody.qml
deleted file mode 100644
index 5ec259ca96..0000000000
--- a/interface/resources/qml/TabletLoginDialog/WelcomeBody.qml
+++ /dev/null
@@ -1,79 +0,0 @@
-//
-//  WelcomeBody.qml
-//
-//  Created by Clement on 7/18/16
-//  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
-//
-
-import Hifi 1.0
-import QtQuick 2.4
-
-import "../controls-uit"
-import "../styles-uit"
-
-Item {
-    id: welcomeBody
-    clip: true
-
-    property bool welcomeBack: false
-
-    function setTitle() {
-        loginDialogRoot.title = (welcomeBack ? qsTr("Welcome back <b>") : qsTr("Welcome <b>")) + Account.username + qsTr("</b>!")
-        loginDialogRoot.iconText = ""
-        d.resize();
-    }
-
-    QtObject {
-        id: d
-        function resize() {}
-    }
-
-    InfoItem {
-        id: mainTextContainer
-        anchors {
-            top: parent.top
-            horizontalCenter: parent.horizontalCenter
-            margins: 0
-            topMargin: hifi.dimensions.contentSpacing.y
-        }
-
-        text: qsTr("You are now signed into High Fidelity")
-        wrapMode: Text.WordWrap
-        color: hifi.colors.baseGrayHighlight
-        lineHeight: 2
-        lineHeightMode: Text.ProportionalHeight
-        horizontalAlignment: Text.AlignHCenter
-    }
-
-    Row {
-        id: buttons
-        anchors {
-            top: mainTextContainer.bottom
-            horizontalCenter: parent.horizontalCenter
-            margins: 0
-            topMargin: 2 * hifi.dimensions.contentSpacing.y
-        }
-        spacing: hifi.dimensions.contentSpacing.x
-        onHeightChanged: d.resize(); onWidthChanged: d.resize();
-
-        Button {
-            anchors.verticalCenter: parent.verticalCenter
-
-            text: qsTr("Close");
-
-            onClicked: bodyLoader.popup()
-        }
-    }
-
-    Component.onCompleted: {
-        welcomeBody.setTitle()
-    }
-
-    Connections {
-        target: Account
-        onUsernameChanged: welcomeBody.setTitle()
-    }
-}
diff --git a/interface/resources/qml/Web3DOverlay.qml b/interface/resources/qml/Web3DOverlay.qml
index e0689e614d..a1fa2d2641 100644
--- a/interface/resources/qml/Web3DOverlay.qml
+++ b/interface/resources/qml/Web3DOverlay.qml
@@ -15,6 +15,11 @@ import "controls" as Controls
 
 Controls.WebView {
 
+    // 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);
+
     function onWebEventReceived(event) {
         if (event.slice(0, 17) === "CLARA.IO DOWNLOAD") {
             ApplicationInterface.addAssetToWorldFromURL(event.slice(18));
diff --git a/interface/resources/qml/controls-uit/BaseWebView.qml b/interface/resources/qml/controls-uit/BaseWebView.qml
index 3ca57f03bf..660f52d529 100644
--- a/interface/resources/qml/controls-uit/BaseWebView.qml
+++ b/interface/resources/qml/controls-uit/BaseWebView.qml
@@ -9,7 +9,7 @@
 //
 
 import QtQuick 2.5
-import QtWebEngine 1.2
+import QtWebEngine 1.5
 
 WebEngineView {
     id: root
diff --git a/interface/resources/qml/controls-uit/Button.qml b/interface/resources/qml/controls-uit/Button.qml
index 59f8a63238..c068fdcfaf 100644
--- a/interface/resources/qml/controls-uit/Button.qml
+++ b/interface/resources/qml/controls-uit/Button.qml
@@ -11,23 +11,44 @@
 import QtQuick 2.5
 import QtQuick.Controls 1.4 as Original
 import QtQuick.Controls.Styles 1.4
+import TabletScriptingInterface 1.0
 
 import "../styles-uit"
 
 Original.Button {
+    id: root;
+
     property int color: 0
     property int colorScheme: hifi.colorSchemes.light
+    property string buttonGlyph: "";
 
     width: 120
     height: hifi.dimensions.controlLineHeight
 
     HifiConstants { id: hifi }
 
+    onHoveredChanged: {
+        if (hovered) {
+            tabletInterface.playSound(TabletEnums.ButtonHover);
+        }
+    }
+
+    onClicked: {
+        tabletInterface.playSound(TabletEnums.ButtonClick);
+    }
+
     style: ButtonStyle {
 
         background: Rectangle {
             radius: hifi.buttons.radius
 
+            border.width: (control.color === hifi.buttons.none ||
+            (control.color === hifi.buttons.noneBorderless && control.hovered) ||
+            (control.color === hifi.buttons.noneBorderlessWhite && control.hovered) ||
+            (control.color === hifi.buttons.noneBorderlessGray && control.hovered)) ? 1 : 0;
+            border.color: control.color === hifi.buttons.noneBorderless ? hifi.colors.blueHighlight :
+            (control.color === hifi.buttons.noneBorderlessGray ? hifi.colors.baseGray : hifi.colors.white);
+
             gradient: Gradient {
                 GradientStop {
                     position: 0.2
@@ -60,14 +81,35 @@ Original.Button {
             }
         }
 
-        label: RalewayBold {
-            font.capitalization: Font.AllUppercase
-            color: enabled ? hifi.buttons.textColor[control.color]
-                           : hifi.buttons.disabledTextColor[control.colorScheme]
-            size: hifi.fontSizes.buttonLabel
-            verticalAlignment: Text.AlignVCenter
-            horizontalAlignment: Text.AlignHCenter
-            text: control.text
+        label: Item {
+            HiFiGlyphs {
+                id: buttonGlyph;
+                visible: root.buttonGlyph !== "";
+                text: root.buttonGlyph === "" ? hifi.glyphs.question : root.buttonGlyph;
+                // Size
+                size: 34;
+                // Anchors
+                anchors.right: buttonText.left;
+                anchors.top: parent.top;
+                anchors.bottom: parent.bottom;
+                // Style
+                color: enabled ? hifi.buttons.textColor[control.color]
+                               : hifi.buttons.disabledTextColor[control.colorScheme];
+                // Alignment
+                horizontalAlignment: Text.AlignHCenter;
+                verticalAlignment: Text.AlignVCenter;
+            }
+            RalewayBold {
+                id: buttonText;
+                anchors.centerIn: parent;
+                font.capitalization: Font.AllUppercase
+                color: enabled ? hifi.buttons.textColor[control.color]
+                               : hifi.buttons.disabledTextColor[control.colorScheme]
+                size: hifi.fontSizes.buttonLabel
+                verticalAlignment: Text.AlignVCenter
+                horizontalAlignment: Text.AlignHCenter
+                text: control.text
+            }
         }
     }
 }
diff --git a/interface/resources/qml/controls-uit/CheckBox.qml b/interface/resources/qml/controls-uit/CheckBox.qml
index 36161e3c3e..22b25671c3 100644
--- a/interface/resources/qml/controls-uit/CheckBox.qml
+++ b/interface/resources/qml/controls-uit/CheckBox.qml
@@ -14,11 +14,13 @@ import QtQuick.Controls.Styles 1.4
 
 import "../styles-uit"
 
+import TabletScriptingInterface 1.0
+
 Original.CheckBox {
     id: checkBox
 
     property int colorScheme: hifi.colorSchemes.light
-    property string color: hifi.colors.lightGray
+    property string color: hifi.colors.lightGrayText
     readonly property bool isLightColorScheme: colorScheme == hifi.colorSchemes.light
     property bool isRedCheck: false
     property int boxSize: 14
@@ -28,6 +30,15 @@ Original.CheckBox {
     readonly property int checkRadius: 2
     activeFocusOnPress: true
 
+    onClicked: {
+        tabletInterface.playSound(TabletEnums.ButtonClick);
+    }
+
+// TODO: doesnt works for QQC1. check with QQC2
+//    onHovered: {
+//        tabletInterface.playSound(TabletEnums.ButtonHover);
+//    }
+
     style: CheckBoxStyle {
         indicator: Rectangle {
             id: box
diff --git a/interface/resources/qml/controls-uit/CheckBoxQQC2.qml b/interface/resources/qml/controls-uit/CheckBoxQQC2.qml
new file mode 100644
index 0000000000..32d69cf339
--- /dev/null
+++ b/interface/resources/qml/controls-uit/CheckBoxQQC2.qml
@@ -0,0 +1,125 @@
+//
+//  CheckBox2.qml
+//
+//  Created by Vlad Stelmahovsky on 10 Aug 2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+import QtQuick 2.7
+import QtQuick.Controls 2.2
+
+import "../styles-uit"
+import "../controls-uit" as HiFiControls
+import TabletScriptingInterface 1.0
+
+CheckBox {
+    id: checkBox
+
+    HifiConstants { id: hifi; }
+
+    padding: 0
+    leftPadding: 0
+    property int colorScheme: hifi.colorSchemes.light
+    property string color: hifi.colors.lightGrayText
+    readonly property bool isLightColorScheme: colorScheme === hifi.colorSchemes.light
+    property bool isRedCheck: false
+    property bool isRound: false
+    property int boxSize: 14
+    property int boxRadius: isRound ? boxSize : 3
+    property bool wrap: true;
+    readonly property int checkSize: Math.max(boxSize - 8, 10)
+    readonly property int checkRadius: isRound ? checkSize / 2 : 2
+    focusPolicy: Qt.ClickFocus
+    hoverEnabled: true
+
+    onClicked: {
+        tabletInterface.playSound(TabletEnums.ButtonClick);
+    }
+
+    onHoveredChanged: {
+        if (hovered) {
+            tabletInterface.playSound(TabletEnums.ButtonHover);
+        }
+    }
+
+    indicator: Rectangle {
+        id: box
+        implicitWidth: boxSize
+        implicitHeight: boxSize
+        radius: boxRadius
+        x: checkBox.leftPadding
+        y: parent.height / 2 - height / 2
+        border.width: 1
+        border.color: pressed || hovered
+                      ? hifi.colors.checkboxCheckedBorder
+                      : (checkBox.isLightColorScheme ? hifi.colors.checkboxLightFinish : hifi.colors.checkboxDarkFinish)
+
+        gradient: Gradient {
+            GradientStop {
+                position: 0.2
+                color: pressed || hovered
+                       ? (checkBox.isLightColorScheme ? hifi.colors.checkboxChecked : hifi.colors.checkboxLightStart)
+                       : (checkBox.isLightColorScheme ? hifi.colors.checkboxLightStart : hifi.colors.checkboxDarkStart)
+            }
+            GradientStop {
+                position: 1.0
+                color: pressed || hovered
+                       ? (checkBox.isLightColorScheme ? hifi.colors.checkboxChecked : hifi.colors.checkboxLightFinish)
+                       : (checkBox.isLightColorScheme ? hifi.colors.checkboxLightFinish : hifi.colors.checkboxDarkFinish)
+            }
+        }
+
+        Rectangle {
+            visible: pressed || hovered
+            anchors.centerIn: parent
+            id: innerBox
+            width: checkSize - 4
+            height: width
+            radius: checkRadius
+            color: hifi.colors.checkboxCheckedBorder
+        }
+
+        Rectangle {
+            id: check
+            width: checkSize
+            height: checkSize
+            radius: checkRadius
+            anchors.centerIn: parent
+            color: isRedCheck ? hifi.colors.checkboxCheckedRed : hifi.colors.checkboxChecked
+            border.width: 2
+            border.color: isRedCheck? hifi.colors.checkboxCheckedBorderRed : hifi.colors.checkboxCheckedBorder
+            visible: checked && !pressed || !checked && pressed
+        }
+
+        Rectangle {
+            id: disabledOverlay
+            visible: !enabled
+            width: boxSize
+            height: boxSize
+            radius: boxRadius
+            border.width: 1
+            border.color: hifi.colors.baseGrayHighlight
+            color: hifi.colors.baseGrayHighlight
+            opacity: 0.5
+        }
+    }
+
+    contentItem: Text {
+        id: root
+        FontLoader { id: ralewaySemiBold; source: pathToFonts + "fonts/Raleway-SemiBold.ttf"; }
+        font.pixelSize: hifi.fontSizes.inputLabel
+        font.family: ralewaySemiBold.name
+        text: checkBox.text
+        color: checkBox.color
+        x: 2
+        wrapMode: checkBox.wrap ? Text.Wrap : Text.NoWrap
+        elide: checkBox.wrap ? Text.ElideNone : Text.ElideRight
+        enabled: checkBox.enabled
+        verticalAlignment: Text.AlignVCenter
+        leftPadding: checkBox.indicator.width + checkBox.spacing
+    }
+}
+
diff --git a/interface/resources/qml/controls-uit/GlyphButton.qml b/interface/resources/qml/controls-uit/GlyphButton.qml
index ac353b5a52..bc7bc636fe 100644
--- a/interface/resources/qml/controls-uit/GlyphButton.qml
+++ b/interface/resources/qml/controls-uit/GlyphButton.qml
@@ -12,6 +12,7 @@
 import QtQuick 2.5
 import QtQuick.Controls 1.4 as Original
 import QtQuick.Controls.Styles 1.4
+import TabletScriptingInterface 1.0
 
 import "../styles-uit"
 
@@ -24,6 +25,16 @@ Original.Button {
     width: 120
     height: 28
 
+    onHoveredChanged: {
+        if (hovered) {
+            tabletInterface.playSound(TabletEnums.ButtonHover);
+        }
+    }
+
+    onClicked: {
+        tabletInterface.playSound(TabletEnums.ButtonClick);
+    }
+
     style: ButtonStyle {
 
         background: Rectangle {
diff --git a/interface/resources/qml/controls-uit/ImageMessageBox.qml b/interface/resources/qml/controls-uit/ImageMessageBox.qml
new file mode 100644
index 0000000000..95c753aab4
--- /dev/null
+++ b/interface/resources/qml/controls-uit/ImageMessageBox.qml
@@ -0,0 +1,64 @@
+//
+//  ImageMessageBox.qml
+//
+//  Created by Dante Ruiz on 7/5/2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+import QtQuick 2.5
+import QtQuick.Controls 1.4
+import "../styles-uit"
+
+Item {
+    id: imageBox
+    visible: false
+    anchors.fill: parent
+    property alias source: image.source
+    property alias imageWidth: image.width
+    property alias imageHeight: image.height
+
+    Rectangle {
+        anchors.fill: parent
+        color: "black"
+        opacity: 0.3
+    }
+
+    Image {
+        id: image
+        anchors.centerIn: parent
+
+        HiFiGlyphs {
+            id: closeGlyphButton
+            text: hifi.glyphs.close
+            size: 25
+
+            anchors {
+                top: parent.top
+                topMargin: 15
+                right: parent.right
+                rightMargin: 15
+            }
+
+            MouseArea {
+                anchors.fill: parent
+                hoverEnabled: true
+
+                onEntered: {
+                    parent.text = hifi.glyphs.closeInverted;
+                }
+
+                onExited: {
+                    parent.text = hifi.glyphs.close;
+                }
+
+                onClicked: {
+                    imageBox.visible = false;
+                }
+            }
+        }
+    }
+
+}
diff --git a/interface/resources/qml/controls-uit/Key.qml b/interface/resources/qml/controls-uit/Key.qml
index 2218474936..b0e965e79f 100644
--- a/interface/resources/qml/controls-uit/Key.qml
+++ b/interface/resources/qml/controls-uit/Key.qml
@@ -1,13 +1,20 @@
 import QtQuick 2.0
+import TabletScriptingInterface 1.0
 
 Item {
     id: keyItem
     width: 45
     height: 50
+
+    property int contentPadding: 4
     property string glyph: "a"
     property bool toggle: false   // does this button have the toggle behaivor?
     property bool toggled: false  // is this button currently toggled?
     property alias mouseArea: mouseArea1
+    property alias fontFamily: letter.font.family;
+    property alias fontPixelSize: letter.font.pixelSize
+    property alias verticalAlignment: letter.verticalAlignment
+    property alias letterAnchors: letter.anchors
 
     function resetToggledMode(mode) {
         toggled = mode;
@@ -32,9 +39,19 @@ Item {
             }
         }
 
+        onContainsMouseChanged: {
+            if (containsMouse) {
+                tabletInterface.playSound(TabletEnums.ButtonHover);
+            }
+        }
+
         onClicked: {
             mouse.accepted = true;
+            tabletInterface.playSound(TabletEnums.ButtonClick);
+
             webEntity.synthesizeKeyPress(glyph);
+            webEntity.synthesizeKeyPress(glyph, mirrorText);
+
             if (toggle) {
                 toggled = !toggled;
             }
@@ -44,8 +61,21 @@ Item {
             mouse.accepted = true;
         }
 
+        property var _HAPTIC_STRENGTH: 0.1;
+        property var _HAPTIC_DURATION: 3.0;
+        property var leftHand: 0;
+        property var rightHand: 1;
+
         onEntered: {
             keyItem.state = "mouseOver";
+
+            var globalPosition = keyItem.mapToGlobal(mouseArea1.mouseX, mouseArea1.mouseY);
+            var deviceId = Web3DOverlay.deviceIdByTouchPoint(globalPosition.x, globalPosition.y);
+            var hand = deviceId - 1; // based on touchEventUtils.js, deviceId is 'hand + 1', so 'hand' is 'deviceId' - 1
+
+            if (hand == leftHand || hand == rightHand) {
+                Controller.triggerHapticPulse(_HAPTIC_STRENGTH, _HAPTIC_DURATION, hand);
+            }
         }
 
         onExited: {
@@ -81,14 +111,8 @@ Item {
         color: "#121212"
         radius: 2
         border.color: "#00000000"
-        anchors.right: parent.right
-        anchors.rightMargin: 4
-        anchors.left: parent.left
-        anchors.leftMargin: 4
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: 4
-        anchors.top: parent.top
-        anchors.topMargin: 4
+        anchors.fill: parent
+        anchors.margins: contentPadding
     }
 
     Text {
diff --git a/interface/resources/qml/controls-uit/Keyboard.qml b/interface/resources/qml/controls-uit/Keyboard.qml
index 07488fe3e6..76b66178d4 100644
--- a/interface/resources/qml/controls-uit/Keyboard.qml
+++ b/interface/resources/qml/controls-uit/Keyboard.qml
@@ -8,22 +8,42 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-import QtQuick 2.0
+import QtQuick 2.7
+import QtGraphicalEffects 1.0
+import "."
 
-Item {
+Rectangle {
     id: keyboardBase
+    objectName: "keyboard"
+
+    anchors.left: parent.left
+    anchors.right: parent.right
+
+    color: "#252525"
 
     property bool raised: false
     property bool numeric: false
 
+    readonly property int keyboardRowHeight: 50
+    readonly property int keyboardWidth: 480
+
+    readonly property int mirrorTextHeight: keyboardRowHeight
+
+    property bool password: false
+    property alias mirroredText: mirrorText.text
+    property bool showMirrorText: true
     readonly property int raisedHeight: 200
 
-    height: enabled && raised ? raisedHeight : 0
+    height: enabled && raised ? raisedHeight + (showMirrorText ? keyboardRowHeight : 0) : 0
     visible: enabled && raised
 
     property bool shiftMode: false
     property bool numericShiftMode: false
 
+    onRaisedChanged: {
+        mirroredText = "";
+    }
+
     function resetShiftMode(mode) {
         shiftMode = mode;
         shiftKey.resetToggledMode(mode);
@@ -36,6 +56,8 @@ Item {
             return ">";
         } else if (str === "/") {
             return "?";
+        } else if (str === "-") {
+            return "_";
         } else {
             return str.toUpperCase(str);
         }
@@ -48,6 +70,8 @@ Item {
             return ".";
         } else if (str === "?") {
             return "/";
+        } else if (str === "_") {
+            return "-";
         } else {
             return str.toLowerCase(str);
         }
@@ -66,7 +90,7 @@ Item {
 
     onShiftModeChanged: {
         forEachKey(function (key) {
-            if (/[a-z]/i.test(key.glyph)) {
+            if (/[a-z-_]/i.test(key.glyph)) {
                 if (shiftMode) {
                     key.glyph = keyboardBase.toUpper(key.glyph);
                 } else {
@@ -93,38 +117,65 @@ Item {
     }
 
     Rectangle {
-        id: leftRect
-        y: 0
-        height: 200
+        height: showMirrorText ? mirrorTextHeight : 0
+        width: keyboardWidth
         color: "#252525"
-        anchors.right: keyboardRect.left
-        anchors.rightMargin: 0
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: 0
-        anchors.left: parent.left
-        anchors.leftMargin: 0
+        anchors.horizontalCenter: parent.horizontalCenter
+
+        TextInput {
+            id: mirrorText
+            visible: showMirrorText
+            FontLoader { id: font; source: "../../fonts/FiraSans-Regular.ttf"; }
+            font.family: font.name
+            font.pixelSize: 20
+            verticalAlignment: Text.AlignVCenter
+            horizontalAlignment: Text.AlignHCenter
+            color: "#00B4EF";
+            anchors.left: parent.left
+            anchors.leftMargin: 10
+            anchors.right: parent.right
+            anchors.top: parent.top
+            anchors.bottom: parent.bottom
+
+            wrapMode: Text.WordWrap
+            readOnly: false // we need this to allow control to accept QKeyEvent
+            selectByMouse: false
+            echoMode: password ? TextInput.Password : TextInput.Normal
+
+            Keys.onPressed: {
+                if (event.key == Qt.Key_Return || event.key == Qt.Key_Space) {
+                    mirrorText.text = "";
+                    event.accepted = true;
+                }
+            }
+
+            MouseArea { // ... and we need this mouse area to prevent mirrorText from getting mouse events to ensure it will never get focus
+                anchors.fill: parent
+            }
+        }
     }
 
     Rectangle {
         id: keyboardRect
-        x: 206
-        y: 0
-        width: 480
-        height: 200
+        y: showMirrorText ? mirrorTextHeight : 0
+        width: keyboardWidth
+        height: raisedHeight
         color: "#252525"
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.bottom: parent.bottom
         anchors.bottomMargin: 0
 
+        FontLoader { id: hiFiGlyphs; source: pathToFonts + "fonts/hifi-glyphs.ttf"; }
+
         Column {
             id: columnAlpha
-            width: 480
-            height: 200
+            width: keyboardWidth
+            height: raisedHeight
             visible: !numeric
 
             Row {
-                width: 480
-                height: 50
+                width: keyboardWidth
+                height: keyboardRowHeight
                 anchors.left: parent.left
                 anchors.leftMargin: 4
 
@@ -142,8 +193,8 @@ Item {
             }
 
             Row {
-                width: 480
-                height: 50
+                width: keyboardWidth
+                height: keyboardRowHeight
                 anchors.left: parent.left
                 anchors.leftMargin: 20
 
@@ -160,8 +211,8 @@ Item {
             }
 
             Row {
-                width: 480
-                height: 50
+                width: keyboardWidth
+                height: keyboardRowHeight
                 anchors.left: parent.left
                 anchors.leftMargin: 4
 
@@ -179,14 +230,14 @@ Item {
                 Key { width: 43; glyph: "b"; }
                 Key { width: 43; glyph: "n"; }
                 Key { width: 43; glyph: "m"; }
-                Key { width: 43; glyph: "_"; }
+                Key { width: 43; glyph: "-"; }
                 Key { width: 43; glyph: "/"; }
                 Key { width: 43; glyph: "?"; }
             }
 
             Row {
-                width: 480
-                height: 50
+                width: keyboardWidth
+                height: keyboardRowHeight
                 anchors.left: parent.left
                 anchors.leftMargin: 4
 
@@ -198,20 +249,25 @@ Item {
                 Key { width: 231; glyph: " "; }
                 Key { width: 43; glyph: ","; }
                 Key { width: 43; glyph: "."; }
-                Key { width: 43; glyph: "\u276C"; }
-                Key { width: 43; glyph: "\u276D"; }
+                Key {
+                    fontFamily: hiFiGlyphs.name;
+                    fontPixelSize: 48;
+                    letterAnchors.topMargin: -4;
+                    verticalAlignment: Text.AlignVCenter;
+                    width: 86; glyph: "\ue02b";
+                }
             }
         }
 
         Column {
             id: columnNumeric
-            width: 480
-            height: 200
+            width: keyboardWidth
+            height: raisedHeight
             visible: numeric
 
             Row {
-                width: 480
-                height: 50
+                width: keyboardWidth
+                height: keyboardRowHeight
                 anchors.left: parent.left
                 anchors.leftMargin: 4
 
@@ -229,8 +285,8 @@ Item {
             }
 
             Row {
-                width: 480
-                height: 50
+                width: keyboardWidth
+                height: keyboardRowHeight
                 anchors.left: parent.left
                 anchors.leftMargin: 4
 
@@ -248,8 +304,8 @@ Item {
             }
 
             Row {
-                width: 480
-                height: 50
+                width: keyboardWidth
+                height: keyboardRowHeight
                 anchors.left: parent.left
                 anchors.leftMargin: 4
 
@@ -273,8 +329,8 @@ Item {
             }
 
             Row {
-                width: 480
-                height: 50
+                width: keyboardWidth
+                height: keyboardRowHeight
                 anchors.left: parent.left
                 anchors.leftMargin: 4
 
@@ -286,36 +342,14 @@ Item {
                 Key { width: 231; glyph: " "; }
                 Key { width: 43; glyph: ","; }
                 Key { width: 43; glyph: "."; }
-                Key { width: 43; glyph: "\u276C"; }
-                Key { width: 43; glyph: "\u276D"; }
+                Key {
+                    fontFamily: hiFiGlyphs.name;
+                    fontPixelSize: 48;
+                    letterAnchors.topMargin: -4;
+                    verticalAlignment: Text.AlignVCenter;
+                    width: 86; glyph: "\ue02b";
+                }
             }
         }
     }
-
-    Rectangle {
-        id: rightRect
-        y: 280
-        height: 200
-        color: "#252525"
-        border.width: 0
-        anchors.left: keyboardRect.right
-        anchors.leftMargin: 0
-        anchors.right: parent.right
-        anchors.rightMargin: 0
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: 0
-    }
-
-    Rectangle {
-        id: rectangle1
-        color: "#ffffff"
-        anchors.bottom: keyboardRect.top
-        anchors.bottomMargin: 0
-        anchors.left: parent.left
-        anchors.leftMargin: 0
-        anchors.right: parent.right
-        anchors.rightMargin: 0
-        anchors.top: parent.top
-        anchors.topMargin: 0
-    }
 }
diff --git a/interface/resources/qml/controls-uit/Label.qml b/interface/resources/qml/controls-uit/Label.qml
index 330d74fa14..1dc3aa0dd4 100644
--- a/interface/resources/qml/controls-uit/Label.qml
+++ b/interface/resources/qml/controls-uit/Label.qml
@@ -17,6 +17,19 @@ RalewaySemiBold {
     property int colorScheme: hifi.colorSchemes.light
 
     size: hifi.fontSizes.inputLabel
-    color: enabled ? (colorScheme == hifi.colorSchemes.light ? hifi.colors.lightGray : hifi.colors.lightGrayText)
-                   : (colorScheme == hifi.colorSchemes.light ? hifi.colors.lightGrayText : hifi.colors.baseGrayHighlight);
+    color: {
+        if (colorScheme === hifi.colorSchemes.dark) {
+            if (enabled) {
+                hifi.colors.lightGrayText
+            } else {
+                hifi.colors.baseGrayHighlight
+            }
+        } else {
+            if (enabled) {
+                hifi.colors.lightGray
+            } else {
+                hifi.colors.lightGrayText
+            }
+        }
+    }
 }
diff --git a/interface/resources/qml/controls-uit/RadioButton.qml b/interface/resources/qml/controls-uit/RadioButton.qml
new file mode 100644
index 0000000000..65d36d2dcb
--- /dev/null
+++ b/interface/resources/qml/controls-uit/RadioButton.qml
@@ -0,0 +1,82 @@
+//
+//  RadioButton.qml
+//
+//  Created by Cain Kilgore on 20th July 2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+import QtQuick 2.5
+import QtQuick.Controls 1.4 as Original
+import QtQuick.Controls.Styles 1.4
+
+import "../styles-uit"
+import "../controls-uit" as HifiControls
+
+import TabletScriptingInterface 1.0
+
+Original.RadioButton {
+    id: radioButton
+    HifiConstants { id: hifi }
+
+    property int colorScheme: hifi.colorSchemes.light
+    readonly property bool isLightColorScheme: colorScheme == hifi.colorSchemes.light
+
+    readonly property int boxSize: 14
+    readonly property int boxRadius: 3
+    readonly property int checkSize: 10
+    readonly property int checkRadius: 2
+
+    onClicked: {
+        tabletInterface.playSound(TabletEnums.ButtonClick);
+    }
+
+// TODO: doesnt works for QQC1. check with QQC2
+//    onHovered: {
+//        tabletInterface.playSound(TabletEnums.ButtonHover);
+//    }
+
+    style: RadioButtonStyle {
+        indicator: Rectangle {
+            id: box
+            width: boxSize
+            height: boxSize
+            radius: 7
+            gradient: Gradient {
+                GradientStop {
+                    position: 0.2
+                    color: pressed || hovered
+                           ? (radioButton.isLightColorScheme ? hifi.colors.checkboxDarkStart : hifi.colors.checkboxLightStart)
+                           : (radioButton.isLightColorScheme ? hifi.colors.checkboxLightStart : hifi.colors.checkboxDarkStart)
+                }
+                GradientStop {
+                    position: 1.0
+                    color: pressed || hovered
+                           ? (radioButton.isLightColorScheme ? hifi.colors.checkboxDarkFinish : hifi.colors.checkboxLightFinish)
+                           : (radioButton.isLightColorScheme ? hifi.colors.checkboxLightFinish : hifi.colors.checkboxDarkFinish)
+                }
+            }
+
+            Rectangle {
+                id: check
+                width: checkSize
+                height: checkSize
+                radius: 7
+                anchors.centerIn: parent
+                color: "#00B4EF"
+                border.width: 1
+                border.color: "#36CDFF"
+                visible: checked && !pressed || !checked && pressed
+            }
+        }
+
+        label: RalewaySemiBold {
+            text: control.text
+            size: hifi.fontSizes.inputLabel
+            color: isLightColorScheme ? hifi.colors.lightGray : hifi.colors.lightGrayText
+            x: radioButton.boxSize / 2
+        }
+    }
+}
diff --git a/interface/resources/qml/controls-uit/Separator.qml b/interface/resources/qml/controls-uit/Separator.qml
new file mode 100644
index 0000000000..5e2d278454
--- /dev/null
+++ b/interface/resources/qml/controls-uit/Separator.qml
@@ -0,0 +1,44 @@
+//
+//  Separator.qml
+//
+//  Created by Zach Fox on 2017-06-06
+//  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
+//
+
+import QtQuick 2.5
+import "../styles-uit"
+
+Item {
+    property int colorScheme: 0;
+    
+    readonly property var topColor: [ hifi.colors.baseGrayShadow, hifi.colors.faintGray ];
+    readonly property var bottomColor: [ hifi.colors.baseGrayHighlight, hifi.colors.faintGray ];
+
+    // Size
+    height: colorScheme === 0 ? 2 : 1;
+    Rectangle {
+        // Size
+        width: parent.width;
+        height: 1;
+        // Anchors
+        anchors.left: parent.left;
+        anchors.bottom: parent.bottom;
+        // Style
+        color: topColor[colorScheme];
+    }
+    Rectangle {
+        visible: colorScheme === 0;
+        // Size
+        width: parent.width;
+        height: 1;
+        // Anchors
+        anchors.left: parent.left;
+        anchors.bottom: parent.bottom;
+        anchors.bottomMargin: -height;
+        // Style
+        color: bottomColor[colorScheme];
+    }
+}
diff --git a/interface/resources/qml/controls-uit/Slider.qml b/interface/resources/qml/controls-uit/Slider.qml
index 39831546e1..89bae9bcde 100644
--- a/interface/resources/qml/controls-uit/Slider.qml
+++ b/interface/resources/qml/controls-uit/Slider.qml
@@ -36,7 +36,7 @@ Slider {
 
             Rectangle {
                 width: parent.height - 2
-                height: slider.value * (slider.width/(slider.maximumValue - slider.minimumValue)) - 1
+                height: slider.width * (slider.value - slider.minimumValue) / (slider.maximumValue - slider.minimumValue) - 1
                 radius: height / 2
                 anchors {
                     top: parent.top
diff --git a/interface/resources/qml/controls-uit/Switch.qml b/interface/resources/qml/controls-uit/Switch.qml
new file mode 100644
index 0000000000..d54f986717
--- /dev/null
+++ b/interface/resources/qml/controls-uit/Switch.qml
@@ -0,0 +1,156 @@
+//
+//  Switch.qml
+//
+//  Created by Zach Fox on 2017-06-06
+//  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
+//
+
+import QtQuick 2.5
+import QtQuick.Controls 1.4 as Original
+import QtQuick.Controls.Styles 1.4
+
+import "../styles-uit"
+
+Item {
+    id: rootSwitch;
+
+    property int colorScheme: hifi.colorSchemes.light;
+    readonly property bool isLightColorScheme: colorScheme == hifi.colorSchemes.light;
+    property int switchWidth: 70;
+    readonly property int switchRadius: height/2;
+    property string labelTextOff: "";
+    property string labelGlyphOffText: "";
+    property int labelGlyphOffSize: 32;
+    property string labelTextOn: "";
+    property string labelGlyphOnText: "";
+    property int labelGlyphOnSize: 32;
+    property alias checked: originalSwitch.checked;
+    signal onCheckedChanged;
+    signal clicked;
+
+    Original.Switch {
+        id: originalSwitch;
+        activeFocusOnPress: true;
+        anchors.top: rootSwitch.top;
+        anchors.left: rootSwitch.left;
+        anchors.leftMargin: rootSwitch.width/2 - rootSwitch.switchWidth/2;
+        onCheckedChanged: rootSwitch.onCheckedChanged();
+        onClicked: rootSwitch.clicked();
+
+        style: SwitchStyle {
+
+            padding {
+                top: 3;
+                left: 3;
+                right: 3;
+                bottom: 3;
+            }
+
+            groove: Rectangle {
+                color: "#252525";
+                implicitWidth: rootSwitch.switchWidth;
+                implicitHeight: rootSwitch.height;
+                radius: rootSwitch.switchRadius;
+            }
+
+            handle: Rectangle {
+                id: switchHandle;
+                implicitWidth: rootSwitch.height - padding.top - padding.bottom;
+                implicitHeight: implicitWidth;
+                radius: implicitWidth/2;
+                border.color: hifi.colors.lightGrayText;
+                color: hifi.colors.lightGray;
+        
+                MouseArea {
+                    anchors.fill: parent;
+                    hoverEnabled: true;
+                    onEntered: parent.color = hifi.colors.blueHighlight;
+                    onExited: parent.color = hifi.colors.lightGray;
+                }
+            }
+        }
+    }
+
+    // OFF Label
+    Item {
+        anchors.right: originalSwitch.left;
+        anchors.rightMargin: 10;
+        anchors.top: rootSwitch.top;
+        height: rootSwitch.height;
+
+        RalewaySemiBold {
+            id: labelOff;
+            text: labelTextOff;
+            size: hifi.fontSizes.inputLabel;
+            color: originalSwitch.checked ? hifi.colors.lightGrayText : "#FFFFFF";
+            anchors.top: parent.top;
+            anchors.right: parent.right;
+            width: paintedWidth;
+            height: parent.height;
+            verticalAlignment: Text.AlignVCenter;
+        }
+
+        HiFiGlyphs {
+            id: labelGlyphOff;
+            text: labelGlyphOffText;
+            size: labelGlyphOffSize;
+            color: labelOff.color;
+            anchors.top: parent.top;
+            anchors.topMargin: 2;
+            anchors.right: labelOff.left;
+            anchors.rightMargin: 4;
+        }
+
+        MouseArea {
+            anchors.top: parent.top;
+            anchors.bottom: parent.bottom;
+            anchors.left: labelGlyphOff.left;
+            anchors.right: labelOff.right;
+            onClicked: {
+                originalSwitch.checked = false;
+            }
+        }
+    }
+
+    // ON Label
+    Item {
+        anchors.left: originalSwitch.right;
+        anchors.leftMargin: 10;
+        anchors.top: rootSwitch.top;
+        height: rootSwitch.height;
+
+        RalewaySemiBold {
+            id: labelOn;
+            text: labelTextOn;
+            size: hifi.fontSizes.inputLabel;
+            color: originalSwitch.checked ? "#FFFFFF" : hifi.colors.lightGrayText;
+            anchors.top: parent.top;
+            anchors.left: parent.left;
+            width: paintedWidth;
+            height: parent.height;
+            verticalAlignment: Text.AlignVCenter;
+        }
+
+        HiFiGlyphs {
+            id: labelGlyphOn;
+            text: labelGlyphOnText;
+            size: labelGlyphOnSize;
+            color: labelOn.color;
+            anchors.top: parent.top;
+            anchors.left: labelOn.right;
+        }
+
+        MouseArea {
+            anchors.top: parent.top;
+            anchors.bottom: parent.bottom;
+            anchors.left: labelOn.left;
+            anchors.right: labelGlyphOn.right;
+            onClicked: {
+                originalSwitch.checked = true;
+            }
+        }
+    }
+}
diff --git a/interface/resources/qml/controls-uit/TextField.qml b/interface/resources/qml/controls-uit/TextField.qml
index 65fab00700..e636bfc27f 100644
--- a/interface/resources/qml/controls-uit/TextField.qml
+++ b/interface/resources/qml/controls-uit/TextField.qml
@@ -20,9 +20,13 @@ TextField {
 
     property int colorScheme: hifi.colorSchemes.light
     readonly property bool isLightColorScheme: colorScheme == hifi.colorSchemes.light
+    readonly property bool isFaintGrayColorScheme: colorScheme == hifi.colorSchemes.faintGray
     property bool isSearchField: false
     property string label: ""
     property real controlHeight: height + (textFieldLabel.visible ? textFieldLabel.height + 1 : 0)
+    property bool hasRoundedBorder: false
+    property bool error: false;
+    property bool hasClearButton: false;
 
     placeholderText: textField.placeholderText
 
@@ -31,20 +35,72 @@ TextField {
     font.pixelSize: hifi.fontSizes.textFieldInput
     font.italic: textField.text == ""
     height: implicitHeight + 3  // Make surrounding box higher so that highlight is vertically centered.
+    property alias textFieldLabel: textFieldLabel
 
     y: textFieldLabel.visible ? textFieldLabel.height + textFieldLabel.anchors.bottomMargin : 0
 
+    // workaround for https://bugreports.qt.io/browse/QTBUG-49297
+    Keys.onPressed: {
+        switch (event.key) {
+            case Qt.Key_Return: 
+            case Qt.Key_Enter: 
+                event.accepted = true;
+
+                // emit accepted signal manually
+                if (acceptableInput) {
+                    accepted();
+                }
+        }
+    }
+
     style: TextFieldStyle {
-        textColor: isLightColorScheme
-                   ? (textField.activeFocus ? hifi.colors.black : hifi.colors.lightGray)
-                   : (textField.activeFocus ? hifi.colors.white : hifi.colors.lightGrayText)
+        textColor: {
+            if (isLightColorScheme) {
+                if (textField.activeFocus) {
+                    hifi.colors.black
+                } else {
+                    hifi.colors.lightGray
+                }
+            } else if (isFaintGrayColorScheme) {
+                if (textField.activeFocus) {
+                    hifi.colors.black
+                } else {
+                    hifi.colors.lightGray
+                }
+            } else {
+                if (textField.activeFocus) {
+                    hifi.colors.white
+                } else {
+                    hifi.colors.lightGrayText
+                }
+            }
+        }
         background: Rectangle {
-            color: isLightColorScheme
-                   ? (textField.activeFocus ? hifi.colors.white : hifi.colors.textFieldLightBackground)
-                   : (textField.activeFocus ? hifi.colors.black : hifi.colors.baseGrayShadow)
-            border.color: hifi.colors.primaryHighlight
-            border.width: textField.activeFocus ? 1 : 0
-            radius: isSearchField ? textField.height / 2 : 0
+            color: {
+            if (isLightColorScheme) {
+                if (textField.activeFocus) {
+                    hifi.colors.white
+                } else {
+                    hifi.colors.textFieldLightBackground
+                }
+            } else if (isFaintGrayColorScheme) {
+                if (textField.activeFocus) {
+                    hifi.colors.white
+                } else {
+                    hifi.colors.faintGray50
+                }
+            } else {
+                if (textField.activeFocus) {
+                    hifi.colors.black
+                } else {
+                    hifi.colors.baseGrayShadow
+                }
+            }
+        }
+            border.color: textField.error ? hifi.colors.redHighlight :
+            (textField.activeFocus ? hifi.colors.primaryHighlight : (isFaintGrayColorScheme ? hifi.colors.lightGrayText : hifi.colors.lightGray))
+            border.width: textField.activeFocus || hasRoundedBorder || textField.error ? 1 : 0
+            radius: isSearchField ? textField.height / 2 : (hasRoundedBorder ? 4 : 0)
 
             HiFiGlyphs {
                 text: hifi.glyphs.search
@@ -55,12 +111,29 @@ TextField {
                 anchors.leftMargin: hifi.dimensions.textPadding - 2
                 visible: isSearchField
             }
+
+            HiFiGlyphs {
+                text: hifi.glyphs.error
+                color: textColor
+                size: 40
+                anchors.right: parent.right
+                anchors.rightMargin: hifi.dimensions.textPadding - 2
+                anchors.verticalCenter: parent.verticalCenter
+                visible: hasClearButton && textField.text !== "";
+
+                MouseArea {
+                    anchors.fill: parent;
+                    onClicked: {
+                        textField.text = "";
+                    }
+                }
+            }
         }
-        placeholderTextColor: hifi.colors.lightGray
+        placeholderTextColor: isFaintGrayColorScheme ? hifi.colors.lightGrayText : hifi.colors.lightGray
         selectedTextColor: hifi.colors.black
         selectionColor: hifi.colors.primaryHighlight
         padding.left: (isSearchField ? textField.height - 2 : 0) + hifi.dimensions.textPadding
-        padding.right: hifi.dimensions.textPadding
+        padding.right: (hasClearButton ? textField.height - 2 : 0) + hifi.dimensions.textPadding
     }
 
     HifiControls.Label {
diff --git a/interface/resources/qml/controls-uit/ToolTip.qml b/interface/resources/qml/controls-uit/ToolTip.qml
new file mode 100644
index 0000000000..4fe36adcd5
--- /dev/null
+++ b/interface/resources/qml/controls-uit/ToolTip.qml
@@ -0,0 +1,51 @@
+//
+//  ToolTip.qml
+//
+//  Created by Clement on  9/12/17
+//  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
+//
+
+import QtQuick 2.5
+
+Item {
+    property string toolTip
+    property bool showToolTip: false
+
+    Rectangle {
+        id: toolTipRectangle
+        anchors.right: parent.right
+
+        width: toolTipText.width + 4
+        height: toolTipText.height + 4
+        opacity: (toolTip != "" && showToolTip) ? 1 : 0
+        color: "#ffffaa"
+        border.color: "#0a0a0a"
+        Text {
+            id: toolTipText
+            text: toolTip
+            color: "black"
+            anchors.centerIn: parent
+        }
+        Behavior on opacity {
+            PropertyAnimation {
+                easing.type: Easing.InOutQuad
+                duration: 250
+            }
+        }
+    }
+    MouseArea {
+        id: mouseArea
+        anchors.fill: parent
+        onEntered: showTimer.start()
+        onExited: { showToolTip = false; showTimer.stop(); }
+        hoverEnabled: true
+    }
+    Timer {
+        id: showTimer
+        interval: 250
+        onTriggered: { showToolTip = true; }
+    }
+}
\ No newline at end of file
diff --git a/interface/resources/qml/controls-uit/Tree.qml b/interface/resources/qml/controls-uit/Tree.qml
index 8bce092947..79d3b958ea 100644
--- a/interface/resources/qml/controls-uit/Tree.qml
+++ b/interface/resources/qml/controls-uit/Tree.qml
@@ -19,7 +19,7 @@ TreeView {
     id: treeView
 
     property var treeModel: ListModel { }
-    property var canEdit: false
+    property bool centerHeaderText: false
     property int colorScheme: hifi.colorSchemes.light
     readonly property bool isLightColorScheme: colorScheme == hifi.colorSchemes.light
 
@@ -27,17 +27,13 @@ TreeView {
 
     model: treeModel
     selection: ItemSelectionModel {
+        id: selectionModel
         model: treeModel
     }
 
-    TableViewColumn {
-        role: "display";
-    }
-
     anchors { left: parent.left; right: parent.right }
-
+    
     headerVisible: false
-    headerDelegate: Item { }  // Fix OSX QML bug that displays scrollbar starting too low.
 
     // Use rectangle to draw border with rounded corners.
     frameVisible: false
@@ -60,6 +56,64 @@ TreeView {
         // Needed in order for rows to keep displaying rows after end of table entries.
         backgroundColor: parent.isLightColorScheme ? hifi.colors.tableRowLightEven : hifi.colors.tableRowDarkEven
         alternateBackgroundColor: parent.isLightColorScheme ? hifi.colors.tableRowLightOdd : hifi.colors.tableRowDarkOdd
+        
+        headerDelegate: Rectangle {
+            height: hifi.dimensions.tableHeaderHeight
+            color: isLightColorScheme ? hifi.colors.tableBackgroundLight : hifi.colors.tableBackgroundDark
+
+            RalewayRegular {
+                id: titleText
+                text: styleData.value
+                size: hifi.fontSizes.tableHeading
+                font.capitalization: Font.AllUppercase
+                color: hifi.colors.baseGrayHighlight
+                horizontalAlignment: (centerHeaderText ? Text.AlignHCenter : Text.AlignLeft)
+                elide: Text.ElideRight
+                anchors {
+                    left: parent.left
+                    leftMargin: hifi.dimensions.tablePadding
+                    right: sortIndicatorVisible && sortIndicatorColumn === styleData.column ? titleSort.left : parent.right
+                    rightMargin: hifi.dimensions.tablePadding
+                    verticalCenter: parent.verticalCenter
+                }
+            }
+
+            HiFiGlyphs {
+                id: titleSort
+                text:  sortIndicatorOrder == Qt.AscendingOrder ? hifi.glyphs.caratUp : hifi.glyphs.caratDn
+                color: isLightColorScheme ? hifi.colors.darkGray : hifi.colors.baseGrayHighlight
+                opacity: 0.6;
+                size: hifi.fontSizes.tableHeadingIcon
+                anchors {
+                    right: parent.right
+                    verticalCenter: titleText.verticalCenter
+                }
+                visible: sortIndicatorVisible && sortIndicatorColumn === styleData.column
+            }
+
+            Rectangle {
+                width: 1
+                anchors {
+                    left: parent.left
+                    top: parent.top
+                    topMargin: 1
+                    bottom: parent.bottom
+                    bottomMargin: 2
+                }
+                color: isLightColorScheme ? hifi.colors.lightGrayText : hifi.colors.baseGrayHighlight
+                visible: styleData.column > 0
+            }
+
+            Rectangle {
+                height: 1
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                    bottom: parent.bottom
+                }
+                color: isLightColorScheme ? hifi.colors.lightGrayText : hifi.colors.baseGrayHighlight
+            }
+        }
 
         branchDelegate: HiFiGlyphs {
             text: styleData.isExpanded ? hifi.glyphs.caratDn : hifi.glyphs.caratR
@@ -75,28 +129,53 @@ TreeView {
 
         handle: Item {
             id: scrollbarHandle
-            implicitWidth: 6
+            implicitWidth: hifi.dimensions.scrollbarHandleWidth
             Rectangle {
                 anchors {
                     fill: parent
-                    leftMargin: 2       // Move it right
-                    rightMargin: -2     // ""
-                    topMargin: 3        // Shrink vertically
+                    topMargin: treeView.headerVisible ? hifi.dimensions.tableHeaderHeight + 3 : 3
                     bottomMargin: 3     // ""
+                    leftMargin: 1       // Move it right
+                    rightMargin: -1     // ""
                 }
-                radius: 3
-                color: hifi.colors.tableScrollHandleDark
+                radius: hifi.dimensions.scrollbarHandleWidth / 2
+                color: treeView.isLightColorScheme ? hifi.colors.tableScrollHandleLight : hifi.colors.tableScrollHandleDark
             }
         }
 
         scrollBarBackground: Item {
-            implicitWidth: 9
+            implicitWidth: hifi.dimensions.scrollbarBackgroundWidth
             Rectangle {
                 anchors {
                     fill: parent
+                    topMargin: treeView.headerVisible ? hifi.dimensions.tableHeaderHeight - 1 : -1
                     margins: -1     // Expand
                 }
-                color: hifi.colors.tableBackgroundDark
+                color: treeView.isLightColorScheme ? hifi.colors.tableScrollBackgroundLight : hifi.colors.tableScrollBackgroundDark
+                
+                // Extend header color above scrollbar background
+                Rectangle {
+                    anchors {
+                        top: parent.top
+                        topMargin: -hifi.dimensions.tableHeaderHeight
+                        left: parent.left
+                        right: parent.right
+                    }
+                    height: hifi.dimensions.tableHeaderHeight
+                    color: treeView.isLightColorScheme ? hifi.colors.tableBackgroundLight : hifi.colors.tableBackgroundDark
+                    visible: treeView.headerVisible
+                }
+                Rectangle {
+                    // Extend header bottom border
+                    anchors {
+                        top: parent.top
+                        left: parent.left
+                        right: parent.right
+                    }
+                    height: 1
+                    color: treeView.isLightColorScheme ? hifi.colors.lightGrayText : hifi.colors.baseGrayHighlight
+                    visible: treeView.headerVisible
+                }
             }
         }
 
@@ -118,9 +197,7 @@ TreeView {
                    : (styleData.alternate ? hifi.colors.tableRowDarkEven : hifi.colors.tableRowDarkOdd)
     }
 
-    itemDelegate: Loader {
-        id: itemDelegateLoader
-
+    itemDelegate: FiraSansSemiBold {
         anchors {
             left: parent ? parent.left : undefined
             leftMargin: (2 + styleData.depth) * hifi.dimensions.tablePadding
@@ -129,83 +206,13 @@ TreeView {
             verticalCenter: parent ? parent.verticalCenter : undefined
         }
 
-        function getComponent() {
-            if (treeView.canEdit && styleData.selected) {
-                return textFieldComponent;
-            } else {
-                return labelComponent;
-            }
-
-        }
-        sourceComponent: getComponent()
-
-        Component {
-            id: labelComponent
-            FiraSansSemiBold {
-
-                text: styleData.value
-                size: hifi.fontSizes.tableText
-                color: colorScheme == hifi.colorSchemes.light
-                       ? (styleData.selected ? hifi.colors.black : hifi.colors.baseGrayHighlight)
-                       : (styleData.selected ? hifi.colors.black : hifi.colors.lightGrayText)
-            }
-        }
-        Component {
-            id: textFieldComponent
-
-            TextField {
-                id: textField
-                readOnly: !activeFocus
-
-                text: styleData.value
-
-                FontLoader { id: firaSansSemiBold; source: "../../fonts/FiraSans-SemiBold.ttf"; }
-                font.family: firaSansSemiBold.name
-                font.pixelSize: hifi.fontSizes.textFieldInput
-                height: hifi.dimensions.tableRowHeight
-
-                style: TextFieldStyle {
-                    textColor: readOnly
-                               ? hifi.colors.black
-                               : (treeView.isLightColorScheme ?  hifi.colors.black :  hifi.colors.white)
-                    background: Rectangle {
-                        visible: !readOnly
-                        color: treeView.isLightColorScheme ? hifi.colors.white : hifi.colors.black
-                        border.color: hifi.colors.primaryHighlight
-                        border.width: 1
-                    }
-                    selectedTextColor: hifi.colors.black
-                    selectionColor: hifi.colors.primaryHighlight
-                    padding.left: readOnly ? 0 : hifi.dimensions.textPadding
-                    padding.right: readOnly ? 0 : hifi.dimensions.textPadding
-                }
-
-                validator: RegExpValidator {
-                    regExp: /[^/]+/
-                }
-
-                Keys.onPressed: {
-                    if (event.key == Qt.Key_Escape) {
-                        text = styleData.value;
-                        unfocusHelper.forceActiveFocus();
-                        event.accepted = true;
-                    }
-                }
-                onAccepted:  {
-                    if (acceptableInput && styleData.selected) {
-                        if (!modifyEl(selection.currentIndex, text)) {
-                            text = styleData.value;
-                        }
-                        unfocusHelper.forceActiveFocus();
-                    }
-                }
-
-                onReadOnlyChanged: {
-                    // Have to explicily set keyboardRaised because automatic setting fails because readOnly is true at the time.
-                    keyboardRaised = activeFocus;
-                }
-            }
-        }
+        text: styleData.value
+        size: hifi.fontSizes.tableText
+        color: colorScheme == hifi.colorSchemes.light
+                ? (styleData.selected ? hifi.colors.black : hifi.colors.baseGrayHighlight)
+                : (styleData.selected ? hifi.colors.black : hifi.colors.lightGrayText)
+                       
+        elide: Text.ElideRight
     }
 
     Item {
@@ -215,10 +222,7 @@ TreeView {
 
     onDoubleClicked: isExpanded(index) ? collapse(index) : expand(index)
 
-    onActivated: {
-        var path = scriptsModel.data(index, 0x100)
-        if (path) {
-            loadScript(path)
-        }
+    onClicked: {
+        selectionModel.setCurrentIndex(index, ItemSelectionModel.ClearAndSelect);
     }
 }
diff --git a/interface/resources/qml/controls-uit/WebGlyphButton.qml b/interface/resources/qml/controls-uit/WebGlyphButton.qml
new file mode 100644
index 0000000000..15524e4188
--- /dev/null
+++ b/interface/resources/qml/controls-uit/WebGlyphButton.qml
@@ -0,0 +1,48 @@
+//
+//  GlyphButton.qml
+//
+//  Created by Vlad Stelmahovsky on 2017-06-21
+//  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
+//
+
+import QtQuick 2.5
+import QtQuick.Controls 1.4 as Original
+import QtQuick.Controls.Styles 1.4
+
+import "../styles-uit"
+
+Original.Button {
+    id: control
+
+    property int colorScheme: hifi.colorSchemes.light
+    property string glyph: ""
+    property int size: 32
+    //colors
+    readonly property color normalColor: "#AFAFAF"
+    readonly property color hoverColor: "#00B4EF"
+    readonly property color clickedColor: "#FFFFFF"
+    readonly property color disabledColor: "#575757"
+
+    style: ButtonStyle {
+        background: Item {}
+
+
+        label: HiFiGlyphs {
+            color: control.enabled ? (control.pressed ? control.clickedColor :
+                                                        (control.hovered ? control.hoverColor : control.normalColor)) :
+                                     control.disabledColor
+            verticalAlignment: Text.AlignVCenter
+            horizontalAlignment: Text.AlignHCenter
+            anchors {
+                // Tweak horizontal alignment so that it looks right.
+                left: parent.left
+                leftMargin: -0.5
+            }
+            text: control.glyph
+            size: control.size
+        }
+    }
+}
diff --git a/interface/resources/qml/controls-uit/WebSpinner.qml b/interface/resources/qml/controls-uit/WebSpinner.qml
index 6323bff1a7..e8e01c4865 100644
--- a/interface/resources/qml/controls-uit/WebSpinner.qml
+++ b/interface/resources/qml/controls-uit/WebSpinner.qml
@@ -9,10 +9,13 @@
 //
 
 import QtQuick 2.5
+import QtWebEngine 1.5
 
 AnimatedImage {
+    property WebEngineView webview: parent
     source: "../../icons/loader-snake-64-w.gif"
-    visible: parent.loading && /^(http.*|)$/i.test(parent.url.toString())
+    visible: webview.loading && /^(http.*|)$/i.test(webview.url.toString())
+    playing: visible
     z: 10000
     anchors {
         horizontalCenter: parent.horizontalCenter
diff --git a/interface/resources/qml/controls/FlickableWebViewCore.qml b/interface/resources/qml/controls/FlickableWebViewCore.qml
new file mode 100644
index 0000000000..29944781c1
--- /dev/null
+++ b/interface/resources/qml/controls/FlickableWebViewCore.qml
@@ -0,0 +1,138 @@
+import QtQuick 2.7
+import QtWebEngine 1.5
+import QtWebChannel 1.0
+
+import QtQuick.Controls 2.2
+
+import "../styles-uit" as StylesUIt
+
+Item {
+    id: flick
+
+    property alias url: webViewCore.url
+    property alias canGoBack: webViewCore.canGoBack
+    property alias webViewCore: webViewCore
+    property alias webViewCoreProfile: webViewCore.profile
+    property string webViewCoreUserAgent
+
+    property string userScriptUrl: ""
+    property string urlTag: "noDownload=false";
+
+    signal newViewRequestedCallback(var request)
+    signal loadingChangedCallback(var loadRequest)
+
+    property bool interactive: false
+
+    StylesUIt.HifiConstants {
+        id: hifi
+    }
+
+    function unfocus() {
+        webViewCore.runJavaScript("if (document.activeElement) document.activeElement.blur();", function(result) {
+            console.log('unfocus completed: ', result);
+        });
+    }
+
+    function onLoadingChanged(loadRequest) {
+        if (WebEngineView.LoadStartedStatus === loadRequest.status) {
+
+            // Required to support clicking on "hifi://" links
+            var url = loadRequest.url.toString();
+            url = (url.indexOf("?") >= 0) ? url + urlTag : url + "?" + urlTag;
+            if (urlHandler.canHandleUrl(url)) {
+                if (urlHandler.handleUrl(url)) {
+                    webViewCore.stop();
+                }
+            }
+        }
+
+        if (WebEngineView.LoadFailedStatus === loadRequest.status) {
+            console.log(" Tablet WebEngineView failed to load url: " + loadRequest.url.toString());
+        }
+
+        if (WebEngineView.LoadSucceededStatus === loadRequest.status) {
+            //disable Chromium's scroll bars
+        }
+    }
+
+    WebEngineView {
+        id: webViewCore
+
+        anchors.fill: parent
+
+        profile: HFWebEngineProfile;
+        settings.pluginsEnabled: true
+        settings.touchIconsEnabled: true
+        settings.allowRunningInsecureContent: true
+
+        // creates a global EventBridge object.
+        WebEngineScript {
+            id: createGlobalEventBridge
+            sourceCode: eventBridgeJavaScriptToInject
+            injectionPoint: WebEngineScript.DocumentCreation
+            worldId: WebEngineScript.MainWorld
+        }
+
+        // detects when to raise and lower virtual keyboard
+        WebEngineScript {
+            id: raiseAndLowerKeyboard
+            injectionPoint: WebEngineScript.Deferred
+            sourceUrl: resourceDirectoryUrl + "/html/raiseAndLowerKeyboard.js"
+            worldId: WebEngineScript.MainWorld
+        }
+
+        // User script.
+        WebEngineScript {
+            id: userScript
+            sourceUrl: flick.userScriptUrl
+            injectionPoint: WebEngineScript.DocumentReady  // DOM ready but page load may not be finished.
+            worldId: WebEngineScript.MainWorld
+        }
+
+        userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ]
+
+        property string newUrl: ""
+
+        Component.onCompleted: {
+            webChannel.registerObject("eventBridge", eventBridge);
+            webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
+            // Ensure the JS from the web-engine makes it to our logging
+            webViewCore.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
+                console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " +  message);
+            });
+            if (webViewCoreUserAgent !== undefined) {
+                webViewCore.profile.httpUserAgent = webViewCoreUserAgent
+            } else {
+                webViewCore.profile.httpUserAgent += " (HighFidelityInterface)";
+            }
+        }
+
+        onFeaturePermissionRequested: {
+            grantFeaturePermission(securityOrigin, feature, true);
+        }
+
+        //disable popup
+        onContextMenuRequested: {
+            request.accepted = true;
+        }
+
+        onNewViewRequested: {
+            newViewRequestedCallback(request)
+        }
+
+        onLoadingChanged: {
+            flick.onLoadingChanged(loadRequest)
+            loadingChangedCallback(loadRequest)
+        }
+    }
+
+    AnimatedImage {
+        //anchoring doesnt works here when changing content size
+        x: flick.width/2 - width/2
+        y: flick.height/2 - height/2
+        source: "../../icons/loader-snake-64-w.gif"
+        visible: webViewCore.loading && /^(http.*|)$/i.test(webViewCore.url.toString())
+        playing: visible
+        z: 10000
+    }
+}
diff --git a/interface/resources/qml/controls/RadioButton.qml b/interface/resources/qml/controls/RadioButton.qml
new file mode 100644
index 0000000000..6bd9c860d2
--- /dev/null
+++ b/interface/resources/qml/controls/RadioButton.qml
@@ -0,0 +1,17 @@
+import QtQuick.Controls 1.3 as Original
+import QtQuick.Controls.Styles 1.3
+import "../styles"
+import "."
+Original.RadioButton {
+    text: "Radio Button"
+    style: RadioButtonStyle {
+        indicator: FontAwesome {
+            text: control.checked ? "\uf046" : "\uf096"
+        }
+        label: Text {
+            text: control.text
+            renderType: Text.QtRendering
+        }
+    }
+
+}
diff --git a/interface/resources/qml/controls/TabletWebScreen.qml b/interface/resources/qml/controls/TabletWebScreen.qml
index 68f8226e21..501e321f0d 100644
--- a/interface/resources/qml/controls/TabletWebScreen.qml
+++ b/interface/resources/qml/controls/TabletWebScreen.qml
@@ -1,16 +1,20 @@
-import QtQuick 2.5
-import QtWebEngine 1.1
-import QtWebChannel 1.0
+import QtQuick 2.7
 import "../controls-uit" as HiFiControls
 
 Item {
-    property alias url: root.url
-    property alias scriptURL: root.userScriptUrl
-    property alias canGoBack: root.canGoBack;
-    property var goBack: root.goBack;
-    property alias urlTag: root.urlTag
+    id: root
+    property alias url: webroot.url
+    property alias scriptURL: webroot.userScriptUrl
+    property alias canGoBack: webroot.canGoBack;
+    property var goBack: webroot.webViewCore.goBack;
+    property alias urlTag: webroot.urlTag
     property bool keyboardEnabled: true  // FIXME - Keyboard HMD only: Default to false
     property bool keyboardRaised: false
+    onKeyboardRaisedChanged: {
+        if(!keyboardRaised) {
+            webroot.unfocus();
+        }
+    }
     property bool punctuationMode: false
 
     // FIXME - Keyboard HMD only: Make Interface either set keyboardRaised property directly in OffscreenQmlSurface
@@ -21,84 +25,20 @@ Item {
     }
     */
 
-    property alias viewProfile: root.profile
+    property alias viewProfile: webroot.webViewCoreProfile
 
-    WebEngineView {
-        id: root
-        objectName: "webEngineView"
-        x: 0
-        y: 0
+    FlickableWebViewCore {
+        id: webroot
         width: parent.width
         height: keyboardEnabled && keyboardRaised ? parent.height - keyboard.height : parent.height
 
-        profile: HFTabletWebEngineProfile;
-
-        property string userScriptUrl: ""
-
-        // creates a global EventBridge object.
-        WebEngineScript {
-            id: createGlobalEventBridge
-            sourceCode: eventBridgeJavaScriptToInject
-            injectionPoint: WebEngineScript.DocumentCreation
-            worldId: WebEngineScript.MainWorld
-        }
-
-        // detects when to raise and lower virtual keyboard
-        WebEngineScript {
-            id: raiseAndLowerKeyboard
-            injectionPoint: WebEngineScript.Deferred
-            sourceUrl: resourceDirectoryUrl + "/html/raiseAndLowerKeyboard.js"
-            worldId: WebEngineScript.MainWorld
-        }
-
-        // User script.
-        WebEngineScript {
-            id: userScript
-            sourceUrl: root.userScriptUrl
-            injectionPoint: WebEngineScript.DocumentReady  // DOM ready but page load may not be finished.
-            worldId: WebEngineScript.MainWorld
-        }
-        
-        property string urlTag: "noDownload=false";
-
-        userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ]
-
-        property string newUrl: ""
-        
-
-        Component.onCompleted: {
-            webChannel.registerObject("eventBridge", eventBridge);
-            webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
-            // Ensure the JS from the web-engine makes it to our logging
-            root.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
-                console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " +  message);
-            });
-
-            root.profile.httpUserAgent = "Mozilla/5.0 Chrome (HighFidelityInterface)";
-        }
-
-        onFeaturePermissionRequested: {
-            grantFeaturePermission(securityOrigin, feature, true);
-        }
-
-        onLoadingChanged: {
+        onLoadingChangedCallback: {
             keyboardRaised = false;
             punctuationMode = false;
             keyboard.resetShiftMode(false);
-
-            // Required to support clicking on "hifi://" links
-            if (WebEngineView.LoadStartedStatus == loadRequest.status) {
-                var url = loadRequest.url.toString();
-                url = (url.indexOf("?") >= 0) ? url + urlTag : url + "?" + urlTag;
-                if (urlHandler.canHandleUrl(url)) {
-                    if (urlHandler.handleUrl(url)) {
-                        root.stop();
-                    }
-                }
-            }
         }
 
-        onNewViewRequested:{
+        onNewViewRequestedCallback: {
             // desktop is not defined for web-entities or tablet
             if (typeof desktop !== "undefined") {
                 desktop.openBrowserWindow(request, profile);
@@ -107,7 +47,6 @@ Item {
             }
         }
 
-        HiFiControls.WebSpinner { }
     }
 
     HiFiControls.Keyboard {
@@ -120,5 +59,4 @@ Item {
             bottom: parent.bottom
         }
     }
-
 }
diff --git a/interface/resources/qml/controls/TabletWebView.qml b/interface/resources/qml/controls/TabletWebView.qml
index 0a5a68717e..477422cfa1 100644
--- a/interface/resources/qml/controls/TabletWebView.qml
+++ b/interface/resources/qml/controls/TabletWebView.qml
@@ -1,29 +1,32 @@
-import QtQuick 2.5
-import QtQuick.Controls 1.4
-import QtWebEngine 1.2
-import QtWebChannel 1.0
+import QtQuick 2.7
+import QtWebEngine 1.5
 import "../controls-uit" as HiFiControls
 import "../styles" as HifiStyles
 import "../styles-uit"
-import "../"
-import "."
 
 Item {
-    id: web
+    id: root
     HifiConstants { id: hifi }
-    width: parent.width
-    height: parent.height
+    width: parent !== null ? parent.width : undefined
+    height: parent !== null ? parent.height : undefined
     property var parentStackItem: null
     property int headerHeight: 70
     property string url
     property string scriptURL
     property bool keyboardEnabled: false
     property bool keyboardRaised: false
+    onKeyboardRaisedChanged: {
+        if(!keyboardRaised) {
+            webroot.unfocus();
+        }
+    }
     property bool punctuationMode: false
+    property bool passwordField: false
     property bool isDesktop: false
-    property alias webView: webview
-    property alias profile: webview.profile
+    property alias webView: web.webViewCore
+    property alias profile: web.webViewCoreProfile
     property bool remove: false
+    property bool closeButtonVisible: true
 
     // Manage own browse history because WebEngineView history is wiped when a new URL is loaded via
     // onNewViewRequested, e.g., as happens when a social media share button is clicked.
@@ -44,7 +47,7 @@ Item {
                 horizontalCenter: parent.horizontalCenter
             }
             spacing: 120
-            
+
             TabletWebButton {
                 id: back
                 enabledColor: hifi.colors.darkGray
@@ -64,6 +67,7 @@ Item {
                 disabledColor: hifi.colors.lightGrayText
                 enabled: true
                 text: "CLOSE"
+                visible: closeButtonVisible
 
                 MouseArea {
                     anchors.fill: parent
@@ -77,7 +81,7 @@ Item {
             color: hifi.colors.baseGray
             font.pixelSize: 12
             verticalAlignment: Text.AlignLeft
-            text: webview.url
+            text: root.url
             anchors {
                 top: nav.bottom
                 horizontalCenter: parent.horizontalCenter;
@@ -102,13 +106,13 @@ Item {
 
     function closeWebEngine() {
         if (remove) {
-            web.destroy();
+            root.destroy();
             return;
         }
         if (parentStackItem) {
             parentStackItem.pop();
         } else {
-            web.visible = false;
+            root.visible = false;
         }
     }
 
@@ -126,69 +130,19 @@ Item {
     }
 
     function loadUrl(url) {
-        webview.url = url
-        web.url = webview.url;
+        web.webViewCore.url = url
+        root.url = web.webViewCore.url;
     }
 
     onUrlChanged: {
         loadUrl(url);
     }
 
-    WebEngineView {
-        id: webview
-        objectName: "webEngineView"
-        x: 0
-        y: 0
+    FlickableWebViewCore {
+        id: web
         width: parent.width
-        height: keyboardEnabled && keyboardRaised ? parent.height - keyboard.height - web.headerHeight : parent.height - web.headerHeight
+        height: keyboardEnabled && keyboardRaised ? parent.height - keyboard.height - root.headerHeight : parent.height - root.headerHeight
         anchors.top: buttons.bottom
-        profile: HFTabletWebEngineProfile;
-
-        property string userScriptUrl: ""
-
-        // creates a global EventBridge object.
-        WebEngineScript {
-            id: createGlobalEventBridge
-            sourceCode: eventBridgeJavaScriptToInject
-            injectionPoint: WebEngineScript.DocumentCreation
-            worldId: WebEngineScript.MainWorld
-        }
-
-        // detects when to raise and lower virtual keyboard
-        WebEngineScript {
-            id: raiseAndLowerKeyboard
-            injectionPoint: WebEngineScript.Deferred
-            sourceUrl: resourceDirectoryUrl + "/html/raiseAndLowerKeyboard.js"
-            worldId: WebEngineScript.MainWorld
-        }
-
-        // User script.
-        WebEngineScript {
-            id: userScript
-            sourceUrl: webview.userScriptUrl
-            injectionPoint: WebEngineScript.DocumentReady  // DOM ready but page load may not be finished.
-            worldId: WebEngineScript.MainWorld
-        }
-
-        property string urlTag: "noDownload=false";
-        userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ]
-
-        property string newUrl: ""
-
-        Component.onCompleted: {
-            webChannel.registerObject("eventBridge", eventBridge);
-            webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
-            // Ensure the JS from the web-engine makes it to our logging
-            webview.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
-                console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " +  message);
-            });
-
-            webview.profile.httpUserAgent = "Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Mobile Safari/537.36";
-        }
-
-        onFeaturePermissionRequested: {
-            grantFeaturePermission(securityOrigin, feature, true);
-        }
 
         onUrlChanged: {
             // Record history, skipping null and duplicate items.
@@ -201,40 +155,27 @@ Item {
             }
         }
 
-        onLoadingChanged: {
+        onLoadingChangedCallback: {
             keyboardRaised = false;
             punctuationMode = false;
             keyboard.resetShiftMode(false);
-            // Required to support clicking on "hifi://" links
-            if (WebEngineView.LoadStartedStatus == loadRequest.status) {
-                var url = loadRequest.url.toString();
-                if (urlHandler.canHandleUrl(url)) {
-                    if (urlHandler.handleUrl(url)) {
-                        root.stop();
-                    }
-                }
-            }
-
-            if (WebEngineView.LoadFailedStatus == loadRequest.status) {
-                console.log(" Tablet WebEngineView failed to load url: " + loadRequest.url.toString());
-            }
-
-            if (WebEngineView.LoadSucceededStatus == loadRequest.status) {
-                webview.forceActiveFocus();
-            }
-        }
-        
-        onNewViewRequested: {
-            request.openIn(webview);
+            webViewCore.forceActiveFocus();
         }
 
-        HiFiControls.WebSpinner { }
+        onNewViewRequestedCallback: {
+            request.openIn(webViewCore);
+        }
     }
 
     HiFiControls.Keyboard {
         id: keyboard
         raised: parent.keyboardEnabled && parent.keyboardRaised
         numeric: parent.punctuationMode
+        password: parent.passwordField
+
+        onPasswordChanged: {
+            keyboard.mirroredText = "";
+        }
 
         anchors {
             left: parent.left
@@ -242,9 +183,9 @@ Item {
             bottom: parent.bottom
         }
     }
-    
+
     Component.onCompleted: {
-        web.isDesktop = (typeof desktop !== "undefined");
+        root.isDesktop = (typeof desktop !== "undefined");
         keyboardEnabled = HMD.active;
     }
 
diff --git a/interface/resources/qml/controls/WebView.qml b/interface/resources/qml/controls/WebView.qml
index 38136c7eec..931c64e1ef 100644
--- a/interface/resources/qml/controls/WebView.qml
+++ b/interface/resources/qml/controls/WebView.qml
@@ -1,17 +1,25 @@
-import QtQuick 2.5
-import QtWebEngine 1.1
-import QtWebChannel 1.0
+import QtQuick 2.7
 import "../controls-uit" as HiFiControls
 
 Item {
-    property alias url: root.url
-    property alias scriptURL: root.userScriptUrl
-    property alias canGoBack: root.canGoBack;
-    property var goBack: root.goBack;
-    property alias urlTag: root.urlTag
+    width: parent !== null ? parent.width : undefined
+    height: parent !== null ? parent.height : undefined
+
+    property alias url: webroot.url
+    property alias scriptURL: webroot.userScriptUrl
+    property alias canGoBack: webroot.canGoBack;
+    property var goBack: webroot.webViewCore.goBack;
+    property alias urlTag: webroot.urlTag
     property bool keyboardEnabled: true  // FIXME - Keyboard HMD only: Default to false
     property bool keyboardRaised: false
+    onKeyboardRaisedChanged: {
+        if(!keyboardRaised) {
+            webroot.unfocus();
+        }
+    }
     property bool punctuationMode: false
+    property bool passwordField: false
+    property alias flickable: webroot.interactive
 
     // FIXME - Keyboard HMD only: Make Interface either set keyboardRaised property directly in OffscreenQmlSurface
     // or provide HMDinfo object to QML in RenderableWebEntityItem and do the following.
@@ -21,83 +29,20 @@ Item {
     }
     */
 
-    property alias viewProfile: root.profile
+    property alias viewProfile: webroot.webViewCoreProfile
 
-    WebEngineView {
-        id: root
-        objectName: "webEngineView"
-        x: 0
-        y: 0
+    FlickableWebViewCore {
+        id: webroot
         width: parent.width
         height: keyboardEnabled && keyboardRaised ? parent.height - keyboard.height : parent.height
 
-        profile: HFWebEngineProfile;
-
-        property string userScriptUrl: ""
-
-        // creates a global EventBridge object.
-        WebEngineScript {
-            id: createGlobalEventBridge
-            sourceCode: eventBridgeJavaScriptToInject
-            injectionPoint: WebEngineScript.DocumentCreation
-            worldId: WebEngineScript.MainWorld
-        }
-
-        // detects when to raise and lower virtual keyboard
-        WebEngineScript {
-            id: raiseAndLowerKeyboard
-            injectionPoint: WebEngineScript.Deferred
-            sourceUrl: resourceDirectoryUrl + "/html/raiseAndLowerKeyboard.js"
-            worldId: WebEngineScript.MainWorld
-        }
-
-        // User script.
-        WebEngineScript {
-            id: userScript
-            sourceUrl: root.userScriptUrl
-            injectionPoint: WebEngineScript.DocumentReady  // DOM ready but page load may not be finished.
-            worldId: WebEngineScript.MainWorld
-        }
-        
-        property string urlTag: "noDownload=false";
-
-        userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ]
-
-        property string newUrl: ""
-
-        Component.onCompleted: {
-            webChannel.registerObject("eventBridge", eventBridge);
-            webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
-            // Ensure the JS from the web-engine makes it to our logging
-            root.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
-                console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " +  message);
-            });
-
-            root.profile.httpUserAgent = "Mozilla/5.0 Chrome (HighFidelityInterface)";
-        }
-
-        onFeaturePermissionRequested: {
-            grantFeaturePermission(securityOrigin, feature, true);
-        }
-
-        onLoadingChanged: {
+        onLoadingChangedCallback: {
             keyboardRaised = false;
             punctuationMode = false;
             keyboard.resetShiftMode(false);
-
-            // Required to support clicking on "hifi://" links
-            if (WebEngineView.LoadStartedStatus == loadRequest.status) {
-                var url = loadRequest.url.toString();
-                url = (url.indexOf("?") >= 0) ? url + urlTag : url + "?" + urlTag;
-                if (urlHandler.canHandleUrl(url)) {
-                    if (urlHandler.handleUrl(url)) {
-                        root.stop();
-                    }
-                }
-            }
         }
 
-        onNewViewRequested:{
+        onNewViewRequestedCallback: {
             // desktop is not defined for web-entities or tablet
             if (typeof desktop !== "undefined") {
                 desktop.openBrowserWindow(request, profile);
@@ -105,19 +50,17 @@ Item {
                 tabletRoot.openBrowserWindow(request, profile);
             }
         }
-
-        HiFiControls.WebSpinner { }
     }
 
     HiFiControls.Keyboard {
         id: keyboard
         raised: parent.keyboardEnabled && parent.keyboardRaised
         numeric: parent.punctuationMode
+        password: parent.passwordField
         anchors {
             left: parent.left
             right: parent.right
             bottom: parent.bottom
         }
     }
-
 }
diff --git a/interface/resources/qml/desktop/Desktop.qml b/interface/resources/qml/desktop/Desktop.qml
index 3dcf747113..847111b8a0 100644
--- a/interface/resources/qml/desktop/Desktop.qml
+++ b/interface/resources/qml/desktop/Desktop.qml
@@ -41,11 +41,31 @@ FocusScope {
     // when they're opened.
     signal showDesktop();
 
+    // This is for JS/QML communication, which is unused in the Desktop,
+    // but not having this here results in spurious warnings about a
+    // missing signal
+    signal sendToScript(var message);
+
     // Allows QML/JS to find the desktop through the parent chain
     property bool desktopRoot: true
 
     // The VR version of the primary menu
-    property var rootMenu: Menu { objectName: "rootMenu" }
+    property var rootMenu: Menu { 
+        objectName: "rootMenu" 
+
+        // for some reasons it is not possible to use just '({})' here as it gets empty when passed to TableRoot/DesktopRoot
+        property var exclusionGroupsByMenuItem : ListModel {}
+
+        function addExclusionGroup(menuItem, exclusionGroup)
+        {
+            exclusionGroupsByMenuItem.append(
+                {
+                    'menuItem' : menuItem.toString(), 
+                    'exclusionGroup' : exclusionGroup.toString()
+                }
+            );
+        }
+    }
 
     // FIXME: Alpha gradients display as fuschia under QtQuick 2.5 on OSX/AMD
     //        because shaders are 4.2, and do not include #version declarations.
@@ -68,7 +88,7 @@ FocusScope {
                 return;
             }
             var oldRecommendedRect = recommendedRect;
-            var newRecommendedRectJS = (typeof Controller === "undefined") ? Qt.rect(0,0,0,0) : Controller.getRecommendedOverlayRect();
+            var newRecommendedRectJS = (typeof Controller === "undefined") ? Qt.rect(0,0,0,0) : Controller.getRecommendedHUDRect();
             var newRecommendedRect = Qt.rect(newRecommendedRectJS.x, newRecommendedRectJS.y,
                                     newRecommendedRectJS.width,
                                     newRecommendedRectJS.height);
@@ -251,7 +271,7 @@ FocusScope {
 
             var oldRecommendedRect = recommendedRect;
             var oldRecommendedDimmensions = { x: oldRecommendedRect.width, y: oldRecommendedRect.height };
-            var newRecommendedRect = Controller.getRecommendedOverlayRect();
+            var newRecommendedRect = Controller.getRecommendedHUDRect();
             var newRecommendedDimmensions = { x: newRecommendedRect.width, y: newRecommendedRect.height };
             var windows = d.getTopLevelWindows();
             for (var i = 0; i < windows.length; ++i) {
@@ -278,6 +298,27 @@ FocusScope {
         pinned = !pinned
     }
 
+    function isPointOnWindow(point) {
+        for (var i = 0; i < desktop.visibleChildren.length; i++) {
+            var child = desktop.visibleChildren[i];
+            if (child.hasOwnProperty("modality")) {
+                var mappedPoint = mapToItem(child, point.x, point.y);
+                if (child.hasOwnProperty("frame")) {
+                    var outLine = child.frame.children[2];
+                    var framePoint = outLine.mapFromGlobal(point.x, point.y);
+                    if (outLine.contains(framePoint)) {
+                        return true;
+                    }
+                }
+
+                if (child.contains(mappedPoint)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
     function setPinned(newPinned) {
         pinned = newPinned
     }
@@ -373,7 +414,7 @@ FocusScope {
             return;
         }
 
-        var newRecommendedRectJS = (typeof Controller === "undefined") ? Qt.rect(0,0,0,0) : Controller.getRecommendedOverlayRect();
+        var newRecommendedRectJS = (typeof Controller === "undefined") ? Qt.rect(0,0,0,0) : Controller.getRecommendedHUDRect();
         var newRecommendedRect = Qt.rect(newRecommendedRectJS.x, newRecommendedRectJS.y,
                                 newRecommendedRectJS.width,
                                 newRecommendedRectJS.height);
@@ -405,7 +446,7 @@ FocusScope {
 
         var oldRecommendedRect = recommendedRect;
         var oldRecommendedDimmensions = { x: oldRecommendedRect.width, y: oldRecommendedRect.height };
-        var newRecommendedRect = Controller.getRecommendedOverlayRect();
+        var newRecommendedRect = Controller.getRecommendedHUDRect();
         var newRecommendedDimmensions = { x: newRecommendedRect.width, y: newRecommendedRect.height };
         repositionWindow(targetWindow, false, oldRecommendedRect, oldRecommendedDimmensions, newRecommendedRect, newRecommendedDimmensions);
     }
@@ -422,7 +463,7 @@ FocusScope {
             return;
         }
 
-        var recommended = Controller.getRecommendedOverlayRect();
+        var recommended = Controller.getRecommendedHUDRect();
         var maxX = recommended.x + recommended.width;
         var maxY = recommended.y + recommended.height;
         var newPosition = Qt.vector2d(targetWindow.x, targetWindow.y);
diff --git a/interface/resources/qml/dialogs/FileDialog.qml b/interface/resources/qml/dialogs/FileDialog.qml
index 106e067968..b9633104d5 100644
--- a/interface/resources/qml/dialogs/FileDialog.qml
+++ b/interface/resources/qml/dialogs/FileDialog.qml
@@ -486,9 +486,9 @@ ModalWindow {
             model: filesModel
 
             function updateSort() {
-                model.sortOrder = sortIndicatorOrder;
-                model.sortColumn = sortIndicatorColumn;
-                model.update();
+                fileTableModel.sortOrder = sortIndicatorOrder;
+                fileTableModel.sortColumn = sortIndicatorColumn;
+                fileTableModel.update();
             }
 
             onSortIndicatorColumnChanged: { updateSort(); }
diff --git a/interface/resources/qml/dialogs/TabletFileDialog.qml b/interface/resources/qml/dialogs/TabletFileDialog.qml
index 9e1d0a9f5a..d3b738469e 100644
--- a/interface/resources/qml/dialogs/TabletFileDialog.qml
+++ b/interface/resources/qml/dialogs/TabletFileDialog.qml
@@ -484,9 +484,9 @@ TabletModalWindow {
             model: filesModel
 
             function updateSort() {
-                model.sortOrder = sortIndicatorOrder;
-                model.sortColumn = sortIndicatorColumn;
-                model.update();
+                fileTableModel.sortOrder = sortIndicatorOrder;
+                fileTableModel.sortColumn = sortIndicatorColumn;
+                fileTableModel.update();
             }
 
             onSortIndicatorColumnChanged: { updateSort(); }
diff --git a/interface/resources/qml/dialogs/TabletLoginDialog.qml b/interface/resources/qml/dialogs/TabletLoginDialog.qml
index 36ca480b24..269788a808 100644
--- a/interface/resources/qml/dialogs/TabletLoginDialog.qml
+++ b/interface/resources/qml/dialogs/TabletLoginDialog.qml
@@ -16,48 +16,68 @@ import "../controls-uit"
 import "../styles-uit"
 import "../windows"
 
+import "../LoginDialog"
+
 TabletModalWindow {
-    id: loginDialogRoot
+    id: realRoot
     objectName: "LoginDialog"
 
     signal sendToScript(var message);
     property bool isHMD: false
     property bool gotoPreviousApp: false;
     color: hifi.colors.baseGray
+    title: qsTr("Sign in to High Fidelity")
+    property alias titleWidth: root.titleWidth
+    property alias punctuationMode: root.punctuationMode
+
+    //fake root for shared components expecting root here
+    property var root: QtObject {
+        id: root
+
+        property bool keyboardEnabled: false
+        property bool keyboardRaised: false
+        property bool punctuationMode: false
+        property bool isPassword: false
+        property alias text: loginKeyboard.mirroredText
+
+        readonly property bool isTablet: true
+
+        property alias title: realRoot.title
+        property real width: realRoot.width
+        property real height: realRoot.height
+
+        property int titleWidth: 0
+        property string iconText: hifi.glyphs.avatar
+        property int iconSize: 35
+
+        property var pane: QtObject {
+            property real width: root.width
+            property real height: root.height
+        }
+
+        function tryDestroy() {
+            canceled()
+        }
+    }
+
+    //property int colorScheme: hifi.colorSchemes.dark
 
-    property int colorScheme: hifi.colorSchemes.dark
-    property int titleWidth: 0
-    property string iconText: ""
-    property int icon: hifi.icons.none
-    property int iconSize: 35
     MouseArea {
-        width: parent.width
-        height: parent.height
+        width: realRoot.width
+        height: realRoot.height
     }
 
     property bool keyboardOverride: true
-    onIconChanged: updateIcon();
 
     property var items;
     property string label: ""
 
-    onTitleWidthChanged: d.resize();
+    //onTitleWidthChanged: d.resize();
 
-    property bool keyboardEnabled: false
-    property bool keyboardRaised: false
-    property bool punctuationMode: false
-
-    onKeyboardRaisedChanged: d.resize();
+    //onKeyboardRaisedChanged: d.resize();
 
     signal canceled();
 
-    function updateIcon() {
-        if (!root) {
-            return;
-        }
-        iconText = hifi.glyphForIcon(root.icon);
-    }
-
     property alias bodyLoader: bodyLoader
     property alias loginDialog: loginDialog
     property alias hifi: hifi
@@ -65,9 +85,10 @@ TabletModalWindow {
     HifiConstants { id: hifi }
 
     onCanceled: {
-        if (loginDialogRoot.Stack.view) {
-            loginDialogRoot.Stack.view.pop();
-        } else if (gotoPreviousApp) {
+        if (bodyLoader.active === true) {
+            //bodyLoader.active = false
+        }
+        if (gotoPreviousApp) {
             var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
             tablet.returnToPreviousApp();
         } else {
@@ -75,45 +96,82 @@ TabletModalWindow {
         }
     }
 
-    LoginDialog {
-        id: loginDialog
-        width: parent.width
-        height: parent.height
-        StackView {
-            id: bodyLoader
-            property var item: currentItem
-            property var props
-            property string source: ""
+    TabletModalFrame {
+        id: mfRoot
 
-            onCurrentItemChanged: {
-                //cleanup source for future usage
-                source = ""
+        width: root.width
+        height: root.height + frameMarginTop + hifi.dimensions.contentMargin.x
+
+        anchors {
+            horizontalCenter: parent.horizontalCenter
+            verticalCenter: parent.verticalCenter
+            verticalCenterOffset: -loginKeyboard.height / 2
+        }
+
+        LoginDialog {
+            id: loginDialog
+
+            anchors {
+                fill: parent
+                topMargin: parent.frameMarginTop
+                leftMargin: hifi.dimensions.contentMargin.x
+                rightMargin: hifi.dimensions.contentMargin.x
+                horizontalCenter: parent.horizontalCenter
             }
 
-            function setSource(src, props) {
-                source = "../TabletLoginDialog/" + src
-                bodyLoader.props = props
-            }
-            function popup() {
-                bodyLoader.pop()
-
-                //check if last screen, if yes, dialog is popped out
-                if (depth === 1)
-                    loginDialogRoot.canceled()
-            }
-
-            anchors.fill: parent
-            anchors.margins: 10
-            onSourceChanged: {
-                if (source !== "") {
-                    bodyLoader.push(Qt.resolvedUrl(source), props)
-                }
-            }
-            Component.onCompleted: {
-                setSource(loginDialog.isSteamRunning() ?
-                              "SignInBody.qml" :
-                              "LinkAccountBody.qml")
+            Loader {
+                id: bodyLoader
+                anchors.fill: parent
+                anchors.horizontalCenter: parent.horizontalCenter
+                source: loginDialog.isSteamRunning() ? "../LoginDialog/SignInBody.qml" : "../LoginDialog/LinkAccountBody.qml"
             }
         }
     }
+
+    Keyboard {
+        id: loginKeyboard
+        raised: root.keyboardEnabled && root.keyboardRaised
+        numeric: root.punctuationMode
+        password: root.isPassword
+        anchors {
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+        }
+    }
+
+    Keys.onPressed: {
+        if (!visible) {
+            return
+        }
+
+        if (event.modifiers === Qt.ControlModifier)
+            switch (event.key) {
+            case Qt.Key_A:
+                event.accepted = true
+                detailedText.selectAll()
+                break
+            case Qt.Key_C:
+                event.accepted = true
+                detailedText.copy()
+                break
+            case Qt.Key_Period:
+                if (Qt.platform.os === "osx") {
+                    event.accepted = true
+                    content.reject()
+                }
+                break
+        } else switch (event.key) {
+            case Qt.Key_Escape:
+            case Qt.Key_Back:
+                event.accepted = true
+                destroy()
+                break
+
+            case Qt.Key_Enter:
+            case Qt.Key_Return:
+                event.accepted = true
+                break
+        }
+    }
 }
diff --git a/interface/resources/qml/dialogs/preferences/AvatarBrowser.qml b/interface/resources/qml/dialogs/preferences/AvatarBrowser.qml
index e2a012ad46..5949adffca 100644
--- a/interface/resources/qml/dialogs/preferences/AvatarBrowser.qml
+++ b/interface/resources/qml/dialogs/preferences/AvatarBrowser.qml
@@ -33,7 +33,7 @@ Window {
 
         BaseWebView {
             id: webview
-            url: "https://metaverse.highfidelity.com/marketplace?category=avatars"
+            url: Account.metaverseServerURL + "/marketplace?category=avatars"
             focus: true
 
             anchors {
diff --git a/interface/resources/qml/dialogs/preferences/ButtonPreference.qml b/interface/resources/qml/dialogs/preferences/ButtonPreference.qml
index 06332bd1be..3a5c850031 100644
--- a/interface/resources/qml/dialogs/preferences/ButtonPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/ButtonPreference.qml
@@ -9,6 +9,7 @@
 //
 
 import QtQuick 2.5
+import TabletScriptingInterface 1.0
 
 import "../../controls-uit"
 
@@ -22,7 +23,16 @@ Preference {
 
     Button {
         id: button
-        onClicked: preference.trigger()
+        onHoveredChanged: {
+            if (hovered) {
+                tabletInterface.playSound(TabletEnums.ButtonHover);
+            }
+        }
+
+        onClicked: {
+            preference.trigger();
+            tabletInterface.playSound(TabletEnums.ButtonClick);
+        }
         width: 180
         anchors.bottom: parent.bottom
     }
diff --git a/interface/resources/qml/dialogs/preferences/CheckBoxPreference.qml b/interface/resources/qml/dialogs/preferences/CheckBoxPreference.qml
index f8f992735c..8904896ab7 100644
--- a/interface/resources/qml/dialogs/preferences/CheckBoxPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/CheckBoxPreference.qml
@@ -9,6 +9,7 @@
 //
 
 import QtQuick 2.5
+import TabletScriptingInterface 1.0
 
 import "../../controls-uit"
 
@@ -38,6 +39,16 @@ Preference {
 
     CheckBox {
         id: checkBox
+        onHoveredChanged: {
+            if (hovered) {
+                tabletInterface.playSound(TabletEnums.ButtonHover);
+            }
+        }
+
+        onClicked: {
+            tabletInterface.playSound(TabletEnums.ButtonClick);
+        }
+
         anchors {
             top: spacer.bottom
             left: parent.left
diff --git a/interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml b/interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml
new file mode 100644
index 0000000000..cfc2e94ed9
--- /dev/null
+++ b/interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml
@@ -0,0 +1,101 @@
+//
+//  PrimaryHandPreference.qml
+//
+//  Created by Cain Kilgore on 20th July 2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+import QtQuick 2.5
+
+import "../../controls-uit"
+
+Preference {
+    id: root
+    property alias box1: box1
+    property alias box2: box2
+    
+    height: control.height + hifi.dimensions.controlInterlineHeight
+
+    Component.onCompleted: {
+        if (preference.value == "left") {
+            box1.checked = true;
+        } else {
+            box2.checked = true;
+        }
+    }
+
+    function save() {
+        if (box1.checked && !box2.checked) {
+            preference.value = "left";
+        }
+        if (!box1.checked && box2.checked) {
+            preference.value = "right";
+        }
+        preference.save();
+    }
+
+    Item {
+        id: control
+        anchors {
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+        }
+        height: Math.max(labelName.height, box1.height, box2.height)
+
+        Label {
+            id: labelName
+            text: root.label + ":"
+            colorScheme: hifi.colorSchemes.dark
+            anchors {
+                left: parent.left
+                right: box1.left
+                rightMargin: hifi.dimensions.labelPadding
+                verticalCenter: parent.verticalCenter
+            }
+            horizontalAlignment: Text.AlignRight
+            wrapMode: Text.Wrap
+        }
+
+        RadioButton {
+            id: box1
+            text: "Left"
+            width: 60
+            anchors {
+                right: box2.left
+                verticalCenter: parent.verticalCenter
+            }
+            onClicked: {
+                if (box2.checked) {
+                    box2.checked = false;
+                }
+                if (!box1.checked && !box2.checked) {
+                    box1.checked = true;
+                }
+            }
+            colorScheme: hifi.colorSchemes.dark
+        }
+        
+        RadioButton {
+            id: box2
+            text: "Right"
+            width: 60
+            anchors {
+                right: parent.right
+                verticalCenter: parent.verticalCenter
+            }
+            onClicked: {
+                if (box1.checked) {
+                    box1.checked = false;
+                }
+                if (!box1.checked && !box2.checked) {
+                    box2.checked = true;
+                }
+            }
+            colorScheme: hifi.colorSchemes.dark
+        }
+    }
+}
diff --git a/interface/resources/qml/dialogs/preferences/Section.qml b/interface/resources/qml/dialogs/preferences/Section.qml
index a813dc6b5f..4a16036a69 100644
--- a/interface/resources/qml/dialogs/preferences/Section.qml
+++ b/interface/resources/qml/dialogs/preferences/Section.qml
@@ -72,6 +72,8 @@ Preference {
         property var avatarBuilder: Component { AvatarPreference { } }
         property var buttonBuilder: Component { ButtonPreference { } }
         property var comboBoxBuilder: Component { ComboBoxPreference { } }
+        property var spinnerSliderBuilder: Component { SpinnerSliderPreference { } }
+        property var primaryHandBuilder: Component { PrimaryHandPreference { } }
         property var preferences: []
         property int checkBoxCount: 0
 
@@ -86,7 +88,7 @@ Preference {
         }
 
         function buildPreference(preference) {
-            console.log("\tPreference type " + preference.type + " name " + preference.name)
+            console.log("\tPreference type " + preference.type + " name " + preference.name);
             var builder;
             switch (preference.type) {
                 case Preference.Editable:
@@ -128,6 +130,16 @@ Preference {
                     checkBoxCount = 0;
                     builder = comboBoxBuilder;
                     break;
+
+                case Preference.SpinnerSlider:
+                    checkBoxCount = 0;
+                    builder = spinnerSliderBuilder;
+                    break;
+                    
+                case Preference.PrimaryHand:
+                    checkBoxCount++;
+                    builder = primaryHandBuilder;
+                    break;
             };
 
             if (builder) {
diff --git a/interface/resources/qml/dialogs/preferences/SpinnerSliderPreference.qml b/interface/resources/qml/dialogs/preferences/SpinnerSliderPreference.qml
new file mode 100644
index 0000000000..3cba67bc82
--- /dev/null
+++ b/interface/resources/qml/dialogs/preferences/SpinnerSliderPreference.qml
@@ -0,0 +1,111 @@
+//
+//  SpinnerSliderPreference.qml
+//
+//  Created by Cain Kilgore on 11th July 2017
+//  Copyright 2016 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 QtQuick 2.5
+
+import "../../dialogs"
+import "../../controls-uit"
+
+Preference {
+    id: root
+    property alias slider: slider
+    property alias spinner: spinner
+    height: control.height + hifi.dimensions.controlInterlineHeight
+
+    Component.onCompleted: {
+        slider.value = preference.value;
+        spinner.value = preference.value;
+    }
+
+    function save() {
+        preference.value = slider.value;
+        preference.save();
+    }
+
+    Item {
+        id: control
+        anchors {
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+        }
+        height: Math.max(labelText.height, slider.height, spinner.height, button.height)
+
+        Label {
+            id: labelText
+            text: root.label + ":"
+            colorScheme: hifi.colorSchemes.dark
+            anchors {
+                left: parent.left
+                right: slider.left
+                rightMargin: hifi.dimensions.labelPadding
+                verticalCenter: parent.verticalCenter
+            }
+            horizontalAlignment: Text.AlignRight
+            wrapMode: Text.Wrap
+        }
+
+        Slider {
+            id: slider
+            value: preference.value
+            width: 100
+            minimumValue: MyAvatar.getDomainMinScale()
+            maximumValue: MyAvatar.getDomainMaxScale()
+            stepSize: preference.step
+            onValueChanged: {
+                spinner.value = value
+            }
+            anchors {
+                right: spinner.left
+                rightMargin: 10
+                verticalCenter: parent.verticalCenter
+            }
+            colorScheme: hifi.colorSchemes.dark
+        }
+        
+        SpinBox {
+            id: spinner
+            decimals: preference.decimals
+            value: preference.value
+            minimumValue: MyAvatar.getDomainMinScale()
+            maximumValue: MyAvatar.getDomainMaxScale()
+            width: 100
+            onValueChanged: {
+                slider.value = value;
+            }
+            anchors {
+                right: button.left
+                rightMargin: 10
+                verticalCenter: parent.verticalCenter
+            }
+            colorScheme: hifi.colorSchemes.dark
+        }
+
+        GlyphButton {
+            id: button
+            onClicked: {
+                if (spinner.maximumValue >= 1) {
+                    spinner.value = 1
+                    slider.value = 1
+                } else {
+                    spinner.value = spinner.maximumValue
+                    slider.value = spinner.maximumValue
+                }
+            }
+            width: 30
+            glyph: hifi.glyphs.reload
+            anchors {
+                right: parent.right
+                verticalCenter: parent.verticalCenter
+            }
+            colorScheme: hifi.colorSchemes.dark
+        }
+    }
+}
\ No newline at end of file
diff --git a/interface/resources/qml/AssetServer.qml b/interface/resources/qml/hifi/AssetServer.qml
similarity index 53%
rename from interface/resources/qml/AssetServer.qml
rename to interface/resources/qml/hifi/AssetServer.qml
index eb47afc951..37c3c2adab 100644
--- a/interface/resources/qml/AssetServer.qml
+++ b/interface/resources/qml/hifi/AssetServer.qml
@@ -10,15 +10,16 @@
 
 import QtQuick 2.5
 import QtQuick.Controls 1.4
+import QtQuick.Controls.Styles 1.4
 import QtQuick.Dialogs 1.2 as OriginalDialogs
 import Qt.labs.settings 1.0
 
-import "styles-uit"
-import "controls-uit" as HifiControls
-import "windows"
-import "dialogs"
+import "../styles-uit"
+import "../controls-uit" as HifiControls
+import "../windows" as Windows
+import "../dialogs"
 
-ScrollingWindow {
+Windows.ScrollingWindow {
     id: root
     objectName: "AssetServer"
     title: "Asset Browser"
@@ -28,6 +29,7 @@ ScrollingWindow {
     minSize: Qt.vector2d(200, 300)
 
     property int colorScheme: hifi.colorSchemes.dark
+    property int selectionMode: SelectionMode.ExtendedSelection
 
     HifiConstants { id: hifi }
 
@@ -35,6 +37,7 @@ ScrollingWindow {
     property var assetProxyModel: Assets.proxyModel;
     property var assetMappingsModel: Assets.mappingModel;
     property var currentDirectory;
+    property var selectedItems: treeView.selection.selectedIndexes.length;
 
     Settings {
         category: "Overlay.AssetServer"
@@ -46,9 +49,32 @@ ScrollingWindow {
     Component.onCompleted: {
         ApplicationInterface.uploadRequest.connect(uploadClicked);
         assetMappingsModel.errorGettingMappings.connect(handleGetMappingsError);
+        assetMappingsModel.autoRefreshEnabled = true;
+
         reload();
     }
 
+    Component.onDestruction: {
+        assetMappingsModel.autoRefreshEnabled = false;
+    }
+    
+    function letterbox(headerGlyph, headerText, message) {
+        letterboxMessage.headerGlyph = headerGlyph;
+        letterboxMessage.headerText = headerText;
+        letterboxMessage.text = message;
+        letterboxMessage.visible = true;
+        letterboxMessage.popupRadius = 0;
+    }
+
+    function errorMessageBox(message) {
+        return desktop.messageBox({
+            icon: hifi.icons.warning,
+            defaultButton: OriginalDialogs.StandardButton.Ok,
+            title: "Error",
+            text: message
+        });
+    }
+
     function doDeleteFile(path) {
         console.log("Deleting " + path);
 
@@ -68,11 +94,11 @@ ScrollingWindow {
 
     function doRenameFile(oldPath, newPath) {
 
-        if (newPath[0] != "/") {
+        if (newPath[0] !== "/") {
             newPath = "/" + newPath;
         }
 
-        if (oldPath[oldPath.length - 1] == '/' && newPath[newPath.length - 1] != '/') {
+        if (oldPath[oldPath.length - 1] === '/' && newPath[newPath.length - 1] != '/') {
             // this is a folder rename but the user neglected to add a trailing slash when providing a new path
             newPath = newPath + "/";
         }
@@ -118,11 +144,23 @@ ScrollingWindow {
 
     function canAddToWorld(path) {
         var supportedExtensions = [/\.fbx\b/i, /\.obj\b/i];
+        
+        if (selectedItems > 1) {
+            return false;
+        }
 
         return supportedExtensions.reduce(function(total, current) {
             return total | new RegExp(current).test(path);
         }, false);
     }
+    
+    function canRename() {    
+        if (treeView.selection.hasSelection && selectedItems == 1) {
+            return true;
+        } else {
+            return false;
+        }
+    }
 
     function clear() {
         Assets.mappingModel.clear();
@@ -130,14 +168,10 @@ ScrollingWindow {
 
     function reload() {
         Assets.mappingModel.refresh();
-        treeView.selection.clear();
     }
 
     function handleGetMappingsError(errorString) {
-        errorMessageBox(
-            "There was a problem retreiving the list of assets from your Asset Server.\n"
-            + errorString
-        );
+        errorMessageBox("There was a problem retrieving the list of assets from your Asset Server.\n" + errorString);
     }
 
     function addToWorld() {
@@ -151,13 +185,17 @@ ScrollingWindow {
         var SHAPE_TYPE_SIMPLE_HULL = 1;
         var SHAPE_TYPE_SIMPLE_COMPOUND = 2;
         var SHAPE_TYPE_STATIC_MESH = 3;
-
+        var SHAPE_TYPE_BOX = 4;
+        var SHAPE_TYPE_SPHERE = 5;
+        
         var SHAPE_TYPES = [];
         SHAPE_TYPES[SHAPE_TYPE_NONE] = "No Collision";
         SHAPE_TYPES[SHAPE_TYPE_SIMPLE_HULL] = "Basic - Whole model";
         SHAPE_TYPES[SHAPE_TYPE_SIMPLE_COMPOUND] = "Good - Sub-meshes";
         SHAPE_TYPES[SHAPE_TYPE_STATIC_MESH] = "Exact - All polygons";
-
+        SHAPE_TYPES[SHAPE_TYPE_BOX] = "Box";
+        SHAPE_TYPES[SHAPE_TYPE_SPHERE] = "Sphere";
+        
         var SHAPE_TYPE_DEFAULT = SHAPE_TYPE_STATIC_MESH;
         var DYNAMIC_DEFAULT = false;
         var prompt = desktop.customInputDialog({
@@ -196,6 +234,12 @@ ScrollingWindow {
                     case SHAPE_TYPE_STATIC_MESH:
                         shapeType = "static-mesh";
                         break;
+                    case SHAPE_TYPE_BOX:
+                        shapeType = "box";
+                        break;
+                    case SHAPE_TYPE_SPHERE:
+                        shapeType = "sphere";
+                        break;
                     default:
                         shapeType = "none";
                 }
@@ -276,7 +320,7 @@ ScrollingWindow {
         object.selected.connect(function(destinationPath) {
             destinationPath = destinationPath.trim();
 
-            if (path == destinationPath) {
+            if (path === destinationPath) {
                 return;
             }
             if (fileExists(destinationPath)) {
@@ -289,23 +333,37 @@ ScrollingWindow {
         });
     }
     function deleteFile(index) {
+        var path = [];
+        
         if (!index) {
-            index = treeView.selection.currentIndex;
+            for (var i = 0; i < selectedItems; i++) {
+                 treeView.selection.setCurrentIndex(treeView.selection.selectedIndexes[i], 0x100);
+                 index = treeView.selection.currentIndex;
+                 path[i] = assetProxyModel.data(index, 0x100);                  
+            }
         }
-        var path = assetProxyModel.data(index, 0x100);
+        
         if (!path) {
             return;
         }
 
+        var modalMessage = "";
+        var items = selectedItems.toString();
         var isFolder = assetProxyModel.data(treeView.selection.currentIndex, 0x101);
         var typeString = isFolder ? 'folder' : 'file';
-
+        
+        if (selectedItems > 1) {
+            modalMessage = "You are about to delete " + items + " items \nDo you want to continue?";
+        } else {
+            modalMessage = "You are about to delete the following " + typeString + ":\n" + path + "\nDo you want to continue?";
+        }
+        
         var object = desktop.messageBox({
             icon: hifi.icons.question,
             buttons: OriginalDialogs.StandardButton.Yes + OriginalDialogs.StandardButton.No,
             defaultButton: OriginalDialogs.StandardButton.Yes,
             title: "Delete",
-            text: "You are about to delete the following " + typeString + ":\n" + path + "\nDo you want to continue?"
+            text: modalMessage
         });
         object.selected.connect(function(button) {
             if (button === OriginalDialogs.StandardButton.Yes) {
@@ -323,7 +381,7 @@ ScrollingWindow {
         running: false
     }
 
-    property var uploadOpen: false;
+    property bool uploadOpen: false;
     Timer {
         id: timer
     }
@@ -404,19 +462,16 @@ ScrollingWindow {
             });
         }
     }
-
-    function errorMessageBox(message) {
-        return desktop.messageBox({
-            icon: hifi.icons.warning,
-            defaultButton: OriginalDialogs.StandardButton.Ok,
-            title: "Error",
-            text: message
-        });
-    }
-
+    
     Item {
         width: pane.contentWidth
         height: pane.height
+        
+        // The letterbox used for popup messages
+        LetterboxMessage {
+            id: letterboxMessage;
+            z: 999; // Force the popup on top of everything else
+        }
 
         HifiControls.ContentSection {
             id: assetDirectory
@@ -426,23 +481,13 @@ ScrollingWindow {
             HifiControls.VerticalSpacer {}
 
             Row {
-                id: buttonRow
                 anchors.left: parent.left
                 anchors.right: parent.right
                 spacing: hifi.dimensions.contentSpacing.x
 
-                HifiControls.GlyphButton {
-                    glyph: hifi.glyphs.reload
-                    color: hifi.buttons.black
-                    colorScheme: root.colorScheme
-                    width: hifi.dimensions.controlLineHeight
-
-                    onClicked: root.reload()
-                }
-
                 HifiControls.Button {
                     text: "Add To World"
-                    color: hifi.buttons.black
+                    color: hifi.buttons.blue
                     colorScheme: root.colorScheme
                     width: 120
 
@@ -458,7 +503,7 @@ ScrollingWindow {
                     width: 80
 
                     onClicked: root.renameFile()
-                    enabled: treeView.selection.hasSelection
+                    enabled: canRename()
                 }
 
                 HifiControls.Button {
@@ -473,7 +518,235 @@ ScrollingWindow {
                     enabled: treeView.selection.hasSelection
                 }
             }
+        }
 
+        HifiControls.Tree {
+            id: treeView
+            anchors.top: assetDirectory.bottom
+            anchors.bottom: infoRow.top
+            anchors.bottomMargin: 2 * hifi.dimensions.contentSpacing.y
+            anchors.margins: hifi.dimensions.contentMargin.x + 2  // Extra for border
+            anchors.left: parent.left
+            anchors.right: parent.right
+            
+            treeModel: assetProxyModel
+            selectionMode: SelectionMode.ExtendedSelection
+            headerVisible: true
+            sortIndicatorVisible: true
+
+            colorScheme: root.colorScheme
+
+            modifyEl: renameEl
+
+            TableViewColumn {
+                id: nameColumn
+                title: "Name:"
+                role: "name"
+                width: treeView.width - bakedColumn.width;
+            }
+            TableViewColumn {
+                id: bakedColumn
+                title: "Use Baked?"
+                role: "baked"
+                width: 100
+            }
+    
+            itemDelegate: Loader {
+                id: itemDelegateLoader
+
+                anchors {
+                    left: parent ? parent.left : undefined
+                    leftMargin: (styleData.column === 0 ? (2 + styleData.depth) : 1) * hifi.dimensions.tablePadding
+                    right: parent ? parent.right : undefined
+                    rightMargin: hifi.dimensions.tablePadding
+                    verticalCenter: parent ? parent.verticalCenter : undefined
+                }
+
+                function convertToGlyph(text) {
+                    switch (text) {
+                        case "Not Baked":
+                            return hifi.glyphs.circleSlash;
+                        case "Baked":
+                            return hifi.glyphs.checkmark;
+                        case "Error":
+                            return hifi.glyphs.alert;
+                        default:
+                            return "";
+                    }
+                }
+
+                function getComponent() {
+                    if ((styleData.column === 0) && styleData.selected) {
+                        return textFieldComponent;
+                    } else if (convertToGlyph(styleData.value) != "") {
+                        return glyphComponent;
+                    } else {
+                        return labelComponent;
+                    }
+
+                }
+                sourceComponent: getComponent()
+        
+                Component {
+                    id: labelComponent
+                    FiraSansSemiBold {
+                        text: styleData.value
+                        size: hifi.fontSizes.tableText
+                        color: colorScheme == hifi.colorSchemes.light
+                                ? (styleData.selected ? hifi.colors.black : hifi.colors.baseGrayHighlight)
+                                : (styleData.selected ? hifi.colors.black : hifi.colors.lightGrayText)
+                       
+                        horizontalAlignment: styleData.column === 1 ? TextInput.AlignHCenter : TextInput.AlignLeft
+                        
+                        elide: Text.ElideMiddle
+
+                        MouseArea {
+                            id: mouseArea
+                            anchors.fill: parent
+                            
+                            acceptedButtons: Qt.NoButton
+                            hoverEnabled: true
+
+                            onEntered: {
+                                if (parent.truncated) {
+                                    treeLabelToolTip.show(parent);
+                                }
+                            }
+                            onExited: treeLabelToolTip.hide();
+                        }
+                    }
+                }
+                Component {
+                    id: glyphComponent
+
+                    HiFiGlyphs {
+                        text: convertToGlyph(styleData.value)
+                        size: hifi.dimensions.frameIconSize
+                        color: colorScheme == hifi.colorSchemes.light
+                                ? (styleData.selected ? hifi.colors.black : hifi.colors.baseGrayHighlight)
+                                : (styleData.selected ? hifi.colors.black : hifi.colors.lightGrayText)
+                       
+                        elide: Text.ElideRight
+                        horizontalAlignment: TextInput.AlignHCenter
+
+                        HifiControls.ToolTip {
+                            anchors.fill: parent
+
+                            visible: styleData.value === "Error"
+
+                            toolTip: assetProxyModel.data(styleData.index, 0x106)
+                        }
+                    }
+                }
+                Component {
+                    id: textFieldComponent
+
+                    TextField {
+                        id: textField
+                        readOnly: !activeFocus
+
+                        text: styleData.value
+
+                        FontLoader { id: firaSansSemiBold; source: "../../fonts/FiraSans-SemiBold.ttf"; }
+                        font.family: firaSansSemiBold.name
+                        font.pixelSize: hifi.fontSizes.textFieldInput
+                        height: hifi.dimensions.tableRowHeight
+
+                        style: TextFieldStyle {
+                            textColor: readOnly
+                                        ? hifi.colors.black
+                                        : (treeView.isLightColorScheme ?  hifi.colors.black :  hifi.colors.white)
+                            background: Rectangle {
+                                visible: !readOnly
+                                color: treeView.isLightColorScheme ? hifi.colors.white : hifi.colors.black
+                                border.color: hifi.colors.primaryHighlight
+                                border.width: 1
+                            }
+                            selectedTextColor: hifi.colors.black
+                            selectionColor: hifi.colors.primaryHighlight
+                            padding.left: readOnly ? 0 : hifi.dimensions.textPadding
+                            padding.right: readOnly ? 0 : hifi.dimensions.textPadding
+                        }
+
+                        validator: RegExpValidator {
+                            regExp: /[^/]+/
+                        }
+
+                        Keys.onPressed: {
+                            if (event.key == Qt.Key_Escape) {
+                                text = styleData.value;
+                                unfocusHelper.forceActiveFocus();
+                                event.accepted = true;
+                            }
+                        }
+                        onAccepted:  {
+                            if (acceptableInput && styleData.selected) {
+                                if (!treeView.modifyEl(treeView.selection.currentIndex, text)) {
+                                    text = styleData.value;
+                                }
+                                unfocusHelper.forceActiveFocus();
+                            }
+                        }
+
+                        onReadOnlyChanged: {
+                            // Have to explicily set keyboardRaised because automatic setting fails because readOnly is true at the time.
+                            keyboardRaised = activeFocus;
+                        }
+                    }
+                }
+            }
+
+            Rectangle {
+                id: treeLabelToolTip
+                visible: false
+                z: 100 // Render on top
+
+                width: toolTipText.width + 2 * hifi.dimensions.textPadding
+                height: hifi.dimensions.tableRowHeight
+                color: colorScheme == hifi.colorSchemes.light ? hifi.colors.tableRowLightOdd : hifi.colors.tableRowDarkOdd
+                border.color: colorScheme == hifi.colorSchemes.light ? hifi.colors.black : hifi.colors.lightGrayText
+
+                FiraSansSemiBold {
+                    id: toolTipText
+                    anchors.centerIn: parent
+
+                    size: hifi.fontSizes.tableText
+                    color: colorScheme == hifi.colorSchemes.light ? hifi.colors.black : hifi.colors.lightGrayText
+                }
+                
+                Timer {
+                    id: showTimer
+                    interval: 1000
+                    onTriggered: { treeLabelToolTip.visible = true; }
+                }
+                function show(item) {
+                    var coord = item.mapToItem(parent, item.x, item.y);
+
+                    toolTipText.text = item.text;
+                    treeLabelToolTip.x = coord.x - hifi.dimensions.textPadding;
+                    treeLabelToolTip.y = coord.y;
+                    showTimer.start();
+                }
+                function hide() {
+                    showTimer.stop();
+                    treeLabelToolTip.visible = false;
+                }
+            }
+            
+            MouseArea {
+                propagateComposedEvents: true
+                anchors.fill: parent
+                acceptedButtons: Qt.RightButton
+                onClicked: {
+                    if (!HMD.active) {  // Popup only displays properly on desktop
+                        var index = treeView.indexAt(mouse.x, mouse.y);
+                        treeView.selection.setCurrentIndex(index, 0x0002);
+                        contextMenu.currentIndex = index;
+                        contextMenu.popup();
+                    }
+                }
+            }
+                
             Menu {
                 id: contextMenu
                 title: "Edit"
@@ -503,35 +776,117 @@ ScrollingWindow {
             }
         }
 
-        HifiControls.Tree {
-            id: treeView
-            anchors.top: assetDirectory.bottom
+        Row {
+            id: infoRow
+            anchors.left: treeView.left
+            anchors.right: treeView.right
             anchors.bottom: uploadSection.top
-            anchors.margins: hifi.dimensions.contentMargin.x + 2  // Extra for border
-            anchors.left: parent.left
-            anchors.right: parent.right
+            
+            RalewayRegular {
+                anchors.verticalCenter: parent.verticalCenter
 
-            treeModel: assetProxyModel
-            canEdit: true
-            colorScheme: root.colorScheme
-
-            modifyEl: renameEl
-
-            MouseArea {
-                propagateComposedEvents: true
-                anchors.fill: parent
-                acceptedButtons: Qt.RightButton
-                onClicked: {
-                    if (!HMD.active) {  // Popup only displays properly on desktop
-                        var index = treeView.indexAt(mouse.x, mouse.y);
-                        treeView.selection.setCurrentIndex(index, 0x0002);
-                        contextMenu.currentIndex = index;
-                        contextMenu.popup();
+                function makeText() {
+                    var numPendingBakes = assetMappingsModel.numPendingBakes;
+                    if (selectedItems > 1 || numPendingBakes === 0) {
+                        return selectedItems + " items selected";
+                    } else {
+                        return numPendingBakes + " bakes pending"
                     }
                 }
+
+                size: hifi.fontSizes.sectionName
+                font.capitalization: Font.AllUppercase
+                text: makeText()
+                color: hifi.colors.lightGrayText
             }
 
+            HifiControls.HorizontalSpacer { }
+
+            HifiControls.CheckBox {
+                id: bakingCheckbox
+                anchors.leftMargin: 2 * hifi.dimensions.contentSpacing.x
+                anchors.verticalCenter: parent.verticalCenter
+
+                text: " Use baked version"
+                colorScheme: root.colorScheme
+                enabled: isEnabled()
+                checked: isChecked()
+                onClicked: {
+                    var mappings = [];
+                    for (var i in treeView.selection.selectedIndexes) {
+                        var index = treeView.selection.selectedIndexes[i];
+                        var path = assetProxyModel.data(index, 0x100);
+                        mappings.push(path);
+                    }
+                    print("Setting baking enabled:" + mappings + " " + checked);
+                    Assets.setBakingEnabled(mappings, checked, function() {
+                        reload();
+                    });
+
+                    checked = Qt.binding(isChecked);
+                }
+                
+                function isEnabled() {
+                    if (!treeView.selection.hasSelection) {
+                        return false;
+                    }
+
+                    var status = assetProxyModel.data(treeView.selection.currentIndex, 0x105);
+                    if (status === "--") {
+                        return false;
+                    }
+                    var bakingEnabled = status !== "Not Baked";
+
+                    for (var i in treeView.selection.selectedIndexes) {
+                        var thisStatus = assetProxyModel.data(treeView.selection.selectedIndexes[i], 0x105);
+                        if (thisStatus === "--") {
+                            return false;
+                        }
+                        var thisBakingEnalbed = (thisStatus !== "Not Baked");
+
+                        if (bakingEnabled !== thisBakingEnalbed) {
+                            return false;
+                        }
+                    }
+
+                    return true; 
+                }
+                function isChecked() {
+                    if (!treeView.selection.hasSelection) {
+                        return false;
+                    }
+
+                    var status = assetProxyModel.data(treeView.selection.currentIndex, 0x105);
+                    return isEnabled() && status !== "Not Baked"; 
+                }  
+            }
+            
+            Item {
+                anchors.verticalCenter: parent.verticalCenter
+                width: infoGlyph.size;
+                height: infoGlyph.size;
+
+                HiFiGlyphs {
+                    id: infoGlyph;
+                    anchors.fill: parent;
+                    horizontalAlignment: Text.AlignHCenter;
+                    verticalAlignment: Text.AlignVCenter;
+                    text: hifi.glyphs.question;
+                    size: 35;
+                    color:  hifi.colors.lightGrayText;
+                }
+                MouseArea {
+                    anchors.fill: parent;
+                    hoverEnabled: true;
+                    onEntered: infoGlyph.color = hifi.colors.blueHighlight;
+                    onExited: infoGlyph.color =  hifi.colors.lightGrayText;
+                    onClicked: letterbox(hifi.glyphs.question,
+                                            "What is baking?",
+                                            "Baking compresses and optimizes files for faster network transfer and display. We recommend you bake your content to reduce initial load times for your visitors.");
+                    }
+            } 
         }
+
         HifiControls.ContentSection {
             id: uploadSection
             name: "Upload A File"
@@ -567,7 +922,7 @@ ScrollingWindow {
                         id: image
                         width: 24
                         height: 24
-                        source: "../images/Loading-Outer-Ring.png"
+                        source: "../../images/Loading-Outer-Ring.png"
                         RotationAnimation on rotation {
                             loops: Animation.Infinite
                             from: 0
@@ -578,7 +933,7 @@ ScrollingWindow {
                     Image {
                         width: 24
                         height: 24
-                        source: "../images/Loading-Inner-H.png"
+                        source: "../../images/Loading-Inner-H.png"
                     }
                     HifiControls.Label {
                         id: uploadProgressLabel
@@ -588,10 +943,9 @@ ScrollingWindow {
                         text: "In progress..."
                         colorScheme: root.colorScheme
                     }
-
                 }
             }
-
         }
     }
 }
+
diff --git a/interface/resources/qml/hifi/Card.qml b/interface/resources/qml/hifi/Card.qml
index fd76c03e45..fc7b8c6200 100644
--- a/interface/resources/qml/hifi/Card.qml
+++ b/interface/resources/qml/hifi/Card.qml
@@ -14,6 +14,8 @@
 import Hifi 1.0
 import QtQuick 2.5
 import QtGraphicalEffects 1.0
+import TabletScriptingInterface 1.0
+
 import "toolbars"
 import "../styles-uit"
 
@@ -46,6 +48,8 @@ Item {
     property int stackShadowNarrowing: 5;
     property string defaultThumbnail: Qt.resolvedUrl("../../images/default-domain.gif");
     property int shadowHeight: 10;
+    property bool hovered: false
+
     HifiConstants { id: hifi }
 
     function pastTime(timestamp) { // Answer a descriptive string
@@ -231,12 +235,25 @@ Item {
     // to that which is being hovered over.
     property var hoverThunk: function () { };
     property var unhoverThunk: function () { };
+    Rectangle {
+        anchors.fill: parent;
+        visible: root.hovered
+        color: "transparent";
+        border.width: 4; border.color: hifiStyleConstants.colors.primaryHighlight;
+        z: 1;
+    }
     MouseArea {
         anchors.fill: parent;
         acceptedButtons: Qt.LeftButton;
-        onClicked: goFunction("hifi://" + hifiUrl);
+        onClicked: {
+            tabletInterface.playSound(TabletEnums.ButtonClick);
+            goFunction("hifi://" + hifiUrl);
+        }
         hoverEnabled: true;
-        onEntered: hoverThunk();
+        onEntered:  {
+            tabletInterface.playSound(TabletEnums.ButtonHover);
+            hoverThunk();
+        }
         onExited: unhoverThunk();
     }
     StateImage {
@@ -252,6 +269,7 @@ Item {
         }
     }
     function go() {
+        tabletInterface.playSound(TabletEnums.ButtonClick);
         goFunction(drillDownToPlace ? ("/places/" + placeName) : ("/user_stories/" + storyId));
     }
     MouseArea {
diff --git a/interface/resources/qml/hifi/DesktopLetterboxMessage.qml b/interface/resources/qml/hifi/DesktopLetterboxMessage.qml
new file mode 100644
index 0000000000..bafa518eb9
--- /dev/null
+++ b/interface/resources/qml/hifi/DesktopLetterboxMessage.qml
@@ -0,0 +1,158 @@
+//
+//  LetterboxMessage.qml
+//  qml/hifi
+//
+//  Created by Dante Ruiz on 7/21/2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+import QtQuick 2.5
+import QtQuick.Controls 1.4
+import "../styles-uit"
+
+Item {
+    property alias text: popupText.text
+    property alias headerGlyph: headerGlyph.text
+    property alias headerText: headerText.text
+    property alias headerGlyphSize: headerGlyph.size
+    property real popupRadius: hifi.dimensions.borderRadius
+    property real headerTextPixelSize: 22
+    property real popupTextPixelSize: 16
+    property real headerTextMargin: -5
+    property real headerGlyphMargin: -15
+    property bool isDesktop: false
+    FontLoader { id: ralewayRegular; source: "../../fonts/Raleway-Regular.ttf"; }
+    FontLoader { id: ralewaySemiBold; source: "../../fonts/Raleway-SemiBold.ttf"; }
+    visible: false
+    id: letterbox
+    anchors.fill: parent
+    Rectangle {
+        id: textContainer;
+        width: parent.width
+        height: parent.height
+        anchors.centerIn: parent
+        radius: popupRadius
+        color: "white"
+        Item {
+            id: contentContainer
+            width: parent.width - 50
+            height: childrenRect.height
+            anchors.centerIn: parent
+            Item {
+                id: popupHeaderContainer
+                visible: headerText.text !== "" || headerGlyph.text !== ""
+                height: 30
+                // Anchors
+                anchors.top: parent.top
+                anchors.left: parent.left
+                anchors.right: parent.right
+                // Header Glyph
+                HiFiGlyphs {
+                    id: headerGlyph
+                    visible: headerGlyph.text !== ""
+                    // Size
+                    height: parent.height
+                    // Anchors
+                    anchors.left: parent.left
+                    anchors.leftMargin: headerGlyphMargin
+                    // Text Size
+                    size: headerTextPixelSize*2.5
+                    // Style
+                    horizontalAlignment: Text.AlignHLeft
+                    verticalAlignment: Text.AlignVCenter
+                    color: hifi.colors.darkGray
+                }
+                // Header Text
+                Text {
+                    id: headerText
+                    visible: headerText.text !== ""
+                    // Size
+
+                    height: parent.height
+                    // Anchors
+                    anchors.left: headerGlyph.right
+                    anchors.leftMargin: headerTextMargin
+                    // Text Size
+                    font.pixelSize: headerTextPixelSize
+                    // Style
+                    font.family: ralewaySemiBold.name
+                    color: hifi.colors.darkGray
+                    horizontalAlignment: Text.AlignHLeft
+                    verticalAlignment: Text.AlignVCenter
+                    wrapMode: Text.WordWrap
+                    textFormat: Text.StyledText
+                }
+            }
+            // Popup Text
+            Text {
+                id: popupText
+                // Size
+                width: parent.width
+                // Anchors
+                anchors.top: popupHeaderContainer.visible ? popupHeaderContainer.bottom : parent.top
+                anchors.topMargin: popupHeaderContainer.visible ? 15 : 0
+                anchors.left: parent.left
+                anchors.right: parent.right
+                // Text alignment
+                verticalAlignment: Text.AlignVCenter
+                horizontalAlignment: Text.AlignHLeft
+                // Style
+                font.pixelSize: popupTextPixelSize
+                font.family: ralewayRegular.name
+                color: hifi.colors.darkGray
+                wrapMode: Text.WordWrap
+                textFormat: Text.StyledText
+                onLinkActivated: {
+                    Qt.openUrlExternally(link)
+                }
+            }
+        }
+    }
+    // Left gray MouseArea
+    MouseArea {
+        anchors.left: parent.left;
+        anchors.right: textContainer.left;
+        anchors.top: textContainer.top;
+        anchors.bottom: textContainer.bottom;
+        acceptedButtons: Qt.LeftButton
+        onClicked: {
+            letterbox.visible = false
+        }
+    }
+    // Right gray MouseArea
+    MouseArea {
+        anchors.left: textContainer.left;
+        anchors.right: parent.left;
+        anchors.top: textContainer.top;
+        anchors.bottom: textContainer.bottom;
+        acceptedButtons: Qt.LeftButton
+        onClicked: {
+            letterbox.visible = false
+        }
+    }
+    // Top gray MouseArea
+    MouseArea {
+        anchors.left: parent.left;
+        anchors.right: parent.right;
+        anchors.top: parent.top;
+        anchors.bottom: textContainer.top;
+        acceptedButtons: Qt.LeftButton
+        onClicked: {
+            letterbox.visible = false
+        }
+    }
+    // Bottom gray MouseArea
+    MouseArea {
+        anchors.left: parent.left;
+        anchors.right: parent.right;
+        anchors.top: textContainer.bottom;
+        anchors.bottom: parent.bottom;
+        acceptedButtons: Qt.LeftButton
+        onClicked: {
+            letterbox.visible = false
+        }
+    }
+}
diff --git a/interface/resources/qml/hifi/Feed.qml b/interface/resources/qml/hifi/Feed.qml
index c1bd35f49d..8576e26fcd 100644
--- a/interface/resources/qml/hifi/Feed.qml
+++ b/interface/resources/qml/hifi/Feed.qml
@@ -35,7 +35,6 @@ Column {
     property string metaverseServerUrl: '';
     property string actions: 'snapshot';
     // sendToScript doesn't get wired until after everything gets created. So we have to queue fillDestinations on nextTick.
-    Component.onCompleted: delay.start();
     property string labelText: actions;
     property string filter: '';
     onFilterChanged: filterChoicesByText();
@@ -125,11 +124,9 @@ Column {
             cb();
         });
     }
-    property var delay: Timer { // No setTimeout or nextTick in QML.
-        interval: 0;
-        onTriggered: fillDestinations();
-    }
     function fillDestinations() { // Public
+        console.debug('Feed::fillDestinations()')
+
         function report(label, error) {
             console.log(label, actions, error || 'ok', allStories.length, 'filtered to', suggestions.count);
         }
@@ -206,9 +203,9 @@ Column {
         id: scroll;
         model: suggestions;
         orientation: ListView.Horizontal;
+        highlightFollowsCurrentItem: false
         highlightMoveDuration: -1;
         highlightMoveVelocity: -1;
-        highlight: Rectangle { color: "transparent"; border.width: 4; border.color: hifiStyleConstants.colors.primaryHighlight; z: 1; }
         currentIndex: -1;
 
         spacing: 12;
@@ -237,9 +234,8 @@ Column {
             textSizeSmall: root.textSizeSmall;
             stackShadowNarrowing: root.stackShadowNarrowing;
             shadowHeight: root.stackedCardShadowHeight;
-
-            hoverThunk: function () { scrollToIndex(index); }
-            unhoverThunk: function () { scrollToIndex(-1); }
+            hoverThunk: function () { hovered = true }
+            unhoverThunk: function () { hovered = false }
         }
     }
     NumberAnimation {
diff --git a/interface/resources/qml/hifi/LetterboxMessage.qml b/interface/resources/qml/hifi/LetterboxMessage.qml
index 754876b2c1..7ce66adf11 100644
--- a/interface/resources/qml/hifi/LetterboxMessage.qml
+++ b/interface/resources/qml/hifi/LetterboxMessage.qml
@@ -17,9 +17,12 @@ Item {
     property alias text: popupText.text
     property alias headerGlyph: headerGlyph.text
     property alias headerText: headerText.text
+    property alias headerGlyphSize: headerGlyph.size
     property real popupRadius: hifi.dimensions.borderRadius
     property real headerTextPixelSize: 22
     property real popupTextPixelSize: 16
+    property real headerTextMargin: -5
+    property real headerGlyphMargin: -15
     FontLoader { id: ralewayRegular; source: "../../fonts/Raleway-Regular.ttf"; }
     FontLoader { id: ralewaySemiBold; source: "../../fonts/Raleway-SemiBold.ttf"; }
     visible: false
@@ -32,14 +35,15 @@ Item {
         radius: popupRadius
     }
     Rectangle {
-        width: Math.max(parent.width * 0.75, 400)
+        id: textContainer;
+        width: Math.max(parent.width * 0.8, 400)
         height: contentContainer.height + 50
         anchors.centerIn: parent
         radius: popupRadius
         color: "white"
         Item {
             id: contentContainer
-            width: parent.width - 60
+            width: parent.width - 50
             height: childrenRect.height
             anchors.centerIn: parent
             Item {
@@ -58,7 +62,7 @@ Item {
                     height: parent.height
                     // Anchors
                     anchors.left: parent.left
-                    anchors.leftMargin: -15
+                    anchors.leftMargin: headerGlyphMargin
                     // Text Size
                     size: headerTextPixelSize*2.5
                     // Style
@@ -74,7 +78,7 @@ Item {
                     height: parent.height
                     // Anchors
                     anchors.left: headerGlyph.right
-                    anchors.leftMargin: -5
+                    anchors.leftMargin: headerTextMargin
                     // Text Size
                     font.pixelSize: headerTextPixelSize
                     // Style
@@ -92,7 +96,7 @@ Item {
                     anchors.top: parent.top
                     anchors.topMargin: -20
                     anchors.right: parent.right
-                    anchors.rightMargin: -25
+                    anchors.rightMargin: -20
                     MouseArea {
                         anchors.fill: closeGlyphButton
                         hoverEnabled: true
@@ -127,6 +131,9 @@ Item {
                 color: hifi.colors.darkGray
                 wrapMode: Text.WordWrap
                 textFormat: Text.StyledText
+                onLinkActivated: {
+                    Qt.openUrlExternally(link)
+                }
             }
         }
     }
@@ -134,7 +141,7 @@ Item {
         anchors.fill: parent
         acceptedButtons: Qt.LeftButton
         onClicked: {
-            letterbox.visible = false
+            letterbox.visible = false;
         }
     }
 }
diff --git a/interface/resources/qml/hifi/NameCard.qml b/interface/resources/qml/hifi/NameCard.qml
index 65517f5a73..775bae7969 100644
--- a/interface/resources/qml/hifi/NameCard.qml
+++ b/interface/resources/qml/hifi/NameCard.qml
@@ -17,7 +17,7 @@ import "../styles-uit"
 import "../controls-uit" as HifiControls
 import "toolbars"
 
-// references Users, UserActivityLogger, MyAvatar, Vec3, Quat, AddressManager from root context
+// references Users, UserActivityLogger, MyAvatar, Vec3, Quat, AddressManager, Account from root context
 
 Item {
     id: thisNameCard
@@ -30,7 +30,6 @@ Item {
 
     // Properties
     property string profileUrl: "";
-    property string defaultBaseUrl: AddressManager.metaverseServerUrl;
     property string connectionStatus : ""
     property string uuid: ""
     property string displayName: ""
@@ -59,7 +58,7 @@ Item {
         clip: true
         Image {
             id: userImage
-            source: profileUrl !== "" ? ((0 === profileUrl.indexOf("http")) ? profileUrl : (defaultBaseUrl + profileUrl)) : "";
+            source: profileUrl !== "" ? ((0 === profileUrl.indexOf("http")) ? profileUrl : (Account.metaverseServerURL + profileUrl)) : "";
             mipmap: true;
             // Anchors
             anchors.fill: parent
@@ -95,7 +94,7 @@ Item {
             enabled: (selected && activeTab == "nearbyTab") || isMyCard;
             hoverEnabled: enabled
             onClicked: {
-                userInfoViewer.url = defaultBaseUrl + "/users/" + userName;
+                userInfoViewer.url = Account.metaverseServerURL + "/users/" + userName;
                 userInfoViewer.visible = true;
             }
             onEntered: infoHoverImage.visible = true;
@@ -366,7 +365,7 @@ Item {
         enabled: selected
         hoverEnabled: true
         onClicked: {
-            userInfoViewer.url = defaultBaseUrl + "/users/" + userName;
+            userInfoViewer.url = Account.metaverseServerURL + "/users/" + userName;
             userInfoViewer.visible = true;
         }
         onEntered: {
@@ -433,7 +432,8 @@ Item {
         anchors.verticalCenter: nameCardRemoveConnectionImage.verticalCenter
         x: 240
         onClicked: {
-            AddressManager.goToUser(thisNameCard.userName);
+            console.log("Vist user button clicked."); // Remove after debugging.
+            AddressManager.goToUser(thisNameCard.userName, false);
             UserActivityLogger.palAction("go_to_user", thisNameCard.userName);
         }
     }
@@ -595,7 +595,10 @@ Item {
         // the avatar goes into fly mode rather than falling. However, that is not exposed to Javascript right now.
         // FIXME: it would be nice if this used the same teleport steps and smoothing as in the teleport.js script.
         // Note, however, that this script allows teleporting to a person in the air, while teleport.js is going to a grounded target.
+        // Position avatar 2 metres from the target in the direction that target avatar was facing.
         MyAvatar.position = Vec3.sum(avatar.position, Vec3.multiplyQbyV(avatar.orientation, {x: 0, y: 0, z: -2}));
-        MyAvatar.orientation = Quat.multiply(avatar.orientation, {y: 1});
+        
+        // Rotate avatar on Y axis to face target avatar and cancel out any inherited roll and pitch.
+        MyAvatar.orientation = Quat.cancelOutRollAndPitch(Quat.multiply(avatar.orientation, {y: 1}));
     }
 }
diff --git a/interface/resources/qml/hifi/Pal.qml b/interface/resources/qml/hifi/Pal.qml
index 8db04a0f5b..efcf6ccfcf 100644
--- a/interface/resources/qml/hifi/Pal.qml
+++ b/interface/resources/qml/hifi/Pal.qml
@@ -23,9 +23,6 @@ import "../controls" as HifiControls
 
 Rectangle {
     id: pal;
-    // Size
-    width: parent.width;
-    height: parent.height;
     // Style
     color: "#E3E3E3";
     // Properties
@@ -830,7 +827,7 @@ Rectangle {
                         hoverEnabled: enabled
                         enabled: connectionsNameCard.selected && pal.activeTab == "connectionsTab"
                         onClicked: {
-                            AddressManager.goToUser(model.userName);
+                            AddressManager.goToUser(model.userName, false);
                             UserActivityLogger.palAction("go_to_user", model.userName);
                         }
                         onEntered: connectionsLocationData.color = hifi.colors.blueHighlight;
@@ -1101,9 +1098,9 @@ Rectangle {
         case 'nearbyUsers':
             var data = message.params;
             var index = -1;
+            iAmAdmin = Users.canKick;
             index = findNearbySessionIndex('', data);
             if (index !== -1) {
-                iAmAdmin = Users.canKick;
                 myData = data[index];
                 data.splice(index, 1);
             } else {
diff --git a/interface/resources/qml/hifi/SkyboxChanger.qml b/interface/resources/qml/hifi/SkyboxChanger.qml
new file mode 100644
index 0000000000..f0c97a11a3
--- /dev/null
+++ b/interface/resources/qml/hifi/SkyboxChanger.qml
@@ -0,0 +1,143 @@
+//
+//  SkyboxChanger.qml
+//  qml/hifi
+//
+//  Created by Cain Kilgore on 9th August 2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+import QtQuick 2.5
+import "../styles-uit"
+import "../controls-uit" as HifiControls
+import QtQuick.Controls 2.2
+
+Item {
+    id: root;
+    HifiConstants { id: hifi; }
+    
+    property var defaultThumbnails: [];
+    property var defaultFulls: [];
+    
+    ListModel {
+        id: skyboxModel;
+    }
+    
+    function getSkyboxes() {
+        var xmlhttp = new XMLHttpRequest();
+        var url = "http://mpassets.highfidelity.com/5fbdbeef-1cf8-4954-811d-3d4acbba4dc9-v1/skyboxes.json";
+        xmlhttp.onreadystatechange = function() {
+            if (xmlhttp.readyState === XMLHttpRequest.DONE && xmlhttp.status === 200) {
+                sortSkyboxes(xmlhttp.responseText);
+            }
+        }
+        xmlhttp.open("GET", url, true);
+        xmlhttp.send();
+    }
+    
+    function sortSkyboxes(response) {
+        var arr = JSON.parse(response);
+        var arrLength = arr.length;
+        for (var i = 0; i < arrLength; i++) {
+            defaultThumbnails.push(arr[i].thumb);
+            defaultFulls.push(arr[i].full);
+            skyboxModel.append({});
+        }
+        setSkyboxes();
+    }
+    
+    function setSkyboxes() {
+        for (var i = 0; i < skyboxModel.count; i++) {
+            skyboxModel.setProperty(i, "thumbnailPath", defaultThumbnails[i]);
+            skyboxModel.setProperty(i, "fullSkyboxPath", defaultFulls[i]);
+        }
+    }
+    
+    Component.onCompleted: {
+        getSkyboxes();
+    }
+    
+    Item {
+        id: titleBarContainer;
+        width: parent.width;
+        height: childrenRect.height;
+        anchors.left: parent.left;
+        anchors.top: parent.top;
+        anchors.right: parent.right;
+        anchors.topMargin: 20;
+        RalewayBold {
+            id: titleBarText;
+            text: "Skybox Changer";
+            size: hifi.fontSizes.overlayTitle;
+            anchors.top: parent.top;
+            anchors.left: parent.left;
+            anchors.leftMargin: 40
+            height: paintedHeight;
+            color: hifi.colors.lightGrayText;
+            horizontalAlignment: Text.AlignHCenter;
+            verticalAlignment: Text.AlignVCenter;
+        }
+        RalewaySemiBold {
+            id: titleBarDesc;
+            text: "Click an image to choose a new Skybox.";
+            wrapMode: Text.Wrap
+            size: 14;
+            anchors.top: titleBarText.bottom;
+            anchors.left: parent.left;
+            anchors.leftMargin: 40
+            height: paintedHeight;
+            color: hifi.colors.lightGrayText;
+            horizontalAlignment: Text.AlignHCenter;
+            verticalAlignment: Text.AlignVCenter;
+        }
+    }
+    
+    GridView {
+        id: gridView
+        interactive: true
+        clip: true
+        anchors.top: titleBarContainer.bottom
+        anchors.topMargin: 20
+        anchors.horizontalCenter: parent.horizontalCenter
+        width: 400
+        anchors.bottom: parent.bottom
+        currentIndex: -1
+        cellWidth: 200
+        cellHeight: 200
+        model: skyboxModel
+        delegate: Item {
+            width: gridView.cellWidth
+            height: gridView.cellHeight
+            Item {
+                anchors.fill: parent
+                Image {
+                    source: thumbnailPath
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    anchors.verticalCenter: parent.verticalCenter
+                    fillMode: Image.Stretch
+                    sourceSize.width: parent.width
+                    sourceSize.height: parent.height
+                    mipmap: true
+                }
+            }
+            MouseArea {
+                anchors.fill: parent
+                onClicked: {
+                    sendToScript({method: 'changeSkybox', url: fullSkyboxPath});
+                }
+            }
+        }
+        ScrollBar.vertical: ScrollBar {
+            parent: gridView.parent
+            anchors.top: gridView.top
+            anchors.left: gridView.right
+            anchors.bottom: gridView.bottom
+            anchors.leftMargin: 10
+            width: 19
+        }
+    }
+    
+    signal sendToScript(var message);
+}
\ No newline at end of file
diff --git a/interface/resources/qml/hifi/SpectatorCamera.qml b/interface/resources/qml/hifi/SpectatorCamera.qml
new file mode 100644
index 0000000000..3a8559ab1e
--- /dev/null
+++ b/interface/resources/qml/hifi/SpectatorCamera.qml
@@ -0,0 +1,374 @@
+//
+//  SpectatorCamera.qml
+//  qml/hifi
+//
+//  Spectator Camera
+//
+//  Created by Zach Fox on 2017-06-05
+//  Copyright 2016 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 Hifi 1.0 as Hifi
+import QtQuick 2.5
+import QtQuick.Controls 1.4
+import "../styles-uit"
+import "../controls-uit" as HifiControlsUit
+import "../controls" as HifiControls
+
+// references HMD, XXX from root context
+
+Rectangle {
+    HifiConstants { id: hifi; }
+
+    id: spectatorCamera;
+    // Style
+    color: hifi.colors.baseGray;
+
+    // The letterbox used for popup messages
+    LetterboxMessage {
+        id: letterboxMessage;
+        z: 999; // Force the popup on top of everything else
+    }
+    function letterbox(headerGlyph, headerText, message) {
+        letterboxMessage.headerGlyph = headerGlyph;
+        letterboxMessage.headerText = headerText;
+        letterboxMessage.text = message;
+        letterboxMessage.visible = true;
+        letterboxMessage.popupRadius = 0;
+    }
+
+    //
+    // TITLE BAR START
+    //
+    Item {
+        id: titleBarContainer;
+        // Size
+        width: spectatorCamera.width;
+        height: 50;
+        // Anchors
+        anchors.left: parent.left;
+        anchors.top: parent.top;
+
+        // "Spectator" text
+        RalewaySemiBold {
+            id: titleBarText;
+            text: "Spectator";
+            // Text size
+            size: hifi.fontSizes.overlayTitle;
+            // Anchors
+            anchors.fill: parent;
+            anchors.leftMargin: 16;
+            // Style
+            color: hifi.colors.lightGrayText;
+            // Alignment
+            horizontalAlignment: Text.AlignHLeft;
+            verticalAlignment: Text.AlignVCenter;
+        }
+
+        // Separator
+        HifiControlsUit.Separator {
+            anchors.left: parent.left;
+            anchors.right: parent.right;
+            anchors.bottom: parent.bottom;
+        }
+    }
+    //
+    // TITLE BAR END
+    //
+
+    //
+    // SPECTATOR APP DESCRIPTION START
+    //
+    Item {
+        id: spectatorDescriptionContainer;
+        // Size
+        width: spectatorCamera.width;
+        height: childrenRect.height;
+        // Anchors
+        anchors.left: parent.left;
+        anchors.top: titleBarContainer.bottom;
+
+        // (i) Glyph
+        HiFiGlyphs {
+            id: spectatorDescriptionGlyph;
+            text: hifi.glyphs.info;
+            // Size
+            width: 20;
+            height: parent.height;
+            size: 60;
+            // Anchors
+            anchors.left: parent.left;
+            anchors.leftMargin: 20;
+            anchors.top: parent.top;
+            anchors.topMargin: 0;
+            // Style
+            color: hifi.colors.lightGrayText;
+            horizontalAlignment: Text.AlignHLeft;
+            verticalAlignment: Text.AlignTop;
+        }
+
+        // "Spectator" app description text
+        RalewayLight {
+            id: spectatorDescriptionText;
+            text: "Spectator lets you change what your monitor displays while you're using a VR headset. Use Spectator when streaming and recording video.";
+            // Text size
+            size: 14;
+            // Size
+            width: 350;
+            height: paintedHeight;
+            // Anchors
+            anchors.top: parent.top;
+            anchors.topMargin: 15;
+            anchors.left: spectatorDescriptionGlyph.right;
+            anchors.leftMargin: 40;
+            // Style
+            color: hifi.colors.lightGrayText;
+            wrapMode: Text.WordWrap;
+            // Alignment
+            horizontalAlignment: Text.AlignHLeft;
+            verticalAlignment: Text.AlignVCenter;
+        }
+
+        // "Learn More" text
+        RalewayRegular {
+            id: spectatorLearnMoreText;
+            text: "Learn More About Spectator";
+            // Text size
+            size: 14;
+            // Size
+            width: paintedWidth;
+            height: paintedHeight;
+            // Anchors
+            anchors.top: spectatorDescriptionText.bottom;
+            anchors.topMargin: 10;
+            anchors.left: spectatorDescriptionText.anchors.left;
+            anchors.leftMargin: spectatorDescriptionText.anchors.leftMargin;
+            // Style
+            color: hifi.colors.blueAccent;
+            wrapMode: Text.WordWrap;
+            font.underline: true;
+            // Alignment
+            horizontalAlignment: Text.AlignHLeft;
+            verticalAlignment: Text.AlignVCenter;
+
+            MouseArea {
+                anchors.fill: parent;
+                hoverEnabled: enabled;
+                onClicked: {
+                    letterbox(hifi.glyphs.question,
+                        "Spectator Camera",
+                        "By default, your monitor shows a preview of what you're seeing in VR. " +
+                        "Using the Spectator Camera app, your monitor can display the view " +
+                        "from a virtual hand-held camera - perfect for taking selfies or filming " +
+                        "your friends!<br>" +
+                        "<h3>Streaming and Recording</h3>" +
+                        "We recommend OBS for streaming and recording the contents of your monitor to services like " +
+                        "Twitch, YouTube Live, and Facebook Live.<br><br>" +
+                        "To get started using OBS, click this link now. The page will open in an external browser:<br>" +
+                        '<font size="4"><a href="https://obsproject.com/forum/threads/official-overview-guide.402/">OBS Official Overview Guide</a></font>');
+                }
+                onEntered: parent.color = hifi.colors.blueHighlight;
+                onExited: parent.color = hifi.colors.blueAccent;
+            }
+        }
+
+        // Separator
+        HifiControlsUit.Separator {
+            anchors.left: parent.left;
+            anchors.right: parent.right;
+            anchors.top: spectatorLearnMoreText.bottom;
+            anchors.topMargin: spectatorDescriptionText.anchors.topMargin;
+        }
+    }
+    //
+    // SPECTATOR APP DESCRIPTION END
+    //
+
+
+    //
+    // SPECTATOR CONTROLS START
+    //
+    Item {
+        id: spectatorControlsContainer;
+        // Size
+        height: spectatorCamera.height - spectatorDescriptionContainer.height - titleBarContainer.height;
+        // Anchors
+        anchors.top: spectatorDescriptionContainer.bottom;
+        anchors.topMargin: 20;
+        anchors.left: parent.left;
+        anchors.leftMargin: 25;
+        anchors.right: parent.right;
+        anchors.rightMargin: anchors.leftMargin;
+
+        // "Camera On" Checkbox
+        HifiControlsUit.CheckBox {
+            id: cameraToggleCheckBox;
+            colorScheme: hifi.colorSchemes.dark;
+            anchors.left: parent.left;
+            anchors.top: parent.top;
+            text: "Spectator Camera On";
+            boxSize: 24;
+            onClicked: {
+                sendToScript({method: (checked ? 'spectatorCameraOn' : 'spectatorCameraOff')});
+                spectatorCameraPreview.ready = checked;
+            }
+        }
+
+        // Instructions or Preview
+        Rectangle {
+            id: spectatorCameraImageContainer;
+            anchors.left: parent.left;
+            anchors.top: cameraToggleCheckBox.bottom;
+            anchors.topMargin: 20;
+            anchors.right: parent.right;
+            height: 250;
+            color: cameraToggleCheckBox.checked ? "transparent" : "black";
+
+            AnimatedImage {
+                source: "../../images/static.gif"
+                visible: !cameraToggleCheckBox.checked;
+                anchors.fill: parent;
+                opacity: 0.15;
+            }
+
+            // Instructions (visible when display texture isn't set)
+            FiraSansRegular {
+                id: spectatorCameraInstructions;
+                text: "Turn on Spectator Camera for a preview\nof what your monitor shows.";
+                size: 16;
+                color: hifi.colors.lightGrayText;
+                visible: !cameraToggleCheckBox.checked;
+                anchors.fill: parent;
+                horizontalAlignment: Text.AlignHCenter;
+                verticalAlignment: Text.AlignVCenter;
+            }
+
+            // Spectator Camera Preview
+            Hifi.ResourceImageItem {
+                id: spectatorCameraPreview;
+                visible: cameraToggleCheckbox.checked;
+                url: monitorShowsSwitch.checked ? "resource://spectatorCameraFrame" : "resource://hmdPreviewFrame";
+                ready: cameraToggleCheckBox.checked;
+                mirrorVertically: true;
+                anchors.fill: parent;
+                onVisibleChanged: {
+                    ready = cameraToggleCheckBox.checked;
+                    update();
+                }
+            }
+        }
+
+
+        // "Monitor Shows" Switch Label Glyph
+        HiFiGlyphs {
+            id: monitorShowsSwitchLabelGlyph;
+            text: hifi.glyphs.screen;
+            size: 32;
+            color: hifi.colors.blueHighlight;
+            anchors.top: spectatorCameraImageContainer.bottom;
+            anchors.topMargin: 13;
+            anchors.left: parent.left;
+        }
+        // "Monitor Shows" Switch Label
+        RalewayLight {
+            id: monitorShowsSwitchLabel;
+            text: "MONITOR SHOWS:";
+            anchors.top: spectatorCameraImageContainer.bottom;
+            anchors.topMargin: 20;
+            anchors.left: monitorShowsSwitchLabelGlyph.right;
+            anchors.leftMargin: 6;
+            size: 16;
+            width: paintedWidth;
+            height: paintedHeight;
+            color: hifi.colors.lightGrayText;
+            verticalAlignment: Text.AlignVCenter;
+        }
+        // "Monitor Shows" Switch
+        HifiControlsUit.Switch {
+            id: monitorShowsSwitch;
+            height: 30;
+            anchors.left: parent.left;
+            anchors.right: parent.right;
+            anchors.top: monitorShowsSwitchLabel.bottom;
+            anchors.topMargin: 10;
+            labelTextOff: "HMD Preview";
+            labelTextOn: "Camera View";
+            labelGlyphOnText: hifi.glyphs.alert;
+            onCheckedChanged: {
+                sendToScript({method: 'setMonitorShowsCameraView', params: checked});
+            }
+        }
+
+        // "Switch View From Controller" Checkbox
+        HifiControlsUit.CheckBox {
+            id: switchViewFromControllerCheckBox;
+            colorScheme: hifi.colorSchemes.dark;
+            anchors.left: parent.left;
+            anchors.top: monitorShowsSwitch.bottom;
+            anchors.topMargin: 25;
+            text: "";
+            boxSize: 24;
+            onClicked: {
+                sendToScript({method: 'changeSwitchViewFromControllerPreference', params: checked});
+            }
+        }
+    }
+    //
+    // SPECTATOR CONTROLS END
+    //
+
+    //
+    // FUNCTION DEFINITIONS START
+    //
+    //
+    // Function Name: fromScript()
+    //
+    // Relevant Variables:
+    // None
+    //
+    // Arguments:
+    // message: The message sent from the SpectatorCamera JavaScript.
+    //     Messages are in format "{method, params}", like json-rpc.
+    //
+    // Description:
+    // Called when a message is received from spectatorCamera.js.
+    //
+    function fromScript(message) {
+        switch (message.method) {
+        case 'updateSpectatorCameraCheckbox':
+            cameraToggleCheckBox.checked = message.params;
+        break;
+        case 'updateMonitorShowsSwitch':
+            monitorShowsSwitch.checked = message.params;
+        break;
+        case 'updateControllerMappingCheckbox':
+            switchViewFromControllerCheckBox.checked = message.setting;
+            switchViewFromControllerCheckBox.enabled = true;
+            if (message.controller === "OculusTouch") {
+                switchViewFromControllerCheckBox.text = "Clicking Touch's Left Thumbstick Switches Monitor View";
+            } else if (message.controller === "Vive") {
+                switchViewFromControllerCheckBox.text = "Clicking Left Thumb Pad Switches Monitor View";
+            } else {
+                switchViewFromControllerCheckBox.text = "Pressing Ctrl+0 Switches Monitor View";
+                switchViewFromControllerCheckBox.checked = true;
+                switchViewFromControllerCheckBox.enabled = false;
+            }
+        break;
+        case 'showPreviewTextureNotInstructions':
+            console.log('showPreviewTextureNotInstructions recvd', JSON.stringify(message));
+            spectatorCameraPreview.url = message.url;
+            spectatorCameraPreview.visible = message.setting;
+        break;
+        default:
+            console.log('Unrecognized message from spectatorCamera.js:', JSON.stringify(message));
+        }
+    }
+    signal sendToScript(var message);
+
+    //
+    // FUNCTION DEFINITIONS END
+    //
+}
diff --git a/interface/resources/qml/hifi/WebBrowser.qml b/interface/resources/qml/hifi/WebBrowser.qml
new file mode 100644
index 0000000000..af54c86bf4
--- /dev/null
+++ b/interface/resources/qml/hifi/WebBrowser.qml
@@ -0,0 +1,253 @@
+//
+//  WebBrowser.qml
+//
+//
+//  Created by Vlad Stelmahovsky on 06/22/2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+import QtQuick 2.5
+import QtQuick.Controls 1.5 as QQControls
+import QtQuick.Layouts 1.3
+import QtQuick.Controls.Styles 1.4
+
+import QtWebEngine 1.2
+import QtWebChannel 1.0
+
+import "../styles-uit"
+import "../controls-uit" as HifiControls
+import "../windows"
+import "../controls"
+
+Rectangle {
+    id: root;
+
+    HifiConstants { id: hifi; }
+
+    property string title: "";
+    signal sendToScript(var message);
+    property bool keyboardEnabled: true  // FIXME - Keyboard HMD only: Default to false
+    property bool keyboardRaised: false
+    property bool punctuationMode: false
+
+
+    color: hifi.colors.baseGray;
+
+    // only show the title if loaded through a "loader"
+
+    Column {
+        spacing: 2
+        width: parent.width;
+
+        RowLayout {
+            width: parent.width;
+            height: 48
+
+            HifiControls.WebGlyphButton {
+                enabled: webEngineView.canGoBack
+                glyph: hifi.glyphs.backward;
+                anchors.verticalCenter: parent.verticalCenter;
+                size: 38;
+                onClicked: {
+                    webEngineView.goBack()
+                }
+            }
+
+            HifiControls.WebGlyphButton {
+                enabled: webEngineView.canGoForward
+                glyph: hifi.glyphs.forward;
+                anchors.verticalCenter: parent.verticalCenter;
+                size: 38;
+                onClicked: {
+                    webEngineView.goForward()
+                }
+            }
+
+            QQControls.TextField {
+                id: addressBar
+
+                Image {
+                    anchors.verticalCenter: addressBar.verticalCenter;
+                    x: 5
+                    z: 2
+                    id: faviconImage
+                    width: 16; height: 16
+                    sourceSize: Qt.size(width, height)
+                    source: webEngineView.icon
+                }
+
+                HifiControls.WebGlyphButton {
+                    glyph: webEngineView.loading ? hifi.glyphs.closeSmall : hifi.glyphs.reloadSmall;
+                    anchors.verticalCenter: parent.verticalCenter;
+                    width: hifi.dimensions.controlLineHeight
+                    z: 2
+                    x: addressBar.width - 28
+                    onClicked: {
+                        if (webEngineView.loading) {
+                            webEngineView.stop()
+                        } else {
+                            reloadTimer.start()
+                        }
+                    }
+                }
+
+                style: TextFieldStyle {
+                    padding {
+                        left: 26;
+                        right: 26
+                    }
+                }
+                focus: true
+                Layout.fillWidth: true
+                text: webEngineView.url
+                onAccepted: webEngineView.url = text
+            }
+            HifiControls.WebGlyphButton {
+                checkable: true
+                //only QtWebEngine 1.3
+                //checked: webEngineView.audioMuted
+                glyph: checked ? hifi.glyphs.unmuted : hifi.glyphs.muted
+                anchors.verticalCenter: parent.verticalCenter;
+                width: hifi.dimensions.controlLineHeight
+                onClicked: {
+                    webEngineView.triggerWebAction(WebEngineView.ToggleMediaMute)
+                }
+            }
+        }
+
+        QQControls.ProgressBar {
+            id: loadProgressBar
+            style: ProgressBarStyle {
+                background: Rectangle {
+                    color: "#6A6A6A"
+                }
+                progress: Rectangle{
+                    color: "#00B4EF"
+                }
+            }
+
+            width: parent.width;
+            minimumValue: 0
+            maximumValue: 100
+            value: webEngineView.loadProgress
+            height: 2
+        }
+
+        HifiControls.BaseWebView {
+            id: webEngineView
+            focus: true
+            objectName: "tabletWebEngineView"
+
+            url: "http://www.highfidelity.com"
+            property real webViewHeight: root.height - loadProgressBar.height - 48 - 4
+
+            width: parent.width;
+            height: keyboardEnabled && keyboardRaised ? webViewHeight - keyboard.height : webViewHeight
+
+            profile: HFWebEngineProfile;
+
+            property string userScriptUrl: ""
+
+            // creates a global EventBridge object.
+            WebEngineScript {
+                id: createGlobalEventBridge
+                sourceCode: eventBridgeJavaScriptToInject
+                injectionPoint: WebEngineScript.DocumentCreation
+                worldId: WebEngineScript.MainWorld
+            }
+
+            // detects when to raise and lower virtual keyboard
+            WebEngineScript {
+                id: raiseAndLowerKeyboard
+                injectionPoint: WebEngineScript.Deferred
+                sourceUrl: resourceDirectoryUrl + "/html/raiseAndLowerKeyboard.js"
+                worldId: WebEngineScript.MainWorld
+            }
+
+            // User script.
+            WebEngineScript {
+                id: userScript
+                sourceUrl: webEngineView.userScriptUrl
+                injectionPoint: WebEngineScript.DocumentReady  // DOM ready but page load may not be finished.
+                worldId: WebEngineScript.MainWorld
+            }
+
+            userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ]
+
+            settings.autoLoadImages: true
+            settings.javascriptEnabled: true
+            settings.errorPageEnabled: true
+            settings.pluginsEnabled: true
+            settings.fullScreenSupportEnabled: false
+            //from WebEngine 1.3
+            //            settings.autoLoadIconsForPage: false
+            //            settings.touchIconsEnabled: false
+
+            onCertificateError: {
+                error.defer();
+            }
+
+            Component.onCompleted: {
+                webChannel.registerObject("eventBridge", eventBridge);
+                webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
+                webEngineView.profile.httpUserAgent = "Mozilla/5.0 Chrome (HighFidelityInterface)";
+            }
+
+            onFeaturePermissionRequested: {
+                grantFeaturePermission(securityOrigin, feature, true);
+            }
+
+            onNewViewRequested: {
+                if (!request.userInitiated) {
+                    print("Warning: Blocked a popup window.");
+                }
+            }
+
+            onRenderProcessTerminated: {
+                var status = "";
+                switch (terminationStatus) {
+                case WebEngineView.NormalTerminationStatus:
+                    status = "(normal exit)";
+                    break;
+                case WebEngineView.AbnormalTerminationStatus:
+                    status = "(abnormal exit)";
+                    break;
+                case WebEngineView.CrashedTerminationStatus:
+                    status = "(crashed)";
+                    break;
+                case WebEngineView.KilledTerminationStatus:
+                    status = "(killed)";
+                    break;
+                }
+
+                print("Render process exited with code " + exitCode + " " + status);
+                reloadTimer.running = true;
+            }
+
+            onWindowCloseRequested: {
+            }
+
+            Timer {
+                id: reloadTimer
+                interval: 0
+                running: false
+                repeat: false
+                onTriggered: webEngineView.reload()
+            }
+        }
+    }
+
+    HifiControls.Keyboard {
+        id: keyboard
+        raised: parent.keyboardEnabled && parent.keyboardRaised
+        numeric: parent.punctuationMode
+        anchors {
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+        }
+    }
+}
diff --git a/interface/resources/qml/hifi/audio/Audio.qml b/interface/resources/qml/hifi/audio/Audio.qml
index c13bd3281a..87ddce49ca 100644
--- a/interface/resources/qml/hifi/audio/Audio.qml
+++ b/interface/resources/qml/hifi/audio/Audio.qml
@@ -12,7 +12,7 @@
 //
 
 import QtQuick 2.5
-import QtQuick.Controls 1.4
+import QtQuick.Controls 2.2
 import QtQuick.Layouts 1.3
 
 import "../../styles-uit"
@@ -33,33 +33,89 @@ Rectangle {
 
     // only show the title if loaded through a "loader"
     function showTitle() {
-        return root.parent.objectName == "loader";
+        return (root.parent !== null) && root.parent.objectName == "loader";
     }
 
+
+    property bool isVR: Audio.context === "VR"
+    property real rightMostInputLevelPos: 0
+    //placeholder for control sizes and paddings
+    //recalculates dynamically in case of UI size is changed
+    QtObject {
+        id: margins
+        property real paddings: root.width / 20.25
+
+        property real sizeCheckBox: root.width / 13.5
+        property real sizeText: root.width / 2.5
+        property real sizeLevel: root.width / 5.8
+        property real sizeDesktop: root.width / 5.8
+        property real sizeVR: root.width / 13.5
+    }
+
+    TabBar {
+        id: bar
+        spacing: 0
+        width: parent.width
+        height: 42
+        currentIndex: isVR ? 1 : 0
+
+        AudioControls.AudioTabButton {
+            height: parent.height
+            text: qsTr("Desktop")
+        }
+        AudioControls.AudioTabButton {
+            height: parent.height
+            text: qsTr("VR")
+        }
+    }
+
+    property bool showPeaks: true;
+
+    function enablePeakValues() {
+        Audio.devices.input.peakValuesEnabled = true;
+        Audio.devices.input.peakValuesEnabledChanged.connect(function(enabled) {
+            if (!enabled && root.showPeaks) {
+                Audio.devices.input.peakValuesEnabled = true;
+            }
+        });
+    }
+
+    function disablePeakValues() {
+        root.showPeaks = false;
+        Audio.devices.input.peakValuesEnabled = false;
+    }
+
+    Component.onCompleted: enablePeakValues();
+    Component.onDestruction: disablePeakValues();
+    onVisibleChanged: visible ? enablePeakValues() : disablePeakValues();
+
     Column {
-        y: 16; // padding does not work
-        spacing: 16;
+        spacing: 12;
+        anchors.top: bar.bottom
+        anchors.bottom: parent.bottom
+        anchors.bottomMargin: 5
         width: parent.width;
 
+        Separator { }
+
         RalewayRegular {
-            x: 16; // padding does not work
+            x: margins.paddings + muteMic.boxSize + muteMic.spacing;
             size: 16;
             color: "white";
-            text: root.title;
-
-            visible: root.showTitle();
+            text: qsTr("Input Device Settings")
         }
 
-        Separator { visible: root.showTitle() }
-
         ColumnLayout {
-            x: 16; // padding does not work
+            x: margins.paddings;
             spacing: 16;
+            width: parent.width;
 
             // mute is in its own row
             RowLayout {
                 AudioControls.CheckBox {
+                    id: muteMic
                     text: qsTr("Mute microphone");
+                    spacing: margins.sizeCheckBox - boxSize
                     isRedCheck: true;
                     checked: Audio.muted;
                     onClicked: {
@@ -70,8 +126,9 @@ Rectangle {
             }
 
             RowLayout {
-                spacing: 16;
+                spacing: muteMic.spacing*2; //make it visually distinguish
                 AudioControls.CheckBox {
+                    spacing: muteMic.spacing
                     text: qsTr("Enable noise reduction");
                     checked: Audio.noiseReduction;
                     onClicked: {
@@ -80,27 +137,39 @@ Rectangle {
                     }
                 }
                 AudioControls.CheckBox {
+                    spacing: muteMic.spacing
                     text: qsTr("Show audio level meter");
                     checked: AvatarInputs.showAudioTools;
                     onClicked: {
                         AvatarInputs.showAudioTools = checked;
                         checked = Qt.binding(function() { return AvatarInputs.showAudioTools; }); // restore binding
                     }
+                    onXChanged: rightMostInputLevelPos = x + width
                 }
             }
         }
 
         Separator {}
 
-        RowLayout {
+        Item {
+            x: margins.paddings;
+            width: parent.width - margins.paddings*2
+            height: 36
+
             HiFiGlyphs {
+                width: margins.sizeCheckBox
                 text: hifi.glyphs.mic;
                 color: hifi.colors.primaryHighlight;
+                anchors.left: parent.left
+                anchors.leftMargin: -size/4 //the glyph has empty space at left about 25%
                 anchors.verticalCenter: parent.verticalCenter;
-                size: 28;
+                size: 30;
             }
             RalewayRegular {
                 anchors.verticalCenter: parent.verticalCenter;
+                width: margins.sizeText + margins.sizeLevel
+                anchors.left: parent.left
+                anchors.leftMargin: margins.sizeCheckBox
                 size: 16;
                 color: hifi.colors.lightGrayText;
                 text: qsTr("CHOOSE INPUT DEVICE");
@@ -108,81 +177,114 @@ Rectangle {
         }
 
         ListView {
-            anchors { left: parent.left; right: parent.right; leftMargin: 70 }
-            height: 125;
-            spacing: 0;
+            id: inputView
+            width: parent.width - margins.paddings*2
+            x: margins.paddings
+            height: Math.min(150, contentHeight);
+            spacing: 4;
             snapMode: ListView.SnapToItem;
             clip: true;
             model: Audio.devices.input;
             delegate: Item {
-                width: parent.width;
-                height: 36;
+                width: rightMostInputLevelPos
+                height: margins.sizeCheckBox > checkBoxInput.implicitHeight ?
+                            margins.sizeCheckBox : checkBoxInput.implicitHeight
 
-                RowLayout {
-                    width: parent.width;
-
-                    AudioControls.CheckBox {
-                        Layout.maximumWidth: parent.width - level.width - 40;
-                        text: display;
-                        wrap: false;
-                        checked: selected;
-                        onClicked: {
-                            selected = checked;
-                            checked = Qt.binding(function() { return selected; }); // restore binding
+                AudioControls.CheckBox {
+                    id: checkBoxInput
+                    anchors.left: parent.left
+                    spacing: margins.sizeCheckBox - boxSize
+                    anchors.verticalCenter: parent.verticalCenter
+                    width: parent.width - inputLevel.width
+                    clip: true
+                    checkable: !checked
+                    checked: bar.currentIndex === 0 ? selectedDesktop :  selectedHMD;
+                    boxSize: margins.sizeCheckBox / 2
+                    isRound: true
+                    text: devicename
+                    onPressed: {
+                        if (!checked) {
+                            Audio.setInputDevice(info, bar.currentIndex === 1);
                         }
                     }
-                    InputLevel {
-                        id: level;
-                        Layout.alignment: Qt.AlignRight;
-                        Layout.rightMargin: 30;
-                        visible: selected;
-                    }
+                }
+                InputPeak {
+                    id: inputLevel
+                    anchors.right: parent.right
+                    peak: model.peak;
+                    anchors.verticalCenter: parent.verticalCenter
+                    visible: ((bar.currentIndex === 1 && isVR) ||
+                             (bar.currentIndex === 0 && !isVR)) &&
+                             Audio.devices.input.peakValuesAvailable;
                 }
             }
         }
 
         Separator {}
 
-        RowLayout {
-            Column {
-                RowLayout {
-                    HiFiGlyphs {
-                        text: hifi.glyphs.unmuted;
-                        color: hifi.colors.primaryHighlight;
-                        anchors.verticalCenter: parent.verticalCenter;
-                        size: 36;
-                    }
-                    RalewayRegular {
-                        anchors.verticalCenter: parent.verticalCenter;
-                        size: 16;
-                        color: hifi.colors.lightGrayText;
-                        text: qsTr("CHOOSE OUTPUT DEVICE");
-                    }
-                }
+        Item {
+            x: margins.paddings;
+            width: parent.width - margins.paddings*2
+            height: 36
 
-                PlaySampleSound { anchors { left: parent.left; leftMargin: 60 }}
+            HiFiGlyphs {
+                anchors.left: parent.left
+                anchors.leftMargin: -size/4 //the glyph has empty space at left about 25%
+                anchors.verticalCenter: parent.verticalCenter;
+                width: margins.sizeCheckBox
+                text: hifi.glyphs.unmuted;
+                color: hifi.colors.primaryHighlight;
+                size: 36;
+            }
+
+            RalewayRegular {
+                width: margins.sizeText + margins.sizeLevel
+                anchors.left: parent.left
+                anchors.leftMargin: margins.sizeCheckBox
+                anchors.verticalCenter: parent.verticalCenter;
+                size: 16;
+                color: hifi.colors.lightGrayText;
+                text: qsTr("CHOOSE OUTPUT DEVICE");
             }
         }
 
         ListView {
-            anchors { left: parent.left; right: parent.right; leftMargin: 70 }
-            height: 125;
-            spacing: 0;
+            id: outputView
+            width: parent.width - margins.paddings*2
+            x: margins.paddings
+            height: Math.min(360 - inputView.height, contentHeight);
+            spacing: 4;
             snapMode: ListView.SnapToItem;
             clip: true;
             model: Audio.devices.output;
             delegate: Item {
-                width: parent.width;
-                height: 36;
+                width: rightMostInputLevelPos
+                height: margins.sizeCheckBox > checkBoxOutput.implicitHeight ?
+                            margins.sizeCheckBox : checkBoxOutput.implicitHeight
+
                 AudioControls.CheckBox {
-                    text: display;
-                    checked: selected;
-                    onClicked: {
-                        selected = checked;
-                        checked = Qt.binding(function() { return selected; }); // restore binding
+                    id: checkBoxOutput
+                    width: parent.width
+                    spacing: margins.sizeCheckBox - boxSize
+                    boxSize: margins.sizeCheckBox / 2
+                    isRound: true
+                    checked: bar.currentIndex === 0 ? selectedDesktop :  selectedHMD;
+                    checkable: !checked
+                    text: devicename
+                    onPressed: {
+                        if (!checked) {
+                            Audio.setOutputDevice(info, bar.currentIndex === 1);
+                        }
                     }
                 }
             }
         }
+        PlaySampleSound {
+            x: margins.paddings
+
+            visible: (bar.currentIndex === 1 && isVR) ||
+                     (bar.currentIndex === 0 && !isVR);
+            anchors { left: parent.left; leftMargin: margins.paddings }
+        }
     }
 }
diff --git a/interface/resources/qml/hifi/audio/AudioTabButton.qml b/interface/resources/qml/hifi/audio/AudioTabButton.qml
new file mode 100644
index 0000000000..3a3ed90f5e
--- /dev/null
+++ b/interface/resources/qml/hifi/audio/AudioTabButton.qml
@@ -0,0 +1,35 @@
+//
+//  AudioTabButton.qml
+//  qml/hifi/audio
+//
+//  Created by Vlad Stelmahovsky on 8/16/2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+import QtQuick 2.7
+import QtQuick.Controls 2.2
+import "../../controls-uit" as HifiControls
+import "../../styles-uit"
+
+TabButton {
+    id: control
+    font.pixelSize: height / 2
+
+    HifiConstants { id: hifi; }
+
+    contentItem: RalewaySemiBold {
+        text: control.text
+        font: control.font
+        color: "white"
+        horizontalAlignment: Text.AlignHCenter
+        verticalAlignment: Text.AlignVCenter
+        elide: Text.ElideRight
+    }
+
+    background: Rectangle {
+        color: control.checked ? hifi.colors.baseGray : "black"
+    }
+}
diff --git a/interface/resources/qml/hifi/audio/CheckBox.qml b/interface/resources/qml/hifi/audio/CheckBox.qml
index 1f632ac479..3a954d4004 100644
--- a/interface/resources/qml/hifi/audio/CheckBox.qml
+++ b/interface/resources/qml/hifi/audio/CheckBox.qml
@@ -9,10 +9,10 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-import QtQuick 2.5
+import QtQuick 2.7
 
 import "../../controls-uit" as HifiControls
 
-HifiControls.CheckBox {
+HifiControls.CheckBoxQQC2 {
     color: "white"
 }
diff --git a/interface/resources/qml/hifi/audio/InputLevel.qml b/interface/resources/qml/hifi/audio/InputPeak.qml
similarity index 95%
rename from interface/resources/qml/hifi/audio/InputLevel.qml
rename to interface/resources/qml/hifi/audio/InputPeak.qml
index 58ce3a1ec7..4ff49091b1 100644
--- a/interface/resources/qml/hifi/audio/InputLevel.qml
+++ b/interface/resources/qml/hifi/audio/InputPeak.qml
@@ -1,5 +1,5 @@
 //
-//  InputLevel.qml
+//  InputPeak.qml
 //  qml/hifi/audio
 //
 //  Created by Zach Pomerantz on 6/20/2017
@@ -15,7 +15,7 @@ import QtQuick.Layouts 1.3
 import QtGraphicalEffects 1.0
 
 Rectangle {
-    readonly property var level: Audio.inputLevel;
+    property var peak;
 
     width: 70;
     height: 8;
@@ -65,7 +65,7 @@ Rectangle {
 
         Rectangle { // mask
             id: mask;
-            width: parent.width * level;
+            width: parent.width * peak;
             radius: 5;
             anchors {
                 bottom: parent.bottom;
diff --git a/interface/resources/qml/hifi/audio/MicBar.qml b/interface/resources/qml/hifi/audio/MicBar.qml
index 10e12551b7..b6699d6ceb 100644
--- a/interface/resources/qml/hifi/audio/MicBar.qml
+++ b/interface/resources/qml/hifi/audio/MicBar.qml
@@ -14,6 +14,8 @@ import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.3
 import QtGraphicalEffects 1.0
 
+import TabletScriptingInterface 1.0
+
 Rectangle {
     readonly property var level: Audio.inputLevel;
 
@@ -27,7 +29,7 @@ Rectangle {
 
     color: "#00000000";
     border {
-        width: (standalone || Audio.muted || mouseArea.containsMouse) ? 2 : 0;
+        width: mouseArea.containsMouse || mouseArea.containsPress ? 2 : 0;
         color: colors.border;
     }
 
@@ -57,11 +59,19 @@ Rectangle {
 
         hoverEnabled: true;
         scrollGestureEnabled: false;
-        onClicked: { Audio.muted = !Audio.muted; }
+        onClicked: {
+            Audio.muted = !Audio.muted;
+            tabletInterface.playSound(TabletEnums.ButtonClick);
+        }
         drag.target: dragTarget;
+        onContainsMouseChanged: {
+            if (containsMouse) {
+                tabletInterface.playSound(TabletEnums.ButtonHover);
+            }
+        }
     }
 
-    Item {
+    QtObject {
         id: colors;
 
         readonly property string unmuted: "#FFF";
@@ -72,7 +82,7 @@ Rectangle {
         readonly property string red: colors.muted;
         readonly property string fill: "#55000000";
         readonly property string border: standalone ? "#80FFFFFF" : "#55FFFFFF";
-        readonly property string icon: (Audio.muted && !mouseArea.containsMouse) ? muted : unmuted;
+        readonly property string icon: Audio.muted ? muted : unmuted;
     }
 
     Item {
@@ -92,10 +102,8 @@ Rectangle {
                 readonly property string unmutedIcon: "../../../icons/tablet-icons/mic-unmute-i.svg";
                 readonly property string mutedIcon: "../../../icons/tablet-icons/mic-mute-i.svg";
 
-                function exclusiveOr(a, b) { return (a || b) && !(a && b); }
-
                 id: image;
-                source: exclusiveOr(Audio.muted, mouseArea.containsMouse) ? mutedIcon : unmutedIcon;
+                source: Audio.muted ? mutedIcon : unmutedIcon;
 
                 width: 30;
                 height: 30;
@@ -118,9 +126,9 @@ Rectangle {
     Item {
         id: status;
 
-        readonly property string color: (Audio.muted && !mouseArea.containsMouse) ? colors.muted : colors.unmuted;
+        readonly property string color: Audio.muted ? colors.muted : colors.unmuted;
 
-        visible: Audio.muted || mouseArea.containsMouse;
+        visible: Audio.muted;
 
         anchors {
             left: parent.left;
@@ -133,14 +141,14 @@ Rectangle {
 
         Text {
             anchors {
-        horizontalCenter: parent.horizontalCenter;
+                horizontalCenter: parent.horizontalCenter;
                 verticalCenter: parent.verticalCenter;
             }
 
             color: parent.color;
 
-            text: Audio.muted ? (mouseArea.containsMouse ? "UNMUTE" : "MUTED") : "MUTE";
-        font.pointSize: 12;
+            text: Audio.muted ? "MUTED" : "MUTE";
+            font.pointSize: 12;
         }
 
         Rectangle {
@@ -150,7 +158,7 @@ Rectangle {
             }
 
             width: 50;
-        height: 4;
+            height: 4;
             color: parent.color;
         }
 
@@ -161,7 +169,7 @@ Rectangle {
             }
 
             width: 50;
-        height: 4;
+            height: 4;
             color: parent.color;
         }
     }
diff --git a/interface/resources/qml/hifi/audio/PlaySampleSound.qml b/interface/resources/qml/hifi/audio/PlaySampleSound.qml
index 99f3648ec3..dec2e9bfc9 100644
--- a/interface/resources/qml/hifi/audio/PlaySampleSound.qml
+++ b/interface/resources/qml/hifi/audio/PlaySampleSound.qml
@@ -22,19 +22,28 @@ RowLayout {
     property var sample: null;
     property bool isPlaying: false;
     function createSampleSound() {
-        var SOUND = Qt.resolvedUrl("../../../sounds/sample.wav");
-        sound = SoundCache.getSound(SOUND);
+        sound = ApplicationInterface.getSampleSound();
         sample = null;
     }
     function playSound() {
         // FIXME: MyAvatar is not properly exposed to QML; MyAvatar.qmlPosition is a stopgap
         // FIXME: Audio.playSystemSound should not require position
-        sample = Audio.playSystemSound(sound, MyAvatar.qmlPosition);
-        isPlaying = true;
-        sample.finished.connect(function() { isPlaying = false; sample = null; });
+        if (sample === null && !isPlaying) {
+            sample = Audio.playSystemSound(sound, MyAvatar.qmlPosition);
+            isPlaying = true;
+            sample.finished.connect(reset);
+        }
     }
     function stopSound() {
-        sample && sample.stop();
+        if (sample && isPlaying) {
+            sample.stop();
+        }
+    }
+
+    function reset() {
+        sample.finished.disconnect(reset);
+        isPlaying = false;
+        sample = null;
     }
 
     Component.onCompleted: createSampleSound();
diff --git a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
new file mode 100644
index 0000000000..6c4e020694
--- /dev/null
+++ b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
@@ -0,0 +1,946 @@
+//
+//  Checkout.qml
+//  qml/hifi/commerce/checkout
+//
+//  Checkout
+//
+//  Created by Zach Fox on 2017-08-25
+//  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
+//
+
+import Hifi 1.0 as Hifi
+import QtQuick 2.5
+import QtQuick.Controls 1.4
+import "../../../styles-uit"
+import "../../../controls-uit" as HifiControlsUit
+import "../../../controls" as HifiControls
+import "../wallet" as HifiWallet
+import "../common" as HifiCommerceCommon
+
+// references XXX from root context
+
+Rectangle {
+    HifiConstants { id: hifi; }
+
+    id: root;
+    objectName: "checkout"
+    property string activeView: "initialize";
+    property bool purchasesReceived: false;
+    property bool balanceReceived: false;
+    property string itemName;
+    property string itemId;
+    property string itemHref;
+    property double balanceAfterPurchase;
+    property bool alreadyOwned: false;
+    property int itemPrice: -1;
+    property bool itemIsJson: true;
+    property bool shouldBuyWithControlledFailure: false;
+    property bool debugCheckoutSuccess: false;
+    property bool canRezCertifiedItems: Entities.canRezCertified() || Entities.canRezTmpCertified();
+    property bool isWearable;
+    // Style
+    color: hifi.colors.white;
+    Hifi.QmlCommerce {
+        id: commerce;
+
+        onWalletStatusResult: {
+            if (walletStatus === 0) {
+                if (root.activeView !== "needsLogIn") {
+                    root.activeView = "needsLogIn";
+                }
+            } else if (walletStatus === 1) {
+                if (root.activeView !== "notSetUp") {
+                    root.activeView = "notSetUp";
+                    notSetUpTimer.start();
+                }
+            } else if (walletStatus === 2) {
+                if (root.activeView !== "passphraseModal") {
+                    root.activeView = "passphraseModal";
+                }
+            } else if (walletStatus === 3) {
+                authSuccessStep();
+            } else {
+                console.log("ERROR in Checkout.qml: Unknown wallet status: " + walletStatus);
+            }
+        }
+
+        onLoginStatusResult: {
+            if (!isLoggedIn && root.activeView !== "needsLogIn") {
+                root.activeView = "needsLogIn";
+            } else {
+                commerce.getWalletStatus();
+            }
+        }
+
+        onBuyResult: {
+            if (result.status !== 'success') {
+                failureErrorText.text = result.message;
+                root.activeView = "checkoutFailure";
+            } else {
+                root.itemHref = result.data.download_url;
+                root.isWearable = result.data.categories.indexOf("Wearables") > -1;
+                root.activeView = "checkoutSuccess";
+            }
+        }
+
+        onBalanceResult: {
+            if (result.status !== 'success') {
+                console.log("Failed to get balance", result.data.message);
+            } else {
+                root.balanceReceived = true;
+                root.balanceAfterPurchase = result.data.balance - root.itemPrice;
+                root.setBuyText();
+            }
+        }
+
+        onInventoryResult: {
+            if (result.status !== 'success') {
+                console.log("Failed to get purchases", result.data.message);
+            } else {
+                root.purchasesReceived = true;
+                if (purchasesContains(result.data.assets, itemId)) {
+                    root.alreadyOwned = true;
+                } else {
+                    root.alreadyOwned = false;
+                }
+                root.setBuyText();
+            }
+        }
+    }
+
+    onItemIdChanged: {
+        commerce.inventory();
+        itemPreviewImage.source = "https://hifi-metaverse.s3-us-west-1.amazonaws.com/marketplace/previews/" + itemId + "/thumbnail/hifi-mp-" + itemId + ".jpg";
+    }
+
+    onItemHrefChanged: {
+        itemIsJson = root.itemHref.endsWith('.json');
+    }
+
+    onItemPriceChanged: {
+        commerce.balance();
+    }
+
+    Timer {
+        id: notSetUpTimer;
+        interval: 200;
+        onTriggered: {
+            sendToScript({method: 'checkout_walletNotSetUp', itemId: itemId});
+        }
+    }
+
+    HifiCommerceCommon.CommerceLightbox {
+        id: lightboxPopup;
+        visible: false;
+        anchors.fill: parent;
+
+        Connections {
+            onSendToParent: {
+                sendToScript(msg);
+            }
+        }
+    }
+
+    //
+    // TITLE BAR START
+    //
+    HifiCommerceCommon.EmulatedMarketplaceHeader {
+        id: titleBarContainer;
+        z: 998;
+        visible: !needsLogIn.visible;
+        // Size
+        width: parent.width;
+        height: 70;
+        // Anchors
+        anchors.left: parent.left;
+        anchors.top: parent.top;
+
+        Connections {
+            onSendToParent: {
+                if (msg.method === 'needsLogIn' && root.activeView !== "needsLogIn") {
+                    root.activeView = "needsLogIn";
+                } else if (msg.method === 'showSecurityPicLightbox') {
+                    lightboxPopup.titleText = "Your Security Pic";
+                    lightboxPopup.bodyImageSource = msg.securityImageSource;
+                    lightboxPopup.bodyText = lightboxPopup.securityPicBodyText;
+                    lightboxPopup.button1text = "CLOSE";
+                    lightboxPopup.button1method = "root.visible = false;"
+                    lightboxPopup.button2text = "GO TO WALLET";
+                    lightboxPopup.button2method = "sendToParent({method: 'checkout_openWallet'});";
+                    lightboxPopup.visible = true;
+                } else {
+                    sendToScript(msg);
+                }
+            }
+        }
+    }
+    MouseArea {
+        enabled: titleBarContainer.usernameDropdownVisible;
+        anchors.fill: parent;
+        onClicked: {
+            titleBarContainer.usernameDropdownVisible = false;
+        }
+    }
+    //
+    // TITLE BAR END
+    //
+
+    Rectangle {
+        id: initialize;
+        visible: root.activeView === "initialize";
+        anchors.top: titleBarContainer.bottom;
+        anchors.bottom: parent.top;
+        anchors.left: parent.left;
+        anchors.right: parent.right;
+        color: hifi.colors.white;
+
+        Component.onCompleted: {
+            purchasesReceived = false;
+            balanceReceived = false;
+            commerce.getWalletStatus();
+        }
+    }
+
+    HifiWallet.NeedsLogIn {
+        id: needsLogIn;
+        visible: root.activeView === "needsLogIn";
+        anchors.top: parent.top;
+        anchors.bottom: parent.bottom;
+        anchors.left: parent.left;
+        anchors.right: parent.right;
+
+        Connections {
+            onSendSignalToWallet: {
+                sendToScript(msg);
+            }
+        }
+    }
+    Connections {
+        target: GlobalServices
+        onMyUsernameChanged: {
+            commerce.getLoginStatus();
+        }
+    }
+
+    HifiWallet.PassphraseModal {
+        id: passphraseModal;
+        visible: root.activeView === "passphraseModal";
+        anchors.fill: parent;
+        titleBarText: "Checkout";
+        titleBarIcon: hifi.glyphs.wallet;
+
+        Connections {
+            onSendSignalToParent: {
+                if (msg.method === "authSuccess") {
+                    authSuccessStep();
+                } else {
+                    sendToScript(msg);
+                }
+            }
+        }
+    }    
+
+    HifiCommerceCommon.FirstUseTutorial {
+        id: firstUseTutorial;
+        z: 999;
+        visible: root.activeView === "firstUseTutorial";
+        anchors.fill: parent;
+
+        Connections {
+            onSendSignalToParent: {
+                switch (message.method) {
+                    case 'tutorial_skipClicked':
+                    case 'tutorial_finished':
+                        Settings.setValue("isFirstUseOfPurchases", false);
+                        root.activeView = "checkoutSuccess";
+                    break;
+                }
+            }
+        }
+    }
+
+    //
+    // CHECKOUT CONTENTS START
+    //
+    Item {
+        id: checkoutContents;
+        visible: root.activeView === "checkoutMain";
+        anchors.top: titleBarContainer.bottom;
+        anchors.bottom: parent.bottom;
+        anchors.left: parent.left;
+        anchors.right: parent.right;
+
+        RalewayRegular {
+            id: confirmPurchaseText;
+            anchors.top: parent.top;
+            anchors.topMargin: 30;
+            anchors.left: parent.left;
+            anchors.leftMargin: 16;
+            width: paintedWidth;
+            height: paintedHeight;
+            text: "Confirm Purchase:";
+            color: hifi.colors.baseGray;
+            size: 28;
+        }
+        
+        HifiControlsUit.Separator {
+            id: separator;
+            colorScheme: 1;
+            anchors.left: parent.left;
+            anchors.right: parent.right;
+            anchors.top: confirmPurchaseText.bottom;
+            anchors.topMargin: 16;
+        }
+
+        Item {
+            id: itemContainer;
+            anchors.top: separator.bottom;
+            anchors.topMargin: 24;
+            anchors.left: parent.left;
+            anchors.leftMargin: 16;
+            anchors.right: parent.right;
+            anchors.rightMargin: 16;
+            height: 120;
+
+            Image {
+                id: itemPreviewImage;
+                anchors.left: parent.left;
+                anchors.top: parent.top;
+                anchors.bottom: parent.bottom;
+                width: height;
+                fillMode: Image.PreserveAspectCrop;
+            }
+
+            RalewaySemiBold {
+                id: itemNameText;
+                text: root.itemName;
+                // Text size
+                size: 26;
+                // Anchors
+                anchors.top: parent.top;
+                anchors.left: itemPreviewImage.right;
+                anchors.leftMargin: 12;
+                anchors.right: itemPriceContainer.left;
+                anchors.rightMargin: 8;
+                height: 30;
+                // Style
+                color: hifi.colors.blueAccent;
+                elide: Text.ElideRight;
+                // Alignment
+                horizontalAlignment: Text.AlignLeft;
+                verticalAlignment: Text.AlignTop;
+            }
+
+            // "Item Price" container
+            Item {
+                id: itemPriceContainer;
+                // Anchors
+                anchors.top: parent.top;
+                anchors.right: parent.right;
+                height: 30;
+                width: itemPriceTextLabel.width + itemPriceText.width + 20;
+
+                // "HFC" balance label
+                HiFiGlyphs {
+                    id: itemPriceTextLabel;
+                    text: hifi.glyphs.hfc;
+                    // Size
+                    size: 30;
+                    // Anchors
+                    anchors.right: itemPriceText.left;
+                    anchors.rightMargin: 4;
+                    anchors.top: parent.top;
+                    anchors.topMargin: 0;
+                    width: paintedWidth;
+                    height: paintedHeight;
+                    // Style
+                    color: hifi.colors.blueAccent;
+                }
+                FiraSansSemiBold {
+                    id: itemPriceText;
+                    text: (root.itemPrice === -1) ? "--" : root.itemPrice;
+                    // Text size
+                    size: 26;
+                    // Anchors
+                    anchors.top: parent.top;
+                    anchors.right: parent.right;
+                    anchors.rightMargin: 16;
+                    width: paintedWidth;
+                    height: paintedHeight;
+                    // Style
+                    color: hifi.colors.blueAccent;
+                }
+            }
+        }
+        
+        HifiControlsUit.Separator {
+            id: separator2;
+            colorScheme: 1;
+            anchors.left: parent.left;
+            anchors.right: parent.right;
+            anchors.top: itemContainer.bottom;
+            anchors.topMargin: itemContainer.anchors.topMargin;
+        }
+
+
+        //
+        // ACTION BUTTONS AND TEXT START
+        //
+        Item {
+            id: checkoutActionButtonsContainer;
+            // Size
+            width: root.width;
+            // Anchors
+            anchors.top: separator2.bottom;
+            anchors.topMargin: 16;
+            anchors.left: parent.left;
+            anchors.leftMargin: 16;
+            anchors.right: parent.right;
+            anchors.rightMargin: 16;
+            anchors.bottom: parent.bottom;
+            anchors.bottomMargin: 8;
+
+            Rectangle {
+                id: buyTextContainer;
+                visible: buyText.text !== "";
+                anchors.top: parent.top;
+                anchors.left: parent.left;
+                anchors.right: parent.right;
+                height: buyText.height + 30;
+                radius: 4;
+                border.width: 2;
+
+                HiFiGlyphs {
+                    id: buyGlyph;
+                    // Size
+                    size: 46;
+                    // Anchors
+                    anchors.left: parent.left;
+                    anchors.leftMargin: 4;
+                    anchors.top: parent.top;
+                    anchors.topMargin: 8;
+                    anchors.bottom: parent.bottom;
+                    width: paintedWidth;
+                    // Style
+                    color: hifi.colors.baseGray;
+                    // Alignment
+                    horizontalAlignment: Text.AlignHCenter;
+                    verticalAlignment: Text.AlignTop;
+                }
+
+                RalewayRegular {
+                    id: buyText;
+                    // Text size
+                    size: 18;
+                    // Anchors
+                    anchors.left: buyGlyph.right;
+                    anchors.leftMargin: 8;
+                    anchors.right: parent.right;
+                    anchors.rightMargin: 12;
+                    anchors.verticalCenter: parent.verticalCenter;
+                    height: paintedHeight;
+                    // Style
+                    color: hifi.colors.black;
+                    wrapMode: Text.WordWrap;
+                    // Alignment
+                    horizontalAlignment: Text.AlignLeft;
+                    verticalAlignment: Text.AlignVCenter;
+
+                    onLinkActivated: {
+                        sendToScript({method: 'checkout_goToPurchases', filterText: root.itemName});
+                    }
+                }
+            }
+
+            // "Buy" button
+            HifiControlsUit.Button {
+                id: buyButton;
+                enabled: (root.balanceAfterPurchase >= 0 && purchasesReceived && balanceReceived) || !itemIsJson;
+                color: hifi.buttons.blue;
+                colorScheme: hifi.colorSchemes.light;
+                anchors.top: buyTextContainer.visible ? buyTextContainer.bottom : checkoutActionButtonsContainer.top;
+                anchors.topMargin: buyTextContainer.visible ? 12 : 16;
+                height: 40;
+                anchors.left: parent.left;
+                anchors.right: parent.right;
+                text: (itemIsJson ? ((purchasesReceived && balanceReceived) ? "Confirm Purchase" : "--") : "Get Item");
+                onClicked: {
+                    if (itemIsJson) {
+                        buyButton.enabled = false;
+                        if (!root.shouldBuyWithControlledFailure) {
+                            commerce.buy(itemId, itemPrice);
+                        } else {
+                            commerce.buy(itemId, itemPrice, true);
+                        }
+                    } else {
+                        if (urlHandler.canHandleUrl(itemHref)) {
+                            urlHandler.handleUrl(itemHref);
+                        }
+                    }
+                }
+            }
+
+            // "Cancel" button
+            HifiControlsUit.Button {
+                id: cancelPurchaseButton;
+                color: hifi.buttons.noneBorderlessGray;
+                colorScheme: hifi.colorSchemes.light;
+                anchors.top: buyButton.bottom;
+                anchors.topMargin: 16;
+                height: 40;
+                anchors.left: parent.left;
+                anchors.right: parent.right;
+                text: "Cancel"
+                onClicked: {
+                    sendToScript({method: 'checkout_cancelClicked', params: itemId});
+                }
+            }
+        }
+        //
+        // ACTION BUTTONS END
+        //
+    }
+    //
+    // CHECKOUT CONTENTS END
+    //
+
+    //
+    // CHECKOUT SUCCESS START
+    //
+    Item {
+        id: checkoutSuccess;
+        visible: root.activeView === "checkoutSuccess";
+        anchors.top: titleBarContainer.bottom;
+        anchors.bottom: root.bottom;
+        anchors.left: parent.left;
+        anchors.leftMargin: 16;
+        anchors.right: parent.right;
+        anchors.rightMargin: 16;
+
+        RalewayRegular {
+            id: completeText;
+            anchors.top: parent.top;
+            anchors.topMargin: 30;
+            anchors.left: parent.left;
+            width: paintedWidth;
+            height: paintedHeight;
+            text: "Thank you for your order!";
+            color: hifi.colors.baseGray;
+            size: 28;
+        }
+
+        RalewaySemiBold {
+            id: completeText2;
+            text: "The item " + '<font color="' + hifi.colors.blueAccent + '"><a href="#">' + root.itemName + '</a></font>' +
+            " has been added to your Purchases and a receipt will appear in your Wallet's transaction history.";
+            // Text size
+            size: 20;
+            // Anchors
+            anchors.top: completeText.bottom;
+            anchors.topMargin: 10;
+            height: paintedHeight;
+            anchors.left: parent.left;
+            anchors.right: parent.right;
+            // Style
+            color: hifi.colors.black;
+            wrapMode: Text.WordWrap;
+            // Alignment
+            horizontalAlignment: Text.AlignLeft;
+            verticalAlignment: Text.AlignVCenter;
+            onLinkActivated: {
+                sendToScript({method: 'checkout_itemLinkClicked', itemId: itemId});
+            }
+        }
+        
+        Rectangle {
+            id: rezzedNotifContainer;
+            z: 997;
+            visible: false;
+            color: hifi.colors.blueHighlight;
+            anchors.fill: rezNowButton;
+            radius: 5;
+            MouseArea {
+                anchors.fill: parent;
+                propagateComposedEvents: false;
+            }
+
+            RalewayBold {
+                anchors.fill: parent;
+                text: "REZZED";
+                size: 18;
+                color: hifi.colors.white;
+                verticalAlignment: Text.AlignVCenter;
+                horizontalAlignment: Text.AlignHCenter;
+            }
+
+            Timer {
+                id: rezzedNotifContainerTimer;
+                interval: 2000;
+                onTriggered: rezzedNotifContainer.visible = false
+            }
+        }
+        // "Rez" button
+        HifiControlsUit.Button {
+            id: rezNowButton;
+            enabled: root.canRezCertifiedItems || root.isWearable;
+            buttonGlyph: hifi.glyphs.lightning;
+            color: hifi.buttons.red;
+            colorScheme: hifi.colorSchemes.light;
+            anchors.top: completeText2.bottom;
+            anchors.topMargin: 30;
+            height: 50;
+            anchors.left: parent.left;
+            anchors.right: parent.right;
+            text: root.isWearable ? "Wear It" : "Rez It"
+            onClicked: {
+                sendToScript({method: 'checkout_rezClicked', itemHref: root.itemHref, isWearable: root.isWearable});
+                rezzedNotifContainer.visible = true;
+                rezzedNotifContainerTimer.start();
+            }
+        }
+        RalewaySemiBold {
+            id: noPermissionText;
+            visible: !root.canRezCertifiedItems && !root.isWearable;
+            text: '<font color="' + hifi.colors.redAccent + '"><a href="#">You do not have Certified Rez permissions in this domain.</a></font>'
+            // Text size
+            size: 16;
+            // Anchors
+            anchors.top: rezNowButton.bottom;
+            anchors.topMargin: 4;
+            height: paintedHeight;
+            anchors.left: parent.left;
+            anchors.right: parent.right;
+            // Style
+            color: hifi.colors.redAccent;
+            wrapMode: Text.WordWrap;
+            // Alignment
+            horizontalAlignment: Text.AlignHCenter;
+            verticalAlignment: Text.AlignVCenter;
+            onLinkActivated: {
+                lightboxPopup.titleText = "Rez Permission Required";
+                lightboxPopup.bodyText = "You don't have permission to rez certified items in this domain.<br><br>" +
+                    "Use the <b>GOTO app</b> to visit another domain or <b>go to your own sandbox.</b>";
+                lightboxPopup.button1text = "CLOSE";
+                lightboxPopup.button1method = "root.visible = false;"
+                lightboxPopup.button2text = "OPEN GOTO";
+                lightboxPopup.button2method = "sendToParent({method: 'purchases_openGoTo'});";
+                lightboxPopup.visible = true;
+            }
+        }
+        RalewaySemiBold {
+            id: explainRezText;
+            visible: !root.isWearable;
+            text: '<font color="' + hifi.colors.redAccent + '"><a href="#">What does "Rez" mean?</a></font>'
+            // Text size
+            size: 16;
+            // Anchors
+            anchors.top: noPermissionText.visible ? noPermissionText.bottom : rezNowButton.bottom;
+            anchors.topMargin: 6;
+            height: paintedHeight;
+            anchors.left: parent.left;
+            anchors.right: parent.right;
+            // Style
+            color: hifi.colors.redAccent;
+            wrapMode: Text.WordWrap;
+            // Alignment
+            horizontalAlignment: Text.AlignHCenter;
+            verticalAlignment: Text.AlignVCenter;
+            onLinkActivated: {
+                root.activeView = "firstUseTutorial";
+            }
+        }
+
+        RalewaySemiBold {
+            id: myPurchasesLink;
+            text: '<font color="' + hifi.colors.blueAccent + '"><a href="#">View this item in My Purchases</a></font>';
+            // Text size
+            size: 20;
+            // Anchors
+            anchors.top: explainRezText.visible ? explainRezText.bottom : (noPermissionText.visible ? noPermissionText.bottom : rezNowButton.bottom);
+            anchors.topMargin: 40;
+            height: paintedHeight;
+            anchors.left: parent.left;
+            anchors.right: parent.right;
+            // Style
+            color: hifi.colors.black;
+            wrapMode: Text.WordWrap;
+            // Alignment
+            horizontalAlignment: Text.AlignLeft;
+            verticalAlignment: Text.AlignVCenter;
+            onLinkActivated: {
+                sendToScript({method: 'checkout_goToPurchases'});
+            }
+        }
+
+        RalewaySemiBold {
+            id: walletLink;
+            text: '<font color="' + hifi.colors.blueAccent + '"><a href="#">View receipt in Wallet</a></font>';
+            // Text size
+            size: 20;
+            // Anchors
+            anchors.top: myPurchasesLink.bottom;
+            anchors.topMargin: 20;
+            height: paintedHeight;
+            anchors.left: parent.left;
+            anchors.right: parent.right;
+            // Style
+            color: hifi.colors.black;
+            wrapMode: Text.WordWrap;
+            // Alignment
+            horizontalAlignment: Text.AlignLeft;
+            verticalAlignment: Text.AlignVCenter;
+            onLinkActivated: {
+                sendToScript({method: 'purchases_openWallet'});
+            }
+        }
+
+        RalewayRegular {
+            id: pendingText;
+            text: 'Your item is marked "pending" while your purchase is being confirmed. ' +
+            '<font color="' + hifi.colors.blueAccent + '"><a href="#">Learn More</a></font>';
+            // Text size
+            size: 20;
+            // Anchors
+            anchors.top: walletLink.bottom;
+            anchors.topMargin: 60;
+            height: paintedHeight;
+            anchors.left: parent.left;
+            anchors.right: parent.right;
+            // Style
+            color: hifi.colors.black;
+            wrapMode: Text.WordWrap;
+            // Alignment
+            horizontalAlignment: Text.AlignLeft;
+            verticalAlignment: Text.AlignVCenter;
+            onLinkActivated: {
+                lightboxPopup.titleText = "Purchase Confirmations";
+                lightboxPopup.bodyText = 'Your item is marked "pending" while your purchase is being confirmed.<br><br>' +
+                'Confirmations usually take about 90 seconds.';
+                lightboxPopup.button1text = "CLOSE";
+                lightboxPopup.button1method = "root.visible = false;"
+                lightboxPopup.visible = true;
+            }
+        }
+
+        // "Continue Shopping" button
+        HifiControlsUit.Button {
+            id: continueShoppingButton;
+            color: hifi.buttons.noneBorderlessGray;
+            colorScheme: hifi.colorSchemes.light;
+            anchors.bottom: parent.bottom;
+            anchors.bottomMargin: 20;
+            anchors.right: parent.right;
+            anchors.rightMargin: 14;
+            width: parent.width/2 - anchors.rightMargin;
+            height: 60;
+            text: "Continue Shopping";
+            onClicked: {
+                sendToScript({method: 'checkout_continueShopping', itemId: itemId});
+            }
+        }
+    }
+    //
+    // CHECKOUT SUCCESS END
+    //
+
+    //
+    // CHECKOUT FAILURE START
+    //
+    Item {
+        id: checkoutFailure;
+        visible: root.activeView === "checkoutFailure";
+        anchors.top: titleBarContainer.bottom;
+        anchors.bottom: root.bottom;
+        anchors.left: parent.left;
+        anchors.leftMargin: 16;
+        anchors.right: parent.right;
+        anchors.rightMargin: 16;
+
+        RalewayRegular {
+            id: failureHeaderText;
+            text: "<b>Purchase Failed.</b><br>Your Purchases and HFC balance haven't changed.";
+            // Text size
+            size: 24;
+            // Anchors
+            anchors.top: parent.top;
+            anchors.topMargin: 40;
+            height: paintedHeight;
+            anchors.left: parent.left;
+            anchors.right: parent.right;
+            // Style
+            color: hifi.colors.black;
+            wrapMode: Text.WordWrap;
+        }
+
+        Rectangle {
+            id: failureErrorTextContainer;
+            anchors.top: failureHeaderText.bottom;
+            anchors.topMargin: 35;
+            anchors.left: parent.left;
+            anchors.right: parent.right;
+            height: failureErrorText.height + 30;
+            radius: 4;
+            border.width: 2;
+            border.color: "#F3808F";
+            color: "#FFC3CD";
+
+            AnonymousProRegular {
+                id: failureErrorText;
+                // Text size
+                size: 16;
+                // Anchors
+                anchors.top: parent.top;
+                anchors.topMargin: 15;
+                anchors.left: parent.left;
+                anchors.leftMargin: 8;
+                anchors.right: parent.right;
+                anchors.rightMargin: 8;
+                height: paintedHeight;
+                // Style
+                color: hifi.colors.black;
+                wrapMode: Text.Wrap;
+                verticalAlignment: Text.AlignVCenter;
+            }
+        }
+
+        Item {
+            id: backToMarketplaceButtonContainer;
+            // Size
+            width: root.width;
+            height: 50;
+            // Anchors
+            anchors.left: parent.left;
+            anchors.bottom: parent.bottom;
+            anchors.bottomMargin: 16;
+            // "Back to Marketplace" button
+            HifiControlsUit.Button {
+                id: backToMarketplaceButton;
+                color: hifi.buttons.noneBorderlessGray;
+                colorScheme: hifi.colorSchemes.light;
+                anchors.top: parent.top;
+                anchors.bottom: parent.bottom;
+                anchors.left: parent.left;
+                anchors.leftMargin: 16;
+                width: parent.width/2 - anchors.leftMargin*2;
+                text: "Back to Marketplace";
+                onClicked: {
+                    sendToScript({method: 'checkout_continueShopping', itemId: itemId});
+                }
+            }
+        }
+    }
+    //
+    // CHECKOUT FAILURE END
+    //
+
+    Keys.onPressed: {
+        if ((event.key == Qt.Key_F) && (event.modifiers & Qt.ControlModifier)) {
+            if (!root.shouldBuyWithControlledFailure) {
+                buyButton.text += " DEBUG FAIL ON"
+                buyButton.color = hifi.buttons.red;
+                root.shouldBuyWithControlledFailure = true;
+            } else {
+                buyButton.text = (itemIsJson ? ((purchasesReceived && balanceReceived) ? (root.alreadyOwned ? "Buy Another" : "Buy"): "--") : "Get Item");
+                buyButton.color = hifi.buttons.blue;
+                root.shouldBuyWithControlledFailure = false;
+            }
+        }
+    }
+
+    //
+    // FUNCTION DEFINITIONS START
+    //
+    //
+    // Function Name: fromScript()
+    //
+    // Relevant Variables:
+    // None
+    //
+    // Arguments:
+    // message: The message sent from the JavaScript, in this case the Marketplaces JavaScript.
+    //     Messages are in format "{method, params}", like json-rpc.
+    //
+    // Description:
+    // Called when a message is received from a script.
+    //
+    function fromScript(message) {
+        switch (message.method) {
+            case 'updateCheckoutQML':
+                itemId = message.params.itemId;
+                itemName = message.params.itemName;
+                root.itemPrice = message.params.itemPrice;
+                itemHref = message.params.itemHref;
+                setBuyText();
+            break;
+            default:
+                console.log('Unrecognized message from marketplaces.js:', JSON.stringify(message));
+        }
+    }
+    signal sendToScript(var message);
+
+    function purchasesContains(purchasesJson, id) {
+        for (var idx = 0; idx < purchasesJson.length; idx++) {
+            if(purchasesJson[idx].id === id) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    function setBuyText() {
+        if (root.itemIsJson) {
+            if (root.purchasesReceived && root.balanceReceived) {
+                if (root.balanceAfterPurchase < 0) {
+                    if (root.alreadyOwned) {
+                        buyText.text = "<b>Your Wallet does not have sufficient funds to purchase this item again.<br>" +
+                        '<font color="' + hifi.colors.blueAccent + '"><a href="#">View the copy you own in My Purchases</a></font></b>';
+                    } else {
+                        buyText.text = "<b>Your Wallet does not have sufficient funds to purchase this item.</b>";
+                    }
+                    buyTextContainer.color = "#FFC3CD";
+                    buyTextContainer.border.color = "#F3808F";
+                    buyGlyph.text = hifi.glyphs.error;
+                    buyGlyph.size = 54;
+                } else {
+                    if (root.alreadyOwned) {
+                        buyText.text = '<b>You already own this item.<br>Purchasing it will buy another copy.<br><font color="'
+                        + hifi.colors.blueAccent + '"><a href="#">View this item in My Purchases</a></font></b>';
+                        buyTextContainer.color = "#FFD6AD";
+                        buyTextContainer.border.color = "#FAC07D";
+                        buyGlyph.text = hifi.glyphs.alert;
+                        buyGlyph.size = 46;
+                    } else {
+                        buyText.text = "";
+                    }
+                }
+            } else {
+                buyText.text = "";
+            }
+        } else {
+            buyText.text = "This free item <b>will not</b> be added to your <b>Purchases</b>. Non-entities can't yet be purchased for HFC.";
+            buyTextContainer.color = "#FFD6AD";
+            buyTextContainer.border.color = "#FAC07D";
+            buyGlyph.text = hifi.glyphs.alert;
+            buyGlyph.size = 46;
+        }
+    }
+
+    function authSuccessStep() {
+        if (!root.debugCheckoutSuccess) {
+            root.activeView = "checkoutMain";
+        } else {
+            root.activeView = "checkoutSuccess";
+        }
+        root.balanceReceived = false;
+        root.purchasesReceived = false;
+        commerce.inventory();
+        commerce.balance();
+    }
+
+    //
+    // FUNCTION DEFINITIONS END
+    //
+}
diff --git a/interface/resources/qml/hifi/commerce/common/CommerceLightbox.qml b/interface/resources/qml/hifi/commerce/common/CommerceLightbox.qml
new file mode 100644
index 0000000000..145b78bdc4
--- /dev/null
+++ b/interface/resources/qml/hifi/commerce/common/CommerceLightbox.qml
@@ -0,0 +1,154 @@
+//
+//  CommerceLightbox.qml
+//  qml/hifi/commerce/common
+//
+//  CommerceLightbox
+//
+//  Created by Zach Fox on 2017-09-19
+//  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
+//
+
+import Hifi 1.0 as Hifi
+import QtQuick 2.5
+import QtGraphicalEffects 1.0
+import QtQuick.Controls 1.4
+import "../../../styles-uit"
+import "../../../controls-uit" as HifiControlsUit
+import "../../../controls" as HifiControls
+
+// references XXX from root context
+
+Rectangle {
+    property string titleText;
+    property string bodyImageSource;
+    property string bodyText;
+    property string button1text;
+    property string button1method;
+    property string button2text;
+    property string button2method;
+
+    readonly property string securityPicBodyText: "When you see your Security Pic, your actions and data are securely making use of your " +
+        "Wallet's private keys.<br><br>You can change your Security Pic in your Wallet.";
+
+    id: root;
+    visible: false;
+    anchors.fill: parent;
+    color: Qt.rgba(0, 0, 0, 0.5);
+    z: 999;
+
+    // This object is always used in a popup.
+    // This MouseArea is used to prevent a user from being
+    //     able to click on a button/mouseArea underneath the popup.
+    MouseArea {
+        anchors.fill: parent;
+        propagateComposedEvents: false;
+    }
+
+    Rectangle {
+        anchors.centerIn: parent;
+        width: parent.width - 100;
+        height: childrenRect.height + 30;
+        color: "white";
+
+        RalewaySemiBold {
+            id: titleText;
+            text: root.titleText;
+            anchors.top: parent.top;
+            anchors.topMargin: 30;
+            anchors.left: parent.left;
+            anchors.leftMargin: 30;
+            anchors.right: parent.right;
+            anchors.rightMargin: 30;
+            height: paintedHeight;
+            color: hifi.colors.baseGray;
+            size: 24;
+            verticalAlignment: Text.AlignTop;
+            wrapMode: Text.WordWrap;
+        }
+
+        Image {
+            id: bodyImage;
+            visible: root.bodyImageSource;
+            source: root.bodyImageSource ? root.bodyImageSource : ""; 
+            anchors.top: root.titleText ? titleText.bottom : parent.top;
+            anchors.topMargin: root.titleText ? 20 : 30;
+            anchors.left: parent.left;
+            anchors.leftMargin: 30;
+            anchors.right: parent.right;
+            anchors.rightMargin: 30;
+            height: 140;
+            fillMode: Image.PreserveAspectFit;
+            mipmap: true;
+            cache: false;
+        }
+
+        RalewayRegular {
+            id: bodyText;
+            text: root.bodyText;
+            anchors.top: root.bodyImageSource ? bodyImage.bottom : (root.titleText ? titleText.bottom : parent.top);
+            anchors.topMargin: root.bodyImageSource ? 20 : (root.titleText ? 20 : 30);
+            anchors.left: parent.left;
+            anchors.leftMargin: 30;
+            anchors.right: parent.right;
+            anchors.rightMargin: 30;
+            height: paintedHeight;
+            color: hifi.colors.baseGray;
+            size: 20;
+            verticalAlignment: Text.AlignTop;
+            wrapMode: Text.WordWrap;
+        }
+
+        Item {
+            id: buttons;
+            anchors.top: bodyText.bottom;
+            anchors.topMargin: 30;
+            anchors.left: parent.left;
+            anchors.right: parent.right;
+            height: 70;
+
+            // Button 1
+            HifiControlsUit.Button {
+                color: hifi.buttons.noneBorderlessGray;
+                colorScheme: hifi.colorSchemes.light;
+                anchors.top: parent.top;
+                anchors.bottom: parent.bottom;
+                anchors.bottomMargin: 20;
+                anchors.left: parent.left;
+                anchors.leftMargin: 10;
+                width: root.button2text ? parent.width/2 - anchors.leftMargin*2 : parent.width - anchors.leftMargin * 2;
+                text: root.button1text;
+                onClicked: {
+                    eval(button1method);
+                }
+            }
+
+            // Button 2
+            HifiControlsUit.Button {
+                visible: root.button2text;
+                color: hifi.buttons.noneBorderless;
+                colorScheme: hifi.colorSchemes.light;
+                anchors.top: parent.top;
+                anchors.bottom: parent.bottom;
+                anchors.bottomMargin: 20;
+                anchors.right: parent.right;
+                anchors.rightMargin: 10;
+                width: parent.width/2 - anchors.rightMargin*2;
+                text: root.button2text;
+                onClicked: {
+                    eval(button2method);
+                }
+            }
+        }
+    }
+
+    //
+    // FUNCTION DEFINITIONS START
+    //
+    signal sendToParent(var msg);
+    //
+    // FUNCTION DEFINITIONS END
+    //
+}
diff --git a/interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml b/interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml
new file mode 100644
index 0000000000..8b3f017fd2
--- /dev/null
+++ b/interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml
@@ -0,0 +1,338 @@
+//
+//  EmulatedMarketplaceHeader.qml
+//  qml/hifi/commerce/common
+//
+//  EmulatedMarketplaceHeader
+//
+//  Created by Zach Fox on 2017-09-18
+//  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
+//
+
+import Hifi 1.0 as Hifi
+import QtQuick 2.7
+import QtGraphicalEffects 1.0
+import QtQuick.Controls 1.4
+import "../../../styles-uit"
+import "../../../controls-uit" as HifiControlsUit
+import "../../../controls" as HifiControls
+
+// references XXX from root context
+
+Item {
+    HifiConstants { id: hifi; }
+
+    id: root;
+    property string referrerURL: (Account.metaverseServerURL + "/marketplace?");
+    readonly property int additionalDropdownHeight: usernameDropdown.height - myUsernameButton.anchors.bottomMargin;
+    property alias usernameDropdownVisible: usernameDropdown.visible;
+
+    height: mainContainer.height + additionalDropdownHeight;
+
+    Hifi.QmlCommerce {
+        id: commerce;
+
+        onWalletStatusResult: {
+            if (walletStatus === 0) {
+                sendToParent({method: "needsLogIn"});
+            } else if (walletStatus === 3) {
+                commerce.getSecurityImage();
+            } else if (walletStatus > 3) {
+                console.log("ERROR in EmulatedMarketplaceHeader.qml: Unknown wallet status: " + walletStatus);
+            }
+        }
+
+        onLoginStatusResult: {
+            if (!isLoggedIn) {
+                sendToParent({method: "needsLogIn"});
+            } else {
+                commerce.getWalletStatus();
+            }
+        }
+
+        onSecurityImageResult: {
+            if (exists) {
+                securityImage.source = "";
+                securityImage.source = "image://security/securityImage";
+            }
+        }
+    }
+
+    Component.onCompleted: {
+        commerce.getWalletStatus();
+    }
+
+    Connections {
+        target: GlobalServices
+        onMyUsernameChanged: {
+            commerce.getLoginStatus();
+        }
+    }
+
+    Rectangle {
+        id: mainContainer;
+        color: hifi.colors.white;
+        anchors.left: parent.left;
+        anchors.right: parent.right;
+        anchors.top: parent.top;
+        height: 70;
+
+        Image {
+            id: marketplaceHeaderImage;
+            source: "images/marketplaceHeaderImage.png";
+            anchors.top: parent.top;
+            anchors.topMargin: 2;
+            anchors.bottom: parent.bottom;
+            anchors.bottomMargin: 10;
+            anchors.left: parent.left;
+            anchors.leftMargin: 8;
+            width: 140;
+            fillMode: Image.PreserveAspectFit;
+
+            MouseArea {
+                anchors.fill: parent;
+                onClicked: {
+                    sendToParent({method: "header_marketplaceImageClicked", referrerURL: root.referrerURL});
+                }
+            }
+        }
+
+        Item {
+            id: buttonAndUsernameContainer;
+            anchors.left: marketplaceHeaderImage.right;
+            anchors.leftMargin: 8;
+            anchors.top: parent.top;
+            anchors.bottom: parent.bottom;
+            anchors.bottomMargin: 10;
+            anchors.right: securityImage.left;
+            anchors.rightMargin: 6;
+
+            Rectangle {
+                id: myPurchasesLink;
+                anchors.right: myUsernameButton.left;
+                anchors.rightMargin: 8;
+                anchors.verticalCenter: parent.verticalCenter;
+                height: 40;
+                width: myPurchasesText.paintedWidth + 10;
+
+                RalewaySemiBold {
+                    id: myPurchasesText;
+                    text: "My Purchases";
+                    // Text size
+                    size: 18;
+                    // Style
+                    color: hifi.colors.blueAccent;
+                    horizontalAlignment: Text.AlignHCenter;
+                    verticalAlignment: Text.AlignVCenter;
+                    // Anchors
+                    anchors.centerIn: parent;
+                }
+
+                MouseArea {
+                    anchors.fill: parent;
+                    hoverEnabled: enabled;
+                    onClicked: {
+                        sendToParent({method: 'header_goToPurchases'});
+                    }
+                    onEntered: myPurchasesText.color = hifi.colors.blueHighlight;
+                    onExited: myPurchasesText.color = hifi.colors.blueAccent;
+                }
+            }
+
+            FontLoader { id: ralewayRegular; source: "../../../../fonts/Raleway-Regular.ttf"; }
+            TextMetrics {
+                id: textMetrics;
+                font.family: ralewayRegular.name
+                text: usernameText.text;
+            }
+
+            Rectangle {
+                id: myUsernameButton;
+                anchors.right: parent.right;
+                anchors.verticalCenter: parent.verticalCenter;
+                height: 40;
+                width: usernameText.width + 25;
+                color: "white";
+                radius: 4;
+                border.width: 1;
+                border.color: hifi.colors.lightGray;
+
+                // Username Text
+                RalewayRegular {
+                    id: usernameText;
+                    text: Account.username;
+                    // Text size
+                    size: 18;
+                    // Style
+                    color: hifi.colors.baseGray;
+                    elide: Text.ElideRight;
+                    horizontalAlignment: Text.AlignHCenter;
+                    verticalAlignment: Text.AlignVCenter;
+                    width: Math.min(textMetrics.width + 25, 110);
+                    // Anchors
+                    anchors.centerIn: parent;
+                    rightPadding: 10;
+                }
+
+                HiFiGlyphs {
+                    id: dropdownIcon;
+                    text: hifi.glyphs.caratDn;
+                    // Size
+                    size: 50;
+                    // Anchors
+                    anchors.right: parent.right;
+                    anchors.rightMargin: -14;
+                    anchors.verticalCenter: parent.verticalCenter;
+                    horizontalAlignment: Text.AlignHCenter;
+                    // Style
+                    color: hifi.colors.baseGray;
+                }
+
+                MouseArea {
+                    anchors.fill: parent;
+                    hoverEnabled: enabled;
+                    onClicked: {
+                        usernameDropdown.visible = !usernameDropdown.visible;
+                    }
+                    onEntered: usernameText.color = hifi.colors.baseGrayShadow;
+                    onExited: usernameText.color = hifi.colors.baseGray;
+                }
+            }
+        }
+
+        Image {
+            id: securityImage;
+            source: "";
+            visible: securityImage.source !== "";
+            anchors.right: parent.right;
+            anchors.rightMargin: 6;
+            anchors.top: parent.top;
+            anchors.topMargin: 6;
+            anchors.bottom: parent.bottom;
+            anchors.bottomMargin: 16;
+            width: height;
+            mipmap: true;
+            cache: false;
+
+            MouseArea {
+                enabled: securityImage.visible;
+                anchors.fill: parent;
+                onClicked: {
+                    sendToParent({method: "showSecurityPicLightbox", securityImageSource: securityImage.source});
+                }
+            }
+        }
+    
+        LinearGradient {
+            z: 996;
+            anchors.bottom: parent.bottom;
+            anchors.left: parent.left;
+            anchors.right: parent.right;
+            height: 10;
+            start: Qt.point(0, 0);
+            end: Qt.point(0, height);
+            gradient: Gradient {
+                GradientStop { position: 0.0; color: hifi.colors.lightGrayText }
+                GradientStop { position: 1.0; color: hifi.colors.white }
+            }
+        }
+
+        Item {
+            id: usernameDropdown;
+            z: 998;
+            visible: false;
+            anchors.top: buttonAndUsernameContainer.bottom;
+            anchors.topMargin: -buttonAndUsernameContainer.anchors.bottomMargin;
+            anchors.right: buttonAndUsernameContainer.right;
+            height: childrenRect.height;
+            width: 100;
+
+            Rectangle {
+                id: myItemsButton;
+                color: hifi.colors.white;
+                anchors.top: parent.top;
+                anchors.left: parent.left;
+                anchors.right: parent.right;
+                height: 50;
+
+                RalewaySemiBold {
+                    anchors.fill: parent;
+                    text: "My Items"
+                    color: hifi.colors.baseGray;
+                    horizontalAlignment: Text.AlignHCenter;
+                    verticalAlignment: Text.AlignVCenter;
+                    size: 18;
+                }
+
+                MouseArea {
+                    anchors.fill: parent;
+                    hoverEnabled: true;
+                    onEntered: {
+                        myItemsButton.color = hifi.colors.blueHighlight;
+                    }
+                    onExited: {
+                        myItemsButton.color = hifi.colors.white;
+                    }
+                    onClicked: {
+                        sendToParent({method: "header_myItemsClicked"});
+                    }
+                }
+            }
+
+            Rectangle {
+                id: logOutButton;
+                color: hifi.colors.white;
+                anchors.top: myItemsButton.bottom;
+                anchors.left: parent.left;
+                anchors.right: parent.right;
+                height: 50;
+
+                RalewaySemiBold {
+                    anchors.fill: parent;
+                    text: "Log Out"
+                    color: hifi.colors.baseGray;
+                    horizontalAlignment: Text.AlignHCenter;
+                    verticalAlignment: Text.AlignVCenter;
+                    size: 18;
+                }
+
+                MouseArea {
+                    anchors.fill: parent;
+                    hoverEnabled: true;
+                    onEntered: {
+                        logOutButton.color = hifi.colors.blueHighlight;
+                    }
+                    onExited: {
+                        logOutButton.color = hifi.colors.white;
+                    }
+                    onClicked: {
+                        Account.logOut();
+                    }
+                }
+            }
+        }
+
+        DropShadow {
+            z: 997;
+            visible: usernameDropdown.visible;
+            anchors.fill: usernameDropdown;
+            horizontalOffset: 3;
+            verticalOffset: 3;
+            radius: 8.0;
+            samples: 17;
+            color: "#80000000";
+            source: usernameDropdown;
+        }
+    }
+
+
+    //
+    // FUNCTION DEFINITIONS START
+    //
+    signal sendToParent(var msg);
+    //
+    // FUNCTION DEFINITIONS END
+    //
+}
diff --git a/interface/resources/qml/hifi/commerce/common/FirstUseTutorial.qml b/interface/resources/qml/hifi/commerce/common/FirstUseTutorial.qml
new file mode 100644
index 0000000000..0d3f67ef7a
--- /dev/null
+++ b/interface/resources/qml/hifi/commerce/common/FirstUseTutorial.qml
@@ -0,0 +1,221 @@
+//
+//  FirstUseTutorial.qml
+//  qml/hifi/commerce/purchases
+//
+//  FirstUseTutorial
+//
+//  Created by Zach Fox on 2017-09-13
+//  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
+//
+
+import Hifi 1.0 as Hifi
+import QtQuick 2.5
+import QtGraphicalEffects 1.0
+import QtQuick.Controls 1.4
+import "../../../styles-uit"
+import "../../../controls-uit" as HifiControlsUit
+import "../../../controls" as HifiControls
+
+// references XXX from root context
+
+Rectangle {
+    HifiConstants { id: hifi; }
+
+    id: root;
+    property int activeView: 1;
+
+    onVisibleChanged: {
+        if (visible) {
+            root.activeView = 1;
+        }
+    }
+
+    Image {
+        anchors.fill: parent;
+        source: "images/Purchase-First-Run-" + root.activeView + ".jpg";
+    }
+
+    // This object is always used in a popup.
+    // This MouseArea is used to prevent a user from being
+    //     able to click on a button/mouseArea underneath the popup.
+    MouseArea {
+        anchors.fill: parent;
+        propagateComposedEvents: false;
+    }
+
+    Item {
+        id: header;
+        anchors.top: parent.top;
+        anchors.left: parent.left;
+        anchors.right: parent.right;
+        height: childrenRect.height;
+
+        Image {
+            id: marketplaceHeaderImage;
+            source: "../common/images/marketplaceHeaderImage.png";
+            anchors.top: parent.top;
+            anchors.topMargin: 2;
+            anchors.left: parent.left;
+            anchors.leftMargin: 8;
+            width: 140;
+            height: 58;
+            fillMode: Image.PreserveAspectFit;
+            visible: false;
+        }
+        ColorOverlay {
+            anchors.fill: marketplaceHeaderImage;
+            source: marketplaceHeaderImage;
+            color: "#FFFFFF"
+        }
+        RalewayRegular {
+            id: introText1;
+            text: "INTRODUCTION TO";
+            // Text size
+            size: 15;
+            // Anchors
+            anchors.top: marketplaceHeaderImage.bottom;
+            anchors.topMargin: 8;
+            anchors.left: parent.left;
+            anchors.leftMargin: 12;
+            anchors.right: parent.right;
+            height: paintedHeight;
+            // Style
+            color: hifi.colors.white;
+        }
+        RalewayRegular {
+            id: introText2;
+            text: "My Purchases";
+            // Text size
+            size: 28;
+            // Anchors
+            anchors.top: introText1.bottom;
+            anchors.left: parent.left;
+            anchors.leftMargin: 12;
+            anchors.right: parent.right;
+            height: paintedHeight;
+            // Style
+            color: hifi.colors.white;
+        }
+    }
+
+    //
+    // "STEP 1" START
+    //
+    Item {
+        id: step_1;
+        visible: root.activeView === 1;
+        anchors.top: header.bottom;
+        anchors.topMargin: 100;
+        anchors.left: parent.left;
+        anchors.leftMargin: 30;
+        anchors.right: parent.right;
+        anchors.bottom: parent.bottom;
+
+        RalewayRegular {
+            id: step1text;
+            text: "The <b>'REZ IT'</b> button makes your purchase appear in front of you.";
+            // Text size
+            size: 20;
+            // Anchors
+            anchors.top: parent.top;
+            anchors.left: parent.left;
+            width: 180;
+            height: paintedHeight;
+            // Style
+            color: hifi.colors.white;
+            wrapMode: Text.WordWrap;
+        }
+        
+        // "Next" button
+        HifiControlsUit.Button {
+            color: hifi.buttons.blue;
+            colorScheme: hifi.colorSchemes.dark;
+            anchors.top: step1text.bottom;
+            anchors.topMargin: 16;
+            anchors.left: parent.left;
+            width: 150;
+            height: 40;
+            text: "Next";
+            onClicked: {
+                root.activeView++;
+            }
+        }
+        
+        // "SKIP" button
+        HifiControlsUit.Button {
+            color: hifi.buttons.noneBorderlessGray;
+            colorScheme: hifi.colorSchemes.dark;
+            anchors.bottom: parent.bottom;
+            anchors.bottomMargin: 32;
+            anchors.right: parent.right;
+            anchors.rightMargin: 16;
+            width: 150;
+            height: 40;
+            text: "SKIP";
+            onClicked: {
+                sendSignalToParent({method: 'tutorial_finished'});
+            }
+        }
+    }
+    //
+    // "STEP 1" END
+    //
+
+    //
+    // "STEP 2" START
+    //
+    Item {
+        id: step_2;
+        visible: root.activeView === 2;
+        anchors.top: header.bottom;
+        anchors.topMargin: 45;
+        anchors.left: parent.left;
+        anchors.leftMargin: 30;
+        anchors.right: parent.right;
+        anchors.bottom: parent.bottom;
+
+        RalewayRegular {
+            id: step2text;
+            text: "If you rez an item twice, the first one will disappear.";
+            // Text size
+            size: 20;
+            // Anchors
+            anchors.top: parent.top;
+            anchors.left: parent.left;
+            width: 180;
+            height: paintedHeight;
+            // Style
+            color: hifi.colors.white;
+            wrapMode: Text.WordWrap;
+        }
+        
+        // "GOT IT" button
+        HifiControlsUit.Button {
+            color: hifi.buttons.blue;
+            colorScheme: hifi.colorSchemes.dark;
+            anchors.top: step2text.bottom;
+            anchors.topMargin: 16;
+            anchors.left: parent.left;
+            width: 150;
+            height: 40;
+            text: "GOT IT";
+            onClicked: {
+                sendSignalToParent({method: 'tutorial_finished'});
+            }
+        }
+    }
+    //
+    // "STEP 2" END
+    //
+
+    //
+    // FUNCTION DEFINITIONS START
+    //
+    signal sendSignalToParent(var message);
+    //
+    // FUNCTION DEFINITIONS END
+    //
+}
diff --git a/interface/resources/qml/hifi/commerce/common/SortableListModel.qml b/interface/resources/qml/hifi/commerce/common/SortableListModel.qml
new file mode 100644
index 0000000000..2d82e42ddb
--- /dev/null
+++ b/interface/resources/qml/hifi/commerce/common/SortableListModel.qml
@@ -0,0 +1,68 @@
+//
+//  SortableListModel.qml
+//  qml/hifi/commerce/common
+//
+//  SortableListModel
+//
+//  Created by Zach Fox on 2017-09-28
+//  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
+//
+
+import QtQuick 2.5
+
+ListModel {
+    id: root;
+    property string sortColumnName: "";
+    property bool isSortingDescending: true;
+
+    function swap(a, b) {
+        if (a < b) {
+            move(a, b, 1);
+            move (b - 1, a, 1);
+        } else if (a > b) {
+            move(b, a, 1);
+            move(a - 1, b, 1);
+        }
+    }
+
+    function partition(begin, end, pivot) {
+        var piv = get(pivot)[sortColumnName];
+        swap(pivot, end - 1);
+        var store = begin;
+
+        for (var i = begin; i < end - 1; ++i) {
+            if (isSortingDescending) {
+                if (get(i)[sortColumnName] < piv) {
+                    swap(store, i);
+                    ++store;
+                }
+            } else {
+                if (get(i)[sortColumnName] > piv) {
+                    swap(store, i);
+                    ++store;
+                }
+            }
+        }
+        swap(end - 1, store);
+
+        return store;
+    }
+
+    function qsort(begin, end) {
+        if (end - 1 > begin) {
+            var pivot = begin + Math.floor(Math.random() * (end - begin));
+
+            pivot = partition(begin, end, pivot);
+
+            qsort(begin, pivot);
+            qsort(pivot + 1, end);
+        }
+    }
+
+    function quickSort() {
+        qsort(0, count)
+    }
+}
\ No newline at end of file
diff --git a/interface/resources/qml/hifi/commerce/common/images/Purchase-First-Run-1.jpg b/interface/resources/qml/hifi/commerce/common/images/Purchase-First-Run-1.jpg
new file mode 100644
index 0000000000..ce0d87363f
Binary files /dev/null and b/interface/resources/qml/hifi/commerce/common/images/Purchase-First-Run-1.jpg differ
diff --git a/interface/resources/qml/hifi/commerce/common/images/Purchase-First-Run-2.jpg b/interface/resources/qml/hifi/commerce/common/images/Purchase-First-Run-2.jpg
new file mode 100644
index 0000000000..40bed974af
Binary files /dev/null and b/interface/resources/qml/hifi/commerce/common/images/Purchase-First-Run-2.jpg differ
diff --git a/interface/resources/qml/hifi/commerce/common/images/marketplaceHeaderImage.png b/interface/resources/qml/hifi/commerce/common/images/marketplaceHeaderImage.png
new file mode 100644
index 0000000000..f49504c539
Binary files /dev/null and b/interface/resources/qml/hifi/commerce/common/images/marketplaceHeaderImage.png differ
diff --git a/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml b/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml
new file mode 100644
index 0000000000..14ed9ece67
--- /dev/null
+++ b/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml
@@ -0,0 +1,456 @@
+//
+//  InspectionCertificate.qml
+//  qml/hifi/commerce/inspectionCertificate
+//
+//  InspectionCertificate
+//
+//  Created by Zach Fox on 2017-09-14
+//  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
+//
+
+import Hifi 1.0 as Hifi
+import QtQuick 2.5
+import QtQuick.Controls 1.4
+import "../../../styles-uit"
+import "../../../controls-uit" as HifiControlsUit
+import "../../../controls" as HifiControls
+import "../wallet" as HifiWallet
+
+// references XXX from root context
+
+Rectangle {
+    HifiConstants { id: hifi; }
+
+    id: root;
+    property string marketplaceUrl;
+    property string certificateId;
+    property string itemName: "--";
+    property string itemOwner: "--";
+    property string itemEdition: "--";
+    property string dateOfPurchase: "--";
+    property bool isLightbox: false;
+    property bool isMyCert: false;
+    property bool isCertificateInvalid: false;
+    // Style
+    color: hifi.colors.faintGray;
+    Hifi.QmlCommerce {
+        id: commerce;
+
+        onCertificateInfoResult: {
+            if (result.status !== 'success') {
+                console.log("Failed to get certificate info", result.message);
+            } else {
+                root.marketplaceUrl = result.data.marketplace_item_url;
+                root.isMyCert = result.isMyCert ? result.isMyCert : false;
+                root.itemOwner = root.isCertificateInvalid ? "--" : (root.isMyCert ? Account.username :
+                "\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022");
+                root.itemEdition = root.isCertificateInvalid ? "Uncertified Copy" :
+                (result.data.edition_number + "/" + (result.data.limited_run === -1 ? "\u221e" : result.data.limited_run));
+                root.dateOfPurchase = root.isCertificateInvalid ? "" : getFormattedDate(result.data.transfer_created_at * 1000);
+                root.itemName = result.data.marketplace_item_name;
+
+                if (result.data.invalid_reason || result.data.transfer_status[0] === "failed") {
+                    titleBarText.text = "Invalid Certificate";
+                    titleBarText.color = hifi.colors.redHighlight;
+                    popText.text = "";
+                    if (result.data.invalid_reason) {
+                        errorText.text = result.data.invalid_reason;
+                    }
+                } else if (result.data.transfer_status[0] === "pending") {
+                    titleBarText.text = "Certificate Pending";
+                    errorText.text = "The status of this item is still pending confirmation. If the purchase is not confirmed, " +
+                    "this entity will be cleaned up by the domain.";
+                    errorText.color = hifi.colors.baseGray;
+                }
+            }
+        }
+
+        onUpdateCertificateStatus: {
+            if (certStatus === 1) { // CERTIFICATE_STATUS_VERIFICATION_SUCCESS
+                // NOP
+            } else if (certStatus === 2) { // CERTIFICATE_STATUS_VERIFICATION_TIMEOUT
+                root.isCertificateInvalid = true;
+                errorText.text = "Verification of this certificate timed out.";
+                errorText.color = hifi.colors.redHighlight;
+            } else if (certStatus === 3) { // CERTIFICATE_STATUS_STATIC_VERIFICATION_FAILED
+                root.isCertificateInvalid = true;
+                titleBarText.text = "Invalid Certificate";
+                titleBarText.color = hifi.colors.redHighlight;
+
+                popText.text = "";
+                root.itemOwner = "";
+                dateOfPurchaseHeader.text = "";
+                root.dateOfPurchase = "";
+                root.itemEdition = "Uncertified Copy";
+
+                errorText.text = "The information associated with this item has been modified and it no longer matches the original certified item.";
+                errorText.color = hifi.colors.baseGray;
+            } else if (certStatus === 4) { // CERTIFICATE_STATUS_OWNER_VERIFICATION_FAILED
+                root.isCertificateInvalid = true;
+                titleBarText.text = "Invalid Certificate";
+                titleBarText.color = hifi.colors.redHighlight;
+
+                popText.text = "";
+                root.itemOwner = "";
+                dateOfPurchaseHeader.text = "";
+                root.dateOfPurchase = "";
+                root.itemEdition = "Uncertified Copy";
+
+                errorText.text = "The avatar who rezzed this item doesn't own it.";
+                errorText.color = hifi.colors.baseGray;
+            } else {
+                console.log("Unknown certificate status received from ledger signal!");
+            }
+        }
+    }
+
+    onCertificateIdChanged: {
+        if (certificateId !== "") {
+            commerce.certificateInfo(certificateId);
+        }
+    }
+
+    // This object is always used in a popup.
+    // This MouseArea is used to prevent a user from being
+    //     able to click on a button/mouseArea underneath the popup.
+    MouseArea {
+        anchors.fill: parent;
+        propagateComposedEvents: false;
+    }
+
+    Image {
+        anchors.fill: parent;
+        source: "images/cert-bg.jpg";
+    }
+
+    // Title text
+    RalewayLight {
+        id: titleBarText;
+        text: "Certificate";
+        // Text size
+        size: 40;
+        // Anchors
+        anchors.top: parent.top;
+        anchors.topMargin: 40;
+        anchors.left: parent.left;
+        anchors.leftMargin: 45;
+        anchors.right: parent.right;
+        height: paintedHeight;
+        // Style
+        color: hifi.colors.darkGray;
+    }
+    // Title text
+    RalewayRegular {
+        id: popText;
+        text: "PROOF OF PURCHASE";
+        // Text size
+        size: 16;
+        // Anchors
+        anchors.top: titleBarText.bottom;
+        anchors.topMargin: 4;
+        anchors.left: titleBarText.left;
+        anchors.right: titleBarText.right;
+        height: paintedHeight;
+        // Style
+        color: hifi.colors.baseGray;
+    }
+
+    //
+    // "CERTIFICATE" START
+    //
+    Item {
+        id: certificateContainer;
+        anchors.top: popText.bottom;
+        anchors.topMargin: 30;
+        anchors.bottom: buttonsContainer.top;
+        anchors.left: parent.left;
+        anchors.right: parent.right;
+
+        RalewayRegular {
+            id: itemNameHeader;
+            text: "ITEM NAME";
+            // Text size
+            size: 16;
+            // Anchors
+            anchors.top: parent.top;
+            anchors.left: parent.left;
+            anchors.leftMargin: 45;
+            anchors.right: parent.right;
+            anchors.rightMargin: 16;
+            height: paintedHeight;
+            // Style
+            color: hifi.colors.baseGray;
+        }
+        RalewaySemiBold {
+            id: itemName;
+            text: root.itemName;
+            // Text size
+            size: 28;
+            // Anchors
+            anchors.top: itemNameHeader.bottom;
+            anchors.topMargin: 8;
+            anchors.left: itemNameHeader.left;
+            anchors.right: itemNameHeader.right;
+            height: paintedHeight;
+            // Style
+            color: hifi.colors.blueAccent;
+            elide: Text.ElideRight;
+            MouseArea {
+                anchors.fill: parent;
+                hoverEnabled: enabled;
+                onClicked: {
+                    sendToScript({method: 'inspectionCertificate_showInMarketplaceClicked', marketplaceUrl: root.marketplaceUrl});
+                }
+                onEntered: itemName.color = hifi.colors.blueHighlight;
+                onExited: itemName.color = hifi.colors.blueAccent;
+            }
+        }
+
+        RalewayRegular {
+            id: ownedByHeader;
+            text: "OWNER";
+            // Text size
+            size: 16;
+            // Anchors
+            anchors.top: itemName.bottom;
+            anchors.topMargin: 28;
+            anchors.left: parent.left;
+            anchors.leftMargin: 45;
+            anchors.right: parent.right;
+            anchors.rightMargin: 16;
+            height: paintedHeight;
+            // Style
+            color: hifi.colors.lightGray;
+        }
+        RalewayRegular {
+            id: ownedBy;
+            text: root.itemOwner;
+            // Text size
+            size: 22;
+            // Anchors
+            anchors.top: ownedByHeader.bottom;
+            anchors.topMargin: 8;
+            anchors.left: ownedByHeader.left;
+            height: paintedHeight;
+            // Style
+            color: hifi.colors.darkGray;
+            elide: Text.ElideRight;
+        }
+        AnonymousProRegular {
+            id: isMyCertText;
+            visible: root.isMyCert && !root.isCertificateInvalid;
+            text: "(Private)";
+            size: 18;
+            // Anchors
+            anchors.top: ownedBy.top;
+            anchors.topMargin: 4;
+            anchors.bottom: ownedBy.bottom;
+            anchors.left: ownedBy.right;
+            anchors.leftMargin: 6;
+            anchors.right: ownedByHeader.right;
+            // Style
+            color: hifi.colors.lightGray;
+            elide: Text.ElideRight;
+            verticalAlignment: Text.AlignVCenter;
+        }
+
+        RalewayRegular {
+            id: editionHeader;
+            text: "EDITION";
+            // Text size
+            size: 16;
+            // Anchors
+            anchors.top: ownedBy.bottom;
+            anchors.topMargin: 28;
+            anchors.left: parent.left;
+            anchors.leftMargin: 45;
+            anchors.right: parent.right;
+            anchors.rightMargin: 16;
+            height: paintedHeight;
+            // Style
+            color: hifi.colors.lightGray;
+        }
+        AnonymousProRegular {
+            id: edition;
+            text: root.itemEdition;
+            // Text size
+            size: 18;
+            // Anchors
+            anchors.top: editionHeader.bottom;
+            anchors.topMargin: 8;
+            anchors.left: editionHeader.left;
+            anchors.right: editionHeader.right;
+            height: paintedHeight;
+            // Style
+            color: hifi.colors.darkGray;
+        }
+
+        RalewayRegular {
+            id: dateOfPurchaseHeader;
+            text: "DATE OF PURCHASE";
+            // Text size
+            size: 16;
+            // Anchors
+            anchors.top: edition.bottom;
+            anchors.topMargin: 28;
+            anchors.left: parent.left;
+            anchors.leftMargin: 45;
+            anchors.right: parent.right;
+            anchors.rightMargin: 16;
+            height: paintedHeight;
+            // Style
+            color: hifi.colors.lightGray;
+        }
+        AnonymousProRegular {
+            id: dateOfPurchase;
+            text: root.dateOfPurchase;
+            // Text size
+            size: 18;
+            // Anchors
+            anchors.top: dateOfPurchaseHeader.bottom;
+            anchors.topMargin: 8;
+            anchors.left: dateOfPurchaseHeader.left;
+            anchors.right: dateOfPurchaseHeader.right;
+            height: paintedHeight;
+            // Style
+            color: hifi.colors.darkGray;
+        }
+
+        RalewayRegular {
+            id: errorText;
+            // Text size
+            size: 20;
+            // Anchors
+            anchors.top: dateOfPurchase.bottom;
+            anchors.topMargin: 36;
+            anchors.left: dateOfPurchase.left;
+            anchors.right: dateOfPurchase.right;
+            anchors.bottom: parent.bottom;
+            // Style
+            wrapMode: Text.WordWrap;
+            color: hifi.colors.redHighlight;
+            verticalAlignment: Text.AlignTop;
+        }
+    }
+    //
+    // "CERTIFICATE" END
+    //
+
+    Item {
+        id: buttonsContainer;
+        anchors.bottom: parent.bottom;
+        anchors.bottomMargin: 30;
+        anchors.left: parent.left;
+        anchors.right: parent.right;
+        height: 50;
+        
+        // "Cancel" button
+        HifiControlsUit.Button {
+            color: hifi.buttons.noneBorderless;
+            colorScheme: hifi.colorSchemes.light;
+            anchors.top: parent.top;
+            anchors.left: parent.left;
+            anchors.leftMargin: 30;
+            width: parent.width/2 - 50;
+            height: 50;
+            text: "close";
+            onClicked: {
+                if (root.isLightbox) {
+                    root.visible = false;
+                } else {
+                    sendToScript({method: 'inspectionCertificate_closeClicked', closeGoesToPurchases: root.closeGoesToPurchases});
+                }
+            }
+        }   
+
+        // "Show In Marketplace" button
+        HifiControlsUit.Button {
+            id: showInMarketplaceButton;
+            enabled: root.marketplaceUrl;
+            color: hifi.buttons.blue;
+            colorScheme: hifi.colorSchemes.light;
+            anchors.top: parent.top;
+            anchors.right: parent.right;
+            anchors.rightMargin: 30;
+            width: parent.width/2 - 50;
+            height: 50;
+            text: "View In Market"
+            onClicked: {
+                sendToScript({method: 'inspectionCertificate_showInMarketplaceClicked', marketplaceUrl: root.marketplaceUrl});
+            }
+        }
+    }
+
+    //
+    // FUNCTION DEFINITIONS START
+    //
+    //
+    // Function Name: fromScript()
+    //
+    // Relevant Variables:
+    // None
+    //
+    // Arguments:
+    // message: The message sent from the JavaScript, in this case the Marketplaces JavaScript.
+    //     Messages are in format "{method, params}", like json-rpc.
+    //
+    // Description:
+    // Called when a message is received from a script.
+    //
+    function fromScript(message) {
+        switch (message.method) {
+            case 'inspectionCertificate_setCertificateId':
+                root.certificateId = message.certificateId;
+            break;
+            case 'inspectionCertificate_resetCert':
+                titleBarText.text = "Certificate";
+                popText.text = "PROOF OF PURCHASE";
+                root.certificateId = "";
+                root.itemName = "--";
+                root.itemOwner = "--";
+                root.itemEdition = "--";
+                root.dateOfPurchase = "--";
+                root.marketplaceUrl = "";
+                root.isMyCert = false;
+                errorText.text = "";
+            break;
+            default:
+                console.log('Unrecognized message from marketplaces.js:', JSON.stringify(message));
+        }
+    }
+    signal sendToScript(var message);
+
+    function getFormattedDate(timestamp) {
+        function addLeadingZero(n) {
+            return n < 10 ? '0' + n : '' + n;
+        }
+
+        var a = new Date(timestamp);
+        var year = a.getFullYear();
+        var month = addLeadingZero(a.getMonth());
+        var day = addLeadingZero(a.getDate());
+        var hour = a.getHours();
+        var drawnHour = hour;
+        if (hour === 0) {
+            drawnHour = 12;
+        } else if (hour > 12) {
+            drawnHour -= 12;
+        }
+        drawnHour = addLeadingZero(drawnHour);
+        
+        var amOrPm = "AM";
+        if (hour >= 12) {
+            amOrPm = "PM";
+        }
+
+        var min = addLeadingZero(a.getMinutes());
+        var sec = addLeadingZero(a.getSeconds());
+        return year + '-' + month + '-' + day + '<br>' + drawnHour + ':' + min + amOrPm;
+    }
+    //
+    // FUNCTION DEFINITIONS END
+    //
+}
diff --git a/interface/resources/qml/hifi/commerce/inspectionCertificate/images/cert-bg.jpg b/interface/resources/qml/hifi/commerce/inspectionCertificate/images/cert-bg.jpg
new file mode 100644
index 0000000000..9cecc79869
Binary files /dev/null and b/interface/resources/qml/hifi/commerce/inspectionCertificate/images/cert-bg.jpg differ
diff --git a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
new file mode 100644
index 0000000000..15ebada0c4
--- /dev/null
+++ b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
@@ -0,0 +1,441 @@
+//
+//  PurchasedItem.qml
+//  qml/hifi/commerce/purchases
+//
+//  PurchasedItem
+//
+//  Created by Zach Fox on 2017-08-25
+//  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
+//
+
+import Hifi 1.0 as Hifi
+import QtQuick 2.5
+import QtGraphicalEffects 1.0
+import QtQuick.Controls 1.4
+import QtQuick.Controls.Styles 1.4
+import "../../../styles-uit"
+import "../../../controls-uit" as HifiControlsUit
+import "../../../controls" as HifiControls
+import "../wallet" as HifiWallet
+
+// references XXX from root context
+
+Item {
+    HifiConstants { id: hifi; }
+
+    id: root;
+    property string purchaseStatus;
+    property bool purchaseStatusChanged;
+    property bool canRezCertifiedItems: false;
+    property string itemName;
+    property string itemId;
+    property string itemPreviewImageUrl;
+    property string itemHref;
+    property string certificateId;
+    property int displayedItemCount;
+    property int itemEdition;
+    property int numberSold;
+    property int limitedRun;
+    property bool isWearable;
+
+    property string originalStatusText;
+    property string originalStatusColor;
+
+    height: 110;
+    width: parent.width;
+
+    onPurchaseStatusChangedChanged: {
+        if (root.purchaseStatusChanged === true && root.purchaseStatus === "confirmed") {
+            root.originalStatusText = statusText.text;
+            root.originalStatusColor = statusText.color;
+            statusText.text = "CONFIRMED!";
+            statusText.color = hifi.colors.blueAccent;
+            confirmedTimer.start();
+        }
+    }
+
+    Timer {
+        id: confirmedTimer;
+        interval: 3000;
+        onTriggered: {
+            statusText.text = root.originalStatusText;
+            statusText.color = root.originalStatusColor;
+            root.purchaseStatusChanged = false;
+        }
+    }
+
+    Rectangle {
+        id: mainContainer;
+        // Style
+        color: hifi.colors.white;
+        // Size
+        anchors.left: parent.left;
+        anchors.leftMargin: 8;
+        anchors.right: parent.right;
+        anchors.rightMargin: 8;
+        anchors.top: parent.top;
+        height: root.height - 10;
+
+        Image {
+            id: itemPreviewImage;
+            source: root.itemPreviewImageUrl;
+            anchors.left: parent.left;
+            anchors.top: parent.top;
+            anchors.bottom: parent.bottom;
+            width: height;
+            fillMode: Image.PreserveAspectCrop;
+
+            MouseArea {
+                anchors.fill: parent;
+                onClicked: {
+                    sendToPurchases({method: 'purchases_itemInfoClicked', itemId: root.itemId});
+                }
+            }
+        }
+
+    
+        RalewaySemiBold {
+            id: itemName;
+            anchors.top: itemPreviewImage.top;
+            anchors.topMargin: 4;
+            anchors.left: itemPreviewImage.right;
+            anchors.leftMargin: 8;
+            anchors.right: buttonContainer.left;
+            anchors.rightMargin: 8;
+            height: paintedHeight;
+            // Text size
+            size: 24;
+            // Style
+            color: hifi.colors.blueAccent;
+            text: root.itemName;
+            elide: Text.ElideRight;
+            // Alignment
+            horizontalAlignment: Text.AlignLeft;
+            verticalAlignment: Text.AlignVCenter;
+
+            MouseArea {
+                anchors.fill: parent;
+                hoverEnabled: enabled;
+                onClicked: {
+                    sendToPurchases({method: 'purchases_itemInfoClicked', itemId: root.itemId});
+                }
+                onEntered: {
+                    itemName.color = hifi.colors.blueHighlight;
+                }
+                onExited: {
+                    itemName.color = hifi.colors.blueAccent;
+                }
+            }
+        }
+
+        Item {
+            id: certificateContainer;
+            anchors.top: itemName.bottom;
+            anchors.topMargin: 4;
+            anchors.left: itemName.left;
+            anchors.right: buttonContainer.left;
+            anchors.rightMargin: 2;
+            height: 24;
+        
+            HiFiGlyphs {
+                id: certificateIcon;
+                text: hifi.glyphs.scriptNew;
+                // Size
+                size: 30;
+                // Anchors
+                anchors.top: parent.top;
+                anchors.left: parent.left;
+                anchors.bottom: parent.bottom;
+                width: 32;
+                // Style
+                color: hifi.colors.lightGray;
+            }
+
+            RalewayRegular {
+                id: viewCertificateText;
+                text: "VIEW CERTIFICATE";
+                size: 14;
+                anchors.left: certificateIcon.right;
+                anchors.leftMargin: 4;
+                anchors.top: parent.top;
+                anchors.bottom: parent.bottom;
+                anchors.right: parent.right;
+                color: hifi.colors.lightGray;
+            }
+
+            MouseArea {
+                anchors.fill: parent;
+                hoverEnabled: enabled;
+                onClicked: {
+                    sendToPurchases({method: 'purchases_itemCertificateClicked', itemCertificateId: root.certificateId});
+                }
+                onEntered: {
+                    certificateIcon.color = hifi.colors.black;
+                    viewCertificateText.color = hifi.colors.black;
+                }
+                onExited: {
+                    certificateIcon.color = hifi.colors.lightGray;
+                    viewCertificateText.color = hifi.colors.lightGray;
+                }
+            }
+        }
+
+        Item {
+            id: editionContainer;
+            visible: root.displayedItemCount > 1 && !statusContainer.visible;
+            anchors.left: itemName.left;
+            anchors.top: certificateContainer.bottom;
+            anchors.topMargin: 8;
+            anchors.bottom: parent.bottom;
+            anchors.right: buttonContainer.left;
+            anchors.rightMargin: 2;
+
+            FiraSansRegular {
+                anchors.left: parent.left;
+                anchors.top: parent.top;
+                anchors.bottom: parent.bottom;
+                width: paintedWidth;
+                text: "#" + root.itemEdition;
+                size: 15;
+                color: "#cc6a6a6a";
+                verticalAlignment: Text.AlignTop;
+            }
+        }
+
+        Item {
+            id: statusContainer;
+            visible: root.purchaseStatus === "pending" || root.purchaseStatus === "invalidated" || root.purchaseStatusChanged;
+            anchors.left: itemName.left;
+            anchors.top: certificateContainer.bottom;
+            anchors.topMargin: 8;
+            anchors.bottom: parent.bottom;
+            anchors.right: buttonContainer.left;
+            anchors.rightMargin: 2;
+
+            RalewaySemiBold {
+                id: statusText;
+                anchors.left: parent.left;
+                anchors.top: parent.top;
+                anchors.bottom: parent.bottom;
+                width: paintedWidth;
+                text: {
+                        if (root.purchaseStatus === "pending") {
+                            "PENDING..."
+                        } else if (root.purchaseStatus === "invalidated") {
+                            "INVALIDATED"
+                        } else if (root.numberSold !== -1) {
+                            ("Sales: " + root.numberSold + "/" + (root.limitedRun === -1 ? "\u221e" : root.limitedRun))
+                        } else {
+                            ""
+                        }
+                    }
+                size: 18;
+                color: {
+                        if (root.purchaseStatus === "pending") {
+                            hifi.colors.blueAccent
+                        } else if (root.purchaseStatus === "invalidated") {
+                            hifi.colors.redAccent
+                        } else {
+                            hifi.colors.baseGray
+                        }
+                    }
+                verticalAlignment: Text.AlignTop;
+            }
+        
+            HiFiGlyphs {
+                id: statusIcon;
+                text: {
+                        if (root.purchaseStatus === "pending") {
+                            hifi.glyphs.question
+                        } else if (root.purchaseStatus === "invalidated") {
+                            hifi.glyphs.question
+                        } else {
+                            ""
+                        }
+                    }
+                // Size
+                size: 36;
+                // Anchors
+                anchors.top: parent.top;
+                anchors.topMargin: -8;
+                anchors.left: statusText.right;
+                anchors.bottom: parent.bottom;
+                // Style
+                color: {
+                        if (root.purchaseStatus === "pending") {
+                            hifi.colors.blueAccent
+                        } else if (root.purchaseStatus === "invalidated") {
+                            hifi.colors.redAccent
+                        } else {
+                            hifi.colors.baseGray
+                        }
+                    }
+                verticalAlignment: Text.AlignTop;
+            }
+
+            MouseArea {
+                anchors.fill: parent;
+                hoverEnabled: enabled;
+                onClicked: {
+                    if (root.purchaseStatus === "pending") {
+                        sendToPurchases({method: 'showPendingLightbox'});
+                    } else if (root.purchaseStatus === "invalidated") {
+                        sendToPurchases({method: 'showInvalidatedLightbox'});
+                    }
+                }
+                onEntered: {
+                    if (root.purchaseStatus === "pending") {
+                        statusText.color = hifi.colors.blueHighlight;
+                        statusIcon.color = hifi.colors.blueHighlight;
+                    } else if (root.purchaseStatus === "invalidated") {
+                        statusText.color = hifi.colors.redAccent;
+                        statusIcon.color = hifi.colors.redAccent;
+                    }
+                }
+                onExited: {
+                    if (root.purchaseStatus === "pending") {
+                        statusText.color = hifi.colors.blueAccent;
+                        statusIcon.color = hifi.colors.blueAccent;
+                    } else if (root.purchaseStatus === "invalidated") {
+                        statusText.color = hifi.colors.redHighlight;
+                        statusIcon.color = hifi.colors.redHighlight;
+                    }
+                }
+            }
+        }
+
+        Rectangle {
+            id: rezzedNotifContainer;
+            z: 998;
+            visible: false;
+            color: hifi.colors.blueHighlight;
+            anchors.fill: buttonContainer;
+            MouseArea {
+                anchors.fill: parent;
+                propagateComposedEvents: false;
+            }
+
+            RalewayBold {
+                anchors.fill: parent;
+                text: "REZZED";
+                size: 18;
+                color: hifi.colors.white;
+                verticalAlignment: Text.AlignVCenter;
+                horizontalAlignment: Text.AlignHCenter;
+            }
+
+                Timer {
+                    id: rezzedNotifContainerTimer;
+                    interval: 2000;
+                    onTriggered: rezzedNotifContainer.visible = false
+                }
+        }
+
+        Button {
+            id: buttonContainer;
+            property int color: hifi.buttons.red;
+            property int colorScheme: hifi.colorSchemes.light;
+
+            anchors.top: parent.top;
+            anchors.bottom: parent.bottom;
+            anchors.right: parent.right;
+            width: height;
+            enabled: (root.canRezCertifiedItems || root.isWearable) && root.purchaseStatus !== "invalidated";
+            
+            onClicked: {
+                sendToPurchases({method: 'purchases_rezClicked', itemHref: root.itemHref, isWearable: root.isWearable});
+                rezzedNotifContainer.visible = true;
+                rezzedNotifContainerTimer.start();
+            }
+
+            style: ButtonStyle {
+
+                background: Rectangle {
+                    gradient: Gradient {
+                        GradientStop {
+                            position: 0.2
+                            color: {
+                                if (!control.enabled) {
+                                    hifi.buttons.disabledColorStart[control.colorScheme]
+                                } else if (control.pressed) {
+                                    hifi.buttons.pressedColor[control.color]
+                                } else if (control.hovered) {
+                                    hifi.buttons.hoveredColor[control.color]
+                                } else {
+                                    hifi.buttons.colorStart[control.color]
+                                }
+                            }
+                        }
+                        GradientStop {
+                            position: 1.0
+                            color: {
+                                if (!control.enabled) {
+                                    hifi.buttons.disabledColorFinish[control.colorScheme]
+                                } else if (control.pressed) {
+                                    hifi.buttons.pressedColor[control.color]
+                                } else if (control.hovered) {
+                                    hifi.buttons.hoveredColor[control.color]
+                                } else {
+                                    hifi.buttons.colorFinish[control.color]
+                                }
+                            }
+                        }
+                    }
+                }
+
+                label: Item {
+                    HiFiGlyphs {
+                        id: lightningIcon;
+                        text: hifi.glyphs.lightning;
+                        // Size
+                        size: 32;
+                        // Anchors
+                        anchors.top: parent.top;
+                        anchors.topMargin: 12;
+                        anchors.left: parent.left;
+                        anchors.right: parent.right;
+                        horizontalAlignment: Text.AlignHCenter;
+                        // Style
+                        color: enabled ? hifi.buttons.textColor[control.color]
+                                       : hifi.buttons.disabledTextColor[control.colorScheme]
+                    }
+                    RalewayBold {
+                        anchors.top: lightningIcon.bottom;
+                        anchors.topMargin: -20;
+                        anchors.right: parent.right;
+                        anchors.left: parent.left;
+                        anchors.bottom: parent.bottom;
+                        font.capitalization: Font.AllUppercase
+                        color: enabled ? hifi.buttons.textColor[control.color]
+                                       : hifi.buttons.disabledTextColor[control.colorScheme]
+                        size: 16;
+                        verticalAlignment: Text.AlignVCenter
+                        horizontalAlignment: Text.AlignHCenter
+                        text: root.isWearable ? "Wear It" : "Rez It"
+                    }
+                }
+            }
+        }
+    }
+
+    DropShadow {
+        anchors.fill: mainContainer;
+        horizontalOffset: 3;
+        verticalOffset: 3;
+        radius: 8.0;
+        samples: 17;
+        color: "#80000000";
+        source: mainContainer;
+    }
+
+    //
+    // FUNCTION DEFINITIONS START
+    //
+    signal sendToPurchases(var msg);
+    //
+    // FUNCTION DEFINITIONS END
+    //
+}
diff --git a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
new file mode 100644
index 0000000000..1ea488ac98
--- /dev/null
+++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
@@ -0,0 +1,710 @@
+//
+//  Purchases.qml
+//  qml/hifi/commerce/purchases
+//
+//  Purchases
+//
+//  Created by Zach Fox on 2017-08-25
+//  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
+//
+
+import Hifi 1.0 as Hifi
+import QtQuick 2.5
+import QtQuick.Controls 1.4
+import "../../../styles-uit"
+import "../../../controls-uit" as HifiControlsUit
+import "../../../controls" as HifiControls
+import "../wallet" as HifiWallet
+import "../common" as HifiCommerceCommon
+import "../inspectionCertificate" as HifiInspectionCertificate
+
+// references XXX from root context
+
+Rectangle {
+    HifiConstants { id: hifi; }
+
+    id: root;
+    property string activeView: "initialize";
+    property string referrerURL: "";
+    property bool securityImageResultReceived: false;
+    property bool purchasesReceived: false;
+    property bool punctuationMode: false;
+    property bool canRezCertifiedItems: Entities.canRezCertified() || Entities.canRezTmpCertified();
+    property bool pendingInventoryReply: true;
+    property bool isShowingMyItems: false;
+    property bool isDebuggingFirstUseTutorial: false;
+    // Style
+    color: hifi.colors.white;
+    Hifi.QmlCommerce {
+        id: commerce;
+
+        onWalletStatusResult: {
+            if (walletStatus === 0) {
+                if (root.activeView !== "needsLogIn") {
+                    root.activeView = "needsLogIn";
+                }
+            } else if (walletStatus === 1) {
+                if (root.activeView !== "notSetUp") {
+                    root.activeView = "notSetUp";
+                    notSetUpTimer.start();
+                }
+            } else if (walletStatus === 2) {
+                if (root.activeView !== "passphraseModal") {
+                    root.activeView = "passphraseModal";
+                }
+            } else if (walletStatus === 3) {
+                if ((Settings.getValue("isFirstUseOfPurchases", true) || root.isDebuggingFirstUseTutorial) && root.activeView !== "firstUseTutorial") {
+                    root.activeView = "firstUseTutorial";
+                } else if (!Settings.getValue("isFirstUseOfPurchases", true) && root.activeView === "initialize") {
+                    root.activeView = "purchasesMain";
+                    commerce.inventory();
+                }
+            } else {
+                console.log("ERROR in Purchases.qml: Unknown wallet status: " + walletStatus);
+            }
+        }
+
+        onLoginStatusResult: {
+            if (!isLoggedIn && root.activeView !== "needsLogIn") {
+                root.activeView = "needsLogIn";
+            } else {
+                commerce.getWalletStatus();
+            }
+        }
+
+        onInventoryResult: {
+            purchasesReceived = true;
+
+            if (root.pendingInventoryReply) {
+                inventoryTimer.start();
+            }
+
+            if (result.status !== 'success') {
+                console.log("Failed to get purchases", result.message);
+            } else {
+                var inventoryResult = processInventoryResult(result.data.assets);
+
+                purchasesModel.clear();
+                purchasesModel.append(inventoryResult);
+
+                if (previousPurchasesModel.count !== 0) {
+                    checkIfAnyItemStatusChanged();
+                } else {
+                    // Fill statusChanged default value
+                    // Not doing this results in the default being true...
+                    for (var i = 0; i < purchasesModel.count; i++) {
+                        purchasesModel.setProperty(i, "statusChanged", false);
+                    }
+                }
+                previousPurchasesModel.append(inventoryResult);
+
+                buildFilteredPurchasesModel();
+            }
+
+            root.pendingInventoryReply = false;
+        }
+    }
+
+    Timer {
+        id: notSetUpTimer;
+        interval: 200;
+        onTriggered: {
+            sendToScript({method: 'purchases_walletNotSetUp'});
+        }
+    }
+
+    HifiInspectionCertificate.InspectionCertificate {
+        id: inspectionCertificate;
+        z: 999;
+        visible: false;
+        anchors.fill: parent;
+
+        Connections {
+            onSendToScript: {
+                sendToScript(message);
+            }
+        }
+    }
+
+    HifiCommerceCommon.CommerceLightbox {
+        id: lightboxPopup;
+        visible: false;
+        anchors.fill: parent;
+
+        Connections {
+            onSendToParent: {
+                sendToScript(msg);
+            }
+        }
+    }
+
+    //
+    // TITLE BAR START
+    //
+    HifiCommerceCommon.EmulatedMarketplaceHeader {
+        id: titleBarContainer;
+        z: 998;
+        visible: !needsLogIn.visible;
+        // Size
+        width: parent.width;
+        // Anchors
+        anchors.left: parent.left;
+        anchors.top: parent.top;
+
+        Connections {
+            onSendToParent: {
+                if (msg.method === 'needsLogIn' && root.activeView !== "needsLogIn") {
+                    root.activeView = "needsLogIn";
+                } else if (msg.method === 'showSecurityPicLightbox') {
+                    lightboxPopup.titleText = "Your Security Pic";
+                    lightboxPopup.bodyImageSource = msg.securityImageSource;
+                    lightboxPopup.bodyText = lightboxPopup.securityPicBodyText;
+                    lightboxPopup.button1text = "CLOSE";
+                    lightboxPopup.button1method = "root.visible = false;"
+                    lightboxPopup.button2text = "GO TO WALLET";
+                    lightboxPopup.button2method = "sendToParent({method: 'purchases_openWallet'});";
+                    lightboxPopup.visible = true;
+                } else {
+                    sendToScript(msg);
+                }
+            }
+        }
+    }
+    MouseArea {
+        enabled: titleBarContainer.usernameDropdownVisible;
+        anchors.fill: parent;
+        onClicked: {
+            titleBarContainer.usernameDropdownVisible = false;
+        }
+    }
+    //
+    // TITLE BAR END
+    //
+
+    Rectangle {
+        id: initialize;
+        visible: root.activeView === "initialize";
+        anchors.top: titleBarContainer.bottom;
+        anchors.topMargin: -titleBarContainer.additionalDropdownHeight;
+        anchors.bottom: parent.bottom;
+        anchors.left: parent.left;
+        anchors.right: parent.right;
+        color: hifi.colors.white;
+
+        Component.onCompleted: {
+            securityImageResultReceived = false;
+            purchasesReceived = false;
+            commerce.getWalletStatus();
+        }
+    }
+
+    HifiWallet.NeedsLogIn {
+        id: needsLogIn;
+        visible: root.activeView === "needsLogIn";
+        anchors.top: parent.top;
+        anchors.bottom: parent.bottom;
+        anchors.left: parent.left;
+        anchors.right: parent.right;
+
+        Connections {
+            onSendSignalToWallet: {
+                sendToScript(msg);
+            }
+        }
+    }
+    Connections {
+        target: GlobalServices
+        onMyUsernameChanged: {
+            commerce.getLoginStatus();
+        }
+    }
+
+    HifiWallet.PassphraseModal {
+        id: passphraseModal;
+        visible: root.activeView === "passphraseModal";
+        anchors.fill: parent;
+        titleBarText: "Purchases";
+        titleBarIcon: hifi.glyphs.wallet;
+
+        Connections {
+            onSendSignalToParent: {
+                if (msg.method === "authSuccess") {
+                    root.activeView = "initialize";
+                    commerce.getWalletStatus();
+                } else {
+                    sendToScript(msg);
+                }
+            }
+        }
+    }
+
+    HifiCommerceCommon.FirstUseTutorial {
+        id: firstUseTutorial;
+        z: 999;
+        visible: root.activeView === "firstUseTutorial";
+        anchors.fill: parent;
+
+        Connections {
+            onSendSignalToParent: {
+                switch (message.method) {
+                    case 'tutorial_skipClicked':
+                    case 'tutorial_finished':
+                        Settings.setValue("isFirstUseOfPurchases", false);
+                        root.activeView = "purchasesMain";
+                        commerce.inventory();
+                    break;
+                }
+            }
+        }
+    }
+
+    //
+    // PURCHASES CONTENTS START
+    //
+    Item {
+        id: purchasesContentsContainer;
+        visible: root.activeView === "purchasesMain";
+        // Anchors
+        anchors.left: parent.left;
+        anchors.right: parent.right;
+        anchors.top: titleBarContainer.bottom;
+        anchors.topMargin: 8 - titleBarContainer.additionalDropdownHeight;
+        anchors.bottom: parent.bottom;
+
+        //
+        // FILTER BAR START
+        //
+        Item {
+            id: filterBarContainer;
+            // Size
+            height: 40;
+            // Anchors
+            anchors.left: parent.left;
+            anchors.leftMargin: 8;
+            anchors.right: parent.right;
+            anchors.rightMargin: 12;
+            anchors.top: parent.top;
+            anchors.topMargin: 4;
+
+            RalewayRegular {
+                id: myText;
+                anchors.top: parent.top;
+                anchors.topMargin: 10;
+                anchors.bottom: parent.bottom;
+                anchors.bottomMargin: 10;
+                anchors.left: parent.left;
+                anchors.leftMargin: 4;
+                width: paintedWidth;
+                text: isShowingMyItems ? "My Items" : "My Purchases";
+                color: hifi.colors.baseGray;
+                size: 28;
+            }
+
+            HifiControlsUit.TextField {
+                id: filterBar;
+                colorScheme: hifi.colorSchemes.faintGray;
+                hasClearButton: true;
+                hasRoundedBorder: true;
+                anchors.left: myText.right;
+                anchors.leftMargin: 16;
+                anchors.top: parent.top;
+                anchors.bottom: parent.bottom;
+                anchors.right: parent.right;
+                placeholderText: "filter items";
+
+                onTextChanged: {
+                    buildFilteredPurchasesModel();
+                }
+
+                onAccepted: {
+                    focus = false;
+                }
+            }
+        }
+        //
+        // FILTER BAR END
+        //
+
+        HifiControlsUit.Separator {
+            id: separator;
+            colorScheme: 1;
+            anchors.left: parent.left;
+            anchors.right: parent.right;
+            anchors.top: filterBarContainer.bottom;
+            anchors.topMargin: 16;
+        }
+
+        ListModel {
+            id: purchasesModel;
+        }
+        ListModel {
+            id: previousPurchasesModel;
+        }
+        HifiCommerceCommon.SortableListModel {
+            id: filteredPurchasesModel;
+        }
+
+        Rectangle {
+            id: cantRezCertified;
+            visible: !root.canRezCertifiedItems;
+            color: "#FFC3CD";
+            radius: 4;
+            border.color: hifi.colors.redAccent;
+            border.width: 1;
+            anchors.top: separator.bottom;
+            anchors.topMargin: 12;
+            anchors.left: parent.left;
+            anchors.leftMargin: 16;
+            anchors.right: parent.right;
+            anchors.rightMargin: 16;
+            height: 80;
+
+            HiFiGlyphs {
+                id: lightningIcon;
+                text: hifi.glyphs.lightning;
+                // Size
+                size: 36;
+                // Anchors
+                anchors.top: parent.top;
+                anchors.topMargin: 18;
+                anchors.left: parent.left;
+                anchors.leftMargin: 12;
+                horizontalAlignment: Text.AlignHCenter;
+                // Style
+                color: hifi.colors.lightGray;
+            }
+
+            RalewayRegular {
+                text: "You don't have permission to rez certified items in this domain. " +
+                '<b><font color="' + hifi.colors.blueAccent + '"><a href="#">Learn More</a></font></b>';
+                // Text size
+                size: 18;
+                // Anchors
+                anchors.top: parent.top;
+                anchors.topMargin: 4;
+                anchors.left: lightningIcon.right;
+                anchors.leftMargin: 8;
+                anchors.right: parent.right;
+                anchors.rightMargin: 8;
+                anchors.bottom: parent.bottom;
+                anchors.bottomMargin: 4;
+                // Style
+                color: hifi.colors.baseGray;
+                wrapMode: Text.WordWrap;
+                // Alignment
+                verticalAlignment: Text.AlignVCenter;
+                
+                onLinkActivated: {
+                    lightboxPopup.titleText = "Rez Permission Required";
+                    lightboxPopup.bodyText = "You don't have permission to rez certified items in this domain.<br><br>" +
+                        "Use the <b>GOTO app</b> to visit another domain or <b>go to your own sandbox.</b>";
+                    lightboxPopup.button1text = "CLOSE";
+                    lightboxPopup.button1method = "root.visible = false;"
+                    lightboxPopup.button2text = "OPEN GOTO";
+                    lightboxPopup.button2method = "sendToParent({method: 'purchases_openGoTo'});";
+                    lightboxPopup.visible = true;
+                }
+            }
+        }
+
+        ListView {
+            id: purchasesContentsList;
+            visible: (root.isShowingMyItems && filteredPurchasesModel.count !== 0) || (!root.isShowingMyItems && filteredPurchasesModel.count !== 0);
+            clip: true;
+            model: filteredPurchasesModel;
+            // Anchors
+            anchors.top: root.canRezCertifiedItems ? separator.bottom : cantRezCertified.bottom;
+            anchors.topMargin: 12;
+            anchors.left: parent.left;
+            anchors.bottom: parent.bottom;
+            width: parent.width;
+            delegate: PurchasedItem {
+                canRezCertifiedItems: root.canRezCertifiedItems;
+                itemName: title;
+                itemId: id;
+                itemPreviewImageUrl: preview;
+                itemHref: download_url;
+                certificateId: certificate_id;
+                purchaseStatus: status;
+                purchaseStatusChanged: statusChanged;
+                itemEdition: model.edition_number;
+                numberSold: model.number_sold;
+                limitedRun: model.limited_run;
+                displayedItemCount: model.displayedItemCount;
+                isWearable: model.categories.indexOf("Wearables") > -1;
+                anchors.topMargin: 12;
+                anchors.bottomMargin: 12;
+
+                Connections {
+                    onSendToPurchases: {
+                        if (msg.method === 'purchases_itemInfoClicked') {
+                            sendToScript({method: 'purchases_itemInfoClicked', itemId: itemId});
+                        } else if (msg.method === "purchases_rezClicked") {
+                            sendToScript({method: 'purchases_rezClicked', itemHref: itemHref, isWearable: isWearable});
+                        } else if (msg.method === 'purchases_itemCertificateClicked') {
+                            inspectionCertificate.visible = true;
+                            inspectionCertificate.isLightbox = true;
+                            sendToScript(msg);
+                        } else if (msg.method === "showInvalidatedLightbox") {
+                            lightboxPopup.titleText = "Item Invalidated";
+                            lightboxPopup.bodyText = 'Your item is marked "invalidated" because this item has been suspended ' +
+                            "from the Marketplace due to a claim against its author.";
+                            lightboxPopup.button1text = "CLOSE";
+                            lightboxPopup.button1method = "root.visible = false;"
+                            lightboxPopup.visible = true;
+                        } else if (msg.method === "showPendingLightbox") {
+                            lightboxPopup.titleText = "Item Pending";
+                            lightboxPopup.bodyText = 'Your item is marked "pending" while your purchase is being confirmed. ' +
+                            "Usually, purchases take about 90 seconds to confirm.";
+                            lightboxPopup.button1text = "CLOSE";
+                            lightboxPopup.button1method = "root.visible = false;"
+                            lightboxPopup.visible = true;
+                        } else if (msg.method === "setFilterText") {
+                            filterBar.text = msg.filterText;
+                        }
+                    }
+                }
+            }
+        }
+
+        Item {
+            id: noItemsAlertContainer;
+            visible: !purchasesContentsList.visible && root.purchasesReceived && root.isShowingMyItems && filterBar.text === "";
+            anchors.top: filterBarContainer.bottom;
+            anchors.topMargin: 12;
+            anchors.left: parent.left;
+            anchors.bottom: parent.bottom;
+            width: parent.width;
+
+            // Explanitory text
+            RalewayRegular {
+                id: noItemsYet;
+                text: "<b>You haven't submitted anything to the Marketplace yet!</b><br><br>Submit an item to the Marketplace to add it to My Items.";
+                // Text size
+                size: 22;
+                // Anchors
+                anchors.top: parent.top;
+                anchors.topMargin: 150;
+                anchors.left: parent.left;
+                anchors.leftMargin: 24;
+                anchors.right: parent.right;
+                anchors.rightMargin: 24;
+                height: paintedHeight;
+                // Style
+                color: hifi.colors.baseGray;
+                wrapMode: Text.WordWrap;
+                // Alignment
+                horizontalAlignment: Text.AlignHCenter;
+            }
+
+            // "Go To Marketplace" button
+            HifiControlsUit.Button {
+                color: hifi.buttons.blue;
+                colorScheme: hifi.colorSchemes.dark;
+                anchors.top: noItemsYet.bottom;
+                anchors.topMargin: 20;
+                anchors.horizontalCenter: parent.horizontalCenter;
+                width: parent.width * 2 / 3;
+                height: 50;
+                text: "Visit Marketplace";
+                onClicked: {
+                    sendToScript({method: 'purchases_goToMarketplaceClicked'});
+                }
+            }
+        }
+
+        Item {
+            id: noPurchasesAlertContainer;
+            visible: !purchasesContentsList.visible && root.purchasesReceived && !root.isShowingMyItems && filterBar.text === "";
+            anchors.top: filterBarContainer.bottom;
+            anchors.topMargin: 12;
+            anchors.left: parent.left;
+            anchors.bottom: parent.bottom;
+            width: parent.width;
+
+            // Explanitory text
+            RalewayRegular {
+                id: haventPurchasedYet;
+                text: "<b>You haven't purchased anything yet!</b><br><br>Get an item from <b>Marketplace</b> to add it to My Purchases.";
+                // Text size
+                size: 22;
+                // Anchors
+                anchors.top: parent.top;
+                anchors.topMargin: 150;
+                anchors.left: parent.left;
+                anchors.leftMargin: 24;
+                anchors.right: parent.right;
+                anchors.rightMargin: 24;
+                height: paintedHeight;
+                // Style
+                color: hifi.colors.baseGray;
+                wrapMode: Text.WordWrap;
+                // Alignment
+                horizontalAlignment: Text.AlignHCenter;
+            }
+
+            // "Go To Marketplace" button
+            HifiControlsUit.Button {
+                color: hifi.buttons.blue;
+                colorScheme: hifi.colorSchemes.dark;
+                anchors.top: haventPurchasedYet.bottom;
+                anchors.topMargin: 20;
+                anchors.horizontalCenter: parent.horizontalCenter;
+                width: parent.width * 2 / 3;
+                height: 50;
+                text: "Visit Marketplace";
+                onClicked: {
+                    sendToScript({method: 'purchases_goToMarketplaceClicked'});
+                }
+            }
+        }
+    }
+    //
+    // PURCHASES CONTENTS END
+    //
+
+    HifiControlsUit.Keyboard {
+        id: keyboard;
+        raised: HMD.mounted && filterBar.focus;
+        numeric: parent.punctuationMode;
+        anchors {
+            bottom: parent.bottom;
+            left: parent.left;
+            right: parent.right;
+        }
+    }
+
+    onVisibleChanged: {
+        if (!visible) {
+            inventoryTimer.stop();
+        }
+    }
+
+    Timer {
+        id: inventoryTimer;
+        interval: 4000; // Change this back to 90000 after demo
+        //interval: 90000;
+        onTriggered: {
+            if (root.activeView === "purchasesMain" && !root.pendingInventoryReply) {
+                console.log("Refreshing Purchases...");
+                root.pendingInventoryReply = true;
+                commerce.inventory();
+            }
+        }
+    }
+
+    //
+    // FUNCTION DEFINITIONS START
+    //
+
+    function processInventoryResult(inventory) {
+        for (var i = 0; i < inventory.length; i++) {
+            if (inventory[i].status.length > 1) {
+                console.log("WARNING: Inventory result index " + i + " has a status of length >1!")
+            }
+            inventory[i].status = inventory[i].status[0];
+            inventory[i].categories = inventory[i].categories.join(';');
+        }
+        return inventory;
+    }
+
+    function populateDisplayedItemCounts() {
+        var itemCountDictionary = {};
+        var currentItemId;
+        for (var i = 0; i < filteredPurchasesModel.count; i++) {
+            currentItemId = filteredPurchasesModel.get(i).id;
+            if (itemCountDictionary[currentItemId] === undefined) {
+                itemCountDictionary[currentItemId] = 1;
+            } else {
+                itemCountDictionary[currentItemId]++;
+            }
+        }
+
+        for (var i = 0; i < filteredPurchasesModel.count; i++) {
+            filteredPurchasesModel.setProperty(i, "displayedItemCount", itemCountDictionary[filteredPurchasesModel.get(i).id]);
+        }
+    }
+
+    function sortByDate() {
+        filteredPurchasesModel.sortColumnName = "purchase_date";
+        filteredPurchasesModel.isSortingDescending = false;
+        filteredPurchasesModel.quickSort();
+    }
+
+    function buildFilteredPurchasesModel() {
+        filteredPurchasesModel.clear();
+        for (var i = 0; i < purchasesModel.count; i++) {
+            if (purchasesModel.get(i).title.toLowerCase().indexOf(filterBar.text.toLowerCase()) !== -1) {
+                if (purchasesModel.get(i).status !== "confirmed" && !root.isShowingMyItems) {
+                    filteredPurchasesModel.insert(0, purchasesModel.get(i));
+                } else if ((root.isShowingMyItems && purchasesModel.get(i).edition_number === -1) || !root.isShowingMyItems) {
+                    filteredPurchasesModel.append(purchasesModel.get(i));
+                }
+            }
+        }
+
+        populateDisplayedItemCounts();
+        sortByDate();
+    }
+
+    function checkIfAnyItemStatusChanged() {
+        var currentPurchasesModelId, currentPurchasesModelEdition, currentPurchasesModelStatus;
+        var previousPurchasesModelStatus;
+        for (var i = 0; i < purchasesModel.count; i++) {
+            currentPurchasesModelId = purchasesModel.get(i).id;
+            currentPurchasesModelEdition = purchasesModel.get(i).edition_number;
+            currentPurchasesModelStatus = purchasesModel.get(i).status;
+
+            for (var j = 0; j < previousPurchasesModel.count; j++) {
+                previousPurchasesModelStatus = previousPurchasesModel.get(j).status;
+                if (currentPurchasesModelId === previousPurchasesModel.get(j).id &&
+                    currentPurchasesModelEdition === previousPurchasesModel.get(j).edition_number &&
+                    currentPurchasesModelStatus !== previousPurchasesModelStatus) {
+                    
+                    purchasesModel.setProperty(i, "statusChanged", true);
+                } else {
+                    purchasesModel.setProperty(i, "statusChanged", false);
+                }
+            }
+        }
+    }
+
+    //
+    // Function Name: fromScript()
+    //
+    // Relevant Variables:
+    // None
+    //
+    // Arguments:
+    // message: The message sent from the JavaScript, in this case the Marketplaces JavaScript.
+    //     Messages are in format "{method, params}", like json-rpc.
+    //
+    // Description:
+    // Called when a message is received from a script.
+    //
+    function fromScript(message) {
+        switch (message.method) {
+            case 'updatePurchases':
+                referrerURL = message.referrerURL;
+                titleBarContainer.referrerURL = message.referrerURL;
+                filterBar.text = message.filterText ? message.filterText : "";
+            break;
+            case 'inspectionCertificate_setCertificateId':
+                inspectionCertificate.fromScript(message);
+            break;
+            case 'purchases_showMyItems':
+                root.isShowingMyItems = true;
+            break;
+            default:
+                console.log('Unrecognized message from marketplaces.js:', JSON.stringify(message));
+        }
+    }
+    signal sendToScript(var message);
+
+    //
+    // FUNCTION DEFINITIONS END
+    //
+}
diff --git a/interface/resources/qml/hifi/commerce/wallet/Help.qml b/interface/resources/qml/hifi/commerce/wallet/Help.qml
new file mode 100644
index 0000000000..0026bf6cdb
--- /dev/null
+++ b/interface/resources/qml/hifi/commerce/wallet/Help.qml
@@ -0,0 +1,296 @@
+//
+//  Help.qml
+//  qml/hifi/commerce/wallet
+//
+//  Help
+//
+//  Created by Zach Fox on 2017-08-18
+//  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
+//
+
+import Hifi 1.0 as Hifi
+import QtQuick 2.7
+import QtQuick.Controls 2.2
+import "../../../styles-uit"
+import "../../../controls-uit" as HifiControlsUit
+import "../../../controls" as HifiControls
+
+// references XXX from root context
+
+Item {
+    HifiConstants { id: hifi; }
+
+    id: root;
+    property string keyFilePath;
+    property bool showDebugButtons: true;
+
+    Hifi.QmlCommerce {
+        id: commerce;
+
+        onKeyFilePathIfExistsResult: {
+            root.keyFilePath = path;
+        }
+    }
+
+    onVisibleChanged: {
+        if (visible) {
+            commerce.getKeyFilePathIfExists();
+        }
+    }
+
+    RalewaySemiBold {
+        id: helpTitleText;
+        text: "Help Topics";
+        // Anchors
+        anchors.top: parent.top;
+        anchors.left: parent.left;
+        anchors.leftMargin: 20;
+        width: paintedWidth;
+        height: 30;
+        // Text size
+        size: 18;
+        // Style
+        color: hifi.colors.blueHighlight;
+    }
+    HifiControlsUit.Button {
+        id: clearCachedPassphraseButton;
+        visible: root.showDebugButtons;
+        color: hifi.buttons.black;
+        colorScheme: hifi.colorSchemes.dark;
+        anchors.top: parent.top;
+        anchors.left: helpTitleText.right;
+        anchors.leftMargin: 20;
+        height: 40;
+        width: 150;
+        text: "DBG: Clear Pass";
+        onClicked: {
+            commerce.setPassphrase("");
+            sendSignalToWallet({method: 'passphraseReset'});
+        }
+    }
+    HifiControlsUit.Button {
+        id: resetButton;
+        visible: root.showDebugButtons;
+        color: hifi.buttons.red;
+        colorScheme: hifi.colorSchemes.dark;
+        anchors.top: clearCachedPassphraseButton.top;
+        anchors.left: clearCachedPassphraseButton.right;
+        height: 40;
+        width: 150;
+        text: "DBG: RST Wallet";
+        onClicked: {
+            commerce.reset();
+            sendSignalToWallet({method: 'walletReset'});
+        }
+    }
+
+    ListModel {
+        id: helpModel;
+
+        ListElement {
+            isExpanded: false;
+            question: "What are private keys?"
+            answer: qsTr("A private key is a secret piece of text that is used to prove ownership, unlock confidential information, and sign transactions.<br><br>In High Fidelity, <b>your private keys are used to securely access the contents of your Wallet and Purchases.</b>");
+        }
+        ListElement {
+            isExpanded: false;
+            question: "Where are my private keys stored?"
+            answer: qsTr('By default, your private keys are <b>only stored on your hard drive</b> in High Fidelity Interface\'s AppData directory.<br><br><b><font color="#0093C5"><a href="#privateKeyPath">Tap here to open the folder where your HifiKeys are stored on your main display.</a></font></b>');
+        }
+        ListElement {
+            isExpanded: false;
+            question: "How can I backup my private keys?"
+            answer: qsTr('You may backup the file containing your private keys by copying it to a USB flash drive, or to a service like Dropbox or Google Drive.<br><br>Restore your backup by replacing the file in Interface\'s AppData directory with your backed-up copy.<br><br><b><font color="#0093C5"><a href="#privateKeyPath">Tap here to open the folder where your HifiKeys are stored on your main display.</a></font></b>');
+        }
+        ListElement {
+            isExpanded: false;
+            question: "What happens if I lose my passphrase?"
+            answer: qsTr("Your passphrase is used to encrypt your private keys. If you lose your passphrase, you will no longer be able to decrypt your private key file. You will also no longer have access to the contents of your Wallet or My Purchases.<br><br><b>Nobody can help you recover your passphrase, including High Fidelity.</b> Please write it down and store it securely.");
+        }
+        ListElement {
+            isExpanded: false;
+            question: "What is a 'Security Pic'?"
+            answer: qsTr("Your Security Pic is an encrypted image that you selected during Wallet Setup. <b>It acts as an extra layer of Wallet security.</b><br><br>When you see your Security Pic, you know that your actions and data are securely making use of your private keys.<br><br><b>If you don't see your Security Pic on a page that is asking you for your Wallet passphrase, someone untrustworthy may be trying to gain access to your Wallet.</b><br><br>The encrypted Pic is stored on your hard drive inside the same file as your private keys.");
+        }
+        ListElement {
+            isExpanded: false;
+            question: "My HFC balance isn't what I expect it to be. Why?"
+            answer: qsTr('High Fidelity Coin (HFC) transactions are backed by a <b>blockchain</b>, which takes time to update. The status of a transaction usually updates within 90 seconds.<br><br><b><font color="#0093C5"><a href="#blockchain">Tap here to learn more about the blockchain.</a></font></b>');
+        }
+        ListElement {
+            isExpanded: false;
+            question: "My friend purchased my item from the Marketplace, but I still haven't received the money from the sale. Why not?"
+            answer: qsTr('High Fidelity Coin (HFC) transactions are backed by a <b>blockchain</b>, which takes time to update. The status of a transaction usually updates within 90 seconds, at which point you will receive your money.<br><br><b><font color="#0093C5"><a href="#blockchain">Tap here to learn more about the blockchain.</a></font></b>');
+        }
+        ListElement {
+            isExpanded: false;
+            question: "Do I get charged money if a transaction fails?"
+            answer: qsTr("<b>No.</b> Your HFC balance only changes after a transaction is confirmed.");
+        }
+        ListElement {
+            isExpanded: false;
+            question: "How do I convert HFC to other currencies?"
+            answer: qsTr("We are still building the tools needed to support a vibrant economy in High Fidelity. <b>There is currently no way to convert HFC to other currencies.</b>");
+        }
+    }
+
+    ListView {
+        id: helpListView;
+        ScrollBar.vertical: ScrollBar {
+        policy: helpListView.contentHeight > helpListView.height ? ScrollBar.AlwaysOn : ScrollBar.AsNeeded;
+        parent: helpListView.parent;
+        anchors.top: helpListView.top;
+        anchors.right: helpListView.right;
+        anchors.bottom: helpListView.bottom;
+        width: 20;
+        }
+        anchors.top: helpTitleText.bottom;
+        anchors.topMargin: 30;
+        anchors.bottom: parent.bottom;
+        anchors.left: parent.left;
+        anchors.right: parent.right
+        clip: true;
+        model: helpModel;
+        delegate: Item {
+            width: parent.width;
+            height: model.isExpanded ? questionContainer.height + answerContainer.height : questionContainer.height;
+
+            HifiControlsUit.Separator {
+            colorScheme: 1;
+            visible: index === 0;
+            anchors.left: parent.left;
+            anchors.right: parent.right;
+            anchors.top: parent.top;
+            }
+
+            Item {
+                id: questionContainer;
+                anchors.top: parent.top;
+                anchors.left: parent.left;
+                width: parent.width;
+                height: questionText.paintedHeight + 50;
+            
+                RalewaySemiBold {
+                    id: plusMinusButton;
+                    text: model.isExpanded ? "-" : "+";
+                    // Anchors
+                    anchors.top: parent.top;
+                    anchors.topMargin: model.isExpanded ? -9 : 0;
+                    anchors.bottom: parent.bottom;
+                    anchors.left: parent.left;
+                    width: 60;
+                    // Text size
+                    size: 60;
+                    // Style
+                    color: hifi.colors.white;
+                    horizontalAlignment: Text.AlignHCenter;
+                    verticalAlignment: Text.AlignVCenter;
+                }
+
+                RalewaySemiBold {
+                    id: questionText;
+                    text: model.question;
+                    size: 18;
+                    anchors.verticalCenter: parent.verticalCenter;
+                    anchors.left: plusMinusButton.right;
+                    anchors.leftMargin: 4;
+                    anchors.right: parent.right;
+                    anchors.rightMargin: 10;
+                    wrapMode: Text.WordWrap;
+                    height: paintedHeight;
+                    color: hifi.colors.white;
+                    verticalAlignment: Text.AlignVCenter;
+                }
+
+                MouseArea {
+                    id: securityTabMouseArea;
+                    anchors.fill: parent;
+                    onClicked: {
+                        model.isExpanded = !model.isExpanded;
+                        if (model.isExpanded) {
+                            collapseAllOtherHelpItems(index);
+                        }
+                    }
+                }
+            }
+
+            Rectangle {
+                id: answerContainer;
+                visible: model.isExpanded;
+                color: Qt.rgba(0, 0, 0, 0.5);
+                anchors.top: questionContainer.bottom;
+                anchors.left: parent.left;
+                anchors.right: parent.right;
+                height: answerText.paintedHeight + 50;
+
+                RalewayRegular {
+                    id: answerText;
+                    text: model.answer;
+                    size: 18;
+                    anchors.verticalCenter: parent.verticalCenter;
+                    anchors.left: parent.left;
+                    anchors.leftMargin: 32;
+                    anchors.right: parent.right;
+                    anchors.rightMargin: 32;
+                    wrapMode: Text.WordWrap;
+                    height: paintedHeight;
+                    color: hifi.colors.white;
+
+                    onLinkActivated: {
+                        if (link === "#privateKeyPath") {
+                            Qt.openUrlExternally("file:///" + root.keyFilePath.substring(0, root.keyFilePath.lastIndexOf('/')));
+                        } else if (link === "#blockchain") {
+                            Qt.openUrlExternally("https://www.highfidelity.com/");
+                        }
+                    }
+                }
+            }
+
+            HifiControlsUit.Separator {
+            colorScheme: 1;
+                anchors.left: parent.left;
+                anchors.right: parent.right;
+                anchors.bottom: parent.bottom;
+            }
+        }
+    }
+
+
+    //
+    // FUNCTION DEFINITIONS START
+    //
+    //
+    // Function Name: fromScript()
+    //
+    // Relevant Variables:
+    // None
+    //
+    // Arguments:
+    // message: The message sent from the JavaScript.
+    //     Messages are in format "{method, params}", like json-rpc.
+    //
+    // Description:
+    // Called when a message is received from a script.
+    //
+    function fromScript(message) {
+        switch (message.method) {
+            default:
+                console.log('Unrecognized message from wallet.js:', JSON.stringify(message));
+        }
+    }
+    signal sendSignalToWallet(var msg);
+
+    function collapseAllOtherHelpItems(thisIndex) {
+        for (var i = 0; i < helpModel.count; i++) {
+            if (i !== thisIndex) {
+                helpModel.setProperty(i, "isExpanded", false);
+            }
+        }
+    }
+    //
+    // FUNCTION DEFINITIONS END
+    //
+}
diff --git a/interface/resources/qml/hifi/commerce/wallet/NeedsLogIn.qml b/interface/resources/qml/hifi/commerce/wallet/NeedsLogIn.qml
new file mode 100644
index 0000000000..7ce0cf3853
--- /dev/null
+++ b/interface/resources/qml/hifi/commerce/wallet/NeedsLogIn.qml
@@ -0,0 +1,194 @@
+//
+//  NeedsLogIn.qml
+//  qml/hifi/commerce/wallet
+//
+//  NeedsLogIn
+//
+//  Created by Zach Fox on 2017-08-18
+//  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
+//
+
+import Hifi 1.0 as Hifi
+import QtQuick 2.5
+import QtQuick.Controls 1.4
+import "../../../styles-uit"
+import "../../../controls-uit" as HifiControlsUit
+import "../../../controls" as HifiControls
+
+// references XXX from root context
+
+Item {
+    HifiConstants { id: hifi; }
+
+    id: root;
+
+    Image {
+        anchors.fill: parent;
+        source: "images/wallet-bg.jpg";
+    }
+    
+    Hifi.QmlCommerce {
+        id: commerce;
+    }
+
+    //
+    // LOGIN PAGE START
+    //
+    Item {
+        id: loginPageContainer;
+        // Anchors
+        anchors.fill: parent;
+
+        Item {
+            id: loginTitle;
+            // Size
+            width: parent.width;
+            height: 50;
+            // Anchors
+            anchors.left: parent.left;
+            anchors.top: parent.top;
+
+            // Title Bar text
+            RalewaySemiBold {
+                text: "HIFI COMMERCE - LOGIN";
+                // Text size
+                size: hifi.fontSizes.overlayTitle;
+                // Anchors
+                anchors.top: parent.top;
+                anchors.left: parent.left;
+                anchors.leftMargin: 16;
+                anchors.bottom: parent.bottom;
+                width: paintedWidth;
+                // Style
+                color: hifi.colors.faintGray;
+                // Alignment
+                horizontalAlignment: Text.AlignHLeft;
+                verticalAlignment: Text.AlignVCenter;
+            }
+        }
+
+        // Text below title bar
+        RalewaySemiBold {
+            id: loginTitleHelper;
+            text: "Please Log In to High Fidelity";
+            // Text size
+            size: 24;
+            // Anchors
+            anchors.top: loginTitle.bottom;
+            anchors.topMargin: 100;
+            anchors.left: parent.left;
+            anchors.leftMargin: 16;
+            anchors.right: parent.right;
+            anchors.rightMargin: 16;
+            height: 50;
+            // Style
+            color: hifi.colors.faintGray;
+            // Alignment
+            horizontalAlignment: Text.AlignHCenter;
+            verticalAlignment: Text.AlignVCenter;
+        }
+
+        // Text below helper text
+        RalewayRegular {
+            id: loginDetailText;
+            text: "To buy/sell items on the <b>Marketplace</b>, or to use your <b>Wallet</b>, you must first log in to High Fidelity.";
+            // Text size
+            size: 18;
+            // Anchors
+            anchors.top: loginTitleHelper.bottom;
+            anchors.topMargin: 25;
+            anchors.left: parent.left;
+            anchors.leftMargin: 16;
+            anchors.right: parent.right;
+            anchors.rightMargin: 16;
+            height: 50;
+            // Style
+            color: hifi.colors.faintGray;
+            wrapMode: Text.WordWrap;
+            // Alignment
+            horizontalAlignment: Text.AlignHCenter;
+            verticalAlignment: Text.AlignVCenter;
+        }
+
+        
+
+        Item {
+            // Size
+            width: root.width;
+            height: 70;
+            // Anchors
+            anchors.top: loginDetailText.bottom;
+            anchors.topMargin: 40;
+            anchors.left: parent.left;
+        
+            // "Cancel" button
+            HifiControlsUit.Button {
+                id: cancelButton;
+                color: hifi.buttons.black;
+                colorScheme: hifi.colorSchemes.dark;
+                anchors.top: parent.top;
+                anchors.topMargin: 3;
+                anchors.bottom: parent.bottom;
+                anchors.bottomMargin: 3;
+                anchors.left: parent.left;
+                anchors.leftMargin: 20;
+                width: parent.width/2 - anchors.leftMargin*2;
+                text: "Cancel"
+                onClicked: {
+                    sendToScript({method: 'needsLogIn_cancelClicked'});
+                }
+            }
+
+            // "Set Up" button
+            HifiControlsUit.Button {
+                id: setUpButton;
+                color: hifi.buttons.blue;
+                colorScheme: hifi.colorSchemes.dark;
+                anchors.top: parent.top;
+                anchors.topMargin: 3;
+                anchors.bottom: parent.bottom;
+                anchors.bottomMargin: 3;
+                anchors.right: parent.right;
+                anchors.rightMargin: 20;
+                width: parent.width/2 - anchors.rightMargin*2;
+                text: "Log In"
+                onClicked: {
+                    sendToScript({method: 'needsLogIn_loginClicked'});
+                }
+            }
+        }
+    }
+    //
+    // LOGIN PAGE END
+    //
+
+    //
+    // FUNCTION DEFINITIONS START
+    //
+    //
+    // Function Name: fromScript()
+    //
+    // Relevant Variables:
+    // None
+    //
+    // Arguments:
+    // message: The message sent from the JavaScript.
+    //     Messages are in format "{method, params}", like json-rpc.
+    //
+    // Description:
+    // Called when a message is received from a script.
+    //
+    function fromScript(message) {
+        switch (message.method) {
+            default:
+                console.log('Unrecognized message from wallet.js:', JSON.stringify(message));
+        }
+    }
+    signal sendSignalToWallet(var msg);
+    //
+    // FUNCTION DEFINITIONS END
+    //
+}
diff --git a/interface/resources/qml/hifi/commerce/wallet/PassphraseChange.qml b/interface/resources/qml/hifi/commerce/wallet/PassphraseChange.qml
new file mode 100644
index 0000000000..a75d511793
--- /dev/null
+++ b/interface/resources/qml/hifi/commerce/wallet/PassphraseChange.qml
@@ -0,0 +1,163 @@
+//
+//  PassphraseChange.qml
+//  qml/hifi/commerce/wallet
+//
+//  PassphraseChange
+//
+//  Created by Zach Fox on 2017-08-18
+//  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
+//
+
+import Hifi 1.0 as Hifi
+import QtQuick 2.5
+import QtQuick.Controls 1.4
+import "../../../styles-uit"
+import "../../../controls-uit" as HifiControlsUit
+import "../../../controls" as HifiControls
+
+// references XXX from root context
+
+Item {
+    HifiConstants { id: hifi; }
+
+    id: root;
+
+    SecurityImageModel {
+        id: securityImageModel;
+    }
+
+    // Username Text
+    RalewayRegular {
+        id: usernameText;
+        text: Account.username;
+        // Text size
+        size: 24;
+        // Style
+        color: hifi.colors.white;
+        elide: Text.ElideRight;
+        // Anchors
+        anchors.top: parent.top;
+        anchors.left: parent.left;
+        anchors.leftMargin: 20;
+        width: parent.width/2;
+        height: 80;
+    }
+
+    //
+    // SECURE PASSPHRASE SELECTION START
+    //
+    Item {
+        id: choosePassphraseContainer;
+        // Anchors
+        anchors.top: usernameText.bottom;
+        anchors.left: parent.left;
+        anchors.right: parent.right;
+        anchors.bottom: parent.bottom;
+
+        // "Change Passphrase" text
+        RalewaySemiBold {
+            id: passphraseTitle;
+            text: "Change Passphrase:";
+            // Text size
+            size: 18;
+            anchors.top: parent.top;
+            anchors.left: parent.left;
+            anchors.leftMargin: 20;
+            anchors.right: parent.right;
+            height: 30;
+            // Style
+            color: hifi.colors.blueHighlight;
+        }
+
+        PassphraseSelection {
+            id: passphraseSelection;
+            isChangingPassphrase: true;
+            anchors.top: passphraseTitle.bottom;
+            anchors.topMargin: 8;
+            anchors.left: parent.left;
+            anchors.right: parent.right;
+            anchors.bottom: passphraseNavBar.top;
+
+            Connections {
+                onSendMessageToLightbox: {
+                    if (msg.method === 'statusResult') {
+                        if (msg.status) {
+                            // Success submitting new passphrase
+                            sendSignalToWallet({method: "walletSecurity_changePassphraseSuccess"});
+                        } else {
+                            // Error submitting new passphrase
+                            resetSubmitButton();
+                            passphraseSelection.setErrorText("Current passphrase incorrect - try again");
+                        }
+                    } else {
+                        sendSignalToWallet(msg);
+                    }
+                }
+            }
+        }
+
+        // Navigation Bar
+        Item {
+            id: passphraseNavBar;
+            // Size
+            width: parent.width;
+            height: 40;
+            // Anchors:
+            anchors.left: parent.left;
+            anchors.bottom: parent.bottom;
+            anchors.bottomMargin: 30;
+
+            // "Cancel" button
+            HifiControlsUit.Button {
+                color: hifi.buttons.noneBorderlessWhite;
+                colorScheme: hifi.colorSchemes.dark;
+                anchors.top: parent.top;
+                anchors.bottom: parent.bottom;
+                anchors.left: parent.left;
+                anchors.leftMargin: 20;
+                width: 150;
+                text: "Cancel"
+                onClicked: {
+                    sendSignalToWallet({method: "walletSecurity_changePassphraseCancelled"});
+                }
+            }
+
+            // "Submit" button
+            HifiControlsUit.Button {
+                id: passphraseSubmitButton;
+                color: hifi.buttons.blue;
+                colorScheme: hifi.colorSchemes.dark;
+                anchors.top: parent.top;
+                anchors.bottom: parent.bottom;
+                anchors.right: parent.right;
+                anchors.rightMargin: 20;
+                width: 150;
+                text: "Submit";
+                onClicked: {
+                    passphraseSubmitButton.text = "Submitting...";
+                    passphraseSubmitButton.enabled = false;
+                    if (!passphraseSelection.validateAndSubmitPassphrase()) {
+                        resetSubmitButton();
+                    }
+                }
+            }
+        }
+    }
+    //
+    // SECURE PASSPHRASE SELECTION END
+    //
+
+    signal sendSignalToWallet(var msg);
+
+    function resetSubmitButton() {
+        passphraseSubmitButton.enabled = true;
+        passphraseSubmitButton.text = "Submit";
+    }
+
+    function clearPassphraseFields() {
+        passphraseSelection.clearPassphraseFields();
+    }
+}
diff --git a/interface/resources/qml/hifi/commerce/wallet/PassphraseModal.qml b/interface/resources/qml/hifi/commerce/wallet/PassphraseModal.qml
new file mode 100644
index 0000000000..d967a36b68
--- /dev/null
+++ b/interface/resources/qml/hifi/commerce/wallet/PassphraseModal.qml
@@ -0,0 +1,398 @@
+//
+//  PassphraseModal.qml
+//  qml/hifi/commerce/wallet
+//
+//  PassphraseModal
+//
+//  Created by Zach Fox on 2017-08-31
+//  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
+//
+
+import Hifi 1.0 as Hifi
+import QtQuick 2.5
+import QtQuick.Controls 1.4
+import "../../../styles-uit"
+import "../../../controls-uit" as HifiControlsUit
+import "../../../controls" as HifiControls
+import "../common" as HifiCommerceCommon
+
+// references XXX from root context
+
+Item {
+    HifiConstants { id: hifi; }
+
+    id: root;
+    z: 997;
+    property bool keyboardRaised: false;
+    property bool isPasswordField: false;
+    property string titleBarIcon: "";
+    property string titleBarText: "";
+
+    Image {
+        anchors.fill: parent;
+        source: "images/wallet-bg.jpg";
+    }
+
+    Hifi.QmlCommerce {
+        id: commerce;
+
+        onSecurityImageResult: {
+            titleBarSecurityImage.source = "";
+            titleBarSecurityImage.source = "image://security/securityImage";
+            passphraseModalSecurityImage.source = "";
+            passphraseModalSecurityImage.source = "image://security/securityImage";
+        }
+
+        onWalletAuthenticatedStatusResult: {
+            submitPassphraseInputButton.enabled = true;
+            if (!isAuthenticated) {
+                errorText.text = "Authentication failed - please try again.";
+            } else {
+                sendSignalToParent({method: 'authSuccess'});;
+            }
+        }
+    }
+
+    // This object is always used in a popup.
+    // This MouseArea is used to prevent a user from being
+    //     able to click on a button/mouseArea underneath the popup.
+    MouseArea {
+        anchors.fill: parent;
+        propagateComposedEvents: false;
+    }
+    
+    // This will cause a bug -- if you bring up passphrase selection in HUD mode while
+    // in HMD while having HMD preview enabled, then move, then finish passphrase selection,
+    // HMD preview will stay off.
+    // TODO: Fix this unlikely bug
+    onVisibleChanged: {
+        if (visible) {
+            passphraseField.focus = true;
+            sendSignalToParent({method: 'disableHmdPreview'});
+        } else {
+            sendSignalToParent({method: 'maybeEnableHmdPreview'});
+        }
+    }
+
+    HifiCommerceCommon.CommerceLightbox {
+        id: lightboxPopup;
+        visible: false;
+        anchors.fill: parent;
+    }
+
+    Item {
+        id: titleBar;
+        anchors.top: parent.top;
+        anchors.left: parent.left;
+        anchors.right: parent.right;
+        height: 50;
+
+        // Wallet icon
+        HiFiGlyphs {
+            id: titleBarIcon;
+            text: root.titleBarIcon;
+            // Size
+            size: parent.height * 0.8;
+            // Anchors
+            anchors.left: parent.left;
+            anchors.leftMargin: 8;
+            anchors.verticalCenter: parent.verticalCenter;
+            // Style
+            color: hifi.colors.blueHighlight;
+        }
+
+        RalewaySemiBold {
+            id: titleBarText;
+            text: root.titleBarText;
+            anchors.top: parent.top;
+            anchors.left: titleBarIcon.right;
+            anchors.leftMargin: 4;
+            anchors.bottom: parent.bottom;
+            anchors.right: parent.right;
+            size: 20;
+            color: hifi.colors.white;
+            verticalAlignment: Text.AlignVCenter;
+        }
+
+        Image {
+            id: titleBarSecurityImage;
+            source: "";
+            visible: titleBarSecurityImage.source !== "";
+            anchors.right: parent.right;
+            anchors.rightMargin: 6;
+            anchors.top: parent.top;
+            anchors.topMargin: 6;
+            anchors.bottom: parent.bottom;
+            anchors.bottomMargin: 6;
+            width: height;
+            fillMode: Image.PreserveAspectFit;
+            mipmap: true;
+            cache: false;
+
+            MouseArea {
+                enabled: titleBarSecurityImage.visible;
+                anchors.fill: parent;
+                onClicked: {
+                    lightboxPopup.titleText = "Your Security Pic";
+                    lightboxPopup.bodyImageSource = titleBarSecurityImage.source;
+                    lightboxPopup.bodyText = lightboxPopup.securityPicBodyText;
+                    lightboxPopup.button1text = "CLOSE";
+                    lightboxPopup.button1method = "root.visible = false;"
+                    lightboxPopup.visible = true;
+                }
+            }
+        }
+    }
+
+    Item {
+        id: passphraseContainer;
+        anchors.top: titleBar.bottom;
+        anchors.left: parent.left;
+        anchors.leftMargin: 8;
+        anchors.right: parent.right;
+        anchors.rightMargin: 8;
+        height: 250;
+
+        RalewaySemiBold {
+            id: instructionsText;
+            text: "Please Enter Your Passphrase";
+            size: 24;
+            anchors.top: parent.top;
+            anchors.topMargin: 30;
+            anchors.left: parent.left;
+            anchors.leftMargin: 16;
+            width: passphraseField.width;
+            height: paintedHeight;
+            // Style
+            color: hifi.colors.white;
+            // Alignment
+            horizontalAlignment: Text.AlignLeft;
+        }
+
+        // Error text above buttons
+        RalewaySemiBold {
+            id: errorText;
+            text: "";
+            // Text size
+            size: 15;
+            // Anchors
+            anchors.bottom: passphraseField.top;
+            anchors.bottomMargin: 4;
+            anchors.left: passphraseField.left;
+            anchors.right: parent.right;
+            height: 20;
+            // Style
+            color: hifi.colors.redHighlight;
+        }
+
+        HifiControlsUit.TextField {
+            id: passphraseField;
+            colorScheme: hifi.colorSchemes.dark;
+            anchors.top: instructionsText.bottom;
+            anchors.topMargin: 40;
+            anchors.left: instructionsText.left;
+            width: 260;
+            height: 50;
+            echoMode: TextInput.Password;
+            placeholderText: "passphrase";
+            activeFocusOnPress: true;
+            activeFocusOnTab: true;
+
+            onFocusChanged: {
+                root.keyboardRaised = focus;
+                root.isPasswordField = (focus && passphraseField.echoMode === TextInput.Password);
+            }
+
+            MouseArea {
+                anchors.fill: parent;
+
+                onClicked: {
+                    root.keyboardRaised = true;
+                    root.isPasswordField = (passphraseField.echoMode === TextInput.Password);
+                    mouse.accepted = false;
+                }
+            }
+
+            onAccepted: {
+                submitPassphraseInputButton.enabled = false;
+                commerce.setPassphrase(passphraseField.text);
+            }
+        }
+
+        // Show passphrase text
+        HifiControlsUit.CheckBox {
+            id: showPassphrase;
+            colorScheme: hifi.colorSchemes.dark;
+            anchors.left: passphraseField.left;
+            anchors.top: passphraseField.bottom;
+            anchors.topMargin: 8;
+            height: 30;
+            text: "Show passphrase";
+            boxSize: 24;
+            onClicked: {
+                passphraseField.echoMode = checked ? TextInput.Normal : TextInput.Password;
+            }
+        }
+
+        // Security Image
+        Item {
+            id: securityImageContainer;
+            // Anchors
+            anchors.top: passphraseField.top;
+            anchors.left: passphraseField.right;
+            anchors.leftMargin: 8;
+            anchors.right: parent.right;
+            anchors.rightMargin: 8;
+            height: 145;
+            Image {
+                id: passphraseModalSecurityImage;
+                anchors.top: parent.top;
+                anchors.left: parent.left;
+                anchors.right: parent.right;
+                anchors.bottom: iconAndTextContainer.top;
+                fillMode: Image.PreserveAspectFit;
+                mipmap: true;
+                source: "image://security/securityImage";
+                cache: false;
+                onVisibleChanged: {
+                    commerce.getSecurityImage();
+                }
+            }
+            Item {
+                id: iconAndTextContainer;
+                anchors.left: passphraseModalSecurityImage.left;
+                anchors.right: passphraseModalSecurityImage.right;
+                anchors.bottom: parent.bottom;
+                height: 24;
+                // Lock icon
+                HiFiGlyphs {
+                    id: lockIcon;
+                    text: hifi.glyphs.lock;
+                    anchors.bottom: parent.bottom;
+                    anchors.left: parent.left;
+                    anchors.leftMargin: 30;
+                    size: 20;
+                    width: height;
+                    verticalAlignment: Text.AlignBottom;
+                    color: hifi.colors.white;
+                }
+                // "Security image" text below pic
+                RalewayRegular {
+                    id: securityImageText;
+                    text: "SECURITY PIC";
+                    // Text size
+                    size: 12;
+                    // Anchors
+                    anchors.bottom: parent.bottom;
+                    anchors.right: parent.right;
+                    anchors.rightMargin: lockIcon.anchors.leftMargin;
+                    width: paintedWidth;
+                    height: 22;
+                    // Style
+                    color: hifi.colors.white;
+                    // Alignment
+                    horizontalAlignment: Text.AlignRight;
+                    verticalAlignment: Text.AlignBottom;
+                }
+            }
+        }
+        
+        //
+        // ACTION BUTTONS START
+        //
+        Item {
+            id: passphrasePopupActionButtonsContainer;
+            // Anchors
+            anchors.left: parent.left;
+            anchors.right: parent.right;
+            anchors.bottom: parent.bottom;
+
+            // "Submit" button
+            HifiControlsUit.Button {
+                id: submitPassphraseInputButton;
+                color: hifi.buttons.blue;
+                colorScheme: hifi.colorSchemes.dark;
+                anchors.top: parent.top;
+                anchors.topMargin: 20;
+                height: 40;
+                anchors.left: parent.left;
+                anchors.leftMargin: 16;
+                anchors.right: parent.right;
+                anchors.rightMargin: 16;
+                width: parent.width/2 -4;
+                text: "Submit"
+                onClicked: {
+                    submitPassphraseInputButton.enabled = false;
+                    commerce.setPassphrase(passphraseField.text);
+                }
+            }
+
+            // "Cancel" button
+            HifiControlsUit.Button {
+                id: cancelPassphraseInputButton;
+                color: hifi.buttons.noneBorderlessWhite;
+                colorScheme: hifi.colorSchemes.dark;
+                anchors.top: submitPassphraseInputButton.bottom;
+                anchors.topMargin: 20;
+                height: 40;
+                anchors.left: parent.left;
+                anchors.leftMargin: 16;
+                anchors.right: parent.right;
+                anchors.rightMargin: 16;
+                width: parent.width/2 - 4;
+                text: "Cancel"
+                onClicked: {
+                    sendSignalToParent({method: 'passphrasePopup_cancelClicked'});
+                }
+            }
+        }
+    }
+
+    Item {
+        id: keyboardContainer;
+        z: 998;
+        visible: keyboard.raised;
+        property bool punctuationMode: false;
+        anchors {
+            bottom: parent.bottom;
+            left: parent.left;
+            right: parent.right;
+        }
+
+        Image {
+            id: lowerKeyboardButton;
+            z: 999;
+            source: "images/lowerKeyboard.png";
+            anchors.right: keyboard.right;
+            anchors.top: keyboard.showMirrorText ? keyboard.top : undefined;
+            anchors.bottom: keyboard.showMirrorText ? undefined : keyboard.bottom;
+            height: 50;
+            width: 60;
+
+            MouseArea {
+                anchors.fill: parent;
+
+                onClicked: {
+                    root.keyboardRaised = false;
+                }
+            }
+        }
+
+        HifiControlsUit.Keyboard {
+            id: keyboard;
+            raised: HMD.mounted && root.keyboardRaised;
+            numeric: parent.punctuationMode;
+            password: root.isPasswordField;
+            anchors {
+                bottom: parent.bottom;
+                left: parent.left;
+                right: parent.right;
+            }
+        }
+    }
+
+    signal sendSignalToParent(var msg);
+}
diff --git a/interface/resources/qml/hifi/commerce/wallet/PassphraseSelection.qml b/interface/resources/qml/hifi/commerce/wallet/PassphraseSelection.qml
new file mode 100644
index 0000000000..ffeedde8f0
--- /dev/null
+++ b/interface/resources/qml/hifi/commerce/wallet/PassphraseSelection.qml
@@ -0,0 +1,344 @@
+//
+//  PassphraseSelection.qml
+//  qml/hifi/commerce/wallet
+//
+//  PassphraseSelection
+//
+//  Created by Zach Fox on 2017-08-18
+//  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
+//
+
+import Hifi 1.0 as Hifi
+import QtQuick 2.5
+import QtQuick.Controls 1.4
+import "../../../styles-uit"
+import "../../../controls-uit" as HifiControlsUit
+import "../../../controls" as HifiControls
+
+// references XXX from root context
+
+Item {
+    HifiConstants { id: hifi; }
+
+    id: root;
+    property bool isChangingPassphrase: false;
+    property bool isShowingTip: false;
+    property bool shouldImmediatelyFocus: true;
+
+    // This object is always used in a popup.
+    // This MouseArea is used to prevent a user from being
+    //     able to click on a button/mouseArea underneath the popup.
+    MouseArea {
+        anchors.fill: parent;
+        propagateComposedEvents: false;
+    }
+
+    Hifi.QmlCommerce {
+        id: commerce;
+        onSecurityImageResult: {
+            passphrasePageSecurityImage.source = "";
+            passphrasePageSecurityImage.source = "image://security/securityImage";
+        }
+
+        onChangePassphraseStatusResult: {
+            sendMessageToLightbox({method: 'statusResult', status: changeSuccess});
+        }
+    }
+
+    // This will cause a bug -- if you bring up passphrase selection in HUD mode while
+    // in HMD while having HMD preview enabled, then move, then finish passphrase selection,
+    // HMD preview will stay off.
+    // TODO: Fix this unlikely bug
+    onVisibleChanged: {
+        if (visible) {
+            if (root.shouldImmediatelyFocus) {
+                focusFirstTextField();
+            }
+            sendMessageToLightbox({method: 'disableHmdPreview'});
+        } else {
+            sendMessageToLightbox({method: 'maybeEnableHmdPreview'});
+        }
+    }
+    
+
+    HifiControlsUit.TextField {
+        id: currentPassphraseField;
+        colorScheme: hifi.colorSchemes.dark;
+        visible: root.isChangingPassphrase;
+        anchors.top: parent.top;
+        anchors.left: parent.left;
+        anchors.leftMargin: 20;
+        anchors.right: passphraseField.right;
+        height: 50;
+        echoMode: TextInput.Password;
+        placeholderText: "enter current passphrase";
+        activeFocusOnPress: true;
+        activeFocusOnTab: true;
+
+        onFocusChanged: {
+            if (focus) {
+                var hidePassword = (currentPassphraseField.echoMode === TextInput.Password);
+                sendSignalToWallet({method: 'walletSetup_raiseKeyboard', isPasswordField: hidePassword});
+            } else if (!passphraseFieldAgain.focus) {
+                sendSignalToWallet({method: 'walletSetup_lowerKeyboard', isPasswordField: false});
+            }
+        }
+
+        MouseArea {
+            anchors.fill: parent;
+            onPressed: {
+                var hidePassword = (currentPassphraseField.echoMode === TextInput.Password);
+                sendSignalToWallet({method: 'walletSetup_raiseKeyboard', isPasswordField: hidePassword});
+                mouse.accepted = false;
+            }
+        }
+
+        onAccepted: {
+            passphraseField.focus = true;
+        }
+    }
+
+    HifiControlsUit.TextField {
+        id: passphraseField;
+        colorScheme: hifi.colorSchemes.dark;
+        anchors.top: root.isChangingPassphrase ? currentPassphraseField.bottom : parent.top;
+        anchors.topMargin: root.isChangingPassphrase ? 40 : 0;
+        anchors.left: parent.left;
+        anchors.leftMargin: 20;
+        width: 285;
+        height: 50;
+        echoMode: TextInput.Password;
+        placeholderText: root.isShowingTip ? "" : "enter new passphrase";
+        activeFocusOnPress: true;
+        activeFocusOnTab: true;
+
+        MouseArea {
+            anchors.fill: parent;
+            onPressed: {
+                var hidePassword = (passphraseField.echoMode === TextInput.Password);
+                sendSignalToWallet({method: 'walletSetup_raiseKeyboard', isPasswordField: hidePassword});
+                mouse.accepted = false;
+            }
+        }
+
+        onFocusChanged: {
+            if (focus) {
+                var hidePassword = (passphraseField.echoMode === TextInput.Password);
+                sendMessageToLightbox({method: 'walletSetup_raiseKeyboard', isPasswordField: hidePassword});
+            } else if (!passphraseFieldAgain.focus) {
+                sendMessageToLightbox({method: 'walletSetup_lowerKeyboard', isPasswordField: false});
+            }
+        }
+
+        onAccepted: {
+            passphraseFieldAgain.focus = true;
+        }
+    }
+
+    HifiControlsUit.TextField {
+        id: passphraseFieldAgain;
+        colorScheme: hifi.colorSchemes.dark;
+        anchors.top: passphraseField.bottom;
+        anchors.topMargin: root.isChangingPassphrase ? 20 : 40;
+        anchors.left: passphraseField.left;
+        anchors.right: passphraseField.right;
+        height: 50;
+        echoMode: TextInput.Password;
+        placeholderText: root.isShowingTip ? "" : "re-enter new passphrase";
+        activeFocusOnPress: true;
+        activeFocusOnTab: true;
+
+        MouseArea {
+            anchors.fill: parent;
+            onPressed: {
+                var hidePassword = (passphraseFieldAgain.echoMode === TextInput.Password);
+                sendSignalToWallet({method: 'walletSetup_raiseKeyboard', isPasswordField: hidePassword});
+                mouse.accepted = false;
+            }
+        }
+
+        onFocusChanged: {
+            if (focus) {
+                var hidePassword = (passphraseFieldAgain.echoMode === TextInput.Password);
+                sendMessageToLightbox({method: 'walletSetup_raiseKeyboard', isPasswordField: hidePassword});
+            } else if (!passphraseField.focus) {
+                sendMessageToLightbox({method: 'walletSetup_lowerKeyboard', isPasswordField: false});
+            }
+        }
+
+        onAccepted: {
+            focus = false;
+        }
+    }
+
+    // Security Image
+    Item {
+        id: securityImageContainer;
+        // Anchors
+        anchors.top: root.isChangingPassphrase ? currentPassphraseField.top : passphraseField.top;
+        anchors.left: passphraseField.right;
+        anchors.right: parent.right;
+        anchors.bottom: root.isChangingPassphrase ? passphraseField.bottom : passphraseFieldAgain.bottom;
+        Image {
+            id: passphrasePageSecurityImage;
+            anchors.top: parent.top;
+            anchors.left: parent.left;
+            anchors.right: parent.right;
+            anchors.bottom: iconAndTextContainer.top;
+            fillMode: Image.PreserveAspectFit;
+            mipmap: true;
+            source: "image://security/securityImage";
+            cache: false;
+            onVisibleChanged: {
+                commerce.getSecurityImage();
+            }
+        }
+        Item {
+            id: iconAndTextContainer;
+            anchors.left: passphrasePageSecurityImage.left;
+            anchors.right: passphrasePageSecurityImage.right;
+            anchors.bottom: parent.bottom;
+            height: 22;
+            // Lock icon
+            HiFiGlyphs {
+                id: lockIcon;
+                text: hifi.glyphs.lock;
+                anchors.bottom: parent.bottom;
+                anchors.left: parent.left;
+                anchors.leftMargin: 35;
+                size: 20;
+                width: height;
+                verticalAlignment: Text.AlignBottom;
+                color: hifi.colors.white;
+            }
+            // "Security image" text below pic
+            RalewayRegular {
+                id: securityImageText;
+                text: "SECURITY PIC";
+                // Text size
+                size: 12;
+                // Anchors
+                anchors.bottom: parent.bottom;
+                anchors.right: parent.right;
+                anchors.rightMargin: lockIcon.anchors.leftMargin;
+                width: paintedWidth;
+                height: 22;
+                // Style
+                color: hifi.colors.white;
+                // Alignment
+                horizontalAlignment: Text.AlignRight;
+                verticalAlignment: Text.AlignBottom;
+            }
+        }
+    }
+
+    // Error text above TextFields
+    RalewaySemiBold {
+        id: errorText;
+        text: "";
+        // Text size
+        size: 15;
+        // Anchors
+        anchors.bottom: passphraseField.top;
+        anchors.bottomMargin: 4;
+        anchors.left: parent.left;
+        anchors.leftMargin: 20;
+        anchors.right: securityImageContainer.left;
+        anchors.rightMargin: 4;
+        height: 30;
+        // Style
+        color: hifi.colors.redHighlight;
+        // Alignment
+        verticalAlignment: Text.AlignVCenter;
+    }
+
+    // Show passphrase text
+    HifiControlsUit.CheckBox {
+        id: showPassphrase;
+        visible: !root.isShowingTip;
+        colorScheme: hifi.colorSchemes.dark;
+        anchors.left: parent.left;
+        anchors.leftMargin: 20;
+        anchors.top: passphraseFieldAgain.bottom;
+        anchors.topMargin: 16;
+        height: 30;
+        text: "Show passphrase";
+        boxSize: 24;
+        onClicked: {
+            passphraseField.echoMode = checked ? TextInput.Normal : TextInput.Password;
+            passphraseFieldAgain.echoMode = checked ? TextInput.Normal : TextInput.Password;
+            if (root.isChangingPassphrase) {
+                currentPassphraseField.echoMode = checked ? TextInput.Normal : TextInput.Password;
+            }
+        }
+    }
+
+    // Text below checkbox
+    RalewayRegular {
+        visible: !root.isShowingTip;
+        text: "Your passphrase is used to encrypt your private keys. Only you have it.<br><br>Please write it down.<br><br><b>If it is lost, you will not be able to recover it.</b>";
+        // Text size
+        size: 18;
+        // Anchors
+        anchors.top: showPassphrase.bottom;
+        anchors.topMargin: 16;
+        anchors.left: parent.left;
+        anchors.leftMargin: 24;
+        anchors.right: parent.right;
+        anchors.rightMargin: 24;
+        height: paintedHeight;
+        // Style
+        color: hifi.colors.white;
+        wrapMode: Text.WordWrap;
+        // Alignment
+        horizontalAlignment: Text.AlignHCenter;
+        verticalAlignment: Text.AlignVCenter;
+    }
+
+    function validateAndSubmitPassphrase() {
+        if (passphraseField.text.length < 3) {
+            setErrorText("Passphrase must be at least 3 characters.");
+            passphraseField.error = true;
+            passphraseFieldAgain.error = true;
+            currentPassphraseField.error = true;
+            return false;
+        } else if (passphraseField.text !== passphraseFieldAgain.text) {
+            setErrorText("Passphrases don't match.");
+            passphraseField.error = true;
+            passphraseFieldAgain.error = true;
+            currentPassphraseField.error = true;
+            return false;
+        } else {
+            passphraseField.error = false;
+            passphraseFieldAgain.error = false;
+            currentPassphraseField.error = false;
+            setErrorText("");
+            commerce.changePassphrase(currentPassphraseField.text, passphraseField.text);
+            return true;
+        }
+    }
+
+    function setErrorText(text) {
+        errorText.text = text;
+    }
+
+    function clearPassphraseFields() {
+        currentPassphraseField.text = "";
+        passphraseField.text = "";
+        passphraseFieldAgain.text = "";
+        setErrorText("");
+    }
+
+    function focusFirstTextField() {
+        if (root.isChangingPassphrase) {
+            currentPassphraseField.focus = true;
+        } else {
+            passphraseField.focus = true;
+        }
+    }
+
+    signal sendMessageToLightbox(var msg);
+}
diff --git a/interface/resources/qml/hifi/commerce/wallet/Security.qml b/interface/resources/qml/hifi/commerce/wallet/Security.qml
new file mode 100644
index 0000000000..485b0ec086
--- /dev/null
+++ b/interface/resources/qml/hifi/commerce/wallet/Security.qml
@@ -0,0 +1,375 @@
+//
+//  Security.qml
+//  qml/hifi/commerce/wallet
+//
+//  Security
+//
+//  Created by Zach Fox on 2017-08-18
+//  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
+//
+
+import Hifi 1.0 as Hifi
+import QtQuick 2.5
+import QtGraphicalEffects 1.0
+import QtQuick.Controls 1.4
+import "../../../styles-uit"
+import "../../../controls-uit" as HifiControlsUit
+import "../../../controls" as HifiControls
+
+// references XXX from root context
+
+Item {
+    HifiConstants { id: hifi; }
+
+    id: root;
+    property string keyFilePath;
+
+    Hifi.QmlCommerce {
+        id: commerce;
+
+        onKeyFilePathIfExistsResult: {
+            root.keyFilePath = path;
+        }
+    }
+
+    // Username Text
+    RalewayRegular {
+        id: usernameText;
+        text: Account.username;
+        // Text size
+        size: 24;
+        // Style
+        color: hifi.colors.white;
+        elide: Text.ElideRight;
+        // Anchors
+        anchors.top: parent.top;
+        anchors.left: parent.left;
+        anchors.leftMargin: 20;
+        width: parent.width/2;
+        height: 80;
+    }
+
+    Item {
+        id: securityContainer;
+        anchors.top: usernameText.bottom;
+        anchors.topMargin: 20;
+        anchors.left: parent.left;
+        anchors.right: parent.right;
+        anchors.bottom: parent.bottom;
+
+        RalewaySemiBold {
+            id: securityText;
+            text: "Security";
+            // Anchors
+            anchors.top: parent.top;
+            anchors.left: parent.left;
+            anchors.leftMargin: 20;
+            anchors.right: parent.right;
+            height: 30;
+            // Text size
+            size: 18;
+            // Style
+            color: hifi.colors.blueHighlight;
+        }
+
+        Rectangle {
+            id: securityTextSeparator;
+            // Size
+            width: parent.width;
+            height: 1;
+            // Anchors
+            anchors.left: parent.left;
+            anchors.right: parent.right;
+            anchors.top: securityText.bottom;
+            anchors.topMargin: 8;
+            // Style
+            color: hifi.colors.faintGray;
+        }
+
+        Item {
+            id: changePassphraseContainer;
+            anchors.top: securityTextSeparator.bottom;
+            anchors.topMargin: 8;
+            anchors.left: parent.left;
+            anchors.leftMargin: 40;
+            anchors.right: parent.right;
+            anchors.rightMargin: 55;
+            height: 75;
+
+            HiFiGlyphs {
+                id: changePassphraseImage;
+                text: hifi.glyphs.passphrase;
+                // Size
+                size: 80;
+                // Anchors
+                anchors.top: parent.top;
+                anchors.bottom: parent.bottom;
+                anchors.left: parent.left;
+                // Style
+                color: hifi.colors.white;
+            }
+
+            RalewaySemiBold {
+                text: "Passphrase";
+                // Anchors
+                anchors.top: parent.top;
+                anchors.bottom: parent.bottom;
+                anchors.left: changePassphraseImage.right;
+                anchors.leftMargin: 30;
+                width: 50;
+                // Text size
+                size: 18;
+                // Style
+                color: hifi.colors.white;
+            }
+
+            // "Change Passphrase" button
+            HifiControlsUit.Button {
+                id: changePassphraseButton;
+                color: hifi.buttons.blue;
+                colorScheme: hifi.colorSchemes.dark;
+                anchors.right: parent.right;
+                anchors.verticalCenter: parent.verticalCenter;
+                width: 140;
+                height: 40;
+                text: "Change";
+                onClicked: {
+                    sendSignalToWallet({method: 'walletSecurity_changePassphrase'});
+                }
+            }
+        }
+
+        Rectangle {
+            id: changePassphraseSeparator;
+            // Size
+            width: parent.width;
+            height: 1;
+            // Anchors
+            anchors.left: parent.left;
+            anchors.right: parent.right;
+            anchors.top: changePassphraseContainer.bottom;
+            anchors.topMargin: 8;
+            // Style
+            color: hifi.colors.faintGray;
+        }
+
+        Item {
+            id: changeSecurityImageContainer;
+            anchors.top: changePassphraseSeparator.bottom;
+            anchors.topMargin: 8;
+            anchors.left: parent.left;
+            anchors.leftMargin: 40;
+            anchors.right: parent.right;
+            anchors.rightMargin: 55;
+            height: 75;
+
+            HiFiGlyphs {
+                id: changeSecurityImageImage;
+                text: hifi.glyphs.securityImage;
+                // Size
+                size: 80;
+                // Anchors
+                anchors.top: parent.top;
+                anchors.bottom: parent.bottom;
+                anchors.left: parent.left;
+                // Style
+                color: hifi.colors.white;
+            }
+
+            RalewaySemiBold {
+                text: "Security Pic";
+                // Anchors
+                anchors.top: parent.top;
+                anchors.bottom: parent.bottom;
+                anchors.left: changeSecurityImageImage.right;
+                anchors.leftMargin: 30;
+                width: 50;
+                // Text size
+                size: 18;
+                // Style
+                color: hifi.colors.white;
+            }
+
+            // "Change Passphrase" button
+            HifiControlsUit.Button {
+                id: changeSecurityImageButton;
+                color: hifi.buttons.blue;
+                colorScheme: hifi.colorSchemes.dark;
+                anchors.right: parent.right;
+                anchors.verticalCenter: parent.verticalCenter;
+                width: 140;
+                height: 40;
+                text: "Change";
+                onClicked: {
+                    sendSignalToWallet({method: 'walletSecurity_changeSecurityImage'});
+                }
+            }
+        }
+
+        Rectangle {
+            id: privateKeysSeparator;
+            // Size
+            width: parent.width;
+            height: 1;
+            // Anchors
+            anchors.left: parent.left;
+            anchors.right: parent.right;
+            anchors.top: changeSecurityImageContainer.bottom;
+            anchors.topMargin: 8;
+            // Style
+            color: hifi.colors.faintGray;
+        }
+
+        Item {
+            id: yourPrivateKeysContainer;
+            anchors.top: privateKeysSeparator.bottom;
+            anchors.left: parent.left;
+            anchors.leftMargin: 40;
+            anchors.right: parent.right;
+            anchors.rightMargin: 55;
+            anchors.bottom: parent.bottom;
+
+            onVisibleChanged: {
+                if (visible) {
+                    commerce.getKeyFilePathIfExists();
+                }
+            }
+
+            HiFiGlyphs {
+                id: yourPrivateKeysImage;
+                text: hifi.glyphs.walletKey;
+                // Size
+                size: 80;
+                // Anchors
+                anchors.top: parent.top;
+                anchors.topMargin: 20;
+                anchors.left: parent.left;
+                // Style
+                color: hifi.colors.white;
+            }
+
+            RalewaySemiBold {
+                id: yourPrivateKeysText;
+                text: "Private Keys";
+                size: 18;
+                // Anchors
+                anchors.top: parent.top;
+                anchors.topMargin: 32;
+                anchors.left: yourPrivateKeysImage.right;
+                anchors.leftMargin: 30;
+                anchors.right: parent.right;
+                height: 30;
+                // Style
+                color: hifi.colors.white;
+            }
+
+            // Text below "private keys"
+            RalewayRegular {
+                id: explanitoryText;
+                text: "Your money and purchases are secured with private keys that only you have access to.";
+                // Text size
+                size: 18;
+                // Anchors
+                anchors.top: yourPrivateKeysText.bottom;
+                anchors.topMargin: 10;
+                anchors.left: yourPrivateKeysText.left;
+                anchors.right: yourPrivateKeysText.right;
+                height: paintedHeight;
+                // Style
+                color: hifi.colors.white;
+                wrapMode: Text.WordWrap;
+                // Alignment
+                horizontalAlignment: Text.AlignLeft;
+                verticalAlignment: Text.AlignVCenter;
+            }
+
+            Rectangle {
+                id: removeHmdContainer;
+                z: 998;
+                visible: false;
+
+                gradient: Gradient {
+                    GradientStop {
+                        position: 0.2;
+                        color: hifi.colors.baseGrayHighlight;
+                    }
+                    GradientStop {
+                        position: 1.0;
+                        color: hifi.colors.baseGrayShadow;
+                    }
+                }
+                anchors.fill: backupInstructionsButton;
+                radius: 5;
+                MouseArea {
+                    anchors.fill: parent;
+                    propagateComposedEvents: false;
+                }
+
+                RalewayBold {
+                    anchors.fill: parent;
+                    text: "INSTRUCTIONS OPEN ON DESKTOP";
+                    size: 15;
+                    color: hifi.colors.white;
+                    verticalAlignment: Text.AlignVCenter;
+                    horizontalAlignment: Text.AlignHCenter;
+                }
+
+                    Timer {
+                        id: removeHmdContainerTimer;
+                        interval: 5000;
+                        onTriggered: removeHmdContainer.visible = false
+                    }
+            }
+
+            HifiControlsUit.Button {
+                id: backupInstructionsButton;
+                text: "View Backup Instructions";
+                color: hifi.buttons.blue;
+                colorScheme: hifi.colorSchemes.dark;
+                anchors.left: explanitoryText.left;
+                anchors.right: explanitoryText.right;
+                anchors.top: explanitoryText.bottom;
+                anchors.topMargin: 16;
+                height: 40;
+
+                onClicked: {
+                    var keyPath = "file:///" + root.keyFilePath.substring(0, root.keyFilePath.lastIndexOf('/'));
+                    Qt.openUrlExternally(keyPath + "/backup_instructions.html");
+                    Qt.openUrlExternally(keyPath);
+                    removeHmdContainer.visible = true;
+                    removeHmdContainerTimer.start();
+                }
+            }
+        }
+    }
+
+    //
+    // FUNCTION DEFINITIONS START
+    //
+    //
+    // Function Name: fromScript()
+    //
+    // Relevant Variables:
+    // None
+    //
+    // Arguments:
+    // message: The message sent from the JavaScript.
+    //     Messages are in format "{method, params}", like json-rpc.
+    //
+    // Description:
+    // Called when a message is received from a script.
+    //
+    function fromScript(message) {
+        switch (message.method) {
+            default:
+                console.log('Unrecognized message from wallet.js:', JSON.stringify(message));
+        }
+    }
+    signal sendSignalToWallet(var msg);
+    //
+    // FUNCTION DEFINITIONS END
+    //
+}
diff --git a/interface/resources/qml/hifi/commerce/wallet/SecurityImageChange.qml b/interface/resources/qml/hifi/commerce/wallet/SecurityImageChange.qml
new file mode 100644
index 0000000000..7f767060f6
--- /dev/null
+++ b/interface/resources/qml/hifi/commerce/wallet/SecurityImageChange.qml
@@ -0,0 +1,216 @@
+//
+//  SecurityImageChange.qml
+//  qml/hifi/commerce/wallet
+//
+//  SecurityImageChange
+//
+//  Created by Zach Fox on 2017-08-18
+//  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
+//
+
+import Hifi 1.0 as Hifi
+import QtQuick 2.5
+import QtQuick.Controls 1.4
+import "../../../styles-uit"
+import "../../../controls-uit" as HifiControlsUit
+import "../../../controls" as HifiControls
+
+// references XXX from root context
+
+Item {
+    HifiConstants { id: hifi; }
+
+    id: root;
+    property bool justSubmitted: false;
+
+    SecurityImageModel {
+        id: securityImageModel;
+    }
+
+    Hifi.QmlCommerce {
+        id: commerce;
+        
+        onSecurityImageResult: {
+            securityImageChangePageSecurityImage.source = "";
+            securityImageChangePageSecurityImage.source = "image://security/securityImage";
+            if (exists) { // Success submitting new security image
+                if (root.justSubmitted) {
+                    root.resetSubmitButton();
+                    sendSignalToWallet({method: "walletSecurity_changeSecurityImageSuccess"});
+                    root.justSubmitted = false;
+                }
+            } else if (root.justSubmitted) {
+                // Error submitting new security image.
+                root.resetSubmitButton();
+                root.justSubmitted = false;
+            }
+        }
+    }
+    
+
+    // Security Image
+    Item {
+        // Anchors
+        anchors.top: parent.top;
+        anchors.right: parent.right;
+        anchors.rightMargin: 25;
+        width: 130;
+        height: 150;
+        Image {
+            id: securityImageChangePageSecurityImage;
+            anchors.top: parent.top;
+            anchors.left: parent.left;
+            anchors.right: parent.right;
+            anchors.bottom: iconAndTextContainer.top;
+            fillMode: Image.PreserveAspectFit;
+            mipmap: true;
+            source: "image://security/securityImage";
+            cache: false;
+            onVisibleChanged: {
+                commerce.getSecurityImage();
+            }
+        }
+        Item {
+            id: iconAndTextContainer;
+            anchors.left: securityImageChangePageSecurityImage.left;
+            anchors.right: securityImageChangePageSecurityImage.right;
+            anchors.bottom: parent.bottom;
+            height: 22;
+            // Lock icon
+            HiFiGlyphs {
+                id: lockIcon;
+                text: hifi.glyphs.lock;
+                anchors.bottom: parent.bottom;
+                anchors.left: parent.left;
+                anchors.leftMargin: 10;
+                size: 20;
+                width: height;
+                verticalAlignment: Text.AlignBottom;
+                color: hifi.colors.white;
+            }
+            // "Security image" text below pic
+            RalewayRegular {
+                id: securityImageText;
+                text: "SECURITY PIC";
+                // Text size
+                size: 12;
+                // Anchors
+                anchors.bottom: parent.bottom;
+                anchors.right: parent.right;
+                anchors.rightMargin: lockIcon.anchors.leftMargin;
+                width: paintedWidth;
+                height: 22;
+                // Style
+                color: hifi.colors.white;
+                // Alignment
+                horizontalAlignment: Text.AlignRight;
+                verticalAlignment: Text.AlignBottom;
+            }
+        }
+    }
+
+    //
+    // SECURITY IMAGE SELECTION START
+    //
+    Item {
+        // Anchors
+        anchors.top: parent.top;
+        anchors.topMargin: 135;
+        anchors.left: parent.left;
+        anchors.right: parent.right;
+        anchors.bottom: parent.bottom;
+
+        // "Change Security Image" text
+        RalewaySemiBold {
+            id: securityImageTitle;
+            text: "Change Security Pic:";
+            // Text size
+            size: 18;
+            anchors.top: parent.top;
+            anchors.left: parent.left;
+            anchors.leftMargin: 20;
+            anchors.right: parent.right;
+            height: 30;
+            // Style
+            color: hifi.colors.blueHighlight;
+        }
+
+        SecurityImageSelection {
+            id: securityImageSelection;
+            // Anchors
+            anchors.top: securityImageTitle.bottom;
+            anchors.left: parent.left;
+            anchors.leftMargin: 16;
+            anchors.right: parent.right;
+            anchors.rightMargin: 16;
+            height: 300;
+        
+            Connections {
+                onSendSignalToWallet: {
+                    sendSignalToWallet(msg);
+                }
+            }
+        }
+
+        // Navigation Bar
+        Item {
+            id: securityImageNavBar;
+            // Size
+            width: parent.width;
+            height: 40;
+            // Anchors:
+            anchors.left: parent.left;
+            anchors.bottom: parent.bottom;
+            anchors.bottomMargin: 30;
+
+            // "Cancel" button
+            HifiControlsUit.Button {
+                color: hifi.buttons.noneBorderlessWhite;
+                colorScheme: hifi.colorSchemes.dark;
+                anchors.top: parent.top;
+                anchors.bottom: parent.bottom;
+                anchors.left: parent.left;
+                anchors.leftMargin: 20;
+                width: 150;
+                text: "Cancel"
+                onClicked: {
+                    sendSignalToWallet({method: "walletSecurity_changeSecurityImageCancelled"});
+                }
+            }
+
+            // "Submit" button
+            HifiControlsUit.Button {
+                id: securityImageSubmitButton;
+                enabled: securityImageSelection.currentIndex !== -1;
+                color: hifi.buttons.blue;
+                colorScheme: hifi.colorSchemes.dark;
+                anchors.top: parent.top;
+                anchors.bottom: parent.bottom;
+                anchors.right: parent.right;
+                anchors.rightMargin: 20;
+                width: 150;
+                text: "Submit";
+                onClicked: {
+                    root.justSubmitted = true;
+                    securityImageSubmitButton.text = "Submitting...";
+                    securityImageSubmitButton.enabled = false;
+                    var securityImagePath = securityImageSelection.getImagePathFromImageID(securityImageSelection.getSelectedImageIndex())
+                    commerce.chooseSecurityImage(securityImagePath);
+                }
+            }
+        }
+    }
+    //
+    // SECURITY IMAGE SELECTION END
+    //
+
+    signal sendSignalToWallet(var msg);
+
+    function resetSubmitButton() {
+        securityImageSubmitButton.enabled = true;
+        securityImageSubmitButton.text = "Submit";
+    }
+}
diff --git a/interface/resources/qml/hifi/commerce/wallet/SecurityImageModel.qml b/interface/resources/qml/hifi/commerce/wallet/SecurityImageModel.qml
new file mode 100644
index 0000000000..7b1434aa3c
--- /dev/null
+++ b/interface/resources/qml/hifi/commerce/wallet/SecurityImageModel.qml
@@ -0,0 +1,46 @@
+//
+//  SecurityImageModel.qml
+//  qml/hifi/commerce
+//
+//  SecurityImageModel
+//
+//  Created by Zach Fox on 2017-08-17
+//  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
+//
+
+import QtQuick 2.5
+
+ListModel {
+    id: root;
+    ListElement{
+        sourcePath: "images/01.jpg"
+        securityImageEnumValue: 1;
+    }
+    ListElement{
+        sourcePath: "images/02.jpg"
+        securityImageEnumValue: 2;
+    }
+    ListElement{
+        sourcePath: "images/03.jpg"
+        securityImageEnumValue: 3;
+    }
+    ListElement{
+        sourcePath: "images/04.jpg"
+        securityImageEnumValue: 4;
+    }
+    ListElement{
+        sourcePath: "images/05.jpg"
+        securityImageEnumValue: 5;
+    }
+    ListElement{
+        sourcePath: "images/06.jpg"
+        securityImageEnumValue: 6;
+    }
+
+    function getImagePathFromImageID(imageID) {
+        return (imageID ? root.get(imageID - 1).sourcePath : "");
+    }
+}
diff --git a/interface/resources/qml/hifi/commerce/wallet/SecurityImageSelection.qml b/interface/resources/qml/hifi/commerce/wallet/SecurityImageSelection.qml
new file mode 100644
index 0000000000..e12332cd0c
--- /dev/null
+++ b/interface/resources/qml/hifi/commerce/wallet/SecurityImageSelection.qml
@@ -0,0 +1,101 @@
+//
+//  SecurityImageSelection.qml
+//  qml/hifi/commerce/wallet
+//
+//  SecurityImageSelection
+//
+//  Created by Zach Fox on 2017-08-17
+//  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
+//
+
+import Hifi 1.0 as Hifi
+import QtQuick 2.5
+import QtQuick.Controls 1.4
+import "../../../styles-uit"
+import "../../../controls-uit" as HifiControlsUit
+import "../../../controls" as HifiControls
+
+// references XXX from root context
+
+Item {
+    HifiConstants { id: hifi; }
+
+    id: root;
+    property int currentIndex: securityImageGrid.currentIndex;
+    
+    // This will cause a bug -- if you bring up security image selection in HUD mode while
+    // in HMD while having HMD preview enabled, then move, then finish passphrase selection,
+    // HMD preview will stay off.
+    // TODO: Fix this unlikely bug
+    onVisibleChanged: {
+        if (visible) {
+            sendSignalToWallet({method: 'disableHmdPreview'});
+        } else {
+            sendSignalToWallet({method: 'maybeEnableHmdPreview'});
+        }
+    }
+
+    SecurityImageModel {
+        id: gridModel;
+    }
+
+    GridView {
+        id: securityImageGrid;
+        interactive: false;
+        clip: true;
+        // Anchors
+        anchors.fill: parent;
+        currentIndex: -1;
+        cellWidth: width / 3;
+        cellHeight: height / 2;
+        model: gridModel;
+        delegate: Item {
+            width: securityImageGrid.cellWidth;
+            height: securityImageGrid.cellHeight;
+            Item {
+                anchors.fill: parent;
+                Image {
+                    width: parent.width - 12;
+                    height: parent.height - 12;
+                    source: sourcePath;
+                    anchors.horizontalCenter: parent.horizontalCenter;
+                    anchors.verticalCenter: parent.verticalCenter;
+                    fillMode: Image.PreserveAspectFit;
+                    mipmap: true;
+                    cache: false;
+                }
+            }
+            MouseArea {
+                anchors.fill: parent;
+                propagateComposedEvents: false;
+                onClicked: {
+                    securityImageGrid.currentIndex = index;
+                }
+            }
+        }
+        highlight: Rectangle {
+                width: securityImageGrid.cellWidth;
+                height: securityImageGrid.cellHeight;
+                color: hifi.colors.blueHighlight;
+            }
+    }
+
+    //
+    // FUNCTION DEFINITIONS START
+    //
+    signal sendSignalToWallet(var msg);
+
+    function getImagePathFromImageID(imageID) {
+        return (imageID ? gridModel.getImagePathFromImageID(imageID) : "");
+    }
+
+    function getSelectedImageIndex() {
+        return gridModel.get(securityImageGrid.currentIndex).securityImageEnumValue;
+    }
+    //
+    // FUNCTION DEFINITIONS END
+    //
+}
diff --git a/interface/resources/qml/hifi/commerce/wallet/SendMoney.qml b/interface/resources/qml/hifi/commerce/wallet/SendMoney.qml
new file mode 100644
index 0000000000..75334b1686
--- /dev/null
+++ b/interface/resources/qml/hifi/commerce/wallet/SendMoney.qml
@@ -0,0 +1,73 @@
+//
+//  SendMoney.qml
+//  qml/hifi/commerce/wallet
+//
+//  SendMoney
+//
+//  Created by Zach Fox on 2017-08-18
+//  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
+//
+
+import Hifi 1.0 as Hifi
+import QtQuick 2.5
+import QtQuick.Controls 1.4
+import "../../../styles-uit"
+import "../../../controls-uit" as HifiControlsUit
+import "../../../controls" as HifiControls
+
+// references XXX from root context
+
+Item {
+    HifiConstants { id: hifi; }
+
+    id: root;
+
+    Hifi.QmlCommerce {
+        id: commerce;
+    }
+
+    // "Unavailable"
+    RalewayRegular {
+        text: "You currently cannot send money to other High Fidelity users.";
+        // Anchors
+        anchors.fill: parent;
+        // Text size
+        size: 24;
+        // Style
+        color: hifi.colors.faintGray;
+        wrapMode: Text.WordWrap;
+        // Alignment
+        horizontalAlignment: Text.AlignHCenter;
+        verticalAlignment: Text.AlignVCenter;
+    }
+
+    //
+    // FUNCTION DEFINITIONS START
+    //
+    //
+    // Function Name: fromScript()
+    //
+    // Relevant Variables:
+    // None
+    //
+    // Arguments:
+    // message: The message sent from the JavaScript.
+    //     Messages are in format "{method, params}", like json-rpc.
+    //
+    // Description:
+    // Called when a message is received from a script.
+    //
+    function fromScript(message) {
+        switch (message.method) {
+            default:
+                console.log('Unrecognized message from wallet.js:', JSON.stringify(message));
+        }
+    }
+    signal sendSignalToWallet(var msg);
+    //
+    // FUNCTION DEFINITIONS END
+    //
+}
diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
new file mode 100644
index 0000000000..759d7a37eb
--- /dev/null
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -0,0 +1,731 @@
+//
+//  Wallet.qml
+//  qml/hifi/commerce/wallet
+//
+//  Wallet
+//
+//  Created by Zach Fox on 2017-08-17
+//  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
+//
+
+import Hifi 1.0 as Hifi
+import QtQuick 2.5
+import QtGraphicalEffects 1.0
+import QtQuick.Controls 1.4
+import "../../../styles-uit"
+import "../../../controls-uit" as HifiControlsUit
+import "../../../controls" as HifiControls
+import "../common" as HifiCommerceCommon
+
+// references XXX from root context
+
+Rectangle {
+    HifiConstants { id: hifi; }
+
+    id: root;
+
+    property string activeView: "initialize";
+    property bool keyboardRaised: false;
+    property bool isPassword: false;
+
+    Image {
+        anchors.fill: parent;
+        source: "images/wallet-bg.jpg";
+    }
+
+    Hifi.QmlCommerce {
+        id: commerce;
+
+        onWalletStatusResult: {
+            if (walletStatus === 0) {
+                if (root.activeView !== "needsLogIn") {
+                    root.activeView = "needsLogIn";
+                }
+            } else if (walletStatus === 1) {
+                if (root.activeView !== "walletSetup") {
+                    root.activeView = "walletSetup";
+                }
+            } else if (walletStatus === 2) {
+                if (root.activeView !== "passphraseModal") {
+                    root.activeView = "passphraseModal";
+                }
+            } else if (walletStatus === 3) {
+                root.activeView = "walletHome";
+                commerce.getSecurityImage();
+            } else {
+                console.log("ERROR in Wallet.qml: Unknown wallet status: " + walletStatus);
+            }
+        }
+
+        onLoginStatusResult: {
+            if (!isLoggedIn && root.activeView !== "needsLogIn") {
+                root.activeView = "needsLogIn";
+            } else if (isLoggedIn) {
+                commerce.getWalletStatus();
+            }
+        }
+
+        onSecurityImageResult: {
+            if (exists) {
+                titleBarSecurityImage.source = "";
+                titleBarSecurityImage.source = "image://security/securityImage";
+            }
+        }
+    }
+
+    SecurityImageModel {
+        id: securityImageModel;
+    }
+
+    HifiCommerceCommon.CommerceLightbox {
+        id: lightboxPopup;
+        visible: false;
+        anchors.fill: parent;
+    }
+
+    //
+    // TITLE BAR START
+    //
+    Item {
+        id: titleBarContainer;
+        visible: !needsLogIn.visible;
+        // Size
+        width: parent.width;
+        height: 50;
+        // Anchors
+        anchors.left: parent.left;
+        anchors.top: parent.top;
+
+        // Wallet icon
+        HiFiGlyphs {
+            id: walletIcon;
+            text: hifi.glyphs.wallet;
+            // Size
+            size: parent.height * 0.8;
+            // Anchors
+            anchors.left: parent.left;
+            anchors.leftMargin: 8;
+            anchors.verticalCenter: parent.verticalCenter;
+            // Style
+            color: hifi.colors.blueHighlight;
+        }
+
+        // Title Bar text
+        RalewaySemiBold {
+            id: titleBarText;
+            text: "WALLET";
+            // Text size
+            size: hifi.fontSizes.overlayTitle;
+            // Anchors
+            anchors.top: parent.top;
+            anchors.left: walletIcon.right;
+            anchors.leftMargin: 4;
+            anchors.bottom: parent.bottom;
+            width: paintedWidth;
+            // Style
+            color: hifi.colors.white;
+            // Alignment
+            verticalAlignment: Text.AlignVCenter;
+        }
+
+        Image {
+            id: titleBarSecurityImage;
+            source: "";
+            visible: titleBarSecurityImage.source !== "" && !securityImageChange.visible;
+            anchors.right: parent.right;
+            anchors.rightMargin: 6;
+            anchors.top: parent.top;
+            anchors.topMargin: 6;
+            anchors.bottom: parent.bottom;
+            anchors.bottomMargin: 6;
+            width: height;
+            mipmap: true;
+            cache: false;
+
+            MouseArea {
+                enabled: titleBarSecurityImage.visible;
+                anchors.fill: parent;
+                onClicked: {
+                    lightboxPopup.titleText = "Your Security Pic";
+                    lightboxPopup.bodyImageSource = titleBarSecurityImage.source;
+                    lightboxPopup.bodyText = lightboxPopup.securityPicBodyText;
+                    lightboxPopup.button1text = "CLOSE";
+                    lightboxPopup.button1method = "root.visible = false;"
+                    lightboxPopup.visible = true;
+                }
+            }
+        }
+    }
+    //
+    // TITLE BAR END
+    //
+
+    WalletSetup {
+        id: walletSetup;
+        visible: root.activeView === "walletSetup";
+        z: 997;
+        anchors.fill: parent;
+
+        Connections {
+            onSendSignalToWallet: {
+                if (msg.method === 'walletSetup_finished') {
+                    if (msg.referrer === '') {
+                        root.activeView = "initialize";
+                        commerce.getWalletStatus();
+                    } else if (msg.referrer === 'purchases') {
+                        sendToScript({method: 'goToPurchases'});
+                    } else {
+                        sendToScript({method: 'goToMarketplaceItemPage', itemId: msg.referrer});
+                    }
+                } else if (msg.method === 'walletSetup_raiseKeyboard') {
+                    root.keyboardRaised = true;
+                    root.isPassword = msg.isPasswordField;
+                } else if (msg.method === 'walletSetup_lowerKeyboard') {
+                    root.keyboardRaised = false;
+                    root.isPassword = msg.isPasswordField;
+                } else {
+                    sendToScript(msg);
+                }
+            }
+        }
+    }
+    PassphraseChange {
+        id: passphraseChange;
+        visible: root.activeView === "passphraseChange";
+        z: 997;
+        anchors.top: titleBarContainer.bottom;
+        anchors.left: parent.left;
+        anchors.right: parent.right;
+        anchors.bottom: parent.bottom;
+
+        Connections {
+            onSendSignalToWallet: {
+                if (msg.method === 'walletSetup_raiseKeyboard') {
+                    root.keyboardRaised = true;
+                    root.isPassword = msg.isPasswordField;
+                } else if (msg.method === 'walletSetup_lowerKeyboard') {
+                    root.keyboardRaised = false;
+                } else if (msg.method === 'walletSecurity_changePassphraseCancelled') {
+                    root.activeView = "security";
+                } else if (msg.method === 'walletSecurity_changePassphraseSuccess') {
+                    root.activeView = "security";
+                } else {
+                    sendToScript(msg);
+                }
+            }
+        }
+    }
+    SecurityImageChange {
+        id: securityImageChange;
+        visible: root.activeView === "securityImageChange";
+        z: 997;
+        anchors.top: titleBarContainer.bottom;
+        anchors.left: parent.left;
+        anchors.right: parent.right;
+        anchors.bottom: parent.bottom;
+
+        Connections {
+            onSendSignalToWallet: {
+                if (msg.method === 'walletSecurity_changeSecurityImageCancelled') {
+                    root.activeView = "security";
+                } else if (msg.method === 'walletSecurity_changeSecurityImageSuccess') {
+                    root.activeView = "security";
+                } else {
+                    sendToScript(msg);
+                }
+            }
+        }
+    }
+
+    //
+    // TAB CONTENTS START
+    //
+
+    Rectangle {
+        id: initialize;
+        visible: root.activeView === "initialize";
+        anchors.top: titleBarContainer.bottom;
+        anchors.bottom: parent.top;
+        anchors.left: parent.left;
+        anchors.right: parent.right;
+        color: hifi.colors.baseGray;
+
+        Component.onCompleted: {
+            commerce.getWalletStatus();
+        }
+    }
+
+    NeedsLogIn {
+        id: needsLogIn;
+        visible: root.activeView === "needsLogIn";
+        anchors.top: parent.top;
+        anchors.bottom: parent.bottom;
+        anchors.left: parent.left;
+        anchors.right: parent.right;
+
+        Connections {
+            onSendSignalToWallet: {
+                sendToScript(msg);
+            }
+        }
+    }
+    Connections {
+        target: GlobalServices
+        onMyUsernameChanged: {
+            commerce.getLoginStatus();
+        }
+    }
+
+    PassphraseModal {
+        id: passphraseModal;
+        visible: root.activeView === "passphraseModal";
+        anchors.fill: parent;
+        titleBarText: "Wallet";
+        titleBarIcon: hifi.glyphs.wallet;
+
+        Connections {
+            onSendSignalToParent: {
+                if (msg.method === "authSuccess") {
+                    commerce.getWalletStatus();
+                } else {
+                    sendToScript(msg);
+                }
+            }
+        }
+    }
+
+    WalletHome {
+        id: walletHome;
+        visible: root.activeView === "walletHome";
+        anchors.top: titleBarContainer.bottom;
+        anchors.bottom: tabButtonsContainer.top;
+        anchors.left: parent.left;
+        anchors.right: parent.right;
+
+        Connections {
+            onSendSignalToWallet: {
+                sendToScript(msg);
+            }
+        }
+    }
+
+    SendMoney {
+        id: sendMoney;
+        visible: root.activeView === "sendMoney";
+        anchors.top: titleBarContainer.bottom;
+        anchors.bottom: tabButtonsContainer.top;
+        anchors.left: parent.left;
+        anchors.right: parent.right;
+    }
+
+    Security {
+        id: security;
+        visible: root.activeView === "security";
+        anchors.top: titleBarContainer.bottom;
+        anchors.bottom: tabButtonsContainer.top;
+        anchors.left: parent.left;
+        anchors.right: parent.right;
+
+        Connections {
+            onSendSignalToWallet: {
+                if (msg.method === 'walletSecurity_changePassphrase') {
+                    root.activeView = "passphraseChange";
+                    passphraseChange.clearPassphraseFields();
+                    passphraseChange.resetSubmitButton();
+                } else if (msg.method === 'walletSecurity_changeSecurityImage') {
+                    root.activeView = "securityImageChange";
+                }
+            }
+        }
+    }
+
+    Help {
+        id: help;
+        visible: root.activeView === "help";
+        anchors.top: titleBarContainer.bottom;
+        anchors.bottom: tabButtonsContainer.top;
+        anchors.left: parent.left;
+        anchors.right: parent.right;
+
+        Connections {
+            onSendSignalToWallet: {
+                if (msg.method === 'walletReset' || msg.method === 'passphraseReset') {
+                    sendToScript(msg);
+                }
+            }
+        }
+    }
+
+
+    //
+    // TAB CONTENTS END
+    //
+
+    //
+    // TAB BUTTONS START
+    //
+    Item {
+        id: tabButtonsContainer;
+        visible: !needsLogIn.visible && root.activeView !== "passphraseChange" && root.activeView !== "securityImageChange";
+        property int numTabs: 5;
+        // Size
+        width: root.width;
+        height: 90;
+        // Anchors
+        anchors.left: parent.left;
+        anchors.bottom: parent.bottom;
+
+        // Separator
+        HifiControlsUit.Separator {
+            anchors.left: parent.left;
+            anchors.right: parent.right;
+            anchors.top: parent.top;
+        }
+
+        // "WALLET HOME" tab button
+        Rectangle {
+            id: walletHomeButtonContainer;
+            visible: !walletSetup.visible;
+            color: root.activeView === "walletHome" ? hifi.colors.blueAccent : hifi.colors.black;
+            anchors.top: parent.top;
+            anchors.left: parent.left;
+            anchors.bottom: parent.bottom;
+            width: parent.width / tabButtonsContainer.numTabs;
+        
+            HiFiGlyphs {
+                id: homeTabIcon;
+                text: hifi.glyphs.home2;
+                // Size
+                size: 50;
+                // Anchors
+                anchors.horizontalCenter: parent.horizontalCenter;
+                anchors.top: parent.top;
+                anchors.topMargin: -2;
+                // Style
+                color: root.activeView === "walletHome" || walletHomeTabMouseArea.containsMouse ? hifi.colors.white : hifi.colors.blueHighlight;
+            }
+
+            RalewaySemiBold {
+                text: "WALLET HOME";
+                // Text size
+                size: 16;
+                // Anchors
+                anchors.bottom: parent.bottom;
+                height: parent.height/2;
+                anchors.left: parent.left;
+                anchors.leftMargin: 4;
+                anchors.right: parent.right;
+                anchors.rightMargin: 4;
+                // Style
+                color: root.activeView === "walletHome" || walletHomeTabMouseArea.containsMouse ? hifi.colors.white : hifi.colors.blueHighlight;
+                wrapMode: Text.WordWrap;
+                // Alignment
+                horizontalAlignment: Text.AlignHCenter;
+                verticalAlignment: Text.AlignTop;
+            }
+            MouseArea {
+                id: walletHomeTabMouseArea;
+                anchors.fill: parent;
+                hoverEnabled: enabled;
+                onClicked: {
+                    root.activeView = "walletHome";
+                    tabButtonsContainer.resetTabButtonColors();
+                }
+                onEntered: parent.color = hifi.colors.blueHighlight;
+                onExited: parent.color = root.activeView === "walletHome" ? hifi.colors.blueAccent : hifi.colors.black;
+            }
+        }
+
+        // "EXCHANGE MONEY" tab button
+        Rectangle {
+            id: exchangeMoneyButtonContainer;
+            visible: !walletSetup.visible;
+            color: hifi.colors.black;
+            anchors.top: parent.top;
+            anchors.left: walletHomeButtonContainer.right;
+            anchors.bottom: parent.bottom;
+            width: parent.width / tabButtonsContainer.numTabs;
+        
+            HiFiGlyphs {
+                id: exchangeMoneyTabIcon;
+                text: hifi.glyphs.leftRightArrows;
+                // Size
+                size: 50;
+                // Anchors
+                anchors.horizontalCenter: parent.horizontalCenter;
+                anchors.top: parent.top;
+                anchors.topMargin: -2;
+                // Style
+                color: hifi.colors.lightGray50;
+            }
+
+            RalewaySemiBold {
+                text: "EXCHANGE MONEY";
+                // Text size
+                size: 16;
+                // Anchors
+                anchors.bottom: parent.bottom;
+                height: parent.height/2;
+                anchors.left: parent.left;
+                anchors.leftMargin: 4;
+                anchors.right: parent.right;
+                anchors.rightMargin: 4;
+                // Style
+                color: hifi.colors.lightGray50;
+                wrapMode: Text.WordWrap;
+                // Alignment
+                horizontalAlignment: Text.AlignHCenter;
+                verticalAlignment: Text.AlignTop;
+            }
+        }
+
+
+        // "SEND MONEY" tab button
+        Rectangle {
+            id: sendMoneyButtonContainer;
+            visible: !walletSetup.visible;
+            color: hifi.colors.black;
+            anchors.top: parent.top;
+            anchors.left: exchangeMoneyButtonContainer.right;
+            anchors.bottom: parent.bottom;
+            width: parent.width / tabButtonsContainer.numTabs;
+        
+            HiFiGlyphs {
+                id: sendMoneyTabIcon;
+                text: hifi.glyphs.paperPlane;
+                // Size
+                size: 46;
+                // Anchors
+                anchors.horizontalCenter: parent.horizontalCenter;
+                anchors.top: parent.top;
+                anchors.topMargin: -2;
+                // Style
+                color: hifi.colors.lightGray50;
+            }
+
+            RalewaySemiBold {
+                text: "SEND MONEY";
+                // Text size
+                size: 16;
+                // Anchors
+                anchors.bottom: parent.bottom;
+                height: parent.height/2;
+                anchors.left: parent.left;
+                anchors.leftMargin: 4;
+                anchors.right: parent.right;
+                anchors.rightMargin: 4;
+                // Style
+                color: hifi.colors.lightGray50;
+                wrapMode: Text.WordWrap;
+                // Alignment
+                horizontalAlignment: Text.AlignHCenter;
+                verticalAlignment: Text.AlignTop;
+            }
+        }
+
+        // "SECURITY" tab button
+        Rectangle {
+            id: securityButtonContainer;
+            visible: !walletSetup.visible;
+            color: root.activeView === "security" ? hifi.colors.blueAccent : hifi.colors.black;
+            anchors.top: parent.top;
+            anchors.left: sendMoneyButtonContainer.right;
+            anchors.bottom: parent.bottom;
+            width: parent.width / tabButtonsContainer.numTabs;
+        
+            HiFiGlyphs {
+                id: securityTabIcon;
+                text: hifi.glyphs.lock;
+                // Size
+                size: 38;
+                // Anchors
+                anchors.horizontalCenter: parent.horizontalCenter;
+                anchors.top: parent.top;
+                anchors.topMargin: 2;
+                // Style
+                color: root.activeView === "security" || securityTabMouseArea.containsMouse ? hifi.colors.white : hifi.colors.blueHighlight;
+            }
+
+            RalewaySemiBold {
+                text: "SECURITY";
+                // Text size
+                size: 16;
+                // Anchors
+                anchors.bottom: parent.bottom;
+                height: parent.height/2;
+                anchors.left: parent.left;
+                anchors.leftMargin: 4;
+                anchors.right: parent.right;
+                anchors.rightMargin: 4;
+                // Style
+                color: root.activeView === "security" || securityTabMouseArea.containsMouse ? hifi.colors.white : hifi.colors.blueHighlight;
+                wrapMode: Text.WordWrap;
+                // Alignment
+                horizontalAlignment: Text.AlignHCenter;
+                verticalAlignment: Text.AlignTop;
+            }
+            MouseArea {
+                id: securityTabMouseArea;
+                anchors.fill: parent;
+                hoverEnabled: enabled;
+                onClicked: {
+                    root.activeView = "security";
+                    tabButtonsContainer.resetTabButtonColors();
+                }
+                onEntered: parent.color = hifi.colors.blueHighlight;
+                onExited: parent.color = root.activeView === "security" ? hifi.colors.blueAccent : hifi.colors.black;
+            }
+        }
+        
+        // "HELP" tab button
+        Rectangle {
+            id: helpButtonContainer;
+            visible: !walletSetup.visible;
+            color: root.activeView === "help" ? hifi.colors.blueAccent : hifi.colors.black;
+            anchors.top: parent.top;
+            anchors.left: securityButtonContainer.right;
+            anchors.bottom: parent.bottom;
+            width: parent.width / tabButtonsContainer.numTabs;
+        
+            HiFiGlyphs {
+                id: helpTabIcon;
+                text: hifi.glyphs.question;
+                // Size
+                size: 55;
+                // Anchors
+                anchors.horizontalCenter: parent.horizontalCenter;
+                anchors.top: parent.top;
+                anchors.topMargin: -6;
+                // Style
+                color: root.activeView === "help" || helpTabMouseArea.containsMouse ? hifi.colors.white : hifi.colors.blueHighlight;
+            }
+
+            RalewaySemiBold {
+                text: "HELP";
+                // Text size
+                size: 16;
+                // Anchors
+                anchors.bottom: parent.bottom;
+                height: parent.height/2;
+                anchors.left: parent.left;
+                anchors.leftMargin: 4;
+                anchors.right: parent.right;
+                anchors.rightMargin: 4;
+                // Style
+                color: root.activeView === "help" || helpTabMouseArea.containsMouse ? hifi.colors.white : hifi.colors.blueHighlight;
+                wrapMode: Text.WordWrap;
+                // Alignment
+                horizontalAlignment: Text.AlignHCenter;
+                verticalAlignment: Text.AlignTop;
+            }
+            MouseArea {
+                id: helpTabMouseArea;
+                anchors.fill: parent;
+                hoverEnabled: enabled;
+                onClicked: {
+                    root.activeView = "help";
+                    tabButtonsContainer.resetTabButtonColors();
+                }
+                onEntered: parent.color = hifi.colors.blueHighlight;
+                onExited: parent.color = root.activeView === "help" ? hifi.colors.blueAccent : hifi.colors.black;
+            }
+        }
+
+
+        function resetTabButtonColors() {
+            walletHomeButtonContainer.color = hifi.colors.black;
+            sendMoneyButtonContainer.color = hifi.colors.black;
+            securityButtonContainer.color = hifi.colors.black;
+            helpButtonContainer.color = hifi.colors.black;
+            if (root.activeView === "walletHome") {
+                walletHomeButtonContainer.color = hifi.colors.blueAccent;
+            } else if (root.activeView === "sendMoney") {
+                sendMoneyButtonContainer.color = hifi.colors.blueAccent;
+            } else if (root.activeView === "security") {
+                securityButtonContainer.color = hifi.colors.blueAccent;
+            } else if (root.activeView === "help") {
+                helpButtonContainer.color = hifi.colors.blueAccent;
+            }
+        }
+    }
+    //
+    // TAB BUTTONS END
+    //
+
+    Item {
+        id: keyboardContainer;
+        z: 998;
+        visible: keyboard.raised;
+        property bool punctuationMode: false;
+        anchors {
+            bottom: parent.bottom;
+            left: parent.left;
+            right: parent.right;
+        }
+
+        Image {
+            id: lowerKeyboardButton;
+            z: 999;
+            source: "images/lowerKeyboard.png";
+            anchors.right: keyboard.right;
+            anchors.top: keyboard.showMirrorText ? keyboard.top : undefined;
+            anchors.bottom: keyboard.showMirrorText ? undefined : keyboard.bottom;
+            height: 50;
+            width: 60;
+
+            MouseArea {
+                anchors.fill: parent;
+
+                onClicked: {
+                    root.keyboardRaised = false;
+                }
+            }
+        }
+
+        HifiControlsUit.Keyboard {
+            id: keyboard;
+            raised: HMD.mounted && root.keyboardRaised;
+            numeric: parent.punctuationMode;
+            password: root.isPassword;
+            anchors {
+                bottom: parent.bottom;
+                left: parent.left;
+                right: parent.right;
+            }
+        }
+    }
+
+    //
+    // FUNCTION DEFINITIONS START
+    //
+    //
+    // Function Name: fromScript()
+    //
+    // Relevant Variables:
+    // None
+    //
+    // Arguments:
+    // message: The message sent from the JavaScript.
+    //     Messages are in format "{method, params}", like json-rpc.
+    //
+    // Description:
+    // Called when a message is received from a script.
+    //
+    function fromScript(message) {
+        switch (message.method) {
+            case 'updateWalletReferrer':
+                walletSetup.referrer = message.referrer;
+            break;
+            default:
+                console.log('Unrecognized message from wallet.js:', JSON.stringify(message));
+        }
+    }
+    signal sendToScript(var message);
+
+    //
+    // FUNCTION DEFINITIONS END
+    //
+}
diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml b/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml
new file mode 100644
index 0000000000..fd7ce0fdfd
--- /dev/null
+++ b/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml
@@ -0,0 +1,402 @@
+//
+//  WalletHome.qml
+//  qml/hifi/commerce/wallet
+//
+//  WalletHome
+//
+//  Created by Zach Fox on 2017-08-18
+//  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
+//
+
+import Hifi 1.0 as Hifi
+import QtQuick 2.5
+import QtGraphicalEffects 1.0
+import QtQuick.Controls 2.2
+import "../../../styles-uit"
+import "../../../controls-uit" as HifiControlsUit
+import "../../../controls" as HifiControls
+
+// references XXX from root context
+
+Item {
+    HifiConstants { id: hifi; }
+
+    id: root;
+    property bool historyReceived: false;
+    property int pendingCount: 0;
+
+    Hifi.QmlCommerce {
+        id: commerce;
+
+        onBalanceResult : {
+            balanceText.text = result.data.balance;
+        }
+
+        onHistoryResult : {
+            historyReceived = true;
+            if (result.status === 'success') {
+                transactionHistoryModel.clear();
+                transactionHistoryModel.append(result.data.history);
+
+                calculatePendingAndInvalidated();
+            }
+            refreshTimer.start();
+        }
+    }
+
+    Connections {
+        target: GlobalServices
+        onMyUsernameChanged: {
+            usernameText.text = Account.username;
+        }
+    }
+
+    // Username Text
+    RalewayRegular {
+        id: usernameText;
+        text: Account.username;
+        // Text size
+        size: 24;
+        // Style
+        color: hifi.colors.white;
+        elide: Text.ElideRight;
+        // Anchors
+        anchors.top: parent.top;
+        anchors.left: parent.left;
+        anchors.leftMargin: 20;
+        width: parent.width/2;
+        height: 80;
+    }
+
+    // HFC Balance Container
+    Item {
+        id: hfcBalanceContainer;
+        // Anchors
+        anchors.top: parent.top;
+        anchors.right: parent.right;
+        anchors.leftMargin: 20;
+        width: parent.width/2;
+        height: 80;
+        
+        // "HFC" balance label
+        HiFiGlyphs {
+            id: balanceLabel;
+            text: hifi.glyphs.hfc;
+            // Size
+            size: 40;
+            // Anchors
+            anchors.left: parent.left;
+            anchors.top: parent.top;
+            anchors.bottom: parent.bottom;
+            // Style
+            color: hifi.colors.white;
+        }
+
+        // Balance Text
+        FiraSansRegular {
+            id: balanceText;
+            text: "--";
+            // Text size
+            size: 28;
+            // Anchors
+            anchors.top: balanceLabel.top;
+            anchors.bottom: balanceLabel.bottom;
+            anchors.left: balanceLabel.right;
+            anchors.leftMargin: 10;
+            anchors.right: parent.right;
+            anchors.rightMargin: 4;
+            // Style
+            color: hifi.colors.white;
+            // Alignment
+            verticalAlignment: Text.AlignVCenter;
+
+            onVisibleChanged: {
+                if (visible) {
+                    historyReceived = false;
+                    commerce.balance();
+                    commerce.history();
+                } else {
+                    refreshTimer.stop();
+                }
+            }
+        }
+
+        // "balance" text below field
+        RalewayRegular {
+            text: "BALANCE (HFC)";
+            // Text size
+            size: 14;
+            // Anchors
+            anchors.top: balanceLabel.top;
+            anchors.topMargin: balanceText.paintedHeight + 20;
+            anchors.bottom: balanceLabel.bottom;
+            anchors.left: balanceText.left;
+            anchors.right: balanceText.right;
+            height: paintedHeight;
+            // Style
+            color: hifi.colors.white;
+        }
+    }
+
+    Timer {
+        id: refreshTimer;
+        interval: 4000; // Remove this after demo?
+        onTriggered: {
+            console.log("Refreshing Wallet Home...");
+            historyReceived = false;
+            commerce.balance();
+            commerce.history();
+        }
+    }
+
+    // Recent Activity
+    Rectangle {
+        id: recentActivityContainer;
+        anchors.left: parent.left;
+        anchors.right: parent.right;
+        anchors.bottom: parent.bottom;
+        height: 440;
+        
+    
+        LinearGradient {
+            anchors.fill: parent;
+            start: Qt.point(0, 0);
+            end: Qt.point(0, height);
+            gradient: Gradient {
+                GradientStop { position: 0.0; color: hifi.colors.white }
+                GradientStop { position: 1.0; color: hifi.colors.faintGray }
+            }
+        }
+
+        RalewaySemiBold {
+            id: recentActivityText;
+            text: "Recent Activity";
+            // Anchors
+            anchors.top: parent.top;
+            anchors.topMargin: 26;
+            anchors.left: parent.left;
+            anchors.leftMargin: 20;
+            anchors.right: parent.right;
+            anchors.rightMargin: 30;
+            height: 30;
+            // Text size
+            size: 22;
+            // Style
+            color: hifi.colors.baseGrayHighlight;
+        }
+        ListModel {
+            id: transactionHistoryModel;
+        }
+        Item {
+            anchors.top: recentActivityText.bottom;
+            anchors.topMargin: 26;
+            anchors.bottom: parent.bottom;
+            anchors.left: parent.left;
+            anchors.right: parent.right;
+
+            Item {
+                visible: transactionHistoryModel.count === 0 && root.historyReceived;
+                anchors.centerIn: parent;
+                width: parent.width - 12;
+                height: parent.height;
+
+                HifiControlsUit.Separator {
+                colorScheme: 1;
+                    anchors.left: parent.left;
+                    anchors.right: parent.right;
+                    anchors.top: parent.top;
+                }
+
+                RalewayRegular {
+                    id: noActivityText;
+                text: "<b>The Wallet app is in closed Beta.</b><br><br>To request entry and <b>receive free HFC</b>, please contact " +
+                "<b>info@highfidelity.com</b> with your High Fidelity account username and the email address registered to that account.";
+                // Text size
+                size: 24;
+                // Style
+                color: hifi.colors.blueAccent;
+                anchors.left: parent.left;
+                anchors.leftMargin: 12;
+                anchors.right: parent.right;
+                anchors.rightMargin: 12;
+                anchors.verticalCenter: parent.verticalCenter;
+                height: paintedHeight;
+                wrapMode: Text.WordWrap;
+                horizontalAlignment: Text.AlignHCenter;
+                }
+            }
+            
+            ListView {
+                id: transactionHistory;
+                ScrollBar.vertical: ScrollBar {
+                policy: transactionHistory.contentHeight > parent.parent.height ? ScrollBar.AlwaysOn : ScrollBar.AsNeeded;
+                parent: transactionHistory.parent;
+                anchors.top: transactionHistory.top;
+                anchors.left: transactionHistory.right;
+                anchors.leftMargin: 4;
+                anchors.bottom: transactionHistory.bottom;
+                width: 20;
+                }
+                anchors.centerIn: parent;
+                width: parent.width - 12;
+                height: parent.height;
+                visible: transactionHistoryModel.count !== 0;
+                clip: true;
+                model: transactionHistoryModel;
+                delegate: Item {
+                    width: parent.width;
+                    height: (model.transaction_type === "pendingCount" && root.pendingCount !== 0) ? 40 : ((model.status === "confirmed" || model.status === "invalidated") ? transactionText.height + 30 : 0);
+
+                    Item {
+                        visible: model.transaction_type === "pendingCount" && root.pendingCount !== 0;
+                        anchors.top: parent.top;
+                        anchors.left: parent.left;
+                        width: parent.width;
+                        height: visible ? parent.height : 0;
+
+                        AnonymousProRegular {
+                            id: pendingCountText;
+                            anchors.fill: parent;
+                            text: root.pendingCount + ' Transaction' + (root.pendingCount > 1 ? 's' : '') + ' Pending';
+                            size: 18;
+                            color: hifi.colors.blueAccent;
+                            verticalAlignment: Text.AlignVCenter;
+                            horizontalAlignment: Text.AlignHCenter;
+                        }
+                    }
+
+                    Item {
+                        visible: model.transaction_type !== "pendingCount" && (model.status === "confirmed" || model.status === "invalidated");
+                        anchors.top: parent.top;
+                        anchors.left: parent.left;
+                        width: parent.width;
+                        height: visible ? parent.height : 0;
+
+                        AnonymousProRegular {
+                            id: dateText;
+                            text: model.created_at ? getFormattedDate(model.created_at * 1000) : "";
+                            // Style
+                            size: 18;
+                            anchors.left: parent.left;
+                            anchors.top: parent.top;
+                            anchors.topMargin: 15;
+                            width: 118;
+                            height: paintedHeight;
+                            color: hifi.colors.blueAccent;
+                            wrapMode: Text.WordWrap;
+                            // Alignment
+                            horizontalAlignment: Text.AlignRight;
+                        }
+
+                        AnonymousProRegular {
+                            id: transactionText;
+                            text: model.text ? (model.status === "invalidated" ? ("INVALIDATED: " + model.text) : model.text) : "";
+                            size: 18;
+                            anchors.top: parent.top;
+                            anchors.topMargin: 15;
+                            anchors.left: dateText.right;
+                            anchors.leftMargin: 20;
+                            anchors.right: parent.right;
+                            height: paintedHeight;
+                            color: model.status === "invalidated" ? hifi.colors.redAccent : hifi.colors.baseGrayHighlight;
+                            wrapMode: Text.WordWrap;
+                            font.strikeout: model.status === "invalidated";
+
+                            onLinkActivated: {
+                                sendSignalToWallet({method: 'transactionHistory_linkClicked', marketplaceLink: link});
+                            }
+                        }
+
+                        HifiControlsUit.Separator {
+                        colorScheme: 1;
+                            anchors.left: parent.left;
+                            anchors.right: parent.right;
+                            anchors.bottom: parent.bottom;
+                        }
+                    }
+                }
+                onAtYEndChanged: {
+                    if (transactionHistory.atYEnd) {
+                        console.log("User scrolled to the bottom of 'Recent Activity'.");
+                        // Grab next page of results and append to model
+                    }
+                }
+            }
+        }
+    }
+
+    //
+    // FUNCTION DEFINITIONS START
+    //
+
+    function getFormattedDate(timestamp) {
+        function addLeadingZero(n) {
+            return n < 10 ? '0' + n : '' + n;
+        }
+
+        var a = new Date(timestamp);
+        var year = a.getFullYear();
+        var month = addLeadingZero(a.getMonth());
+        var day = addLeadingZero(a.getDate());
+        var hour = a.getHours();
+        var drawnHour = hour;
+        if (hour === 0) {
+            drawnHour = 12;
+        } else if (hour > 12) {
+            drawnHour -= 12;
+        }
+        drawnHour = addLeadingZero(drawnHour);
+        
+        var amOrPm = "AM";
+        if (hour >= 12) {
+            amOrPm = "PM";
+        }
+
+        var min = addLeadingZero(a.getMinutes());
+        var sec = addLeadingZero(a.getSeconds());
+        return year + '-' + month + '-' + day + '<br>' + drawnHour + ':' + min + amOrPm;
+    }
+
+    
+    function calculatePendingAndInvalidated(startingPendingCount) {
+        var pendingCount = startingPendingCount ? startingPendingCount : 0;
+        for (var i = 0; i < transactionHistoryModel.count; i++) {
+            if (transactionHistoryModel.get(i).status === "pending") {
+                pendingCount++;
+            }
+        }
+
+        root.pendingCount = pendingCount;
+        if (pendingCount > 0) {
+            transactionHistoryModel.insert(0, {"transaction_type": "pendingCount"});
+        }
+    }
+
+    //
+    // Function Name: fromScript()
+    //
+    // Relevant Variables:
+    // None
+    //
+    // Arguments:
+    // message: The message sent from the JavaScript.
+    //     Messages are in format "{method, params}", like json-rpc.
+    //
+    // Description:
+    // Called when a message is received from a script.
+    //
+    function fromScript(message) {
+        switch (message.method) {
+            default:
+                console.log('Unrecognized message from wallet.js:', JSON.stringify(message));
+        }
+    }
+    signal sendSignalToWallet(var msg);
+
+    //
+    // FUNCTION DEFINITIONS END
+    //
+}
diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml b/interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml
new file mode 100644
index 0000000000..1a62fe6f0d
--- /dev/null
+++ b/interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml
@@ -0,0 +1,751 @@
+//
+//  modalContainer.qml
+//  qml/hifi/commerce/wallet
+//
+//  modalContainer
+//
+//  Created by Zach Fox on 2017-08-17
+//  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
+//
+
+import Hifi 1.0 as Hifi
+import QtQuick 2.5
+import QtGraphicalEffects 1.0
+import QtQuick.Controls 1.4
+import "../../../styles-uit"
+import "../../../controls-uit" as HifiControlsUit
+import "../../../controls" as HifiControls
+import "../common" as HifiCommerceCommon
+
+// references XXX from root context
+
+Item {
+    HifiConstants { id: hifi; }
+
+    id: root;
+    property string activeView: "step_1";
+    property string lastPage;
+    property bool hasShownSecurityImageTip: false;
+    property string referrer;
+    property string keyFilePath;
+
+    Image {
+        anchors.fill: parent;
+        source: "images/wallet-bg.jpg";
+    }
+
+    Hifi.QmlCommerce {
+        id: commerce;
+
+        onSecurityImageResult: {
+            if (!exists && root.lastPage === "step_2") {
+                // ERROR! Invalid security image.
+                root.activeView = "step_2";
+            } else if (exists) {
+                titleBarSecurityImage.source = "";
+                titleBarSecurityImage.source = "image://security/securityImage";
+            }
+        }
+
+        onWalletAuthenticatedStatusResult: {
+            if (isAuthenticated) {
+                root.activeView = "step_4";
+            }
+        }
+
+        onKeyFilePathIfExistsResult: {
+            root.keyFilePath = path;
+        }
+    }
+
+    HifiCommerceCommon.CommerceLightbox {
+        id: lightboxPopup;
+        visible: false;
+        anchors.fill: parent;
+    }
+
+    //
+    // TITLE BAR START
+    //
+    Item {
+        id: titleBarContainer;
+        // Size
+        height: 50;
+        // Anchors
+        anchors.left: parent.left;
+        anchors.top: parent.top;
+        anchors.right: parent.right;
+
+        // Wallet icon
+        HiFiGlyphs {
+            id: walletIcon;
+            text: hifi.glyphs.wallet;
+            // Size
+            size: parent.height * 0.8;
+            // Anchors
+            anchors.left: parent.left;
+            anchors.leftMargin: 8;
+            anchors.verticalCenter: parent.verticalCenter;
+            // Style
+            color: hifi.colors.blueHighlight;
+        }
+
+        // Title Bar text
+        RalewayRegular {
+            id: titleBarText;
+            text: "Wallet Setup" + (securityImageTip.visible ? "" : " - Step " + root.activeView.split("_")[1] + " of 4");
+            // Text size
+            size: hifi.fontSizes.overlayTitle;
+            // Anchors
+            anchors.top: parent.top;
+            anchors.left: walletIcon.right;
+            anchors.leftMargin: 8;
+            anchors.bottom: parent.bottom;
+            width: paintedWidth;
+            // Style
+            color: hifi.colors.white;
+            // Alignment
+            horizontalAlignment: Text.AlignHLeft;
+            verticalAlignment: Text.AlignVCenter;
+        }
+
+        Image {
+            id: titleBarSecurityImage;
+            source: "";
+            visible: !securityImageTip.visible && titleBarSecurityImage.source !== "" && root.activeView !== "step_1" && root.activeView !== "step_2";
+            anchors.right: parent.right;
+            anchors.rightMargin: 6;
+            anchors.top: parent.top;
+            anchors.topMargin: 6;
+            anchors.bottom: parent.bottom;
+            anchors.bottomMargin: 6;
+            width: height;
+            mipmap: true;
+            cache: false;
+
+            MouseArea {
+                enabled: titleBarSecurityImage.visible;
+                anchors.fill: parent;
+                onClicked: {
+                    lightboxPopup.titleText = "Your Security Pic";
+                    lightboxPopup.bodyImageSource = titleBarSecurityImage.source;
+                    lightboxPopup.bodyText = lightboxPopup.securityPicBodyText;
+                    lightboxPopup.button1text = "CLOSE";
+                    lightboxPopup.button1method = "root.visible = false;"
+                    lightboxPopup.visible = true;
+                }
+            }
+        }
+    }
+    //
+    // TITLE BAR END
+    //
+    
+    //
+    // FIRST PAGE START
+    //
+    Item {
+        id: firstPageContainer;
+        visible: root.activeView === "step_1";
+        // Anchors
+        anchors.top: titleBarContainer.bottom;
+        anchors.bottom: parent.bottom;
+        anchors.left: parent.left;
+        anchors.right: parent.right;
+
+        HiFiGlyphs {
+            id: bigWalletIcon;
+            text: hifi.glyphs.wallet;
+            // Size
+            size: 180;
+            // Anchors
+            anchors.top: parent.top;
+            anchors.topMargin: 40;
+            anchors.horizontalCenter: parent.horizontalCenter;
+            // Style
+            color: hifi.colors.white;
+        }
+
+        RalewayRegular {
+            id: firstPage_text01;
+            text: "Let's set up your wallet!";
+            // Text size
+            size: 26;
+            // Anchors
+            anchors.top: bigWalletIcon.bottom;
+            anchors.left: parent.left;
+            anchors.leftMargin: 16;
+            anchors.right: parent.right;
+            anchors.rightMargin: 16;
+            height: paintedHeight;
+            width: paintedWidth;
+            // Style
+            color: hifi.colors.white;
+            wrapMode: Text.WordWrap;
+            // Alignment
+            horizontalAlignment: Text.AlignHCenter;
+            verticalAlignment: Text.AlignVCenter;
+        }
+
+        RalewayRegular {
+            id: firstPage_text02;
+            text: "Set up your wallet to claim your <b>free High Fidelity Coin (HFC)</b> and get items from the Marketplace.<br><br>" +
+            "<b>No credit card is required.</b>";
+            // Text size
+            size: 18;
+            // Anchors
+            anchors.top: firstPage_text01.bottom;
+            anchors.topMargin: 40;
+            anchors.left: parent.left;
+            anchors.leftMargin: 65;
+            anchors.right: parent.right;
+            anchors.rightMargin: 65;
+            height: paintedHeight;
+            width: paintedWidth;
+            // Style
+            color: hifi.colors.white;
+            wrapMode: Text.WordWrap;
+            // Alignment
+            horizontalAlignment: Text.AlignHCenter;
+            verticalAlignment: Text.AlignVCenter;
+        }
+
+        // "Set Up" button
+        HifiControlsUit.Button {
+            id: firstPage_setUpButton;
+            color: hifi.buttons.blue;
+            colorScheme: hifi.colorSchemes.dark;
+            anchors.top: firstPage_text02.bottom;
+            anchors.topMargin: 40;
+            anchors.horizontalCenter: parent.horizontalCenter;
+            width: parent.width/2;
+            height: 50;
+            text: "Set Up Wallet";
+            onClicked: {
+                root.activeView = "step_2";
+            }
+        }
+
+        // "Cancel" button
+        HifiControlsUit.Button {
+            color: hifi.buttons.none;
+            colorScheme: hifi.colorSchemes.dark;
+            anchors.top: firstPage_setUpButton.bottom;
+            anchors.topMargin: 20;
+            anchors.horizontalCenter: parent.horizontalCenter;
+            width: parent.width/2;
+            height: 50;
+            text: "Cancel";
+            onClicked: {
+                sendSignalToWallet({method: 'walletSetup_cancelClicked'});
+            }
+        }   
+    }
+    //
+    // FIRST PAGE END
+    //
+
+    //
+    // SECURITY IMAGE SELECTION START
+    //
+    Item {
+        id: securityImageContainer;
+        visible: root.activeView === "step_2";
+        // Anchors
+        anchors.top: titleBarContainer.bottom;
+        anchors.topMargin: 30;
+        anchors.bottom: parent.bottom;
+        anchors.left: parent.left;
+        anchors.leftMargin: 16;
+        anchors.right: parent.right;
+        anchors.rightMargin: 16;
+
+        // Text below title bar
+        RalewayRegular {
+            id: securityImageTitleHelper;
+            text: "Choose a Security Pic:";
+            // Text size
+            size: 24;
+            // Anchors
+            anchors.top: parent.top;
+            anchors.left: parent.left;
+            height: 50;
+            width: paintedWidth;
+            // Style
+            color: hifi.colors.white;
+            // Alignment
+            horizontalAlignment: Text.AlignHLeft;
+            verticalAlignment: Text.AlignVCenter;
+        }
+
+        SecurityImageSelection {
+            id: securityImageSelection;
+            // Anchors
+            anchors.top: securityImageTitleHelper.bottom;
+            anchors.left: parent.left;
+            anchors.right: parent.right;
+            height: 300;
+
+            Connections {
+                onSendSignalToWallet: {
+                    sendSignalToWallet(msg);
+                }
+            }
+        }
+
+        // Text below security images
+        RalewayRegular {
+            text: "<b>Your security picture shows you that the service asking for your passphrase is authorized.</b> You can change your secure picture at any time.";
+            // Text size
+            size: 18;
+            // Anchors
+            anchors.top: securityImageSelection.bottom;
+            anchors.topMargin: 40;
+            anchors.left: parent.left;
+            anchors.right: parent.right;
+            height: paintedHeight;
+            // Style
+            color: hifi.colors.white;
+            wrapMode: Text.WordWrap;
+            // Alignment
+            horizontalAlignment: Text.AlignHLeft;
+            verticalAlignment: Text.AlignVCenter;
+        }
+
+        // Navigation Bar
+        Item {
+            // Size
+            width: parent.width;
+            height: 50;
+            // Anchors:
+            anchors.left: parent.left;
+            anchors.bottom: parent.bottom;
+            anchors.bottomMargin: 50;
+
+            // "Back" button
+            HifiControlsUit.Button {
+                color: hifi.buttons.noneBorderlessWhite;
+                colorScheme: hifi.colorSchemes.dark;
+                anchors.top: parent.top;
+                anchors.bottom: parent.bottom;
+                anchors.left: parent.left;
+                anchors.leftMargin: 20;
+                width: 200;
+                text: "Back"
+                onClicked: {
+                    root.activeView = "step_1";
+                }
+            }
+
+            // "Next" button
+            HifiControlsUit.Button {
+                enabled: securityImageSelection.currentIndex !== -1;
+                color: hifi.buttons.blue;
+                colorScheme: hifi.colorSchemes.dark;
+                anchors.top: parent.top;
+                anchors.bottom: parent.bottom;
+                anchors.right: parent.right;
+                anchors.rightMargin: 20;
+                width: 200;
+                text: "Next";
+                onClicked: {
+                    root.lastPage = "step_2";
+                    var securityImagePath = securityImageSelection.getImagePathFromImageID(securityImageSelection.getSelectedImageIndex())
+                    commerce.chooseSecurityImage(securityImagePath);
+                    root.activeView = "step_3";
+                    passphraseSelection.clearPassphraseFields();
+                }
+            }
+        }
+    }
+    //
+    // SECURITY IMAGE SELECTION END
+    //
+
+    //
+    // SECURE PASSPHRASE SELECTION START
+    //
+
+    Item {
+        id: securityImageTip;
+        visible: false;
+        z: 999;
+        anchors.fill: root;
+        
+        // This object is always used in a popup.
+        // This MouseArea is used to prevent a user from being
+        //     able to click on a button/mouseArea underneath the popup.
+        MouseArea {
+            anchors.fill: parent;
+            propagateComposedEvents: false;
+        }
+
+        Image {
+            source: "images/wallet-tip-bg.png";
+            anchors.fill: parent;
+        }
+
+        RalewayRegular {
+            id: tipText;
+            text: '<font size="5">Tip:</font><br><br>When you see your security picture like this, you know ' +
+            "the page asking for your passphrase is legitimate.";
+            // Text size
+            size: 18;
+            // Anchors
+            anchors.bottom: parent.bottom;
+            anchors.bottomMargin: 230;
+            anchors.left: parent.left;
+            anchors.leftMargin: 60;
+            height: paintedHeight;
+            width: 210;
+            // Style
+            color: hifi.colors.white;
+            wrapMode: Text.WordWrap;
+            // Alignment
+            horizontalAlignment: Text.AlignHCenter;
+        }
+
+        // "Got It" button
+        HifiControlsUit.Button {
+            id: tipGotItButton;
+            color: hifi.buttons.blue;
+            colorScheme: hifi.colorSchemes.dark;
+            anchors.top: tipText.bottom;
+            anchors.topMargin: 20;
+            anchors.horizontalCenter: tipText.horizontalCenter;
+            height: 50;
+            width: 150;
+            text: "Got It";
+            onClicked: {
+                root.hasShownSecurityImageTip = true;
+                securityImageTip.visible = false;
+                passphraseSelection.focusFirstTextField();
+            }
+        }
+    }
+    Item {
+        id: choosePassphraseContainer;
+        visible: root.activeView === "step_3";
+        // Anchors
+        anchors.top: titleBarContainer.bottom;
+        anchors.topMargin: 30;
+        anchors.bottom: parent.bottom;
+        anchors.left: parent.left;
+        anchors.right: parent.right;
+
+        onVisibleChanged: {
+            if (visible) {
+                commerce.getWalletAuthenticatedStatus();
+                if (!root.hasShownSecurityImageTip) {
+                    securityImageTip.visible = true;
+                }
+            }
+        }
+
+        // Text below title bar
+        RalewayRegular {
+            id: passphraseTitleHelper;
+            text: "Set Your Passphrase:";
+            // Text size
+            size: 24;
+            // Anchors
+            anchors.top: parent.top;
+            anchors.left: parent.left;
+            anchors.leftMargin: 16;
+            anchors.right: parent.right;
+            anchors.rightMargin: 16;
+            height: 50;
+            // Style
+            color: hifi.colors.white;
+            // Alignment
+            horizontalAlignment: Text.AlignHLeft;
+            verticalAlignment: Text.AlignVCenter;
+        }
+
+        PassphraseSelection {
+            id: passphraseSelection;
+            shouldImmediatelyFocus: root.hasShownSecurityImageTip;
+            isShowingTip: securityImageTip.visible;
+            anchors.top: passphraseTitleHelper.bottom;
+            anchors.topMargin: 30;
+            anchors.left: parent.left;
+            anchors.right: parent.right;
+            anchors.bottom: passphraseNavBar.top;
+
+            Connections {
+                onSendMessageToLightbox: {
+                    if (msg.method === 'statusResult') {
+                    } else {
+                        sendSignalToWallet(msg);
+                    }
+                }
+            }
+        }
+
+        // Navigation Bar
+        Item {
+            id: passphraseNavBar;
+            visible: !securityImageTip.visible;
+            // Size
+            width: parent.width;
+            height: 50;
+            // Anchors:
+            anchors.left: parent.left;
+            anchors.bottom: parent.bottom;
+            anchors.bottomMargin: 50;
+
+            // "Back" button
+            HifiControlsUit.Button {
+                color: hifi.buttons.noneBorderlessWhite;
+                colorScheme: hifi.colorSchemes.dark;
+                anchors.top: parent.top;
+                anchors.bottom: parent.bottom;
+                anchors.left: parent.left;
+                anchors.leftMargin: 20;
+                width: 200;
+                text: "Back"
+                onClicked: {
+                    root.lastPage = "step_3";
+                    root.activeView = "step_2";
+                }
+            }
+
+            // "Next" button
+            HifiControlsUit.Button {
+                id: passphrasePageNextButton;
+                color: hifi.buttons.blue;
+                colorScheme: hifi.colorSchemes.dark;
+                anchors.top: parent.top;
+                anchors.bottom: parent.bottom;
+                anchors.right: parent.right;
+                anchors.rightMargin: 20;
+                width: 200;
+                text: "Next";
+                onClicked: {
+                    if (passphraseSelection.validateAndSubmitPassphrase()) {
+                        root.lastPage = "step_3";
+                        commerce.generateKeyPair();
+                        root.activeView = "step_4";
+                    }
+                }
+            }
+        }
+    }
+    //
+    // SECURE PASSPHRASE SELECTION END
+    //
+
+    //
+    // PRIVATE KEYS READY START
+    //
+    Item {
+        id: privateKeysReadyContainer;
+        visible: root.activeView === "step_4";
+        // Anchors
+        anchors.top: titleBarContainer.bottom;
+        anchors.topMargin: 30;
+        anchors.bottom: parent.bottom;
+        anchors.left: parent.left;
+        anchors.right: parent.right;
+
+        // Text below title bar
+        RalewayRegular {
+            id: keysReadyTitleHelper;
+            text: "Back Up Your Private Keys";
+            // Text size
+            size: 24;
+            // Anchors
+            anchors.top: parent.top;
+            anchors.left: parent.left;
+            anchors.leftMargin: 16;
+            anchors.right: parent.right;
+            anchors.rightMargin: 16;
+            height: 50;
+            // Style
+            color: hifi.colors.white;
+            // Alignment
+            horizontalAlignment: Text.AlignHLeft;
+            verticalAlignment: Text.AlignVCenter;
+        }
+
+        RalewayRegular {
+            id: explanationText;
+            text: "To protect your privacy, you control your private keys. High Fidelity has no access to your private keys and cannot " +
+            "recover them for you.<br><br><b>If they are lost, you will not be able to access your money or purchases.</b>";
+            // Text size
+            size: 20;
+            // Anchors
+            anchors.top: keysReadyTitleHelper.bottom;
+            anchors.topMargin: 24;
+            anchors.left: parent.left;
+            anchors.leftMargin: 16;
+            anchors.right: parent.right;
+            anchors.rightMargin: 16;
+            height: paintedHeight;
+            // Style
+            color: hifi.colors.white;
+            wrapMode: Text.WordWrap;
+            // Alignment
+            horizontalAlignment: Text.AlignHCenter;
+            verticalAlignment: Text.AlignVCenter;
+        }
+
+        Rectangle {
+            id: pathAndInstructionsContainer;
+            anchors.top: explanationText.bottom;
+            anchors.topMargin: 24;
+            anchors.left: parent.left;
+            anchors.right: parent.right;
+            height: 240;
+            color: Qt.rgba(0, 0, 0, 0.5);
+
+            Item {
+                id: instructions01Container;
+                anchors.fill: parent;
+                
+                RalewaySemiBold {
+                    id: keyFilePathHelperText;
+                    text: "Private Key File Location:";
+                    size: 18;
+                    anchors.top: parent.top;
+                    anchors.topMargin: 40;
+                    anchors.left: parent.left;
+                    anchors.leftMargin: 30;
+                    anchors.right: parent.right;
+                    anchors.rightMargin: 30;
+                    height: paintedHeight;
+                    color: hifi.colors.white;
+                }
+            
+                HifiControlsUit.Button {
+                    id: clipboardButton;
+                    color: hifi.buttons.black;
+                    colorScheme: hifi.colorSchemes.dark;
+                    anchors.left: parent.left;
+                    anchors.leftMargin: 30;
+                    anchors.top: keyFilePathHelperText.bottom;
+                    anchors.topMargin: 8;
+                    height: 24;
+                    width: height;
+                    HiFiGlyphs {
+                        text: hifi.glyphs.folderLg;
+                        // Size
+                        size: parent.height;
+                        // Anchors
+                        anchors.fill: parent;
+                        // Style
+                        horizontalAlignment: Text.AlignHCenter;
+                        color: enabled ? hifi.colors.blueHighlight : hifi.colors.faintGray;
+                    }
+
+                    onClicked: {
+                        Qt.openUrlExternally("file:///" + keyFilePath.substring(0, keyFilePath.lastIndexOf('/')));
+                    }
+                }
+                RalewayRegular {
+                    id: keyFilePathText;
+                    text: root.keyFilePath;
+                    size: 18;
+                    anchors.top: clipboardButton.top;
+                    anchors.left: clipboardButton.right;
+                    anchors.leftMargin: 8;
+                    anchors.right: parent.right;
+                    anchors.rightMargin: 30;
+                    height: paintedHeight;
+                    wrapMode: Text.WordWrap;
+                    color: hifi.colors.blueHighlight;
+
+                    onVisibleChanged: {
+                        if (visible) {
+                            commerce.getKeyFilePathIfExists();
+                        }
+                    }
+                }
+
+                // "Open Instructions" button
+                HifiControlsUit.Button {
+                    id: openInstructionsButton;
+                    color: hifi.buttons.blue;
+                    colorScheme: hifi.colorSchemes.dark;
+                    anchors.top: keyFilePathText.bottom;
+                    anchors.topMargin: 30;
+                    anchors.left: parent.left;
+                    anchors.leftMargin: 30;
+                    anchors.right: parent.right;
+                    anchors.rightMargin: 30;
+                    height: 40;
+                    text: "Open Backup Instructions for Later";
+                    onClicked: {
+                        instructions01Container.visible = false;
+                        instructions02Container.visible = true;
+                        keysReadyPageFinishButton.visible = true;
+                        var keyPath = "file:///" + root.keyFilePath.substring(0, root.keyFilePath.lastIndexOf('/'));
+                        Qt.openUrlExternally(keyPath + "/backup_instructions.html");
+                        Qt.openUrlExternally(keyPath);
+                    }
+                }
+            }
+
+            Item {
+                id: instructions02Container;
+                anchors.fill: parent;
+                visible: false;
+
+                RalewayRegular {
+                    text: "All set!<br>Instructions for backing up your keys have been opened on your desktop. " +
+                    "Be sure to look them over after your session.";
+                    size: 22;
+                    anchors.fill: parent;
+                    anchors.leftMargin: 30;
+                    anchors.rightMargin: 30;
+                    wrapMode: Text.WordWrap;
+                    color: hifi.colors.white;
+                    horizontalAlignment: Text.AlignHCenter;
+                    verticalAlignment: Text.AlignVCenter;
+                }
+            }
+        }
+
+        // Navigation Bar
+        Item {
+            // Size
+            width: parent.width;
+            height: 50;
+            // Anchors:
+            anchors.left: parent.left;
+            anchors.bottom: parent.bottom;
+            anchors.bottomMargin: 50;
+            // "Finish" button
+            HifiControlsUit.Button {
+                id: keysReadyPageFinishButton;
+                visible: false;
+                color: hifi.buttons.blue;
+                colorScheme: hifi.colorSchemes.dark;
+                anchors.top: parent.top;
+                anchors.bottom: parent.bottom;
+                anchors.right: parent.right;
+                anchors.rightMargin: 20;
+                width: 200;
+                text: "Finish";
+                onClicked: {
+                    root.visible = false;
+                    sendSignalToWallet({method: 'walletSetup_finished', referrer: root.referrer ? root.referrer : ""});
+                }
+            }
+        }
+    }
+    //
+    // PRIVATE KEYS READY END
+    //
+
+    //
+    // FUNCTION DEFINITIONS START
+    //
+    signal sendSignalToWallet(var msg);
+    //
+    // FUNCTION DEFINITIONS END
+    //
+}
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/01.jpg b/interface/resources/qml/hifi/commerce/wallet/images/01.jpg
new file mode 100644
index 0000000000..821be6c584
Binary files /dev/null and b/interface/resources/qml/hifi/commerce/wallet/images/01.jpg differ
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/02.jpg b/interface/resources/qml/hifi/commerce/wallet/images/02.jpg
new file mode 100644
index 0000000000..cfcd3e38bf
Binary files /dev/null and b/interface/resources/qml/hifi/commerce/wallet/images/02.jpg differ
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/03.jpg b/interface/resources/qml/hifi/commerce/wallet/images/03.jpg
new file mode 100644
index 0000000000..53b6f811d8
Binary files /dev/null and b/interface/resources/qml/hifi/commerce/wallet/images/03.jpg differ
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/04.jpg b/interface/resources/qml/hifi/commerce/wallet/images/04.jpg
new file mode 100644
index 0000000000..82e3e64be3
Binary files /dev/null and b/interface/resources/qml/hifi/commerce/wallet/images/04.jpg differ
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/05.jpg b/interface/resources/qml/hifi/commerce/wallet/images/05.jpg
new file mode 100644
index 0000000000..c6ce0ac0a1
Binary files /dev/null and b/interface/resources/qml/hifi/commerce/wallet/images/05.jpg differ
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/06.jpg b/interface/resources/qml/hifi/commerce/wallet/images/06.jpg
new file mode 100644
index 0000000000..1acedf8b10
Binary files /dev/null and b/interface/resources/qml/hifi/commerce/wallet/images/06.jpg differ
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/lowerKeyboard.png b/interface/resources/qml/hifi/commerce/wallet/images/lowerKeyboard.png
new file mode 100644
index 0000000000..c14409d45c
Binary files /dev/null and b/interface/resources/qml/hifi/commerce/wallet/images/lowerKeyboard.png differ
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/wallet-bg.jpg b/interface/resources/qml/hifi/commerce/wallet/images/wallet-bg.jpg
new file mode 100644
index 0000000000..46f22b4bc7
Binary files /dev/null and b/interface/resources/qml/hifi/commerce/wallet/images/wallet-bg.jpg differ
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/wallet-tip-bg.png b/interface/resources/qml/hifi/commerce/wallet/images/wallet-tip-bg.png
new file mode 100644
index 0000000000..34f0f7d76d
Binary files /dev/null and b/interface/resources/qml/hifi/commerce/wallet/images/wallet-tip-bg.png differ
diff --git a/interface/resources/qml/hifi/dialogs/AttachmentsDialog.qml b/interface/resources/qml/hifi/dialogs/AttachmentsDialog.qml
index 12e8de3bfc..76484cf8c7 100644
--- a/interface/resources/qml/hifi/dialogs/AttachmentsDialog.qml
+++ b/interface/resources/qml/hifi/dialogs/AttachmentsDialog.qml
@@ -28,6 +28,11 @@ ScrollingWindow {
 
     HifiConstants { id: hifi }
 
+    // This is for JS/QML communication, which is unused in the AttachmentsDialog,
+    // but not having this here results in spurious warnings about a
+    // missing signal
+    signal sendToScript(var message);
+
     property var settings: Settings {
         category: "AttachmentsDialog"
         property alias x: root.x
diff --git a/interface/resources/qml/hifi/dialogs/GeneralPreferencesDialog.qml b/interface/resources/qml/hifi/dialogs/GeneralPreferencesDialog.qml
index 44cae95696..94665794d6 100644
--- a/interface/resources/qml/hifi/dialogs/GeneralPreferencesDialog.qml
+++ b/interface/resources/qml/hifi/dialogs/GeneralPreferencesDialog.qml
@@ -17,7 +17,7 @@ PreferencesDialog {
     id: root
     objectName: "GeneralPreferencesDialog"
     title: "General Settings"
-    showCategories: ["UI", "Snapshots", "Scripts", "Privacy", "Octree", "HMD", "Sixense Controllers", "Perception Neuron", "Kinect"]
+    showCategories: ["UI", "Snapshots", "Scripts", "Privacy", "Octree", "HMD", "Game Controller", "Sixense Controllers", "Perception Neuron", "Kinect", "Leap Motion"]
     property var settings: Settings {
         category: root.objectName
         property alias x: root.x
diff --git a/interface/resources/qml/hifi/dialogs/RunningScripts.qml b/interface/resources/qml/hifi/dialogs/RunningScripts.qml
index da9ffdb07e..00273171df 100644
--- a/interface/resources/qml/hifi/dialogs/RunningScripts.qml
+++ b/interface/resources/qml/hifi/dialogs/RunningScripts.qml
@@ -16,6 +16,7 @@ import Qt.labs.settings 1.0
 import "../../styles-uit"
 import "../../controls-uit" as HifiControls
 import "../../windows"
+import "../"
 
 ScrollingWindow {
     id: root
@@ -28,10 +29,11 @@ ScrollingWindow {
     minSize: Qt.vector2d(424, 300)
 
     HifiConstants { id: hifi }
-
+    
     property var scripts: ScriptDiscoveryService;
     property var scriptsModel: scripts.scriptsModelFilter
     property var runningScriptsModel: ListModel { }
+    property bool developerMenuEnabled: false
     property bool isHMD: false
 
     Settings {
@@ -39,6 +41,28 @@ ScrollingWindow {
         property alias x: root.x
         property alias y: root.y
     }
+
+    Component {
+        id: letterBoxMessage
+        Window {
+            implicitWidth: 400
+            implicitHeight: 300
+            minSize: Qt.vector2d(424, 300)
+            DesktopLetterboxMessage {
+                visible: true
+                headerGlyph: hifi.glyphs.lock
+                headerText: "Developer Mode only"
+                text: ( "In order to edit, delete or reload this script," +
+                        " turn on Developer Mode by going to:" +
+                        " Menu > Settings > Developer Menus")
+                popupRadius: 0
+                headerGlyphSize: 20
+                headerTextMargin: 2
+                headerGlyphMargin: -3
+            }
+        }
+    }
+    
     
     Timer {
         id: refreshTimer
@@ -47,6 +71,15 @@ ScrollingWindow {
         running: false
         onTriggered: updateRunningScripts();
     }
+
+
+    Timer {
+        id: checkMenu
+        interval: 1000
+        repeat: true
+        running: false
+        onTriggered: developerMenuEnabled = MenuInterface.isMenuEnabled("Developer Menus");
+    }
     
     Component {
         id: listModelBuilder
@@ -64,6 +97,8 @@ ScrollingWindow {
     Component.onCompleted: {
         isHMD = HMD.active;
         updateRunningScripts();
+        developerMenuEnabled = MenuInterface.isMenuEnabled("Developer Menus");
+        checkMenu.restart();
     }
 
     function updateRunningScripts() {
@@ -110,7 +145,17 @@ ScrollingWindow {
 
     function reloadAll() {
         console.log("Reload all scripts");
-        scripts.reloadAllScripts();
+        if (!developerMenuEnabled) {
+            for (var index = 0; index < runningScriptsModel.count; index++) {
+                var url = runningScriptsModel.get(index).url;
+                var fileName = url.substring(url.lastIndexOf('/')+1);
+                if (canEditScript(fileName)) {
+                    scripts.stopScript(url, true);
+                }
+            }
+        } else {
+            scripts.reloadAllScripts();
+        }
     }
 
     function loadDefaults() {
@@ -120,7 +165,22 @@ ScrollingWindow {
 
     function stopAll() {
         console.log("Stop all scripts");
-        scripts.stopAllScripts();
+        for (var index = 0; index < runningScriptsModel.count; index++) {
+            var url = runningScriptsModel.get(index).url;
+            var fileName = url.substring(url.lastIndexOf('/')+1);
+            if (canEditScript(fileName)) {
+                scripts.stopScript(url);
+            }
+        }
+    }
+
+
+    function canEditScript(script) {
+        if ((script === "controllerScripts.js") || (script === "defaultScripts.js")) {
+            return developerMenuEnabled;
+        }
+        
+        return true;
     }
 
     Column {
@@ -146,6 +206,14 @@ ScrollingWindow {
                     color: hifi.buttons.red
                     onClicked: stopAll()
                 }
+
+                HifiControls.Button {
+                    text: "Load Defaults"
+                    color: hifi.buttons.black
+                    height: 26
+                    visible: root.developerMenuEnabled;
+                    onClicked: loadDefaults()
+                }
             }
 
             HifiControls.VerticalSpacer {
@@ -162,6 +230,7 @@ ScrollingWindow {
                 expandSelectedRow: true
 
                 itemDelegate: Item {
+                    property bool canEdit: canEditScript(styleData.value);
                     anchors {
                         left: parent ? parent.left : undefined
                         leftMargin: hifi.dimensions.tablePadding
@@ -185,8 +254,9 @@ ScrollingWindow {
 
                         HiFiGlyphs {
                             id: reloadButton
-                            text: hifi.glyphs.reloadSmall
+                            text: ((canEditScript(styleData.value)) ? hifi.glyphs.reload : hifi.glyphs.lock)
                             color: reloadButtonArea.pressed ? hifi.colors.white : parent.color
+                            size: 21
                             anchors {
                                 top: parent.top
                                 right: stopButton.left
@@ -195,7 +265,13 @@ ScrollingWindow {
                             MouseArea {
                                 id: reloadButtonArea
                                 anchors { fill: parent; margins: -2 }
-                                onClicked: reloadScript(model.url)
+                                onClicked: {
+                                    if (canEdit) {
+                                        reloadScript(model.url)
+                                    } else {
+                                        letterBoxMessage.createObject(desktop)
+                                    }
+                                }
                             }
                         }
 
@@ -203,6 +279,7 @@ ScrollingWindow {
                             id: stopButton
                             text: hifi.glyphs.closeSmall
                             color: stopButtonArea.pressed ? hifi.colors.white : parent.color
+                            visible: canEditScript(styleData.value)
                             anchors {
                                 top: parent.top
                                 right: parent.right
@@ -211,7 +288,11 @@ ScrollingWindow {
                             MouseArea {
                                 id: stopButtonArea
                                 anchors { fill: parent; margins: -2 }
-                                onClicked: stopScript(model.url)
+                                onClicked: {
+                                    if (canEdit) {
+                                        stopScript(model.url);
+                                    }
+                                }
                             }
                         }
 
@@ -264,13 +345,6 @@ ScrollingWindow {
                     height: 26
                     onClickedQueued: ApplicationInterface.loadDialog()
                 }
-
-                HifiControls.Button {
-                    text: "Load Defaults"
-                    color: hifi.buttons.black
-                    height: 26
-                    onClicked: loadDefaults()
-                }
             }
 
             HifiControls.VerticalSpacer {}
@@ -297,6 +371,17 @@ ScrollingWindow {
                 colorScheme: hifi.colorSchemes.dark
                 anchors.left: parent.left
                 anchors.right: parent.right
+                
+                TableViewColumn {
+                    role: "display";
+                }
+
+                onActivated: {
+                    var path = scriptsModel.data(index, 0x100)
+                    if (path) {
+                        loadScript(path)
+                    }
+                }
             }
 
             HifiControls.VerticalSpacer {
@@ -313,9 +398,9 @@ ScrollingWindow {
                 readOnly: true
 
                 Connections {
-                    target: treeView
+                    target: treeView.selection
                     onCurrentIndexChanged: {
-                        var path = scriptsModel.data(treeView.currentIndex, 0x100)
+                        var path = scriptsModel.data(treeView.selection.currentIndex, 0x100)
                         if (path) {
                             selectedScript.text = path
                         } else {
diff --git a/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml b/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
index 47c9af1f57..a02496a252 100644
--- a/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
+++ b/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
@@ -10,12 +10,14 @@
 
 import QtQuick 2.5
 import QtQuick.Controls 1.4
+import QtQuick.Controls.Styles 1.4
 import QtQuick.Dialogs 1.2 as OriginalDialogs
 import Qt.labs.settings 1.0
 
 import "../../styles-uit"
 import "../../controls-uit" as HifiControls
 import "../../windows"
+import ".."
 
 Rectangle {
     id: root
@@ -37,6 +39,7 @@ Rectangle {
     property var assetProxyModel: Assets.proxyModel;
     property var assetMappingsModel: Assets.mappingModel;
     property var currentDirectory;
+    property var selectedItems: treeView.selection.selectedIndexes.length;
 
     Settings {
         category: "Overlay.AssetServer"
@@ -47,9 +50,32 @@ Rectangle {
         isHMD = HMD.active;
         ApplicationInterface.uploadRequest.connect(uploadClicked);
         assetMappingsModel.errorGettingMappings.connect(handleGetMappingsError);
+        assetMappingsModel.autoRefreshEnabled = true;
+
         reload();
     }
 
+    Component.onDestruction: {
+        assetMappingsModel.autoRefreshEnabled = false;
+    }
+    
+    function letterbox(headerGlyph, headerText, message) {
+        letterboxMessage.headerGlyph = headerGlyph;
+        letterboxMessage.headerText = headerText;
+        letterboxMessage.text = message;
+        letterboxMessage.visible = true;
+        letterboxMessage.popupRadius = 0;
+    }
+    
+    function errorMessageBox(message) {
+        return tabletRoot.messageBox({
+            icon: hifi.icons.warning,
+            defaultButton: OriginalDialogs.StandardButton.Ok,
+            title: "Error",
+            text: message
+        });
+    }
+
     function doDeleteFile(path) {
         console.log("Deleting " + path);
 
@@ -104,12 +130,12 @@ Rectangle {
 
     function askForOverwrite(path, callback) {
         var object = tabletRoot.messageBox({
-                                            icon: hifi.icons.question,
-                                            buttons: OriginalDialogs.StandardButton.Yes | OriginalDialogs.StandardButton.No,
-                                            defaultButton: OriginalDialogs.StandardButton.No,
-                                            title: "Overwrite File",
-                                            text: path + "\n" + "This file already exists. Do you want to overwrite it?"
-                                        });
+            icon: hifi.icons.question,
+            buttons: OriginalDialogs.StandardButton.Yes | OriginalDialogs.StandardButton.No,
+            defaultButton: OriginalDialogs.StandardButton.No,
+            title: "Overwrite File",
+            text: path + "\n" + "This file already exists. Do you want to overwrite it?"
+        });
         object.selected.connect(function(button) {
             if (button === OriginalDialogs.StandardButton.Yes) {
                 callback();
@@ -119,11 +145,23 @@ Rectangle {
 
     function canAddToWorld(path) {
         var supportedExtensions = [/\.fbx\b/i, /\.obj\b/i];
+        
+        if (selectedItems > 1) {
+            return false;
+        }
 
         return supportedExtensions.reduce(function(total, current) {
             return total | new RegExp(current).test(path);
         }, false);
     }
+    
+    function canRename() {    
+        if (treeView.selection.hasSelection && selectedItems == 1) {
+            return true;
+        } else {
+            return false;
+        }
+    }
 
     function clear() {
         Assets.mappingModel.clear();
@@ -131,14 +169,10 @@ Rectangle {
 
     function reload() {
         Assets.mappingModel.refresh();
-        treeView.selection.clear();
     }
 
     function handleGetMappingsError(errorString) {
-        errorMessageBox(
-                    "There was a problem retreiving the list of assets from your Asset Server.\n"
-                    + errorString
-                    );
+        errorMessageBox("There was a problem retrieving the list of assets from your Asset Server.\n" + errorString);
     }
 
     function addToWorld() {
@@ -152,35 +186,39 @@ Rectangle {
         var SHAPE_TYPE_SIMPLE_HULL = 1;
         var SHAPE_TYPE_SIMPLE_COMPOUND = 2;
         var SHAPE_TYPE_STATIC_MESH = 3;
-
+        var SHAPE_TYPE_BOX = 4;
+        var SHAPE_TYPE_SPHERE = 5;
+        
         var SHAPE_TYPES = [];
         SHAPE_TYPES[SHAPE_TYPE_NONE] = "No Collision";
         SHAPE_TYPES[SHAPE_TYPE_SIMPLE_HULL] = "Basic - Whole model";
         SHAPE_TYPES[SHAPE_TYPE_SIMPLE_COMPOUND] = "Good - Sub-meshes";
         SHAPE_TYPES[SHAPE_TYPE_STATIC_MESH] = "Exact - All polygons";
-
+        SHAPE_TYPES[SHAPE_TYPE_BOX] = "Box";
+        SHAPE_TYPES[SHAPE_TYPE_SPHERE] = "Sphere";
+        
         var SHAPE_TYPE_DEFAULT = SHAPE_TYPE_STATIC_MESH;
         var DYNAMIC_DEFAULT = false;
         var prompt = tabletRoot.customInputDialog({
-                                                   textInput: {
-                                                       label: "Model URL",
-                                                       text: defaultURL
-                                                   },
-                                                   comboBox: {
-                                                       label: "Automatic Collisions",
-                                                       index: SHAPE_TYPE_DEFAULT,
-                                                       items: SHAPE_TYPES
-                                                   },
-                                                   checkBox: {
-                                                       label: "Dynamic",
-                                                       checked: DYNAMIC_DEFAULT,
-                                                       disableForItems: [
-                                                           SHAPE_TYPE_STATIC_MESH
-                                                       ],
-                                                       checkStateOnDisable: false,
-                                                       warningOnDisable: "Models with 'Exact' automatic collisions cannot be dynamic, and should not be used as floors"
-                                                   }
-                                               });
+            textInput: {
+                label: "Model URL",
+                text: defaultURL
+            },
+            comboBox: {
+                label: "Automatic Collisions",
+                index: SHAPE_TYPE_DEFAULT,
+                items: SHAPE_TYPES
+            },
+            checkBox: {
+                label: "Dynamic",
+                checked: DYNAMIC_DEFAULT,
+                disableForItems: [
+                    SHAPE_TYPE_STATIC_MESH
+                ],
+                checkStateOnDisable: false,
+                warningOnDisable: "Models with 'Exact' automatic collisions cannot be dynamic, and should not be used as floors"
+            }
+        });
 
         prompt.selected.connect(function (jsonResult) {
             if (jsonResult) {
@@ -188,17 +226,23 @@ Rectangle {
                 var url = result.textInput.trim();
                 var shapeType;
                 switch (result.comboBox) {
-                case SHAPE_TYPE_SIMPLE_HULL:
-                    shapeType = "simple-hull";
-                    break;
-                case SHAPE_TYPE_SIMPLE_COMPOUND:
-                    shapeType = "simple-compound";
-                    break;
-                case SHAPE_TYPE_STATIC_MESH:
-                    shapeType = "static-mesh";
-                    break;
-                default:
-                    shapeType = "none";
+                    case SHAPE_TYPE_SIMPLE_HULL:
+                        shapeType = "simple-hull";
+                        break;
+                    case SHAPE_TYPE_SIMPLE_COMPOUND:
+                        shapeType = "simple-compound";
+                        break;
+                    case SHAPE_TYPE_STATIC_MESH:
+                        shapeType = "static-mesh";
+                        break;
+                    case SHAPE_TYPE_BOX:
+                        shapeType = "box";
+                        break;
+                    case SHAPE_TYPE_SPHERE:
+                        shapeType = "sphere";
+                        break;
+                    default:
+                        shapeType = "none";
                 }
 
                 var dynamic = result.checkBox !== null ? result.checkBox : DYNAMIC_DEFAULT;
@@ -207,7 +251,7 @@ Rectangle {
                     print("Error: model cannot be both static mesh and dynamic.  This should never happen.");
                 } else if (url) {
                     var name = assetProxyModel.data(treeView.selection.currentIndex);
-                    var addPosition = Vec3.sum(MyAvatar.position, Vec3.multiply(2, Quat.getFront(MyAvatar.orientation)));
+                    var addPosition = Vec3.sum(MyAvatar.position, Vec3.multiply(2, Quat.getForward(MyAvatar.orientation)));
                     var gravity;
                     if (dynamic) {
                         // Create a vector <0, -10, 0>.  { x: 0, y: -10, z: 0 } won't work because Qt is dumb and this is a
@@ -270,10 +314,10 @@ Rectangle {
         }
 
         var object = tabletRoot.inputDialog({
-                                             label: "Enter new path:",
-                                             current: path,
-                                             placeholderText: "Enter path here"
-                                         });
+            label: "Enter new path:",
+            current: path,
+            placeholderText: "Enter path here"
+        });
         object.selected.connect(function(destinationPath) {
             destinationPath = destinationPath.trim();
 
@@ -290,24 +334,38 @@ Rectangle {
         });
     }
     function deleteFile(index) {
+        var path = [];
+        
         if (!index) {
-            index = treeView.selection.currentIndex;
+            for (var i = 0; i < selectedItems; i++) {
+                 treeView.selection.setCurrentIndex(treeView.selection.selectedIndexes[i], 0x100);
+                 index = treeView.selection.currentIndex;
+                 path[i] = assetProxyModel.data(index, 0x100);                  
+            }
         }
-        var path = assetProxyModel.data(index, 0x100);
+        
         if (!path) {
             return;
         }
 
+        var modalMessage = "";
+        var items = selectedItems.toString();
         var isFolder = assetProxyModel.data(treeView.selection.currentIndex, 0x101);
         var typeString = isFolder ? 'folder' : 'file';
+        
+        if (selectedItems > 1) {
+            modalMessage = "You are about to delete " + items + " items \nDo you want to continue?";
+        } else {
+            modalMessage = "You are about to delete the following " + typeString + ":\n" + path + "\nDo you want to continue?";
+        }
 
         var object = tabletRoot.messageBox({
-                                            icon: hifi.icons.question,
-                                            buttons: OriginalDialogs.StandardButton.Yes + OriginalDialogs.StandardButton.No,
-                                            defaultButton: OriginalDialogs.StandardButton.Yes,
-                                            title: "Delete",
-                                            text: "You are about to delete the following " + typeString + ":\n" + path + "\nDo you want to continue?"
-                                        });
+            icon: hifi.icons.question,
+            buttons: OriginalDialogs.StandardButton.Yes + OriginalDialogs.StandardButton.No,
+            defaultButton: OriginalDialogs.StandardButton.Yes,
+            title: "Delete",
+            text: modalMessage
+        });
         object.selected.connect(function(button) {
             if (button === OriginalDialogs.StandardButton.Yes) {
                 doDeleteFile(path);
@@ -342,38 +400,38 @@ Rectangle {
             var filename = fileUrl.slice(fileUrl.lastIndexOf('/') + 1);
 
             Assets.uploadFile(fileUrl, directory + filename,
-                              function() {
-                                  // Upload started
-                                  uploadSpinner.visible = true;
-                                  uploadButton.enabled = false;
-                                  uploadProgressLabel.text = "In progress...";
-                              },
-                              function(err, path) {
-                                  print(err, path);
-                                  if (err === "") {
-                                      uploadProgressLabel.text = "Upload Complete";
-                                      timer.interval = 1000;
-                                      timer.repeat = false;
-                                      timer.triggered.connect(function() {
-                                          uploadSpinner.visible = false;
-                                          uploadButton.enabled = true;
-                                          uploadOpen = false;
-                                      });
-                                      timer.start();
-                                      console.log("Asset Browser - finished uploading: ", fileUrl);
-                                      reload();
-                                  } else {
-                                      uploadSpinner.visible = false;
-                                      uploadButton.enabled = true;
-                                      uploadOpen = false;
+                function() {
+                    // Upload started
+                    uploadSpinner.visible = true;
+                    uploadButton.enabled = false;
+                    uploadProgressLabel.text = "In progress...";
+                },
+                function(err, path) {
+                    print(err, path);
+                    if (err === "") {
+                        uploadProgressLabel.text = "Upload Complete";
+                        timer.interval = 1000;
+                        timer.repeat = false;
+                        timer.triggered.connect(function() {
+                            uploadSpinner.visible = false;
+                            uploadButton.enabled = true;
+                            uploadOpen = false;
+                        });
+                        timer.start();
+                        console.log("Asset Browser - finished uploading: ", fileUrl);
+                        reload();
+                    } else {
+                        uploadSpinner.visible = false;
+                        uploadButton.enabled = true;
+                        uploadOpen = false;
 
-                                      if (err !== -1) {
-                                          console.log("Asset Browser - error uploading: ", fileUrl, " - error ", err);
-                                          var box = errorMessageBox("There was an error uploading:\n" + fileUrl + "\n" + err);
-                                          box.selected.connect(reload);
-                                      }
-                                  }
-                              }, dropping);
+                        if (err !== -1) {
+                            console.log("Asset Browser - error uploading: ", fileUrl, " - error ", err);
+                            var box = errorMessageBox("There was an error uploading:\n" + fileUrl + "\n" + err);
+                            box.selected.connect(reload);
+                        }
+                    }
+            }, dropping);
         }
 
         function initiateUpload(url) {
@@ -384,9 +442,9 @@ Rectangle {
             doUpload(fileUrl, true);
         } else {
             var browser = tabletRoot.fileDialog({
-                                                 selectDirectory: false,
-                                                 dir: currentDirectory
-                                             });
+                selectDirectory: false,
+                dir: currentDirectory
+            });
 
             browser.canceled.connect(function() {
                 uploadOpen = false;
@@ -405,14 +463,11 @@ Rectangle {
             });
         }
     }
-
-    function errorMessageBox(message) {
-        return tabletRoot.messageBox({
-                                      icon: hifi.icons.warning,
-                                      defaultButton: OriginalDialogs.StandardButton.Ok,
-                                      title: "Error",
-                                      text: message
-                                  });
+    
+    // The letterbox used for popup messages
+    LetterboxMessage {
+        id: letterboxMessage;
+        z: 999; // Force the popup on top of everything else
     }
 
     Column {
@@ -432,18 +487,9 @@ Rectangle {
                 height: 30
                 spacing: hifi.dimensions.contentSpacing.x
 
-                HifiControls.GlyphButton {
-                    glyph: hifi.glyphs.reload
-                    color: hifi.buttons.black
-                    colorScheme: root.colorScheme
-                    width: hifi.dimensions.controlLineHeight
-
-                    onClicked: root.reload()
-                }
-
                 HifiControls.Button {
                     text: "Add To World"
-                    color: hifi.buttons.black
+                    color: hifi.buttons.blue
                     colorScheme: root.colorScheme
                     width: 120
 
@@ -459,7 +505,7 @@ Rectangle {
                     width: 80
 
                     onClicked: root.renameFile()
-                    enabled: treeView.selection.hasSelection
+                    enabled: canRename()
                 }
 
                 HifiControls.Button {
@@ -474,7 +520,232 @@ Rectangle {
                     enabled: treeView.selection.hasSelection
                 }
             }
+        }
 
+        HifiControls.Tree {
+            id: treeView
+            anchors.margins: hifi.dimensions.contentMargin.x + 2  // Extra for border
+            anchors.left: parent.left
+            anchors.right: parent.right
+            
+            treeModel: assetProxyModel
+            selectionMode: SelectionMode.ExtendedSelection
+            headerVisible: true
+            sortIndicatorVisible: true
+
+            colorScheme: root.colorScheme
+
+            modifyEl: renameEl
+
+            TableViewColumn {
+                id: nameColumn
+                title: "Name:"
+                role: "name"
+                width: treeView.width - bakedColumn.width;
+            }
+            TableViewColumn {
+                id: bakedColumn
+                title: "Use Baked?"
+                role: "baked"
+                width: 100
+            }
+    
+            itemDelegate: Loader {
+                id: itemDelegateLoader
+
+                anchors {
+                    left: parent ? parent.left : undefined
+                    leftMargin: (styleData.column === 0 ? (2 + styleData.depth) : 1) * hifi.dimensions.tablePadding
+                    right: parent ? parent.right : undefined
+                    rightMargin: hifi.dimensions.tablePadding
+                    verticalCenter: parent ? parent.verticalCenter : undefined
+                }
+
+                function convertToGlyph(text) {
+                    switch (text) {
+                        case "Not Baked":
+                            return hifi.glyphs.circleSlash;
+                        case "Baked":
+                            return hifi.glyphs.checkmark;
+                        case "Error":
+                            return hifi.glyphs.alert;
+                        default:
+                            return "";
+                    }
+                }
+
+                function getComponent() {
+                    if ((styleData.column === 0) && styleData.selected) {
+                        return textFieldComponent;
+                    } else if (convertToGlyph(styleData.value) != "") {
+                        return glyphComponent;
+                    } else {
+                        return labelComponent;
+                    }
+
+                }
+                sourceComponent: getComponent()
+        
+                Component {
+                    id: labelComponent
+                    FiraSansSemiBold {
+                        text: styleData.value
+                        size: hifi.fontSizes.tableText
+                        color: colorScheme == hifi.colorSchemes.light
+                                ? (styleData.selected ? hifi.colors.black : hifi.colors.baseGrayHighlight)
+                                : (styleData.selected ? hifi.colors.black : hifi.colors.lightGrayText)
+                       
+                        horizontalAlignment: styleData.column === 1 ? TextInput.AlignHCenter : TextInput.AlignLeft
+                        
+                        elide: Text.ElideMiddle
+
+                        MouseArea {
+                            id: mouseArea
+                            anchors.fill: parent
+                            
+                            acceptedButtons: Qt.NoButton
+                            hoverEnabled: true
+
+                            onEntered: {
+                                if (parent.truncated) {
+                                    treeLabelToolTip.show(parent);
+                                }
+                            }
+                            onExited: treeLabelToolTip.hide();
+                        }
+                    }
+                }
+                Component {
+                    id: glyphComponent
+
+                    HiFiGlyphs {
+                        text: convertToGlyph(styleData.value)
+                        size: hifi.dimensions.frameIconSize
+                        color: colorScheme == hifi.colorSchemes.light
+                                ? (styleData.selected ? hifi.colors.black : hifi.colors.baseGrayHighlight)
+                                : (styleData.selected ? hifi.colors.black : hifi.colors.lightGrayText)
+                       
+                        elide: Text.ElideRight
+                        horizontalAlignment: TextInput.AlignHCenter
+
+                        HifiControls.ToolTip {
+                            anchors.fill: parent
+
+                            visible: styleData.value === "Error"
+
+                            toolTip: assetProxyModel.data(styleData.index, 0x106)
+                        }
+                    }
+                }
+                Component {
+                    id: textFieldComponent
+
+                    TextField {
+                        id: textField
+                        readOnly: !activeFocus
+
+                        text: styleData.value
+
+                        FontLoader { id: firaSansSemiBold; source: "../../fonts/FiraSans-SemiBold.ttf"; }
+                        font.family: firaSansSemiBold.name
+                        font.pixelSize: hifi.fontSizes.textFieldInput
+                        height: hifi.dimensions.tableRowHeight
+
+                        style: TextFieldStyle {
+                            textColor: readOnly
+                                        ? hifi.colors.black
+                                        : (treeView.isLightColorScheme ?  hifi.colors.black :  hifi.colors.white)
+                            background: Rectangle {
+                                visible: !readOnly
+                                color: treeView.isLightColorScheme ? hifi.colors.white : hifi.colors.black
+                                border.color: hifi.colors.primaryHighlight
+                                border.width: 1
+                            }
+                            selectedTextColor: hifi.colors.black
+                            selectionColor: hifi.colors.primaryHighlight
+                            padding.left: readOnly ? 0 : hifi.dimensions.textPadding
+                            padding.right: readOnly ? 0 : hifi.dimensions.textPadding
+                        }
+
+                        validator: RegExpValidator {
+                            regExp: /[^/]+/
+                        }
+
+                        Keys.onPressed: {
+                            if (event.key == Qt.Key_Escape) {
+                                text = styleData.value;
+                                unfocusHelper.forceActiveFocus();
+                                event.accepted = true;
+                            }
+                        }
+                        onAccepted:  {
+                            if (acceptableInput && styleData.selected) {
+                                if (!treeView.modifyEl(treeView.selection.currentIndex, text)) {
+                                    text = styleData.value;
+                                }
+                                unfocusHelper.forceActiveFocus();
+                            }
+                        }
+
+                        onReadOnlyChanged: {
+                            // Have to explicily set keyboardRaised because automatic setting fails because readOnly is true at the time.
+                            keyboardRaised = activeFocus;
+                        }
+                    }
+                }
+            }
+
+            Rectangle {
+                id: treeLabelToolTip
+                visible: false
+                z: 100 // Render on top
+
+                width: toolTipText.width + 2 * hifi.dimensions.textPadding
+                height: hifi.dimensions.tableRowHeight
+                color: colorScheme == hifi.colorSchemes.light ? hifi.colors.tableRowLightOdd : hifi.colors.tableRowDarkOdd
+                border.color: colorScheme == hifi.colorSchemes.light ? hifi.colors.black : hifi.colors.lightGrayText
+
+                FiraSansSemiBold {
+                    id: toolTipText
+                    anchors.centerIn: parent
+
+                    size: hifi.fontSizes.tableText
+                    color: colorScheme == hifi.colorSchemes.light ? hifi.colors.black : hifi.colors.lightGrayText
+                }
+                
+                Timer {
+                    id: showTimer
+                    interval: 1000
+                    onTriggered: { treeLabelToolTip.visible = true; }
+                }
+                function show(item) {
+                    var coord = item.mapToItem(parent, item.x, item.y);
+
+                    toolTipText.text = item.text;
+                    treeLabelToolTip.x = coord.x - hifi.dimensions.textPadding;
+                    treeLabelToolTip.y = coord.y;
+                    showTimer.start();
+                }
+                function hide() {
+                    showTimer.stop();
+                    treeLabelToolTip.visible = false;
+                }
+            }
+            
+            MouseArea {
+                propagateComposedEvents: true
+                anchors.fill: parent
+                acceptedButtons: Qt.RightButton
+                onClicked: {
+                    if (!HMD.active) {  // Popup only displays properly on desktop
+                        var index = treeView.indexAt(mouse.x, mouse.y);
+                        treeView.selection.setCurrentIndex(index, 0x0002);
+                        contextMenu.currentIndex = index;
+                        contextMenu.popup();
+                    }
+                }
+            }
+                
             Menu {
                 id: contextMenu
                 title: "Edit"
@@ -502,37 +773,118 @@ Rectangle {
                     }
                 }
             }
-
         }
-        HifiControls.Tree {
-            id: treeView
-            height: 430
-            anchors.leftMargin: hifi.dimensions.contentMargin.x + 2  // Extra for border
-            anchors.rightMargin: hifi.dimensions.contentMargin.x + 2  // Extra for border
-            anchors.left: parent.left
-            anchors.right: parent.right
 
-            treeModel: assetProxyModel
-            canEdit: true
-            colorScheme: root.colorScheme
+        Row {
+            id: infoRow
+            anchors.left: treeView.left
+            anchors.right: treeView.right
+            anchors.bottomMargin: hifi.dimensions.contentSpacing.y
+            
+            RalewayRegular {
+                anchors.verticalCenter: parent.verticalCenter
 
-            modifyEl: renameEl
-
-            MouseArea {
-                propagateComposedEvents: true
-                anchors.fill: parent
-                acceptedButtons: Qt.RightButton
-                onClicked: {
-                    if (!HMD.active) {  // Popup only displays properly on desktop
-                        var index = treeView.indexAt(mouse.x, mouse.y);
-                        treeView.selection.setCurrentIndex(index, 0x0002);
-                        contextMenu.currentIndex = index;
-                        contextMenu.popup();
+                function makeText() {
+                    var numPendingBakes = assetMappingsModel.numPendingBakes;
+                    if (selectedItems > 1 || numPendingBakes === 0) {
+                        return selectedItems + " items selected";
+                    } else {
+                        return numPendingBakes + " bakes pending"
                     }
                 }
-            }
-        }
 
+                size: hifi.fontSizes.sectionName
+                font.capitalization: Font.AllUppercase
+                text: makeText()
+                color: hifi.colors.lightGrayText
+            }
+
+            HifiControls.HorizontalSpacer { }
+
+            HifiControls.CheckBox {
+                id: bakingCheckbox
+                anchors.leftMargin: 2 * hifi.dimensions.contentSpacing.x
+                anchors.verticalCenter: parent.verticalCenter
+
+                text: " Use baked version"
+                colorScheme: root.colorScheme
+                enabled: isEnabled()
+                checked: isChecked()
+                onClicked: {
+                    var mappings = [];
+                    for (var i in treeView.selection.selectedIndexes) {
+                        var index = treeView.selection.selectedIndexes[i];
+                        var path = assetProxyModel.data(index, 0x100);
+                        mappings.push(path);
+                    }
+                    print("Setting baking enabled:" + mappings + " " + checked);
+                    Assets.setBakingEnabled(mappings, checked, function() {
+                        reload();
+                    });
+
+                    checked = Qt.binding(isChecked);
+                }
+                
+                function isEnabled() {
+                    if (!treeView.selection.hasSelection) {
+                        return false;
+                    }
+
+                    var status = assetProxyModel.data(treeView.selection.currentIndex, 0x105);
+                    if (status === "--") {
+                        return false;
+                    }
+                    var bakingEnabled = status !== "Not Baked";
+
+                    for (var i in treeView.selection.selectedIndexes) {
+                        var thisStatus = assetProxyModel.data(treeView.selection.selectedIndexes[i], 0x105);
+                        if (thisStatus === "--") {
+                            return false;
+                        }
+                        var thisBakingEnalbed = (thisStatus !== "Not Baked");
+
+                        if (bakingEnabled !== thisBakingEnalbed) {
+                            return false;
+                        }
+                    }
+
+                    return true; 
+                }
+                function isChecked() {
+                    if (!treeView.selection.hasSelection) {
+                        return false;
+                    }
+
+                    var status = assetProxyModel.data(treeView.selection.currentIndex, 0x105);
+                    return isEnabled() && status !== "Not Baked"; 
+                }  
+            }
+            
+            Item {
+                anchors.verticalCenter: parent.verticalCenter
+                width: infoGlyph.size;
+                height: infoGlyph.size;
+
+                HiFiGlyphs {
+                    id: infoGlyph;
+                    anchors.fill: parent;
+                    horizontalAlignment: Text.AlignHCenter;
+                    verticalAlignment: Text.AlignVCenter;
+                    text: hifi.glyphs.question;
+                    size: 35;
+                    color:  hifi.colors.lightGrayText;
+                }
+                MouseArea {
+                    anchors.fill: parent;
+                    hoverEnabled: true;
+                    onEntered: infoGlyph.color = hifi.colors.blueHighlight;
+                    onExited: infoGlyph.color =  hifi.colors.lightGrayText;
+                    onClicked: letterbox(hifi.glyphs.question,
+                                            "What is baking?",
+                                            "Baking compresses and optimizes files for faster network transfer and display. We recommend you bake your content to reduce initial load times for your visitors.");
+                    }
+            } 
+        }
 
         HifiControls.TabletContentSection {
             id: uploadSection
diff --git a/interface/resources/qml/hifi/dialogs/TabletRunningScripts.qml b/interface/resources/qml/hifi/dialogs/TabletRunningScripts.qml
index 11643ae1f1..83f91c78c5 100644
--- a/interface/resources/qml/hifi/dialogs/TabletRunningScripts.qml
+++ b/interface/resources/qml/hifi/dialogs/TabletRunningScripts.qml
@@ -16,6 +16,7 @@ import Qt.labs.settings 1.0
 import "../../styles-uit"
 import "../../controls-uit" as HifiControls
 import "../../windows"
+import "../"
 
 Rectangle {
     id: root
@@ -26,26 +27,92 @@ Rectangle {
     property var scripts: ScriptDiscoveryService;
     property var scriptsModel: scripts.scriptsModelFilter
     property var runningScriptsModel: ListModel { }
+    property bool developerMenuEnabled: false
     property bool isHMD: false
 
     color: hifi.colors.baseGray
 
+    property bool keyboardEnabled: HMD.active
+    property bool keyboardRaised: false
+
+    LetterboxMessage {
+        id: letterBoxMessage
+        z: 999
+        visible: false
+    }
+
+    function letterBox(glyph, text, message) {
+        letterBoxMessage.headerGlyph = glyph;
+        letterBoxMessage.headerText = text;
+        letterBoxMessage.text = message;
+        letterBoxMessage.visible = true;
+        letterBoxMessage.popupRadius = 0;
+        letterBoxMessage.headerGlyphSize = 20
+        letterBoxMessage.headerTextMargin = 2
+        letterBoxMessage.headerGlyphMargin = -3
+    }
+
+    Timer {
+        id: refreshTimer
+        interval: 100
+        repeat: false
+        running: false
+        onTriggered: updateRunningScripts();
+    }
+
+    Timer {
+        id: checkMenu
+        interval: 1000
+        repeat: true
+        running: false
+        onTriggered: developerMenuEnabled = MenuInterface.isMenuEnabled("Developer Menus");
+    }
+
+    Component {
+        id: listModelBuilder
+        ListModel {}
+    }
+    
     Connections {
         target: ScriptDiscoveryService
-        onScriptCountChanged: updateRunningScripts();
+        onScriptCountChanged: {
+            runningScriptsModel = listModelBuilder.createObject(root);
+            refreshTimer.restart();
+        }
     }
 
     Component.onCompleted: {
         isHMD = HMD.active;
         updateRunningScripts();
+        developerMenuEnabled = MenuInterface.isMenuEnabled("Developer Menus");
+        checkMenu.restart();
     }
 
     function updateRunningScripts() {
-        var runningScripts = ScriptDiscoveryService.getRunning();
-        runningScriptsModel.clear()
-        for (var i = 0; i < runningScripts.length; ++i) {
-            runningScriptsModel.append(runningScripts[i]);
+        function simplify(path) {
+            // trim URI querystring/fragment
+            path = (path+'').replace(/[#?].*$/,'');
+            // normalize separators and grab last path segment (ie: just the filename)
+            path = path.replace(/\\/g, '/').split('/').pop();
+            // return lowercased because we want to sort mnemonically
+            return path.toLowerCase();
         }
+        var runningScripts = ScriptDiscoveryService.getRunning();
+        runningScripts.sort(function(a,b) {
+            a = simplify(a.path);
+            b = simplify(b.path);
+            return a < b ? -1 : a > b ? 1 : 0;
+        });
+        // Calling  `runningScriptsModel.clear()` here instead of creating a new object
+        // triggers some kind of weird heap corruption deep inside Qt.  So instead of
+        // modifying the model in place, possibly triggering behaviors in the table
+        // instead we create a new `ListModel`, populate it and update the 
+        // existing model atomically.
+        var newRunningScriptsModel = listModelBuilder.createObject(root);
+        for (var i = 0; i < runningScripts.length; ++i) {
+            newRunningScriptsModel.append(runningScripts[i]);
+        }
+        runningScriptsModel = newRunningScriptsModel;
     }
 
     function loadScript(script) {
@@ -65,7 +132,17 @@ Rectangle {
 
     function reloadAll() {
         console.log("Reload all scripts");
-        scripts.reloadAllScripts();
+        if (!developerMenuEnabled) {
+            for (var index = 0; index < runningScriptsModel.count; index++) {
+                var url = runningScriptsModel.get(index).url;
+                var fileName = url.substring(url.lastIndexOf('/')+1);
+                if (canEditScript(fileName)) {
+                    scripts.stopScript(url, true);
+                }
+            }
+        } else {
+            scripts.reloadAllScripts();
+        }
     }
 
     function loadDefaults() {
@@ -75,7 +152,22 @@ Rectangle {
 
     function stopAll() {
         console.log("Stop all scripts");
-        scripts.stopAllScripts();
+        for (var index = 0; index < runningScriptsModel.count; index++) {
+            var url = runningScriptsModel.get(index).url;
+            console.log(url);
+            var fileName = url.substring(url.lastIndexOf('/')+1);
+            if (canEditScript(fileName)) {
+                scripts.stopScript(url);
+            }
+        }
+    }
+
+    function canEditScript(script) {
+        if ((script === "controllerScripts.js") || (script === "defaultScripts.js")) {
+            return developerMenuEnabled;
+        }
+
+        return true;
     }
 
     Flickable {
@@ -110,6 +202,14 @@ Rectangle {
                         color: hifi.buttons.red
                         onClicked: stopAll()
                     }
+
+                    HifiControls.Button {
+                        text: "Load Defaults"
+                        color: hifi.buttons.black
+                        height: 26
+                        visible: root.developerMenuEnabled;
+                        onClicked: loadDefaults()
+                    }
                 }
 
                 HifiControls.VerticalSpacer {
@@ -125,6 +225,7 @@ Rectangle {
                     expandSelectedRow: true
 
                     itemDelegate: Item {
+                        property bool canEdit: canEditScript(styleData.value);
                         anchors {
                             left: parent ? parent.left : undefined
                             leftMargin: hifi.dimensions.tablePadding
@@ -148,8 +249,9 @@ Rectangle {
 
                             HiFiGlyphs {
                                 id: reloadButton
-                                text: hifi.glyphs.reloadSmall
+                                text: ((canEditScript(styleData.value)) ? hifi.glyphs.reload : hifi.glyphs.lock)
                                 color: reloadButtonArea.pressed ? hifi.colors.white : parent.color
+                                size: 21
                                 anchors {
                                     top: parent.top
                                     right: stopButton.left
@@ -158,7 +260,17 @@ Rectangle {
                                 MouseArea {
                                     id: reloadButtonArea
                                     anchors { fill: parent; margins: -2 }
-                                    onClicked: reloadScript(model.url)
+                                    onClicked: {
+                                        if (canEdit) {
+                                            reloadScript(model.url)
+                                        } else {
+                                            letterBox(hifi.glyphs.lock,
+                                                      "Developer Mode only",
+                                                      "In order to edit, delete or reload this script," +
+                                                      " turn on Developer Mode by going to:" +
+                                                      " Menu > Settings > Developer Menus");
+                                        }
+                                    }
                                 }
                             }
 
@@ -166,6 +278,7 @@ Rectangle {
                                 id: stopButton
                                 text: hifi.glyphs.closeSmall
                                 color: stopButtonArea.pressed ? hifi.colors.white : parent.color
+                                visible: canEditScript(styleData.value)
                                 anchors {
                                     top: parent.top
                                     right: parent.right
@@ -174,7 +287,11 @@ Rectangle {
                                 MouseArea {
                                     id: stopButtonArea
                                     anchors { fill: parent; margins: -2 }
-                                    onClicked: stopScript(model.url)
+                                    onClicked: {
+                                        if (canEdit) {
+                                            stopScript(model.url)
+                                        }
+                                    }
                                 }
                             }
 
@@ -250,13 +367,6 @@ Rectangle {
                             onTriggered: ApplicationInterface.loadDialog();
                         }
                     }
-
-                    HifiControls.Button {
-                        text: "Load Defaults"
-                        color: hifi.buttons.black
-                        height: 26
-                        onClicked: loadDefaults()
-                    }
                 }
 
                 HifiControls.VerticalSpacer {}
@@ -272,7 +382,7 @@ Rectangle {
                     Component.onCompleted: scriptsModel.filterRegExp = new RegExp("^.*$", "i")
                     onActiveFocusChanged: {
                         // raise the keyboard
-                        keyboard.raised = activeFocus;
+                        root.keyboardRaised = activeFocus;
 
                         // scroll to the bottom of the content area.
                         if (activeFocus) {
@@ -292,6 +402,17 @@ Rectangle {
                     colorScheme: hifi.colorSchemes.dark
                     anchors.left: parent.left
                     anchors.right: parent.right
+
+                    TableViewColumn {
+                        role: "display";
+                    }
+
+                    onActivated: {
+                        var path = scriptsModel.data(index, 0x100)
+                        if (path) {
+                            loadScript(path)
+                        }
+                    }
                 }
 
                 HifiControls.VerticalSpacer {
@@ -308,9 +429,9 @@ Rectangle {
                     readOnly: true
 
                     Connections {
-                        target: treeView
+                        target: treeView.selection
                         onCurrentIndexChanged: {
-                            var path = scriptsModel.data(treeView.currentIndex, 0x100)
+                            var path = scriptsModel.data(treeView.selection.currentIndex, 0x100)
                             if (path) {
                                 selectedScript.text = path
                             } else {
@@ -362,7 +483,7 @@ Rectangle {
 
     HifiControls.Keyboard {
         id: keyboard
-        raised: false
+        raised: parent.keyboardEnabled && parent.keyboardRaised
         numeric: false
         anchors {
             bottom: parent.bottom
diff --git a/interface/resources/qml/hifi/dialogs/content/AttachmentsContent.qml b/interface/resources/qml/hifi/dialogs/content/AttachmentsContent.qml
index 4adb485c2b..5c9d6822c8 100644
--- a/interface/resources/qml/hifi/dialogs/content/AttachmentsContent.qml
+++ b/interface/resources/qml/hifi/dialogs/content/AttachmentsContent.qml
@@ -14,13 +14,25 @@ Item {
     readonly property var originalAttachments: MyAvatar.getAttachmentsVariant();
     property var attachments: [];
 
-    Component.onCompleted: {
-        for (var i = 0; i < originalAttachments.length; ++i) {
-            var attachment = originalAttachments[i];
+    function reload(){
+        content.attachments = [];
+        var currentAttachments = MyAvatar.getAttachmentsVariant();
+        listView.model.clear();
+        for (var i = 0; i < currentAttachments.length; ++i) {
+            var attachment = currentAttachments[i];
             content.attachments.push(attachment);
             listView.model.append({});
         }
     }
+    
+    Connections {
+        target: MyAvatar
+        onAttachmentsChanged: reload()
+    }
+
+    Component.onCompleted: {
+        reload()
+    }
 
     Column {
         width: pane.width
@@ -50,7 +62,7 @@ Item {
                         margins: 4
                     }
                     clip: true
-                    snapMode: ListView.SnapToItem
+                    cacheBuffer: 4000
 
                     model: ListModel {}
                     delegate: Item {
diff --git a/interface/resources/qml/hifi/tablet/BlocksWebView.qml b/interface/resources/qml/hifi/tablet/BlocksWebView.qml
new file mode 100644
index 0000000000..1e9eb3beb4
--- /dev/null
+++ b/interface/resources/qml/hifi/tablet/BlocksWebView.qml
@@ -0,0 +1,10 @@
+import QtQuick 2.0
+import QtWebEngine 1.2
+
+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/CalibratingScreen.qml b/interface/resources/qml/hifi/tablet/CalibratingScreen.qml
index 338a76989f..dd56bc96ab 100644
--- a/interface/resources/qml/hifi/tablet/CalibratingScreen.qml
+++ b/interface/resources/qml/hifi/tablet/CalibratingScreen.qml
@@ -25,11 +25,12 @@ Rectangle {
     signal canceled()
     signal restart()
 
-    property int count: 3
+    property int count: 5
     property string calibratingText: "CALIBRATING..."
     property string calibratingCountText: "CALIBRATION STARTING IN"
     property string calibrationSuccess: "CALIBRATION COMPLETED"
     property string calibrationFailed: "CALIBRATION FAILED"
+    property string instructionText: "Please stand in a T-Pose during calibration"
     
     HifiConstants { id: hifi }
     visible: true
@@ -64,7 +65,7 @@ Rectangle {
 
     HiFiGlyphs {
         id: image
-        text: hifi.glyphs.avatar1
+        text: hifi.glyphs.avatarTPose
         size: 190
         color: hifi.colors.white
 
@@ -158,6 +159,15 @@ Rectangle {
 
             onClicked: {
                 restart();
+                statusText.color = hifi.colors.blueHighlight;
+                statusText.text = info.calibratingCountText;
+                directions.text = instructionText;
+                countDown.visible = true;
+                busyIndicator.running = true;
+                busyRotation.from = 0
+                busyRotation.to = 360
+                busyIndicator.source = blueIndicator;
+                closeWindow.stop();
                 numberAnimation.stop();
                 info.count = (timer.interval / 1000);
                 numberAnimation.start();
@@ -178,6 +188,7 @@ Rectangle {
         }
     }
     
+    
     function start(interval, countNumber) {
         countDown.visible = true;
         statusText.color = hifi.colors.blueHighlight;
@@ -201,6 +212,7 @@ Rectangle {
         busyIndicator.running = false;
         statusText.text = info.calibrationSuccess
         statusText.color = hifi.colors.greenHighlight
+        directions.text = "SUCCESS"
         closeWindow.start();
     }
 
diff --git a/interface/resources/qml/hifi/tablet/ControllerSettings.qml b/interface/resources/qml/hifi/tablet/ControllerSettings.qml
index e1ba93a840..4814eaf01c 100644
--- a/interface/resources/qml/hifi/tablet/ControllerSettings.qml
+++ b/interface/resources/qml/hifi/tablet/ControllerSettings.qml
@@ -16,6 +16,7 @@ import "../../controls-uit" as HifiControls
 StackView {
     id: stack
     initialItem: inputConfiguration
+    property alias messageVisible: imageMessageBox.visible
     Rectangle {
         id: inputConfiguration
         anchors.fill: parent
@@ -26,6 +27,15 @@ StackView {
 
         property var pluginSettings: null
 
+        HifiControls.ImageMessageBox {
+            id: imageMessageBox
+            anchors.fill: parent
+            z: 2000
+            imageWidth: 442
+            imageHeight: 670
+            source: "../../../images/calibration-help.png"
+        }
+
         Rectangle {
             width: inputConfiguration.width
             height: 1
@@ -167,7 +177,7 @@ StackView {
                         loader.item.pluginName = box.currentText;
                     }
                 }
-                
+
                 if (loader.item.hasOwnProperty("displayInformation")) {
                     loader.item.displayConfiguration();
                 }
@@ -183,20 +193,20 @@ StackView {
             return InputConfiguration.activeInputPlugins();
         }
     }
-    
+
     function initialize() {
         changeSource();
     }
-    
+
     function changeSource() {
         loader.source = "";
         var source = "";
         if (box.currentText == "Vive") {
             source = InputConfiguration.configurationLayout("OpenVR");
-        } else { 
+        } else {
             source = InputConfiguration.configurationLayout(box.currentText);
         }
-        
+
         loader.source = source;
         if (source === "") {
             box.label = "(not configurable)";
@@ -204,14 +214,14 @@ StackView {
             box.label = "";
         }
     }
-    
+
     Timer {
         id: timer
         repeat: false
         interval: 300
         onTriggered: initialize()
     }
-    
+
     Component.onCompleted: {
         timer.start();
     }
diff --git a/interface/resources/qml/hifi/tablet/EditTabView.qml b/interface/resources/qml/hifi/tablet/EditTabView.qml
index e4a20a0316..e94325f399 100644
--- a/interface/resources/qml/hifi/tablet/EditTabView.qml
+++ b/interface/resources/qml/hifi/tablet/EditTabView.qml
@@ -21,7 +21,7 @@ TabView {
         enabled: true
         property string originalUrl: ""
 
-        Rectangle { 
+        Rectangle {
             color: "#404040"
 
             Text {
@@ -180,7 +180,7 @@ TabView {
 
         WebView {
             id: entityListToolWebView
-            url: "../../../../../scripts/system/html/entityList.html"
+            url: Paths.defaultScripts + "/system/html/entityList.html"
             anchors.fill: parent
             enabled: true
         }
@@ -194,7 +194,7 @@ TabView {
 
         WebView {
             id: entityPropertiesWebView
-            url: "../../../../../scripts/system/html/entityProperties.html"
+            url: Paths.defaultScripts + "/system/html/entityProperties.html"
             anchors.fill: parent
             enabled: true
         }
@@ -208,7 +208,7 @@ TabView {
 
         WebView {
             id: gridControlsWebView
-            url: "../../../../../scripts/system/html/gridControls.html"
+            url: Paths.defaultScripts + "/system/html/gridControls.html"
             anchors.fill: parent
             enabled: true
         }
@@ -222,7 +222,7 @@ TabView {
 
         WebView {
             id: particleExplorerWebView
-            url: "../../../../../scripts/system/particle_explorer/particleExplorer.html"
+            url: Paths.defaultScripts + "/system/particle_explorer/particleExplorer.html"
             anchors.fill: parent
             enabled: true
         }
@@ -293,16 +293,16 @@ TabView {
                     break;
                 case 'list':
                     editTabView.currentIndex = 1;
-                    break; 
+                    break;
                 case 'properties':
                     editTabView.currentIndex = 2;
-                    break; 
+                    break;
                 case 'grid':
                     editTabView.currentIndex = 3;
-                    break; 
+                    break;
                 case 'particle':
                     editTabView.currentIndex = 4;
-                    break; 
+                    break;
                 default:
                     console.warn('Attempt to switch to invalid tab:', id);
             }
@@ -310,4 +310,4 @@ TabView {
             console.warn('Attempt to switch tabs with invalid input:', JSON.stringify(id));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/interface/resources/qml/hifi/tablet/NewEntityButton.qml b/interface/resources/qml/hifi/tablet/NewEntityButton.qml
index e5684fa791..7f838717df 100644
--- a/interface/resources/qml/hifi/tablet/NewEntityButton.qml
+++ b/interface/resources/qml/hifi/tablet/NewEntityButton.qml
@@ -1,5 +1,6 @@
 import QtQuick 2.0
 import QtGraphicalEffects 1.0
+import TabletScriptingInterface 1.0
 
 Item {
     id: newEntityButton
@@ -122,9 +123,11 @@ Item {
         hoverEnabled: true
         enabled: true
         onClicked: {
+            tabletInterface.playSound(TabletEnums.ButtonClick);
             newEntityButton.clicked();
         }
         onEntered: {
+            tabletInterface.playSound(TabletEnums.ButtonHover);
             newEntityButton.state = "hover state";
         }
         onExited: {
diff --git a/interface/resources/qml/hifi/tablet/NewModelDialog.qml b/interface/resources/qml/hifi/tablet/NewModelDialog.qml
index 5040c043f4..3debc8b9e7 100644
--- a/interface/resources/qml/hifi/tablet/NewModelDialog.qml
+++ b/interface/resources/qml/hifi/tablet/NewModelDialog.qml
@@ -11,8 +11,11 @@
 
 import QtQuick 2.5
 import QtQuick.Controls 1.4
+import QtQuick.Dialogs 1.2 as OriginalDialogs
+
 import "../../styles-uit"
 import "../../controls-uit"
+import "../dialogs"
 
 Rectangle {
     id: newModelDialog
@@ -25,6 +28,15 @@ Rectangle {
     property bool punctuationMode: false
     property bool keyboardRasied: false
 
+    function errorMessageBox(message) {
+        return desktop.messageBox({
+            icon: hifi.icons.warning,
+            defaultButton: OriginalDialogs.StandardButton.Ok,
+            title: "Error",
+            text: message
+        });
+    }
+
     Item {
         id: column1
         anchors.rightMargin: 10
@@ -65,7 +77,8 @@ Rectangle {
                 onClicked: {
                     newModelDialog.keyboardEnabled = HMD.active
                     parent.focus = true;
-                    parent.forceActiveFocus()
+                    parent.forceActiveFocus();
+                    modelURL.cursorPosition = modelURL.positionAt(mouseX, mouseY, TextInput.CursorBetweenCharaters);
                 }
             }
         }
@@ -97,7 +110,6 @@ Rectangle {
                 CheckBox {
                     id: dynamic
                     text: qsTr("Dynamic")
-                    
                 }
 
                 Row {
@@ -116,6 +128,7 @@ Rectangle {
                     Text {
                         id: text2
                         width: 160
+                        x: dynamic.width / 2
                         color: "#ffffff"
                         text: qsTr("Models with automatic collisions set to 'Exact' cannot be dynamic, and should not be used as floors")
                         wrapMode: Text.WordWrap
@@ -138,13 +151,40 @@ Rectangle {
 
                 ComboBox {
                     id: collisionType
+
+                    property int priorIndex: 0
+                    property string staticMeshCollisionText: "Exact - All polygons"
+                    property var collisionArray: ["No Collision",
+                                                  "Basic - Whole model",
+                                                  "Good - Sub-meshes",
+                                                  staticMeshCollisionText, 
+                                                  "Box", 
+                                                  "Sphere"]
+
                     width: 200
                     z: 100
                     transformOrigin: Item.Center
-                    model: ["No Collision",
-                            "Basic - Whole model",
-                            "Good - Sub-meshes",
-                            "Exact - All polygons"]
+                    model: collisionArray
+
+                    onCurrentIndexChanged: {
+                        if (collisionArray[currentIndex] === staticMeshCollisionText) {
+                            
+                            if (dynamic.checked) {
+                                currentIndex = priorIndex;
+
+                                errorMessageBox("Models with Automatic Collisions set to \"" 
+                                                    + staticMeshCollisionText + "\" cannot be dynamic.");
+                                //--EARLY EXIT--( Can't have a static mesh model that's dynamic )
+                                return;
+                            }
+
+                            dynamic.enabled = false;
+                        } else {
+                            dynamic.enabled = true;
+                        }
+
+                        priorIndex = currentIndex;
+                    }
                 }
 
                 Row {
@@ -152,10 +192,10 @@ Rectangle {
                     width: 200
                     height: 400
                     spacing: 5
-                    
-                    anchors {
-                        rightMargin: 15
-                    }
+
+                    anchors.horizontalCenter: column3.horizontalCenter
+                    anchors.horizontalCenterOffset: -20
+
                     Button {
                         id: button1
                         text: qsTr("Add")
diff --git a/interface/resources/qml/hifi/tablet/OpenVrConfiguration.qml b/interface/resources/qml/hifi/tablet/OpenVrConfiguration.qml
index 52a935ab19..78c10e2ffa 100644
--- a/interface/resources/qml/hifi/tablet/OpenVrConfiguration.qml
+++ b/interface/resources/qml/hifi/tablet/OpenVrConfiguration.qml
@@ -50,9 +50,12 @@ Rectangle {
         readonly property int apply: 1
         readonly property int applyAndCalibrate: 2
         readonly property int calibrate: 3
-        
+
     }
-        
+
+
+
+
 
     MouseArea {
         id: mouseArea
@@ -64,6 +67,7 @@ Rectangle {
             mouse.accepted = false;
         }
     }
+
     color: hifi.colors.baseGray
 
     RalewayBold {
@@ -141,11 +145,13 @@ Rectangle {
         visible: headPuckBox.checked
         HifiControls.SpinBox {
             id: headYOffset
-            decimals: 4
+            decimals: 1
             width: 112
-            label: "Y: offset"
+            label: "Y Offset"
+            suffix: " cm"
             minimumValue: -10
-            stepSize: 0.0254
+            stepSize: 1
+            value: -5
             colorScheme: hifi.colorSchemes.dark
 
             onEditingFinished: {
@@ -157,19 +163,20 @@ Rectangle {
         HifiControls.SpinBox {
             id: headZOffset
             width: 112
-            label: "Z: offset"
+            label: "Z Offset"
             minimumValue: -10
-            stepSize: 0.0254
-            decimals: 4
+            stepSize: 1
+            decimals: 1
+            suffix: " cm"
+            value: -5
             colorScheme: hifi.colorSchemes.dark
-            
+
             onEditingFinished: {
                 sendConfigurationSettings();
             }
         }
     }
-        
-    
+
     RalewayBold {
         id: hands
 
@@ -245,14 +252,15 @@ Rectangle {
         anchors.left: openVrConfiguration.left
         anchors.leftMargin: leftMargin + 10
         spacing: 10
-        
+
         HifiControls.SpinBox {
             id: handYOffset
-            decimals: 4
+            decimals: 1
             width: 112
-            label: "Y: offset"
+            suffix: " cm"
+            label: "Y Offset"
             minimumValue: -10
-            stepSize: 0.0254
+            stepSize: 1
             colorScheme: hifi.colorSchemes.dark
 
             onEditingFinished: {
@@ -264,12 +272,13 @@ Rectangle {
         HifiControls.SpinBox {
             id: handZOffset
             width: 112
-            label: "Z: offset"
+            label: "Z Offset"
+            suffix: " cm"
             minimumValue: -10
-            stepSize: 0.0254
-            decimals: 4
+            stepSize: 1
+            decimals: 1
             colorScheme: hifi.colorSchemes.dark
-            
+
             onEditingFinished: {
                 sendConfigurationSettings();
             }
@@ -290,6 +299,52 @@ Rectangle {
         anchors.leftMargin: leftMargin
     }
 
+    RalewayRegular {
+        id: info
+
+        text: "See Recommended Tracker Placement"
+        color: hifi.colors.blueHighlight
+        size: 10
+        anchors {
+            left: additional.right
+            leftMargin: 10
+            verticalCenter: additional.verticalCenter
+        }
+
+        Rectangle {
+            id: selected
+            color: hifi.colors.blueHighlight
+
+            width: info.width
+            height: 1
+
+            anchors {
+                top: info.bottom
+                topMargin: 1
+                left: info.left
+                right: info.right
+            }
+
+            visible: false
+        }
+
+        MouseArea {
+            anchors.fill: parent;
+            hoverEnabled: true
+
+            onEntered: {
+                selected.visible = true;
+            }
+
+            onExited: {
+                selected.visible = false;
+            }
+            onClicked: {
+                stack.messageVisible = true;
+            }
+        }
+    }
+
     Row {
         id: feetConfig
         anchors.top: additional.bottom
@@ -379,6 +434,7 @@ Rectangle {
                 if (checked) {
                     hipBox.checked = true;
                     feetBox.checked = true;
+                    shoulderBox.checked = false;
                 }
                 sendConfigurationSettings();
             }
@@ -416,6 +472,7 @@ Rectangle {
                 if (checked) {
                     hipBox.checked = true;
                     feetBox.checked = true;
+                    chestBox.checked = false;
                 }
                 sendConfigurationSettings();
             }
@@ -434,15 +491,55 @@ Rectangle {
         }
     }
 
+    Row {
+        id: shoulderAdditionalConfig
+        visible: shoulderBox.checked
+        anchors.top: shoulderConfig.bottom
+        anchors.topMargin: 5
+        anchors.left: openVrConfiguration.left
+        anchors.leftMargin: leftMargin + 20
+        spacing: 10
+
+        HifiControls.SpinBox {
+            id: armCircumference
+            decimals: 1
+            width: 160
+            suffix: " cm"
+            label: "Arm Circumference"
+            minimumValue: 0
+            stepSize: 1.0
+            colorScheme: hifi.colorSchemes.dark
+            value: 33.0
+
+            onEditingFinished: {
+                sendConfigurationSettings();
+            }
+        }
+
+        HifiControls.SpinBox {
+            id: shoulderWidth
+            width: 160
+            label: "Shoulder Width"
+            suffix: " cm"
+            minimumValue: 0
+            stepSize: 1.0
+            decimals: 1
+            colorScheme: hifi.colorSchemes.dark
+            value: 48
+
+            onEditingFinished: {
+                sendConfigurationSettings();
+            }
+        }
+    }
+
     Separator {
         id: bottomSeperator
         width: parent.width
-        anchors.top: shoulderConfig.bottom
-        anchors.topMargin: 10
+        anchors.top: shoulderAdditionalConfig.visible ? shoulderAdditionalConfig.bottom : shoulderConfig.bottom
+        anchors.topMargin: (shoulderAdditionalConfig.visible ? 25 : 10)
     }
 
-
-
     Rectangle {
         id: calibrationButton
         property int color: hifi.buttons.blue
@@ -458,12 +555,12 @@ Rectangle {
         width: glyphButton.width + calibrationText.width + padding
         height: hifi.dimensions.controlLineHeight
         anchors.top: bottomSeperator.bottom
-        anchors.topMargin: 10
+        anchors.topMargin: 15
         anchors.left: parent.left
         anchors.leftMargin: leftMargin
 
         radius: hifi.buttons.radius
-        
+
         gradient: Gradient {
             GradientStop {
                 position: 0.2
@@ -479,7 +576,7 @@ Rectangle {
                     }
                 }
             }
-            
+
             GradientStop {
                 position: 1.0
                 color: {
@@ -495,10 +592,10 @@ Rectangle {
                 }
             }
         }
-    
 
 
-       
+
+
         HiFiGlyphs {
             id: glyphButton
             color: enabled ? hifi.buttons.textColor[calibrationButton.color]
@@ -512,7 +609,7 @@ Rectangle {
                 bottomMargin: 1
             }
         }
-            
+
         RalewayBold {
             id: calibrationText
             font.capitalization: Font.AllUppercase
@@ -527,7 +624,7 @@ Rectangle {
                 topMargin: 7
             }
         }
-    
+
 
         MouseArea {
             anchors.fill: parent
@@ -549,19 +646,19 @@ Rectangle {
                     }
                 }
             }
-            
+
             onPressed: {
                 calibrationButton.pressed = true;
             }
-            
+
             onReleased: {
                 calibrationButton.pressed = false;
             }
-            
+
             onEntered: {
                 calibrationButton.hovered = true;
             }
-            
+
             onExited: {
                 calibrationButton.hovered = false;
             }
@@ -590,16 +687,24 @@ Rectangle {
         lastConfiguration = composeConfigurationSettings();
     }
 
+    Component.onDestruction: {
+        var settings = InputConfiguration.configurationSettings(pluginName);
+        var data = {
+            "num_pucks": settings["puckCount"]
+        }
+        UserActivityLogger.logAction("mocap_ui_close_dialog", data);
+    }
+
     HifiControls.SpinBox {
         id: timeToCalibrate
         width: 70
         anchors.top: calibrationButton.bottom
-        anchors.topMargin: 40
+        anchors.topMargin: 20
         anchors.left: parent.left
         anchors.leftMargin: leftMargin
 
-        minimumValue: 3
-        value: 3
+        minimumValue: 5
+        value: 5
         colorScheme: hifi.colorSchemes.dark
 
         onEditingFinished: {
@@ -634,6 +739,57 @@ Rectangle {
         }
     }
 
+    Separator {
+        id: advanceSeperator
+        width: parent.width
+        anchors.top: timeToCalibrate.bottom
+        anchors.topMargin: 10
+    }
+
+    RalewayBold {
+        id: advanceSettings
+        
+        text: "Advanced Settings"
+        size: 12
+        
+        color: hifi.colors.white
+        
+        anchors.top: advanceSeperator.bottom
+        anchors.topMargin: 10
+        anchors.left: parent.left
+        anchors.leftMargin: leftMargin
+    }
+
+
+    HifiControls.CheckBox {
+        id: viveInDesktop
+        width: 15
+        height: 15
+        boxRadius: 7
+
+        anchors.top: advanceSettings.bottom
+        anchors.topMargin: 5
+        anchors.left: openVrConfiguration.left
+        anchors.leftMargin: leftMargin + 10
+        
+        onClicked: {
+            sendConfigurationSettings();
+        }
+    }
+
+    RalewayBold {
+        id: viveDesktopText
+        size: 10
+        text: "Use Vive devices in desktop mode"
+        color: hifi.colors.white
+        
+        anchors {
+            left: viveInDesktop.right
+            leftMargin: 5
+            verticalCenter: viveInDesktop.verticalCenter
+        }
+    }
+    
     NumberAnimation {
         id: numberAnimation
         target: openVrConfiguration
@@ -641,17 +797,39 @@ Rectangle {
         to: 0
     }
 
+    function logAction(action, status) {
+        console.log("calibrated from ui");
+        var data = {
+            "num_pucks": status["puckCount"],
+            "puck_configuration": status["configuration"],
+            "head_puck": status["head_puck"],
+            "hand_puck": status["hand_pucks"]
+        }
+        UserActivityLogger.logAction(action, data);
+    }
+
     function calibrationStatusInfo(status) {
         var calibrationScreen = stack.currentItem;
-        if (status["calibrated"]) {
-            calibrationScreen.success();
-        } else if (!status["calibrated"]) {
-            var uncalibrated = status["success"];
-            if (!uncalibrated) {
-                calibrationScreen.failure();
-            }
+
+        if (!status["UI"]) {
+            calibratingScreen = screen.createObject();
+            stack.push(calibratingScreen);
         }
 
+        if (status["calibrated"]) {
+            calibrationScreen.success();
+
+            if (status["UI"]) {
+                logAction("mocap_ui_success", status);
+            }
+
+        } else if (!status["calibrated"]) {
+            calibrationScreen.failure();
+
+            if (status["UI"]) {
+                logAction("mocap_ui_failed", status);
+            }
+        }
         updateCalibrationButton();
     }
 
@@ -698,6 +876,10 @@ Rectangle {
 
         var HmdHead = settings["HMDHead"];
         var viveController = settings["handController"];
+        var desktopMode = settings["desktopMode"];
+
+        armCircumference.value = settings.armCircumference;
+        shoulderWidth.value = settings.shoulderWidth;
 
         if (HmdHead) {
             headBox.checked = true;
@@ -715,8 +897,16 @@ Rectangle {
             handBox.checked = false;
         }
 
+        viveInDesktop.checked = desktopMode;
+
         initializeButtonState();
         updateCalibrationText();
+
+        var data = {
+            "num_pucks": settings["puckCount"]
+        };
+
+        UserActivityLogger.logAction("mocap_ui_open_dialog", data);
     }
 
     function displayTrackerConfiguration(type) {
@@ -750,11 +940,11 @@ Rectangle {
         var handOverride = handSetting["override"];
 
         var settingsChanged = false;
-        
+
         if (lastConfiguration["bodyConfiguration"] !== bodySetting) {
             settingsChanged = true;
         }
-        
+
         var lastHead = lastConfiguration["headConfiguration"];
         if (lastHead["override"] !== headOverride) {
             settingsChanged = true;
@@ -764,13 +954,13 @@ Rectangle {
         if (lastHand["override"] !== handOverride) {
             settingsChanged = true;
         }
-        
+
         if (settingsChanged) {
             if ((!handOverride) && (!headOverride) && (bodySetting === "None")) {
                 state = buttonState.apply;
             } else {
                 state = buttonState.applyAndCalibrate;
-            }   
+            }
         } else {
             if (state == buttonState.apply) {
                 state = buttonState.disabled;
@@ -778,7 +968,7 @@ Rectangle {
                 state = buttonState.calibrate;
             }
         }
-        
+
         lastConfiguration = settings;
     }
 
@@ -795,7 +985,7 @@ Rectangle {
             state = buttonState.disabled;
         } else {
             state = buttonState.calibrate;
-        }   
+        }
     }
 
     function updateCalibrationButton() {
@@ -861,11 +1051,14 @@ Rectangle {
             "Y": handYOffset.value,
             "Z": handZOffset.value
         }
-        
+
         var settingsObject = {
             "bodyConfiguration": trackerConfiguration,
             "headConfiguration": headObject,
-            "handConfiguration": handObject 
+            "handConfiguration": handObject,
+            "armCircumference": armCircumference.value,
+            "shoulderWidth": shoulderWidth.value,
+            "desktopMode": viveInDesktop.checked
         }
 
         return settingsObject;
diff --git a/interface/resources/qml/hifi/tablet/Tablet.qml b/interface/resources/qml/hifi/tablet/Tablet.qml
index 43672190dd..2a086bae94 100644
--- a/interface/resources/qml/hifi/tablet/Tablet.qml
+++ b/interface/resources/qml/hifi/tablet/Tablet.qml
@@ -1,5 +1,6 @@
 import QtQuick 2.5
 import QtGraphicalEffects 1.0
+import QtQuick.Layouts 1.3
 
 import "../../styles-uit"
 import "../audio" as HifiAudio
@@ -7,8 +8,8 @@ import "../audio" as HifiAudio
 Item {
     id: tablet
     objectName: "tablet"
-    property int rowIndex: 0
-    property int columnIndex: 0
+    property int rowIndex: 6 // by default
+    property int columnIndex: 1 // point to 'go to location'
     property int count: (flowMain.children.length - 1)
 
     // used to look up a button by its uuid
@@ -109,15 +110,45 @@ Item {
             }
         }
 
-        RalewaySemiBold {
-            id: usernameText
-            text: tabletRoot.username
-            anchors.verticalCenter: parent.verticalCenter
+        Item {
+            width: 150
+            height: 50
             anchors.right: parent.right
-            anchors.rightMargin: 20
-            horizontalAlignment: Text.AlignRight
-            font.pixelSize: 20
-            color: "#afafaf"
+            anchors.rightMargin: 30
+            anchors.verticalCenter: parent.verticalCenter
+
+            ColumnLayout {
+                anchors.fill: parent
+
+                RalewaySemiBold {
+                    text: Account.loggedIn ? qsTr("Log out") : qsTr("Log in")
+                    horizontalAlignment: Text.AlignRight
+                    anchors.right: parent.right
+                    font.pixelSize: 20
+                    color: "#afafaf"
+                }
+
+                RalewaySemiBold {
+                    visible: Account.loggedIn
+                    height: Account.loggedIn ? parent.height/2 - parent.spacing/2 : 0
+                    text: Account.loggedIn ? "[" + tabletRoot.usernameShort + "]" : ""
+                    horizontalAlignment: Text.AlignRight
+                    anchors.right: parent.right
+                    font.pixelSize: 20
+                    color: "#afafaf"
+                }
+            }
+
+            MouseArea {
+                anchors.fill: parent
+                onClicked: {
+                    if (!Account.loggedIn) {
+                        DialogsManager.showLoginDialog()
+                    } else {
+                        Account.logOut()
+                    }
+                }
+            }
         }
     }
 
diff --git a/interface/resources/qml/hifi/tablet/TabletAddressDialog.qml b/interface/resources/qml/hifi/tablet/TabletAddressDialog.qml
index 073f143dbe..649a8e6259 100644
--- a/interface/resources/qml/hifi/tablet/TabletAddressDialog.qml
+++ b/interface/resources/qml/hifi/tablet/TabletAddressDialog.qml
@@ -39,11 +39,24 @@ StackView {
     property var rpcCounter: 0;
     signal sendToScript(var message);
     function rpc(method, parameters, callback) {
+        console.debug('TabletAddressDialog: rpc: method = ', method, 'parameters = ', parameters, 'callback = ', callback)
+
         rpcCalls[rpcCounter] = callback;
         var message = {method: method, params: parameters, id: rpcCounter++, jsonrpc: "2.0"};
         sendToScript(message);
     }
     function fromScript(message) {
+        if (message.method === 'refreshFeeds') {
+            var feeds = [happeningNow, places, snapshots];
+            console.debug('TabletAddressDialog::fromScript: refreshFeeds', 'feeds = ', feeds);
+
+            feeds.forEach(function(feed) {
+                Qt.callLater(feed.fillDestinations);
+            });
+
+            return;
+        }
+
         var callback = rpcCalls[message.id];
         if (!callback) {
             console.log('No callback for message fromScript', JSON.stringify(message));
@@ -94,10 +107,26 @@ StackView {
         property bool keyboardEnabled: false
         property bool keyboardRaised: false
         property bool punctuationMode: false
-        
+
         width: parent.width
         height: parent.height
 
+        MouseArea {
+            anchors {
+                top: parent.top
+                left: parent.left
+                right: parent.right
+                bottom: keyboard.top
+            }
+
+            propagateComposedEvents: true
+            onPressed: {
+                parent.forceActiveFocus();
+                addressBarDialog.keyboardEnabled = false;
+                mouse.accepted = false;
+            }
+        }
+
         anchors {
             right: parent.right
             left: parent.left
@@ -105,7 +134,7 @@ StackView {
             bottom: parent.bottom
         }
 
-        onMetaverseServerUrlChanged: updateLocationTextTimer.start();
+        onHostChanged: updateLocationTextTimer.start();
         Rectangle {
             id: navBar
             width: parent.width
@@ -227,9 +256,9 @@ StackView {
                 MouseArea {
                     anchors.fill: parent;
                     onClicked: {
-                        if (!addressLine.focus || !HMD.active) {
-                            addressLine.focus = true;
-                            addressLine.forceActiveFocus();
+                        addressLine.focus = true;
+                        addressLine.forceActiveFocus();
+                        if (HMD.active) {
                             addressBarDialog.keyboardEnabled = HMD.active;
                         }
                         tabletRoot.playButtonClickSound();
@@ -337,7 +366,7 @@ StackView {
 
         HifiControls.Keyboard {
             id: keyboard
-            raised: parent.keyboardEnabled
+            raised: parent.keyboardEnabled && parent.keyboardRaised
             numeric: parent.punctuationMode
             anchors {
                 bottom: parent.bottom
diff --git a/interface/resources/qml/hifi/tablet/TabletButton.qml b/interface/resources/qml/hifi/tablet/TabletButton.qml
index 5e7e0f5709..169c7acec1 100644
--- a/interface/resources/qml/hifi/tablet/TabletButton.qml
+++ b/interface/resources/qml/hifi/tablet/TabletButton.qml
@@ -1,8 +1,11 @@
 import QtQuick 2.0
 import QtGraphicalEffects 1.0
+import TabletScriptingInterface 1.0
 
 Item {
     id: tabletButton
+
+    property string captionColorOverride: ""
     property var uuid;
     property string icon: "icons/tablet-icons/edit-i.svg"
     property string hoverIcon: tabletButton.icon
@@ -82,7 +85,7 @@ Item {
     }
 
     function urlHelper(src) {
-        if (src.match(/\bhttp/)) {
+        if (src.match(/\bhttp/) || src.match(/\bfile:/)) {
             return src;
         } else {
             return "../../../" + src;
@@ -102,7 +105,7 @@ Item {
 
     Text {
         id: text
-        color: "#ffffff"
+        color: captionColorOverride !== "" ? captionColorOverride: "#ffffff"
         text: tabletButton.text
         font.bold: true
         font.pixelSize: 18
@@ -116,6 +119,7 @@ Item {
         anchors.fill: parent
         hoverEnabled: true
         enabled: true
+        preventStealing: true
         onClicked: {
             console.log("Tablet Button Clicked!");
             if (tabletButton.inDebugMode) {
@@ -127,11 +131,13 @@ Item {
             }
             tabletButton.clicked();
             if (tabletRoot) {
-                tabletRoot.playButtonClickSound();
+                tabletInterface.playSound(TabletEnums.ButtonClick);
             }
         }
         onEntered: {
             tabletButton.isEntered = true;
+            tabletInterface.playSound(TabletEnums.ButtonHover);
+
             if (tabletButton.isActive) {
                 tabletButton.state = "hover active state";
             } else {
@@ -165,7 +171,7 @@ Item {
 
             PropertyChanges {
                 target: text
-                color: "#ffffff"
+                color: captionColorOverride !== "" ? captionColorOverride: "#ffffff"
                 text: tabletButton.hoverText
             }
 
@@ -191,7 +197,7 @@ Item {
 
             PropertyChanges {
                 target: text
-                color: "#333333"
+                color: captionColorOverride !== "" ? captionColorOverride: "#333333"
                 text: tabletButton.activeText
             }
 
@@ -222,7 +228,7 @@ Item {
 
             PropertyChanges {
                 target: text
-                color: "#333333"
+                color: captionColorOverride !== "" ? captionColorOverride: "#333333"
                 text: tabletButton.activeHoverText
             }
 
diff --git a/interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml b/interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml
index fe043f6ac7..dee2eed9c3 100644
--- a/interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml
+++ b/interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml
@@ -32,6 +32,6 @@ StackView {
     TabletPreferencesDialog {
         id: root
         objectName: "TabletGeneralPreferences"
-        showCategories: ["UI", "Snapshots", "Scripts", "Privacy", "Octree", "HMD", "Sixense Controllers", "Perception Neuron", "Kinect", "Vive Pucks Configuration"]
+        showCategories: ["UI", "Snapshots", "Scripts", "Privacy", "Octree", "HMD", "Game Controller", "Sixense Controllers", "Perception Neuron", "Kinect", "Leap Motion"]
     }
 }
diff --git a/interface/resources/qml/hifi/tablet/TabletMenuItem.qml b/interface/resources/qml/hifi/tablet/TabletMenuItem.qml
index 25f672e7a9..11d3cab35e 100644
--- a/interface/resources/qml/hifi/tablet/TabletMenuItem.qml
+++ b/interface/resources/qml/hifi/tablet/TabletMenuItem.qml
@@ -21,29 +21,57 @@ Item {
     property alias text: label.text
     property var source
 
-    implicitHeight: source.visible ? 2 * label.implicitHeight : 0
+    implicitHeight: source !== null ? source.visible ? 2 * label.implicitHeight : 0 : 0
     implicitWidth: 2 * hifi.dimensions.menuPadding.x + check.width + label.width + tail.width
-    visible: source.visible
+    visible: source !== null ? source.visible : false
     width: parent.width
 
-    CheckBox {
+    Item {
         id: check
-        // FIXME: Should use radio buttons if source.exclusiveGroup.
+
         anchors {
             left: parent.left
             leftMargin: hifi.dimensions.menuPadding.x + 15
             verticalCenter: label.verticalCenter
         }
-        width: 20
-        visible: source.visible && source.type === 1 && source.checkable
-        checked: setChecked()
-        function setChecked() {
-            if (!source || source.type !== 1 || !source.checkable) {
-                return false;
+
+        width: checkbox.visible ? checkbox.width : radiobutton.width
+        height: checkbox.visible ? checkbox.height : radiobutton.height
+
+        CheckBox {
+            id: checkbox
+            // FIXME: Should use radio buttons if source.exclusiveGroup.
+            width: 20
+            visible: source !== null ?
+                         source.visible && source.type === 1 && source.checkable && !source.exclusiveGroup :
+                         false
+            checked: setChecked()
+            function setChecked() {
+                if (!source || source.type !== 1 || !source.checkable) {
+                    return false;
+                }
+                // FIXME this works for native QML menus but I don't think it will
+                // for proxied QML menus
+                return source.checked;
+            }
+        }
+
+        RadioButton {
+            id: radiobutton
+            // FIXME: Should use radio buttons if source.exclusiveGroup.
+            width: 20
+            visible: source !== null ?
+                         source.visible && source.type === 1 && source.checkable && source.exclusiveGroup :
+                         false
+            checked: setChecked()
+            function setChecked() {
+                if (!source || source.type !== 1 || !source.checkable) {
+                    return false;
+                }
+                // FIXME this works for native QML menus but I don't think it will
+                // for proxied QML menus
+                return source.checked;
             }
-            // FIXME this works for native QML menus but I don't think it will
-            // for proxied QML menus
-            return source.checked;
         }
     }
 
@@ -56,9 +84,13 @@ Item {
         anchors.left: check.right
         anchors.verticalCenter: parent.verticalCenter
         verticalAlignment: Text.AlignVCenter
-        color: source.enabled ? hifi.colors.baseGrayShadow : hifi.colors.baseGrayShadow50
-        enabled: source.visible && (source.type !== 0 ? source.enabled : false)
-        visible: source.visible
+        color: source !== null ?
+                   source.enabled ? hifi.colors.baseGrayShadow :
+                                    hifi.colors.baseGrayShadow50 :
+        "transparent"
+
+        enabled: source !== null ? source.visible && (source.type !== 0 ? source.enabled : false) : false
+        visible: source !== null ? source.visible : false
         wrapMode: Text.WordWrap
     }
 
@@ -69,7 +101,7 @@ Item {
             leftMargin: hifi.dimensions.menuPadding.x + check.width
             rightMargin: hifi.dimensions.menuPadding.x + tail.width
         }
-        visible: source.type === MenuItemType.Separator
+        visible: source !== null ? source.type === MenuItemType.Separator : false
 
         Rectangle {
             anchors {
@@ -93,23 +125,23 @@ Item {
 
         RalewayLight {
             id: shortcut
-            text: source.shortcut ? source.shortcut : ""
+            text: source !== null ? source.shortcut ? source.shortcut : "" : ""
             size: hifi.fontSizes.shortcutText
             color: hifi.colors.baseGrayShadow
             anchors.verticalCenter: parent.verticalCenter
             anchors.right: parent.right
             anchors.rightMargin: 15
-            visible: source.visible && text != ""
+            visible: source !== null ? source.visible && text != "" : false
         }
 
         HiFiGlyphs {
             text: hifi.glyphs.disclosureExpand
-            color: source.enabled ? hifi.colors.baseGrayShadow : hifi.colors.baseGrayShadow25
+            color: source !== null ? source.enabled ? hifi.colors.baseGrayShadow : hifi.colors.baseGrayShadow25 : "transparent"
             size: 70
             anchors.verticalCenter: parent.verticalCenter
             anchors.right: parent.right
             horizontalAlignment: Text.AlignRight
-            visible: source.visible && (source.type === 2)
+            visible: source !== null ? source.visible && (source.type === 2) : false
         }
     }
 }
diff --git a/interface/resources/qml/hifi/tablet/TabletMenuStack.qml b/interface/resources/qml/hifi/tablet/TabletMenuStack.qml
index 2fd33e9cbc..ce4fac3bd5 100644
--- a/interface/resources/qml/hifi/tablet/TabletMenuStack.qml
+++ b/interface/resources/qml/hifi/tablet/TabletMenuStack.qml
@@ -64,11 +64,12 @@ Item {
             d.pop();
         }
 
-        function toModel(items) {
+        function toModel(items, newMenu) {
             var result = modelMaker.createObject(tabletMenu);
+            var exclusionGroups = {};
+
             for (var i = 0; i < items.length; ++i) {
                 var item = items[i];
-                if (!item.visible) continue;
                 switch (item.type) {
                 case MenuItemType.Menu:
                     result.append({"name": item.title, "item": item})
@@ -77,6 +78,28 @@ Item {
                     if (item.text !== "Users Online") {
                         result.append({"name": item.text, "item": item})
                     }
+
+                    for(var j = 0; j < tabletMenu.rootMenu.exclusionGroupsByMenuItem.count; ++j)
+                    {
+                        var entry = tabletMenu.rootMenu.exclusionGroupsByMenuItem.get(j);
+                        if(entry.menuItem == item.toString())
+                        {
+                            var exclusionGroupId = entry.exclusionGroup;
+                            console.debug('item exclusionGroupId: ', exclusionGroupId)
+
+                            if(!exclusionGroups[exclusionGroupId])
+                            {
+                                exclusionGroups[exclusionGroupId] = exclusiveGroupMaker.createObject(newMenu);
+                                console.debug('new exclusion group created: ', exclusionGroups[exclusionGroupId])
+                            }
+
+                            var exclusionGroup = exclusionGroups[exclusionGroupId];
+
+                            item.exclusiveGroup = exclusionGroup
+                            console.debug('item.exclusiveGroup: ', item.exclusiveGroup)                        
+                        }
+                    }
+
                     break;
                 case MenuItemType.Separator:
                     result.append({"name": "", "item": item})
@@ -114,6 +137,7 @@ Item {
         }
 
         function clearMenus() {
+            topMenu = null
             d.clear()
         }
 
@@ -132,10 +156,21 @@ Item {
             }
         }
 
+        property Component exclusiveGroupMaker: Component {
+            ExclusiveGroup {
+            }
+        }
+
         function buildMenu(items) {
-            var model = toModel(items);
             // Menus must be childed to desktop for Z-ordering
-            var newMenu = menuViewMaker.createObject(tabletMenu, { model: model, isSubMenu: topMenu !== null });
+            var newMenu = menuViewMaker.createObject(tabletMenu);
+            console.debug('newMenu created: ', newMenu)
+
+            var model = toModel(items, newMenu);
+
+            newMenu.model = model;
+            newMenu.isSubMenu = topMenu !== null;
+
             pushMenu(newMenu);
             return newMenu;
         }
@@ -180,5 +215,4 @@ Item {
     function nextItem() { d.topMenu.nextItem(); }
     function selectCurrentItem() { d.topMenu.selectCurrentItem(); }
     function previousPage() { d.topMenu.previousPage(); }
-
 }
diff --git a/interface/resources/qml/hifi/tablet/TabletMenuView.qml b/interface/resources/qml/hifi/tablet/TabletMenuView.qml
index 92e7f59524..4a4a6b7f87 100644
--- a/interface/resources/qml/hifi/tablet/TabletMenuView.qml
+++ b/interface/resources/qml/hifi/tablet/TabletMenuView.qml
@@ -11,9 +11,11 @@
 import QtQuick 2.5
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
+import TabletScriptingInterface 1.0
 
 import "../../styles-uit"
 import "."
+
 FocusScope {
     id: root
     implicitHeight: background.height
@@ -36,7 +38,6 @@ FocusScope {
         //color: isSubMenu ? hifi.colors.faintGray : hifi.colors.faintGray80
     }
 
-
     ListView {
         id: listView
         x: 0
@@ -68,16 +69,21 @@ FocusScope {
         delegate: TabletMenuItem {
             text: name
             source: item
-            onImplicitHeightChanged: listView.recalcSize()
-            onImplicitWidthChanged: listView.recalcSize()
+            onImplicitHeightChanged: listView !== null ? listView.recalcSize() : 0
+            onImplicitWidthChanged: listView !== null ? listView.recalcSize() : 0
 
             MouseArea {
+                enabled: name !== "" && item.enabled
                 anchors.fill: parent
                 hoverEnabled: true
-                onEntered: listView.currentIndex = index
+                onEntered: {
+                    tabletInterface.playSound(TabletEnums.ButtonHover);
+                    listView.currentIndex = index
+                }
+
                 onClicked: {
-                    root.selected(item)
-                    tabletRoot.playButtonClickSound();
+                    tabletInterface.playSound(TabletEnums.ButtonClick);
+                    root.selected(item);
                 }
             }
         }
@@ -124,8 +130,6 @@ FocusScope {
     function nextItem() { listView.currentIndex = (listView.currentIndex + listView.count + 1) % listView.count; }
     function selectCurrentItem() { if (listView.currentIndex != -1) root.selected(currentItem.source); }
     function previousPage() { root.parent.pop(); }
-
-    
 }
 
 
diff --git a/interface/resources/qml/hifi/tablet/TabletRoot.qml b/interface/resources/qml/hifi/tablet/TabletRoot.qml
index faa4013bce..a161741049 100644
--- a/interface/resources/qml/hifi/tablet/TabletRoot.qml
+++ b/interface/resources/qml/hifi/tablet/TabletRoot.qml
@@ -1,6 +1,7 @@
 import QtQuick 2.0
 import Hifi 1.0
 import QtQuick.Controls 1.4
+
 import "../../dialogs"
 import "../../controls"
 
@@ -8,6 +9,7 @@ Item {
     id: tabletRoot
     objectName: "tabletRoot"
     property string username: "Unknown user"
+    property string usernameShort: "Unknown user"
     property var rootMenu;
     property var openModal: null;
     property var openMessage: null;
@@ -93,6 +95,11 @@ Item {
         loader.source = "";
         loader.source = "TabletWebView.qml";
     }
+
+    function loadTabletWebBase() {
+        loader.source = "";
+        loader.source = "./BlocksWebView.qml";
+    }
         
     function returnToPreviousApp() {
         tabletApps.remove(currentApp);
@@ -121,6 +128,9 @@ Item {
         loader.item.url = url;
         loader.item.scriptURL = injectedJavaScriptUrl;
         tabletApps.append({"appUrl": "TabletWebView.qml", "isWebUrl": true, "scriptUrl": injectedJavaScriptUrl, "appWebUrl": url});
+        if (loader.item.hasOwnProperty("closeButtonVisible")) {
+            loader.item.closeButtonVisible = false;
+        }
     }
 
     // used to send a message from qml to interface script.
@@ -149,6 +159,11 @@ Item {
 
     function setUsername(newUsername) {
         username = newUsername;
+        usernameShort = newUsername.substring(0, 8);
+
+        if (newUsername.length > 8) {
+            usernameShort = usernameShort + "..."
+        }
     }
 
     ListModel {
@@ -202,5 +217,11 @@ Item {
     width: 480
     height: 706
 
-    function setShown(value) {}
+    function setShown(value) {
+        if (value === true) {
+            HMD.openTablet(HMD.tabletContextualMode) // pass in current contextual mode flag to maintain flag (otherwise uses default false argument)
+        } else {
+            HMD.closeTablet()
+        }
+    }
 }
diff --git a/interface/resources/qml/hifi/tablet/WindowRoot.qml b/interface/resources/qml/hifi/tablet/WindowRoot.qml
index ea0c2844a1..e3170f85ef 100644
--- a/interface/resources/qml/hifi/tablet/WindowRoot.qml
+++ b/interface/resources/qml/hifi/tablet/WindowRoot.qml
@@ -14,6 +14,8 @@ import "../../windows" as Windows
 import QtQuick 2.0
 import Hifi 1.0
 
+import Qt.labs.settings 1.0
+
 Windows.ScrollingWindow {
     id: tabletRoot
     objectName: "tabletRoot"
@@ -25,8 +27,32 @@ Windows.ScrollingWindow {
     shown: false
     resizable: false
 
+    Settings {
+        id: settings
+        category: "WindowRoot.Windows"
+        property real width: 480
+        property real height: 706
+    }
+
+    onResizableChanged: {
+        if (!resizable) {
+            // restore default size
+            settings.width = tabletRoot.width
+            settings.height = tabletRoot.height
+            tabletRoot.width = 480
+            tabletRoot.height = 706
+        } else {
+            tabletRoot.width = settings.width
+            tabletRoot.height = settings.height
+        }
+    }
+
     signal showDesktop();
 
+    function setResizable(value) {
+        tabletRoot.resizable = value;
+    }
+
     function setMenuProperties(rootMenu, subMenu) {
         tabletRoot.rootMenu = rootMenu;
         tabletRoot.subMenu = subMenu;
@@ -42,9 +68,17 @@ Windows.ScrollingWindow {
         loader.source = "WindowWebView.qml";
     }
 
+    function loadTabletWebBase() {
+        loader.source = "";
+        loader.source = "./BlocksWebView.qml";
+    }
+
     function loadWebUrl(url, injectedJavaScriptUrl) {
         loader.item.url = url;
         loader.item.scriptURL = injectedJavaScriptUrl;
+        if (loader.item.hasOwnProperty("closeButtonVisible")) {
+            loader.item.closeButtonVisible = false;
+        }
     }
 
     // used to send a message from qml to interface script.
@@ -52,8 +86,10 @@ Windows.ScrollingWindow {
 
     // used to receive messages from interface script
     function fromScript(message) {
-        if (loader.item.hasOwnProperty("fromScript")) {
-            loader.item.fromScript(message);
+        if (loader.item !== null) {
+            if (loader.item.hasOwnProperty("fromScript")) {
+                loader.item.fromScript(message);
+            }
         }
     }
 
diff --git a/interface/resources/qml/hifi/tablet/tabletWindows/preferences/Section.qml b/interface/resources/qml/hifi/tablet/tabletWindows/preferences/Section.qml
index 9dd0956000..8cf254809d 100644
--- a/interface/resources/qml/hifi/tablet/tabletWindows/preferences/Section.qml
+++ b/interface/resources/qml/hifi/tablet/tabletWindows/preferences/Section.qml
@@ -81,6 +81,8 @@ Preference {
         property var avatarBuilder: Component { AvatarPreference { } }
         property var buttonBuilder: Component { ButtonPreference { } }
         property var comboBoxBuilder: Component { ComboBoxPreference { } }
+        property var spinnerSliderBuilder: Component { SpinnerSliderPreference { } }
+        property var primaryHandBuilder: Component { PrimaryHandPreference { } }
         property var preferences: []
         property int checkBoxCount: 0
 
@@ -143,6 +145,16 @@ Preference {
                     //to be not overlapped when drop down is active
                     zpos = root.z + 1000 - itemNum
                     break;
+
+                case Preference.SpinnerSlider:
+                    checkBoxCount = 0;
+                    builder = spinnerSliderBuilder;
+                    break;
+
+                case Preference.PrimaryHand:
+                    checkBoxCount++;
+                    builder = primaryHandBuilder;
+                    break;
             };
 
             if (builder) {
diff --git a/interface/resources/qml/hifi/tablet/tabletWindows/preferences/TabletAvatarBrowser.qml b/interface/resources/qml/hifi/tablet/tabletWindows/preferences/TabletAvatarBrowser.qml
index cab76bf818..2ea12f1d3d 100644
--- a/interface/resources/qml/hifi/tablet/tabletWindows/preferences/TabletAvatarBrowser.qml
+++ b/interface/resources/qml/hifi/tablet/tabletWindows/preferences/TabletAvatarBrowser.qml
@@ -31,7 +31,7 @@ Item {
 
     BaseWebView {
         id: webview
-        url: "https://metaverse.highfidelity.com/marketplace?category=avatars"
+        url: (Account.metaverseServerURL + "/marketplace?category=avatars")
         focus: true
 
         anchors {
diff --git a/interface/resources/qml/hifi/toolbars/Toolbar.qml b/interface/resources/qml/hifi/toolbars/Toolbar.qml
index 9015c026b0..01aa29f665 100644
--- a/interface/resources/qml/hifi/toolbars/Toolbar.qml
+++ b/interface/resources/qml/hifi/toolbars/Toolbar.qml
@@ -126,7 +126,7 @@ Window {
 
         sortButtons();
 
-        shown = true;
+        fadeIn(null);
 
         return result;
     }
@@ -142,7 +142,7 @@ Window {
         buttons.splice(index, 1);
 
         if (buttons.length === 0) {
-            shown = false;
+            fadeOut(null);
         }
     }
 }
diff --git a/interface/resources/qml/hifi/toolbars/ToolbarButton.qml b/interface/resources/qml/hifi/toolbars/ToolbarButton.qml
index 3d4231ced7..63149ad23b 100644
--- a/interface/resources/qml/hifi/toolbars/ToolbarButton.qml
+++ b/interface/resources/qml/hifi/toolbars/ToolbarButton.qml
@@ -4,6 +4,7 @@ import QtQuick.Controls 1.4
 StateImage {
     id: button
 
+    property string captionColorOverride: ""
     property bool buttonEnabled: true
     property bool isActive: false
     property bool isEntered: false
@@ -33,7 +34,7 @@ StateImage {
     }
 
     function urlHelper(src) {
-        if (src.match(/\bhttp/)) {
+        if (src.match(/\bhttp/) || src.match(/\bfile:/)) {
             return src;
         } else {
             return "../../../" + src;
@@ -97,7 +98,7 @@ StateImage {
 
     Text {
         id: caption
-        color: button.isActive ? "#000000" : "#ffffff"
+        color: captionColorOverride !== "" ? captionColorOverride: (button.isActive ? "#000000" : "#ffffff")
         text: button.isActive ? (button.isEntered ? button.activeHoverText : button.activeText) : (button.isEntered ? button.hoverText : button.text)
         font.bold: false
         font.pixelSize: 9
diff --git a/interface/resources/qml/styles-uit/HiFiGlyphs.qml b/interface/resources/qml/styles-uit/HiFiGlyphs.qml
index cbd6fa1d68..f78d6c6f59 100644
--- a/interface/resources/qml/styles-uit/HiFiGlyphs.qml
+++ b/interface/resources/qml/styles-uit/HiFiGlyphs.qml
@@ -9,8 +9,6 @@
 //
 
 import QtQuick 2.5
-import QtQuick.Controls 1.4
-import QtQuick.Controls.Styles 1.4
 
 Text {
     id: root
diff --git a/interface/resources/qml/styles-uit/HifiConstants.qml b/interface/resources/qml/styles-uit/HifiConstants.qml
index ca39326102..a0af92dec0 100644
--- a/interface/resources/qml/styles-uit/HifiConstants.qml
+++ b/interface/resources/qml/styles-uit/HifiConstants.qml
@@ -50,7 +50,7 @@ Item {
         id: colors
 
         // Base colors
-        readonly property color baseGray: "#404040"
+        readonly property color baseGray: "#393939"
         readonly property color darkGray: "#121212"
         readonly property color baseGrayShadow: "#252525"
         readonly property color baseGrayHighlight: "#575757"
@@ -138,6 +138,7 @@ Item {
         id: colorSchemes
         readonly property int light: 0
         readonly property int dark: 1
+        readonly property int faintGray: 2
     }
 
     Item {
@@ -178,7 +179,7 @@ Item {
         readonly property real tableHeading: dimensions.largeScreen ? 12 : 10
         readonly property real tableHeadingIcon: dimensions.largeScreen ? 60 : 33
         readonly property real tableText: dimensions.largeScreen ? 15 : 12
-        readonly property real buttonLabel: dimensions.largeScreen ? 13 : 9
+        readonly property real buttonLabel: dimensions.largeScreen ? 14 : 9
         readonly property real iconButton: dimensions.largeScreen ? 13 : 9
         readonly property real listItem: dimensions.largeScreen ? 15 : 11
         readonly property real tabularData: dimensions.largeScreen ? 15 : 11
@@ -209,11 +210,15 @@ Item {
         readonly property int blue: 1
         readonly property int red: 2
         readonly property int black: 3
-        readonly property var textColor: [ colors.darkGray, colors.white, colors.white, colors.white ]
-        readonly property var colorStart: [ colors.white, colors.primaryHighlight, "#d42043", "#343434" ]
-        readonly property var colorFinish: [ colors.lightGrayText, colors.blueAccent, "#94132e", colors.black ]
-        readonly property var hoveredColor: [ colorStart[white], colorStart[blue], colorStart[red], colorFinish[black] ]
-        readonly property var pressedColor: [ colorFinish[white], colorFinish[blue], colorFinish[red], colorStart[black] ]
+        readonly property int none: 4
+        readonly property int noneBorderless: 5
+        readonly property int noneBorderlessWhite: 6
+        readonly property int noneBorderlessGray: 7
+        readonly property var textColor: [ colors.darkGray, colors.white, colors.white, colors.white, colors.white, colors.blueAccent, colors.white, colors.darkGray ]
+        readonly property var colorStart: [ colors.white, colors.primaryHighlight, "#d42043", "#343434", Qt.rgba(0, 0, 0, 0), Qt.rgba(0, 0, 0, 0), Qt.rgba(0, 0, 0, 0), Qt.rgba(0, 0, 0, 0) ]
+        readonly property var colorFinish: [ colors.lightGrayText, colors.blueAccent, "#94132e", colors.black, Qt.rgba(0, 0, 0, 0), Qt.rgba(0, 0, 0, 0), Qt.rgba(0, 0, 0, 0), Qt.rgba(0, 0, 0, 0) ]
+        readonly property var hoveredColor: [ colorStart[white], colorStart[blue], colorStart[red], colorFinish[black], colorStart[none], colorStart[noneBorderless], colorStart[noneBorderlessWhite], colorStart[noneBorderlessGray] ]
+        readonly property var pressedColor: [ colorFinish[white], colorFinish[blue], colorFinish[red], colorStart[black], colorStart[none], colorStart[noneBorderless], colorStart[noneBorderlessWhite], colorStart[noneBorderlessGray] ]
         readonly property var disabledColorStart: [ colorStart[white], colors.baseGrayHighlight]
         readonly property var disabledColorFinish: [ colorFinish[white], colors.baseGrayShadow]
         readonly property var disabledTextColor: [ colors.lightGrayText, colors.baseGrayShadow]
@@ -336,5 +341,17 @@ Item {
         readonly property string source: "\ue01c"
         readonly property string playback_play: "\ue01d"
         readonly property string stop_square: "\ue01e"
+        readonly property string avatarTPose: "\ue01f"
+        readonly property string lock: "\ue006"
+        readonly property string checkmark: "\ue020"
+        readonly property string leftRightArrows: "\ue021"
+        readonly property string hfc: "\ue022"
+        readonly property string home2: "\ue023"
+        readonly property string walletKey: "\ue024"
+        readonly property string lightning: "\ue025"
+        readonly property string securityImage: "\ue026"
+        readonly property string wallet: "\ue027"
+        readonly property string paperPlane: "\ue028"
+        readonly property string passphrase: "\ue029"
     }
 }
diff --git a/interface/resources/qml/styles-uit/RalewayRegular.qml b/interface/resources/qml/styles-uit/RalewayRegular.qml
index 2cffeeb59d..aab31ecf33 100644
--- a/interface/resources/qml/styles-uit/RalewayRegular.qml
+++ b/interface/resources/qml/styles-uit/RalewayRegular.qml
@@ -8,7 +8,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-import QtQuick 2.5
+import QtQuick 2.7
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 
diff --git a/interface/resources/qml/windows/Fadable.qml b/interface/resources/qml/windows/Fadable.qml
index 38cd4bf1f9..4d506755f2 100644
--- a/interface/resources/qml/windows/Fadable.qml
+++ b/interface/resources/qml/windows/Fadable.qml
@@ -26,6 +26,7 @@ FocusScope {
     property var completionCallback;
     // The target property to animate, usually scale or opacity
     property alias fadeTargetProperty: root.opacity
+    property bool disableFade: false
     // always start the property at 0 to enable fade in on creation
     fadeTargetProperty: 0
     // DO NOT set visible to false or when derived types override it it
diff --git a/interface/resources/qml/windows/Frame.qml b/interface/resources/qml/windows/Frame.qml
index 030af974f6..c3b8399e01 100644
--- a/interface/resources/qml/windows/Frame.qml
+++ b/interface/resources/qml/windows/Frame.qml
@@ -26,6 +26,7 @@ Item {
     readonly property int frameMarginRight: frame.decoration ? frame.decoration.frameMarginRight : 0
     readonly property int frameMarginTop: frame.decoration ? frame.decoration.frameMarginTop : 0
     readonly property int frameMarginBottom: frame.decoration ? frame.decoration.frameMarginBottom : 0
+    readonly property int offsetCorrection: 20
 
     // Frames always fill their parents, but their decorations may extend
     // beyond the window via negative margin sizes
@@ -73,7 +74,7 @@ Item {
     Rectangle {
         id: sizeOutline
         x: -frameMarginLeft
-        y: -frameMarginTop
+        y: -frameMarginTop - offsetCorrection
         width: window ? window.width + frameMarginLeft + frameMarginRight + 2 : 0
         height: window ? window.height + frameMarginTop + frameMarginBottom + 2 : 0
         color: hifi.colors.baseGrayHighlight15
diff --git a/interface/resources/qml/windows/TabletModalWindow.qml b/interface/resources/qml/windows/TabletModalWindow.qml
index 05f192f7a7..e21cb6b224 100644
--- a/interface/resources/qml/windows/TabletModalWindow.qml
+++ b/interface/resources/qml/windows/TabletModalWindow.qml
@@ -15,7 +15,7 @@ import "."
 Rectangle {
     id: modalWindow
     layer.enabled: true
-    property var title: "Modal"
+    property var title: "Open"
     width: tabletRoot.width
     height: tabletRoot.height
     color: "#80000000"
diff --git a/interface/resources/shaders/hmd_ui_glow.frag b/interface/resources/shaders/hmd_ui_glow.frag
deleted file mode 100644
index 5dda76e89d..0000000000
--- a/interface/resources/shaders/hmd_ui_glow.frag
+++ /dev/null
@@ -1,86 +0,0 @@
-//
-//  Created by Bradley Austin Davis on 2016/07/11
-//  Copyright 2013-2016 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
-//
-
-uniform sampler2D sampler;
-
-struct OverlayData {
-    mat4 mvp;
-    vec4 glowPoints;
-    vec4 glowColors[2];
-    vec4 resolutionRadiusAlpha;
-
-    vec4 extraGlowColor;
-    vec2 extraGlowPoint;
-};
-
-layout(std140) uniform overlayBuffer {
-    OverlayData overlay;
-};
-
-vec2 resolution = overlay.resolutionRadiusAlpha.xy;
-float radius = overlay.resolutionRadiusAlpha.z;
-float alpha = overlay.resolutionRadiusAlpha.w;
-vec4 glowPoints = overlay.glowPoints;
-vec4 glowColors[2] = overlay.glowColors;
-
-vec2 extraGlowPoint = overlay.extraGlowPoint;
-vec4 extraGlowColor = overlay.extraGlowColor;
-
-in vec3 vPosition;
-in vec2 vTexCoord;
-
-out vec4 FragColor;
-
-float easeInOutCubic(float f) {
-    const float d = 1.0;
-    const float b = 0.0;
-    const float c = 1.0;
-    float t = f;
-    if ((t /= d / 2.0) < 1.0) return c / 2.0 * t * t * t + b;
-    return c / 2.0 * ((t -= 2.0) * t * t + 2.0) + b;
-}
-
-void main() {
-    FragColor = texture(sampler, vTexCoord);
-
-    vec2 aspect = resolution;
-    aspect /= resolution.x;
-
-    float glowIntensity = 0.0;
-    float dist1 = distance(vTexCoord * aspect, glowPoints.xy * aspect);
-    float dist2 = distance(vTexCoord * aspect, glowPoints.zw * aspect);
-    float dist3 = distance(vTexCoord * aspect, extraGlowPoint * aspect);
-    float distX = min(dist1, dist2);
-    float dist = min(distX, dist3);
-    vec3 glowColor = glowColors[0].rgb;
-    if (dist2 < dist1) {
-        glowColor = glowColors[1].rgb;
-    }
-    if (dist3 < dist2) {
-        glowColor = extraGlowColor.rgb;
-    }
-
-    if (dist <= radius) {
-       glowIntensity = 1.0 - (dist / radius);
-       glowColor.rgb = pow(glowColor, vec3(1.0 - glowIntensity));
-       glowIntensity = easeInOutCubic(glowIntensity);
-       glowIntensity = pow(glowIntensity, 0.5);
-    }
-
-    if (alpha <= 0.0) {
-        if (glowIntensity <= 0.0) {
-            discard;
-        }
-
-        FragColor = vec4(glowColor, glowIntensity);
-        return;
-    }
-
-    FragColor.rgb = mix(FragColor.rgb, glowColor.rgb, glowIntensity);
-    FragColor.a *= alpha;
-}
\ No newline at end of file
diff --git a/interface/resources/shaders/hmd_ui_glow.vert b/interface/resources/shaders/hmd_ui_glow.vert
deleted file mode 100644
index 71089d8608..0000000000
--- a/interface/resources/shaders/hmd_ui_glow.vert
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-//  Created by Bradley Austin Davis on 2016/07/11
-//  Copyright 2013-2016 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
-//
-
-struct OverlayData {
-    mat4 mvp;
-    vec4 glowPoints;
-    vec4 glowColors[2];
-    vec4 resolutionRadiusAlpha;
-
-    vec4 extraGlowColor;
-    vec2 extraGlowPoint;
-};
-
-layout(std140) uniform overlayBuffer {
-    OverlayData overlay;
-};
-
-mat4 mvp = overlay.mvp;
-
-layout(location = 0) in vec3 Position;
-layout(location = 3) in vec2 TexCoord;
-
-out vec3 vPosition;
-out vec2 vTexCoord;
-
-void main() {
-  gl_Position = mvp * vec4(Position, 1);
-  vTexCoord = TexCoord;
-  vPosition = Position;
-}
diff --git a/interface/resources/sounds/Button01.wav b/interface/resources/sounds/Button01.wav
new file mode 100644
index 0000000000..e1c8111c6f
Binary files /dev/null and b/interface/resources/sounds/Button01.wav differ
diff --git a/interface/resources/sounds/Button02.wav b/interface/resources/sounds/Button02.wav
new file mode 100644
index 0000000000..f4bac99e38
Binary files /dev/null and b/interface/resources/sounds/Button02.wav differ
diff --git a/interface/resources/sounds/Button03.wav b/interface/resources/sounds/Button03.wav
new file mode 100644
index 0000000000..1eb28b7daf
Binary files /dev/null and b/interface/resources/sounds/Button03.wav differ
diff --git a/interface/resources/sounds/Button04.wav b/interface/resources/sounds/Button04.wav
new file mode 100644
index 0000000000..cd76d0174c
Binary files /dev/null and b/interface/resources/sounds/Button04.wav differ
diff --git a/interface/resources/sounds/Button05.wav b/interface/resources/sounds/Button05.wav
new file mode 100644
index 0000000000..72d2622e9d
Binary files /dev/null and b/interface/resources/sounds/Button05.wav differ
diff --git a/interface/resources/sounds/Button06.wav b/interface/resources/sounds/Button06.wav
new file mode 100644
index 0000000000..30a097ce45
Binary files /dev/null and b/interface/resources/sounds/Button06.wav differ
diff --git a/interface/resources/sounds/Button07.wav b/interface/resources/sounds/Button07.wav
new file mode 100644
index 0000000000..5d285ffa07
Binary files /dev/null and b/interface/resources/sounds/Button07.wav differ
diff --git a/interface/resources/sounds/Collapse.wav b/interface/resources/sounds/Collapse.wav
new file mode 100644
index 0000000000..7a169d506c
Binary files /dev/null and b/interface/resources/sounds/Collapse.wav differ
diff --git a/interface/resources/sounds/Expand.wav b/interface/resources/sounds/Expand.wav
new file mode 100644
index 0000000000..7f7710e7f6
Binary files /dev/null and b/interface/resources/sounds/Expand.wav differ
diff --git a/interface/resources/sounds/Tab01.wav b/interface/resources/sounds/Tab01.wav
new file mode 100644
index 0000000000..38cf7decc4
Binary files /dev/null and b/interface/resources/sounds/Tab01.wav differ
diff --git a/interface/resources/sounds/Tab02.wav b/interface/resources/sounds/Tab02.wav
new file mode 100644
index 0000000000..04ad9b909f
Binary files /dev/null and b/interface/resources/sounds/Tab02.wav differ
diff --git a/interface/resources/sounds/Tab03.wav b/interface/resources/sounds/Tab03.wav
new file mode 100644
index 0000000000..db7545a365
Binary files /dev/null and b/interface/resources/sounds/Tab03.wav differ
diff --git a/interface/resources/sounds/sample.wav b/interface/resources/sounds/sample.wav
index d461ab9186..9c9289bb51 100644
Binary files a/interface/resources/sounds/sample.wav and b/interface/resources/sounds/sample.wav differ
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 0d9f19b86f..c53b2c993c 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -25,6 +25,7 @@
 #include <QtCore/QCommandLineParser>
 #include <QtCore/QMimeData>
 #include <QtCore/QThreadPool>
+#include <QtConcurrent/QtConcurrentRun>
 
 #include <QtGui/QScreen>
 #include <QtGui/QWindow>
@@ -48,6 +49,7 @@
 
 #include <gl/QOpenGLContextWrapper.h>
 
+#include <shared/QtHelpers.h>
 #include <shared/GlobalAppProperties.h>
 #include <StatTracker.h>
 #include <Trace.h>
@@ -59,6 +61,7 @@
 #include <AssetClient.h>
 #include <AssetUpload.h>
 #include <AutoUpdater.h>
+#include <Midi.h>
 #include <AudioInjectorManager.h>
 #include <AvatarBookmarks.h>
 #include <CursorManager.h>
@@ -67,6 +70,7 @@
 #include <EntityScriptClient.h>
 #include <EntityScriptServerLogClient.h>
 #include <EntityScriptingInterface.h>
+#include "ui/overlays/ContextOverlayInterface.h"
 #include <ErrorDialog.h>
 #include <FileScriptingInterface.h>
 #include <Finally.h>
@@ -75,8 +79,6 @@
 #include <gpu/Batch.h>
 #include <gpu/Context.h>
 #include <gpu/gl/GLBackend.h>
-#include <HFActionEvent.h>
-#include <HFBackEvent.h>
 #include <InfoView.h>
 #include <input-plugins/InputPlugin.h>
 #include <controllers/UserInputMapper.h>
@@ -109,7 +111,6 @@
 #include <plugins/SteamClientPlugin.h>
 #include <plugins/InputConfiguration.h>
 #include <RecordingScriptingInterface.h>
-#include <RenderableWebEntityItem.h>
 #include <UpdateSceneTask.h>
 #include <RenderViewTask.h>
 #include <SecondaryCamera.h>
@@ -119,6 +120,7 @@
 #include <SceneScriptingInterface.h>
 #include <ScriptEngines.h>
 #include <ScriptCache.h>
+#include <ShapeEntityItem.h>
 #include <SoundCache.h>
 #include <ui/TabletScriptingInterface.h>
 #include <ui/ToolbarScriptingInterface.h>
@@ -135,6 +137,7 @@
 #include <display-plugins/CompositorHelper.h>
 #include <trackers/EyeTracker.h>
 #include <avatars-renderer/ScriptAvatar.h>
+#include <RenderableEntityItem.h>
 
 #include "AudioClient.h"
 #include "audio/AudioScope.h"
@@ -142,7 +145,6 @@
 #include "avatar/MyHead.h"
 #include "CrashHandler.h"
 #include "devices/DdeFaceTracker.h"
-#include "devices/Leapmotion.h"
 #include "DiscoverabilityManager.h"
 #include "GLCanvas.h"
 #include "InterfaceDynamicFactory.h"
@@ -163,9 +165,12 @@
 #include "scripting/WindowScriptingInterface.h"
 #include "scripting/ControllerScriptingInterface.h"
 #include "scripting/RatesScriptingInterface.h"
+#include "scripting/SelectionScriptingInterface.h"
+#include "scripting/WalletScriptingInterface.h"
 #if defined(Q_OS_MAC) || defined(Q_OS_WIN)
 #include "SpeechRecognizer.h"
 #endif
+#include "ui/ResourceImageItem.h"
 #include "ui/AddressBarDialog.h"
 #include "ui/AvatarInputs.h"
 #include "ui/DialogsManager.h"
@@ -183,23 +188,107 @@
 #include "InterfaceParentFinder.h"
 #include "ui/OctreeStatsProvider.h"
 
-#include "FrameTimingsScriptingInterface.h"
 #include <GPUIdent.h>
 #include <gl/GLHelpers.h>
 #include <src/scripting/LimitlessVoiceRecognitionScriptingInterface.h>
 #include <EntityScriptClient.h>
 #include <ModelScriptingInterface.h>
 
+#include <raypick/RayPickScriptingInterface.h>
+#include <raypick/LaserPointerScriptingInterface.h>
+
+#include <FadeEffect.h>
+
+#include "commerce/Ledger.h"
+#include "commerce/Wallet.h"
+#include "commerce/QmlCommerce.h"
+
 // On Windows PC, NVidia Optimus laptop, we want to enable NVIDIA GPU
 // FIXME seems to be broken.
 #if defined(Q_OS_WIN)
 #include <VersionHelpers.h>
 
+#ifdef DEBUG_EVENT_QUEUE
+// This is a HACK that uses private headers included with the qt source distrubution.
+// To use this feature you need to add these directores to your include path:
+// E:/Qt/5.9.1/Src/qtbase/include/QtCore/5.9.1/QtCore
+// E:/Qt/5.9.1/Src/qtbase/include/QtCore/5.9.1
+#define QT_BOOTSTRAPPED
+#include <private/qthread_p.h>
+#include <private/qobject_p.h>
+#undef QT_BOOTSTRAPPED
+#endif
+
 extern "C" {
  _declspec(dllexport) DWORD NvOptimusEnablement = 0x00000001;
 }
 #endif
 
+enum ApplicationEvent {
+    // Execute a lambda function
+    Lambda = QEvent::User + 1,
+    // Trigger the next render
+    Render,
+    // Trigger the next idle
+    Idle,
+};
+
+
+class RenderEventHandler : public QObject {
+    using Parent = QObject;
+    Q_OBJECT
+public:
+    RenderEventHandler(QOpenGLContext* context) {
+        _renderContext = new OffscreenGLCanvas();
+        _renderContext->setObjectName("RenderContext");
+        _renderContext->create(context);
+        if (!_renderContext->makeCurrent()) {
+            qFatal("Unable to make rendering context current");
+        }
+        _renderContext->doneCurrent();
+
+        // Deleting the object with automatically shutdown the thread
+        connect(qApp, &QCoreApplication::aboutToQuit, this, &QObject::deleteLater);
+
+        // Transfer to a new thread
+        moveToNewNamedThread(this, "RenderThread", [this](QThread* renderThread) {
+            hifi::qt::addBlockingForbiddenThread("Render", renderThread);
+            _renderContext->moveToThreadWithContext(renderThread);
+            qApp->_lastTimeRendered.start();
+        }, std::bind(&RenderEventHandler::initialize, this), QThread::HighestPriority);
+    }
+
+private:
+    void initialize() {
+        PROFILE_SET_THREAD_NAME("Render");
+        if (!_renderContext->makeCurrent()) {
+            qFatal("Unable to make rendering context current on render thread");
+        }
+    }
+
+    void render() {
+        if (qApp->shouldPaint()) {
+            qApp->paintGL();
+        }
+    }
+
+    bool event(QEvent* event) override {
+        switch ((int)event->type()) {
+            case ApplicationEvent::Render:
+                render();
+                qApp->_pendingRenderEvent.store(false);
+                return true;
+
+            default:
+                break;
+        }
+        return Parent::event(event);
+    }
+
+    OffscreenGLCanvas* _renderContext { nullptr };
+};
+
+
 Q_LOGGING_CATEGORY(trace_app_input_mouse, "trace.app.input.mouse")
 
 using namespace std;
@@ -208,6 +297,10 @@ static QTimer locationUpdateTimer;
 static QTimer identityPacketTimer;
 static QTimer pingTimer;
 
+static const QString DISABLE_WATCHDOG_FLAG("HIFI_DISABLE_WATCHDOG");
+static bool DISABLE_WATCHDOG = QProcessEnvironment::systemEnvironment().contains(DISABLE_WATCHDOG_FLAG);
+
+
 static const int MAX_CONCURRENT_RESOURCE_DOWNLOADS = 16;
 
 // For processing on QThreadPool, we target a number of threads after reserving some
@@ -218,6 +311,7 @@ static const int MIN_PROCESSING_THREAD_POOL_SIZE = 1;
 static const QString SNAPSHOT_EXTENSION  = ".jpg";
 static const QString SVO_EXTENSION  = ".svo";
 static const QString SVO_JSON_EXTENSION = ".svo.json";
+static const QString JSON_GZ_EXTENSION = ".json.gz";
 static const QString JSON_EXTENSION = ".json";
 static const QString JS_EXTENSION  = ".js";
 static const QString FST_EXTENSION  = ".fst";
@@ -225,6 +319,7 @@ static const QString FBX_EXTENSION  = ".fbx";
 static const QString OBJ_EXTENSION  = ".obj";
 static const QString AVA_JSON_EXTENSION = ".ava.json";
 static const QString WEB_VIEW_TAG = "noDownload=true";
+static const QString ZIP_EXTENSION = ".zip";
 
 static const float MIRROR_FULLSCREEN_DISTANCE = 0.389f;
 
@@ -250,13 +345,17 @@ static const QString DESKTOP_DISPLAY_PLUGIN_NAME = "Desktop";
 
 static const QString SYSTEM_TABLET = "com.highfidelity.interface.tablet.system";
 
+static const QString DOMAIN_SPAWNING_POINT = "/0, -10, 0";
+
 const QHash<QString, Application::AcceptURLMethod> Application::_acceptedExtensions {
     { SVO_EXTENSION, &Application::importSVOFromURL },
     { SVO_JSON_EXTENSION, &Application::importSVOFromURL },
     { AVA_JSON_EXTENSION, &Application::askToWearAvatarAttachmentUrl },
     { JSON_EXTENSION, &Application::importJSONFromURL },
     { JS_EXTENSION, &Application::askToLoadScript },
-    { FST_EXTENSION, &Application::askToSetAvatarUrl }
+    { FST_EXTENSION, &Application::askToSetAvatarUrl },
+    { JSON_GZ_EXTENSION, &Application::askToReplaceDomainContent },
+    { ZIP_EXTENSION, &Application::importFromZIP }
 };
 
 class DeadlockWatchdogThread : public QThread {
@@ -395,6 +494,10 @@ public:
                     return true;
                 }
             }
+
+            if (message->message == WM_DEVICECHANGE) {
+                Midi::USBchanged();                // re-scan the MIDI bus
+            }
         }
         return false;
     }
@@ -405,10 +508,10 @@ class LambdaEvent : public QEvent {
     std::function<void()> _fun;
 public:
     LambdaEvent(const std::function<void()> & fun) :
-    QEvent(static_cast<QEvent::Type>(Application::Lambda)), _fun(fun) {
+    QEvent(static_cast<QEvent::Type>(ApplicationEvent::Lambda)), _fun(fun) {
     }
     LambdaEvent(std::function<void()> && fun) :
-    QEvent(static_cast<QEvent::Type>(Application::Lambda)), _fun(fun) {
+    QEvent(static_cast<QEvent::Type>(ApplicationEvent::Lambda)), _fun(fun) {
     }
     void call() const { _fun(); }
 };
@@ -477,6 +580,12 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
     static const auto SUPPRESS_SETTINGS_RESET = "--suppress-settings-reset";
     bool suppressPrompt = cmdOptionExists(argc, const_cast<const char**>(argv), SUPPRESS_SETTINGS_RESET);
     bool previousSessionCrashed = CrashHandler::checkForResetSettings(runningMarkerExisted, suppressPrompt);
+    // get dir to use for cache
+    static const auto CACHE_SWITCH = "--cache";
+    QString cacheDir = getCmdOption(argc, const_cast<const char**>(argv), CACHE_SWITCH);
+    if (!cacheDir.isEmpty()) {
+        qApp->setProperty(hifi::properties::APP_LOCAL_DATA_PATH, cacheDir);
+    }
 
     Setting::init();
 
@@ -509,6 +618,7 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
     DependencyManager::registerInheritance<SpatialParentFinder, InterfaceParentFinder>();
 
     // Set dependencies
+    DependencyManager::set<Cursor::Manager>();
     DependencyManager::set<AccountManager>(std::bind(&Application::getUserAgent, qApp));
     DependencyManager::set<StatTracker>();
     DependencyManager::set<ScriptEngines>(ScriptEngine::CLIENT_SCRIPT);
@@ -558,6 +668,7 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
     DependencyManager::set<SceneScriptingInterface>();
     DependencyManager::set<OffscreenUi>();
     DependencyManager::set<AutoUpdater>();
+    DependencyManager::set<Midi>();
     DependencyManager::set<PathUtils>();
     DependencyManager::set<InterfaceDynamicFactory>();
     DependencyManager::set<AudioInjectorManager>();
@@ -580,6 +691,15 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
     DependencyManager::set<Snapshot>();
     DependencyManager::set<CloseEventSender>();
     DependencyManager::set<ResourceManager>();
+    DependencyManager::set<SelectionScriptingInterface>();
+    DependencyManager::set<Ledger>();
+    DependencyManager::set<Wallet>();
+    DependencyManager::set<WalletScriptingInterface>();
+
+    DependencyManager::set<FadeEffect>();
+
+    DependencyManager::set<LaserPointerScriptingInterface>();
+    DependencyManager::set<RayPickScriptingInterface>();
 
     return previousSessionCrashed;
 }
@@ -608,6 +728,7 @@ const float DEFAULT_DESKTOP_TABLET_SCALE_PERCENT = 75.0f;
 const bool DEFAULT_DESKTOP_TABLET_BECOMES_TOOLBAR = true;
 const bool DEFAULT_HMD_TABLET_BECOMES_TOOLBAR = false;
 const bool DEFAULT_PREFER_AVATAR_FINGER_OVER_STYLUS = false;
+const QString DEFAULT_CURSOR_NAME = "DEFAULT";
 
 Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bool runningMarkerExisted) :
     QApplication(argc, argv),
@@ -627,6 +748,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     _hmdTabletBecomesToolbarSetting("hmdTabletBecomesToolbar", DEFAULT_HMD_TABLET_BECOMES_TOOLBAR),
     _preferAvatarFingerOverStylusSetting("preferAvatarFingerOverStylus", DEFAULT_PREFER_AVATAR_FINGER_OVER_STYLUS),
     _constrainToolbarPosition("toolbar/constrainToolbarToCenterX", true),
+    _preferredCursor("preferredCursor", DEFAULT_CURSOR_NAME),
     _scaleMirror(1.0f),
     _rotateMirror(0.0f),
     _raiseMirror(0.0f),
@@ -637,7 +759,9 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     _notifiedPacketVersionMismatchThisDomain(false),
     _maxOctreePPS(maxOctreePacketsPerSecond.get()),
     _lastFaceTrackerUpdate(0),
-    _snapshotSound(nullptr)
+    _snapshotSound(nullptr),
+    _sampleSound(nullptr)
+
 {
     auto steamClient = PluginManager::getInstance()->getSteamClientPlugin();
     setProperty(hifi::properties::STEAM, (steamClient && steamClient->isRunning()));
@@ -682,12 +806,11 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     installNativeEventFilter(&MyNativeEventFilter::getInstance());
 #endif
 
-    _logger = new FileLogger(this);  // After setting organization name in order to get correct directory
-
+    _logger = new FileLogger(this);
     qInstallMessageHandler(messageHandler);
 
     QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "styles/Inconsolata.otf");
-    _window->setWindowTitle("Interface");
+    _window->setWindowTitle("High Fidelity Interface");
 
     Model::setAbstractViewStateInterface(this); // The model class will sometimes need to know view state details from us
 
@@ -695,8 +818,16 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     nodeList->startThread();
 
     // Set up a watchdog thread to intentionally crash the application on deadlocks
-    _deadlockWatchdogThread = new DeadlockWatchdogThread();
-    _deadlockWatchdogThread->start();
+    if (!DISABLE_WATCHDOG) {
+        (new DeadlockWatchdogThread())->start();
+    }
+
+    // Set File Logger Session UUID
+    auto avatarManager = DependencyManager::get<AvatarManager>();
+    auto myAvatar = avatarManager ? avatarManager->getMyAvatar() : nullptr;
+    auto accountManager = DependencyManager::get<AccountManager>();
+
+    _logger->setSessionID(accountManager->getSessionID());
 
     if (steamClient) {
         qCDebug(interfaceapp) << "[VERSION] SteamVR buildID:" << steamClient->getSteamVRBuildID();
@@ -814,8 +945,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     // send a location update immediately
     discoverabilityManager->updateLocation();
 
-    auto myAvatar = getMyAvatar();
-
     connect(nodeList.data(), &NodeList::nodeAdded, this, &Application::nodeAdded);
     connect(nodeList.data(), &NodeList::nodeKilled, this, &Application::nodeKilled);
     connect(nodeList.data(), &NodeList::nodeActivated, this, &Application::nodeActivated);
@@ -826,9 +955,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     // you might think we could just do this in NodeList but we only want this connection for Interface
     connect(nodeList.data(), &NodeList::limitOfSilentDomainCheckInsReached, nodeList.data(), &NodeList::reset);
 
-    // connect to appropriate slots on AccountManager
-    auto accountManager = DependencyManager::get<AccountManager>();
-
     auto dialogsManager = DependencyManager::get<DialogsManager>();
     connect(accountManager.data(), &AccountManager::authRequired, dialogsManager.data(), &DialogsManager::showLoginDialog);
     connect(accountManager.data(), &AccountManager::usernameChanged, this, &Application::updateWindowTitle);
@@ -856,8 +982,12 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     connect(myAvatar.get(), &MyAvatar::positionGoneTo,
         DependencyManager::get<AddressManager>().data(), &AddressManager::storeCurrentAddress);
 
+    // Inititalize sample before registering
+    QFileInfo infSample = QFileInfo(PathUtils::resourcesPath() + "sounds/sample.wav");
+    _sampleSound = DependencyManager::get<SoundCache>()->getSound(QUrl::fromLocalFile(infSample.absoluteFilePath()));
+
     auto scriptEngines = DependencyManager::get<ScriptEngines>().data();
-    scriptEngines->registerScriptInitializer([this](ScriptEngine* engine){
+    scriptEngines->registerScriptInitializer([this](ScriptEnginePointer engine){
         registerScriptEngineWithApplicationServices(engine);
     });
 
@@ -874,7 +1004,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
 
     connect(scriptEngines, &ScriptEngines::scriptLoadError,
         scriptEngines, [](const QString& filename, const QString& error){
-        OffscreenUi::warning(nullptr, "Error Loading Script", filename + " failed to load.");
+        OffscreenUi::asyncWarning(nullptr, "Error Loading Script", filename + " failed to load.");
     }, Qt::QueuedConnection);
 
 #ifdef _WIN32
@@ -888,6 +1018,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
 
     // connect to the packet sent signal of the _entityEditSender
     connect(&_entityEditSender, &EntityEditPacketSender::packetSent, this, &Application::packetSent);
+    connect(&_entityEditSender, &EntityEditPacketSender::addingEntityWithCertificate, this, &Application::addingEntityWithCertificate);
 
     const char** constArgv = const_cast<const char**>(argv);
     QString concurrentDownloadsStr = getCmdOption(argc, constArgv, "--concurrent-downloads");
@@ -922,14 +1053,10 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     _glWidget->setFocusPolicy(Qt::StrongFocus);
     _glWidget->setFocus();
 
-#ifdef Q_OS_MAC
-    auto cursorTarget = _window; // OSX doesn't seem to provide for hiding the cursor only on the GL widget
-#else
-    // On windows and linux, hiding the top level cursor also means it's invisible when hovering over the
-    // window menu, which is a pain, so only hide it for the GL surface
-    auto cursorTarget = _glWidget;
-#endif
-    cursorTarget->setCursor(Qt::BlankCursor);
+    if (cmdOptionExists(argc, constArgv, "--system-cursor")) {
+        _preferredCursor.set(Cursor::Manager::getIconName(Cursor::Icon::SYSTEM));
+    }
+    showCursor(Cursor::Manager::lookupIcon(_preferredCursor.get()));
 
     // enable mouse tracking; otherwise, we only get drag events
     _glWidget->setMouseTracking(true);
@@ -942,6 +1069,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     // Make sure we don't time out during slow operations at startup
     updateHeartbeat();
 
+    // Now that OpenGL is initialized, we are sure we have a valid context and can create the various pipeline shaders with success.
+    DependencyManager::get<GeometryCache>()->initializeShapePipelines();
 
     // sessionRunTime will be reset soon by loadSettings. Grab it now to get previous session value.
     // The value will be 0 if the user blew away settings this session, which is both a feature and a bug.
@@ -988,12 +1117,67 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
 
     // add firstRun flag from settings to launch event
     Setting::Handle<bool> firstRun { Settings::firstRun, true };
-    properties["first_run"] = firstRun.get();
 
-    // add the user's machine ID to the launch event
-    properties["machine_fingerprint"] = uuidStringWithoutCurlyBraces(FingerprintUtils::getMachineFingerprint());
+    // once the settings have been loaded, check if we need to flip the default for UserActivityLogger
+    auto& userActivityLogger = UserActivityLogger::getInstance();
+    if (!userActivityLogger.isDisabledSettingSet()) {
+        // the user activity logger is opt-out for Interface
+        // but it's defaulted to disabled for other targets
+        // so we need to enable it here if it has never been disabled by the user
+        userActivityLogger.disable(false);
+    }
 
-    UserActivityLogger::getInstance().logAction("launch", properties);
+    if (userActivityLogger.isEnabled()) {
+        // sessionRunTime will be reset soon by loadSettings. Grab it now to get previous session value.
+        // The value will be 0 if the user blew away settings this session, which is both a feature and a bug.
+        static const QString TESTER = "HIFI_TESTER";
+        auto gpuIdent = GPUIdent::getInstance();
+        auto glContextData = getGLContextData();
+        QJsonObject properties = {
+            { "version", applicationVersion() },
+            { "tester", QProcessEnvironment::systemEnvironment().contains(TESTER) },
+            { "previousSessionCrashed", _previousSessionCrashed },
+            { "previousSessionRuntime", sessionRunTime.get() },
+            { "cpu_architecture", QSysInfo::currentCpuArchitecture() },
+            { "kernel_type", QSysInfo::kernelType() },
+            { "kernel_version", QSysInfo::kernelVersion() },
+            { "os_type", QSysInfo::productType() },
+            { "os_version", QSysInfo::productVersion() },
+            { "gpu_name", gpuIdent->getName() },
+            { "gpu_driver", gpuIdent->getDriver() },
+            { "gpu_memory", static_cast<qint64>(gpuIdent->getMemory()) },
+            { "gl_version_int", glVersionToInteger(glContextData.value("version").toString()) },
+            { "gl_version", glContextData["version"] },
+            { "gl_vender", glContextData["vendor"] },
+            { "gl_sl_version", glContextData["sl_version"] },
+            { "gl_renderer", glContextData["renderer"] },
+            { "ideal_thread_count", QThread::idealThreadCount() }
+        };
+        auto macVersion = QSysInfo::macVersion();
+        if (macVersion != QSysInfo::MV_None) {
+            properties["os_osx_version"] = QSysInfo::macVersion();
+        }
+        auto windowsVersion = QSysInfo::windowsVersion();
+        if (windowsVersion != QSysInfo::WV_None) {
+            properties["os_win_version"] = QSysInfo::windowsVersion();
+        }
+
+        ProcessorInfo procInfo;
+        if (getProcessorInfo(procInfo)) {
+            properties["processor_core_count"] = procInfo.numProcessorCores;
+            properties["logical_processor_count"] = procInfo.numLogicalProcessors;
+            properties["processor_l1_cache_count"] = procInfo.numProcessorCachesL1;
+            properties["processor_l2_cache_count"] = procInfo.numProcessorCachesL2;
+            properties["processor_l3_cache_count"] = procInfo.numProcessorCachesL3;
+        }
+
+        properties["first_run"] = firstRun.get();
+
+        // add the user's machine ID to the launch event
+        properties["machine_fingerprint"] = uuidStringWithoutCurlyBraces(FingerprintUtils::getMachineFingerprint());
+
+        userActivityLogger.logAction("launch", properties);
+    }
 
     // Tell our entity edit sender about our known jurisdictions
     _entityEditSender.setServerJurisdictions(&_entityServerJurisdictions);
@@ -1004,7 +1188,10 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     // allow you to move an entity around in your hand
     _entityEditSender.setPacketsPerSecond(3000); // super high!!
 
+    // Overlays need to exist before we set the ContextOverlayInterface dependency
     _overlays.init(); // do this before scripts load
+    DependencyManager::set<ContextOverlayInterface>();
+
     // Make sure we don't time out during slow operations at startup
     updateHeartbeat();
 
@@ -1205,15 +1392,26 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     // Make sure we don't time out during slow operations at startup
     updateHeartbeat();
 
-    int SAVE_SETTINGS_INTERVAL = 10 * MSECS_PER_SECOND; // Let's save every seconds for now
-    connect(&_settingsTimer, &QTimer::timeout, this, &Application::saveSettings);
-    connect(&_settingsThread, SIGNAL(started()), &_settingsTimer, SLOT(start()));
-    connect(&_settingsThread, SIGNAL(finished()), &_settingsTimer, SLOT(stop()));
-    _settingsTimer.moveToThread(&_settingsThread);
-    _settingsTimer.setSingleShot(false);
-    _settingsTimer.setInterval(SAVE_SETTINGS_INTERVAL); // 10s, Qt::CoarseTimer acceptable
-    _settingsThread.setPriority(QThread::LowestPriority);
-    _settingsThread.start();
+
+    QTimer* settingsTimer = new QTimer();
+    moveToNewNamedThread(settingsTimer, "Settings Thread", [this, settingsTimer]{
+        connect(qApp, &Application::beforeAboutToQuit, [this, settingsTimer]{
+            // Disconnect the signal from the save settings
+            QObject::disconnect(settingsTimer, &QTimer::timeout, this, &Application::saveSettings);
+            // Stop the settings timer
+            settingsTimer->stop();
+            // Delete it (this will trigger the thread destruction
+            settingsTimer->deleteLater();
+            // Mark the settings thread as finished, so we know we can safely save in the main application
+            // shutdown code
+            _settingsGuard.trigger();
+        });
+
+        int SAVE_SETTINGS_INTERVAL = 10 * MSECS_PER_SECOND; // Let's save every seconds for now
+        settingsTimer->setSingleShot(false);
+        settingsTimer->setInterval(SAVE_SETTINGS_INTERVAL); // 10s, Qt::CoarseTimer acceptable
+        QObject::connect(settingsTimer, &QTimer::timeout, this, &Application::saveSettings);
+    }, QThread::LowestPriority);
 
     if (Menu::getInstance()->isOptionChecked(MenuOption::FirstPerson)) {
         getMyAvatar()->setBoomLength(MyAvatar::ZOOM_MIN);  // So that camera doesn't auto-switch to third person.
@@ -1269,8 +1467,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
     connect(entityScriptingInterface.data(), &EntityScriptingInterface::clickDownOnEntity,
             [this](const EntityItemID& entityItemID, const PointerEvent& event) {
-        auto entity = getEntities()->getTree()->findEntityByID(entityItemID);
-        if (entity && entity->wantsKeyboardFocus()) {
+        if (getEntities()->wantsKeyboardFocus(entityItemID)) {
             setKeyboardFocusOverlay(UNKNOWN_OVERLAY_ID);
             setKeyboardFocusEntity(entityItemID);
         } else {
@@ -1284,29 +1481,14 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
         }
     });
 
-    // If the user clicks somewhere where there is NO entity at all, we will release focus
-    connect(getEntities().data(), &EntityTreeRenderer::mousePressOffEntity, [=]() {
-        setKeyboardFocusEntity(UNKNOWN_ENTITY_ID);
-    });
-
     // Keyboard focus handling for Web overlays.
     auto overlays = &(qApp->getOverlays());
-
-    connect(overlays, &Overlays::mousePressOnOverlay, [=](OverlayID overlayID, const PointerEvent& event) {
-        setKeyboardFocusEntity(UNKNOWN_ENTITY_ID);
-        setKeyboardFocusOverlay(overlayID);
-    });
-
-    connect(overlays, &Overlays::overlayDeleted, [=](OverlayID overlayID) {
+    connect(overlays, &Overlays::overlayDeleted, [=](const OverlayID& overlayID) {
         if (overlayID == _keyboardFocusedOverlay.get()) {
             setKeyboardFocusOverlay(UNKNOWN_OVERLAY_ID);
         }
     });
 
-    connect(overlays, &Overlays::mousePressOffOverlay, [=]() {
-        setKeyboardFocusOverlay(UNKNOWN_OVERLAY_ID);
-    });
-
     connect(this, &Application::aboutToQuit, [=]() {
         setKeyboardFocusOverlay(UNKNOWN_OVERLAY_ID);
         setKeyboardFocusEntity(UNKNOWN_ENTITY_ID);
@@ -1348,15 +1530,13 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
 
         auto displayPlugin = qApp->getActiveDisplayPlugin();
 
-        properties["fps"] = _frameCounter.rate();
-        properties["target_frame_rate"] = getTargetFrameRate();
-        properties["render_rate"] = displayPlugin->renderRate();
+        properties["render_rate"] = _renderLoopCounter.rate();
+        properties["target_render_rate"] = getTargetRenderFrameRate();
         properties["present_rate"] = displayPlugin->presentRate();
         properties["new_frame_present_rate"] = displayPlugin->newFramePresentRate();
         properties["dropped_frame_rate"] = displayPlugin->droppedFrameRate();
         properties["stutter_rate"] = displayPlugin->stutterRate();
-        properties["sim_rate"] = getAverageSimsPerSecond();
-        properties["avatar_sim_rate"] = getAvatarSimrate();
+        properties["game_rate"] = getGameLoopRate();
         properties["has_async_reprojection"] = displayPlugin->hasAsyncReprojection();
         properties["hardware_stats"] = displayPlugin->getHardwareStats();
 
@@ -1439,6 +1619,16 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
 
         properties["throttled"] = _displayPlugin ? _displayPlugin->isThrottled() : false;
 
+        QJsonObject bytesDownloaded;
+        auto atpBytes = statTracker->getStat(STAT_ATP_RESOURCE_TOTAL_BYTES).toLongLong();
+        auto httpBytes = statTracker->getStat(STAT_HTTP_RESOURCE_TOTAL_BYTES).toLongLong();
+        auto fileBytes = statTracker->getStat(STAT_FILE_RESOURCE_TOTAL_BYTES).toLongLong();
+        bytesDownloaded["atp"] = atpBytes;
+        bytesDownloaded["http"] = httpBytes;
+        bytesDownloaded["file"] = fileBytes;
+        bytesDownloaded["total"] = atpBytes + httpBytes + fileBytes;
+        properties["bytes_downloaded"] = bytesDownloaded;
+
         auto myAvatar = getMyAvatar();
         glm::vec3 avatarPosition = myAvatar->getPosition();
         properties["avatar_has_moved"] = lastAvatarPosition != avatarPosition;
@@ -1510,8 +1700,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
         lastLeftHandPose = leftHandPose;
         lastRightHandPose = rightHandPose;
 
-        properties["local_socket_changes"] = DependencyManager::get<StatTracker>()->getStat(LOCAL_SOCKET_CHANGE_STAT).toInt();
-
         UserActivityLogger::getInstance().logAction("stats", properties);
     });
     sendStatsTimer->start();
@@ -1567,14 +1755,14 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
         _defaultSkybox->setCubemap(_defaultSkyboxTexture);
     }
 
-    EntityItem::setEntitiesShouldFadeFunction([this]() {
+    EntityTreeRenderer::setEntitiesShouldFadeFunction([this]() {
         SharedNodePointer entityServerNode = DependencyManager::get<NodeList>()->soloNodeOfType(NodeType::EntityServer);
         return entityServerNode && !isPhysicsEnabled();
     });
 
-    QFileInfo inf = QFileInfo(PathUtils::resourcesPath() + "sounds/snap.wav");
-    _snapshotSound = DependencyManager::get<SoundCache>()->getSound(QUrl::fromLocalFile(inf.absoluteFilePath()));
-
+    QFileInfo infSnap = QFileInfo(PathUtils::resourcesPath() + "sounds/snap.wav");
+    _snapshotSound = DependencyManager::get<SoundCache>()->getSound(QUrl::fromLocalFile(infSnap.absoluteFilePath()));
+    
     QVariant testProperty = property(hifi::properties::TEST);
     qDebug() << testProperty;
     if (testProperty.isValid()) {
@@ -1611,6 +1799,33 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
 
     connect(&_myCamera, &Camera::modeUpdated, this, &Application::cameraModeChanged);
 
+    // Setup the mouse ray pick and related operators
+    DependencyManager::get<EntityTreeRenderer>()->setMouseRayPickID(_rayPickManager.createRayPick(
+        RayPickFilter(DependencyManager::get<RayPickScriptingInterface>()->PICK_ENTITIES() | DependencyManager::get<RayPickScriptingInterface>()->PICK_INCLUDE_NONCOLLIDABLE()),
+        0.0f, true));
+    DependencyManager::get<EntityTreeRenderer>()->setMouseRayPickResultOperator([&](QUuid rayPickID) {
+        RayToEntityIntersectionResult entityResult;
+        RayPickResult result = _rayPickManager.getPrevRayPickResult(rayPickID);
+        entityResult.intersects = result.type != DependencyManager::get<RayPickScriptingInterface>()->INTERSECTED_NONE();
+        if (entityResult.intersects) {
+            entityResult.intersection = result.intersection;
+            entityResult.distance = result.distance;
+            entityResult.surfaceNormal = result.surfaceNormal;
+            entityResult.entityID = result.objectID;
+            entityResult.entity = DependencyManager::get<EntityTreeRenderer>()->getTree()->findEntityByID(entityResult.entityID);
+        }
+        return entityResult;
+    });
+    DependencyManager::get<EntityTreeRenderer>()->setSetPrecisionPickingOperator([&](QUuid rayPickID, bool value) {
+        _rayPickManager.setPrecisionPicking(rayPickID, value);
+    });
+
+    // Preload Tablet sounds
+    DependencyManager::get<TabletScriptingInterface>()->preloadSounds();
+
+    _pendingIdleEvent = false;
+    _pendingRenderEvent = false;
+
     qCDebug(interfaceapp) << "Metaverse session ID is" << uuidStringWithoutCurlyBraces(accountManager->getSessionID());
 }
 
@@ -1628,7 +1843,7 @@ void Application::domainConnectionRefused(const QString& reasonMessage, int reas
         case DomainHandler::ConnectionRefusedReason::Unknown: {
             QString message = "Unable to connect to the location you are visiting.\n";
             message += reasonMessage;
-            OffscreenUi::warning("", message);
+            OffscreenUi::asyncWarning("", message);
             break;
         }
         default:
@@ -1641,7 +1856,7 @@ QString Application::getUserAgent() {
     if (QThread::currentThread() != thread()) {
         QString userAgent;
 
-        QMetaObject::invokeMethod(this, "getUserAgent", Qt::BlockingQueuedConnection, Q_RETURN_ARG(QString, userAgent));
+        BLOCKING_INVOKE_METHOD(this, "getUserAgent", Q_RETURN_ARG(QString, userAgent));
 
         return userAgent;
     }
@@ -1676,9 +1891,7 @@ QString Application::getUserAgent() {
 void Application::toggleTabletUI(bool shouldOpen) const {
     auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
     auto hmd = DependencyManager::get<HMDScriptingInterface>();
-    TabletProxy* tablet = dynamic_cast<TabletProxy*>(tabletScriptingInterface->getTablet(SYSTEM_TABLET));
-    bool messageOpen = tablet->isMessageDialogOpen();
-    if ((!messageOpen || (messageOpen && !hmd->getShouldShowTablet())) && !(shouldOpen && hmd->getShouldShowTablet())) {
+    if (!(shouldOpen && hmd->getShouldShowTablet())) {
         auto HMD = DependencyManager::get<HMDScriptingInterface>();
         HMD->toggleShouldShowTablet();
     }
@@ -1700,14 +1913,21 @@ void Application::checkChangeCursor() {
     }
 }
 
-void Application::showCursor(const QCursor& cursor) {
+void Application::showCursor(const Cursor::Icon& cursor) {
     QMutexLocker locker(&_changeCursorLock);
-    _desiredCursor = cursor;
+
+    auto managedCursor = Cursor::Manager::instance().getCursor();
+    auto curIcon = managedCursor->getIcon();
+    if (curIcon != cursor) {
+        managedCursor->setIcon(cursor);
+        curIcon = cursor;
+    }
+    _desiredCursor = cursor == Cursor::Icon::SYSTEM ? Qt::ArrowCursor : Qt::BlankCursor;
     _cursorNeedsChanging = true;
 }
 
 void Application::updateHeartbeat() const {
-    static_cast<DeadlockWatchdogThread*>(_deadlockWatchdogThread)->updateHeartbeat();
+    DeadlockWatchdogThread::updateHeartbeat();
 }
 
 void Application::onAboutToQuit() {
@@ -1792,18 +2012,21 @@ void Application::cleanupBeforeQuit() {
     // The cleanup process enqueues the transactions but does not process them.  Calling this here will force the actual
     // removal of the items.
     // See https://highfidelity.fogbugz.com/f/cases/5328
-    _main3DScene->processTransactionQueue();
+    _main3DScene->enqueueFrame(); // flush all the transactions
+    _main3DScene->processTransactionQueue(); // process and apply deletions
 
     // first stop all timers directly or by invokeMethod
     // depending on what thread they run in
     locationUpdateTimer.stop();
     identityPacketTimer.stop();
     pingTimer.stop();
-    QMetaObject::invokeMethod(&_settingsTimer, "stop", Qt::BlockingQueuedConnection);
 
-    // save state
-    _settingsThread.quit();
-    saveSettings();
+    // Wait for the settings thread to shut down, and save the settings one last time when it's safe
+    if (_settingsGuard.wait()) {
+        // save state
+        saveSettings();
+    }
+
     _window->saveGeometry();
 
     // Destroy third party processes after scripts have finished using them.
@@ -1827,13 +2050,13 @@ void Application::cleanupBeforeQuit() {
 
     // FIXME: something else is holding a reference to AudioClient,
     // so it must be explicitly synchronously stopped here
-    QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(),
-        "cleanupBeforeQuit", Qt::BlockingQueuedConnection);
+    DependencyManager::get<AudioClient>()->cleanupBeforeQuit();
 
     // destroy Audio so it and its threads have a chance to go down safely
     // this must happen after QML, as there are unexplained audio crashes originating in qtwebengine
     DependencyManager::destroy<AudioClient>();
     DependencyManager::destroy<AudioInjectorManager>();
+    DependencyManager::destroy<AudioScriptingInterface>();
 
     qCDebug(interfaceapp) << "Application::cleanupBeforeQuit() complete";
 }
@@ -1867,7 +2090,6 @@ Application::~Application() {
     _octreeProcessor.terminate();
     _entityEditSender.terminate();
 
-
     DependencyManager::destroy<AvatarManager>();
     DependencyManager::destroy<AnimationCache>();
     DependencyManager::destroy<FramebufferCache>();
@@ -1883,8 +2105,6 @@ Application::~Application() {
     // remove the NodeList from the DependencyManager
     DependencyManager::destroy<NodeList>();
 
-    Leapmotion::destroy();
-
     if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) {
         steamClient->shutdown();
     }
@@ -1944,11 +2164,18 @@ void Application::initializeGL() {
     static const QString RENDER_FORWARD = "HIFI_RENDER_FORWARD";
     bool isDeferred = !QProcessEnvironment::systemEnvironment().contains(RENDER_FORWARD);
     _renderEngine->addJob<UpdateSceneTask>("UpdateScene");
-    _renderEngine->addJob<SecondaryCameraRenderTask>("SecondaryCameraFrame", cullFunctor);
+    _renderEngine->addJob<SecondaryCameraRenderTask>("SecondaryCameraJob", cullFunctor);
     _renderEngine->addJob<RenderViewTask>("RenderMainView", cullFunctor, isDeferred);
     _renderEngine->load();
     _renderEngine->registerScene(_main3DScene);
 
+    _offscreenContext = new OffscreenGLCanvas();
+    _offscreenContext->setObjectName("MainThreadContext");
+    _offscreenContext->create(_glWidget->qglContext());
+    if (!_offscreenContext->makeCurrent()) {
+        qFatal("Unable to make offscreen context current");
+    }
+
     // The UI can't be created until the primary OpenGL
     // context is created, because it needs to share
     // texture resources
@@ -1972,30 +2199,34 @@ void Application::initializeGL() {
 
     _idleLoopStdev.reset();
 
-    _offscreenContext = new OffscreenGLCanvas();
-    _offscreenContext->setObjectName("MainThreadContext");
-    _offscreenContext->create(_glWidget->qglContext());
-    _offscreenContext->makeCurrent();
+    _renderEventHandler = new RenderEventHandler(_glWidget->qglContext());
+
+    // Restore the primary GL content for the main thread
+    if (!_offscreenContext->makeCurrent()) {
+        qFatal("Unable to make offscreen context current");
+    }
 
     // update before the first render
     update(0);
-
 }
 
-FrameTimingsScriptingInterface _frameTimingsScriptingInterface;
-
 extern void setupPreferences();
 
 void Application::initializeUi() {
+    // Make sure all QML surfaces share the main thread GL context
+    OffscreenQmlSurface::setSharedContext(_offscreenContext->getContext());
+
     AddressBarDialog::registerType();
     ErrorDialog::registerType();
     LoginDialog::registerType();
     Tooltip::registerType();
     UpdateDialog::registerType();
+    QmlCommerce::registerType();
+    qmlRegisterType<ResourceImageItem>("Hifi", 1, 0, "ResourceImageItem");
     qmlRegisterType<Preference>("Hifi", 1, 0, "Preference");
 
     auto offscreenUi = DependencyManager::get<OffscreenUi>();
-    offscreenUi->create(_glWidget->qglContext());
+    offscreenUi->create();
 
     auto surfaceContext = offscreenUi->getSurfaceContext();
 
@@ -2003,7 +2234,7 @@ void Application::initializeUi() {
     offscreenUi->setBaseUrl(QUrl::fromLocalFile(PathUtils::resourcesPath() + "/qml/"));
     // OffscreenUi is a subclass of OffscreenQmlSurface specifically designed to
     // support the window management and scripting proxies for VR use
-    offscreenUi->createDesktop(QString("hifi/Desktop.qml"));
+    offscreenUi->createDesktop(QString("qrc:///qml/hifi/Desktop.qml"));
 
     // FIXME either expose so that dialogs can set this themselves or
     // do better detection in the offscreen UI of what has focus
@@ -2014,6 +2245,7 @@ void Application::initializeUi() {
         qApp->quit();
     });
 
+
     setupPreferences();
 
     // For some reason there is already an "Application" object in the QML context,
@@ -2071,13 +2303,14 @@ void Application::initializeUi() {
 
     surfaceContext->setContextProperty("Account", AccountScriptingInterface::getInstance());
     surfaceContext->setContextProperty("Tablet", DependencyManager::get<TabletScriptingInterface>().data());
+    // Tablet inteference with Tablet.qml. Need to avoid this in QML space
+    surfaceContext->setContextProperty("tabletInterface", DependencyManager::get<TabletScriptingInterface>().data());
     surfaceContext->setContextProperty("DialogsManager", _dialogsManagerScriptingInterface);
     surfaceContext->setContextProperty("GlobalServices", GlobalServicesScriptingInterface::getInstance());
     surfaceContext->setContextProperty("FaceTracker", DependencyManager::get<DdeFaceTracker>().data());
     surfaceContext->setContextProperty("AvatarManager", DependencyManager::get<AvatarManager>().data());
     surfaceContext->setContextProperty("UndoStack", &_undoStackScriptingInterface);
     surfaceContext->setContextProperty("LODManager", DependencyManager::get<LODManager>().data());
-    surfaceContext->setContextProperty("Paths", DependencyManager::get<PathUtils>().data());
     surfaceContext->setContextProperty("HMD", DependencyManager::get<HMDScriptingInterface>().data());
     surfaceContext->setContextProperty("Scene", DependencyManager::get<SceneScriptingInterface>().data());
     surfaceContext->setContextProperty("Render", _renderEngine->getConfiguration().get());
@@ -2087,6 +2320,9 @@ void Application::initializeUi() {
     surfaceContext->setContextProperty("ApplicationCompositor", &getApplicationCompositor());
 
     surfaceContext->setContextProperty("AvatarInputs", AvatarInputs::getInstance());
+    surfaceContext->setContextProperty("Selection", DependencyManager::get<SelectionScriptingInterface>().data());
+    surfaceContext->setContextProperty("ContextOverlay", DependencyManager::get<ContextOverlayInterface>().data());
+    surfaceContext->setContextProperty("Wallet", DependencyManager::get<WalletScriptingInterface>().data());
 
     if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) {
         surfaceContext->setContextProperty("Steam", new SteamScriptingInterface(engine, steamClient.get()));
@@ -2122,265 +2358,119 @@ void Application::initializeUi() {
     _window->setMenuBar(new Menu());
 
     auto compositorHelper = DependencyManager::get<CompositorHelper>();
-    connect(compositorHelper.data(), &CompositorHelper::allowMouseCaptureChanged, [=] {
+    connect(compositorHelper.data(), &CompositorHelper::allowMouseCaptureChanged, this, [=] {
         if (isHMDMode()) {
-            showCursor(compositorHelper->getAllowMouseCapture() ? Qt::BlankCursor : Qt::ArrowCursor);
+            showCursor(compositorHelper->getAllowMouseCapture() ?
+                       Cursor::Manager::lookupIcon(_preferredCursor.get()) :
+                       Cursor::Icon::SYSTEM);
         }
     });
 
     // Pre-create a couple of Web3D overlays to speed up tablet UI
     auto offscreenSurfaceCache = DependencyManager::get<OffscreenQmlSurfaceCache>();
+    offscreenSurfaceCache->reserve(TabletScriptingInterface::QML, 1);
     offscreenSurfaceCache->reserve(Web3DOverlay::QML, 2);
 }
 
-void Application::paintGL() {
-    // Some plugins process message events, allowing paintGL to be called reentrantly.
-    if (_inPaint || _aboutToQuit || _window->isMinimized()) {
-        return;
-    }
-
-    _inPaint = true;
-    Finally clearFlag([this] { _inPaint = false; });
-
-    _frameCount++;
-
-    auto lastPaintBegin = usecTimestampNow();
-    PROFILE_RANGE_EX(render, __FUNCTION__, 0xff0000ff, (uint64_t)_frameCount);
-    PerformanceTimer perfTimer("paintGL");
-
-    if (nullptr == _displayPlugin) {
-        return;
-    }
-
-    auto displayPlugin = getActiveDisplayPlugin();
-    // FIXME not needed anymore?
-    _offscreenContext->makeCurrent();
-
-    // If a display plugin loses it's underlying support, it
-    // needs to be able to signal us to not use it
-    if (!displayPlugin->beginFrameRender(_frameCount)) {
-        _inPaint = false;
-        updateDisplayMode();
-        return;
-    }
-
-    // update the avatar with a fresh HMD pose
-    getMyAvatar()->updateFromHMDSensorMatrix(getHMDSensorPose());
-
-    auto lodManager = DependencyManager::get<LODManager>();
-
-    {
-        QMutexLocker viewLocker(&_viewMutex);
-        _viewFrustum.calculate();
-    }
-    RenderArgs renderArgs(_gpuContext, getEntities(), lodManager->getOctreeSizeScale(),
-                          lodManager->getBoundaryLevelAdjust(), RenderArgs::DEFAULT_RENDER_MODE,
-                          RenderArgs::MONO, RenderArgs::RENDER_DEBUG_NONE);
-    {
-        QMutexLocker viewLocker(&_viewMutex);
-        renderArgs.setViewFrustum(_viewFrustum);
-    }
-
-    PerformanceWarning::setSuppressShortTimings(Menu::getInstance()->isOptionChecked(MenuOption::SuppressShortTimings));
-    bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
-    PerformanceWarning warn(showWarnings, "Application::paintGL()");
-    resizeGL();
-
-    _gpuContext->beginFrame(getHMDSensorPose());
-    // Reset the gpu::Context Stages
-    // Back to the default framebuffer;
-    gpu::doInBatch(_gpuContext, [&](gpu::Batch& batch) {
-        batch.resetStages();
-    });
-
-    {
-        PerformanceTimer perfTimer("renderOverlay");
-        // NOTE: There is no batch associated with this renderArgs
-        // the ApplicationOverlay class assumes it's viewport is setup to be the device size
-        QSize size = getDeviceSize();
-        renderArgs._viewport = glm::ivec4(0, 0, size.width(), size.height());
-        _applicationOverlay.renderOverlay(&renderArgs);
-    }
+void Application::updateCamera(RenderArgs& renderArgs) {
+    PROFILE_RANGE(render, __FUNCTION__);
+    PerformanceTimer perfTimer("updateCamera");
 
     glm::vec3 boomOffset;
-    {
-        PerformanceTimer perfTimer("CameraUpdates");
+    auto myAvatar = getMyAvatar();
+    boomOffset = myAvatar->getModelScale() * myAvatar->getBoomLength() * -IDENTITY_FORWARD;
 
-        auto myAvatar = getMyAvatar();
-        boomOffset = myAvatar->getScale() * myAvatar->getBoomLength() * -IDENTITY_FORWARD;
+    // The render mode is default or mirror if the camera is in mirror mode, assigned further below
+    renderArgs._renderMode = RenderArgs::DEFAULT_RENDER_MODE;
 
-        if (_myCamera.getMode() == CAMERA_MODE_FIRST_PERSON || _myCamera.getMode() == CAMERA_MODE_THIRD_PERSON) {
-            Menu::getInstance()->setIsOptionChecked(MenuOption::FirstPerson, myAvatar->getBoomLength() <= MyAvatar::ZOOM_MIN);
-            Menu::getInstance()->setIsOptionChecked(MenuOption::ThirdPerson, !(myAvatar->getBoomLength() <= MyAvatar::ZOOM_MIN));
-            cameraMenuChanged();
+    // 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) {
+        if (isHMDMode()) {
+            mat4 camMat = myAvatar->getSensorToWorldMatrix() * myAvatar->getHMDSensorMatrix();
+            _myCamera.setPosition(extractTranslation(camMat));
+            _myCamera.setOrientation(glmExtractRotation(camMat));
         }
-
-        // The render mode is default or mirror if the camera is in mirror mode, assigned further below
-        renderArgs._renderMode = RenderArgs::DEFAULT_RENDER_MODE;
-
-        // 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) {
-            if (isHMDMode()) {
-                mat4 camMat = myAvatar->getSensorToWorldMatrix() * myAvatar->getHMDSensorMatrix();
-                _myCamera.setPosition(extractTranslation(camMat));
-                _myCamera.setOrientation(glm::quat_cast(camMat));
-            } else {
-                _myCamera.setPosition(myAvatar->getDefaultEyePosition());
-                _myCamera.setOrientation(myAvatar->getMyHead()->getHeadOrientation());
+        else {
+            _myCamera.setPosition(myAvatar->getDefaultEyePosition());
+            _myCamera.setOrientation(myAvatar->getMyHead()->getHeadOrientation());
+        }
+    }
+    else if (_myCamera.getMode() == CAMERA_MODE_THIRD_PERSON) {
+        if (isHMDMode()) {
+            auto hmdWorldMat = myAvatar->getSensorToWorldMatrix() * myAvatar->getHMDSensorMatrix();
+            _myCamera.setOrientation(glm::normalize(glmExtractRotation(hmdWorldMat)));
+            _myCamera.setPosition(extractTranslation(hmdWorldMat) +
+                myAvatar->getOrientation() * boomOffset);
+        }
+        else {
+            _myCamera.setOrientation(myAvatar->getHead()->getOrientation());
+            if (Menu::getInstance()->isOptionChecked(MenuOption::CenterPlayerInView)) {
+                _myCamera.setPosition(myAvatar->getDefaultEyePosition()
+                    + _myCamera.getOrientation() * boomOffset);
             }
-        } else if (_myCamera.getMode() == CAMERA_MODE_THIRD_PERSON) {
-            if (isHMDMode()) {
-                auto hmdWorldMat = myAvatar->getSensorToWorldMatrix() * myAvatar->getHMDSensorMatrix();
-                _myCamera.setOrientation(glm::normalize(glm::quat_cast(hmdWorldMat)));
-                _myCamera.setPosition(extractTranslation(hmdWorldMat) +
-                    myAvatar->getOrientation() * boomOffset);
-            } else {
-                _myCamera.setOrientation(myAvatar->getHead()->getOrientation());
-                if (Menu::getInstance()->isOptionChecked(MenuOption::CenterPlayerInView)) {
-                    _myCamera.setPosition(myAvatar->getDefaultEyePosition()
-                        + _myCamera.getOrientation() * boomOffset);
-                } else {
-                    _myCamera.setPosition(myAvatar->getDefaultEyePosition()
-                        + myAvatar->getOrientation() * boomOffset);
-                }
+            else {
+                _myCamera.setPosition(myAvatar->getDefaultEyePosition()
+                    + myAvatar->getOrientation() * boomOffset);
             }
-        } else if (_myCamera.getMode() == CAMERA_MODE_MIRROR) {
-            if (isHMDMode()) {
-                auto mirrorBodyOrientation = myAvatar->getWorldAlignedOrientation() * glm::quat(glm::vec3(0.0f, PI + _rotateMirror, 0.0f));
+        }
+    }
+    else if (_myCamera.getMode() == CAMERA_MODE_MIRROR) {
+        if (isHMDMode()) {
+            auto mirrorBodyOrientation = myAvatar->getOrientation() * glm::quat(glm::vec3(0.0f, PI + _rotateMirror, 0.0f));
 
+            glm::quat hmdRotation = extractRotation(myAvatar->getHMDSensorMatrix());
+            // Mirror HMD yaw and roll
+            glm::vec3 mirrorHmdEulers = glm::eulerAngles(hmdRotation);
+            mirrorHmdEulers.y = -mirrorHmdEulers.y;
+            mirrorHmdEulers.z = -mirrorHmdEulers.z;
+            glm::quat mirrorHmdRotation = glm::quat(mirrorHmdEulers);
+
+            glm::quat worldMirrorRotation = mirrorBodyOrientation * mirrorHmdRotation;
+
+            _myCamera.setOrientation(worldMirrorRotation);
+
+            glm::vec3 hmdOffset = extractTranslation(myAvatar->getHMDSensorMatrix());
+            // Mirror HMD lateral offsets
+            hmdOffset.x = -hmdOffset.x;
+
+            _myCamera.setPosition(myAvatar->getDefaultEyePosition()
+                + glm::vec3(0, _raiseMirror * myAvatar->getModelScale(), 0)
+                + mirrorBodyOrientation * glm::vec3(0.0f, 0.0f, 1.0f) * MIRROR_FULLSCREEN_DISTANCE * _scaleMirror
+                + mirrorBodyOrientation * hmdOffset);
+        }
+        else {
+            _myCamera.setOrientation(myAvatar->getOrientation()
+                * glm::quat(glm::vec3(0.0f, PI + _rotateMirror, 0.0f)));
+            _myCamera.setPosition(myAvatar->getDefaultEyePosition()
+                + glm::vec3(0, _raiseMirror * myAvatar->getModelScale(), 0)
+                + (myAvatar->getOrientation() * glm::quat(glm::vec3(0.0f, _rotateMirror, 0.0f))) *
+                glm::vec3(0.0f, 0.0f, -1.0f) * MIRROR_FULLSCREEN_DISTANCE * _scaleMirror);
+        }
+        renderArgs._renderMode = RenderArgs::MIRROR_RENDER_MODE;
+    }
+    else if (_myCamera.getMode() == CAMERA_MODE_ENTITY) {
+        EntityItemPointer cameraEntity = _myCamera.getCameraEntityPointer();
+        if (cameraEntity != nullptr) {
+            if (isHMDMode()) {
                 glm::quat hmdRotation = extractRotation(myAvatar->getHMDSensorMatrix());
-                // Mirror HMD yaw and roll
-                glm::vec3 mirrorHmdEulers = glm::eulerAngles(hmdRotation);
-                mirrorHmdEulers.y = -mirrorHmdEulers.y;
-                mirrorHmdEulers.z = -mirrorHmdEulers.z;
-                glm::quat mirrorHmdRotation = glm::quat(mirrorHmdEulers);
-
-                glm::quat worldMirrorRotation = mirrorBodyOrientation * mirrorHmdRotation;
-
-                _myCamera.setOrientation(worldMirrorRotation);
-
+                _myCamera.setOrientation(cameraEntity->getRotation() * hmdRotation);
                 glm::vec3 hmdOffset = extractTranslation(myAvatar->getHMDSensorMatrix());
-                // Mirror HMD lateral offsets
-                hmdOffset.x = -hmdOffset.x;
-
-                _myCamera.setPosition(myAvatar->getDefaultEyePosition()
-                    + glm::vec3(0, _raiseMirror * myAvatar->getUniformScale(), 0)
-                   + mirrorBodyOrientation * glm::vec3(0.0f, 0.0f, 1.0f) * MIRROR_FULLSCREEN_DISTANCE * _scaleMirror
-                   + mirrorBodyOrientation * hmdOffset);
-            } else {
-                _myCamera.setOrientation(myAvatar->getWorldAlignedOrientation()
-                    * glm::quat(glm::vec3(0.0f, PI + _rotateMirror, 0.0f)));
-                _myCamera.setPosition(myAvatar->getDefaultEyePosition()
-                    + glm::vec3(0, _raiseMirror * myAvatar->getUniformScale(), 0)
-                    + (myAvatar->getOrientation() * glm::quat(glm::vec3(0.0f, _rotateMirror, 0.0f))) *
-                    glm::vec3(0.0f, 0.0f, -1.0f) * MIRROR_FULLSCREEN_DISTANCE * _scaleMirror);
+                _myCamera.setPosition(cameraEntity->getPosition() + (hmdRotation * hmdOffset));
             }
-            renderArgs._renderMode = RenderArgs::MIRROR_RENDER_MODE;
-        } else if (_myCamera.getMode() == CAMERA_MODE_ENTITY) {
-            EntityItemPointer cameraEntity = _myCamera.getCameraEntityPointer();
-            if (cameraEntity != nullptr) {
-                if (isHMDMode()) {
-                    glm::quat hmdRotation = extractRotation(myAvatar->getHMDSensorMatrix());
-                    _myCamera.setOrientation(cameraEntity->getRotation() * hmdRotation);
-                    glm::vec3 hmdOffset = extractTranslation(myAvatar->getHMDSensorMatrix());
-                    _myCamera.setPosition(cameraEntity->getPosition() + (hmdRotation * hmdOffset));
-                } else {
-                    _myCamera.setOrientation(cameraEntity->getRotation());
-                    _myCamera.setPosition(cameraEntity->getPosition());
-                }
+            else {
+                _myCamera.setOrientation(cameraEntity->getRotation());
+                _myCamera.setPosition(cameraEntity->getPosition());
             }
         }
-        // Update camera position
-        if (!isHMDMode()) {
-            _myCamera.update(1.0f / _frameCounter.rate());
-        }
+    }
+    // Update camera position
+    if (!isHMDMode()) {
+        _myCamera.update();
     }
 
-    getApplicationCompositor().setFrameInfo(_frameCount, _myCamera.getTransform());
-
-    // Primary rendering pass
-    auto framebufferCache = DependencyManager::get<FramebufferCache>();
-    const QSize size = framebufferCache->getFrameBufferSize();
-    // Final framebuffer that will be handled to the display-plugin
-    auto finalFramebuffer = framebufferCache->getFramebuffer();
-
-    {
-        PROFILE_RANGE(render, "/mainRender");
-        PerformanceTimer perfTimer("mainRender");
-        renderArgs._boomOffset = boomOffset;
-        // Viewport is assigned to the size of the framebuffer
-        renderArgs._viewport = ivec4(0, 0, size.width(), size.height());
-        if (displayPlugin->isStereo()) {
-            // Stereo modes will typically have a larger projection matrix overall,
-            // so we ask for the 'mono' projection matrix, which for stereo and HMD
-            // plugins will imply the combined projection for both eyes.
-            //
-            // This is properly implemented for the Oculus plugins, but for OpenVR
-            // and Stereo displays I'm not sure how to get / calculate it, so we're
-            // just relying on the left FOV in each case and hoping that the
-            // overall culling margin of error doesn't cause popping in the
-            // right eye.  There are FIXMEs in the relevant plugins
-            _myCamera.setProjection(displayPlugin->getCullingProjection(_myCamera.getProjection()));
-            renderArgs._context->enableStereo(true);
-            mat4 eyeOffsets[2];
-            mat4 eyeProjections[2];
-            auto baseProjection = renderArgs.getViewFrustum().getProjection();
-            auto hmdInterface = DependencyManager::get<HMDScriptingInterface>();
-            float IPDScale = hmdInterface->getIPDScale();
-
-            // FIXME we probably don't need to set the projection matrix every frame,
-            // only when the display plugin changes (or in non-HMD modes when the user
-            // changes the FOV manually, which right now I don't think they can.
-            for_each_eye([&](Eye eye) {
-                // For providing the stereo eye views, the HMD head pose has already been
-                // applied to the avatar, so we need to get the difference between the head
-                // pose applied to the avatar and the per eye pose, and use THAT as
-                // the per-eye stereo matrix adjustment.
-                mat4 eyeToHead = displayPlugin->getEyeToHeadTransform(eye);
-                // Grab the translation
-                vec3 eyeOffset = glm::vec3(eyeToHead[3]);
-                // Apply IPD scaling
-                mat4 eyeOffsetTransform = glm::translate(mat4(), eyeOffset * -1.0f * IPDScale);
-                eyeOffsets[eye] = eyeOffsetTransform;
-                eyeProjections[eye] = displayPlugin->getEyeProjection(eye, baseProjection);
-            });
-            renderArgs._context->setStereoProjections(eyeProjections);
-            renderArgs._context->setStereoViews(eyeOffsets);
-
-            // Configure the type of display / stereo
-            renderArgs._displayMode = (isHMDMode() ? RenderArgs::STEREO_HMD : RenderArgs::STEREO_MONITOR);
-        }
-        renderArgs._blitFramebuffer = finalFramebuffer;
-        displaySide(&renderArgs, _myCamera);
-    }
-
-    auto frame = _gpuContext->endFrame();
-    frame->frameIndex = _frameCount;
-    frame->framebuffer = finalFramebuffer;
-    frame->framebufferRecycler = [](const gpu::FramebufferPointer& framebuffer){
-        DependencyManager::get<FramebufferCache>()->releaseFramebuffer(framebuffer);
-    };
-    frame->overlay = _applicationOverlay.getOverlayTexture();
-    // deliver final scene rendering commands to the display plugin
-    {
-        PROFILE_RANGE(render, "/pluginOutput");
-        PerformanceTimer perfTimer("pluginOutput");
-        _frameCounter.increment();
-        displayPlugin->submitFrame(frame);
-    }
-
-    // Reset the framebuffer and stereo state
-    renderArgs._blitFramebuffer.reset();
-    renderArgs._context->enableStereo(false);
-
-    {
-        Stats::getInstance()->setRenderDetails(renderArgs._details);
-    }
-
-    uint64_t lastPaintDuration = usecTimestampNow() - lastPaintBegin;
-    _frameTimingsScriptingInterface.addValue(lastPaintDuration);
+    renderArgs._cameraMode = (int8_t)_myCamera.getMode();
 }
 
 void Application::runTests() {
@@ -2427,6 +2517,12 @@ void Application::setPreferAvatarFingerOverStylus(bool value) {
     _preferAvatarFingerOverStylusSetting.set(value);
 }
 
+void Application::setPreferredCursor(const QString& cursorName) {
+    qCDebug(interfaceapp) << "setPreferredCursor" << cursorName;
+    _preferredCursor.set(cursorName.isEmpty() ? DEFAULT_CURSOR_NAME : cursorName);
+    showCursor(Cursor::Manager::lookupIcon(_preferredCursor.get()));
+}
+
 void Application::setSettingConstrainToolbarPosition(bool setting) {
     _constrainToolbarPosition.set(setting);
     DependencyManager::get<OffscreenUi>()->setConstrainToolbarToCenterX(setting);
@@ -2491,19 +2587,10 @@ void Application::resizeGL() {
         QMutexLocker viewLocker(&_viewMutex);
         _myCamera.loadViewFrustum(_viewFrustum);
     }
-
-    auto offscreenUi = DependencyManager::get<OffscreenUi>();
-    auto uiSize = displayPlugin->getRecommendedUiSize();
-    // Bit of a hack since there's no device pixel ratio change event I can find.
-    if (offscreenUi->size() != fromGlm(uiSize)) {
-        qCDebug(interfaceapp) << "Device pixel ratio changed, triggering resize to " << uiSize;
-        offscreenUi->resize(fromGlm(uiSize), true);
-        _offscreenContext->makeCurrent();
-    }
 }
 
 void Application::handleSandboxStatus(QNetworkReply* reply) {
-    PROFILE_RANGE(render, "HandleSandboxStatus");
+    PROFILE_RANGE(render, __FUNCTION__);
 
     bool sandboxIsRunning = SandboxUtils::readStatus(reply->readAll());
     qDebug() << "HandleSandboxStatus" << sandboxIsRunning;
@@ -2530,35 +2617,18 @@ void Application::handleSandboxStatus(QNetworkReply* reply) {
 
     // Get controller availability
     bool hasHandControllers = false;
-    HandControllerType handControllerType = Vive;
-    if (PluginUtils::isViveControllerAvailable()) {
+    if (PluginUtils::isViveControllerAvailable() || PluginUtils::isOculusTouchControllerAvailable()) {
         hasHandControllers = true;
-        handControllerType = Vive;
-    } else if (PluginUtils::isOculusTouchControllerAvailable()) {
-        hasHandControllers = true;
-        handControllerType = Oculus;
     }
 
-    // Check tutorial content versioning
-    bool hasTutorialContent = contentVersion >= MIN_CONTENT_VERSION.at(handControllerType);
-
     // Check HMD use (may be technically available without being in use)
     bool hasHMD = PluginUtils::isHMDAvailable();
     bool isUsingHMD = _displayPlugin->isHmd();
     bool isUsingHMDAndHandControllers = hasHMD && hasHandControllers && isUsingHMD;
 
-    Setting::Handle<bool> tutorialComplete{ "tutorialComplete", false };
     Setting::Handle<bool> firstRun{ Settings::firstRun, true };
 
-    const QString HIFI_SKIP_TUTORIAL_COMMAND_LINE_KEY = "--skipTutorial";
-    // Skips tutorial/help behavior, and does NOT clear firstRun setting.
-    bool skipTutorial = arguments().contains(HIFI_SKIP_TUTORIAL_COMMAND_LINE_KEY);
-    bool isTutorialComplete = tutorialComplete.get();
-    bool shouldGoToTutorial = isUsingHMDAndHandControllers && hasTutorialContent && !isTutorialComplete && !skipTutorial;
-
     qCDebug(interfaceapp) << "HMD:" << hasHMD << ", Hand Controllers: " << hasHandControllers << ", Using HMD: " << isUsingHMDAndHandControllers;
-    qCDebug(interfaceapp) << "Tutorial version:" << contentVersion << ", sufficient:" << hasTutorialContent <<
-        ", complete:" << isTutorialComplete << ", should go:" << shouldGoToTutorial;
 
     // when --url in command line, teleport to location
     const QString HIFI_URL_COMMAND_LINE_KEY = "--url";
@@ -2568,58 +2638,31 @@ void Application::handleSandboxStatus(QNetworkReply* reply) {
         addressLookupString = arguments().value(urlIndex + 1);
     }
 
-    const QString TUTORIAL_PATH = "/tutorial_begin";
-
-    static const QString SENT_TO_TUTORIAL = "tutorial";
     static const QString SENT_TO_PREVIOUS_LOCATION = "previous_location";
     static const QString SENT_TO_ENTRY = "entry";
     static const QString SENT_TO_SANDBOX = "sandbox";
 
     QString sentTo;
 
-    if (shouldGoToTutorial) {
-        if (sandboxIsRunning) {
-            qCDebug(interfaceapp) << "Home sandbox appears to be running, going to Home.";
-            DependencyManager::get<AddressManager>()->goToLocalSandbox(TUTORIAL_PATH);
-            sentTo = SENT_TO_TUTORIAL;
-        } else {
-            qCDebug(interfaceapp) << "Home sandbox does not appear to be running, going to Entry.";
-            if (firstRun.get()) {
-                showHelp();
-            }
-            if (addressLookupString.isEmpty()) {
-                DependencyManager::get<AddressManager>()->goToEntry();
-                sentTo = SENT_TO_ENTRY;
-            } else {
-                DependencyManager::get<AddressManager>()->loadSettings(addressLookupString);
-                sentTo = SENT_TO_PREVIOUS_LOCATION;
-            }
-        }
-    } else {
-
         // If this is a first run we short-circuit the address passed in
-        if (firstRun.get() && !skipTutorial) {
+        if (firstRun.get()) {
             showHelp();
-            if (isUsingHMDAndHandControllers) {
-                if (sandboxIsRunning) {
-                    qCDebug(interfaceapp) << "Home sandbox appears to be running, going to Home.";
-                    DependencyManager::get<AddressManager>()->goToLocalSandbox();
-                    sentTo = SENT_TO_SANDBOX;
-                } else {
-                    qCDebug(interfaceapp) << "Home sandbox does not appear to be running, going to Entry.";
-                    DependencyManager::get<AddressManager>()->goToEntry();
-                    sentTo = SENT_TO_ENTRY;
-                }
+            if (sandboxIsRunning) {
+                qCDebug(interfaceapp) << "Home sandbox appears to be running, going to Home.";
+                DependencyManager::get<AddressManager>()->goToLocalSandbox();
+                sentTo = SENT_TO_SANDBOX;
             } else {
+                qCDebug(interfaceapp) << "Home sandbox does not appear to be running, going to Entry.";
                 DependencyManager::get<AddressManager>()->goToEntry();
                 sentTo = SENT_TO_ENTRY;
             }
+            firstRun.set(false);
+
         } else {
             qCDebug(interfaceapp) << "Not first run... going to" << qPrintable(addressLookupString.isEmpty() ? QString("previous location") : addressLookupString);
             DependencyManager::get<AddressManager>()->loadSettings(addressLookupString);
             sentTo = SENT_TO_PREVIOUS_LOCATION;
         }
-    }
 
     UserActivityLogger::getInstance().logAction("startup_sent_to", {
         { "sent_to", sentTo },
@@ -2628,32 +2671,18 @@ void Application::handleSandboxStatus(QNetworkReply* reply) {
         { "has_hand_controllers", hasHandControllers },
         { "is_using_hmd", isUsingHMD },
         { "is_using_hmd_and_hand_controllers", isUsingHMDAndHandControllers },
-        { "content_version", contentVersion },
-        { "is_tutorial_complete", isTutorialComplete },
-        { "has_tutorial_content", hasTutorialContent },
-        { "should_go_to_tutorial", shouldGoToTutorial }
+        { "content_version", contentVersion }
     });
 
     _connectionMonitor.init();
-
-    // After all of the constructor is completed, then set firstRun to false.
-    if (!skipTutorial) {
-        firstRun.set(false);
-    }
 }
 
 bool Application::importJSONFromURL(const QString& urlString) {
     // we only load files that terminate in just .json (not .svo.json and not .ava.json)
-    // if they come from the High Fidelity Marketplace Assets CDN
-
     QUrl jsonURL { urlString };
 
-    if (jsonURL.host().endsWith(MARKETPLACE_CDN_HOSTNAME)) {
-        emit svoImportRequested(urlString);
-        return true;
-    } else {
-        return false;
-    }
+    emit svoImportRequested(urlString);
+    return true;
 }
 
 bool Application::importSVOFromURL(const QString& urlString) {
@@ -2661,68 +2690,44 @@ bool Application::importSVOFromURL(const QString& urlString) {
     return true;
 }
 
-bool Application::event(QEvent* event) {
-    if (!Menu::getInstance()) {
-        return false;
+bool Application::importFromZIP(const QString& filePath) {
+    qDebug() << "A zip file has been dropped in: " << filePath;
+    QUrl empty;
+    // handle Blocks download from Marketplace
+    if (filePath.contains("poly.google.com/downloads")) {
+        addAssetToWorldFromURL(filePath);
+    } else {
+        qApp->getFileDownloadInterface()->runUnzip(filePath, empty, true, true, false);
     }
+    return true;
+}
 
-    // Presentation/painting logic
-    // TODO: Decouple presentation and painting loops
-    static bool isPaintingThrottled = false;
-    if ((int)event->type() == (int)Present) {
-        if (isPaintingThrottled) {
-            // If painting (triggered by presentation) is hogging the main thread,
-            // repost as low priority to avoid hanging the GUI.
-            // This has the effect of allowing presentation to exceed the paint budget by X times and
-            // only dropping every (1/X) frames, instead of every ceil(X) frames
-            // (e.g. at a 60FPS target, painting for 17us would fall to 58.82FPS instead of 30FPS).
-            removePostedEvents(this, Present);
-            postEvent(this, new QEvent(static_cast<QEvent::Type>(Present)), Qt::LowEventPriority);
-            isPaintingThrottled = false;
-            return true;
-        }
-
-        float nsecsElapsed = (float)_lastTimeUpdated.nsecsElapsed();
-        if (shouldPaint(nsecsElapsed)) {
-            _lastTimeUpdated.start();
-            idle(nsecsElapsed);
-            postEvent(this, new QEvent(static_cast<QEvent::Type>(Paint)), Qt::HighEventPriority);
-        }
-        isPaintingThrottled = true;
-
-        return true;
-    } else if ((int)event->type() == (int)Paint) {
-        // NOTE: This must be updated as close to painting as possible,
-        //       or AvatarInputs will mysteriously move to the bottom-right
-        AvatarInputs::getInstance()->update();
-
-        paintGL();
-
-        isPaintingThrottled = false;
-
-        return true;
-    } else if ((int)event->type() == (int)Idle) {
-        float nsecsElapsed = (float)_lastTimeUpdated.nsecsElapsed();
-        idle(nsecsElapsed);
-
-        return true;
+// thread-safe
+void Application::onPresent(quint32 frameCount) {
+    bool expected = false;
+    if (_pendingIdleEvent.compare_exchange_strong(expected, true)) {
+        postEvent(this, new QEvent((QEvent::Type)ApplicationEvent::Idle), Qt::HighEventPriority);
     }
-
-    if ((int)event->type() == (int)Lambda) {
-        static_cast<LambdaEvent*>(event)->call();
-        return true;
+    expected = false;
+    if (_renderEventHandler && !isAboutToQuit() && _pendingRenderEvent.compare_exchange_strong(expected, true)) {
+        postEvent(_renderEventHandler, new QEvent((QEvent::Type)ApplicationEvent::Render));
     }
+}
 
-    {
-        if (!_keyboardFocusedEntity.get().isInvalidID()) {
-            switch (event->type()) {
-                case QEvent::KeyPress:
-                case QEvent::KeyRelease: {
-                    //auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
-                    auto entity = getEntities()->getTree()->findEntityByID(_keyboardFocusedEntity.get());
-                    if (entity && entity->getEventHandler()) {
+static inline bool isKeyEvent(QEvent::Type type) {
+    return type == QEvent::KeyPress || type == QEvent::KeyRelease;
+}
+
+bool Application::handleKeyEventForFocusedEntityOrOverlay(QEvent* event) {
+    if (!_keyboardFocusedEntity.get().isInvalidID()) {
+        switch (event->type()) {
+            case QEvent::KeyPress:
+            case QEvent::KeyRelease:
+                {
+                    auto eventHandler = getEntities()->getEventHandler(_keyboardFocusedEntity.get());
+                    if (eventHandler) {
                         event->setAccepted(false);
-                        QCoreApplication::sendEvent(entity->getEventHandler(), event);
+                        QCoreApplication::sendEvent(eventHandler, event);
                         if (event->isAccepted()) {
                             _lastAcceptedKeyPress = usecTimestampNow();
                             return true;
@@ -2730,20 +2735,17 @@ bool Application::event(QEvent* event) {
                     }
                     break;
                 }
-                default:
-                    break;
-                }
+            default:
+                break;
         }
     }
 
-    {
-        if (_keyboardFocusedOverlay.get() != UNKNOWN_OVERLAY_ID) {
-            switch (event->type()) {
-                case QEvent::KeyPress:
-                case QEvent::KeyRelease: {
+    if (_keyboardFocusedOverlay.get() != UNKNOWN_OVERLAY_ID) {
+        switch (event->type()) {
+            case QEvent::KeyPress:
+            case QEvent::KeyRelease: {
                     // Only Web overlays can have focus.
-                    auto overlay =
-                        std::dynamic_pointer_cast<Web3DOverlay>(getOverlays().getOverlay(_keyboardFocusedOverlay.get()));
+                    auto overlay = std::dynamic_pointer_cast<Web3DOverlay>(getOverlays().getOverlay(_keyboardFocusedOverlay.get()));
                     if (overlay && overlay->getEventHandler()) {
                         event->setAccepted(false);
                         QCoreApplication::sendEvent(overlay->getEventHandler(), event);
@@ -2752,15 +2754,81 @@ bool Application::event(QEvent* event) {
                             return true;
                         }
                     }
-                    break;
-                }
-                default:
-                    break;
                 }
+                break;
+
+            default:
+                break;
         }
     }
 
-    switch (event->type()) {
+    return false;
+}
+
+bool Application::handleFileOpenEvent(QFileOpenEvent* fileEvent) {
+    QUrl url = fileEvent->url();
+    if (!url.isEmpty()) {
+        QString urlString = url.toString();
+        if (canAcceptURL(urlString)) {
+            return acceptURL(urlString);
+        }
+    }
+    return false;
+}
+
+#ifdef DEBUG_EVENT_QUEUE
+static int getEventQueueSize(QThread* thread) {
+    auto threadData = QThreadData::get2(thread);
+    QMutexLocker locker(&threadData->postEventList.mutex);
+    return threadData->postEventList.size();
+}
+
+static void dumpEventQueue(QThread* thread) {
+    auto threadData = QThreadData::get2(thread);
+    QMutexLocker locker(&threadData->postEventList.mutex);
+    qDebug() << "AJT: event list, size =" << threadData->postEventList.size();
+    for (auto& postEvent : threadData->postEventList) {
+        QEvent::Type type = (postEvent.event ? postEvent.event->type() : QEvent::None);
+        qDebug() << "AJT:    " << type;
+    }
+}
+#endif // DEBUG_EVENT_QUEUE
+
+bool Application::event(QEvent* event) {
+
+    if (!Menu::getInstance()) {
+        return false;
+    }
+
+    // Allow focused Entities and Overlays to handle keyboard input
+    if (isKeyEvent(event->type()) && handleKeyEventForFocusedEntityOrOverlay(event)) {
+        return true;
+    }
+
+    int type = event->type();
+    switch (type) {
+        case ApplicationEvent::Lambda:
+            static_cast<LambdaEvent*>(event)->call();
+            return true;
+
+        // Explicit idle keeps the idle running at a lower interval, but without any rendering
+        // see (windowMinimizedChanged)
+        case ApplicationEvent::Idle:
+            idle();
+
+#ifdef DEBUG_EVENT_QUEUE
+            {
+                int count = getEventQueueSize(QThread::currentThread());
+                if (count > 400) {
+                    dumpEventQueue(QThread::currentThread());
+                }
+            }
+#endif // DEBUG_EVENT_QUEUE
+
+            _pendingIdleEvent.store(false);
+
+            return true;
+
         case QEvent::MouseMove:
             mouseMoveEvent(static_cast<QMouseEvent*>(event));
             return true;
@@ -2801,32 +2869,17 @@ bool Application::event(QEvent* event) {
         case QEvent::Drop:
             dropEvent(static_cast<QDropEvent*>(event));
             return true;
+
+        case QEvent::FileOpen:
+            if (handleFileOpenEvent(static_cast<QFileOpenEvent*>(event))) {
+                return true;
+            }
+            break;
+
         default:
             break;
     }
 
-    // handle custom URL
-    if (event->type() == QEvent::FileOpen) {
-
-        QFileOpenEvent* fileEvent = static_cast<QFileOpenEvent*>(event);
-
-        QUrl url = fileEvent->url();
-
-        if (!url.isEmpty()) {
-            QString urlString = url.toString();
-
-            if (canAcceptURL(urlString)) {
-
-                return acceptURL(urlString);
-            }
-        }
-        return false;
-    }
-
-    if (HFActionEvent::types().contains(event->type())) {
-        _controllerScriptingInterface->handleMetaEvent(static_cast<HFMetaEvent*>(event));
-    }
-
     return QApplication::event(event);
 }
 
@@ -2946,7 +2999,9 @@ void Application::keyPressEvent(QKeyEvent* event) {
                 break;
 
             case Qt::Key_F: {
-                _physicsEngine->dumpNextStats();
+                if (isOption) {
+                    _physicsEngine->dumpNextStats();
+                }
                 break;
             }
 
@@ -2990,9 +3045,13 @@ void Application::keyPressEvent(QKeyEvent* event) {
                     auto cursor = Cursor::Manager::instance().getCursor();
                     auto curIcon = cursor->getIcon();
                     if (curIcon == Cursor::Icon::DEFAULT) {
-                        cursor->setIcon(Cursor::Icon::LINK);
+                        showCursor(Cursor::Icon::RETICLE);
+                    } else if (curIcon == Cursor::Icon::RETICLE) {
+                        showCursor(Cursor::Icon::SYSTEM);
+                    } else if (curIcon == Cursor::Icon::SYSTEM) {
+                        showCursor(Cursor::Icon::LINK);
                     } else {
-                        cursor->setIcon(Cursor::Icon::DEFAULT);
+                        showCursor(Cursor::Icon::DEFAULT);
                     }
                 } else {
                     resetSensors(true);
@@ -3098,59 +3157,6 @@ void Application::keyPressEvent(QKeyEvent* event) {
                 break;
 #endif
 
-            case Qt::Key_H: {
-                // whenever switching to/from full screen mirror from the keyboard, remember
-                // the state you were in before full screen mirror, and return to that.
-                auto previousMode = _myCamera.getMode();
-                if (previousMode != CAMERA_MODE_MIRROR) {
-                    switch (previousMode) {
-                    case CAMERA_MODE_FIRST_PERSON:
-                        _returnFromFullScreenMirrorTo = MenuOption::FirstPerson;
-                        break;
-                    case CAMERA_MODE_THIRD_PERSON:
-                        _returnFromFullScreenMirrorTo = MenuOption::ThirdPerson;
-                        break;
-
-                        // FIXME - it's not clear that these modes make sense to return to...
-                    case CAMERA_MODE_INDEPENDENT:
-                        _returnFromFullScreenMirrorTo = MenuOption::IndependentMode;
-                        break;
-                    case CAMERA_MODE_ENTITY:
-                        _returnFromFullScreenMirrorTo = MenuOption::CameraEntityMode;
-                        break;
-
-                    default:
-                        _returnFromFullScreenMirrorTo = MenuOption::ThirdPerson;
-                        break;
-                    }
-                }
-
-                bool isMirrorChecked = Menu::getInstance()->isOptionChecked(MenuOption::FullscreenMirror);
-                Menu::getInstance()->setIsOptionChecked(MenuOption::FullscreenMirror, !isMirrorChecked);
-                if (isMirrorChecked) {
-
-                    // if we got here without coming in from a non-Full Screen mirror case, then our
-                    // _returnFromFullScreenMirrorTo is unknown. In that case we'll go to the old
-                    // behavior of returning to ThirdPerson
-                    if (_returnFromFullScreenMirrorTo.isEmpty()) {
-                        _returnFromFullScreenMirrorTo = MenuOption::ThirdPerson;
-                    }
-                    Menu::getInstance()->setIsOptionChecked(_returnFromFullScreenMirrorTo, true);
-                }
-                cameraMenuChanged();
-                break;
-            }
-
-            case Qt::Key_P: {
-                if (!(isShifted || isMeta || isOption)) {
-                    bool isFirstPersonChecked = Menu::getInstance()->isOptionChecked(MenuOption::FirstPerson);
-                    Menu::getInstance()->setIsOptionChecked(MenuOption::FirstPerson, !isFirstPersonChecked);
-                    Menu::getInstance()->setIsOptionChecked(MenuOption::ThirdPerson, isFirstPersonChecked);
-                    cameraMenuChanged();
-                }
-                break;
-            }
-
             case Qt::Key_Slash:
                 Menu::getInstance()->triggerOption(MenuOption::Stats);
                 break;
@@ -3178,25 +3184,8 @@ void Application::keyPressEvent(QKeyEvent* event) {
             case Qt::Key_Equal:
                 getMyAvatar()->resetSize();
                 break;
-            case Qt::Key_Space: {
-                if (!event->isAutoRepeat()) {
-                    // FIXME -- I don't think we've tested the HFActionEvent in a while... this looks possibly dubious
-                    // this starts an HFActionEvent
-                    HFActionEvent startActionEvent(HFActionEvent::startType(),
-                                                   computePickRay(getMouse().x, getMouse().y));
-                    sendEvent(this, &startActionEvent);
-                }
-
-                break;
-            }
             case Qt::Key_Escape: {
                 getActiveDisplayPlugin()->abandonCalibration();
-                if (!event->isAutoRepeat()) {
-                    // this starts the HFCancelEvent
-                    HFBackEvent startBackEvent(HFBackEvent::startType());
-                    sendEvent(this, &startBackEvent);
-                }
-
                 break;
             }
 
@@ -3222,30 +3211,6 @@ void Application::keyReleaseEvent(QKeyEvent* event) {
     if (_keyboardMouseDevice->isActive()) {
         _keyboardMouseDevice->keyReleaseEvent(event);
     }
-
-    switch (event->key()) {
-        case Qt::Key_Space: {
-            if (!event->isAutoRepeat()) {
-                // FIXME -- I don't think we've tested the HFActionEvent in a while... this looks possibly dubious
-                // this ends the HFActionEvent
-                HFActionEvent endActionEvent(HFActionEvent::endType(),
-                                             computePickRay(getMouse().x, getMouse().y));
-                sendEvent(this, &endActionEvent);
-            }
-            break;
-        }
-        case Qt::Key_Escape: {
-            if (!event->isAutoRepeat()) {
-                // this ends the HFCancelEvent
-                HFBackEvent endBackEvent(HFBackEvent::endType());
-                sendEvent(this, &endBackEvent);
-            }
-            break;
-        }
-        default:
-            event->ignore();
-            break;
-    }
 }
 
 void Application::focusOutEvent(QFocusEvent* event) {
@@ -3382,13 +3347,6 @@ void Application::mousePressEvent(QMouseEvent* event) {
         if (_keyboardMouseDevice->isActive()) {
             _keyboardMouseDevice->mousePressEvent(event);
         }
-
-        if (event->button() == Qt::LeftButton) {
-            // nobody handled this - make it an action event on the _window object
-            HFActionEvent actionEvent(HFActionEvent::startType(),
-                computePickRay(mappedEvent.x(), mappedEvent.y()));
-            sendEvent(this, &actionEvent);
-        }
     }
 }
 
@@ -3443,13 +3401,6 @@ void Application::mouseReleaseEvent(QMouseEvent* event) {
         if (_keyboardMouseDevice->isActive()) {
             _keyboardMouseDevice->mouseReleaseEvent(event);
         }
-
-        if (event->button() == Qt::LeftButton) {
-            // fire an action end event
-            HFActionEvent actionEvent(HFActionEvent::endType(),
-                computePickRay(mappedEvent.x(), mappedEvent.y()));
-            sendEvent(this, &actionEvent);
-        }
     }
 }
 
@@ -3564,7 +3515,7 @@ bool Application::acceptSnapshot(const QString& urlString) {
             DependencyManager::get<AddressManager>()->handleLookupString(snapshotData->getURL().toString());
         }
     } else {
-        OffscreenUi::warning("", "No location details were found in the file\n" +
+        OffscreenUi::asyncWarning("", "No location details were found in the file\n" +
                              snapshotPath + "\nTry dragging in an authentic Hifi snapshot.");
     }
     return true;
@@ -3572,11 +3523,12 @@ bool Application::acceptSnapshot(const QString& urlString) {
 
 static uint32_t _renderedFrameIndex { INVALID_FRAME };
 
-bool Application::shouldPaint(float nsecsElapsed) {
+bool Application::shouldPaint() const {
     if (_aboutToQuit) {
         return false;
     }
 
+
     auto displayPlugin = getActiveDisplayPlugin();
 
 #ifdef DEBUG_PAINT_DELAY
@@ -3593,16 +3545,13 @@ bool Application::shouldPaint(float nsecsElapsed) {
     }
 #endif
 
-    float msecondsSinceLastUpdate = nsecsElapsed / NSECS_PER_USEC / USECS_PER_MSEC;
-
     // Throttle if requested
-    if (displayPlugin->isThrottled() && (msecondsSinceLastUpdate < THROTTLED_SIM_FRAME_PERIOD_MS)) {
+    if (displayPlugin->isThrottled() && (_lastTimeRendered.elapsed() < THROTTLED_SIM_FRAME_PERIOD_MS)) {
         return false;
     }
 
     // Sync up the _renderedFrameIndex
     _renderedFrameIndex = displayPlugin->presentCount();
-
     return true;
 }
 
@@ -3611,6 +3560,133 @@ bool Application::shouldPaint(float nsecsElapsed) {
 #include <TCHAR.h>
 #include <pdh.h>
 #pragma comment(lib, "pdh.lib")
+#pragma comment(lib, "ntdll.lib")
+
+extern "C" {
+    enum SYSTEM_INFORMATION_CLASS {
+        SystemBasicInformation = 0,
+        SystemProcessorPerformanceInformation = 8,
+    };
+
+    struct SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION {
+        LARGE_INTEGER IdleTime;
+        LARGE_INTEGER KernelTime;
+        LARGE_INTEGER UserTime;
+        LARGE_INTEGER DpcTime;
+        LARGE_INTEGER InterruptTime;
+        ULONG InterruptCount;
+    };
+
+    struct SYSTEM_BASIC_INFORMATION {
+        ULONG Reserved;
+        ULONG TimerResolution;
+        ULONG PageSize;
+        ULONG NumberOfPhysicalPages;
+        ULONG LowestPhysicalPageNumber;
+        ULONG HighestPhysicalPageNumber;
+        ULONG AllocationGranularity;
+        ULONG_PTR MinimumUserModeAddress;
+        ULONG_PTR MaximumUserModeAddress;
+        ULONG_PTR ActiveProcessorsAffinityMask;
+        CCHAR NumberOfProcessors;
+    };
+
+    NTSYSCALLAPI NTSTATUS NTAPI NtQuerySystemInformation(
+        _In_ SYSTEM_INFORMATION_CLASS SystemInformationClass,
+        _Out_writes_bytes_opt_(SystemInformationLength) PVOID SystemInformation,
+        _In_ ULONG SystemInformationLength,
+        _Out_opt_ PULONG ReturnLength
+    );
+
+}
+template <typename T>
+NTSTATUS NtQuerySystemInformation(SYSTEM_INFORMATION_CLASS SystemInformationClass, T& t) {
+    return NtQuerySystemInformation(SystemInformationClass, &t, (ULONG)sizeof(T), nullptr);
+}
+
+template <typename T>
+NTSTATUS NtQuerySystemInformation(SYSTEM_INFORMATION_CLASS SystemInformationClass, std::vector<T>& t) {
+    return NtQuerySystemInformation(SystemInformationClass, t.data(), (ULONG)(sizeof(T) * t.size()), nullptr);
+}
+
+
+template <typename T>
+void updateValueAndDelta(std::pair<T, T>& pair, T newValue) {
+    auto& value = pair.first;
+    auto& delta = pair.second;
+    delta = (value != 0) ? newValue - value : 0;
+    value = newValue;
+}
+
+struct MyCpuInfo {
+    using ValueAndDelta = std::pair<LONGLONG, LONGLONG>;
+    std::string name;
+    ValueAndDelta kernel { 0, 0 };
+    ValueAndDelta user { 0, 0 };
+    ValueAndDelta idle { 0, 0 };
+    float kernelUsage { 0.0f };
+    float userUsage { 0.0f };
+
+    void update(const SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION& cpuInfo) {
+        updateValueAndDelta(kernel, cpuInfo.KernelTime.QuadPart);
+        updateValueAndDelta(user, cpuInfo.UserTime.QuadPart);
+        updateValueAndDelta(idle, cpuInfo.IdleTime.QuadPart);
+        auto totalTime = kernel.second + user.second + idle.second;
+        if (totalTime != 0) {
+            kernelUsage = (FLOAT)kernel.second / totalTime;
+            userUsage = (FLOAT)user.second / totalTime;
+        } else {
+            kernelUsage = userUsage = 0.0f;
+        }
+    }
+};
+
+void updateCpuInformation() {
+    static std::once_flag once;
+    static SYSTEM_BASIC_INFORMATION systemInfo {};
+    static SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION cpuTotals;
+    static std::vector<SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION> cpuInfos;
+    static std::vector<MyCpuInfo> myCpuInfos;
+    static MyCpuInfo myCpuTotals;
+    std::call_once(once, [&] {
+        NtQuerySystemInformation( SystemBasicInformation, systemInfo);
+        cpuInfos.resize(systemInfo.NumberOfProcessors);
+        myCpuInfos.resize(systemInfo.NumberOfProcessors);
+        for (size_t i = 0; i < systemInfo.NumberOfProcessors; ++i) {
+            myCpuInfos[i].name = "cpu." + std::to_string(i);
+        }
+        myCpuTotals.name = "cpu.total";
+    });
+    NtQuerySystemInformation(SystemProcessorPerformanceInformation, cpuInfos);
+
+    // Zero the CPU totals.
+    memset(&cpuTotals, 0, sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION));
+    for (size_t i = 0; i < systemInfo.NumberOfProcessors; ++i) {
+        auto& cpuInfo = cpuInfos[i];
+        // KernelTime includes IdleTime.
+        cpuInfo.KernelTime.QuadPart -= cpuInfo.IdleTime.QuadPart;
+
+        // Update totals
+        cpuTotals.IdleTime.QuadPart += cpuInfo.IdleTime.QuadPart;
+        cpuTotals.KernelTime.QuadPart += cpuInfo.KernelTime.QuadPart;
+        cpuTotals.UserTime.QuadPart += cpuInfo.UserTime.QuadPart;
+
+        // Update friendly structure
+        auto& myCpuInfo = myCpuInfos[i];
+        myCpuInfo.update(cpuInfo);
+        PROFILE_COUNTER(app, myCpuInfo.name.c_str(), {
+            { "kernel", myCpuInfo.kernelUsage },
+            { "user", myCpuInfo.userUsage }
+        });
+    }
+
+    myCpuTotals.update(cpuTotals);
+    PROFILE_COUNTER(app, myCpuTotals.name.c_str(), {
+        { "kernel", myCpuTotals.kernelUsage },
+        { "user", myCpuTotals.userUsage }
+    });
+}
+
 
 static ULARGE_INTEGER lastCPU, lastSysCPU, lastUserCPU;
 static int numProcessors;
@@ -3663,10 +3739,29 @@ void getCpuUsage(vec3& systemAndUser) {
     systemAndUser.z = (float)counterVal.doubleValue;
 }
 
+void setupCpuMonitorThread() {
+    initCpuUsage();
+    auto cpuMonitorThread = QThread::currentThread();
+
+    QTimer* timer = new QTimer();
+    timer->setInterval(50);
+    QObject::connect(timer, &QTimer::timeout, [] {
+        updateCpuInformation();
+        vec3 kernelUserAndSystem;
+        getCpuUsage(kernelUserAndSystem);
+        PROFILE_COUNTER(app, "cpuProcess", { { "system", kernelUserAndSystem.x }, { "user", kernelUserAndSystem.y } });
+        PROFILE_COUNTER(app, "cpuSystem", { { "system", kernelUserAndSystem.z } });
+    });
+    QObject::connect(cpuMonitorThread, &QThread::finished, [=] {
+        timer->deleteLater();
+        cpuMonitorThread->deleteLater();
+    });
+    timer->start();
+}
+
 #endif
 
-
-void Application::idle(float nsecsElapsed) {
+void Application::idle() {
     PerformanceTimer perfTimer("idle");
 
     // Update the deadlock watchdog
@@ -3683,24 +3778,34 @@ void Application::idle(float nsecsElapsed) {
     }
 
 #ifdef Q_OS_WIN
+    // If tracing is enabled then monitor the CPU in a separate thread
     static std::once_flag once;
-    std::call_once(once, [] {
-        initCpuUsage();
+    std::call_once(once, [&] {
+        if (trace_app().isDebugEnabled()) {
+            QThread* cpuMonitorThread = new QThread(qApp);
+            cpuMonitorThread->setObjectName("cpuMonitorThread");
+            QObject::connect(cpuMonitorThread, &QThread::started, [this] { setupCpuMonitorThread(); });
+            QObject::connect(qApp, &QCoreApplication::aboutToQuit, cpuMonitorThread, &QThread::quit);
+            cpuMonitorThread->start();
+        }
     });
-
-    vec3 kernelUserAndSystem;
-    getCpuUsage(kernelUserAndSystem);
-    PROFILE_COUNTER(app, "cpuProcess", { { "system", kernelUserAndSystem.x }, { "user", kernelUserAndSystem.y } });
-    PROFILE_COUNTER(app, "cpuSystem", { { "system", kernelUserAndSystem.z } });
 #endif
 
-
-
     auto displayPlugin = getActiveDisplayPlugin();
+    if (displayPlugin) {
+        auto uiSize = displayPlugin->getRecommendedUiSize();
+        // Bit of a hack since there's no device pixel ratio change event I can find.
+        if (offscreenUi->size() != fromGlm(uiSize)) {
+            qCDebug(interfaceapp) << "Device pixel ratio changed, triggering resize to " << uiSize;
+            offscreenUi->resize(fromGlm(uiSize), true);
+            _offscreenContext->makeCurrent();
+        }
+    }
+
     if (displayPlugin) {
         PROFILE_COUNTER_IF_CHANGED(app, "present", float, displayPlugin->presentRate());
     }
-    PROFILE_COUNTER_IF_CHANGED(app, "fps", float, _frameCounter.rate());
+    PROFILE_COUNTER_IF_CHANGED(app, "renderLoopRate", float, _renderLoopCounter.rate());
     PROFILE_COUNTER_IF_CHANGED(app, "currentDownloads", int, ResourceCache::getLoadingRequests().length());
     PROFILE_COUNTER_IF_CHANGED(app, "pendingDownloads", int, ResourceCache::getPendingRequestCount());
     PROFILE_COUNTER_IF_CHANGED(app, "currentProcessing", int, DependencyManager::get<StatTracker>()->getStat("Processing").toInt());
@@ -3721,7 +3826,8 @@ void Application::idle(float nsecsElapsed) {
         steamClient->runCallbacks();
     }
 
-    float secondsSinceLastUpdate = nsecsElapsed / NSECS_PER_MSEC / MSECS_PER_SECOND;
+    float secondsSinceLastUpdate = (float)_lastTimeUpdated.nsecsElapsed() / NSECS_PER_MSEC / MSECS_PER_SECOND;
+    _lastTimeUpdated.start();
 
     // If the offscreen Ui has something active that is NOT the root, then assume it has keyboard focus.
     if (_keyboardDeviceHasFocus && offscreenUi && offscreenUi->getWindow()->activeFocusItem() != offscreenUi->getRootItem()) {
@@ -3735,14 +3841,16 @@ void Application::idle(float nsecsElapsed) {
 
     Stats::getInstance()->updateStats();
 
-    _simCounter.increment();
-
     // Normally we check PipelineWarnings, but since idle will often take more than 10ms we only show these idle timing
     // details if we're in ExtraDebugging mode. However, the ::update() and its subcomponents will show their timing
     // details normally.
     bool showWarnings = getLogger()->extraDebugging();
     PerformanceWarning warn(showWarnings, "idle()");
 
+    if (!_offscreenContext->makeCurrent()) {
+        qFatal("Unable to make main thread context current");
+    }
+
     {
         PerformanceTimer perfTimer("update");
         PerformanceWarning warn(showWarnings, "Application::idle()... update()");
@@ -3805,6 +3913,14 @@ void Application::idle(float nsecsElapsed) {
     }
 
     _overlayConductor.update(secondsSinceLastUpdate);
+
+    auto myAvatar = getMyAvatar();
+    if (_myCamera.getMode() == CAMERA_MODE_FIRST_PERSON || _myCamera.getMode() == CAMERA_MODE_THIRD_PERSON) {
+        Menu::getInstance()->setIsOptionChecked(MenuOption::FirstPerson, myAvatar->getBoomLength() <= MyAvatar::ZOOM_MIN);
+        Menu::getInstance()->setIsOptionChecked(MenuOption::ThirdPerson, !(myAvatar->getBoomLength() <= MyAvatar::ZOOM_MIN));
+        cameraMenuChanged();
+    }
+    _gameLoopCounter.increment();
 }
 
 ivec2 Application::getMouse() const {
@@ -3871,9 +3987,14 @@ void Application::calibrateEyeTracker5Points() {
 }
 #endif
 
-bool Application::exportEntities(const QString& filename, const QVector<EntityItemID>& entityIDs, const glm::vec3* givenOffset) {
+bool Application::exportEntities(const QString& filename,
+                                 const QVector<EntityItemID>& entityIDs,
+                                 const glm::vec3* givenOffset) {
     QHash<EntityItemID, EntityItemPointer> entities;
 
+    auto nodeList = DependencyManager::get<NodeList>();
+    const QUuid myAvatarID = nodeList->getSessionUUID();
+
     auto entityTree = getEntities()->getTree();
     auto exportTree = std::make_shared<EntityTree>();
     exportTree->createRootElement();
@@ -3889,8 +4010,12 @@ bool Application::exportEntities(const QString& filename, const QVector<EntityIt
 
             if (!givenOffset) {
                 EntityItemID parentID = entityItem->getParentID();
-                if (parentID.isInvalidID() || !entityIDs.contains(parentID) || !entityTree->findEntityByEntityItemID(parentID)) {
-                    auto position = entityItem->getPosition(); // If parent wasn't selected, we want absolute position, which isn't in properties.
+                bool parentIsAvatar = (parentID == AVATAR_SELF_ID || parentID == myAvatarID);
+                if (!parentIsAvatar && (parentID.isInvalidID() ||
+                                        !entityIDs.contains(parentID) ||
+                                        !entityTree->findEntityByEntityItemID(parentID))) {
+                    // If parent wasn't selected, we want absolute position, which isn't in properties.
+                    auto position = entityItem->getPosition();
                     root.x = glm::min(root.x, position.x);
                     root.y = glm::min(root.y, position.y);
                     root.z = glm::min(root.z, position.z);
@@ -3910,12 +4035,16 @@ bool Application::exportEntities(const QString& filename, const QVector<EntityIt
         for (EntityItemPointer& entityDatum : entities) {
             auto properties = entityDatum->getProperties();
             EntityItemID parentID = properties.getParentID();
-            if (parentID.isInvalidID()) {
-                properties.setPosition(properties.getPosition() - root);
+            bool parentIsAvatar = (parentID == AVATAR_SELF_ID || parentID == myAvatarID);
+            if (parentIsAvatar) {
+                properties.setParentID(AVATAR_SELF_ID);
+            } else {
+                if (parentID.isInvalidID()) {
+                    properties.setPosition(properties.getPosition() - root);
+                } else if (!entities.contains(parentID)) {
+                    entityDatum->globalizeProperties(properties, "Parent %3 of %2 %1 is not selected for export.", -root);
+                } // else valid parent -- don't offset
             }
-            else if (!entities.contains(parentID)) {
-                entityDatum->globalizeProperties(properties, "Parent %3 of %2 %1 is not selected for export.", -root);
-            } // else valid parent -- don't offset
             exportTree->addEntity(entityDatum->getEntityItemID(), properties);
         }
     });
@@ -3955,6 +4084,7 @@ void Application::loadSettings() {
     //DependencyManager::get<LODManager>()->setAutomaticLODAdjust(false);
 
     Menu::getInstance()->loadSettings();
+
     // If there is a preferred plugin, we probably messed it up with the menu settings, so fix it.
     auto pluginManager = PluginManager::getInstance();
     auto plugins = pluginManager->getPreferredDisplayPlugins();
@@ -3968,24 +4098,44 @@ void Application::loadSettings() {
                 break;
             }
         }
-    } else {
+    }
+
+    Setting::Handle<bool> firstRun { Settings::firstRun, true };
+    bool isFirstPerson = false;
+    if (firstRun.get()) {
         // If this is our first run, and no preferred devices were set, default to
         // an HMD device if available.
-        Setting::Handle<bool> firstRun { Settings::firstRun, true };
-        if (firstRun.get()) {
-            auto displayPlugins = pluginManager->getDisplayPlugins();
-            for (auto& plugin : displayPlugins) {
-                if (plugin->isHmd()) {
-                    if (auto action = menu->getActionForOption(plugin->getName())) {
-                        action->setChecked(true);
-                        action->trigger();
-                        break;
-                    }
+        auto displayPlugins = pluginManager->getDisplayPlugins();
+        for (auto& plugin : displayPlugins) {
+            if (plugin->isHmd()) {
+                if (auto action = menu->getActionForOption(plugin->getName())) {
+                    action->setChecked(true);
+                    action->trigger();
+                    break;
                 }
             }
         }
+
+        isFirstPerson = (qApp->isHMDMode());
+    } else {
+        // if this is not the first run, the camera will be initialized differently depending on user settings
+
+        if (qApp->isHMDMode()) {
+            // if the HMD is active, use first-person camera, unless the appropriate setting is checked
+            isFirstPerson = menu->isOptionChecked(MenuOption::FirstPersonHMD);
+        } else {
+            // if HMD is not active, only use first person if the menu option is checked
+            isFirstPerson = menu->isOptionChecked(MenuOption::FirstPerson);
+        }
     }
 
+    // finish initializing the camera, based on everything we checked above. Third person camera will be used if no settings
+    // 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);
+    cameraMenuChanged();
+
     auto inputs = pluginManager->getInputPlugins();
     for (auto plugin : inputs) {
         if (!plugin->isActive()) {
@@ -4028,18 +4178,17 @@ void Application::initDisplay() {
 }
 
 void Application::init() {
+    
     // Make sure Login state is up to date
     DependencyManager::get<DialogsManager>()->toggleLoginDialog();
 
     DependencyManager::get<DeferredLightingEffect>()->init();
 
     DependencyManager::get<AvatarManager>()->init();
-    _myCamera.setMode(CAMERA_MODE_FIRST_PERSON);
 
     _timerStart.start();
     _lastTimeUpdated.start();
 
-
     if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) {
         // when +connect_lobby in command line, join steam lobby
         const QString STEAM_LOBBY_COMMAND_LINE_KEY = "+connect_lobby";
@@ -4053,11 +4202,13 @@ void Application::init() {
 
     qCDebug(interfaceapp) << "Loaded settings";
 
-    Leapmotion::init();
-
     // fire off an immediate domain-server check in now that settings are loaded
     DependencyManager::get<NodeList>()->sendDomainServerCheckIn();
 
+    // This allows collision to be set up properly for shape entities supported by GeometryCache.
+    // This is before entity setup to ensure that it's ready for whenever instance collision is initialized.
+    ShapeEntityItem::setShapeInfoCalulator(ShapeEntityItem::ShapeInfoCalculator(&shapeInfoCalculator));
+
     getEntities()->init();
     getEntities()->setEntityLoadingPriorityFunction([this](const EntityItem& item) {
         auto dims = item.getDimensions();
@@ -4090,14 +4241,7 @@ void Application::init() {
 
     // Make sure any new sounds are loaded as soon as know about them.
     connect(tree.get(), &EntityTree::newCollisionSoundURL, this, [this](QUrl newURL, EntityItemID id) {
-        EntityTreePointer tree = getEntities()->getTree();
-        if (auto entity = tree->findEntityByEntityItemID(id)) {
-            auto sound = DependencyManager::get<SoundCache>()->getSound(newURL);
-            auto renderable = entity->getRenderableInterface();
-            if (renderable) {
-                renderable->setCollisionSound(sound);
-            }
-        }
+        getEntities()->setCollisionSound(id, DependencyManager::get<SoundCache>()->getSound(newURL));
     }, Qt::QueuedConnection);
     connect(getMyAvatar().get(), &MyAvatar::newCollisionSoundURL, this, [this](QUrl newURL) {
         if (auto avatar = getMyAvatar()) {
@@ -4107,11 +4251,13 @@ void Application::init() {
     }, Qt::QueuedConnection);
 }
 
-void Application::updateLOD() const {
+void Application::updateLOD(float deltaTime) const {
     PerformanceTimer perfTimer("LOD");
     // adjust it unless we were asked to disable this feature, or if we're currently in throttleRendering mode
     if (!isThrottleRendering()) {
-        DependencyManager::get<LODManager>()->autoAdjustLOD(_frameCounter.rate());
+        float batchTime = (float)_gpuContext->getFrameTimerBatchAverage();
+        float engineRunTime = (float)(_renderEngine->getConfiguration().get()->getCPURunTime());
+        DependencyManager::get<LODManager>()->autoAdjustLOD(batchTime, engineRunTime, deltaTime);
     } else {
         DependencyManager::get<LODManager>()->resetLODAdjust();
     }
@@ -4156,10 +4302,13 @@ void Application::updateMyAvatarLookAtPosition() {
         }
     } else {
         AvatarSharedPointer lookingAt = myAvatar->getLookAtTargetAvatar().lock();
-        if (lookingAt && myAvatar.get() != lookingAt.get()) {
+        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 = static_pointer_cast<Avatar>(lookingAt)->getHead();
+            auto lookingAtHead = avatar->getHead();
 
             const float MAXIMUM_FACE_ANGLE = 65.0f * RADIANS_PER_DEGREE;
             glm::vec3 lookingAtFaceOrientation = lookingAtHead->getFinalOrientationInWorldFrame() * IDENTITY_FORWARD;
@@ -4188,10 +4337,9 @@ void Application::updateMyAvatarLookAtPosition() {
             }
         } else {
             //  I am not looking at anyone else, so just look forward
-            auto headPose = myAvatar->getHeadControllerPoseInSensorFrame();
+            auto headPose = myAvatar->getControllerPoseInWorldFrame(controller::Action::HEAD);
             if (headPose.isValid()) {
-                glm::mat4 worldHeadMat = myAvatar->getSensorToWorldMatrix() * headPose.getMatrix();
-                lookAtSpot = transformPoint(worldHeadMat, glm::vec3(0.0f, 0.0f, TREE_SCALE));
+                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));
@@ -4292,27 +4440,29 @@ void Application::cameraModeChanged() {
 
 
 void Application::cameraMenuChanged() {
-    if (Menu::getInstance()->isOptionChecked(MenuOption::FullscreenMirror)) {
-        if (_myCamera.getMode() != CAMERA_MODE_MIRROR) {
+    auto menu = Menu::getInstance();
+    if (menu->isOptionChecked(MenuOption::FullscreenMirror)) {
+        if (!isHMDMode() && _myCamera.getMode() != CAMERA_MODE_MIRROR) {
             _myCamera.setMode(CAMERA_MODE_MIRROR);
+            getMyAvatar()->reset(false, false, false); // to reset any active MyAvatar::FollowHelpers
         }
-    } else if (Menu::getInstance()->isOptionChecked(MenuOption::FirstPerson)) {
+    } else 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::getInstance()->isOptionChecked(MenuOption::ThirdPerson)) {
+    } else if (menu->isOptionChecked(MenuOption::ThirdPerson)) {
         if (_myCamera.getMode() != CAMERA_MODE_THIRD_PERSON) {
             _myCamera.setMode(CAMERA_MODE_THIRD_PERSON);
             if (getMyAvatar()->getBoomLength() == MyAvatar::ZOOM_MIN) {
                 getMyAvatar()->setBoomLength(MyAvatar::ZOOM_DEFAULT);
             }
         }
-    } else if (Menu::getInstance()->isOptionChecked(MenuOption::IndependentMode)) {
+    } else if (menu->isOptionChecked(MenuOption::IndependentMode)) {
         if (_myCamera.getMode() != CAMERA_MODE_INDEPENDENT) {
             _myCamera.setMode(CAMERA_MODE_INDEPENDENT);
         }
-    } else if (Menu::getInstance()->isOptionChecked(MenuOption::CameraEntityMode)) {
+    } else if (menu->isOptionChecked(MenuOption::CameraEntityMode)) {
         if (_myCamera.getMode() != CAMERA_MODE_ENTITY) {
             _myCamera.setMode(CAMERA_MODE_ENTITY);
         }
@@ -4332,12 +4482,8 @@ void Application::resetPhysicsReadyInformation() {
 
 void Application::reloadResourceCaches() {
     resetPhysicsReadyInformation();
-    {
-        QMutexLocker viewLocker(&_viewMutex);
-        _viewFrustum.setPosition(glm::vec3(0.0f, 0.0f, TREE_SCALE));
-        _viewFrustum.setOrientation(glm::quat());
-    }
-    // Clear entities out of view frustum
+    // Query the octree to refresh everything in view
+    _lastQueriedTime = 0;
     queryOctree(NodeType::EntityServer, PacketType::EntityQuery, _entityServerJurisdictions);
 
     DependencyManager::get<AssetClient>()->clearCache();
@@ -4385,14 +4531,9 @@ QUuid Application::getKeyboardFocusEntity() const {
     return _keyboardFocusedEntity.get();
 }
 
-void Application::setKeyboardFocusEntity(QUuid id) {
-    EntityItemID entityItemID(id);
-    setKeyboardFocusEntity(entityItemID);
-}
-
 static const float FOCUS_HIGHLIGHT_EXPANSION_FACTOR = 1.05f;
 
-void Application::setKeyboardFocusEntity(EntityItemID entityItemID) {
+void Application::setKeyboardFocusEntity(const EntityItemID& entityItemID) {
     if (_keyboardFocusedEntity.get() != entityItemID) {
         _keyboardFocusedEntity.set(entityItemID);
 
@@ -4407,9 +4548,12 @@ void Application::setKeyboardFocusEntity(EntityItemID entityItemID) {
         auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
         auto properties = entityScriptingInterface->getEntityProperties(entityItemID);
         if (!properties.getLocked() && properties.getVisible()) {
-            auto entity = getEntities()->getTree()->findEntityByID(entityItemID);
-            if (entity && entity->wantsKeyboardFocus()) {
-                entity->setProxyWindow(_window->windowHandle());
+
+            auto entities = getEntities();
+            auto entityId = _keyboardFocusedEntity.get();
+            if (entities->wantsKeyboardFocus(entityId)) {
+                entities->setProxyWindow(entityId, _window->windowHandle());
+                auto entity = getEntities()->getEntity(entityId);
                 if (_keyboardMouseDevice->isActive()) {
                     _keyboardMouseDevice->pluginFocusOutEvent();
                 }
@@ -4426,7 +4570,7 @@ OverlayID Application::getKeyboardFocusOverlay() {
     return _keyboardFocusedOverlay.get();
 }
 
-void Application::setKeyboardFocusOverlay(OverlayID overlayID) {
+void Application::setKeyboardFocusOverlay(const OverlayID& overlayID) {
     if (overlayID != _keyboardFocusedOverlay.get()) {
         _keyboardFocusedOverlay.set(overlayID);
 
@@ -4475,13 +4619,7 @@ void Application::updateDialogs(float deltaTime) const {
 static bool domainLoadingInProgress = false;
 
 void Application::update(float deltaTime) {
-
-    PROFILE_RANGE_EX(app, __FUNCTION__, 0xffff0000, (uint64_t)_frameCount + 1);
-
-    bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
-    PerformanceWarning warn(showWarnings, "Application::update()");
-
-    updateLOD();
+    PROFILE_RANGE_EX(app, __FUNCTION__, 0xffff0000, (uint64_t)_renderFrameCount + 1);
 
     if (!_physicsEnabled) {
         if (!domainLoadingInProgress) {
@@ -4492,13 +4630,9 @@ void Application::update(float deltaTime) {
         // we haven't yet enabled physics.  we wait until we think we have all the collision information
         // for nearby entities before starting bullet up.
         quint64 now = usecTimestampNow();
-        bool timeout = false;
         const int PHYSICS_CHECK_TIMEOUT = 2 * USECS_PER_SECOND;
-        if (_lastPhysicsCheckTime > 0 && now - _lastPhysicsCheckTime > PHYSICS_CHECK_TIMEOUT) {
-            timeout = true;
-        }
 
-        if (timeout || _fullSceneReceivedCounter > _fullSceneCounterAtLastPhysicsCheck) {
+        if (now - _lastPhysicsCheckTime > PHYSICS_CHECK_TIMEOUT || _fullSceneReceivedCounter > _fullSceneCounterAtLastPhysicsCheck) {
             // we've received a new full-scene octree stats packet, or it's been long enough to try again anyway
             _lastPhysicsCheckTime = now;
             _fullSceneCounterAtLastPhysicsCheck = _fullSceneReceivedCounter;
@@ -4516,9 +4650,9 @@ void Application::update(float deltaTime) {
         PROFILE_ASYNC_END(app, "Scene Loading", "");
     }
 
+    auto myAvatar = getMyAvatar();
     {
         PerformanceTimer perfTimer("devices");
-        DeviceTracker::updateAll();
 
         FaceTracker* tracker = getSelectedFaceTracker();
         if (tracker && Menu::getInstance()->isOptionChecked(MenuOption::MuteFaceTracking) != tracker->isMuted()) {
@@ -4550,197 +4684,269 @@ void Application::update(float deltaTime) {
             _lastFaceTrackerUpdate = 0;
         }
 
-    }
+        auto userInputMapper = DependencyManager::get<UserInputMapper>();
 
-    auto myAvatar = getMyAvatar();
-    auto userInputMapper = DependencyManager::get<UserInputMapper>();
+        controller::InputCalibrationData calibrationData = {
+            myAvatar->getSensorToWorldMatrix(),
+            createMatFromQuatAndPos(myAvatar->getOrientation(), myAvatar->getPosition()),
+            myAvatar->getHMDSensorMatrix(),
+            myAvatar->getCenterEyeCalibrationMat(),
+            myAvatar->getHeadCalibrationMat(),
+            myAvatar->getSpine2CalibrationMat(),
+            myAvatar->getHipsCalibrationMat(),
+            myAvatar->getLeftFootCalibrationMat(),
+            myAvatar->getRightFootCalibrationMat(),
+            myAvatar->getRightArmCalibrationMat(),
+            myAvatar->getLeftArmCalibrationMat(),
+            myAvatar->getRightHandCalibrationMat(),
+            myAvatar->getLeftHandCalibrationMat()
+        };
 
-    controller::InputCalibrationData calibrationData = {
-        myAvatar->getSensorToWorldMatrix(),
-        createMatFromQuatAndPos(myAvatar->getOrientation(), myAvatar->getPosition()),
-        myAvatar->getHMDSensorMatrix(),
-        myAvatar->getCenterEyeCalibrationMat(),
-        myAvatar->getHeadCalibrationMat(),
-        myAvatar->getSpine2CalibrationMat(),
-        myAvatar->getHipsCalibrationMat(),
-        myAvatar->getLeftFootCalibrationMat(),
-        myAvatar->getRightFootCalibrationMat(),
-        myAvatar->getRightArmCalibrationMat(),
-        myAvatar->getLeftArmCalibrationMat(),
-        myAvatar->getRightHandCalibrationMat(),
-        myAvatar->getLeftHandCalibrationMat()
-    };
-
-    InputPluginPointer keyboardMousePlugin;
-    for (auto inputPlugin : PluginManager::getInstance()->getInputPlugins()) {
-        if (inputPlugin->getName() == KeyboardMouseDevice::NAME) {
-            keyboardMousePlugin = inputPlugin;
-        } else if (inputPlugin->isActive()) {
-            inputPlugin->pluginUpdate(deltaTime, calibrationData);
-        }
-    }
-
-    userInputMapper->setInputCalibrationData(calibrationData);
-    userInputMapper->update(deltaTime);
-
-    if (keyboardMousePlugin && keyboardMousePlugin->isActive()) {
-        keyboardMousePlugin->pluginUpdate(deltaTime, calibrationData);
-    }
-
-    _controllerScriptingInterface->updateInputControllers();
-
-    // Transfer the user inputs to the driveKeys
-    // FIXME can we drop drive keys and just have the avatar read the action states directly?
-    myAvatar->clearDriveKeys();
-    if (_myCamera.getMode() != CAMERA_MODE_INDEPENDENT) {
-        if (!_controllerScriptingInterface->areActionsCaptured()) {
-            myAvatar->setDriveKey(MyAvatar::TRANSLATE_Z, -1.0f * userInputMapper->getActionState(controller::Action::TRANSLATE_Z));
-            myAvatar->setDriveKey(MyAvatar::TRANSLATE_Y, userInputMapper->getActionState(controller::Action::TRANSLATE_Y));
-            myAvatar->setDriveKey(MyAvatar::TRANSLATE_X, userInputMapper->getActionState(controller::Action::TRANSLATE_X));
-            if (deltaTime > FLT_EPSILON) {
-                myAvatar->setDriveKey(MyAvatar::PITCH, -1.0f * userInputMapper->getActionState(controller::Action::PITCH));
-                myAvatar->setDriveKey(MyAvatar::YAW, -1.0f * userInputMapper->getActionState(controller::Action::YAW));
-                myAvatar->setDriveKey(MyAvatar::STEP_YAW, -1.0f * userInputMapper->getActionState(controller::Action::STEP_YAW));
+        InputPluginPointer keyboardMousePlugin;
+        for (auto inputPlugin : PluginManager::getInstance()->getInputPlugins()) {
+            if (inputPlugin->getName() == KeyboardMouseDevice::NAME) {
+                keyboardMousePlugin = inputPlugin;
+            } else if (inputPlugin->isActive()) {
+                inputPlugin->pluginUpdate(deltaTime, calibrationData);
             }
         }
-        myAvatar->setDriveKey(MyAvatar::ZOOM, userInputMapper->getActionState(controller::Action::TRANSLATE_CAMERA_Z));
+
+        userInputMapper->setInputCalibrationData(calibrationData);
+        userInputMapper->update(deltaTime);
+
+        if (keyboardMousePlugin && keyboardMousePlugin->isActive()) {
+            keyboardMousePlugin->pluginUpdate(deltaTime, calibrationData);
+        }
+
+        // Transfer the user inputs to the driveKeys
+        // FIXME can we drop drive keys and just have the avatar read the action states directly?
+        myAvatar->clearDriveKeys();
+        if (_myCamera.getMode() != CAMERA_MODE_INDEPENDENT) {
+            if (!_controllerScriptingInterface->areActionsCaptured()) {
+                myAvatar->setDriveKey(MyAvatar::TRANSLATE_Z, -1.0f * userInputMapper->getActionState(controller::Action::TRANSLATE_Z));
+                myAvatar->setDriveKey(MyAvatar::TRANSLATE_Y, userInputMapper->getActionState(controller::Action::TRANSLATE_Y));
+                myAvatar->setDriveKey(MyAvatar::TRANSLATE_X, userInputMapper->getActionState(controller::Action::TRANSLATE_X));
+                if (deltaTime > FLT_EPSILON) {
+                    myAvatar->setDriveKey(MyAvatar::PITCH, -1.0f * userInputMapper->getActionState(controller::Action::PITCH));
+                    myAvatar->setDriveKey(MyAvatar::YAW, -1.0f * userInputMapper->getActionState(controller::Action::YAW));
+                    myAvatar->setDriveKey(MyAvatar::STEP_YAW, -1.0f * userInputMapper->getActionState(controller::Action::STEP_YAW));
+                }
+            }
+            myAvatar->setDriveKey(MyAvatar::ZOOM, userInputMapper->getActionState(controller::Action::TRANSLATE_CAMERA_Z));
+        }
+
+        static const std::vector<controller::Action> avatarControllerActions = {
+            controller::Action::LEFT_HAND,
+            controller::Action::RIGHT_HAND,
+            controller::Action::LEFT_FOOT,
+            controller::Action::RIGHT_FOOT,
+            controller::Action::HIPS,
+            controller::Action::SPINE2,
+            controller::Action::HEAD,
+            controller::Action::LEFT_HAND_THUMB1,
+            controller::Action::LEFT_HAND_THUMB2,
+            controller::Action::LEFT_HAND_THUMB3,
+            controller::Action::LEFT_HAND_THUMB4,
+            controller::Action::LEFT_HAND_INDEX1,
+            controller::Action::LEFT_HAND_INDEX2,
+            controller::Action::LEFT_HAND_INDEX3,
+            controller::Action::LEFT_HAND_INDEX4,
+            controller::Action::LEFT_HAND_MIDDLE1,
+            controller::Action::LEFT_HAND_MIDDLE2,
+            controller::Action::LEFT_HAND_MIDDLE3,
+            controller::Action::LEFT_HAND_MIDDLE4,
+            controller::Action::LEFT_HAND_RING1,
+            controller::Action::LEFT_HAND_RING2,
+            controller::Action::LEFT_HAND_RING3,
+            controller::Action::LEFT_HAND_RING4,
+            controller::Action::LEFT_HAND_PINKY1,
+            controller::Action::LEFT_HAND_PINKY2,
+            controller::Action::LEFT_HAND_PINKY3,
+            controller::Action::LEFT_HAND_PINKY4,
+            controller::Action::RIGHT_HAND_THUMB1,
+            controller::Action::RIGHT_HAND_THUMB2,
+            controller::Action::RIGHT_HAND_THUMB3,
+            controller::Action::RIGHT_HAND_THUMB4,
+            controller::Action::RIGHT_HAND_INDEX1,
+            controller::Action::RIGHT_HAND_INDEX2,
+            controller::Action::RIGHT_HAND_INDEX3,
+            controller::Action::RIGHT_HAND_INDEX4,
+            controller::Action::RIGHT_HAND_MIDDLE1,
+            controller::Action::RIGHT_HAND_MIDDLE2,
+            controller::Action::RIGHT_HAND_MIDDLE3,
+            controller::Action::RIGHT_HAND_MIDDLE4,
+            controller::Action::RIGHT_HAND_RING1,
+            controller::Action::RIGHT_HAND_RING2,
+            controller::Action::RIGHT_HAND_RING3,
+            controller::Action::RIGHT_HAND_RING4,
+            controller::Action::RIGHT_HAND_PINKY1,
+            controller::Action::RIGHT_HAND_PINKY2,
+            controller::Action::RIGHT_HAND_PINKY3,
+            controller::Action::RIGHT_HAND_PINKY4,
+            controller::Action::LEFT_ARM,
+            controller::Action::RIGHT_ARM,
+            controller::Action::LEFT_SHOULDER,
+            controller::Action::RIGHT_SHOULDER,
+            controller::Action::LEFT_FORE_ARM,
+            controller::Action::RIGHT_FORE_ARM,
+            controller::Action::LEFT_LEG,
+            controller::Action::RIGHT_LEG,
+            controller::Action::LEFT_UP_LEG,
+            controller::Action::RIGHT_UP_LEG,
+            controller::Action::LEFT_TOE_BASE,
+            controller::Action::RIGHT_TOE_BASE
+        };
+
+        // copy controller poses from userInputMapper to myAvatar.
+        glm::mat4 myAvatarMatrix = createMatFromQuatAndPos(myAvatar->getOrientation(), myAvatar->getPosition());
+        glm::mat4 worldToSensorMatrix = glm::inverse(myAvatar->getSensorToWorldMatrix());
+        glm::mat4 avatarToSensorMatrix = worldToSensorMatrix * myAvatarMatrix;
+        for (auto& action : avatarControllerActions) {
+            controller::Pose pose = userInputMapper->getPoseState(action);
+            myAvatar->setControllerPoseInSensorFrame(action, pose.transform(avatarToSensorMatrix));
+        }
     }
 
-    controller::Pose leftHandPose = userInputMapper->getPoseState(controller::Action::LEFT_HAND);
-    controller::Pose rightHandPose = userInputMapper->getPoseState(controller::Action::RIGHT_HAND);
-    auto myAvatarMatrix = createMatFromQuatAndPos(myAvatar->getOrientation(), myAvatar->getPosition());
-    auto worldToSensorMatrix = glm::inverse(myAvatar->getSensorToWorldMatrix());
-    auto avatarToSensorMatrix = worldToSensorMatrix * myAvatarMatrix;
-    myAvatar->setHandControllerPosesInSensorFrame(leftHandPose.transform(avatarToSensorMatrix), rightHandPose.transform(avatarToSensorMatrix));
-
-    controller::Pose leftFootPose = userInputMapper->getPoseState(controller::Action::LEFT_FOOT);
-    controller::Pose rightFootPose = userInputMapper->getPoseState(controller::Action::RIGHT_FOOT);
-    myAvatar->setFootControllerPosesInSensorFrame(leftFootPose.transform(avatarToSensorMatrix), rightFootPose.transform(avatarToSensorMatrix));
-
-    controller::Pose hipsPose = userInputMapper->getPoseState(controller::Action::HIPS);
-    controller::Pose spine2Pose = userInputMapper->getPoseState(controller::Action::SPINE2);
-    myAvatar->setSpineControllerPosesInSensorFrame(hipsPose.transform(avatarToSensorMatrix), spine2Pose.transform(avatarToSensorMatrix));
-
-    controller::Pose headPose = userInputMapper->getPoseState(controller::Action::HEAD);
-    myAvatar->setHeadControllerPoseInSensorFrame(headPose.transform(avatarToSensorMatrix));
-
-    controller::Pose leftArmPose = userInputMapper->getPoseState(controller::Action::LEFT_ARM);
-    controller::Pose rightArmPose = userInputMapper->getPoseState(controller::Action::RIGHT_ARM);
-    myAvatar->setArmControllerPosesInSensorFrame(leftArmPose.transform(avatarToSensorMatrix), rightArmPose.transform(avatarToSensorMatrix));
-
     updateThreads(deltaTime); // If running non-threaded, then give the threads some time to process...
     updateDialogs(deltaTime); // update various stats dialogs if present
 
     QSharedPointer<AvatarManager> avatarManager = DependencyManager::get<AvatarManager>();
 
-    if (_physicsEnabled) {
-        PROFILE_RANGE_EX(simulation_physics, "Physics", 0xffff0000, (uint64_t)getActiveDisplayPlugin()->presentCount());
-
+    {
+        PROFILE_RANGE(simulation_physics, "Physics");
         PerformanceTimer perfTimer("physics");
+        if (_physicsEnabled) {
+            {
+                PROFILE_RANGE(simulation_physics, "PreStep");
 
-        {
-            PROFILE_RANGE_EX(simulation_physics, "UpdateStats", 0xffffff00, (uint64_t)getActiveDisplayPlugin()->presentCount());
+                PerformanceTimer perfTimer("updateStates)");
+                static VectorOfMotionStates motionStates;
+                _entitySimulation->getObjectsToRemoveFromPhysics(motionStates);
+                _physicsEngine->removeObjects(motionStates);
+                _entitySimulation->deleteObjectsRemovedFromPhysics();
 
-            PerformanceTimer perfTimer("updateStates)");
-            static VectorOfMotionStates motionStates;
-            _entitySimulation->getObjectsToRemoveFromPhysics(motionStates);
-            _physicsEngine->removeObjects(motionStates);
-            _entitySimulation->deleteObjectsRemovedFromPhysics();
+                getEntities()->getTree()->withReadLock([&] {
+                    _entitySimulation->getObjectsToAddToPhysics(motionStates);
+                    _physicsEngine->addObjects(motionStates);
 
-            getEntities()->getTree()->withReadLock([&] {
-                _entitySimulation->getObjectsToAddToPhysics(motionStates);
-                _physicsEngine->addObjects(motionStates);
-
-            });
-            getEntities()->getTree()->withReadLock([&] {
-                _entitySimulation->getObjectsToChange(motionStates);
-                VectorOfMotionStates stillNeedChange = _physicsEngine->changeObjects(motionStates);
-                _entitySimulation->setObjectsToChange(stillNeedChange);
-            });
-
-            _entitySimulation->applyDynamicChanges();
-
-             avatarManager->getObjectsToRemoveFromPhysics(motionStates);
-            _physicsEngine->removeObjects(motionStates);
-            avatarManager->getObjectsToAddToPhysics(motionStates);
-            _physicsEngine->addObjects(motionStates);
-            avatarManager->getObjectsToChange(motionStates);
-            _physicsEngine->changeObjects(motionStates);
-
-            myAvatar->prepareForPhysicsSimulation();
-            _physicsEngine->forEachDynamic([&](EntityDynamicPointer dynamic) {
-                dynamic->prepareForPhysicsSimulation();
-            });
-        }
-        {
-            PROFILE_RANGE_EX(simulation_physics, "StepSimulation", 0xffff8000, (uint64_t)getActiveDisplayPlugin()->presentCount());
-            PerformanceTimer perfTimer("stepSimulation");
-            getEntities()->getTree()->withWriteLock([&] {
-                _physicsEngine->stepSimulation();
-            });
-        }
-        {
-            PROFILE_RANGE_EX(simulation_physics, "HarvestChanges", 0xffffff00, (uint64_t)getActiveDisplayPlugin()->presentCount());
-            PerformanceTimer perfTimer("harvestChanges");
-            if (_physicsEngine->hasOutgoingChanges()) {
-                // grab the collision events BEFORE handleOutgoingChanges() because at this point
-                // we have a better idea of which objects we own or should own.
-                auto& collisionEvents = _physicsEngine->getCollisionEvents();
-
-                getEntities()->getTree()->withWriteLock([&] {
-                    PerformanceTimer perfTimer("handleOutgoingChanges");
-
-                    const VectorOfMotionStates& outgoingChanges = _physicsEngine->getChangedMotionStates();
-                    _entitySimulation->handleChangedMotionStates(outgoingChanges);
-                    avatarManager->handleChangedMotionStates(outgoingChanges);
-
-                    const VectorOfMotionStates& deactivations = _physicsEngine->getDeactivatedMotionStates();
-                    _entitySimulation->handleDeactivatedMotionStates(deactivations);
+                });
+                getEntities()->getTree()->withReadLock([&] {
+                    _entitySimulation->getObjectsToChange(motionStates);
+                    VectorOfMotionStates stillNeedChange = _physicsEngine->changeObjects(motionStates);
+                    _entitySimulation->setObjectsToChange(stillNeedChange);
                 });
 
-                if (!_aboutToQuit) {
-                    // handleCollisionEvents() AFTER handleOutgoinChanges()
-                    PerformanceTimer perfTimer("entities");
-                    avatarManager->handleCollisionEvents(collisionEvents);
-                    // Collision events (and their scripts) must not be handled when we're locked, above. (That would risk
-                    // deadlock.)
-                    _entitySimulation->handleCollisionEvents(collisionEvents);
+                _entitySimulation->applyDynamicChanges();
 
-                    // NOTE: the getEntities()->update() call below will wait for lock
-                    // and will simulate entity motion (the EntityTree has been given an EntitySimulation).
-                    getEntities()->update(); // update the models...
-                }
+                 avatarManager->getObjectsToRemoveFromPhysics(motionStates);
+                _physicsEngine->removeObjects(motionStates);
+                avatarManager->getObjectsToAddToPhysics(motionStates);
+                _physicsEngine->addObjects(motionStates);
+                avatarManager->getObjectsToChange(motionStates);
+                _physicsEngine->changeObjects(motionStates);
 
-                myAvatar->harvestResultsFromPhysicsSimulation(deltaTime);
-
-                if (Menu::getInstance()->isOptionChecked(MenuOption::DisplayDebugTimingDetails) &&
-                        Menu::getInstance()->isOptionChecked(MenuOption::ExpandPhysicsSimulationTiming)) {
-                    _physicsEngine->harvestPerformanceStats();
-                }
-                // NOTE: the PhysicsEngine stats are written to stdout NOT to Qt log framework
-                _physicsEngine->dumpStatsIfNecessary();
+                myAvatar->prepareForPhysicsSimulation();
+                _physicsEngine->forEachDynamic([&](EntityDynamicPointer dynamic) {
+                    dynamic->prepareForPhysicsSimulation();
+                });
             }
+            {
+                PROFILE_RANGE(simulation_physics, "Step");
+                PerformanceTimer perfTimer("stepSimulation");
+                getEntities()->getTree()->withWriteLock([&] {
+                    _physicsEngine->stepSimulation();
+                });
+            }
+            {
+                PROFILE_RANGE(simulation_physics, "PostStep");
+                PerformanceTimer perfTimer("harvestChanges");
+                if (_physicsEngine->hasOutgoingChanges()) {
+                    // grab the collision events BEFORE handleOutgoingChanges() because at this point
+                    // we have a better idea of which objects we own or should own.
+                    auto& collisionEvents = _physicsEngine->getCollisionEvents();
+
+                    getEntities()->getTree()->withWriteLock([&] {
+                        PROFILE_RANGE(simulation_physics, "Harvest");
+                        PerformanceTimer perfTimer("handleOutgoingChanges");
+
+                        const VectorOfMotionStates& outgoingChanges = _physicsEngine->getChangedMotionStates();
+                        _entitySimulation->handleChangedMotionStates(outgoingChanges);
+                        avatarManager->handleChangedMotionStates(outgoingChanges);
+
+                        const VectorOfMotionStates& deactivations = _physicsEngine->getDeactivatedMotionStates();
+                        _entitySimulation->handleDeactivatedMotionStates(deactivations);
+                    });
+
+                    if (!_aboutToQuit) {
+                        // handleCollisionEvents() AFTER handleOutgoinChanges()
+                        {
+                            PROFILE_RANGE(simulation_physics, "CollisionEvents");
+                            PerformanceTimer perfTimer("entities");
+                            avatarManager->handleCollisionEvents(collisionEvents);
+                            // Collision events (and their scripts) must not be handled when we're locked, above. (That would risk
+                            // deadlock.)
+                            _entitySimulation->handleCollisionEvents(collisionEvents);
+                        }
+
+                        PROFILE_RANGE(simulation_physics, "UpdateEntities");
+                        // NOTE: the getEntities()->update() call below will wait for lock
+                        // and will simulate entity motion (the EntityTree has been given an EntitySimulation).
+                        getEntities()->update(true); // update the models...
+                    }
+
+                    {
+                        PROFILE_RANGE(simulation_physics, "MyAvatar");
+                        myAvatar->harvestResultsFromPhysicsSimulation(deltaTime);
+                    }
+
+                    if (Menu::getInstance()->isOptionChecked(MenuOption::DisplayDebugTimingDetails) &&
+                            Menu::getInstance()->isOptionChecked(MenuOption::ExpandPhysicsSimulationTiming)) {
+                        _physicsEngine->harvestPerformanceStats();
+                    }
+                    // NOTE: the PhysicsEngine stats are written to stdout NOT to Qt log framework
+                    _physicsEngine->dumpStatsIfNecessary();
+                }
+            }
+        } else {
+            // update the rendering without any simulation
+            getEntities()->update(false);
         }
     }
 
     // AvatarManager update
     {
-        PerformanceTimer perfTimer("AvatarManager");
-        _avatarSimCounter.increment();
-
         {
-            PROFILE_RANGE_EX(simulation, "OtherAvatars", 0xffff00ff, (uint64_t)getActiveDisplayPlugin()->presentCount());
+            PROFILE_RANGE(simulation, "OtherAvatars");
+            PerformanceTimer perfTimer("otherAvatars");
             avatarManager->updateOtherAvatars(deltaTime);
         }
 
-        qApp->updateMyAvatarLookAtPosition();
-
         {
-            PROFILE_RANGE_EX(simulation, "MyAvatar", 0xffff00ff, (uint64_t)getActiveDisplayPlugin()->presentCount());
+            PROFILE_RANGE(simulation, "MyAvatar");
+            PerformanceTimer perfTimer("MyAvatar");
+            qApp->updateMyAvatarLookAtPosition();
             avatarManager->updateMyAvatar(deltaTime);
         }
     }
 
+    PerformanceTimer perfTimer("misc");
+
+    bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
+    PerformanceWarning warn(showWarnings, "Application::update()");
+
+    updateLOD(deltaTime);
+
+    // TODO: break these out into distinct perfTimers when they prove interesting
+    {
+        PROFILE_RANGE(app, "RayPickManager");
+        _rayPickManager.update();
+    }
+
+    {
+        PROFILE_RANGE(app, "LaserPointerManager");
+        _laserPointerManager.update();
+    }
+
     {
         PROFILE_RANGE_EX(app, "Overlays", 0xffff0000, (uint64_t)getActiveDisplayPlugin()->presentCount());
         PerformanceTimer perfTimer("overlays");
@@ -4800,7 +5006,8 @@ void Application::update(float deltaTime) {
         }
     }
 
-    avatarManager->postUpdate(deltaTime);
+    avatarManager->postUpdate(deltaTime, getMain3DScene());
+
 
     {
         PROFILE_RANGE_EX(app, "PreRenderLambdas", 0xffff0000, (uint64_t)0);
@@ -4812,9 +5019,126 @@ void Application::update(float deltaTime) {
         _postUpdateLambdas.clear();
     }
 
+    editRenderArgs([this](AppRenderArgs& appRenderArgs) {
+        appRenderArgs._headPose= getHMDSensorPose();
+
+        auto myAvatar = getMyAvatar();
+
+        // update the avatar with a fresh HMD pose
+        {
+            PROFILE_RANGE(render, "/updateAvatar");
+            myAvatar->updateFromHMDSensorMatrix(appRenderArgs._headPose);
+        }
+
+        auto lodManager = DependencyManager::get<LODManager>();
+
+        float sensorToWorldScale = getMyAvatar()->getSensorToWorldScale();
+        appRenderArgs._sensorToWorldScale = sensorToWorldScale;
+        appRenderArgs._sensorToWorld = getMyAvatar()->getSensorToWorldMatrix();
+        {
+            PROFILE_RANGE(render, "/buildFrustrumAndArgs");
+            {
+                QMutexLocker viewLocker(&_viewMutex);
+                // adjust near clip plane to account for sensor scaling.
+                auto adjustedProjection = glm::perspective(_viewFrustum.getFieldOfView(),
+                    _viewFrustum.getAspectRatio(),
+                    DEFAULT_NEAR_CLIP * sensorToWorldScale,
+                    _viewFrustum.getFarClip());
+                _viewFrustum.setProjection(adjustedProjection);
+                _viewFrustum.calculate();
+            }
+            appRenderArgs._renderArgs = RenderArgs(_gpuContext, lodManager->getOctreeSizeScale(),
+                lodManager->getBoundaryLevelAdjust(), RenderArgs::DEFAULT_RENDER_MODE,
+                RenderArgs::MONO, RenderArgs::RENDER_DEBUG_NONE);
+            appRenderArgs._renderArgs._scene = getMain3DScene();
+
+            {
+                QMutexLocker viewLocker(&_viewMutex);
+                appRenderArgs._renderArgs.setViewFrustum(_viewFrustum);
+            }
+        }
+        {
+            PROFILE_RANGE(render, "/resizeGL");
+            PerformanceWarning::setSuppressShortTimings(Menu::getInstance()->isOptionChecked(MenuOption::SuppressShortTimings));
+            bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
+            PerformanceWarning warn(showWarnings, "Application::paintGL()");
+            resizeGL();
+        }
+
+        this->updateCamera(appRenderArgs._renderArgs);
+        appRenderArgs._eyeToWorld = _myCamera.getTransform();
+        appRenderArgs._isStereo = false;
+
+        {
+            auto hmdInterface = DependencyManager::get<HMDScriptingInterface>();
+            float ipdScale = hmdInterface->getIPDScale();
+
+            // scale IPD by sensorToWorldScale, to make the world seem larger or smaller accordingly.
+            ipdScale *= sensorToWorldScale;
+
+            auto baseProjection = appRenderArgs._renderArgs.getViewFrustum().getProjection();
+
+            if (getActiveDisplayPlugin()->isStereo()) {
+                // Stereo modes will typically have a larger projection matrix overall,
+                // so we ask for the 'mono' projection matrix, which for stereo and HMD
+                // plugins will imply the combined projection for both eyes.
+                //
+                // This is properly implemented for the Oculus plugins, but for OpenVR
+                // and Stereo displays I'm not sure how to get / calculate it, so we're
+                // just relying on the left FOV in each case and hoping that the
+                // overall culling margin of error doesn't cause popping in the
+                // right eye.  There are FIXMEs in the relevant plugins
+                _myCamera.setProjection(getActiveDisplayPlugin()->getCullingProjection(baseProjection));
+                appRenderArgs._isStereo = true;
+
+                auto& eyeOffsets = appRenderArgs._eyeOffsets;
+                auto& eyeProjections = appRenderArgs._eyeProjections;
+
+                // FIXME we probably don't need to set the projection matrix every frame,
+                // only when the display plugin changes (or in non-HMD modes when the user
+                // changes the FOV manually, which right now I don't think they can.
+                for_each_eye([&](Eye eye) {
+                    // For providing the stereo eye views, the HMD head pose has already been
+                    // applied to the avatar, so we need to get the difference between the head
+                    // pose applied to the avatar and the per eye pose, and use THAT as
+                    // the per-eye stereo matrix adjustment.
+                    mat4 eyeToHead = getActiveDisplayPlugin()->getEyeToHeadTransform(eye);
+                    // Grab the translation
+                    vec3 eyeOffset = glm::vec3(eyeToHead[3]);
+                    // Apply IPD scaling
+                    mat4 eyeOffsetTransform = glm::translate(mat4(), eyeOffset * -1.0f * ipdScale);
+                    eyeOffsets[eye] = eyeOffsetTransform;
+                    eyeProjections[eye] = getActiveDisplayPlugin()->getEyeProjection(eye, baseProjection);
+                });
+
+                // Configure the type of display / stereo
+                appRenderArgs._renderArgs._displayMode = (isHMDMode() ? RenderArgs::STEREO_HMD : RenderArgs::STEREO_MONITOR);
+            }
+        }
+
+        // HACK
+        // load the view frustum
+        // FIXME: This preDisplayRender call is temporary until we create a separate render::scene for the mirror rendering.
+        // Then we can move this logic into the Avatar::simulate call.
+        myAvatar->preDisplaySide(&appRenderArgs._renderArgs);
+
+        {
+            QMutexLocker viewLocker(&_viewMutex);
+            _myCamera.loadViewFrustum(_displayViewFrustum);
+        }
+
+        {
+            QMutexLocker viewLocker(&_viewMutex);
+            appRenderArgs._renderArgs.setViewFrustum(_displayViewFrustum);
+        }
+    });
+
     AnimDebugDraw::getInstance().update();
 
     DependencyManager::get<LimitlessVoiceRecognitionScriptingInterface>()->update();
+
+    // Game loop is done, mark the end of the frame for the scene transactions and the render loop to take over
+    getMain3DScene()->enqueueFrame();
 }
 
 void Application::sendAvatarViewFrustum() {
@@ -4873,11 +5197,10 @@ int Application::sendNackPackets() {
         }
     });
 
-
     return packetsSent;
 }
 
-void Application::queryOctree(NodeType_t serverType, PacketType packetType, NodeToJurisdictionMap& jurisdictions, bool forceResend) {
+void Application::queryOctree(NodeType_t serverType, PacketType packetType, NodeToJurisdictionMap& jurisdictions) {
 
     if (!_settingsLoaded) {
         return; // bail early if settings are not loaded
@@ -5033,16 +5356,6 @@ void Application::queryOctree(NodeType_t serverType, PacketType packetType, Node
                 _octreeQuery.setMaxQueryPacketsPerSecond(0);
             }
 
-            // if asked to forceResend, then set the query's position/orientation to be degenerate in a manner
-            // that will cause our next query to be guarenteed to be different and the server will resend to us
-            if (forceResend) {
-                _octreeQuery.setCameraPosition(glm::vec3(-0.1, -0.1, -0.1));
-                const glm::quat OFF_IN_NEGATIVE_SPACE = glm::quat(-0.5, 0, -0.5, 1.0);
-                _octreeQuery.setCameraOrientation(OFF_IN_NEGATIVE_SPACE);
-                _octreeQuery.setCameraNearClip(0.1f);
-                _octreeQuery.setCameraFarClip(0.1f);
-            }
-
             // encode the query data
             int packetSize = _octreeQuery.getBroadcastData(reinterpret_cast<unsigned char*>(queryPacket->getPayload()));
             queryPacket->setPayloadSize(packetSize);
@@ -5058,7 +5371,7 @@ bool Application::isHMDMode() const {
     return getActiveDisplayPlugin()->isHmd();
 }
 
-float Application::getTargetFrameRate() const { return getActiveDisplayPlugin()->getTargetFrameRate(); }
+float Application::getTargetRenderFrameRate() const { return getActiveDisplayPlugin()->getTargetFrameRate(); }
 
 QRect Application::getDesirableApplicationGeometry() const {
     QRect applicationGeometry = getWindow()->geometry();
@@ -5114,116 +5427,6 @@ void Application::copyDisplayViewFrustum(ViewFrustum& viewOut) const {
     viewOut = _displayViewFrustum;
 }
 
-void Application::copyShadowViewFrustum(ViewFrustum& viewOut) const {
-    QMutexLocker viewLocker(&_viewMutex);
-    viewOut = _shadowViewFrustum;
-}
-
-// WorldBox Render Data & rendering functions
-
-class WorldBoxRenderData {
-public:
-    typedef render::Payload<WorldBoxRenderData> Payload;
-    typedef Payload::DataPointer Pointer;
-
-    int _val = 0;
-    static render::ItemID _item; // unique WorldBoxRenderData
-};
-
-render::ItemID WorldBoxRenderData::_item { render::Item::INVALID_ITEM_ID };
-
-namespace render {
-    template <> const ItemKey payloadGetKey(const WorldBoxRenderData::Pointer& stuff) { return ItemKey::Builder::opaqueShape(); }
-    template <> const Item::Bound payloadGetBound(const WorldBoxRenderData::Pointer& stuff) { return Item::Bound(); }
-    template <> void payloadRender(const WorldBoxRenderData::Pointer& stuff, RenderArgs* args) {
-        if (Menu::getInstance()->isOptionChecked(MenuOption::WorldAxes)) {
-            PerformanceTimer perfTimer("worldBox");
-
-            auto& batch = *args->_batch;
-            DependencyManager::get<GeometryCache>()->bindSimpleProgram(batch);
-            renderWorldBox(args, batch);
-        }
-    }
-}
-
-void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool selfAvatarOnly) {
-
-    // FIXME: This preDisplayRender call is temporary until we create a separate render::scene for the mirror rendering.
-    // Then we can move this logic into the Avatar::simulate call.
-    auto myAvatar = getMyAvatar();
-    myAvatar->preDisplaySide(renderArgs);
-
-    PROFILE_RANGE(render, __FUNCTION__);
-    PerformanceTimer perfTimer("display");
-    PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), "Application::displaySide()");
-
-    // load the view frustum
-    {
-        QMutexLocker viewLocker(&_viewMutex);
-        theCamera.loadViewFrustum(_displayViewFrustum);
-    }
-
-    // TODO fix shadows and make them use the GPU library
-
-    // The pending changes collecting the changes here
-    render::Transaction transaction;
-
-    // Assuming nothing gets rendered through that
-    if (!selfAvatarOnly) {
-        if (DependencyManager::get<SceneScriptingInterface>()->shouldRenderEntities()) {
-            // render models...
-            PerformanceTimer perfTimer("entities");
-            PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
-                "Application::displaySide() ... entities...");
-
-            RenderArgs::DebugFlags renderDebugFlags = RenderArgs::RENDER_DEBUG_NONE;
-
-            if (Menu::getInstance()->isOptionChecked(MenuOption::PhysicsShowHulls)) {
-                renderDebugFlags = static_cast<RenderArgs::DebugFlags>(renderDebugFlags |
-                    static_cast<int>(RenderArgs::RENDER_DEBUG_HULLS));
-            }
-            renderArgs->_debugFlags = renderDebugFlags;
-            //ViveControllerManager::getInstance().updateRendering(renderArgs, _main3DScene, transaction);
-        }
-    }
-
-    // FIXME: Move this out of here!, WorldBox should be driven by the entity content just like the other entities
-    // Make sure the WorldBox is in the scene
-    if (!render::Item::isValidID(WorldBoxRenderData::_item)) {
-        auto worldBoxRenderData = make_shared<WorldBoxRenderData>();
-        auto worldBoxRenderPayload = make_shared<WorldBoxRenderData::Payload>(worldBoxRenderData);
-
-        WorldBoxRenderData::_item = _main3DScene->allocateID();
-
-        transaction.resetItem(WorldBoxRenderData::_item, worldBoxRenderPayload);
-    } else {
-        transaction.updateItem<WorldBoxRenderData>(WorldBoxRenderData::_item,
-            [](WorldBoxRenderData& payload) {
-            payload._val++;
-        });
-    }
-
-    {
-        _main3DScene->enqueueTransaction(transaction);
-    }
-
-    // For now every frame pass the renderContext
-    {
-        PerformanceTimer perfTimer("EngineRun");
-
-        {
-            QMutexLocker viewLocker(&_viewMutex);
-            renderArgs->setViewFrustum(_displayViewFrustum);
-        }
-        renderArgs->_cameraMode = (int8_t)theCamera.getMode(); // HACK
-        renderArgs->_scene = getMain3DScene();
-        _renderEngine->getRenderContext()->args = renderArgs;
-
-        // Before the deferred pass, let's try to use the render engine
-        _renderEngine->run();
-    }
-}
-
 void Application::resetSensors(bool andReload) {
     DependencyManager::get<DdeFaceTracker>()->reset();
     DependencyManager::get<EyeTracker>()->reset();
@@ -5258,6 +5461,10 @@ void Application::updateWindowTitle() const {
     qCDebug(interfaceapp, "Application title set to: %s", title.toStdString().c_str());
 #endif
     _window->setWindowTitle(title);
+
+    // updateTitleWindow gets called whenever there's a change regarding the domain, so rather
+    // than placing this within domainChanged, it's placed here to cover the other potential cases.
+    DependencyManager::get< MessagesClient >()->sendLocalMessage("Toolbar-DomainChanged", "");
 }
 
 void Application::clearDomainOctreeDetails() {
@@ -5287,8 +5494,6 @@ void Application::clearDomainOctreeDetails() {
 
     skyStage->setBackgroundMode(model::SunSkyStage::SKY_DEFAULT);
 
-    _recentlyClearedDomain = true;
-
     DependencyManager::get<AnimationCache>()->clearUnusedResources();
     DependencyManager::get<ModelCache>()->clearUnusedResources();
     DependencyManager::get<SoundCache>()->clearUnusedResources();
@@ -5335,14 +5540,10 @@ void Application::nodeActivated(SharedNodePointer node) {
         }
     }
 
-    // If we get a new EntityServer activated, do a "forceRedraw" query. This will send a degenerate
-    // query so that the server will think our next non-degenerate query is "different enough" to send
-    // us a full scene
-    if (_recentlyClearedDomain && node->getType() == NodeType::EntityServer) {
-        _recentlyClearedDomain = false;
-        if (DependencyManager::get<SceneScriptingInterface>()->shouldRenderEntities()) {
-            queryOctree(NodeType::EntityServer, PacketType::EntityQuery, _entityServerJurisdictions, true);
-        }
+    // If we get a new EntityServer activated, reset lastQueried time
+    // so we will do a proper query during update
+    if (node->getType() == NodeType::EntityServer) {
+        _lastQueriedTime = 0;
     }
 
     if (node->getType() == NodeType::AudioMixer) {
@@ -5421,14 +5622,37 @@ bool Application::nearbyEntitiesAreReadyForPhysics() {
         return false;
     }
 
+    // We don't want to use EntityTree::findEntities(AABox, ...) method because that scan will snarf parented entities
+    // whose bounding boxes cannot be computed (it is too loose for our purposes here).  Instead we manufacture
+    // custom filters and use the general-purpose EntityTree::findEntities(filter, ...)
     QVector<EntityItemPointer> entities;
+    AABox avatarBox(getMyAvatar()->getPosition() - glm::vec3(PHYSICS_READY_RANGE), glm::vec3(2 * PHYSICS_READY_RANGE));
+    // create two functions that use avatarBox (entityScan and elementScan), the second calls the first
+    std::function<bool (EntityItemPointer&)> entityScan = [=](EntityItemPointer& entity) {
+            if (entity->shouldBePhysical()) {
+                bool success = false;
+                AABox entityBox = entity->getAABox(success);
+                // important: bail for entities that cannot supply a valid AABox
+                return success && avatarBox.touches(entityBox);
+            }
+            return false;
+        };
+    std::function<bool(const OctreeElementPointer&, void*)> elementScan = [&](const OctreeElementPointer& element, void* unused) {
+            if (element->getAACube().touches(avatarBox)) {
+                EntityTreeElementPointer entityTreeElement = std::static_pointer_cast<EntityTreeElement>(element);
+                entityTreeElement->getEntities(entityScan, entities);
+                return true;
+            }
+            return false;
+        };
+
     entityTree->withReadLock([&] {
-        AABox box(getMyAvatar()->getPosition() - glm::vec3(PHYSICS_READY_RANGE), glm::vec3(2 * PHYSICS_READY_RANGE));
-        entityTree->findEntities(box, entities);
+        // Pass the second function to the general-purpose EntityTree::findEntities()
+        // which will traverse the tree, apply the two filter functions (to element, then to entities)
+        // as it traverses.  The end result will be a list of entities that match.
+        entityTree->findEntities(elementScan, entities);
     });
 
-    // For reasons I haven't found, we don't necessarily have the full scene when we receive a stats packet.  Apply
-    // a heuristic to try to decide when we actually know about all of the nearby entities.
     uint32_t nearbyCount = entities.size();
     if (nearbyCount == _nearbyEntitiesCountAtLastPhysicsCheck) {
         _nearbyEntitiesStabilityCount++;
@@ -5517,7 +5741,12 @@ int Application::processOctreeStats(ReceivedMessage& message, SharedNodePointer
 void Application::packetSent(quint64 length) {
 }
 
-void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scriptEngine) {
+void Application::addingEntityWithCertificate(const QString& certificateID, const QString& placeName) {
+    auto ledger = DependencyManager::get<Ledger>();
+    ledger->updateLocation(certificateID, placeName);
+}
+
+void Application::registerScriptEngineWithApplicationServices(ScriptEnginePointer scriptEngine) {
 
     scriptEngine->setEmitScriptUpdatesFunction([this]() {
         SharedNodePointer entityServerNode = DependencyManager::get<NodeList>()->soloNodeOfType(NodeType::EntityServer);
@@ -5552,29 +5781,33 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri
 
     ClipboardScriptingInterface* clipboardScriptable = new ClipboardScriptingInterface();
     scriptEngine->registerGlobalObject("Clipboard", clipboardScriptable);
-    connect(scriptEngine, &ScriptEngine::finished, clipboardScriptable, &ClipboardScriptingInterface::deleteLater);
+    connect(scriptEngine.data(), &ScriptEngine::finished, clipboardScriptable, &ClipboardScriptingInterface::deleteLater);
 
     scriptEngine->registerGlobalObject("Overlays", &_overlays);
-    qScriptRegisterMetaType(scriptEngine, OverlayPropertyResultToScriptValue, OverlayPropertyResultFromScriptValue);
-    qScriptRegisterMetaType(scriptEngine, RayToOverlayIntersectionResultToScriptValue,
+    qScriptRegisterMetaType(scriptEngine.data(), OverlayPropertyResultToScriptValue, OverlayPropertyResultFromScriptValue);
+    qScriptRegisterMetaType(scriptEngine.data(), RayToOverlayIntersectionResultToScriptValue,
                             RayToOverlayIntersectionResultFromScriptValue);
 
     scriptEngine->registerGlobalObject("OffscreenFlags", DependencyManager::get<OffscreenUi>()->getFlags());
     scriptEngine->registerGlobalObject("Desktop", DependencyManager::get<DesktopScriptingInterface>().data());
 
-    qScriptRegisterMetaType(scriptEngine, wrapperToScriptValue<ToolbarProxy>, wrapperFromScriptValue<ToolbarProxy>);
-    qScriptRegisterMetaType(scriptEngine, wrapperToScriptValue<ToolbarButtonProxy>, wrapperFromScriptValue<ToolbarButtonProxy>);
+    qScriptRegisterMetaType(scriptEngine.data(), wrapperToScriptValue<ToolbarProxy>, wrapperFromScriptValue<ToolbarProxy>);
+    qScriptRegisterMetaType(scriptEngine.data(),
+                            wrapperToScriptValue<ToolbarButtonProxy>, wrapperFromScriptValue<ToolbarButtonProxy>);
     scriptEngine->registerGlobalObject("Toolbars", DependencyManager::get<ToolbarScriptingInterface>().data());
 
-    qScriptRegisterMetaType(scriptEngine, wrapperToScriptValue<TabletProxy>, wrapperFromScriptValue<TabletProxy>);
-    qScriptRegisterMetaType(scriptEngine, wrapperToScriptValue<TabletButtonProxy>, wrapperFromScriptValue<TabletButtonProxy>);
+    qScriptRegisterMetaType(scriptEngine.data(), wrapperToScriptValue<TabletProxy>, wrapperFromScriptValue<TabletProxy>);
+    qScriptRegisterMetaType(scriptEngine.data(),
+                            wrapperToScriptValue<TabletButtonProxy>, wrapperFromScriptValue<TabletButtonProxy>);
+    // Tablet inteference with Tablet.qml. Need to avoid this in QML space
+    scriptEngine->registerGlobalObject("tabletInterface", DependencyManager::get<TabletScriptingInterface>().data());
     scriptEngine->registerGlobalObject("Tablet", DependencyManager::get<TabletScriptingInterface>().data());
 
-
-    DependencyManager::get<TabletScriptingInterface>().data()->setToolbarScriptingInterface(DependencyManager::get<ToolbarScriptingInterface>().data());
+    auto toolbarScriptingInterface = DependencyManager::get<ToolbarScriptingInterface>().data();
+    DependencyManager::get<TabletScriptingInterface>().data()->setToolbarScriptingInterface(toolbarScriptingInterface);
 
     scriptEngine->registerGlobalObject("Window", DependencyManager::get<WindowScriptingInterface>().data());
-    qScriptRegisterMetaType(scriptEngine, CustomPromptResultToScriptValue, CustomPromptResultFromScriptValue);
+    qScriptRegisterMetaType(scriptEngine.data(), CustomPromptResultToScriptValue, CustomPromptResultFromScriptValue);
     scriptEngine->registerGetterSetter("location", LocationScriptingInterface::locationGetter,
                         LocationScriptingInterface::locationSetter, "Window");
     // register `location` on the global object.
@@ -5593,6 +5826,9 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri
     scriptEngine->registerGlobalObject("AvatarBookmarks", DependencyManager::get<AvatarBookmarks>().data());
     scriptEngine->registerGlobalObject("LocationBookmarks", DependencyManager::get<LocationBookmarks>().data());
 
+    scriptEngine->registerGlobalObject("RayPick", DependencyManager::get<RayPickScriptingInterface>().data());
+    scriptEngine->registerGlobalObject("LaserPointers", DependencyManager::get<LaserPointerScriptingInterface>().data());
+
     // Caches
     scriptEngine->registerGlobalObject("AnimationCache", DependencyManager::get<AnimationCache>().data());
     scriptEngine->registerGlobalObject("TextureCache", DependencyManager::get<TextureCache>().data());
@@ -5603,7 +5839,7 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri
     scriptEngine->registerGlobalObject("DialogsManager", _dialogsManagerScriptingInterface);
 
     scriptEngine->registerGlobalObject("GlobalServices", GlobalServicesScriptingInterface::getInstance());
-    qScriptRegisterMetaType(scriptEngine, DownloadInfoResultToScriptValue, DownloadInfoResultFromScriptValue);
+    qScriptRegisterMetaType(scriptEngine.data(), DownloadInfoResultToScriptValue, DownloadInfoResultFromScriptValue);
 
     scriptEngine->registerGlobalObject("FaceTracker", DependencyManager::get<DdeFaceTracker>().data());
 
@@ -5631,11 +5867,11 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri
     scriptEngine->registerGlobalObject("LimitlessSpeechRecognition", DependencyManager::get<LimitlessVoiceRecognitionScriptingInterface>().data());
 
     if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) {
-        scriptEngine->registerGlobalObject("Steam", new SteamScriptingInterface(scriptEngine, steamClient.get()));
+        scriptEngine->registerGlobalObject("Steam", new SteamScriptingInterface(scriptEngine.data(), steamClient.get()));
     }
     auto scriptingInterface = DependencyManager::get<controller::ScriptingInterface>();
     scriptEngine->registerGlobalObject("Controller", scriptingInterface.data());
-    UserInputMapper::registerControllerTypes(scriptEngine);
+    UserInputMapper::registerControllerTypes(scriptEngine.data());
 
     auto recordingInterface = DependencyManager::get<RecordingScriptingInterface>();
     scriptEngine->registerGlobalObject("Recording", recordingInterface.data());
@@ -5643,15 +5879,23 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri
     auto entityScriptServerLog = DependencyManager::get<EntityScriptServerLogClient>();
     scriptEngine->registerGlobalObject("EntityScriptServerLog", entityScriptServerLog.data());
     scriptEngine->registerGlobalObject("AvatarInputs", AvatarInputs::getInstance());
+    scriptEngine->registerGlobalObject("Selection", DependencyManager::get<SelectionScriptingInterface>().data());
+    scriptEngine->registerGlobalObject("ContextOverlay", DependencyManager::get<ContextOverlayInterface>().data());
+    scriptEngine->registerGlobalObject("Wallet", DependencyManager::get<WalletScriptingInterface>().data());
 
-    qScriptRegisterMetaType(scriptEngine, OverlayIDtoScriptValue, OverlayIDfromScriptValue);
+    qScriptRegisterMetaType(scriptEngine.data(), OverlayIDtoScriptValue, OverlayIDfromScriptValue);
 
     // connect this script engines printedMessage signal to the global ScriptEngines these various messages
-    connect(scriptEngine, &ScriptEngine::printedMessage, DependencyManager::get<ScriptEngines>().data(), &ScriptEngines::onPrintedMessage);
-    connect(scriptEngine, &ScriptEngine::errorMessage, DependencyManager::get<ScriptEngines>().data(), &ScriptEngines::onErrorMessage);
-    connect(scriptEngine, &ScriptEngine::warningMessage, DependencyManager::get<ScriptEngines>().data(), &ScriptEngines::onWarningMessage);
-    connect(scriptEngine, &ScriptEngine::infoMessage, DependencyManager::get<ScriptEngines>().data(), &ScriptEngines::onInfoMessage);
-    connect(scriptEngine, &ScriptEngine::clearDebugWindow, DependencyManager::get<ScriptEngines>().data(), &ScriptEngines::onClearDebugWindow);
+    connect(scriptEngine.data(), &ScriptEngine::printedMessage,
+            DependencyManager::get<ScriptEngines>().data(), &ScriptEngines::onPrintedMessage);
+    connect(scriptEngine.data(), &ScriptEngine::errorMessage,
+            DependencyManager::get<ScriptEngines>().data(), &ScriptEngines::onErrorMessage);
+    connect(scriptEngine.data(), &ScriptEngine::warningMessage,
+            DependencyManager::get<ScriptEngines>().data(), &ScriptEngines::onWarningMessage);
+    connect(scriptEngine.data(), &ScriptEngine::infoMessage,
+            DependencyManager::get<ScriptEngines>().data(), &ScriptEngines::onInfoMessage);
+    connect(scriptEngine.data(), &ScriptEngine::clearDebugWindow,
+            DependencyManager::get<ScriptEngines>().data(), &ScriptEngines::onClearDebugWindow);
 
 }
 
@@ -5706,7 +5950,7 @@ void Application::setSessionUUID(const QUuid& sessionUUID) const {
 bool Application::askToSetAvatarUrl(const QString& url) {
     QUrl realUrl(url);
     if (realUrl.isLocalFile()) {
-        OffscreenUi::warning("", "You can not use local files for avatar components.");
+        OffscreenUi::asyncWarning("", "You can not use local files for avatar components.");
         return false;
     }
 
@@ -5718,41 +5962,55 @@ bool Application::askToSetAvatarUrl(const QString& url) {
     QString modelName = fstMapping["name"].toString();
     QString modelLicense = fstMapping["license"].toString();
 
-    bool agreeToLicence = true; // assume true
+    bool agreeToLicense = true; // assume true
+    //create set avatar callback
+    auto setAvatar = [=] (QString url, QString modelName) {
+        ModalDialogListener* dlg = OffscreenUi::asyncQuestion("Set Avatar",
+                                                              "Would you like to use '" + modelName + "' for your avatar?",
+                                                              QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Ok);
+        QObject::connect(dlg, &ModalDialogListener::response, this, [=] (QVariant answer) {
+            QObject::disconnect(dlg, &ModalDialogListener::response, this, nullptr);
+
+            bool ok = (QMessageBox::Ok == static_cast<QMessageBox::StandardButton>(answer.toInt()));
+            if (ok) {
+                getMyAvatar()->useFullAvatarURL(url, modelName);
+                emit fullAvatarURLChanged(url, modelName);
+            } else {
+                qCDebug(interfaceapp) << "Declined to use the avatar: " << url;
+            }
+        });
+    };
+
     if (!modelLicense.isEmpty()) {
-        // word wrap the licence text to fit in a reasonable shaped message box.
+        // word wrap the license text to fit in a reasonable shaped message box.
         const int MAX_CHARACTERS_PER_LINE = 90;
         modelLicense = simpleWordWrap(modelLicense, MAX_CHARACTERS_PER_LINE);
 
-        agreeToLicence = QMessageBox::Yes == OffscreenUi::question("Avatar Usage License",
-            modelLicense + "\nDo you agree to these terms?",
-            QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
-    }
+        ModalDialogListener* dlg = OffscreenUi::asyncQuestion("Avatar Usage License",
+                                                              modelLicense + "\nDo you agree to these terms?",
+                                                              QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
+        QObject::connect(dlg, &ModalDialogListener::response, this, [=, &agreeToLicense] (QVariant answer) {
+            QObject::disconnect(dlg, &ModalDialogListener::response, this, nullptr);
 
-    bool ok = false;
+            agreeToLicense = (static_cast<QMessageBox::StandardButton>(answer.toInt()) == QMessageBox::Yes);
+            if (agreeToLicense) {
+                switch (modelType) {
+                    case FSTReader::HEAD_AND_BODY_MODEL: {
+                    setAvatar(url, modelName);
+                    break;
+                }
+                default:
+                    OffscreenUi::asyncWarning("", modelName + "Does not support a head and body as required.");
+                    break;
+                }
+            } else {
+                qCDebug(interfaceapp) << "Declined to agree to avatar license: " << url;
+            }
 
-    if (!agreeToLicence) {
-        qCDebug(interfaceapp) << "Declined to agree to avatar license: " << url;
+            //auto offscreenUi = DependencyManager::get<OffscreenUi>();
+        });
     } else {
-        switch (modelType) {
-
-            case FSTReader::HEAD_AND_BODY_MODEL:
-                 ok = QMessageBox::Ok == OffscreenUi::question("Set Avatar",
-                                   "Would you like to use '" + modelName + "' for your avatar?",
-                                   QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Ok);
-            break;
-
-            default:
-                OffscreenUi::warning("", modelName + "Does not support a head and body as required.");
-            break;
-        }
-    }
-
-    if (ok) {
-        getMyAvatar()->useFullAvatarURL(url, modelName);
-        emit fullAvatarURLChanged(url, modelName);
-    } else {
-        qCDebug(interfaceapp) << "Declined to use the avatar: " << url;
+        setAvatar(url, modelName);
     }
 
     return true;
@@ -5760,8 +6018,6 @@ bool Application::askToSetAvatarUrl(const QString& url) {
 
 
 bool Application::askToLoadScript(const QString& scriptFilenameOrURL) {
-    QMessageBox::StandardButton reply;
-
     QString shortName = scriptFilenameOrURL;
 
     QUrl scriptURL { scriptFilenameOrURL };
@@ -5773,15 +6029,20 @@ bool Application::askToLoadScript(const QString& scriptFilenameOrURL) {
     }
 
     QString message = "Would you like to run this script:\n" + shortName;
+    ModalDialogListener* dlg = OffscreenUi::asyncQuestion(getWindow(), "Run Script", message,
+                                                           QMessageBox::Yes | QMessageBox::No);
 
-    reply = OffscreenUi::question(getWindow(), "Run Script", message, QMessageBox::Yes | QMessageBox::No);
+    QObject::connect(dlg, &ModalDialogListener::response, this, [=] (QVariant answer) {
+        const QString& fileName = scriptFilenameOrURL;
+        if (static_cast<QMessageBox::StandardButton>(answer.toInt()) == QMessageBox::Yes) {
+            qCDebug(interfaceapp) << "Chose to run the script: " << fileName;
+            DependencyManager::get<ScriptEngines>()->loadScript(fileName);
+        } else {
+            qCDebug(interfaceapp) << "Declined to run the script: " << scriptFilenameOrURL;
+        }
+        QObject::disconnect(dlg, &ModalDialogListener::response, this, nullptr);
+    });
 
-    if (reply == QMessageBox::Yes) {
-        qCDebug(interfaceapp) << "Chose to run the script: " << scriptFilenameOrURL;
-        DependencyManager::get<ScriptEngines>()->loadScript(scriptFilenameOrURL);
-    } else {
-        qCDebug(interfaceapp) << "Declined to run the script: " << scriptFilenameOrURL;
-    }
     return true;
 }
 
@@ -5818,22 +6079,26 @@ bool Application::askToWearAvatarAttachmentUrl(const QString& url) {
                     name = nameValue.toString();
                 }
 
-                // display confirmation dialog
-                if (displayAvatarAttachmentConfirmationDialog(name)) {
-
-                    // add attachment to avatar
-                    auto myAvatar = getMyAvatar();
-                    assert(myAvatar);
-                    auto attachmentDataVec = myAvatar->getAttachmentData();
-                    AttachmentData attachmentData;
-                    attachmentData.fromJson(jsonObject);
-                    attachmentDataVec.push_back(attachmentData);
-                    myAvatar->setAttachmentData(attachmentDataVec);
-
-                } else {
-                    qCDebug(interfaceapp) << "User declined to wear the avatar attachment: " << url;
-                }
-
+                auto avatarAttachmentConfirmationTitle = tr("Avatar Attachment Confirmation");
+                auto avatarAttachmentConfirmationMessage = tr("Would you like to wear '%1' on your avatar?").arg(name);
+                ModalDialogListener* dlg = OffscreenUi::asyncQuestion(avatarAttachmentConfirmationTitle,
+                                           avatarAttachmentConfirmationMessage,
+                                           QMessageBox::Ok | QMessageBox::Cancel);
+                QObject::connect(dlg, &ModalDialogListener::response, this, [=] (QVariant answer) {
+                    QObject::disconnect(dlg, &ModalDialogListener::response, this, nullptr);
+                    if (static_cast<QMessageBox::StandardButton>(answer.toInt()) == QMessageBox::Yes) {
+                        // add attachment to avatar
+                        auto myAvatar = getMyAvatar();
+                        assert(myAvatar);
+                        auto attachmentDataVec = myAvatar->getAttachmentData();
+                        AttachmentData attachmentData;
+                        attachmentData.fromJson(jsonObject);
+                        attachmentDataVec.push_back(attachmentData);
+                        myAvatar->setAttachmentData(attachmentDataVec);
+                    } else {
+                        qCDebug(interfaceapp) << "User declined to wear the avatar attachment: " << url;
+                    }
+                });
             } else {
                 // json parse error
                 auto avatarAttachmentParseErrorString = tr("Error parsing attachment JSON from url: \"%1\"");
@@ -5849,22 +6114,64 @@ bool Application::askToWearAvatarAttachmentUrl(const QString& url) {
     return true;
 }
 
-void Application::displayAvatarAttachmentWarning(const QString& message) const {
-    auto avatarAttachmentWarningTitle = tr("Avatar Attachment Failure");
-    OffscreenUi::warning(avatarAttachmentWarningTitle, message);
+bool Application::askToReplaceDomainContent(const QString& url) {
+    QString methodDetails;
+    const int MAX_CHARACTERS_PER_LINE = 90;
+    if (DependencyManager::get<NodeList>()->getThisNodeCanReplaceContent()) {
+        QUrl originURL { url };
+        if (originURL.host().endsWith(MARKETPLACE_CDN_HOSTNAME)) {
+            // Create a confirmation dialog when this call is made
+            static const QString infoText = simpleWordWrap("Your domain's content will be replaced with a new content set. "
+                "If you want to save what you have now, create a backup before proceeding. For more information about backing up "
+                "and restoring content, visit the documentation page at: ", MAX_CHARACTERS_PER_LINE) +
+                "\nhttps://docs.highfidelity.com/create-and-explore/start-working-in-your-sandbox/restoring-sandbox-content";
+
+            bool agreeToReplaceContent = false; // assume false
+            agreeToReplaceContent = QMessageBox::Yes == OffscreenUi::question("Are you sure you want to replace this domain's content set?",
+                infoText, QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
+
+            if (agreeToReplaceContent) {
+                // Given confirmation, send request to domain server to replace content
+                qCDebug(interfaceapp) << "Attempting to replace domain content: " << url;
+                QByteArray urlData(url.toUtf8());
+                auto limitedNodeList = DependencyManager::get<LimitedNodeList>();
+                limitedNodeList->eachMatchingNode([](const SharedNodePointer& node) {
+                    return node->getType() == NodeType::EntityServer && node->getActiveSocket();
+                }, [&urlData, limitedNodeList](const SharedNodePointer& octreeNode) {
+                    auto octreeFilePacket = NLPacket::create(PacketType::OctreeFileReplacementFromUrl, urlData.size(), true);
+                    octreeFilePacket->write(urlData);
+                    limitedNodeList->sendPacket(std::move(octreeFilePacket), *octreeNode);
+                });
+                auto addressManager = DependencyManager::get<AddressManager>();
+                addressManager->handleLookupString(DOMAIN_SPAWNING_POINT);
+                QString newHomeAddress = addressManager->getHost() + DOMAIN_SPAWNING_POINT;
+                qCDebug(interfaceapp) << "Setting new home bookmark to: " << newHomeAddress;
+                DependencyManager::get<LocationBookmarks>()->setHomeLocationToAddress(newHomeAddress);
+                methodDetails = "SuccessfulRequestToReplaceContent";
+            } else {
+                methodDetails = "UserDeclinedToReplaceContent";
+            }
+        } else {
+            methodDetails = "ContentSetDidNotOriginateFromMarketplace";
+        }
+    } else {
+            methodDetails = "UserDoesNotHavePermissionToReplaceContent";
+            static const QString warningMessage = simpleWordWrap("The domain owner must enable 'Replace Content' "
+                "permissions for you in this domain's server settings before you can continue.", MAX_CHARACTERS_PER_LINE);
+            OffscreenUi::warning("You do not have permissions to replace domain content", warningMessage,
+                                 QMessageBox::Ok, QMessageBox::Ok);
+    }
+    QJsonObject messageProperties = {
+        { "status", methodDetails },
+        { "content_set_url", url }
+    };
+    UserActivityLogger::getInstance().logAction("replace_domain_content", messageProperties);
+    return true;
 }
 
-bool Application::displayAvatarAttachmentConfirmationDialog(const QString& name) const {
-    auto avatarAttachmentConfirmationTitle = tr("Avatar Attachment Confirmation");
-    auto avatarAttachmentConfirmationMessage = tr("Would you like to wear '%1' on your avatar?").arg(name);
-    auto reply = OffscreenUi::question(avatarAttachmentConfirmationTitle,
-                                       avatarAttachmentConfirmationMessage,
-                                       QMessageBox::Ok | QMessageBox::Cancel);
-    if (QMessageBox::Ok == reply) {
-        return true;
-    } else {
-        return false;
-    }
+void Application::displayAvatarAttachmentWarning(const QString& message) const {
+    auto avatarAttachmentWarningTitle = tr("Avatar Attachment Failure");
+    OffscreenUi::asyncWarning(avatarAttachmentWarningTitle, message);
 }
 
 void Application::showDialog(const QUrl& widgetUrl, const QUrl& tabletUrl, const QString& name) const {
@@ -5898,7 +6205,7 @@ void Application::showAssetServerWidget(QString filePath) {
     if (!DependencyManager::get<NodeList>()->getThisNodeCanWriteAssets()) {
         return;
     }
-    static const QUrl url { "AssetServer.qml" };
+    static const QUrl url { "hifi/AssetServer.qml" };
 
     auto startUpload = [=](QQmlContext* context, QObject* newObject){
         if (!filePath.isEmpty()) {
@@ -5925,7 +6232,19 @@ void Application::showAssetServerWidget(QString filePath) {
 void Application::addAssetToWorldFromURL(QString url) {
     qInfo(interfaceapp) << "Download model and add to world from" << url;
 
-    QString filename = url.section("filename=", 1, 1);  // Filename is in "?filename=" parameter at end of URL.
+    QString filename;
+    if (url.contains("filename")) {
+        filename = url.section("filename=", 1, 1);  // Filename is in "?filename=" parameter at end of URL.
+    }
+    if (url.contains("poly.google.com/downloads")) {
+        filename = url.section('/', -1);
+        if (url.contains("noDownload")) {
+            filename.remove(".zip?noDownload=false");
+        } else {
+            filename.remove(".zip");
+        }
+        
+    }
 
     if (!DependencyManager::get<NodeList>()->getThisNodeCanWriteAssets()) {
         QString errorInfo = "You do not have permissions to write to the Asset Server.";
@@ -5946,7 +6265,21 @@ void Application::addAssetToWorldFromURLRequestFinished() {
     auto url = request->getUrl().toString();
     auto result = request->getResult();
 
-    QString filename = url.section("filename=", 1, 1);  // Filename from trailing "?filename=" URL parameter.
+    QString filename;
+    bool isBlocks = false;
+
+    if (url.contains("filename")) {
+        filename = url.section("filename=", 1, 1);  // Filename is in "?filename=" parameter at end of URL.
+    }
+    if (url.contains("poly.google.com/downloads")) {
+        filename = url.section('/', -1);
+        if (url.contains("noDownload")) {
+            filename.remove(".zip?noDownload=false");
+        } else {
+            filename.remove(".zip");
+        }
+        isBlocks = true;
+    }
 
     if (result == ResourceRequest::Success) {
         qInfo(interfaceapp) << "Downloaded model from" << url;
@@ -5961,7 +6294,8 @@ void Application::addAssetToWorldFromURLRequestFinished() {
             if (tempFile.open(QIODevice::WriteOnly)) {
                 tempFile.write(request->getData());
                 addAssetToWorldInfoClear(filename);  // Remove message from list; next one added will have a different key.
-                qApp->getFileDownloadInterface()->runUnzip(downloadPath, url, true);
+                tempFile.close();
+                qApp->getFileDownloadInterface()->runUnzip(downloadPath, url, true, false, isBlocks);
             } else {
                 QString errorInfo = "Couldn't open temporary file for download";
                 qWarning(interfaceapp) << errorInfo;
@@ -5991,12 +6325,23 @@ void Application::addAssetToWorldUnzipFailure(QString filePath) {
     addAssetToWorldError(filename, "Couldn't unzip file " + filename + ".");
 }
 
-void Application::addAssetToWorld(QString filePath) {
+void Application::addAssetToWorld(QString filePath, QString zipFile, bool isZip, bool isBlocks) {
     // Automatically upload and add asset to world as an alternative manual process initiated by showAssetServerWidget().
-
-    QString path = QUrl(filePath).toLocalFile();
+    QString mapping;
+    QString path = filePath;
     QString filename = filenameFromPath(path);
-    QString mapping = "/" + filename;
+    if (isZip) {
+        QString assetFolder = zipFile.section("/", -1);
+        assetFolder.remove(".zip");
+        mapping = "/" + assetFolder + "/" + filename;
+    } else if (isBlocks) {
+        qCDebug(interfaceapp) << "Path to asset folder: " << zipFile;
+        QString assetFolder = zipFile.section('/', -1);
+        assetFolder.remove(".zip?noDownload=false");
+        mapping = "/" + assetFolder + "/" + filename;
+    } else {
+        mapping = "/" + filename;
+    }
 
     // Test repeated because possibly different code paths.
     if (!DependencyManager::get<NodeList>()->getThisNodeCanWriteAssets()) {
@@ -6077,7 +6422,13 @@ void Application::addAssetToWorldSetMapping(QString filePath, QString mapping, Q
             qWarning(interfaceapp) << "Error downloading model: " + errorInfo;
             addAssetToWorldError(filenameFromPath(filePath), errorInfo);
         } else {
-            addAssetToWorldAddEntity(filePath, mapping);
+            // to prevent files that aren't models from being loaded into world automatically
+            if (filePath.endsWith(".obj") || filePath.endsWith(".fbx")) {
+                addAssetToWorldAddEntity(filePath, mapping);
+            } else {
+                qCDebug(interfaceapp) << "Zipped contents are not supported entity files";
+                addAssetToWorldInfoDone(filenameFromPath(filePath));
+            }
         }
         request->deleteLater();
     });
@@ -6093,7 +6444,9 @@ void Application::addAssetToWorldAddEntity(QString filePath, QString mapping) {
     properties.setShapeType(SHAPE_TYPE_SIMPLE_COMPOUND);
     properties.setCollisionless(true);  // Temporarily set so that doesn't collide with avatar.
     properties.setVisible(false);  // Temporarily set so that don't see at large unresized dimensions.
-    properties.setPosition(getMyAvatar()->getPosition() + getMyAvatar()->getOrientation() * glm::vec3(0.0f, 0.0f, -2.0f));
+    glm::vec3 positionOffset = getMyAvatar()->getOrientation() * (getMyAvatar()->getSensorToWorldScale() * glm::vec3(0.0f, 0.0f, -2.0f));
+    properties.setPosition(getMyAvatar()->getPosition() + positionOffset);
+    properties.setRotation(getMyAvatar()->getOrientation());
     properties.setGravity(glm::vec3(0.0f, 0.0f, 0.0f));
     auto entityID = DependencyManager::get<EntityScriptingInterface>()->addEntity(properties);
 
@@ -6140,7 +6493,7 @@ void Application::addAssetToWorldCheckModelSize() {
         if (dimensions != DEFAULT_DIMENSIONS) {
 
             // Scale model so that its maximum is exactly specific size.
-            const float MAXIMUM_DIMENSION = 1.0f;
+            const float MAXIMUM_DIMENSION = getMyAvatar()->getSensorToWorldScale();
             auto previousDimensions = dimensions;
             auto scale = std::min(MAXIMUM_DIMENSION / dimensions.x, std::min(MAXIMUM_DIMENSION / dimensions.y,
                 MAXIMUM_DIMENSION / dimensions.z));
@@ -6367,15 +6720,18 @@ void Application::onAssetToWorldMessageBoxClosed() {
 }
 
 
-void Application::handleUnzip(QString zipFile, QString unzipFile, bool autoAdd) {
+void Application::handleUnzip(QString zipFile, QStringList unzipFile, bool autoAdd, bool isZip, bool isBlocks) {
     if (autoAdd) {
         if (!unzipFile.isEmpty()) {
-            addAssetToWorld(unzipFile);
+            for (int i = 0; i < unzipFile.length(); i++) {
+                qCDebug(interfaceapp) << "Preparing file for asset server: " << unzipFile.at(i);
+                addAssetToWorld(unzipFile.at(i), zipFile, isZip, isBlocks);
+            }
         } else {
             addAssetToWorldUnzipFailure(zipFile);
         }
     } else {
-        showAssetServerWidget(unzipFile);
+        showAssetServerWidget(unzipFile.first());
     }
 }
 
@@ -6396,12 +6752,17 @@ void Application::openUrl(const QUrl& url) const {
 
 void Application::loadDialog() {
     auto scriptEngines = DependencyManager::get<ScriptEngines>();
-    QString fileNameString = OffscreenUi::getOpenFileName(
-        _glWidget, tr("Open Script"), getPreviousScriptLocation(), tr("JavaScript Files (*.js)"));
-    if (!fileNameString.isEmpty() && QFile(fileNameString).exists()) {
-        setPreviousScriptLocation(QFileInfo(fileNameString).absolutePath());
-        DependencyManager::get<ScriptEngines>()->loadScript(fileNameString, true, false, false, true);  // Don't load from cache
-    }
+    ModalDialogListener* dlg = OffscreenUi::getOpenFileNameAsync(_glWidget, tr("Open Script"),
+                                                                 getPreviousScriptLocation(),
+                                                                 tr("JavaScript Files (*.js)"));
+    connect(dlg, &ModalDialogListener::response, this, [=] (QVariant answer) {
+        disconnect(dlg, &ModalDialogListener::response, this, nullptr);
+        const QString& response = answer.toString();
+        if (!response.isEmpty() && QFile(response).exists()) {
+            setPreviousScriptLocation(QFileInfo(response).absolutePath());
+            DependencyManager::get<ScriptEngines>()->loadScript(response, true, false, false, true);  // Don't load from cache
+        }
+    });
 }
 
 QString Application::getPreviousScriptLocation() {
@@ -6414,12 +6775,20 @@ void Application::setPreviousScriptLocation(const QString& location) {
 }
 
 void Application::loadScriptURLDialog() const {
-    auto newScript = OffscreenUi::getText(OffscreenUi::ICON_NONE, "Open and Run Script", "Script URL");
-    if (QUrl(newScript).scheme() == "atp") {
-        OffscreenUi::warning("Error Loading Script", "Cannot load client script over ATP");
-    } else if (!newScript.isEmpty()) {
-        DependencyManager::get<ScriptEngines>()->loadScript(newScript);
-    }
+    ModalDialogListener* dlg = OffscreenUi::getTextAsync(OffscreenUi::ICON_NONE, "Open and Run Script", "Script URL");
+    connect(dlg, &ModalDialogListener::response, this, [=] (QVariant response) {
+        disconnect(dlg, &ModalDialogListener::response, this, nullptr);
+        const QString& newScript = response.toString();
+        if (QUrl(newScript).scheme() == "atp") {
+            OffscreenUi::asyncWarning("Error Loading Script", "Cannot load client script over ATP");
+        } else if (!newScript.isEmpty()) {
+            DependencyManager::get<ScriptEngines>()->loadScript(newScript.trimmed());
+        }
+    });
+}
+
+SharedSoundPointer Application::getSampleSound() const {
+    return _sampleSound;
 }
 
 void Application::loadLODToolsDialog() {
@@ -6500,6 +6869,12 @@ void Application::takeSnapshot(bool notify, bool includeAnimated, float aspectRa
     });
 }
 
+void Application::takeSecondaryCameraSnapshot() {
+    postLambdaEvent([this] {
+        Snapshot::saveSnapshot(getActiveDisplayPlugin()->getSecondaryCameraScreenshot());
+    });
+}
+
 void Application::shareSnapshot(const QString& path, const QUrl& href) {
     postLambdaEvent([path, href] {
         // not much to do here, everything is done in snapshot code...
@@ -6530,7 +6905,7 @@ void Application::notifyPacketVersionMismatch() {
         QString message = "The location you are visiting is running an incompatible server version.\n";
         message += "Content may not display properly.";
 
-        OffscreenUi::warning("", message);
+        OffscreenUi::asyncWarning("", message);
     }
 }
 
@@ -6539,7 +6914,7 @@ void Application::checkSkeleton() const {
         qCDebug(interfaceapp) << "MyAvatar model has no skeleton";
 
         QString message = "Your selected avatar body has no skeleton.\n\nThe default body will be loaded...";
-        OffscreenUi::warning("", message);
+        OffscreenUi::asyncWarning("", message);
 
         getMyAvatar()->useFullAvatarURL(AvatarData::defaultFullAvatarModelUrl(), DEFAULT_FULL_AVATAR_MODEL_NAME);
     } else {
@@ -6644,11 +7019,11 @@ glm::uvec2 Application::getUiSize() const {
     return result;
 }
 
-QRect Application::getRecommendedOverlayRect() const {
+QRect Application::getRecommendedHUDRect() const {
     auto uiSize = getUiSize();
     QRect result(0, 0, uiSize.x, uiSize.y);
     if (_displayPlugin) {
-        result = getActiveDisplayPlugin()->getRecommendedOverlayRect();
+        result = getActiveDisplayPlugin()->getRecommendedHUDRect();
     }
     return result;
 }
@@ -6752,14 +7127,6 @@ void Application::updateDisplayMode() {
         qFatal("Attempted to switch display plugins from a non-main thread");
     }
 
-    // Some plugins *cough* Oculus *cough* process message events from inside their
-    // display function, and we don't want to change the display plugin underneath
-    // the paintGL call, so we need to guard against that
-    // The current oculus runtime doesn't do this anymore
-    if (_inPaint) {
-        qFatal("Attempted to switch display plugins while in painting");
-    }
-
     auto menu = Menu::getInstance();
     auto displayPlugins = PluginManager::getInstance()->getDisplayPlugins();
 
@@ -6836,11 +7203,12 @@ void Application::updateDisplayMode() {
         bool wasRepositionLocked = offscreenUi->getDesktop()->property("repositionLocked").toBool();
         offscreenUi->getDesktop()->setProperty("repositionLocked", true);
 
-        auto oldDisplayPlugin = _displayPlugin;
         if (_displayPlugin) {
+            disconnect(_displayPlugin.get(), &DisplayPlugin::presented, this, &Application::onPresent);
             _displayPlugin->deactivate();
         }
 
+        auto oldDisplayPlugin = _displayPlugin;
         bool active = newDisplayPlugin->activate();
 
         if (!active) {
@@ -6878,7 +7246,11 @@ void Application::updateDisplayMode() {
         _offscreenContext->makeCurrent();
         getApplicationCompositor().setDisplayPlugin(newDisplayPlugin);
         _displayPlugin = newDisplayPlugin;
-        offscreenUi->getDesktop()->setProperty("repositionLocked", wasRepositionLocked);
+        connect(_displayPlugin.get(), &DisplayPlugin::presented, this, &Application::onPresent, Qt::DirectConnection);
+        auto desktop = offscreenUi->getDesktop();
+        if (desktop) {
+            desktop->setProperty("repositionLocked", wasRepositionLocked);
+        }
     }
 
     bool isHmd = _displayPlugin->isHmd();
@@ -6895,6 +7267,16 @@ void Application::updateDisplayMode() {
     // reset the avatar, to set head and hand palms back to a reasonable default pose.
     getMyAvatar()->reset(false);
 
+    // switch to first person if entering hmd and setting is checked
+    if (isHmd && menu->isOptionChecked(MenuOption::FirstPersonHMD)) {
+        menu->setIsOptionChecked(MenuOption::FirstPerson, true);
+        cameraMenuChanged();
+    }
+    
+    // Remove the mirror camera option from menu if in HMD mode
+    auto mirrorAction = menu->getActionForOption(MenuOption::FullscreenMirror);
+    mirrorAction->setVisible(!isHmd);
+
     Q_ASSERT_X(_displayPlugin, "Application::updateDisplayMode", "could not find an activated display plugin");
 }
 
@@ -7035,51 +7417,6 @@ bool Application::isForeground() const {
     return _isForeground && !_window->isMinimized();
 }
 
-void Application::sendMousePressOnEntity(QUuid id, PointerEvent event) {
-    EntityItemID entityItemID(id);
-    emit getEntities()->mousePressOnEntity(entityItemID, event);
-}
-
-void Application::sendMouseMoveOnEntity(QUuid id, PointerEvent event) {
-    EntityItemID entityItemID(id);
-    emit getEntities()->mouseMoveOnEntity(entityItemID, event);
-}
-
-void Application::sendMouseReleaseOnEntity(QUuid id, PointerEvent event) {
-    EntityItemID entityItemID(id);
-    emit getEntities()->mouseReleaseOnEntity(entityItemID, event);
-}
-
-void Application::sendClickDownOnEntity(QUuid id, PointerEvent event) {
-    EntityItemID entityItemID(id);
-    emit getEntities()->clickDownOnEntity(entityItemID, event);
-}
-
-void Application::sendHoldingClickOnEntity(QUuid id, PointerEvent event) {
-    EntityItemID entityItemID(id);
-    emit getEntities()->holdingClickOnEntity(entityItemID, event);
-}
-
-void Application::sendClickReleaseOnEntity(QUuid id, PointerEvent event) {
-    EntityItemID entityItemID(id);
-    emit getEntities()->clickReleaseOnEntity(entityItemID, event);
-}
-
-void Application::sendHoverEnterEntity(QUuid id, PointerEvent event) {
-    EntityItemID entityItemID(id);
-    emit getEntities()->hoverEnterEntity(entityItemID, event);
-}
-
-void Application::sendHoverOverEntity(QUuid id, PointerEvent event) {
-    EntityItemID entityItemID(id);
-    emit getEntities()->hoverOverEntity(entityItemID, event);
-}
-
-void Application::sendHoverLeaveEntity(QUuid id, PointerEvent event) {
-    EntityItemID entityItemID(id);
-    emit getEntities()->hoverLeaveEntity(entityItemID, event);
-}
-
 // FIXME?  perhaps two, one for the main thread and one for the offscreen UI rendering thread?
 static const int UI_RESERVED_THREADS = 1;
 // Windows won't let you have all the cores
@@ -7123,3 +7460,4 @@ void Application::setAvatarOverrideUrl(const QUrl& url, bool save) {
     _avatarOverrideUrl = url;
     _saveAvatarOverrideUrl = save;
 }
+#include "Application.moc"
diff --git a/interface/src/Application.h b/interface/src/Application.h
index c26b3b215e..19a6dfdac1 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -25,6 +25,7 @@
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QUndoStack>
 
+#include <ThreadHelpers.h>
 #include <AbstractScriptingServicesInterface.h>
 #include <AbstractViewStateInterface.h>
 #include <EntityEditPacketSender.h>
@@ -36,7 +37,6 @@
 #include <PhysicalEntitySimulation.h>
 #include <PhysicsEngine.h>
 #include <plugins/Forward.h>
-#include <plugins/DisplayPlugin.h>
 #include <ui-plugins/PluginContainer.h>
 #include <ScriptEngine.h>
 #include <ShapeManager.h>
@@ -54,6 +54,7 @@
 #include "BandwidthRecorder.h"
 #include "FancyCamera.h"
 #include "ConnectionMonitor.h"
+#include "CursorManager.h"
 #include "gpu/Context.h"
 #include "Menu.h"
 #include "octree/OctreePacketProcessor.h"
@@ -69,9 +70,13 @@
 #include "ui/overlays/Overlays.h"
 #include "UndoStackScriptingInterface.h"
 
+#include "raypick/RayPickManager.h"
+#include "raypick/LaserPointerManager.h"
+
 #include <procedural/ProceduralSkybox.h>
 #include <model/Skybox.h>
 #include <ModelScriptingInterface.h>
+#include "FrameTimingsScriptingInterface.h"
 
 #include "Sound.h"
 
@@ -126,13 +131,6 @@ public:
 
     virtual DisplayPluginPointer getActiveDisplayPlugin() const override;
 
-    enum Event {
-        Present = DisplayPlugin::Present,
-        Paint,
-        Idle,
-        Lambda
-    };
-
     // FIXME? Empty methods, do we still need them?
     static void initPlugins(const QStringList& arguments);
     static void shutdownPlugins();
@@ -150,6 +148,8 @@ public:
 
     void initializeGL();
     void initializeUi();
+
+    void updateCamera(RenderArgs& renderArgs);
     void paintGL();
     void resizeGL();
 
@@ -160,11 +160,11 @@ public:
     QRect getRenderingGeometry() const;
 
     glm::uvec2 getUiSize() const;
-    QRect getRecommendedOverlayRect() const;
+    QRect getRecommendedHUDRect() const;
     QSize getDeviceSize() const;
     bool hasFocus() const;
 
-    void showCursor(const QCursor& cursor);
+    void showCursor(const Cursor::Icon& cursor);
 
     bool isThrottleRendering() const;
 
@@ -176,7 +176,6 @@ public:
     // which might be different from the viewFrustum, i.e. shadowmap
     // passes, mirror window passes, etc
     void copyDisplayViewFrustum(ViewFrustum& viewOut) const;
-    void copyShadowViewFrustum(ViewFrustum& viewOut) const override;
     const OctreePacketProcessor& getOctreePacketProcessor() const { return _octreeProcessor; }
     QSharedPointer<EntityTreeRenderer> getEntities() const { return DependencyManager::get<EntityTreeRenderer>(); }
     QUndoStack* getUndoStack() { return &_undoStack; }
@@ -195,10 +194,9 @@ public:
 
     Overlays& getOverlays() { return _overlays; }
 
-
-    size_t getFrameCount() const { return _frameCount; }
-    float getFps() const { return _frameCounter.rate(); }
-    float getTargetFrameRate() const; // frames/second
+    size_t getRenderFrameCount() const { return _renderFrameCount; }
+    float getRenderLoopRate() const { return _renderLoopCounter.rate(); }
+    float getTargetRenderFrameRate() const; // frames/second
 
     float getFieldOfView() { return _fieldOfView.get(); }
     void setFieldOfView(float fov);
@@ -221,7 +219,7 @@ public:
     NodeToOctreeSceneStats* getOcteeSceneStats() { return &_octreeServerSceneStats; }
 
     virtual controller::ScriptingInterface* getControllerScriptingInterface() { return _controllerScriptingInterface; }
-    virtual void registerScriptEngineWithApplicationServices(ScriptEngine* scriptEngine) override;
+    virtual void registerScriptEngineWithApplicationServices(ScriptEnginePointer scriptEngine) override;
 
     virtual void copyCurrentViewFrustum(ViewFrustum& viewOut) const override { copyDisplayViewFrustum(viewOut); }
     virtual QThread* getMainThread() override { return thread(); }
@@ -269,36 +267,27 @@ public:
 
     void updateMyAvatarLookAtPosition();
 
-    float getAvatarSimrate() const { return _avatarSimCounter.rate(); }
-    float getAverageSimsPerSecond() const { return _simCounter.rate(); }
+    float getGameLoopRate() const { return _gameLoopCounter.rate(); }
 
     void takeSnapshot(bool notify, bool includeAnimated = false, float aspectRatio = 0.0f);
+    void takeSecondaryCameraSnapshot();
     void shareSnapshot(const QString& filename, const QUrl& href = QUrl(""));
 
     model::SkyboxPointer getDefaultSkybox() const { return _defaultSkybox; }
     gpu::TexturePointer getDefaultSkyboxTexture() const { return _defaultSkyboxTexture;  }
     gpu::TexturePointer getDefaultSkyboxAmbientTexture() const { return _defaultSkyboxAmbientTexture; }
 
-    Q_INVOKABLE void sendMousePressOnEntity(QUuid id, PointerEvent event);
-    Q_INVOKABLE void sendMouseMoveOnEntity(QUuid id, PointerEvent event);
-    Q_INVOKABLE void sendMouseReleaseOnEntity(QUuid id, PointerEvent event);
-
-    Q_INVOKABLE void sendClickDownOnEntity(QUuid id, PointerEvent event);
-    Q_INVOKABLE void sendHoldingClickOnEntity(QUuid id, PointerEvent event);
-    Q_INVOKABLE void sendClickReleaseOnEntity(QUuid id, PointerEvent event);
-
-    Q_INVOKABLE void sendHoverEnterEntity(QUuid id, PointerEvent event);
-    Q_INVOKABLE void sendHoverOverEntity(QUuid id, PointerEvent event);
-    Q_INVOKABLE void sendHoverLeaveEntity(QUuid id, PointerEvent event);
-
     OverlayID getTabletScreenID() const;
     OverlayID getTabletHomeButtonID() const;
     QUuid getTabletFrameID() const; // may be an entity or an overlay
 
     void setAvatarOverrideUrl(const QUrl& url, bool save);
+    void clearAvatarOverrideUrl() { _avatarOverrideUrl = QUrl(); _saveAvatarOverrideUrl = false; }
     QUrl getAvatarOverrideUrl() { return _avatarOverrideUrl; }
     bool getSaveAvatarOverrideUrl() { return _saveAvatarOverrideUrl; }
-    void setCacheOverrideDir(const QString& dirName) { _cacheDir = dirName; }
+
+    LaserPointerManager& getLaserPointerManager() { return _laserPointerManager; }
+    RayPickManager& getRayPickManager() { return _rayPickManager; }
 
 signals:
     void svoImportRequested(const QString& url);
@@ -325,20 +314,21 @@ public slots:
     void toggleEntityScriptServerLogDialog();
     Q_INVOKABLE void showAssetServerWidget(QString filePath = "");
     Q_INVOKABLE void loadAddAvatarBookmarkDialog() const;
+    Q_INVOKABLE SharedSoundPointer getSampleSound() const;
 
     void showDialog(const QUrl& widgetUrl, const QUrl& tabletUrl, const QString& name) const;
 
     // FIXME: Move addAssetToWorld* methods to own class?
     void addAssetToWorldFromURL(QString url);
     void addAssetToWorldFromURLRequestFinished();
-    void addAssetToWorld(QString filePath);
+    void addAssetToWorld(QString filePath, QString zipFile, bool isZip, bool isBlocks);
     void addAssetToWorldUnzipFailure(QString filePath);
     void addAssetToWorldWithNewMapping(QString filePath, QString mapping, int copy);
     void addAssetToWorldUpload(QString filePath, QString mapping);
     void addAssetToWorldSetMapping(QString filePath, QString mapping, QString hash);
     void addAssetToWorldAddEntity(QString filePath, QString mapping);
 
-    void handleUnzip(QString sourceFile, QString destinationFile, bool autoAdd);
+    void handleUnzip(QString sourceFile, QStringList destinationFile, bool autoAdd, bool isZip, bool isBlocks);
 
     FileScriptingInterface* getFileDownloadInterface() { return _fileDownload; }
 
@@ -387,11 +377,10 @@ public slots:
     void setKeyboardFocusHighlight(const glm::vec3& position, const glm::quat& rotation, const glm::vec3& dimensions);
 
     QUuid getKeyboardFocusEntity() const;  // thread-safe
-    void setKeyboardFocusEntity(QUuid id);
-    void setKeyboardFocusEntity(EntityItemID entityItemID);
+    void setKeyboardFocusEntity(const EntityItemID& entityItemID);
 
     OverlayID getKeyboardFocusOverlay();
-    void setKeyboardFocusOverlay(OverlayID overlayID);
+    void setKeyboardFocusOverlay(const OverlayID& overlayID);
 
     void addAssetToWorldMessageClose();
 
@@ -400,11 +389,15 @@ public slots:
     void loadDomainConnectionDialog();
     void showScriptLogs();
 
+    const QString getPreferredCursor() const { return _preferredCursor.get(); }
+    void setPreferredCursor(const QString& cursor);
+
 private slots:
     void showDesktop();
     void clearDomainOctreeDetails();
     void clearDomainAvatars();
     void onAboutToQuit();
+    void onPresent(quint32 frameCount);
 
     void resettingDomain();
 
@@ -424,7 +417,8 @@ private slots:
 
     bool askToWearAvatarAttachmentUrl(const QString& url);
     void displayAvatarAttachmentWarning(const QString& message) const;
-    bool displayAvatarAttachmentConfirmationDialog(const QString& name) const;
+
+    bool askToReplaceDomainContent(const QString& url);
 
     void setSessionUUID(const QUuid& sessionUUID) const;
 
@@ -434,6 +428,7 @@ private slots:
     void nodeActivated(SharedNodePointer node);
     void nodeKilled(SharedNodePointer node);
     static void packetSent(quint64 length);
+    static void addingEntityWithCertificate(const QString& certificateID, const QString& placeName);
     void updateDisplayMode();
     void domainConnectionRefused(const QString& reasonMessage, int reason, const QString& extraInfo);
 
@@ -448,21 +443,20 @@ private slots:
 private:
     static void initDisplay();
     void init();
-
+    bool handleKeyEventForFocusedEntityOrOverlay(QEvent* event);
+    bool handleFileOpenEvent(QFileOpenEvent* event);
     void cleanupBeforeQuit();
 
-    bool shouldPaint(float nsecsElapsed);
-    void idle(float nsecsElapsed);
+    bool shouldPaint() const;
+    void idle();
     void update(float deltaTime);
 
     // Various helper functions called during update()
-    void updateLOD() const;
+    void updateLOD(float deltaTime) const;
     void updateThreads(float deltaTime);
     void updateDialogs(float deltaTime) const;
 
-    void queryOctree(NodeType_t serverType, PacketType packetType, NodeToJurisdictionMap& jurisdictions, bool forceResend = false);
-
-    void renderRearViewMirror(RenderArgs* renderArgs, const QRect& region, bool isZoomed);
+    void queryOctree(NodeType_t serverType, PacketType packetType, NodeToJurisdictionMap& jurisdictions);
 
     int sendNackPackets();
     void sendAvatarViewFrustum();
@@ -473,10 +467,11 @@ private:
 
     void initializeAcceptedFiles();
 
-    void displaySide(RenderArgs* renderArgs, Camera& whichCamera, bool selfAvatarOnly = false);
+    void runRenderFrame(RenderArgs* renderArgs/*, Camera& whichCamera, bool selfAvatarOnly = false*/);
 
     bool importJSONFromURL(const QString& urlString);
     bool importSVOFromURL(const QString& urlString);
+    bool importFromZIP(const QString& filePath);
 
     bool nearbyEntitiesAreReadyForPhysics();
     int processOctreeStats(ReceivedMessage& message, SharedNodePointer sendingNode);
@@ -514,6 +509,7 @@ private:
 
     OffscreenGLCanvas* _offscreenContext { nullptr };
     DisplayPluginPointer _displayPlugin;
+    QMetaObject::Connection _displayPluginPresentConnection;
     mutable std::mutex _displayPluginLock;
     InputPluginList _activeInputPlugins;
 
@@ -522,16 +518,18 @@ private:
     QUndoStack _undoStack;
     UndoStackScriptingInterface _undoStackScriptingInterface;
 
-    uint32_t _frameCount { 0 };
+    uint32_t _renderFrameCount { 0 };
 
     // Frame Rate Measurement
-    RateCounter<> _frameCounter;
-    RateCounter<> _avatarSimCounter;
-    RateCounter<> _simCounter;
+    RateCounter<500> _renderLoopCounter;
+    RateCounter<500> _gameLoopCounter;
+
+    FrameTimingsScriptingInterface _frameTimingsScriptingInterface;
 
     QTimer _minimizedWindowTimer;
     QElapsedTimer _timerStart;
     QElapsedTimer _lastTimeUpdated;
+    QElapsedTimer _lastTimeRendered;
 
     ShapeManager _shapeManager;
     PhysicalEntitySimulationPointer _entitySimulation;
@@ -543,7 +541,6 @@ private:
     ViewFrustum _viewFrustum; // current state of view frustum, perspective, orientation, etc.
     ViewFrustum _lastQueriedViewFrustum; /// last view frustum used to query octree servers (voxels)
     ViewFrustum _displayViewFrustum;
-    ViewFrustum _shadowViewFrustum;
     quint64 _lastQueriedTime;
 
     OctreeQuery _octreeQuery; // NodeData derived class for querying octee cells from octree servers
@@ -564,6 +561,7 @@ private:
     Setting::Handle<bool> _hmdTabletBecomesToolbarSetting;
     Setting::Handle<bool> _preferAvatarFingerOverStylusSetting;
     Setting::Handle<bool> _constrainToolbarPosition;
+    Setting::Handle<QString> _preferredCursor;
 
     float _scaleMirror;
     float _rotateMirror;
@@ -596,8 +594,7 @@ private:
 
     bool _notifiedPacketVersionMismatchThisDomain;
 
-    QThread _settingsThread;
-    QTimer _settingsTimer;
+    ConditionalGuard _settingsGuard;
 
     GLCanvas* _glWidget{ nullptr };
 
@@ -614,6 +611,24 @@ private:
     render::EnginePointer _renderEngine{ new render::Engine() };
     gpu::ContextPointer _gpuContext; // initialized during window creation
 
+    mutable QMutex _renderArgsMutex{ QMutex::Recursive };
+    struct AppRenderArgs {
+        render::Args _renderArgs;
+        glm::mat4 _eyeToWorld;
+        glm::mat4 _eyeOffsets[2];
+        glm::mat4 _eyeProjections[2];
+        glm::mat4 _headPose;
+        glm::mat4 _sensorToWorld;
+        float _sensorToWorldScale { 1.0f };
+        bool _isStereo{ false };
+    };
+    AppRenderArgs _appRenderArgs;
+
+
+    using RenderArgsEditor = std::function <void (AppRenderArgs&)>;
+    void editRenderArgs(RenderArgsEditor editor);
+
+
     Overlays _overlays;
     ApplicationOverlay _applicationOverlay;
     OverlayConductor _overlayConductor;
@@ -624,7 +639,6 @@ private:
     ThreadSafeValueCache<OverlayID> _keyboardFocusedOverlay;
     quint64 _lastAcceptedKeyPress = 0;
     bool _isForeground = true; // starts out assumed to be in foreground
-    bool _inPaint = false;
     bool _isGLInitialized { false };
     bool _physicsEnabled { false };
 
@@ -638,11 +652,9 @@ private:
 
     void checkChangeCursor();
     mutable QMutex _changeCursorLock { QMutex::Recursive };
-    QCursor _desiredCursor{ Qt::BlankCursor };
+    Qt::CursorShape _desiredCursor{ Qt::BlankCursor };
     bool _cursorNeedsChanging { false };
 
-    QThread* _deadlockWatchdogThread;
-
     std::map<void*, std::function<void()>> _postUpdateLambdas;
     std::mutex _postUpdateLambdasLock;
 
@@ -650,12 +662,10 @@ private:
     uint32_t _fullSceneCounterAtLastPhysicsCheck { 0 }; // _fullSceneReceivedCounter last time we checked physics ready
     uint32_t _nearbyEntitiesCountAtLastPhysicsCheck { 0 }; // how many in-range entities last time we checked physics ready
     uint32_t _nearbyEntitiesStabilityCount { 0 }; // how many times has _nearbyEntitiesCountAtLastPhysicsCheck been the same
-    quint64 _lastPhysicsCheckTime { 0 }; // when did we last check to see if physics was ready
+    quint64 _lastPhysicsCheckTime { usecTimestampNow() }; // when did we last check to see if physics was ready
 
     bool _keyboardDeviceHasFocus { true };
 
-    bool _recentlyClearedDomain { false };
-
     QString _returnFromFullScreenMirrorTo;
 
     ConnectionMonitor _connectionMonitor;
@@ -679,8 +689,9 @@ private:
     QTimer _addAssetToWorldErrorTimer;
 
     FileScriptingInterface* _fileDownload;
-    AudioInjector* _snapshotSoundInjector { nullptr };
+    AudioInjectorPointer _snapshotSoundInjector;
     SharedSoundPointer _snapshotSound;
+    SharedSoundPointer _sampleSound;
 
     DisplayPluginPointer _autoSwitchDisplayModeSupportedHMDPlugin;
     QString _autoSwitchDisplayModeSupportedHMDPluginName;
@@ -690,7 +701,14 @@ private:
 
     QUrl _avatarOverrideUrl;
     bool _saveAvatarOverrideUrl { false };
+    QObject* _renderEventHandler{ nullptr };
 
-    QString _cacheDir;
+    RayPickManager _rayPickManager;
+    LaserPointerManager _laserPointerManager;
+
+    friend class RenderEventHandler;
+
+    std::atomic<bool> _pendingIdleEvent { true };
+    std::atomic<bool> _pendingRenderEvent { true };
 };
 #endif // hifi_Application_h
diff --git a/interface/src/Application_render.cpp b/interface/src/Application_render.cpp
new file mode 100644
index 0000000000..44d9dfee03
--- /dev/null
+++ b/interface/src/Application_render.cpp
@@ -0,0 +1,236 @@
+//
+//  Application_render.cpp
+//  interface/src
+//
+//  Copyright 2013 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 "Application.h"
+#include <MainWindow.h>
+
+#include <display-plugins/CompositorHelper.h>
+#include <FramebufferCache.h>
+#include "ui/Stats.h"
+#include <SceneScriptingInterface.h>
+#include "Util.h"
+
+
+// Statically provided display and input plugins
+extern DisplayPluginList getDisplayPlugins();
+
+void Application::editRenderArgs(RenderArgsEditor editor) {
+    QMutexLocker renderLocker(&_renderArgsMutex);
+    editor(_appRenderArgs);
+
+}
+
+void Application::paintGL() {
+    // Some plugins process message events, allowing paintGL to be called reentrantly.
+    if (_aboutToQuit || _window->isMinimized()) {
+        return;
+    }
+
+    _renderFrameCount++;
+    _lastTimeRendered.start();
+
+    auto lastPaintBegin = usecTimestampNow();
+    PROFILE_RANGE_EX(render, __FUNCTION__, 0xff0000ff, (uint64_t)_renderFrameCount);
+    PerformanceTimer perfTimer("paintGL");
+
+    if (nullptr == _displayPlugin) {
+        return;
+    }
+
+    DisplayPluginPointer displayPlugin;
+    {
+        PROFILE_RANGE(render, "/getActiveDisplayPlugin");
+        displayPlugin = getActiveDisplayPlugin();
+    }
+
+    {
+        PROFILE_RANGE(render, "/pluginBeginFrameRender");
+        // If a display plugin loses it's underlying support, it
+        // needs to be able to signal us to not use it
+        if (!displayPlugin->beginFrameRender(_renderFrameCount)) {
+            updateDisplayMode();
+            return;
+        }
+    }
+
+    RenderArgs renderArgs;
+    glm::mat4  HMDSensorPose;
+    glm::mat4  eyeToWorld;
+    glm::mat4  sensorToWorld;
+
+    bool isStereo;
+    glm::mat4  stereoEyeOffsets[2];
+    glm::mat4  stereoEyeProjections[2];
+
+    {
+        QMutexLocker viewLocker(&_renderArgsMutex);
+        renderArgs = _appRenderArgs._renderArgs;
+
+        // don't render if there is no context.
+        if (!_appRenderArgs._renderArgs._context) {
+            return;
+        }
+
+        HMDSensorPose = _appRenderArgs._headPose;
+        eyeToWorld = _appRenderArgs._eyeToWorld;
+        sensorToWorld = _appRenderArgs._sensorToWorld;
+        isStereo = _appRenderArgs._isStereo;
+        for_each_eye([&](Eye eye) {
+            stereoEyeOffsets[eye] = _appRenderArgs._eyeOffsets[eye];
+            stereoEyeProjections[eye] = _appRenderArgs._eyeProjections[eye];
+        });
+    }
+
+    {
+        PROFILE_RANGE(render, "/gpuContextReset");
+        _gpuContext->beginFrame(HMDSensorPose);
+        // Reset the gpu::Context Stages
+        // Back to the default framebuffer;
+        gpu::doInBatch(_gpuContext, [&](gpu::Batch& batch) {
+            batch.resetStages();
+        });
+    }
+
+
+    {
+        PROFILE_RANGE(render, "/renderOverlay");
+        PerformanceTimer perfTimer("renderOverlay");
+        // NOTE: There is no batch associated with this renderArgs
+        // the ApplicationOverlay class assumes it's viewport is setup to be the device size
+        QSize size = getDeviceSize();
+        renderArgs._viewport = glm::ivec4(0, 0, size.width(), size.height());
+        _applicationOverlay.renderOverlay(&renderArgs);
+    }
+
+    {
+        PROFILE_RANGE(render, "/updateCompositor");
+        getApplicationCompositor().setFrameInfo(_renderFrameCount, eyeToWorld, sensorToWorld);
+    }
+
+    gpu::FramebufferPointer finalFramebuffer;
+    QSize finalFramebufferSize;
+    {
+        PROFILE_RANGE(render, "/getOutputFramebuffer");
+        // Primary rendering pass
+        auto framebufferCache = DependencyManager::get<FramebufferCache>();
+        finalFramebufferSize = framebufferCache->getFrameBufferSize();
+        // Final framebuffer that will be handled to the display-plugin
+        finalFramebuffer = framebufferCache->getFramebuffer();
+    }
+
+    {
+        if (isStereo) {
+            renderArgs._context->enableStereo(true);
+            renderArgs._context->setStereoProjections(stereoEyeProjections);
+            renderArgs._context->setStereoViews(stereoEyeOffsets);
+        }
+
+        renderArgs._hudOperator = displayPlugin->getHUDOperator();
+        renderArgs._hudTexture = _applicationOverlay.getOverlayTexture();
+        renderArgs._blitFramebuffer = finalFramebuffer;
+        runRenderFrame(&renderArgs);
+    }
+
+    auto frame = _gpuContext->endFrame();
+    frame->frameIndex = _renderFrameCount;
+    frame->framebuffer = finalFramebuffer;
+    frame->framebufferRecycler = [](const gpu::FramebufferPointer& framebuffer) {
+        DependencyManager::get<FramebufferCache>()->releaseFramebuffer(framebuffer);
+    };
+    // deliver final scene rendering commands to the display plugin
+    {
+        PROFILE_RANGE(render, "/pluginOutput");
+        PerformanceTimer perfTimer("pluginOutput");
+        _renderLoopCounter.increment();
+        displayPlugin->submitFrame(frame);
+    }
+
+    // Reset the framebuffer and stereo state
+    renderArgs._blitFramebuffer.reset();
+    renderArgs._context->enableStereo(false);
+
+    {
+        Stats::getInstance()->setRenderDetails(renderArgs._details);
+    }
+
+    uint64_t lastPaintDuration = usecTimestampNow() - lastPaintBegin;
+    _frameTimingsScriptingInterface.addValue(lastPaintDuration);
+}
+
+
+// WorldBox Render Data & rendering functions
+
+class WorldBoxRenderData {
+public:
+    typedef render::Payload<WorldBoxRenderData> Payload;
+    typedef Payload::DataPointer Pointer;
+
+    int _val = 0;
+    static render::ItemID _item; // unique WorldBoxRenderData
+};
+
+render::ItemID WorldBoxRenderData::_item{ render::Item::INVALID_ITEM_ID };
+
+namespace render {
+    template <> const ItemKey payloadGetKey(const WorldBoxRenderData::Pointer& stuff) { return ItemKey::Builder::opaqueShape(); }
+    template <> const Item::Bound payloadGetBound(const WorldBoxRenderData::Pointer& stuff) { return Item::Bound(); }
+    template <> void payloadRender(const WorldBoxRenderData::Pointer& stuff, RenderArgs* args) {
+        if (Menu::getInstance()->isOptionChecked(MenuOption::WorldAxes)) {
+            PerformanceTimer perfTimer("worldBox");
+
+            auto& batch = *args->_batch;
+            DependencyManager::get<GeometryCache>()->bindSimpleProgram(batch);
+            renderWorldBox(args, batch);
+        }
+    }
+}
+
+void Application::runRenderFrame(RenderArgs* renderArgs) {
+    PROFILE_RANGE(render, __FUNCTION__);
+    PerformanceTimer perfTimer("display");
+    PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), "Application::runRenderFrame()");
+
+    // The pending changes collecting the changes here
+    render::Transaction transaction;
+
+    if (DependencyManager::get<SceneScriptingInterface>()->shouldRenderEntities()) {
+        // render models...
+        PerformanceTimer perfTimer("entities");
+        PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
+            "Application::runRenderFrame() ... entities...");
+
+        RenderArgs::DebugFlags renderDebugFlags = RenderArgs::RENDER_DEBUG_NONE;
+
+        if (Menu::getInstance()->isOptionChecked(MenuOption::PhysicsShowHulls)) {
+            renderDebugFlags = static_cast<RenderArgs::DebugFlags>(renderDebugFlags |
+                static_cast<int>(RenderArgs::RENDER_DEBUG_HULLS));
+        }
+        renderArgs->_debugFlags = renderDebugFlags;
+    }
+
+    // Make sure the WorldBox is in the scene
+    // For the record, this one RenderItem is the first one we created and added to the scene.
+    // We could meoee that code elsewhere but you know...
+    if (!render::Item::isValidID(WorldBoxRenderData::_item)) {
+        auto worldBoxRenderData = std::make_shared<WorldBoxRenderData>();
+        auto worldBoxRenderPayload = std::make_shared<WorldBoxRenderData::Payload>(worldBoxRenderData);
+
+        WorldBoxRenderData::_item = _main3DScene->allocateID();
+
+        transaction.resetItem(WorldBoxRenderData::_item, worldBoxRenderPayload);
+        _main3DScene->enqueueTransaction(transaction);
+    }
+
+    {
+        PerformanceTimer perfTimer("EngineRun");
+        _renderEngine->getRenderContext()->args = renderArgs;
+        _renderEngine->run();
+    }
+}
diff --git a/interface/src/AvatarBookmarks.cpp b/interface/src/AvatarBookmarks.cpp
index db2a240b92..5b9c45eef5 100644
--- a/interface/src/AvatarBookmarks.cpp
+++ b/interface/src/AvatarBookmarks.cpp
@@ -14,6 +14,7 @@
 #include <QMessageBox>
 #include <QStandardPaths>
 #include <QQmlContext>
+#include <QList>
 
 #include <Application.h>
 #include <OffscreenUi.h>
@@ -24,6 +25,8 @@
 #include "AvatarBookmarks.h"
 #include "InterfaceLogging.h"
 
+#include "QVariantGLM.h"
+
 #include <QtQuick/QQuickWindow>
 
 AvatarBookmarks::AvatarBookmarks() {
@@ -58,38 +61,80 @@ void AvatarBookmarks::setupMenus(Menu* menubar, MenuWrapper* menu) {
     _deleteBookmarksAction = menubar->addActionToQMenuAndActionHash(menu, MenuOption::DeleteAvatarBookmark);
     QObject::connect(_deleteBookmarksAction, SIGNAL(triggered()), this, SLOT(deleteBookmark()), Qt::QueuedConnection);
 
-    Bookmarks::setupMenus(menubar, menu);
+    for (auto it = _bookmarks.begin(); it != _bookmarks.end(); ++it) {
+        addBookmarkToMenu(menubar, it.key(), it.value());
+    }
+
     Bookmarks::sortActions(menubar, _bookmarksMenu);
 }
 
 void AvatarBookmarks::changeToBookmarkedAvatar() {
     QAction* action = qobject_cast<QAction*>(sender());
-    const QString& address = action->data().toString();
-
     auto myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
-    myAvatar->useFullAvatarURL(address);
+
+
+
+    if (action->data().type() == QVariant::String) {
+        // TODO: Phase this out eventually.
+        // Legacy avatar bookmark.
+
+        myAvatar->useFullAvatarURL(action->data().toString());
+        qCDebug(interfaceapp) << " Using Legacy V1 Avatar Bookmark ";
+    } else {
+        
+        const QMap<QString, QVariant> bookmark = action->data().toMap();
+        // Not magic value. This is the current made version, and if it changes this interpreter should be updated to 
+        // handle the new one separately.
+        // This is where the avatar bookmark entry is parsed. If adding new Value, make sure to have backward compatability with previous
+        if (bookmark.value(ENTRY_VERSION) == 3) {
+                const QString& avatarUrl = bookmark.value(ENTRY_AVATAR_URL, "").toString();
+                myAvatar->useFullAvatarURL(avatarUrl);
+                qCDebug(interfaceapp) << "Avatar On " << avatarUrl;
+                const QList<QVariant>& attachments = bookmark.value(ENTRY_AVATAR_ATTACHMENTS, QList<QVariant>()).toList();
+
+                qCDebug(interfaceapp) << "Attach " << attachments;
+                myAvatar->setAttachmentsVariant(attachments);
+
+                const float& qScale = bookmark.value(ENTRY_AVATAR_SCALE, 1.0f).toFloat();
+                myAvatar->setAvatarScale(qScale);
+     
+        } else {
+            qCDebug(interfaceapp) << " Bookmark entry does not match client version, make sure client has a handler for the new AvatarBookmark";
+        }
+    }
+
 }
 
 void AvatarBookmarks::addBookmark() {
-    bool ok = false;
-    auto bookmarkName = OffscreenUi::getText(OffscreenUi::ICON_PLACEMARK, "Bookmark Avatar", "Name", QString(), &ok);
-    if (!ok) {
-        return;
-    }
+    ModalDialogListener* dlg = OffscreenUi::getTextAsync(OffscreenUi::ICON_PLACEMARK, "Bookmark Avatar", "Name", QString());
+    connect(dlg, &ModalDialogListener::response, this, [=] (QVariant response) {
+        disconnect(dlg, &ModalDialogListener::response, this, nullptr);
+        auto bookmarkName = response.toString();
+        bookmarkName = bookmarkName.trimmed().replace(QRegExp("(\r\n|[\r\n\t\v ])+"), " ");
+        if (bookmarkName.length() == 0) {
+            return;
+        }
 
-    bookmarkName = bookmarkName.trimmed().replace(QRegExp("(\r\n|[\r\n\t\v ])+"), " ");
-    if (bookmarkName.length() == 0) {
-        return;
-    }
+        auto myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
+
+        const QString& avatarUrl = myAvatar->getSkeletonModelURL().toString();
+        const QVariant& avatarScale = myAvatar->getAvatarScale();
+
+        // If Avatar attachments ever change, this is where to update them, when saving remember to also append to AVATAR_BOOKMARK_VERSION
+        QVariantMap *bookmark = new QVariantMap;
+        bookmark->insert(ENTRY_VERSION, AVATAR_BOOKMARK_VERSION);
+        bookmark->insert(ENTRY_AVATAR_URL, avatarUrl);
+        bookmark->insert(ENTRY_AVATAR_SCALE, avatarScale);
+        bookmark->insert(ENTRY_AVATAR_ATTACHMENTS, myAvatar->getAttachmentsVariant());
+
+        Bookmarks::addBookmarkToFile(bookmarkName, *bookmark);
+    });
 
-    auto myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
-    const QString& bookmarkAddress = myAvatar->getSkeletonModelURL().toString();
-    Bookmarks::addBookmarkToFile(bookmarkName, bookmarkAddress);
 }
 
-void AvatarBookmarks::addBookmarkToMenu(Menu* menubar, const QString& name, const QString& address) {
+void AvatarBookmarks::addBookmarkToMenu(Menu* menubar, const QString& name, const QVariant& bookmark) {
     QAction* changeAction = _bookmarksMenu->newAction();
-    changeAction->setData(address);
+    changeAction->setData(bookmark);
     connect(changeAction, SIGNAL(triggered()), this, SLOT(changeToBookmarkedAvatar()));
     if (!_isMenuSorted) {
         menubar->addActionToQMenuAndActionHash(_bookmarksMenu, changeAction, name, 0, QAction::NoRole);
diff --git a/interface/src/AvatarBookmarks.h b/interface/src/AvatarBookmarks.h
index dc5a0aee6e..0529eeb516 100644
--- a/interface/src/AvatarBookmarks.h
+++ b/interface/src/AvatarBookmarks.h
@@ -21,18 +21,23 @@ class AvatarBookmarks: public Bookmarks, public  Dependency {
 
 public:
     AvatarBookmarks();
-
     void setupMenus(Menu* menubar, MenuWrapper* menu) override;
 
 public slots:
     void addBookmark();
 
 protected:
-    void addBookmarkToMenu(Menu* menubar, const QString& name, const QString& address) override;
-    void readFromFile();
+    void addBookmarkToMenu(Menu* menubar, const QString& name, const QVariant& bookmark) override;
+    void readFromFile() override;
 
 private:
     const QString AVATARBOOKMARKS_FILENAME = "avatarbookmarks.json";
+    const QString ENTRY_AVATAR_URL = "avatarUrl";
+    const QString ENTRY_AVATAR_ATTACHMENTS = "attachments";
+    const QString ENTRY_AVATAR_SCALE = "avatarScale";
+    const QString ENTRY_VERSION = "version";
+
+    const int AVATAR_BOOKMARK_VERSION = 3;
 
 private slots:
     void changeToBookmarkedAvatar();
diff --git a/interface/src/Bookmarks.cpp b/interface/src/Bookmarks.cpp
index 4cbc17f8ce..f48b5e1f5b 100644
--- a/interface/src/Bookmarks.cpp
+++ b/interface/src/Bookmarks.cpp
@@ -28,19 +28,6 @@ Bookmarks::Bookmarks() :
 _isMenuSorted(false)
 {
 }
-
-void Bookmarks::setupMenus(Menu* menubar, MenuWrapper* menu) {
-    // Enable/Disable menus as needed
-    enableMenuItems(_bookmarks.count() > 0);
-
-    // Load Bookmarks
-    for (auto it = _bookmarks.begin(); it != _bookmarks.end(); ++it) {
-        QString bookmarkName = it.key();
-        QString bookmarkAddress = it.value().toString();
-        addBookmarkToMenu(menubar, bookmarkName, bookmarkAddress);
-    }
-}
-
 void Bookmarks::deleteBookmark() {
     QStringList bookmarkList;
     QList<QAction*> menuItems = _bookmarksMenu->actions();
@@ -67,35 +54,40 @@ void Bookmarks::deleteBookmark() {
     }
 }
 
-void Bookmarks::addBookmarkToFile(const QString& bookmarkName, const QString& bookmarkAddress) {
+void Bookmarks::addBookmarkToFile(const QString& bookmarkName, const QVariant& bookmark) {
     Menu* menubar = Menu::getInstance();
     if (contains(bookmarkName)) {
         auto offscreenUi = DependencyManager::get<OffscreenUi>();
-        auto duplicateBookmarkMessage = offscreenUi->createMessageBox(OffscreenUi::ICON_WARNING, "Duplicate Bookmark",
-            "The bookmark name you entered already exists in your list.",
-            QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
-        duplicateBookmarkMessage->setProperty("informativeText", "Would you like to overwrite it?");
+        ModalDialogListener* dlg = OffscreenUi::asyncWarning("Duplicate Bookmark",
+                                  "The bookmark name you entered already exists in your list.",
+                                  QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
+        dlg->setProperty("informativeText", "Would you like to overwrite it?");
+        QObject::connect(dlg, &ModalDialogListener::response, this, [=] (QVariant answer) {
+            QObject::disconnect(dlg, &ModalDialogListener::response, this, nullptr);
 
-        auto result = offscreenUi->waitForMessageBoxResult(duplicateBookmarkMessage);
-        if (result != QMessageBox::Yes) {
-            return;
-        }
-        removeBookmarkFromMenu(menubar, bookmarkName);
+            if (QMessageBox::Yes == static_cast<QMessageBox::StandardButton>(answer.toInt())) {
+                removeBookmarkFromMenu(menubar, bookmarkName);
+                addBookmarkToMenu(menubar, bookmarkName, bookmark);
+                insert(bookmarkName, bookmark);  // Overwrites any item with the same bookmarkName.
+                enableMenuItems(true);
+            }
+        });
+    } else {
+        addBookmarkToMenu(menubar, bookmarkName, bookmark);
+        insert(bookmarkName, bookmark);  // Overwrites any item with the same bookmarkName.
+        enableMenuItems(true);
     }
-
-    addBookmarkToMenu(menubar, bookmarkName, bookmarkAddress);
-    insert(bookmarkName, bookmarkAddress);  // Overwrites any item with the same bookmarkName.
-    enableMenuItems(true);
 }
 
-void Bookmarks::insert(const QString& name, const QString& address) {
-    _bookmarks.insert(name, address);
+void Bookmarks::insert(const QString& name, const QVariant& bookmark) {
+    _bookmarks.insert(name, bookmark);
 
     if (contains(name)) {
-        qCDebug(interfaceapp) << "Added bookmark:" << name << "," << address;
+        qCDebug(interfaceapp) << "Added bookmark:" << name;
         persistToFile();
-    } else {
-        qWarning() << "Couldn't add bookmark: " << name << "," << address;
+    }
+    else {
+        qWarning() << "Couldn't add bookmark: " << name;
     }
 }
 
diff --git a/interface/src/Bookmarks.h b/interface/src/Bookmarks.h
index 6c322197cc..dd47a286bf 100644
--- a/interface/src/Bookmarks.h
+++ b/interface/src/Bookmarks.h
@@ -27,18 +27,20 @@ class Bookmarks: public QObject {
 public:
     Bookmarks();
 
-    virtual void setupMenus(Menu* menubar, MenuWrapper* menu);
+    virtual void setupMenus(Menu* menubar, MenuWrapper* menu) = 0;
     QString addressForBookmark(const QString& name) const;
 
 protected:
-    virtual void addBookmarkToFile(const QString& bookmarkName, const QString& bookmarkAddress);
-    virtual void addBookmarkToMenu(Menu* menubar, const QString& name, const QString& address) = 0;
+    void addBookmarkToFile(const QString& bookmarkName, const QVariant& bookmark);
+    virtual void addBookmarkToMenu(Menu* menubar, const QString& name, const QVariant& bookmark) = 0;
     void enableMenuItems(bool enabled);
-    void readFromFile();
-    void insert(const QString& name, const QString& address);  // Overwrites any existing entry with same name.
+    virtual void readFromFile();
+    void insert(const QString& name, const QVariant& address);  // Overwrites any existing entry with same name.
     void sortActions(Menu* menubar, MenuWrapper* menu);
     int getMenuItemLocation(QList<QAction*> actions, const QString& name) const;
-
+    
+    bool contains(const QString& name) const;
+    
     QVariantMap _bookmarks;  // { name: url, ... }
     QPointer<MenuWrapper> _bookmarksMenu;
     QPointer<QAction> _deleteBookmarksAction;
@@ -50,7 +52,6 @@ protected slots:
 
 private:
     void remove(const QString& name);
-    bool contains(const QString& name) const;
     static bool sortOrder(QAction* a, QAction* b);
 
     void persistToFile();
diff --git a/interface/src/LODManager.cpp b/interface/src/LODManager.cpp
index bf756a55a5..01ccbd0d9a 100644
--- a/interface/src/LODManager.cpp
+++ b/interface/src/LODManager.cpp
@@ -39,16 +39,31 @@ float LODManager::getLODIncreaseFPS() {
     return getDesktopLODIncreaseFPS();
 }
 
-void LODManager::autoAdjustLOD(float currentFPS) {
-    
+void LODManager::autoAdjustLOD(float batchTime, float engineRunTime, float deltaTimeSec) {
+
     // NOTE: our first ~100 samples at app startup are completely all over the place, and we don't
     // really want to count them in our average, so we will ignore the real frame rates and stuff
     // our moving average with simulated good data
     const int IGNORE_THESE_SAMPLES = 100;
     if (_fpsAverageUpWindow.getSampleCount() < IGNORE_THESE_SAMPLES) {
-        currentFPS = ASSUMED_FPS;
         _lastStable = _lastUpShift = _lastDownShift = usecTimestampNow();
     }
+
+    // compute time-weighted running average renderTime
+    const float OVERLAY_AND_SWAP_TIME_BUDGET = 2.0f; // msec
+    float renderTime = batchTime + OVERLAY_AND_SWAP_TIME_BUDGET;
+    float maxTime = glm::max(renderTime, engineRunTime);
+    const float BLEND_TIMESCALE = 0.3f; // sec
+    const float MIN_DELTA_TIME = 0.001f;
+    const float safeDeltaTime = glm::max(deltaTimeSec, MIN_DELTA_TIME);
+    float blend = BLEND_TIMESCALE / safeDeltaTime;
+    if (blend > 1.0f) {
+        blend = 1.0f;
+    }
+    _avgRenderTime = (1.0f - blend) * _avgRenderTime + blend * maxTime; // msec
+
+    // translate into fps for legacy implementation
+    float currentFPS = (float)MSECS_PER_SECOND / _avgRenderTime;
     
     _fpsAverageStartWindow.updateAverage(currentFPS);
     _fpsAverageDownWindow.updateAverage(currentFPS);
@@ -56,7 +71,6 @@ void LODManager::autoAdjustLOD(float currentFPS) {
     
     quint64 now = usecTimestampNow();
 
-    bool changed = false;
     quint64 elapsedSinceDownShift = now - _lastDownShift;
     quint64 elapsedSinceUpShift = now - _lastUpShift;
 
@@ -64,6 +78,7 @@ void LODManager::autoAdjustLOD(float currentFPS) {
     quint64 elapsedSinceStableOrUpShift = now - lastStableOrUpshift;
     
     if (_automaticLODAdjust) {
+        bool changed = false;
     
         // LOD Downward adjustment 
         // If we've been downshifting, we watch a shorter downshift window so that we will quickly move toward our
@@ -176,11 +191,44 @@ void LODManager::resetLODAdjust() {
     _isDownshifting = false;
 }
 
+const float MIN_DECREASE_FPS = 0.5f;
+
+void LODManager::setDesktopLODDecreaseFPS(float fps) {
+    if (fps < MIN_DECREASE_FPS) {
+        // avoid divide by zero
+        fps = MIN_DECREASE_FPS;
+    }
+    _desktopMaxRenderTime = (float)MSECS_PER_SECOND / fps;
+}
+
+float LODManager::getDesktopLODDecreaseFPS() const {
+    return (float)MSECS_PER_SECOND / _desktopMaxRenderTime;
+}
+
+float LODManager::getDesktopLODIncreaseFPS() const {
+    return glm::max(((float)MSECS_PER_SECOND / _desktopMaxRenderTime) + INCREASE_LOD_GAP, MAX_LIKELY_DESKTOP_FPS);
+}
+
+void LODManager::setHMDLODDecreaseFPS(float fps) {
+    if (fps < MIN_DECREASE_FPS) {
+        // avoid divide by zero
+        fps = MIN_DECREASE_FPS;
+    }
+    _hmdMaxRenderTime = (float)MSECS_PER_SECOND / fps;
+}
+
+float LODManager::getHMDLODDecreaseFPS() const {
+    return (float)MSECS_PER_SECOND / _hmdMaxRenderTime;
+}
+
+float LODManager::getHMDLODIncreaseFPS() const {
+    return glm::max(((float)MSECS_PER_SECOND / _hmdMaxRenderTime) + INCREASE_LOD_GAP, MAX_LIKELY_HMD_FPS);
+}
+
 QString LODManager::getLODFeedbackText() {
     // determine granularity feedback
     int boundaryLevelAdjust = getBoundaryLevelAdjust();
     QString granularityFeedback;
-    
     switch (boundaryLevelAdjust) {
         case 0: {
             granularityFeedback = QString(".");
@@ -195,7 +243,6 @@ QString LODManager::getLODFeedbackText() {
             granularityFeedback = QString(" at 1/%1th of standard granularity.").arg(boundaryLevelAdjust + 1);
         } break;
     }
-    
     // distance feedback
     float octreeSizeScale = getOctreeSizeScale();
     float relativeToDefault = octreeSizeScale / DEFAULT_OCTREE_SIZE_SCALE;
diff --git a/interface/src/LODManager.h b/interface/src/LODManager.h
index 3d5161298d..1b3797a0ca 100644
--- a/interface/src/LODManager.h
+++ b/interface/src/LODManager.h
@@ -21,6 +21,8 @@
 
 const float DEFAULT_DESKTOP_LOD_DOWN_FPS = 20.0;
 const float DEFAULT_HMD_LOD_DOWN_FPS = 20.0;
+const float DEFAULT_DESKTOP_MAX_RENDER_TIME = (float)MSECS_PER_SECOND / DEFAULT_DESKTOP_LOD_DOWN_FPS; // msec
+const float DEFAULT_HMD_MAX_RENDER_TIME = (float)MSECS_PER_SECOND / DEFAULT_HMD_LOD_DOWN_FPS; // msec
 const float MAX_LIKELY_DESKTOP_FPS = 59.0; // this is essentially, V-synch - 1 fps
 const float MAX_LIKELY_HMD_FPS = 74.0; // this is essentially, V-synch - 1 fps
 const float INCREASE_LOD_GAP = 15.0f;
@@ -56,13 +58,13 @@ public:
     Q_INVOKABLE void setAutomaticLODAdjust(bool value) { _automaticLODAdjust = value; }
     Q_INVOKABLE bool getAutomaticLODAdjust() const { return _automaticLODAdjust; }
 
-    Q_INVOKABLE void setDesktopLODDecreaseFPS(float value) { _desktopLODDecreaseFPS = value; }
-    Q_INVOKABLE float getDesktopLODDecreaseFPS() const { return _desktopLODDecreaseFPS; }
-    Q_INVOKABLE float getDesktopLODIncreaseFPS() const { return glm::min(_desktopLODDecreaseFPS + INCREASE_LOD_GAP, MAX_LIKELY_DESKTOP_FPS); }
+    Q_INVOKABLE void setDesktopLODDecreaseFPS(float value);
+    Q_INVOKABLE float getDesktopLODDecreaseFPS() const;
+    Q_INVOKABLE float getDesktopLODIncreaseFPS() const;
 
-    Q_INVOKABLE void setHMDLODDecreaseFPS(float value) { _hmdLODDecreaseFPS = value; }
-    Q_INVOKABLE float getHMDLODDecreaseFPS() const { return _hmdLODDecreaseFPS; }
-    Q_INVOKABLE float getHMDLODIncreaseFPS() const { return glm::min(_hmdLODDecreaseFPS + INCREASE_LOD_GAP, MAX_LIKELY_HMD_FPS); }
+    Q_INVOKABLE void setHMDLODDecreaseFPS(float value);
+    Q_INVOKABLE float getHMDLODDecreaseFPS() const;
+    Q_INVOKABLE float getHMDLODIncreaseFPS() const;
     
     // User Tweakable LOD Items
     Q_INVOKABLE QString getLODFeedbackText();
@@ -76,7 +78,7 @@ public:
     Q_INVOKABLE float getLODIncreaseFPS();
     
     static bool shouldRender(const RenderArgs* args, const AABox& bounds);
-    void autoAdjustLOD(float currentFPS);
+    void autoAdjustLOD(float batchTime, float engineRunTime, float deltaTimeSec);
     
     void loadSettings();
     void saveSettings();
@@ -90,8 +92,9 @@ private:
     LODManager();
     
     bool _automaticLODAdjust = true;
-    float _desktopLODDecreaseFPS = DEFAULT_DESKTOP_LOD_DOWN_FPS;
-    float _hmdLODDecreaseFPS = DEFAULT_HMD_LOD_DOWN_FPS;
+    float _avgRenderTime { 0.0 };
+    float _desktopMaxRenderTime { DEFAULT_DESKTOP_MAX_RENDER_TIME };
+    float _hmdMaxRenderTime { DEFAULT_HMD_MAX_RENDER_TIME };
 
     float _octreeSizeScale = DEFAULT_OCTREE_SIZE_SCALE;
     int _boundaryLevelAdjust = 0;
diff --git a/interface/src/LocationBookmarks.cpp b/interface/src/LocationBookmarks.cpp
index b79adcf1b7..285f533a7f 100644
--- a/interface/src/LocationBookmarks.cpp
+++ b/interface/src/LocationBookmarks.cpp
@@ -41,16 +41,32 @@ void LocationBookmarks::setupMenus(Menu* menubar, MenuWrapper* menu) {
     _deleteBookmarksAction = menubar->addActionToQMenuAndActionHash(menu, MenuOption::DeleteBookmark);
     QObject::connect(_deleteBookmarksAction, SIGNAL(triggered()), this, SLOT(deleteBookmark()), Qt::QueuedConnection);
 
-    Bookmarks::setupMenus(menubar, menu);
+    // Legacy Location to Bookmark.
+
+    // Enable/Disable menus as needed
+    enableMenuItems(_bookmarks.count() > 0);
+
+    // Load Bookmarks
+    for (auto it = _bookmarks.begin(); it != _bookmarks.end(); ++it) {
+        QString bookmarkName = it.key();
+        QString bookmarkAddress = it.value().toString();
+        addBookmarkToMenu(menubar, bookmarkName, bookmarkAddress);
+    }
+
     Bookmarks::sortActions(menubar, _bookmarksMenu);
 }
 
 void LocationBookmarks::setHomeLocation() {
     auto addressManager = DependencyManager::get<AddressManager>();
     QString bookmarkAddress = addressManager->currentAddress().toString();
+
     Bookmarks::addBookmarkToFile(HOME_BOOKMARK, bookmarkAddress);
 }
 
+void LocationBookmarks::setHomeLocationToAddress(const QVariant& address) {
+    Bookmarks::insert("Home", address);
+}
+
 void LocationBookmarks::teleportToBookmark() {
     QAction* action = qobject_cast<QAction*>(sender());
     QString address = action->data().toString();
@@ -58,23 +74,24 @@ void LocationBookmarks::teleportToBookmark() {
 }
 
 void LocationBookmarks::addBookmark() {
-    bool ok = false;
-    auto bookmarkName = OffscreenUi::getText(OffscreenUi::ICON_PLACEMARK, "Bookmark Location", "Name", QString(), &ok);
-    if (!ok) {
-        return;
-    }
+    ModalDialogListener* dlg = OffscreenUi::getTextAsync(OffscreenUi::ICON_PLACEMARK, "Bookmark Location", "Name", QString());
 
-    bookmarkName = bookmarkName.trimmed().replace(QRegExp("(\r\n|[\r\n\t\v ])+"), " ");
-    if (bookmarkName.length() == 0) {
-        return;
-    }
+    connect(dlg, &ModalDialogListener::response, this, [=] (QVariant response) {
+        disconnect(dlg, &ModalDialogListener::response, this, nullptr);
+        auto bookmarkName = response.toString();
 
-    auto addressManager = DependencyManager::get<AddressManager>();
-    QString bookmarkAddress = addressManager->currentAddress().toString();
-    Bookmarks::addBookmarkToFile(bookmarkName, bookmarkAddress);
+        bookmarkName = bookmarkName.trimmed().replace(QRegExp("(\r\n|[\r\n\t\v ])+"), " ");
+        if (bookmarkName.length() == 0) {
+            return;
+        }
+
+        auto addressManager = DependencyManager::get<AddressManager>();
+        QString bookmarkAddress = addressManager->currentAddress().toString();
+        Bookmarks::addBookmarkToFile(bookmarkName, bookmarkAddress);
+    });
 }
 
-void LocationBookmarks::addBookmarkToMenu(Menu* menubar, const QString& name, const QString& address) {
+void LocationBookmarks::addBookmarkToMenu(Menu* menubar, const QString& name, const QVariant& address) {
     QAction* teleportAction = _bookmarksMenu->newAction();
     teleportAction->setData(address);
     connect(teleportAction, SIGNAL(triggered()), this, SLOT(teleportToBookmark()));
diff --git a/interface/src/LocationBookmarks.h b/interface/src/LocationBookmarks.h
index 1324e96574..9a800ba35e 100644
--- a/interface/src/LocationBookmarks.h
+++ b/interface/src/LocationBookmarks.h
@@ -27,9 +27,10 @@ public:
 
 public slots:
     void addBookmark();
+    void setHomeLocationToAddress(const QVariant& address);
 
 protected:
-    void addBookmarkToMenu(Menu* menubar, const QString& name, const QString& address) override;
+    void addBookmarkToMenu(Menu* menubar, const QString& name, const QVariant& address) override;
 
 private:
     const QString LOCATIONBOOKMARKS_FILENAME = "bookmarks.json";
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 7d4535c681..9df22ab08e 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -56,6 +56,8 @@ Menu* Menu::getInstance() {
     return dynamic_cast<Menu*>(qApp->getWindow()->menuBar());
 }
 
+const char* exclusionGroupKey = "exclusionGroup";
+
 Menu::Menu() {
     auto dialogsManager = DependencyManager::get<DialogsManager>();
     auto accountManager = DependencyManager::get<AccountManager>();
@@ -222,32 +224,42 @@ Menu::Menu() {
     cameraModeGroup->setExclusive(true);
 
     // View > First Person
-    cameraModeGroup->addAction(addCheckableActionToQMenuAndActionHash(viewMenu,
-        MenuOption::FirstPerson, 0, // QML Qt:: Key_P
-        true, qApp, SLOT(cameraMenuChanged())));
+    auto firstPersonAction = cameraModeGroup->addAction(addCheckableActionToQMenuAndActionHash(
+                                   viewMenu, MenuOption::FirstPerson, Qt::CTRL | Qt::Key_F,
+                                   true, qApp, SLOT(cameraMenuChanged())));
+
+    firstPersonAction->setProperty(exclusionGroupKey, QVariant::fromValue(cameraModeGroup));
 
     // View > Third Person
-    cameraModeGroup->addAction(addCheckableActionToQMenuAndActionHash(viewMenu,
-        MenuOption::ThirdPerson, 0,
-        false, qApp, SLOT(cameraMenuChanged())));
+    auto thirdPersonAction = cameraModeGroup->addAction(addCheckableActionToQMenuAndActionHash(
+                                   viewMenu, MenuOption::ThirdPerson, Qt::CTRL | Qt::Key_G,
+                                   false, qApp, SLOT(cameraMenuChanged())));
+
+    thirdPersonAction->setProperty(exclusionGroupKey, QVariant::fromValue(cameraModeGroup));
 
     // View > Mirror
-    cameraModeGroup->addAction(addCheckableActionToQMenuAndActionHash(viewMenu,
-        MenuOption::FullscreenMirror, 0, // QML Qt::Key_H,
-        false, qApp, SLOT(cameraMenuChanged())));
+    auto viewMirrorAction = cameraModeGroup->addAction(addCheckableActionToQMenuAndActionHash(
+                                   viewMenu, MenuOption::FullscreenMirror, Qt::CTRL | Qt::Key_H,
+                                   false, qApp, SLOT(cameraMenuChanged())));
+
+    viewMirrorAction->setProperty(exclusionGroupKey, QVariant::fromValue(cameraModeGroup));
 
     // View > Independent [advanced]
-    cameraModeGroup->addAction(addCheckableActionToQMenuAndActionHash(viewMenu,
+    auto viewIndependentAction = cameraModeGroup->addAction(addCheckableActionToQMenuAndActionHash(viewMenu,
         MenuOption::IndependentMode, 0,
         false, qApp, SLOT(cameraMenuChanged()),
         UNSPECIFIED_POSITION, "Advanced"));
 
+    viewIndependentAction->setProperty(exclusionGroupKey, QVariant::fromValue(cameraModeGroup));
+
     // View > Entity Camera [advanced]
-    cameraModeGroup->addAction(addCheckableActionToQMenuAndActionHash(viewMenu,
+    auto viewEntityCameraAction = cameraModeGroup->addAction(addCheckableActionToQMenuAndActionHash(viewMenu,
         MenuOption::CameraEntityMode, 0,
         false, qApp, SLOT(cameraMenuChanged()),
         UNSPECIFIED_POSITION, "Advanced"));
 
+    viewEntityCameraAction->setProperty(exclusionGroupKey, QVariant::fromValue(cameraModeGroup));
+
     viewMenu->addSeparator();
 
     // View > Center Player In View
@@ -258,6 +270,9 @@ Menu::Menu() {
     // View > Overlays
     addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Overlays, 0, true);
 
+    // View > Enter First Person Mode in HMD
+    addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FirstPersonHMD, 0, true);
+
     // Navigate menu ----------------------------------
     MenuWrapper* navigateMenu = addMenu("Navigate");
 
@@ -319,7 +334,7 @@ Menu::Menu() {
             QString("../../hifi/tablet/TabletLodPreferences.qml"), "LodPreferencesDialog");
     });
 
-    action = addActionToQMenuAndActionHash(settingsMenu, "Controller Settings");
+    action = addActionToQMenuAndActionHash(settingsMenu, "Controller Settings...");
     connect(action, &QAction::triggered, [] {
             auto tablet = DependencyManager::get<TabletScriptingInterface>()->getTablet("com.highfidelity.interface.tablet.system");
             auto hmd = DependencyManager::get<HMDScriptingInterface>();
@@ -352,6 +367,20 @@ Menu::Menu() {
             QString("../../hifi/tablet/TabletGraphicsPreferences.qml"), "GraphicsPreferencesDialog");
     });
 
+    // Developer > UI >>>
+    MenuWrapper* uiOptionsMenu = developerMenu->addMenu("UI");
+    action = addCheckableActionToQMenuAndActionHash(uiOptionsMenu, MenuOption::DesktopTabletToToolbar, 0,
+                                                    qApp->getDesktopTabletBecomesToolbarSetting());
+    connect(action, &QAction::triggered, [action] {
+        qApp->setDesktopTabletBecomesToolbarSetting(action->isChecked());
+    });
+
+    action = addCheckableActionToQMenuAndActionHash(uiOptionsMenu, MenuOption::HMDTabletToToolbar, 0,
+                                                    qApp->getHmdTabletBecomesToolbarSetting());
+    connect(action, &QAction::triggered, [action] {
+        qApp->setHmdTabletBecomesToolbarSetting(action->isChecked());
+    });
+
     // Developer > Render >>>
     MenuWrapper* renderOptionsMenu = developerMenu->addMenu("Render");
     addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::WorldAxes);
@@ -529,6 +558,11 @@ Menu::Menu() {
     action = addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::ShowOtherLookAtVectors, 0, false);
     connect(action, &QAction::triggered, [this]{ Avatar::setShowOtherLookAtVectors(isOptionChecked(MenuOption::ShowOtherLookAtVectors)); });
 
+    action = addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::EnableLookAtSnapping, 0, true);
+    connect(action, &QAction::triggered, [this, avatar]{
+            avatar->setProperty("lookAtSnappingEnabled", isOptionChecked(MenuOption::EnableLookAtSnapping));
+        });
+
     addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::FixGaze, 0, false);
     addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::AnimDebugDrawDefaultPose, 0, false,
         avatar.get(), SLOT(setEnableDebugDrawDefaultPose(bool)));
@@ -552,6 +586,8 @@ Menu::Menu() {
         avatar.get(), SLOT(setEnableDebugDrawIKConstraints(bool)));
     addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::RenderIKChains, 0, false,
         avatar.get(), SLOT(setEnableDebugDrawIKChains(bool)));
+    addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::RenderDetailedCollision, 0, false,
+        avatar.get(), SLOT(setEnableDebugDrawDetailedCollision(bool)));
 
     addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::ActionMotorControl,
         Qt::CTRL | Qt::SHIFT | Qt::Key_K, true, avatar.get(), SLOT(updateMotionBehaviorFromMenu()),
@@ -566,9 +602,6 @@ Menu::Menu() {
     addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::DisplayHandTargets, 0, false,
         avatar.get(), SLOT(setEnableDebugDrawHandControllers(bool)));
 
-    MenuWrapper* leapOptionsMenu = handOptionsMenu->addMenu("Leap Motion");
-    addCheckableActionToQMenuAndActionHash(leapOptionsMenu, MenuOption::LeapMotionOnHMD, 0, false);
-
     // Developer > Entities >>>
     MenuWrapper* entitiesOptionsMenu = developerMenu->addMenu("Entities");
 
@@ -680,7 +713,7 @@ Menu::Menu() {
     // Developer > Physics >>>
     MenuWrapper* physicsOptionsMenu = developerMenu->addMenu("Physics");
     {
-        auto drawStatusConfig = qApp->getRenderEngine()->getConfiguration()->getConfig<render::DrawStatus>();
+        auto drawStatusConfig = qApp->getRenderEngine()->getConfiguration()->getConfig<render::DrawStatus>("RenderMainView.DrawStatus");
         addCheckableActionToQMenuAndActionHash(physicsOptionsMenu, MenuOption::PhysicsShowOwned,
             0, false, drawStatusConfig, SLOT(setShowNetwork(bool)));
     }
diff --git a/interface/src/Menu.h b/interface/src/Menu.h
index cc8e67c8f7..854f8d8c2b 100644
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@@ -105,6 +105,7 @@ namespace MenuOption {
     const QString ExpandPhysicsSimulationTiming = "Expand /physics";
     const QString ExpandUpdateTiming = "Expand /update";
     const QString FirstPerson = "First Person";
+    const QString FirstPersonHMD = "Enter First Person Mode in HMD";
     const QString FivePointCalibration = "5 Point Calibration";
     const QString FixGaze = "Fix Gaze (no saccade)";
     const QString Forward = "Forward";
@@ -114,7 +115,6 @@ namespace MenuOption {
     const QString IncreaseAvatarSize = "Increase Avatar Size";
     const QString IndependentMode = "Independent Mode";
     const QString ActionMotorControl = "Enable Default Motor Control";
-    const QString LeapMotionOnHMD = "Leap Motion on HMD";
     const QString LoadScript = "Open and Run Script File...";
     const QString LoadScriptURL = "Open and Run Script from URL...";
     const QString LodTools = "LOD Tools";
@@ -162,6 +162,7 @@ namespace MenuOption {
     const QString RenderIKTargets = "Show IK Targets";
     const QString RenderIKConstraints = "Show IK Constraints";
     const QString RenderIKChains = "Show IK Chains";
+    const QString RenderDetailedCollision = "Show Detailed Collision";
     const QString ResetAvatarSize = "Reset Avatar Size";
     const QString ResetSensors = "Reset Sensors";
     const QString RunningScripts = "Running Scripts...";
@@ -176,6 +177,7 @@ namespace MenuOption {
     const QString ShowDSConnectTable = "Show Domain Connection Timing";
     const QString ShowMyLookAtVectors = "Show My Eye Vectors";
     const QString ShowOtherLookAtVectors = "Show Other Eye Vectors";
+    const QString EnableLookAtSnapping = "Enable LookAt Snapping";
     const QString ShowRealtimeEntityStats = "Show Realtime Entity Stats";
     const QString StandingHMDSensorMode = "Standing HMD Sensor Mode";
     const QString SimulateEyeTracking = "Simulate";
@@ -198,6 +200,8 @@ namespace MenuOption {
     const QString VisibleToFriends = "Friends";
     const QString VisibleToNoOne = "No one";
     const QString WorldAxes = "World Axes";
+    const QString DesktopTabletToToolbar = "Desktop Tablet Becomes Toolbar";
+    const QString HMDTabletToToolbar = "HMD Tablet Becomes Toolbar";
 }
 
 #endif // hifi_Menu_h
diff --git a/interface/src/ModelPackager.cpp b/interface/src/ModelPackager.cpp
index 44768db93c..5f4c7526e0 100644
--- a/interface/src/ModelPackager.cpp
+++ b/interface/src/ModelPackager.cpp
@@ -79,7 +79,7 @@ bool ModelPackager::loadModel() {
     if (_modelFile.completeSuffix().contains("fst")) {
         QFile fst(_modelFile.filePath());
         if (!fst.open(QFile::ReadOnly | QFile::Text)) {
-            OffscreenUi::warning(NULL,
+            OffscreenUi::asyncWarning(NULL,
                                  QString("ModelPackager::loadModel()"),
                                  QString("Could not open FST file %1").arg(_modelFile.filePath()),
                                  QMessageBox::Ok);
@@ -98,7 +98,7 @@ bool ModelPackager::loadModel() {
     // open the fbx file
     QFile fbx(_fbxInfo.filePath());
     if (!_fbxInfo.exists() || !_fbxInfo.isFile() || !fbx.open(QIODevice::ReadOnly)) {
-        OffscreenUi::warning(NULL,
+        OffscreenUi::asyncWarning(NULL,
                              QString("ModelPackager::loadModel()"),
                              QString("Could not open FBX file %1").arg(_fbxInfo.filePath()),
                              QMessageBox::Ok);
@@ -408,7 +408,7 @@ bool ModelPackager::copyTextures(const QString& oldDir, const QDir& newDir) {
     }
     
     if (!errors.isEmpty()) {
-        OffscreenUi::warning(nullptr, "ModelPackager::copyTextures()",
+        OffscreenUi::asyncWarning(nullptr, "ModelPackager::copyTextures()",
                              "Missing textures:" + errors);
         qCDebug(interfaceapp) << "ModelPackager::copyTextures():" << errors;
         return false;
diff --git a/interface/src/ModelPropertiesDialog.cpp b/interface/src/ModelPropertiesDialog.cpp
index d41a913c95..ae352974ae 100644
--- a/interface/src/ModelPropertiesDialog.cpp
+++ b/interface/src/ModelPropertiesDialog.cpp
@@ -201,7 +201,7 @@ void ModelPropertiesDialog::chooseTextureDirectory() {
         return;
     }
     if (!directory.startsWith(_basePath)) {
-        OffscreenUi::warning(NULL, "Invalid texture directory", "Texture directory must be child of base path.");
+        OffscreenUi::asyncWarning(NULL, "Invalid texture directory", "Texture directory must be child of base path.");
         return;
     }
     _textureDirectory->setText(directory.length() == _basePath.length() ? "." : directory.mid(_basePath.length() + 1));
diff --git a/interface/src/SecondaryCamera.cpp b/interface/src/SecondaryCamera.cpp
index f6ee8caa61..9d19b8fb0f 100644
--- a/interface/src/SecondaryCamera.cpp
+++ b/interface/src/SecondaryCamera.cpp
@@ -9,14 +9,15 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "Application.h"
 #include "SecondaryCamera.h"
 #include <TextureCache.h>
 #include <gpu/Context.h>
+#include <EntityScriptingInterface.h>
 
 using RenderArgsPointer = std::shared_ptr<RenderArgs>;
 
 void MainRenderTask::build(JobModel& task, const render::Varying& inputs, render::Varying& outputs, render::CullFunctor cullFunctor, bool isDeferred) {
-
     task.addJob<RenderShadowTask>("RenderShadowTask", cullFunctor);
     const auto items = task.addJob<RenderFetchCullSortTask>("FetchCullSort", cullFunctor);
     assert(items.canCast<RenderFetchCullSortTask::Output>());
@@ -27,46 +28,33 @@ void MainRenderTask::build(JobModel& task, const render::Varying& inputs, render
     }
 }
 
-void SecondaryCameraRenderTaskConfig::resetSize(int width, int height) { // FIXME: Add an arg here for "destinationFramebuffer"
-    bool wasEnabled = isEnabled();
-    setEnabled(false);
-    auto textureCache = DependencyManager::get<TextureCache>();
-    textureCache->resetSpectatorCameraFramebuffer(width, height); // FIXME: Call the correct reset function based on the "destinationFramebuffer" arg
-    setEnabled(wasEnabled);
-}
-
-void SecondaryCameraRenderTaskConfig::resetSizeSpectatorCamera(int width, int height) { // Carefully adjust the framebuffer / texture.
-    resetSize(width, height);
-}
-
-class BeginSecondaryCameraFrame {  // Changes renderContext for our framebuffer and and view.
-    glm::vec3 _position{};
-    glm::quat _orientation{};
-    float _vFoV{};
-    float _nearClipPlaneDistance{};
-    float _farClipPlaneDistance{};
+class SecondaryCameraJob {  // Changes renderContext for our framebuffer and view.
 public:
-    using Config = BeginSecondaryCameraFrameConfig;
-    using JobModel = render::Job::ModelO<BeginSecondaryCameraFrame, RenderArgsPointer, Config>;
-    BeginSecondaryCameraFrame() {
+    using Config = SecondaryCameraJobConfig;
+    using JobModel = render::Job::ModelO<SecondaryCameraJob, RenderArgsPointer, Config>;
+    SecondaryCameraJob() {
         _cachedArgsPointer = std::make_shared<RenderArgs>(_cachedArgs);
+        _entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
+        _attachedEntityPropertyFlags += PROP_POSITION;
+        _attachedEntityPropertyFlags += PROP_ROTATION;
     }
 
     void configure(const Config& config) {
-        if (config.enabled || config.alwaysEnabled) {
-            _position = config.position;
-            _orientation = config.orientation;
-            _vFoV = config.vFoV;
-            _nearClipPlaneDistance = config.nearClipPlaneDistance;
-            _farClipPlaneDistance = config.farClipPlaneDistance;
-        }
+        _attachedEntityId = config.attachedEntityId;
+        _position = config.position;
+        _orientation = config.orientation;
+        _vFoV = config.vFoV;
+        _nearClipPlaneDistance = config.nearClipPlaneDistance;
+        _farClipPlaneDistance = config.farClipPlaneDistance;
+        _textureWidth = config.textureWidth;
+        _textureHeight = config.textureHeight;
     }
 
     void run(const render::RenderContextPointer& renderContext, RenderArgsPointer& cachedArgs) {
         auto args = renderContext->args;
         auto textureCache = DependencyManager::get<TextureCache>();
         gpu::FramebufferPointer destFramebuffer;
-        destFramebuffer = textureCache->getSpectatorCameraFramebuffer(); // FIXME: Change the destination based on some unimplemented config var
+        destFramebuffer = textureCache->getSpectatorCameraFramebuffer(_textureWidth, _textureHeight); // FIXME: Change the destination based on some unimplemented config var
         if (destFramebuffer) {
             _cachedArgsPointer->_blitFramebuffer = args->_blitFramebuffer;
             _cachedArgsPointer->_viewport = args->_viewport;
@@ -79,11 +67,18 @@ public:
 
             gpu::doInBatch(args->_context, [&](gpu::Batch& batch) {
                 batch.disableContextStereo();
+                batch.disableContextViewCorrection();
             });
 
             auto srcViewFrustum = args->getViewFrustum();
-            srcViewFrustum.setPosition(_position);
-            srcViewFrustum.setOrientation(_orientation);
+            if (!_attachedEntityId.isNull()) {
+                EntityItemProperties entityProperties = _entityScriptingInterface->getEntityProperties(_attachedEntityId, _attachedEntityPropertyFlags);
+                srcViewFrustum.setPosition(entityProperties.getPosition());
+                srcViewFrustum.setOrientation(entityProperties.getRotation());
+            } else {
+                srcViewFrustum.setPosition(_position);
+                srcViewFrustum.setOrientation(_orientation);
+            }
             srcViewFrustum.setProjection(glm::perspective(glm::radians(_vFoV), ((float)args->_viewport.z / (float)args->_viewport.w), _nearClipPlaneDistance, _farClipPlaneDistance));
             // Without calculating the bound planes, the secondary camera will use the same culling frustum as the main camera,
             // which is not what we want here.
@@ -96,8 +91,49 @@ public:
 protected:
     RenderArgs _cachedArgs;
     RenderArgsPointer _cachedArgsPointer;
+
+private:
+    QUuid _attachedEntityId;
+    glm::vec3 _position;
+    glm::quat _orientation;
+    float _vFoV;
+    float _nearClipPlaneDistance;
+    float _farClipPlaneDistance;
+    int _textureWidth;
+    int _textureHeight;
+    EntityPropertyFlags _attachedEntityPropertyFlags;
+    QSharedPointer<EntityScriptingInterface> _entityScriptingInterface;
 };
 
+void SecondaryCameraJobConfig::setPosition(glm::vec3 pos) {
+    if (attachedEntityId.isNull()) {
+        position = pos;
+        emit dirty();
+    } else {
+        qDebug() << "ERROR: Cannot set position of SecondaryCamera while attachedEntityId is set.";
+    }
+}
+
+void SecondaryCameraJobConfig::setOrientation(glm::quat orient) {
+    if (attachedEntityId.isNull()) {
+        orientation = orient;
+        emit dirty();
+    } else {
+        qDebug() << "ERROR: Cannot set orientation of SecondaryCamera while attachedEntityId is set.";
+    }
+}
+
+void SecondaryCameraJobConfig::enableSecondaryCameraRenderConfigs(bool enabled) {
+    qApp->getRenderEngine()->getConfiguration()->getConfig<SecondaryCameraRenderTask>()->setEnabled(enabled);
+    setEnabled(enabled);
+}
+
+void SecondaryCameraJobConfig::resetSizeSpectatorCamera(int width, int height) {
+    textureWidth = width;
+    textureHeight = height;
+    emit dirty();
+}
+
 class EndSecondaryCameraFrame {  // Restores renderContext.
 public:
     using JobModel = render::Job::ModelI<EndSecondaryCameraFrame, RenderArgsPointer>;
@@ -112,12 +148,13 @@ public:
 
         gpu::doInBatch(args->_context, [&](gpu::Batch& batch) {
             batch.restoreContextStereo();
+            batch.restoreContextViewCorrection();
         });
     }
 };
 
 void SecondaryCameraRenderTask::build(JobModel& task, const render::Varying& inputs, render::Varying& outputs, render::CullFunctor cullFunctor) {
-    const auto cachedArg = task.addJob<BeginSecondaryCameraFrame>("BeginSecondaryCamera");
+    const auto cachedArg = task.addJob<SecondaryCameraJob>("SecondaryCamera");
     const auto items = task.addJob<RenderFetchCullSortTask>("FetchCullSort", cullFunctor);
     assert(items.canCast<RenderFetchCullSortTask::Output>());
     task.addJob<RenderDeferredTask>("RenderDeferredTask", items);
diff --git a/interface/src/SecondaryCamera.h b/interface/src/SecondaryCamera.h
index 5ad19c9614..a9b438ec6f 100644
--- a/interface/src/SecondaryCamera.h
+++ b/interface/src/SecondaryCamera.h
@@ -18,7 +18,6 @@
 #include <RenderDeferredTask.h>
 #include <RenderForwardTask.h>
 
-
 class MainRenderTask {
 public:
     using JobModel = render::Task::Model<MainRenderTask>;
@@ -28,34 +27,40 @@ public:
     void build(JobModel& task, const render::Varying& inputs, render::Varying& outputs, render::CullFunctor cullFunctor, bool isDeferred = true);
 };
 
-class BeginSecondaryCameraFrameConfig : public render::Task::Config { // Exposes secondary camera parameters to JavaScript.
+class SecondaryCameraJobConfig : public render::Task::Config { // Exposes secondary camera parameters to JavaScript.
     Q_OBJECT
-    Q_PROPERTY(glm::vec3 position MEMBER position NOTIFY dirty)  // of viewpoint to render from
-    Q_PROPERTY(glm::quat orientation MEMBER orientation NOTIFY dirty)  // of viewpoint to render from
+    Q_PROPERTY(QUuid attachedEntityId MEMBER attachedEntityId NOTIFY dirty)  // entity whose properties define camera position and orientation
+    Q_PROPERTY(glm::vec3 position READ getPosition WRITE setPosition)  // of viewpoint to render from
+    Q_PROPERTY(glm::quat orientation READ getOrientation WRITE setOrientation)  // of viewpoint to render from
     Q_PROPERTY(float vFoV MEMBER vFoV NOTIFY dirty)  // Secondary camera's vertical field of view. In degrees.
     Q_PROPERTY(float nearClipPlaneDistance MEMBER nearClipPlaneDistance NOTIFY dirty)  // Secondary camera's near clip plane distance. In meters.
     Q_PROPERTY(float farClipPlaneDistance MEMBER farClipPlaneDistance NOTIFY dirty)  // Secondary camera's far clip plane distance. In meters.
 public:
-    glm::vec3 position{};
-    glm::quat orientation{};
-    float vFoV{ 45.0f };
-    float nearClipPlaneDistance{ 0.1f };
-    float farClipPlaneDistance{ 100.0f };
-    BeginSecondaryCameraFrameConfig() : render::Task::Config(false) {}
+    QUuid attachedEntityId;
+    glm::vec3 position;
+    glm::quat orientation;
+    float vFoV { DEFAULT_FIELD_OF_VIEW_DEGREES };
+    float nearClipPlaneDistance { DEFAULT_NEAR_CLIP };
+    float farClipPlaneDistance { DEFAULT_FAR_CLIP };
+    int textureWidth { TextureCache::DEFAULT_SPECTATOR_CAM_WIDTH };
+    int textureHeight { TextureCache::DEFAULT_SPECTATOR_CAM_HEIGHT };
+
+    SecondaryCameraJobConfig() : render::Task::Config(false) {}
 signals:
     void dirty();
+public slots:
+    glm::vec3 getPosition() { return position; }
+    void setPosition(glm::vec3 pos);
+    glm::quat getOrientation() { return orientation; }
+    void setOrientation(glm::quat orient);
+    void enableSecondaryCameraRenderConfigs(bool enabled);
+    void resetSizeSpectatorCamera(int width, int height);
 };
 
 class SecondaryCameraRenderTaskConfig : public render::Task::Config {
     Q_OBJECT
 public:
     SecondaryCameraRenderTaskConfig() : render::Task::Config(false) {}
-private:
-    void resetSize(int width, int height);
-signals:
-    void dirty();
-public slots:
-    void resetSizeSpectatorCamera(int width, int height);
 };
 
 class SecondaryCameraRenderTask {
diff --git a/interface/src/Util.cpp b/interface/src/Util.cpp
index 7822b78244..aad7768b99 100644
--- a/interface/src/Util.cpp
+++ b/interface/src/Util.cpp
@@ -28,6 +28,8 @@
 #include <GeometryCache.h>
 #include <OctreeConstants.h>
 #include <SharedUtil.h>
+#include <ShapeEntityItem.h>
+#include <ShapeInfo.h>
 
 #include "InterfaceLogging.h"
 #include "world.h"
@@ -393,4 +395,20 @@ void runUnitTests() {
     }
 }
 
+void shapeInfoCalculator(const ShapeEntityItem * const shapeEntity, ShapeInfo &shapeInfo) {
+
+    if (shapeEntity == nullptr) {
+
+        //--EARLY EXIT--
+        return;
+    }
+
+    ShapeInfo::PointCollection pointCollection;
+    ShapeInfo::PointList points;
+    pointCollection.push_back(points);
+
+    GeometryCache::computeSimpleHullPointListForShape((int)shapeEntity->getShape(), shapeEntity->getDimensions(), pointCollection.back());
+    shapeInfo.setPointCollection(pointCollection);
+}
+
 
diff --git a/interface/src/Util.h b/interface/src/Util.h
index 48acb53936..976a26ce82 100644
--- a/interface/src/Util.h
+++ b/interface/src/Util.h
@@ -18,6 +18,9 @@
 #include <gpu/Batch.h>
 #include <render/Forward.h>
 
+class ShapeEntityItem;
+class ShapeInfo;
+
 void renderWorldBox(RenderArgs* args, gpu::Batch& batch);
 
 void runTimingTests();
@@ -28,4 +31,6 @@ bool rayIntersectsSphere(const glm::vec3& rayStarting, const glm::vec3& rayNorma
 
 bool pointInSphere(glm::vec3& point, glm::vec3& sphereCenter, double sphereRadius);
 
+void shapeInfoCalculator(const ShapeEntityItem * const shapeEntity, ShapeInfo &shapeInfo);
+
 #endif // hifi_Util_h
diff --git a/interface/src/assets/ATPAssetMigrator.cpp b/interface/src/assets/ATPAssetMigrator.cpp
index 667c2587b0..45ac80b054 100644
--- a/interface/src/assets/ATPAssetMigrator.cpp
+++ b/interface/src/assets/ATPAssetMigrator.cpp
@@ -42,117 +42,161 @@ static const QString COMPOUND_SHAPE_URL_KEY = "compoundShapeURL";
 static const QString MESSAGE_BOX_TITLE = "ATP Asset Migration";
 
 void ATPAssetMigrator::loadEntityServerFile() {
-    auto filename = OffscreenUi::getOpenFileName(_dialogParent, tr("Select an entity-server content file to migrate"), QString(), tr("Entity-Server Content (*.gz)"));
-    
-    if (!filename.isEmpty()) {
-        qCDebug(asset_migrator) << "Selected filename for ATP asset migration: " << filename;
-        
-        static const QString MIGRATION_CONFIRMATION_TEXT {
-            "The ATP Asset Migration process will scan the selected entity-server file,\nupload discovered resources to the"\
-            " current asset-server\nand then save a new entity-server file with the ATP URLs.\n\nAre you ready to"\
-            " continue?\n\nMake sure you are connected to the right domain."
-        };
-        
-        auto button = OffscreenUi::question(_dialogParent, MESSAGE_BOX_TITLE, MIGRATION_CONFIRMATION_TEXT,
-                                            QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
-        
-        if (button == QMessageBox::No) {
-            return;
-        }
-        
-        // try to open the file at the given filename
-        QFile modelsFile { filename };
-        
-        if (modelsFile.open(QIODevice::ReadOnly)) {
-            QByteArray compressedJsonData = modelsFile.readAll();
-            QByteArray jsonData;
-            
-            if (!gunzip(compressedJsonData, jsonData)) {
-                OffscreenUi::warning(_dialogParent, "Error", "The file at" + filename + "was not in gzip format.");
-            }
-            
-            QJsonDocument modelsJSON = QJsonDocument::fromJson(jsonData);
-            _entitiesArray = modelsJSON.object()["Entities"].toArray();
-            
-            for (auto jsonValue : _entitiesArray) {
-                QJsonObject entityObject = jsonValue.toObject();
-                QString modelURLString = entityObject.value(MODEL_URL_KEY).toString();
-                QString compoundURLString = entityObject.value(COMPOUND_SHAPE_URL_KEY).toString();
+    ModalDialogListener* dlg = OffscreenUi::getOpenFileNameAsync(_dialogParent, tr("Select an entity-server content file to migrate"),
+                                      QString(), tr("Entity-Server Content (*.gz)"));
 
-                for (int i = 0; i < 2; ++i) {
-                    bool isModelURL = (i == 0);
-                    quint8 replacementType = i;
-                    auto migrationURLString = (isModelURL) ? modelURLString : compoundURLString;
+    connect(dlg, &ModalDialogListener::response, this, [=] (QVariant response) {
+        const QString& filename = response.toString();
+        disconnect(dlg, &ModalDialogListener::response, this, nullptr);
+        if (!filename.isEmpty()) {
+            qCDebug(asset_migrator) << "Selected filename for ATP asset migration: " << filename;
 
-                    if (!migrationURLString.isEmpty()) {
-                        QUrl migrationURL = QUrl(migrationURLString);
+            auto migrateResources = [=](QUrl migrationURL, QJsonValueRef jsonValue, bool isModelURL) {
+                auto request =
+                        DependencyManager::get<ResourceManager>()->createResourceRequest(this, migrationURL);
 
-                        if (!_ignoredUrls.contains(migrationURL)
-                            && (migrationURL.scheme() == URL_SCHEME_HTTP || migrationURL.scheme() == URL_SCHEME_HTTPS
-                                || migrationURL.scheme() == URL_SCHEME_FILE || migrationURL.scheme() == URL_SCHEME_FTP)) {
+                if (request) {
+                    qCDebug(asset_migrator) << "Requesting" << migrationURL << "for ATP asset migration";
 
-                                if (_pendingReplacements.contains(migrationURL)) {
-                                    // we already have a request out for this asset, just store the QJsonValueRef
-                                    // so we can do the hash replacement when the request comes back
-                                    _pendingReplacements.insert(migrationURL, { jsonValue, replacementType });
-                                } else if (_uploadedAssets.contains(migrationURL)) {
-                                    // we already have a hash for this asset
-                                    // so just do the replacement immediately
-                                    if (isModelURL) {
-                                        entityObject[MODEL_URL_KEY] = _uploadedAssets.value(migrationURL).toString();
-                                    } else {
-                                        entityObject[COMPOUND_SHAPE_URL_KEY] = _uploadedAssets.value(migrationURL).toString();
-                                    }
+                    // add this combination of QUrl and QJsonValueRef to our multi hash so we can change the URL
+                    // to an ATP one once ready
+                    _pendingReplacements.insert(migrationURL, { jsonValue, (isModelURL ? 0 : 1)});
 
-                                    jsonValue = entityObject;
-                                } else if (wantsToMigrateResource(migrationURL)) {
-                                    auto request =
-                                        DependencyManager::get<ResourceManager>()->createResourceRequest(this, migrationURL);
+                    connect(request, &ResourceRequest::finished, this, [=]() {
+                        if (request->getResult() == ResourceRequest::Success) {
+                            migrateResource(request);
+                        } else {
+                            ++_errorCount;
+                            _pendingReplacements.remove(migrationURL);
+                            qWarning() << "Could not retrieve asset at" << migrationURL.toString();
 
-                                    if (request) {
-                                        qCDebug(asset_migrator) << "Requesting" << migrationURL << "for ATP asset migration";
+                            checkIfFinished();
+                        }
+                        request->deleteLater();
+                    });
 
-                                        // add this combination of QUrl and QJsonValueRef to our multi hash so we can change the URL
-                                        // to an ATP one once ready
-                                        _pendingReplacements.insert(migrationURL, { jsonValue, (isModelURL ? 0 : 1)});
-
-                                        connect(request, &ResourceRequest::finished, this, [=]() {
-                                            if (request->getResult() == ResourceRequest::Success) {
-                                                migrateResource(request);
-                                            } else {
-                                                ++_errorCount;
-                                                _pendingReplacements.remove(migrationURL);
-                                                qWarning() << "Could not retrieve asset at" << migrationURL.toString();
-
-                                                checkIfFinished();
-                                            }
-                                            request->deleteLater();
-                                        });
-
-                                        request->send();
-                                    } else {
-                                        ++_errorCount;
-                                        qWarning() << "Count not create request for asset at" << migrationURL.toString();
-                                    }
-                                    
-                                } else {
-                                    _ignoredUrls.insert(migrationURL);
-                                }
-                            }
-                    }
+                    request->send();
+                } else {
+                    ++_errorCount;
+                    qWarning() << "Could not create request for asset at" << migrationURL.toString();
                 }
 
-            }
-            
-            _doneReading = true;
+            };
+            static const QString MIGRATION_CONFIRMATION_TEXT {
+                "The ATP Asset Migration process will scan the selected entity-server file,\nupload discovered resources to the"\
+                " current asset-server\nand then save a new entity-server file with the ATP URLs.\n\nAre you ready to"\
+                " continue?\n\nMake sure you are connected to the right domain."
+            };
+            ModalDialogListener* migrationConfirmDialog = OffscreenUi::asyncQuestion(_dialogParent, MESSAGE_BOX_TITLE, MIGRATION_CONFIRMATION_TEXT,
+                                       QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
+            QObject::connect(migrationConfirmDialog, &ModalDialogListener::response, this, [=] (QVariant answer) {
+                QObject::disconnect(migrationConfirmDialog, &ModalDialogListener::response, this, nullptr);
 
-            checkIfFinished();
-            
-        } else {
-            OffscreenUi::warning(_dialogParent, "Error",
-                                 "There was a problem loading that entity-server file for ATP asset migration. Please try again");
+                if (QMessageBox::Yes == static_cast<QMessageBox::StandardButton>(answer.toInt())) {
+                    // try to open the file at the given filename
+                    QFile modelsFile { filename };
+
+                    if (modelsFile.open(QIODevice::ReadOnly)) {
+                        QByteArray compressedJsonData = modelsFile.readAll();
+                        QByteArray jsonData;
+
+                        if (!gunzip(compressedJsonData, jsonData)) {
+                            OffscreenUi::asyncWarning(_dialogParent, "Error", "The file at" + filename + "was not in gzip format.");
+                        }
+
+                        QJsonDocument modelsJSON = QJsonDocument::fromJson(jsonData);
+                        _entitiesArray = modelsJSON.object()["Entities"].toArray();
+
+                        for (auto jsonValue : _entitiesArray) {
+                            QJsonObject entityObject = jsonValue.toObject();
+                            QString modelURLString = entityObject.value(MODEL_URL_KEY).toString();
+                            QString compoundURLString = entityObject.value(COMPOUND_SHAPE_URL_KEY).toString();
+
+                            for (int i = 0; i < 2; ++i) {
+                                bool isModelURL = (i == 0);
+                                quint8 replacementType = i;
+                                auto migrationURLString = (isModelURL) ? modelURLString : compoundURLString;
+
+                                if (!migrationURLString.isEmpty()) {
+                                    QUrl migrationURL = QUrl(migrationURLString);
+
+                                    if (!_ignoredUrls.contains(migrationURL)
+                                            && (migrationURL.scheme() == URL_SCHEME_HTTP || migrationURL.scheme() == URL_SCHEME_HTTPS
+                                                || migrationURL.scheme() == URL_SCHEME_FILE || migrationURL.scheme() == URL_SCHEME_FTP)) {
+
+                                        if (_pendingReplacements.contains(migrationURL)) {
+                                            // we already have a request out for this asset, just store the QJsonValueRef
+                                            // so we can do the hash replacement when the request comes back
+                                            _pendingReplacements.insert(migrationURL, { jsonValue, replacementType });
+                                        } else if (_uploadedAssets.contains(migrationURL)) {
+                                            // we already have a hash for this asset
+                                            // so just do the replacement immediately
+                                            if (isModelURL) {
+                                                entityObject[MODEL_URL_KEY] = _uploadedAssets.value(migrationURL).toString();
+                                            } else {
+                                                entityObject[COMPOUND_SHAPE_URL_KEY] = _uploadedAssets.value(migrationURL).toString();
+                                            }
+
+                                            jsonValue = entityObject;
+                                        } else {
+
+                                            static bool hasAskedForCompleteMigration { false };
+                                            static bool wantsCompleteMigration { false };
+
+                                            if (!hasAskedForCompleteMigration) {
+                                                // this is the first resource migration - ask the user if they just want to migrate everything
+                                                static const QString COMPLETE_MIGRATION_TEXT { "Do you want to migrate all assets found in this entity-server file?\n"\
+                                                                                               "Select \"Yes\" to upload all discovered assets to the current asset-server immediately.\n"\
+                                                                                               "Select \"No\" to be prompted for each discovered asset."
+                                                                                             };
+                                                ModalDialogListener* migrationConfirmDialog1 = OffscreenUi::asyncQuestion(_dialogParent, MESSAGE_BOX_TITLE,
+                                                                           "Would you like to migrate the following resource?\n" + migrationURL.toString(),
+                                                                           QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
+
+                                                QObject::connect(migrationConfirmDialog1, &ModalDialogListener::response, this, [=] (QVariant answer) {
+                                                    QObject::disconnect(migrationConfirmDialog1, &ModalDialogListener::response, this, nullptr);
+                                                    if (static_cast<QMessageBox::StandardButton>(answer.toInt()) ==
+                                                            QMessageBox::Yes) {
+                                                        wantsCompleteMigration = true;
+                                                        migrateResources(migrationURL, jsonValue, isModelURL);
+                                                    } else {
+                                                        ModalDialogListener* migrationConfirmDialog2 = OffscreenUi::asyncQuestion(_dialogParent, MESSAGE_BOX_TITLE, COMPLETE_MIGRATION_TEXT,
+                                                                                   QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
+
+                                                        QObject::connect(migrationConfirmDialog2, &ModalDialogListener::response, this, [=] (QVariant answer) {
+                                                            QObject::disconnect(migrationConfirmDialog2, &ModalDialogListener::response, this, nullptr);
+                                                            if (static_cast<QMessageBox::StandardButton>(answer.toInt()) ==
+                                                                    QMessageBox::Yes) {
+                                                                migrateResources(migrationURL, jsonValue, isModelURL);
+                                                            } else {
+                                                                _ignoredUrls.insert(migrationURL);
+                                                            }
+                                                        });
+                                                    }
+                                                });
+                                                hasAskedForCompleteMigration = true;
+                                            }
+                                            if (wantsCompleteMigration) {
+                                                migrateResources(migrationURL, jsonValue, isModelURL);
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+
+                        _doneReading = true;
+
+                        checkIfFinished();
+
+                    } else {
+                        OffscreenUi::asyncWarning(_dialogParent, "Error",
+                                                  "There was a problem loading that entity-server file for ATP asset migration. Please try again");
+                    }
+                }
+            });
         }
-    }
+    });
 }
 
 void ATPAssetMigrator::migrateResource(ResourceRequest* request) {
@@ -248,9 +292,6 @@ void ATPAssetMigrator::checkIfFinished() {
     // are we out of pending replacements? if so it is time to save the entity-server file
     if (_doneReading && _pendingReplacements.empty()) {
         saveEntityServerFile();
-
-        // reset after the attempted save, success or fail
-        reset();
     }
 }
 
@@ -288,39 +329,43 @@ bool ATPAssetMigrator::wantsToMigrateResource(const QUrl& url) {
 
 void ATPAssetMigrator::saveEntityServerFile() {
     // show a dialog to ask the user where they want to save the file
-    QString saveName = OffscreenUi::getSaveFileName(_dialogParent, "Save Migrated Entities File");
-    
-    QFile saveFile { saveName };
-    
-    if (saveFile.open(QIODevice::WriteOnly)) {
-        QJsonObject rootObject;
-        rootObject[ENTITIES_OBJECT_KEY] = _entitiesArray;
-        
-        QJsonDocument newDocument { rootObject };
-        QByteArray jsonDataForFile;
-        
-        if (gzip(newDocument.toJson(), jsonDataForFile, -1)) {
-            
-            saveFile.write(jsonDataForFile);
-            saveFile.close();
+    ModalDialogListener* dlg = OffscreenUi::getSaveFileNameAsync(_dialogParent, "Save Migrated Entities File");
+    connect(dlg, &ModalDialogListener::response, this, [=] (QVariant response) {
+        const QString& saveName = response.toString();
+        QFile saveFile { saveName };
 
-            QString infoMessage = QString("Your new entities file has been saved at\n%1.").arg(saveName);
+        if (saveFile.open(QIODevice::WriteOnly)) {
+            QJsonObject rootObject;
+            rootObject[ENTITIES_OBJECT_KEY] = _entitiesArray;
 
-            if (_errorCount > 0) {
-                infoMessage += QString("\nThere were %1 models that could not be migrated.\n").arg(_errorCount);
-                infoMessage += "Check the warnings in your log for details.\n";
-                infoMessage += "You can re-attempt migration on those models\nby restarting this process with the newly saved file.";
+            QJsonDocument newDocument { rootObject };
+            QByteArray jsonDataForFile;
+
+            if (gzip(newDocument.toJson(), jsonDataForFile, -1)) {
+
+                saveFile.write(jsonDataForFile);
+                saveFile.close();
+
+                QString infoMessage = QString("Your new entities file has been saved at\n%1.").arg(saveName);
+
+                if (_errorCount > 0) {
+                    infoMessage += QString("\nThere were %1 models that could not be migrated.\n").arg(_errorCount);
+                    infoMessage += "Check the warnings in your log for details.\n";
+                    infoMessage += "You can re-attempt migration on those models\nby restarting this process with the newly saved file.";
+                }
+
+                OffscreenUi::asyncInformation(_dialogParent, "Success", infoMessage);
+            } else {
+                OffscreenUi::asyncWarning(_dialogParent, "Error", "Could not gzip JSON data for new entities file.");
             }
 
-            OffscreenUi::information(_dialogParent, "Success", infoMessage);
         } else {
-            OffscreenUi::warning(_dialogParent, "Error", "Could not gzip JSON data for new entities file.");
+            OffscreenUi::asyncWarning(_dialogParent, "Error",
+                                 QString("Could not open file at %1 to write new entities file to.").arg(saveName));
         }
-    
-    } else {
-        OffscreenUi::warning(_dialogParent, "Error",
-                             QString("Could not open file at %1 to write new entities file to.").arg(saveName));
-    }
+        // reset after the attempted save, success or fail
+        reset();
+    });
 }
 
 void ATPAssetMigrator::reset() {
diff --git a/interface/src/avatar/AvatarActionHold.cpp b/interface/src/avatar/AvatarActionHold.cpp
index c1d2f903f3..a47bbbad1b 100644
--- a/interface/src/avatar/AvatarActionHold.cpp
+++ b/interface/src/avatar/AvatarActionHold.cpp
@@ -134,9 +134,9 @@ bool AvatarActionHold::getTarget(float deltaTimeStep, glm::quat& rotation, glm::
             // fetch the hand controller pose
             controller::Pose pose;
             if (isRightHand) {
-                pose = myAvatar->getRightHandControllerPoseInWorldFrame();
+                pose = myAvatar->getControllerPoseInWorldFrame(controller::Action::RIGHT_HAND);
             } else {
-                pose = myAvatar->getLeftHandControllerPoseInWorldFrame();
+                pose = myAvatar->getControllerPoseInWorldFrame(controller::Action::LEFT_HAND);
             }
 
             if (pose.isValid()) {
@@ -165,7 +165,7 @@ bool AvatarActionHold::getTarget(float deltaTimeStep, glm::quat& rotation, glm::
 
                 Transform avatarTransform;
                 avatarTransform = myAvatar->getTransform();
-                palmPosition = avatarTransform.transform(camRelPos / myAvatar->getDomainLimitedScale());
+                palmPosition = avatarTransform.transform(camRelPos);
                 palmRotation = avatarTransform.getRotation() * camRelRot;
             } else {
                 glm::vec3 avatarRigidBodyPosition;
diff --git a/interface/src/avatar/AvatarManager.cpp b/interface/src/avatar/AvatarManager.cpp
index 20b3949bc6..4cf8ba6d4e 100644
--- a/interface/src/avatar/AvatarManager.cpp
+++ b/interface/src/avatar/AvatarManager.cpp
@@ -25,6 +25,7 @@
 #endif
 
 
+#include <shared/QtHelpers.h>
 #include <AvatarData.h>
 #include <PerfStat.h>
 #include <RegisteredMetaTypes.h>
@@ -52,7 +53,7 @@ const QUuid MY_AVATAR_KEY;  // NULL key
 
 AvatarManager::AvatarManager(QObject* parent) :
     _avatarsToFade(),
-    _myAvatar(std::make_shared<MyAvatar>(qApp->thread()))
+    _myAvatar(new MyAvatar(qApp->thread()), [](MyAvatar* ptr) { ptr->deleteLater(); })
 {
     // register a meta type for the weak pointer we'll use for the owning avatar mixer for each avatar
     qRegisterMetaType<QWeakPointer<Node> >("NodeWeakPointer");
@@ -62,7 +63,6 @@ AvatarManager::AvatarManager(QObject* parent) :
     packetReceiver.registerListener(PacketType::BulkAvatarData, this, "processAvatarDataPacket");
     packetReceiver.registerListener(PacketType::KillAvatar, this, "processKillAvatar");
     packetReceiver.registerListener(PacketType::AvatarIdentity, this, "processAvatarIdentityPacket");
-    packetReceiver.registerListener(PacketType::ExitingSpaceBubble, this, "processExitingSpaceBubble");
 
     // when we hear that the user has ignored an avatar by session UUID
     // immediately remove that avatar instead of waiting for the absence of packets from avatar mixer
@@ -179,6 +179,12 @@ void AvatarManager::updateOtherAvatars(float deltaTime) {
         const AvatarPriority& sortData = sortedAvatars.top();
         const auto& avatar = std::static_pointer_cast<Avatar>(sortData.avatar);
 
+        bool ignoring = DependencyManager::get<NodeList>()->isPersonalMutingNode(avatar->getID());
+        if (ignoring) {
+            sortedAvatars.pop();
+            continue;
+        }
+
         // for ALL avatars...
         if (_shouldRender) {
             avatar->ensureInScene(avatar, qApp->getMain3DScene());
@@ -252,19 +258,20 @@ void AvatarManager::updateOtherAvatars(float deltaTime) {
         qApp->getMain3DScene()->enqueueTransaction(transaction);
     }
 
-    _avatarSimulationTime = (float)(usecTimestampNow() - startTime) / (float)USECS_PER_MSEC;
     _numAvatarsUpdated = numAvatarsUpdated;
     _numAvatarsNotUpdated = numAVatarsNotUpdated;
 
     simulateAvatarFades(deltaTime);
+
+    _avatarSimulationTime = (float)(usecTimestampNow() - startTime) / (float)USECS_PER_MSEC;
 }
 
-void AvatarManager::postUpdate(float deltaTime) {
+void AvatarManager::postUpdate(float deltaTime, const render::ScenePointer& scene) {
     auto hashCopy = getHashCopy();
     AvatarHash::iterator avatarIterator = hashCopy.begin();
     for (avatarIterator = hashCopy.begin(); avatarIterator != hashCopy.end(); avatarIterator++) {
         auto avatar = std::static_pointer_cast<Avatar>(avatarIterator.value());
-        avatar->postUpdate(deltaTime);
+        avatar->postUpdate(deltaTime, scene);
     }
 }
 
@@ -273,19 +280,15 @@ void AvatarManager::simulateAvatarFades(float deltaTime) {
         return;
     }
 
-    const float SHRINK_RATE = 0.15f;
-    const float MIN_FADE_SCALE = MIN_AVATAR_SCALE;
-
     QReadLocker locker(&_hashLock);
     QVector<AvatarSharedPointer>::iterator avatarItr = _avatarsToFade.begin();
+    const render::ScenePointer& scene = qApp->getMain3DScene();
     while (avatarItr != _avatarsToFade.end()) {
         auto avatar = std::static_pointer_cast<Avatar>(*avatarItr);
-        avatar->setTargetScale(avatar->getUniformScale() * SHRINK_RATE);
-        avatar->animateScaleChanges(deltaTime);
-        if (avatar->getTargetScale() <= MIN_FADE_SCALE) {
+        avatar->updateFadingStatus(scene);
+        if (!avatar->isFading()) {
             // fading to zero is such a rare event we push a unique transaction for each
             if (avatar->isInScene()) {
-                const render::ScenePointer& scene = qApp->getMain3DScene();
                 render::Transaction transaction;
                 avatar->removeFromScene(*avatarItr, scene, transaction);
                 scene->enqueueTransaction(transaction);
@@ -300,7 +303,7 @@ void AvatarManager::simulateAvatarFades(float deltaTime) {
 }
 
 AvatarSharedPointer AvatarManager::newSharedAvatar() {
-    return std::make_shared<OtherAvatar>(qApp->thread());
+    return AvatarSharedPointer(new OtherAvatar(qApp->thread()), [](OtherAvatar* ptr) { ptr->deleteLater(); });
 }
 
 void AvatarManager::handleRemovedAvatar(const AvatarSharedPointer& removedAvatar, KillAvatarReason removalReason) {
@@ -319,13 +322,11 @@ void AvatarManager::handleRemovedAvatar(const AvatarSharedPointer& removedAvatar
 
     if (removalReason == KillAvatarReason::TheirAvatarEnteredYourBubble) {
         emit DependencyManager::get<UsersScriptingInterface>()->enteredIgnoreRadius();
-    }
-    if (removalReason == KillAvatarReason::TheirAvatarEnteredYourBubble || removalReason == YourAvatarEnteredTheirBubble) {
-        DependencyManager::get<NodeList>()->radiusIgnoreNodeBySessionID(avatar->getSessionUUID(), true);
     } else if (removalReason == KillAvatarReason::AvatarDisconnected) {
         // remove from node sets, if present
         DependencyManager::get<NodeList>()->removeFromIgnoreMuteSets(avatar->getSessionUUID());
         DependencyManager::get<UsersScriptingInterface>()->avatarDisconnected(avatar->getSessionUUID());
+        avatar->fadeOut(qApp->getMain3DScene(), removalReason);
     }
     _avatarsToFade.push_back(removedAvatar);
 }
@@ -433,8 +434,7 @@ void AvatarManager::handleCollisionEvents(const CollisionEvents& collisionEvents
                 // but most avatars are roughly the same size, so let's not be so fancy yet.
                 const float AVATAR_STRETCH_FACTOR = 1.0f;
 
-
-                _collisionInjectors.remove_if([](QPointer<AudioInjector>& injector) {
+                _collisionInjectors.remove_if([](const AudioInjectorPointer& injector) {
                     return !injector || injector->isFinished();
                 });
 
@@ -480,19 +480,25 @@ AvatarSharedPointer AvatarManager::getAvatarBySessionID(const QUuid& sessionID)
 RayToAvatarIntersectionResult AvatarManager::findRayIntersection(const PickRay& ray,
                                                                  const QScriptValue& avatarIdsToInclude,
                                                                  const QScriptValue& avatarIdsToDiscard) {
-    RayToAvatarIntersectionResult result;
-    if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(const_cast<AvatarManager*>(this), "findRayIntersection", Qt::BlockingQueuedConnection,
-                                  Q_RETURN_ARG(RayToAvatarIntersectionResult, result),
-                                  Q_ARG(const PickRay&, ray),
-                                  Q_ARG(const QScriptValue&, avatarIdsToInclude),
-                                  Q_ARG(const QScriptValue&, avatarIdsToDiscard));
-        return result;
-    }
-
     QVector<EntityItemID> avatarsToInclude = qVectorEntityItemIDFromScriptValue(avatarIdsToInclude);
     QVector<EntityItemID> avatarsToDiscard = qVectorEntityItemIDFromScriptValue(avatarIdsToDiscard);
 
+    return findRayIntersectionVector(ray, avatarsToInclude, avatarsToDiscard);
+}
+
+RayToAvatarIntersectionResult AvatarManager::findRayIntersectionVector(const PickRay& ray,
+                                                                       const QVector<EntityItemID>& avatarsToInclude,
+                                                                       const QVector<EntityItemID>& avatarsToDiscard) {
+    RayToAvatarIntersectionResult result;
+    if (QThread::currentThread() != thread()) {
+        BLOCKING_INVOKE_METHOD(const_cast<AvatarManager*>(this), "findRayIntersectionVector",
+                                  Q_RETURN_ARG(RayToAvatarIntersectionResult, result),
+                                  Q_ARG(const PickRay&, ray),
+                                  Q_ARG(const QVector<EntityItemID>&, avatarsToInclude),
+                                  Q_ARG(const QVector<EntityItemID>&, avatarsToDiscard));
+        return result;
+    }
+
     glm::vec3 normDirection = glm::normalize(ray.direction);
 
     for (auto avatarData : _avatarHash) {
diff --git a/interface/src/avatar/AvatarManager.h b/interface/src/avatar/AvatarManager.h
index f1e71f7367..39a4f7a4af 100644
--- a/interface/src/avatar/AvatarManager.h
+++ b/interface/src/avatar/AvatarManager.h
@@ -22,11 +22,11 @@
 #include <SimpleMovingAverage.h>
 #include <shared/RateCounter.h>
 #include <avatars-renderer/ScriptAvatar.h>
+#include <AudioInjector.h>
 
 #include "AvatarMotionState.h"
 #include "MyAvatar.h"
 
-class AudioInjector;
 
 class AvatarManager : public AvatarHashMap {
     Q_OBJECT
@@ -55,7 +55,7 @@ public:
     void updateMyAvatar(float deltaTime);
     void updateOtherAvatars(float deltaTime);
 
-    void postUpdate(float deltaTime);
+    void postUpdate(float deltaTime, const render::ScenePointer& scene);
 
     void clearOtherAvatars();
     void deleteAllAvatars();
@@ -73,6 +73,9 @@ public:
     Q_INVOKABLE RayToAvatarIntersectionResult findRayIntersection(const PickRay& ray,
                                                                   const QScriptValue& avatarIdsToInclude = QScriptValue(),
                                                                   const QScriptValue& avatarIdsToDiscard = QScriptValue());
+    Q_INVOKABLE RayToAvatarIntersectionResult findRayIntersectionVector(const PickRay& ray,
+                                                                        const QVector<EntityItemID>& avatarsToInclude,
+                                                                        const QVector<EntityItemID>& avatarsToDiscard);
 
     // TODO: remove this HACK once we settle on optimal default sort coefficients
     Q_INVOKABLE float getAvatarSortCoefficient(const QString& name);
@@ -104,7 +107,7 @@ private:
     std::shared_ptr<MyAvatar> _myAvatar;
     quint64 _lastSendAvatarDataTime = 0; // Controls MyAvatar send data rate.
 
-    std::list<QPointer<AudioInjector>> _collisionInjectors;
+    std::list<AudioInjectorPointer> _collisionInjectors;
 
     RateCounter<> _myAvatarSendRate;
     int _numAvatarsUpdated { 0 };
diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index e5c4f4b972..0dfcf93a65 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -21,6 +21,7 @@
 
 #include <QtCore/QTimer>
 
+#include <shared/QtHelpers.h>
 #include <scripting/HMDScriptingInterface.h>
 #include <AccountManager.h>
 #include <AddressManager.h>
@@ -63,18 +64,13 @@ using namespace std;
 
 const float DEFAULT_REAL_WORLD_FIELD_OF_VIEW_DEGREES = 30.0f;
 
-const float MAX_WALKING_SPEED = 2.6f; // human walking speed
-const float MAX_BOOST_SPEED = 0.5f * MAX_WALKING_SPEED; // action motor gets additive boost below this speed
+const float YAW_SPEED_DEFAULT = 100.0f;   // degrees/sec
+const float PITCH_SPEED_DEFAULT = 75.0f; // degrees/sec
+
+const float MAX_BOOST_SPEED = 0.5f * DEFAULT_AVATAR_MAX_WALKING_SPEED; // action motor gets additive boost below this speed
 const float MIN_AVATAR_SPEED = 0.05f;
 const float MIN_AVATAR_SPEED_SQUARED = MIN_AVATAR_SPEED * MIN_AVATAR_SPEED; // speed is set to zero below this
 
-const float YAW_SPEED_DEFAULT = 120.0f;   // degrees/sec
-const float PITCH_SPEED_DEFAULT = 90.0f; // degrees/sec
-
-// TODO: normalize avatar speed for standard avatar size, then scale all motion logic
-// to properly follow avatar size.
-float MAX_AVATAR_SPEED = 30.0f;
-float MAX_ACTION_MOTOR_SPEED = MAX_AVATAR_SPEED;
 float MIN_SCRIPTED_MOTOR_TIMESCALE = 0.005f;
 float DEFAULT_SCRIPTED_MOTOR_TIMESCALE = 1.0e6f;
 const int SCRIPTED_MOTOR_CAMERA_FRAME = 0;
@@ -86,29 +82,6 @@ const float MyAvatar::ZOOM_MIN = 0.5f;
 const float MyAvatar::ZOOM_MAX = 25.0f;
 const float MyAvatar::ZOOM_DEFAULT = 1.5f;
 
-// default values, used when avatar is missing joints... (avatar space)
-static const glm::quat DEFAULT_AVATAR_MIDDLE_EYE_ROT { Quaternions::Y_180 };
-static const glm::vec3 DEFAULT_AVATAR_MIDDLE_EYE_POS { 0.0f, 0.6f, 0.0f };
-static const glm::vec3 DEFAULT_AVATAR_HEAD_POS { 0.0f, 0.53f, 0.0f };
-static const glm::quat DEFAULT_AVATAR_HEAD_ROT { Quaternions::Y_180 };
-static const glm::vec3 DEFAULT_AVATAR_RIGHTARM_POS { -0.134824f, 0.396348f, -0.0515777f };
-static const glm::quat DEFAULT_AVATAR_RIGHTARM_ROT { -0.536241f, 0.536241f, -0.460918f, -0.460918f };
-static const glm::vec3 DEFAULT_AVATAR_LEFTARM_POS { 0.134795f, 0.396349f, -0.0515881f };
-static const glm::quat DEFAULT_AVATAR_LEFTARM_ROT { 0.536257f, 0.536258f, -0.460899f, 0.4609f };
-static const glm::vec3 DEFAULT_AVATAR_RIGHTHAND_POS { -0.72768f, 0.396349f, -0.0515779f };
-static const glm::quat DEFAULT_AVATAR_RIGHTHAND_ROT { 0.479184f, -0.520013f, 0.522537f, 0.476365f};
-static const glm::vec3 DEFAULT_AVATAR_LEFTHAND_POS { 0.727588f, 0.39635f, -0.0515878f };
-static const glm::quat DEFAULT_AVATAR_LEFTHAND_ROT { -0.479181f, -0.52001f, 0.52254f, -0.476369f };
-static const glm::vec3 DEFAULT_AVATAR_NECK_POS { 0.0f, 0.445f, 0.025f };
-static const glm::vec3 DEFAULT_AVATAR_SPINE2_POS { 0.0f, 0.32f, 0.02f };
-static const glm::quat DEFAULT_AVATAR_SPINE2_ROT { Quaternions::Y_180 };
-static const glm::vec3 DEFAULT_AVATAR_HIPS_POS { 0.0f, 0.0f, 0.0f };
-static const glm::quat DEFAULT_AVATAR_HIPS_ROT { Quaternions::Y_180 };
-static const glm::vec3 DEFAULT_AVATAR_LEFTFOOT_POS { -0.08f, -0.96f, 0.029f};
-static const glm::quat DEFAULT_AVATAR_LEFTFOOT_ROT { -0.40167322754859924f, 0.9154590368270874f, -0.005437685176730156f, -0.023744143545627594f };
-static const glm::vec3 DEFAULT_AVATAR_RIGHTFOOT_POS { 0.08f, -0.96f, 0.029f };
-static const glm::quat DEFAULT_AVATAR_RIGHTFOOT_ROT { -0.4016716778278351f, 0.9154615998268127f, 0.0053307069465518f, 0.023696165531873703f };
-
 MyAvatar::MyAvatar(QThread* thread) :
     Avatar(thread),
     _yawSpeed(YAW_SPEED_DEFAULT),
@@ -162,7 +135,7 @@ MyAvatar::MyAvatar(QThread* thread) :
     connect(&domainHandler, &DomainHandler::settingsReceived, this, &MyAvatar::restrictScaleFromDomainSettings);
 
     // when we leave a domain we lift whatever restrictions that domain may have placed on our scale
-    connect(&domainHandler, &DomainHandler::disconnectedFromDomain, this, &MyAvatar::clearScaleRestriction);
+    connect(&domainHandler, &DomainHandler::disconnectedFromDomain, this, &MyAvatar::leaveDomain);
 
     _bodySensorMatrix = deriveBodyFromHMDSensor();
 
@@ -254,7 +227,14 @@ MyAvatar::~MyAvatar() {
     _lookAtTargetAvatar.reset();
 }
 
-void MyAvatar::registerMetaTypes(QScriptEngine* engine) {
+void MyAvatar::setDominantHand(const QString& hand) {
+    if (hand == DOMINANT_LEFT_HAND || hand == DOMINANT_RIGHT_HAND) {
+        _dominantHand = hand;
+        emit dominantHandChanged(_dominantHand);
+    }
+}
+
+void MyAvatar::registerMetaTypes(ScriptEnginePointer engine) {
     QScriptValue value = engine->newQObject(this, QScriptEngine::QtOwnership, QScriptEngine::ExcludeDeleteLater | QScriptEngine::ExcludeChildObjects);
     engine->globalObject().setProperty("MyAvatar", value);
 
@@ -265,8 +245,8 @@ void MyAvatar::registerMetaTypes(QScriptEngine* engine) {
     }
     engine->globalObject().setProperty("DriveKeys", driveKeys);
 
-    qScriptRegisterMetaType(engine, audioListenModeToScriptValue, audioListenModeFromScriptValue);
-    qScriptRegisterMetaType(engine, driveKeysToScriptValue, driveKeysFromScriptValue);
+    qScriptRegisterMetaType(engine.data(), audioListenModeToScriptValue, audioListenModeFromScriptValue);
+    qScriptRegisterMetaType(engine.data(), driveKeysToScriptValue, driveKeysFromScriptValue);
 }
 
 void MyAvatar::setOrientationVar(const QVariant& newOrientationVar) {
@@ -294,7 +274,7 @@ void MyAvatar::simulateAttachments(float deltaTime) {
     // don't update attachments here, do it in harvestResultsFromPhysicsSimulation()
 }
 
-QByteArray MyAvatar::toByteArrayStateful(AvatarDataDetail dataDetail) {
+QByteArray MyAvatar::toByteArrayStateful(AvatarDataDetail dataDetail, bool dropFaceTracking) {
     CameraMode mode = qApp->getCamera().getMode();
     _globalPosition = getPosition();
     // This might not be right! Isn't the capsule local offset in avatar space, and don't we need to add the radius to the y as well? -HRS 5/26/17
@@ -336,7 +316,7 @@ void MyAvatar::centerBody() {
     // transform this body into world space
     auto worldBodyMatrix = _sensorToWorldMatrix * newBodySensorMatrix;
     auto worldBodyPos = extractTranslation(worldBodyMatrix);
-    auto worldBodyRot = glm::normalize(glm::quat_cast(worldBodyMatrix));
+    auto worldBodyRot = glmExtractRotation(worldBodyMatrix);
 
     if (_characterController.getState() == CharacterController::State::Ground) {
         // the avatar's physical aspect thinks it is standing on something
@@ -389,7 +369,7 @@ void MyAvatar::reset(bool andRecenter, bool andReload, bool andHead) {
         // transform this body into world space
         auto worldBodyMatrix = _sensorToWorldMatrix * newBodySensorMatrix;
         auto worldBodyPos = extractTranslation(worldBodyMatrix);
-        auto worldBodyRot = glm::normalize(glm::quat_cast(worldBodyMatrix));
+        auto worldBodyRot = glmExtractRotation(worldBodyMatrix);
 
         // this will become our new position.
         setPosition(worldBodyPos);
@@ -421,7 +401,7 @@ void MyAvatar::update(float deltaTime) {
     }
 
 #ifdef DEBUG_DRAW_HMD_MOVING_AVERAGE
-    glm::vec3 p = transformPoint(getSensorToWorldMatrix(), getHeadControllerPoseInAvatarFrame() *
+    glm::vec3 p = transformPoint(getSensorToWorldMatrix(), getControllerPoseInAvatarFrame(controller::Pose::HEAD) *
                                  glm::vec3(_headControllerFacingMovingAverage.x, 0.0f, _headControllerFacingMovingAverage.y));
     DebugDraw::getInstance().addMarker("facing-avg", getOrientation(), p, glm::vec4(1.0f));
     p = transformPoint(getSensorToWorldMatrix(), getHMDSensorPosition() +
@@ -565,6 +545,7 @@ void MyAvatar::simulate(float deltaTime) {
         PerformanceTimer perfTimer("joints");
         // copy out the skeleton joints from the model
         if (_rigEnabled) {
+            QWriteLocker writeLock(&_jointDataLock);
             _skeletonModel->getRig().copyJointsIntoJointData(_jointData);
         }
     }
@@ -577,7 +558,7 @@ void MyAvatar::simulate(float deltaTime) {
             headPosition = getPosition();
         }
         head->setPosition(headPosition);
-        head->setScale(getUniformScale());
+        head->setScale(getModelScale());
         head->simulate(deltaTime);
     }
 
@@ -603,17 +584,19 @@ void MyAvatar::simulate(float deltaTime) {
             }
             auto now = usecTimestampNow();
             EntityEditPacketSender* packetSender = qApp->getEntityEditPacketSender();
-            MovingEntitiesOperator moveOperator(entityTree);
+            MovingEntitiesOperator moveOperator;
             forEachDescendant([&](SpatiallyNestablePointer object) {
                 // if the queryBox has changed, tell the entity-server
-                if (object->computePuffedQueryAACube() && object->getNestableType() == NestableType::Entity) {
+                if (object->getNestableType() == NestableType::Entity && object->updateQueryAACube()) {
                     EntityItemPointer entity = std::static_pointer_cast<EntityItem>(object);
                     bool success;
                     AACube newCube = entity->getQueryAACube(success);
                     if (success) {
                         moveOperator.addEntityToMoveList(entity, newCube);
                     }
-                    if (packetSender) {
+                    // send an edit packet to update the entity-server about the queryAABox.  If it's an
+                    // avatar-entity, don't.
+                    if (packetSender && !entity->getClientOnly()) {
                         EntityItemProperties properties = entity->getProperties();
                         properties.setQueryAACubeDirty();
                         properties.setLastEdited(now);
@@ -655,8 +638,8 @@ void MyAvatar::updateFromHMDSensorMatrix(const glm::mat4& hmdSensorMatrix) {
     }
 
     _hmdSensorPosition = newHmdSensorPosition;
-    _hmdSensorOrientation = glm::quat_cast(hmdSensorMatrix);
-    auto headPose = _headControllerPoseInSensorFrameCache.get();
+    _hmdSensorOrientation = glmExtractRotation(hmdSensorMatrix);
+    auto headPose = getControllerPoseInSensorFrame(controller::Action::HEAD);
     if (headPose.isValid()) {
         _headControllerFacing = getFacingDir2D(headPose.rotation);
     } else {
@@ -679,9 +662,11 @@ void MyAvatar::updateJointFromController(controller::Action poseKey, ThreadSafeV
 // update sensor to world matrix from current body position and hmd sensor.
 // This is so the correct camera can be used for rendering.
 void MyAvatar::updateSensorToWorldMatrix() {
+
     // update the sensor mat so that the body position will end up in the desired
     // position when driven from the head.
-    glm::mat4 desiredMat = createMatFromQuatAndPos(getOrientation(), getPosition());
+    float sensorToWorldScale = getEyeHeight() / getUserEyeHeight();
+    glm::mat4 desiredMat = createMatFromScaleQuatAndPos(glm::vec3(sensorToWorldScale), getOrientation(), getPosition());
     _sensorToWorldMatrix = desiredMat * glm::inverse(_bodySensorMatrix);
 
     lateUpdatePalms();
@@ -752,37 +737,37 @@ void MyAvatar::updateFromTrackers(float deltaTime) {
 }
 
 glm::vec3 MyAvatar::getLeftHandPosition() const {
-    auto pose = getLeftHandControllerPoseInAvatarFrame();
+    auto pose = getControllerPoseInAvatarFrame(controller::Action::LEFT_HAND);
     return pose.isValid() ? pose.getTranslation() : glm::vec3(0.0f);
 }
 
 glm::vec3 MyAvatar::getRightHandPosition() const {
-    auto pose = getRightHandControllerPoseInAvatarFrame();
+    auto pose = getControllerPoseInAvatarFrame(controller::Action::RIGHT_HAND);
     return pose.isValid() ? pose.getTranslation() : glm::vec3(0.0f);
 }
 
 glm::vec3 MyAvatar::getLeftHandTipPosition() const {
     const float TIP_LENGTH = 0.3f;
-    auto pose = getLeftHandControllerPoseInAvatarFrame();
+    auto pose = getControllerPoseInAvatarFrame(controller::Action::LEFT_HAND);
     return pose.isValid() ? pose.getTranslation() * pose.getRotation() + glm::vec3(0.0f, TIP_LENGTH, 0.0f) : glm::vec3(0.0f);
 }
 
 glm::vec3 MyAvatar::getRightHandTipPosition() const {
     const float TIP_LENGTH = 0.3f;
-    auto pose = getRightHandControllerPoseInAvatarFrame();
+    auto pose = getControllerPoseInAvatarFrame(controller::Action::RIGHT_HAND);
     return pose.isValid() ? pose.getTranslation() * pose.getRotation() + glm::vec3(0.0f, TIP_LENGTH, 0.0f) : glm::vec3(0.0f);
 }
 
 controller::Pose MyAvatar::getLeftHandPose() const {
-    return getLeftHandControllerPoseInAvatarFrame();
+    return getControllerPoseInAvatarFrame(controller::Action::LEFT_HAND);
 }
 
 controller::Pose MyAvatar::getRightHandPose() const {
-    return getRightHandControllerPoseInAvatarFrame();
+    return getControllerPoseInAvatarFrame(controller::Action::RIGHT_HAND);
 }
 
 controller::Pose MyAvatar::getLeftHandTipPose() const {
-    auto pose = getLeftHandControllerPoseInAvatarFrame();
+    auto pose = getLeftHandPose();
     glm::vec3 tipTrans = getLeftHandTipPosition();
     pose.velocity += glm::cross(pose.getAngularVelocity(), pose.getTranslation() - tipTrans);
     pose.translation = tipTrans;
@@ -790,7 +775,7 @@ controller::Pose MyAvatar::getLeftHandTipPose() const {
 }
 
 controller::Pose MyAvatar::getRightHandTipPose() const {
-    auto pose = getRightHandControllerPoseInAvatarFrame();
+    auto pose = getRightHandPose();
     glm::vec3 tipTrans = getRightHandTipPosition();
     pose.velocity += glm::cross(pose.getAngularVelocity(), pose.getTranslation() - tipTrans);
     pose.translation = tipTrans;
@@ -897,7 +882,7 @@ void MyAvatar::restoreAnimation() {
 QStringList MyAvatar::getAnimationRoles() {
     if (QThread::currentThread() != thread()) {
         QStringList result;
-        QMetaObject::invokeMethod(this, "getAnimationRoles", Qt::BlockingQueuedConnection, Q_RETURN_ARG(QStringList, result));
+        BLOCKING_INVOKE_METHOD(this, "getAnimationRoles", Q_RETURN_ARG(QStringList, result));
         return result;
     }
     return _skeletonModel->getRig().getAnimationRoles();
@@ -925,10 +910,14 @@ void MyAvatar::saveData() {
     Settings settings;
     settings.beginGroup("Avatar");
 
+    settings.setValue("dominantHand", _dominantHand);
     settings.setValue("headPitch", getHead()->getBasePitch());
 
     settings.setValue("scale", _targetScale);
 
+    settings.setValue("yawSpeed", _yawSpeed);
+    settings.setValue("pitchSpeed", _pitchSpeed);
+
     // only save the fullAvatarURL if it has not been overwritten on command line
     // (so the overrideURL is not valid), or it was overridden _and_ we specified
     // --replaceAvatarURL (so _saveAvatarOverrideUrl is true)
@@ -989,6 +978,7 @@ void MyAvatar::saveData() {
     settings.setValue("collisionSoundURL", _collisionSoundURL);
     settings.setValue("useSnapTurn", _useSnapTurn);
     settings.setValue("clearOverlayWhenMoving", _clearOverlayWhenMoving);
+    settings.setValue("userHeight", getUserHeight());
 
     settings.endGroup();
 }
@@ -1051,6 +1041,10 @@ void MyAvatar::setEnableDebugDrawIKConstraints(bool isEnabled) {
     _enableDebugDrawIKConstraints = isEnabled;
 }
 
+void MyAvatar::setEnableDebugDrawDetailedCollision(bool isEnabled) {
+    _enableDebugDrawDetailedCollision = isEnabled;
+}
+
 void MyAvatar::setEnableDebugDrawIKChains(bool isEnabled) {
     _enableDebugDrawIKChains = isEnabled;
 }
@@ -1074,8 +1068,8 @@ void MyAvatar::loadData() {
 
     getHead()->setBasePitch(loadSetting(settings, "headPitch", 0.0f));
 
-    _targetScale = loadSetting(settings, "scale", 1.0f);
-    setScale(glm::vec3(_targetScale));
+    _yawSpeed = loadSetting(settings, "yawSpeed", _yawSpeed);
+    _pitchSpeed = loadSetting(settings, "pitchSpeed", _pitchSpeed);
 
     _prefOverrideAnimGraphUrl.set(QUrl(settings.value("animGraphURL", "").toString()));
     _fullAvatarURLFromPreferences = settings.value("fullAvatarURL", AvatarData::defaultFullAvatarModelUrl()).toUrl();
@@ -1124,7 +1118,8 @@ void MyAvatar::loadData() {
     setCollisionSoundURL(settings.value("collisionSoundURL", DEFAULT_AVATAR_COLLISION_SOUND_URL).toString());
     setSnapTurn(settings.value("useSnapTurn", _useSnapTurn).toBool());
     setClearOverlayWhenMoving(settings.value("clearOverlayWhenMoving", _clearOverlayWhenMoving).toBool());
-
+    setDominantHand(settings.value("dominantHand", _dominantHand).toString().toLower());
+    setUserHeight(settings.value("userHeight", DEFAULT_AVATAR_HEIGHT).toDouble());
     settings.endGroup();
 
     setEnableMeshVisible(Menu::getInstance()->isOptionChecked(MenuOption::MeshVisible));
@@ -1199,6 +1194,15 @@ int MyAvatar::parseDataFromBuffer(const QByteArray& buffer) {
     return buffer.size();
 }
 
+ScriptAvatarData* MyAvatar::getTargetAvatar() const {
+    auto avatar = std::static_pointer_cast<Avatar>(_lookAtTargetAvatar.lock());
+    if (avatar) {
+        return new ScriptAvatar(avatar);
+    } else {
+        return nullptr;
+    }
+}
+
 void MyAvatar::updateLookAtTargetAvatar() {
     //
     //  Look at the avatar whose eyes are closest to the ray in direction of my avatar's head
@@ -1221,15 +1225,14 @@ void MyAvatar::updateLookAtTargetAvatar() {
         float distanceTo = glm::length(avatar->getHead()->getEyePosition() - cameraPosition);
         avatar->setIsLookAtTarget(false);
         if (!avatar->isMyAvatar() && avatar->isInitialized() &&
-            (distanceTo < GREATEST_LOOKING_AT_DISTANCE * getUniformScale())) {
+            (distanceTo < GREATEST_LOOKING_AT_DISTANCE * getModelScale())) {
             float radius = glm::length(avatar->getHead()->getEyePosition() - avatar->getHead()->getRightEyePosition());
             float angleTo = coneSphereAngle(getHead()->getEyePosition(), lookForward, avatar->getHead()->getEyePosition(), radius);
             if (angleTo < (smallestAngleTo * (isCurrentTarget ? KEEP_LOOKING_AT_CURRENT_ANGLE_FACTOR : 1.0f))) {
                 _lookAtTargetAvatar = avatarPointer;
                 _targetAvatarPosition = avatarPointer->getPosition();
-                smallestAngleTo = angleTo;
             }
-            if (isLookingAtMe(avatar)) {
+            if (_lookAtSnappingEnabled && avatar->getLookAtSnappingEnabled() && isLookingAtMe(avatar)) {
 
                 // Alter their gaze to look directly at my camera; this looks more natural than looking at my avatar's face.
                 glm::vec3 lookAtPosition = avatar->getHead()->getLookAtPosition(); // A position, in world space, on my avatar.
@@ -1246,14 +1249,19 @@ void MyAvatar::updateLookAtTargetAvatar() {
                  ViewFrustum viewFrustum;
                  qApp->copyViewFrustum(viewFrustum);
 
+                 glm::vec3 viewPosition = viewFrustum.getPosition();
+#if DEBUG_ALWAYS_LOOKAT_EYES_NOT_CAMERA
+                 viewPosition = (avatarLeftEye + avatarRightEye) / 2.0f;
+#endif
                 // scale gazeOffset by IPD, if wearing an HMD.
                 if (qApp->isHMDMode()) {
+                    glm::quat viewOrientation = viewFrustum.getOrientation();
                     glm::mat4 leftEye = qApp->getEyeOffset(Eye::Left);
                     glm::mat4 rightEye = qApp->getEyeOffset(Eye::Right);
                     glm::vec3 leftEyeHeadLocal = glm::vec3(leftEye[3]);
                     glm::vec3 rightEyeHeadLocal = glm::vec3(rightEye[3]);
-                    glm::vec3 humanLeftEye = viewFrustum.getPosition() + (viewFrustum.getOrientation() * leftEyeHeadLocal);
-                    glm::vec3 humanRightEye = viewFrustum.getPosition() + (viewFrustum.getOrientation() * rightEyeHeadLocal);
+                    glm::vec3 humanLeftEye = viewPosition + (viewOrientation * leftEyeHeadLocal);
+                    glm::vec3 humanRightEye = viewPosition + (viewOrientation * rightEyeHeadLocal);
 
                     auto hmdInterface = DependencyManager::get<HMDScriptingInterface>();
                     float ipdScale = hmdInterface->getIPDScale();
@@ -1267,7 +1275,7 @@ void MyAvatar::updateLookAtTargetAvatar() {
                 }
 
                 // And now we can finally add that offset to the camera.
-                glm::vec3 corrected = viewFrustum.getPosition() + gazeOffset;
+                glm::vec3 corrected = viewPosition + gazeOffset;
 
                 avatar->getHead()->setCorrectedLookAtPosition(corrected);
 
@@ -1293,13 +1301,13 @@ eyeContactTarget MyAvatar::getEyeContactTarget() {
 }
 
 glm::vec3 MyAvatar::getDefaultEyePosition() const {
-    return getPosition() + getWorldAlignedOrientation() * Quaternions::Y_180 * _skeletonModel->getDefaultEyeModelPosition();
+    return getPosition() + getOrientation() * Quaternions::Y_180 * _skeletonModel->getDefaultEyeModelPosition();
 }
 
 const float SCRIPT_PRIORITY = 1.0f + 1.0f;
 const float RECORDER_PRIORITY = 1.0f + 1.0f;
 
-void MyAvatar::setJointRotations(QVector<glm::quat> jointRotations) {
+void MyAvatar::setJointRotations(const QVector<glm::quat>& jointRotations) {
     int numStates = glm::min(_skeletonModel->getJointStateCount(), jointRotations.size());
     for (int i = 0; i < numStates; ++i) {
         // HACK: ATM only Recorder calls setJointRotations() so we hardcode its priority here
@@ -1343,6 +1351,50 @@ void MyAvatar::clearJointData(int index) {
     _skeletonModel->getRig().clearJointAnimationPriority(index);
 }
 
+void MyAvatar::setJointData(const QString& name, const glm::quat& rotation, const glm::vec3& translation) {
+    if (QThread::currentThread() != thread()) {
+        QMetaObject::invokeMethod(this, "setJointData", Q_ARG(QString, name), Q_ARG(const glm::quat&, rotation),
+            Q_ARG(const glm::vec3&, translation));
+        return;
+    }
+    writeLockWithNamedJointIndex(name, [&](int index) {
+        // HACK: ATM only JS scripts call setJointData() on MyAvatar so we hardcode the priority
+        _skeletonModel->getRig().setJointState(index, true, rotation, translation, SCRIPT_PRIORITY);
+    });
+}
+
+void MyAvatar::setJointRotation(const QString& name, const glm::quat& rotation) {
+    if (QThread::currentThread() != thread()) {
+        QMetaObject::invokeMethod(this, "setJointRotation", Q_ARG(QString, name), Q_ARG(const glm::quat&, rotation));
+        return;
+    }
+    writeLockWithNamedJointIndex(name, [&](int index) {
+        // HACK: ATM only JS scripts call setJointData() on MyAvatar so we hardcode the priority
+        _skeletonModel->getRig().setJointRotation(index, true, rotation, SCRIPT_PRIORITY);
+    });
+}
+
+void MyAvatar::setJointTranslation(const QString& name, const glm::vec3& translation) {
+    if (QThread::currentThread() != thread()) {
+        QMetaObject::invokeMethod(this, "setJointTranslation", Q_ARG(QString, name), Q_ARG(const glm::vec3&, translation));
+        return;
+    }
+    writeLockWithNamedJointIndex(name, [&](int index) {
+        // HACK: ATM only JS scripts call setJointData() on MyAvatar so we hardcode the priority
+        _skeletonModel->getRig().setJointTranslation(index, true, translation, SCRIPT_PRIORITY);
+    });
+}
+
+void MyAvatar::clearJointData(const QString& name) {
+    if (QThread::currentThread() != thread()) {
+        QMetaObject::invokeMethod(this, "clearJointData", Q_ARG(QString, name));
+        return;
+    }
+    writeLockWithNamedJointIndex(name, [&](int index) {
+        _skeletonModel->getRig().clearJointAnimationPriority(index);
+    });
+}
+
 void MyAvatar::clearJointsData() {
     if (QThread::currentThread() != thread()) {
         QMetaObject::invokeMethod(this, "clearJointsData");
@@ -1355,6 +1407,7 @@ void MyAvatar::setSkeletonModelURL(const QUrl& skeletonModelURL) {
     Avatar::setSkeletonModelURL(skeletonModelURL);
     _skeletonModel->setVisibleInScene(true, qApp->getMain3DScene());
     _headBoneSet.clear();
+    emit skeletonChanged();
 }
 
 
@@ -1368,7 +1421,7 @@ void MyAvatar::resetFullAvatarURL() {
 void MyAvatar::useFullAvatarURL(const QUrl& fullAvatarURL, const QString& modelName) {
 
     if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "useFullAvatarURL", Qt::BlockingQueuedConnection,
+        BLOCKING_INVOKE_METHOD(this, "useFullAvatarURL",
                                   Q_ARG(const QUrl&, fullAvatarURL),
                                   Q_ARG(const QString&, modelName));
         return;
@@ -1394,11 +1447,12 @@ void MyAvatar::useFullAvatarURL(const QUrl& fullAvatarURL, const QString& modelN
 
 void MyAvatar::setAttachmentData(const QVector<AttachmentData>& attachmentData) {
     if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "setAttachmentData", Qt::BlockingQueuedConnection,
+        BLOCKING_INVOKE_METHOD(this, "setAttachmentData",
                                   Q_ARG(const QVector<AttachmentData>, attachmentData));
         return;
     }
     Avatar::setAttachmentData(attachmentData);
+    emit attachmentsChanged();
 }
 
 glm::vec3 MyAvatar::getSkeletonPosition() const {
@@ -1414,7 +1468,7 @@ glm::vec3 MyAvatar::getSkeletonPosition() const {
 
 void MyAvatar::rebuildCollisionShape() {
     // compute localAABox
-    float scale = getUniformScale();
+    float scale = getModelScale();
     float radius = scale * _skeletonModel->getBoundingCapsuleRadius();
     float height = scale * _skeletonModel->getBoundingCapsuleHeight() + 2.0f * radius;
     glm::vec3 corner(-radius, -0.5f * height, -radius);
@@ -1423,146 +1477,43 @@ void MyAvatar::rebuildCollisionShape() {
     _characterController.setLocalBoundingBox(corner, diagonal);
 }
 
-
-void MyAvatar::setHandControllerPosesInSensorFrame(const controller::Pose& left, const controller::Pose& right) {
-    _leftHandControllerPoseInSensorFrameCache.set(left);
-    _rightHandControllerPoseInSensorFrameCache.set(right);
+void MyAvatar::setControllerPoseInSensorFrame(controller::Action action, const controller::Pose& pose) {
+    std::lock_guard<std::mutex> guard(_controllerPoseMapMutex);
+    auto iter = _controllerPoseMap.find(action);
+    if (iter != _controllerPoseMap.end()) {
+        iter->second = pose;
+    } else {
+        _controllerPoseMap.insert({ action, pose });
+    }
 }
 
-controller::Pose MyAvatar::getLeftHandControllerPoseInSensorFrame() const {
-    return _leftHandControllerPoseInSensorFrameCache.get();
+controller::Pose MyAvatar::getControllerPoseInSensorFrame(controller::Action action) const {
+    std::lock_guard<std::mutex> guard(_controllerPoseMapMutex);
+    auto iter = _controllerPoseMap.find(action);
+    if (iter != _controllerPoseMap.end()) {
+        return iter->second;
+    } else {
+        return controller::Pose(); // invalid pose
+    }
 }
 
-controller::Pose MyAvatar::getRightHandControllerPoseInSensorFrame() const {
-    return _rightHandControllerPoseInSensorFrameCache.get();
+controller::Pose MyAvatar::getControllerPoseInWorldFrame(controller::Action action) const {
+    auto pose = getControllerPoseInSensorFrame(action);
+    if (pose.valid) {
+        return pose.transform(getSensorToWorldMatrix());
+    } else {
+        return controller::Pose(); // invalid pose
+    }
 }
 
-controller::Pose MyAvatar::getLeftHandControllerPoseInWorldFrame() const {
-    return _leftHandControllerPoseInSensorFrameCache.get().transform(getSensorToWorldMatrix());
-}
-
-controller::Pose MyAvatar::getRightHandControllerPoseInWorldFrame() const {
-    return _rightHandControllerPoseInSensorFrameCache.get().transform(getSensorToWorldMatrix());
-}
-
-controller::Pose MyAvatar::getLeftHandControllerPoseInAvatarFrame() const {
-    glm::mat4 invAvatarMatrix = glm::inverse(createMatFromQuatAndPos(getOrientation(), getPosition()));
-    return getLeftHandControllerPoseInWorldFrame().transform(invAvatarMatrix);
-}
-
-controller::Pose MyAvatar::getRightHandControllerPoseInAvatarFrame() const {
-    glm::mat4 invAvatarMatrix = glm::inverse(createMatFromQuatAndPos(getOrientation(), getPosition()));
-    return getRightHandControllerPoseInWorldFrame().transform(invAvatarMatrix);
-}
-
-void MyAvatar::setFootControllerPosesInSensorFrame(const controller::Pose& left, const controller::Pose& right) {
-    _leftFootControllerPoseInSensorFrameCache.set(left);
-    _rightFootControllerPoseInSensorFrameCache.set(right);
-}
-
-controller::Pose MyAvatar::getLeftFootControllerPoseInSensorFrame() const {
-    return _leftFootControllerPoseInSensorFrameCache.get();
-}
-
-controller::Pose MyAvatar::getRightFootControllerPoseInSensorFrame() const {
-    return _rightFootControllerPoseInSensorFrameCache.get();
-}
-
-controller::Pose MyAvatar::getLeftFootControllerPoseInWorldFrame() const {
-    return _leftFootControllerPoseInSensorFrameCache.get().transform(getSensorToWorldMatrix());
-}
-
-controller::Pose MyAvatar::getRightFootControllerPoseInWorldFrame() const {
-    return _rightFootControllerPoseInSensorFrameCache.get().transform(getSensorToWorldMatrix());
-}
-
-controller::Pose MyAvatar::getLeftFootControllerPoseInAvatarFrame() const {
-    glm::mat4 invAvatarMatrix = glm::inverse(createMatFromQuatAndPos(getOrientation(), getPosition()));
-    return getLeftFootControllerPoseInWorldFrame().transform(invAvatarMatrix);
-}
-
-controller::Pose MyAvatar::getRightFootControllerPoseInAvatarFrame() const {
-    glm::mat4 invAvatarMatrix = glm::inverse(createMatFromQuatAndPos(getOrientation(), getPosition()));
-    return getRightFootControllerPoseInWorldFrame().transform(invAvatarMatrix);
-}
-
-void MyAvatar::setSpineControllerPosesInSensorFrame(const controller::Pose& hips, const controller::Pose& spine2) {
-    _hipsControllerPoseInSensorFrameCache.set(hips);
-    _spine2ControllerPoseInSensorFrameCache.set(spine2);
-}
-
-controller::Pose MyAvatar::getHipsControllerPoseInSensorFrame() const {
-    return _hipsControllerPoseInSensorFrameCache.get();
-}
-
-controller::Pose MyAvatar::getSpine2ControllerPoseInSensorFrame() const {
-    return _spine2ControllerPoseInSensorFrameCache.get();
-}
-
-controller::Pose MyAvatar::getHipsControllerPoseInWorldFrame() const {
-    return _hipsControllerPoseInSensorFrameCache.get().transform(getSensorToWorldMatrix());
-}
-
-controller::Pose MyAvatar::getSpine2ControllerPoseInWorldFrame() const {
-    return _spine2ControllerPoseInSensorFrameCache.get().transform(getSensorToWorldMatrix());
-}
-
-controller::Pose MyAvatar::getHipsControllerPoseInAvatarFrame() const {
-    glm::mat4 invAvatarMatrix = glm::inverse(createMatFromQuatAndPos(getOrientation(), getPosition()));
-    return getHipsControllerPoseInWorldFrame().transform(invAvatarMatrix);
-}
-
-controller::Pose MyAvatar::getSpine2ControllerPoseInAvatarFrame() const {
-    glm::mat4 invAvatarMatrix = glm::inverse(createMatFromQuatAndPos(getOrientation(), getPosition()));
-    return getSpine2ControllerPoseInWorldFrame().transform(invAvatarMatrix);
-}
-
-void MyAvatar::setHeadControllerPoseInSensorFrame(const controller::Pose& head) {
-    _headControllerPoseInSensorFrameCache.set(head);
-}
-
-controller::Pose MyAvatar::getHeadControllerPoseInSensorFrame() const {
-    return _headControllerPoseInSensorFrameCache.get();
-}
-
-controller::Pose MyAvatar::getHeadControllerPoseInWorldFrame() const {
-    return _headControllerPoseInSensorFrameCache.get().transform(getSensorToWorldMatrix());
-}
-
-controller::Pose MyAvatar::getHeadControllerPoseInAvatarFrame() const {
-    glm::mat4 invAvatarMatrix = glm::inverse(createMatFromQuatAndPos(getOrientation(), getPosition()));
-    return getHeadControllerPoseInWorldFrame().transform(invAvatarMatrix);
-}
-
-void MyAvatar::setArmControllerPosesInSensorFrame(const controller::Pose& left, const controller::Pose& right) {
-    _leftArmControllerPoseInSensorFrameCache.set(left);
-    _rightArmControllerPoseInSensorFrameCache.set(right);
-}
-
-controller::Pose MyAvatar::getLeftArmControllerPoseInSensorFrame() const {
-    return _leftArmControllerPoseInSensorFrameCache.get();
-}
-
-controller::Pose MyAvatar::getRightArmControllerPoseInSensorFrame() const {
-    return _rightArmControllerPoseInSensorFrameCache.get();
-}
-
-controller::Pose MyAvatar::getLeftArmControllerPoseInWorldFrame() const {
-    return getLeftArmControllerPoseInSensorFrame().transform(getSensorToWorldMatrix());
-}
-
-controller::Pose MyAvatar::getRightArmControllerPoseInWorldFrame() const {
-    return getRightArmControllerPoseInSensorFrame().transform(getSensorToWorldMatrix());
-}
-
-controller::Pose MyAvatar::getLeftArmControllerPoseInAvatarFrame() const {
-    glm::mat4 worldToAvatarMat = glm::inverse(createMatFromQuatAndPos(getOrientation(), getPosition()));
-    return getLeftArmControllerPoseInWorldFrame().transform(worldToAvatarMat);
-}
-
-controller::Pose MyAvatar::getRightArmControllerPoseInAvatarFrame() const {
-    glm::mat4 worldToAvatarMat = glm::inverse(createMatFromQuatAndPos(getOrientation(), getPosition()));
-    return getRightArmControllerPoseInWorldFrame().transform(worldToAvatarMat);
+controller::Pose MyAvatar::getControllerPoseInAvatarFrame(controller::Action action) const {
+    auto pose = getControllerPoseInWorldFrame(action);
+    if (pose.valid) {
+        glm::mat4 invAvatarMatrix = glm::inverse(createMatFromQuatAndPos(getOrientation(), getPosition()));
+        return pose.transform(invAvatarMatrix);
+    } else {
+        return controller::Pose(); // invalid pose
+    }
 }
 
 void MyAvatar::updateMotors() {
@@ -1574,9 +1525,14 @@ void MyAvatar::updateMotors() {
             motorRotation = getMyHead()->getHeadOrientation();
         } else {
             // non-hovering = walking: follow camera twist about vertical but not lift
-            // so we decompose camera's rotation and store the twist part in motorRotation
+            // we decompose camera's rotation and store the twist part in motorRotation
+            // however, we need to perform the decomposition in the avatar-frame
+            // using the local UP axis and then transform back into world-frame
+            glm::quat orientation = getOrientation();
+            glm::quat headOrientation = glm::inverse(orientation) * getMyHead()->getHeadOrientation(); // avatar-frame
             glm::quat liftRotation;
-            swingTwistDecomposition(getMyHead()->getHeadOrientation(), _worldUpDirection, liftRotation, motorRotation);
+            swingTwistDecomposition(headOrientation, Vectors::UNIT_Y, liftRotation, motorRotation);
+            motorRotation = orientation * motorRotation;
         }
         const float DEFAULT_MOTOR_TIMESCALE = 0.2f;
         const float INVALID_MOTOR_TIMESCALE = 1.0e6f;
@@ -1618,9 +1574,11 @@ void MyAvatar::prepareForPhysicsSimulation() {
     }
     _characterController.handleChangedCollisionGroup();
     _characterController.setParentVelocity(parentVelocity);
+    _characterController.setScaleFactor(getSensorToWorldScale());
 
     _characterController.setPositionAndOrientation(getPosition(), getOrientation());
-    if (qApp->isHMDMode()) {
+    auto headPose = getControllerPoseInAvatarFrame(controller::Action::HEAD);
+    if (headPose.isValid()) {
         _follow.prePhysicsUpdate(*this, deriveBodyFromHMDSensor(), _bodySensorMatrix, hasDriveInput());
     } else {
         _follow.deactivate();
@@ -1629,11 +1587,31 @@ void MyAvatar::prepareForPhysicsSimulation() {
     _prePhysicsRoomPose = AnimPose(_sensorToWorldMatrix);
 }
 
+// There are a number of possible strategies for this set of tools through endRender, below.
+void MyAvatar::nextAttitude(glm::vec3 position, glm::quat orientation) {
+    bool success;
+    Transform trans = getTransform(success);
+    if (!success) {
+        qCWarning(interfaceapp) << "Warning -- MyAvatar::nextAttitude failed";
+        return;
+    }
+    trans.setTranslation(position);
+    trans.setRotation(orientation);
+    SpatiallyNestable::setTransform(trans, success);
+    if (!success) {
+        qCWarning(interfaceapp) << "Warning -- MyAvatar::nextAttitude failed";
+    }
+    updateAttitude(orientation);
+}
+
 void MyAvatar::harvestResultsFromPhysicsSimulation(float deltaTime) {
-    glm::vec3 position = getPosition();
-    glm::quat orientation = getOrientation();
+    glm::vec3 position;
+    glm::quat orientation;
     if (_characterController.isEnabledAndReady()) {
         _characterController.getPositionAndOrientation(position, orientation);
+    } else {
+        position = getPosition();
+        orientation = getOrientation();
     }
     nextAttitude(position, orientation);
     _bodySensorMatrix = _follow.postPhysicsUpdate(*this, _bodySensorMatrix);
@@ -1816,11 +1794,11 @@ void MyAvatar::destroyAnimGraph() {
     _skeletonModel->getRig().destroyAnimGraph();
 }
 
-void MyAvatar::postUpdate(float deltaTime) {
+void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) {
 
-    Avatar::postUpdate(deltaTime);
+    Avatar::postUpdate(deltaTime, scene);
 
-    if (DependencyManager::get<SceneScriptingInterface>()->shouldRenderAvatars() && _skeletonModel->initWhenReady(qApp->getMain3DScene())) {
+    if (_skeletonModel->isLoaded() && !_skeletonModel->getRig().getAnimNode()) {
         initHeadBones();
         _skeletonModel->setCauterizeBoneSet(_headBoneSet);
         _fstAnimGraphOverrideUrl = _skeletonModel->getGeometry()->getAnimGraphOverrideUrl();
@@ -1853,8 +1831,8 @@ void MyAvatar::postUpdate(float deltaTime) {
     }
 
     if (_enableDebugDrawHandControllers) {
-        auto leftHandPose = getLeftHandControllerPoseInWorldFrame();
-        auto rightHandPose = getRightHandControllerPoseInWorldFrame();
+        auto leftHandPose = getControllerPoseInWorldFrame(controller::Action::LEFT_HAND);
+        auto rightHandPose = getControllerPoseInWorldFrame(controller::Action::RIGHT_HAND);
 
         if (leftHandPose.isValid()) {
             DebugDraw::getInstance().addMarker("leftHandController", leftHandPose.getRotation(), leftHandPose.getTranslation(), glm::vec4(1));
@@ -1875,6 +1853,37 @@ void MyAvatar::postUpdate(float deltaTime) {
     AnimPose postUpdateRoomPose(_sensorToWorldMatrix);
 
     updateHoldActions(_prePhysicsRoomPose, postUpdateRoomPose);
+
+    if (_enableDebugDrawDetailedCollision) {
+        AnimPose rigToWorldPose(glm::vec3(1.0f), getRotation() * Quaternions::Y_180, getPosition());
+        const int NUM_DEBUG_COLORS = 8;
+        const glm::vec4 DEBUG_COLORS[NUM_DEBUG_COLORS] = {
+            glm::vec4(1.0f, 1.0f, 1.0f, 1.0f),
+            glm::vec4(1.0f, 0.0f, 0.0f, 1.0f),
+            glm::vec4(0.0f, 1.0f, 0.0f, 1.0f),
+            glm::vec4(0.25f, 0.25f, 1.0f, 1.0f),
+            glm::vec4(1.0f, 1.0f, 0.0f, 1.0f),
+            glm::vec4(0.25f, 1.0f, 1.0f, 1.0f),
+            glm::vec4(1.0f, 0.25f, 1.0f, 1.0f),
+            glm::vec4(1.0f, 0.65f, 0.0f, 1.0f)  // Orange you glad I added this color?
+        };
+
+        if (_skeletonModel && _skeletonModel->isLoaded()) {
+            const Rig& rig = _skeletonModel->getRig();
+            const FBXGeometry& geometry = _skeletonModel->getFBXGeometry();
+            for (int i = 0; i < rig.getJointStateCount(); i++) {
+                AnimPose jointPose;
+                rig.getAbsoluteJointPoseInRigFrame(i, jointPose);
+                const FBXJointShapeInfo& shapeInfo = geometry.joints[i].shapeInfo;
+                const AnimPose pose = rigToWorldPose * jointPose;
+                for (size_t j = 0; j < shapeInfo.debugLines.size() / 2; j++) {
+                    glm::vec3 pointA = pose.xformPoint(shapeInfo.debugLines[2 * j]);
+                    glm::vec3 pointB = pose.xformPoint(shapeInfo.debugLines[2 * j + 1]);
+                    DebugDraw::getInstance().drawRay(pointA, pointB, DEBUG_COLORS[i % NUM_DEBUG_COLORS]);
+                }
+            }
+        }
+    }
 }
 
 void MyAvatar::preDisplaySide(RenderArgs* renderArgs) {
@@ -1883,6 +1892,17 @@ void MyAvatar::preDisplaySide(RenderArgs* renderArgs) {
     const bool shouldDrawHead = shouldRenderHead(renderArgs);
     if (shouldDrawHead != _prevShouldDrawHead) {
         _skeletonModel->setEnableCauterization(!shouldDrawHead);
+
+        for (int i = 0; i < _attachmentData.size(); i++) {
+            if (_attachmentData[i].jointName.compare("Head", Qt::CaseInsensitive) == 0 ||
+                _attachmentData[i].jointName.compare("Neck", Qt::CaseInsensitive) == 0 ||
+                _attachmentData[i].jointName.compare("LeftEye", Qt::CaseInsensitive) == 0 ||
+                _attachmentData[i].jointName.compare("RightEye", Qt::CaseInsensitive) == 0 ||
+                _attachmentData[i].jointName.compare("HeadTop_End", Qt::CaseInsensitive) == 0 ||
+                _attachmentData[i].jointName.compare("Face", Qt::CaseInsensitive) == 0) {
+                _attachmentModels[i]->setVisibleInScene(shouldDrawHead, qApp->getMain3DScene());
+            }
+        }
     }
     _prevShouldDrawHead = shouldDrawHead;
 }
@@ -1890,7 +1910,7 @@ void MyAvatar::preDisplaySide(RenderArgs* renderArgs) {
 const float RENDER_HEAD_CUTOFF_DISTANCE = 0.3f;
 
 bool MyAvatar::cameraInsideHead(const glm::vec3& cameraPosition) const {
-    return glm::length(cameraPosition - getHeadPosition()) < (RENDER_HEAD_CUTOFF_DISTANCE * getUniformScale());
+    return glm::length(cameraPosition - getHeadPosition()) < (RENDER_HEAD_CUTOFF_DISTANCE * getModelScale());
 }
 
 bool MyAvatar::shouldRenderHead(const RenderArgs* renderArgs) const {
@@ -1938,38 +1958,8 @@ void MyAvatar::updateOrientation(float deltaTime) {
         snapTurn = true;
     }
 
-    // use head/HMD orientation to turn while flying
-    if (getCharacterController()->getState() == CharacterController::State::Hover) {
-
-        // This is the direction the user desires to fly in.
-        glm::vec3 desiredFacing = getMyHead()->getHeadOrientation() * Vectors::UNIT_Z;
-        desiredFacing.y = 0.0f;
-
-        // This is our reference frame, it is captured when the user begins to move.
-        glm::vec3 referenceFacing = transformVectorFast(_sensorToWorldMatrix, _hoverReferenceCameraFacing);
-        referenceFacing.y = 0.0f;
-        referenceFacing = glm::normalize(referenceFacing);
-        glm::vec3 referenceRight(referenceFacing.z, 0.0f, -referenceFacing.x);
-        const float HOVER_FLY_ROTATION_PERIOD = 0.5f;
-        float tau = glm::clamp(deltaTime / HOVER_FLY_ROTATION_PERIOD, 0.0f, 1.0f);
-
-        // new facing is a linear interpolation between the desired and reference vectors.
-        glm::vec3 newFacing = glm::normalize((1.0f - tau) * referenceFacing + tau * desiredFacing);
-
-        // calcualte the signed delta yaw angle to apply so that we match our newFacing.
-        float sign = copysignf(1.0f, glm::dot(desiredFacing, referenceRight));
-        float deltaAngle = sign * acosf(glm::clamp(glm::dot(referenceFacing, newFacing), -1.0f, 1.0f));
-
-        // speedFactor is 0 when we are at rest adn 1.0 when we are at max flying speed.
-        const float MAX_FLYING_SPEED = 30.0f;
-        float speedFactor = glm::min(glm::length(getVelocity()) / MAX_FLYING_SPEED, 1.0f);
-
-        // apply our delta, but scale it by the speed factor, so we turn faster when we are flying faster.
-        totalBodyYaw += (speedFactor * deltaAngle * (180.0f / PI));
-    }
-
-    // Use head/HMD roll to turn while walking or flying.
-    if (qApp->isHMDMode() && _hmdRollControlEnabled) {
+    // Use head/HMD roll to turn while flying, but not when standing still.
+    if (qApp->isHMDMode() && getCharacterController()->getState() == CharacterController::State::Hover && _hmdRollControlEnabled && hasDriveInput()) {
         // Turn with head roll.
         const float MIN_CONTROL_SPEED = 0.01f;
         float speed = glm::length(getVelocity());
@@ -2007,7 +1997,7 @@ void MyAvatar::updateOrientation(float deltaTime) {
 
     getHead()->setBasePitch(getHead()->getBasePitch() + getDriveKey(PITCH) * _pitchSpeed * deltaTime);
 
-    auto headPose = getHeadControllerPoseInAvatarFrame();
+    auto headPose = getControllerPoseInAvatarFrame(controller::Action::HEAD);
     if (headPose.isValid()) {
         glm::quat localOrientation = headPose.rotation * Quaternions::Y_180;
         // these angles will be in radians
@@ -2063,17 +2053,17 @@ void MyAvatar::updateActionMotor(float deltaTime) {
     if (state == CharacterController::State::Hover) {
         // we're flying --> complex acceleration curve that builds on top of current motor speed and caps at some max speed
         float motorSpeed = glm::length(_actionMotorVelocity);
-        float finalMaxMotorSpeed = getUniformScale() * MAX_ACTION_MOTOR_SPEED;
+        float finalMaxMotorSpeed = getSensorToWorldScale() * DEFAULT_AVATAR_MAX_FLYING_SPEED;
         float speedGrowthTimescale  = 2.0f;
         float speedIncreaseFactor = 1.8f;
         motorSpeed *= 1.0f + glm::clamp(deltaTime / speedGrowthTimescale, 0.0f, 1.0f) * speedIncreaseFactor;
-        const float maxBoostSpeed = getUniformScale() * MAX_BOOST_SPEED;
+        const float maxBoostSpeed = getSensorToWorldScale() * MAX_BOOST_SPEED;
 
         if (_isPushing) {
             if (motorSpeed < maxBoostSpeed) {
                 // an active action motor should never be slower than this
                 float boostCoefficient = (maxBoostSpeed - motorSpeed) / maxBoostSpeed;
-                motorSpeed += MIN_AVATAR_SPEED * boostCoefficient;
+                motorSpeed += getSensorToWorldScale() * MIN_AVATAR_SPEED * boostCoefficient;
             } else if (motorSpeed > finalMaxMotorSpeed) {
                 motorSpeed = finalMaxMotorSpeed;
             }
@@ -2081,7 +2071,7 @@ void MyAvatar::updateActionMotor(float deltaTime) {
         _actionMotorVelocity = motorSpeed * direction;
     } else {
         // we're interacting with a floor --> simple horizontal speed and exponential decay
-        _actionMotorVelocity = MAX_WALKING_SPEED * direction;
+        _actionMotorVelocity = getSensorToWorldScale() * DEFAULT_AVATAR_MAX_WALKING_SPEED * direction;
     }
 
     float boomChange = getDriveKey(ZOOM);
@@ -2095,22 +2085,24 @@ void MyAvatar::updatePosition(float deltaTime) {
     }
 
     vec3 velocity = getVelocity();
+    float sensorToWorldScale = getSensorToWorldScale();
+    float sensorToWorldScale2 = sensorToWorldScale * sensorToWorldScale;
     const float MOVING_SPEED_THRESHOLD_SQUARED = 0.0001f; // 0.01 m/s
     if (!_characterController.isEnabledAndReady()) {
         // _characterController is not in physics simulation but it can still compute its target velocity
         updateMotors();
         _characterController.computeNewVelocity(deltaTime, velocity);
 
-        float speed2 = glm::length2(velocity);
-        if (speed2 > MIN_AVATAR_SPEED_SQUARED) {
+        float speed2 = glm::length(velocity);
+        if (speed2 > sensorToWorldScale2 * MIN_AVATAR_SPEED_SQUARED) {
             // update position ourselves
             applyPositionDelta(deltaTime * velocity);
         }
         measureMotionDerivatives(deltaTime);
-        _moving = speed2 > MOVING_SPEED_THRESHOLD_SQUARED;
+        _moving = speed2 > sensorToWorldScale2 * MOVING_SPEED_THRESHOLD_SQUARED;
     } else {
         float speed2 = glm::length2(velocity);
-        _moving = speed2 > MOVING_SPEED_THRESHOLD_SQUARED;
+        _moving = speed2 > sensorToWorldScale2 * MOVING_SPEED_THRESHOLD_SQUARED;
 
         if (_moving) {
             // scan for walkability
@@ -2121,18 +2113,6 @@ void MyAvatar::updatePosition(float deltaTime) {
             _characterController.setStepUpEnabled(result.walkable);
         }
     }
-
-    // capture the head rotation, in sensor space, when the user first indicates they would like to move/fly.
-    if (!_hoverReferenceCameraFacingIsCaptured &&
-        (fabs(getDriveKey(TRANSLATE_Z)) > 0.1f || fabs(getDriveKey(TRANSLATE_X)) > 0.1f)) {
-        _hoverReferenceCameraFacingIsCaptured = true;
-        // transform the camera facing vector into sensor space.
-        _hoverReferenceCameraFacing = transformVectorFast(glm::inverse(_sensorToWorldMatrix),
-                                                          getMyHead()->getHeadOrientation() * Vectors::UNIT_Z);
-    } else if (_hoverReferenceCameraFacingIsCaptured &&
-               (fabs(getDriveKey(TRANSLATE_Z)) <= 0.1f && fabs(getDriveKey(TRANSLATE_X)) <= 0.1f)) {
-        _hoverReferenceCameraFacingIsCaptured = false;
-    }
 }
 
 void MyAvatar::updateCollisionSound(const glm::vec3 &penetration, float deltaTime, float frequency) {
@@ -2209,6 +2189,23 @@ void MyAvatar::clampScaleChangeToDomainLimits(float desiredScale) {
 
     setTargetScale(clampedTargetScale);
     qCDebug(interfaceapp, "Changed scale to %f", (double)_targetScale);
+    emit(scaleChanged());
+}
+
+float MyAvatar::getDomainMinScale() {
+    return _domainMinimumScale;
+}
+
+float MyAvatar::getDomainMaxScale() {
+    return _domainMaximumScale;
+}
+
+void MyAvatar::setGravity(float gravity) {
+    _characterController.setGravity(gravity);
+}
+
+float MyAvatar::getGravity() {
+    return _characterController.getGravity();
 }
 
 void MyAvatar::increaseSize() {
@@ -2258,17 +2255,40 @@ void MyAvatar::restrictScaleFromDomainSettings(const QJsonObject& domainSettings
     if (_domainMinimumScale > _domainMaximumScale) {
         std::swap(_domainMinimumScale, _domainMaximumScale);
     }
+    // Set avatar current scale
+    Settings settings;
+    settings.beginGroup("Avatar");
+    _targetScale = loadSetting(settings, "scale", 1.0f);
 
-    qCDebug(interfaceapp, "This domain requires a minimum avatar scale of %f and a maximum avatar scale of %f",
-            (double)_domainMinimumScale, (double)_domainMaximumScale);
+    qCDebug(interfaceapp) << "This domain requires a minimum avatar scale of " << _domainMinimumScale
+        << " and a maximum avatar scale of " << _domainMaximumScale
+        << ". Current avatar scale is " << _targetScale;
 
     // debug to log if this avatar's scale in this domain will be clamped
-    auto clampedScale = glm::clamp(_targetScale, _domainMinimumScale, _domainMaximumScale);
+    float clampedScale = glm::clamp(_targetScale, _domainMinimumScale, _domainMaximumScale);
 
     if (_targetScale != clampedScale) {
-        qCDebug(interfaceapp, "Avatar scale will be clamped to %f because %f is not allowed by current domain",
-                (double)clampedScale, (double)_targetScale);
+        qCDebug(interfaceapp) << "Current avatar scale is clamped to " << clampedScale
+            << " because " << _targetScale << " is not allowed by current domain";
+        // The current scale of avatar should not be more than domain's max_avatar_scale and not less than domain's min_avatar_scale .
+        _targetScale = clampedScale;
     }
+
+    setModelScale(_targetScale);
+    rebuildCollisionShape();
+    settings.endGroup();
+}
+
+void MyAvatar::leaveDomain() {
+    clearScaleRestriction();
+    saveAvatarScale();
+}
+
+void MyAvatar::saveAvatarScale() {
+    Settings settings;
+    settings.beginGroup("Avatar");
+    settings.setValue("scale", _targetScale);
+    settings.endGroup();
 }
 
 void MyAvatar::clearScaleRestriction() {
@@ -2358,7 +2378,7 @@ bool MyAvatar::safeLanding(const glm::vec3& position) {
 
     if (QThread::currentThread() != thread()) {
         bool result;
-        QMetaObject::invokeMethod(this, "safeLanding", Qt::BlockingQueuedConnection, Q_RETURN_ARG(bool, result), Q_ARG(const glm::vec3&, position));
+        BLOCKING_INVOKE_METHOD(this, "safeLanding", Q_RETURN_ARG(bool, result), Q_ARG(const glm::vec3&, position));
         return result;
     }
     glm::vec3 better;
@@ -2498,6 +2518,7 @@ void MyAvatar::updateMotionBehaviorFromMenu() {
         _motionBehaviors &= ~AVATAR_MOTION_SCRIPTED_MOTOR_ENABLED;
     }
     setCollisionsEnabled(menu->isOptionChecked(MenuOption::EnableAvatarCollisions));
+    setProperty("lookAtSnappingEnabled", menu->isOptionChecked(MenuOption::EnableLookAtSnapping));
 }
 
 void MyAvatar::setFlyingEnabled(bool enabled) {
@@ -2524,6 +2545,21 @@ bool MyAvatar::getFlyingEnabled() {
     return _enableFlying;
 }
 
+// Public interface for targetscale
+float MyAvatar::getAvatarScale() {
+    return getTargetScale();
+}
+
+void MyAvatar::setAvatarScale(float val) {
+
+    if (QThread::currentThread() != thread()) {
+        QMetaObject::invokeMethod(this, "setAvatarScale", Q_ARG(float, val));
+        return;
+    }
+
+    setTargetScale(val);
+}
+
 void MyAvatar::setCollisionsEnabled(bool enabled) {
 
     if (QThread::currentThread() != thread()) {
@@ -2610,10 +2646,10 @@ bool MyAvatar::isDriveKeyDisabled(DriveKeys key) const {
 glm::mat4 MyAvatar::deriveBodyFromHMDSensor() const {
     glm::vec3 headPosition;
     glm::quat headOrientation;
-    auto headPose = getHeadControllerPoseInSensorFrame();
+    auto headPose = getControllerPoseInSensorFrame(controller::Action::HEAD);
     if (headPose.isValid()) {
-        headPosition = getHeadControllerPoseInSensorFrame().translation;
-        headOrientation = getHeadControllerPoseInSensorFrame().rotation * Quaternions::Y_180;
+        headPosition = headPose.translation;
+        headOrientation = headPose.rotation * Quaternions::Y_180;
     }
     const glm::quat headOrientationYawOnly = cancelOutRollAndPitch(headOrientation);
 
@@ -2637,11 +2673,30 @@ glm::mat4 MyAvatar::deriveBodyFromHMDSensor() const {
     // Y_180 is necessary because rig is z forward and hmdOrientation is -z forward
     glm::vec3 headToNeck = headOrientation * Quaternions::Y_180 * (localNeck - localHead);
     glm::vec3 neckToRoot = headOrientationYawOnly  * Quaternions::Y_180 * -localNeck;
-    glm::vec3 bodyPos = headPosition + headToNeck + neckToRoot;
+
+    float invSensorToWorldScale = getUserEyeHeight() / getEyeHeight();
+    glm::vec3 bodyPos = headPosition + invSensorToWorldScale * (headToNeck + neckToRoot);
 
     return createMatFromQuatAndPos(headOrientationYawOnly, bodyPos);
 }
 
+float MyAvatar::getUserHeight() const {
+    return _userHeight.get();
+}
+
+void MyAvatar::setUserHeight(float value) {
+    _userHeight.set(value);
+
+    float sensorToWorldScale = getEyeHeight() / getUserEyeHeight();
+    emit sensorToWorldScaleChanged(sensorToWorldScale);
+}
+
+float MyAvatar::getUserEyeHeight() const {
+    float ratio = DEFAULT_AVATAR_EYE_TO_TOP_OF_HEAD / DEFAULT_AVATAR_HEIGHT;
+    float userHeight = _userHeight.get();
+    return userHeight - userHeight * ratio;
+}
+
 glm::vec3 MyAvatar::getPositionForAudio() {
     switch (_audioListenerMode) {
         case AudioListenerMode::FROM_HEAD:
@@ -2760,7 +2815,6 @@ bool MyAvatar::FollowHelper::shouldActivateRotation(const MyAvatar& myAvatar, co
 }
 
 bool MyAvatar::FollowHelper::shouldActivateHorizontal(const MyAvatar& myAvatar, const glm::mat4& desiredBodyMatrix, const glm::mat4& currentBodyMatrix) const {
-
     // -z axis of currentBodyMatrix in world space.
     glm::vec3 forward = glm::normalize(glm::vec3(-currentBodyMatrix[0][2], -currentBodyMatrix[1][2], -currentBodyMatrix[2][2]));
     // x axis of currentBodyMatrix in world space.
@@ -2784,7 +2838,6 @@ bool MyAvatar::FollowHelper::shouldActivateHorizontal(const MyAvatar& myAvatar,
 }
 
 bool MyAvatar::FollowHelper::shouldActivateVertical(const MyAvatar& myAvatar, const glm::mat4& desiredBodyMatrix, const glm::mat4& currentBodyMatrix) const {
-
     const float CYLINDER_TOP = 0.1f;
     const float CYLINDER_BOTTOM = -1.5f;
 
@@ -2795,7 +2848,8 @@ bool MyAvatar::FollowHelper::shouldActivateVertical(const MyAvatar& myAvatar, co
 void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, const glm::mat4& desiredBodyMatrix,
                                               const glm::mat4& currentBodyMatrix, bool hasDriveInput) {
 
-    if (myAvatar.getHMDLeanRecenterEnabled()) {
+    if (myAvatar.getHMDLeanRecenterEnabled() &&
+        qApp->getCamera().getMode() != CAMERA_MODE_MIRROR) {
         if (!isActive(Rotation) && (shouldActivateRotation(myAvatar, desiredBodyMatrix, currentBodyMatrix) || hasDriveInput)) {
             activate(Rotation);
         }
@@ -2811,6 +2865,10 @@ void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, const glm::mat
     glm::mat4 currentWorldMatrix = myAvatar.getSensorToWorldMatrix() * currentBodyMatrix;
 
     AnimPose followWorldPose(currentWorldMatrix);
+
+    // remove scale present from sensorToWorldMatrix
+    followWorldPose.scale() = glm::vec3(1.0f);
+
     if (isActive(Rotation)) {
         followWorldPose.rot() = glmExtractRotation(desiredWorldMatrix);
     }
@@ -2835,16 +2893,16 @@ glm::mat4 MyAvatar::FollowHelper::postPhysicsUpdate(const MyAvatar& myAvatar, co
         // apply follow displacement to the body matrix.
         glm::vec3 worldLinearDisplacement = myAvatar.getCharacterController()->getFollowLinearDisplacement();
         glm::quat worldAngularDisplacement = myAvatar.getCharacterController()->getFollowAngularDisplacement();
-        glm::quat sensorToWorld = glmExtractRotation(myAvatar.getSensorToWorldMatrix());
-        glm::quat worldToSensor = glm::inverse(sensorToWorld);
 
-        glm::vec3 sensorLinearDisplacement = worldToSensor * worldLinearDisplacement;
-        glm::quat sensorAngularDisplacement = worldToSensor * worldAngularDisplacement * sensorToWorld;
+        glm::mat4 sensorToWorldMatrix = myAvatar.getSensorToWorldMatrix();
+        glm::mat4 worldToSensorMatrix = glm::inverse(sensorToWorldMatrix);
+
+        glm::vec3 sensorLinearDisplacement = transformVectorFast(worldToSensorMatrix, worldLinearDisplacement);
+        glm::quat sensorAngularDisplacement = glmExtractRotation(worldToSensorMatrix) * worldAngularDisplacement * glmExtractRotation(sensorToWorldMatrix);
 
         glm::mat4 newBodyMat = createMatFromQuatAndPos(sensorAngularDisplacement * glmExtractRotation(currentBodyMatrix),
                                                        sensorLinearDisplacement + extractTranslation(currentBodyMatrix));
         return newBodyMat;
-
     } else {
         return currentBodyMatrix;
     }
@@ -2902,15 +2960,20 @@ glm::mat4 MyAvatar::computeCameraRelativeHandControllerMatrix(const glm::mat4& c
         cameraWorldMatrix *= createMatFromScaleQuatAndPos(vec3(-1.0f, 1.0f, 1.0f), glm::quat(), glm::vec3());
     }
 
-    // compute a NEW sensorToWorldMatrix for the camera.
-    // The equation is cameraWorldMatrix = cameraSensorToWorldMatrix * _hmdSensorMatrix.
-    // here we solve for the unknown cameraSensorToWorldMatrix.
-    glm::mat4 cameraSensorToWorldMatrix = cameraWorldMatrix * glm::inverse(getHMDSensorMatrix());
+    // move the camera into sensor space.
+    glm::mat4 cameraSensorMatrix = glm::inverse(getSensorToWorldMatrix()) * cameraWorldMatrix;
 
-    // Using the new cameraSensorToWorldMatrix, compute where the controller is in world space.
-    glm::mat4 controllerWorldMatrix = cameraSensorToWorldMatrix * controllerSensorMatrix;
+    // cancel out scale
+    glm::vec3 scale = extractScale(cameraSensorMatrix);
+    cameraSensorMatrix = glm::scale(cameraSensorMatrix, 1.0f / scale);
 
-    // move it into avatar space
+    // measure the offset from the hmd and the camera, in sensor space
+    glm::mat4 delta = cameraSensorMatrix * glm::inverse(getHMDSensorMatrix());
+
+    // apply the delta offset to the controller, in sensor space, then transform it into world space.
+    glm::mat4 controllerWorldMatrix = getSensorToWorldMatrix() * delta * controllerSensorMatrix;
+
+    // transform controller into avatar space
     glm::mat4 avatarMatrix = createMatFromQuatAndPos(getOrientation(), getPosition());
     return glm::inverse(avatarMatrix) * controllerWorldMatrix;
 }
@@ -2922,19 +2985,19 @@ glm::quat MyAvatar::getAbsoluteJointRotationInObjectFrame(int index) const {
 
     switch (index) {
         case CONTROLLER_LEFTHAND_INDEX: {
-            return getLeftHandControllerPoseInAvatarFrame().getRotation();
+            return getControllerPoseInAvatarFrame(controller::Action::LEFT_HAND).getRotation();
         }
         case CONTROLLER_RIGHTHAND_INDEX: {
-            return getRightHandControllerPoseInAvatarFrame().getRotation();
+            return getControllerPoseInAvatarFrame(controller::Action::RIGHT_HAND).getRotation();
         }
         case CAMERA_RELATIVE_CONTROLLER_LEFTHAND_INDEX: {
-            auto pose = _leftHandControllerPoseInSensorFrameCache.get();
+            auto pose = getControllerPoseInSensorFrame(controller::Action::LEFT_HAND);
             glm::mat4 controllerSensorMatrix = createMatFromQuatAndPos(pose.rotation, pose.translation);
             glm::mat4 result = computeCameraRelativeHandControllerMatrix(controllerSensorMatrix);
             return glmExtractRotation(result);
         }
         case CAMERA_RELATIVE_CONTROLLER_RIGHTHAND_INDEX: {
-            auto pose = _rightHandControllerPoseInSensorFrameCache.get();
+            auto pose = getControllerPoseInSensorFrame(controller::Action::RIGHT_HAND);
             glm::mat4 controllerSensorMatrix = createMatFromQuatAndPos(pose.rotation, pose.translation);
             glm::mat4 result = computeCameraRelativeHandControllerMatrix(controllerSensorMatrix);
             return glmExtractRotation(result);
@@ -2959,19 +3022,19 @@ glm::vec3 MyAvatar::getAbsoluteJointTranslationInObjectFrame(int index) const {
 
     switch (index) {
         case CONTROLLER_LEFTHAND_INDEX: {
-            return getLeftHandControllerPoseInAvatarFrame().getTranslation();
+            return getControllerPoseInAvatarFrame(controller::Action::LEFT_HAND).getTranslation();
         }
         case CONTROLLER_RIGHTHAND_INDEX: {
-            return getRightHandControllerPoseInAvatarFrame().getTranslation();
+            return getControllerPoseInAvatarFrame(controller::Action::RIGHT_HAND).getTranslation();
         }
         case CAMERA_RELATIVE_CONTROLLER_LEFTHAND_INDEX: {
-            auto pose = _leftHandControllerPoseInSensorFrameCache.get();
+            auto pose = getControllerPoseInSensorFrame(controller::Action::LEFT_HAND);
             glm::mat4 controllerSensorMatrix = createMatFromQuatAndPos(pose.rotation, pose.translation);
             glm::mat4 result = computeCameraRelativeHandControllerMatrix(controllerSensorMatrix);
             return extractTranslation(result);
         }
         case CAMERA_RELATIVE_CONTROLLER_RIGHTHAND_INDEX: {
-            auto pose = _rightHandControllerPoseInSensorFrameCache.get();
+            auto pose = getControllerPoseInSensorFrame(controller::Action::RIGHT_HAND);
             glm::mat4 controllerSensorMatrix = createMatFromQuatAndPos(pose.rotation, pose.translation);
             glm::mat4 result = computeCameraRelativeHandControllerMatrix(controllerSensorMatrix);
             return extractTranslation(result);
@@ -2996,9 +3059,9 @@ glm::mat4 MyAvatar::getCenterEyeCalibrationMat() const {
     if (rightEyeIndex >= 0 && leftEyeIndex >= 0) {
         auto centerEyePos = (getAbsoluteDefaultJointTranslationInObjectFrame(rightEyeIndex) + getAbsoluteDefaultJointTranslationInObjectFrame(leftEyeIndex)) * 0.5f;
         auto centerEyeRot = Quaternions::Y_180;
-        return createMatFromQuatAndPos(centerEyeRot, centerEyePos);
+        return createMatFromQuatAndPos(centerEyeRot, centerEyePos / getSensorToWorldScale());
     } else {
-        return createMatFromQuatAndPos(DEFAULT_AVATAR_MIDDLE_EYE_ROT, DEFAULT_AVATAR_MIDDLE_EYE_POS);
+        return createMatFromQuatAndPos(DEFAULT_AVATAR_MIDDLE_EYE_ROT, DEFAULT_AVATAR_MIDDLE_EYE_POS / getSensorToWorldScale());
     }
 }
 
@@ -3008,9 +3071,9 @@ glm::mat4 MyAvatar::getHeadCalibrationMat() const {
     if (headIndex >= 0) {
         auto headPos = getAbsoluteDefaultJointTranslationInObjectFrame(headIndex);
         auto headRot = getAbsoluteDefaultJointRotationInObjectFrame(headIndex);
-        return createMatFromQuatAndPos(headRot, headPos);
+        return createMatFromQuatAndPos(headRot, headPos / getSensorToWorldScale());
     } else {
-        return createMatFromQuatAndPos(DEFAULT_AVATAR_HEAD_ROT, DEFAULT_AVATAR_HEAD_POS);
+        return createMatFromQuatAndPos(DEFAULT_AVATAR_HEAD_ROT, DEFAULT_AVATAR_HEAD_POS / getSensorToWorldScale());
     }
 }
 
@@ -3020,9 +3083,9 @@ glm::mat4 MyAvatar::getSpine2CalibrationMat() const {
     if (spine2Index >= 0) {
         auto spine2Pos = getAbsoluteDefaultJointTranslationInObjectFrame(spine2Index);
         auto spine2Rot = getAbsoluteDefaultJointRotationInObjectFrame(spine2Index);
-        return createMatFromQuatAndPos(spine2Rot, spine2Pos);
+        return createMatFromQuatAndPos(spine2Rot, spine2Pos / getSensorToWorldScale());
     } else {
-        return createMatFromQuatAndPos(DEFAULT_AVATAR_SPINE2_ROT, DEFAULT_AVATAR_SPINE2_POS);
+        return createMatFromQuatAndPos(DEFAULT_AVATAR_SPINE2_ROT, DEFAULT_AVATAR_SPINE2_POS / getSensorToWorldScale());
     }
 }
 
@@ -3032,9 +3095,9 @@ glm::mat4 MyAvatar::getHipsCalibrationMat() const {
     if (hipsIndex >= 0) {
         auto hipsPos = getAbsoluteDefaultJointTranslationInObjectFrame(hipsIndex);
         auto hipsRot = getAbsoluteDefaultJointRotationInObjectFrame(hipsIndex);
-        return createMatFromQuatAndPos(hipsRot, hipsPos);
+        return createMatFromQuatAndPos(hipsRot, hipsPos / getSensorToWorldScale());
     } else {
-        return createMatFromQuatAndPos(DEFAULT_AVATAR_HIPS_ROT, DEFAULT_AVATAR_HIPS_POS);
+        return createMatFromQuatAndPos(DEFAULT_AVATAR_HIPS_ROT, DEFAULT_AVATAR_HIPS_POS / getSensorToWorldScale());
     }
 }
 
@@ -3044,9 +3107,9 @@ glm::mat4 MyAvatar::getLeftFootCalibrationMat() const {
     if (leftFootIndex >= 0) {
         auto leftFootPos = getAbsoluteDefaultJointTranslationInObjectFrame(leftFootIndex);
         auto leftFootRot = getAbsoluteDefaultJointRotationInObjectFrame(leftFootIndex);
-        return createMatFromQuatAndPos(leftFootRot, leftFootPos);
+        return createMatFromQuatAndPos(leftFootRot, leftFootPos / getSensorToWorldScale());
     } else {
-        return createMatFromQuatAndPos(DEFAULT_AVATAR_LEFTFOOT_ROT, DEFAULT_AVATAR_LEFTFOOT_POS);
+        return createMatFromQuatAndPos(DEFAULT_AVATAR_LEFTFOOT_ROT, DEFAULT_AVATAR_LEFTFOOT_POS / getSensorToWorldScale());
     }
 }
 
@@ -3056,9 +3119,9 @@ glm::mat4 MyAvatar::getRightFootCalibrationMat() const {
     if (rightFootIndex >= 0) {
         auto rightFootPos = getAbsoluteDefaultJointTranslationInObjectFrame(rightFootIndex);
         auto rightFootRot = getAbsoluteDefaultJointRotationInObjectFrame(rightFootIndex);
-        return createMatFromQuatAndPos(rightFootRot, rightFootPos);
+        return createMatFromQuatAndPos(rightFootRot, rightFootPos / getSensorToWorldScale());
     } else {
-        return createMatFromQuatAndPos(DEFAULT_AVATAR_RIGHTFOOT_ROT, DEFAULT_AVATAR_RIGHTFOOT_POS);
+        return createMatFromQuatAndPos(DEFAULT_AVATAR_RIGHTFOOT_ROT, DEFAULT_AVATAR_RIGHTFOOT_POS / getSensorToWorldScale());
     }
 }
 
@@ -3068,9 +3131,9 @@ glm::mat4 MyAvatar::getRightArmCalibrationMat() const {
     if (rightArmIndex >= 0) {
         auto rightArmPos = getAbsoluteDefaultJointTranslationInObjectFrame(rightArmIndex);
         auto rightArmRot = getAbsoluteDefaultJointRotationInObjectFrame(rightArmIndex);
-        return createMatFromQuatAndPos(rightArmRot, rightArmPos);
+        return createMatFromQuatAndPos(rightArmRot, rightArmPos / getSensorToWorldScale());
     } else {
-        return createMatFromQuatAndPos(DEFAULT_AVATAR_RIGHTARM_ROT, DEFAULT_AVATAR_RIGHTARM_POS);
+        return createMatFromQuatAndPos(DEFAULT_AVATAR_RIGHTARM_ROT, DEFAULT_AVATAR_RIGHTARM_POS / getSensorToWorldScale());
     }
 }
 
@@ -3079,9 +3142,9 @@ glm::mat4 MyAvatar::getLeftArmCalibrationMat() const {
     if (leftArmIndex >= 0) {
         auto leftArmPos = getAbsoluteDefaultJointTranslationInObjectFrame(leftArmIndex);
         auto leftArmRot = getAbsoluteDefaultJointRotationInObjectFrame(leftArmIndex);
-        return createMatFromQuatAndPos(leftArmRot, leftArmPos);
+        return createMatFromQuatAndPos(leftArmRot, leftArmPos / getSensorToWorldScale());
     } else {
-        return createMatFromQuatAndPos(DEFAULT_AVATAR_LEFTARM_ROT, DEFAULT_AVATAR_LEFTARM_POS);
+        return createMatFromQuatAndPos(DEFAULT_AVATAR_LEFTARM_ROT, DEFAULT_AVATAR_LEFTARM_POS / getSensorToWorldScale());
     }
 }
 
@@ -3090,9 +3153,9 @@ glm::mat4 MyAvatar::getRightHandCalibrationMat() const {
     if (rightHandIndex >= 0) {
         auto rightHandPos = getAbsoluteDefaultJointTranslationInObjectFrame(rightHandIndex);
         auto rightHandRot = getAbsoluteDefaultJointRotationInObjectFrame(rightHandIndex);
-        return createMatFromQuatAndPos(rightHandRot, rightHandPos);
+        return createMatFromQuatAndPos(rightHandRot, rightHandPos / getSensorToWorldScale());
     } else {
-        return createMatFromQuatAndPos(DEFAULT_AVATAR_RIGHTHAND_ROT, DEFAULT_AVATAR_RIGHTHAND_POS);
+        return createMatFromQuatAndPos(DEFAULT_AVATAR_RIGHTHAND_ROT, DEFAULT_AVATAR_RIGHTHAND_POS / getSensorToWorldScale());
     }
 }
 
@@ -3101,9 +3164,9 @@ glm::mat4 MyAvatar::getLeftHandCalibrationMat() const {
     if (leftHandIndex >= 0) {
         auto leftHandPos = getAbsoluteDefaultJointTranslationInObjectFrame(leftHandIndex);
         auto leftHandRot = getAbsoluteDefaultJointRotationInObjectFrame(leftHandIndex);
-        return createMatFromQuatAndPos(leftHandRot, leftHandPos);
+        return createMatFromQuatAndPos(leftHandRot, leftHandPos / getSensorToWorldScale());
     } else {
-        return createMatFromQuatAndPos(DEFAULT_AVATAR_LEFTHAND_ROT, DEFAULT_AVATAR_LEFTHAND_POS);
+        return createMatFromQuatAndPos(DEFAULT_AVATAR_LEFTHAND_ROT, DEFAULT_AVATAR_LEFTHAND_POS / getSensorToWorldScale());
     }
 }
 
@@ -3182,3 +3245,18 @@ void MyAvatar::updateHoldActions(const AnimPose& prePhysicsPose, const AnimPose&
 const MyHead* MyAvatar::getMyHead() const {
     return static_cast<const MyHead*>(getHead());
 }
+
+void MyAvatar::setModelScale(float scale) {
+    bool changed = (scale != getModelScale());
+    Avatar::setModelScale(scale);
+    if (changed) {
+        float sensorToWorldScale = getEyeHeight() / getUserEyeHeight();
+        emit sensorToWorldScaleChanged(sensorToWorldScale);
+    }
+}
+
+SpatialParentTree* MyAvatar::getParentTree() const {
+    auto entityTreeRenderer = qApp->getEntities();
+    EntityTreePointer entityTree = entityTreeRenderer ? entityTreeRenderer->getTree() : nullptr;
+    return entityTree.get();
+}
diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index e2ea745ed0..e4e8f8d02c 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -16,13 +16,18 @@
 
 #include <glm/glm.hpp>
 
+#include <QUuid>
+
 #include <SettingHandle.h>
 #include <Rig.h>
 #include <Sound.h>
+#include <ScriptEngine.h>
 
 #include <controllers/Pose.h>
 #include <controllers/Actions.h>
+#include <AvatarConstants.h>
 #include <avatars-renderer/Avatar.h>
+#include <avatars-renderer/ScriptAvatar.h>
 
 #include "AtRestDetector.h"
 #include "MyCharacterController.h"
@@ -43,6 +48,7 @@ enum AudioListenerMode {
     FROM_CAMERA,
     CUSTOM
 };
+
 Q_DECLARE_METATYPE(AudioListenerMode);
 
 class MyAvatar : public Avatar {
@@ -100,6 +106,10 @@ class MyAvatar : public Avatar {
      * @property collisionsEnabled {bool} This can be used to disable collisions between the avatar and the world.
      * @property useAdvancedMovementControls {bool} Stores the user preference only, does not change user mappings, this is done in the defaultScript
      *   "scripts/system/controllers/toggleAdvancedMovementForHandControllers.js".
+     * @property userHeight {number} The height of the user in sensor space. (meters).
+     * @property userEyeHeight {number} Estimated height of the users eyes in sensor space. (meters)
+     * @property SELF_ID {string} READ-ONLY. UUID representing "my avatar". Only use for local-only entities and overlays in situations where MyAvatar.sessionUUID is not available (e.g., if not connected to a domain).
+     *   Note: Likely to be deprecated.
      */
 
     // FIXME: `glm::vec3 position` is not accessible from QML, so this exposes position in a QML-native type
@@ -137,10 +147,21 @@ class MyAvatar : public Avatar {
     Q_PROPERTY(bool characterControllerEnabled READ getCharacterControllerEnabled WRITE setCharacterControllerEnabled)
     Q_PROPERTY(bool useAdvancedMovementControls READ useAdvancedMovementControls WRITE setUseAdvancedMovementControls)
 
+    Q_PROPERTY(float yawSpeed MEMBER _yawSpeed)
+    Q_PROPERTY(float pitchSpeed MEMBER _pitchSpeed)
+
     Q_PROPERTY(bool hmdRollControlEnabled READ getHMDRollControlEnabled WRITE setHMDRollControlEnabled)
     Q_PROPERTY(float hmdRollControlDeadZone READ getHMDRollControlDeadZone WRITE setHMDRollControlDeadZone)
     Q_PROPERTY(float hmdRollControlRate READ getHMDRollControlRate WRITE setHMDRollControlRate)
 
+    Q_PROPERTY(float userHeight READ getUserHeight WRITE setUserHeight)
+    Q_PROPERTY(float userEyeHeight READ getUserEyeHeight)
+
+    Q_PROPERTY(QUuid SELF_ID READ getSelfID CONSTANT)
+ 
+    const QString DOMINANT_LEFT_HAND = "left";
+    const QString DOMINANT_RIGHT_HAND = "right";
+
 public:
     enum DriveKeys {
         TRANSLATE_X = 0,
@@ -161,7 +182,7 @@ public:
     ~MyAvatar();
 
     void instantiableAvatar() override {};
-    void registerMetaTypes(QScriptEngine* engine);
+    void registerMetaTypes(ScriptEnginePointer engine);
 
     virtual void simulateAttachments(float deltaTime) override;
 
@@ -188,7 +209,7 @@ public:
     Q_INVOKABLE void clearIKJointLimitHistory(); // thread-safe
 
     void update(float deltaTime);
-    virtual void postUpdate(float deltaTime) override;
+    virtual void postUpdate(float deltaTime, const render::ScenePointer& scene) override;
     void preDisplaySide(RenderArgs* renderArgs);
 
     const glm::mat4& getHMDSensorMatrix() const { return _hmdSensorMatrix; }
@@ -339,6 +360,9 @@ public:
     Q_INVOKABLE bool getClearOverlayWhenMoving() const { return _clearOverlayWhenMoving; }
     Q_INVOKABLE void setClearOverlayWhenMoving(bool on) { _clearOverlayWhenMoving = on; }
 
+    Q_INVOKABLE void setDominantHand(const QString& hand);
+    Q_INVOKABLE QString getDominantHand() const { return _dominantHand; }
+
     Q_INVOKABLE void setHMDLeanRecenterEnabled(bool value) { _hmdLeanRecenterEnabled = value; }
     Q_INVOKABLE bool getHMDLeanRecenterEnabled() const { return _hmdLeanRecenterEnabled; }
 
@@ -366,7 +390,7 @@ public:
     float getDriveKey(DriveKeys key) const;
     Q_INVOKABLE float getRawDriveKey(DriveKeys key) const;
     void relayDriveKeysToCharacterController();
-
+    
     Q_INVOKABLE void disableDriveKey(DriveKeys key);
     Q_INVOKABLE void enableDriveKey(DriveKeys key);
     Q_INVOKABLE bool isDriveKeyDisabled(DriveKeys key) const;
@@ -383,6 +407,7 @@ public:
     Q_INVOKABLE glm::vec3 getEyePosition() const { return getHead()->getEyePosition(); }
 
     Q_INVOKABLE glm::vec3 getTargetAvatarPosition() const { return _targetAvatarPosition; }
+    Q_INVOKABLE ScriptAvatarData* getTargetAvatar() const;
 
     Q_INVOKABLE glm::vec3 getLeftHandPosition() const;
     Q_INVOKABLE glm::vec3 getRightHandPosition() const;
@@ -407,13 +432,20 @@ public:
     void updateLookAtTargetAvatar();
     void clearLookAtTargetAvatar();
 
-    virtual void setJointRotations(QVector<glm::quat> jointRotations) override;
+    virtual void setJointRotations(const QVector<glm::quat>& jointRotations) override;
     virtual void setJointData(int index, const glm::quat& rotation, const glm::vec3& translation) override;
     virtual void setJointRotation(int index, const glm::quat& rotation) override;
     virtual void setJointTranslation(int index, const glm::vec3& translation) override;
     virtual void clearJointData(int index) override;
+
+    virtual void setJointData(const QString& name, const glm::quat& rotation, const glm::vec3& translation)  override;
+    virtual void setJointRotation(const QString& name, const glm::quat& rotation)  override;
+    virtual void setJointTranslation(const QString& name, const glm::vec3& translation)  override;
+    virtual void clearJointData(const QString& name) override;
     virtual void clearJointsData() override;
 
+
+
     Q_INVOKABLE bool pinJoint(int index, const glm::vec3& position, const glm::quat& orientation);
     Q_INVOKABLE bool clearPinOnJoint(int index);
 
@@ -424,7 +456,6 @@ public:
     Q_INVOKABLE QString getFullAvatarModelName() const { return _fullAvatarModelName; }
     void resetFullAvatarURL();
 
-
     virtual void setAttachmentData(const QVector<AttachmentData>& attachmentData) override;
 
     MyCharacterController* getCharacterController() { return &_characterController; }
@@ -432,6 +463,7 @@ public:
 
     void updateMotors();
     void prepareForPhysicsSimulation();
+    void nextAttitude(glm::vec3 position, glm::quat orientation); // Can be safely called at any time.
     void harvestResultsFromPhysicsSimulation(float deltaTime);
 
     const QString& getCollisionSoundURL() { return _collisionSoundURL; }
@@ -466,44 +498,12 @@ public:
 
     virtual void rebuildCollisionShape() override;
 
-    void setHandControllerPosesInSensorFrame(const controller::Pose& left, const controller::Pose& right);
-    controller::Pose getLeftHandControllerPoseInSensorFrame() const;
-    controller::Pose getRightHandControllerPoseInSensorFrame() const;
-    controller::Pose getLeftHandControllerPoseInWorldFrame() const;
-    controller::Pose getRightHandControllerPoseInWorldFrame() const;
-    controller::Pose getLeftHandControllerPoseInAvatarFrame() const;
-    controller::Pose getRightHandControllerPoseInAvatarFrame() const;
-
-    void setFootControllerPosesInSensorFrame(const controller::Pose& left, const controller::Pose& right);
-    controller::Pose getLeftFootControllerPoseInSensorFrame() const;
-    controller::Pose getRightFootControllerPoseInSensorFrame() const;
-    controller::Pose getLeftFootControllerPoseInWorldFrame() const;
-    controller::Pose getRightFootControllerPoseInWorldFrame() const;
-    controller::Pose getLeftFootControllerPoseInAvatarFrame() const;
-    controller::Pose getRightFootControllerPoseInAvatarFrame() const;
-
-    void setSpineControllerPosesInSensorFrame(const controller::Pose& hips, const controller::Pose& spine2);
-    controller::Pose getHipsControllerPoseInSensorFrame() const;
-    controller::Pose getSpine2ControllerPoseInSensorFrame() const;
-    controller::Pose getHipsControllerPoseInWorldFrame() const;
-    controller::Pose getSpine2ControllerPoseInWorldFrame() const;
-    controller::Pose getHipsControllerPoseInAvatarFrame() const;
-    controller::Pose getSpine2ControllerPoseInAvatarFrame() const;
-
-    void setHeadControllerPoseInSensorFrame(const controller::Pose& head);
-    controller::Pose getHeadControllerPoseInSensorFrame() const;
-    controller::Pose getHeadControllerPoseInWorldFrame() const;
-    controller::Pose getHeadControllerPoseInAvatarFrame() const;
     const glm::vec2& getHeadControllerFacingMovingAverage() const { return _headControllerFacingMovingAverage; }
 
-
-    void setArmControllerPosesInSensorFrame(const controller::Pose& left, const controller::Pose& right);
-    controller::Pose getLeftArmControllerPoseInSensorFrame() const;
-    controller::Pose getRightArmControllerPoseInSensorFrame() const;
-    controller::Pose getLeftArmControllerPoseInWorldFrame() const;
-    controller::Pose getRightArmControllerPoseInWorldFrame() const;
-    controller::Pose getLeftArmControllerPoseInAvatarFrame() const;
-    controller::Pose getRightArmControllerPoseInAvatarFrame() const;
+    void setControllerPoseInSensorFrame(controller::Action action, const controller::Pose& pose);
+    controller::Pose getControllerPoseInSensorFrame(controller::Action action) const;
+    controller::Pose getControllerPoseInWorldFrame(controller::Action action) const;
+    controller::Pose getControllerPoseInAvatarFrame(controller::Action action) const;
 
     bool hasDriveInput() const;
 
@@ -512,6 +512,9 @@ public:
     Q_INVOKABLE void setFlyingEnabled(bool enabled);
     Q_INVOKABLE bool getFlyingEnabled();
 
+    Q_INVOKABLE float getAvatarScale();
+    Q_INVOKABLE void setAvatarScale(float scale);
+
     Q_INVOKABLE void setCollisionsEnabled(bool enabled);
     Q_INVOKABLE bool getCollisionsEnabled();
     Q_INVOKABLE void setCharacterControllerEnabled(bool enabled); // deprecated
@@ -543,11 +546,23 @@ public:
     Q_INVOKABLE bool isUp(const glm::vec3& direction) { return glm::dot(direction, _worldUpDirection) > 0.0f; }; // true iff direction points up wrt avatar's definition of up.
     Q_INVOKABLE bool isDown(const glm::vec3& direction) { return glm::dot(direction, _worldUpDirection) < 0.0f; };
 
+    void setUserHeight(float value);
+    float getUserHeight() const;
+    float getUserEyeHeight() const;
+
+    virtual SpatialParentTree* getParentTree() const override;
+
+    const QUuid& getSelfID() const { return AVATAR_SELF_ID; }
 
 public slots:
     void increaseSize();
     void decreaseSize();
     void resetSize();
+    float getDomainMinScale();
+    float getDomainMaxScale();
+
+    void setGravity(float gravity);
+    float getGravity();
 
     void goToLocation(const glm::vec3& newPosition,
                       bool hasOrientation = false, const glm::quat& newOrientation = glm::quat(),
@@ -574,6 +589,7 @@ public slots:
     void setEnableDebugDrawIKTargets(bool isEnabled);
     void setEnableDebugDrawIKConstraints(bool isEnabled);
     void setEnableDebugDrawIKChains(bool isEnabled);
+    void setEnableDebugDrawDetailedCollision(bool isEnabled);
 
     bool getEnableMeshVisible() const { return _skeletonModel->isVisible(); }
     void setEnableMeshVisible(bool isEnabled);
@@ -588,6 +604,8 @@ public slots:
     glm::vec3 getPositionForAudio();
     glm::quat getOrientationForAudio();
 
+    virtual void setModelScale(float scale) override;
+
 signals:
     void audioListenerModeChanged();
     void transformChanged();
@@ -598,12 +616,20 @@ signals:
     void onLoadComplete();
     void wentAway();
     void wentActive();
+    void skeletonChanged();
+    void dominantHandChanged(const QString& hand);
+    void sensorToWorldScaleChanged(float sensorToWorldScale);
+    void attachmentsChanged();
+    void scaleChanged();
+
+private slots:
+    void leaveDomain();
 
 private:
 
     bool requiresSafeLanding(const glm::vec3& positionIn, glm::vec3& positionOut);
 
-    virtual QByteArray toByteArrayStateful(AvatarDataDetail dataDetail) override;
+    virtual QByteArray toByteArrayStateful(AvatarDataDetail dataDetail, bool dropFaceTracking) override;
 
     void simulate(float deltaTime);
     void updateFromTrackers(float deltaTime);
@@ -615,6 +641,8 @@ private:
     virtual int parseDataFromBuffer(const QByteArray& buffer) override;
     virtual glm::vec3 getSkeletonPosition() const override;
 
+    void saveAvatarScale();
+
     glm::vec3 getScriptedMotorVelocity() const { return _scriptedMotorVelocity; }
     float getScriptedMotorTimescale() const { return _scriptedMotorTimescale; }
     QString getScriptedMotorFrame() const;
@@ -635,8 +663,6 @@ private:
 
     void setVisibleInSceneIfReady(Model* model, const render::ScenePointer& scene, bool visiblity);
 
-private:
-
     virtual void updatePalms() override {}
     void lateUpdatePalms();
 
@@ -709,6 +735,7 @@ private:
     QUrl _fstAnimGraphOverrideUrl;
     bool _useSnapTurn { true };
     bool _clearOverlayWhenMoving { true };
+    QString _dominantHand { DOMINANT_RIGHT_HAND };
 
     const float ROLL_CONTROL_DEAD_ZONE_DEFAULT = 8.0f; // deg
     const float ROLL_CONTROL_RATE_DEFAULT = 2.5f; // deg/sec/deg
@@ -717,7 +744,7 @@ private:
     float _hmdRollControlRate { ROLL_CONTROL_RATE_DEFAULT };
     float _lastDrivenSpeed { 0.0f };
 
-    // working copies -- see AvatarData for thread-safe _sensorToWorldMatrixCache, used for outward facing access
+    // working copy -- see AvatarData for thread-safe _sensorToWorldMatrixCache, used for outward facing access
     glm::mat4 _sensorToWorldMatrix { glm::mat4() };
 
     // cache of the current HMD sensor position and orientation in sensor space.
@@ -775,6 +802,7 @@ private:
     bool _enableDebugDrawIKTargets { false };
     bool _enableDebugDrawIKConstraints { false };
     bool _enableDebugDrawIKChains { false };
+    bool _enableDebugDrawDetailedCollision { false };
 
     AudioListenerMode _audioListenerMode;
     glm::vec3 _customListenPosition;
@@ -782,19 +810,10 @@ private:
 
     AtRestDetector _hmdAtRestDetector;
     bool _lastIsMoving { false };
-    bool _hoverReferenceCameraFacingIsCaptured { false };
-    glm::vec3 _hoverReferenceCameraFacing { 0.0f, 0.0f, -1.0f }; // hmd sensor space
 
-    // These are stored in SENSOR frame
-    ThreadSafeValueCache<controller::Pose> _leftHandControllerPoseInSensorFrameCache { controller::Pose() };
-    ThreadSafeValueCache<controller::Pose> _rightHandControllerPoseInSensorFrameCache { controller::Pose() };
-    ThreadSafeValueCache<controller::Pose> _leftFootControllerPoseInSensorFrameCache{ controller::Pose() };
-    ThreadSafeValueCache<controller::Pose> _rightFootControllerPoseInSensorFrameCache{ controller::Pose() };
-    ThreadSafeValueCache<controller::Pose> _hipsControllerPoseInSensorFrameCache{ controller::Pose() };
-    ThreadSafeValueCache<controller::Pose> _spine2ControllerPoseInSensorFrameCache{ controller::Pose() };
-    ThreadSafeValueCache<controller::Pose> _headControllerPoseInSensorFrameCache{ controller::Pose() };
-    ThreadSafeValueCache<controller::Pose> _leftArmControllerPoseInSensorFrameCache{ controller::Pose() };
-    ThreadSafeValueCache<controller::Pose> _rightArmControllerPoseInSensorFrameCache{ controller::Pose() };
+    // all poses are in sensor-frame
+    std::map<controller::Action, controller::Pose> _controllerPoseMap;
+    mutable std::mutex _controllerPoseMapMutex;
 
     bool _hmdLeanRecenterEnabled = true;
     AnimPose _prePhysicsRoomPose;
@@ -817,6 +836,9 @@ private:
     void setAway(bool value);
 
     std::vector<int> _pinnedJoints;
+
+    // height of user in sensor space, when standing erect.
+    ThreadSafeValueCache<float> _userHeight { DEFAULT_AVATAR_HEIGHT };
 };
 
 QScriptValue audioListenModeToScriptValue(QScriptEngine* engine, const AudioListenerMode& audioListenerMode);
diff --git a/interface/src/avatar/MyCharacterController.cpp b/interface/src/avatar/MyCharacterController.cpp
index 3d98a0e604..761e2e5bff 100755
--- a/interface/src/avatar/MyCharacterController.cpp
+++ b/interface/src/avatar/MyCharacterController.cpp
@@ -36,7 +36,7 @@ MyCharacterController::~MyCharacterController() {
 
 void MyCharacterController::setDynamicsWorld(btDynamicsWorld* world) {
     CharacterController::setDynamicsWorld(world);
-    if (world) {
+    if (world && _rigidBody) {
         initRayShotgun(world);
     }
 }
diff --git a/interface/src/avatar/MyHead.cpp b/interface/src/avatar/MyHead.cpp
index 9f2d080cd6..7fc1850bb2 100644
--- a/interface/src/avatar/MyHead.cpp
+++ b/interface/src/avatar/MyHead.cpp
@@ -29,17 +29,17 @@ MyHead::MyHead(MyAvatar* owningAvatar) : Head(owningAvatar) {
 glm::quat MyHead::getHeadOrientation() const {
     // NOTE: Head::getHeadOrientation() is not used for orienting the camera "view" while in Oculus mode, so
     // you may wonder why this code is here. This method will be called while in Oculus mode to determine how
-    // to change the driving direction while in Oculus mode. It is used to support driving toward where you're
+    // to change the driving direction while in Oculus mode. It is used to support driving toward where your
     // head is looking. Note that in oculus mode, your actual camera view and where your head is looking is not
     // always the same.
 
     MyAvatar* myAvatar = static_cast<MyAvatar*>(_owningAvatar);
-    auto headPose = myAvatar->getHeadControllerPoseInWorldFrame();
+    auto headPose = myAvatar->getControllerPoseInWorldFrame(controller::Action::HEAD);
     if (headPose.isValid()) {
         return headPose.rotation * Quaternions::Y_180;
     }
 
-    return myAvatar->getWorldAlignedOrientation() * glm::quat(glm::radians(glm::vec3(_basePitch, 0.0f, 0.0f)));
+    return myAvatar->getOrientation() * glm::quat(glm::radians(glm::vec3(_basePitch, 0.0f, 0.0f)));
 }
 
 void MyHead::simulate(float deltaTime) {
diff --git a/interface/src/avatar/MySkeletonModel.cpp b/interface/src/avatar/MySkeletonModel.cpp
index 89b6c36c63..a707031167 100644
--- a/interface/src/avatar/MySkeletonModel.cpp
+++ b/interface/src/avatar/MySkeletonModel.cpp
@@ -46,118 +46,109 @@ void MySkeletonModel::updateRig(float deltaTime, glm::mat4 parentTransform) {
     }
 
     MyAvatar* myAvatar = static_cast<MyAvatar*>(_owningAvatar);
+    assert(myAvatar);
 
     Rig::ControllerParameters params;
 
     AnimPose avatarToRigPose(glm::vec3(1.0f), Quaternions::Y_180, glm::vec3(0.0f));
 
     // input action is the highest priority source for head orientation.
-    auto avatarHeadPose = myAvatar->getHeadControllerPoseInAvatarFrame();
+    auto avatarHeadPose = myAvatar->getControllerPoseInAvatarFrame(controller::Action::HEAD);
     if (avatarHeadPose.isValid()) {
         AnimPose pose(avatarHeadPose.getRotation(), avatarHeadPose.getTranslation());
-        params.controllerPoses[Rig::ControllerType_Head] = avatarToRigPose * pose;
-        params.controllerActiveFlags[Rig::ControllerType_Head] = true;
+        params.primaryControllerPoses[Rig::PrimaryControllerType_Head] = avatarToRigPose * pose;
+        params.primaryControllerActiveFlags[Rig::PrimaryControllerType_Head] = true;
     } else {
         // even though full head IK is disabled, the rig still needs the head orientation to rotate the head up and
         // down in desktop mode.
         // preMult 180 is necessary to convert from avatar to rig coordinates.
         // postMult 180 is necessary to convert head from -z forward to z forward.
         glm::quat headRot = Quaternions::Y_180 * head->getFinalOrientationInLocalFrame() * Quaternions::Y_180;
-        params.controllerPoses[Rig::ControllerType_Head] = AnimPose(glm::vec3(1.0f), headRot, glm::vec3(0.0f));
-        params.controllerActiveFlags[Rig::ControllerType_Head] = false;
+        params.primaryControllerPoses[Rig::PrimaryControllerType_Head] = AnimPose(glm::vec3(1.0f), headRot, glm::vec3(0.0f));
+        params.primaryControllerActiveFlags[Rig::PrimaryControllerType_Head] = false;
     }
 
-    auto avatarHipsPose = myAvatar->getHipsControllerPoseInAvatarFrame();
-    if (avatarHipsPose.isValid()) {
-        AnimPose pose(avatarHipsPose.getRotation(), avatarHipsPose.getTranslation());
-        params.controllerPoses[Rig::ControllerType_Hips] = avatarToRigPose * pose;
-        params.controllerActiveFlags[Rig::ControllerType_Hips] = true;
-    } else {
-        params.controllerPoses[Rig::ControllerType_Hips] = AnimPose::identity;
-        params.controllerActiveFlags[Rig::ControllerType_Hips] = false;
+    //
+    // primary controller poses, control IK targets directly.
+    //
+
+    static const std::vector<std::pair<controller::Action, Rig::PrimaryControllerType>> primaryControllers = {
+        { controller::Action::LEFT_HAND, Rig::PrimaryControllerType_LeftHand },
+        { controller::Action::RIGHT_HAND, Rig::PrimaryControllerType_RightHand },
+        { controller::Action::HIPS, Rig::PrimaryControllerType_Hips },
+        { controller::Action::LEFT_FOOT, Rig::PrimaryControllerType_LeftFoot },
+        { controller::Action::RIGHT_FOOT, Rig::PrimaryControllerType_RightFoot },
+        { controller::Action::SPINE2, Rig::PrimaryControllerType_Spine2 }
+    };
+
+    for (auto pair : primaryControllers) {
+        auto controllerPose = myAvatar->getControllerPoseInAvatarFrame(pair.first);
+        if (controllerPose.isValid()) {
+            AnimPose pose(controllerPose.getRotation(), controllerPose.getTranslation());
+            params.primaryControllerPoses[pair.second] = avatarToRigPose * pose;
+            params.primaryControllerActiveFlags[pair.second] = true;
+        } else {
+            params.primaryControllerPoses[pair.second] = AnimPose::identity;
+            params.primaryControllerActiveFlags[pair.second] = false;
+        }
     }
 
-    auto avatarSpine2Pose = myAvatar->getSpine2ControllerPoseInAvatarFrame();
-    if (avatarSpine2Pose.isValid()) {
-        AnimPose pose(avatarSpine2Pose.getRotation(), avatarSpine2Pose.getTranslation());
-        params.controllerPoses[Rig::ControllerType_Spine2] = avatarToRigPose * pose;
-        params.controllerActiveFlags[Rig::ControllerType_Spine2] = true;
-    } else {
-        params.controllerPoses[Rig::ControllerType_Spine2] = AnimPose::identity;
-        params.controllerActiveFlags[Rig::ControllerType_Spine2] = false;
-    }
+    //
+    // secondary controller poses, influence the pose of the skeleton indirectly.
+    //
 
-    auto avatarRightArmPose = myAvatar->getRightArmControllerPoseInAvatarFrame();
-    if (avatarRightArmPose.isValid()) {
-        AnimPose pose(avatarRightArmPose.getRotation(), avatarRightArmPose.getTranslation());
-        params.controllerPoses[Rig::ControllerType_RightArm] = avatarToRigPose * pose;
-        params.controllerActiveFlags[Rig::ControllerType_RightArm] = true;
-    } else {
-        params.controllerPoses[Rig::ControllerType_RightArm] = AnimPose::identity;
-        params.controllerActiveFlags[Rig::ControllerType_RightArm] = false;
-    }
+    static const std::vector<std::pair<controller::Action, Rig::SecondaryControllerType>> secondaryControllers = {
+        { controller::Action::LEFT_SHOULDER, Rig::SecondaryControllerType_LeftShoulder },
+        { controller::Action::RIGHT_SHOULDER, Rig::SecondaryControllerType_RightShoulder },
+        { controller::Action::LEFT_ARM, Rig::SecondaryControllerType_LeftArm },
+        { controller::Action::RIGHT_ARM, Rig::SecondaryControllerType_RightArm },
+        { controller::Action::LEFT_FORE_ARM, Rig::SecondaryControllerType_LeftForeArm },
+        { controller::Action::RIGHT_FORE_ARM, Rig::SecondaryControllerType_RightForeArm },
+        { controller::Action::LEFT_UP_LEG, Rig::SecondaryControllerType_LeftUpLeg },
+        { controller::Action::RIGHT_UP_LEG, Rig::SecondaryControllerType_RightUpLeg },
+        { controller::Action::LEFT_LEG, Rig::SecondaryControllerType_LeftLeg },
+        { controller::Action::RIGHT_LEG, Rig::SecondaryControllerType_RightLeg },
+        { controller::Action::LEFT_TOE_BASE, Rig::SecondaryControllerType_LeftToeBase },
+        { controller::Action::RIGHT_TOE_BASE, Rig::SecondaryControllerType_RightToeBase }
+    };
 
-    auto avatarLeftArmPose = myAvatar->getLeftArmControllerPoseInAvatarFrame();
-    if (avatarLeftArmPose.isValid()) {
-        AnimPose pose(avatarLeftArmPose.getRotation(), avatarLeftArmPose.getTranslation());
-        params.controllerPoses[Rig::ControllerType_LeftArm] = avatarToRigPose * pose;
-        params.controllerActiveFlags[Rig::ControllerType_LeftArm] = true;
-    } else {
-        params.controllerPoses[Rig::ControllerType_LeftArm] = AnimPose::identity;
-        params.controllerActiveFlags[Rig::ControllerType_LeftArm] = false;
+    for (auto pair : secondaryControllers) {
+        auto controllerPose = myAvatar->getControllerPoseInAvatarFrame(pair.first);
+        if (controllerPose.isValid()) {
+            AnimPose pose(controllerPose.getRotation(), controllerPose.getTranslation());
+            params.secondaryControllerPoses[pair.second] = avatarToRigPose * pose;
+            params.secondaryControllerActiveFlags[pair.second] = true;
+        } else {
+            params.secondaryControllerPoses[pair.second] = AnimPose::identity;
+            params.secondaryControllerActiveFlags[pair.second] = false;
+        }
     }
 
-    auto avatarLeftHandPose = myAvatar->getLeftHandControllerPoseInAvatarFrame();
-    if (avatarLeftHandPose.isValid()) {
-        AnimPose pose(avatarLeftHandPose.getRotation(), avatarLeftHandPose.getTranslation());
-        params.controllerPoses[Rig::ControllerType_LeftHand] = avatarToRigPose * pose;
-        params.controllerActiveFlags[Rig::ControllerType_LeftHand] = true;
-    } else {
-        params.controllerPoses[Rig::ControllerType_LeftHand] = AnimPose::identity;
-        params.controllerActiveFlags[Rig::ControllerType_LeftHand] = false;
-    }
-
-    auto avatarRightHandPose = myAvatar->getRightHandControllerPoseInAvatarFrame();
-    if (avatarRightHandPose.isValid()) {
-        AnimPose pose(avatarRightHandPose.getRotation(), avatarRightHandPose.getTranslation());
-        params.controllerPoses[Rig::ControllerType_RightHand] = avatarToRigPose * pose;
-        params.controllerActiveFlags[Rig::ControllerType_RightHand] = true;
-    } else {
-        params.controllerPoses[Rig::ControllerType_RightHand] = AnimPose::identity;
-        params.controllerActiveFlags[Rig::ControllerType_RightHand] = false;
-    }
-
-    auto avatarLeftFootPose = myAvatar->getLeftFootControllerPoseInAvatarFrame();
-    if (avatarLeftFootPose.isValid()) {
-        AnimPose pose(avatarLeftFootPose.getRotation(), avatarLeftFootPose.getTranslation());
-        params.controllerPoses[Rig::ControllerType_LeftFoot] = avatarToRigPose * pose;
-        params.controllerActiveFlags[Rig::ControllerType_LeftFoot] = true;
-    } else {
-        params.controllerPoses[Rig::ControllerType_LeftFoot] = AnimPose::identity;
-        params.controllerActiveFlags[Rig::ControllerType_LeftFoot] = false;
-    }
-
-    auto avatarRightFootPose = myAvatar->getRightFootControllerPoseInAvatarFrame();
-    if (avatarRightFootPose.isValid()) {
-        AnimPose pose(avatarRightFootPose.getRotation(), avatarRightFootPose.getTranslation());
-        params.controllerPoses[Rig::ControllerType_RightFoot] = avatarToRigPose * pose;
-        params.controllerActiveFlags[Rig::ControllerType_RightFoot] = true;
-    } else {
-        params.controllerPoses[Rig::ControllerType_RightFoot] = AnimPose::identity;
-        params.controllerActiveFlags[Rig::ControllerType_RightFoot] = false;
-    }
-
-    params.bodyCapsuleRadius = myAvatar->getCharacterController()->getCapsuleRadius();
-    params.bodyCapsuleHalfHeight = myAvatar->getCharacterController()->getCapsuleHalfHeight();
-    params.bodyCapsuleLocalOffset = myAvatar->getCharacterController()->getCapsuleLocalOffset();
-
     params.isTalking = head->getTimeWithoutTalking() <= 1.5f;
 
+    // pass detailed torso k-dops to rig.
+    int hipsJoint = _rig.indexOfJoint("Hips");
+    if (hipsJoint >= 0) {
+        params.hipsShapeInfo = geometry.joints[hipsJoint].shapeInfo;
+    }
+    int spineJoint = _rig.indexOfJoint("Spine");
+    if (spineJoint >= 0) {
+        params.spineShapeInfo = geometry.joints[spineJoint].shapeInfo;
+    }
+    int spine1Joint = _rig.indexOfJoint("Spine1");
+    if (spine1Joint >= 0) {
+        params.spine1ShapeInfo = geometry.joints[spine1Joint].shapeInfo;
+    }
+    int spine2Joint = _rig.indexOfJoint("Spine2");
+    if (spine2Joint >= 0) {
+        params.spine2ShapeInfo = geometry.joints[spine2Joint].shapeInfo;
+    }
+
     _rig.updateFromControllerParameters(params, deltaTime);
 
     Rig::CharacterControllerState ccState = convertCharacterControllerState(myAvatar->getCharacterController()->getState());
 
-    auto velocity = myAvatar->getLocalVelocity();
+    auto velocity = myAvatar->getLocalVelocity() / myAvatar->getSensorToWorldScale();
     auto position = myAvatar->getLocalPosition();
     auto orientation = myAvatar->getLocalOrientation();
     _rig.computeMotionAnimationState(deltaTime, position, velocity, orientation, ccState);
@@ -174,5 +165,107 @@ void MySkeletonModel::updateRig(float deltaTime, glm::mat4 parentTransform) {
     eyeParams.rightEyeJointIndex = geometry.rightEyeJointIndex;
 
     _rig.updateFromEyeParameters(eyeParams);
+
+    updateFingers();
 }
 
+
+void MySkeletonModel::updateFingers() {
+
+    MyAvatar* myAvatar = static_cast<MyAvatar*>(_owningAvatar);
+
+    static std::vector<std::vector<std::pair<controller::Action, QString>>> fingerChains = {
+        {
+            { controller::Action::LEFT_HAND, "LeftHand" },
+            { controller::Action::LEFT_HAND_THUMB1, "LeftHandThumb1" },
+            { controller::Action::LEFT_HAND_THUMB2, "LeftHandThumb2" },
+            { controller::Action::LEFT_HAND_THUMB3, "LeftHandThumb3" },
+            { controller::Action::LEFT_HAND_THUMB4, "LeftHandThumb4" }
+        },
+        {
+            { controller::Action::LEFT_HAND, "LeftHand" },
+            { controller::Action::LEFT_HAND_INDEX1, "LeftHandIndex1" },
+            { controller::Action::LEFT_HAND_INDEX2, "LeftHandIndex2" },
+            { controller::Action::LEFT_HAND_INDEX3, "LeftHandIndex3" },
+            { controller::Action::LEFT_HAND_INDEX4, "LeftHandIndex4" }
+        },
+        {
+            { controller::Action::LEFT_HAND, "LeftHand" },
+            { controller::Action::LEFT_HAND_MIDDLE1, "LeftHandMiddle1" },
+            { controller::Action::LEFT_HAND_MIDDLE2, "LeftHandMiddle2" },
+            { controller::Action::LEFT_HAND_MIDDLE3, "LeftHandMiddle3" },
+            { controller::Action::LEFT_HAND_MIDDLE4, "LeftHandMiddle4" }
+        },
+        {
+            { controller::Action::LEFT_HAND, "LeftHand" },
+            { controller::Action::LEFT_HAND_RING1, "LeftHandRing1" },
+            { controller::Action::LEFT_HAND_RING2, "LeftHandRing2" },
+            { controller::Action::LEFT_HAND_RING3, "LeftHandRing3" },
+            { controller::Action::LEFT_HAND_RING4, "LeftHandRing4" }
+        },
+        {
+            { controller::Action::LEFT_HAND, "LeftHand" },
+            { controller::Action::LEFT_HAND_PINKY1, "LeftHandPinky1" },
+            { controller::Action::LEFT_HAND_PINKY2, "LeftHandPinky2" },
+            { controller::Action::LEFT_HAND_PINKY3, "LeftHandPinky3" },
+            { controller::Action::LEFT_HAND_PINKY4, "LeftHandPinky4" }
+        },
+        {
+            { controller::Action::RIGHT_HAND, "RightHand" },
+            { controller::Action::RIGHT_HAND_THUMB1, "RightHandThumb1" },
+            { controller::Action::RIGHT_HAND_THUMB2, "RightHandThumb2" },
+            { controller::Action::RIGHT_HAND_THUMB3, "RightHandThumb3" },
+            { controller::Action::RIGHT_HAND_THUMB4, "RightHandThumb4" }
+        },
+        {
+            { controller::Action::RIGHT_HAND, "RightHand" },
+            { controller::Action::RIGHT_HAND_INDEX1, "RightHandIndex1" },
+            { controller::Action::RIGHT_HAND_INDEX2, "RightHandIndex2" },
+            { controller::Action::RIGHT_HAND_INDEX3, "RightHandIndex3" },
+            { controller::Action::RIGHT_HAND_INDEX4, "RightHandIndex4" }
+        },
+        {
+            { controller::Action::RIGHT_HAND, "RightHand" },
+            { controller::Action::RIGHT_HAND_MIDDLE1, "RightHandMiddle1" },
+            { controller::Action::RIGHT_HAND_MIDDLE2, "RightHandMiddle2" },
+            { controller::Action::RIGHT_HAND_MIDDLE3, "RightHandMiddle3" },
+            { controller::Action::RIGHT_HAND_MIDDLE4, "RightHandMiddle4" }
+        },
+        {
+            { controller::Action::RIGHT_HAND, "RightHand" },
+            { controller::Action::RIGHT_HAND_RING1, "RightHandRing1" },
+            { controller::Action::RIGHT_HAND_RING2, "RightHandRing2" },
+            { controller::Action::RIGHT_HAND_RING3, "RightHandRing3" },
+            { controller::Action::RIGHT_HAND_RING4, "RightHandRing4" }
+        },
+        {
+            { controller::Action::RIGHT_HAND, "RightHand" },
+            { controller::Action::RIGHT_HAND_PINKY1, "RightHandPinky1" },
+            { controller::Action::RIGHT_HAND_PINKY2, "RightHandPinky2" },
+            { controller::Action::RIGHT_HAND_PINKY3, "RightHandPinky3" },
+            { controller::Action::RIGHT_HAND_PINKY4, "RightHandPinky4" }
+        }
+    };
+
+    const float CONTROLLER_PRIORITY = 2.0f;
+
+    for (auto& chain : fingerChains) {
+        glm::quat prevAbsRot = Quaternions::IDENTITY;
+        for (auto& link : chain) {
+            int index = _rig.indexOfJoint(link.second);
+            if (index >= 0) {
+                auto pose = myAvatar->getControllerPoseInSensorFrame(link.first);
+                if (pose.valid) {
+                    glm::quat relRot = glm::inverse(prevAbsRot) * pose.getRotation();
+                    // only set the rotation for the finger joints, not the hands.
+                    if (link.first != controller::Action::LEFT_HAND && link.first != controller::Action::RIGHT_HAND) {
+                        _rig.setJointRotation(index, true, relRot, CONTROLLER_PRIORITY);
+                    }
+                    prevAbsRot = pose.getRotation();
+                } else {
+                    _rig.clearJointAnimationPriority(index);
+                }
+            }
+        }
+    }
+}
diff --git a/interface/src/avatar/MySkeletonModel.h b/interface/src/avatar/MySkeletonModel.h
index 12aba6b545..ad0ae1b8e9 100644
--- a/interface/src/avatar/MySkeletonModel.h
+++ b/interface/src/avatar/MySkeletonModel.h
@@ -10,6 +10,7 @@
 #define hifi_MySkeletonModel_h
 
 #include <avatars-renderer/SkeletonModel.h>
+#include "MyAvatar.h"
 
 /// A skeleton loaded from a model.
 class MySkeletonModel : public SkeletonModel {
@@ -21,6 +22,9 @@ private:
 public:
     MySkeletonModel(Avatar* owningAvatar, QObject* parent = nullptr);
     void updateRig(float deltaTime, glm::mat4 parentTransform) override;
+
+private:
+    void updateFingers();
 };
 
 #endif // hifi_MySkeletonModel_h
diff --git a/interface/src/commerce/CommerceLogging.cpp b/interface/src/commerce/CommerceLogging.cpp
new file mode 100644
index 0000000000..65102e9699
--- /dev/null
+++ b/interface/src/commerce/CommerceLogging.cpp
@@ -0,0 +1,14 @@
+//
+//  CommerceLogging.cpp
+//  interface/src/commerce
+//
+//  Created by Howard Stearns on 8/9/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include "CommerceLogging.h"
+
+Q_LOGGING_CATEGORY(commerce, "hifi.commerce")
diff --git a/interface/src/commerce/CommerceLogging.h b/interface/src/commerce/CommerceLogging.h
new file mode 100644
index 0000000000..d641977872
--- /dev/null
+++ b/interface/src/commerce/CommerceLogging.h
@@ -0,0 +1,19 @@
+//
+//  CommerceLogging.h
+//  interface/src/commerce
+//
+//  Created by Howard Stearns on 8/9/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_CommerceLogging_h
+#define hifi_CommerceLogging_h
+
+#include <QLoggingCategory>
+
+Q_DECLARE_LOGGING_CATEGORY(commerce)
+
+#endif // hifi_CommerceLogging_h
diff --git a/interface/src/commerce/Ledger.cpp b/interface/src/commerce/Ledger.cpp
new file mode 100644
index 0000000000..904847cb5f
--- /dev/null
+++ b/interface/src/commerce/Ledger.cpp
@@ -0,0 +1,268 @@
+//
+//  Ledger.cpp
+//  interface/src/commerce
+//
+//  Created by Howard Stearns on 8/4/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include <QJsonObject>
+#include <QJsonArray>
+#include <QTimeZone>
+#include <QJsonDocument>
+#include "Wallet.h"
+#include "Ledger.h"
+#include "CommerceLogging.h"
+#include <NetworkingConstants.h>
+
+// inventory answers {status: 'success', data: {assets: [{id: "guid", title: "name", preview: "url"}....]}}
+// balance answers {status: 'success', data: {balance: integer}}
+// buy and receive_at answer {status: 'success'}
+
+QJsonObject Ledger::apiResponse(const QString& label, QNetworkReply& reply) {
+    QByteArray response = reply.readAll();
+    QJsonObject data = QJsonDocument::fromJson(response).object();
+    qInfo(commerce) << label << "response" << QJsonDocument(data).toJson(QJsonDocument::Compact);
+    return data;
+}
+// Non-200 responses are not json:
+QJsonObject Ledger::failResponse(const QString& label, QNetworkReply& reply) {
+    QString response = reply.readAll();
+    qWarning(commerce) << "FAILED" << label << response;
+    QJsonObject result
+    {
+        { "status", "fail" },
+        { "message", response }
+    };
+    return result;
+}
+#define ApiHandler(NAME) void Ledger::NAME##Success(QNetworkReply& reply) { emit NAME##Result(apiResponse(#NAME, reply)); }
+#define FailHandler(NAME) void Ledger::NAME##Failure(QNetworkReply& reply) { emit NAME##Result(failResponse(#NAME, reply)); }
+#define Handler(NAME) ApiHandler(NAME) FailHandler(NAME)
+Handler(buy)
+Handler(receiveAt)
+Handler(balance)
+Handler(inventory)
+
+void Ledger::send(const QString& endpoint, const QString& success, const QString& fail, QNetworkAccessManager::Operation method, AccountManagerAuth::Type authType, QJsonObject request) {
+    auto accountManager = DependencyManager::get<AccountManager>();
+    const QString URL = "/api/v1/commerce/";
+    JSONCallbackParameters callbackParams(this, success, this, fail);
+    qCInfo(commerce) << "Sending" << endpoint << QJsonDocument(request).toJson(QJsonDocument::Compact);
+    accountManager->sendRequest(URL + endpoint,
+        authType,
+        method,
+        callbackParams,
+        QJsonDocument(request).toJson());
+}
+
+void Ledger::signedSend(const QString& propertyName, const QByteArray& text, const QString& key, const QString& endpoint, const QString& success, const QString& fail, const bool controlled_failure) {
+    auto wallet = DependencyManager::get<Wallet>();
+    QString signature = key.isEmpty() ? "" : wallet->signWithKey(text, key);
+    QJsonObject request;
+    request[propertyName] = QString(text);
+    if (!controlled_failure) {
+        request["signature"] = signature;
+    } else {
+        request["signature"] = QString("controlled failure!");
+    }
+    send(endpoint, success, fail, QNetworkAccessManager::PutOperation, AccountManagerAuth::Required, request);
+}
+
+void Ledger::keysQuery(const QString& endpoint, const QString& success, const QString& fail) {
+    auto wallet = DependencyManager::get<Wallet>();
+    QJsonObject request;
+    request["public_keys"] = QJsonArray::fromStringList(wallet->listPublicKeys());
+    send(endpoint, success, fail, QNetworkAccessManager::PostOperation, AccountManagerAuth::Required, request);
+}
+
+void Ledger::buy(const QString& hfc_key, int cost, const QString& asset_id, const QString& inventory_key, const bool controlled_failure) {
+    QJsonObject transaction;
+    transaction["hfc_key"] = hfc_key;
+    transaction["cost"] = cost;
+    transaction["asset_id"] = asset_id;
+    transaction["inventory_key"] = inventory_key;
+    QJsonDocument transactionDoc{ transaction };
+    auto transactionString = transactionDoc.toJson(QJsonDocument::Compact);
+    signedSend("transaction", transactionString, hfc_key, "buy", "buySuccess", "buyFailure", controlled_failure);
+}
+
+bool Ledger::receiveAt(const QString& hfc_key, const QString& old_key) {
+    auto accountManager = DependencyManager::get<AccountManager>();
+    if (!accountManager->isLoggedIn()) {
+        qCWarning(commerce) << "Cannot set receiveAt when not logged in.";
+        QJsonObject result{ { "status", "fail" }, { "message", "Not logged in" } };
+        emit receiveAtResult(result);
+        return false; // We know right away that we will fail, so tell the caller.
+    }
+
+    signedSend("public_key", hfc_key.toUtf8(), old_key, "receive_at", "receiveAtSuccess", "receiveAtFailure");
+    return true; // Note that there may still be an asynchronous signal of failure that callers might be interested in.
+}
+
+void Ledger::balance(const QStringList& keys) {
+    keysQuery("balance", "balanceSuccess", "balanceFailure");
+}
+
+void Ledger::inventory(const QStringList& keys) {
+    keysQuery("inventory", "inventorySuccess", "inventoryFailure");
+}
+
+QString nameFromKey(const QString& key, const QStringList& publicKeys) {
+    if (key.isNull() || key.isEmpty()) {
+        return "Marketplace";
+    }
+    if (publicKeys.contains(key)) {
+        return "You";
+    }
+    return "Someone";
+}
+
+static const QString MARKETPLACE_ITEMS_BASE_URL = NetworkingConstants::METAVERSE_SERVER_URL.toString() + "/marketplace/items/";
+void Ledger::historySuccess(QNetworkReply& reply) {
+    // here we send a historyResult with some extra stuff in it
+    // Namely, the styled text we'd like to show.  The issue is the
+    // QML cannot do that easily since it doesn't know what the wallet
+    // public key(s) are.  Let's keep it that way
+    QByteArray response = reply.readAll();
+    QJsonObject data = QJsonDocument::fromJson(response).object();
+
+    // we will need the array of public keys from the wallet
+    auto wallet = DependencyManager::get<Wallet>();
+    auto keys = wallet->listPublicKeys();
+
+    // now we need to loop through the transactions and add fancy text...
+    auto historyArray = data.find("data").value().toObject().find("history").value().toArray();
+    QJsonArray newHistoryArray;
+
+    // TODO: do this with 0 copies if possible
+    for (auto it = historyArray.begin(); it != historyArray.end(); it++) {
+        auto valueObject = (*it).toObject();
+        QString from = nameFromKey(valueObject["sender_key"].toString(), keys);
+        QString to = nameFromKey(valueObject["recipient_key"].toString(), keys);
+        bool isHfc = valueObject["asset_title"].toString() == "HFC";
+        bool iAmReceiving = to == "You";
+        QString coloredQuantityAndAssetTitle = QString::number(valueObject["quantity"].toInt()) + " " + valueObject["asset_title"].toString();
+        if (isHfc) {
+            if (iAmReceiving) {
+                coloredQuantityAndAssetTitle = QString("<font color='#1FC6A6'>") + coloredQuantityAndAssetTitle + QString("</font>");
+            } else {
+                coloredQuantityAndAssetTitle = QString("<font color='#EA4C5F'>") + coloredQuantityAndAssetTitle + QString("</font>");
+            }
+        } else {
+            coloredQuantityAndAssetTitle = QString("\"<font color='#0093C5'><a href='") +
+                MARKETPLACE_ITEMS_BASE_URL +
+                valueObject["asset_id"].toString() +
+                QString("'>") +
+                coloredQuantityAndAssetTitle +
+                QString("</a></font>\"");
+        }
+        // turns out on my machine, toLocalTime convert to some weird timezone, yet the
+        // systemTimeZone is correct.  To avoid a strange bug with other's systems too, lets
+        // be explicit
+        QDateTime createdAt = QDateTime::fromSecsSinceEpoch(valueObject["created_at"].toInt(), Qt::UTC);
+        QDateTime localCreatedAt = createdAt.toTimeZone(QTimeZone::systemTimeZone());
+        valueObject["text"] = QString("%1 sent %2 %3 with message \"%4\"").
+            arg(from, to, coloredQuantityAndAssetTitle, valueObject["message"].toString());
+        newHistoryArray.push_back(valueObject);
+    }
+    // now copy the rest of the json -- this is inefficient
+    // TODO: try to do this without making copies
+    QJsonObject newData;
+    newData["status"] = "success";
+    QJsonObject newDataData;
+    newDataData["history"] = newHistoryArray;
+    newData["data"] = newDataData;
+    emit historyResult(newData);
+}
+
+void Ledger::historyFailure(QNetworkReply& reply) {
+    failResponse("history", reply);
+}
+
+void Ledger::history(const QStringList& keys) {
+    keysQuery("history", "historySuccess", "historyFailure");
+}
+
+// The api/failResponse is called just for the side effect of logging.
+void Ledger::resetSuccess(QNetworkReply& reply) { apiResponse("reset", reply); }
+void Ledger::resetFailure(QNetworkReply& reply) { failResponse("reset", reply); }
+void Ledger::reset() {
+    send("reset_user_hfc_account", "resetSuccess", "resetFailure", QNetworkAccessManager::PutOperation, AccountManagerAuth::Required, QJsonObject());
+}
+
+void Ledger::accountSuccess(QNetworkReply& reply) {
+    // lets set the appropriate stuff in the wallet now
+    auto wallet = DependencyManager::get<Wallet>();
+    QByteArray response = reply.readAll();
+    QJsonObject data = QJsonDocument::fromJson(response).object()["data"].toObject();
+
+    auto salt = QByteArray::fromBase64(data["salt"].toString().toUtf8());
+    auto iv = QByteArray::fromBase64(data["iv"].toString().toUtf8());
+    auto ckey = QByteArray::fromBase64(data["ckey"].toString().toUtf8());
+
+    wallet->setSalt(salt);
+    wallet->setIv(iv);
+    wallet->setCKey(ckey);
+
+    // none of the hfc account info should be emitted
+    emit accountResult(QJsonObject{ {"status", "success"} });
+}
+
+void Ledger::accountFailure(QNetworkReply& reply) {
+    failResponse("account", reply);
+}
+void Ledger::account() {
+    send("hfc_account", "accountSuccess", "accountFailure", QNetworkAccessManager::PutOperation, AccountManagerAuth::Required, QJsonObject());
+}
+
+// The api/failResponse is called just for the side effect of logging.
+void Ledger::updateLocationSuccess(QNetworkReply& reply) { apiResponse("updateLocation", reply); }
+void Ledger::updateLocationFailure(QNetworkReply& reply) { failResponse("updateLocation", reply); }
+void Ledger::updateLocation(const QString& asset_id, const QString location, const bool controlledFailure) {
+    auto wallet = DependencyManager::get<Wallet>();
+    auto walletScriptingInterface = DependencyManager::get<WalletScriptingInterface>();
+    uint walletStatus = walletScriptingInterface->getWalletStatus();
+
+    if (walletStatus != (uint)wallet->WALLET_STATUS_READY) {
+        emit walletScriptingInterface->walletNotSetup();
+        qDebug(commerce) << "User attempted to update the location of a certificate, but their wallet wasn't ready. Status:" << walletStatus;
+    } else {
+        QStringList keys = wallet->listPublicKeys();
+        QString key = keys[0];
+        QJsonObject transaction;
+        transaction["certificate_id"] = asset_id;
+        transaction["place_name"] = location;
+        QJsonDocument transactionDoc{ transaction };
+        auto transactionString = transactionDoc.toJson(QJsonDocument::Compact);
+        signedSend("transaction", transactionString, key, "location", "updateLocationSuccess", "updateLocationFailure", controlledFailure);
+    }
+}
+
+void Ledger::certificateInfoSuccess(QNetworkReply& reply) {
+    auto wallet = DependencyManager::get<Wallet>();
+    auto accountManager = DependencyManager::get<AccountManager>();
+
+    QByteArray response = reply.readAll();
+    QJsonObject replyObject = QJsonDocument::fromJson(response).object();
+
+    QStringList keys = wallet->listPublicKeys();
+    if (keys.count() != 0) {
+        QJsonObject data = replyObject["data"].toObject();
+        if (data["transfer_recipient_key"].toString() == keys[0]) {
+            replyObject.insert("isMyCert", true);
+        }
+    }
+    qInfo(commerce) << "certificateInfo" << "response" << QJsonDocument(replyObject).toJson(QJsonDocument::Compact);
+    emit certificateInfoResult(replyObject);
+}
+void Ledger::certificateInfoFailure(QNetworkReply& reply) { failResponse("certificateInfo", reply); }
+void Ledger::certificateInfo(const QString& certificateId) {
+    QString endpoint = "proof_of_purchase_status/transfer";
+    QJsonObject request;
+    request["certificate_id"] = certificateId;
+    send(endpoint, "certificateInfoSuccess", "certificateInfoFailure", QNetworkAccessManager::PutOperation, AccountManagerAuth::None, request);
+}
diff --git a/interface/src/commerce/Ledger.h b/interface/src/commerce/Ledger.h
new file mode 100644
index 0000000000..42eb0ffc49
--- /dev/null
+++ b/interface/src/commerce/Ledger.h
@@ -0,0 +1,86 @@
+//
+//  Ledger.h
+//  interface/src/commerce
+//
+// Bottlenecks all interaction with the blockchain or other ledger system.
+//
+//  Created by Howard Stearns on 8/4/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_Ledger_h
+#define hifi_Ledger_h
+
+#include <QJsonObject>
+#include <DependencyManager.h>
+#include <QtNetwork/QNetworkReply>
+#include "AccountManager.h"
+
+
+class Ledger : public QObject, public Dependency {
+    Q_OBJECT
+    SINGLETON_DEPENDENCY
+
+public:
+    void buy(const QString& hfc_key, int cost, const QString& asset_id, const QString& inventory_key, const bool controlled_failure = false);
+    bool receiveAt(const QString& hfc_key, const QString& old_key);
+    void balance(const QStringList& keys);
+    void inventory(const QStringList& keys);
+    void history(const QStringList& keys);
+    void account();
+    void reset();
+    void updateLocation(const QString& asset_id, const QString location, const bool controlledFailure = false);
+    void certificateInfo(const QString& certificateId);
+
+    enum CertificateStatus {
+        CERTIFICATE_STATUS_UNKNOWN = 0,
+        CERTIFICATE_STATUS_VERIFICATION_SUCCESS,
+        CERTIFICATE_STATUS_VERIFICATION_TIMEOUT,
+        CERTIFICATE_STATUS_STATIC_VERIFICATION_FAILED,
+        CERTIFICATE_STATUS_OWNER_VERIFICATION_FAILED,
+    };
+
+signals:
+    void buyResult(QJsonObject result);
+    void receiveAtResult(QJsonObject result);
+    void balanceResult(QJsonObject result);
+    void inventoryResult(QJsonObject result);
+    void historyResult(QJsonObject result);
+    void accountResult(QJsonObject result);
+    void locationUpdateResult(QJsonObject result);
+    void certificateInfoResult(QJsonObject result);
+
+    void updateCertificateStatus(const QString& certID, uint certStatus);
+
+public slots:
+    void buySuccess(QNetworkReply& reply);
+    void buyFailure(QNetworkReply& reply);
+    void receiveAtSuccess(QNetworkReply& reply);
+    void receiveAtFailure(QNetworkReply& reply);
+    void balanceSuccess(QNetworkReply& reply);
+    void balanceFailure(QNetworkReply& reply);
+    void inventorySuccess(QNetworkReply& reply);
+    void inventoryFailure(QNetworkReply& reply);
+    void historySuccess(QNetworkReply& reply);
+    void historyFailure(QNetworkReply& reply);
+    void resetSuccess(QNetworkReply& reply);
+    void resetFailure(QNetworkReply& reply);
+    void accountSuccess(QNetworkReply& reply);
+    void accountFailure(QNetworkReply& reply);
+    void updateLocationSuccess(QNetworkReply& reply);
+    void updateLocationFailure(QNetworkReply& reply);
+    void certificateInfoSuccess(QNetworkReply& reply);
+    void certificateInfoFailure(QNetworkReply& reply);
+
+private:
+    QJsonObject apiResponse(const QString& label, QNetworkReply& reply);
+    QJsonObject failResponse(const QString& label, QNetworkReply& reply);
+    void send(const QString& endpoint, const QString& success, const QString& fail, QNetworkAccessManager::Operation method, AccountManagerAuth::Type authType, QJsonObject request);
+    void keysQuery(const QString& endpoint, const QString& success, const QString& fail);
+    void signedSend(const QString& propertyName, const QByteArray& text, const QString& key, const QString& endpoint, const QString& success, const QString& fail, const bool controlled_failure = false);
+};
+
+#endif // hifi_Ledger_h
diff --git a/interface/src/commerce/QmlCommerce.cpp b/interface/src/commerce/QmlCommerce.cpp
new file mode 100644
index 0000000000..f29e46d843
--- /dev/null
+++ b/interface/src/commerce/QmlCommerce.cpp
@@ -0,0 +1,139 @@
+//
+//  QmlCommerce.cpp
+//  interface/src/commerce
+//
+//  Created by Howard Stearns on 8/4/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include "QmlCommerce.h"
+#include "Application.h"
+#include "DependencyManager.h"
+#include "Ledger.h"
+#include "Wallet.h"
+#include <AccountManager.h>
+
+HIFI_QML_DEF(QmlCommerce)
+
+QmlCommerce::QmlCommerce(QQuickItem* parent) : OffscreenQmlDialog(parent) {
+    auto ledger = DependencyManager::get<Ledger>();
+    auto wallet = DependencyManager::get<Wallet>();
+    connect(ledger.data(), &Ledger::buyResult, this, &QmlCommerce::buyResult);
+    connect(ledger.data(), &Ledger::balanceResult, this, &QmlCommerce::balanceResult);
+    connect(ledger.data(), &Ledger::inventoryResult, this, &QmlCommerce::inventoryResult);
+    connect(wallet.data(), &Wallet::securityImageResult, this, &QmlCommerce::securityImageResult);
+    connect(ledger.data(), &Ledger::historyResult, this, &QmlCommerce::historyResult);
+    connect(wallet.data(), &Wallet::keyFilePathIfExistsResult, this, &QmlCommerce::keyFilePathIfExistsResult);
+    connect(ledger.data(), &Ledger::accountResult, this, &QmlCommerce::accountResult);
+    connect(wallet.data(), &Wallet::walletStatusResult, this, &QmlCommerce::walletStatusResult);
+    connect(ledger.data(), &Ledger::certificateInfoResult, this, &QmlCommerce::certificateInfoResult);
+    connect(ledger.data(), &Ledger::updateCertificateStatus, this, &QmlCommerce::updateCertificateStatus);
+    
+    auto accountManager = DependencyManager::get<AccountManager>();
+    connect(accountManager.data(), &AccountManager::usernameChanged, this, [&]() {
+        setPassphrase("");
+    });
+}
+
+void QmlCommerce::getWalletStatus() {
+    auto wallet = DependencyManager::get<Wallet>();
+    wallet->getWalletStatus();
+}
+
+void QmlCommerce::getLoginStatus() {
+    emit loginStatusResult(DependencyManager::get<AccountManager>()->isLoggedIn());
+}
+
+void QmlCommerce::getKeyFilePathIfExists() {
+    auto wallet = DependencyManager::get<Wallet>();
+    emit keyFilePathIfExistsResult(wallet->getKeyFilePath());
+}
+
+void QmlCommerce::getWalletAuthenticatedStatus() {
+    auto wallet = DependencyManager::get<Wallet>();
+    emit walletAuthenticatedStatusResult(wallet->walletIsAuthenticatedWithPassphrase());
+}
+
+void QmlCommerce::getSecurityImage() {
+    auto wallet = DependencyManager::get<Wallet>();
+    wallet->getSecurityImage();
+}
+
+void QmlCommerce::chooseSecurityImage(const QString& imageFile) {
+    auto wallet = DependencyManager::get<Wallet>();
+    wallet->chooseSecurityImage(imageFile);
+}
+
+void QmlCommerce::buy(const QString& assetId, int cost, const bool controlledFailure) {
+    auto ledger = DependencyManager::get<Ledger>();
+    auto wallet = DependencyManager::get<Wallet>();
+    QStringList keys = wallet->listPublicKeys();
+    if (keys.count() == 0) {
+        QJsonObject result{ { "status", "fail" }, { "message", "Uninitialized Wallet." } };
+        return emit buyResult(result);
+    }
+    QString key = keys[0];
+    // For now, we receive at the same key that pays for it.
+    ledger->buy(key, cost, assetId, key, controlledFailure);
+}
+
+void QmlCommerce::balance() {
+    auto ledger = DependencyManager::get<Ledger>();
+    auto wallet = DependencyManager::get<Wallet>();
+    ledger->balance(wallet->listPublicKeys());
+}
+
+void QmlCommerce::inventory() {
+    auto ledger = DependencyManager::get<Ledger>();
+    auto wallet = DependencyManager::get<Wallet>();
+    ledger->inventory(wallet->listPublicKeys());
+}
+
+void QmlCommerce::history() {
+    auto ledger = DependencyManager::get<Ledger>();
+    auto wallet = DependencyManager::get<Wallet>();
+    ledger->history(wallet->listPublicKeys());
+}
+
+void QmlCommerce::changePassphrase(const QString& oldPassphrase, const QString& newPassphrase) {
+    auto wallet = DependencyManager::get<Wallet>();
+    if (wallet->getPassphrase()->isEmpty()) {
+        emit changePassphraseStatusResult(wallet->setPassphrase(newPassphrase));
+    } else if (wallet->getPassphrase() == oldPassphrase && !newPassphrase.isEmpty()) {
+        emit changePassphraseStatusResult(wallet->changePassphrase(newPassphrase));
+    } else {
+        emit changePassphraseStatusResult(false);
+    }
+}
+
+void QmlCommerce::setPassphrase(const QString& passphrase) {
+    auto wallet = DependencyManager::get<Wallet>();
+    wallet->setPassphrase(passphrase);
+    getWalletAuthenticatedStatus();
+}
+
+void QmlCommerce::generateKeyPair() {
+    auto wallet = DependencyManager::get<Wallet>();
+    wallet->generateKeyPair();
+    getWalletAuthenticatedStatus();
+}
+
+void QmlCommerce::reset() {
+    auto ledger = DependencyManager::get<Ledger>();
+    auto wallet = DependencyManager::get<Wallet>();
+    ledger->reset();
+    wallet->reset();
+}
+
+void QmlCommerce::account() {
+    auto ledger = DependencyManager::get<Ledger>();
+    ledger->account();
+}
+
+void QmlCommerce::certificateInfo(const QString& certificateId) {
+    auto ledger = DependencyManager::get<Ledger>();
+    ledger->certificateInfo(certificateId);
+}
diff --git a/interface/src/commerce/QmlCommerce.h b/interface/src/commerce/QmlCommerce.h
new file mode 100644
index 0000000000..d4f4aa35d2
--- /dev/null
+++ b/interface/src/commerce/QmlCommerce.h
@@ -0,0 +1,73 @@
+//
+//  QmlCommerce.h
+//  interface/src/commerce
+//
+//  Guard for safe use of Commerce (Wallet, Ledger) by authorized QML.
+//
+//  Created by Howard Stearns on 8/4/17.
+//  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
+//
+
+#pragma once
+#ifndef hifi_QmlCommerce_h
+#define hifi_QmlCommerce_h
+
+#include <QJsonObject>
+#include <OffscreenQmlDialog.h>
+
+#include <QPixmap>
+
+class QmlCommerce : public OffscreenQmlDialog {
+    Q_OBJECT
+    HIFI_QML_DECL
+
+public:
+    QmlCommerce(QQuickItem* parent = nullptr);
+
+signals:
+    void walletStatusResult(uint walletStatus);
+
+    void loginStatusResult(bool isLoggedIn);
+    void keyFilePathIfExistsResult(const QString& path);
+    void securityImageResult(bool exists);
+    void walletAuthenticatedStatusResult(bool isAuthenticated);
+    void changePassphraseStatusResult(bool changeSuccess);
+
+    void buyResult(QJsonObject result);
+    // Balance and Inventory are NOT properties, because QML can't change them (without risk of failure), and
+    // because we can't scalably know of out-of-band changes (e.g., another machine interacting with the block chain).
+    void balanceResult(QJsonObject result);
+    void inventoryResult(QJsonObject result);
+    void historyResult(QJsonObject result);
+    void accountResult(QJsonObject result);
+    void certificateInfoResult(QJsonObject result);
+
+    void updateCertificateStatus(const QString& certID, uint certStatus);
+
+protected:
+    Q_INVOKABLE void getWalletStatus();
+
+    Q_INVOKABLE void getLoginStatus();
+    Q_INVOKABLE void getKeyFilePathIfExists();
+    Q_INVOKABLE void getSecurityImage();
+    Q_INVOKABLE void getWalletAuthenticatedStatus();
+
+    Q_INVOKABLE void chooseSecurityImage(const QString& imageFile);
+    Q_INVOKABLE void setPassphrase(const QString& passphrase);
+    Q_INVOKABLE void changePassphrase(const QString& oldPassphrase, const QString& newPassphrase);
+
+    Q_INVOKABLE void buy(const QString& assetId, int cost, const bool controlledFailure = false);
+    Q_INVOKABLE void balance();
+    Q_INVOKABLE void inventory();
+    Q_INVOKABLE void history();
+    Q_INVOKABLE void generateKeyPair();
+    Q_INVOKABLE void reset();
+    Q_INVOKABLE void account();
+
+    Q_INVOKABLE void certificateInfo(const QString& certificateId);
+};
+
+#endif // hifi_QmlCommerce_h
diff --git a/interface/src/commerce/Wallet.cpp b/interface/src/commerce/Wallet.cpp
new file mode 100644
index 0000000000..85632ff8f1
--- /dev/null
+++ b/interface/src/commerce/Wallet.cpp
@@ -0,0 +1,821 @@
+//
+//  Wallet.cpp
+//  interface/src/commerce
+//
+//  Created by Howard Stearns on 8/4/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include "CommerceLogging.h"
+#include "Ledger.h"
+#include "Wallet.h"
+#include "Application.h"
+#include "ui/ImageProvider.h"
+#include "scripting/HMDScriptingInterface.h"
+
+#include <PathUtils.h>
+#include <OffscreenUi.h>
+#include <AccountManager.h>
+
+#include <QFile>
+#include <QCryptographicHash>
+#include <QQmlContext>
+#include <QBuffer>
+
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+#include <openssl/rsa.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
+#include <openssl/evp.h>
+#include <openssl/aes.h>
+
+// I know, right?  But per https://www.openssl.org/docs/faq.html
+// this avoids OPENSSL_Uplink(00007FF847238000,08): no OPENSSL_Applink
+// at runtime.
+#ifdef Q_OS_WIN
+#include <openssl/applink.c>
+#endif
+
+static const char* KEY_FILE = "hifikey";
+static const char* INSTRUCTIONS_FILE = "backup_instructions.html";
+static const char* IMAGE_HEADER = "-----BEGIN SECURITY IMAGE-----\n";
+static const char* IMAGE_FOOTER = "-----END SECURITY IMAGE-----\n";
+
+void initialize() {
+    static bool initialized = false;
+    if (!initialized) {
+        SSL_load_error_strings();
+        SSL_library_init();
+        OpenSSL_add_all_algorithms();
+        initialized = true;
+    }
+}
+
+QString keyFilePath() {
+    auto accountManager = DependencyManager::get<AccountManager>();
+    return PathUtils::getAppDataFilePath(QString("%1.%2").arg(accountManager->getAccountInfo().getUsername(), KEY_FILE));
+}
+
+// use the cached _passphrase if it exists, otherwise we need to prompt
+int passwordCallback(char* password, int maxPasswordSize, int rwFlag, void* u) {
+    // just return a hardcoded pwd for now
+    auto wallet = DependencyManager::get<Wallet>();
+    auto passphrase = wallet->getPassphrase();
+    if (passphrase && !passphrase->isEmpty()) {
+        QString saltedPassphrase(*passphrase);
+        saltedPassphrase.append(wallet->getSalt());
+        strcpy(password, saltedPassphrase.toUtf8().constData());
+        return static_cast<int>(passphrase->size());
+    } else {
+        // this shouldn't happen - so lets log it to tell us we have
+        // a problem with the flow...
+        qCCritical(commerce) << "no cached passphrase while decrypting!";
+        return 0;
+    }
+}
+
+RSA* readKeys(const char* filename) {
+    FILE* fp;
+    RSA* key = NULL;
+    if ((fp = fopen(filename, "rt"))) {
+        // file opened successfully
+        qCDebug(commerce) << "opened key file" << filename;
+        if ((key = PEM_read_RSAPublicKey(fp, NULL, NULL, NULL))) {
+            // now read private key
+
+            qCDebug(commerce) << "read public key";
+
+            if ((key = PEM_read_RSAPrivateKey(fp, &key, passwordCallback, NULL))) {
+                qCDebug(commerce) << "read private key";
+                fclose(fp);
+                return key;
+            }
+            qCDebug(commerce) << "failed to read private key";
+        } else {
+            qCDebug(commerce) << "failed to read public key";
+        }
+        fclose(fp);
+    } else {
+        qCDebug(commerce) << "failed to open key file" << filename;
+    }
+    return key;
+}
+
+bool Wallet::writeBackupInstructions() {
+    QString inputFilename(PathUtils::resourcesPath() + "html/commerce/backup_instructions.html");
+    QString outputFilename = PathUtils::getAppDataFilePath(INSTRUCTIONS_FILE);
+    QFile outputFile(outputFilename);
+    bool retval = false;
+
+    if (QFile::exists(outputFilename) || getKeyFilePath() == "")
+    {
+        return false;
+    }
+    QFile::copy(inputFilename, outputFilename);
+
+    if (QFile::exists(outputFilename) && outputFile.open(QIODevice::ReadWrite)) {
+
+        QByteArray fileData = outputFile.readAll();
+        QString text(fileData);
+
+        text.replace(QString("HIFIKEY_PATH_REPLACEME"), keyFilePath());
+
+        outputFile.seek(0); // go to the beginning of the file
+        outputFile.write(text.toUtf8()); // write the new text back to the file
+
+        outputFile.close(); // close the file handle.
+
+        retval = true;
+        qCDebug(commerce) << "wrote html file successfully";
+    } else {
+        qCDebug(commerce) << "failed to open output html file" << outputFilename;
+    }
+    return retval;
+}
+
+bool writeKeys(const char* filename, RSA* keys) {
+    FILE* fp;
+    bool retval = false;
+    if ((fp = fopen(filename, "wt"))) {
+        if (!PEM_write_RSAPublicKey(fp, keys)) {
+            fclose(fp);
+            qCDebug(commerce) << "failed to write public key";
+            QFile(QString(filename)).remove();
+            return retval;
+        }
+
+        if (!PEM_write_RSAPrivateKey(fp, keys, EVP_des_ede3_cbc(), NULL, 0, passwordCallback, NULL)) {
+            fclose(fp);
+            qCDebug(commerce) << "failed to write private key";
+            QFile(QString(filename)).remove();
+            return retval;
+        }
+
+        retval = true;
+        qCDebug(commerce) << "wrote keys successfully";
+        fclose(fp);
+    } else {
+        qCDebug(commerce) << "failed to open key file" << filename;
+    }
+    return retval;
+}
+
+// copied (without emits for various signals) from libraries/networking/src/RSAKeypairGenerator.cpp.
+// We will have a different implementation in practice, but this gives us a start for now
+//
+// TODO: we don't really use the private keys returned - we can see how this evolves, but probably
+// we should just return a list of public keys?
+// or perhaps return the RSA* instead?
+QPair<QByteArray*, QByteArray*> generateRSAKeypair() {
+
+    RSA* keyPair = RSA_new();
+    BIGNUM* exponent = BN_new();
+    QPair<QByteArray*, QByteArray*> retval;
+
+    const unsigned long RSA_KEY_EXPONENT = 65537;
+    BN_set_word(exponent, RSA_KEY_EXPONENT);
+
+    // seed the random number generator before we call RSA_generate_key_ex
+    srand(time(NULL));
+
+    const int RSA_KEY_BITS = 2048;
+
+    if (!RSA_generate_key_ex(keyPair, RSA_KEY_BITS, exponent, NULL)) {
+        qCDebug(commerce) << "Error generating 2048-bit RSA Keypair -" << ERR_get_error();
+
+        // we're going to bust out of here but first we cleanup the BIGNUM
+        BN_free(exponent);
+        return retval;
+    }
+
+    // we don't need the BIGNUM anymore so clean that up
+    BN_free(exponent);
+
+    // grab the public key and private key from the file
+    unsigned char* publicKeyDER = NULL;
+    int publicKeyLength = i2d_RSAPublicKey(keyPair, &publicKeyDER);
+
+    unsigned char* privateKeyDER = NULL;
+    int privateKeyLength = i2d_RSAPrivateKey(keyPair, &privateKeyDER);
+
+    if (publicKeyLength <= 0 || privateKeyLength <= 0) {
+        qCDebug(commerce) << "Error getting DER public or private key from RSA struct -" << ERR_get_error();
+
+
+        // cleanup the RSA struct
+        RSA_free(keyPair);
+
+        // cleanup the public and private key DER data, if required
+        if (publicKeyLength > 0) {
+            OPENSSL_free(publicKeyDER);
+        }
+
+        if (privateKeyLength > 0) {
+            OPENSSL_free(privateKeyDER);
+        }
+
+        return retval;
+    }
+
+
+    if (!writeKeys(keyFilePath().toStdString().c_str(), keyPair)) {
+        qCDebug(commerce) << "couldn't save keys!";
+        return retval;
+    }
+
+    RSA_free(keyPair);
+
+    // prepare the return values.  TODO: Fix this - we probably don't really even want the
+    // private key at all (better to read it when we need it?).  Or maybe we do, when we have
+    // multiple keys?
+    retval.first = new QByteArray(reinterpret_cast<char*>(publicKeyDER), publicKeyLength ),
+    retval.second = new QByteArray(reinterpret_cast<char*>(privateKeyDER), privateKeyLength );
+
+    // cleanup the publicKeyDER and publicKeyDER data
+    OPENSSL_free(publicKeyDER);
+    OPENSSL_free(privateKeyDER);
+    return retval;
+}
+// END copied code (which will soon change)
+
+// the public key can just go into a byte array
+QByteArray readPublicKey(const char* filename) {
+    FILE* fp;
+    RSA* key = NULL;
+    if ((fp = fopen(filename, "r"))) {
+        // file opened successfully
+        qCDebug(commerce) << "opened key file" << filename;
+        if ((key = PEM_read_RSAPublicKey(fp, NULL, NULL, NULL))) {
+            // file read successfully
+            unsigned char* publicKeyDER = NULL;
+            int publicKeyLength = i2d_RSAPublicKey(key, &publicKeyDER);
+            // TODO: check for 0 length?
+
+            // cleanup
+            RSA_free(key);
+            fclose(fp);
+
+            qCDebug(commerce) << "parsed public key file successfully";
+
+            QByteArray retval((char*)publicKeyDER, publicKeyLength);
+            OPENSSL_free(publicKeyDER);
+            return retval;
+        } else {
+            qCDebug(commerce) << "couldn't parse" << filename;
+        }
+        fclose(fp);
+    } else {
+        qCDebug(commerce) << "couldn't open" << filename;
+    }
+    return QByteArray();
+}
+
+// the private key should be read/copied into heap memory.  For now, we need the RSA struct
+// so I'll return that.  Note we need to RSA_free(key) later!!!
+RSA* readPrivateKey(const char* filename) {
+    FILE* fp;
+    RSA* key = NULL;
+    if ((fp = fopen(filename, "r"))) {
+        // file opened successfully
+        qCDebug(commerce) << "opened key file" << filename;
+        if ((key = PEM_read_RSAPrivateKey(fp, &key, passwordCallback, NULL))) {
+            qCDebug(commerce) << "parsed private key file successfully";
+
+        } else {
+            qCDebug(commerce) << "couldn't parse" << filename;
+            // if the passphrase is wrong, then let's not cache it
+            DependencyManager::get<Wallet>()->setPassphrase("");
+        }
+        fclose(fp);
+    } else {
+        qCDebug(commerce) << "couldn't open" << filename;
+    }
+    return key;
+}
+
+// QT's QByteArray will convert to Base64 without any embedded newlines.  This just
+// writes it with embedded newlines, which is more readable.
+void outputBase64WithNewlines(QFile& file, const QByteArray& b64Array) {
+    for (int i = 0; i < b64Array.size(); i += 64) {
+        file.write(b64Array.mid(i, 64));
+        file.write("\n");
+    }
+}
+
+void initializeAESKeys(unsigned char* ivec, unsigned char* ckey, const QByteArray& salt) {
+    // use the ones in the wallet
+    auto wallet = DependencyManager::get<Wallet>();
+    memcpy(ivec, wallet->getIv(), 16);
+    memcpy(ckey, wallet->getCKey(), 32);
+}
+
+Wallet::Wallet() {
+    auto nodeList = DependencyManager::get<NodeList>();
+    auto ledger = DependencyManager::get<Ledger>();
+    auto& packetReceiver = nodeList->getPacketReceiver();
+
+    packetReceiver.registerListener(PacketType::ChallengeOwnership, this, "handleChallengeOwnershipPacket");
+    packetReceiver.registerListener(PacketType::ChallengeOwnershipRequest, this, "handleChallengeOwnershipPacket");
+
+    connect(ledger.data(), &Ledger::accountResult, this, [&]() {
+        auto wallet = DependencyManager::get<Wallet>();
+        auto walletScriptingInterface = DependencyManager::get<WalletScriptingInterface>();
+        uint status;
+
+        if (wallet->getKeyFilePath() == "" || !wallet->getSecurityImage()) {
+            status = (uint)WalletStatus::WALLET_STATUS_NOT_SET_UP;
+        } else if (!wallet->walletIsAuthenticatedWithPassphrase()) {
+            status = (uint)WalletStatus::WALLET_STATUS_NOT_AUTHENTICATED;
+        } else {
+            status = (uint)WalletStatus::WALLET_STATUS_READY;
+        }
+
+        walletScriptingInterface->setWalletStatus(status);
+        emit walletStatusResult(status);
+    });
+
+    auto accountManager = DependencyManager::get<AccountManager>();
+    connect(accountManager.data(), &AccountManager::usernameChanged, this, [&]() {
+        getWalletStatus();
+    });
+}
+
+Wallet::~Wallet() {
+    if (_securityImage) {
+        delete _securityImage;
+    }
+}
+
+bool Wallet::setPassphrase(const QString& passphrase) {
+    if (_passphrase) {
+        delete _passphrase;
+    }
+    _passphrase = new QString(passphrase);
+
+    _publicKeys.clear();
+
+    writeBackupInstructions();
+
+    return true;
+}
+
+bool Wallet::writeSecurityImage(const QPixmap* pixmap, const QString& outputFilePath) {
+    // aes requires a couple 128-bit keys (ckey and ivec).  For now, I'll just
+    // use the md5 of the salt as the ckey (md5 is 128-bit), and ivec will be
+    // a constant.  We can review this later - there are ways to generate keys
+    // from a password that may be better.
+    unsigned char ivec[16];
+    unsigned char ckey[32];
+
+    initializeAESKeys(ivec, ckey, _salt);
+
+    int tempSize, outSize;
+    QByteArray inputFileBuffer;
+    QBuffer buffer(&inputFileBuffer);
+    buffer.open(QIODevice::WriteOnly);
+
+    // another spot where we are assuming only jpgs
+    pixmap->save(&buffer, "jpg");
+
+    // reserve enough capacity for encrypted bytes
+    unsigned char* outputFileBuffer = new unsigned char[inputFileBuffer.size() + AES_BLOCK_SIZE];
+
+    EVP_CIPHER_CTX* ctx = EVP_CIPHER_CTX_new();
+
+    // TODO: add error handling!!!
+    if (!EVP_EncryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, ckey, ivec)) {
+        qCDebug(commerce) << "encrypt init failure";
+        delete[] outputFileBuffer;
+        return false;
+    }
+    if (!EVP_EncryptUpdate(ctx, outputFileBuffer, &tempSize, (unsigned char*)inputFileBuffer.data(), inputFileBuffer.size())) {
+        qCDebug(commerce) << "encrypt update failure";
+        delete[] outputFileBuffer;
+        return false;
+    }
+    outSize = tempSize;
+    if (!EVP_EncryptFinal_ex(ctx, outputFileBuffer + outSize, &tempSize)) {
+        qCDebug(commerce) << "encrypt final failure";
+        delete[] outputFileBuffer;
+        return false;
+    }
+
+    outSize += tempSize;
+    EVP_CIPHER_CTX_free(ctx);
+    qCDebug(commerce) << "encrypted buffer size" << outSize;
+    QByteArray output((const char*)outputFileBuffer, outSize);
+
+    // now APPEND to the file,
+    QByteArray b64output = output.toBase64();
+    QFile outputFile(outputFilePath);
+    outputFile.open(QIODevice::Append);
+    outputFile.write(IMAGE_HEADER);
+    outputBase64WithNewlines(outputFile, b64output);
+    outputFile.write(IMAGE_FOOTER);
+    outputFile.close();
+
+    delete[] outputFileBuffer;
+    return true;
+}
+
+bool Wallet::readSecurityImage(const QString& inputFilePath, unsigned char** outputBufferPtr, int* outputBufferSize) {
+    unsigned char ivec[16];
+    unsigned char ckey[32];
+    initializeAESKeys(ivec, ckey, _salt);
+
+    // read encrypted file
+    QFile inputFile(inputFilePath);
+    if (!inputFile.exists()) {
+        qCDebug(commerce) << "cannot decrypt file" << inputFilePath << "it doesn't exist";
+        return false;
+    }
+    inputFile.open(QIODevice::ReadOnly | QIODevice::Text);
+    bool foundHeader = false;
+    bool foundFooter = false;
+
+    QByteArray base64EncryptedBuffer;
+
+    while (!inputFile.atEnd()) {
+        QString line(inputFile.readLine());
+        if (!foundHeader) {
+            foundHeader = (line == IMAGE_HEADER);
+        } else {
+            foundFooter = (line == IMAGE_FOOTER);
+            if (!foundFooter) {
+                base64EncryptedBuffer.append(line);
+            }
+        }
+    }
+    inputFile.close();
+    if (! (foundHeader && foundFooter)) {
+        qCDebug(commerce) << "couldn't parse" << inputFilePath << foundHeader << foundFooter;
+        return false;
+    }
+
+    // convert to bytes
+    auto encryptedBuffer = QByteArray::fromBase64(base64EncryptedBuffer);
+
+    // setup decrypted buffer
+    unsigned char* outputBuffer = new unsigned char[encryptedBuffer.size()];
+    int tempSize;
+
+    // TODO: add error handling
+    EVP_CIPHER_CTX* ctx = EVP_CIPHER_CTX_new();
+    if (!EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, ckey, ivec)) {
+        qCDebug(commerce) << "decrypt init failure";
+        delete[] outputBuffer;
+        return false;
+    }
+    if (!EVP_DecryptUpdate(ctx, outputBuffer, &tempSize, (unsigned char*)encryptedBuffer.data(), encryptedBuffer.size())) {
+        qCDebug(commerce) << "decrypt update failure";
+        delete[] outputBuffer;
+        return false;
+    }
+    *outputBufferSize = tempSize;
+    if (!EVP_DecryptFinal_ex(ctx, outputBuffer + tempSize, &tempSize)) {
+        qCDebug(commerce) << "decrypt final failure";
+        delete[] outputBuffer;
+        return false;
+    }
+    EVP_CIPHER_CTX_free(ctx);
+    *outputBufferSize += tempSize;
+    *outputBufferPtr = outputBuffer;
+    qCDebug(commerce) << "decrypted buffer size" << *outputBufferSize;
+    return true;
+}
+
+bool Wallet::walletIsAuthenticatedWithPassphrase() {
+    // try to read existing keys if they exist...
+
+    // FIXME: initialize OpenSSL elsewhere soon
+    initialize();
+
+    // this should always be false if we don't have a passphrase
+    // cached yet
+    if (!_passphrase || _passphrase->isEmpty()) {
+        return false;
+    }
+    if (_publicKeys.count() > 0) {
+        // we _must_ be authenticated if the publicKeys are there
+        return true;
+    }
+
+    // otherwise, we have a passphrase but no keys, so we have to check
+    auto publicKey = readPublicKey(keyFilePath().toStdString().c_str());
+
+    if (publicKey.size() > 0) {
+        if (auto key = readPrivateKey(keyFilePath().toStdString().c_str())) {
+            RSA_free(key);
+
+            // be sure to add the public key so we don't do this over and over
+            _publicKeys.push_back(publicKey.toBase64());
+            return true;
+        }
+    }
+
+    return false;
+}
+
+bool Wallet::generateKeyPair() {
+    // FIXME: initialize OpenSSL elsewhere soon
+    initialize();
+
+    qCInfo(commerce) << "Generating keypair.";
+    auto keyPair = generateRSAKeypair();
+
+    writeBackupInstructions();
+
+    // TODO: redo this soon -- need error checking and so on
+    writeSecurityImage(_securityImage, keyFilePath());
+    QString oldKey = _publicKeys.count() == 0 ? "" : _publicKeys.last();
+    QString key = keyPair.first->toBase64();
+    _publicKeys.push_back(key);
+    qCDebug(commerce) << "public key:" << key;
+
+    // It's arguable whether we want to change the receiveAt every time, but:
+    // 1. It's certainly needed the first time, when createIfNeeded answers true.
+    // 2. It is maximally private, and we can step back from that later if desired.
+    // 3. It maximally exercises all the machinery, so we are most likely to surface issues now.
+    auto ledger = DependencyManager::get<Ledger>();
+    return ledger->receiveAt(key, oldKey);
+}
+
+QStringList Wallet::listPublicKeys() {
+    qCInfo(commerce) << "Enumerating public keys.";
+    return _publicKeys;
+}
+
+// for now a copy of how we sign in libraries/networking/src/DataServerAccountInfo -
+// we sha256 the text, read the private key from disk (for now!), and return the signed
+// sha256.  Note later with multiple keys, we may need the key parameter (or something
+// similar) so I left it alone for now.  Also this will probably change when we move
+// away from RSA keys anyways.  Note that since this returns a QString, we better avoid
+// the horror of code pages and so on (changing the bytes) by just returning a base64
+// encoded string representing the signature (suitable for http, etc...)
+QString Wallet::signWithKey(const QByteArray& text, const QString& key) {
+    qCInfo(commerce) << "Signing text.";
+    RSA* rsaPrivateKey = NULL;
+    if ((rsaPrivateKey = readPrivateKey(keyFilePath().toStdString().c_str()))) {
+        QByteArray signature(RSA_size(rsaPrivateKey), 0);
+        unsigned int signatureBytes = 0;
+
+        QByteArray hashedPlaintext = QCryptographicHash::hash(text, QCryptographicHash::Sha256);
+
+        int encryptReturn = RSA_sign(NID_sha256,
+                reinterpret_cast<const unsigned char*>(hashedPlaintext.constData()),
+                hashedPlaintext.size(),
+                reinterpret_cast<unsigned char*>(signature.data()),
+                &signatureBytes,
+                rsaPrivateKey);
+
+        // free the private key RSA struct now that we are done with it
+        RSA_free(rsaPrivateKey);
+
+        if (encryptReturn != -1) {
+            return signature.toBase64();
+        }
+    }
+    return QString();
+}
+
+void Wallet::updateImageProvider() {
+    // inform the image provider.  Note it doesn't matter which one you inform, as the
+    // images are statics
+    auto engine = DependencyManager::get<OffscreenUi>()->getSurfaceContext()->engine();
+    auto imageProvider = reinterpret_cast<ImageProvider*>(engine->imageProvider(ImageProvider::PROVIDER_NAME));
+    imageProvider->setSecurityImage(_securityImage);
+}
+
+void Wallet::chooseSecurityImage(const QString& filename) {
+
+    if (_securityImage) {
+        delete _securityImage;
+    }
+    QString path = qApp->applicationDirPath();
+    path.append("/resources/qml/hifi/commerce/wallet/");
+    path.append(filename);
+
+    // now create a new security image pixmap
+    _securityImage = new QPixmap();
+
+    qCDebug(commerce) << "loading data for pixmap from" << path;
+    _securityImage->load(path);
+
+    // update the image now
+    updateImageProvider();
+
+    // we could be choosing the _inital_ security image.  If so, there
+    // will be no hifikey file yet.  If that is the case, we are done.  If
+    // there _is_ a keyfile, we need to update it (similar to changing the
+    // passphrase, we need to do so into a temp file and move it).
+    if (!QFile(keyFilePath()).exists()) {
+        emit securityImageResult(true);
+        return;
+    }
+
+    bool success = writeWallet();
+    emit securityImageResult(success);
+}
+
+bool Wallet::getSecurityImage() {
+    unsigned char* data;
+    int dataLen;
+
+    // if already decrypted, don't do it again
+    if (_securityImage) {
+        emit securityImageResult(true);
+        return true;
+    }
+
+    bool success = false;
+    // decrypt and return.  Don't bother if we have no file to decrypt, or
+    // no salt set yet.
+    QFileInfo fileInfo(keyFilePath());
+    if (fileInfo.exists() && _salt.size() > 0 && readSecurityImage(keyFilePath(), &data, &dataLen)) {
+        // create the pixmap
+        _securityImage = new QPixmap();
+        _securityImage->loadFromData(data, dataLen, "jpg");
+        qCDebug(commerce) << "created pixmap from encrypted file";
+
+        updateImageProvider();
+
+        delete[] data;
+        success = true;
+    }
+    emit securityImageResult(success);
+    return success;
+}
+QString Wallet::getKeyFilePath() {
+    QString filePath(keyFilePath());
+    QFileInfo fileInfo(filePath);
+    if (fileInfo.exists()) {
+        return filePath;
+    } else {
+        return "";
+    }
+}
+
+void Wallet::reset() {
+    _publicKeys.clear();
+
+    delete _securityImage;
+    _securityImage = nullptr;
+
+    // tell the provider we got nothing
+    updateImageProvider();
+    _passphrase->clear();
+
+
+    QFile keyFile(keyFilePath());
+    keyFile.remove();
+}
+bool Wallet::writeWallet(const QString& newPassphrase) {
+    RSA* keys = readKeys(keyFilePath().toStdString().c_str());
+    if (keys) {
+        // we read successfully, so now write to a new temp file
+        QString tempFileName = QString("%1.%2").arg(keyFilePath(), QString("temp"));
+        QString oldPassphrase = *_passphrase;
+        if (!newPassphrase.isEmpty()) {
+            setPassphrase(newPassphrase);
+        }
+        if (writeKeys(tempFileName.toStdString().c_str(), keys)) {
+            if (writeSecurityImage(_securityImage, tempFileName)) {
+                // ok, now move the temp file to the correct spot
+                QFile(QString(keyFilePath())).remove();
+                QFile(tempFileName).rename(QString(keyFilePath()));
+                qCDebug(commerce) << "wallet written successfully";
+                emit keyFilePathIfExistsResult(getKeyFilePath());
+                return true;
+            } else {
+                qCDebug(commerce) << "couldn't write security image to temp wallet";
+            }
+        } else {
+            qCDebug(commerce) << "couldn't write keys to temp wallet";
+        }
+        // if we are here, we failed, so cleanup
+        QFile(tempFileName).remove();
+        if (!newPassphrase.isEmpty()) {
+            setPassphrase(oldPassphrase);
+        }
+
+    } else {
+        qCDebug(commerce) << "couldn't read wallet - bad passphrase?";
+        // TODO: review this, but it seems best to reset the passphrase
+        // since we couldn't decrypt the existing wallet (or is doesn't
+        // exist perhaps).
+        setPassphrase("");
+    }
+    return false;
+}
+
+bool Wallet::changePassphrase(const QString& newPassphrase) {
+    qCDebug(commerce) << "changing passphrase";
+    return writeWallet(newPassphrase);
+}
+
+void Wallet::handleChallengeOwnershipPacket(QSharedPointer<ReceivedMessage> packet, SharedNodePointer sendingNode) {
+    auto nodeList = DependencyManager::get<NodeList>();
+
+    bool challengeOriginatedFromClient = packet->getType() == PacketType::ChallengeOwnershipRequest;
+    unsigned char decryptedText[64];
+    int certIDByteArraySize;
+    int encryptedTextByteArraySize;
+    int challengingNodeUUIDByteArraySize;
+
+    packet->readPrimitive(&certIDByteArraySize);
+    packet->readPrimitive(&encryptedTextByteArraySize);
+    if (challengeOriginatedFromClient) {
+        packet->readPrimitive(&challengingNodeUUIDByteArraySize);
+    }
+
+    QByteArray certID = packet->read(certIDByteArraySize);
+    QByteArray encryptedText = packet->read(encryptedTextByteArraySize);
+    QByteArray challengingNodeUUID;
+    if (challengeOriginatedFromClient) {
+        challengingNodeUUID = packet->read(challengingNodeUUIDByteArraySize);
+    }
+
+    RSA* rsa = readKeys(keyFilePath().toStdString().c_str());
+    int decryptionStatus = -1;
+
+    if (rsa) {
+        ERR_clear_error();
+        decryptionStatus = RSA_private_decrypt(encryptedTextByteArraySize,
+            reinterpret_cast<const unsigned char*>(encryptedText.constData()),
+            decryptedText,
+            rsa,
+            RSA_PKCS1_OAEP_PADDING);
+
+        RSA_free(rsa);
+    } else {
+        qCDebug(commerce) << "During entity ownership challenge, creating the RSA object failed.";
+    }
+
+    QByteArray decryptedTextByteArray;
+    if (decryptionStatus > -1) {
+        decryptedTextByteArray = QByteArray(reinterpret_cast<const char*>(decryptedText), decryptionStatus);
+    }
+    int decryptedTextByteArraySize = decryptedTextByteArray.size();
+    int certIDSize = certID.size();
+    // setup the packet
+    if (challengeOriginatedFromClient) {
+        auto decryptedTextPacket = NLPacket::create(PacketType::ChallengeOwnershipReply,
+            certIDSize + decryptedTextByteArraySize + challengingNodeUUIDByteArraySize + 3 * sizeof(int),
+            true);
+
+        decryptedTextPacket->writePrimitive(certIDSize);
+        decryptedTextPacket->writePrimitive(decryptedTextByteArraySize);
+        decryptedTextPacket->writePrimitive(challengingNodeUUIDByteArraySize);
+        decryptedTextPacket->write(certID);
+        decryptedTextPacket->write(decryptedTextByteArray);
+        decryptedTextPacket->write(challengingNodeUUID);
+
+        qCDebug(commerce) << "Sending ChallengeOwnershipReply Packet containing decrypted text" << decryptedTextByteArray << "for CertID" << certID;
+
+        nodeList->sendPacket(std::move(decryptedTextPacket), *sendingNode);
+    } else {
+        auto decryptedTextPacket = NLPacket::create(PacketType::ChallengeOwnership, certIDSize + decryptedTextByteArraySize + 2 * sizeof(int), true);
+
+        decryptedTextPacket->writePrimitive(certIDSize);
+        decryptedTextPacket->writePrimitive(decryptedTextByteArraySize);
+        decryptedTextPacket->write(certID);
+        decryptedTextPacket->write(decryptedTextByteArray);
+
+        qCDebug(commerce) << "Sending ChallengeOwnership Packet containing decrypted text" << decryptedTextByteArray << "for CertID" << certID;
+
+        nodeList->sendPacket(std::move(decryptedTextPacket), *sendingNode);
+    }
+
+    if (decryptionStatus == -1) {
+        qCDebug(commerce) << "During entity ownership challenge, decrypting the encrypted text failed.";
+        long error = ERR_get_error();
+        if (error != 0) {
+            const char* error_str = ERR_error_string(error, NULL);
+            qCWarning(entities) << "RSA error:" << error_str;
+        }
+    }
+}
+
+void Wallet::account() {
+    auto ledger = DependencyManager::get<Ledger>();
+    ledger->account();
+}
+
+void Wallet::getWalletStatus() {
+    auto walletScriptingInterface = DependencyManager::get<WalletScriptingInterface>();
+    uint status;
+
+    if (DependencyManager::get<AccountManager>()->isLoggedIn()) {
+        // This will set account info for the wallet, allowing us to decrypt and display the security image.
+        account();
+    } else {
+        status = (uint)WalletStatus::WALLET_STATUS_NOT_LOGGED_IN;
+        emit walletStatusResult(status);
+        walletScriptingInterface->setWalletStatus(status);
+        return;
+    }
+}
diff --git a/interface/src/commerce/Wallet.h b/interface/src/commerce/Wallet.h
new file mode 100644
index 0000000000..ed145df451
--- /dev/null
+++ b/interface/src/commerce/Wallet.h
@@ -0,0 +1,88 @@
+//
+//  Wallet.h
+//  interface/src/commerce
+//
+//  API for secure keypair management
+//
+//  Created by Howard Stearns on 8/4/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_Wallet_h
+#define hifi_Wallet_h
+
+#include <DependencyManager.h>
+#include <Node.h>
+#include <ReceivedMessage.h>
+#include "scripting/WalletScriptingInterface.h"
+
+#include <QPixmap>
+
+class Wallet : public QObject, public Dependency {
+    Q_OBJECT
+    SINGLETON_DEPENDENCY
+
+public:
+    Wallet();
+    ~Wallet();
+    // These are currently blocking calls, although they might take a moment.
+    bool generateKeyPair();
+    QStringList listPublicKeys();
+    QString signWithKey(const QByteArray& text, const QString& key);
+    void chooseSecurityImage(const QString& imageFile);
+    bool getSecurityImage();
+    QString getKeyFilePath();
+
+    void setSalt(const QByteArray& salt) { _salt = salt; }
+    QByteArray getSalt() { return _salt; }
+    void setIv(const QByteArray& iv) { _iv = iv; }
+    QByteArray getIv() { return _iv; }
+    void setCKey(const QByteArray& ckey) { _ckey = ckey; }
+    QByteArray getCKey() { return _ckey; }
+
+    bool setPassphrase(const QString& passphrase);
+    QString* getPassphrase() { return _passphrase; }
+    bool getPassphraseIsCached() { return !(_passphrase->isEmpty()); }
+    bool walletIsAuthenticatedWithPassphrase();
+    bool changePassphrase(const QString& newPassphrase);
+
+    void reset();
+
+    void getWalletStatus();
+    enum WalletStatus {
+        WALLET_STATUS_NOT_LOGGED_IN = 0,
+        WALLET_STATUS_NOT_SET_UP,
+        WALLET_STATUS_NOT_AUTHENTICATED,
+        WALLET_STATUS_READY
+    };
+
+signals:
+    void securityImageResult(bool exists);
+    void keyFilePathIfExistsResult(const QString& path);
+
+    void walletStatusResult(uint walletStatus);
+
+private slots:
+    void handleChallengeOwnershipPacket(QSharedPointer<ReceivedMessage> packet, SharedNodePointer sendingNode);
+
+private:
+    QStringList _publicKeys{};
+    QPixmap* _securityImage { nullptr };
+    QByteArray _salt;
+    QByteArray _iv;
+    QByteArray _ckey;
+    QString* _passphrase { new QString("") };
+
+    bool writeWallet(const QString& newPassphrase = QString(""));
+    void updateImageProvider();
+    bool writeSecurityImage(const QPixmap* pixmap, const QString& outputFilePath);
+    bool readSecurityImage(const QString& inputFilePath, unsigned char** outputBufferPtr, int* outputBufferLen);
+    bool writeBackupInstructions();
+
+    void account();
+};
+
+#endif // hifi_Wallet_h
diff --git a/interface/src/devices/Leapmotion.cpp b/interface/src/devices/Leapmotion.cpp
deleted file mode 100644
index c643042300..0000000000
--- a/interface/src/devices/Leapmotion.cpp
+++ /dev/null
@@ -1,246 +0,0 @@
-//
-//  Created by Sam Cake on 6/2/2014
-//  Copyright 2014 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 "Leapmotion.h"
-
-#include <NumericalConstants.h>
-
-#include "Menu.h"
-
-const int PALMROOT_NUM_JOINTS = 3;
-const int FINGER_NUM_JOINTS = 4;
-const int HAND_NUM_JOINTS = FINGER_NUM_JOINTS*5+PALMROOT_NUM_JOINTS;
-
-const DeviceTracker::Name Leapmotion::NAME = "Leapmotion";
-
-// find the index of a joint from
-// the side: true = right
-// the finger & the bone:
-//             finger in [0..4] : bone in  [0..3] a finger phalange
-//             [-1]   up the hand branch : bone in [0..2] <=> [ hand, forearm, arm]
-MotionTracker::Index evalJointIndex(bool isRightSide, int finger, int bone) {
-
-    MotionTracker::Index offset = 1                                     // start after root
-                                + (int(isRightSide) * HAND_NUM_JOINTS)  // then offset for side
-                                + PALMROOT_NUM_JOINTS;                  // then add the arm/forearm/hand chain
-    if (finger >= 0) {
-        // from there go down in the correct finger and bone
-        return offset + (finger * FINGER_NUM_JOINTS) + bone;
-    } else {
-        // or go back up for the correct root bone
-        return offset - 1 - bone;
-    }
-}
-
-// static
-void Leapmotion::init() {
-    DeviceTracker* device = DeviceTracker::getDevice(NAME);
-
-    if (!device) {
-        // create a new Leapmotion and register it
-        Leapmotion* leap = new Leapmotion();
-        DeviceTracker::registerDevice(NAME, leap);
-    }
-}
-
-// static
-void Leapmotion::destroy() {
-    DeviceTracker::destroyDevice(NAME);
-}
-
-// static
-Leapmotion* Leapmotion::getInstance() {
-    DeviceTracker* device = DeviceTracker::getDevice(NAME);
-    if (!device) {
-        // create a new Leapmotion and register it
-        device = new Leapmotion();
-        DeviceTracker::registerDevice(NAME, device);
-    }
-    return dynamic_cast< Leapmotion* > (device);
-}
-
-Leapmotion::Leapmotion() :
-     MotionTracker(),
-    _active(false)
-{
-    // Create the Leapmotion joint hierarchy
-    std::vector< Semantic > sides;
-    sides.push_back("joint_L_");
-    sides.push_back("joint_R_");
-
-    std::vector< Semantic > rootBones;
-    rootBones.push_back("elbow");
-    rootBones.push_back("wrist");
-    rootBones.push_back("hand");
-
-    std::vector< Semantic > fingers;
-    fingers.push_back("thumb");
-    fingers.push_back("index");
-    fingers.push_back("middle");
-    fingers.push_back("ring");
-    fingers.push_back("pinky");
-
-    std::vector< Semantic > fingerBones;
-    fingerBones.push_back("1");
-    fingerBones.push_back("2");
-    fingerBones.push_back("3");
-    fingerBones.push_back("4");
-
-    std::vector< Index > palms;
-    for (unsigned int s = 0; s < sides.size(); s++) {
-        Index rootJoint = 0;
-        for (unsigned int rb = 0; rb < rootBones.size(); rb++) {
-            rootJoint = addJoint(sides[s] + rootBones[rb], rootJoint);
-        }
-
-        // capture the hand index for debug
-        palms.push_back(rootJoint);
-
-        for (unsigned int f = 0; f < fingers.size(); f++) {
-            for (unsigned int b = 0; b < fingerBones.size(); b++) {
-                rootJoint  = addJoint(sides[s] + fingers[f] + fingerBones[b], rootJoint);
-            }
-        }
-    }
-
-#ifdef HAVE_LEAPMOTION
-    if (Menu::getInstance()->isOptionChecked(MenuOption::LeapMotionOnHMD)) {
-        _controller.setPolicyFlags(Leap::Controller::POLICY_OPTIMIZE_HMD);
-    }
-#endif
-}
-
-Leapmotion::~Leapmotion() {
-}
-
-#ifdef HAVE_LEAPMOTION
-glm::quat quatFromLeapBase(float sideSign, const Leap::Matrix& basis) {
-
-    // fix the handness to right and always...
-    glm::vec3 xAxis = glm::normalize(sideSign * glm::vec3(basis.xBasis.x, basis.xBasis.y, basis.xBasis.z));
-    glm::vec3 yAxis = glm::normalize(glm::vec3(basis.yBasis.x, basis.yBasis.y, basis.yBasis.z));
-    glm::vec3 zAxis = glm::normalize(glm::vec3(basis.zBasis.x, basis.zBasis.y, basis.zBasis.z));
-
-    xAxis = glm::normalize(glm::cross(yAxis, zAxis));
-
-    glm::quat orientation = (glm::quat_cast(glm::mat3(xAxis, yAxis, zAxis)));
-    return orientation;
-}
-
-glm::vec3 vec3FromLeapVector(const Leap::Vector& vec) {
-    return glm::vec3(vec.x * METERS_PER_MILLIMETER, vec.y * METERS_PER_MILLIMETER, vec.z * METERS_PER_MILLIMETER);
-}
-
-#endif
-
-void Leapmotion::update() {
-#ifdef HAVE_LEAPMOTION
-    bool wasActive = _active;
-    _active = _controller.isConnected();
-
-    if (_active || wasActive) {
-        // Go through all the joints and increment their counter since last update.
-        // Increment all counters once after controller first becomes inactive so that each joint reports itself as inactive.
-        // TODO C++11 for (auto jointIt = _jointsArray.begin(); jointIt != _jointsArray.end(); jointIt++) {
-        for (JointTracker::Vector::iterator jointIt = _jointsArray.begin(); jointIt != _jointsArray.end(); jointIt++) {
-            (*jointIt).tickNewFrame();
-        }
-    }
-
-    if (!_active) {
-        return;
-    }
-
-    // Get the most recent frame and report some basic information
-    const Leap::Frame frame = _controller.frame();
-    static int64_t lastFrameID = -1;
-    int64_t newFrameID = frame.id();
-
-    // If too soon then exit
-    if (lastFrameID >= newFrameID)
-        return;
-
-    glm::vec3 delta(0.0f);
-    glm::quat handOri;
-    if (!frame.hands().isEmpty()) {
-        for (int handNum = 0; handNum < frame.hands().count(); handNum++) {
-
-            const Leap::Hand hand = frame.hands()[handNum];
-            int side = (hand.isRight() ? 1 : -1);
-
-            JointTracker* parentJointTracker = _jointsArray.data();
-
-
-            int rootBranchIndex = -1;
-
-            Leap::Arm arm = hand.arm();
-            if (arm.isValid()) {
-                glm::quat ori = quatFromLeapBase(float(side), arm.basis());
-                glm::vec3 pos = vec3FromLeapVector(arm.elbowPosition());
-                JointTracker* elbow = editJointTracker(evalJointIndex((side > 0), rootBranchIndex, 2)); // 2 is the index of the elbow joint
-                elbow->editAbsFrame().setTranslation(pos);
-                elbow->editAbsFrame().setRotation(ori);
-                elbow->updateLocFromAbsTransform(parentJointTracker);
-                elbow->activeFrame();
-                parentJointTracker = elbow;
-
-                pos = vec3FromLeapVector(arm.wristPosition());
-                JointTracker* wrist = editJointTracker(evalJointIndex((side > 0), rootBranchIndex, 1)); // 1 is the index of the wrist joint
-                wrist->editAbsFrame().setTranslation(pos);
-                wrist->editAbsFrame().setRotation(ori);
-                wrist->updateLocFromAbsTransform(parentJointTracker);
-                wrist->activeFrame();
-                parentJointTracker = wrist;
-            }
-
-            JointTracker* palmJoint = NULL;
-            {
-                glm::vec3 pos = vec3FromLeapVector(hand.palmPosition());
-                glm::quat ori = quatFromLeapBase(float(side), hand.basis());
-
-                palmJoint = editJointTracker(evalJointIndex((side > 0), rootBranchIndex, 0)); // 0 is the index of the palm joint
-                palmJoint->editAbsFrame().setTranslation(pos);
-                palmJoint->editAbsFrame().setRotation(ori);
-                palmJoint->updateLocFromAbsTransform(parentJointTracker);
-                palmJoint->activeFrame();
-            }
-            
-            // Check if the hand has any fingers
-            const Leap::FingerList fingers = hand.fingers();
-            if (!fingers.isEmpty()) {
-                // For every fingers in the list
-                for (int i = 0; i < fingers.count(); ++i) {
-                    // Reset the parent joint to the palmJoint for every finger traversal
-                    parentJointTracker = palmJoint;
-
-                    // surprisingly, Leap::Finger::Type start at 0 for thumb a until 4 for the pinky
-                    Index fingerIndex = evalJointIndex((side > 0), int(fingers[i].type()), 0);
-
-                    // let's update the finger's joints
-                    for (int b = 0; b < FINGER_NUM_JOINTS; b++) {
-                        Leap::Bone::Type type = Leap::Bone::Type(b + Leap::Bone::TYPE_METACARPAL);
-                        Leap::Bone bone = fingers[i].bone(type);
-                        JointTracker* ljointTracker = editJointTracker(fingerIndex + b);
-                        if (bone.isValid()) {
-                            Leap::Vector bp = bone.nextJoint();
-
-                            ljointTracker->editAbsFrame().setTranslation(vec3FromLeapVector(bp));
-                            ljointTracker->editAbsFrame().setRotation(quatFromLeapBase(float(side), bone.basis()));
-                            ljointTracker->updateLocFromAbsTransform(parentJointTracker);
-                            ljointTracker->activeFrame();
-                        }
-                        parentJointTracker = ljointTracker;
-                    }
-                }
-            }
-        }
-    }
-
-    lastFrameID = newFrameID;
-#endif
-}
diff --git a/interface/src/devices/Leapmotion.h b/interface/src/devices/Leapmotion.h
deleted file mode 100644
index a119821846..0000000000
--- a/interface/src/devices/Leapmotion.h
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-//  Created by Sam Cake on 6/2/2014
-//  Copyright 2014 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_Leapmotion_h
-#define hifi_Leapmotion_h
-
-#include <QDateTime>
-
-#include <trackers/MotionTracker.h>
-
-#ifdef HAVE_LEAPMOTION
-#include <Leap.h>
-#endif
-
-/// Handles interaction with the Leapmotion skeleton tracking suit.
-class Leapmotion : public MotionTracker {
-public:
-    static const Name NAME;
-
-    static void init();
-    static void destroy();
-
-    /// Leapmotion MotionTracker factory
-    static Leapmotion* getInstance();
-
-    bool isActive() const { return _active; }
-
-    virtual void update() override;
-
-protected:
-    Leapmotion();
-    virtual ~Leapmotion();
-
-private:
-#ifdef HAVE_LEAPMOTION
-    Leap::Listener _listener;
-    Leap::Controller _controller;
-#endif
-
-    bool _active;
-};
-
-#endif // hifi_Leapmotion_h
diff --git a/interface/src/main.cpp b/interface/src/main.cpp
index 42ceb756b9..5c07bebc23 100644
--- a/interface/src/main.cpp
+++ b/interface/src/main.cpp
@@ -49,6 +49,10 @@ int main(int argc, const char* argv[]) {
     CrashReporter crashReporter { BUG_SPLAT_DATABASE, BUG_SPLAT_APPLICATION_NAME, BuildInfo::VERSION };
 #endif
 
+#ifdef Q_OS_LINUX
+    QApplication::setAttribute(Qt::AA_DontUseNativeMenuBar);
+#endif
+
     disableQtBearerPoll(); // Fixes wifi ping spikes
 
     QElapsedTimer startupTime;
@@ -101,7 +105,7 @@ int main(int argc, const char* argv[]) {
     if (allowMultipleInstances) {
         instanceMightBeRunning = false;
     }
-    // this needs to be done here in main, as the mechanism for setting the 
+    // this needs to be done here in main, as the mechanism for setting the
     // scripts directory appears not to work.  See the bug report
     // https://highfidelity.fogbugz.com/f/cases/5759/Issues-changing-scripts-directory-in-ScriptsEngine
     if (parser.isSet(overrideScriptsPathOption)) {
@@ -111,20 +115,6 @@ int main(int argc, const char* argv[]) {
         }
     }
 
-    if (parser.isSet(overrideAppLocalDataPathOption)) {
-        // get dir to use for cache
-        QString cacheDir = parser.value(overrideAppLocalDataPathOption);
-        if (!cacheDir.isEmpty()) {
-            // tell everyone to use the right cache location
-            //
-            // this handles data8 and prepared
-            DependencyManager::get<ResourceManager>()->setCacheDir(cacheDir);
-
-            // this does the ktx_cache
-            PathUtils::getAppLocalDataPath(cacheDir);
-        }
-    }
-
     if (instanceMightBeRunning) {
         // Try to connect and send message to existing interface instance
         QLocalSocket socket;
@@ -158,25 +148,33 @@ int main(int argc, const char* argv[]) {
 #endif
     }
 
+
+    // FIXME this method of checking the OpenGL version screws up the `QOpenGLContext::globalShareContext()` value, which in turn
+    // leads to crashes when creating the real OpenGL instance.  Disabling for now until we come up with a better way of checking
+    // the GL version on the system without resorting to creating a full Qt application
+#if 0
     // Check OpenGL version.
     // This is done separately from the main Application so that start-up and shut-down logic within the main Application is
     // not made more complicated than it already is.
-    bool override = false;
+    bool overrideGLCheck = false;
+
     QJsonObject glData;
     {
         OpenGLVersionChecker openGLVersionChecker(argc, const_cast<char**>(argv));
         bool valid = true;
-        glData = openGLVersionChecker.checkVersion(valid, override);
+        glData = openGLVersionChecker.checkVersion(valid, overrideGLCheck);
         if (!valid) {
-            if (override) {
+            if (overrideGLCheck) {
                 auto glVersion = glData["version"].toString();
-                qCDebug(interfaceapp, "Running on insufficient OpenGL version: %s.", glVersion.toStdString().c_str());
+                qCWarning(interfaceapp, "Running on insufficient OpenGL version: %s.", glVersion.toStdString().c_str());
             } else {
-                qCDebug(interfaceapp, "Early exit due to OpenGL version.");
+                qCWarning(interfaceapp, "Early exit due to OpenGL version.");
                 return 0;
             }
         }
     }
+#endif
+
 
     // Debug option to demonstrate that the client's local time does not
     // need to be in sync with any other network node. This forces clock
@@ -230,10 +228,16 @@ int main(int argc, const char* argv[]) {
             SandboxUtils::runLocalSandbox(serverContentPath, true, noUpdater);
         }
 
-        Application app(argc, const_cast<char**>(argv), startupTime, runningMarkerExisted);
+        // Extend argv to enable WebGL rendering
+        std::vector<const char*> argvExtended(&argv[0], &argv[argc]);
+        argvExtended.push_back("--ignore-gpu-blacklist");
+        int argcExtended = (int)argvExtended.size();
 
+        Application app(argcExtended, const_cast<char**>(argvExtended.data()), startupTime, runningMarkerExisted);
+
+#if 0
         // If we failed the OpenGLVersion check, log it.
-        if (override) {
+        if (overrideGLcheck) {
             auto accountManager = DependencyManager::get<AccountManager>();
             if (accountManager->isLoggedIn()) {
                 UserActivityLogger::getInstance().insufficientGLVersion(glData);
@@ -247,6 +251,8 @@ int main(int argc, const char* argv[]) {
                 });
             }
         }
+#endif
+        
 
         // Setup local server
         QLocalServer server { &app };
diff --git a/interface/src/raypick/JointRayPick.cpp b/interface/src/raypick/JointRayPick.cpp
new file mode 100644
index 0000000000..cf3f380ca0
--- /dev/null
+++ b/interface/src/raypick/JointRayPick.cpp
@@ -0,0 +1,47 @@
+//
+//  JointRayPick.cpp
+//  interface/src/raypick
+//
+//  Created by Sam Gondelman 7/11/2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#include "JointRayPick.h"
+
+#include "avatar/AvatarManager.h"
+
+JointRayPick::JointRayPick(const std::string& jointName, const glm::vec3& posOffset, const glm::vec3& dirOffset, const RayPickFilter& filter, const float maxDistance, const bool enabled) :
+    RayPick(filter, maxDistance, enabled),
+    _jointName(jointName),
+    _posOffset(posOffset),
+    _dirOffset(dirOffset)
+{
+}
+
+const PickRay JointRayPick::getPickRay(bool& valid) const {
+    auto myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
+    int jointIndex = myAvatar->getJointIndex(QString::fromStdString(_jointName));
+    bool useAvatarHead = _jointName == "Avatar";
+    const int INVALID_JOINT = -1;
+    if (jointIndex != INVALID_JOINT || useAvatarHead) {
+        glm::vec3 jointPos = useAvatarHead ? myAvatar->getHeadPosition() : myAvatar->getAbsoluteJointTranslationInObjectFrame(jointIndex);
+        glm::quat jointRot = useAvatarHead ? myAvatar->getHeadOrientation() : myAvatar->getAbsoluteJointRotationInObjectFrame(jointIndex);
+        glm::vec3 avatarPos = myAvatar->getPosition();
+        glm::quat avatarRot = myAvatar->getOrientation();
+
+        glm::vec3 pos = useAvatarHead ? jointPos : avatarPos + (avatarRot * jointPos);
+        glm::quat rot = useAvatarHead ? jointRot * glm::angleAxis(-PI / 2.0f, Vectors::RIGHT) : avatarRot * jointRot;
+
+        // Apply offset
+        pos = pos + (rot * (myAvatar->getSensorToWorldScale() * _posOffset));
+        glm::vec3 dir = rot * glm::normalize(_dirOffset);
+
+        valid = true;
+        return PickRay(pos, dir);
+    }
+
+    valid = false;
+    return PickRay();
+}
diff --git a/interface/src/raypick/JointRayPick.h b/interface/src/raypick/JointRayPick.h
new file mode 100644
index 0000000000..e3e5670e20
--- /dev/null
+++ b/interface/src/raypick/JointRayPick.h
@@ -0,0 +1,30 @@
+//
+//  JointRayPick.h
+//  interface/src/raypick
+//
+//  Created by Sam Gondelman 7/11/2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#ifndef hifi_JointRayPick_h
+#define hifi_JointRayPick_h
+
+#include <pointers/rays/RayPick.h>
+
+class JointRayPick : public RayPick {
+
+public:
+    JointRayPick(const std::string& jointName, const glm::vec3& posOffset, const glm::vec3& dirOffset, const RayPickFilter& filter, const float maxDistance = 0.0f, const bool enabled = false);
+
+    const PickRay getPickRay(bool& valid) const override;
+
+private:
+    std::string _jointName;
+    glm::vec3 _posOffset;
+    glm::vec3 _dirOffset;
+
+};
+
+#endif // hifi_JointRayPick_h
diff --git a/interface/src/raypick/LaserPointer.cpp b/interface/src/raypick/LaserPointer.cpp
new file mode 100644
index 0000000000..71a547533b
--- /dev/null
+++ b/interface/src/raypick/LaserPointer.cpp
@@ -0,0 +1,288 @@
+//
+//  LaserPointer.cpp
+//  interface/src/raypick
+//
+//  Created by Sam Gondelman 7/11/2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#include "LaserPointer.h"
+
+#include "Application.h"
+#include "avatar/AvatarManager.h"
+#include "RayPickScriptingInterface.h"
+
+LaserPointer::LaserPointer(const QVariant& rayProps, const RenderStateMap& renderStates, const DefaultRenderStateMap& defaultRenderStates,
+        const bool faceAvatar, const bool centerEndY, const bool lockEnd, const bool distanceScaleEnd, const bool scaleWithAvatar, const bool enabled) :
+    _renderingEnabled(enabled),
+    _renderStates(renderStates),
+    _defaultRenderStates(defaultRenderStates),
+    _faceAvatar(faceAvatar),
+    _centerEndY(centerEndY),
+    _lockEnd(lockEnd),
+    _distanceScaleEnd(distanceScaleEnd),
+    _scaleWithAvatar(scaleWithAvatar),
+    _rayPickUID(DependencyManager::get<RayPickScriptingInterface>()->createRayPick(rayProps))
+{
+
+    for (auto& state : _renderStates) {
+        if (!enabled || state.first != _currentRenderState) {
+            disableRenderState(state.second);
+        }
+    }
+    for (auto& state : _defaultRenderStates) {
+        if (!enabled || state.first != _currentRenderState) {
+            disableRenderState(state.second.second);
+        }
+    }
+}
+
+LaserPointer::~LaserPointer() {
+    qApp->getRayPickManager().removeRayPick(_rayPickUID);
+
+    for (auto& renderState : _renderStates) {
+        renderState.second.deleteOverlays();
+    }
+    for (auto& renderState : _defaultRenderStates) {
+        renderState.second.second.deleteOverlays();
+    }
+}
+
+void LaserPointer::enable() {
+    qApp->getRayPickManager().enableRayPick(_rayPickUID);
+    withWriteLock([&] {
+        _renderingEnabled = true;
+    });
+}
+
+void LaserPointer::disable() {
+    qApp->getRayPickManager().disableRayPick(_rayPickUID);
+    withWriteLock([&] {
+        _renderingEnabled = false;
+        if (!_currentRenderState.empty()) {
+            if (_renderStates.find(_currentRenderState) != _renderStates.end()) {
+                disableRenderState(_renderStates[_currentRenderState]);
+            }
+            if (_defaultRenderStates.find(_currentRenderState) != _defaultRenderStates.end()) {
+                disableRenderState(_defaultRenderStates[_currentRenderState].second);
+            }
+        }
+    });
+}
+
+void LaserPointer::setRenderState(const std::string& state) {
+    withWriteLock([&] {
+        if (!_currentRenderState.empty() && state != _currentRenderState) {
+            if (_renderStates.find(_currentRenderState) != _renderStates.end()) {
+                disableRenderState(_renderStates[_currentRenderState]);
+            }
+            if (_defaultRenderStates.find(_currentRenderState) != _defaultRenderStates.end()) {
+                disableRenderState(_defaultRenderStates[_currentRenderState].second);
+            }
+        }
+        _currentRenderState = state;
+    });
+}
+
+void LaserPointer::editRenderState(const std::string& state, const QVariant& startProps, const QVariant& pathProps, const QVariant& endProps) {
+    withWriteLock([&] {
+        updateRenderStateOverlay(_renderStates[state].getStartID(), startProps);
+        updateRenderStateOverlay(_renderStates[state].getPathID(), pathProps);
+        updateRenderStateOverlay(_renderStates[state].getEndID(), endProps);
+        QVariant endDim = endProps.toMap()["dimensions"];
+        if (endDim.isValid()) {
+            _renderStates[state].setEndDim(vec3FromVariant(endDim));
+        }
+        QVariant lineWidth = pathProps.toMap()["lineWidth"];
+        if (lineWidth.isValid()) {
+            _renderStates[state].setLineWidth(lineWidth.toFloat());
+        }
+    });
+}
+
+void LaserPointer::updateRenderStateOverlay(const OverlayID& id, const QVariant& props) {
+    if (!id.isNull() && props.isValid()) {
+        QVariantMap propMap = props.toMap();
+        propMap.remove("visible");
+        qApp->getOverlays().editOverlay(id, propMap);
+    }
+}
+
+const RayPickResult LaserPointer::getPrevRayPickResult() {
+    return qApp->getRayPickManager().getPrevRayPickResult(_rayPickUID);
+}
+
+void LaserPointer::updateRenderState(const RenderState& renderState, const IntersectionType type, const float distance, const QUuid& objectID, const PickRay& pickRay, const bool defaultState) {
+    if (!renderState.getStartID().isNull()) {
+        QVariantMap startProps;
+        startProps.insert("position", vec3toVariant(pickRay.origin));
+        startProps.insert("visible", true);
+        startProps.insert("ignoreRayIntersection", renderState.doesStartIgnoreRays());
+        qApp->getOverlays().editOverlay(renderState.getStartID(), startProps);
+    }
+    glm::vec3 endVec;
+    if (((defaultState || !_lockEnd) && _lockEndObject.id.isNull()) || type == IntersectionType::HUD) {
+        endVec = pickRay.origin + pickRay.direction * distance;
+    } else {
+        if (!_lockEndObject.id.isNull()) {
+            glm::vec3 pos;
+            glm::quat rot;
+            glm::vec3 dim;
+            glm::vec3 registrationPoint;
+            if (_lockEndObject.isOverlay) {
+                pos = vec3FromVariant(qApp->getOverlays().getProperty(_lockEndObject.id, "position").value);
+                rot = quatFromVariant(qApp->getOverlays().getProperty(_lockEndObject.id, "rotation").value);
+                dim = vec3FromVariant(qApp->getOverlays().getProperty(_lockEndObject.id, "dimensions").value);
+                registrationPoint = glm::vec3(0.5f);
+            } else {
+                EntityItemProperties props = DependencyManager::get<EntityScriptingInterface>()->getEntityProperties(_lockEndObject.id);
+                glm::mat4 entityMat = createMatFromQuatAndPos(props.getRotation(), props.getPosition());
+                glm::mat4 finalPosAndRotMat = entityMat * _lockEndObject.offsetMat;
+                pos = extractTranslation(finalPosAndRotMat);
+                rot = glmExtractRotation(finalPosAndRotMat);
+                dim = props.getDimensions();
+                registrationPoint = props.getRegistrationPoint();
+            }
+            const glm::vec3 DEFAULT_REGISTRATION_POINT = glm::vec3(0.5f);
+            endVec = pos + rot * (dim * (DEFAULT_REGISTRATION_POINT - registrationPoint));
+        } else {
+            if (type == IntersectionType::ENTITY) {
+                endVec = DependencyManager::get<EntityScriptingInterface>()->getEntityTransform(objectID)[3];
+            } else if (type == IntersectionType::OVERLAY) {
+                endVec = vec3FromVariant(qApp->getOverlays().getProperty(objectID, "position").value);
+            } else if (type == IntersectionType::AVATAR) {
+                endVec = DependencyManager::get<AvatarHashMap>()->getAvatar(objectID)->getPosition();
+            }
+        }
+    }
+    
+    QVariant end = vec3toVariant(endVec);
+    if (!renderState.getPathID().isNull()) {
+        QVariantMap pathProps;
+        pathProps.insert("start", vec3toVariant(pickRay.origin));
+        pathProps.insert("end", end);
+        pathProps.insert("visible", true);
+        pathProps.insert("ignoreRayIntersection", renderState.doesPathIgnoreRays());
+        if (_scaleWithAvatar) {
+            pathProps.insert("lineWidth", renderState.getLineWidth() * DependencyManager::get<AvatarManager>()->getMyAvatar()->getSensorToWorldScale());
+        }
+        qApp->getOverlays().editOverlay(renderState.getPathID(), pathProps);
+    }
+    if (!renderState.getEndID().isNull()) {
+        QVariantMap endProps;
+        glm::quat faceAvatarRotation = DependencyManager::get<AvatarManager>()->getMyAvatar()->getOrientation() * glm::quat(glm::radians(glm::vec3(0.0f, 180.0f, 0.0f)));
+        glm::vec3 dim = vec3FromVariant(qApp->getOverlays().getProperty(renderState.getEndID(), "dimensions").value);
+        if (_distanceScaleEnd) {
+            dim = renderState.getEndDim() * glm::distance(pickRay.origin, endVec);
+            endProps.insert("dimensions", vec3toVariant(dim));
+        }
+        if (_centerEndY) {
+            endProps.insert("position", end);
+        } else {
+            glm::vec3 currentUpVector = faceAvatarRotation * Vectors::UP;
+            endProps.insert("position", vec3toVariant(endVec + glm::vec3(currentUpVector.x * 0.5f * dim.y, currentUpVector.y * 0.5f * dim.y, currentUpVector.z * 0.5f * dim.y)));
+        }
+        if (_faceAvatar) {
+            endProps.insert("rotation", quatToVariant(faceAvatarRotation));
+        }
+        endProps.insert("visible", true);
+        endProps.insert("ignoreRayIntersection", renderState.doesEndIgnoreRays());
+        qApp->getOverlays().editOverlay(renderState.getEndID(), endProps);
+    }
+}
+
+void LaserPointer::disableRenderState(const RenderState& renderState) {
+    if (!renderState.getStartID().isNull()) {
+        QVariantMap startProps;
+        startProps.insert("visible", false);
+        startProps.insert("ignoreRayIntersection", true);
+        qApp->getOverlays().editOverlay(renderState.getStartID(), startProps);
+    }
+    if (!renderState.getPathID().isNull()) {
+        QVariantMap pathProps;
+        pathProps.insert("visible", false);
+        pathProps.insert("ignoreRayIntersection", true);
+        qApp->getOverlays().editOverlay(renderState.getPathID(), pathProps);
+    }
+    if (!renderState.getEndID().isNull()) {
+        QVariantMap endProps;
+        endProps.insert("visible", false);
+        endProps.insert("ignoreRayIntersection", true);
+        qApp->getOverlays().editOverlay(renderState.getEndID(), endProps);
+    }
+}
+
+void LaserPointer::update() {
+    // This only needs to be a read lock because update won't change any of the properties that can be modified from scripts
+    withReadLock([&] {
+        RayPickResult prevRayPickResult = qApp->getRayPickManager().getPrevRayPickResult(_rayPickUID);
+        if (_renderingEnabled && !_currentRenderState.empty() && _renderStates.find(_currentRenderState) != _renderStates.end() &&
+            (prevRayPickResult.type != IntersectionType::NONE || _laserLength > 0.0f || !_lockEndObject.id.isNull())) {
+            float distance = _laserLength > 0.0f ? _laserLength : prevRayPickResult.distance;
+            updateRenderState(_renderStates[_currentRenderState], prevRayPickResult.type, distance, prevRayPickResult.objectID, prevRayPickResult.searchRay, false);
+            disableRenderState(_defaultRenderStates[_currentRenderState].second);
+        } else if (_renderingEnabled && !_currentRenderState.empty() && _defaultRenderStates.find(_currentRenderState) != _defaultRenderStates.end()) {
+            disableRenderState(_renderStates[_currentRenderState]);
+            updateRenderState(_defaultRenderStates[_currentRenderState].second, IntersectionType::NONE, _defaultRenderStates[_currentRenderState].first, QUuid(), prevRayPickResult.searchRay, true);
+        } else if (!_currentRenderState.empty()) {
+            disableRenderState(_renderStates[_currentRenderState]);
+            disableRenderState(_defaultRenderStates[_currentRenderState].second);
+        }
+    });
+}
+
+void LaserPointer::setPrecisionPicking(const bool precisionPicking) {
+    qApp->getRayPickManager().setPrecisionPicking(_rayPickUID, precisionPicking);
+}
+
+void LaserPointer::setLaserLength(const float laserLength) {
+    withWriteLock([&] {
+        _laserLength = laserLength;
+    });
+}
+
+void LaserPointer::setLockEndUUID(QUuid objectID, const bool isOverlay, const glm::mat4& offsetMat) {
+    withWriteLock([&] {
+        _lockEndObject.id = objectID;
+        _lockEndObject.isOverlay = isOverlay;
+        _lockEndObject.offsetMat = offsetMat;
+    });
+}
+
+void LaserPointer::setIgnoreItems(const QVector<QUuid>& ignoreItems) const {
+    qApp->getRayPickManager().setIgnoreItems(_rayPickUID, ignoreItems);
+}
+
+void LaserPointer::setIncludeItems(const QVector<QUuid>& includeItems) const {
+    qApp->getRayPickManager().setIncludeItems(_rayPickUID, includeItems);
+}
+
+RenderState::RenderState(const OverlayID& startID, const OverlayID& pathID, const OverlayID& endID) :
+    _startID(startID), _pathID(pathID), _endID(endID)
+{
+    if (!_startID.isNull()) {
+        _startIgnoreRays = qApp->getOverlays().getProperty(_startID, "ignoreRayIntersection").value.toBool();
+    }
+    if (!_pathID.isNull()) {
+        _pathIgnoreRays = qApp->getOverlays().getProperty(_pathID, "ignoreRayIntersection").value.toBool();
+        _lineWidth = qApp->getOverlays().getProperty(_pathID, "lineWidth").value.toFloat();
+    }
+    if (!_endID.isNull()) {
+        _endDim = vec3FromVariant(qApp->getOverlays().getProperty(_endID, "dimensions").value);
+        _endIgnoreRays = qApp->getOverlays().getProperty(_endID, "ignoreRayIntersection").value.toBool();
+    }
+}
+
+void RenderState::deleteOverlays() {
+    if (!_startID.isNull()) {
+        qApp->getOverlays().deleteOverlay(_startID);
+    }
+    if (!_pathID.isNull()) {
+        qApp->getOverlays().deleteOverlay(_pathID);
+    }
+    if (!_endID.isNull()) {
+        qApp->getOverlays().deleteOverlay(_endID);
+    }
+}
diff --git a/interface/src/raypick/LaserPointer.h b/interface/src/raypick/LaserPointer.h
new file mode 100644
index 0000000000..d38070c05c
--- /dev/null
+++ b/interface/src/raypick/LaserPointer.h
@@ -0,0 +1,115 @@
+//
+//  LaserPointer.h
+//  interface/src/raypick
+//
+//  Created by Sam Gondelman 7/11/2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#ifndef hifi_LaserPointer_h
+#define hifi_LaserPointer_h
+
+#include <QString>
+#include <glm/glm.hpp>
+
+#include <DependencyManager.h>
+#include <shared/ReadWriteLockable.h>
+
+#include "ui/overlays/Overlay.h"
+
+class RayPickResult;
+
+struct LockEndObject {
+    QUuid id { QUuid() };
+    bool isOverlay { false };
+    glm::mat4 offsetMat { glm::mat4() };
+};
+
+class RenderState {
+
+public:
+    RenderState() {}
+    RenderState(const OverlayID& startID, const OverlayID& pathID, const OverlayID& endID);
+
+    const OverlayID& getStartID() const { return _startID; }
+    const OverlayID& getPathID() const { return _pathID; }
+    const OverlayID& getEndID() const { return _endID; }
+    const bool& doesStartIgnoreRays() const { return _startIgnoreRays; }
+    const bool& doesPathIgnoreRays() const { return _pathIgnoreRays; }
+    const bool& doesEndIgnoreRays() const { return _endIgnoreRays; }
+
+    void setEndDim(const glm::vec3& endDim) { _endDim = endDim; }
+    const glm::vec3& getEndDim() const { return _endDim; }
+
+    void setLineWidth(const float& lineWidth) { _lineWidth = lineWidth; }
+    const float& getLineWidth() const { return _lineWidth; }
+
+    void deleteOverlays();
+
+private:
+    OverlayID _startID;
+    OverlayID _pathID;
+    OverlayID _endID;
+    bool _startIgnoreRays;
+    bool _pathIgnoreRays;
+    bool _endIgnoreRays;
+
+    glm::vec3 _endDim;
+    float _lineWidth;
+};
+
+
+class LaserPointer : public ReadWriteLockable {
+
+public:
+    using Pointer = std::shared_ptr<LaserPointer>;
+
+    typedef std::unordered_map<std::string, RenderState> RenderStateMap;
+    typedef std::unordered_map<std::string, std::pair<float, RenderState>> DefaultRenderStateMap;
+
+    LaserPointer(const QVariant& rayProps, const RenderStateMap& renderStates, const DefaultRenderStateMap& defaultRenderStates,
+        const bool faceAvatar, const bool centerEndY, const bool lockEnd, const bool distanceScaleEnd, const bool scaleWithAvatar, const bool enabled);
+    ~LaserPointer();
+
+    QUuid getRayUID() { return _rayPickUID; }
+    void enable();
+    void disable();
+    const RayPickResult getPrevRayPickResult();
+
+    void setRenderState(const std::string& state);
+    // You cannot use editRenderState to change the overlay type of any part of the laser pointer.  You can only edit the properties of the existing overlays.
+    void editRenderState(const std::string& state, const QVariant& startProps, const QVariant& pathProps, const QVariant& endProps);
+
+    void setPrecisionPicking(const bool precisionPicking);
+    void setLaserLength(const float laserLength);
+    void setLockEndUUID(QUuid objectID, const bool isOverlay, const glm::mat4& offsetMat = glm::mat4());
+
+    void setIgnoreItems(const QVector<QUuid>& ignoreItems) const;
+    void setIncludeItems(const QVector<QUuid>& includeItems) const;
+
+    void update();
+
+private:
+    bool _renderingEnabled;
+    float _laserLength { 0.0f };
+    std::string _currentRenderState { "" };
+    RenderStateMap _renderStates;
+    DefaultRenderStateMap _defaultRenderStates;
+    bool _faceAvatar;
+    bool _centerEndY;
+    bool _lockEnd;
+    bool _distanceScaleEnd;
+    bool _scaleWithAvatar;
+    LockEndObject _lockEndObject;
+
+    const QUuid _rayPickUID;
+
+    void updateRenderStateOverlay(const OverlayID& id, const QVariant& props);
+    void updateRenderState(const RenderState& renderState, const IntersectionType type, const float distance, const QUuid& objectID, const PickRay& pickRay, const bool defaultState);
+    void disableRenderState(const RenderState& renderState);
+
+};
+
+#endif // hifi_LaserPointer_h
diff --git a/interface/src/raypick/LaserPointerManager.cpp b/interface/src/raypick/LaserPointerManager.cpp
new file mode 100644
index 0000000000..143451d0d3
--- /dev/null
+++ b/interface/src/raypick/LaserPointerManager.cpp
@@ -0,0 +1,121 @@
+//
+//  LaserPointerManager.cpp
+//  interface/src/raypick
+//
+//  Created by Sam Gondelman 7/11/2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#include "LaserPointerManager.h"
+
+QUuid LaserPointerManager::createLaserPointer(const QVariant& rayProps, const LaserPointer::RenderStateMap& renderStates, const LaserPointer::DefaultRenderStateMap& defaultRenderStates,
+    const bool faceAvatar, const bool centerEndY, const bool lockEnd, const bool distanceScaleEnd, const bool scaleWithAvatar, const bool enabled) {
+    QUuid result;
+    std::shared_ptr<LaserPointer> laserPointer = std::make_shared<LaserPointer>(rayProps, renderStates, defaultRenderStates, faceAvatar, centerEndY, lockEnd, distanceScaleEnd, scaleWithAvatar, enabled);
+    if (!laserPointer->getRayUID().isNull()) {
+        result = QUuid::createUuid();
+        withWriteLock([&] { _laserPointers[result] = laserPointer; });
+    }
+    return result;
+}
+
+
+LaserPointer::Pointer LaserPointerManager::find(const QUuid& uid) const {
+    return resultWithReadLock<LaserPointer::Pointer>([&] {
+        auto itr = _laserPointers.find(uid);
+        if (itr != _laserPointers.end()) {
+            return *itr;
+        }
+        return LaserPointer::Pointer();
+    });
+}
+
+
+void LaserPointerManager::removeLaserPointer(const QUuid& uid) {
+    withWriteLock([&] {
+        _laserPointers.remove(uid);
+    });
+}
+
+void LaserPointerManager::enableLaserPointer(const QUuid& uid) const {
+    auto laserPointer = find(uid);
+    if (laserPointer) {
+        laserPointer->enable();
+    }
+}
+
+void LaserPointerManager::disableLaserPointer(const QUuid& uid) const  {
+    auto laserPointer = find(uid);
+    if (laserPointer) {
+        laserPointer->disable();
+    }
+}
+
+void LaserPointerManager::setRenderState(const QUuid& uid, const std::string& renderState) const {
+    auto laserPointer = find(uid);
+    if (laserPointer) {
+        laserPointer->setRenderState(renderState);
+    }
+}
+
+void LaserPointerManager::editRenderState(const QUuid& uid, const std::string& state, const QVariant& startProps, const QVariant& pathProps, const QVariant& endProps) const {
+    auto laserPointer = find(uid);
+    if (laserPointer) {
+        laserPointer->editRenderState(state, startProps, pathProps, endProps);
+    }
+}
+
+const RayPickResult LaserPointerManager::getPrevRayPickResult(const QUuid& uid) const {
+    auto laserPointer = find(uid);
+    if (laserPointer) {
+        return laserPointer->getPrevRayPickResult();
+    }
+    return RayPickResult();
+}
+
+void LaserPointerManager::update() {
+    auto cachedLaserPointers = resultWithReadLock<QList<std::shared_ptr<LaserPointer>>>([&] { 
+        return _laserPointers.values(); 
+    });
+
+    for (const auto& laserPointer : cachedLaserPointers) {
+        laserPointer->update();
+    }
+}
+
+void LaserPointerManager::setPrecisionPicking(const QUuid& uid, const bool precisionPicking) const {
+    auto laserPointer = find(uid);
+    if (laserPointer) {
+        laserPointer->setPrecisionPicking(precisionPicking);
+    }
+}
+
+void LaserPointerManager::setLaserLength(const QUuid& uid, const float laserLength) const {
+    auto laserPointer = find(uid);
+    if (laserPointer) {
+        laserPointer->setLaserLength(laserLength);
+    }
+}
+
+void LaserPointerManager::setIgnoreItems(const QUuid& uid, const QVector<QUuid>& ignoreEntities) const {
+    auto laserPointer = find(uid);
+    if (laserPointer) {
+        laserPointer->setIgnoreItems(ignoreEntities);
+    }
+}
+
+void LaserPointerManager::setIncludeItems(const QUuid& uid, const QVector<QUuid>& includeEntities) const {
+    auto laserPointer = find(uid);
+    if (laserPointer) {
+        laserPointer->setIncludeItems(includeEntities);
+    }
+}
+
+void LaserPointerManager::setLockEndUUID(const QUuid& uid, const QUuid& objectID, const bool isOverlay, const glm::mat4& offsetMat) const {
+    auto laserPointer = find(uid);
+    if (laserPointer) {
+        laserPointer->setLockEndUUID(objectID, isOverlay, offsetMat);
+    }
+}
diff --git a/interface/src/raypick/LaserPointerManager.h b/interface/src/raypick/LaserPointerManager.h
new file mode 100644
index 0000000000..3f8f962679
--- /dev/null
+++ b/interface/src/raypick/LaserPointerManager.h
@@ -0,0 +1,51 @@
+//
+//  LaserPointerManager.h
+//  interface/src/raypick
+//
+//  Created by Sam Gondelman 7/11/2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#ifndef hifi_LaserPointerManager_h
+#define hifi_LaserPointerManager_h
+
+#include <memory>
+#include <glm/glm.hpp>
+
+#include <shared/ReadWriteLockable.h>
+
+#include "LaserPointer.h"
+
+class RayPickResult;
+
+
+class LaserPointerManager : protected ReadWriteLockable {
+
+public:
+    QUuid createLaserPointer(const QVariant& rayProps, const LaserPointer::RenderStateMap& renderStates, const LaserPointer::DefaultRenderStateMap& defaultRenderStates,
+        const bool faceAvatar, const bool centerEndY, const bool lockEnd, const bool distanceScaleEnd, const bool scaleWithAvatar, const bool enabled);
+
+    void removeLaserPointer(const QUuid& uid);
+    void enableLaserPointer(const QUuid& uid) const;
+    void disableLaserPointer(const QUuid& uid) const;
+    void setRenderState(const QUuid& uid, const std::string& renderState) const;
+    void editRenderState(const QUuid& uid, const std::string& state, const QVariant& startProps, const QVariant& pathProps, const QVariant& endProps) const;
+    const RayPickResult getPrevRayPickResult(const QUuid& uid) const;
+
+    void setPrecisionPicking(const QUuid& uid, const bool precisionPicking) const;
+    void setLaserLength(const QUuid& uid, const float laserLength) const;
+    void setIgnoreItems(const QUuid& uid, const QVector<QUuid>& ignoreEntities) const;
+    void setIncludeItems(const QUuid& uid, const QVector<QUuid>& includeEntities) const;
+
+    void setLockEndUUID(const QUuid& uid, const QUuid& objectID, const bool isOverlay, const glm::mat4& offsetMat = glm::mat4()) const;
+
+    void update();
+
+private:
+    LaserPointer::Pointer find(const QUuid& uid) const;
+    QHash<QUuid, std::shared_ptr<LaserPointer>> _laserPointers;
+};
+
+#endif // hifi_LaserPointerManager_h
diff --git a/interface/src/raypick/LaserPointerScriptingInterface.cpp b/interface/src/raypick/LaserPointerScriptingInterface.cpp
new file mode 100644
index 0000000000..eb69d610ad
--- /dev/null
+++ b/interface/src/raypick/LaserPointerScriptingInterface.cpp
@@ -0,0 +1,142 @@
+//
+//  LaserPointerScriptingInterface.cpp
+//  interface/src/raypick
+//
+//  Created by Sam Gondelman 7/11/2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include "LaserPointerScriptingInterface.h"
+
+#include <QtCore/QVariant>
+
+#include <GLMHelpers.h>
+#include <RegisteredMetaTypes.h>
+
+void LaserPointerScriptingInterface::setIgnoreItems(const QUuid& uid, const QScriptValue& ignoreItems) const { 
+    qApp->getLaserPointerManager().setIgnoreItems(uid, qVectorQUuidFromScriptValue(ignoreItems));
+}
+void LaserPointerScriptingInterface::setIncludeItems(const QUuid& uid, const QScriptValue& includeItems) const {
+    qApp->getLaserPointerManager().setIncludeItems(uid, qVectorQUuidFromScriptValue(includeItems)); 
+}
+
+QUuid LaserPointerScriptingInterface::createLaserPointer(const QVariant& properties) const {
+    QVariantMap propertyMap = properties.toMap();
+
+    bool faceAvatar = false;
+    if (propertyMap["faceAvatar"].isValid()) {
+        faceAvatar = propertyMap["faceAvatar"].toBool();
+    }
+
+    bool centerEndY = true;
+    if (propertyMap["centerEndY"].isValid()) {
+        centerEndY = propertyMap["centerEndY"].toBool();
+    }
+
+    bool lockEnd = false;
+    if (propertyMap["lockEnd"].isValid()) {
+        lockEnd = propertyMap["lockEnd"].toBool();
+    }
+
+    bool distanceScaleEnd = false;
+    if (propertyMap["distanceScaleEnd"].isValid()) {
+        distanceScaleEnd = propertyMap["distanceScaleEnd"].toBool();
+    }
+
+    bool enabled = false;
+    if (propertyMap["enabled"].isValid()) {
+        enabled = propertyMap["enabled"].toBool();
+    }
+
+    bool scaleWithAvatar = false;
+    if (propertyMap["scaleWithAvatar"].isValid()) {
+        scaleWithAvatar = propertyMap["scaleWithAvatar"].toBool();
+    }
+
+    LaserPointer::RenderStateMap renderStates;
+    if (propertyMap["renderStates"].isValid()) {
+        QList<QVariant> renderStateVariants = propertyMap["renderStates"].toList();
+        for (QVariant& renderStateVariant : renderStateVariants) {
+            if (renderStateVariant.isValid()) {
+                QVariantMap renderStateMap = renderStateVariant.toMap();
+                if (renderStateMap["name"].isValid()) {
+                    std::string name = renderStateMap["name"].toString().toStdString();
+                    renderStates[name] = buildRenderState(renderStateMap);
+                }
+            }
+        }
+    }
+
+    LaserPointer::DefaultRenderStateMap defaultRenderStates;
+    if (propertyMap["defaultRenderStates"].isValid()) {
+        QList<QVariant> renderStateVariants = propertyMap["defaultRenderStates"].toList();
+        for (QVariant& renderStateVariant : renderStateVariants) {
+            if (renderStateVariant.isValid()) {
+                QVariantMap renderStateMap = renderStateVariant.toMap();
+                if (renderStateMap["name"].isValid() && renderStateMap["distance"].isValid()) {
+                    std::string name = renderStateMap["name"].toString().toStdString();
+                    float distance = renderStateMap["distance"].toFloat();
+                    defaultRenderStates[name] = std::pair<float, RenderState>(distance, buildRenderState(renderStateMap));
+                }
+            }
+        }
+    }
+
+    return qApp->getLaserPointerManager().createLaserPointer(properties, renderStates, defaultRenderStates, faceAvatar, centerEndY, lockEnd, distanceScaleEnd, scaleWithAvatar, enabled);
+}
+
+void LaserPointerScriptingInterface::editRenderState(const QUuid& uid, const QString& renderState, const QVariant& properties) const {
+    QVariantMap propMap = properties.toMap();
+
+    QVariant startProps;
+    if (propMap["start"].isValid()) {
+        startProps = propMap["start"];
+    }
+
+    QVariant pathProps;
+    if (propMap["path"].isValid()) {
+        pathProps = propMap["path"];
+    }
+
+    QVariant endProps;
+    if (propMap["end"].isValid()) {
+        endProps = propMap["end"];
+    }
+
+    qApp->getLaserPointerManager().editRenderState(uid, renderState.toStdString(), startProps, pathProps, endProps);
+}
+
+RenderState LaserPointerScriptingInterface::buildRenderState(const QVariantMap& propMap) {
+    QUuid startID;
+    if (propMap["start"].isValid()) {
+        QVariantMap startMap = propMap["start"].toMap();
+        if (startMap["type"].isValid()) {
+            startMap.remove("visible");
+            startID = qApp->getOverlays().addOverlay(startMap["type"].toString(), startMap);
+        }
+    }
+
+    QUuid pathID;
+    if (propMap["path"].isValid()) {
+        QVariantMap pathMap = propMap["path"].toMap();
+        // right now paths must be line3ds
+        if (pathMap["type"].isValid() && pathMap["type"].toString() == "line3d") {
+            pathMap.remove("visible");
+            pathID = qApp->getOverlays().addOverlay(pathMap["type"].toString(), pathMap);
+        }
+    }
+
+    QUuid endID;
+    if (propMap["end"].isValid()) {
+        QVariantMap endMap = propMap["end"].toMap();
+        if (endMap["type"].isValid()) {
+            endMap.remove("visible");
+            endID = qApp->getOverlays().addOverlay(endMap["type"].toString(), endMap);
+        }
+    }
+
+    return RenderState(startID, pathID, endID);
+}
\ No newline at end of file
diff --git a/interface/src/raypick/LaserPointerScriptingInterface.h b/interface/src/raypick/LaserPointerScriptingInterface.h
new file mode 100644
index 0000000000..986c53e24f
--- /dev/null
+++ b/interface/src/raypick/LaserPointerScriptingInterface.h
@@ -0,0 +1,45 @@
+//
+//  LaserPointerScriptingInterface.h
+//  interface/src/raypick
+//
+//  Created by Sam Gondelman 7/11/2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#ifndef hifi_LaserPointerScriptingInterface_h
+#define hifi_LaserPointerScriptingInterface_h
+
+#include <QtCore/QObject>
+
+#include "RegisteredMetaTypes.h"
+#include "DependencyManager.h"
+#include "Application.h"
+
+class LaserPointerScriptingInterface : public QObject, public Dependency {
+    Q_OBJECT
+    SINGLETON_DEPENDENCY
+
+public slots:
+    Q_INVOKABLE QUuid createLaserPointer(const QVariant& properties) const;
+    Q_INVOKABLE void enableLaserPointer(const QUuid& uid) const { qApp->getLaserPointerManager().enableLaserPointer(uid); }
+    Q_INVOKABLE void disableLaserPointer(const QUuid& uid) const { qApp->getLaserPointerManager().disableLaserPointer(uid); }
+    Q_INVOKABLE void removeLaserPointer(const QUuid& uid) const { qApp->getLaserPointerManager().removeLaserPointer(uid); }
+    Q_INVOKABLE void editRenderState(const QUuid& uid, const QString& renderState, const QVariant& properties) const;
+    Q_INVOKABLE void setRenderState(const QUuid& uid, const QString& renderState) const { qApp->getLaserPointerManager().setRenderState(uid, renderState.toStdString()); }
+    Q_INVOKABLE RayPickResult getPrevRayPickResult(QUuid uid) const { return qApp->getLaserPointerManager().getPrevRayPickResult(uid); }
+
+    Q_INVOKABLE void setPrecisionPicking(const QUuid& uid, bool precisionPicking) const { qApp->getLaserPointerManager().setPrecisionPicking(uid, precisionPicking); }
+    Q_INVOKABLE void setLaserLength(const QUuid& uid, float laserLength) const { qApp->getLaserPointerManager().setLaserLength(uid, laserLength); }
+    Q_INVOKABLE void setIgnoreItems(const QUuid& uid, const QScriptValue& ignoreEntities) const;
+    Q_INVOKABLE void setIncludeItems(const QUuid& uid, const QScriptValue& includeEntities) const;
+
+    Q_INVOKABLE void setLockEndUUID(const QUuid& uid, const QUuid& objectID, bool isOverlay, const glm::mat4& offsetMat = glm::mat4()) const { qApp->getLaserPointerManager().setLockEndUUID(uid, objectID, isOverlay, offsetMat); }
+
+private:
+    static RenderState buildRenderState(const QVariantMap& propMap);
+
+};
+
+#endif // hifi_LaserPointerScriptingInterface_h
diff --git a/interface/src/raypick/MouseRayPick.cpp b/interface/src/raypick/MouseRayPick.cpp
new file mode 100644
index 0000000000..de59fde88d
--- /dev/null
+++ b/interface/src/raypick/MouseRayPick.cpp
@@ -0,0 +1,32 @@
+//
+//  MouseRayPick.cpp
+//  interface/src/raypick
+//
+//  Created by Sam Gondelman 7/19/2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#include "MouseRayPick.h"
+
+#include "DependencyManager.h"
+#include "Application.h"
+#include "display-plugins/CompositorHelper.h"
+
+MouseRayPick::MouseRayPick(const RayPickFilter& filter, const float maxDistance, const bool enabled) :
+    RayPick(filter, maxDistance, enabled)
+{
+}
+
+const PickRay MouseRayPick::getPickRay(bool& valid) const {
+    QVariant position = qApp->getApplicationCompositor().getReticleInterface()->getPosition();
+    if (position.isValid()) {
+        QVariantMap posMap = position.toMap();
+        valid = true;
+        return qApp->getCamera().computePickRay(posMap["x"].toFloat(), posMap["y"].toFloat());
+    }
+
+    valid = false;
+    return PickRay();
+}
diff --git a/interface/src/raypick/MouseRayPick.h b/interface/src/raypick/MouseRayPick.h
new file mode 100644
index 0000000000..47f9404f3a
--- /dev/null
+++ b/interface/src/raypick/MouseRayPick.h
@@ -0,0 +1,24 @@
+//
+//  MouseRayPick.h
+//  interface/src/raypick
+//
+//  Created by Sam Gondelman 7/19/2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#ifndef hifi_MouseRayPick_h
+#define hifi_MouseRayPick_h
+
+#include <pointers/rays/RayPick.h>
+
+class MouseRayPick : public RayPick {
+
+public:
+    MouseRayPick(const RayPickFilter& filter, const float maxDistance = 0.0f, const bool enabled = false);
+
+    const PickRay getPickRay(bool& valid) const override;
+};
+
+#endif // hifi_MouseRayPick_h
diff --git a/interface/src/raypick/RayPickManager.cpp b/interface/src/raypick/RayPickManager.cpp
new file mode 100644
index 0000000000..15489ce93d
--- /dev/null
+++ b/interface/src/raypick/RayPickManager.cpp
@@ -0,0 +1,217 @@
+//
+//  RayPickManager.cpp
+//  interface/src/raypick
+//
+//  Created by Sam Gondelman 7/11/2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#include "RayPickManager.h"
+
+#include <pointers/rays/StaticRayPick.h>
+
+#include "Application.h"
+#include "EntityScriptingInterface.h"
+#include "ui/overlays/Overlays.h"
+#include "avatar/AvatarManager.h"
+#include "scripting/HMDScriptingInterface.h"
+#include "DependencyManager.h"
+
+#include "JointRayPick.h"
+#include "MouseRayPick.h"
+
+bool RayPickManager::checkAndCompareCachedResults(QPair<glm::vec3, glm::vec3>& ray, RayPickCache& cache, RayPickResult& res, const RayCacheKey& key) {
+    if (cache.contains(ray) && cache[ray].find(key) != cache[ray].end()) {
+        if (cache[ray][key].distance < res.distance) {
+            res = cache[ray][key];
+        }
+        return true;
+    }
+    return false;
+}
+
+void RayPickManager::cacheResult(const bool intersects, const RayPickResult& resTemp, const RayCacheKey& key, RayPickResult& res, QPair<glm::vec3, glm::vec3>& ray, RayPickCache& cache) {
+    if (intersects) {
+        cache[ray][key] = resTemp;
+        if (resTemp.distance < res.distance) {
+            res = resTemp;
+        }
+    } else {
+        cache[ray][key] = RayPickResult(res.searchRay);
+    }
+}
+
+void RayPickManager::update() {
+    RayPickCache results;
+    QHash<QUuid, RayPick::Pointer> cachedRayPicks;
+    withReadLock([&] {
+        cachedRayPicks = _rayPicks;
+    });
+
+    for (const auto& uid : cachedRayPicks.keys()) {
+        std::shared_ptr<RayPick> rayPick = cachedRayPicks[uid];
+        if (!rayPick->isEnabled() || rayPick->getFilter().doesPickNothing() || rayPick->getMaxDistance() < 0.0f) {
+            continue;
+        }
+
+        PickRay ray;
+
+        {
+            bool valid;
+            ray = rayPick->getPickRay(valid);
+            if (!valid) {
+                continue;
+            }
+        }
+
+        QPair<glm::vec3, glm::vec3> rayKey = QPair<glm::vec3, glm::vec3>(ray.origin, ray.direction);
+        RayPickResult res = RayPickResult(ray);
+
+        if (rayPick->getFilter().doesPickEntities()) {
+            RayToEntityIntersectionResult entityRes;
+            bool fromCache = true;
+            bool invisible = rayPick->getFilter().doesPickInvisible();
+            bool nonCollidable = rayPick->getFilter().doesPickNonCollidable();
+            RayCacheKey entityKey = { rayPick->getFilter().getEntityFlags(), rayPick->getIncludeItems(), rayPick->getIgnoreItems() };
+            if (!checkAndCompareCachedResults(rayKey, results, res, entityKey)) {
+                entityRes = DependencyManager::get<EntityScriptingInterface>()->findRayIntersectionVector(ray, !rayPick->getFilter().doesPickCoarse(),
+                    rayPick->getIncludeItemsAs<EntityItemID>(), rayPick->getIgnoreItemsAs<EntityItemID>(), !invisible, !nonCollidable);
+                fromCache = false;
+            }
+
+            if (!fromCache) {
+                cacheResult(entityRes.intersects, RayPickResult(IntersectionType::ENTITY, entityRes.entityID, entityRes.distance, entityRes.intersection, ray, entityRes.surfaceNormal),
+                    entityKey, res, rayKey, results);
+            }
+        }
+
+        if (rayPick->getFilter().doesPickOverlays()) {
+            RayToOverlayIntersectionResult overlayRes;
+            bool fromCache = true;
+            bool invisible = rayPick->getFilter().doesPickInvisible();
+            bool nonCollidable = rayPick->getFilter().doesPickNonCollidable();
+            RayCacheKey overlayKey = { rayPick->getFilter().getOverlayFlags(), rayPick->getIncludeItems(), rayPick->getIgnoreItems() };
+            if (!checkAndCompareCachedResults(rayKey, results, res, overlayKey)) {
+                overlayRes = qApp->getOverlays().findRayIntersectionVector(ray, !rayPick->getFilter().doesPickCoarse(),
+                    rayPick->getIncludeItemsAs<OverlayID>(), rayPick->getIgnoreItemsAs<OverlayID>(), !invisible, !nonCollidable);
+                fromCache = false;
+            }
+
+            if (!fromCache) {
+                cacheResult(overlayRes.intersects, RayPickResult(IntersectionType::OVERLAY, overlayRes.overlayID, overlayRes.distance, overlayRes.intersection, ray, overlayRes.surfaceNormal),
+                    overlayKey, res, rayKey, results);
+            }
+        }
+
+        if (rayPick->getFilter().doesPickAvatars()) {
+            RayCacheKey avatarKey = { rayPick->getFilter().getAvatarFlags(), rayPick->getIncludeItems(), rayPick->getIgnoreItems() };
+            if (!checkAndCompareCachedResults(rayKey, results, res, avatarKey)) {
+                RayToAvatarIntersectionResult avatarRes = DependencyManager::get<AvatarManager>()->findRayIntersectionVector(ray, 
+                    rayPick->getIncludeItemsAs<EntityItemID>(), rayPick->getIgnoreItemsAs<EntityItemID>());
+                cacheResult(avatarRes.intersects, RayPickResult(IntersectionType::AVATAR, avatarRes.avatarID, avatarRes.distance, avatarRes.intersection, ray), avatarKey, res, rayKey, results);
+            }
+        }
+
+        // Can't intersect with HUD in desktop mode
+        if (rayPick->getFilter().doesPickHUD() && DependencyManager::get<HMDScriptingInterface>()->isHMDMode()) {
+            RayCacheKey hudKey = { rayPick->getFilter().getHUDFlags(), QVector<QUuid>(), QVector<QUuid>() };
+            if (!checkAndCompareCachedResults(rayKey, results, res, hudKey)) {
+                glm::vec3 hudRes = DependencyManager::get<HMDScriptingInterface>()->calculateRayUICollisionPoint(ray.origin, ray.direction);
+                cacheResult(true, RayPickResult(IntersectionType::HUD, 0, glm::distance(ray.origin, hudRes), hudRes, ray), hudKey, res, rayKey, results);
+            }
+        }
+
+        if (rayPick->getMaxDistance() == 0.0f || (rayPick->getMaxDistance() > 0.0f && res.distance < rayPick->getMaxDistance())) {
+            rayPick->setRayPickResult(res);
+        } else {
+            rayPick->setRayPickResult(RayPickResult(ray));
+        }
+    }
+}
+
+QUuid RayPickManager::createRayPick(const std::string& jointName, const glm::vec3& posOffset, const glm::vec3& dirOffset, const RayPickFilter& filter, float maxDistance, bool enabled) {
+    auto newRayPick = std::make_shared<JointRayPick>(jointName, posOffset, dirOffset, filter, maxDistance, enabled);
+    QUuid id = QUuid::createUuid();
+    withWriteLock([&] {
+        _rayPicks[id] = newRayPick;
+    });
+    return id;
+}
+
+QUuid RayPickManager::createRayPick(const RayPickFilter& filter, float maxDistance, bool enabled) {
+    QUuid id = QUuid::createUuid();
+    auto newRayPick = std::make_shared<MouseRayPick>(filter, maxDistance, enabled);
+    withWriteLock([&] {
+        _rayPicks[id] = newRayPick;
+    });
+    return id;
+}
+
+QUuid RayPickManager::createRayPick(const glm::vec3& position, const glm::vec3& direction, const RayPickFilter& filter, float maxDistance, bool enabled) {
+    QUuid id = QUuid::createUuid();
+    auto newRayPick = std::make_shared<StaticRayPick>(position, direction, filter, maxDistance, enabled);
+    withWriteLock([&] {
+        _rayPicks[id] = newRayPick;
+    });
+    return id;
+}
+
+void RayPickManager::removeRayPick(const QUuid& uid) {
+    withWriteLock([&] {
+        _rayPicks.remove(uid);
+    });
+}
+
+RayPick::Pointer RayPickManager::findRayPick(const QUuid& uid) const {
+    return resultWithReadLock<RayPick::Pointer>([&] {
+        if (_rayPicks.contains(uid)) {
+            return _rayPicks[uid];
+        }
+        return RayPick::Pointer();
+    });
+}
+
+void RayPickManager::enableRayPick(const QUuid& uid) const {
+    auto rayPick = findRayPick(uid);
+    if (rayPick) {
+        rayPick->enable();
+    }
+}
+
+void RayPickManager::disableRayPick(const QUuid& uid) const {
+    auto rayPick = findRayPick(uid);
+    if (rayPick) {
+        rayPick->disable();
+    }
+}
+
+RayPickResult RayPickManager::getPrevRayPickResult(const QUuid& uid) const {
+    auto rayPick = findRayPick(uid);
+    if (rayPick) {
+        return rayPick->getPrevRayPickResult();
+    }
+    return RayPickResult();
+}
+
+void RayPickManager::setPrecisionPicking(const QUuid& uid, bool precisionPicking) const {
+    auto rayPick = findRayPick(uid);
+    if (rayPick) {
+        rayPick->setPrecisionPicking(precisionPicking);
+    }
+}
+
+void RayPickManager::setIgnoreItems(const QUuid& uid, const QVector<QUuid>& ignore) const {
+    auto rayPick = findRayPick(uid);
+    if (rayPick) {
+        rayPick->setIgnoreItems(ignore);
+    }
+}
+
+void RayPickManager::setIncludeItems(const QUuid& uid, const QVector<QUuid>& include) const {
+    auto rayPick = findRayPick(uid);
+    if (rayPick) {
+        rayPick->setIncludeItems(include);
+    }
+}
diff --git a/interface/src/raypick/RayPickManager.h b/interface/src/raypick/RayPickManager.h
new file mode 100644
index 0000000000..fd2c6f4a6b
--- /dev/null
+++ b/interface/src/raypick/RayPickManager.h
@@ -0,0 +1,74 @@
+//
+//  RayPickManager.h
+//  interface/src/raypick
+//
+//  Created by Sam Gondelman 7/11/2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#ifndef hifi_RayPickManager_h
+#define hifi_RayPickManager_h
+
+
+#include <memory>
+#include <unordered_map>
+#include <queue>
+
+#include <QtCore/QObject>
+
+#include <RegisteredMetaTypes.h>
+#include <pointers/rays/RayPick.h>
+
+
+class RayPickResult;
+
+typedef struct RayCacheKey {
+    RayPickFilter::Flags mask;
+    QVector<QUuid> include;
+    QVector<QUuid> ignore;
+
+    bool operator==(const RayCacheKey& other) const {
+        return (mask == other.mask && include == other.include && ignore == other.ignore);
+    }
+} RayCacheKey;
+
+namespace std {
+    template <>
+    struct hash<RayCacheKey> {
+        size_t operator()(const RayCacheKey& k) const {
+            return ((hash<RayPickFilter::Flags>()(k.mask) ^ (qHash(k.include) << 1)) >> 1) ^ (qHash(k.ignore) << 1);
+        }
+    };
+}
+
+class RayPickManager : protected ReadWriteLockable {
+
+public:
+    void update();
+
+    QUuid createRayPick(const std::string& jointName, const glm::vec3& posOffset, const glm::vec3& dirOffset, const RayPickFilter& filter, const float maxDistance, const bool enabled);
+    QUuid createRayPick(const RayPickFilter& filter, const float maxDistance, const bool enabled);
+    QUuid createRayPick(const glm::vec3& position, const glm::vec3& direction, const RayPickFilter& filter, const float maxDistance, const bool enabled);
+    void removeRayPick(const QUuid& uid);
+    void enableRayPick(const QUuid& uid) const;
+    void disableRayPick(const QUuid& uid) const;
+    RayPickResult getPrevRayPickResult(const QUuid& uid) const;
+
+    void setPrecisionPicking(const QUuid& uid, bool precisionPicking) const;
+    void setIgnoreItems(const QUuid& uid, const QVector<QUuid>& ignore) const;
+    void setIncludeItems(const QUuid& uid, const QVector<QUuid>& include) const;
+
+private:
+    RayPick::Pointer findRayPick(const QUuid& uid) const;
+    QHash<QUuid, RayPick::Pointer> _rayPicks;
+
+    typedef QHash<QPair<glm::vec3, glm::vec3>, std::unordered_map<RayCacheKey, RayPickResult>> RayPickCache;
+
+    // Returns true if this ray exists in the cache, and if it does, update res if the cached result is closer
+    bool checkAndCompareCachedResults(QPair<glm::vec3, glm::vec3>& ray, RayPickCache& cache, RayPickResult& res, const RayCacheKey& key);
+    void cacheResult(const bool intersects, const RayPickResult& resTemp, const RayCacheKey& key, RayPickResult& res, QPair<glm::vec3, glm::vec3>& ray, RayPickCache& cache);
+};
+
+#endif // hifi_RayPickManager_h
\ No newline at end of file
diff --git a/interface/src/raypick/RayPickScriptingInterface.cpp b/interface/src/raypick/RayPickScriptingInterface.cpp
new file mode 100644
index 0000000000..621ae9b738
--- /dev/null
+++ b/interface/src/raypick/RayPickScriptingInterface.cpp
@@ -0,0 +1,95 @@
+//
+//  RayPickScriptingInterface.cpp
+//  interface/src/raypick
+//
+//  Created by Sam Gondelman 8/15/2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include "RayPickScriptingInterface.h"
+
+#include <QVariant>
+#include "GLMHelpers.h"
+#include "Application.h"
+
+QUuid RayPickScriptingInterface::createRayPick(const QVariant& properties) {
+    QVariantMap propMap = properties.toMap();
+
+    bool enabled = false;
+    if (propMap["enabled"].isValid()) {
+        enabled = propMap["enabled"].toBool();
+    }
+
+    RayPickFilter filter = RayPickFilter();
+    if (propMap["filter"].isValid()) {
+        filter = RayPickFilter(propMap["filter"].toUInt());
+    }
+
+    float maxDistance = 0.0f;
+    if (propMap["maxDistance"].isValid()) {
+        maxDistance = propMap["maxDistance"].toFloat();
+    }
+
+    if (propMap["joint"].isValid()) {
+        std::string jointName = propMap["joint"].toString().toStdString();
+
+        if (jointName != "Mouse") {
+            // x = upward, y = forward, z = lateral
+            glm::vec3 posOffset = Vectors::ZERO;
+            if (propMap["posOffset"].isValid()) {
+                posOffset = vec3FromVariant(propMap["posOffset"]);
+            }
+
+            glm::vec3 dirOffset = Vectors::UP;
+            if (propMap["dirOffset"].isValid()) {
+                dirOffset = vec3FromVariant(propMap["dirOffset"]);
+            }
+
+            return qApp->getRayPickManager().createRayPick(jointName, posOffset, dirOffset, filter, maxDistance, enabled);
+        } else {
+            return qApp->getRayPickManager().createRayPick(filter, maxDistance, enabled);
+        }
+    } else if (propMap["position"].isValid()) {
+        glm::vec3 position = vec3FromVariant(propMap["position"]);
+
+        glm::vec3 direction = -Vectors::UP;
+        if (propMap["direction"].isValid()) {
+            direction = vec3FromVariant(propMap["direction"]);
+        }
+
+        return qApp->getRayPickManager().createRayPick(position, direction, filter, maxDistance, enabled);
+    }
+
+    return QUuid();
+}
+
+void RayPickScriptingInterface::enableRayPick(const QUuid& uid) {
+    qApp->getRayPickManager().enableRayPick(uid);
+}
+
+void RayPickScriptingInterface::disableRayPick(const QUuid& uid) {
+    qApp->getRayPickManager().disableRayPick(uid);
+}
+
+void RayPickScriptingInterface::removeRayPick(const QUuid& uid) {
+    qApp->getRayPickManager().removeRayPick(uid);
+}
+
+RayPickResult RayPickScriptingInterface::getPrevRayPickResult(const QUuid& uid) {
+    return qApp->getRayPickManager().getPrevRayPickResult(uid);
+}
+
+void RayPickScriptingInterface::setPrecisionPicking(const QUuid& uid, const bool precisionPicking) {
+    qApp->getRayPickManager().setPrecisionPicking(uid, precisionPicking);
+}
+
+void RayPickScriptingInterface::setIgnoreItems(const QUuid& uid, const QScriptValue& ignoreItems) {
+    qApp->getRayPickManager().setIgnoreItems(uid, qVectorQUuidFromScriptValue(ignoreItems));
+}
+
+void RayPickScriptingInterface::setIncludeItems(const QUuid& uid, const QScriptValue& includeItems) {
+    qApp->getRayPickManager().setIncludeItems(uid, qVectorQUuidFromScriptValue(includeItems));
+}
diff --git a/interface/src/raypick/RayPickScriptingInterface.h b/interface/src/raypick/RayPickScriptingInterface.h
new file mode 100644
index 0000000000..099103e4c5
--- /dev/null
+++ b/interface/src/raypick/RayPickScriptingInterface.h
@@ -0,0 +1,65 @@
+//
+//  RayPickScriptingInterface.h
+//  interface/src/raypick
+//
+//  Created by Sam Gondelman 8/15/2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#ifndef hifi_RayPickScriptingInterface_h
+#define hifi_RayPickScriptingInterface_h
+
+#include <QtCore/QObject>
+
+#include <RegisteredMetaTypes.h>
+#include <DependencyManager.h>
+#include <pointers/rays/RayPick.h>
+
+class RayPickScriptingInterface : public QObject, public Dependency {
+    Q_OBJECT
+    Q_PROPERTY(unsigned int PICK_NOTHING READ PICK_NOTHING CONSTANT)
+    Q_PROPERTY(unsigned int PICK_ENTITIES READ PICK_ENTITIES CONSTANT)
+    Q_PROPERTY(unsigned int PICK_OVERLAYS READ PICK_OVERLAYS CONSTANT)
+    Q_PROPERTY(unsigned int PICK_AVATARS READ PICK_AVATARS CONSTANT)
+    Q_PROPERTY(unsigned int PICK_HUD READ PICK_HUD CONSTANT)
+    Q_PROPERTY(unsigned int PICK_COARSE READ PICK_COARSE CONSTANT)
+    Q_PROPERTY(unsigned int PICK_INCLUDE_INVISIBLE READ PICK_INCLUDE_INVISIBLE CONSTANT)
+    Q_PROPERTY(unsigned int PICK_INCLUDE_NONCOLLIDABLE READ PICK_INCLUDE_NONCOLLIDABLE CONSTANT)
+    Q_PROPERTY(unsigned int PICK_ALL_INTERSECTIONS READ PICK_ALL_INTERSECTIONS CONSTANT)
+    Q_PROPERTY(unsigned int INTERSECTED_NONE READ INTERSECTED_NONE CONSTANT)
+    Q_PROPERTY(unsigned int INTERSECTED_ENTITY READ INTERSECTED_ENTITY CONSTANT)
+    Q_PROPERTY(unsigned int INTERSECTED_OVERLAY READ INTERSECTED_OVERLAY CONSTANT)
+    Q_PROPERTY(unsigned int INTERSECTED_AVATAR READ INTERSECTED_AVATAR CONSTANT)
+    Q_PROPERTY(unsigned int INTERSECTED_HUD READ INTERSECTED_HUD CONSTANT)
+    SINGLETON_DEPENDENCY
+
+public slots:
+    Q_INVOKABLE QUuid createRayPick(const QVariant& properties);
+    Q_INVOKABLE void enableRayPick(const QUuid& uid);
+    Q_INVOKABLE void disableRayPick(const QUuid& uid);
+    Q_INVOKABLE void removeRayPick(const QUuid& uid);
+    Q_INVOKABLE RayPickResult getPrevRayPickResult(const QUuid& uid);
+
+    Q_INVOKABLE void setPrecisionPicking(const QUuid& uid, const bool precisionPicking);
+    Q_INVOKABLE void setIgnoreItems(const QUuid& uid, const QScriptValue& ignoreEntities);
+    Q_INVOKABLE void setIncludeItems(const QUuid& uid, const QScriptValue& includeEntities);
+
+    unsigned int PICK_NOTHING() { return 0; }
+    unsigned int PICK_ENTITIES() { return RayPickFilter::getBitMask(RayPickFilter::FlagBit::PICK_ENTITIES); }
+    unsigned int PICK_OVERLAYS() { return RayPickFilter::getBitMask(RayPickFilter::FlagBit::PICK_OVERLAYS); }
+    unsigned int PICK_AVATARS() { return RayPickFilter::getBitMask(RayPickFilter::FlagBit::PICK_AVATARS); }
+    unsigned int PICK_HUD() { return RayPickFilter::getBitMask(RayPickFilter::FlagBit::PICK_HUD); }
+    unsigned int PICK_COARSE() { return RayPickFilter::getBitMask(RayPickFilter::FlagBit::PICK_COARSE); }
+    unsigned int PICK_INCLUDE_INVISIBLE() { return RayPickFilter::getBitMask(RayPickFilter::FlagBit::PICK_INCLUDE_INVISIBLE); }
+    unsigned int PICK_INCLUDE_NONCOLLIDABLE() { return RayPickFilter::getBitMask(RayPickFilter::FlagBit::PICK_INCLUDE_NONCOLLIDABLE); }
+    unsigned int PICK_ALL_INTERSECTIONS() { return RayPickFilter::getBitMask(RayPickFilter::FlagBit::PICK_ALL_INTERSECTIONS); }
+    unsigned int INTERSECTED_NONE() { return IntersectionType::NONE; }
+    unsigned int INTERSECTED_ENTITY() { return IntersectionType::ENTITY; }
+    unsigned int INTERSECTED_OVERLAY() { return IntersectionType::OVERLAY; }
+    unsigned int INTERSECTED_AVATAR() { return IntersectionType::AVATAR; }
+    unsigned int INTERSECTED_HUD() { return IntersectionType::HUD; }
+};
+
+#endif // hifi_RayPickScriptingInterface_h
diff --git a/interface/src/scripting/AccountScriptingInterface.cpp b/interface/src/scripting/AccountScriptingInterface.cpp
index d8533bb769..068cccdc50 100644
--- a/interface/src/scripting/AccountScriptingInterface.cpp
+++ b/interface/src/scripting/AccountScriptingInterface.cpp
@@ -18,6 +18,8 @@ AccountScriptingInterface* AccountScriptingInterface::getInstance() {
     auto accountManager = DependencyManager::get<AccountManager>();
     QObject::connect(accountManager.data(), &AccountManager::profileChanged,
                      &sharedInstance, &AccountScriptingInterface::usernameChanged);
+    QObject::connect(accountManager.data(), &AccountManager::usernameChanged,
+                     &sharedInstance, &AccountScriptingInterface::onUsernameChanged);
     return &sharedInstance;
 }
 
@@ -31,6 +33,21 @@ bool AccountScriptingInterface::checkAndSignalForAccessToken() {
     return accountManager->checkAndSignalForAccessToken();
 }
 
+void AccountScriptingInterface::logOut() {
+    auto accountManager = DependencyManager::get<AccountManager>();
+    return accountManager->logout();
+}
+
+AccountScriptingInterface::AccountScriptingInterface(QObject *parent): QObject(parent) {
+    m_loggedIn = isLoggedIn();
+    emit loggedInChanged(m_loggedIn);
+}
+
+void AccountScriptingInterface::onUsernameChanged(QString username) {
+    m_loggedIn = (username != QString());
+    emit loggedInChanged(m_loggedIn);
+}
+
 QString AccountScriptingInterface::getUsername() {
     auto accountManager = DependencyManager::get<AccountManager>();
     if (accountManager->isLoggedIn()) {
diff --git a/interface/src/scripting/AccountScriptingInterface.h b/interface/src/scripting/AccountScriptingInterface.h
index 748f110356..4ff250e926 100644
--- a/interface/src/scripting/AccountScriptingInterface.h
+++ b/interface/src/scripting/AccountScriptingInterface.h
@@ -18,12 +18,18 @@ class AccountScriptingInterface : public QObject {
     Q_OBJECT
 
     Q_PROPERTY(QString username READ getUsername NOTIFY usernameChanged)
+    Q_PROPERTY(bool loggedIn READ loggedIn NOTIFY loggedInChanged)
 
     /**jsdoc
      * @namespace Account
      * @property username {String} username if user is logged in, otherwise it returns "Unknown user"
      */
 
+public:
+
+    Q_PROPERTY(QUrl metaverseServerURL READ getMetaverseServerURL)
+    QUrl getMetaverseServerURL() { return DependencyManager::get<AccountManager>()->getMetaverseServerURL(); }
+
 signals:
 
     /**jsdoc
@@ -32,6 +38,7 @@ signals:
      * @return {Signal}
      */
     void usernameChanged();
+    void loggedInChanged(bool loggedIn);
 
 public slots:
     static AccountScriptingInterface* getInstance();
@@ -50,6 +57,20 @@ public slots:
      */
     bool isLoggedIn();
     bool checkAndSignalForAccessToken();
+    void logOut();
+
+public:
+    AccountScriptingInterface(QObject* parent = nullptr);
+    bool loggedIn() const {
+        return m_loggedIn;
+    }
+
+private slots:
+    void onUsernameChanged(QString username);
+
+private:
+    bool m_loggedIn { false };
+
 };
 
 #endif // hifi_AccountScriptingInterface_h
diff --git a/interface/src/scripting/AssetMappingsScriptingInterface.cpp b/interface/src/scripting/AssetMappingsScriptingInterface.cpp
index 5a81fe8749..a1b2a9ccfc 100644
--- a/interface/src/scripting/AssetMappingsScriptingInterface.cpp
+++ b/interface/src/scripting/AssetMappingsScriptingInterface.cpp
@@ -19,20 +19,13 @@
 #include <AssetUpload.h>
 #include <MappingRequest.h>
 #include <NetworkLogging.h>
+#include <NodeList.h>
 #include <OffscreenUi.h>
+#include <UserActivityLogger.h>
 
-void AssetMappingModel::clear() {
-    // make sure we are on the same thread before we touch the hash
-    if (thread() != QThread::currentThread()) {
-        QMetaObject::invokeMethod(this, "clear");
-        return;
-    }
+static const int AUTO_REFRESH_INTERVAL = 1000;
 
-    qDebug() << "Clearing loaded asset mappings for Asset Browser";
-
-    _pathToItemMap.clear();
-    QStandardItemModel::clear();
-}
+int assetMappingModelMetatypeId = qRegisterMetaType<AssetMappingModel*>("AssetMappingModel*");
 
 AssetMappingsScriptingInterface::AssetMappingsScriptingInterface() {
     _proxyModel.setSourceModel(&_assetMappingModel);
@@ -112,6 +105,21 @@ void AssetMappingsScriptingInterface::uploadFile(QString path, QString mapping,
 
     startedCallback.call();
 
+    QFileInfo fileInfo { path };
+    int64_t size { fileInfo.size() };
+
+    QString extension = "";
+    auto idx = path.lastIndexOf(".");
+    if (idx >= 0) {
+        extension = path.mid(idx + 1);
+    }
+
+    UserActivityLogger::getInstance().logAction("uploading_asset", {
+        { "size", (qint64)size },
+        { "mapping", mapping },
+        { "extension", extension}
+    });
+
     auto upload = DependencyManager::get<AssetClient>()->createUpload(path);
     QObject::connect(upload, &AssetUpload::finished, this, [=](AssetUpload* upload, const QString& hash) mutable {
         if (upload->getError() != AssetUpload::NoError) {
@@ -154,7 +162,7 @@ void AssetMappingsScriptingInterface::getAllMappings(QJSValue callback) {
         auto map = callback.engine()->newObject();
 
         for (auto& kv : mappings ) {
-            map.setProperty(kv.first, kv.second);
+            map.setProperty(kv.first, kv.second.hash);
         }
 
         if (callback.isCallable()) {
@@ -174,7 +182,7 @@ void AssetMappingsScriptingInterface::renameMapping(QString oldPath, QString new
 
     connect(request, &RenameMappingRequest::finished, this, [this, callback](RenameMappingRequest* request) mutable {
         if (callback.isCallable()) {
-            QJSValueList args { request->getErrorString() };
+            QJSValueList args{ request->getErrorString() };
             callback.call(args);
         }
 
@@ -184,6 +192,49 @@ void AssetMappingsScriptingInterface::renameMapping(QString oldPath, QString new
     request->start();
 }
 
+void AssetMappingsScriptingInterface::setBakingEnabled(QStringList paths, bool enabled, QJSValue callback) {
+    auto assetClient = DependencyManager::get<AssetClient>();
+    auto request = assetClient->createSetBakingEnabledRequest(paths, enabled);
+
+    connect(request, &SetBakingEnabledRequest::finished, this, [this, callback](SetBakingEnabledRequest* request) mutable {
+        if (callback.isCallable()) {
+            QJSValueList args{ request->getErrorString() };
+            callback.call(args);
+        }
+
+        request->deleteLater();
+    });
+
+    request->start();
+}
+
+AssetMappingModel::AssetMappingModel() {
+    setupRoles();
+
+    connect(&_autoRefreshTimer, &QTimer::timeout, this, [this] {
+        auto nodeList = DependencyManager::get<NodeList>();
+        auto assetServer = nodeList->soloNodeOfType(NodeType::AssetServer);
+        if (assetServer) {
+            refresh();
+        }
+    });
+    _autoRefreshTimer.setInterval(AUTO_REFRESH_INTERVAL);
+}
+
+bool AssetMappingModel::isAutoRefreshEnabled() {
+    return _autoRefreshTimer.isActive();
+}
+
+void AssetMappingModel::setAutoRefreshEnabled(bool enabled) {
+    if (enabled != _autoRefreshTimer.isActive()) {
+        if (enabled) {
+            _autoRefreshTimer.start();
+        } else {
+            _autoRefreshTimer.stop();
+        }
+    }
+}
+
 bool AssetMappingModel::isKnownFolder(QString path) const {
     if (!path.endsWith("/")) {
         return false;
@@ -198,19 +249,23 @@ bool AssetMappingModel::isKnownFolder(QString path) const {
     return false;
 }
 
-int assetMappingModelMetatypeId = qRegisterMetaType<AssetMappingModel*>("AssetMappingModel*");
-
 void AssetMappingModel::refresh() {
-    qDebug() << "Refreshing asset mapping model";
     auto assetClient = DependencyManager::get<AssetClient>();
     auto request = assetClient->createGetAllMappingsRequest();
 
     connect(request, &GetAllMappingsRequest::finished, this, [this](GetAllMappingsRequest* request) mutable {
         if (request->getError() == MappingRequest::NoError) {
+            int numPendingBakes = 0;
             auto mappings = request->getMappings();
             auto existingPaths = _pathToItemMap.keys();
             for (auto& mapping : mappings) {
                 auto& path = mapping.first;
+
+                if (path.startsWith(HIDDEN_BAKED_CONTENT_FOLDER)) {
+                    // Hide baked mappings
+                    continue;
+                }
+
                 auto parts = path.split("/");
                 auto length = parts.length();
 
@@ -223,27 +278,35 @@ void AssetMappingModel::refresh() {
                 // start index at 1 to avoid empty string from leading slash
                 for (int i = 1; i < length; ++i) {
                     fullPath += (i == 1 ? "" : "/") + parts[i];
+                    bool isFolder = i < length - 1;
 
                     auto it = _pathToItemMap.find(fullPath);
                     if (it == _pathToItemMap.end()) {
                         auto item = new QStandardItem(parts[i]);
-                        bool isFolder = i < length - 1;
                         item->setData(isFolder ? fullPath + "/" : fullPath, Qt::UserRole);
                         item->setData(isFolder, Qt::UserRole + 1);
                         item->setData(parts[i], Qt::UserRole + 2);
                         item->setData("atp:" + fullPath, Qt::UserRole + 3);
                         item->setData(fullPath, Qt::UserRole + 4);
+                        
                         if (lastItem) {
-                            lastItem->setChild(lastItem->rowCount(), 0, item);
+                            lastItem->appendRow(item);
                         } else {
                             appendRow(item);
                         }
-
                         lastItem = item;
                         _pathToItemMap[fullPath] = lastItem;
                     } else {
                         lastItem = it.value();
                     }
+
+                    // update status
+                    auto statusString = isFolder ? "--" : bakingStatusToString(mapping.second.status);
+                    lastItem->setData(statusString, Qt::UserRole + 5);
+                    lastItem->setData(mapping.second.bakingErrors, Qt::UserRole + 6);
+                    if (mapping.second.status == Pending) {
+                        ++numPendingBakes;
+                    }
                 }
 
                 Q_ASSERT(fullPath == path);
@@ -291,12 +354,39 @@ void AssetMappingModel::refresh() {
                     item = nextItem;
                 }
             }
+
+            if (numPendingBakes != _numPendingBakes) {
+                _numPendingBakes = numPendingBakes;
+                emit numPendingBakesChanged(_numPendingBakes);
+            }
         } else {
             emit errorGettingMappings(request->getErrorString());
         }
 
+        emit updated();
+
         request->deleteLater();
     });
 
     request->start();
 }
+
+void AssetMappingModel::clear() {
+    // make sure we are on the same thread before we touch the hash
+    if (thread() != QThread::currentThread()) {
+        QMetaObject::invokeMethod(this, "clear");
+        return;
+    }
+
+    qDebug() << "Clearing loaded asset mappings for Asset Browser";
+
+    _pathToItemMap.clear();
+    QStandardItemModel::clear();
+}
+
+void AssetMappingModel::setupRoles() {
+    QHash<int, QByteArray> roleNames;
+    roleNames[Qt::DisplayRole] = "name";
+    roleNames[Qt::UserRole + 5] = "baked";
+    setItemRoleNames(roleNames);
+}
diff --git a/interface/src/scripting/AssetMappingsScriptingInterface.h b/interface/src/scripting/AssetMappingsScriptingInterface.h
index b7fcea2491..1a4c7dae48 100644
--- a/interface/src/scripting/AssetMappingsScriptingInterface.h
+++ b/interface/src/scripting/AssetMappingsScriptingInterface.h
@@ -25,20 +25,36 @@
 
 class AssetMappingModel : public QStandardItemModel {
     Q_OBJECT
+    Q_PROPERTY(bool autoRefreshEnabled READ isAutoRefreshEnabled WRITE setAutoRefreshEnabled)
+    Q_PROPERTY(int numPendingBakes READ getNumPendingBakes NOTIFY numPendingBakesChanged)
+
 public:
+    AssetMappingModel();
+
     Q_INVOKABLE void refresh();
 
+    bool isAutoRefreshEnabled();
+    void setAutoRefreshEnabled(bool enabled);
+
     bool isKnownMapping(QString path) const { return _pathToItemMap.contains(path); }
     bool isKnownFolder(QString path) const;
 
+    int getNumPendingBakes() const { return _numPendingBakes;  }
+
 public slots:
     void clear();
 
 signals:
+    void numPendingBakesChanged(int newCount);
     void errorGettingMappings(QString errorString);
+    void updated();
 
 private:
+    void setupRoles();
+
     QHash<QString, QStandardItem*> _pathToItemMap;
+    QTimer _autoRefreshTimer;
+    int _numPendingBakes{ 0 };
 };
 
 Q_DECLARE_METATYPE(AssetMappingModel*)
@@ -61,10 +77,11 @@ public:
     Q_INVOKABLE void setMapping(QString path, QString hash, QJSValue callback = QJSValue());
     Q_INVOKABLE void getMapping(QString path, QJSValue callback = QJSValue());
     Q_INVOKABLE void uploadFile(QString path, QString mapping, QJSValue startedCallback = QJSValue(), QJSValue completedCallback = QJSValue(), bool dropEvent = false);
-    Q_INVOKABLE void deleteMappings(QStringList paths, QJSValue callback);
+    Q_INVOKABLE void deleteMappings(QStringList paths, QJSValue callback = QJSValue());
     Q_INVOKABLE void deleteMapping(QString path, QJSValue callback) { deleteMappings(QStringList(path), callback = QJSValue()); }
     Q_INVOKABLE void getAllMappings(QJSValue callback = QJSValue());
     Q_INVOKABLE void renameMapping(QString oldPath, QString newPath, QJSValue callback = QJSValue());
+    Q_INVOKABLE void setBakingEnabled(QStringList paths, bool enabled, QJSValue callback = QJSValue());
 
 protected:
     QSet<AssetRequest*> _pendingRequests;
diff --git a/interface/src/scripting/Audio.cpp b/interface/src/scripting/Audio.cpp
index 4576190413..f9c1a95fb5 100644
--- a/interface/src/scripting/Audio.cpp
+++ b/interface/src/scripting/Audio.cpp
@@ -11,6 +11,8 @@
 
 #include "Audio.h"
 
+#include <shared/QtHelpers.h>
+
 #include "Application.h"
 #include "AudioClient.h"
 #include "ui/AvatarInputs.h"
@@ -49,27 +51,22 @@ float Audio::loudnessToLevel(float loudness) {
 Audio::Audio() : _devices(_contextIsHMD) {
     auto client = DependencyManager::get<AudioClient>().data();
     connect(client, &AudioClient::muteToggled, this, &Audio::onMutedChanged);
+    connect(client, &AudioClient::noiseReductionChanged, this, &Audio::onNoiseReductionChanged);
     connect(client, &AudioClient::inputLoudnessChanged, this, &Audio::onInputLoudnessChanged);
+    connect(client, &AudioClient::inputVolumeChanged, this, &Audio::onInputVolumeChanged);
     connect(this, &Audio::contextChanged, &_devices, &AudioDevices::onContextChanged);
-    connect(&_devices._inputs, &AudioDeviceList::deviceChanged, this, &Audio::onInputChanged);
     enableNoiseReduction(enableNoiseReductionSetting.get());
 }
 
 void Audio::setMuted(bool isMuted) {
     if (_isMuted != isMuted) {
         auto client = DependencyManager::get<AudioClient>().data();
-        QMetaObject::invokeMethod(client, "toggleMute", Qt::BlockingQueuedConnection);
-
-        _isMuted = isMuted;
-        emit mutedChanged(_isMuted);
+        QMetaObject::invokeMethod(client, "toggleMute");
     }
 }
 
 void Audio::onMutedChanged() {
-    auto client = DependencyManager::get<AudioClient>().data();
-    bool isMuted;
-    QMetaObject::invokeMethod(client, "isMuted", Qt::BlockingQueuedConnection, Q_RETURN_ARG(bool, isMuted));
-
+    bool isMuted = DependencyManager::get<AudioClient>()->isMuted();
     if (_isMuted != isMuted) {
         _isMuted = isMuted;
         emit mutedChanged(_isMuted);
@@ -79,11 +76,16 @@ void Audio::onMutedChanged() {
 void Audio::enableNoiseReduction(bool enable) {
     if (_enableNoiseReduction != enable) {
         auto client = DependencyManager::get<AudioClient>().data();
-        QMetaObject::invokeMethod(client, "setNoiseReduction", Qt::BlockingQueuedConnection, Q_ARG(bool, enable));
-
+        QMetaObject::invokeMethod(client, "setNoiseReduction", Q_ARG(bool, enable));
         enableNoiseReductionSetting.set(enable);
-        _enableNoiseReduction = enable;
-        emit noiseReductionChanged(enable);
+    }
+}
+
+void Audio::onNoiseReductionChanged() {
+    bool noiseReductionEnabled = DependencyManager::get<AudioClient>()->isNoiseReductionEnabled();
+    if (_enableNoiseReduction != noiseReductionEnabled) {
+        _enableNoiseReduction = noiseReductionEnabled;
+        emit noiseReductionChanged(_enableNoiseReduction);
     }
 }
 
@@ -93,19 +95,11 @@ void Audio::setInputVolume(float volume) {
 
     if (_inputVolume != volume) {
         auto client = DependencyManager::get<AudioClient>().data();
-        QMetaObject::invokeMethod(client, "setInputVolume", Qt::BlockingQueuedConnection, Q_ARG(float, volume));
-
-        _inputVolume = volume;
-        emit inputVolumeChanged(_inputVolume);
+        QMetaObject::invokeMethod(client, "setInputVolume", Q_ARG(float, volume));
     }
 }
 
-// different audio input devices may have different volumes
-void Audio::onInputChanged() {
-    auto client = DependencyManager::get<AudioClient>().data();
-    float volume;
-    QMetaObject::invokeMethod(client, "getInputVolume", Qt::BlockingQueuedConnection, Q_RETURN_ARG(float, volume));
-
+void Audio::onInputVolumeChanged(float volume) {
     if (_inputVolume != volume) {
         _inputVolume = volume;
         emit inputVolumeChanged(_inputVolume);
@@ -139,4 +133,12 @@ void Audio::setReverb(bool enable) {
 
 void Audio::setReverbOptions(const AudioEffectOptions* options) {
     DependencyManager::get<AudioClient>()->setReverbOptions(options);
-}
\ No newline at end of file
+}
+
+void Audio::setInputDevice(const QAudioDeviceInfo& device, bool isHMD) {
+    _devices.chooseInputDevice(device, isHMD);
+}
+
+void Audio::setOutputDevice(const QAudioDeviceInfo& device, bool isHMD) {
+    _devices.chooseOutputDevice(device, isHMD);
+}
diff --git a/interface/src/scripting/Audio.h b/interface/src/scripting/Audio.h
index 953727ede8..abd2312cf0 100644
--- a/interface/src/scripting/Audio.h
+++ b/interface/src/scripting/Audio.h
@@ -50,6 +50,8 @@ public:
     void showMicMeter(bool show);
     void setInputVolume(float volume);
 
+    Q_INVOKABLE void setInputDevice(const QAudioDeviceInfo& device, bool isHMD);
+    Q_INVOKABLE void setOutputDevice(const QAudioDeviceInfo& device, bool isHMD);
     Q_INVOKABLE void setReverb(bool enable);
     Q_INVOKABLE void setReverbOptions(const AudioEffectOptions* options);
 
@@ -62,9 +64,12 @@ signals:
     void contextChanged(const QString& context);
 
 public slots:
-    void onMutedChanged();
     void onContextChanged();
-    void onInputChanged();
+
+private slots:
+    void onMutedChanged();
+    void onNoiseReductionChanged();
+    void onInputVolumeChanged(float volume);
     void onInputLoudnessChanged(float loudness);
 
 protected:
@@ -76,7 +81,7 @@ private:
     float _inputVolume { 1.0f };
     float _inputLevel { 0.0f };
     bool _isMuted { false };
-    bool _enableNoiseReduction;
+    bool _enableNoiseReduction { true };  // Match default value of AudioClient::_isNoiseGateEnabled.
     bool _contextIsHMD { false };
 
     AudioDevices* getDevices() { return &_devices; }
diff --git a/interface/src/scripting/AudioDevices.cpp b/interface/src/scripting/AudioDevices.cpp
index b0ea8226e8..a130b46877 100644
--- a/interface/src/scripting/AudioDevices.cpp
+++ b/interface/src/scripting/AudioDevices.cpp
@@ -11,6 +11,9 @@
 
 #include <map>
 
+#include <shared/QtHelpers.h>
+#include <plugins/DisplayPlugin.h>
+
 #include "AudioDevices.h"
 
 #include "Application.h"
@@ -34,89 +37,132 @@ Setting::Handle<QString>& getSetting(bool contextIsHMD, QAudio::Mode mode) {
     }
 }
 
-QHash<int, QByteArray> AudioDeviceList::_roles {
-    { Qt::DisplayRole, "display" },
-    { Qt::CheckStateRole, "selected" }
+enum AudioDeviceRole {
+    DeviceNameRole = Qt::UserRole,
+    SelectedDesktopRole,
+    SelectedHMDRole,
+    PeakRole,
+    InfoRole
 };
+
+QHash<int, QByteArray> AudioDeviceList::_roles {
+    { DeviceNameRole, "devicename" },
+    { SelectedDesktopRole, "selectedDesktop" },
+    { SelectedHMDRole, "selectedHMD" },
+    { PeakRole, "peak" },
+    { InfoRole, "info" }
+};
+
+static QString getTargetDevice(bool hmd, QAudio::Mode mode) {
+    QString deviceName;
+    auto& setting = getSetting(hmd, mode);
+    if (setting.isSet()) {
+        deviceName = setting.get();
+    } else if (hmd) {
+        if (mode == QAudio::AudioInput) {
+            deviceName = qApp->getActiveDisplayPlugin()->getPreferredAudioInDevice();
+        } else { // if (_mode == QAudio::AudioOutput)
+            deviceName = qApp->getActiveDisplayPlugin()->getPreferredAudioOutDevice();
+        }
+    }
+    return deviceName;
+}
+
 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";
+    }
+
+    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";
+    }
+
+    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";
+    }
+
+    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";
+    }
+}
+
+AudioDeviceList::~AudioDeviceList() {
+    //save all selected devices
+    auto& settingHMD = getSetting(true, _mode);
+    auto& settingDesktop = getSetting(false, _mode);
+    // store the selected device
+    foreach(std::shared_ptr<AudioDevice> adevice, _devices) {
+        if (adevice->selectedDesktop) {
+            qDebug() << "Saving Desktop for" << _mode << "name" << adevice->info.deviceName();
+            settingDesktop.set(adevice->info.deviceName());
+        }
+        if (adevice->selectedHMD) {
+            qDebug() << "Saving HMD for" << _mode << "name" << adevice->info.deviceName();
+            settingHMD.set(adevice->info.deviceName());
+        }
+    }
+}
+
 QVariant AudioDeviceList::data(const QModelIndex& index, int role) const {
-    if (!index.isValid() || index.row() >= _devices.size()) {
+    if (!index.isValid() || index.row() >= rowCount()) {
         return QVariant();
     }
 
-    if (role == Qt::DisplayRole) {
-        return _devices.at(index.row()).display;
-    } else if (role == Qt::CheckStateRole) {
-        return _devices.at(index.row()).selected;
+    if (role == DeviceNameRole) {
+        return _devices.at(index.row())->display;
+    } else if (role == SelectedDesktopRole) {
+        return _devices.at(index.row())->selectedDesktop;
+    } else if (role == SelectedHMDRole) {
+        return _devices.at(index.row())->selectedHMD;
+    } else if (role == InfoRole) {
+        return QVariant::fromValue<QAudioDeviceInfo>(_devices.at(index.row())->info);
     } else {
         return QVariant();
     }
 }
 
-bool AudioDeviceList::setData(const QModelIndex& index, const QVariant& value, int role) {
-    if (!index.isValid() || index.row() >= _devices.size() || role != Qt::CheckStateRole) {
-        return false;
+QVariant AudioInputDeviceList::data(const QModelIndex& index, int role) const {
+    if (!index.isValid() || index.row() >= rowCount()) {
+        return QVariant();
     }
 
-    // only allow switching to a new device, not deactivating an in-use device
-    auto selected = value.toBool();
-    if (!selected) {
-        return false;
+    if (role == PeakRole) {
+        return std::static_pointer_cast<AudioInputDevice>(_devices.at(index.row()))->peak;
+    } else {
+        return AudioDeviceList::data(index, role);
     }
-
-    return setDevice(index.row(), true);
 }
 
-bool AudioDeviceList::setDevice(int row, bool fromUser) {
-    bool success = false;
-    auto& device = _devices[row];
+void AudioDeviceList::resetDevice(bool contextIsHMD) {
+    auto client = DependencyManager::get<AudioClient>().data();
+    QString deviceName = getTargetDevice(contextIsHMD, _mode);
+    // FIXME can't use blocking connections here, so we can't determine whether the switch succeeded or not
+    // We need to have the AudioClient emit signals on switch success / failure
+    QMetaObject::invokeMethod(client, "switchAudioDevice", 
+        Q_ARG(QAudio::Mode, _mode), Q_ARG(QString, deviceName));
 
-    // skip if already selected
-    if (!device.selected) {
-        auto client = DependencyManager::get<AudioClient>();
-        QMetaObject::invokeMethod(client.data(), "switchAudioDevice", Qt::BlockingQueuedConnection,
-            Q_RETURN_ARG(bool, success),
-            Q_ARG(QAudio::Mode, _mode),
-            Q_ARG(const QAudioDeviceInfo&, device.info));
-
-        if (success) {
-            device.selected = true;
-            if (fromUser) {
-                emit deviceSelected(device.info, _selectedDevice);
-            }
-            emit deviceChanged(device.info);
-        }
-    }
-
-    emit dataChanged(createIndex(0, 0), createIndex(rowCount() - 1, 0));
-    return success;
-}
-
-void AudioDeviceList::resetDevice(bool contextIsHMD, const QString& device) {
-    bool success { false };
-
-    // try to set the last selected device
-    if (!device.isNull()) {
-        auto i = 0;
-        for (; i < rowCount(); ++i) {
-            if (device == _devices[i].info.deviceName()) {
-                break;
-            }
-        }
-        if (i < rowCount()) {
-            success = setDevice(i, false);
-        }
-
-        // the selection failed - reset it
-        if (!success) {
-            emit deviceSelected();
-        }
-    }
+#if 0
+    bool switchResult = false;
+    QMetaObject::invokeMethod(client, "switchAudioDevice", Qt::BlockingQueuedConnection,
+        Q_RETURN_ARG(bool, switchResult),
+        Q_ARG(QAudio::Mode, _mode), Q_ARG(QString, deviceName));
 
     // try to set to the default device for this mode
-    if (!success) {
-        auto client = DependencyManager::get<AudioClient>().data();
+    if (!switchResult) {
         if (contextIsHMD) {
             QString deviceName;
             if (_mode == QAudio::AudioInput) {
@@ -132,78 +178,119 @@ void AudioDeviceList::resetDevice(bool contextIsHMD, const QString& device) {
             QMetaObject::invokeMethod(client, "switchAudioDevice", Q_ARG(QAudio::Mode, _mode));
         }
     }
+#endif
 }
 
-void AudioDeviceList::onDeviceChanged(const QAudioDeviceInfo& device) {
-    _selectedDevice = device;
-    QModelIndex index;
+void AudioDeviceList::onDeviceChanged(const QAudioDeviceInfo& device, bool isHMD) {
+    auto oldDevice = isHMD ? _selectedHMDDevice : _selectedDesktopDevice;
+    QAudioDeviceInfo& selectedDevice = isHMD ? _selectedHMDDevice : _selectedDesktopDevice;
+    selectedDevice = device;
 
     for (auto i = 0; i < _devices.size(); ++i) {
-        AudioDevice& device = _devices[i];
-
-        if (device.selected && device.info != _selectedDevice) {
-            device.selected = false;
-        } else if (device.info == _selectedDevice) {
-            device.selected = true;
-            index = createIndex(i, 0);
+        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;
         }
     }
 
-    emit deviceChanged(_selectedDevice);
+    emit deviceChanged(selectedDevice);
     emit dataChanged(createIndex(0, 0), createIndex(rowCount() - 1, 0));
 }
 
-void AudioDeviceList::onDevicesChanged(const QList<QAudioDeviceInfo>& devices) {
+void AudioDeviceList::onDevicesChanged(const QList<QAudioDeviceInfo>& devices, bool isHMD) {
+    QAudioDeviceInfo& selectedDevice = isHMD ? _selectedHMDDevice : _selectedDesktopDevice;
+
+    const QString& savedDeviceName = isHMD ? _hmdSavedDeviceName : _desktopSavedDeviceName;
     beginResetModel();
 
     _devices.clear();
 
     foreach(const QAudioDeviceInfo& deviceInfo, devices) {
         AudioDevice device;
+        bool &isSelected = isHMD ? device.selectedHMD : device.selectedDesktop;
         device.info = deviceInfo;
         device.display = device.info.deviceName()
             .replace("High Definition", "HD")
             .remove("Device")
             .replace(" )", ")");
-        device.selected = (device.info == _selectedDevice);
-        _devices.push_back(device);
+        if (!selectedDevice.isNull()) {
+            isSelected = (device.info == selectedDevice);
+        } else {
+            //no selected device for context. fallback to saved
+            isSelected = (device.info.deviceName() == savedDeviceName);
+        }
+        qDebug() << "adding audio device:" << device.display << device.selectedDesktop << device.selectedHMD << _mode;
+        _devices.push_back(newDevice(device));
     }
 
     endResetModel();
 }
 
+bool AudioInputDeviceList::peakValuesAvailable() {
+    std::call_once(_peakFlag, [&] {
+        _peakValuesAvailable = DependencyManager::get<AudioClient>()->peakValuesAvailable();
+    });
+    return _peakValuesAvailable;
+}
+
+void AudioInputDeviceList::setPeakValuesEnabled(bool enable) {
+    if (peakValuesAvailable() && (enable != _peakValuesEnabled)) {
+        DependencyManager::get<AudioClient>()->enablePeakValues(enable);
+        _peakValuesEnabled = enable;
+        emit peakValuesEnabledChanged(_peakValuesEnabled);
+    }
+}
+
+void AudioInputDeviceList::onPeakValueListChanged(const QList<float>& peakValueList) {
+    assert(_mode == QAudio::AudioInput);
+
+    if (peakValueList.length() != rowCount()) {
+        qWarning() << "AudioDeviceList" << __FUNCTION__ << "length mismatch";
+    }
+
+    for (auto i = 0; i < rowCount(); ++i) {
+        std::static_pointer_cast<AudioInputDevice>(_devices[i])->peak = peakValueList[i];
+    }
+
+    emit dataChanged(createIndex(0, 0), createIndex(rowCount() - 1, 0), { PeakRole });
+}
+
 AudioDevices::AudioDevices(bool& contextIsHMD) : _contextIsHMD(contextIsHMD) {
     auto client = DependencyManager::get<AudioClient>();
 
     connect(client.data(), &AudioClient::deviceChanged, this, &AudioDevices::onDeviceChanged, Qt::QueuedConnection);
     connect(client.data(), &AudioClient::devicesChanged, this, &AudioDevices::onDevicesChanged, Qt::QueuedConnection);
+    connect(client.data(), &AudioClient::peakValueListChanged, &_inputs, &AudioInputDeviceList::onPeakValueListChanged, Qt::QueuedConnection);
+
+    _inputs.onDeviceChanged(client->getActiveAudioDevice(QAudio::AudioInput), contextIsHMD);
+    _outputs.onDeviceChanged(client->getActiveAudioDevice(QAudio::AudioOutput), contextIsHMD);
 
     // connections are made after client is initialized, so we must also fetch the devices
-    _inputs.onDeviceChanged(client->getActiveAudioDevice(QAudio::AudioInput));
-    _outputs.onDeviceChanged(client->getActiveAudioDevice(QAudio::AudioOutput));
-    _inputs.onDevicesChanged(client->getAudioDevices(QAudio::AudioInput));
-    _outputs.onDevicesChanged(client->getAudioDevices(QAudio::AudioOutput));
-
-    connect(&_inputs, &AudioDeviceList::deviceSelected, [&](const QAudioDeviceInfo& device, const QAudioDeviceInfo& previousDevice) {
-        onDeviceSelected(QAudio::AudioInput, device, previousDevice);
-    });
-    connect(&_outputs, &AudioDeviceList::deviceSelected, [&](const QAudioDeviceInfo& device, const QAudioDeviceInfo& previousDevice) {
-        onDeviceSelected(QAudio::AudioOutput, device, previousDevice);
-    });
+    const QList<QAudioDeviceInfo>& devicesInput = client->getAudioDevices(QAudio::AudioInput);
+    const QList<QAudioDeviceInfo>& devicesOutput = client->getAudioDevices(QAudio::AudioOutput);
+    //setup HMD devices
+    _inputs.onDevicesChanged(devicesInput, true);
+    _outputs.onDevicesChanged(devicesOutput, true);
+    //setup Desktop devices
+    _inputs.onDevicesChanged(devicesInput, false);
+    _outputs.onDevicesChanged(devicesOutput, false);
 }
 
+AudioDevices::~AudioDevices() {}
+
 void AudioDevices::onContextChanged(const QString& context) {
-    auto input = getSetting(_contextIsHMD, QAudio::AudioInput).get();
-    auto output = getSetting(_contextIsHMD, QAudio::AudioOutput).get();
-
-    _inputs.resetDevice(_contextIsHMD, input);
-    _outputs.resetDevice(_contextIsHMD, output);
+    _inputs.resetDevice(_contextIsHMD);
+    _outputs.resetDevice(_contextIsHMD);
 }
 
-void AudioDevices::onDeviceSelected(QAudio::Mode mode, const QAudioDeviceInfo& device, const QAudioDeviceInfo& previousDevice) {
+void AudioDevices::onDeviceSelected(QAudio::Mode mode, const QAudioDeviceInfo& device,
+                                    const QAudioDeviceInfo& previousDevice, bool isHMD) {
     QString deviceName = device.isNull() ? QString() : device.deviceName();
 
-    auto& setting = getSetting(_contextIsHMD, mode);
+    auto& setting = getSetting(isHMD, mode);
 
     // check for a previous device
     auto wasDefault = setting.get().isNull();
@@ -238,29 +325,95 @@ void AudioDevices::onDeviceSelected(QAudio::Mode mode, const QAudioDeviceInfo& d
 
 void AudioDevices::onDeviceChanged(QAudio::Mode mode, const QAudioDeviceInfo& device) {
     if (mode == QAudio::AudioInput) {
-        _inputs.onDeviceChanged(device);
+        if (_requestedInputDevice == device) {
+            onDeviceSelected(QAudio::AudioInput, device,
+                             _contextIsHMD ? _inputs._selectedHMDDevice : _inputs._selectedDesktopDevice,
+                             _contextIsHMD);
+            _requestedInputDevice = QAudioDeviceInfo();
+        }
+        _inputs.onDeviceChanged(device, _contextIsHMD);
     } else { // if (mode == QAudio::AudioOutput)
-        _outputs.onDeviceChanged(device);
+        if (_requestedOutputDevice == device) {
+            onDeviceSelected(QAudio::AudioOutput, device,
+                             _contextIsHMD ? _outputs._selectedHMDDevice : _outputs._selectedDesktopDevice,
+                             _contextIsHMD);
+            _requestedOutputDevice = QAudioDeviceInfo();
+        }
+        _outputs.onDeviceChanged(device, _contextIsHMD);
     }
 }
 
 void AudioDevices::onDevicesChanged(QAudio::Mode mode, const QList<QAudioDeviceInfo>& devices) {
-    static bool initialized { false };
-    auto initialize = [&]{
-        if (initialized) {
-            onContextChanged(QString());
-        } else {
-            initialized = true;
-        }
-    };
+    static std::once_flag once;
+    std::call_once(once, [&] {
+        //readout settings
+        auto client = DependencyManager::get<AudioClient>();
 
+        _inputs._hmdSavedDeviceName = getTargetDevice(true, QAudio::AudioInput);
+        _inputs._desktopSavedDeviceName = getTargetDevice(false, QAudio::AudioInput);
+
+        //fallback to default device
+        if (_inputs._desktopSavedDeviceName.isEmpty()) {
+            _inputs._desktopSavedDeviceName = client->getActiveAudioDevice(QAudio::AudioInput).deviceName();
+        }
+        //fallback to desktop device
+        if (_inputs._hmdSavedDeviceName.isEmpty()) {
+            _inputs._hmdSavedDeviceName = _inputs._desktopSavedDeviceName;
+        }
+
+        _outputs._hmdSavedDeviceName = getTargetDevice(true, QAudio::AudioOutput);
+        _outputs._desktopSavedDeviceName = getTargetDevice(false, QAudio::AudioOutput);
+
+        if (_outputs._desktopSavedDeviceName.isEmpty()) {
+            _outputs._desktopSavedDeviceName = client->getActiveAudioDevice(QAudio::AudioOutput).deviceName();
+        }
+        if (_outputs._hmdSavedDeviceName.isEmpty()) {
+            _outputs._hmdSavedDeviceName = _outputs._desktopSavedDeviceName;
+        }
+        onContextChanged(QString());
+    });
+
+    //set devices for both contexts
     if (mode == QAudio::AudioInput) {
-        _inputs.onDevicesChanged(devices);
-        static std::once_flag inputFlag;
-        std::call_once(inputFlag, initialize);
+        _inputs.onDevicesChanged(devices, _contextIsHMD);
+        _inputs.onDevicesChanged(devices, !_contextIsHMD);
     } else { // if (mode == QAudio::AudioOutput)
-        _outputs.onDevicesChanged(devices);
-        static std::once_flag outputFlag;
-        std::call_once(outputFlag, initialize);
+        _outputs.onDevicesChanged(devices, _contextIsHMD);
+        _outputs.onDevicesChanged(devices, !_contextIsHMD);
+    }
+}
+
+
+void AudioDevices::chooseInputDevice(const QAudioDeviceInfo& device, bool isHMD) {
+    //check if current context equals device to change
+    if (_contextIsHMD == isHMD) {
+        auto client = DependencyManager::get<AudioClient>();
+        _requestedInputDevice = device;
+        QMetaObject::invokeMethod(client.data(), "switchAudioDevice",
+                                  Q_ARG(QAudio::Mode, QAudio::AudioInput),
+                                  Q_ARG(const QAudioDeviceInfo&, device));
+    } else {
+        //context is different. just save device in settings
+        onDeviceSelected(QAudio::AudioInput, device,
+                         isHMD ? _inputs._selectedHMDDevice : _inputs._selectedDesktopDevice,
+                         isHMD);
+        _inputs.onDeviceChanged(device, isHMD);
+    }
+}
+
+void AudioDevices::chooseOutputDevice(const QAudioDeviceInfo& device, bool isHMD) {
+    //check if current context equals device to change
+    if (_contextIsHMD == isHMD) {
+        auto client = DependencyManager::get<AudioClient>();
+        _requestedOutputDevice = device;
+        QMetaObject::invokeMethod(client.data(), "switchAudioDevice",
+                                  Q_ARG(QAudio::Mode, QAudio::AudioOutput),
+                                  Q_ARG(const QAudioDeviceInfo&, device));
+    } else {
+        //context is different. just save device in settings
+        onDeviceSelected(QAudio::AudioOutput, device,
+                         isHMD ? _outputs._selectedHMDDevice : _outputs._selectedDesktopDevice,
+                         isHMD);
+        _outputs.onDeviceChanged(device, isHMD);
     }
 }
diff --git a/interface/src/scripting/AudioDevices.h b/interface/src/scripting/AudioDevices.h
index cd47ab4191..36f1653e38 100644
--- a/interface/src/scripting/AudioDevices.h
+++ b/interface/src/scripting/AudioDevices.h
@@ -12,6 +12,9 @@
 #ifndef hifi_scripting_AudioDevices_h
 #define hifi_scripting_AudioDevices_h
 
+#include <memory>
+#include <mutex>
+
 #include <QObject>
 #include <QAbstractListModel>
 #include <QAudioDeviceInfo>
@@ -22,14 +25,19 @@ class AudioDevice {
 public:
     QAudioDeviceInfo info;
     QString display;
-    bool selected { false };
+    bool selectedDesktop { false };
+    bool selectedHMD { false };
 };
 
 class AudioDeviceList : public QAbstractListModel {
     Q_OBJECT
 
 public:
-    AudioDeviceList(QAudio::Mode mode) : _mode(mode) {}
+    AudioDeviceList(QAudio::Mode mode = QAudio::AudioOutput);
+    virtual ~AudioDeviceList();
+
+    virtual std::shared_ptr<AudioDevice> newDevice(const AudioDevice& device)
+        { return std::make_shared<AudioDevice>(device); }
 
     int rowCount(const QModelIndex& parent = QModelIndex()) const override { Q_UNUSED(parent); return _devices.size(); }
     QHash<int, QByteArray> roleNames() const override { return _roles; }
@@ -37,62 +45,103 @@ public:
 
     // get/set devices through a QML ListView
     QVariant data(const QModelIndex& index, int role) const override;
-    bool setData(const QModelIndex& index, const QVariant &value, int role) override;
 
     // reset device to the last selected device in this context, or the default
-    void resetDevice(bool contextIsHMD, const QString& device);
+    void resetDevice(bool contextIsHMD);
 
 signals:
-    void deviceSelected(const QAudioDeviceInfo& device = QAudioDeviceInfo(),
-                        const QAudioDeviceInfo& previousDevice = QAudioDeviceInfo());
     void deviceChanged(const QAudioDeviceInfo& device);
 
-private slots:
-    void onDeviceChanged(const QAudioDeviceInfo& device);
-    void onDevicesChanged(const QList<QAudioDeviceInfo>& devices);
+protected slots:
+    void onDeviceChanged(const QAudioDeviceInfo& device, bool isHMD);
+    void onDevicesChanged(const QList<QAudioDeviceInfo>& devices, bool isHMD);
 
-private:
+protected:
     friend class AudioDevices;
 
-    bool setDevice(int index, bool fromUser);
-
     static QHash<int, QByteArray> _roles;
     static Qt::ItemFlags _flags;
-
-    QAudio::Mode _mode;
-    QAudioDeviceInfo _selectedDevice;
-    QList<AudioDevice> _devices;
+    const QAudio::Mode _mode;
+    QAudioDeviceInfo _selectedDesktopDevice;
+    QAudioDeviceInfo _selectedHMDDevice;
+    QList<std::shared_ptr<AudioDevice>> _devices;
+    QString _hmdSavedDeviceName;
+    QString _desktopSavedDeviceName;
 };
 
+class AudioInputDevice : public AudioDevice {
+public:
+    AudioInputDevice(const AudioDevice& device) : AudioDevice(device) {}
+    float peak { 0.0f };
+};
+
+class AudioInputDeviceList : public AudioDeviceList {
+    Q_OBJECT
+    Q_PROPERTY(bool peakValuesAvailable READ peakValuesAvailable)
+    Q_PROPERTY(bool peakValuesEnabled READ peakValuesEnabled WRITE setPeakValuesEnabled NOTIFY peakValuesEnabledChanged)
+
+public:
+    AudioInputDeviceList() : AudioDeviceList(QAudio::AudioInput) {}
+    virtual ~AudioInputDeviceList() = default;
+
+    virtual std::shared_ptr<AudioDevice> newDevice(const AudioDevice& device) override
+        { return std::make_shared<AudioInputDevice>(device); }
+
+    QVariant data(const QModelIndex& index, int role) const override;
+
+signals:
+    void peakValuesEnabledChanged(bool enabled);
+
+protected slots:
+    void onPeakValueListChanged(const QList<float>& peakValueList);
+
+protected:
+    friend class AudioDevices;
+
+    bool peakValuesAvailable();
+    std::once_flag _peakFlag;
+    bool _peakValuesAvailable;
+
+    bool peakValuesEnabled() const { return _peakValuesEnabled; }
+    void setPeakValuesEnabled(bool enable);
+    bool _peakValuesEnabled { false };
+};
 class Audio;
 
 class AudioDevices : public QObject {
     Q_OBJECT
-    Q_PROPERTY(AudioDeviceList* input READ getInputList NOTIFY nop)
+    Q_PROPERTY(AudioInputDeviceList* input READ getInputList NOTIFY nop)
     Q_PROPERTY(AudioDeviceList* output READ getOutputList NOTIFY nop)
 
 public:
     AudioDevices(bool& contextIsHMD);
+    virtual ~AudioDevices();
+
+    void chooseInputDevice(const QAudioDeviceInfo& device, bool isHMD);
+    void chooseOutputDevice(const QAudioDeviceInfo& device, bool isHMD);
 
 signals:
     void nop();
 
 private slots:
     void onContextChanged(const QString& context);
-    void onDeviceSelected(QAudio::Mode mode, const QAudioDeviceInfo& device, const QAudioDeviceInfo& previousDevice);
+    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);
 
 private:
     friend class Audio;
 
-    AudioDeviceList* getInputList() { return &_inputs; }
+    AudioInputDeviceList* getInputList() { return &_inputs; }
     AudioDeviceList* getOutputList() { return &_outputs; }
 
-    AudioDeviceList _inputs { QAudio::AudioInput };
+    AudioInputDeviceList _inputs;
     AudioDeviceList _outputs { QAudio::AudioOutput };
+    QAudioDeviceInfo _requestedOutputDevice;
+    QAudioDeviceInfo _requestedInputDevice;
 
-    bool& _contextIsHMD;
+    const bool& _contextIsHMD;
 };
 
 };
diff --git a/interface/src/scripting/ClipboardScriptingInterface.cpp b/interface/src/scripting/ClipboardScriptingInterface.cpp
index b803080538..f8db061299 100644
--- a/interface/src/scripting/ClipboardScriptingInterface.cpp
+++ b/interface/src/scripting/ClipboardScriptingInterface.cpp
@@ -8,9 +8,12 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include "Application.h"
 #include "ClipboardScriptingInterface.h"
 
+#include <shared/QtHelpers.h>
+
+#include "Application.h"
+
 ClipboardScriptingInterface::ClipboardScriptingInterface() {
 }
 
@@ -24,7 +27,7 @@ float ClipboardScriptingInterface::getClipboardContentsLargestDimension() {
 
 bool ClipboardScriptingInterface::exportEntities(const QString& filename, const QVector<EntityItemID>& entityIDs) {
     bool retVal;
-    QMetaObject::invokeMethod(qApp, "exportEntities", Qt::BlockingQueuedConnection,
+    BLOCKING_INVOKE_METHOD(qApp, "exportEntities",
                               Q_RETURN_ARG(bool, retVal),
                               Q_ARG(const QString&, filename),
                               Q_ARG(const QVector<EntityItemID>&, entityIDs));
@@ -33,7 +36,7 @@ bool ClipboardScriptingInterface::exportEntities(const QString& filename, const
 
 bool ClipboardScriptingInterface::exportEntities(const QString& filename, float x, float y, float z, float s) {
     bool retVal;
-    QMetaObject::invokeMethod(qApp, "exportEntities", Qt::BlockingQueuedConnection,
+    BLOCKING_INVOKE_METHOD(qApp, "exportEntities",
                               Q_RETURN_ARG(bool, retVal),
                               Q_ARG(const QString&, filename),
                               Q_ARG(float, x),
@@ -45,7 +48,7 @@ bool ClipboardScriptingInterface::exportEntities(const QString& filename, float
 
 bool ClipboardScriptingInterface::importEntities(const QString& filename) {
     bool retVal;
-    QMetaObject::invokeMethod(qApp, "importEntities", Qt::BlockingQueuedConnection,
+    BLOCKING_INVOKE_METHOD(qApp, "importEntities",
                               Q_RETURN_ARG(bool, retVal),
                               Q_ARG(const QString&, filename));
     return retVal;
@@ -53,7 +56,7 @@ bool ClipboardScriptingInterface::importEntities(const QString& filename) {
 
 QVector<EntityItemID> ClipboardScriptingInterface::pasteEntities(glm::vec3 position) {
     QVector<EntityItemID> retVal;
-    QMetaObject::invokeMethod(qApp, "pasteEntities", Qt::BlockingQueuedConnection,
+    BLOCKING_INVOKE_METHOD(qApp, "pasteEntities",
                               Q_RETURN_ARG(QVector<EntityItemID>, retVal),
                               Q_ARG(float, position.x),
                               Q_ARG(float, position.y),
diff --git a/interface/src/scripting/ClipboardScriptingInterface.h b/interface/src/scripting/ClipboardScriptingInterface.h
index 3c10475242..826732c777 100644
--- a/interface/src/scripting/ClipboardScriptingInterface.h
+++ b/interface/src/scripting/ClipboardScriptingInterface.h
@@ -13,6 +13,10 @@
 
 #include <QObject>
 
+#include <glm/glm.hpp>
+
+#include <EntityItemID.h>
+
 /**jsdoc
  * @namespace Clipboard
  */
diff --git a/interface/src/scripting/ControllerScriptingInterface.cpp b/interface/src/scripting/ControllerScriptingInterface.cpp
index f3ec3cd79d..4848531de7 100644
--- a/interface/src/scripting/ControllerScriptingInterface.cpp
+++ b/interface/src/scripting/ControllerScriptingInterface.cpp
@@ -13,23 +13,9 @@
 
 #include <avatar/AvatarManager.h>
 #include <avatar/MyAvatar.h>
-#include <HFBackEvent.h>
 #include <plugins/PluginManager.h>
 
 #include "Application.h"
-#include <trackers/MotionTracker.h>
-
-void ControllerScriptingInterface::handleMetaEvent(HFMetaEvent* event) {
-    if (event->type() == HFActionEvent::startType()) {
-        emit actionStartEvent(static_cast<HFActionEvent&>(*event));
-    } else if (event->type() == HFActionEvent::endType()) {
-        emit actionEndEvent(static_cast<HFActionEvent&>(*event));
-    } else if (event->type() == HFBackEvent::startType()) {
-        emit backStartEvent();
-    } else if (event->type() == HFBackEvent::endType()) {
-        emit backEndEvent();
-    }
-}
 
 bool ControllerScriptingInterface::isKeyCaptured(QKeyEvent* event) const {
     return isKeyCaptured(KeyEvent(*event));
@@ -92,91 +78,11 @@ glm::vec2 ControllerScriptingInterface::getViewportDimensions() const {
     return qApp->getUiSize();
 }
 
-QVariant ControllerScriptingInterface::getRecommendedOverlayRect() const {
-    auto rect = qApp->getRecommendedOverlayRect();
+QVariant ControllerScriptingInterface::getRecommendedHUDRect() const {
+    auto rect = qApp->getRecommendedHUDRect();
     return qRectToVariant(rect);
 }
 
-controller::InputController* ControllerScriptingInterface::createInputController(const QString& deviceName, const QString& tracker) {
-    // This is where we retrieve the Device Tracker category and then the sub tracker within it
-    auto icIt = _inputControllers.find(0);
-    if (icIt != _inputControllers.end()) {
-        return (*icIt).second.get();
-    }
-
-    // Look for device
-    DeviceTracker::ID deviceID = DeviceTracker::getDeviceID(deviceName.toStdString());
-    if (deviceID < 0) {
-        deviceID = 0;
-    }
-    // TODO in this current implementation, we just pick the device assuming there is one (normally the Leapmotion)
-    // in the near future we need to change that to a real mapping between the devices and the deviceName
-    // ALso we need to expand the spec so we can fall back on  the "default" controller per categories
-
-    if (deviceID >= 0) {
-        // TODO here again the assumption it's the LeapMotion and so it's a MOtionTracker, this would need to be changed to support different types of devices
-        MotionTracker* motionTracker = dynamic_cast< MotionTracker* > (DeviceTracker::getDevice(deviceID));
-        if (motionTracker) {
-            MotionTracker::Index trackerID = motionTracker->findJointIndex(tracker.toStdString());
-            if (trackerID >= 0) {
-                controller::InputController::Pointer inputController = std::make_shared<InputController>(deviceID, trackerID, this);
-                controller::InputController::Key key = inputController->getKey();
-                _inputControllers.insert(InputControllerMap::value_type(key, inputController));
-                return inputController.get();
-            }
-        }
-    }
-
-    return nullptr;
-}
-
-void ControllerScriptingInterface::releaseInputController(controller::InputController* input) {
-    _inputControllers.erase(input->getKey());
-}
-
-void ControllerScriptingInterface::updateInputControllers() {
-    for (auto it = _inputControllers.begin(); it != _inputControllers.end(); it++) {
-        (*it).second->update();
-    }
-}
-
-InputController::InputController(int deviceTrackerId, int subTrackerId, QObject* parent) :
-    _deviceTrackerId(deviceTrackerId),
-    _subTrackerId(subTrackerId),
-    _isActive(false)
-{
-}
-
-void InputController::update() {
-    _isActive = false;
-
-    // TODO for now the InputController is only supporting a JointTracker from a MotionTracker
-    MotionTracker* motionTracker = dynamic_cast< MotionTracker*> (DeviceTracker::getDevice(_deviceTrackerId));
-    if (motionTracker) {
-        if ((int)_subTrackerId < motionTracker->numJointTrackers()) {
-            const MotionTracker::JointTracker* joint = motionTracker->getJointTracker(_subTrackerId);
-
-            if (joint->isActive()) {
-                joint->getAbsFrame().getTranslation(_eventCache.absTranslation);
-                joint->getAbsFrame().getRotation(_eventCache.absRotation);
-                joint->getLocFrame().getTranslation(_eventCache.locTranslation);
-                joint->getLocFrame().getRotation(_eventCache.locRotation);
-
-                _isActive = true;
-                //emit spatialEvent(_eventCache);
-            }
-        }
-    }
-}
-
-const unsigned int INPUTCONTROLLER_KEY_DEVICE_OFFSET = 16;
-const unsigned int INPUTCONTROLLER_KEY_DEVICE_MASK = 16;
-
-InputController::Key InputController::getKey() const {
-    return (((_deviceTrackerId & INPUTCONTROLLER_KEY_DEVICE_MASK) << INPUTCONTROLLER_KEY_DEVICE_OFFSET) | _subTrackerId);
-}
-
-
 void ControllerScriptingInterface::emitKeyPressEvent(QKeyEvent* event) { emit keyPressEvent(KeyEvent(*event)); }
 void ControllerScriptingInterface::emitKeyReleaseEvent(QKeyEvent* event) { emit keyReleaseEvent(KeyEvent(*event)); }
 
diff --git a/interface/src/scripting/ControllerScriptingInterface.h b/interface/src/scripting/ControllerScriptingInterface.h
index 996ccabb20..7a2c964622 100644
--- a/interface/src/scripting/ControllerScriptingInterface.h
+++ b/interface/src/scripting/ControllerScriptingInterface.h
@@ -17,7 +17,6 @@
 #include <controllers/UserInputMapper.h>
 #include <controllers/ScriptingInterface.h>
 
-#include <HFActionEvent.h>
 #include <KeyEvent.h>
 #include <MouseEvent.h>
 #include <SpatialEvent.h>
@@ -25,38 +24,6 @@
 #include <WheelEvent.h>
 class ScriptEngine;
 
-class PalmData;
-
-class InputController : public  controller::InputController {
-    Q_OBJECT
-
-public:
-    InputController(int deviceTrackerId, int subTrackerId, QObject* parent = NULL);
-
-    virtual void update() override;
-    virtual Key getKey() const override;
-
-public slots:
-
-    virtual bool isActive() const override { return _isActive; }
-    virtual glm::vec3 getAbsTranslation() const override { return _eventCache.absTranslation; }
-    virtual glm::quat getAbsRotation() const override { return _eventCache.absRotation; }
-    virtual glm::vec3 getLocTranslation() const override { return _eventCache.locTranslation; }
-    virtual glm::quat getLocRotation() const override { return _eventCache.locRotation; }
-
-private:
-
-    int  _deviceTrackerId;
-    uint  _subTrackerId;
-
-    // cache for the spatial
-    SpatialEvent    _eventCache;
-    bool            _isActive;
-
-signals:
-};
- 
-
 /// handles scripting of input controller commands from JS
 class ControllerScriptingInterface : public controller::ScriptingInterface {
     Q_OBJECT
@@ -68,8 +35,6 @@ public:
     void emitKeyPressEvent(QKeyEvent* event);
     void emitKeyReleaseEvent(QKeyEvent* event);
     
-    void handleMetaEvent(HFMetaEvent* event);
-
     void emitMouseMoveEvent(QMouseEvent* event);
     void emitMousePressEvent(QMouseEvent* event); 
     void emitMouseDoublePressEvent(QMouseEvent* event);
@@ -86,8 +51,6 @@ public:
     bool isJoystickCaptured(int joystickIndex) const;
     bool areEntityClicksCaptured() const;
 
-    void updateInputControllers();
-
 public slots:
 
     virtual void captureKeyEvents(const KeyEvent& event);
@@ -100,22 +63,12 @@ public slots:
     virtual void releaseEntityClickEvents();
 
     virtual glm::vec2 getViewportDimensions() const;
-    virtual QVariant getRecommendedOverlayRect() const;
-
-    /// Factory to create an InputController
-    virtual controller::InputController* createInputController(const QString& deviceName, const QString& tracker);
-    virtual void releaseInputController(controller::InputController* input);
+    virtual QVariant getRecommendedHUDRect() const;
 
 signals:
     void keyPressEvent(const KeyEvent& event);
     void keyReleaseEvent(const KeyEvent& event);
 
-    void actionStartEvent(const HFActionEvent& event);
-    void actionEndEvent(const HFActionEvent& event);
-
-    void backStartEvent();
-    void backEndEvent();
-
     void mouseMoveEvent(const MouseEvent& event);
     void mousePressEvent(const MouseEvent& event);
     void mouseDoublePressEvent(const MouseEvent& event);
@@ -135,8 +88,6 @@ private:
     bool _captureEntityClicks;
 
     using InputKey = controller::InputController::Key;
-    using InputControllerMap = std::map<InputKey, controller::InputController::Pointer>;
-    InputControllerMap _inputControllers;
 };
 
 const int NUMBER_OF_SPATIALCONTROLS_PER_PALM = 2; // the hand and the tip
diff --git a/interface/src/scripting/DesktopScriptingInterface.cpp b/interface/src/scripting/DesktopScriptingInterface.cpp
index efab178798..34f196ac70 100644
--- a/interface/src/scripting/DesktopScriptingInterface.cpp
+++ b/interface/src/scripting/DesktopScriptingInterface.cpp
@@ -29,7 +29,7 @@ int DesktopScriptingInterface::getHeight() {
     return size.height();
 }
 
-void DesktopScriptingInterface::setOverlayAlpha(float alpha) {
+void DesktopScriptingInterface::setHUDAlpha(float alpha) {
     qApp->getApplicationCompositor().setAlpha(alpha);
 }
 
diff --git a/interface/src/scripting/DesktopScriptingInterface.h b/interface/src/scripting/DesktopScriptingInterface.h
index 2825065e90..e62a3584d6 100644
--- a/interface/src/scripting/DesktopScriptingInterface.h
+++ b/interface/src/scripting/DesktopScriptingInterface.h
@@ -22,7 +22,7 @@ class DesktopScriptingInterface : public QObject, public Dependency {
     Q_PROPERTY(int height READ getHeight)  // Physical height of screen(s) including task bars and system menus
 
 public:
-    Q_INVOKABLE void setOverlayAlpha(float alpha);
+    Q_INVOKABLE void setHUDAlpha(float alpha);
     Q_INVOKABLE void show(const QString& path, const QString&  title);
 
     int getWidth();
diff --git a/interface/src/scripting/DialogsManagerScriptingInterface.cpp b/interface/src/scripting/DialogsManagerScriptingInterface.cpp
index 0fb6078290..596320eb3c 100644
--- a/interface/src/scripting/DialogsManagerScriptingInterface.cpp
+++ b/interface/src/scripting/DialogsManagerScriptingInterface.cpp
@@ -33,7 +33,12 @@ void DialogsManagerScriptingInterface::showAddressBar() {
 
 void DialogsManagerScriptingInterface::hideAddressBar() {
     QMetaObject::invokeMethod(DependencyManager::get<DialogsManager>().data(),
-        "hideAddressBar", Qt::QueuedConnection);
+                              "hideAddressBar", Qt::QueuedConnection);
+}
+
+void DialogsManagerScriptingInterface::showLoginDialog() {
+    QMetaObject::invokeMethod(DependencyManager::get<DialogsManager>().data(),
+        "showLoginDialog", Qt::QueuedConnection);
 }
 
 void DialogsManagerScriptingInterface::showFeed() {
diff --git a/interface/src/scripting/DialogsManagerScriptingInterface.h b/interface/src/scripting/DialogsManagerScriptingInterface.h
index e4dd18aedf..b223799cfe 100644
--- a/interface/src/scripting/DialogsManagerScriptingInterface.h
+++ b/interface/src/scripting/DialogsManagerScriptingInterface.h
@@ -24,6 +24,7 @@ public:
 public slots:
     void showAddressBar();
     void hideAddressBar();
+    void showLoginDialog();
 
 signals:
     void addressBarShown(bool visible);
diff --git a/interface/src/scripting/HMDScriptingInterface.cpp b/interface/src/scripting/HMDScriptingInterface.cpp
index 883a6e758e..31b8f74e9e 100644
--- a/interface/src/scripting/HMDScriptingInterface.cpp
+++ b/interface/src/scripting/HMDScriptingInterface.cpp
@@ -13,6 +13,7 @@
 
 #include <QtScript/QScriptContext>
 
+#include <shared/QtHelpers.h>
 #include <avatar/AvatarManager.h>
 #include <display-plugins/DisplayPlugin.h>
 #include <display-plugins/CompositorHelper.h>
@@ -81,12 +82,39 @@ bool HMDScriptingInterface::shouldShowHandControllers() const {
     return _showHandControllersCount > 0;
 }
 
-void  HMDScriptingInterface::closeTablet() {
-    _showTablet = false;
+void HMDScriptingInterface::activateHMDHandMouse() {
+    QWriteLocker lock(&_hmdHandMouseLock);
+    auto offscreenUi = DependencyManager::get<OffscreenUi>();
+    offscreenUi->getDesktop()->setProperty("hmdHandMouseActive", true);
+    _hmdHandMouseCount++;
 }
 
-void HMDScriptingInterface::openTablet() {
+void HMDScriptingInterface::deactivateHMDHandMouse() {
+    QWriteLocker lock(&_hmdHandMouseLock);
+    _hmdHandMouseCount = std::max(_hmdHandMouseCount - 1, 0);
+    if (_hmdHandMouseCount == 0) {
+        auto offscreenUi = DependencyManager::get<OffscreenUi>();
+        offscreenUi->getDesktop()->setProperty("hmdHandMouseActive", false);
+    }
+}
+
+void  HMDScriptingInterface::closeTablet() {
+    _showTablet = false;
+    _tabletContextualMode = false;
+}
+
+void HMDScriptingInterface::openTablet(bool contextualMode) {
     _showTablet = true;
+    _tabletContextualMode = contextualMode;
+}
+
+void HMDScriptingInterface::toggleShouldShowTablet() {
+    setShouldShowTablet(!getShouldShowTablet());
+}
+
+void HMDScriptingInterface::setShouldShowTablet(bool value) {
+    _showTablet = value;
+    _tabletContextualMode = false;
 }
 
 QScriptValue HMDScriptingInterface::getHUDLookAtPosition2D(QScriptContext* context, QScriptEngine* engine) {
@@ -134,7 +162,7 @@ glm::vec3 HMDScriptingInterface::getPosition() const {
 
 glm::quat HMDScriptingInterface::getOrientation() const {
     if (qApp->getActiveDisplayPlugin()->isHmd()) {
-        return glm::normalize(glm::quat_cast(getWorldHMDMatrix()));
+        return glmExtractRotation(getWorldHMDMatrix());
     }
     return glm::quat();
 }
@@ -152,41 +180,6 @@ QString HMDScriptingInterface::preferredAudioOutput() const {
     return qApp->getActiveDisplayPlugin()->getPreferredAudioOutDevice();
 }
 
-bool HMDScriptingInterface::setHandLasers(int hands, bool enabled, const glm::vec4& color, const glm::vec3& direction) const {
-    auto offscreenUi = DependencyManager::get<OffscreenUi>();
-    offscreenUi->executeOnUiThread([offscreenUi, enabled] {
-        offscreenUi->getDesktop()->setProperty("hmdHandMouseActive", enabled);
-    });
-    return qApp->getActiveDisplayPlugin()->setHandLaser(hands,
-        enabled ? DisplayPlugin::HandLaserMode::Overlay : DisplayPlugin::HandLaserMode::None,
-        color, direction);
-}
-
-bool HMDScriptingInterface::setExtraLaser(const glm::vec3& worldStart, bool enabled, const glm::vec4& color, const glm::vec3& direction) const {
-    auto offscreenUi = DependencyManager::get<OffscreenUi>();
-    offscreenUi->executeOnUiThread([offscreenUi, enabled] {
-        offscreenUi->getDesktop()->setProperty("hmdHandMouseActive", enabled);
-    });
-
-
-    auto myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
-    auto sensorToWorld = myAvatar->getSensorToWorldMatrix();
-    auto worldToSensor = glm::inverse(sensorToWorld);
-    auto sensorStart = ::transformPoint(worldToSensor, worldStart);
-    auto sensorDirection = ::transformVectorFast(worldToSensor, direction);
-
-    return qApp->getActiveDisplayPlugin()->setExtraLaser(enabled ? DisplayPlugin::HandLaserMode::Overlay : DisplayPlugin::HandLaserMode::None,
-        color, sensorStart, sensorDirection);
-}
-
-void HMDScriptingInterface::disableExtraLaser() const {
-    setExtraLaser(vec3(0), false, vec4(0), vec3(0));
-}
-
-void HMDScriptingInterface::disableHandLasers(int hands) const {
-    setHandLasers(hands, false, vec4(0), vec3(0));
-}
-
 bool HMDScriptingInterface::suppressKeyboard() {
     return qApp->getActiveDisplayPlugin()->suppressKeyboard();
 }
diff --git a/interface/src/scripting/HMDScriptingInterface.h b/interface/src/scripting/HMDScriptingInterface.h
index 4657e61d05..ef8ea95704 100644
--- a/interface/src/scripting/HMDScriptingInterface.h
+++ b/interface/src/scripting/HMDScriptingInterface.h
@@ -22,6 +22,7 @@ class QScriptEngine;
 #include <DependencyManager.h>
 #include <display-plugins/AbstractHMDScriptingInterface.h>
 
+#include <QReadWriteLock>
 
 class HMDScriptingInterface : public AbstractHMDScriptingInterface, public Dependency {
     Q_OBJECT
@@ -29,8 +30,10 @@ class HMDScriptingInterface : public AbstractHMDScriptingInterface, public Depen
     Q_PROPERTY(glm::quat orientation READ getOrientation)
     Q_PROPERTY(bool mounted READ isMounted NOTIFY mountedChanged)
     Q_PROPERTY(bool showTablet READ getShouldShowTablet)
+    Q_PROPERTY(bool tabletContextualMode READ getTabletContextualMode)
     Q_PROPERTY(QUuid tabletID READ getCurrentTabletFrameID WRITE setCurrentTabletFrameID)
     Q_PROPERTY(QUuid homeButtonID READ getCurrentHomeButtonID WRITE setCurrentHomeButtonID)
+    Q_PROPERTY(QUuid homeButtonHighlightID READ getCurrentHomeButtonHightlightID WRITE setCurrentHomeButtonHightlightID)
     Q_PROPERTY(QUuid tabletScreenID READ getCurrentTabletScreenID WRITE setCurrentTabletScreenID)
 
 public:
@@ -51,12 +54,8 @@ public:
     Q_INVOKABLE void requestHideHandControllers();
     Q_INVOKABLE bool shouldShowHandControllers() const;
 
-    Q_INVOKABLE bool setHandLasers(int hands, bool enabled, const glm::vec4& color, const glm::vec3& direction) const;
-    Q_INVOKABLE void disableHandLasers(int hands) const;
-
-    Q_INVOKABLE bool setExtraLaser(const glm::vec3& worldStart, bool enabled, const glm::vec4& color, const glm::vec3& direction) const;
-    Q_INVOKABLE void disableExtraLaser() const;
-
+    Q_INVOKABLE void activateHMDHandMouse();
+    Q_INVOKABLE void deactivateHMDHandMouse();
 
     /// Suppress the activation of any on-screen keyboard so that a script operation will
     /// not be interrupted by a keyboard popup
@@ -77,7 +76,7 @@ public:
 
     Q_INVOKABLE void closeTablet();
 
-    Q_INVOKABLE void openTablet();
+    Q_INVOKABLE void openTablet(bool contextualMode = false);
 
 signals:
     bool shouldShowHandControllersChanged();
@@ -90,9 +89,10 @@ public:
 
     bool isMounted() const;
 
-    void toggleShouldShowTablet() { _showTablet = !_showTablet; }
-    void setShouldShowTablet(bool value) { _showTablet = value; }
+    void toggleShouldShowTablet();
+    void setShouldShowTablet(bool value);
     bool getShouldShowTablet() const { return _showTablet; }
+    bool getTabletContextualMode() const { return _tabletContextualMode; }
 
     void setCurrentTabletFrameID(QUuid tabletID) { _tabletUIID = tabletID; }
     QUuid getCurrentTabletFrameID() const { return _tabletUIID; }
@@ -100,14 +100,19 @@ public:
     void setCurrentHomeButtonID(QUuid homeButtonID) { _homeButtonID = homeButtonID; }
     QUuid getCurrentHomeButtonID() const { return _homeButtonID; }
 
+    void setCurrentHomeButtonHightlightID(QUuid homeButtonHightlightID) { _homeButtonHightlightID = homeButtonHightlightID; }
+    QUuid getCurrentHomeButtonHightlightID() const { return _homeButtonHightlightID; }
+
     void setCurrentTabletScreenID(QUuid tabletID) { _tabletScreenID = tabletID; }
     QUuid getCurrentTabletScreenID() const { return _tabletScreenID; }
 
 private:
     bool _showTablet { false };
+    bool _tabletContextualMode { false };
     QUuid _tabletUIID; // this is the entityID of the tablet frame
     QUuid _tabletScreenID; // this is the overlayID which is part of (a child of) the tablet-ui.
     QUuid _homeButtonID;
+    QUuid _homeButtonHightlightID;
     QUuid _tabletEntityID;
 
     // Get the position of the HMD
@@ -119,6 +124,9 @@ private:
     bool getHUDLookAtPosition3D(glm::vec3& result) const;
     glm::mat4 getWorldHMDMatrix() const;
     std::atomic<int> _showHandControllersCount { 0 };
+
+    QReadWriteLock _hmdHandMouseLock;
+    int _hmdHandMouseCount;
 };
 
 #endif // hifi_HMDScriptingInterface_h
diff --git a/interface/src/scripting/MenuScriptingInterface.cpp b/interface/src/scripting/MenuScriptingInterface.cpp
index 91fba1ce9e..d9372978e8 100644
--- a/interface/src/scripting/MenuScriptingInterface.cpp
+++ b/interface/src/scripting/MenuScriptingInterface.cpp
@@ -14,6 +14,7 @@
 #include <QtCore/QCoreApplication>
 #include <QtCore/QThread>
 
+#include <shared/QtHelpers.h>
 #include <MenuItemProperties.h>
 #include "Menu.h"
 
@@ -43,7 +44,7 @@ bool MenuScriptingInterface::menuExists(const QString& menu) {
         return Menu::getInstance()->menuExists(menu);
     }
     bool result;
-    QMetaObject::invokeMethod(Menu::getInstance(), "menuExists", Qt::BlockingQueuedConnection,
+    BLOCKING_INVOKE_METHOD(Menu::getInstance(), "menuExists",
                 Q_RETURN_ARG(bool, result), 
                 Q_ARG(const QString&, menu));
     return result;
@@ -86,7 +87,7 @@ bool MenuScriptingInterface::menuItemExists(const QString& menu, const QString&
         return Menu::getInstance()->menuItemExists(menu, menuitem);
     }
     bool result;
-    QMetaObject::invokeMethod(Menu::getInstance(), "menuItemExists", Qt::BlockingQueuedConnection,
+    BLOCKING_INVOKE_METHOD(Menu::getInstance(), "menuItemExists",
         Q_RETURN_ARG(bool, result),
         Q_ARG(const QString&, menu),
         Q_ARG(const QString&, menuitem));
@@ -114,7 +115,7 @@ bool MenuScriptingInterface::isOptionChecked(const QString& menuOption) {
         return Menu::getInstance()->isOptionChecked(menuOption);
     }
     bool result;
-    QMetaObject::invokeMethod(Menu::getInstance(), "isOptionChecked", Qt::BlockingQueuedConnection,
+    BLOCKING_INVOKE_METHOD(Menu::getInstance(), "isOptionChecked",
                 Q_RETURN_ARG(bool, result), 
                 Q_ARG(const QString&, menuOption));
     return result;
@@ -131,7 +132,7 @@ bool MenuScriptingInterface::isMenuEnabled(const QString& menuOption) {
         return Menu::getInstance()->isOptionChecked(menuOption);
     }
     bool result;
-    QMetaObject::invokeMethod(Menu::getInstance(), "isMenuEnabled", Qt::BlockingQueuedConnection,
+    BLOCKING_INVOKE_METHOD(Menu::getInstance(), "isMenuEnabled",
         Q_RETURN_ARG(bool, result),
         Q_ARG(const QString&, menuOption));
     return result;
@@ -157,7 +158,7 @@ bool MenuScriptingInterface::isInfoViewVisible(const QString& path) {
     }
         
     bool result;
-    QMetaObject::invokeMethod(Menu::getInstance(), "isInfoViewVisible", Qt::BlockingQueuedConnection,
+    BLOCKING_INVOKE_METHOD(Menu::getInstance(), "isInfoViewVisible",
         Q_RETURN_ARG(bool, result), Q_ARG(const QString&, path));
     return result;
 }
diff --git a/interface/src/scripting/RatesScriptingInterface.h b/interface/src/scripting/RatesScriptingInterface.h
index 7bcab0ea70..5658ed99a0 100644
--- a/interface/src/scripting/RatesScriptingInterface.h
+++ b/interface/src/scripting/RatesScriptingInterface.h
@@ -22,16 +22,14 @@ class RatesScriptingInterface : public QObject {
     Q_PROPERTY(float newFrame READ getNewFrameRate)
     Q_PROPERTY(float dropped READ getDropRate)
     Q_PROPERTY(float simulation READ getSimulationRate)
-    Q_PROPERTY(float avatar READ getAvatarRate)
 
 public:
     RatesScriptingInterface(QObject* parent) : QObject(parent) {}
-    float getRenderRate() { return qApp->getFps(); }
+    float getRenderRate() { return qApp->getRenderLoopRate(); }
     float getPresentRate() { return qApp->getActiveDisplayPlugin()->presentRate(); }
     float getNewFrameRate() { return qApp->getActiveDisplayPlugin()->newFramePresentRate(); }
     float getDropRate() { return qApp->getActiveDisplayPlugin()->droppedFrameRate(); }
-    float getSimulationRate() { return qApp->getAverageSimsPerSecond(); }
-    float getAvatarRate() { return qApp->getAvatarSimrate(); }
+    float getSimulationRate() { return qApp->getGameLoopRate(); }
 };
 
 #endif // HIFI_INTERFACE_RATES_SCRIPTING_INTERFACE_H
diff --git a/interface/src/scripting/SelectionScriptingInterface.cpp b/interface/src/scripting/SelectionScriptingInterface.cpp
new file mode 100644
index 0000000000..1adf5650dd
--- /dev/null
+++ b/interface/src/scripting/SelectionScriptingInterface.cpp
@@ -0,0 +1,201 @@
+//
+//  SelectionScriptingInterface.cpp
+//  interface/src/scripting
+//
+//  Created by Zach Fox on 2017-08-22.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include "SelectionScriptingInterface.h"
+#include <QDebug>
+#include "Application.h"
+
+GameplayObjects::GameplayObjects() {
+}
+
+bool GameplayObjects::addToGameplayObjects(const QUuid& avatarID) {
+    containsData = true;
+    _avatarIDs.push_back(avatarID);
+    return true;
+}
+bool GameplayObjects::removeFromGameplayObjects(const QUuid& avatarID) {
+    _avatarIDs.erase(std::remove(_avatarIDs.begin(), _avatarIDs.end(), avatarID), _avatarIDs.end());
+    return true;
+}
+
+bool GameplayObjects::addToGameplayObjects(const EntityItemID& entityID) {
+    containsData = true;
+    _entityIDs.push_back(entityID);
+    return true;
+}
+bool GameplayObjects::removeFromGameplayObjects(const EntityItemID& entityID) {
+    _entityIDs.erase(std::remove(_entityIDs.begin(), _entityIDs.end(), entityID), _entityIDs.end());
+    return true;
+}
+
+bool GameplayObjects::addToGameplayObjects(const OverlayID& overlayID) {
+    containsData = true;
+    _overlayIDs.push_back(overlayID);
+    return true;
+}
+bool GameplayObjects::removeFromGameplayObjects(const OverlayID& overlayID) {
+    _overlayIDs.erase(std::remove(_overlayIDs.begin(), _overlayIDs.end(), overlayID), _overlayIDs.end());
+    return true;
+}
+
+
+SelectionScriptingInterface::SelectionScriptingInterface() {
+}
+
+bool SelectionScriptingInterface::addToSelectedItemsList(const QString& listName, const QString& itemType, const QUuid& id) {
+    if (itemType == "avatar") {
+        return addToGameplayObjects(listName, (QUuid)id);
+    } else if (itemType == "entity") {
+        return addToGameplayObjects(listName, (EntityItemID)id);
+    } else if (itemType == "overlay") {
+        return addToGameplayObjects(listName, (OverlayID)id);
+    }
+    return false;
+}
+bool SelectionScriptingInterface::removeFromSelectedItemsList(const QString& listName, const QString& itemType, const QUuid& id) {
+    if (itemType == "avatar") {
+        return removeFromGameplayObjects(listName, (QUuid)id);
+    } else if (itemType == "entity") {
+        return removeFromGameplayObjects(listName, (EntityItemID)id);
+    } else if (itemType == "overlay") {
+        return removeFromGameplayObjects(listName, (OverlayID)id);
+    }
+    return false;
+}
+
+bool SelectionScriptingInterface::clearSelectedItemsList(const QString& listName) {
+    _selectedItemsListMap.insert(listName, GameplayObjects());
+    emit selectedItemsListChanged(listName);
+    return true;
+}
+
+template <class T> bool SelectionScriptingInterface::addToGameplayObjects(const QString& listName, T idToAdd) {
+    GameplayObjects currentList = _selectedItemsListMap.value(listName);
+    currentList.addToGameplayObjects(idToAdd);
+    _selectedItemsListMap.insert(listName, currentList);
+
+    emit selectedItemsListChanged(listName);
+    return true;
+}
+template <class T> bool SelectionScriptingInterface::removeFromGameplayObjects(const QString& listName, T idToRemove) {
+    GameplayObjects currentList = _selectedItemsListMap.value(listName);
+    if (currentList.getContainsData()) {
+        currentList.removeFromGameplayObjects(idToRemove);
+        _selectedItemsListMap.insert(listName, currentList);
+
+        emit selectedItemsListChanged(listName);
+        return true;
+    } else {
+        return false;
+    }
+}
+//
+// END HANDLING GENERIC ITEMS
+//
+
+GameplayObjects SelectionScriptingInterface::getList(const QString& listName) {
+    return _selectedItemsListMap.value(listName);
+}
+
+void SelectionScriptingInterface::printList(const QString& listName) {
+    GameplayObjects currentList = _selectedItemsListMap.value(listName);
+    if (currentList.getContainsData()) {
+
+        qDebug() << "Avatar IDs:";
+        for (auto i : currentList.getAvatarIDs()) {
+            qDebug() << i << ';';
+        }
+        qDebug() << "";
+
+        qDebug() << "Entity IDs:";
+        for (auto j : currentList.getEntityIDs()) {
+            qDebug() << j << ';';
+        }
+        qDebug() << "";
+
+        qDebug() << "Overlay IDs:";
+        for (auto k : currentList.getOverlayIDs()) {
+            qDebug() << k << ';';
+        }
+        qDebug() << "";
+    } else {
+        qDebug() << "List named" << listName << "doesn't exist.";
+    }
+}
+
+bool SelectionScriptingInterface::removeListFromMap(const QString& listName) {
+    if (_selectedItemsListMap.remove(listName)) {
+        emit selectedItemsListChanged(listName);
+        return true;
+    } else {
+        return false;
+    }
+}
+
+
+SelectionToSceneHandler::SelectionToSceneHandler() {
+}
+
+void SelectionToSceneHandler::initialize(const QString& listName) {
+    _listName = listName;
+}
+
+void SelectionToSceneHandler::selectedItemsListChanged(const QString& listName) {
+    if (listName == _listName) {
+        updateSceneFromSelectedList();
+    }
+}
+
+void SelectionToSceneHandler::updateSceneFromSelectedList() {
+    auto mainScene = qApp->getMain3DScene();
+    if (mainScene) {
+        GameplayObjects thisList = DependencyManager::get<SelectionScriptingInterface>()->getList(_listName);
+        render::Transaction transaction;
+        render::ItemIDs finalList;
+        render::ItemID currentID;
+        auto entityTreeRenderer = DependencyManager::get<EntityTreeRenderer>();
+        auto& overlays = qApp->getOverlays();
+
+        for (QUuid& currentAvatarID : thisList.getAvatarIDs()) {
+            auto avatar = std::static_pointer_cast<Avatar>(DependencyManager::get<AvatarManager>()->getAvatarBySessionID(currentAvatarID));
+            if (avatar) {
+                currentID = avatar->getRenderItemID();
+                if (currentID != render::Item::INVALID_ITEM_ID) {
+                    finalList.push_back(currentID);
+                }
+            }
+        }
+
+        for (EntityItemID& currentEntityID : thisList.getEntityIDs()) {
+            currentID = entityTreeRenderer->renderableIdForEntityId(currentEntityID);
+            if (currentID != render::Item::INVALID_ITEM_ID) {
+                finalList.push_back(currentID);
+            }
+        }
+
+        for (OverlayID& currentOverlayID : thisList.getOverlayIDs()) {
+            auto overlay = overlays.getOverlay(currentOverlayID);
+            if (overlay != NULL) {
+                currentID = overlay->getRenderItemID();
+                if (currentID != render::Item::INVALID_ITEM_ID) {
+                    finalList.push_back(currentID);
+                }
+            }
+        }
+
+        render::Selection selection(_listName.toStdString(), finalList);
+        transaction.resetSelection(selection);
+
+        mainScene->enqueueTransaction(transaction);
+    } else {
+        qWarning() << "SelectionToSceneHandler::updateRendererSelectedList(), Unexpected null scene, possibly during application shutdown";
+    }
+}
diff --git a/interface/src/scripting/SelectionScriptingInterface.h b/interface/src/scripting/SelectionScriptingInterface.h
new file mode 100644
index 0000000000..d9003c2c32
--- /dev/null
+++ b/interface/src/scripting/SelectionScriptingInterface.h
@@ -0,0 +1,125 @@
+
+//  SelectionScriptingInterface.h
+//  interface/src/scripting
+//
+//  Created by Zach Fox on 2017-08-22.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_SelectionScriptingInterface_h
+#define hifi_SelectionScriptingInterface_h
+
+#include <QtCore/QObject>
+#include <QtCore/QMap>
+#include <DependencyManager.h>
+
+#include <AbstractViewStateInterface.h>
+
+#include "RenderableEntityItem.h"
+#include "ui/overlays/Overlay.h"
+#include <avatar/AvatarManager.h>
+
+class GameplayObjects {
+public:
+    GameplayObjects();
+
+    bool getContainsData() { return containsData; }
+
+    std::vector<QUuid> getAvatarIDs() { return _avatarIDs; }
+    bool addToGameplayObjects(const QUuid& avatarID);
+    bool removeFromGameplayObjects(const QUuid& avatarID);
+
+    std::vector<EntityItemID> getEntityIDs() { return _entityIDs; }
+    bool addToGameplayObjects(const EntityItemID& entityID);
+    bool removeFromGameplayObjects(const EntityItemID& entityID);
+
+    std::vector<OverlayID> getOverlayIDs() { return _overlayIDs; }
+    bool addToGameplayObjects(const OverlayID& overlayID);
+    bool removeFromGameplayObjects(const OverlayID& overlayID);
+
+private:
+    bool containsData { false };
+    std::vector<QUuid> _avatarIDs;
+    std::vector<EntityItemID> _entityIDs;
+    std::vector<OverlayID> _overlayIDs;
+};
+
+
+class SelectionScriptingInterface : public QObject, public Dependency {
+    Q_OBJECT
+
+public:
+    SelectionScriptingInterface();
+
+    GameplayObjects getList(const QString& listName);
+
+    /**jsdoc
+    * Prints out the list of avatars, entities and overlays stored in a particular selection.
+    * @function Selection.printList
+    * @param listName {string} name of the selection
+    */
+    Q_INVOKABLE void printList(const QString& listName);
+    /**jsdoc
+    * Removes a named selection from the list of selections.
+    * @function Selection.removeListFromMap
+    * @param listName {string} name of the selection
+    * @returns {bool} true if the selection existed and was successfully removed.
+    */
+    Q_INVOKABLE bool removeListFromMap(const QString& listName);
+
+    /**jsdoc
+    * Add an item in a selection.
+    * @function Selection.addToSelectedItemsList
+    * @param listName {string} name of the selection
+    * @param itemType {string} the type of the item (one of "avatar", "entity" or "overlay")
+    * @param id {EntityID} the Id of the item to add to the selection
+    * @returns {bool} true if the item was successfully added.
+    */
+    Q_INVOKABLE bool addToSelectedItemsList(const QString& listName, const QString& itemType, const QUuid& id);
+    /**jsdoc
+    * Remove an item from a selection.
+    * @function Selection.removeFromSelectedItemsList
+    * @param listName {string} name of the selection
+    * @param itemType {string} the type of the item (one of "avatar", "entity" or "overlay")
+    * @param id {EntityID} the Id of the item to remove
+    * @returns {bool} true if the item was successfully removed.
+    */
+    Q_INVOKABLE bool removeFromSelectedItemsList(const QString& listName, const QString& itemType, const QUuid& id);
+    /**jsdoc
+    * Remove all items from a selection.
+    * @function Selection.clearSelectedItemsList
+    * @param listName {string} name of the selection
+    * @returns {bool} true if the item was successfully cleared.
+    */
+    Q_INVOKABLE bool clearSelectedItemsList(const QString& listName);
+
+signals:
+    void selectedItemsListChanged(const QString& listName);
+
+private:
+    QMap<QString, GameplayObjects> _selectedItemsListMap;
+
+    template <class T> bool addToGameplayObjects(const QString& listName, T idToAdd);
+    template <class T> bool removeFromGameplayObjects(const QString& listName, T idToRemove);
+};
+
+
+class SelectionToSceneHandler : public QObject {
+    Q_OBJECT
+public:
+    SelectionToSceneHandler();
+    void initialize(const QString& listName);
+
+    void updateSceneFromSelectedList();
+
+public slots:
+    void selectedItemsListChanged(const QString& listName);
+
+private:
+    QString _listName { "" };
+};
+
+#endif // hifi_SelectionScriptingInterface_h
diff --git a/interface/src/scripting/TestScriptingInterface.cpp b/interface/src/scripting/TestScriptingInterface.cpp
index 84c742d0ab..d4b4ba1480 100644
--- a/interface/src/scripting/TestScriptingInterface.cpp
+++ b/interface/src/scripting/TestScriptingInterface.cpp
@@ -11,6 +11,7 @@
 #include <QtCore/QLoggingCategory>
 #include <QtCore/QThread>
 
+#include <shared/QtHelpers.h>
 #include <DependencyManager.h>
 #include <Trace.h>
 #include <StatTracker.h>
@@ -57,20 +58,25 @@ void TestScriptingInterface::waitIdle() {
 }
 
 bool TestScriptingInterface::loadTestScene(QString scene) {
+    if (QThread::currentThread() != thread()) {
+        bool result;
+        BLOCKING_INVOKE_METHOD(this, "loadTestScene", Q_RETURN_ARG(bool, result), Q_ARG(QString, scene));
+        return result;
+    }
+
     static const QString TEST_ROOT = "https://raw.githubusercontent.com/highfidelity/hifi_tests/master/";
     static const QString TEST_BINARY_ROOT = "https://hifi-public.s3.amazonaws.com/test_scene_data/";
     static const QString TEST_SCRIPTS_ROOT = TEST_ROOT + "scripts/";
     static const QString TEST_SCENES_ROOT = TEST_ROOT + "scenes/";
-    return DependencyManager::get<OffscreenUi>()->returnFromUiThread([scene]()->QVariant {
-        DependencyManager::get<ResourceManager>()->setUrlPrefixOverride("atp:/", TEST_BINARY_ROOT + scene + ".atp/");
-        auto tree = qApp->getEntities()->getTree();
-        auto treeIsClient = tree->getIsClient();
-        // Force the tree to accept the load regardless of permissions
-        tree->setIsClient(false);
-        auto result = tree->readFromURL(TEST_SCENES_ROOT + scene + ".json");
-        tree->setIsClient(treeIsClient);
-        return result;
-    }).toBool();
+    
+    DependencyManager::get<ResourceManager>()->setUrlPrefixOverride("atp:/", TEST_BINARY_ROOT + scene + ".atp/");
+    auto tree = qApp->getEntities()->getTree();
+    auto treeIsClient = tree->getIsClient();
+    // Force the tree to accept the load regardless of permissions
+    tree->setIsClient(false);
+    auto result = tree->readFromURL(TEST_SCENES_ROOT + scene + ".json");
+    tree->setIsClient(treeIsClient);
+    return result;
 }
 
 bool TestScriptingInterface::startTracing(QString logrules) {
diff --git a/interface/src/scripting/WalletScriptingInterface.cpp b/interface/src/scripting/WalletScriptingInterface.cpp
new file mode 100644
index 0000000000..99fdd5fbde
--- /dev/null
+++ b/interface/src/scripting/WalletScriptingInterface.cpp
@@ -0,0 +1,52 @@
+//
+//  WalletScriptingInterface.cpp
+//  interface/src/scripting
+//
+//  Created by Zach Fox on 2017-09-29.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include "WalletScriptingInterface.h"
+
+CheckoutProxy::CheckoutProxy(QObject* qmlObject, QObject* parent) : QmlWrapper(qmlObject, parent) {
+    Q_ASSERT(QThread::currentThread() == qApp->thread());
+}
+
+WalletScriptingInterface::WalletScriptingInterface() {
+}
+
+void WalletScriptingInterface::refreshWalletStatus() {
+    auto wallet = DependencyManager::get<Wallet>();
+    wallet->getWalletStatus();
+}
+
+static const QString CHECKOUT_QML_PATH = qApp->applicationDirPath() + "../../../qml/hifi/commerce/checkout/Checkout.qml";
+void WalletScriptingInterface::buy(const QString& name, const QString& id, const int& price, const QString& href) {
+    if (QThread::currentThread() != thread()) {
+        QMetaObject::invokeMethod(this, "buy", Q_ARG(const QString&, name), Q_ARG(const QString&, id), Q_ARG(const int&, price), Q_ARG(const QString&, href));
+        return;
+    }
+
+    auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
+    auto tablet = dynamic_cast<TabletProxy*>(tabletScriptingInterface->getTablet("com.highfidelity.interface.tablet.system"));
+
+    tablet->loadQMLSource(CHECKOUT_QML_PATH);
+    DependencyManager::get<HMDScriptingInterface>()->openTablet();
+
+    QQuickItem* root = nullptr;
+    if (tablet->getToolbarMode() || (!tablet->getTabletRoot() && !qApp->isHMDMode())) {
+        root = DependencyManager::get<OffscreenUi>()->getRootItem();
+    } else {
+        root = tablet->getTabletRoot();
+    }
+    CheckoutProxy* checkout = new CheckoutProxy(root->findChild<QObject*>("checkout"));
+
+    // Example: Wallet.buy("Test Flaregun", "0d90d21c-ce7a-4990-ad18-e9d2cf991027", 17, "http://mpassets.highfidelity.com/0d90d21c-ce7a-4990-ad18-e9d2cf991027-v1/flaregun.json");
+    checkout->writeProperty("itemName", name);
+    checkout->writeProperty("itemId", id);
+    checkout->writeProperty("itemPrice", price);
+    checkout->writeProperty("itemHref", href);
+}
\ No newline at end of file
diff --git a/interface/src/scripting/WalletScriptingInterface.h b/interface/src/scripting/WalletScriptingInterface.h
new file mode 100644
index 0000000000..038c580197
--- /dev/null
+++ b/interface/src/scripting/WalletScriptingInterface.h
@@ -0,0 +1,54 @@
+
+//  WalletScriptingInterface.h
+//  interface/src/scripting
+//
+//  Created by Zach Fox on 2017-09-29.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_WalletScriptingInterface_h
+#define hifi_WalletScriptingInterface_h
+
+#include <QtCore/QObject>
+#include <DependencyManager.h>
+
+#include "scripting/HMDScriptingInterface.h"
+#include <ui/TabletScriptingInterface.h>
+#include <ui/QmlWrapper.h>
+#include <OffscreenUi.h>
+#include "Application.h"
+#include "commerce/Wallet.h"
+
+class CheckoutProxy : public QmlWrapper {
+    Q_OBJECT
+public:
+    CheckoutProxy(QObject* qmlObject, QObject* parent = nullptr);
+};
+
+
+class WalletScriptingInterface : public QObject, public Dependency {
+    Q_OBJECT
+
+    Q_PROPERTY(uint walletStatus READ getWalletStatus WRITE setWalletStatus NOTIFY walletStatusChanged)
+
+public:
+    WalletScriptingInterface();
+
+    Q_INVOKABLE void refreshWalletStatus();
+    Q_INVOKABLE uint getWalletStatus() { return _walletStatus; }
+    void setWalletStatus(const uint& status) { _walletStatus = status; }
+
+    Q_INVOKABLE void buy(const QString& name, const QString& id, const int& price, const QString& href);
+
+signals:
+    void walletStatusChanged();
+    void walletNotSetup();
+
+private:
+    uint _walletStatus;
+};
+
+#endif // hifi_WalletScriptingInterface_h
diff --git a/interface/src/scripting/WindowScriptingInterface.cpp b/interface/src/scripting/WindowScriptingInterface.cpp
index 38f467f22b..c99e190d12 100644
--- a/interface/src/scripting/WindowScriptingInterface.cpp
+++ b/interface/src/scripting/WindowScriptingInterface.cpp
@@ -9,11 +9,14 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "WindowScriptingInterface.h"
+
 #include <QClipboard>
 #include <QtCore/QDir>
 #include <QMessageBox>
 #include <QScriptValue>
 
+#include <shared/QtHelpers.h>
 #include <SettingHandle.h>
 
 #include <display-plugins/CompositorHelper.h>
@@ -24,8 +27,6 @@
 #include "Menu.h"
 #include "OffscreenUi.h"
 
-#include "WindowScriptingInterface.h"
-
 static const QString DESKTOP_LOCATION = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation);
 static const QString LAST_BROWSE_LOCATION_SETTING = "LastBrowseLocation";
 static const QString LAST_BROWSE_ASSETS_LOCATION_SETTING = "LastBrowseAssetsLocation";
@@ -58,7 +59,7 @@ WindowScriptingInterface::WindowScriptingInterface() {
             QUrl url(urlString);
             emit svoImportRequested(url.url());
         } else {
-            OffscreenUi::warning("Import SVO Error", "You need to be running edit.js to import entities.");
+            OffscreenUi::asyncWarning("Import SVO Error", "You need to be running edit.js to import entities.");
         }
     });
 
@@ -102,7 +103,7 @@ void WindowScriptingInterface::raiseMainWindow() {
 /// \param const QString& message message to display
 /// \return QScriptValue::UndefinedValue
 void WindowScriptingInterface::alert(const QString& message) {
-    OffscreenUi::warning("", message);
+    OffscreenUi::asyncWarning("", message);
 }
 
 /// Display a confirmation box with the options 'Yes' and 'No'
@@ -122,6 +123,17 @@ QScriptValue WindowScriptingInterface::prompt(const QString& message, const QStr
     return ok ? QScriptValue(result) : QScriptValue::NullValue;
 }
 
+/// Display a prompt with a text box
+/// \param const QString& message message to display
+/// \param const QString& defaultText default text in the text box
+void WindowScriptingInterface::promptAsync(const QString& message, const QString& defaultText) {
+    ModalDialogListener* dlg = OffscreenUi::getTextAsync(nullptr, "", message, QLineEdit::Normal, defaultText);
+    connect(dlg, &ModalDialogListener::response, this, [=] (QVariant result) {
+        disconnect(dlg, &ModalDialogListener::response, this, nullptr);
+        emit promptTextChanged(result.toString());
+    });
+}
+
 CustomPromptResult WindowScriptingInterface::customPrompt(const QVariant& config) {
     CustomPromptResult result;
     bool ok = false;
@@ -159,6 +171,11 @@ void WindowScriptingInterface::setPreviousBrowseAssetLocation(const QString& loc
     Setting::Handle<QVariant>(LAST_BROWSE_ASSETS_LOCATION_SETTING).set(location);
 }
 
+bool  WindowScriptingInterface::isPointOnDesktopWindow(QVariant point) {
+    auto offscreenUi = DependencyManager::get<OffscreenUi>();
+    return offscreenUi->isPointOnDesktopWindow(point);
+}
+
 /// Makes sure that the reticle is visible, use this in blocking forms that require a reticle and
 /// might be in same thread as a script that sets the reticle to invisible
 void WindowScriptingInterface::ensureReticleVisible() const {
@@ -190,8 +207,31 @@ QScriptValue WindowScriptingInterface::browseDir(const QString& title, const QSt
     return result.isEmpty() ? QScriptValue::NullValue : QScriptValue(result);
 }
 
-/// Display an open file dialog.  If `directory` is an invalid file or directory the browser will start at the current
+/// Display a "browse to directory" dialog.  If `directory` is an invalid file or directory the browser will start at the current
 /// working directory.
+/// \param const QString& title title of the window
+/// \param const QString& directory directory to start the file browser at
+/// \param const QString& nameFilter filter to filter filenames by - see `QFileDialog`
+void WindowScriptingInterface::browseDirAsync(const QString& title, const QString& directory) {
+    ensureReticleVisible();
+    QString path = directory;
+    if (path.isEmpty()) {
+        path = getPreviousBrowseLocation();
+    }
+#ifndef Q_OS_WIN
+    path = fixupPathForMac(directory);
+#endif
+    ModalDialogListener* dlg = OffscreenUi::getExistingDirectoryAsync(nullptr, title, path);
+    connect(dlg, &ModalDialogListener::response, this, [=] (QVariant response) {
+        const QString& result = response.toString();
+        disconnect(dlg, &ModalDialogListener::response, this, nullptr);
+        if (!result.isEmpty()) {
+            setPreviousBrowseLocation(QFileInfo(result).absolutePath());
+        }
+        emit browseDirChanged(result);
+    });
+}
+
 /// \param const QString& title title of the window
 /// \param const QString& directory directory to start the file browser at
 /// \param const QString& nameFilter filter to filter filenames by - see `QFileDialog`
@@ -212,6 +252,31 @@ QScriptValue WindowScriptingInterface::browse(const QString& title, const QStrin
     return result.isEmpty() ? QScriptValue::NullValue : QScriptValue(result);
 }
 
+/// Display an open file dialog.  If `directory` is an invalid file or directory the browser will start at the current
+/// working directory.
+/// \param const QString& title title of the window
+/// \param const QString& directory directory to start the file browser at
+/// \param const QString& nameFilter filter to filter filenames by - see `QFileDialog`
+void WindowScriptingInterface::browseAsync(const QString& title, const QString& directory, const QString& nameFilter) {
+    ensureReticleVisible();
+    QString path = directory;
+    if (path.isEmpty()) {
+        path = getPreviousBrowseLocation();
+    }
+#ifndef Q_OS_WIN
+    path = fixupPathForMac(directory);
+#endif
+    ModalDialogListener* dlg = OffscreenUi::getOpenFileNameAsync(nullptr, title, path, nameFilter);
+    connect(dlg, &ModalDialogListener::response, this, [=] (QVariant response) {
+        const QString& result = response.toString();
+        disconnect(dlg, &ModalDialogListener::response, this, nullptr);
+        if (!result.isEmpty()) {
+            setPreviousBrowseLocation(QFileInfo(result).absolutePath());
+        }
+        emit openFileChanged(result);
+    });
+}
+
 /// Display a save file dialog.  If `directory` is an invalid file or directory the browser will start at the current
 /// working directory.
 /// \param const QString& title title of the window
@@ -234,7 +299,32 @@ QScriptValue WindowScriptingInterface::save(const QString& title, const QString&
     return result.isEmpty() ? QScriptValue::NullValue : QScriptValue(result);
 }
 
-/// Display a select asset dialog that lets the user select an asset from the Asset Server.  If `directory` is an invalid 
+/// Display a save file dialog.  If `directory` is an invalid file or directory the browser will start at the current
+/// working directory.
+/// \param const QString& title title of the window
+/// \param const QString& directory directory to start the file browser at
+/// \param const QString& nameFilter filter to filter filenames by - see `QFileDialog`
+void WindowScriptingInterface::saveAsync(const QString& title, const QString& directory, const QString& nameFilter) {
+    ensureReticleVisible();
+    QString path = directory;
+    if (path.isEmpty()) {
+        path = getPreviousBrowseLocation();
+    }
+#ifndef Q_OS_WIN
+    path = fixupPathForMac(directory);
+#endif
+    ModalDialogListener* dlg = OffscreenUi::getSaveFileNameAsync(nullptr, title, path, nameFilter);
+    connect(dlg, &ModalDialogListener::response, this, [=] (QVariant response) {
+        const QString& result = response.toString();
+        disconnect(dlg, &ModalDialogListener::response, this, nullptr);
+        if (!result.isEmpty()) {
+            setPreviousBrowseLocation(QFileInfo(result).absolutePath());
+        }
+        emit saveFileChanged(result);
+    });
+}
+
+/// Display a select asset dialog that lets the user select an asset from the Asset Server.  If `directory` is an invalid
 /// directory the browser will start at the root directory.
 /// \param const QString& title title of the window
 /// \param const QString& directory directory to start the asset browser at
@@ -259,10 +349,43 @@ QScriptValue WindowScriptingInterface::browseAssets(const QString& title, const
     return result.isEmpty() ? QScriptValue::NullValue : QScriptValue(result);
 }
 
+/// Display a select asset dialog that lets the user select an asset from the Asset Server.  If `directory` is an invalid 
+/// directory the browser will start at the root directory.
+/// \param const QString& title title of the window
+/// \param const QString& directory directory to start the asset browser at
+/// \param const QString& nameFilter filter to filter asset names by - see `QFileDialog`
+void WindowScriptingInterface::browseAssetsAsync(const QString& title, const QString& directory, const QString& nameFilter) {
+    ensureReticleVisible();
+    QString path = directory;
+    if (path.isEmpty()) {
+        path = getPreviousBrowseAssetLocation();
+    }
+    if (path.left(1) != "/") {
+        path = "/" + path;
+    }
+    if (path.right(1) != "/") {
+        path = path + "/";
+    }
+
+    ModalDialogListener* dlg = OffscreenUi::getOpenAssetNameAsync(nullptr, title, path, nameFilter);
+    connect(dlg, &ModalDialogListener::response, this, [=] (QVariant response) {
+        const QString& result = response.toString();
+        disconnect(dlg, &ModalDialogListener::response, this, nullptr);
+        if (!result.isEmpty()) {
+            setPreviousBrowseAssetLocation(QFileInfo(result).absolutePath());
+        }
+        emit assetsDirChanged(result);
+    });
+}
+
 void WindowScriptingInterface::showAssetServer(const QString& upload) {
     QMetaObject::invokeMethod(qApp, "showAssetServerWidget", Qt::QueuedConnection, Q_ARG(QString, upload));
 }
 
+QString WindowScriptingInterface::checkVersion() {
+    return QCoreApplication::applicationVersion();
+}
+
 int WindowScriptingInterface::getInnerWidth() {
     return qApp->getWindow()->geometry().width();
 }
@@ -293,6 +416,10 @@ void WindowScriptingInterface::takeSnapshot(bool notify, bool includeAnimated, f
     qApp->takeSnapshot(notify, includeAnimated, aspectRatio);
 }
 
+void WindowScriptingInterface::takeSecondaryCameraSnapshot() {
+    qApp->takeSecondaryCameraSnapshot();
+}
+
 void WindowScriptingInterface::shareSnapshot(const QString& path, const QUrl& href) {
     qApp->shareSnapshot(path, href);
 }
@@ -316,7 +443,7 @@ bool WindowScriptingInterface::isPhysicsEnabled() {
 int WindowScriptingInterface::openMessageBox(QString title, QString text, int buttons, int defaultButton) {
     if (QThread::currentThread() != thread()) {
         int result;
-        QMetaObject::invokeMethod(this, "openMessageBox", Qt::BlockingQueuedConnection,
+        BLOCKING_INVOKE_METHOD(this, "openMessageBox",
             Q_RETURN_ARG(int, result),
             Q_ARG(QString, title),
             Q_ARG(QString, text),
diff --git a/interface/src/scripting/WindowScriptingInterface.h b/interface/src/scripting/WindowScriptingInterface.h
index 4fb4829636..61aaec7bea 100644
--- a/interface/src/scripting/WindowScriptingInterface.h
+++ b/interface/src/scripting/WindowScriptingInterface.h
@@ -18,6 +18,8 @@
 #include <QtScript/QScriptValue>
 #include <QtWidgets/QMessageBox>
 
+#include <DependencyManager.h>
+
 class CustomPromptResult {
 public:
     QVariant value;
@@ -49,20 +51,28 @@ public slots:
     void raiseMainWindow();
     void alert(const QString& message = "");
     QScriptValue confirm(const QString& message = "");
-    QScriptValue prompt(const QString& message = "", const QString& defaultText = "");
+    QScriptValue prompt(const QString& message, const QString& defaultText);
+    void promptAsync(const QString& message = "", const QString& defaultText = "");
     CustomPromptResult customPrompt(const QVariant& config);
     QScriptValue browseDir(const QString& title = "", const QString& directory = "");
+    void browseDirAsync(const QString& title = "", const QString& directory = "");
     QScriptValue browse(const QString& title = "", const QString& directory = "",  const QString& nameFilter = "");
+    void browseAsync(const QString& title = "", const QString& directory = "",  const QString& nameFilter = "");
     QScriptValue save(const QString& title = "", const QString& directory = "",  const QString& nameFilter = "");
+    void saveAsync(const QString& title = "", const QString& directory = "",  const QString& nameFilter = "");
     QScriptValue browseAssets(const QString& title = "", const QString& directory = "", const QString& nameFilter = "");
+    void browseAssetsAsync(const QString& title = "", const QString& directory = "", const QString& nameFilter = "");
     void showAssetServer(const QString& upload = "");
+    QString checkVersion();
     void copyToClipboard(const QString& text);
     void takeSnapshot(bool notify = true, bool includeAnimated = false, float aspectRatio = 0.0f);
+    void takeSecondaryCameraSnapshot();
     void makeConnection(bool success, const QString& userNameOrError);
     void displayAnnouncement(const QString& message);
     void shareSnapshot(const QString& path, const QUrl& href = QUrl(""));
     bool isPhysicsEnabled();
     bool setDisplayTexture(const QString& name);
+    bool isPointOnDesktopWindow(QVariant point);
 
     int openMessageBox(QString title, QString text, int buttons, int defaultButton);
     void updateMessageBox(int id, QString title, QString text, int buttons, int defaultButton);
@@ -85,6 +95,11 @@ signals:
     void announcement(const QString& message);
 
     void messageBoxClosed(int id, int button);
+    void browseDirChanged(QString browseDir);
+    void assetsDirChanged(QString assetsDir);
+    void saveFileChanged(QString filename);
+    void openFileChanged(QString filename);
+    void promptTextChanged(QString text);
 
     // triggered when window size or position changes
     void geometryChanged(QRect geometry);
diff --git a/interface/src/ui/AddressBarDialog.cpp b/interface/src/ui/AddressBarDialog.cpp
index 8aaaac1a57..8b5e255b06 100644
--- a/interface/src/ui/AddressBarDialog.cpp
+++ b/interface/src/ui/AddressBarDialog.cpp
@@ -39,7 +39,7 @@ AddressBarDialog::AddressBarDialog(QQuickItem* parent) : OffscreenQmlDialog(pare
     });
     _backEnabled = !(DependencyManager::get<AddressManager>()->getBackStack().isEmpty());
     _forwardEnabled = !(DependencyManager::get<AddressManager>()->getForwardStack().isEmpty());
-    connect(addressManager.data(), &AddressManager::hostChanged, this, &AddressBarDialog::metaverseServerUrlChanged);
+    connect(addressManager.data(), &AddressManager::hostChanged, this, &AddressBarDialog::hostChanged);
     connect(DependencyManager::get<DialogsManager>().data(), &DialogsManager::setUseFeed, this, &AddressBarDialog::setUseFeed);
     connect(qApp, &Application::receivedHifiSchemeURL, this, &AddressBarDialog::receivedHifiSchemeURL);
 }
@@ -73,11 +73,11 @@ void AddressBarDialog::loadForward() {
 }
 
 void AddressBarDialog::displayAddressOfflineMessage() {
-    OffscreenUi::critical("", "That user or place is currently offline");
+    OffscreenUi::asyncCritical("", "That user or place is currently offline");
 }
 
 void AddressBarDialog::displayAddressNotFoundMessage() {
-    OffscreenUi::critical("", "There is no address information for that user or place");
+    OffscreenUi::asyncCritical("", "There is no address information for that user or place");
 }
 
 void AddressBarDialog::observeShownChanged(bool visible) {
diff --git a/interface/src/ui/AddressBarDialog.h b/interface/src/ui/AddressBarDialog.h
index 921e808abb..cab533cce3 100644
--- a/interface/src/ui/AddressBarDialog.h
+++ b/interface/src/ui/AddressBarDialog.h
@@ -22,7 +22,7 @@ class AddressBarDialog : public OffscreenQmlDialog {
     Q_PROPERTY(bool backEnabled READ backEnabled NOTIFY backEnabledChanged)
     Q_PROPERTY(bool forwardEnabled READ forwardEnabled NOTIFY forwardEnabledChanged)
     Q_PROPERTY(bool useFeed READ useFeed WRITE setUseFeed NOTIFY useFeedChanged)
-    Q_PROPERTY(QString metaverseServerUrl READ metaverseServerUrl NOTIFY metaverseServerUrlChanged)
+    Q_PROPERTY(QString metaverseServerUrl READ metaverseServerUrl)
 
 public:
     AddressBarDialog(QQuickItem* parent = nullptr);
@@ -37,7 +37,7 @@ signals:
     void forwardEnabledChanged();
     void useFeedChanged();
     void receivedHifiSchemeURL(const QString& url);
-    void metaverseServerUrlChanged();
+    void hostChanged();
 
 protected:
     void displayAddressOfflineMessage();
diff --git a/interface/src/ui/JSConsole.cpp b/interface/src/ui/JSConsole.cpp
index 79314ce49a..c5f8b54ebd 100644
--- a/interface/src/ui/JSConsole.cpp
+++ b/interface/src/ui/JSConsole.cpp
@@ -9,27 +9,30 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "JSConsole.h"
+
 #include <QFuture>
 #include <QKeyEvent>
 #include <QLabel>
 #include <QScrollBar>
 #include <QtConcurrent/QtConcurrentRun>
 
+#include <shared/QtHelpers.h>
 #include <ScriptEngines.h>
 #include <PathUtils.h>
 
 #include "Application.h"
-#include "JSConsole.h"
 #include "ScriptHighlighting.h"
 
 const int NO_CURRENT_HISTORY_COMMAND = -1;
-const int MAX_HISTORY_SIZE = 64;
+const int MAX_HISTORY_SIZE = 256;
+const QString HISTORY_FILENAME = "JSConsole.history.json";
 
 const QString COMMAND_STYLE = "color: #266a9b;";
 
 const QString RESULT_SUCCESS_STYLE = "color: #677373;";
 const QString RESULT_INFO_STYLE = "color: #223bd1;";
-const QString RESULT_WARNING_STYLE = "color: #d13b22;";
+const QString RESULT_WARNING_STYLE = "color: #999922;";
 const QString RESULT_ERROR_STYLE = "color: #d13b22;";
 
 const QString GUTTER_PREVIOUS_COMMAND = "<span style=\"color: #57b8bb;\">&lt;</span>";
@@ -37,14 +40,33 @@ const QString GUTTER_ERROR = "<span style=\"color: #d13b22;\">X</span>";
 
 const QString JSConsole::_consoleFileName { "about:console" };
 
-JSConsole::JSConsole(QWidget* parent, ScriptEngine* scriptEngine) :
+const QString JSON_KEY = "entries";
+QList<QString> _readLines(const QString& filename) {
+    QFile file(filename);
+    file.open(QFile::ReadOnly);
+    auto json = QTextStream(&file).readAll().toUtf8();
+    auto root = QJsonDocument::fromJson(json).object();
+    // TODO: check root["version"]
+    return root[JSON_KEY].toVariant().toStringList();
+}
+
+void _writeLines(const QString& filename, const QList<QString>& lines) {
+    QFile file(filename);
+    file.open(QFile::WriteOnly);
+    auto root = QJsonObject();
+    root["version"] = 1.0;
+    root["last-modified"] = QDateTime::currentDateTime().toTimeSpec(Qt::OffsetFromUTC).toString(Qt::ISODate);
+    root[JSON_KEY] = QJsonArray::fromStringList(lines);
+    auto json = QJsonDocument(root).toJson();
+    QTextStream(&file) << json;
+}
+
+JSConsole::JSConsole(QWidget* parent, const ScriptEnginePointer& scriptEngine) :
     QWidget(parent),
     _ui(new Ui::Console),
     _currentCommandInHistory(NO_CURRENT_HISTORY_COMMAND),
-    _commandHistory(),
-    _ownScriptEngine(scriptEngine == NULL),
-    _scriptEngine(NULL) {
-
+    _savedHistoryFilename(QStandardPaths::writableLocation(QStandardPaths::DataLocation) + "/" + HISTORY_FILENAME),
+    _commandHistory(_readLines(_savedHistoryFilename)) {
     _ui->setupUi(this);
     _ui->promptTextEdit->setLineWrapMode(QTextEdit::NoWrap);
     _ui->promptTextEdit->setWordWrapMode(QTextOption::NoWrap);
@@ -67,61 +89,68 @@ JSConsole::JSConsole(QWidget* parent, ScriptEngine* scriptEngine) :
 }
 
 JSConsole::~JSConsole() {
-    disconnect(_scriptEngine, SIGNAL(printedMessage(const QString&)), this, SLOT(handlePrint(const QString&)));
-    disconnect(_scriptEngine, SIGNAL(errorMessage(const QString&)), this, SLOT(handleError(const QString&)));
-    if (_ownScriptEngine) {
-        _scriptEngine->deleteLater();
+    if (_scriptEngine) {
+        disconnect(_scriptEngine.data(), SIGNAL(printedMessage(const QString&)), this, SLOT(handlePrint(const QString&)));
+        disconnect(_scriptEngine.data(), SIGNAL(errorMessage(const QString&)), this, SLOT(handleError(const QString&)));
+        _scriptEngine.reset();
     }
     delete _ui;
 }
 
-void JSConsole::setScriptEngine(ScriptEngine* scriptEngine) {
+void JSConsole::setScriptEngine(const ScriptEnginePointer&  scriptEngine) {
     if (_scriptEngine == scriptEngine && scriptEngine != NULL) {
         return;
     }
     if (_scriptEngine != NULL) {
-        disconnect(_scriptEngine, &ScriptEngine::printedMessage, this, &JSConsole::handlePrint);
-        disconnect(_scriptEngine, &ScriptEngine::infoMessage, this, &JSConsole::handleInfo);
-        disconnect(_scriptEngine, &ScriptEngine::warningMessage, this, &JSConsole::handleWarning);
-        disconnect(_scriptEngine, &ScriptEngine::errorMessage, this, &JSConsole::handleError);
-        if (_ownScriptEngine) {
-            _scriptEngine->deleteLater();
-        }
+        disconnect(_scriptEngine.data(), &ScriptEngine::printedMessage, this, &JSConsole::handlePrint);
+        disconnect(_scriptEngine.data(), &ScriptEngine::infoMessage, this, &JSConsole::handleInfo);
+        disconnect(_scriptEngine.data(), &ScriptEngine::warningMessage, this, &JSConsole::handleWarning);
+        disconnect(_scriptEngine.data(), &ScriptEngine::errorMessage, this, &JSConsole::handleError);
+        _scriptEngine.reset();
     }
 
     // if scriptEngine is NULL then create one and keep track of it using _ownScriptEngine
-    _ownScriptEngine = (scriptEngine == NULL);
-    _scriptEngine = _ownScriptEngine ? DependencyManager::get<ScriptEngines>()->loadScript(_consoleFileName, false) : scriptEngine;
+    if (scriptEngine.isNull()) {
+        _scriptEngine = DependencyManager::get<ScriptEngines>()->loadScript(_consoleFileName, false);
+    } else {
+        _scriptEngine = scriptEngine;
+    }
 
-    connect(_scriptEngine, &ScriptEngine::printedMessage, this, &JSConsole::handlePrint);
-    connect(_scriptEngine, &ScriptEngine::infoMessage, this, &JSConsole::handleInfo);
-    connect(_scriptEngine, &ScriptEngine::warningMessage, this, &JSConsole::handleWarning);
-    connect(_scriptEngine, &ScriptEngine::errorMessage, this, &JSConsole::handleError);
+    connect(_scriptEngine.data(), &ScriptEngine::printedMessage, this, &JSConsole::handlePrint);
+    connect(_scriptEngine.data(), &ScriptEngine::infoMessage, this, &JSConsole::handleInfo);
+    connect(_scriptEngine.data(), &ScriptEngine::warningMessage, this, &JSConsole::handleWarning);
+    connect(_scriptEngine.data(), &ScriptEngine::errorMessage, this, &JSConsole::handleError);
 }
 
 void JSConsole::executeCommand(const QString& command) {
-    _commandHistory.prepend(command);
-    if (_commandHistory.length() > MAX_HISTORY_SIZE) {
-        _commandHistory.removeLast();
+    if (_commandHistory.isEmpty() || _commandHistory.constFirst() != command) {
+        _commandHistory.prepend(command);
+        if (_commandHistory.length() > MAX_HISTORY_SIZE) {
+            _commandHistory.removeLast();
+        }
+        _writeLines(_savedHistoryFilename, _commandHistory);
     }
 
     _ui->promptTextEdit->setDisabled(true);
 
     appendMessage(">", "<span style='" + COMMAND_STYLE + "'>" + command.toHtmlEscaped() + "</span>");
 
-    QFuture<QScriptValue> future = QtConcurrent::run(this, &JSConsole::executeCommandInWatcher, command);
+    QWeakPointer<ScriptEngine> weakScriptEngine = _scriptEngine;
+    auto consoleFileName = _consoleFileName;
+    QFuture<QScriptValue> future = QtConcurrent::run([weakScriptEngine, consoleFileName, command]()->QScriptValue{
+        QScriptValue result;
+        auto scriptEngine = weakScriptEngine.lock();
+        if (scriptEngine) {
+            BLOCKING_INVOKE_METHOD(scriptEngine.data(), "evaluate",
+                Q_RETURN_ARG(QScriptValue, result),
+                Q_ARG(const QString&, command),
+                Q_ARG(const QString&, consoleFileName));
+        }
+        return result;
+    });
     _executeWatcher.setFuture(future);
 }
 
-QScriptValue JSConsole::executeCommandInWatcher(const QString& command) {
-    QScriptValue result;
-    QMetaObject::invokeMethod(_scriptEngine, "evaluate", Qt::ConnectionType::BlockingQueuedConnection,
-                              Q_RETURN_ARG(QScriptValue, result),
-                              Q_ARG(const QString&, command),
-                              Q_ARG(const QString&, _consoleFileName));
-    return result;
-}
-
 void JSConsole::commandFinished() {
     QScriptValue result = _executeWatcher.result();
 
@@ -181,7 +210,7 @@ bool JSConsole::eventFilter(QObject* sender, QEvent* event) {
                     // a new QTextBlock isn't created.
                     keyEvent->setModifiers(keyEvent->modifiers() & ~Qt::ShiftModifier);
                 } else {
-                    QString command = _ui->promptTextEdit->toPlainText().trimmed();
+                    QString command = _ui->promptTextEdit->toPlainText().replace("\r\n","\n").trimmed();
 
                     if (!command.isEmpty()) {
                         QTextCursor cursor = _ui->promptTextEdit->textCursor();
diff --git a/interface/src/ui/JSConsole.h b/interface/src/ui/JSConsole.h
index 864f847071..4b6409a76f 100644
--- a/interface/src/ui/JSConsole.h
+++ b/interface/src/ui/JSConsole.h
@@ -17,6 +17,7 @@
 #include <QFutureWatcher>
 #include <QObject>
 #include <QWidget>
+#include <QSharedPointer>
 
 #include "ui_console.h"
 #include "ScriptEngine.h"
@@ -29,10 +30,10 @@ const int CONSOLE_HEIGHT = 200;
 class JSConsole : public QWidget {
     Q_OBJECT
 public:
-    JSConsole(QWidget* parent, ScriptEngine* scriptEngine = NULL);
+    JSConsole(QWidget* parent, const ScriptEnginePointer& scriptEngine = ScriptEnginePointer());
     ~JSConsole();
 
-    void setScriptEngine(ScriptEngine* scriptEngine = NULL);
+    void setScriptEngine(const ScriptEnginePointer& scriptEngine = ScriptEnginePointer());
     void clear();
 
 public slots:
@@ -58,16 +59,14 @@ private:
     void setToNextCommandInHistory();
     void setToPreviousCommandInHistory();
     void resetCurrentCommandHistory();
-    QScriptValue executeCommandInWatcher(const QString& command);
 
     QFutureWatcher<QScriptValue> _executeWatcher;
     Ui::Console* _ui;
     int _currentCommandInHistory;
+    QString _savedHistoryFilename;
     QList<QString> _commandHistory;
-    // Keeps track if the script engine is created inside the JSConsole
-    bool _ownScriptEngine;
     QString _rootCommand;
-    ScriptEngine* _scriptEngine;
+    ScriptEnginePointer _scriptEngine;
     static const QString _consoleFileName;
 };
 
diff --git a/interface/src/ui/LoginDialog.cpp b/interface/src/ui/LoginDialog.cpp
index c9341fd3d9..7ce2a0146d 100644
--- a/interface/src/ui/LoginDialog.cpp
+++ b/interface/src/ui/LoginDialog.cpp
@@ -16,7 +16,6 @@
 #include <QtCore/QJsonDocument>
 #include <QtNetwork/QNetworkReply>
 
-#include <NetworkingConstants.h>
 #include <plugins/PluginManager.h>
 #include <plugins/SteamClientPlugin.h>
 #include <ui/TabletScriptingInterface.h>
@@ -169,12 +168,14 @@ void LoginDialog::openUrl(const QString& url) const {
     auto offscreenUi = DependencyManager::get<OffscreenUi>();
 
     if (tablet->getToolbarMode()) {
-        auto browser = offscreenUi->load("Browser.qml");
-        browser->setProperty("url", url);
+        offscreenUi->load("Browser.qml", [=](QQmlContext* context, QObject* newObject) {
+            newObject->setProperty("url", url);
+        });
     } else {
         if (!hmd->getShouldShowTablet() && !qApp->isHMDMode()) {
-            auto browser = offscreenUi->load("Browser.qml");
-            browser->setProperty("url", url);
+            offscreenUi->load("Browser.qml", [=](QQmlContext* context, QObject* newObject) {
+                newObject->setProperty("url", url);
+            });
         } else {
             tablet->gotoWebScreen(url);
         }
diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp
index 41a4ebdf68..023d3e6e17 100644
--- a/interface/src/ui/PreferencesDialog.cpp
+++ b/interface/src/ui/PreferencesDialog.cpp
@@ -11,7 +11,6 @@
 #include <AudioClient.h>
 #include <avatar/AvatarManager.h>
 #include <devices/DdeFaceTracker.h>
-#include <NetworkingConstants.h>
 #include <ScriptEngines.h>
 #include <OffscreenUi.h>
 #include <Preferences.h>
@@ -52,7 +51,7 @@ void setupPreferences() {
 
     {
         auto getter = [=]()->QString { return myAvatar->getFullAvatarURLFromPreferences().toString(); };
-        auto setter = [=](const QString& value) { myAvatar->useFullAvatarURL(value, ""); };
+        auto setter = [=](const QString& value) { myAvatar->useFullAvatarURL(value, ""); qApp->clearAvatarOverrideUrl(); };
         auto preference = new AvatarPreference(AVATAR_BASICS, "Appearance", getter, setter);
         preferences->addPreference(preference);
     }
@@ -91,21 +90,17 @@ void setupPreferences() {
         preference->setMax(500);
         preferences->addPreference(preference);
     }
-    {
-        auto getter = []()->bool { return qApp->getDesktopTabletBecomesToolbarSetting(); };
-        auto setter = [](bool value) { qApp->setDesktopTabletBecomesToolbarSetting(value); };
-        preferences->addPreference(new CheckPreference(UI_CATEGORY, "Desktop Tablet Becomes Toolbar", getter, setter));
-    }
-    {
-        auto getter = []()->bool { return qApp->getHmdTabletBecomesToolbarSetting(); };
-        auto setter = [](bool value) { qApp->setHmdTabletBecomesToolbarSetting(value); };
-        preferences->addPreference(new CheckPreference(UI_CATEGORY, "HMD Tablet Becomes Toolbar", getter, setter));
-    }
     {
         auto getter = []()->bool { return qApp->getPreferAvatarFingerOverStylus(); };
         auto setter = [](bool value) { qApp->setPreferAvatarFingerOverStylus(value); };
         preferences->addPreference(new CheckPreference(UI_CATEGORY, "Prefer Avatar Finger Over Stylus", getter, setter));
     }
+    {
+        static const QString RETICLE_ICON_NAME = { Cursor::Manager::getIconName(Cursor::Icon::RETICLE) };
+        auto getter = []()->bool { return qApp->getPreferredCursor() == RETICLE_ICON_NAME; };
+        auto setter = [](bool value) { qApp->setPreferredCursor(value ? RETICLE_ICON_NAME : QString()); };
+        preferences->addPreference(new CheckPreference(UI_CATEGORY, "Use reticle cursor instead of arrow", getter, setter));
+    }
 
     // Snapshots
     static const QString SNAPSHOTS { "Snapshots" };
@@ -182,13 +177,31 @@ void setupPreferences() {
         preferences->addPreference(preference);
     }
     {
-        auto getter = [=]()->float { return myAvatar->getUniformScale(); };
+        auto getter = [=]()->QString { return myAvatar->getDominantHand(); };
+        auto setter = [=](const QString& value) { myAvatar->setDominantHand(value); };
+        preferences->addPreference(new PrimaryHandPreference(AVATAR_TUNING, "Dominant Hand", getter, setter));
+    }
+    {
+        auto getter = [=]()->float { return myAvatar->getTargetScale(); };
         auto setter = [=](float value) { myAvatar->setTargetScale(value); };
-        auto preference = new SpinnerPreference(AVATAR_TUNING, "Avatar scale (default is 1.0)", getter, setter);
-        preference->setMin(0.01f);
-        preference->setMax(99.9f);
+        auto preference = new SpinnerSliderPreference(AVATAR_TUNING, "Avatar Scale", getter, setter);
+        preference->setStep(0.05f);
         preference->setDecimals(2);
-        preference->setStep(1);
+        preferences->addPreference(preference);
+        
+        // When the Interface is first loaded, this section setupPreferences(); is loaded - 
+        // causing the myAvatar->getDomainMinScale() and myAvatar->getDomainMaxScale() to get set to incorrect values
+        // which can't be changed across domain switches. Having these values loaded up when you load the Dialog each time
+        // is a way around this, therefore they're not specified here but in the QML.
+    }
+    {
+        auto getter = [=]()->float { return myAvatar->getUserHeight(); };
+        auto setter = [=](float value) { myAvatar->setUserHeight(value); };
+        auto preference = new SpinnerPreference(AVATAR_TUNING, "User height (meters)", getter, setter);
+        preference->setMin(1.0f);
+        preference->setMax(2.2f);
+        preference->setDecimals(3);
+        preference->setStep(0.001f);
         preferences->addPreference(preference);
     }
     {
@@ -297,63 +310,28 @@ void setupPreferences() {
         preferences->addPreference(preference);
     }
 
-
-    {
-        auto getter = []()->float { return controller::InputDevice::getReticleMoveSpeed(); };
-        auto setter = [](float value) { controller::InputDevice::setReticleMoveSpeed(value); };
-        auto preference = new SpinnerPreference("Sixense Controllers", "Reticle movement speed", getter, setter);
-        preference->setMin(0);
-        preference->setMax(100);
-        preference->setStep(1);
-        preferences->addPreference(preference);
-    }
-
     {
         static const QString RENDER("Graphics");
         auto renderConfig = qApp->getRenderEngine()->getConfiguration();
         if (renderConfig) {
-            auto ambientOcclusionConfig = renderConfig->getConfig<AmbientOcclusionEffect>();
-            if (ambientOcclusionConfig) {
-                auto getter = [ambientOcclusionConfig]()->QString { return ambientOcclusionConfig->getPreset(); };
-                auto setter = [ambientOcclusionConfig](QString preset) { ambientOcclusionConfig->setPreset(preset); };
+            auto mainViewAmbientOcclusionConfig = renderConfig->getConfig<AmbientOcclusionEffect>("RenderMainView.AmbientOcclusion");
+            if (mainViewAmbientOcclusionConfig) {
+                auto getter = [mainViewAmbientOcclusionConfig]()->QString { return mainViewAmbientOcclusionConfig->getPreset(); };
+                auto setter = [mainViewAmbientOcclusionConfig](QString preset) { mainViewAmbientOcclusionConfig->setPreset(preset); };
                 auto preference = new ComboBoxPreference(RENDER, "Ambient occlusion", getter, setter);
-                preference->setItems(ambientOcclusionConfig->getPresetList());
+                preference->setItems(mainViewAmbientOcclusionConfig->getPresetList());
                 preferences->addPreference(preference);
             }
 
-            auto shadowConfig = renderConfig->getConfig<RenderShadowTask>();
-            if (shadowConfig) {
-                auto getter = [shadowConfig]()->QString { return shadowConfig->getPreset(); };
-                auto setter = [shadowConfig](QString preset) { shadowConfig->setPreset(preset); };
+            auto mainViewShadowConfig = renderConfig->getConfig<RenderShadowTask>("RenderMainView.RenderShadowTask");
+            if (mainViewShadowConfig) {
+                auto getter = [mainViewShadowConfig]()->QString { return mainViewShadowConfig->getPreset(); };
+                auto setter = [mainViewShadowConfig](QString preset) { mainViewShadowConfig->setPreset(preset); };
                 auto preference = new ComboBoxPreference(RENDER, "Shadows", getter, setter);
-                preference->setItems(shadowConfig->getPresetList());
+                preference->setItems(mainViewShadowConfig->getPresetList());
                 preferences->addPreference(preference);
             }
         }
-        {
-            auto getter = []()->bool { return image::isColorTexturesCompressionEnabled(); };
-            auto setter = [](bool value) { return image::setColorTexturesCompressionEnabled(value); };
-            auto preference = new CheckPreference(RENDER, "Compress Color Textures", getter, setter);
-            preferences->addPreference(preference);
-        }
-        {
-            auto getter = []()->bool { return image::isNormalTexturesCompressionEnabled(); };
-            auto setter = [](bool value) { return image::setNormalTexturesCompressionEnabled(value); };
-            auto preference = new CheckPreference(RENDER, "Compress Normal Textures", getter, setter);
-            preferences->addPreference(preference);
-        }
-        {
-            auto getter = []()->bool { return image::isGrayscaleTexturesCompressionEnabled(); };
-            auto setter = [](bool value) { return image::setGrayscaleTexturesCompressionEnabled(value); };
-            auto preference = new CheckPreference(RENDER, "Compress Grayscale Textures", getter, setter);
-            preferences->addPreference(preference);
-        }
-        {
-            auto getter = []()->bool { return image::isCubeTexturesCompressionEnabled(); };
-            auto setter = [](bool value) { return image::setCubeTexturesCompressionEnabled(value); };
-            auto preference = new CheckPreference(RENDER, "Compress Cube Textures", getter, setter);
-            preferences->addPreference(preference);
-        }
     }
     {
         static const QString RENDER("Networking");
diff --git a/interface/src/ui/ResourceImageItem.cpp b/interface/src/ui/ResourceImageItem.cpp
new file mode 100644
index 0000000000..5b7c1896fe
--- /dev/null
+++ b/interface/src/ui/ResourceImageItem.cpp
@@ -0,0 +1,115 @@
+//
+// ResourceImageItem.cpp
+//
+// Created by David Kelly and Howard Stearns on 2017/06/08
+// Copyright 2017 High Fidelity, Inc.
+
+// Distributed under the Apache License, Version 2.0
+// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include "ResourceImageItem.h"
+
+#include <QOpenGLFramebufferObjectFormat>
+#include <QOpenGLFunctions>
+#include <QOpenGLExtraFunctions>
+#include <QOpenGLContext>
+
+#include <plugins/DisplayPlugin.h>
+
+ResourceImageItem::ResourceImageItem() : QQuickFramebufferObject() {
+    auto textureCache = DependencyManager::get<TextureCache>();
+    connect(textureCache.data(), SIGNAL(spectatorCameraFramebufferReset()), this, SLOT(update()));
+}
+
+void ResourceImageItem::setUrl(const QString& url) {
+    if (url != m_url) {
+        m_url = url;
+        update();
+    }
+}
+
+void ResourceImageItem::setReady(bool ready) {
+    if (ready != m_ready) {
+        m_ready = ready;
+        update();
+    }
+}
+
+void ResourceImageItemRenderer::onUpdateTimer() {
+    if (_ready) {
+        if (_networkTexture && _networkTexture->isLoaded()) {
+            if(_fboMutex.tryLock()) {
+                invalidateFramebufferObject();
+                qApp->getActiveDisplayPlugin()->copyTextureToQuickFramebuffer(_networkTexture, _copyFbo, &_fenceSync);
+                _fboMutex.unlock();
+            } else {
+                qDebug() << "couldn't get a lock, using last frame";
+            }
+        } else {
+            _networkTexture = DependencyManager::get<TextureCache>()->getTexture(_url);
+        }
+    }
+    update();
+}
+
+ResourceImageItemRenderer::ResourceImageItemRenderer() : QQuickFramebufferObject::Renderer() {
+    connect(&_updateTimer, SIGNAL(timeout()), this, SLOT(onUpdateTimer()));
+    auto textureCache = DependencyManager::get<TextureCache>();
+}
+
+void ResourceImageItemRenderer::synchronize(QQuickFramebufferObject* item) {
+    ResourceImageItem* resourceImageItem = static_cast<ResourceImageItem*>(item);
+
+    resourceImageItem->setFlag(QQuickItem::ItemHasContents);
+
+    _url = resourceImageItem->getUrl();
+    _ready = resourceImageItem->getReady();
+    _visible = resourceImageItem->isVisible();
+    _window = resourceImageItem->window();
+
+    _networkTexture = DependencyManager::get<TextureCache>()->getTexture(_url);
+    static const int UPDATE_TIMER_DELAY_IN_MS = 100; // 100 ms = 10 hz for now
+    if (_ready && _visible && !_updateTimer.isActive()) {
+        _updateTimer.start(UPDATE_TIMER_DELAY_IN_MS);
+    } else if (!(_ready && _visible) && _updateTimer.isActive()) {
+        _updateTimer.stop();
+    }
+}
+
+QOpenGLFramebufferObject* ResourceImageItemRenderer::createFramebufferObject(const QSize& size) {
+    if (_copyFbo) {
+        delete _copyFbo;
+    }
+    QOpenGLFramebufferObjectFormat format;
+    format.setAttachment(QOpenGLFramebufferObject::CombinedDepthStencil);
+    _copyFbo = new QOpenGLFramebufferObject(size, format);
+    _copyFbo->bind();
+    return new QOpenGLFramebufferObject(size, format);
+}
+
+void ResourceImageItemRenderer::render() {
+    auto f = QOpenGLContext::currentContext()->extraFunctions();
+
+    if (_fenceSync) {
+        f->glWaitSync(_fenceSync, 0, GL_TIMEOUT_IGNORED);
+        f->glDeleteSync(_fenceSync);
+        _fenceSync = 0;
+    }
+    if (_ready) {
+        _fboMutex.lock();
+        _copyFbo->bind();
+        QOpenGLFramebufferObject::blitFramebuffer(framebufferObject(), _copyFbo, GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT, GL_NEAREST);
+
+        // this clears the copyFbo texture
+        // so next frame starts fresh - helps
+        // when aspect ratio changes
+        _copyFbo->takeTexture();
+        _copyFbo->bind();
+        _copyFbo->release();
+
+        _fboMutex.unlock();
+    }
+    glFlush();
+    _window->resetOpenGLState();
+}
diff --git a/interface/src/ui/ResourceImageItem.h b/interface/src/ui/ResourceImageItem.h
new file mode 100644
index 0000000000..985ab5a66e
--- /dev/null
+++ b/interface/src/ui/ResourceImageItem.h
@@ -0,0 +1,63 @@
+//
+// ResourceImageItem.h
+//
+// Created by David Kelly and Howard Stearns on 2017/06/08
+// 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
+//
+
+#pragma once
+#ifndef hifi_ResourceImageItem_h
+#define hifi_ResourceImageItem_h
+
+#include "Application.h"
+
+#include <QQuickFramebufferObject>
+#include <QQuickWindow>
+#include <QTimer>
+
+#include <TextureCache.h>
+
+class ResourceImageItemRenderer : public QObject, public QQuickFramebufferObject::Renderer {
+    Q_OBJECT
+public:
+    ResourceImageItemRenderer();
+    QOpenGLFramebufferObject* createFramebufferObject(const QSize& size) override;
+    void synchronize(QQuickFramebufferObject* item) override;
+    void render() override;
+private:
+    bool _ready;
+    QString _url;
+    bool _visible;
+
+    NetworkTexturePointer _networkTexture;
+    QQuickWindow* _window;
+    QMutex _fboMutex;
+    QOpenGLFramebufferObject* _copyFbo { nullptr };
+    GLsync _fenceSync { 0 };
+    QTimer _updateTimer;
+public slots:
+    void onUpdateTimer();
+};
+
+class ResourceImageItem : public QQuickFramebufferObject {
+    Q_OBJECT
+    Q_PROPERTY(QString url READ getUrl WRITE setUrl)
+    Q_PROPERTY(bool ready READ getReady WRITE setReady)
+public:
+    ResourceImageItem();
+    QString getUrl() const { return m_url; }
+    void setUrl(const QString& url);
+    bool getReady() const { return m_ready; }
+    void setReady(bool ready);
+    QQuickFramebufferObject::Renderer* createRenderer() const override { return new ResourceImageItemRenderer; }
+
+private:
+    QString m_url;
+    bool m_ready { false };
+
+};
+
+#endif // hifi_ResourceImageItem_h
diff --git a/interface/src/ui/SnapshotAnimated.cpp b/interface/src/ui/SnapshotAnimated.cpp
index 70767b007d..3c00be8358 100644
--- a/interface/src/ui/SnapshotAnimated.cpp
+++ b/interface/src/ui/SnapshotAnimated.cpp
@@ -13,8 +13,9 @@
 #include <QtCore/QObject>
 #include <QtCore/QString>
 #include <QtGui/QImage>
+#include <QtConcurrent/QtConcurrentRun>
 
-#include <QtConcurrent/qtconcurrentrun.h>
+#include <plugins/DisplayPlugin.h>
 #include "SnapshotAnimated.h"
 
 QTimer* SnapshotAnimated::snapshotAnimatedTimer = NULL;
diff --git a/interface/src/ui/Stats.cpp b/interface/src/ui/Stats.cpp
index 8e3636dd7e..d4a300c337 100644
--- a/interface/src/ui/Stats.cpp
+++ b/interface/src/ui/Stats.cpp
@@ -8,6 +8,7 @@
 
 #include "Stats.h"
 
+#include <queue>
 #include <sstream>
 #include <QFontDatabase>
 
@@ -105,23 +106,18 @@ extern std::atomic<size_t> DECIMATED_TEXTURE_COUNT;
 extern std::atomic<size_t> RECTIFIED_TEXTURE_COUNT;
 
 void Stats::updateStats(bool force) {
+    QQuickItem* parent = parentItem();
     if (!force) {
         if (!Menu::getInstance()->isOptionChecked(MenuOption::Stats)) {
-            if (isVisible()) {
-                setVisible(false);
+            if (parent->isVisible()) {
+                parent->setVisible(false);
             }
             return;
-        } else if (!isVisible()) {
-            setVisible(true);
+        } else if (!parent->isVisible()) {
+            parent->setVisible(true);
         }
     }
 
-    bool shouldDisplayTimingDetail = Menu::getInstance()->isOptionChecked(MenuOption::DisplayDebugTimingDetails) &&
-        Menu::getInstance()->isOptionChecked(MenuOption::Stats) && isExpanded();
-    if (shouldDisplayTimingDetail != PerformanceTimer::isActive()) {
-        PerformanceTimer::setActive(shouldDisplayTimingDetail);
-    }
-
     auto nodeList = DependencyManager::get<NodeList>();
     auto avatarManager = DependencyManager::get<AvatarManager>();
     // we need to take one avatar out so we don't include ourselves
@@ -129,7 +125,7 @@ void Stats::updateStats(bool force) {
     STAT_UPDATE(updatedAvatarCount, avatarManager->getNumAvatarsUpdated());
     STAT_UPDATE(notUpdatedAvatarCount, avatarManager->getNumAvatarsNotUpdated());
     STAT_UPDATE(serverCount, (int)nodeList->size());
-    STAT_UPDATE_FLOAT(framerate, qApp->getFps(), 0.1f);
+    STAT_UPDATE_FLOAT(renderrate, qApp->getRenderLoopRate(), 0.1f);
     if (qApp->getActiveDisplayPlugin()) {
         auto displayPlugin = qApp->getActiveDisplayPlugin();
         auto stats = displayPlugin->getHardwareStats();
@@ -137,7 +133,6 @@ void Stats::updateStats(bool force) {
         STAT_UPDATE(longrenders, stats["long_render_count"].toInt());
         STAT_UPDATE(longsubmits, stats["long_submit_count"].toInt());
         STAT_UPDATE(longframes, stats["long_frame_count"].toInt());
-        STAT_UPDATE_FLOAT(renderrate, displayPlugin->renderRate(), 0.1f);
         STAT_UPDATE_FLOAT(presentrate, displayPlugin->presentRate(), 0.1f);
         STAT_UPDATE_FLOAT(presentnewrate, displayPlugin->newFramePresentRate(), 0.1f);
         STAT_UPDATE_FLOAT(presentdroprate, displayPlugin->droppedFrameRate(), 0.1f);
@@ -150,8 +145,7 @@ void Stats::updateStats(bool force) {
         STAT_UPDATE(presentnewrate, -1);
         STAT_UPDATE(presentdroprate, -1);
     }
-    STAT_UPDATE(simrate, (int)qApp->getAverageSimsPerSecond());
-    STAT_UPDATE(avatarSimrate, (int)qApp->getAvatarSimrate());
+    STAT_UPDATE(gameLoopRate, (int)qApp->getGameLoopRate());
 
     auto bandwidthRecorder = DependencyManager::get<BandwidthRecorder>();
     STAT_UPDATE(packetInCount, (int)bandwidthRecorder->getCachedTotalAverageInputPacketsPerSecond());
@@ -180,10 +174,12 @@ void Stats::updateStats(bool force) {
     int totalPingOctree = 0;
     int octreeServerCount = 0;
     int pingOctreeMax = 0;
+    int totalEntityKbps = 0;
     nodeList->eachNode([&](const SharedNodePointer& node) {
         // TODO: this should also support entities
         if (node->getType() == NodeType::EntityServer) {
             totalPingOctree += node->getPingMs();
+            totalEntityKbps += node->getInboundBandwidth();
             octreeServerCount++;
             if (pingOctreeMax < node->getPingMs()) {
                 pingOctreeMax = node->getPingMs();
@@ -248,6 +244,7 @@ void Stats::updateStats(bool force) {
         STAT_UPDATE(audioCodec, audioClient->getSelectedAudioFormat());
         STAT_UPDATE(audioNoiseGate, audioClient->getNoiseGateOpen() ? "Open" : "Closed");
 
+        STAT_UPDATE(entityPacketsInKbps, octreeServerCount ? totalEntityKbps / octreeServerCount : -1);
 
         auto loadingRequests = ResourceCache::getLoadingRequests();
         STAT_UPDATE(downloads, loadingRequests.size());
@@ -403,14 +400,21 @@ void Stats::updateStats(bool force) {
         STAT_UPDATE(lodStatus, "You can see " + DependencyManager::get<LODManager>()->getLODFeedbackText());
     }
 
-    bool performanceTimerIsActive = PerformanceTimer::isActive();
-    bool displayPerf = _expanded && Menu::getInstance()->isOptionChecked(MenuOption::DisplayDebugTimingDetails);
-    if (displayPerf && performanceTimerIsActive) {
-        if (!_timingExpanded) {
-            _timingExpanded = true;
+
+    bool performanceTimerShouldBeActive = Menu::getInstance()->isOptionChecked(MenuOption::Stats) && _expanded;
+    if (performanceTimerShouldBeActive != PerformanceTimer::isActive()) {
+        PerformanceTimer::setActive(performanceTimerShouldBeActive);
+    }
+    if (performanceTimerShouldBeActive) {
+        PerformanceTimer::tallyAllTimerRecords(); // do this even if we're not displaying them, so they don't stack up
+    }
+
+    if (performanceTimerShouldBeActive &&
+        Menu::getInstance()->isOptionChecked(MenuOption::DisplayDebugTimingDetails)) {
+        if (!_showTimingDetails) {
+            _showTimingDetails = true;
             emit timingExpandedChanged();
         }
-        PerformanceTimer::tallyAllTimerRecords(); // do this even if we're not displaying them, so they don't stack up
 
         // we will also include room for 1 line per timing record and a header of 4 lines
         // Timing details...
@@ -450,10 +454,55 @@ void Stats::updateStats(bool force) {
         }
         _timingStats = perfLines;
         emit timingStatsChanged();
-    } else if (_timingExpanded) {
-        _timingExpanded = false;
+    } else if (_showTimingDetails) {
+        _showTimingDetails = false;
         emit timingExpandedChanged();
     }
+
+    if (_expanded && performanceTimerShouldBeActive) {
+        if (!_showGameUpdateStats) {
+            _showGameUpdateStats = true;
+        }
+        class SortableStat {
+        public:
+            SortableStat(QString a, float p) : message(a), priority(p) {}
+            QString message;
+            float priority;
+            bool operator<(const SortableStat& other) const { return priority < other.priority; }
+        };
+
+        const QMap<QString, PerformanceTimerRecord>& allRecords = PerformanceTimer::getAllTimerRecords();
+        std::priority_queue<SortableStat> idleUpdateStats;
+        auto itr = allRecords.find("/idle/update");
+        if (itr != allRecords.end()) {
+            float dt = (float)itr.value().getMovingAverage() / (float)USECS_PER_MSEC;
+            _gameUpdateStats = QString("/idle/update = %1 ms").arg(dt);
+
+            QVector<QString> categories = { "devices", "physics", "otherAvatars", "MyAvatar", "misc" };
+            for (int32_t j = 0; j < categories.size(); ++j) {
+                QString recordKey = "/idle/update/" + categories[j];
+                itr = allRecords.find(recordKey);
+                if (itr != allRecords.end()) {
+                    float dt = (float)itr.value().getMovingAverage() / (float)USECS_PER_MSEC;
+                    QString message = QString("\n    %1 = %2").arg(categories[j]).arg(dt);
+                    idleUpdateStats.push(SortableStat(message, dt));
+                }
+            }
+            while (!idleUpdateStats.empty()) {
+                SortableStat stat = idleUpdateStats.top();
+                _gameUpdateStats += stat.message;
+                idleUpdateStats.pop();
+            }
+            emit gameUpdateStatsChanged();
+        } else if (_gameUpdateStats != "") {
+            _gameUpdateStats = "";
+            emit gameUpdateStatsChanged();
+        }
+    } else if (_showGameUpdateStats) {
+        _showGameUpdateStats = false;
+        _gameUpdateStats = "";
+        emit gameUpdateStatsChanged();
+    }
 }
 
 void Stats::setRenderDetails(const render::RenderDetails& details) {
diff --git a/interface/src/ui/Stats.h b/interface/src/ui/Stats.h
index 74d2589c35..af3189f20b 100644
--- a/interface/src/ui/Stats.h
+++ b/interface/src/ui/Stats.h
@@ -32,8 +32,6 @@ class Stats : public QQuickItem {
 
     STATS_PROPERTY(int, serverCount, 0)
     // How often the app is creating new gpu::Frames
-    STATS_PROPERTY(float, framerate, 0)
-    // How often the display plugin is executing a given frame
     STATS_PROPERTY(float, renderrate, 0)
     // How often the display plugin is presenting to the device
     STATS_PROPERTY(float, presentrate, 0)
@@ -47,8 +45,7 @@ class Stats : public QQuickItem {
 
     STATS_PROPERTY(float, presentnewrate, 0)
     STATS_PROPERTY(float, presentdroprate, 0)
-    STATS_PROPERTY(int, simrate, 0)
-    STATS_PROPERTY(int, avatarSimrate, 0)
+    STATS_PROPERTY(int, gameLoopRate, 0)
     STATS_PROPERTY(int, avatarCount, 0)
     STATS_PROPERTY(int, updatedAvatarCount, 0)
     STATS_PROPERTY(int, notUpdatedAvatarCount, 0)
@@ -85,6 +82,7 @@ class Stats : public QQuickItem {
     STATS_PROPERTY(int, audioPacketLoss, 0)
     STATS_PROPERTY(QString, audioCodec, QString())
     STATS_PROPERTY(QString, audioNoiseGate, QString())
+    STATS_PROPERTY(int, entityPacketsInKbps, 0)
 
     STATS_PROPERTY(int, downloads, 0)
     STATS_PROPERTY(int, downloadLimit, 0)
@@ -107,6 +105,7 @@ class Stats : public QQuickItem {
     STATS_PROPERTY(QString, packetStats, QString())
     STATS_PROPERTY(QString, lodStatus, QString())
     STATS_PROPERTY(QString, timingStats, QString())
+    STATS_PROPERTY(QString, gameUpdateStats, QString())
     STATS_PROPERTY(int, serverElements, 0)
     STATS_PROPERTY(int, serverInternal, 0)
     STATS_PROPERTY(int, serverLeaves, 0)
@@ -147,7 +146,7 @@ public:
     void updateStats(bool force = false);
 
     bool isExpanded() { return _expanded; }
-    bool isTimingExpanded() { return _timingExpanded; }
+    bool isTimingExpanded() { return _showTimingDetails; }
 
     void setExpanded(bool expanded) {
         if (_expanded != expanded) {
@@ -166,7 +165,6 @@ signals:
     void longrendersChanged();
     void longframesChanged();
     void appdroppedChanged();
-    void framerateChanged();
     void expandedChanged();
     void timingExpandedChanged();
     void serverCountChanged();
@@ -175,8 +173,7 @@ signals:
     void presentnewrateChanged();
     void presentdroprateChanged();
     void stutterrateChanged();
-    void simrateChanged();
-    void avatarSimrateChanged();
+    void gameLoopRateChanged();
     void avatarCountChanged();
     void updatedAvatarCountChanged();
     void notUpdatedAvatarCountChanged();
@@ -212,6 +209,7 @@ signals:
     void audioPacketLossChanged();
     void audioCodecChanged();
     void audioNoiseGateChanged();
+    void entityPacketsInKbpsChanged();
 
     void downloadsChanged();
     void downloadLimitChanged();
@@ -240,6 +238,7 @@ signals:
     void localInternalChanged();
     void localLeavesChanged();
     void timingStatsChanged();
+    void gameUpdateStatsChanged();
     void glContextSwapchainMemoryChanged();
     void qmlTextureMemoryChanged();
     void texturePendingTransfersChanged();
@@ -265,7 +264,8 @@ private:
     int _recentMaxPackets{ 0 } ; // recent max incoming voxel packets to process
     bool _resetRecentMaxPacketsSoon{ true };
     bool _expanded{ false };
-    bool _timingExpanded{ false };
+    bool _showTimingDetails{ false };
+    bool _showGameUpdateStats{ false };
     QString _monospaceFont;
     const AudioIOStats* _audioStats;
     QStringList _downloadUrls = QStringList();
diff --git a/interface/src/ui/TestingDialog.cpp b/interface/src/ui/TestingDialog.cpp
index f55eb63a5b..6f499f2a8d 100644
--- a/interface/src/ui/TestingDialog.cpp
+++ b/interface/src/ui/TestingDialog.cpp
@@ -26,10 +26,10 @@ TestingDialog::TestingDialog(QWidget* parent) :
     auto _engines = DependencyManager::get<ScriptEngines>();
     _engine = _engines->loadScript(qApp->applicationDirPath() + testRunnerRelativePath);
     _console->setScriptEngine(_engine);
-    connect(_engine, &ScriptEngine::finished, this, &TestingDialog::onTestingFinished);
+    connect(_engine.data(), &ScriptEngine::finished, this, &TestingDialog::onTestingFinished);
 }
 
 void TestingDialog::onTestingFinished(const QString& scriptPath) {
-    _engine = nullptr;
-    _console->setScriptEngine(nullptr);
+    _engine.reset();
+    _console->setScriptEngine();
 }
diff --git a/interface/src/ui/TestingDialog.h b/interface/src/ui/TestingDialog.h
index b90b8f2e99..a7e909ca0e 100644
--- a/interface/src/ui/TestingDialog.h
+++ b/interface/src/ui/TestingDialog.h
@@ -29,7 +29,7 @@ public:
 
 private:
     std::unique_ptr<JSConsole> _console;
-    ScriptEngine* _engine;
+    ScriptEnginePointer _engine;
 };
 
 #endif
diff --git a/interface/src/ui/overlays/Base3DOverlay.cpp b/interface/src/ui/overlays/Base3DOverlay.cpp
index 6f1167cfc9..4412014eb1 100644
--- a/interface/src/ui/overlays/Base3DOverlay.cpp
+++ b/interface/src/ui/overlays/Base3DOverlay.cpp
@@ -16,30 +16,27 @@
 #include "Application.h"
 
 
-const float DEFAULT_LINE_WIDTH = 1.0f;
 const bool DEFAULT_IS_SOLID = false;
 const bool DEFAULT_IS_DASHED_LINE = false;
 
 Base3DOverlay::Base3DOverlay() :
     SpatiallyNestable(NestableType::Overlay, QUuid::createUuid()),
-    _lineWidth(DEFAULT_LINE_WIDTH),
     _isSolid(DEFAULT_IS_SOLID),
     _isDashedLine(DEFAULT_IS_DASHED_LINE),
     _ignoreRayIntersection(false),
     _drawInFront(false),
-    _isAA(true)
+    _drawHUDLayer(false)
 {
 }
 
 Base3DOverlay::Base3DOverlay(const Base3DOverlay* base3DOverlay) :
     Overlay(base3DOverlay),
     SpatiallyNestable(NestableType::Overlay, QUuid::createUuid()),
-    _lineWidth(base3DOverlay->_lineWidth),
     _isSolid(base3DOverlay->_isSolid),
     _isDashedLine(base3DOverlay->_isDashedLine),
     _ignoreRayIntersection(base3DOverlay->_ignoreRayIntersection),
     _drawInFront(base3DOverlay->_drawInFront),
-    _isAA(base3DOverlay->_isAA),
+    _drawHUDLayer(base3DOverlay->_drawHUDLayer),
     _isGrabbable(base3DOverlay->_isGrabbable)
 {
     setTransform(base3DOverlay->getTransform());
@@ -127,13 +124,19 @@ void Base3DOverlay::setProperties(const QVariantMap& originalProperties) {
     bool needRenderItemUpdate = false;
 
     auto drawInFront = properties["drawInFront"];
-
     if (drawInFront.isValid()) {
         bool value = drawInFront.toBool();
         setDrawInFront(value);
         needRenderItemUpdate = true;
     }
 
+    auto drawHUDLayer = properties["drawHUDLayer"];
+    if (drawHUDLayer.isValid()) {
+        bool value = drawHUDLayer.toBool();
+        setDrawHUDLayer(value);
+        needRenderItemUpdate = true;
+    }
+
     auto isGrabbable = properties["grabbable"];
     if (isGrabbable.isValid()) {
         setIsGrabbable(isGrabbable.toBool());
@@ -147,12 +150,6 @@ void Base3DOverlay::setProperties(const QVariantMap& originalProperties) {
         setLocalOrientation(quatFromVariant(properties["orientation"]));
         needRenderItemUpdate = true;
     }
-
-    if (properties["lineWidth"].isValid()) {
-        setLineWidth(properties["lineWidth"].toFloat());
-        needRenderItemUpdate = true;
-    }
-
     if (properties["isSolid"].isValid()) {
         setIsSolid(properties["isSolid"].toBool());
     }
@@ -191,13 +188,6 @@ void Base3DOverlay::setProperties(const QVariantMap& originalProperties) {
         needRenderItemUpdate = true;
     }
 
-    auto isAA = properties["isAA"];
-    if (isAA.isValid()) {
-        bool value = isAA.toBool();
-        setIsAA(value);
-        needRenderItemUpdate = true;
-    }
-
     // Communicate changes to the renderItem if needed
     if (needRenderItemUpdate) {
         auto itemID = getRenderItemID();
@@ -226,9 +216,6 @@ QVariant Base3DOverlay::getProperty(const QString& property) {
     if (property == "localRotation" || property == "localOrientation") {
         return quatToVariant(getLocalOrientation());
     }
-    if (property == "lineWidth") {
-        return _lineWidth;
-    }
     if (property == "isSolid" || property == "isFilled" || property == "solid" || property == "filed") {
         return _isSolid;
     }
@@ -253,9 +240,6 @@ QVariant Base3DOverlay::getProperty(const QString& property) {
     if (property == "parentJointIndex") {
         return getParentJointIndex();
     }
-    if (property == "isAA") {
-        return _isAA;
-    }
 
     return Overlay::getProperty(property);
 }
@@ -268,15 +252,62 @@ bool Base3DOverlay::findRayIntersection(const glm::vec3& origin, const glm::vec3
 void Base3DOverlay::locationChanged(bool tellPhysics) {
     SpatiallyNestable::locationChanged(tellPhysics);
 
-    auto itemID = getRenderItemID();
-    if (render::Item::isValidID(itemID)) {
-        render::ScenePointer scene = qApp->getMain3DScene();
-        render::Transaction transaction;
-        transaction.updateItem(itemID);
-        scene->enqueueTransaction(transaction);
-    }
+    // Force the actual update of the render transform through the notify call
+    notifyRenderVariableChange();
 }
 
 void Base3DOverlay::parentDeleted() {
     qApp->getOverlays().deleteOverlay(getOverlayID());
 }
+
+void Base3DOverlay::update(float duration) {
+    // In Base3DOverlay, if its location or bound changed, the renderTrasnformDirty flag is true.
+    // then the correct transform used for rendering is computed in the update transaction and assigned.
+    if (_renderVariableDirty) {
+        auto itemID = getRenderItemID();
+        if (render::Item::isValidID(itemID)) {
+            // Capture the render transform value in game loop before
+            auto latestTransform = evalRenderTransform();
+            bool latestVisible = getVisible();
+            _renderVariableDirty = false;
+            render::ScenePointer scene = qApp->getMain3DScene();
+            render::Transaction transaction;
+            transaction.updateItem<Overlay>(itemID, [latestTransform, latestVisible](Overlay& data) {
+                auto overlay3D = dynamic_cast<Base3DOverlay*>(&data);
+                if (overlay3D) {
+                    // TODO: overlays need to communicate all relavent render properties through transactions
+                    overlay3D->setRenderTransform(latestTransform);
+                    overlay3D->setRenderVisible(latestVisible);
+                }
+            });
+            scene->enqueueTransaction(transaction);
+        }
+    }
+}
+
+void Base3DOverlay::notifyRenderVariableChange() const {
+    _renderVariableDirty = true;
+}
+
+Transform Base3DOverlay::evalRenderTransform() {
+    return getTransform();
+}
+
+void Base3DOverlay::setRenderTransform(const Transform& transform) {
+    _renderTransform = transform;
+}
+
+void Base3DOverlay::setRenderVisible(bool visible) {
+    _renderVisible = visible;
+}
+
+SpatialParentTree* Base3DOverlay::getParentTree() const {
+    auto entityTreeRenderer = qApp->getEntities();
+    EntityTreePointer entityTree = entityTreeRenderer ? entityTreeRenderer->getTree() : nullptr;
+    return entityTree.get();
+}
+
+void Base3DOverlay::setVisible(bool visible) {
+    Parent::setVisible(visible);
+    notifyRenderVariableChange();
+}
\ No newline at end of file
diff --git a/interface/src/ui/overlays/Base3DOverlay.h b/interface/src/ui/overlays/Base3DOverlay.h
index 29d4c093a9..2f6e6db9dc 100644
--- a/interface/src/ui/overlays/Base3DOverlay.h
+++ b/interface/src/ui/overlays/Base3DOverlay.h
@@ -18,11 +18,14 @@
 
 class Base3DOverlay : public Overlay, public SpatiallyNestable {
     Q_OBJECT
+    using Parent = Overlay;
 
 public:
     Base3DOverlay();
     Base3DOverlay(const Base3DOverlay* base3DOverlay);
 
+    void setVisible(bool visible) override;
+
     virtual OverlayID getOverlayID() const override { return OverlayID(getID().toString()); }
     void setOverlayID(OverlayID overlayID) override { setID(overlayID); }
 
@@ -35,26 +38,27 @@ public:
     // TODO: consider implementing registration points in this class
     glm::vec3 getCenter() const { return getPosition(); }
 
-    float getLineWidth() const { return _lineWidth; }
     bool getIsSolid() const { return _isSolid; }
     bool getIsDashedLine() const { return _isDashedLine; }
     bool getIsSolidLine() const { return !_isDashedLine; }
     bool getIgnoreRayIntersection() const { return _ignoreRayIntersection; }
     bool getDrawInFront() const { return _drawInFront; }
+    bool getDrawHUDLayer() const { return _drawHUDLayer; }
     bool getIsGrabbable() const { return _isGrabbable; }
 
-    virtual bool isAA() const { return _isAA; }
-
-    void setLineWidth(float lineWidth) { _lineWidth = lineWidth; }
     void setIsSolid(bool isSolid) { _isSolid = isSolid; }
     void setIsDashedLine(bool isDashedLine) { _isDashedLine = isDashedLine; }
     void setIgnoreRayIntersection(bool value) { _ignoreRayIntersection = value; }
-    void setDrawInFront(bool value) { _drawInFront = value; }
-    void setIsAA(bool value) { _isAA = value; }
+    virtual void setDrawInFront(bool value) { _drawInFront = value; }
+    virtual void setDrawHUDLayer(bool value) { _drawHUDLayer = value; }
     void setIsGrabbable(bool value) { _isGrabbable = value; }
 
     virtual AABox getBounds() const override = 0;
 
+    void update(float deltatime) override;
+
+    void notifyRenderVariableChange() const;
+
     void setProperties(const QVariantMap& properties) override;
     QVariant getProperty(const QString& property) override;
 
@@ -66,17 +70,26 @@ public:
         return findRayIntersection(origin, direction, distance, face, surfaceNormal);
     }
 
+    virtual SpatialParentTree* getParentTree() const override;
+
 protected:
     virtual void locationChanged(bool tellPhysics = true) override;
     virtual void parentDeleted() override;
 
-    float _lineWidth;
+    mutable Transform _renderTransform;
+    mutable bool _renderVisible;
+    virtual Transform evalRenderTransform();
+    virtual void setRenderTransform(const Transform& transform);
+    void setRenderVisible(bool visible);
+    const Transform& getRenderTransform() const { return _renderTransform; }
+
     bool _isSolid;
     bool _isDashedLine;
     bool _ignoreRayIntersection;
     bool _drawInFront;
-    bool _isAA;
+    bool _drawHUDLayer;
     bool _isGrabbable { false };
+    mutable bool _renderVariableDirty { true };
 
     QString _name;
 };
diff --git a/interface/src/ui/overlays/Billboard3DOverlay.cpp b/interface/src/ui/overlays/Billboard3DOverlay.cpp
index 182e7da978..960f0de095 100644
--- a/interface/src/ui/overlays/Billboard3DOverlay.cpp
+++ b/interface/src/ui/overlays/Billboard3DOverlay.cpp
@@ -37,9 +37,22 @@ QVariant Billboard3DOverlay::getProperty(const QString &property) {
     return Planar3DOverlay::getProperty(property);
 }
 
-void Billboard3DOverlay::applyTransformTo(Transform& transform, bool force) {
+bool Billboard3DOverlay::applyTransformTo(Transform& transform, bool force) {
+    bool transformChanged = false;
     if (force || usecTimestampNow() > _transformExpiry) {
-        PanelAttachable::applyTransformTo(transform, true);
-        pointTransformAtCamera(transform, getOffsetRotation());
+        transformChanged = PanelAttachable::applyTransformTo(transform, true);
+        transformChanged |= pointTransformAtCamera(transform, getOffsetRotation());
     }
+    return transformChanged;
 }
+
+Transform Billboard3DOverlay::evalRenderTransform() {
+    Transform transform = getTransform();
+    bool transformChanged = applyTransformTo(transform, true);
+    // If the transform is not modified, setting the transform to
+    // itself will cause drift over time due to floating point errors.
+    if (transformChanged) {
+        setTransform(transform);
+    }
+    return transform;
+}
\ No newline at end of file
diff --git a/interface/src/ui/overlays/Billboard3DOverlay.h b/interface/src/ui/overlays/Billboard3DOverlay.h
index d256a92afe..6b3aa40451 100644
--- a/interface/src/ui/overlays/Billboard3DOverlay.h
+++ b/interface/src/ui/overlays/Billboard3DOverlay.h
@@ -27,7 +27,9 @@ public:
     QVariant getProperty(const QString& property) override;
 
 protected:
-    virtual void applyTransformTo(Transform& transform, bool force = false) override;
+    virtual bool applyTransformTo(Transform& transform, bool force = false) override;
+
+    Transform evalRenderTransform() override;
 };
 
 #endif // hifi_Billboard3DOverlay_h
diff --git a/interface/src/ui/overlays/Billboardable.cpp b/interface/src/ui/overlays/Billboardable.cpp
index a01d62bfd1..5e912864fc 100644
--- a/interface/src/ui/overlays/Billboardable.cpp
+++ b/interface/src/ui/overlays/Billboardable.cpp
@@ -3,6 +3,7 @@
 //  interface/src/ui/overlays
 //
 //  Created by Zander Otavka on 8/7/15.
+//  Modified by Daniela Fontes on 24/10/17.
 //  Copyright 2014 High Fidelity, Inc.
 //
 //  Distributed under the Apache License, Version 2.0.
@@ -13,6 +14,7 @@
 
 #include <Application.h>
 #include <Transform.h>
+#include "avatar/AvatarManager.h"
 
 void Billboardable::setProperties(const QVariantMap& properties) {
     auto isFacingAvatar = properties["isFacingAvatar"];
@@ -28,15 +30,18 @@ QVariant Billboardable::getProperty(const QString &property) {
     return QVariant();
 }
 
-void Billboardable::pointTransformAtCamera(Transform& transform, glm::quat offsetRotation) {
+bool Billboardable::pointTransformAtCamera(Transform& transform, glm::quat offsetRotation) {
     if (isFacingAvatar()) {
         glm::vec3 billboardPos = transform.getTranslation();
         glm::vec3 cameraPos = qApp->getCamera().getPosition();
-        glm::vec3 look = cameraPos - billboardPos;
-        float elevation = -asinf(look.y / glm::length(look));
-        float azimuth = atan2f(look.x, look.z);
-        glm::quat rotation(glm::vec3(elevation, azimuth, 0));
+        // use the referencial from the avatar, y isn't always up
+        glm::vec3 avatarUP = DependencyManager::get<AvatarManager>()->getMyAvatar()->getOrientation()*Vectors::UP;
+        
+        glm::quat rotation(conjugate(toQuat(glm::lookAt(cameraPos, billboardPos, avatarUP))));
+        
         transform.setRotation(rotation);
         transform.postRotate(offsetRotation);
+        return true;
     }
+    return false;
 }
diff --git a/interface/src/ui/overlays/Billboardable.h b/interface/src/ui/overlays/Billboardable.h
index e2d29a2769..46d9ac6479 100644
--- a/interface/src/ui/overlays/Billboardable.h
+++ b/interface/src/ui/overlays/Billboardable.h
@@ -27,7 +27,7 @@ protected:
     void setProperties(const QVariantMap& properties);
     QVariant getProperty(const QString& property);
 
-    void pointTransformAtCamera(Transform& transform, glm::quat offsetRotation = {1, 0, 0, 0});
+    bool pointTransformAtCamera(Transform& transform, glm::quat offsetRotation = {1, 0, 0, 0});
 
 private:
     bool _isFacingAvatar = false;
diff --git a/interface/src/ui/overlays/Circle3DOverlay.cpp b/interface/src/ui/overlays/Circle3DOverlay.cpp
index ae0173f054..69ce331c99 100644
--- a/interface/src/ui/overlays/Circle3DOverlay.cpp
+++ b/interface/src/ui/overlays/Circle3DOverlay.cpp
@@ -59,7 +59,7 @@ Circle3DOverlay::~Circle3DOverlay() {
     }
 }
 void Circle3DOverlay::render(RenderArgs* args) {
-    if (!_visible) {
+    if (!_renderVisible) {
         return; // do nothing if we're not visible
     }
 
@@ -80,15 +80,11 @@ void Circle3DOverlay::render(RenderArgs* args) {
 
     Q_ASSERT(args->_batch);
     auto& batch = *args->_batch;
-    if (args->_pipeline) {
-        batch.setPipeline(args->_pipeline->pipeline);
+    if (args->_shapePipeline) {
+        batch.setPipeline(args->_shapePipeline->pipeline);
     }
 
-    // FIXME: THe line width of _lineWidth is not supported anymore, we ll need a workaround
-
-    auto transform = getTransform();
-    transform.postScale(glm::vec3(getDimensions(), 1.0f));
-    batch.setModelTransform(transform);
+    batch.setModelTransform(getRenderTransform());
 
     // for our overlay, is solid means we draw a ring between the inner and outer radius of the circle, otherwise
     // we just draw a line...
@@ -263,8 +259,8 @@ void Circle3DOverlay::render(RenderArgs* args) {
 }
 
 const render::ShapeKey Circle3DOverlay::getShapeKey() {
-    auto builder = render::ShapeKey::Builder().withoutCullFace().withUnlit();
-    if (getAlpha() != 1.0f) {
+    auto builder = render::ShapeKey::Builder().withoutCullFace();
+    if (isTransparent()) {
         builder.withTranslucent();
     }
     if (!getIsSolid()) {
diff --git a/interface/src/ui/overlays/ContextOverlayInterface.cpp b/interface/src/ui/overlays/ContextOverlayInterface.cpp
new file mode 100644
index 0000000000..d40c0972e9
--- /dev/null
+++ b/interface/src/ui/overlays/ContextOverlayInterface.cpp
@@ -0,0 +1,437 @@
+//
+//  ContextOverlayInterface.cpp
+//  interface/src/ui/overlays
+//
+//  Created by Zach Fox on 2017-07-14.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include "ContextOverlayInterface.h"
+#include "Application.h"
+
+#include <EntityTreeRenderer.h>
+#include <NetworkingConstants.h>
+#include <NetworkAccessManager.h>
+#include <QtNetwork/QNetworkRequest>
+#include <QtNetwork/QNetworkReply>
+#include <commerce/Ledger.h>
+
+#ifndef MIN
+#define MIN(a,b) ((a) < (b) ? (a) : (b))
+#endif
+
+static const float CONTEXT_OVERLAY_TABLET_OFFSET = 30.0f; // Degrees
+static const float CONTEXT_OVERLAY_TABLET_ORIENTATION = 210.0f; // Degrees
+static const float CONTEXT_OVERLAY_TABLET_DISTANCE = 0.65F; // Meters
+ContextOverlayInterface::ContextOverlayInterface() {
+    // "context_overlay" debug log category disabled by default.
+    // Create your own "qtlogging.ini" file and set your "QT_LOGGING_CONF" environment variable
+    // if you'd like to enable/disable certain categories.
+    // More details: http://doc.qt.io/qt-5/qloggingcategory.html#configuring-categories
+    QLoggingCategory::setFilterRules(QStringLiteral("hifi.context_overlay.debug=false"));
+
+    _entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
+    _hmdScriptingInterface = DependencyManager::get<HMDScriptingInterface>();
+    _tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
+    _selectionScriptingInterface = DependencyManager::get<SelectionScriptingInterface>();
+
+    _entityPropertyFlags += PROP_POSITION;
+    _entityPropertyFlags += PROP_ROTATION;
+    _entityPropertyFlags += PROP_MARKETPLACE_ID;
+    _entityPropertyFlags += PROP_DIMENSIONS;
+    _entityPropertyFlags += PROP_REGISTRATION_POINT;
+    _entityPropertyFlags += PROP_CERTIFICATE_ID;
+    _entityPropertyFlags += PROP_CLIENT_ONLY;
+    _entityPropertyFlags += PROP_OWNING_AVATAR_ID;
+
+    auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>().data();
+    connect(entityScriptingInterface, &EntityScriptingInterface::mousePressOnEntity, this, &ContextOverlayInterface::createOrDestroyContextOverlay);
+    connect(entityScriptingInterface, &EntityScriptingInterface::hoverEnterEntity, this, &ContextOverlayInterface::contextOverlays_hoverEnterEntity);
+    connect(entityScriptingInterface, &EntityScriptingInterface::hoverLeaveEntity, this, &ContextOverlayInterface::contextOverlays_hoverLeaveEntity);
+    connect(_tabletScriptingInterface->getTablet("com.highfidelity.interface.tablet.system"), &TabletProxy::tabletShownChanged, this, [&]() {
+        if (_contextOverlayJustClicked && _hmdScriptingInterface->isMounted()) {
+            QUuid tabletFrameID = _hmdScriptingInterface->getCurrentTabletFrameID();
+            auto myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
+            glm::quat cameraOrientation = qApp->getCamera().getOrientation();
+            QVariantMap props;
+            props.insert("position", vec3toVariant(myAvatar->getEyePosition() + glm::quat(glm::radians(glm::vec3(0.0f, CONTEXT_OVERLAY_TABLET_OFFSET, 0.0f))) * (CONTEXT_OVERLAY_TABLET_DISTANCE * (cameraOrientation * Vectors::FRONT))));
+            props.insert("orientation", quatToVariant(cameraOrientation * glm::quat(glm::radians(glm::vec3(0.0f, CONTEXT_OVERLAY_TABLET_ORIENTATION, 0.0f)))));
+            qApp->getOverlays().editOverlay(tabletFrameID, props);
+            _contextOverlayJustClicked = false;
+        }
+    });
+    connect(entityScriptingInterface, &EntityScriptingInterface::deletingEntity, this, &ContextOverlayInterface::deletingEntity);
+    connect(&qApp->getOverlays(), &Overlays::mousePressOnOverlay, this, &ContextOverlayInterface::contextOverlays_mousePressOnOverlay);
+    connect(&qApp->getOverlays(), &Overlays::hoverEnterOverlay, this, &ContextOverlayInterface::contextOverlays_hoverEnterOverlay);
+    connect(&qApp->getOverlays(), &Overlays::hoverLeaveOverlay, this, &ContextOverlayInterface::contextOverlays_hoverLeaveOverlay);
+
+    {
+        render::Transaction transaction;
+        initializeSelectionToSceneHandler(_selectionToSceneHandlers[0], "contextOverlayHighlightList", transaction);
+        for (auto i = 1; i < MAX_SELECTION_COUNT; i++) {
+            auto selectionName = QString("highlightList") + QString::number(i);
+            initializeSelectionToSceneHandler(_selectionToSceneHandlers[i], selectionName, transaction);
+        }
+        const render::ScenePointer& scene = qApp->getMain3DScene();
+        scene->enqueueTransaction(transaction);
+    }
+
+    auto nodeList = DependencyManager::get<NodeList>();
+    auto& packetReceiver = nodeList->getPacketReceiver();
+    packetReceiver.registerListener(PacketType::ChallengeOwnershipReply, this, "handleChallengeOwnershipReplyPacket");
+    _challengeOwnershipTimeoutTimer.setSingleShot(true);
+}
+
+void ContextOverlayInterface::initializeSelectionToSceneHandler(SelectionToSceneHandler& handler, const QString& selectionName, render::Transaction& transaction) {
+    handler.initialize(selectionName);
+    connect(_selectionScriptingInterface.data(), &SelectionScriptingInterface::selectedItemsListChanged, &handler, &SelectionToSceneHandler::selectedItemsListChanged);
+    transaction.resetSelectionHighlight(selectionName.toStdString());
+}
+
+static const uint32_t MOUSE_HW_ID = 0;
+static const uint32_t LEFT_HAND_HW_ID = 1;
+static const xColor CONTEXT_OVERLAY_COLOR = { 255, 255, 255 };
+static const float CONTEXT_OVERLAY_INSIDE_DISTANCE = 1.0f; // in meters
+static const float CONTEXT_OVERLAY_SIZE = 0.09f; // in meters, same x and y dims
+static const float CONTEXT_OVERLAY_OFFSET_DISTANCE = 0.1f;
+static const float CONTEXT_OVERLAY_OFFSET_ANGLE = 5.0f;
+static const float CONTEXT_OVERLAY_UNHOVERED_ALPHA = 0.85f;
+static const float CONTEXT_OVERLAY_HOVERED_ALPHA = 1.0f;
+static const float CONTEXT_OVERLAY_UNHOVERED_PULSEMIN = 0.6f;
+static const float CONTEXT_OVERLAY_UNHOVERED_PULSEMAX = 1.0f;
+static const float CONTEXT_OVERLAY_UNHOVERED_PULSEPERIOD = 1.0f;
+static const float CONTEXT_OVERLAY_UNHOVERED_COLORPULSE = 1.0f;
+
+void ContextOverlayInterface::setEnabled(bool enabled) {
+    _enabled = enabled;
+}
+
+bool ContextOverlayInterface::createOrDestroyContextOverlay(const EntityItemID& entityItemID, const PointerEvent& event) {
+    if (_enabled && event.getButton() == PointerEvent::SecondaryButton) {
+        if (contextOverlayFilterPassed(entityItemID)) {
+            if (event.getID() == MOUSE_HW_ID) {
+                enableEntityHighlight(entityItemID);
+            }
+
+            qCDebug(context_overlay) << "Creating Context Overlay on top of entity with ID: " << entityItemID;
+
+            // Add all necessary variables to the stack
+            EntityItemProperties entityProperties = _entityScriptingInterface->getEntityProperties(entityItemID, _entityPropertyFlags);
+            glm::vec3 cameraPosition = qApp->getCamera().getPosition();
+            glm::vec3 entityDimensions = entityProperties.getDimensions();
+            glm::vec3 entityPosition = entityProperties.getPosition();
+            glm::vec3 contextOverlayPosition = entityProperties.getPosition();
+            glm::vec2 contextOverlayDimensions;
+
+            // Update the position of the overlay if the registration point of the entity
+            // isn't default
+            if (entityProperties.getRegistrationPoint() != glm::vec3(0.5f)) {
+                glm::vec3 adjustPos = entityProperties.getRegistrationPoint() - glm::vec3(0.5f);
+                entityPosition = entityPosition - (entityProperties.getRotation() * (adjustPos * entityProperties.getDimensions()));
+            }
+
+            enableEntityHighlight(entityItemID);
+
+            AABox boundingBox = AABox(entityPosition - (entityDimensions / 2.0f), entityDimensions * 2.0f);
+
+            // Update the cached Entity Marketplace ID
+            _entityMarketplaceID = entityProperties.getMarketplaceID();
+
+
+            if (!_currentEntityWithContextOverlay.isNull() && _currentEntityWithContextOverlay != entityItemID) {
+                disableEntityHighlight(_currentEntityWithContextOverlay);
+            }
+
+            // Update the cached "Current Entity with Context Overlay" variable
+            setCurrentEntityWithContextOverlay(entityItemID);
+
+            // Here, we determine the position and dimensions of the Context Overlay.
+            if (boundingBox.contains(cameraPosition)) {
+                // If the camera is inside the box...
+                // ...position the Context Overlay 1 meter in front of the camera.
+                contextOverlayPosition = cameraPosition + CONTEXT_OVERLAY_INSIDE_DISTANCE * (qApp->getCamera().getOrientation() * Vectors::FRONT);
+                contextOverlayDimensions = glm::vec2(CONTEXT_OVERLAY_SIZE, CONTEXT_OVERLAY_SIZE) * glm::distance(contextOverlayPosition, cameraPosition);
+            } else {
+                // Rotate the Context Overlay some number of degrees offset from the entity
+                // along the line cast from your head to the entity's bounding box.
+                glm::vec3 direction = glm::normalize(entityPosition - cameraPosition);
+                float distance;
+                BoxFace face;
+                glm::vec3 normal;
+                boundingBox.findRayIntersection(cameraPosition, direction, distance, face, normal);
+                float offsetAngle = -CONTEXT_OVERLAY_OFFSET_ANGLE;
+                if (event.getID() == LEFT_HAND_HW_ID) {
+                    offsetAngle *= -1.0f;
+                }
+                contextOverlayPosition = cameraPosition +
+                    (glm::quat(glm::radians(glm::vec3(0.0f, offsetAngle, 0.0f)))) * (direction * (distance - CONTEXT_OVERLAY_OFFSET_DISTANCE));
+                contextOverlayDimensions = glm::vec2(CONTEXT_OVERLAY_SIZE, CONTEXT_OVERLAY_SIZE) * glm::distance(contextOverlayPosition, cameraPosition);
+            }
+
+            // Finally, setup and draw the Context Overlay
+            if (_contextOverlayID == UNKNOWN_OVERLAY_ID || !qApp->getOverlays().isAddedOverlay(_contextOverlayID)) {
+                _contextOverlay = std::make_shared<Image3DOverlay>();
+                _contextOverlay->setAlpha(CONTEXT_OVERLAY_UNHOVERED_ALPHA);
+                _contextOverlay->setPulseMin(CONTEXT_OVERLAY_UNHOVERED_PULSEMIN);
+                _contextOverlay->setPulseMax(CONTEXT_OVERLAY_UNHOVERED_PULSEMAX);
+                _contextOverlay->setColorPulse(CONTEXT_OVERLAY_UNHOVERED_COLORPULSE);
+                _contextOverlay->setIgnoreRayIntersection(false);
+                _contextOverlay->setDrawInFront(true);
+                _contextOverlay->setURL(PathUtils::resourcesPath() + "images/inspect-icon.png");
+                _contextOverlay->setIsFacingAvatar(true);
+                _contextOverlayID = qApp->getOverlays().addOverlay(_contextOverlay);
+            }
+            _contextOverlay->setPosition(contextOverlayPosition);
+            _contextOverlay->setDimensions(contextOverlayDimensions);
+            _contextOverlay->setRotation(entityProperties.getRotation());
+            _contextOverlay->setVisible(true);
+
+            return true;
+        }
+    } else {
+        if (!_currentEntityWithContextOverlay.isNull()) {
+            disableEntityHighlight(_currentEntityWithContextOverlay);
+            return destroyContextOverlay(_currentEntityWithContextOverlay, event);
+        }
+        return false;
+    }
+    return false;
+}
+
+bool ContextOverlayInterface::contextOverlayFilterPassed(const EntityItemID& entityItemID) {
+    EntityItemProperties entityProperties = _entityScriptingInterface->getEntityProperties(entityItemID, _entityPropertyFlags);
+    Setting::Handle<bool> _settingSwitch{ "commerce", false };
+    if (_settingSwitch.get()) {
+        return (entityProperties.getCertificateID().length() != 0);
+    } else {
+        return (entityProperties.getMarketplaceID().length() != 0);
+    }
+}
+
+bool ContextOverlayInterface::destroyContextOverlay(const EntityItemID& entityItemID, const PointerEvent& event) {
+    if (_contextOverlayID != UNKNOWN_OVERLAY_ID) {
+        qCDebug(context_overlay) << "Destroying Context Overlay on top of entity with ID: " << entityItemID;
+        disableEntityHighlight(entityItemID);
+        setCurrentEntityWithContextOverlay(QUuid());
+        _entityMarketplaceID.clear();
+        // Destroy the Context Overlay
+        qApp->getOverlays().deleteOverlay(_contextOverlayID);
+        _contextOverlay = NULL;
+        _contextOverlayID = UNKNOWN_OVERLAY_ID;
+        return true;
+    }
+    return false;
+}
+
+bool ContextOverlayInterface::destroyContextOverlay(const EntityItemID& entityItemID) {
+    return ContextOverlayInterface::destroyContextOverlay(entityItemID, PointerEvent());
+}
+
+void ContextOverlayInterface::contextOverlays_mousePressOnOverlay(const OverlayID& overlayID, const PointerEvent& event) {
+    if (overlayID == _contextOverlayID  && event.getButton() == PointerEvent::PrimaryButton) {
+        qCDebug(context_overlay) << "Clicked Context Overlay. Entity ID:" << _currentEntityWithContextOverlay << "Overlay ID:" << overlayID;
+        Setting::Handle<bool> _settingSwitch{ "commerce", false };
+        if (_settingSwitch.get()) {
+            openInspectionCertificate();
+        } else {
+            openMarketplace();
+        }
+        emit contextOverlayClicked(_currentEntityWithContextOverlay);
+        _contextOverlayJustClicked = true;
+    }
+}
+
+void ContextOverlayInterface::contextOverlays_hoverEnterOverlay(const OverlayID& overlayID, const PointerEvent& event) {
+    if (_contextOverlayID != UNKNOWN_OVERLAY_ID && _contextOverlay) {
+        qCDebug(context_overlay) << "Started hovering over Context Overlay. Overlay ID:" << overlayID;
+        _contextOverlay->setColor(CONTEXT_OVERLAY_COLOR);
+        _contextOverlay->setColorPulse(0.0f); // pulse off
+        _contextOverlay->setPulsePeriod(0.0f); // pulse off
+        _contextOverlay->setAlpha(CONTEXT_OVERLAY_HOVERED_ALPHA);
+    }
+}
+
+void ContextOverlayInterface::contextOverlays_hoverLeaveOverlay(const OverlayID& overlayID, const PointerEvent& event) {
+    if (_contextOverlayID != UNKNOWN_OVERLAY_ID && _contextOverlay) {
+        qCDebug(context_overlay) << "Stopped hovering over Context Overlay. Overlay ID:" << overlayID;
+        _contextOverlay->setColor(CONTEXT_OVERLAY_COLOR);
+        _contextOverlay->setColorPulse(CONTEXT_OVERLAY_UNHOVERED_COLORPULSE);
+        _contextOverlay->setPulsePeriod(CONTEXT_OVERLAY_UNHOVERED_PULSEPERIOD);
+        _contextOverlay->setAlpha(CONTEXT_OVERLAY_UNHOVERED_ALPHA);
+    }
+}
+
+void ContextOverlayInterface::contextOverlays_hoverEnterEntity(const EntityItemID& entityID, const PointerEvent& event) {
+    if (contextOverlayFilterPassed(entityID) && _enabled && event.getID() != MOUSE_HW_ID) {
+        enableEntityHighlight(entityID);
+    }
+}
+
+void ContextOverlayInterface::contextOverlays_hoverLeaveEntity(const EntityItemID& entityID, const PointerEvent& event) {
+    if (_currentEntityWithContextOverlay != entityID && _enabled && event.getID() != MOUSE_HW_ID) {
+        disableEntityHighlight(entityID);
+    }
+}
+
+static const QString INSPECTION_CERTIFICATE_QML_PATH = qApp->applicationDirPath() + "../../../qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml";
+void ContextOverlayInterface::openInspectionCertificate() {
+    // lets open the tablet to the inspection certificate QML
+    if (!_currentEntityWithContextOverlay.isNull() && _entityMarketplaceID.length() > 0) {
+        auto tablet = dynamic_cast<TabletProxy*>(_tabletScriptingInterface->getTablet("com.highfidelity.interface.tablet.system"));
+        tablet->loadQMLSource(INSPECTION_CERTIFICATE_QML_PATH);
+        _hmdScriptingInterface->openTablet();
+
+        setLastInspectedEntity(_currentEntityWithContextOverlay);
+
+        EntityItemProperties entityProperties = _entityScriptingInterface->getEntityProperties(_lastInspectedEntity, _entityPropertyFlags);
+
+        auto nodeList = DependencyManager::get<NodeList>();
+
+        if (entityProperties.getClientOnly()) {
+            if (entityProperties.verifyStaticCertificateProperties()) {
+                SharedNodePointer entityServer = nodeList->soloNodeOfType(NodeType::EntityServer);
+
+                if (entityServer) {
+                    QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
+                    QNetworkRequest networkRequest;
+                    networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
+                    networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
+                    QUrl requestURL = NetworkingConstants::METAVERSE_SERVER_URL;
+                    requestURL.setPath("/api/v1/commerce/proof_of_purchase_status/transfer");
+                    QJsonObject request;
+                    request["certificate_id"] = entityProperties.getCertificateID();
+                    networkRequest.setUrl(requestURL);
+
+                    QNetworkReply* networkReply = NULL;
+                    networkReply = networkAccessManager.put(networkRequest, QJsonDocument(request).toJson());
+
+                    connect(networkReply, &QNetworkReply::finished, [=]() {
+                        QJsonObject jsonObject = QJsonDocument::fromJson(networkReply->readAll()).object();
+                        jsonObject = jsonObject["data"].toObject();
+
+                        if (networkReply->error() == QNetworkReply::NoError) {
+                            if (!jsonObject["invalid_reason"].toString().isEmpty()) {
+                                qCDebug(entities) << "invalid_reason not empty";
+                            } else if (jsonObject["transfer_status"].toArray().first().toString() == "failed") {
+                                qCDebug(entities) << "'transfer_status' is 'failed'";
+                            } else if (jsonObject["transfer_status"].toArray().first().toString() == "pending") {
+                                qCDebug(entities) << "'transfer_status' is 'pending'";
+                            } else {
+                                QString ownerKey = jsonObject["transfer_recipient_key"].toString();
+
+                                QByteArray certID = entityProperties.getCertificateID().toUtf8();
+                                QByteArray encryptedText = DependencyManager::get<EntityTreeRenderer>()->getTree()->computeEncryptedNonce(certID, ownerKey);
+                                QByteArray nodeToChallengeByteArray = entityProperties.getOwningAvatarID().toRfc4122();
+
+                                int certIDByteArraySize = certID.length();
+                                int encryptedTextByteArraySize = encryptedText.length();
+                                int nodeToChallengeByteArraySize = nodeToChallengeByteArray.length();
+
+                                auto challengeOwnershipPacket = NLPacket::create(PacketType::ChallengeOwnershipRequest,
+                                    certIDByteArraySize + encryptedTextByteArraySize + nodeToChallengeByteArraySize + 3 * sizeof(int),
+                                    true);
+                                challengeOwnershipPacket->writePrimitive(certIDByteArraySize);
+                                challengeOwnershipPacket->writePrimitive(encryptedTextByteArraySize);
+                                challengeOwnershipPacket->writePrimitive(nodeToChallengeByteArraySize);
+                                challengeOwnershipPacket->write(certID);
+                                challengeOwnershipPacket->write(encryptedText);
+                                challengeOwnershipPacket->write(nodeToChallengeByteArray);
+                                nodeList->sendPacket(std::move(challengeOwnershipPacket), *entityServer);
+
+                                // Kickoff a 10-second timeout timer that marks the cert if we don't get an ownership response in time
+                                if (thread() != QThread::currentThread()) {
+                                    QMetaObject::invokeMethod(this, "startChallengeOwnershipTimer");
+                                    return;
+                                } else {
+                                    startChallengeOwnershipTimer();
+                                }
+                            }
+                        } else {
+                            qCDebug(entities) << "Call to" << networkReply->url() << "failed with error" << networkReply->error() <<
+                                "More info:" << networkReply->readAll();
+                        }
+
+                        networkReply->deleteLater();
+                    });
+                } else {
+                    qCWarning(context_overlay) << "Couldn't get Entity Server!";
+                }
+            } else {
+                auto ledger = DependencyManager::get<Ledger>();
+                _challengeOwnershipTimeoutTimer.stop();
+                emit ledger->updateCertificateStatus(entityProperties.getCertificateID(), (uint)(ledger->CERTIFICATE_STATUS_STATIC_VERIFICATION_FAILED));
+                qCDebug(context_overlay) << "Entity" << _lastInspectedEntity << "failed static certificate verification!";
+            }
+        }
+    }
+}
+
+static const QString MARKETPLACE_BASE_URL = NetworkingConstants::METAVERSE_SERVER_URL.toString() + "/marketplace/items/";
+
+void ContextOverlayInterface::openMarketplace() {
+    // lets open the tablet and go to the current item in
+    // the marketplace (if the current entity has a
+    // marketplaceID)
+    if (!_currentEntityWithContextOverlay.isNull() && _entityMarketplaceID.length() > 0) {
+        auto tablet = dynamic_cast<TabletProxy*>(_tabletScriptingInterface->getTablet("com.highfidelity.interface.tablet.system"));
+        // construct the url to the marketplace item
+        QString url = MARKETPLACE_BASE_URL + _entityMarketplaceID;
+        QString MARKETPLACES_INJECT_SCRIPT_PATH = "file:///" + qApp->applicationDirPath() + "/scripts/system/html/js/marketplacesInject.js";
+        tablet->gotoWebScreen(url, MARKETPLACES_INJECT_SCRIPT_PATH);
+        _hmdScriptingInterface->openTablet();
+        _isInMarketplaceInspectionMode = true;
+    }
+}
+
+void ContextOverlayInterface::enableEntityHighlight(const EntityItemID& entityItemID) {
+    _selectionScriptingInterface->addToSelectedItemsList("contextOverlayHighlightList", "entity", entityItemID);
+}
+
+void ContextOverlayInterface::disableEntityHighlight(const EntityItemID& entityItemID) {
+    _selectionScriptingInterface->removeFromSelectedItemsList("contextOverlayHighlightList", "entity", entityItemID);
+}
+
+void ContextOverlayInterface::deletingEntity(const EntityItemID& entityID) {
+    if (_currentEntityWithContextOverlay == entityID) {
+        destroyContextOverlay(_currentEntityWithContextOverlay, PointerEvent());
+    }
+}
+
+void ContextOverlayInterface::startChallengeOwnershipTimer() {
+    auto ledger = DependencyManager::get<Ledger>();
+    EntityItemProperties entityProperties = _entityScriptingInterface->getEntityProperties(_lastInspectedEntity, _entityPropertyFlags);
+
+    connect(&_challengeOwnershipTimeoutTimer, &QTimer::timeout, this, [=]() {
+        qCDebug(entities) << "Ownership challenge timed out for" << _lastInspectedEntity;
+        emit ledger->updateCertificateStatus(entityProperties.getCertificateID(), (uint)(ledger->CERTIFICATE_STATUS_VERIFICATION_TIMEOUT));
+    });
+
+    _challengeOwnershipTimeoutTimer.start(5000);
+}
+
+void ContextOverlayInterface::handleChallengeOwnershipReplyPacket(QSharedPointer<ReceivedMessage> packet, SharedNodePointer sendingNode) {
+    auto ledger = DependencyManager::get<Ledger>();
+
+    _challengeOwnershipTimeoutTimer.stop();
+
+    int certIDByteArraySize;
+    int decryptedTextByteArraySize;
+
+    packet->readPrimitive(&certIDByteArraySize);
+    packet->readPrimitive(&decryptedTextByteArraySize);
+
+    QString certID(packet->read(certIDByteArraySize));
+    QString decryptedText(packet->read(decryptedTextByteArraySize));
+
+    EntityItemID id;
+    bool verificationSuccess = DependencyManager::get<EntityTreeRenderer>()->getTree()->verifyDecryptedNonce(certID, decryptedText, id);
+
+    if (verificationSuccess) {
+        emit ledger->updateCertificateStatus(certID, (uint)(ledger->CERTIFICATE_STATUS_VERIFICATION_SUCCESS));
+    } else {
+        emit ledger->updateCertificateStatus(certID, (uint)(ledger->CERTIFICATE_STATUS_OWNER_VERIFICATION_FAILED));
+    }
+}
diff --git a/interface/src/ui/overlays/ContextOverlayInterface.h b/interface/src/ui/overlays/ContextOverlayInterface.h
new file mode 100644
index 0000000000..81e398e15d
--- /dev/null
+++ b/interface/src/ui/overlays/ContextOverlayInterface.h
@@ -0,0 +1,107 @@
+//
+//  ContextOverlayInterface.h
+//  interface/src/ui/overlays
+//
+//  Created by Zach Fox on 2017-07-14.
+//  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
+//
+
+#pragma once
+#ifndef hifi_ContextOverlayInterface_h
+#define hifi_ContextOverlayInterface_h
+
+#include <QtCore/QObject>
+#include <QUuid>
+
+#include <DependencyManager.h>
+#include <PointerEvent.h>
+#include <ui/TabletScriptingInterface.h>
+#include "avatar/AvatarManager.h"
+
+#include "EntityScriptingInterface.h"
+#include "ui/overlays/Image3DOverlay.h"
+#include "ui/overlays/Overlays.h"
+#include "scripting/HMDScriptingInterface.h"
+#include "scripting/SelectionScriptingInterface.h"
+
+#include "EntityTree.h"
+#include "ContextOverlayLogging.h"
+
+/**jsdoc
+* @namespace ContextOverlay
+*/
+class ContextOverlayInterface : public QObject, public Dependency  {
+    Q_OBJECT
+
+    Q_PROPERTY(QUuid entityWithContextOverlay READ getCurrentEntityWithContextOverlay WRITE setCurrentEntityWithContextOverlay)
+    Q_PROPERTY(bool enabled READ getEnabled WRITE setEnabled)
+    Q_PROPERTY(bool isInMarketplaceInspectionMode READ getIsInMarketplaceInspectionMode WRITE setIsInMarketplaceInspectionMode)
+    QSharedPointer<EntityScriptingInterface> _entityScriptingInterface;
+    EntityPropertyFlags _entityPropertyFlags;
+    QSharedPointer<HMDScriptingInterface> _hmdScriptingInterface;
+    QSharedPointer<TabletScriptingInterface> _tabletScriptingInterface;
+    QSharedPointer<SelectionScriptingInterface> _selectionScriptingInterface;
+    OverlayID _contextOverlayID { UNKNOWN_OVERLAY_ID };
+    std::shared_ptr<Image3DOverlay> _contextOverlay { nullptr };
+public:
+
+    ContextOverlayInterface();
+
+    Q_INVOKABLE QUuid getCurrentEntityWithContextOverlay() { return _currentEntityWithContextOverlay; }
+    void setCurrentEntityWithContextOverlay(const QUuid& entityID) { _currentEntityWithContextOverlay = entityID; }
+    void setLastInspectedEntity(const QUuid& entityID) { _challengeOwnershipTimeoutTimer.stop(); _lastInspectedEntity = entityID; }
+    void setEnabled(bool enabled);
+    bool getEnabled() { return _enabled; }
+    bool getIsInMarketplaceInspectionMode() { return _isInMarketplaceInspectionMode; }
+    void setIsInMarketplaceInspectionMode(bool mode) { _isInMarketplaceInspectionMode = mode; }
+
+signals:
+    void contextOverlayClicked(const QUuid& currentEntityWithContextOverlay);
+
+public slots:
+    bool createOrDestroyContextOverlay(const EntityItemID& entityItemID, const PointerEvent& event);
+    bool destroyContextOverlay(const EntityItemID& entityItemID, const PointerEvent& event);
+    bool destroyContextOverlay(const EntityItemID& entityItemID);
+    void contextOverlays_mousePressOnOverlay(const OverlayID& overlayID, const PointerEvent& event);
+    void contextOverlays_hoverEnterOverlay(const OverlayID& overlayID, const PointerEvent& event);
+    void contextOverlays_hoverLeaveOverlay(const OverlayID& overlayID, const PointerEvent& event);
+    void contextOverlays_hoverEnterEntity(const EntityItemID& entityID, const PointerEvent& event);
+    void contextOverlays_hoverLeaveEntity(const EntityItemID& entityID, const PointerEvent& event);
+    bool contextOverlayFilterPassed(const EntityItemID& entityItemID);
+
+private slots:
+    void handleChallengeOwnershipReplyPacket(QSharedPointer<ReceivedMessage> packet, SharedNodePointer sendingNode);
+
+private:
+
+    enum {
+        MAX_SELECTION_COUNT = 16
+    };
+
+    bool _verboseLogging { true };
+    bool _enabled { true };
+    EntityItemID _currentEntityWithContextOverlay{};
+    EntityItemID _lastInspectedEntity{};
+    QString _entityMarketplaceID;
+    bool _contextOverlayJustClicked { false };
+
+    bool _isInMarketplaceInspectionMode { false };
+
+    void openInspectionCertificate();
+    void openMarketplace();
+    void enableEntityHighlight(const EntityItemID& entityItemID);
+    void disableEntityHighlight(const EntityItemID& entityItemID);
+
+    void deletingEntity(const EntityItemID& entityItemID);
+    void initializeSelectionToSceneHandler(SelectionToSceneHandler& handler, const QString& selectionName, render::Transaction& transaction);
+
+    SelectionToSceneHandler _selectionToSceneHandlers[MAX_SELECTION_COUNT];
+
+    Q_INVOKABLE void startChallengeOwnershipTimer();
+    QTimer _challengeOwnershipTimeoutTimer;
+};
+
+#endif // hifi_ContextOverlayInterface_h
diff --git a/interface/src/ui/overlays/ContextOverlayLogging.cpp b/interface/src/ui/overlays/ContextOverlayLogging.cpp
new file mode 100644
index 0000000000..c2c3fb7734
--- /dev/null
+++ b/interface/src/ui/overlays/ContextOverlayLogging.cpp
@@ -0,0 +1,14 @@
+//
+//  ContextOverlayLogging.cpp
+//  interface/src/ui/overlays
+//
+//  Created by Zach Fox on 2017-07-17
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include "ContextOverlayLogging.h"
+
+Q_LOGGING_CATEGORY(context_overlay, "hifi.context_overlay")
diff --git a/interface/src/ui/overlays/ContextOverlayLogging.h b/interface/src/ui/overlays/ContextOverlayLogging.h
new file mode 100644
index 0000000000..182ebc1425
--- /dev/null
+++ b/interface/src/ui/overlays/ContextOverlayLogging.h
@@ -0,0 +1,20 @@
+//
+//  ContextOverlayLogging.h
+//  interface/src/ui/overlays
+//
+//  Created by Zach Fox on 2017-07-17
+//  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
+//
+
+#pragma once
+#ifndef hifi_ContextOverlayLogging_h
+#define hifi_ContextOverlayLogging_h
+
+#include <QLoggingCategory>
+
+Q_DECLARE_LOGGING_CATEGORY(context_overlay)
+
+#endif // hifi_ContextOverlayLogging_h
diff --git a/interface/src/ui/overlays/Cube3DOverlay.cpp b/interface/src/ui/overlays/Cube3DOverlay.cpp
index 707aabc241..caa9a1b397 100644
--- a/interface/src/ui/overlays/Cube3DOverlay.cpp
+++ b/interface/src/ui/overlays/Cube3DOverlay.cpp
@@ -44,7 +44,7 @@ Cube3DOverlay::~Cube3DOverlay() {
 }
 
 void Cube3DOverlay::render(RenderArgs* args) {
-    if (!_visible) {
+    if (!_renderVisible) {
         return; // do nothing if we're not visible
     }
 
@@ -53,30 +53,24 @@ void Cube3DOverlay::render(RenderArgs* args) {
     const float MAX_COLOR = 255.0f;
     glm::vec4 cubeColor(color.red / MAX_COLOR, color.green / MAX_COLOR, color.blue / MAX_COLOR, alpha);
 
-    // TODO: handle registration point??
-    glm::vec3 position = getPosition();
-    glm::vec3 dimensions = getDimensions();
-    glm::quat rotation = getRotation();
+
 
     auto batch = args->_batch;
-
     if (batch) {
-        Transform transform;
-        transform.setTranslation(position);
-        transform.setRotation(rotation);
+        Transform transform = getRenderTransform();
         auto geometryCache = DependencyManager::get<GeometryCache>();
-        auto pipeline = args->_pipeline;
-        if (!pipeline) {
-            pipeline = _isSolid ? geometryCache->getOpaqueShapePipeline() : geometryCache->getWireShapePipeline();
+        auto shapePipeline = args->_shapePipeline;
+        if (!shapePipeline) {
+            shapePipeline = _isSolid ? geometryCache->getOpaqueShapePipeline() : geometryCache->getWireShapePipeline();
         }
 
         if (_isSolid) {
-            transform.setScale(dimensions);
             batch->setModelTransform(transform);
-            geometryCache->renderSolidCubeInstance(args, *batch, cubeColor, pipeline);
+            geometryCache->renderSolidCubeInstance(args, *batch, cubeColor, shapePipeline);
         } else {
             geometryCache->bindSimpleProgram(*batch, false, false, false, true, true);
             if (getIsDashedLine()) {
+                auto dimensions = transform.getScale();
                 transform.setScale(1.0f);
                 batch->setModelTransform(transform);
 
@@ -107,9 +101,8 @@ void Cube3DOverlay::render(RenderArgs* args) {
                 geometryCache->renderDashedLine(*batch, bottomRightFar, topRightFar, cubeColor, _geometryIds[11]);
 
             } else {
-                transform.setScale(dimensions);
                 batch->setModelTransform(transform);
-                geometryCache->renderWireCubeInstance(args, *batch, cubeColor, pipeline);
+                geometryCache->renderWireCubeInstance(args, *batch, cubeColor, shapePipeline);
             }
         }
     }
@@ -117,7 +110,7 @@ void Cube3DOverlay::render(RenderArgs* args) {
 
 const render::ShapeKey Cube3DOverlay::getShapeKey() {
     auto builder = render::ShapeKey::Builder();
-    if (getAlpha() != 1.0f) {
+    if (isTransparent()) {
         builder.withTranslucent();
     }
     if (!getIsSolid()) {
@@ -148,3 +141,16 @@ QVariant Cube3DOverlay::getProperty(const QString& property) {
 
     return Volume3DOverlay::getProperty(property);
 }
+
+Transform Cube3DOverlay::evalRenderTransform() {
+    // TODO: handle registration point??
+    glm::vec3 position = getPosition();
+    glm::vec3 dimensions = getDimensions();
+    glm::quat rotation = getRotation();
+
+    Transform transform;
+    transform.setScale(dimensions);
+    transform.setTranslation(position);
+    transform.setRotation(rotation);
+    return transform;
+}
diff --git a/interface/src/ui/overlays/Cube3DOverlay.h b/interface/src/ui/overlays/Cube3DOverlay.h
index 9289af4de5..e7b58ad911 100644
--- a/interface/src/ui/overlays/Cube3DOverlay.h
+++ b/interface/src/ui/overlays/Cube3DOverlay.h
@@ -36,6 +36,9 @@ public:
     void setProperties(const QVariantMap& properties) override;
     QVariant getProperty(const QString& property) override;
 
+protected:
+    Transform evalRenderTransform() override;
+
 private:
     float _borderSize;
     // edges on a cube
diff --git a/interface/src/ui/overlays/Grid3DOverlay.cpp b/interface/src/ui/overlays/Grid3DOverlay.cpp
index 1c2b4c162d..6fd132b531 100644
--- a/interface/src/ui/overlays/Grid3DOverlay.cpp
+++ b/interface/src/ui/overlays/Grid3DOverlay.cpp
@@ -53,7 +53,7 @@ AABox Grid3DOverlay::getBounds() const {
 }
 
 void Grid3DOverlay::render(RenderArgs* args) {
-    if (!_visible) {
+    if (!_renderVisible) {
         return; // do nothing if we're not visible
     }
 
@@ -79,9 +79,7 @@ void Grid3DOverlay::render(RenderArgs* args) {
             position += glm::vec3(cameraPosition.x, 0.0f, cameraPosition.z);
         }
 
-        Transform transform;
-        transform.setRotation(getRotation());
-        transform.setScale(glm::vec3(getDimensions(), 1.0f));
+        Transform transform = getRenderTransform();
         transform.setTranslation(position);
         batch->setModelTransform(transform);
         const float MINOR_GRID_EDGE = 0.0025f;
@@ -145,3 +143,10 @@ void Grid3DOverlay::updateGrid() {
     _minorGridRowDivisions = getDimensions().x / _minorGridEvery;
     _minorGridColDivisions = getDimensions().y / _minorGridEvery;
 }
+
+Transform Grid3DOverlay::evalRenderTransform() {
+    Transform transform;
+    transform.setRotation(getRotation());
+    transform.setScale(glm::vec3(getDimensions(), 1.0f));
+    return transform;
+}
diff --git a/interface/src/ui/overlays/Grid3DOverlay.h b/interface/src/ui/overlays/Grid3DOverlay.h
index 0d042af6ca..5a67b21e07 100644
--- a/interface/src/ui/overlays/Grid3DOverlay.h
+++ b/interface/src/ui/overlays/Grid3DOverlay.h
@@ -37,6 +37,9 @@ public:
     // Grids are UI tools, and may not be intersected (pickable)
     virtual bool findRayIntersection(const glm::vec3&, const glm::vec3&, float&, BoxFace&, glm::vec3&) override { return false; }
 
+protected:
+    Transform evalRenderTransform() override;
+
 private:
     void updateGrid();
 
diff --git a/interface/src/ui/overlays/Image3DOverlay.cpp b/interface/src/ui/overlays/Image3DOverlay.cpp
index 3e0bb74bc4..a8ae293c83 100644
--- a/interface/src/ui/overlays/Image3DOverlay.cpp
+++ b/interface/src/ui/overlays/Image3DOverlay.cpp
@@ -19,6 +19,7 @@
 
 #include "GeometryUtil.h"
 
+#include "AbstractViewStateInterface.h"
 
 QString const Image3DOverlay::TYPE = "image3d";
 
@@ -45,21 +46,38 @@ Image3DOverlay::~Image3DOverlay() {
 }
 
 void Image3DOverlay::update(float deltatime) {
+    if (!_isLoaded) {
+        _isLoaded = true;
+        _texture = DependencyManager::get<TextureCache>()->getTexture(_url);
+        _textureIsLoaded = false;
+    }
     if (usecTimestampNow() > _transformExpiry) {
         Transform transform = getTransform();
         applyTransformTo(transform);
         setTransform(transform);
     }
+    Parent::update(deltatime);
 }
 
 void Image3DOverlay::render(RenderArgs* args) {
-    if (!_isLoaded) {
-        _isLoaded = true;
-        _texture = DependencyManager::get<TextureCache>()->getTexture(_url);
+    if (!_renderVisible || !getParentVisible() || !_texture || !_texture->isLoaded()) {
+        return;
     }
 
-    if (!_visible || !getParentVisible() || !_texture || !_texture->isLoaded()) {
-        return;
+    // Once the texture has loaded, check if we need to update the render item because of transparency
+    if (!_textureIsLoaded && _texture && _texture->getGPUTexture()) {
+        _textureIsLoaded = true;
+        bool prevAlphaTexture = _alphaTexture;
+        _alphaTexture = _texture->getGPUTexture()->getUsage().isAlpha();
+        if (_alphaTexture != prevAlphaTexture) {
+            auto itemID = getRenderItemID();
+            if (render::Item::isValidID(itemID)) {
+                render::ScenePointer scene = AbstractViewStateInterface::instance()->getMain3DScene();
+                render::Transaction transaction;
+                transaction.updateItem(itemID);
+                scene->enqueueTransaction(transaction);
+            }
+        }
     }
 
     Q_ASSERT(args->_batch);
@@ -90,20 +108,15 @@ void Image3DOverlay::render(RenderArgs* args) {
 
     glm::vec2 topLeft(-x, -y);
     glm::vec2 bottomRight(x, y);
-    glm::vec2 texCoordTopLeft(fromImage.x() / imageWidth, fromImage.y() / imageHeight);
-    glm::vec2 texCoordBottomRight((fromImage.x() + fromImage.width()) / imageWidth,
-                                  (fromImage.y() + fromImage.height()) / imageHeight);
+    glm::vec2 texCoordTopLeft((fromImage.x() + 0.5f) / imageWidth, (fromImage.y() + 0.5f) / imageHeight);
+    glm::vec2 texCoordBottomRight((fromImage.x() + fromImage.width() - 0.5f) / imageWidth,
+                                  (fromImage.y() + fromImage.height() - 0.5f) / imageHeight);
 
     const float MAX_COLOR = 255.0f;
     xColor color = getColor();
     float alpha = getAlpha();
 
-    Transform transform = getTransform();
-    applyTransformTo(transform, true);
-    setTransform(transform);
-    transform.postScale(glm::vec3(getDimensions(), 1.0f));
-
-    batch->setModelTransform(transform);
+    batch->setModelTransform(getRenderTransform());
     batch->setResourceTexture(0, _texture->getGPUTexture());
 
     DependencyManager::get<GeometryCache>()->renderQuad(
@@ -120,7 +133,7 @@ const render::ShapeKey Image3DOverlay::getShapeKey() {
     if (_emissive) {
         builder.withUnlit();
     }
-    if (getAlpha() != 1.0f) {
+    if (isTransparent()) {
         builder.withTranslucent();
     }
     return builder.build();
@@ -225,3 +238,9 @@ bool Image3DOverlay::findRayIntersection(const glm::vec3& origin, const glm::vec
 Image3DOverlay* Image3DOverlay::createClone() const {
     return new Image3DOverlay(this);
 }
+
+Transform Image3DOverlay::evalRenderTransform() {
+    auto transform = Parent::evalRenderTransform();
+    transform.postScale(glm::vec3(getDimensions(), 1.0f));
+    return transform;
+}
diff --git a/interface/src/ui/overlays/Image3DOverlay.h b/interface/src/ui/overlays/Image3DOverlay.h
index 2e5f74749c..aa802a82a9 100644
--- a/interface/src/ui/overlays/Image3DOverlay.h
+++ b/interface/src/ui/overlays/Image3DOverlay.h
@@ -19,6 +19,7 @@
 
 class Image3DOverlay : public Billboard3DOverlay {
     Q_OBJECT
+    using Parent = Billboard3DOverlay;
 
 public:
     static QString const TYPE;
@@ -39,15 +40,21 @@ public:
 
     void setProperties(const QVariantMap& properties) override;
     QVariant getProperty(const QString& property) override;
+    bool isTransparent() override { return Base3DOverlay::isTransparent() || _alphaTexture; }
 
     virtual bool findRayIntersection(const glm::vec3& origin, const glm::vec3& direction, float& distance, 
                                         BoxFace& face, glm::vec3& surfaceNormal) override;
 
     virtual Image3DOverlay* createClone() const override;
 
+protected:
+    Transform evalRenderTransform() override;
+
 private:
     QString _url;
     NetworkTexturePointer _texture;
+    bool _textureIsLoaded { false };
+    bool _alphaTexture { false };
     bool _emissive { false };
 
     QRect _fromImage; // where from in the image to sample
diff --git a/interface/src/ui/overlays/Line3DOverlay.cpp b/interface/src/ui/overlays/Line3DOverlay.cpp
index 900c79fc3f..d59e382613 100644
--- a/interface/src/ui/overlays/Line3DOverlay.cpp
+++ b/interface/src/ui/overlays/Line3DOverlay.cpp
@@ -13,6 +13,7 @@
 #include <GeometryCache.h>
 #include <RegisteredMetaTypes.h>
 
+#include "AbstractViewStateInterface.h"
 
 QString const Line3DOverlay::TYPE = "line3d";
 
@@ -32,6 +33,8 @@ Line3DOverlay::Line3DOverlay(const Line3DOverlay* line3DOverlay) :
     _length = line3DOverlay->getLength();
     _endParentID = line3DOverlay->getEndParentID();
     _endParentJointIndex = line3DOverlay->getEndJointIndex();
+    _lineWidth = line3DOverlay->getLineWidth();
+    _glow = line3DOverlay->getGlow();
 }
 
 Line3DOverlay::~Line3DOverlay() {
@@ -93,6 +96,7 @@ void Line3DOverlay::setEnd(const glm::vec3& end) {
     } else {
         _direction = glm::vec3(0.0f);
     }
+    notifyRenderVariableChange();
 }
 
 void Line3DOverlay::setLocalEnd(const glm::vec3& localEnd) {
@@ -119,7 +123,7 @@ AABox Line3DOverlay::getBounds() const {
 }
 
 void Line3DOverlay::render(RenderArgs* args) {
-    if (!_visible) {
+    if (!_renderVisible) {
         return; // do nothing if we're not visible
     }
 
@@ -130,26 +134,25 @@ void Line3DOverlay::render(RenderArgs* args) {
     auto batch = args->_batch;
     if (batch) {
         batch->setModelTransform(Transform());
-        glm::vec3 start = getStart();
-        glm::vec3 end = getEnd();
+        auto& renderTransform = getRenderTransform();
+        glm::vec3 start = renderTransform.getTranslation();
+        glm::vec3 end = renderTransform.transform(vec3(0.0, 0.0, -1.0));
 
         auto geometryCache = DependencyManager::get<GeometryCache>();
         if (getIsDashedLine()) {
             // TODO: add support for color to renderDashedLine()
             geometryCache->bindSimpleProgram(*batch, false, false, false, true, true);
             geometryCache->renderDashedLine(*batch, start, end, colorv4, _geometryCacheID);
-        } else if (_glow > 0.0f) {
-            geometryCache->renderGlowLine(*batch, start, end, colorv4, _glow, _glowWidth, _geometryCacheID);
         } else {
-            geometryCache->bindSimpleProgram(*batch, false, false, false, true, true);
-            geometryCache->renderLine(*batch, start, end, colorv4, _geometryCacheID);
+            // renderGlowLine handles both glow = 0 and glow > 0 cases
+            geometryCache->renderGlowLine(*batch, start, end, colorv4, _glow, _lineWidth, _geometryCacheID);
         }
     }
 }
 
 const render::ShapeKey Line3DOverlay::getShapeKey() {
     auto builder = render::ShapeKey::Builder().withOwnPipeline();
-    if (getAlpha() != 1.0f || _glow > 0.0f) {
+    if (isTransparent()) {
         builder.withTranslucent();
     }
     return builder.build();
@@ -222,17 +225,24 @@ void Line3DOverlay::setProperties(const QVariantMap& originalProperties) {
 
     auto glow = properties["glow"];
     if (glow.isValid()) {
+        float prevGlow = _glow;
         setGlow(glow.toFloat());
-        if (_glow > 0.0f) {
-            _alpha = 0.5f;
+        // Update our payload key if necessary to handle transparency
+        if ((prevGlow <= 0.0f && _glow > 0.0f) || (prevGlow > 0.0f && _glow <= 0.0f)) {
+            auto itemID = getRenderItemID();
+            if (render::Item::isValidID(itemID)) {
+                render::ScenePointer scene = AbstractViewStateInterface::instance()->getMain3DScene();
+                render::Transaction transaction;
+                transaction.updateItem(itemID);
+                scene->enqueueTransaction(transaction);
+            }
         }
     }
 
-    auto glowWidth = properties["glow"];
-    if (glowWidth.isValid()) {
-        setGlow(glowWidth.toFloat());
+    auto lineWidth = properties["lineWidth"];
+    if (lineWidth.isValid()) {
+        setLineWidth(lineWidth.toFloat());
     }
-
 }
 
 QVariant Line3DOverlay::getProperty(const QString& property) {
@@ -251,6 +261,9 @@ QVariant Line3DOverlay::getProperty(const QString& property) {
     if (property == "length") {
         return QVariant(getLength());
     }
+    if (property == "lineWidth") {
+        return _lineWidth;
+    }
 
     return Base3DOverlay::getProperty(property);
 }
@@ -258,3 +271,22 @@ QVariant Line3DOverlay::getProperty(const QString& property) {
 Line3DOverlay* Line3DOverlay::createClone() const {
     return new Line3DOverlay(this);
 }
+
+Transform Line3DOverlay::evalRenderTransform() {
+    // Capture start and endin the renderTransform:
+    // start is the origin
+    // end is at the tip of the front axis aka -Z
+    Transform transform;
+    transform.setTranslation( getStart());
+    auto endPos = getEnd();
+
+    auto vec = endPos - transform.getTranslation();
+    const float MIN_LINE_LENGTH = 0.0001f;
+    auto scale = glm::max(glm::length(vec), MIN_LINE_LENGTH);
+    auto dir = vec / scale;
+    auto orientation = glm::rotation(glm::vec3(0.0f, 0.0f, -1.0f), dir);
+    transform.setRotation(orientation);
+    transform.setScale(scale);
+
+    return transform;
+}
diff --git a/interface/src/ui/overlays/Line3DOverlay.h b/interface/src/ui/overlays/Line3DOverlay.h
index c9ceac55a9..79af937f23 100644
--- a/interface/src/ui/overlays/Line3DOverlay.h
+++ b/interface/src/ui/overlays/Line3DOverlay.h
@@ -15,6 +15,7 @@
 
 class Line3DOverlay : public Base3DOverlay {
     Q_OBJECT
+    using Parent = Base3DOverlay;
 
 public:
     static QString const TYPE;
@@ -30,8 +31,8 @@ public:
     // getters
     glm::vec3 getStart() const;
     glm::vec3 getEnd() const;
+    const float& getLineWidth() const { return _lineWidth; }
     const float& getGlow() const { return _glow; }
-    const float& getGlowWidth() const { return _glowWidth; }
 
     // setters
     void setStart(const glm::vec3& start);
@@ -40,11 +41,12 @@ public:
     void setLocalStart(const glm::vec3& localStart) { setLocalPosition(localStart); }
     void setLocalEnd(const glm::vec3& localEnd);
 
+    void setLineWidth(const float& lineWidth) { _lineWidth = lineWidth; }
     void setGlow(const float& glow) { _glow = glow; }
-    void setGlowWidth(const float& glowWidth) { _glowWidth = glowWidth; }
 
     void setProperties(const QVariantMap& properties) override;
     QVariant getProperty(const QString& property) override;
+    bool isTransparent() override { return Base3DOverlay::isTransparent() || _glow > 0.0f; }
 
     virtual Line3DOverlay* createClone() const override;
 
@@ -55,6 +57,9 @@ public:
     QUuid getEndParentID() const { return _endParentID; }
     quint16 getEndJointIndex() const { return _endParentJointIndex; }
 
+protected:
+    Transform evalRenderTransform() override;
+
 private:
     QUuid _endParentID;
     quint16 _endParentJointIndex { INVALID_JOINT_INDEX };
@@ -65,8 +70,9 @@ private:
     glm::vec3 _direction; // in parent frame
     float _length { 1.0 }; // in parent frame
 
+    const float DEFAULT_LINE_WIDTH = 0.02f;
+    float _lineWidth { DEFAULT_LINE_WIDTH };
     float _glow { 0.0 };
-    float _glowWidth { 0.0 };
     int _geometryCacheID;
 };
 
diff --git a/interface/src/ui/overlays/ModelOverlay.cpp b/interface/src/ui/overlays/ModelOverlay.cpp
index 0bed07891e..2a13249958 100644
--- a/interface/src/ui/overlays/ModelOverlay.cpp
+++ b/interface/src/ui/overlays/ModelOverlay.cpp
@@ -9,6 +9,9 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include <glm/gtx/quaternion.hpp>
+#include <glm/gtx/transform.hpp>
+
 #include "ModelOverlay.h"
 #include <Rig.h>
 
@@ -46,19 +49,49 @@ void ModelOverlay::update(float deltatime) {
     if (_updateModel) {
         _updateModel = false;
         _model->setSnapModelToCenter(true);
+        Transform transform = evalRenderTransform();
         if (_scaleToFit) {
-            _model->setScaleToFit(true, getScale() * getDimensions());
+            _model->setScaleToFit(true, transform.getScale() * getDimensions());
         } else {
-            _model->setScale(getScale());
+            _model->setScale(transform.getScale());
         }
-        _model->setRotation(getRotation());
-        _model->setTranslation(getPosition());
+        _model->setRotation(transform.getRotation());
+        _model->setTranslation(transform.getTranslation());
         _model->setURL(_url);
         _model->simulate(deltatime, true);
     } else {
         _model->simulate(deltatime);
     }
     _isLoaded = _model->isActive();
+
+    if (isAnimatingSomething()) {
+        if (!jointsMapped()) {
+            mapAnimationJoints(_model->getJointNames());
+        }
+        animate();
+    }
+
+    // check to see if when we added our model to the scene they were ready, if they were not ready, then
+    // fix them up in the scene
+    render::ScenePointer scene = qApp->getMain3DScene();
+    render::Transaction transaction;
+    if (_model->needsFixupInScene()) {
+        _model->removeFromScene(scene, transaction);
+        _model->addToScene(scene, transaction);
+    }
+    if (_visibleDirty) {
+        _visibleDirty = false;
+        _model->setVisibleInScene(getVisible(), scene);
+    }
+    if (_drawInFrontDirty) {
+        _drawInFrontDirty = false;
+        _model->setLayeredInFront(getDrawInFront(), scene);
+    }
+    if (_drawInHUDDirty) {
+        _drawInHUDDirty = false;
+        _model->setLayeredInHUD(getDrawHUDLayer(), scene);
+    }
+    scene->enqueueTransaction(transaction);
 }
 
 bool ModelOverlay::addToScene(Overlay::Pointer overlay, const render::ScenePointer& scene, render::Transaction& transaction) {
@@ -72,34 +105,32 @@ void ModelOverlay::removeFromScene(Overlay::Pointer overlay, const render::Scene
     _model->removeFromScene(scene, transaction);
 }
 
-void ModelOverlay::render(RenderArgs* args) {
+void ModelOverlay::setVisible(bool visible) {
+    Overlay::setVisible(visible);
+    _visibleDirty = true;
+}
 
-    // check to see if when we added our model to the scene they were ready, if they were not ready, then
-    // fix them up in the scene
-    render::ScenePointer scene = qApp->getMain3DScene();
-    render::Transaction transaction;
-    if (_model->needsFixupInScene()) {
-        _model->removeFromScene(scene, transaction);
-        _model->addToScene(scene, transaction);
-    }
+void ModelOverlay::setDrawInFront(bool drawInFront) {
+    Base3DOverlay::setDrawInFront(drawInFront);
+    _drawInFrontDirty = true;
+}
 
-    _model->setVisibleInScene(_visible, scene);
-    _model->setLayeredInFront(getDrawInFront(), scene);
-
-    scene->enqueueTransaction(transaction);
+void ModelOverlay::setDrawHUDLayer(bool drawHUDLayer) {
+    Base3DOverlay::setDrawHUDLayer(drawHUDLayer);
+    _drawInHUDDirty = true;
 }
 
 void ModelOverlay::setProperties(const QVariantMap& properties) {
     auto origPosition = getPosition();
     auto origRotation = getRotation();
     auto origDimensions = getDimensions();
-    auto origScale = getScale();
+    auto origScale = getSNScale();
 
     Base3DOverlay::setProperties(properties);
 
     auto scale = properties["scale"];
     if (scale.isValid()) {
-        setScale(vec3FromVariant(scale));
+        setSNScale(vec3FromVariant(scale));
     }
 
     auto dimensions = properties["dimensions"];
@@ -112,7 +143,7 @@ void ModelOverlay::setProperties(const QVariantMap& properties) {
         _scaleToFit = false;
     }
 
-    if (origPosition != getPosition() || origRotation != getRotation() || origDimensions != getDimensions() || origScale != getScale()) {
+    if (origPosition != getPosition() || origRotation != getRotation() || origDimensions != getDimensions() || origScale != getSNScale()) {
         _updateModel = true;
     }
 
@@ -171,6 +202,51 @@ void ModelOverlay::setProperties(const QVariantMap& properties) {
         }
         _updateModel = true;
     }
+
+    auto animationSettings = properties["animationSettings"];
+    if (animationSettings.canConvert(QVariant::Map)) {
+        QVariantMap animationSettingsMap = animationSettings.toMap();
+
+        auto animationURL = animationSettingsMap["url"];
+        auto animationFPS = animationSettingsMap["fps"];
+        auto animationCurrentFrame = animationSettingsMap["currentFrame"];
+        auto animationFirstFrame = animationSettingsMap["firstFrame"];
+        auto animationLastFrame = animationSettingsMap["lastFrame"];
+        auto animationRunning = animationSettingsMap["running"];
+        auto animationLoop = animationSettingsMap["loop"];
+        auto animationHold = animationSettingsMap["hold"];
+        auto animationAllowTranslation = animationSettingsMap["allowTranslation"];
+
+        if (animationURL.canConvert(QVariant::Url)) {
+            _animationURL = animationURL.toUrl();
+        }
+        if (animationFPS.isValid()) {
+            _animationFPS = animationFPS.toFloat();
+        }
+        if (animationCurrentFrame.isValid()) {
+            _animationCurrentFrame = animationCurrentFrame.toFloat();
+        }
+        if (animationFirstFrame.isValid()) {
+            _animationFirstFrame = animationFirstFrame.toFloat();
+        }
+        if (animationLastFrame.isValid()) {
+            _animationLastFrame = animationLastFrame.toFloat();
+        }
+
+        if (animationRunning.canConvert(QVariant::Bool)) {
+            _animationRunning = animationRunning.toBool();
+        }
+        if (animationLoop.canConvert(QVariant::Bool)) {
+            _animationLoop = animationLoop.toBool();
+        }
+        if (animationHold.canConvert(QVariant::Bool)) {
+            _animationHold = animationHold.toBool();
+        }
+        if (animationAllowTranslation.canConvert(QVariant::Bool)) {
+            _animationAllowTranslation = animationAllowTranslation.toBool();
+        }
+
+    }
 }
 
 template <typename vectorType, typename itemType>
@@ -194,7 +270,7 @@ QVariant ModelOverlay::getProperty(const QString& property) {
         return vec3toVariant(getDimensions());
     }
     if (property == "scale") {
-        return vec3toVariant(getScale());
+        return vec3toVariant(getSNScale());
     }
     if (property == "textures") {
         if (_modelTextures.size() > 0) {
@@ -258,6 +334,24 @@ QVariant ModelOverlay::getProperty(const QString& property) {
             });
     }
 
+    // animation properties
+    if (property == "animationSettings") {
+        QVariantMap animationSettingsMap;
+
+        animationSettingsMap["url"] = _animationURL;
+        animationSettingsMap["fps"] = _animationFPS;
+        animationSettingsMap["currentFrame"] = _animationCurrentFrame;
+        animationSettingsMap["firstFrame"] = _animationFirstFrame;
+        animationSettingsMap["lastFrame"] = _animationLastFrame;
+        animationSettingsMap["running"] = _animationRunning;
+        animationSettingsMap["loop"] = _animationLoop;
+        animationSettingsMap["hold"]= _animationHold;
+        animationSettingsMap["allowTranslation"] = _animationAllowTranslation;
+
+        return animationSettingsMap;
+    }
+
+
     return Volume3DOverlay::getProperty(property);
 }
 
@@ -278,9 +372,16 @@ ModelOverlay* ModelOverlay::createClone() const {
     return new ModelOverlay(this);
 }
 
+Transform ModelOverlay::evalRenderTransform() {
+    Transform transform = getTransform();
+    transform.setScale(1.0f); // disable inherited scale
+    return transform;
+}
+
 void ModelOverlay::locationChanged(bool tellPhysics) {
     Base3DOverlay::locationChanged(tellPhysics);
 
+    // FIXME Start using the _renderTransform instead of calling for Transform and Dimensions from here, do the custom things needed in evalRenderTransform()
     if (_model && _model->isActive()) {
         _model->setRotation(getRotation());
         _model->setTranslation(getPosition());
@@ -293,3 +394,134 @@ QString ModelOverlay::getName() const {
     }
     return QString("Overlay:") + getType() + ":" + _url.toString();
 }
+
+
+void ModelOverlay::animate() {
+
+    if (!_animation || !_animation->isLoaded() || !_model || !_model->isLoaded()) {
+        return;
+    }
+
+
+    QVector<JointData> jointsData;
+
+    const QVector<FBXAnimationFrame>&  frames = _animation->getFramesReference(); // NOTE: getFrames() is too heavy
+    int frameCount = frames.size();
+    if (frameCount <= 0) {
+        return;
+    }
+
+    if (!_lastAnimated) {
+        _lastAnimated = usecTimestampNow();
+        return;
+    }
+
+    auto now = usecTimestampNow();
+    auto interval = now - _lastAnimated;
+    _lastAnimated = now;
+    float deltaTime = (float)interval / (float)USECS_PER_SECOND;
+    _animationCurrentFrame += (deltaTime * _animationFPS);
+
+    int animationCurrentFrame = (int)(glm::floor(_animationCurrentFrame)) % frameCount;
+    if (animationCurrentFrame < 0 || animationCurrentFrame > frameCount) {
+        animationCurrentFrame = 0;
+    }
+
+    if (animationCurrentFrame == _lastKnownCurrentFrame) {
+        return;
+    }
+    _lastKnownCurrentFrame = animationCurrentFrame;
+
+    if (_jointMapping.size() != _model->getJointStateCount()) {
+        return;
+    }
+
+    QStringList animationJointNames = _animation->getGeometry().getJointNames();
+    auto& fbxJoints = _animation->getGeometry().joints;
+
+    auto& originalFbxJoints = _model->getFBXGeometry().joints;
+    auto& originalFbxIndices = _model->getFBXGeometry().jointIndices;
+
+    const QVector<glm::quat>& rotations = frames[_lastKnownCurrentFrame].rotations;
+    const QVector<glm::vec3>& translations = frames[_lastKnownCurrentFrame].translations;
+
+    jointsData.resize(_jointMapping.size());
+    for (int j = 0; j < _jointMapping.size(); j++) {
+        int index = _jointMapping[j];
+
+        if (index >= 0) {
+            glm::mat4 translationMat;
+
+            if (_animationAllowTranslation) {
+                if (index < translations.size()) {
+                    translationMat = glm::translate(translations[index]);
+                }
+            } else if (index < animationJointNames.size()) {
+                QString jointName = fbxJoints[index].name;
+
+                if (originalFbxIndices.contains(jointName)) {
+                    // Making sure the joint names exist in the original model the animation is trying to apply onto. If they do, then remap and get its translation.
+                    int remappedIndex = originalFbxIndices[jointName] - 1; // JointIndeces seem to always start from 1 and the found index is always 1 higher than actual.
+                    translationMat = glm::translate(originalFbxJoints[remappedIndex].translation);
+                }
+            }
+            glm::mat4 rotationMat;
+            if (index < rotations.size()) {
+                rotationMat = glm::mat4_cast(fbxJoints[index].preRotation * rotations[index] * fbxJoints[index].postRotation);
+            } else {
+                rotationMat = glm::mat4_cast(fbxJoints[index].preRotation * fbxJoints[index].postRotation);
+            }
+
+            glm::mat4 finalMat = (translationMat * fbxJoints[index].preTransform *
+                rotationMat * fbxJoints[index].postTransform);
+            auto& jointData = jointsData[j];
+            jointData.translation = extractTranslation(finalMat);
+            jointData.translationSet = true;
+            jointData.rotation = glmExtractRotation(finalMat);
+            jointData.rotationSet = true;
+        }
+    }
+    // Set the data in the model
+    copyAnimationJointDataToModel(jointsData);
+}
+
+
+void ModelOverlay::mapAnimationJoints(const QStringList& modelJointNames) {
+
+    // if we don't have animation, or we're already joint mapped then bail early
+    if (!hasAnimation() || jointsMapped()) {
+        return;
+    }
+
+    if (!_animation || _animation->getURL() != _animationURL) {
+        _animation = DependencyManager::get<AnimationCache>()->getAnimation(_animationURL);
+    }
+
+    if (_animation && _animation->isLoaded()) {
+        QStringList animationJointNames = _animation->getJointNames();
+
+        if (modelJointNames.size() > 0 && animationJointNames.size() > 0) {
+            _jointMapping.resize(modelJointNames.size());
+            for (int i = 0; i < modelJointNames.size(); i++) {
+                _jointMapping[i] = animationJointNames.indexOf(modelJointNames[i]);
+            }
+            _jointMappingCompleted = true;
+            _jointMappingURL = _animationURL;
+        }
+    }
+}
+
+void ModelOverlay::copyAnimationJointDataToModel(QVector<JointData> jointsData) {
+    if (!_model || !_model->isLoaded()) {
+        return;
+    }
+
+    // relay any inbound joint changes from scripts/animation/network to the model/rig
+    for (int index = 0; index < jointsData.size(); ++index) {
+        auto& jointData = jointsData[index];
+        _model->setJointRotation(index, true, jointData.rotation, 1.0f);
+        _model->setJointTranslation(index, true, jointData.translation, 1.0f);
+    }
+    _updateModel = true;
+}
+
diff --git a/interface/src/ui/overlays/ModelOverlay.h b/interface/src/ui/overlays/ModelOverlay.h
index 59548dfe62..ea0eff170c 100644
--- a/interface/src/ui/overlays/ModelOverlay.h
+++ b/interface/src/ui/overlays/ModelOverlay.h
@@ -13,6 +13,7 @@
 #define hifi_ModelOverlay_h
 
 #include <Model.h>
+#include <AnimationCache.h>
 
 #include "Volume3DOverlay.h"
 
@@ -28,7 +29,7 @@ public:
     ModelOverlay(const ModelOverlay* modelOverlay);
 
     virtual void update(float deltatime) override;
-    virtual void render(RenderArgs* args) override;
+    virtual void render(RenderArgs* args) override {};
     void setProperties(const QVariantMap& properties) override;
     QVariant getProperty(const QString& property) override;
     virtual bool findRayIntersection(const glm::vec3& origin, const glm::vec3& direction, float& distance,
@@ -45,12 +46,29 @@ public:
 
     float getLoadPriority() const { return _loadPriority; }
 
+    bool hasAnimation() const { return !_animationURL.isEmpty(); }
+    bool jointsMapped() const { return _jointMappingURL == _animationURL && _jointMappingCompleted; }
+
+    void setVisible(bool visible) override;
+    void setDrawInFront(bool drawInFront) override;
+    void setDrawHUDLayer(bool drawHUDLayer) override;
+
 protected:
+    Transform evalRenderTransform() override;
+
     // helper to extract metadata from our Model's rigged joints
     template <typename itemType> using mapFunction = std::function<itemType(int jointIndex)>;
     template <typename vectorType, typename itemType>
         vectorType mapJoints(mapFunction<itemType> function) const;
 
+    void animate();
+    void mapAnimationJoints(const QStringList& modelJointNames);
+    bool isAnimatingSomething() const {
+        return !_animationURL.isEmpty() && _animationRunning && _animationFPS != 0.0f;
+    }
+    void copyAnimationJointDataToModel(QVector<JointData> jointsData);
+
+
 private:
 
     ModelPointer _model;
@@ -60,6 +78,29 @@ private:
     bool _updateModel = { false };
     bool _scaleToFit = { false };
     float _loadPriority { 0.0f };
+
+    AnimationPointer _animation;
+
+    QUrl _animationURL;
+    float _animationFPS { 0.0f };
+    float _animationCurrentFrame { 0.0f };
+    bool _animationRunning { false };
+    bool _animationLoop { false };
+    float _animationFirstFrame { 0.0f };
+    float _animationLastFrame = { 0.0f };
+    bool _animationHold { false };
+    bool _animationAllowTranslation { false };
+    uint64_t _lastAnimated { 0 };
+    int _lastKnownCurrentFrame { -1 };
+
+    QUrl _jointMappingURL;
+    bool _jointMappingCompleted { false };
+    QVector<int> _jointMapping; // domain is index into model-joints, range is index into animation-joints
+
+    bool _visibleDirty { false };
+    bool _drawInFrontDirty { false };
+    bool _drawInHUDDirty { false };
+
 };
 
 #endif // hifi_ModelOverlay_h
diff --git a/interface/src/ui/overlays/Overlay.cpp b/interface/src/ui/overlays/Overlay.cpp
index b650da3522..01ad56f20e 100644
--- a/interface/src/ui/overlays/Overlay.cpp
+++ b/interface/src/ui/overlays/Overlay.cpp
@@ -13,6 +13,8 @@
 #include <NumericalConstants.h>
 #include <RegisteredMetaTypes.h>
 
+#include "Application.h"
+
 static const xColor DEFAULT_OVERLAY_COLOR = { 255, 255, 255 };
 static const float DEFAULT_ALPHA = 0.7f;
 
@@ -20,7 +22,7 @@ Overlay::Overlay() :
     _renderItemID(render::Item::INVALID_ITEM_ID),
     _isLoaded(true),
     _alpha(DEFAULT_ALPHA),
-    _pulse(0.0f),
+    _pulse(1.0f),
     _pulseMax(0.0f),
     _pulseMin(0.0f),
     _pulsePeriod(1.0f),
@@ -161,7 +163,6 @@ float Overlay::getAlpha() {
     return (_alphaPulse >= 0.0f) ? _alpha * pulseLevel : _alpha * (1.0f - pulseLevel);
 }
 
-
 // pulse travels from min to max, then max to min in one period.
 float Overlay::updatePulse() {
     if (_pulsePeriod <= 0.0f) {
diff --git a/interface/src/ui/overlays/Overlay.h b/interface/src/ui/overlays/Overlay.h
index 4ad1b070b1..39208f01a0 100644
--- a/interface/src/ui/overlays/Overlay.h
+++ b/interface/src/ui/overlays/Overlay.h
@@ -58,6 +58,7 @@ public:
     virtual bool is3D() const = 0;
     bool isLoaded() { return _isLoaded; }
     bool getVisible() const { return _visible; }
+    virtual bool isTransparent() { return getAlphaPulse() != 0.0f || getAlpha() != 1.0f; };
     xColor getColor();
     float getAlpha();
     Anchor getAnchor() const { return _anchor; }
@@ -71,7 +72,8 @@ public:
     float getAlphaPulse() const { return _alphaPulse; }
 
     // setters
-    void setVisible(bool visible) { _visible = visible; }
+    virtual void setVisible(bool visible) { _visible = visible; }
+    void setDrawHUDLayer(bool drawHUDLayer);
     void setColor(const xColor& color) { _color = color; }
     void setAlpha(float alpha) { _alpha = alpha; }
     void setAnchor(Anchor anchor) { _anchor = anchor; }
@@ -84,9 +86,9 @@ public:
     void setColorPulse(float value) { _colorPulse = value; }
     void setAlphaPulse(float value) { _alphaPulse = value; }
 
-    virtual void setProperties(const QVariantMap& properties);
-    virtual Overlay* createClone() const = 0;
-    virtual QVariant getProperty(const QString& property);
+    Q_INVOKABLE virtual void setProperties(const QVariantMap& properties);
+    Q_INVOKABLE virtual Overlay* createClone() const = 0;
+    Q_INVOKABLE virtual QVariant getProperty(const QString& property);
 
     render::ItemID getRenderItemID() const { return _renderItemID; }
     void setRenderItemID(render::ItemID renderItemID) { _renderItemID = renderItemID; }
diff --git a/interface/src/ui/overlays/OverlayPanel.cpp b/interface/src/ui/overlays/OverlayPanel.cpp
index df2b91c4ef..06480109ce 100644
--- a/interface/src/ui/overlays/OverlayPanel.cpp
+++ b/interface/src/ui/overlays/OverlayPanel.cpp
@@ -11,6 +11,8 @@
 
 #include "OverlayPanel.h"
 
+#if OVERLAY_PANELS
+
 #include <QVariant>
 #include <RegisteredMetaTypes.h>
 #include <DependencyManager.h>
@@ -185,3 +187,4 @@ void OverlayPanel::applyTransformTo(Transform& transform, bool force) {
         pointTransformAtCamera(transform, getOffsetRotation());
     }
 }
+#endif
\ No newline at end of file
diff --git a/interface/src/ui/overlays/OverlayPanel.h b/interface/src/ui/overlays/OverlayPanel.h
index 5bffe3851e..cff2bc224d 100644
--- a/interface/src/ui/overlays/OverlayPanel.h
+++ b/interface/src/ui/overlays/OverlayPanel.h
@@ -22,6 +22,7 @@
 #include "Billboardable.h"
 #include "Overlay.h"
 
+#if OVERLAY_PANELS
 class PropertyBinding {
 public:
     PropertyBinding() {}
@@ -80,4 +81,6 @@ private:
     QScriptEngine* _scriptEngine;
 };
 
+#endif
+
 #endif // hifi_OverlayPanel_h
diff --git a/interface/src/ui/overlays/Overlays.cpp b/interface/src/ui/overlays/Overlays.cpp
index a9efd51a3e..fd5aae4027 100644
--- a/interface/src/ui/overlays/Overlays.cpp
+++ b/interface/src/ui/overlays/Overlays.cpp
@@ -14,6 +14,7 @@
 
 #include <QtScript/QScriptValueIterator>
 
+#include <shared/QtHelpers.h>
 #include <OffscreenUi.h>
 #include <render/Scene.h>
 #include <RegisteredMetaTypes.h>
@@ -38,35 +39,42 @@
 
 Q_LOGGING_CATEGORY(trace_render_overlays, "trace.render.overlays")
 
+extern void initOverlay3DPipelines(render::ShapePlumber& plumber, bool depthTest = false);
+
 void Overlays::cleanupAllOverlays() {
+    QMap<OverlayID, Overlay::Pointer> overlaysHUD;
+    QMap<OverlayID, Overlay::Pointer> overlaysWorld;
     {
-        QWriteLocker lock(&_lock);
-        QWriteLocker deleteLock(&_deleteLock);
-        foreach(Overlay::Pointer overlay, _overlaysHUD) {
-            _overlaysToDelete.push_back(overlay);
-        }
-        foreach(Overlay::Pointer overlay, _overlaysWorld) {
-            _overlaysToDelete.push_back(overlay);
-        }
-        _overlaysHUD.clear();
-        _overlaysWorld.clear();
-        _panels.clear();
+        QMutexLocker locker(&_mutex);
+        overlaysHUD.swap(_overlaysHUD);
+        overlaysWorld.swap(_overlaysWorld);
     }
+
+    foreach(Overlay::Pointer overlay, overlaysHUD) {
+        _overlaysToDelete.push_back(overlay);
+    }
+    foreach(Overlay::Pointer overlay, overlaysWorld) {
+        _overlaysToDelete.push_back(overlay);
+    }
+#if OVERLAY_PANELS
+    _panels.clear();
+#endif
     cleanupOverlaysToDelete();
 }
 
 void Overlays::init() {
+#if OVERLAY_PANELS
     _scriptEngine = new QScriptEngine();
+#endif
 }
 
 void Overlays::update(float deltatime) {
-
     {
-        QWriteLocker lock(&_lock);
-        foreach(Overlay::Pointer thisOverlay, _overlaysHUD) {
+        QMutexLocker locker(&_mutex);
+        foreach(const auto& thisOverlay, _overlaysHUD) {
             thisOverlay->update(deltatime);
         }
-        foreach(Overlay::Pointer thisOverlay, _overlaysWorld) {
+        foreach(const auto& thisOverlay, _overlaysWorld) {
             thisOverlay->update(deltatime);
         }
     }
@@ -80,8 +88,6 @@ void Overlays::cleanupOverlaysToDelete() {
         render::Transaction transaction;
 
         {
-            QWriteLocker lock(&_deleteLock);
-
             do {
                 Overlay::Pointer overlay = _overlaysToDelete.takeLast();
 
@@ -92,7 +98,7 @@ void Overlays::cleanupOverlaysToDelete() {
             } while (!_overlaysToDelete.isEmpty());
         }
 
-        if (transaction._removedItems.size() > 0) {
+        if (transaction.hasRemovedItems()) {
             scene->enqueueTransaction(transaction);
         }
     }
@@ -100,7 +106,6 @@ void Overlays::cleanupOverlaysToDelete() {
 
 void Overlays::renderHUD(RenderArgs* renderArgs) {
     PROFILE_RANGE(render_overlays, __FUNCTION__);
-    QReadLocker lock(&_lock);
     gpu::Batch& batch = *renderArgs->_batch;
 
     auto geometryCache = DependencyManager::get<GeometryCache>();
@@ -111,9 +116,9 @@ void Overlays::renderHUD(RenderArgs* renderArgs) {
     int height = size.y;
     mat4 legacyProjection = glm::ortho<float>(0, width, height, 0, -1000, 1000);
 
-
+    QMutexLocker locker(&_mutex);
     foreach(Overlay::Pointer thisOverlay, _overlaysHUD) {
-    
+
         // Reset all batch pipeline settings between overlay
         geometryCache->useSimpleDrawPipeline(batch);
         batch.setResourceTexture(0, textureCache->getWhiteTexture()); // FIXME - do we really need to do this??
@@ -126,56 +131,63 @@ void Overlays::renderHUD(RenderArgs* renderArgs) {
 }
 
 void Overlays::disable() {
-    QWriteLocker lock(&_lock);
     _enabled = false;
 }
 
 void Overlays::enable() {
-    QWriteLocker lock(&_lock);
     _enabled = true;
 }
 
+// Note, can't be invoked by scripts, but can be called by the InterfaceParentFinder
+// class on packet processing threads
 Overlay::Pointer Overlays::getOverlay(OverlayID id) const {
+    QMutexLocker locker(&_mutex);
     if (_overlaysHUD.contains(id)) {
         return _overlaysHUD[id];
-    }
-    if (_overlaysWorld.contains(id)) {
+    } else if (_overlaysWorld.contains(id)) {
         return _overlaysWorld[id];
     }
     return nullptr;
 }
 
 OverlayID Overlays::addOverlay(const QString& type, const QVariant& properties) {
+    if (QThread::currentThread() != thread()) {
+        OverlayID result;
+        PROFILE_RANGE(script, __FUNCTION__);
+        BLOCKING_INVOKE_METHOD(this, "addOverlay", Q_RETURN_ARG(OverlayID, result), Q_ARG(QString, type), Q_ARG(QVariant, properties));
+        return result;
+    }
+
     Overlay::Pointer thisOverlay = nullptr;
 
     if (type == ImageOverlay::TYPE) {
-        thisOverlay = std::make_shared<ImageOverlay>();
+        thisOverlay = Overlay::Pointer(new ImageOverlay(), [](Overlay* ptr) { ptr->deleteLater(); });
     } else if (type == Image3DOverlay::TYPE || type == "billboard") { // "billboard" for backwards compatibility
-        thisOverlay = std::make_shared<Image3DOverlay>();
+        thisOverlay = Overlay::Pointer(new Image3DOverlay(), [](Overlay* ptr) { ptr->deleteLater(); });
     } else if (type == TextOverlay::TYPE) {
-        thisOverlay = std::make_shared<TextOverlay>();
+        thisOverlay = Overlay::Pointer(new TextOverlay(), [](Overlay* ptr) { ptr->deleteLater(); });
     } else if (type == Text3DOverlay::TYPE) {
-        thisOverlay = std::make_shared<Text3DOverlay>();
+        thisOverlay = Overlay::Pointer(new Text3DOverlay(), [](Overlay* ptr) { ptr->deleteLater(); });
     } else if (type == Shape3DOverlay::TYPE) {
-        thisOverlay = std::make_shared<Shape3DOverlay>();
+        thisOverlay = Overlay::Pointer(new Shape3DOverlay(), [](Overlay* ptr) { ptr->deleteLater(); });
     } else if (type == Cube3DOverlay::TYPE) {
-        thisOverlay = std::make_shared<Cube3DOverlay>();
+        thisOverlay = Overlay::Pointer(new Cube3DOverlay(), [](Overlay* ptr) { ptr->deleteLater(); });
     } else if (type == Sphere3DOverlay::TYPE) {
-        thisOverlay = std::make_shared<Sphere3DOverlay>();
+        thisOverlay = Overlay::Pointer(new Sphere3DOverlay(), [](Overlay* ptr) { ptr->deleteLater(); });
     } else if (type == Circle3DOverlay::TYPE) {
-        thisOverlay = std::make_shared<Circle3DOverlay>();
+        thisOverlay = Overlay::Pointer(new Circle3DOverlay(), [](Overlay* ptr) { ptr->deleteLater(); });
     } else if (type == Rectangle3DOverlay::TYPE) {
-        thisOverlay = std::make_shared<Rectangle3DOverlay>();
+        thisOverlay = Overlay::Pointer(new Rectangle3DOverlay(), [](Overlay* ptr) { ptr->deleteLater(); });
     } else if (type == Line3DOverlay::TYPE) {
-        thisOverlay = std::make_shared<Line3DOverlay>();
+        thisOverlay = Overlay::Pointer(new Line3DOverlay(), [](Overlay* ptr) { ptr->deleteLater(); });
     } else if (type == Grid3DOverlay::TYPE) {
-        thisOverlay = std::make_shared<Grid3DOverlay>();
+        thisOverlay = Overlay::Pointer(new Grid3DOverlay(), [](Overlay* ptr) { ptr->deleteLater(); });
     } else if (type == ModelOverlay::TYPE) {
-        thisOverlay = std::make_shared<ModelOverlay>();
+        thisOverlay = Overlay::Pointer(new ModelOverlay(), [](Overlay* ptr) { ptr->deleteLater(); });
     } else if (type == Web3DOverlay::TYPE) {
-        thisOverlay = std::make_shared<Web3DOverlay>();
+        thisOverlay = Overlay::Pointer(new Web3DOverlay(), [](Overlay* ptr) { ptr->deleteLater(); });
     } else if (type == RectangleOverlay::TYPE) {
-        thisOverlay = std::make_shared<RectangleOverlay>();
+        thisOverlay = Overlay::Pointer(new RectangleOverlay(), [](Overlay* ptr) { ptr->deleteLater(); });
     }
 
     if (thisOverlay) {
@@ -185,19 +197,22 @@ OverlayID Overlays::addOverlay(const QString& type, const QVariant& properties)
     return UNKNOWN_OVERLAY_ID;
 }
 
-OverlayID Overlays::addOverlay(Overlay::Pointer overlay) {
-    QWriteLocker lock(&_lock);
+OverlayID Overlays::addOverlay(const Overlay::Pointer& overlay) {
     OverlayID thisID = OverlayID(QUuid::createUuid());
     overlay->setOverlayID(thisID);
     overlay->setStackOrder(_stackOrder++);
     if (overlay->is3D()) {
-        _overlaysWorld[thisID] = overlay;
+        {
+            QMutexLocker locker(&_mutex);
+            _overlaysWorld[thisID] = overlay;
+        }
 
         render::ScenePointer scene = qApp->getMain3DScene();
         render::Transaction transaction;
         overlay->addToScene(overlay, scene, transaction);
         scene->enqueueTransaction(transaction);
     } else {
+        QMutexLocker locker(&_mutex);
         _overlaysHUD[thisID] = overlay;
     }
 
@@ -205,14 +220,23 @@ OverlayID Overlays::addOverlay(Overlay::Pointer overlay) {
 }
 
 OverlayID Overlays::cloneOverlay(OverlayID id) {
+    if (QThread::currentThread() != thread()) {
+        OverlayID result;
+        PROFILE_RANGE(script, __FUNCTION__);
+        BLOCKING_INVOKE_METHOD(this, "cloneOverlay", Q_RETURN_ARG(OverlayID, result), Q_ARG(OverlayID, id));
+        return result;
+    }
+
     Overlay::Pointer thisOverlay = getOverlay(id);
 
     if (thisOverlay) {
-        OverlayID cloneId = addOverlay(Overlay::Pointer(thisOverlay->createClone()));
+        OverlayID cloneId = addOverlay(Overlay::Pointer(thisOverlay->createClone(), [](Overlay* ptr) { ptr->deleteLater(); }));
+#if OVERLAY_PANELS
         auto attachable = std::dynamic_pointer_cast<PanelAttachable>(thisOverlay);
         if (attachable && attachable->getParentPanel()) {
             attachable->getParentPanel()->addChild(cloneId);
         }
+#endif
         return cloneId;
     }
 
@@ -220,21 +244,30 @@ OverlayID Overlays::cloneOverlay(OverlayID id) {
 }
 
 bool Overlays::editOverlay(OverlayID id, const QVariant& properties) {
-    QWriteLocker lock(&_lock);
-
-    Overlay::Pointer thisOverlay = getOverlay(id);
-    if (thisOverlay) {
-        thisOverlay->setProperties(properties.toMap());
+    auto thisOverlay = getOverlay(id);
+    if (!thisOverlay) {
+        return false;
+    }
 
+    if (!thisOverlay->is3D() && QThread::currentThread() != thread()) {
+        // NOTE editOverlay can be called very frequently in scripts and can't afford to
+        // block waiting on the main thread.  Additionally, no script actually
+        // examines the return value and does something useful with it, so use a non-blocking
+        // invoke and just always return true
+        QMetaObject::invokeMethod(this, "editOverlay", Q_ARG(OverlayID, id), Q_ARG(QVariant, properties));
         return true;
     }
-    return false;
+
+    thisOverlay->setProperties(properties.toMap());
+    return true;
 }
 
 bool Overlays::editOverlays(const QVariant& propertiesById) {
-    QVariantMap map = propertiesById.toMap();
+    bool defer2DOverlays = QThread::currentThread() != thread();
+
+    QVariantMap deferrred;
+    const QVariantMap map = propertiesById.toMap();
     bool success = true;
-    QWriteLocker lock(&_lock);
     for (const auto& key : map.keys()) {
         OverlayID id = OverlayID(key);
         Overlay::Pointer thisOverlay = getOverlay(id);
@@ -242,17 +275,34 @@ bool Overlays::editOverlays(const QVariant& propertiesById) {
             success = false;
             continue;
         }
-        QVariant properties = map[key];
+
+        const QVariant& properties = map[key];
+        if (defer2DOverlays && !thisOverlay->is3D()) {
+            deferrred[key] = properties;
+            continue;
+        }
         thisOverlay->setProperties(properties.toMap());
     }
+
+    // For 2D/QML overlays, we need to perform the edit on the main thread
+    if (defer2DOverlays && !deferrred.empty()) {
+        // NOTE see comment on editOverlay for why this is not a blocking call
+        QMetaObject::invokeMethod(this, "editOverlays", Q_ARG(QVariant, deferrred));
+    }
+
     return success;
 }
 
 void Overlays::deleteOverlay(OverlayID id) {
+    if (QThread::currentThread() != thread()) {
+        QMetaObject::invokeMethod(this, "deleteOverlay", Q_ARG(OverlayID, id));
+        return;
+    }
+
     Overlay::Pointer overlayToDelete;
 
     {
-        QWriteLocker lock(&_lock);
+        QMutexLocker locker(&_mutex);
         if (_overlaysHUD.contains(id)) {
             overlayToDelete = _overlaysHUD.take(id);
         } else if (_overlaysWorld.contains(id)) {
@@ -262,19 +312,27 @@ void Overlays::deleteOverlay(OverlayID id) {
         }
     }
 
+#if OVERLAY_PANELS
     auto attachable = std::dynamic_pointer_cast<PanelAttachable>(overlayToDelete);
     if (attachable && attachable->getParentPanel()) {
         attachable->getParentPanel()->removeChild(id);
         attachable->setParentPanel(nullptr);
     }
+#endif
+
 
-    QWriteLocker lock(&_deleteLock);
     _overlaysToDelete.push_back(overlayToDelete);
-
     emit overlayDeleted(id);
 }
 
-QString Overlays::getOverlayType(OverlayID overlayId) const {
+QString Overlays::getOverlayType(OverlayID overlayId) {
+    if (QThread::currentThread() != thread()) {
+        QString result;
+        PROFILE_RANGE(script, __FUNCTION__);
+        BLOCKING_INVOKE_METHOD(this, "getOverlayType", Q_RETURN_ARG(QString, result), Q_ARG(OverlayID, overlayId));
+        return result;
+    }
+
     Overlay::Pointer overlay = getOverlay(overlayId);
     if (overlay) {
         return overlay->getType();
@@ -283,6 +341,13 @@ QString Overlays::getOverlayType(OverlayID overlayId) const {
 }
 
 QObject* Overlays::getOverlayObject(OverlayID id) {
+    if (QThread::currentThread() != thread()) {
+        QObject* result;
+        PROFILE_RANGE(script, __FUNCTION__);
+        BLOCKING_INVOKE_METHOD(this, "getOverlayObject", Q_RETURN_ARG(QObject*, result), Q_ARG(OverlayID, id));
+        return result;
+    }
+
     Overlay::Pointer thisOverlay = getOverlay(id);
     if (thisOverlay) {
         return qobject_cast<QObject*>(&(*thisOverlay));
@@ -290,6 +355,7 @@ QObject* Overlays::getOverlayObject(OverlayID id) {
     return nullptr;
 }
 
+#if OVERLAY_PANELS
 OverlayID Overlays::getParentPanel(OverlayID childId) const {
     Overlay::Pointer overlay = getOverlay(childId);
     auto attachable = std::dynamic_pointer_cast<PanelAttachable>(overlay);
@@ -330,33 +396,25 @@ void Overlays::setParentPanel(OverlayID childId, OverlayID panelId) {
         }
     }
 }
+#endif
 
 OverlayID Overlays::getOverlayAtPoint(const glm::vec2& point) {
-    glm::vec2 pointCopy = point;
-    QReadLocker lock(&_lock);
     if (!_enabled) {
         return UNKNOWN_OVERLAY_ID;
     }
-    QMapIterator<OverlayID, Overlay::Pointer> i(_overlaysHUD);
 
-    const float LARGE_NEGATIVE_FLOAT = -9999999;
-    glm::vec3 origin(pointCopy.x, pointCopy.y, LARGE_NEGATIVE_FLOAT);
-    glm::vec3 direction(0, 0, 1);
-    glm::vec3 thisSurfaceNormal;
+    QMutexLocker locker(&_mutex);
+    QMapIterator<OverlayID, Overlay::Pointer> i(_overlaysHUD);
     unsigned int bestStackOrder = 0;
     OverlayID bestOverlayID = UNKNOWN_OVERLAY_ID;
-
     while (i.hasNext()) {
         i.next();
-        OverlayID thisID = i.key();
-        if (!i.value()->is3D()) {
-            auto thisOverlay = std::dynamic_pointer_cast<Overlay2D>(i.value());
-            if (thisOverlay && thisOverlay->getVisible() && thisOverlay->isLoaded() &&
-                thisOverlay->getBoundingRect().contains(pointCopy.x, pointCopy.y, false)) {
-                if (thisOverlay->getStackOrder() > bestStackOrder) {
-                    bestOverlayID = thisID;
-                    bestStackOrder = thisOverlay->getStackOrder();
-                }
+        auto thisOverlay = std::dynamic_pointer_cast<Overlay2D>(i.value());
+        if (thisOverlay && thisOverlay->getVisible() && thisOverlay->isLoaded() &&
+            thisOverlay->getBoundingRect().contains(point.x, point.y, false)) {
+            if (thisOverlay->getStackOrder() > bestStackOrder) {
+                bestOverlayID = i.key();
+                bestStackOrder = thisOverlay->getStackOrder();
             }
         }
     }
@@ -365,15 +423,47 @@ OverlayID Overlays::getOverlayAtPoint(const glm::vec2& point) {
 }
 
 OverlayPropertyResult Overlays::getProperty(OverlayID id, const QString& property) {
-    OverlayPropertyResult result;
     Overlay::Pointer thisOverlay = getOverlay(id);
-    QReadLocker lock(&_lock);
+    OverlayPropertyResult result;
     if (thisOverlay && thisOverlay->supportsGetProperty()) {
         result.value = thisOverlay->getProperty(property);
     }
     return result;
 }
 
+OverlayPropertyResult Overlays::getProperties(const OverlayID& id, const QStringList& properties) {
+    Overlay::Pointer thisOverlay = getOverlay(id);
+    OverlayPropertyResult result;
+    if (thisOverlay && thisOverlay->supportsGetProperty()) {
+        QVariantMap mapResult;
+        for (const auto& property : properties) {
+            mapResult.insert(property, thisOverlay->getProperty(property));
+        }
+        result.value = mapResult;
+    }
+    return result;
+}
+
+OverlayPropertyResult Overlays::getOverlaysProperties(const QVariant& propertiesById) {
+    QVariantMap map = propertiesById.toMap();
+    OverlayPropertyResult result;
+    QVariantMap resultMap;
+    for (const auto& key : map.keys()) {
+        OverlayID id = OverlayID(key);
+        QVariantMap overlayResult;
+        Overlay::Pointer thisOverlay = getOverlay(id);
+        if (thisOverlay && thisOverlay->supportsGetProperty()) {
+            QStringList propertiesToFetch = map[key].toStringList();
+            for (const auto& property : propertiesToFetch) {
+                overlayResult[property] = thisOverlay->getProperty(property);
+            }
+        }
+        resultMap[key] = overlayResult;
+    }
+    result.value = resultMap;
+    return result;
+}
+
 OverlayPropertyResult::OverlayPropertyResult() {
 }
 
@@ -396,19 +486,19 @@ RayToOverlayIntersectionResult Overlays::findRayIntersection(const PickRay& ray,
     const QVector<OverlayID> overlaysToInclude = qVectorOverlayIDFromScriptValue(overlayIDsToInclude);
     const QVector<OverlayID> overlaysToDiscard = qVectorOverlayIDFromScriptValue(overlayIDsToDiscard);
 
-    return findRayIntersectionInternal(ray, precisionPicking,
-                                       overlaysToInclude, overlaysToDiscard, visibleOnly, collidableOnly);
+    return findRayIntersectionVector(ray, precisionPicking,
+                                     overlaysToInclude, overlaysToDiscard, visibleOnly, collidableOnly);
 }
 
 
-RayToOverlayIntersectionResult Overlays::findRayIntersectionInternal(const PickRay& ray, bool precisionPicking,
-                                                                     const QVector<OverlayID>& overlaysToInclude,
-                                                                     const QVector<OverlayID>& overlaysToDiscard,
-                                                                     bool visibleOnly, bool collidableOnly) {
-    QReadLocker lock(&_lock);
+RayToOverlayIntersectionResult Overlays::findRayIntersectionVector(const PickRay& ray, bool precisionPicking,
+                                                                   const QVector<OverlayID>& overlaysToInclude,
+                                                                   const QVector<OverlayID>& overlaysToDiscard,
+                                                                   bool visibleOnly, bool collidableOnly) {
     float bestDistance = std::numeric_limits<float>::max();
     bool bestIsFront = false;
 
+    QMutexLocker locker(&_mutex);
     RayToOverlayIntersectionResult result;
     QMapIterator<OverlayID, Overlay::Pointer> i(_overlaysWorld);
     while (i.hasNext()) {
@@ -448,16 +538,6 @@ RayToOverlayIntersectionResult Overlays::findRayIntersectionInternal(const PickR
     return result;
 }
 
-RayToOverlayIntersectionResult::RayToOverlayIntersectionResult() :
-    intersects(false),
-    overlayID(UNKNOWN_OVERLAY_ID),
-    distance(0),
-    face(),
-    intersection(),
-    extraInfo()
-{
-}
-
 QScriptValue RayToOverlayIntersectionResultToScriptValue(QScriptEngine* engine, const RayToOverlayIntersectionResult& value) {
     auto obj = engine->newObject();
     obj.setProperty("intersects", value.intersects);
@@ -531,7 +611,13 @@ void RayToOverlayIntersectionResultFromScriptValue(const QScriptValue& objectVar
 }
 
 bool Overlays::isLoaded(OverlayID id) {
-    QReadLocker lock(&_lock);
+    if (QThread::currentThread() != thread()) {
+        bool result;
+        PROFILE_RANGE(script, __FUNCTION__);
+        BLOCKING_INVOKE_METHOD(this, "isLoaded", Q_RETURN_ARG(bool, result), Q_ARG(OverlayID, id));
+        return result;
+    }
+
     Overlay::Pointer thisOverlay = getOverlay(id);
     if (!thisOverlay) {
         return false; // not found
@@ -539,21 +625,30 @@ bool Overlays::isLoaded(OverlayID id) {
     return thisOverlay->isLoaded();
 }
 
-QSizeF Overlays::textSize(OverlayID id, const QString& text) const {
-    Overlay::Pointer thisOverlay = _overlaysHUD[id];
+QSizeF Overlays::textSize(OverlayID id, const QString& text) {
+    if (QThread::currentThread() != thread()) {
+        QSizeF result;
+        PROFILE_RANGE(script, __FUNCTION__);
+        BLOCKING_INVOKE_METHOD(this, "textSize", Q_RETURN_ARG(QSizeF, result), Q_ARG(OverlayID, id), Q_ARG(QString, text));
+        return result;
+    }
+
+    Overlay::Pointer thisOverlay = getOverlay(id);
     if (thisOverlay) {
-        if (auto textOverlay = std::dynamic_pointer_cast<TextOverlay>(thisOverlay)) {
-            return textOverlay->textSize(text);
-        }
-    } else {
-        thisOverlay = _overlaysWorld[id];
-        if (auto text3dOverlay = std::dynamic_pointer_cast<Text3DOverlay>(thisOverlay)) {
-            return text3dOverlay->textSize(text);
+        if (thisOverlay->is3D()) {
+            if (auto text3dOverlay = std::dynamic_pointer_cast<Text3DOverlay>(thisOverlay)) {
+                return text3dOverlay->textSize(text);
+            }
+        } else {
+            if (auto textOverlay = std::dynamic_pointer_cast<TextOverlay>(thisOverlay)) {
+                return textOverlay->textSize(text);
+            }
         }
     }
     return QSizeF(0.0f, 0.0f);
 }
 
+#if OVERLAY_PANELS
 OverlayID Overlays::addPanel(OverlayPanel::Pointer panel) {
     QWriteLocker lock(&_lock);
 
@@ -607,56 +702,79 @@ void Overlays::deletePanel(OverlayID panelId) {
 
     emit panelDeleted(panelId);
 }
+#endif
 
 bool Overlays::isAddedOverlay(OverlayID id) {
+    if (QThread::currentThread() != thread()) {
+        bool result;
+        PROFILE_RANGE(script, __FUNCTION__);
+        BLOCKING_INVOKE_METHOD(this, "isAddedOverlay", Q_RETURN_ARG(bool, result), Q_ARG(OverlayID, id));
+        return result;
+    }
+
+    QMutexLocker locker(&_mutex);
     return _overlaysHUD.contains(id) || _overlaysWorld.contains(id);
 }
 
-void Overlays::sendMousePressOnOverlay(OverlayID overlayID, const PointerEvent& event) {
-    emit mousePressOnOverlay(overlayID, event);
+void Overlays::sendMousePressOnOverlay(const OverlayID& overlayID, const PointerEvent& event) {
+    mousePressEvent(overlayID, event);
 }
 
-void Overlays::sendMouseReleaseOnOverlay(OverlayID overlayID, const PointerEvent& event) {
-    emit mouseReleaseOnOverlay(overlayID, event);
+void Overlays::sendMouseReleaseOnOverlay(const OverlayID& overlayID, const PointerEvent& event) {
+    mouseReleaseEvent(overlayID, event);
 }
 
-void Overlays::sendMouseMoveOnOverlay(OverlayID overlayID, const PointerEvent& event) {
-    emit mouseMoveOnOverlay(overlayID, event);
+void Overlays::sendMouseMoveOnOverlay(const OverlayID& overlayID, const PointerEvent& event) {
+    mouseMoveEvent(overlayID, event);
 }
 
-void Overlays::sendHoverEnterOverlay(OverlayID id, PointerEvent event) {
-    emit hoverEnterOverlay(id, event);
+void Overlays::sendHoverEnterOverlay(const OverlayID& overlayID, const PointerEvent& event) {
+    emit hoverEnterOverlay(overlayID, event);
 }
 
-void Overlays::sendHoverOverOverlay(OverlayID  id, PointerEvent event) {
-    emit hoverOverOverlay(id, event);
+void Overlays::sendHoverOverOverlay(const OverlayID& overlayID, const PointerEvent& event) {
+    emit hoverOverOverlay(overlayID, event);
 }
 
-void Overlays::sendHoverLeaveOverlay(OverlayID  id, PointerEvent event) {
-    emit hoverLeaveOverlay(id, event);
+void Overlays::sendHoverLeaveOverlay(const OverlayID& overlayID, const PointerEvent& event) {
+    hoverLeaveEvent(overlayID, event);
 }
 
-OverlayID Overlays::getKeyboardFocusOverlay() const {
+OverlayID Overlays::getKeyboardFocusOverlay() {
     return qApp->getKeyboardFocusOverlay();
 }
 
-void Overlays::setKeyboardFocusOverlay(OverlayID id) {
+void Overlays::setKeyboardFocusOverlay(const OverlayID& id) {
     qApp->setKeyboardFocusOverlay(id);
 }
 
-float Overlays::width() const {
+float Overlays::width() {
+    if (QThread::currentThread() != thread()) {
+        float result;
+        PROFILE_RANGE(script, __FUNCTION__);
+        BLOCKING_INVOKE_METHOD(this, "width", Q_RETURN_ARG(float, result));
+        return result;
+    }
+
     auto offscreenUi = DependencyManager::get<OffscreenUi>();
     return offscreenUi->getWindow()->size().width();
 }
 
-float Overlays::height() const {
+float Overlays::height() {
+    if (QThread::currentThread() != thread()) {
+        float result;
+        PROFILE_RANGE(script, __FUNCTION__);
+        BLOCKING_INVOKE_METHOD(this, "height", Q_RETURN_ARG(float, result));
+        return result;
+    }
+
     auto offscreenUi = DependencyManager::get<OffscreenUi>();
     return offscreenUi->getWindow()->size().height();
 }
 
 static const uint32_t MOUSE_POINTER_ID = 0;
 
-static glm::vec2 projectOntoOverlayXYPlane(glm::vec3 position, glm::quat rotation, glm::vec2 dimensions, const PickRay& pickRay, 
+static glm::vec2 projectOntoOverlayXYPlane(glm::vec3 position, glm::quat rotation, glm::vec2 dimensions, const PickRay& pickRay,
     const RayToOverlayIntersectionResult& rayPickResult) {
 
     // Project the intersection point onto the local xy plane of the overlay.
@@ -699,16 +817,20 @@ static PointerEvent::Button toPointerButton(const QMouseEvent& event) {
     }
 }
 
-PointerEvent Overlays::calculatePointerEvent(Overlay::Pointer overlay, PickRay ray,
+PointerEvent Overlays::calculateOverlayPointerEvent(OverlayID overlayID, PickRay ray,
                                              RayToOverlayIntersectionResult rayPickResult, QMouseEvent* event,
                                              PointerEvent::EventType eventType) {
+    auto overlay = std::dynamic_pointer_cast<Planar3DOverlay>(getOverlay(overlayID));
+    if (getOverlayType(overlayID) == "web3d") {
+        overlay = std::dynamic_pointer_cast<Web3DOverlay>(getOverlay(overlayID));
+    }
+    if (!overlay) {
+        return PointerEvent();
+    }
+    glm::vec3 position = overlay->getPosition();
+    glm::quat rotation = overlay->getRotation();
+    glm::vec2 dimensions = overlay->getSize();
 
-    auto thisOverlay = std::dynamic_pointer_cast<Web3DOverlay>(overlay);
-
-    QReadLocker lock(&_lock);
-    auto position = thisOverlay->getPosition();
-    auto rotation = thisOverlay->getRotation();
-    auto dimensions = thisOverlay->getSize();
 
     glm::vec2 pos2D = projectOntoOverlayXYPlane(position, rotation, dimensions, ray, rayPickResult);
 
@@ -726,21 +848,21 @@ RayToOverlayIntersectionResult Overlays::findRayIntersectionForMouseEvent(PickRa
 
     // first priority is tablet screen
     overlaysToInclude << qApp->getTabletScreenID();
-    rayPickResult = findRayIntersectionInternal(ray, true, overlaysToInclude, overlaysToDiscard);
+    rayPickResult = findRayIntersectionVector(ray, true, overlaysToInclude, overlaysToDiscard);
     if (rayPickResult.intersects) {
         return rayPickResult;
     }
     // then tablet home button
     overlaysToInclude.clear();
     overlaysToInclude << qApp->getTabletHomeButtonID();
-    rayPickResult = findRayIntersectionInternal(ray, true, overlaysToInclude, overlaysToDiscard);
+    rayPickResult = findRayIntersectionVector(ray, true, overlaysToInclude, overlaysToDiscard);
     if (rayPickResult.intersects) {
         return rayPickResult;
     }
     // then tablet frame
     overlaysToInclude.clear();
     overlaysToInclude << OverlayID(qApp->getTabletFrameID());
-    rayPickResult = findRayIntersectionInternal(ray, true, overlaysToInclude, overlaysToDiscard);
+    rayPickResult = findRayIntersectionVector(ray, true, overlaysToInclude, overlaysToDiscard);
     if (rayPickResult.intersects) {
         return rayPickResult;
     }
@@ -756,18 +878,36 @@ bool Overlays::mousePressEvent(QMouseEvent* event) {
     if (rayPickResult.intersects) {
         _currentClickingOnOverlayID = rayPickResult.overlayID;
 
-        // Only Web overlays can have focus.
-        auto thisOverlay = std::dynamic_pointer_cast<Web3DOverlay>(getOverlay(_currentClickingOnOverlayID));
-        if (thisOverlay) {
-            auto pointerEvent = calculatePointerEvent(thisOverlay, ray, rayPickResult, event, PointerEvent::Press);
-            emit mousePressOnOverlay(_currentClickingOnOverlayID, pointerEvent);
-            return true;
-        }
+        PointerEvent pointerEvent = calculateOverlayPointerEvent(_currentClickingOnOverlayID, ray, rayPickResult, event, PointerEvent::Press);
+        mousePressEvent(_currentClickingOnOverlayID, pointerEvent);
+        return true;
     }
+    // if we didn't press on an overlay, disable overlay keyboard focus
+    setKeyboardFocusOverlay(UNKNOWN_OVERLAY_ID);
+    // emit to scripts
     emit mousePressOffOverlay();
     return false;
 }
 
+void Overlays::mousePressEvent(const OverlayID& overlayID, const PointerEvent& event) {
+    // TODO: generalize this to allow any overlay to recieve events
+    std::shared_ptr<Web3DOverlay> thisOverlay;
+    if (getOverlayType(overlayID) == "web3d") {
+        thisOverlay = std::static_pointer_cast<Web3DOverlay>(getOverlay(overlayID));
+    }
+    if (thisOverlay) {
+        // Focus keyboard on web overlays
+        DependencyManager::get<EntityScriptingInterface>()->setKeyboardFocusEntity(UNKNOWN_ENTITY_ID);
+        setKeyboardFocusOverlay(overlayID);
+
+        // Send to web overlay
+        QMetaObject::invokeMethod(thisOverlay.get(), "handlePointerEvent", Q_ARG(PointerEvent, event));
+    }
+
+    // emit to scripts
+    emit mousePressOnOverlay(overlayID, event);
+}
+
 bool Overlays::mouseDoublePressEvent(QMouseEvent* event) {
     PerformanceTimer perfTimer("Overlays::mouseDoublePressEvent");
 
@@ -776,77 +916,89 @@ bool Overlays::mouseDoublePressEvent(QMouseEvent* event) {
     if (rayPickResult.intersects) {
         _currentClickingOnOverlayID = rayPickResult.overlayID;
 
-        // Only Web overlays can have focus.
-        auto thisOverlay = std::dynamic_pointer_cast<Web3DOverlay>(getOverlay(_currentClickingOnOverlayID));
-        if (thisOverlay) {
-            auto pointerEvent = calculatePointerEvent(thisOverlay, ray, rayPickResult, event, PointerEvent::Press);
-            emit mouseDoublePressOnOverlay(_currentClickingOnOverlayID, pointerEvent);
-            return true;
-        }
+        auto pointerEvent = calculateOverlayPointerEvent(_currentClickingOnOverlayID, ray, rayPickResult, event, PointerEvent::Press);
+        // emit to scripts
+        emit mouseDoublePressOnOverlay(_currentClickingOnOverlayID, pointerEvent);
+        return true;
     }
+    // emit to scripts
     emit mouseDoublePressOffOverlay();
     return false;
 }
 
+void Overlays::hoverLeaveEvent(const OverlayID& overlayID, const PointerEvent& event) {
+    // TODO: generalize this to allow any overlay to recieve events
+    std::shared_ptr<Web3DOverlay> thisOverlay;
+    if (getOverlayType(overlayID) == "web3d") {
+        thisOverlay = std::static_pointer_cast<Web3DOverlay>(getOverlay(overlayID));
+    }
+    if (thisOverlay) {
+        // Send to web overlay
+        QMetaObject::invokeMethod(thisOverlay.get(), "hoverLeaveOverlay", Q_ARG(PointerEvent, event));
+    }
+
+    // emit to scripts
+    emit hoverLeaveOverlay(overlayID, event);
+}
+
 bool Overlays::mouseReleaseEvent(QMouseEvent* event) {
     PerformanceTimer perfTimer("Overlays::mouseReleaseEvent");
 
     PickRay ray = qApp->computePickRay(event->x(), event->y());
     RayToOverlayIntersectionResult rayPickResult = findRayIntersectionForMouseEvent(ray);
     if (rayPickResult.intersects) {
-
-        // Only Web overlays can have focus.
-        auto thisOverlay = std::dynamic_pointer_cast<Web3DOverlay>(getOverlay(rayPickResult.overlayID));
-        if (thisOverlay) {
-            auto pointerEvent = calculatePointerEvent(thisOverlay, ray, rayPickResult, event, PointerEvent::Release);
-            emit mouseReleaseOnOverlay(rayPickResult.overlayID, pointerEvent);
-        }
+        auto pointerEvent = calculateOverlayPointerEvent(rayPickResult.overlayID, ray, rayPickResult, event, PointerEvent::Release);
+        mouseReleaseEvent(rayPickResult.overlayID, pointerEvent);
     }
 
     _currentClickingOnOverlayID = UNKNOWN_OVERLAY_ID;
     return false;
 }
 
+void Overlays::mouseReleaseEvent(const OverlayID& overlayID, const PointerEvent& event) {
+    // TODO: generalize this to allow any overlay to recieve events
+    std::shared_ptr<Web3DOverlay> thisOverlay;
+    if (getOverlayType(overlayID) == "web3d") {
+        thisOverlay = std::static_pointer_cast<Web3DOverlay>(getOverlay(overlayID));
+    }
+    if (thisOverlay) {
+        // Send to web overlay
+        QMetaObject::invokeMethod(thisOverlay.get(), "handlePointerEvent", Q_ARG(PointerEvent, event));
+    }
+
+    // emit to scripts
+    emit mouseReleaseOnOverlay(overlayID, event);
+}
+
 bool Overlays::mouseMoveEvent(QMouseEvent* event) {
     PerformanceTimer perfTimer("Overlays::mouseMoveEvent");
 
     PickRay ray = qApp->computePickRay(event->x(), event->y());
     RayToOverlayIntersectionResult rayPickResult = findRayIntersectionForMouseEvent(ray);
     if (rayPickResult.intersects) {
+        auto pointerEvent = calculateOverlayPointerEvent(rayPickResult.overlayID, ray, rayPickResult, event, PointerEvent::Move);
+        mouseMoveEvent(rayPickResult.overlayID, pointerEvent);
 
-        // Only Web overlays can have focus.
-        auto thisOverlay = std::dynamic_pointer_cast<Web3DOverlay>(getOverlay(rayPickResult.overlayID));
-        if (thisOverlay) {
-            auto pointerEvent = calculatePointerEvent(thisOverlay, ray, rayPickResult, event, PointerEvent::Move);
-            emit mouseMoveOnOverlay(rayPickResult.overlayID, pointerEvent);
-
-            // If previously hovering over a different overlay then leave hover on that overlay.
-            if (_currentHoverOverOverlayID != UNKNOWN_OVERLAY_ID && rayPickResult.overlayID != _currentHoverOverOverlayID) {
-                auto thisOverlay = std::dynamic_pointer_cast<Web3DOverlay>(getOverlay(_currentHoverOverOverlayID));
-                if (thisOverlay) {
-                    auto pointerEvent = calculatePointerEvent(thisOverlay, ray, rayPickResult, event, PointerEvent::Move);
-                    emit hoverLeaveOverlay(_currentHoverOverOverlayID, pointerEvent);
-                }
-            }
-
-            // If hovering over a new overlay then enter hover on that overlay.
-            if (rayPickResult.overlayID != _currentHoverOverOverlayID) {
-                emit hoverEnterOverlay(rayPickResult.overlayID, pointerEvent);
-            }
-
-            // Hover over current overlay.
-            emit hoverOverOverlay(rayPickResult.overlayID, pointerEvent);
-
-            _currentHoverOverOverlayID = rayPickResult.overlayID;
+        // If previously hovering over a different overlay then leave hover on that overlay.
+        if (_currentHoverOverOverlayID != UNKNOWN_OVERLAY_ID && rayPickResult.overlayID != _currentHoverOverOverlayID) {
+            auto pointerEvent = calculateOverlayPointerEvent(_currentHoverOverOverlayID, ray, rayPickResult, event, PointerEvent::Move);
+            hoverLeaveEvent(_currentHoverOverOverlayID, pointerEvent);
         }
+
+        // If hovering over a new overlay then enter hover on that overlay.
+        if (rayPickResult.overlayID != _currentHoverOverOverlayID) {
+            emit hoverEnterOverlay(rayPickResult.overlayID, pointerEvent);
+        }
+
+        // Hover over current overlay.
+        emit hoverOverOverlay(rayPickResult.overlayID, pointerEvent);
+
+        _currentHoverOverOverlayID = rayPickResult.overlayID;
     } else {
         // If previously hovering an overlay then leave hover.
         if (_currentHoverOverOverlayID != UNKNOWN_OVERLAY_ID) {
-            auto thisOverlay = std::dynamic_pointer_cast<Web3DOverlay>(getOverlay(_currentHoverOverOverlayID));
-            if (thisOverlay) {
-                auto pointerEvent = calculatePointerEvent(thisOverlay, ray, rayPickResult, event, PointerEvent::Move);
-                emit hoverLeaveOverlay(_currentHoverOverOverlayID, pointerEvent);
-            }
+            auto pointerEvent = calculateOverlayPointerEvent(_currentHoverOverOverlayID, ray, rayPickResult, event, PointerEvent::Move);
+            hoverLeaveEvent(_currentHoverOverOverlayID, pointerEvent);
 
             _currentHoverOverOverlayID = UNKNOWN_OVERLAY_ID;
         }
@@ -854,9 +1006,30 @@ bool Overlays::mouseMoveEvent(QMouseEvent* event) {
     return false;
 }
 
-QVector<QUuid> Overlays::findOverlays(const glm::vec3& center, float radius) const {
-    QVector<QUuid> result;
+void Overlays::mouseMoveEvent(const OverlayID& overlayID, const PointerEvent& event) {
+    // TODO: generalize this to allow any overlay to recieve events
+    std::shared_ptr<Web3DOverlay> thisOverlay;
+    if (getOverlayType(overlayID) == "web3d") {
+        thisOverlay = std::static_pointer_cast<Web3DOverlay>(getOverlay(overlayID));
+    }
+    if (thisOverlay) {
+        // Send to web overlay
+        QMetaObject::invokeMethod(thisOverlay.get(), "handlePointerEvent", Q_ARG(PointerEvent, event));
+    }
 
+    // emit to scripts
+    emit mouseMoveOnOverlay(overlayID, event);
+}
+
+QVector<QUuid> Overlays::findOverlays(const glm::vec3& center, float radius) {
+    QVector<QUuid> result;
+    //if (QThread::currentThread() != thread()) {
+    //    PROFILE_RANGE(script, __FUNCTION__);
+    //    BLOCKING_INVOKE_METHOD(this, "findOverlays", Q_RETURN_ARG(QVector<QUuid>, result), Q_ARG(glm::vec3, center), Q_ARG(float, radius));
+    //    return result;
+    //}
+
+    QMutexLocker locker(&_mutex);
     QMapIterator<OverlayID, Overlay::Pointer> i(_overlaysWorld);
     int checked = 0;
     while (i.hasNext()) {
@@ -871,6 +1044,7 @@ QVector<QUuid> Overlays::findOverlays(const glm::vec3& center, float radius) con
             AABox overlayFrameBox(low, dimensions);
 
             Transform overlayToWorldMatrix = overlay->getTransform();
+            overlayToWorldMatrix.setScale(1.0f);  // ignore inherited scale factor from parents
             glm::mat4 worldToOverlayMatrix = glm::inverse(overlayToWorldMatrix.getMatrix());
             glm::vec3 overlayFrameSearchPosition = glm::vec3(worldToOverlayMatrix * glm::vec4(center, 1.0f));
             glm::vec3 penetration;
diff --git a/interface/src/ui/overlays/Overlays.h b/interface/src/ui/overlays/Overlays.h
index a1d4be8376..988b288741 100644
--- a/interface/src/ui/overlays/Overlays.h
+++ b/interface/src/ui/overlays/Overlays.h
@@ -25,8 +25,9 @@
 #include <PointerEvent.h>
 
 #include "Overlay.h"
-#include "OverlayPanel.h"
+
 #include "PanelAttachable.h"
+#include "OverlayPanel.h"
 
 class PickRay;
 
@@ -41,6 +42,8 @@ Q_DECLARE_METATYPE(OverlayPropertyResult);
 QScriptValue OverlayPropertyResultToScriptValue(QScriptEngine* engine, const OverlayPropertyResult& value);
 void OverlayPropertyResultFromScriptValue(const QScriptValue& object, OverlayPropertyResult& value);
 
+const OverlayID UNKNOWN_OVERLAY_ID = OverlayID();
+
 /**jsdoc
  * @typedef Overlays.RayToOverlayIntersectionResult
  * @property {bool} intersects True if the PickRay intersected with a 3D overlay.
@@ -51,10 +54,9 @@ void OverlayPropertyResultFromScriptValue(const QScriptValue& object, OverlayPro
  */
 class RayToOverlayIntersectionResult {
 public:
-    RayToOverlayIntersectionResult();
-    bool intersects;
-    OverlayID overlayID;
-    float distance;
+    bool intersects { false };
+    OverlayID overlayID { UNKNOWN_OVERLAY_ID };
+    float distance { 0 };
     BoxFace face;
     glm::vec3 surfaceNormal;
     glm::vec3 intersection;
@@ -77,8 +79,6 @@ void RayToOverlayIntersectionResultFromScriptValue(const QScriptValue& object, R
  * @namespace Overlays
  */
 
-const OverlayID UNKNOWN_OVERLAY_ID = OverlayID();
-
 class Overlays : public QObject {
     Q_OBJECT
 
@@ -94,17 +94,24 @@ public:
     void enable();
 
     Overlay::Pointer getOverlay(OverlayID id) const;
+#if OVERLAY_PANELS
     OverlayPanel::Pointer getPanel(OverlayID id) const { return _panels[id]; }
+#endif
 
     /// adds an overlay that's already been created
     OverlayID addOverlay(Overlay* overlay) { return addOverlay(Overlay::Pointer(overlay)); }
-    OverlayID addOverlay(Overlay::Pointer overlay);
+    OverlayID addOverlay(const Overlay::Pointer& overlay);
 
     bool mousePressEvent(QMouseEvent* event);
     bool mouseDoublePressEvent(QMouseEvent* event);
     bool mouseReleaseEvent(QMouseEvent* event);
     bool mouseMoveEvent(QMouseEvent* event);
 
+    void mousePressEvent(const OverlayID& overlayID, const PointerEvent& event);
+    void mouseMoveEvent(const OverlayID& overlayID, const PointerEvent& event);
+    void mouseReleaseEvent(const OverlayID& overlayID, const PointerEvent& event);
+    void hoverLeaveEvent(const OverlayID& overlayID, const PointerEvent& event);
+
     void cleanupAllOverlays();
 
 public slots:
@@ -129,7 +136,7 @@ public slots:
     OverlayID cloneOverlay(OverlayID id);
 
     /**jsdoc
-     * Edit an overlay's properties. 
+     * Edit an overlay's properties.
      *
      * @function Overlays.editOverlay
      * @param {Overlays.OverlayID} overlayID The ID of the overlay to edit.
@@ -156,7 +163,7 @@ public slots:
      * @param {Overlays.OverlayID} overlayID The ID of the overlay to get the type of.
      * @return {string} The type of the overlay if found, otherwise the empty string.
      */
-    QString getOverlayType(OverlayID overlayId) const;
+    QString getOverlayType(OverlayID overlayId);
 
     /**jsdoc
     * Get the overlay Script object.
@@ -188,6 +195,10 @@ public slots:
      */
     OverlayPropertyResult getProperty(OverlayID id, const QString& property);
 
+    OverlayPropertyResult getProperties(const OverlayID& id, const QStringList& properties);
+
+    OverlayPropertyResult getOverlaysProperties(const QVariant& overlaysProperties);
+
     /*jsdoc
      * Find the closest 3D overlay hit by a pick ray.
      *
@@ -207,6 +218,12 @@ public slots:
                                                        bool visibleOnly = false,
                                                        bool collidableOnly = false);
 
+    // Same as above but with QVectors
+    RayToOverlayIntersectionResult findRayIntersectionVector(const PickRay& ray, bool precisionPicking,
+                                                             const QVector<OverlayID>& overlaysToInclude,
+                                                             const QVector<OverlayID>& overlaysToDiscard,
+                                                             bool visibleOnly = false, bool collidableOnly = false);
+
     /**jsdoc
      * Return a list of 3d overlays with bounding boxes that touch the given sphere
      *
@@ -215,7 +232,7 @@ public slots:
      * @param {float} radius search radius
      * @return {Overlays.OverlayID[]} list of overlays withing the radius
      */
-    QVector<QUuid> findOverlays(const glm::vec3& center, float radius) const;
+    QVector<QUuid> findOverlays(const glm::vec3& center, float radius);
 
     /**jsdoc
      * Check whether an overlay's assets have been loaded. For example, if the
@@ -237,7 +254,7 @@ public slots:
      * @param {string} The string to measure.
      * @return {Vec2} The size of the text.
      */
-    QSizeF textSize(OverlayID id, const QString& text) const;
+    QSizeF textSize(OverlayID id, const QString& text);
 
     /**jsdoc
      * Get the width of the virtual 2D HUD.
@@ -245,7 +262,7 @@ public slots:
      * @function Overlays.width
      * @return {float} The width of the 2D HUD.
      */
-    float width() const;
+    float width();
 
     /**jsdoc
      * Get the height of the virtual 2D HUD.
@@ -253,11 +270,12 @@ public slots:
      * @function Overlays.height
      * @return {float} The height of the 2D HUD.
      */
-    float height() const;
+    float height();
 
     /// return true if there is an overlay with that id else false
     bool isAddedOverlay(OverlayID id);
 
+#if OVERLAY_PANELS
     OverlayID getParentPanel(OverlayID childId) const;
     void setParentPanel(OverlayID childId, OverlayID panelId);
 
@@ -279,16 +297,18 @@ public slots:
     /// return true if there is a panel with that id else false
     bool isAddedPanel(OverlayID id) { return _panels.contains(id); }
 
-    void sendMousePressOnOverlay(OverlayID overlayID, const PointerEvent& event);
-    void sendMouseReleaseOnOverlay(OverlayID overlayID, const PointerEvent& event);
-    void sendMouseMoveOnOverlay(OverlayID overlayID, const PointerEvent& event);
+#endif
 
-    void sendHoverEnterOverlay(OverlayID id, PointerEvent event);
-    void sendHoverOverOverlay(OverlayID id, PointerEvent event);
-    void sendHoverLeaveOverlay(OverlayID id, PointerEvent event);
+    void sendMousePressOnOverlay(const OverlayID& overlayID, const PointerEvent& event);
+    void sendMouseReleaseOnOverlay(const OverlayID& overlayID, const PointerEvent& event);
+    void sendMouseMoveOnOverlay(const OverlayID& overlayID, const PointerEvent& event);
 
-    OverlayID getKeyboardFocusOverlay() const;
-    void setKeyboardFocusOverlay(OverlayID id);
+    void sendHoverEnterOverlay(const OverlayID& overlayID, const PointerEvent& event);
+    void sendHoverOverOverlay(const OverlayID& overlayID, const PointerEvent& event);
+    void sendHoverLeaveOverlay(const OverlayID& overlayID, const PointerEvent& event);
+
+    OverlayID getKeyboardFocusOverlay();
+    void setKeyboardFocusOverlay(const OverlayID& id);
 
 signals:
     /**jsdoc
@@ -314,27 +334,27 @@ signals:
 private:
     void cleanupOverlaysToDelete();
 
+    mutable QMutex _mutex { QMutex::Recursive };
     QMap<OverlayID, Overlay::Pointer> _overlaysHUD;
     QMap<OverlayID, Overlay::Pointer> _overlaysWorld;
+
+#if OVERLAY_PANELS
     QMap<OverlayID, OverlayPanel::Pointer> _panels;
+#endif
     QList<Overlay::Pointer> _overlaysToDelete;
     unsigned int _stackOrder { 1 };
 
-    QReadWriteLock _lock;
-    QReadWriteLock _deleteLock;
+#if OVERLAY_PANELS
     QScriptEngine* _scriptEngine;
+#endif
     bool _enabled = true;
 
-    PointerEvent calculatePointerEvent(Overlay::Pointer overlay, PickRay ray, RayToOverlayIntersectionResult rayPickResult,
+    PointerEvent calculateOverlayPointerEvent(OverlayID overlayID, PickRay ray, RayToOverlayIntersectionResult rayPickResult,
         QMouseEvent* event, PointerEvent::EventType eventType);
 
     OverlayID _currentClickingOnOverlayID { UNKNOWN_OVERLAY_ID };
     OverlayID _currentHoverOverOverlayID { UNKNOWN_OVERLAY_ID };
 
-    RayToOverlayIntersectionResult findRayIntersectionInternal(const PickRay& ray, bool precisionPicking,
-                                                               const QVector<OverlayID>& overlaysToInclude,
-                                                               const QVector<OverlayID>& overlaysToDiscard,
-                                                               bool visibleOnly = false, bool collidableOnly = false);
     RayToOverlayIntersectionResult findRayIntersectionForMouseEvent(PickRay ray);
 };
 
diff --git a/interface/src/ui/overlays/OverlaysPayload.cpp b/interface/src/ui/overlays/OverlaysPayload.cpp
index d14805c1ba..194c530df0 100644
--- a/interface/src/ui/overlays/OverlaysPayload.cpp
+++ b/interface/src/ui/overlays/OverlaysPayload.cpp
@@ -34,13 +34,11 @@ namespace render {
     template <> const ItemKey payloadGetKey(const Overlay::Pointer& overlay) {
         auto builder = ItemKey::Builder().withTypeShape();
         if (overlay->is3D()) {
-            if (std::static_pointer_cast<Base3DOverlay>(overlay)->getDrawInFront()) {
+            auto overlay3D = std::static_pointer_cast<Base3DOverlay>(overlay);
+            if (overlay3D->getDrawInFront() || overlay3D->getDrawHUDLayer()) {
                 builder.withLayered();
             }
-            if (!std::static_pointer_cast<Base3DOverlay>(overlay)->isAA()) {
-                builder.withLayered();
-            }
-            if (overlay->getAlphaPulse() != 0.0f || overlay->getAlpha() != 1.0f) {
+            if (overlay->isTransparent()) {
                 builder.withTransparent();
             }
         } else {
@@ -52,24 +50,17 @@ namespace render {
         return overlay->getBounds();
     }
     template <> int payloadGetLayer(const Overlay::Pointer& overlay) {
-        // Magic number while we are defining the layering mechanism:
-        const int LAYER_NO_AA = 3;
-        const int LAYER_2D = 2;
-        const int LAYER_3D_FRONT = 1;
-        const int LAYER_3D = 0;
-
         if (overlay->is3D()) {
             auto overlay3D = std::dynamic_pointer_cast<Base3DOverlay>(overlay);
-            if (overlay3D->isAA())
-                if (overlay3D->getDrawInFront()) {
-                    return LAYER_3D_FRONT;
-                } else {
-                    return LAYER_3D;
-                }
-            else
-                return LAYER_NO_AA;
+            if (overlay3D->getDrawInFront()) {
+                return Item::LAYER_3D_FRONT;
+            } else if (overlay3D->getDrawHUDLayer()) {
+                return Item::LAYER_3D_HUD;
+            } else {
+                return Item::LAYER_3D;
+            }
         } else {
-            return LAYER_2D;
+            return Item::LAYER_2D;
         }
     }
     template <> void payloadRender(const Overlay::Pointer& overlay, RenderArgs* args) {
@@ -81,7 +72,7 @@ namespace render {
                 glm::vec3 myAvatarPosition = avatar->getPosition();
                 float angle = glm::degrees(glm::angle(myAvatarRotation));
                 glm::vec3 axis = glm::axis(myAvatarRotation);
-                float myAvatarScale = avatar->getUniformScale();
+                float myAvatarScale = avatar->getModelScale();
                 Transform transform = Transform();
                 transform.setTranslation(myAvatarPosition);
                 transform.setRotation(glm::angleAxis(angle, axis));
diff --git a/interface/src/ui/overlays/PanelAttachable.cpp b/interface/src/ui/overlays/PanelAttachable.cpp
index 7f1c4e2e50..aae8893667 100644
--- a/interface/src/ui/overlays/PanelAttachable.cpp
+++ b/interface/src/ui/overlays/PanelAttachable.cpp
@@ -16,11 +16,15 @@
 #include "OverlayPanel.h"
 
 bool PanelAttachable::getParentVisible() const {
+#if OVERLAY_PANELS
     if (getParentPanel()) {
         return getParentPanel()->getVisible() && getParentPanel()->getParentVisible();
     } else {
         return true;
     }
+#else
+    return true;
+#endif
 }
 
 QVariant PanelAttachable::getProperty(const QString& property) {
@@ -57,15 +61,19 @@ void PanelAttachable::setProperties(const QVariantMap& properties) {
     }
 }
 
-void PanelAttachable::applyTransformTo(Transform& transform, bool force) {
+bool PanelAttachable::applyTransformTo(Transform& transform, bool force) {
     if (force || usecTimestampNow() > _transformExpiry) {
         const quint64 TRANSFORM_UPDATE_PERIOD = 100000; // frequency is 10 Hz
         _transformExpiry = usecTimestampNow() + TRANSFORM_UPDATE_PERIOD;
+#if OVERLAY_PANELS
         if (getParentPanel()) {
             getParentPanel()->applyTransformTo(transform, true);
             transform.postTranslate(getOffsetPosition());
             transform.postRotate(getOffsetRotation());
             transform.postScale(getOffsetScale());
+            return true;
         }
+#endif
     }
+    return false;
 }
diff --git a/interface/src/ui/overlays/PanelAttachable.h b/interface/src/ui/overlays/PanelAttachable.h
index 270addbfcf..1598aa4700 100644
--- a/interface/src/ui/overlays/PanelAttachable.h
+++ b/interface/src/ui/overlays/PanelAttachable.h
@@ -30,6 +30,8 @@
 #ifndef hifi_PanelAttachable_h
 #define hifi_PanelAttachable_h
 
+#define OVERLAY_PANELS 0
+
 #include <memory>
 
 #include <glm/glm.hpp>
@@ -39,18 +41,21 @@
 #include <QUuid>
 
 class OverlayPanel;
-
 class PanelAttachable {
 public:
     // getters
+#if OVERLAY_PANELS
     std::shared_ptr<OverlayPanel> getParentPanel() const { return _parentPanel; }
+#endif
     glm::vec3 getOffsetPosition() const { return _offset.getTranslation(); }
     glm::quat getOffsetRotation() const { return _offset.getRotation(); }
     glm::vec3 getOffsetScale() const { return _offset.getScale(); }
     bool getParentVisible() const;
 
     // setters
+#if OVERLAY_PANELS
     void setParentPanel(std::shared_ptr<OverlayPanel> panel) { _parentPanel = panel; }
+#endif
     void setOffsetPosition(const glm::vec3& position) { _offset.setTranslation(position); }
     void setOffsetRotation(const glm::quat& rotation) { _offset.setRotation(rotation); }
     void setOffsetScale(float scale) { _offset.setScale(scale); }
@@ -62,11 +67,13 @@ protected:
 
     /// set position, rotation and scale on transform based on offsets, and parent panel offsets
     /// if force is false, only apply transform if it hasn't been applied in the last .1 seconds
-    virtual void applyTransformTo(Transform& transform, bool force = false);
+    virtual bool applyTransformTo(Transform& transform, bool force = false);
     quint64 _transformExpiry = 0;
 
 private:
+#if OVERLAY_PANELS
     std::shared_ptr<OverlayPanel> _parentPanel = nullptr;
+#endif
     Transform _offset;
 };
 
diff --git a/interface/src/ui/overlays/Planar3DOverlay.cpp b/interface/src/ui/overlays/Planar3DOverlay.cpp
index 58d72b100b..a9f0bfe2f1 100644
--- a/interface/src/ui/overlays/Planar3DOverlay.cpp
+++ b/interface/src/ui/overlays/Planar3DOverlay.cpp
@@ -35,6 +35,11 @@ AABox Planar3DOverlay::getBounds() const {
     return AABox(extents);
 }
 
+void Planar3DOverlay::setDimensions(const glm::vec2& value) {
+    _dimensions = value;
+    notifyRenderVariableChange();
+}
+
 void Planar3DOverlay::setProperties(const QVariantMap& properties) {
     Base3DOverlay::setProperties(properties);
 
@@ -66,3 +71,12 @@ bool Planar3DOverlay::findRayIntersection(const glm::vec3& origin, const glm::ve
     // FIXME - face and surfaceNormal not being returned
     return findRayRectangleIntersection(origin, direction, getRotation(), getPosition(), getDimensions(), distance);
 }
+
+Transform Planar3DOverlay::evalRenderTransform() {
+    auto transform = getTransform();
+    transform.setScale(1.0f); // ignore inherited scale factor from parents
+    if (glm::length2(getDimensions()) != 1.0f) {
+        transform.postScale(vec3(getDimensions(), 1.0f));
+    }
+    return transform;
+}
diff --git a/interface/src/ui/overlays/Planar3DOverlay.h b/interface/src/ui/overlays/Planar3DOverlay.h
index 9c502ab75e..1360cccfc2 100644
--- a/interface/src/ui/overlays/Planar3DOverlay.h
+++ b/interface/src/ui/overlays/Planar3DOverlay.h
@@ -21,19 +21,22 @@ public:
     Planar3DOverlay(const Planar3DOverlay* planar3DOverlay);
     
     virtual AABox getBounds() const override;
+    virtual glm::vec2 getSize() const { return _dimensions; };
     
     glm::vec2 getDimensions() const { return _dimensions; }
-    void setDimensions(float value) { _dimensions = glm::vec2(value); }
-    void setDimensions(const glm::vec2& value) { _dimensions = value; }
+    void setDimensions(float value) { setDimensions(glm::vec2(value)); }
+    void setDimensions(const glm::vec2& value);
     
     void setProperties(const QVariantMap& properties) override;
     QVariant getProperty(const QString& property) override;
 
     virtual bool findRayIntersection(const glm::vec3& origin, const glm::vec3& direction, float& distance, 
                                         BoxFace& face, glm::vec3& surfaceNormal) override;
-    
+  
 protected:
     glm::vec2 _dimensions;
+
+    Transform evalRenderTransform() override;
 };
 
  
diff --git a/interface/src/ui/overlays/QmlOverlay.cpp b/interface/src/ui/overlays/QmlOverlay.cpp
index eb909de993..15e72cf1e3 100644
--- a/interface/src/ui/overlays/QmlOverlay.cpp
+++ b/interface/src/ui/overlays/QmlOverlay.cpp
@@ -32,21 +32,20 @@ QmlOverlay::QmlOverlay(const QUrl& url, const QmlOverlay* textOverlay)
 }
 
 void QmlOverlay::buildQmlElement(const QUrl& url) {
+    if (QThread::currentThread() != thread()) {
+        QMetaObject::invokeMethod(this, "buildQmlElement", Q_ARG(QUrl, url));
+        return;
+    }
+
     auto offscreenUi = DependencyManager::get<OffscreenUi>();
-    offscreenUi->returnFromUiThread([=] {
-        offscreenUi->load(url, [=](QQmlContext* context, QObject* object) {
-            QQuickItem* rawPtr = dynamic_cast<QQuickItem*>(object);
-            // Create a shared ptr with a custom deleter lambda, that calls deleteLater
-            _qmlElement = std::shared_ptr<QQuickItem>(rawPtr, [](QQuickItem* ptr) {
-                if (ptr) {
-                    ptr->deleteLater();
-                }
-            });
+    offscreenUi->load(url, [=](QQmlContext* context, QObject* object) {
+        QQuickItem* rawPtr = dynamic_cast<QQuickItem*>(object);
+        // Create a shared ptr with a custom deleter lambda, that calls deleteLater
+        _qmlElement = std::shared_ptr<QQuickItem>(rawPtr, [](QQuickItem* ptr) {
+            if (ptr) {
+                ptr->deleteLater();
+            }
         });
-        while (!_qmlElement) {
-            qApp->processEvents();
-        }
-        return QVariant();
     });
 }
 
@@ -55,20 +54,23 @@ QmlOverlay::~QmlOverlay() {
 }
 
 void QmlOverlay::setProperties(const QVariantMap& properties) {
+    if (QThread::currentThread() != thread()) {
+        QMetaObject::invokeMethod(this, "setProperties", Q_ARG(QVariantMap, properties));
+        return;
+    }
+
     Overlay2D::setProperties(properties);
     auto bounds = _bounds;
     std::weak_ptr<QQuickItem> weakQmlElement = _qmlElement;
-    DependencyManager::get<OffscreenUi>()->executeOnUiThread([weakQmlElement, bounds, properties] {
-        // check to see if qmlElement still exists
-        auto qmlElement = weakQmlElement.lock();
-        if (qmlElement) {
-            qmlElement->setX(bounds.left());
-            qmlElement->setY(bounds.top());
-            qmlElement->setWidth(bounds.width());
-            qmlElement->setHeight(bounds.height());
-            QMetaObject::invokeMethod(qmlElement.get(), "updatePropertiesFromScript", Qt::DirectConnection, Q_ARG(QVariant, properties));
-        }
-    });
+    // check to see if qmlElement still exists
+    auto qmlElement = weakQmlElement.lock();
+    if (qmlElement) {
+        qmlElement->setX(bounds.left());
+        qmlElement->setY(bounds.top());
+        qmlElement->setWidth(bounds.width());
+        qmlElement->setHeight(bounds.height());
+        QMetaObject::invokeMethod(qmlElement.get(), "updatePropertiesFromScript", Qt::DirectConnection, Q_ARG(QVariant, properties));
+    }
 }
 
 void QmlOverlay::render(RenderArgs* args) {
diff --git a/interface/src/ui/overlays/QmlOverlay.h b/interface/src/ui/overlays/QmlOverlay.h
index 736d3884b5..ced2b6fa1f 100644
--- a/interface/src/ui/overlays/QmlOverlay.h
+++ b/interface/src/ui/overlays/QmlOverlay.h
@@ -32,7 +32,7 @@ public:
     void render(RenderArgs* args) override;
 
 private:
-    void buildQmlElement(const QUrl& url);
+    Q_INVOKABLE void buildQmlElement(const QUrl& url);
 
 protected:
     std::shared_ptr<QQuickItem> _qmlElement;
diff --git a/interface/src/ui/overlays/Rectangle3DOverlay.cpp b/interface/src/ui/overlays/Rectangle3DOverlay.cpp
index f981fe1462..f2e324206d 100644
--- a/interface/src/ui/overlays/Rectangle3DOverlay.cpp
+++ b/interface/src/ui/overlays/Rectangle3DOverlay.cpp
@@ -23,7 +23,6 @@ Rectangle3DOverlay::Rectangle3DOverlay() :
     for (size_t i = 0; i < _rectGeometryIds.size(); ++i) {
         _rectGeometryIds[i] = geometryCache->allocateID();
     }
-    qDebug() << "Building rect3d overlay";
 }
 
 Rectangle3DOverlay::Rectangle3DOverlay(const Rectangle3DOverlay* rectangle3DOverlay) :
@@ -34,11 +33,9 @@ Rectangle3DOverlay::Rectangle3DOverlay(const Rectangle3DOverlay* rectangle3DOver
     for (size_t i = 0; i < _rectGeometryIds.size(); ++i) {
         _rectGeometryIds[i] = geometryCache->allocateID();
     }
-    qDebug() << "Building rect3d overlay";
 }
 
 Rectangle3DOverlay::~Rectangle3DOverlay() {
-    qDebug() << "Destryoing rect3d overlay";
     auto geometryCache = DependencyManager::get<GeometryCache>();
     if (geometryCache) {
         geometryCache->releaseID(_geometryCacheID);
@@ -49,7 +46,7 @@ Rectangle3DOverlay::~Rectangle3DOverlay() {
 }
 
 void Rectangle3DOverlay::render(RenderArgs* args) {
-    if (!_visible) {
+    if (!_renderVisible) {
         return; // do nothing if we're not visible
     }
 
@@ -58,17 +55,11 @@ void Rectangle3DOverlay::render(RenderArgs* args) {
     const float MAX_COLOR = 255.0f;
     glm::vec4 rectangleColor(color.red / MAX_COLOR, color.green / MAX_COLOR, color.blue / MAX_COLOR, alpha);
 
-    glm::vec3 position = getPosition();
-    glm::vec2 dimensions = getDimensions();
-    glm::vec2 halfDimensions = dimensions * 0.5f;
-    glm::quat rotation = getRotation();
-
     auto batch = args->_batch;
-
     if (batch) {
-        Transform transform;
-        transform.setTranslation(position);
-        transform.setRotation(rotation);
+        Transform transform = getRenderTransform();
+        glm::vec2 halfDimensions = transform.getScale() * 0.5f;
+        transform.setScale(1.0f);
 
         batch->setModelTransform(transform);
         auto geometryCache = DependencyManager::get<GeometryCache>();
@@ -110,7 +101,7 @@ void Rectangle3DOverlay::render(RenderArgs* args) {
 
 const render::ShapeKey Rectangle3DOverlay::getShapeKey() {
     auto builder = render::ShapeKey::Builder().withOwnPipeline();
-    if (getAlpha() != 1.0f) {
+    if (isTransparent()) {
         builder.withTranslucent();
     }
     return builder.build();
diff --git a/interface/src/ui/overlays/Rectangle3DOverlay.h b/interface/src/ui/overlays/Rectangle3DOverlay.h
index a0c342a25b..645553ed38 100644
--- a/interface/src/ui/overlays/Rectangle3DOverlay.h
+++ b/interface/src/ui/overlays/Rectangle3DOverlay.h
@@ -28,6 +28,7 @@ public:
     void setProperties(const QVariantMap& properties) override;
 
     virtual Rectangle3DOverlay* createClone() const override;
+
 private:
     int _geometryCacheID;
     std::array<int, 4> _rectGeometryIds;
diff --git a/interface/src/ui/overlays/Shape3DOverlay.cpp b/interface/src/ui/overlays/Shape3DOverlay.cpp
index 72c57565d4..bd8e6a9728 100644
--- a/interface/src/ui/overlays/Shape3DOverlay.cpp
+++ b/interface/src/ui/overlays/Shape3DOverlay.cpp
@@ -24,7 +24,7 @@ Shape3DOverlay::Shape3DOverlay(const Shape3DOverlay* Shape3DOverlay) :
 }
 
 void Shape3DOverlay::render(RenderArgs* args) {
-    if (!_visible) {
+    if (!_renderVisible) {
         return; // do nothing if we're not visible
     }
 
@@ -33,36 +33,26 @@ void Shape3DOverlay::render(RenderArgs* args) {
     const float MAX_COLOR = 255.0f;
     glm::vec4 cubeColor(color.red / MAX_COLOR, color.green / MAX_COLOR, color.blue / MAX_COLOR, alpha);
 
-    // TODO: handle registration point??
-    glm::vec3 position = getPosition();
-    glm::vec3 dimensions = getDimensions();
-    glm::quat rotation = getRotation();
-
     auto batch = args->_batch;
-
     if (batch) {
-        Transform transform;
-        transform.setTranslation(position);
-        transform.setRotation(rotation);
         auto geometryCache = DependencyManager::get<GeometryCache>();
-        auto pipeline = args->_pipeline;
-        if (!pipeline) {
-            pipeline = _isSolid ? geometryCache->getOpaqueShapePipeline() : geometryCache->getWireShapePipeline();
+        auto shapePipeline = args->_shapePipeline;
+        if (!shapePipeline) {
+            shapePipeline = _isSolid ? geometryCache->getOpaqueShapePipeline() : geometryCache->getWireShapePipeline();
         }
 
-        transform.setScale(dimensions);
-        batch->setModelTransform(transform);
+        batch->setModelTransform(getRenderTransform());
         if (_isSolid) {
-            geometryCache->renderSolidShapeInstance(args, *batch, _shape, cubeColor, pipeline);
+            geometryCache->renderSolidShapeInstance(args, *batch, _shape, cubeColor, shapePipeline);
         } else {
-            geometryCache->renderWireShapeInstance(args, *batch, _shape, cubeColor, pipeline);
+            geometryCache->renderWireShapeInstance(args, *batch, _shape, cubeColor, shapePipeline);
         }
     }
 }
 
 const render::ShapeKey Shape3DOverlay::getShapeKey() {
     auto builder = render::ShapeKey::Builder();
-    if (getAlpha() != 1.0f) {
+    if (isTransparent()) {
         builder.withTranslucent();
     }
     if (!getIsSolid()) {
@@ -128,3 +118,16 @@ QVariant Shape3DOverlay::getProperty(const QString& property) {
 
     return Volume3DOverlay::getProperty(property);
 }
+
+Transform Shape3DOverlay::evalRenderTransform() {
+    // TODO: handle registration point??
+    glm::vec3 position = getPosition();
+    glm::vec3 dimensions = getDimensions();
+    glm::quat rotation = getRotation();
+
+    Transform transform;
+    transform.setScale(dimensions);
+    transform.setTranslation(position);
+    transform.setRotation(rotation);
+    return transform;
+}
diff --git a/interface/src/ui/overlays/Shape3DOverlay.h b/interface/src/ui/overlays/Shape3DOverlay.h
index 2361001721..e9e26e3c94 100644
--- a/interface/src/ui/overlays/Shape3DOverlay.h
+++ b/interface/src/ui/overlays/Shape3DOverlay.h
@@ -37,6 +37,9 @@ public:
     void setProperties(const QVariantMap& properties) override;
     QVariant getProperty(const QString& property) override;
 
+protected:
+    Transform evalRenderTransform() override;
+
 private:
     float _borderSize;
     GeometryCache::Shape _shape { GeometryCache::Hexagon };
diff --git a/interface/src/ui/overlays/Sphere3DOverlay.cpp b/interface/src/ui/overlays/Sphere3DOverlay.cpp
index 67e11cf1d8..2013e5689a 100644
--- a/interface/src/ui/overlays/Sphere3DOverlay.cpp
+++ b/interface/src/ui/overlays/Sphere3DOverlay.cpp
@@ -27,7 +27,7 @@ Sphere3DOverlay::Sphere3DOverlay(const Sphere3DOverlay* Sphere3DOverlay) :
 }
 
 void Sphere3DOverlay::render(RenderArgs* args) {
-    if (!_visible) {
+    if (!_renderVisible) {
         return; // do nothing if we're not visible
     }
 
@@ -39,27 +39,25 @@ void Sphere3DOverlay::render(RenderArgs* args) {
     auto batch = args->_batch;
 
     if (batch) {
-        Transform transform = getTransform();
-        transform.postScale(getDimensions() * SPHERE_OVERLAY_SCALE);
-        batch->setModelTransform(transform);
+        batch->setModelTransform(getRenderTransform());
 
         auto geometryCache = DependencyManager::get<GeometryCache>();
-        auto pipeline = args->_pipeline;
-        if (!pipeline) {
-            pipeline = _isSolid ? geometryCache->getOpaqueShapePipeline() : geometryCache->getWireShapePipeline();
+        auto shapePipeline = args->_shapePipeline;
+        if (!shapePipeline) {
+            shapePipeline = _isSolid ? geometryCache->getOpaqueShapePipeline() : geometryCache->getWireShapePipeline();
         }
 
         if (_isSolid) {
-            geometryCache->renderSolidSphereInstance(args, *batch, sphereColor, pipeline);
+            geometryCache->renderSolidSphereInstance(args, *batch, sphereColor, shapePipeline);
         } else {
-            geometryCache->renderWireSphereInstance(args, *batch, sphereColor, pipeline);
+            geometryCache->renderWireSphereInstance(args, *batch, sphereColor, shapePipeline);
         }
     }
 }
 
 const render::ShapeKey Sphere3DOverlay::getShapeKey() {
     auto builder = render::ShapeKey::Builder();
-    if (getAlpha() != 1.0f) {
+    if (isTransparent()) {
         builder.withTranslucent();
     }
     if (!getIsSolid()) {
@@ -71,3 +69,11 @@ const render::ShapeKey Sphere3DOverlay::getShapeKey() {
 Sphere3DOverlay* Sphere3DOverlay::createClone() const {
     return new Sphere3DOverlay(this);
 }
+
+Transform Sphere3DOverlay::evalRenderTransform() {
+    Transform transform = getTransform();
+    transform.setScale(1.0f);  // ignore inherited scale from SpatiallyNestable
+    transform.postScale(getDimensions() * SPHERE_OVERLAY_SCALE);
+
+    return transform;
+}
diff --git a/interface/src/ui/overlays/Sphere3DOverlay.h b/interface/src/ui/overlays/Sphere3DOverlay.h
index 991b2ab51e..ebe6dc8d83 100644
--- a/interface/src/ui/overlays/Sphere3DOverlay.h
+++ b/interface/src/ui/overlays/Sphere3DOverlay.h
@@ -27,6 +27,9 @@ public:
     virtual const render::ShapeKey getShapeKey() override;
 
     virtual Sphere3DOverlay* createClone() const override;
+
+protected:
+    Transform evalRenderTransform() override;
 };
 
  
diff --git a/interface/src/ui/overlays/Text3DOverlay.cpp b/interface/src/ui/overlays/Text3DOverlay.cpp
index ed29bc4e1b..1cbc73304b 100644
--- a/interface/src/ui/overlays/Text3DOverlay.cpp
+++ b/interface/src/ui/overlays/Text3DOverlay.cpp
@@ -17,6 +17,8 @@
 #include <RenderDeferredTask.h>
 #include <TextRenderer3D.h>
 
+#include <AbstractViewStateInterface.h>
+
 const int FIXED_FONT_POINT_SIZE = 40;
 const int FIXED_FONT_SCALING_RATIO = FIXED_FONT_POINT_SIZE * 80.0f; // this is a ratio determined through experimentation
 const float LINE_SCALE_RATIO = 1.2f;
@@ -86,19 +88,18 @@ void Text3DOverlay::update(float deltatime) {
         applyTransformTo(transform);
         setTransform(transform);
     }
+    Parent::update(deltatime);
 }
 
 void Text3DOverlay::render(RenderArgs* args) {
-    if (!_visible || !getParentVisible()) {
+    if (!_renderVisible || !getParentVisible()) {
         return; // do nothing if we're not visible
     }
 
     Q_ASSERT(args->_batch);
     auto& batch = *args->_batch;
 
-    Transform transform = getTransform();
-    applyTransformTo(transform, true);
-    setTransform(transform);
+    auto transform = getRenderTransform();
     batch.setModelTransform(transform);
 
     const float MAX_COLOR = 255.0f;
@@ -113,6 +114,7 @@ void Text3DOverlay::render(RenderArgs* args) {
 
     glm::vec3 topLeft(-halfDimensions.x, -halfDimensions.y, SLIGHTLY_BEHIND);
     glm::vec3 bottomRight(halfDimensions.x, halfDimensions.y, SLIGHTLY_BEHIND);
+    DependencyManager::get<GeometryCache>()->bindSimpleProgram(batch, false, quadColor.a < 1.0f, false, false, false, false);
     DependencyManager::get<GeometryCache>()->renderQuad(batch, topLeft, bottomRight, quadColor, _geometryId);
 
     // Same font properties as textSize()
@@ -132,18 +134,13 @@ void Text3DOverlay::render(RenderArgs* args) {
     glm::vec4 textColor = { _color.red / MAX_COLOR, _color.green / MAX_COLOR,
                             _color.blue / MAX_COLOR, getTextAlpha() };
 
-    // FIXME: Factor out textRenderer so that Text3DOverlay overlay parts can be grouped by pipeline
-    //        for a gpu performance increase. Currently,
-    //        Text renderer sets its own pipeline,
-    _textRenderer->draw(batch, 0, 0, getText(), textColor, glm::vec2(-1.0f), getDrawInFront());
-    //        so before we continue, we must reset the pipeline
-    batch.setPipeline(args->_pipeline->pipeline);
-    args->_pipeline->prepare(batch, args);
+    // FIXME: Factor out textRenderer so that Text3DOverlay overlay parts can be grouped by pipeline for a gpu performance increase.
+    _textRenderer->draw(batch, 0, 0, getText(), textColor, glm::vec2(-1.0f), true);
 }
 
 const render::ShapeKey Text3DOverlay::getShapeKey() {
     auto builder = render::ShapeKey::Builder();
-    if (getAlpha() != 1.0f) {
+    if (isTransparent()) {
         builder.withTranslucent();
     }
     return builder.build();
@@ -159,7 +156,18 @@ void Text3DOverlay::setProperties(const QVariantMap& properties) {
 
     auto textAlpha = properties["textAlpha"];
     if (textAlpha.isValid()) {
+        float prevTextAlpha = getTextAlpha();
         setTextAlpha(textAlpha.toFloat());
+        // Update our payload key if necessary to handle transparency
+        if ((prevTextAlpha < 1.0f && _textAlpha >= 1.0f) || (prevTextAlpha >= 1.0f && _textAlpha < 1.0f)) {
+            auto itemID = getRenderItemID();
+            if (render::Item::isValidID(itemID)) {
+                render::ScenePointer scene = AbstractViewStateInterface::instance()->getMain3DScene();
+                render::Transaction transaction;
+                transaction.updateItem(itemID);
+                scene->enqueueTransaction(transaction);
+            }
+        }
     }
 
     bool valid;
@@ -248,3 +256,4 @@ bool Text3DOverlay::findRayIntersection(const glm::vec3 &origin, const glm::vec3
     setTransform(transform);
     return Billboard3DOverlay::findRayIntersection(origin, direction, distance, face, surfaceNormal);
 }
+
diff --git a/interface/src/ui/overlays/Text3DOverlay.h b/interface/src/ui/overlays/Text3DOverlay.h
index e7b09c9040..daa5fdc804 100644
--- a/interface/src/ui/overlays/Text3DOverlay.h
+++ b/interface/src/ui/overlays/Text3DOverlay.h
@@ -19,6 +19,7 @@ class TextRenderer3D;
 
 class Text3DOverlay : public Billboard3DOverlay {
     Q_OBJECT
+    using Parent = Billboard3DOverlay;
 
 public:
     static QString const TYPE;
@@ -43,6 +44,7 @@ public:
     xColor getBackgroundColor();
     float getTextAlpha() { return _textAlpha; }
     float getBackgroundAlpha() { return getAlpha(); }
+    bool isTransparent() override { return Overlay::isTransparent() || _textAlpha < 1.0f; }
 
     // setters
     void setText(const QString& text);
diff --git a/interface/src/ui/overlays/Volume3DOverlay.cpp b/interface/src/ui/overlays/Volume3DOverlay.cpp
index ad61e28bc7..e5a418cce5 100644
--- a/interface/src/ui/overlays/Volume3DOverlay.cpp
+++ b/interface/src/ui/overlays/Volume3DOverlay.cpp
@@ -26,6 +26,11 @@ AABox Volume3DOverlay::getBounds() const {
     return AABox(extents);
 }
 
+void Volume3DOverlay::setDimensions(const glm::vec3& value) {
+    _localBoundingBox.setBox(-value / 2.0f, value);
+    notifyRenderVariableChange();
+}
+
 void Volume3DOverlay::setProperties(const QVariantMap& properties) {
     Base3DOverlay::setProperties(properties);
 
@@ -40,7 +45,19 @@ void Volume3DOverlay::setProperties(const QVariantMap& properties) {
     }
 
     if (dimensions.isValid()) {
-        setDimensions(vec3FromVariant(dimensions));
+        glm::vec3 scale = vec3FromVariant(dimensions);
+        // don't allow a zero or negative dimension component to reach the renderTransform
+        const float MIN_DIMENSION = 0.0001f;
+        if (scale.x < MIN_DIMENSION) {
+            scale.x = MIN_DIMENSION;
+        }
+        if (scale.y < MIN_DIMENSION) {
+            scale.y = MIN_DIMENSION;
+        }
+        if (scale.z < MIN_DIMENSION) {
+            scale.z = MIN_DIMENSION;
+        }
+        setDimensions(scale);
     }
 }
 
@@ -56,7 +73,9 @@ bool Volume3DOverlay::findRayIntersection(const glm::vec3& origin, const glm::ve
                                             float& distance, BoxFace& face, glm::vec3& surfaceNormal) {
     // extents is the entity relative, scaled, centered extents of the entity
     glm::mat4 worldToEntityMatrix;
-    getTransform().getInverseMatrix(worldToEntityMatrix);
+    Transform transform = getTransform();
+    transform.setScale(1.0f);  // ignore any inherited scale from SpatiallyNestable
+    transform.getInverseMatrix(worldToEntityMatrix);
 
     glm::vec3 overlayFrameOrigin = glm::vec3(worldToEntityMatrix * glm::vec4(origin, 1.0f));
     glm::vec3 overlayFrameDirection = glm::vec3(worldToEntityMatrix * glm::vec4(direction, 0.0f));
@@ -65,3 +84,11 @@ bool Volume3DOverlay::findRayIntersection(const glm::vec3& origin, const glm::ve
     // and testing intersection there.
     return _localBoundingBox.findRayIntersection(overlayFrameOrigin, overlayFrameDirection, distance, face, surfaceNormal);
 }
+
+Transform Volume3DOverlay::evalRenderTransform() {
+    Transform transform = getTransform();
+#ifndef USE_SN_SCALE
+    transform.setScale(1.0f);  // ignore any inherited scale from SpatiallyNestable
+#endif
+    return transform;
+}
diff --git a/interface/src/ui/overlays/Volume3DOverlay.h b/interface/src/ui/overlays/Volume3DOverlay.h
index 04b694b2f8..bde8c71aef 100644
--- a/interface/src/ui/overlays/Volume3DOverlay.h
+++ b/interface/src/ui/overlays/Volume3DOverlay.h
@@ -15,6 +15,7 @@
 
 class Volume3DOverlay : public Base3DOverlay {
     Q_OBJECT
+    using Parent = Base3DOverlay;
 
 public:
     Volume3DOverlay() {}
@@ -23,8 +24,8 @@ public:
     virtual AABox getBounds() const override;
 
     const glm::vec3& getDimensions() const { return _localBoundingBox.getDimensions(); }
-    void setDimensions(float value) { _localBoundingBox.setBox(glm::vec3(-value / 2.0f), value); }
-    void setDimensions(const glm::vec3& value) { _localBoundingBox.setBox(-value / 2.0f, value); }
+    void setDimensions(float value) { setDimensions(glm::vec3(value)); }
+    void setDimensions(const glm::vec3& value);
 
     void setProperties(const QVariantMap& properties) override;
     QVariant getProperty(const QString& property) override;
@@ -35,6 +36,8 @@ public:
 protected:
     // Centered local bounding box
     AABox _localBoundingBox{ vec3(0.0f), 1.0f };
+
+    Transform evalRenderTransform() override;
 };
 
 
diff --git a/interface/src/ui/overlays/Web3DOverlay.cpp b/interface/src/ui/overlays/Web3DOverlay.cpp
index 80f11fa552..d418a79fbf 100644
--- a/interface/src/ui/overlays/Web3DOverlay.cpp
+++ b/interface/src/ui/overlays/Web3DOverlay.cpp
@@ -24,6 +24,7 @@
 #include <DependencyManager.h>
 #include <GeometryCache.h>
 #include <GeometryUtil.h>
+#include <gl/GLHelpers.h>
 #include <scripting/HMDScriptingInterface.h>
 #include <ui/OffscreenQmlSurface.h>
 #include <ui/OffscreenQmlSurfaceCache.h>
@@ -38,6 +39,8 @@
 #include "scripting/AccountScriptingInterface.h"
 #include "scripting/HMDScriptingInterface.h"
 #include "scripting/AssetMappingsScriptingInterface.h"
+#include "scripting/MenuScriptingInterface.h"
+#include "scripting/SettingsScriptingInterface.h"
 #include <Preferences.h>
 #include <ScriptEngines.h>
 #include "FileDialogHelper.h"
@@ -67,6 +70,9 @@ Web3DOverlay::Web3DOverlay() : _dpi(DPI) {
     _touchDevice.setMaximumTouchPoints(4);
 
     _geometryId = DependencyManager::get<GeometryCache>()->allocateID();
+    connect(this, &Web3DOverlay::requestWebSurface, this, &Web3DOverlay::buildWebSurface);
+    connect(this, &Web3DOverlay::releaseWebSurface, this, &Web3DOverlay::destroyWebSurface);
+    connect(this, &Web3DOverlay::resizeWebSurface, this, &Web3DOverlay::onResizeWebSurface);
 }
 
 Web3DOverlay::Web3DOverlay(const Web3DOverlay* Web3DOverlay) :
@@ -81,141 +87,157 @@ Web3DOverlay::Web3DOverlay(const Web3DOverlay* Web3DOverlay) :
 }
 
 Web3DOverlay::~Web3DOverlay() {
-    if (_webSurface) {
-        QQuickItem* rootItem = _webSurface->getRootItem();
+    disconnect(this, &Web3DOverlay::requestWebSurface, this, nullptr);
+    disconnect(this, &Web3DOverlay::releaseWebSurface, this, nullptr);
+    disconnect(this, &Web3DOverlay::resizeWebSurface, this, nullptr);
 
-        if (rootItem && rootItem->objectName() == "tabletRoot") {
-            auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
-            tabletScriptingInterface->setQmlTabletRoot("com.highfidelity.interface.tablet.system", nullptr);
-        }
-
-        // Fix for crash in QtWebEngineCore when rapidly switching domains
-        // Call stop on the QWebEngineView before destroying OffscreenQMLSurface.
-        if (rootItem) {
-            QObject* obj = rootItem->findChild<QObject*>("webEngineView");
-            if (obj) {
-                // stop loading
-                QMetaObject::invokeMethod(obj, "stop");
-            }
-        }
-
-        _webSurface->pause();
-        _webSurface->disconnect(_connection);
-
-        QObject::disconnect(_mousePressConnection);
-        _mousePressConnection = QMetaObject::Connection();
-        QObject::disconnect(_mouseReleaseConnection);
-        _mouseReleaseConnection = QMetaObject::Connection();
-        QObject::disconnect(_mouseMoveConnection);
-        _mouseMoveConnection = QMetaObject::Connection();
-        QObject::disconnect(_hoverLeaveConnection);
-        _hoverLeaveConnection = QMetaObject::Connection();
-
-        QObject::disconnect(_emitScriptEventConnection);
-        _emitScriptEventConnection = QMetaObject::Connection();
-        QObject::disconnect(_webEventReceivedConnection);
-        _webEventReceivedConnection = QMetaObject::Connection();
-
-        // The lifetime of the QML surface MUST be managed by the main thread
-        // Additionally, we MUST use local variables copied by value, rather than
-        // member variables, since they would implicitly refer to a this that
-        // is no longer valid
-        auto webSurface = _webSurface;
-        AbstractViewStateInterface::instance()->postLambdaEvent([webSurface] {
-            DependencyManager::get<OffscreenQmlSurfaceCache>()->release(QML, webSurface);
-        });
-        _webSurface.reset();
-    }
+    destroyWebSurface();
     auto geometryCache = DependencyManager::get<GeometryCache>();
     if (geometryCache) {
         geometryCache->releaseID(_geometryId);
     }
 }
 
+void Web3DOverlay::rebuildWebSurface() {
+    destroyWebSurface();
+    buildWebSurface();
+}
+
+void Web3DOverlay::destroyWebSurface() {
+    if (!_webSurface) {
+        return;
+    }
+    QQuickItem* rootItem = _webSurface->getRootItem();
+
+    if (rootItem && rootItem->objectName() == "tabletRoot") {
+        auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
+        tabletScriptingInterface->setQmlTabletRoot("com.highfidelity.interface.tablet.system", nullptr);
+    }
+
+    // Fix for crash in QtWebEngineCore when rapidly switching domains
+    // Call stop on the QWebEngineView before destroying OffscreenQMLSurface.
+    if (rootItem) {
+        QObject* obj = rootItem->findChild<QObject*>("webEngineView");
+        if (obj) {
+            // stop loading
+            QMetaObject::invokeMethod(obj, "stop");
+        }
+    }
+
+    _webSurface->pause();
+
+    QObject::disconnect(this, &Web3DOverlay::scriptEventReceived, _webSurface.data(), &OffscreenQmlSurface::emitScriptEvent);
+    QObject::disconnect(_webSurface.data(), &OffscreenQmlSurface::webEventReceived, this, &Web3DOverlay::webEventReceived);
+    DependencyManager::get<OffscreenQmlSurfaceCache>()->release(QML, _webSurface);
+    _webSurface.reset();
+}
+
+void Web3DOverlay::buildWebSurface() {
+    if (_webSurface) {
+        return;
+    }
+    gl::withSavedContext([&] {
+        // FIXME, the max FPS could be better managed by being dynamic (based on the number of current surfaces
+        // and the current rendering load)
+        if (_currentMaxFPS != _desiredMaxFPS) {
+            setMaxFPS(_desiredMaxFPS);
+        }
+
+        if (isWebContent()) {
+            _webSurface = DependencyManager::get<OffscreenQmlSurfaceCache>()->acquire(QML);
+            _webSurface->getRootItem()->setProperty("url", _url);
+            _webSurface->getRootItem()->setProperty("scriptURL", _scriptURL);
+        } else {
+            _webSurface = DependencyManager::get<OffscreenQmlSurfaceCache>()->acquire(_url);
+            setupQmlSurface();
+        }
+        _webSurface->getSurfaceContext()->setContextProperty("globalPosition", vec3toVariant(getPosition()));
+        _webSurface->resize(QSize(_resolution.x, _resolution.y));
+        _webSurface->resume();
+    });
+
+    QObject::connect(this, &Web3DOverlay::scriptEventReceived, _webSurface.data(), &OffscreenQmlSurface::emitScriptEvent);
+    QObject::connect(_webSurface.data(), &OffscreenQmlSurface::webEventReceived, this, &Web3DOverlay::webEventReceived);
+}
+
+void Web3DOverlay::hoverLeaveOverlay(const PointerEvent& event) {
+    if ((_pressed || (!_activeTouchPoints.empty() && _touchBeginAccepted))) {
+        PointerEvent endEvent(PointerEvent::Release, event.getID(), event.getPos2D(), event.getPos3D(), event.getNormal(), event.getDirection(),
+            event.getButton(), event.getButtons(), event.getKeyboardModifiers());
+        handlePointerEvent(endEvent);
+    }
+}
+
 void Web3DOverlay::update(float deltatime) {
     if (_webSurface) {
         // update globalPosition
         _webSurface->getSurfaceContext()->setContextProperty("globalPosition", vec3toVariant(getPosition()));
     }
+    Parent::update(deltatime);
 }
 
-QString Web3DOverlay::pickURL() {
+bool Web3DOverlay::isWebContent() const {
     QUrl sourceUrl(_url);
     if (sourceUrl.scheme() == "http" || sourceUrl.scheme() == "https" ||
         _url.toLower().endsWith(".htm") || _url.toLower().endsWith(".html")) {
-
-        _webSurface->setBaseUrl(QUrl::fromLocalFile(PathUtils::resourcesPath() + "/qml/"));
-        return "Web3DOverlay.qml";
-    } else {
-        return QUrl::fromLocalFile(PathUtils::resourcesPath()).toString() + "/" + _url;
+        return true;
     }
+    return false;
 }
 
+void Web3DOverlay::setupQmlSurface() {
+    _webSurface->getSurfaceContext()->setContextProperty("Users", DependencyManager::get<UsersScriptingInterface>().data());
+    _webSurface->getSurfaceContext()->setContextProperty("HMD", DependencyManager::get<HMDScriptingInterface>().data());
+    _webSurface->getSurfaceContext()->setContextProperty("UserActivityLogger", DependencyManager::get<UserActivityLoggerScriptingInterface>().data());
+    _webSurface->getSurfaceContext()->setContextProperty("Preferences", DependencyManager::get<Preferences>().data());
+    _webSurface->getSurfaceContext()->setContextProperty("Vec3", new Vec3());
+    _webSurface->getSurfaceContext()->setContextProperty("Quat", new Quat());
+    _webSurface->getSurfaceContext()->setContextProperty("MyAvatar", DependencyManager::get<AvatarManager>()->getMyAvatar().get());
+    _webSurface->getSurfaceContext()->setContextProperty("Entities", DependencyManager::get<EntityScriptingInterface>().data());
+    _webSurface->getSurfaceContext()->setContextProperty("Snapshot", DependencyManager::get<Snapshot>().data());
 
-void Web3DOverlay::loadSourceURL() {
+    if (_webSurface->getRootItem() && _webSurface->getRootItem()->objectName() == "tabletRoot") {
+        auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
+        auto flags = tabletScriptingInterface->getFlags();
 
-    QUrl sourceUrl(_url);
-    if (sourceUrl.scheme() == "http" || sourceUrl.scheme() == "https" ||
-        _url.toLower().endsWith(".htm") || _url.toLower().endsWith(".html")) {
-
-        _webSurface->setBaseUrl(QUrl::fromLocalFile(PathUtils::resourcesPath() + "/qml/"));
-        _webSurface->load("Web3DOverlay.qml");
-        _webSurface->resume();
-        _webSurface->getRootItem()->setProperty("url", _url);
-        _webSurface->getRootItem()->setProperty("scriptURL", _scriptURL);
-
-    } else {
-        _webSurface->setBaseUrl(QUrl::fromLocalFile(PathUtils::resourcesPath()));
-        _webSurface->load(_url, [&](QQmlContext* context, QObject* obj) {});
-        _webSurface->resume();
-
-        _webSurface->getSurfaceContext()->setContextProperty("Users", DependencyManager::get<UsersScriptingInterface>().data());
+        _webSurface->getSurfaceContext()->setContextProperty("offscreenFlags", flags);
+        _webSurface->getSurfaceContext()->setContextProperty("AddressManager", DependencyManager::get<AddressManager>().data());
+        _webSurface->getSurfaceContext()->setContextProperty("Account", AccountScriptingInterface::getInstance());
+        _webSurface->getSurfaceContext()->setContextProperty("Audio", DependencyManager::get<AudioScriptingInterface>().data());
+        _webSurface->getSurfaceContext()->setContextProperty("AudioStats", DependencyManager::get<AudioClient>()->getStats().data());
         _webSurface->getSurfaceContext()->setContextProperty("HMD", DependencyManager::get<HMDScriptingInterface>().data());
-        _webSurface->getSurfaceContext()->setContextProperty("UserActivityLogger", DependencyManager::get<UserActivityLoggerScriptingInterface>().data());
-        _webSurface->getSurfaceContext()->setContextProperty("Preferences", DependencyManager::get<Preferences>().data());
-        _webSurface->getSurfaceContext()->setContextProperty("Vec3", new Vec3());
-        _webSurface->getSurfaceContext()->setContextProperty("Quat", new Quat());
+        _webSurface->getSurfaceContext()->setContextProperty("fileDialogHelper", new FileDialogHelper());
         _webSurface->getSurfaceContext()->setContextProperty("MyAvatar", DependencyManager::get<AvatarManager>()->getMyAvatar().get());
-        _webSurface->getSurfaceContext()->setContextProperty("Entities", DependencyManager::get<EntityScriptingInterface>().data());
-        _webSurface->getSurfaceContext()->setContextProperty("Snapshot", DependencyManager::get<Snapshot>().data());
+        _webSurface->getSurfaceContext()->setContextProperty("ScriptDiscoveryService", DependencyManager::get<ScriptEngines>().data());
+        _webSurface->getSurfaceContext()->setContextProperty("Tablet", DependencyManager::get<TabletScriptingInterface>().data());
+        _webSurface->getSurfaceContext()->setContextProperty("Assets", DependencyManager::get<AssetMappingsScriptingInterface>().data());
+        _webSurface->getSurfaceContext()->setContextProperty("LODManager", DependencyManager::get<LODManager>().data());
+        _webSurface->getSurfaceContext()->setContextProperty("OctreeStats", DependencyManager::get<OctreeStatsProvider>().data());
+        _webSurface->getSurfaceContext()->setContextProperty("DCModel", DependencyManager::get<DomainConnectionModel>().data());
+        _webSurface->getSurfaceContext()->setContextProperty("AvatarInputs", AvatarInputs::getInstance());
+        _webSurface->getSurfaceContext()->setContextProperty("GlobalServices", GlobalServicesScriptingInterface::getInstance());
+        _webSurface->getSurfaceContext()->setContextProperty("AvatarList", DependencyManager::get<AvatarManager>().data());
+        _webSurface->getSurfaceContext()->setContextProperty("DialogsManager", DialogsManagerScriptingInterface::getInstance());
+        _webSurface->getSurfaceContext()->setContextProperty("InputConfiguration", DependencyManager::get<InputConfiguration>().data());
+        _webSurface->getSurfaceContext()->setContextProperty("SoundCache", DependencyManager::get<SoundCache>().data());
+        _webSurface->getSurfaceContext()->setContextProperty("MenuInterface", MenuScriptingInterface::getInstance());
+        _webSurface->getSurfaceContext()->setContextProperty("Settings", SettingsScriptingInterface::getInstance());
+        _webSurface->getSurfaceContext()->setContextProperty("Render", AbstractViewStateInterface::instance()->getRenderEngine()->getConfiguration().get());
+        _webSurface->getSurfaceContext()->setContextProperty("Controller", DependencyManager::get<controller::ScriptingInterface>().data());
+        _webSurface->getSurfaceContext()->setContextProperty("Web3DOverlay", this);
 
-        if (_webSurface->getRootItem() && _webSurface->getRootItem()->objectName() == "tabletRoot") {
-            auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
-            auto flags = tabletScriptingInterface->getFlags();
+        _webSurface->getSurfaceContext()->setContextProperty("pathToFonts", "../../");
 
-            _webSurface->getSurfaceContext()->setContextProperty("offscreenFlags", flags);
-            _webSurface->getSurfaceContext()->setContextProperty("AddressManager", DependencyManager::get<AddressManager>().data());
-            _webSurface->getSurfaceContext()->setContextProperty("Account", AccountScriptingInterface::getInstance());
-            _webSurface->getSurfaceContext()->setContextProperty("Audio", DependencyManager::get<AudioScriptingInterface>().data());
-            _webSurface->getSurfaceContext()->setContextProperty("AudioStats", DependencyManager::get<AudioClient>()->getStats().data());
-            _webSurface->getSurfaceContext()->setContextProperty("HMD", DependencyManager::get<HMDScriptingInterface>().data());
-            _webSurface->getSurfaceContext()->setContextProperty("fileDialogHelper", new FileDialogHelper());
-            _webSurface->getSurfaceContext()->setContextProperty("MyAvatar", DependencyManager::get<AvatarManager>()->getMyAvatar().get());
-            _webSurface->getSurfaceContext()->setContextProperty("ScriptDiscoveryService", DependencyManager::get<ScriptEngines>().data());
-            _webSurface->getSurfaceContext()->setContextProperty("Tablet", DependencyManager::get<TabletScriptingInterface>().data());
-            _webSurface->getSurfaceContext()->setContextProperty("Assets", DependencyManager::get<AssetMappingsScriptingInterface>().data());
-            _webSurface->getSurfaceContext()->setContextProperty("LODManager", DependencyManager::get<LODManager>().data());
-            _webSurface->getSurfaceContext()->setContextProperty("OctreeStats", DependencyManager::get<OctreeStatsProvider>().data());
-            _webSurface->getSurfaceContext()->setContextProperty("DCModel", DependencyManager::get<DomainConnectionModel>().data());
-            _webSurface->getSurfaceContext()->setContextProperty("AvatarInputs", AvatarInputs::getInstance());
-            _webSurface->getSurfaceContext()->setContextProperty("GlobalServices", GlobalServicesScriptingInterface::getInstance());
-            _webSurface->getSurfaceContext()->setContextProperty("AvatarList", DependencyManager::get<AvatarManager>().data());
-            _webSurface->getSurfaceContext()->setContextProperty("DialogsManager", DialogsManagerScriptingInterface::getInstance());
-            _webSurface->getSurfaceContext()->setContextProperty("InputConfiguration", DependencyManager::get<InputConfiguration>().data());
-            _webSurface->getSurfaceContext()->setContextProperty("SoundCache", DependencyManager::get<SoundCache>().data());
+        // Tablet inteference with Tablet.qml. Need to avoid this in QML space
+        _webSurface->getSurfaceContext()->setContextProperty("tabletInterface", DependencyManager::get<TabletScriptingInterface>().data());
 
-            _webSurface->getSurfaceContext()->setContextProperty("pathToFonts", "../../");
-            tabletScriptingInterface->setQmlTabletRoot("com.highfidelity.interface.tablet.system", _webSurface.data());
-
-            // mark the TabletProxy object as cpp ownership.
-            QObject* tablet = tabletScriptingInterface->getTablet("com.highfidelity.interface.tablet.system");
-            _webSurface->getSurfaceContext()->engine()->setObjectOwnership(tablet, QQmlEngine::CppOwnership);
-
-            // Override min fps for tablet UI, for silky smooth scrolling
-            setMaxFPS(90);
-        }
+        tabletScriptingInterface->setQmlTabletRoot("com.highfidelity.interface.tablet.system", _webSurface.data());
+        // mark the TabletProxy object as cpp ownership.
+        QObject* tablet = tabletScriptingInterface->getTablet("com.highfidelity.interface.tablet.system");
+        _webSurface->getSurfaceContext()->engine()->setObjectOwnership(tablet, QQmlEngine::CppOwnership);
+        // Override min fps for tablet UI, for silky smooth scrolling
+        setMaxFPS(90);
     }
-    _webSurface->getSurfaceContext()->setContextProperty("globalPosition", vec3toVariant(getPosition()));
 }
 
 void Web3DOverlay::setMaxFPS(uint8_t maxFPS) {
@@ -226,82 +248,46 @@ void Web3DOverlay::setMaxFPS(uint8_t maxFPS) {
     }
 }
 
+void Web3DOverlay::onResizeWebSurface() {
+    _mayNeedResize = false;
+    _webSurface->resize(QSize(_resolution.x, _resolution.y));
+}
+
+const int INVALID_DEVICE_ID = -1;
+
+Q_INVOKABLE int Web3DOverlay::deviceIdByTouchPoint(qreal x, qreal y) {
+    auto mapped = _webSurface->getRootItem()->mapFromGlobal(QPoint(x, y));
+
+    for (auto pair : _activeTouchPoints) {
+        if (mapped.x() == (int)pair.second.pos().x() && mapped.y() == (int)pair.second.pos().y()) {
+            return pair.first;
+        }
+    }
+
+    return INVALID_DEVICE_ID;
+}
+
 void Web3DOverlay::render(RenderArgs* args) {
-    QOpenGLContext * currentContext = QOpenGLContext::currentContext();
-    QSurface * currentSurface = currentContext->surface();
-    if (!_webSurface) {
-        _webSurface = DependencyManager::get<OffscreenQmlSurfaceCache>()->acquire(pickURL());
-        // FIXME, the max FPS could be better managed by being dynamic (based on the number of current surfaces
-        // and the current rendering load)
-        if (_currentMaxFPS != _desiredMaxFPS) {
-            setMaxFPS(_desiredMaxFPS);
-        }
-        loadSourceURL();
-        _webSurface->resume();
-        _webSurface->resize(QSize(_resolution.x, _resolution.y));
-        _webSurface->getRootItem()->setProperty("url", _url);
-        _webSurface->getRootItem()->setProperty("scriptURL", _scriptURL);
-        currentContext->makeCurrent(currentSurface);
-
-        auto selfOverlayID = getOverlayID();
-        std::weak_ptr<Web3DOverlay> weakSelf = std::dynamic_pointer_cast<Web3DOverlay>(qApp->getOverlays().getOverlay(selfOverlayID));
-        auto forwardPointerEvent = [=](OverlayID overlayID, const PointerEvent& event) {
-            auto self = weakSelf.lock();
-            if (self && overlayID == selfOverlayID) {
-                self->handlePointerEvent(event);
-            }
-        };
-
-        _mousePressConnection = connect(&(qApp->getOverlays()), &Overlays::mousePressOnOverlay, this, forwardPointerEvent, Qt::DirectConnection);
-        _mouseReleaseConnection = connect(&(qApp->getOverlays()), &Overlays::mouseReleaseOnOverlay, this, forwardPointerEvent, Qt::DirectConnection);
-        _mouseMoveConnection = connect(&(qApp->getOverlays()), &Overlays::mouseMoveOnOverlay, this, forwardPointerEvent, Qt::DirectConnection);
-        _hoverLeaveConnection = connect(&(qApp->getOverlays()), &Overlays::hoverLeaveOverlay, this, [=](OverlayID overlayID, const PointerEvent& event) {
-            auto self = weakSelf.lock();
-            if (!self) {
-                return;
-            }
-            if (self->_pressed && overlayID == selfOverlayID) {
-                PointerEvent endEvent(PointerEvent::Release, event.getID(), event.getPos2D(), event.getPos3D(), event.getNormal(), event.getDirection(),
-                                      event.getButton(), event.getButtons(), event.getKeyboardModifiers());
-                forwardPointerEvent(overlayID, event);
-            }
-        }, Qt::DirectConnection);
-
-        _emitScriptEventConnection = connect(this, &Web3DOverlay::scriptEventReceived, _webSurface.data(), &OffscreenQmlSurface::emitScriptEvent);
-        _webEventReceivedConnection = connect(_webSurface.data(), &OffscreenQmlSurface::webEventReceived, this, &Web3DOverlay::webEventReceived);
-    } else {
-        if (_currentMaxFPS != _desiredMaxFPS) {
-            setMaxFPS(_desiredMaxFPS);
-        }
-    }
-
-    if (_mayNeedResize) {
-        _mayNeedResize = false;
-        _webSurface->resize(QSize(_resolution.x, _resolution.y));
-    }
-
-    if (!_visible || !getParentVisible()) {
+    if (!_renderVisible || !getParentVisible()) {
         return;
     }
 
-    vec2 halfSize = getSize() / 2.0f;
-    vec4 color(toGlm(getColor()), getAlpha());
-
-    Transform transform = getTransform();
-
-    // FIXME: applyTransformTo causes tablet overlay to detach from tablet entity.
-    // Perhaps rather than deleting the following code it should be run only if isFacingAvatar() is true?
-    /*
-    applyTransformTo(transform, true);
-    setTransform(transform);
-    */
-
-    if (glm::length2(getDimensions()) != 1.0f) {
-        transform.postScale(vec3(getDimensions(), 1.0f));
+    if (!_webSurface) {
+        emit requestWebSurface();
+        return;
     }
 
+    if (_currentMaxFPS != _desiredMaxFPS) {
+        setMaxFPS(_desiredMaxFPS);
+    }
+
+    if (_mayNeedResize) {
+        emit resizeWebSurface();
+    }
+
+    vec4 color(toGlm(getColor()), getAlpha());
+
     if (!_texture) {
-        auto webSurface = _webSurface;
         _texture = gpu::Texture::createExternal(OffscreenQmlSurface::getDiscardLambda());
         _texture->setSource(__FUNCTION__);
     }
@@ -314,20 +300,34 @@ void Web3DOverlay::render(RenderArgs* args) {
     Q_ASSERT(args->_batch);
     gpu::Batch& batch = *args->_batch;
     batch.setResourceTexture(0, _texture);
-    batch.setModelTransform(transform);
+
+    auto renderTransform = getRenderTransform();
+    auto size = renderTransform.getScale();
+    renderTransform.setScale(1.0f);
+    batch.setModelTransform(renderTransform);
+
     auto geometryCache = DependencyManager::get<GeometryCache>();
     if (color.a < OPAQUE_ALPHA_THRESHOLD) {
-        geometryCache->bindTransparentWebBrowserProgram(batch, _isAA);
+        geometryCache->bindWebBrowserProgram(batch, true);
     } else {
-        geometryCache->bindOpaqueWebBrowserProgram(batch, _isAA);
+        geometryCache->bindWebBrowserProgram(batch);
     }
+
+    vec2 halfSize = vec2(size.x, size.y) / 2.0f;
     geometryCache->renderQuad(batch, halfSize * -1.0f, halfSize, vec2(0), vec2(1), color, _geometryId);
     batch.setResourceTexture(0, nullptr); // restore default white color after me
 }
 
+Transform Web3DOverlay::evalRenderTransform() {
+    Transform transform = Parent::evalRenderTransform();
+    transform.setScale(1.0f);
+    transform.postScale(glm::vec3(getSize(), 1.0f));
+    return transform;
+}
+
 const render::ShapeKey Web3DOverlay::getShapeKey() {
-    auto builder = render::ShapeKey::Builder().withoutCullFace().withDepthBias();
-    if (getAlpha() != 1.0f) {
+    auto builder = render::ShapeKey::Builder().withoutCullFace().withDepthBias().withOwnPipeline();
+    if (isTransparent()) {
         builder.withTranslucent();
     }
     return builder.build();
@@ -361,19 +361,68 @@ void Web3DOverlay::handlePointerEventAsTouch(const PointerEvent& event) {
         return;
     }
 
-    glm::vec2 windowPos = event.getPos2D() * (METERS_TO_INCHES * _dpi);
-    QPointF windowPoint(windowPos.x, windowPos.y);
-
-    if (event.getType() == PointerEvent::Press && event.getButton() == PointerEvent::PrimaryButton) {
-        this->_pressed = true;
-    } else if (event.getType() == PointerEvent::Release && event.getButton() == PointerEvent::PrimaryButton) {
-        this->_pressed = false;
+    //do not send secondary button events to tablet
+    if (event.getButton() == PointerEvent::SecondaryButton ||
+        //do not block composed events
+        event.getButtons() == PointerEvent::SecondaryButton) {
+        return;
     }
 
-    QEvent::Type touchType;
-    Qt::TouchPointState touchPointState;
-    QEvent::Type mouseType;
 
+    QPointF windowPoint;
+    {
+        glm::vec2 windowPos = event.getPos2D() * (METERS_TO_INCHES * _dpi);
+        windowPoint = QPointF(windowPos.x, windowPos.y);
+    }
+
+    Qt::TouchPointState state = Qt::TouchPointStationary;
+    if (event.getType() == PointerEvent::Press && event.getButton() == PointerEvent::PrimaryButton) {
+        state = Qt::TouchPointPressed;
+    } else if (event.getType() == PointerEvent::Release) {
+        state = Qt::TouchPointReleased;
+    } else if (_activeTouchPoints.count(event.getID()) && windowPoint != _activeTouchPoints[event.getID()].pos()) {
+        state = Qt::TouchPointMoved;
+    }
+
+    QEvent::Type touchType = QEvent::TouchUpdate;
+    if (_activeTouchPoints.empty()) {
+        // If the first active touch point is being created, send a begin
+        touchType = QEvent::TouchBegin;
+    } if (state == Qt::TouchPointReleased && _activeTouchPoints.size() == 1 && _activeTouchPoints.count(event.getID())) {
+        // If the last active touch point is being released, send an end
+        touchType = QEvent::TouchEnd;
+    } 
+
+    {
+        QTouchEvent::TouchPoint point;
+        point.setId(event.getID());
+        point.setState(state);
+        point.setPos(windowPoint);
+        point.setScreenPos(windowPoint);
+        _activeTouchPoints[event.getID()] = point;
+    }
+
+    QTouchEvent touchEvent(touchType, &_touchDevice, event.getKeyboardModifiers());
+    {
+        QList<QTouchEvent::TouchPoint> touchPoints;
+        Qt::TouchPointStates touchPointStates;
+        for (const auto& entry : _activeTouchPoints) {
+            touchPointStates |= entry.second.state();
+            touchPoints.push_back(entry.second);
+        }
+
+        touchEvent.setWindow(_webSurface->getWindow());
+        touchEvent.setTarget(_webSurface->getRootItem());
+        touchEvent.setTouchPoints(touchPoints);
+        touchEvent.setTouchPointStates(touchPointStates);
+    }
+
+    // Send mouse events to the Web surface so that HTML dialog elements work with mouse press and hover.
+    // FIXME: Scroll bar dragging is a bit unstable in the tablet (content can jump up and down at times).
+    // This may be improved in Qt 5.8. Release notes: "Cleaned up touch and mouse event delivery".
+    //
+    // In Qt 5.9 mouse events must be sent before touch events to make sure some QtQuick components will
+    // receive mouse events
     Qt::MouseButton button = Qt::NoButton;
     Qt::MouseButtons buttons = Qt::NoButton;
     if (event.getButton() == PointerEvent::PrimaryButton) {
@@ -383,87 +432,29 @@ void Web3DOverlay::handlePointerEventAsTouch(const PointerEvent& event) {
         buttons |= Qt::LeftButton;
     }
 
-    switch (event.getType()) {
-        case PointerEvent::Press:
-            touchType = QEvent::TouchBegin;
-            touchPointState = Qt::TouchPointPressed;
-            mouseType = QEvent::MouseButtonPress;
-            break;
-        case PointerEvent::Release:
-            touchType = QEvent::TouchEnd;
-            touchPointState = Qt::TouchPointReleased;
-            mouseType = QEvent::MouseButtonRelease;
-            break;
-        case PointerEvent::Move:
-            touchType = QEvent::TouchUpdate;
-            touchPointState = Qt::TouchPointMoved;
-            mouseType = QEvent::MouseMove;
-
-            if (((event.getButtons() & PointerEvent::PrimaryButton) > 0) != this->_pressed) {
-                // Mouse was pressed/released while off the overlay; convert touch and mouse events to press/release to reflect
-                // current mouse/touch status.
-                this->_pressed = !this->_pressed;
-                if (this->_pressed) {
-                    touchType = QEvent::TouchBegin;
-                    touchPointState = Qt::TouchPointPressed;
-                    mouseType = QEvent::MouseButtonPress;
-
-                } else {
-                    touchType = QEvent::TouchEnd;
-                    touchPointState = Qt::TouchPointReleased;
-                    mouseType = QEvent::MouseButtonRelease;
-
-                }
-                button = Qt::LeftButton;
-                buttons |= Qt::LeftButton;
-            }
-
-            break;
-        default:
-            return;
-    }
-
-    //do not send secondary button events to tablet
-    if (event.getButton() == PointerEvent::SecondaryButton ||
-            //do not block composed events
-            event.getButtons() == PointerEvent::SecondaryButton) {
-        return;
-    }
-
-    QTouchEvent::TouchPoint point;
-    point.setId(event.getID());
-    point.setState(touchPointState);
-    point.setPos(windowPoint);
-    point.setScreenPos(windowPoint);
-    QList<QTouchEvent::TouchPoint> touchPoints;
-    touchPoints.push_back(point);
-
-    QTouchEvent* touchEvent = new QTouchEvent(touchType, &_touchDevice, event.getKeyboardModifiers());
-    touchEvent->setWindow(_webSurface->getWindow());
-    touchEvent->setTarget(_webSurface->getRootItem());
-    touchEvent->setTouchPoints(touchPoints);
-    touchEvent->setTouchPointStates(touchPointState);
-
-    // Send mouse events to the Web surface so that HTML dialog elements work with mouse press and hover.
-    // FIXME: Scroll bar dragging is a bit unstable in the tablet (content can jump up and down at times).
-    // This may be improved in Qt 5.8. Release notes: "Cleaned up touch and mouse event delivery".
-    //
-    // In Qt 5.9 mouse events must be sent before touch events to make sure some QtQuick components will
-    // receive mouse events
 #if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
-    if (!(this->_pressed && event.getType() == PointerEvent::Move)) {
-        QMouseEvent* mouseEvent = new QMouseEvent(mouseType, windowPoint, windowPoint, windowPoint, button, buttons, Qt::NoModifier);
-        QCoreApplication::postEvent(_webSurface->getWindow(), mouseEvent);
+    if (event.getType() == PointerEvent::Move) {
+        QMouseEvent mouseEvent(QEvent::MouseMove, windowPoint, windowPoint, windowPoint, button, buttons, Qt::NoModifier);
+        QCoreApplication::sendEvent(_webSurface->getWindow(), &mouseEvent);
     }
 #endif
-    QCoreApplication::postEvent(_webSurface->getWindow(), touchEvent);
+
+    if (touchType == QEvent::TouchBegin) {
+        _touchBeginAccepted = QCoreApplication::sendEvent(_webSurface->getWindow(), &touchEvent);
+    } else if (_touchBeginAccepted) {
+        QCoreApplication::sendEvent(_webSurface->getWindow(), &touchEvent);
+    }
+
+    // If this was a release event, remove the point from the active touch points
+    if (state == Qt::TouchPointReleased) {
+        _activeTouchPoints.erase(event.getID());
+    }
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 9, 0)
-    if (this->_pressed && event.getType() == PointerEvent::Move) {
-        return;
+    if (event.getType() == PointerEvent::Move) {
+        QMouseEvent mouseEvent(QEvent::MouseMove, windowPoint, windowPoint, windowPoint, button, buttons, Qt::NoModifier);
+        QCoreApplication::sendEvent(_webSurface->getWindow(), &mouseEvent);
     }
-    QMouseEvent* mouseEvent = new QMouseEvent(mouseType, windowPoint, windowPoint, windowPoint, button, buttons, Qt::NoModifier);
-    QCoreApplication::postEvent(_webSurface->getWindow(), mouseEvent);
 #endif
 }
 
@@ -506,8 +497,8 @@ void Web3DOverlay::handlePointerEventAsMouse(const PointerEvent& event) {
             return;
     }
 
-    QMouseEvent* mouseEvent = new QMouseEvent(type, windowPoint, windowPoint, windowPoint, button, buttons, Qt::NoModifier);
-    QCoreApplication::postEvent(_webSurface->getWindow(), mouseEvent);
+    QMouseEvent mouseEvent(type, windowPoint, windowPoint, windowPoint, button, buttons, Qt::NoModifier);
+    QCoreApplication::sendEvent(_webSurface->getWindow(), &mouseEvent);
 }
 
 void Web3DOverlay::setProperties(const QVariantMap& properties) {
@@ -597,11 +588,25 @@ QVariant Web3DOverlay::getProperty(const QString& property) {
 }
 
 void Web3DOverlay::setURL(const QString& url) {
-    _url = url;
-    if (_webSurface) {
-        AbstractViewStateInterface::instance()->postLambdaEvent([this, url] {
-            loadSourceURL();
-        });
+    if (url != _url) {
+        bool wasWebContent = isWebContent();
+        _url = url;
+        if (_webSurface) {
+            if (wasWebContent && isWebContent()) {
+                // If we're just targeting a new web URL, then switch to that without messing around
+                // with the underlying QML
+                AbstractViewStateInterface::instance()->postLambdaEvent([this, url] {
+                    _webSurface->getRootItem()->setProperty("url", _url);
+                    _webSurface->getRootItem()->setProperty("scriptURL", _scriptURL);
+                });
+            } else {
+                // If we're switching to or from web content, or between different QML content
+                // we need to destroy and rebuild the entire QML surface
+                AbstractViewStateInterface::instance()->postLambdaEvent([this, url] {
+                    rebuildWebSurface();
+                });
+            }
+        }
     }
 }
 
@@ -609,12 +614,15 @@ void Web3DOverlay::setScriptURL(const QString& scriptURL) {
     _scriptURL = scriptURL;
     if (_webSurface) {
         AbstractViewStateInterface::instance()->postLambdaEvent([this, scriptURL] {
+            if (!_webSurface) {
+                return;
+            }
             _webSurface->getRootItem()->setProperty("scriptURL", scriptURL);
         });
     }
 }
 
-glm::vec2 Web3DOverlay::getSize() {
+glm::vec2 Web3DOverlay::getSize() const {
     return _resolution / _dpi * INCHES_TO_METERS * getDimensions();
 };
 
@@ -632,9 +640,5 @@ Web3DOverlay* Web3DOverlay::createClone() const {
 }
 
 void Web3DOverlay::emitScriptEvent(const QVariant& message) {
-    if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "emitScriptEvent", Qt::QueuedConnection, Q_ARG(QVariant, message));
-    } else {
-        emit scriptEventReceived(message);
-    }
+    QMetaObject::invokeMethod(this, "scriptEventReceived", Q_ARG(QVariant, message));
 }
diff --git a/interface/src/ui/overlays/Web3DOverlay.h b/interface/src/ui/overlays/Web3DOverlay.h
index 1e3706ed25..2fc63df76a 100644
--- a/interface/src/ui/overlays/Web3DOverlay.h
+++ b/interface/src/ui/overlays/Web3DOverlay.h
@@ -19,8 +19,10 @@ class OffscreenQmlSurface;
 
 class Web3DOverlay : public Billboard3DOverlay {
     Q_OBJECT
+    using Parent = Billboard3DOverlay;
 
 public:
+
     static const QString QML;
     static QString const TYPE;
     virtual QString getType() const override { return TYPE; }
@@ -29,8 +31,6 @@ public:
     Web3DOverlay(const Web3DOverlay* Web3DOverlay);
     virtual ~Web3DOverlay();
 
-    QString pickURL();
-    void loadSourceURL();
     void setMaxFPS(uint8_t maxFPS);
     virtual void render(RenderArgs* args) override;
     virtual const render::ShapeKey getShapeKey() override;
@@ -39,7 +39,8 @@ public:
 
     QObject* getEventHandler();
     void setProxyWindow(QWindow* proxyWindow);
-    void handlePointerEvent(const PointerEvent& event);
+    Q_INVOKABLE void hoverLeaveOverlay(const PointerEvent& event);
+    Q_INVOKABLE void handlePointerEvent(const PointerEvent& event);
     void handlePointerEventAsTouch(const PointerEvent& event);
     void handlePointerEventAsMouse(const PointerEvent& event);
 
@@ -50,7 +51,7 @@ public:
     void setProperties(const QVariantMap& properties) override;
     QVariant getProperty(const QString& property) override;
 
-    glm::vec2 getSize();
+    glm::vec2 getSize() const override;
 
     virtual bool findRayIntersection(const glm::vec3& origin, const glm::vec3& direction, float& distance,
         BoxFace& face, glm::vec3& surfaceNormal) override;
@@ -62,17 +63,32 @@ public:
         Mouse
     };
 
+    void buildWebSurface();
+    void destroyWebSurface();
+    void onResizeWebSurface();
+
+    Q_INVOKABLE int deviceIdByTouchPoint(qreal x, qreal y);
+
 public slots:
     void emitScriptEvent(const QVariant& scriptMessage);
 
 signals:
     void scriptEventReceived(const QVariant& message);
     void webEventReceived(const QVariant& message);
+    void resizeWebSurface();
+    void requestWebSurface();
+    void releaseWebSurface();
+
+protected:
+    Transform evalRenderTransform() override;
 
 private:
+    void setupQmlSurface();
+    void rebuildWebSurface();
+    bool isWebContent() const;
+
     InputMode _inputMode { Touch };
     QSharedPointer<OffscreenQmlSurface> _webSurface;
-    QMetaObject::Connection _connection;
     gpu::TexturePointer _texture;
     QString _url;
     QString _scriptURL;
@@ -82,20 +98,14 @@ private:
     bool _showKeyboardFocusHighlight{ true };
 
     bool _pressed{ false };
+    bool _touchBeginAccepted { false };
+    std::map<uint32_t, QTouchEvent::TouchPoint> _activeTouchPoints;
     QTouchDevice _touchDevice;
 
     uint8_t _desiredMaxFPS { 10 };
     uint8_t _currentMaxFPS { 0 };
 
     bool _mayNeedResize { false };
-
-    QMetaObject::Connection _mousePressConnection;
-    QMetaObject::Connection _mouseReleaseConnection;
-    QMetaObject::Connection _mouseMoveConnection;
-    QMetaObject::Connection _hoverLeaveConnection;
-
-    QMetaObject::Connection _emitScriptEventConnection;
-    QMetaObject::Connection _webEventReceivedConnection;
 };
 
 #endif // hifi_Web3DOverlay_h
diff --git a/libraries/animation/src/AnimInverseKinematics.cpp b/libraries/animation/src/AnimInverseKinematics.cpp
index d7076a443e..d17fbebf3a 100644
--- a/libraries/animation/src/AnimInverseKinematics.cpp
+++ b/libraries/animation/src/AnimInverseKinematics.cpp
@@ -23,20 +23,24 @@
 #include "CubicHermiteSpline.h"
 #include "AnimUtil.h"
 
-static void lookupJointChainInfo(AnimInverseKinematics::JointChainInfo* jointChainInfos, size_t numJointChainInfos,
-                                 int indexA, int indexB,
-                                 AnimInverseKinematics::JointChainInfo** jointChainInfoA,
-                                 AnimInverseKinematics::JointChainInfo** jointChainInfoB) {
-    *jointChainInfoA = nullptr;
-    *jointChainInfoB = nullptr;
-    for (size_t i = 0; i < numJointChainInfos; i++) {
-        if (jointChainInfos[i].jointIndex == indexA) {
-            *jointChainInfoA = jointChainInfos + i;
+static const int MAX_TARGET_MARKERS = 30;
+static const float JOINT_CHAIN_INTERP_TIME = 0.25f;
+
+static void lookupJointInfo(const AnimInverseKinematics::JointChainInfo& jointChainInfo,
+                            int indexA, int indexB,
+                            const AnimInverseKinematics::JointInfo** jointInfoA,
+                            const AnimInverseKinematics::JointInfo** jointInfoB) {
+    *jointInfoA = nullptr;
+    *jointInfoB = nullptr;
+    for (size_t i = 0; i < jointChainInfo.jointInfoVec.size(); i++) {
+        const AnimInverseKinematics::JointInfo* jointInfo = &jointChainInfo.jointInfoVec[i];
+        if (jointInfo->jointIndex == indexA) {
+            *jointInfoA = jointInfo;
         }
-        if (jointChainInfos[i].jointIndex == indexB) {
-            *jointChainInfoB = jointChainInfos + i;
+        if (jointInfo->jointIndex == indexB) {
+            *jointInfoB = jointInfo;
         }
-        if (*jointChainInfoA && *jointChainInfoB) {
+        if (*jointInfoA && *jointInfoB) {
             break;
         }
     }
@@ -94,6 +98,12 @@ AnimInverseKinematics::~AnimInverseKinematics() {
     _rotationAccumulators.clear();
     _translationAccumulators.clear();
     _targetVarVec.clear();
+
+    // remove markers
+    for (int i = 0; i < MAX_TARGET_MARKERS; i++) {
+        QString name = QString("ikTarget%1").arg(i);
+        DebugDraw::getInstance().removeMyAvatarMarker(name);
+    }
 }
 
 void AnimInverseKinematics::loadDefaultPoses(const AnimPoseVec& poses) {
@@ -149,25 +159,28 @@ void AnimInverseKinematics::setTargetVars(const QString& jointName, const QStrin
 }
 
 void AnimInverseKinematics::computeTargets(const AnimVariantMap& animVars, std::vector<IKTarget>& targets, const AnimPoseVec& underPoses) {
-    // build a list of valid targets from _targetVarVec and animVars
-    _maxTargetIndex = -1;
+
     _hipsTargetIndex = -1;
-    bool removeUnfoundJoints = false;
+
+    targets.reserve(_targetVarVec.size());
 
     for (auto& targetVar : _targetVarVec) {
+
+        // update targetVar jointIndex cache
         if (targetVar.jointIndex == -1) {
-            // this targetVar hasn't been validated yet...
             int jointIndex = _skeleton->nameToJointIndex(targetVar.jointName);
             if (jointIndex >= 0) {
                 // this targetVar has a valid joint --> cache the indices
                 targetVar.jointIndex = jointIndex;
             } else {
                 qCWarning(animation) << "AnimInverseKinematics could not find jointName" << targetVar.jointName << "in skeleton";
-                removeUnfoundJoints = true;
             }
-        } else {
-            IKTarget target;
+        }
+
+        IKTarget target;
+        if (targetVar.jointIndex != -1) {
             target.setType(animVars.lookup(targetVar.typeVar, (int)IKTarget::Type::RotationAndPosition));
+            target.setIndex(targetVar.jointIndex);
             if (target.getType() != IKTarget::Type::Unknown) {
                 AnimPose absPose = _skeleton->getAbsolutePose(targetVar.jointIndex, underPoses);
                 glm::quat rotation = animVars.lookupRigToGeometry(targetVar.rotationVar, absPose.rot());
@@ -175,7 +188,6 @@ void AnimInverseKinematics::computeTargets(const AnimVariantMap& animVars, std::
                 float weight = animVars.lookup(targetVar.weightVar, targetVar.weight);
 
                 target.setPose(rotation, translation);
-                target.setIndex(targetVar.jointIndex);
                 target.setWeight(weight);
                 target.setFlexCoefficients(targetVar.numFlexCoefficients, targetVar.flexCoefficients);
 
@@ -188,39 +200,20 @@ void AnimInverseKinematics::computeTargets(const AnimVariantMap& animVars, std::
                 glm::vec3 poleReferenceVector = animVars.lookupRigToGeometryVector(targetVar.poleReferenceVectorVar, Vectors::UNIT_Z);
                 target.setPoleReferenceVector(glm::normalize(poleReferenceVector));
 
-                targets.push_back(target);
-
-                if (targetVar.jointIndex > _maxTargetIndex) {
-                    _maxTargetIndex = targetVar.jointIndex;
-                }
-
                 // record the index of the hips ik target.
                 if (target.getIndex() == _hipsIndex) {
-                    _hipsTargetIndex = (int)targets.size() - 1;
+                    _hipsTargetIndex = (int)targets.size();
                 }
             }
+        } else {
+            target.setType((int)IKTarget::Type::Unknown);
         }
-    }
 
-    if (removeUnfoundJoints) {
-        int numVars = (int)_targetVarVec.size();
-        int i = 0;
-        while (i < numVars) {
-            if (_targetVarVec[i].jointIndex == -1) {
-                if (numVars > 1) {
-                    // swap i for last element
-                    _targetVarVec[i] = _targetVarVec[numVars - 1];
-                }
-                _targetVarVec.pop_back();
-                --numVars;
-            } else {
-                ++i;
-            }
-        }
+        targets.push_back(target);
     }
 }
 
-void AnimInverseKinematics::solve(const AnimContext& context, const std::vector<IKTarget>& targets) {
+void AnimInverseKinematics::solve(const AnimContext& context, const std::vector<IKTarget>& targets, float dt, JointChainInfoVec& jointChainInfoVec) {
     // compute absolute poses that correspond to relative target poses
     AnimPoseVec absolutePoses;
     absolutePoses.resize(_relativePoses.size());
@@ -234,26 +227,75 @@ void AnimInverseKinematics::solve(const AnimContext& context, const std::vector<
         accumulator.clearAndClean();
     }
 
-    float maxError = FLT_MAX;
+    float maxError = 0.0f;
     int numLoops = 0;
     const int MAX_IK_LOOPS = 16;
-    const float MAX_ERROR_TOLERANCE = 0.1f; // cm
-    while (maxError > MAX_ERROR_TOLERANCE && numLoops < MAX_IK_LOOPS) {
+    while (numLoops < MAX_IK_LOOPS) {
         ++numLoops;
 
         bool debug = context.getEnableDebugDrawIKChains() && numLoops == MAX_IK_LOOPS;
 
         // solve all targets
-        for (auto& target: targets) {
-            if (target.getType() == IKTarget::Type::Spline) {
-                solveTargetWithSpline(context, target, absolutePoses, debug);
-            } else {
-                solveTargetWithCCD(context, target, absolutePoses, debug);
+        for (size_t i = 0; i < targets.size(); i++) {
+            switch (targets[i].getType()) {
+            case IKTarget::Type::Unknown:
+                break;
+            case IKTarget::Type::Spline:
+                solveTargetWithSpline(context, targets[i], absolutePoses, debug, jointChainInfoVec[i]);
+                break;
+            default:
+                solveTargetWithCCD(context, targets[i], absolutePoses, debug, jointChainInfoVec[i]);
+                break;
+            }
+        }
+
+        // on last iteration, interpolate jointChains, if necessary
+        if (numLoops == MAX_IK_LOOPS) {
+            for (size_t i = 0; i < _prevJointChainInfoVec.size(); i++) {
+                if (_prevJointChainInfoVec[i].timer > 0.0f) {
+                    float alpha = (JOINT_CHAIN_INTERP_TIME - _prevJointChainInfoVec[i].timer) / JOINT_CHAIN_INTERP_TIME;
+                    size_t chainSize = std::min(_prevJointChainInfoVec[i].jointInfoVec.size(), jointChainInfoVec[i].jointInfoVec.size());
+                    for (size_t j = 0; j < chainSize; j++) {
+                        jointChainInfoVec[i].jointInfoVec[j].rot = safeMix(_prevJointChainInfoVec[i].jointInfoVec[j].rot, jointChainInfoVec[i].jointInfoVec[j].rot, alpha);
+                        jointChainInfoVec[i].jointInfoVec[j].trans = lerp(_prevJointChainInfoVec[i].jointInfoVec[j].trans, jointChainInfoVec[i].jointInfoVec[j].trans, alpha);
+                    }
+
+                    // if joint chain was just disabled, ramp the weight toward zero.
+                    if (_prevJointChainInfoVec[i].target.getType() != IKTarget::Type::Unknown &&
+                        jointChainInfoVec[i].target.getType() == IKTarget::Type::Unknown) {
+                        IKTarget newTarget = _prevJointChainInfoVec[i].target;
+                        newTarget.setWeight((1.0f - alpha) * _prevJointChainInfoVec[i].target.getWeight());
+                        jointChainInfoVec[i].target = newTarget;
+                    }
+                }
+            }
+        }
+
+        // copy jointChainInfoVecs into accumulators
+        for (size_t i = 0; i < targets.size(); i++) {
+            const std::vector<JointInfo>& jointInfoVec = jointChainInfoVec[i].jointInfoVec;
+
+            // don't accumulate disabled or rotation only ik targets.
+            IKTarget::Type type = jointChainInfoVec[i].target.getType();
+            if (type != IKTarget::Type::Unknown && type != IKTarget::Type::RotationOnly) {
+                float weight = jointChainInfoVec[i].target.getWeight();
+                if (weight > 0.0f) {
+                    for (size_t j = 0; j < jointInfoVec.size(); j++) {
+                        const JointInfo& info = jointInfoVec[j];
+                        if (info.jointIndex >= 0) {
+                            _rotationAccumulators[info.jointIndex].add(info.rot, weight);
+                            _translationAccumulators[info.jointIndex].add(info.trans, weight);
+                        }
+                    }
+                }
             }
         }
 
         // harvest accumulated rotations and apply the average
         for (int i = 0; i < (int)_relativePoses.size(); ++i) {
+            if (i == _hipsIndex) {
+                continue;  // don't apply accumulators to hips
+            }
             if (_rotationAccumulators[i].size() > 0) {
                 _relativePoses[i].rot() = _rotationAccumulators[i].getAverage();
                 _rotationAccumulators[i].clear();
@@ -289,7 +331,7 @@ void AnimInverseKinematics::solve(const AnimContext& context, const std::vector<
     // finally set the relative rotation of each tip to agree with absolute target rotation
     for (auto& target: targets) {
         int tipIndex = target.getIndex();
-        int parentIndex = _skeleton->getParentIndex(tipIndex);
+        int parentIndex = (tipIndex >= 0) ? _skeleton->getParentIndex(tipIndex) : -1;
 
         // update rotationOnly targets that don't lie on the ik chain of other ik targets.
         if (parentIndex != -1 && !_rotationAccumulators[tipIndex].isDirty() && target.getType() == IKTarget::Type::RotationOnly) {
@@ -308,9 +350,34 @@ void AnimInverseKinematics::solve(const AnimContext& context, const std::vector<
             absolutePoses[tipIndex].rot() = targetRotation;
         }
     }
+
+    // copy jointChainInfoVec into _prevJointChainInfoVec, and update timers
+    for (size_t i = 0; i < jointChainInfoVec.size(); i++) {
+        _prevJointChainInfoVec[i].timer = _prevJointChainInfoVec[i].timer - dt;
+        if (_prevJointChainInfoVec[i].timer <= 0.0f) {
+            _prevJointChainInfoVec[i] = jointChainInfoVec[i];
+            _prevJointChainInfoVec[i].target = targets[i];
+            // store relative poses into unknown/rotation only joint chains.
+            // so we have something to interpolate from if this chain is activated.
+            IKTarget::Type type = _prevJointChainInfoVec[i].target.getType();
+            if (type == IKTarget::Type::Unknown || type == IKTarget::Type::RotationOnly) {
+                for (size_t j = 0; j < _prevJointChainInfoVec[i].jointInfoVec.size(); j++) {
+                    auto& info = _prevJointChainInfoVec[i].jointInfoVec[j];
+                    if (info.jointIndex >= 0) {
+                        info.rot = _relativePoses[info.jointIndex].rot();
+                        info.trans = _relativePoses[info.jointIndex].trans();
+                    } else {
+                        info.rot = Quaternions::IDENTITY;
+                        info.trans = glm::vec3(0.0f);
+                    }
+                }
+            }
+        }
+    }
 }
 
-void AnimInverseKinematics::solveTargetWithCCD(const AnimContext& context, const IKTarget& target, const AnimPoseVec& absolutePoses, bool debug) {
+void AnimInverseKinematics::solveTargetWithCCD(const AnimContext& context, const IKTarget& target, const AnimPoseVec& absolutePoses,
+                                               bool debug, JointChainInfo& jointChainInfoOut) const {
     size_t chainDepth = 0;
 
     IKTarget::Type targetType = target.getType();
@@ -338,9 +405,6 @@ void AnimInverseKinematics::solveTargetWithCCD(const AnimContext& context, const
     // the tip's parent-relative as we proceed up the chain
     glm::quat tipParentOrientation = absolutePoses[pivotIndex].rot();
 
-    const size_t MAX_CHAIN_DEPTH = 30;
-    JointChainInfo jointChainInfos[MAX_CHAIN_DEPTH];
-
     // NOTE: if this code is removed, the head will remain rigid, causing the spine/hips to thrust forward backward
     // as the head is nodded.
     if (targetType == IKTarget::Type::HmdHead ||
@@ -368,7 +432,7 @@ void AnimInverseKinematics::solveTargetWithCCD(const AnimContext& context, const
         }
 
         glm::vec3 tipRelativeTranslation = _relativePoses[target.getIndex()].trans();
-        jointChainInfos[chainDepth] = { tipRelativeRotation, tipRelativeTranslation, target.getWeight(), tipIndex, constrained };
+        jointChainInfoOut.jointInfoVec[chainDepth] = { tipRelativeRotation, tipRelativeTranslation, tipIndex, constrained };
     }
 
     // cache tip absolute position
@@ -379,7 +443,7 @@ void AnimInverseKinematics::solveTargetWithCCD(const AnimContext& context, const
     // descend toward root, pivoting each joint to get tip closer to target position
     while (pivotIndex != _hipsIndex && pivotsParentIndex != -1) {
 
-        assert(chainDepth < MAX_CHAIN_DEPTH);
+        assert(chainDepth < jointChainInfoOut.jointInfoVec.size());
 
         // compute the two lines that should be aligned
         glm::vec3 jointPosition = absolutePoses[pivotIndex].trans();
@@ -444,9 +508,8 @@ void AnimInverseKinematics::solveTargetWithCCD(const AnimContext& context, const
                             glm::quat twistPart;
                             glm::vec3 axis = glm::normalize(deltaRotation * leverArm);
                             swingTwistDecomposition(missingRotation, axis, swingPart, twistPart);
-                            float dotSign = copysignf(1.0f, twistPart.w);
                             const float LIMIT_LEAK_FRACTION = 0.1f;
-                            deltaRotation = glm::normalize(glm::lerp(glm::quat(), dotSign * twistPart, LIMIT_LEAK_FRACTION)) * deltaRotation;
+                            deltaRotation = safeLerp(glm::quat(), twistPart, LIMIT_LEAK_FRACTION);
                         }
                     }
                 }
@@ -455,9 +518,8 @@ void AnimInverseKinematics::solveTargetWithCCD(const AnimContext& context, const
             // An HmdHead target slaves the orientation of the end-effector by distributing rotation
             // deltas up the hierarchy.  Its target position is enforced later (by shifting the hips).
             deltaRotation = target.getRotation() * glm::inverse(tipOrientation);
-            float dotSign = copysignf(1.0f, deltaRotation.w);
             const float ANGLE_DISTRIBUTION_FACTOR = 0.45f;
-            deltaRotation = glm::normalize(glm::lerp(glm::quat(), dotSign * deltaRotation, ANGLE_DISTRIBUTION_FACTOR));
+            deltaRotation = safeLerp(glm::quat(), deltaRotation, ANGLE_DISTRIBUTION_FACTOR);
         }
 
         // compute joint's new parent-relative rotation after swing
@@ -480,7 +542,7 @@ void AnimInverseKinematics::solveTargetWithCCD(const AnimContext& context, const
         }
 
         glm::vec3 newTrans = _relativePoses[pivotIndex].trans();
-        jointChainInfos[chainDepth] = { newRot, newTrans, target.getWeight(), pivotIndex, constrained };
+        jointChainInfoOut.jointInfoVec[chainDepth] = { newRot, newTrans, pivotIndex, constrained };
 
         // keep track of tip's new transform as we descend towards root
         tipPosition = jointPosition + deltaRotation * (tipPosition - jointPosition);
@@ -502,24 +564,25 @@ void AnimInverseKinematics::solveTargetWithCCD(const AnimContext& context, const
                 int baseParentJointIndex = _skeleton->getParentIndex(baseJointIndex);
                 AnimPose topPose, midPose, basePose;
                 int topChainIndex = -1, baseChainIndex = -1;
+                const size_t MAX_CHAIN_DEPTH = 30;
                 AnimPose postAbsPoses[MAX_CHAIN_DEPTH];
                 AnimPose accum = absolutePoses[_hipsIndex];
                 AnimPose baseParentPose = absolutePoses[_hipsIndex];
                 for (int i = (int)chainDepth - 1; i >= 0; i--) {
-                    accum = accum * AnimPose(glm::vec3(1.0f), jointChainInfos[i].relRot, jointChainInfos[i].relTrans);
+                    accum = accum * AnimPose(glm::vec3(1.0f), jointChainInfoOut.jointInfoVec[i].rot, jointChainInfoOut.jointInfoVec[i].trans);
                     postAbsPoses[i] = accum;
-                    if (jointChainInfos[i].jointIndex == topJointIndex) {
+                    if (jointChainInfoOut.jointInfoVec[i].jointIndex == topJointIndex) {
                         topChainIndex = i;
                         topPose = accum;
                     }
-                    if (jointChainInfos[i].jointIndex == midJointIndex) {
+                    if (jointChainInfoOut.jointInfoVec[i].jointIndex == midJointIndex) {
                         midPose = accum;
                     }
-                    if (jointChainInfos[i].jointIndex == baseJointIndex) {
+                    if (jointChainInfoOut.jointInfoVec[i].jointIndex == baseJointIndex) {
                         baseChainIndex = i;
                         basePose = accum;
                     }
-                    if (jointChainInfos[i].jointIndex == baseParentJointIndex) {
+                    if (jointChainInfoOut.jointInfoVec[i].jointIndex == baseParentJointIndex) {
                         baseParentPose = accum;
                     }
                 }
@@ -599,21 +662,16 @@ void AnimInverseKinematics::solveTargetWithCCD(const AnimContext& context, const
                 }
 
                 glm::quat newBaseRelRot = glm::inverse(baseParentPose.rot()) * poleRot * basePose.rot();
-                jointChainInfos[baseChainIndex].relRot = newBaseRelRot;
+                jointChainInfoOut.jointInfoVec[baseChainIndex].rot = newBaseRelRot;
 
                 glm::quat newTopRelRot = glm::inverse(midPose.rot()) * glm::inverse(poleRot) * topPose.rot();
-                jointChainInfos[topChainIndex].relRot = newTopRelRot;
+                jointChainInfoOut.jointInfoVec[topChainIndex].rot = newTopRelRot;
             }
         }
     }
 
-    for (size_t i = 0; i < chainDepth; i++) {
-        _rotationAccumulators[jointChainInfos[i].jointIndex].add(jointChainInfos[i].relRot, jointChainInfos[i].weight);
-        _translationAccumulators[jointChainInfos[i].jointIndex].add(jointChainInfos[i].relTrans, jointChainInfos[i].weight);
-    }
-
     if (debug) {
-        debugDrawIKChain(jointChainInfos, chainDepth, context);
+        debugDrawIKChain(jointChainInfoOut, context);
     }
 }
 
@@ -628,7 +686,7 @@ static CubicHermiteSplineFunctorWithArcLength computeSplineFromTipAndBase(const
 }
 
 // pre-compute information about each joint influeced by this spline IK target.
-void AnimInverseKinematics::computeSplineJointInfosForIKTarget(const AnimContext& context, const IKTarget& target) {
+void AnimInverseKinematics::computeAndCacheSplineJointInfosForIKTarget(const AnimContext& context, const IKTarget& target) const {
     std::vector<SplineJointInfo> splineJointInfoVec;
 
     // build spline between the default poses.
@@ -681,13 +739,13 @@ void AnimInverseKinematics::computeSplineJointInfosForIKTarget(const AnimContext
     _splineJointInfoMap[target.getIndex()] = splineJointInfoVec;
 }
 
-const std::vector<AnimInverseKinematics::SplineJointInfo>* AnimInverseKinematics::findOrCreateSplineJointInfo(const AnimContext& context, const IKTarget& target) {
+const std::vector<AnimInverseKinematics::SplineJointInfo>* AnimInverseKinematics::findOrCreateSplineJointInfo(const AnimContext& context, const IKTarget& target) const {
     // find or create splineJointInfo for this target
     auto iter = _splineJointInfoMap.find(target.getIndex());
     if (iter != _splineJointInfoMap.end()) {
         return &(iter->second);
     } else {
-        computeSplineJointInfosForIKTarget(context, target);
+        computeAndCacheSplineJointInfosForIKTarget(context, target);
         auto iter = _splineJointInfoMap.find(target.getIndex());
         if (iter != _splineJointInfoMap.end()) {
             return &(iter->second);
@@ -697,10 +755,8 @@ const std::vector<AnimInverseKinematics::SplineJointInfo>* AnimInverseKinematics
     return nullptr;
 }
 
-void AnimInverseKinematics::solveTargetWithSpline(const AnimContext& context, const IKTarget& target, const AnimPoseVec& absolutePoses, bool debug) {
-
-    const size_t MAX_CHAIN_DEPTH = 30;
-    JointChainInfo jointChainInfos[MAX_CHAIN_DEPTH];
+void AnimInverseKinematics::solveTargetWithSpline(const AnimContext& context, const IKTarget& target, const AnimPoseVec& absolutePoses,
+                                                  bool debug, JointChainInfo& jointChainInfoOut) const {
 
     const int baseIndex = _hipsIndex;
 
@@ -720,7 +776,7 @@ void AnimInverseKinematics::solveTargetWithSpline(const AnimContext& context, co
 
     // This prevents the rotation interpolation from rotating the wrong physical way (but correct mathematical way)
     // when the head is arched backwards very far.
-    glm::quat halfRot = glm::normalize(glm::lerp(basePose.rot(), tipPose.rot(), 0.5f));
+    glm::quat halfRot = safeLerp(basePose.rot(), tipPose.rot(), 0.5f);
     if (glm::dot(halfRot * Vectors::UNIT_Z, basePose.rot() * Vectors::UNIT_Z) < 0.0f) {
         tipPose.rot() = -tipPose.rot();
     }
@@ -743,7 +799,7 @@ void AnimInverseKinematics::solveTargetWithSpline(const AnimContext& context, co
             if (target.getIndex() == _headIndex) {
                 rotT = t * t;
             }
-            glm::quat twistRot = glm::normalize(glm::lerp(basePose.rot(), tipPose.rot(), rotT));
+            glm::quat twistRot = safeLerp(basePose.rot(), tipPose.rot(), rotT);
 
             // compute the rotation by using the derivative of the spline as the y-axis, and the twistRot x-axis
             glm::vec3 y = glm::normalize(spline.d(t));
@@ -783,19 +839,14 @@ void AnimInverseKinematics::solveTargetWithSpline(const AnimContext& context, co
                 }
             }
 
-            jointChainInfos[i] = { relPose.rot(), relPose.trans(), target.getWeight(), splineJointInfo.jointIndex, constrained };
+            jointChainInfoOut.jointInfoVec[i] = { relPose.rot(), relPose.trans(), splineJointInfo.jointIndex, constrained };
 
             parentAbsPose = flexedAbsPose;
         }
     }
 
-    for (size_t i = 0; i < splineJointInfoVec->size(); i++) {
-        _rotationAccumulators[jointChainInfos[i].jointIndex].add(jointChainInfos[i].relRot, jointChainInfos[i].weight);
-        _translationAccumulators[jointChainInfos[i].jointIndex].add(jointChainInfos[i].relTrans, jointChainInfos[i].weight);
-    }
-
     if (debug) {
-        debugDrawIKChain(jointChainInfos, splineJointInfoVec->size(), context);
+        debugDrawIKChain(jointChainInfoOut, context);
     }
 }
 
@@ -806,6 +857,24 @@ const AnimPoseVec& AnimInverseKinematics::evaluate(const AnimVariantMap& animVar
     return _relativePoses;
 }
 
+AnimPose AnimInverseKinematics::applyHipsOffset() const {
+    glm::vec3 hipsOffset = _hipsOffset;
+    AnimPose relHipsPose = _relativePoses[_hipsIndex];
+    float offsetLength = glm::length(hipsOffset);
+    const float MIN_HIPS_OFFSET_LENGTH = 0.03f;
+    if (offsetLength > MIN_HIPS_OFFSET_LENGTH) {
+        float scaleFactor = ((offsetLength - MIN_HIPS_OFFSET_LENGTH) / offsetLength);
+        glm::vec3 scaledHipsOffset = scaleFactor * hipsOffset;
+        if (_hipsParentIndex == -1) {
+            relHipsPose.trans() = _relativePoses[_hipsIndex].trans() + scaledHipsOffset;
+        } else {
+            AnimPose absHipsPose = _skeleton->getAbsolutePose(_hipsIndex, _relativePoses);
+            absHipsPose.trans() += scaledHipsOffset;
+            relHipsPose = _skeleton->getAbsolutePose(_hipsParentIndex, _relativePoses).inverse() * absHipsPose;
+        }
+    }
+    return relHipsPose;
+}
 
 //virtual
 const AnimPoseVec& AnimInverseKinematics::overlay(const AnimVariantMap& animVars, const AnimContext& context, float dt, Triggers& triggersOut, const AnimPoseVec& underPoses) {
@@ -850,33 +919,88 @@ const AnimPoseVec& AnimInverseKinematics::overlay(const AnimVariantMap& animVars
             _relativePoses = underPoses;
         } else {
 
+            JointChainInfoVec jointChainInfoVec(targets.size());
+            {
+                PROFILE_RANGE_EX(simulation_animation, "ik/jointChainInfo", 0xffff00ff, 0);
+
+                // initialize a new jointChainInfoVec, this will hold the results for solving each ik chain.
+                JointInfo defaultJointInfo = { glm::quat(), glm::vec3(), -1, false };
+                for (size_t i = 0; i < targets.size(); i++) {
+                    size_t chainDepth = (size_t)_skeleton->getChainDepth(targets[i].getIndex());
+                    jointChainInfoVec[i].jointInfoVec.reserve(chainDepth);
+                    jointChainInfoVec[i].target = targets[i];
+                    int index = targets[i].getIndex();
+                    for (size_t j = 0; j < chainDepth; j++) {
+                        jointChainInfoVec[i].jointInfoVec.push_back(defaultJointInfo);
+                        jointChainInfoVec[i].jointInfoVec[j].jointIndex = index;
+                        index = _skeleton->getParentIndex(index);
+                    }
+                }
+
+                // identify joint chains that have changed types this frame.
+                _prevJointChainInfoVec.resize(jointChainInfoVec.size());
+                for (size_t i = 0; i < _prevJointChainInfoVec.size(); i++) {
+                    if (_prevJointChainInfoVec[i].timer <= 0.0f &&
+                        (jointChainInfoVec[i].target.getType() != _prevJointChainInfoVec[i].target.getType() ||
+                         jointChainInfoVec[i].target.getPoleVectorEnabled() != _prevJointChainInfoVec[i].target.getPoleVectorEnabled())) {
+                        _prevJointChainInfoVec[i].timer = JOINT_CHAIN_INTERP_TIME;
+                    }
+                }
+            }
+
             {
                 PROFILE_RANGE_EX(simulation_animation, "ik/shiftHips", 0xffff00ff, 0);
 
-                if (_hipsTargetIndex >= 0 && _hipsTargetIndex < (int)targets.size()) {
+                if (_hipsTargetIndex >= 0) {
+                    assert(_hipsTargetIndex < (int)targets.size());
+
                     // slam the hips to match the _hipsTarget
+
                     AnimPose absPose = targets[_hipsTargetIndex].getPose();
+
                     int parentIndex = _skeleton->getParentIndex(targets[_hipsTargetIndex].getIndex());
-                    if (parentIndex != -1) {
-                        _relativePoses[_hipsIndex] = _skeleton->getAbsolutePose(parentIndex, _relativePoses).inverse() * absPose;
-                    } else {
-                        _relativePoses[_hipsIndex] = absPose;
+                    AnimPose parentAbsPose = _skeleton->getAbsolutePose(parentIndex, _relativePoses);
+
+                    // do smooth interpolation of hips, if necessary.
+                    if (_prevJointChainInfoVec[_hipsTargetIndex].timer > 0.0f && _prevJointChainInfoVec[_hipsTargetIndex].jointInfoVec.size() > 0) {
+                        float alpha = (JOINT_CHAIN_INTERP_TIME - _prevJointChainInfoVec[_hipsTargetIndex].timer) / JOINT_CHAIN_INTERP_TIME;
+
+                        auto& info = _prevJointChainInfoVec[_hipsTargetIndex].jointInfoVec[0];
+                        AnimPose prevHipsRelPose(info.rot, info.trans);
+                        AnimPose prevHipsAbsPose = parentAbsPose * prevHipsRelPose;
+                        ::blend(1, &prevHipsAbsPose, &absPose, alpha, &absPose);
                     }
-                } else {
+
+                    _relativePoses[_hipsIndex] = parentAbsPose.inverse() * absPose;
+                    _relativePoses[_hipsIndex].scale() = glm::vec3(1.0f);
+                    _hipsOffset = Vectors::ZERO;
+
+                } else if (_hipsIndex >= 0) {
+
                     // if there is no hips target, shift hips according to the _hipsOffset from the previous frame
-                    float offsetLength = glm::length(_hipsOffset);
-                    const float MIN_HIPS_OFFSET_LENGTH = 0.03f;
-                    if (offsetLength > MIN_HIPS_OFFSET_LENGTH && _hipsIndex >= 0) {
-                        float scaleFactor = ((offsetLength - MIN_HIPS_OFFSET_LENGTH) / offsetLength);
-                        glm::vec3 hipsOffset = scaleFactor * _hipsOffset;
-                        if (_hipsParentIndex == -1) {
-                            _relativePoses[_hipsIndex].trans() = _relativePoses[_hipsIndex].trans() + hipsOffset;
-                        } else {
-                            auto absHipsPose = _skeleton->getAbsolutePose(_hipsIndex, _relativePoses);
-                            absHipsPose.trans() += hipsOffset;
-                            _relativePoses[_hipsIndex] = _skeleton->getAbsolutePose(_hipsParentIndex, _relativePoses).inverse() * absHipsPose;
+                    AnimPose relHipsPose = applyHipsOffset();
+
+                    // determine if we should begin interpolating the hips.
+                    for (size_t i = 0; i < targets.size(); i++) {
+                        if (_prevJointChainInfoVec[i].target.getIndex() == _hipsIndex) {
+                            if (_prevJointChainInfoVec[i].timer > 0.0f) {
+                                // smoothly lerp in hipsOffset
+                                float alpha = (JOINT_CHAIN_INTERP_TIME - _prevJointChainInfoVec[i].timer) / JOINT_CHAIN_INTERP_TIME;
+                                AnimPose prevRelHipsPose(_prevJointChainInfoVec[i].jointInfoVec[0].rot, _prevJointChainInfoVec[i].jointInfoVec[0].trans);
+                                ::blend(1, &prevRelHipsPose, &relHipsPose, alpha, &relHipsPose);
+                            }
+                            break;
                         }
                     }
+
+                    _relativePoses[_hipsIndex] = relHipsPose;
+                }
+
+                // if there is an active jointChainInfo for the hips store the post shifted hips into it.
+                // This is so we have a valid pose to interplate from when the hips target is disabled.
+                if (_hipsTargetIndex >= 0) {
+                    jointChainInfoVec[_hipsTargetIndex].jointInfoVec[0].rot = _relativePoses[_hipsIndex].rot();
+                    jointChainInfoVec[_hipsTargetIndex].jointInfoVec[0].trans = _relativePoses[_hipsIndex].trans();
                 }
 
                 // update all HipsRelative targets to account for the hips shift/ik target.
@@ -898,19 +1022,30 @@ const AnimPoseVec& AnimInverseKinematics::overlay(const AnimVariantMap& animVars
                 // debug render ik targets
                 if (context.getEnableDebugDrawIKTargets()) {
                     const vec4 WHITE(1.0f);
+                    const vec4 GREEN(0.0f, 1.0f, 0.0f, 1.0f);
                     glm::mat4 rigToAvatarMat = createMatFromQuatAndPos(Quaternions::Y_180, glm::vec3());
+                    int targetNum = 0;
 
                     for (auto& target : targets) {
                         glm::mat4 geomTargetMat = createMatFromQuatAndPos(target.getRotation(), target.getTranslation());
                         glm::mat4 avatarTargetMat = rigToAvatarMat * context.getGeometryToRigMatrix() * geomTargetMat;
 
-                        QString name = QString("ikTarget%1").arg(target.getIndex());
+                        QString name = QString("ikTarget%1").arg(targetNum);
                         DebugDraw::getInstance().addMyAvatarMarker(name, glmExtractRotation(avatarTargetMat), extractTranslation(avatarTargetMat), WHITE);
+                        targetNum++;
+                    }
+
+                    // draw secondary ik targets
+                    for (auto& iter : _secondaryTargetsInRigFrame) {
+                        glm::mat4 avatarTargetMat = rigToAvatarMat * (glm::mat4)iter.second;
+                        QString name = QString("ikTarget%1").arg(targetNum);
+                        DebugDraw::getInstance().addMyAvatarMarker(name, glmExtractRotation(avatarTargetMat), extractTranslation(avatarTargetMat), GREEN);
+                        targetNum++;
                     }
                 } else if (context.getEnableDebugDrawIKTargets() != _previousEnableDebugIKTargets) {
                     // remove markers if they were added last frame.
-                    for (auto& target : targets) {
-                        QString name = QString("ikTarget%1").arg(target.getIndex());
+                    for (int i = 0; i < MAX_TARGET_MARKERS; i++) {
+                        QString name = QString("ikTarget%1").arg(i);
                         DebugDraw::getInstance().removeMyAvatarMarker(name);
                     }
                 }
@@ -920,15 +1055,16 @@ const AnimPoseVec& AnimInverseKinematics::overlay(const AnimVariantMap& animVars
 
             {
                 PROFILE_RANGE_EX(simulation_animation, "ik/ccd", 0xffff00ff, 0);
+
+                setSecondaryTargets(context);
                 preconditionRelativePosesToAvoidLimbLock(context, targets);
-                solve(context, targets);
+
+                solve(context, targets, dt, jointChainInfoVec);
             }
 
             if (_hipsTargetIndex < 0) {
                 PROFILE_RANGE_EX(simulation_animation, "ik/measureHipsOffset", 0xffff00ff, 0);
-                computeHipsOffset(targets, underPoses, dt);
-            } else {
-                _hipsOffset = Vectors::ZERO;
+                _hipsOffset = computeHipsOffset(targets, underPoses, dt, _hipsOffset);
             }
         }
 
@@ -937,23 +1073,15 @@ const AnimPoseVec& AnimInverseKinematics::overlay(const AnimVariantMap& animVars
         }
     }
 
-    if (_leftHandIndex > -1) {
-        _uncontrolledLeftHandPose = _skeleton->getAbsolutePose(_leftHandIndex, underPoses);
-    }
-    if (_rightHandIndex > -1) {
-        _uncontrolledRightHandPose = _skeleton->getAbsolutePose(_rightHandIndex, underPoses);
-    }
-    if (_hipsIndex > -1) {
-        _uncontrolledHipsPose = _skeleton->getAbsolutePose(_hipsIndex, underPoses);
-    }
-
     return _relativePoses;
 }
 
-void AnimInverseKinematics::computeHipsOffset(const std::vector<IKTarget>& targets, const AnimPoseVec& underPoses, float dt) {
+glm::vec3 AnimInverseKinematics::computeHipsOffset(const std::vector<IKTarget>& targets, const AnimPoseVec& underPoses, float dt, glm::vec3 prevHipsOffset) const {
+
     // measure new _hipsOffset for next frame
     // by looking for discrepancies between where a targeted endEffector is
     // and where it wants to be (after IK solutions are done)
+    glm::vec3 hipsOffset = prevHipsOffset;
     glm::vec3 newHipsOffset = Vectors::ZERO;
     for (auto& target: targets) {
         int targetIndex = target.getIndex();
@@ -969,9 +1097,9 @@ void AnimInverseKinematics::computeHipsOffset(const std::vector<IKTarget>& targe
             } else if (target.getType() == IKTarget::Type::HmdHead) {
                 // we want to shift the hips to bring the head to its designated position
                 glm::vec3 actual = _skeleton->getAbsolutePose(_headIndex, _relativePoses).trans();
-                _hipsOffset += target.getTranslation() - actual;
+                hipsOffset += target.getTranslation() - actual;
                 // and ignore all other targets
-                newHipsOffset = _hipsOffset;
+                newHipsOffset = hipsOffset;
                 break;
             } else if (target.getType() == IKTarget::Type::RotationAndPosition) {
                 glm::vec3 actualPosition = _skeleton->getAbsolutePose(targetIndex, _relativePoses).trans();
@@ -991,16 +1119,18 @@ void AnimInverseKinematics::computeHipsOffset(const std::vector<IKTarget>& targe
         }
     }
 
-    // smooth transitions by relaxing _hipsOffset toward the new value
+    // smooth transitions by relaxing hipsOffset toward the new value
     const float HIPS_OFFSET_SLAVE_TIMESCALE = 0.10f;
     float tau = dt < HIPS_OFFSET_SLAVE_TIMESCALE ?  dt / HIPS_OFFSET_SLAVE_TIMESCALE : 1.0f;
-    _hipsOffset += (newHipsOffset - _hipsOffset) * tau;
+    hipsOffset += (newHipsOffset - hipsOffset) * tau;
 
     // clamp the hips offset
-    float hipsOffsetLength = glm::length(_hipsOffset);
+    float hipsOffsetLength = glm::length(hipsOffset);
     if (hipsOffsetLength > _maxHipsOffsetLength) {
-        _hipsOffset *= _maxHipsOffsetLength / hipsOffsetLength;
+        hipsOffset *= _maxHipsOffsetLength / hipsOffsetLength;
     }
+
+    return hipsOffset;
 }
 
 void AnimInverseKinematics::setMaxHipsOffsetLength(float maxLength) {
@@ -1015,6 +1145,22 @@ void AnimInverseKinematics::clearIKJointLimitHistory() {
     }
 }
 
+void AnimInverseKinematics::setSecondaryTargetInRigFrame(int jointIndex, const AnimPose& pose) {
+    auto iter = _secondaryTargetsInRigFrame.find(jointIndex);
+    if (iter != _secondaryTargetsInRigFrame.end()) {
+        iter->second = pose;
+    } else {
+        _secondaryTargetsInRigFrame.insert({ jointIndex, pose });
+    }
+}
+
+void AnimInverseKinematics::clearSecondaryTarget(int jointIndex) {
+    auto iter = _secondaryTargetsInRigFrame.find(jointIndex);
+    if (iter != _secondaryTargetsInRigFrame.end()) {
+        _secondaryTargetsInRigFrame.erase(iter);
+    }
+}
+
 RotationConstraint* AnimInverseKinematics::getConstraint(int index) const {
     RotationConstraint* constraint = nullptr;
     std::map<int, RotationConstraint*>::const_iterator constraintItr = _constraints.find(index);
@@ -1414,8 +1560,6 @@ void AnimInverseKinematics::setSkeletonInternal(AnimSkeleton::ConstPointer skele
         targetVar.jointIndex = -1;
     }
 
-    _maxTargetIndex = -1;
-
     for (auto& accumulator: _rotationAccumulators) {
         accumulator.clearAndClean();
     }
@@ -1446,10 +1590,6 @@ void AnimInverseKinematics::setSkeletonInternal(AnimSkeleton::ConstPointer skele
         _leftHandIndex = -1;
         _rightHandIndex = -1;
     }
-
-    _uncontrolledLeftHandPose = AnimPose();
-    _uncontrolledRightHandPose = AnimPose();
-    _uncontrolledHipsPose = AnimPose();
 }
 
 static glm::vec3 sphericalToCartesian(float phi, float theta) {
@@ -1471,7 +1611,7 @@ void AnimInverseKinematics::debugDrawRelativePoses(const AnimContext& context) c
     const vec4 GREEN(0.0f, 1.0f, 0.0f, 1.0f);
     const vec4 BLUE(0.0f, 0.0f, 1.0f, 1.0f);
     const vec4 GRAY(0.2f, 0.2f, 0.2f, 1.0f);
-    const float AXIS_LENGTH = 2.0f; // cm
+    const float AXIS_LENGTH = 10.0f; // cm
 
     // draw each pose
     for (int i = 0; i < (int)poses.size(); i++) {
@@ -1495,14 +1635,16 @@ void AnimInverseKinematics::debugDrawRelativePoses(const AnimContext& context) c
     }
 }
 
-void AnimInverseKinematics::debugDrawIKChain(JointChainInfo* jointChainInfos, size_t numJointChainInfos, const AnimContext& context) const {
+void AnimInverseKinematics::debugDrawIKChain(const JointChainInfo& jointChainInfo, const AnimContext& context) const {
     AnimPoseVec poses = _relativePoses;
 
     // copy debug joint rotations into the relative poses
-    for (size_t i = 0; i < numJointChainInfos; i++) {
-        const JointChainInfo& info = jointChainInfos[i];
-        poses[info.jointIndex].rot() = info.relRot;
-        poses[info.jointIndex].trans() = info.relTrans;
+    for (size_t i = 0; i < jointChainInfo.jointInfoVec.size(); i++) {
+        const JointInfo& info = jointChainInfo.jointInfoVec[i];
+        if (info.jointIndex != _hipsIndex) {
+            poses[info.jointIndex].rot() = info.rot;
+            poses[info.jointIndex].trans() = info.trans;
+        }
     }
 
     // convert relative poses to absolute
@@ -1519,9 +1661,9 @@ void AnimInverseKinematics::debugDrawIKChain(JointChainInfo* jointChainInfos, si
     // draw each pose
     for (int i = 0; i < (int)poses.size(); i++) {
         int parentIndex = _skeleton->getParentIndex(i);
-        JointChainInfo* jointInfo = nullptr;
-        JointChainInfo* parentJointInfo = nullptr;
-        lookupJointChainInfo(jointChainInfos, numJointChainInfos, i, parentIndex, &jointInfo, &parentJointInfo);
+        const JointInfo* jointInfo = nullptr;
+        const JointInfo* parentJointInfo = nullptr;
+        lookupJointInfo(jointChainInfo, i, parentIndex, &jointInfo, &parentJointInfo);
         if (jointInfo && parentJointInfo) {
 
             // transform local axes into world space.
@@ -1608,7 +1750,7 @@ void AnimInverseKinematics::debugDrawConstraints(const AnimContext& context) con
 
                     const int NUM_SWING_STEPS = 10;
                     for (int i = 0; i < NUM_SWING_STEPS + 1; i++) {
-                        glm::quat rot = glm::normalize(glm::lerp(minRot, maxRot, i * (1.0f / NUM_SWING_STEPS)));
+                        glm::quat rot = safeLerp(minRot, maxRot, i * (1.0f / NUM_SWING_STEPS));
                         glm::vec3 axis = transformVectorFast(geomToWorldMatrix, parentAbsRot * rot * refRot * Vectors::UNIT_Y);
                         DebugDraw::getInstance().drawRay(pos, pos + TWIST_LENGTH * axis, CYAN);
                     }
@@ -1626,7 +1768,7 @@ void AnimInverseKinematics::debugDrawConstraints(const AnimContext& context) con
 
                         const int NUM_SWING_STEPS = 10;
                         for (int i = 0; i < NUM_SWING_STEPS + 1; i++) {
-                            glm::quat rot = glm::normalize(glm::lerp(minRot, maxRot, i * (1.0f / NUM_SWING_STEPS)));
+                            glm::quat rot = safeLerp(minRot, maxRot, i * (1.0f / NUM_SWING_STEPS));
                             glm::vec3 axis = transformVectorFast(geomToWorldMatrix, parentAbsRot * rot * refRot * Vectors::UNIT_X);
                             DebugDraw::getInstance().drawRay(pos, pos + TWIST_LENGTH * axis, CYAN);
                         }
@@ -1666,10 +1808,9 @@ void AnimInverseKinematics::blendToPoses(const AnimPoseVec& targetPoses, const A
     // relax toward poses
     int numJoints = (int)_relativePoses.size();
     for (int i = 0; i < numJoints; ++i) {
-        float dotSign = copysignf(1.0f, glm::dot(_relativePoses[i].rot(), targetPoses[i].rot()));
         if (_rotationAccumulators[i].isDirty()) {
             // this joint is affected by IK --> blend toward the targetPoses rotation
-            _relativePoses[i].rot() = glm::normalize(glm::lerp(_relativePoses[i].rot(), dotSign * targetPoses[i].rot(), blendFactor));
+            _relativePoses[i].rot() = safeLerp(_relativePoses[i].rot(), targetPoses[i].rot(), blendFactor);
         } else {
             // this joint is NOT affected by IK --> slam to underPoses rotation
             _relativePoses[i].rot() = underPoses[i].rot();
@@ -1722,6 +1863,59 @@ void AnimInverseKinematics::preconditionRelativePosesToAvoidLimbLock(const AnimC
     }
 }
 
+// overwrites _relativePoses with secondary poses.
+void AnimInverseKinematics::setSecondaryTargets(const AnimContext& context) {
+
+    if (_secondaryTargetsInRigFrame.empty()) {
+        return;
+    }
+
+    // special case for arm secondary poses.
+    // determine if shoulder joint should look-at position of arm joint.
+    bool shoulderShouldLookAtArm = false;
+    const int leftArmIndex = _skeleton->nameToJointIndex("LeftArm");
+    const int rightArmIndex = _skeleton->nameToJointIndex("RightArm");
+    const int leftShoulderIndex = _skeleton->nameToJointIndex("LeftShoulder");
+    const int rightShoulderIndex = _skeleton->nameToJointIndex("RightShoulder");
+    for (auto& iter : _secondaryTargetsInRigFrame) {
+        if (iter.first == leftShoulderIndex || iter.first == rightShoulderIndex) {
+            shoulderShouldLookAtArm = true;
+            break;
+        }
+    }
+
+    AnimPose rigToGeometryPose = AnimPose(glm::inverse(context.getGeometryToRigMatrix()));
+    for (auto& iter : _secondaryTargetsInRigFrame) {
+        AnimPose absPose = rigToGeometryPose * iter.second;
+        absPose.scale() = glm::vec3(1.0f);
+
+        AnimPose parentAbsPose;
+        int parentIndex = _skeleton->getParentIndex(iter.first);
+        if (parentIndex >= 0) {
+            parentAbsPose = _skeleton->getAbsolutePose(parentIndex, _relativePoses);
+        }
+
+        // if parent should "look-at" child joint position.
+        if (shoulderShouldLookAtArm && (iter.first == leftArmIndex || iter.first == rightArmIndex)) {
+
+            AnimPose grandParentAbsPose;
+            int grandParentIndex = _skeleton->getParentIndex(parentIndex);
+            if (parentIndex >= 0) {
+                grandParentAbsPose = _skeleton->getAbsolutePose(grandParentIndex, _relativePoses);
+            }
+
+            // the shoulder should rotate toward the arm joint via "look-at" constraint
+            parentAbsPose = boneLookAt(absPose.trans(), parentAbsPose);
+            _relativePoses[parentIndex] = grandParentAbsPose.inverse() * parentAbsPose;
+        }
+
+        // Ignore translation on secondary poses, to prevent them from distorting the skeleton.
+        glm::vec3 origTrans = _relativePoses[iter.first].trans();
+        _relativePoses[iter.first] = parentAbsPose.inverse() * absPose;
+        _relativePoses[iter.first].trans() = origTrans;
+    }
+}
+
 void AnimInverseKinematics::initRelativePosesFromSolutionSource(SolutionSource solutionSource, const AnimPoseVec& underPoses) {
     const float RELAX_BLEND_FACTOR = (1.0f / 16.0f);
     const float COPY_BLEND_FACTOR = 1.0f;
diff --git a/libraries/animation/src/AnimInverseKinematics.h b/libraries/animation/src/AnimInverseKinematics.h
index d473ae3698..bdfbad408d 100644
--- a/libraries/animation/src/AnimInverseKinematics.h
+++ b/libraries/animation/src/AnimInverseKinematics.h
@@ -26,14 +26,21 @@ class RotationConstraint;
 class AnimInverseKinematics : public AnimNode {
 public:
 
-    struct JointChainInfo {
-        glm::quat relRot;
-        glm::vec3 relTrans;
-        float weight;
+    struct JointInfo {
+        glm::quat rot;
+        glm::vec3 trans;
         int jointIndex;
         bool constrained;
     };
 
+    struct JointChainInfo {
+        std::vector<JointInfo> jointInfoVec;
+        IKTarget target;
+        float timer { 0.0f };
+    };
+
+    using JointChainInfoVec = std::vector<JointChainInfo>;
+
     explicit AnimInverseKinematics(const QString& id);
     virtual ~AnimInverseKinematics() override;
 
@@ -63,26 +70,29 @@ public:
         NumSolutionSources,
     };
 
+    void setSecondaryTargetInRigFrame(int jointIndex, const AnimPose& pose);
+    void clearSecondaryTarget(int jointIndex);
+
     void setSolutionSource(SolutionSource solutionSource) { _solutionSource = solutionSource; }
     void setSolutionSourceVar(const QString& solutionSourceVar) { _solutionSourceVar = solutionSourceVar; }
 
-    const AnimPose& getUncontrolledLeftHandPose() { return _uncontrolledLeftHandPose; }
-    const AnimPose& getUncontrolledRightHandPose() { return _uncontrolledRightHandPose; }
-    const AnimPose& getUncontrolledHipPose() { return _uncontrolledHipsPose; }
-
 protected:
     void computeTargets(const AnimVariantMap& animVars, std::vector<IKTarget>& targets, const AnimPoseVec& underPoses);
-    void solve(const AnimContext& context, const std::vector<IKTarget>& targets);
-    void solveTargetWithCCD(const AnimContext& context, const IKTarget& target, const AnimPoseVec& absolutePoses, bool debug);
-    void solveTargetWithSpline(const AnimContext& context, const IKTarget& target, const AnimPoseVec& absolutePoses, bool debug);
+    void solve(const AnimContext& context, const std::vector<IKTarget>& targets, float dt, JointChainInfoVec& jointChainInfoVec);
+    void solveTargetWithCCD(const AnimContext& context, const IKTarget& target, const AnimPoseVec& absolutePoses,
+                            bool debug, JointChainInfo& jointChainInfoOut) const;
+    void solveTargetWithSpline(const AnimContext& context, const IKTarget& target, const AnimPoseVec& absolutePoses,
+                               bool debug, JointChainInfo& jointChainInfoOut) const;
     virtual void setSkeletonInternal(AnimSkeleton::ConstPointer skeleton) override;
-    void debugDrawIKChain(JointChainInfo* jointChainInfos, size_t numJointChainInfos, const AnimContext& context) const;
+    void debugDrawIKChain(const JointChainInfo& jointChainInfo, const AnimContext& context) const;
     void debugDrawRelativePoses(const AnimContext& context) const;
     void debugDrawConstraints(const AnimContext& context) const;
     void debugDrawSpineSplines(const AnimContext& context, const std::vector<IKTarget>& targets) const;
     void initRelativePosesFromSolutionSource(SolutionSource solutionSource, const AnimPoseVec& underPose);
     void blendToPoses(const AnimPoseVec& targetPoses, const AnimPoseVec& underPose, float blendFactor);
     void preconditionRelativePosesToAvoidLimbLock(const AnimContext& context, const std::vector<IKTarget>& targets);
+    void setSecondaryTargets(const AnimContext& context);
+    AnimPose applyHipsOffset() const;
 
     // used to pre-compute information about each joint influeced by a spline IK target.
     struct SplineJointInfo {
@@ -91,8 +101,8 @@ protected:
         AnimPose offsetPose;  // local offset from the spline to the joint.
     };
 
-    void computeSplineJointInfosForIKTarget(const AnimContext& context, const IKTarget& target);
-    const std::vector<SplineJointInfo>* findOrCreateSplineJointInfo(const AnimContext& context, const IKTarget& target);
+    void computeAndCacheSplineJointInfosForIKTarget(const AnimContext& context, const IKTarget& target) const;
+    const std::vector<SplineJointInfo>* findOrCreateSplineJointInfo(const AnimContext& context, const IKTarget& target) const;
 
     // for AnimDebugDraw rendering
     virtual const AnimPoseVec& getPosesInternal() const override { return _relativePoses; }
@@ -101,7 +111,7 @@ protected:
     void clearConstraints();
     void initConstraints();
     void initLimitCenterPoses();
-    void computeHipsOffset(const std::vector<IKTarget>& targets, const AnimPoseVec& underPoses, float dt);
+    glm::vec3 computeHipsOffset(const std::vector<IKTarget>& targets, const AnimPoseVec& underPoses, float dt, glm::vec3 prevHipsOffset) const;
 
     // no copies
     AnimInverseKinematics(const AnimInverseKinematics&) = delete;
@@ -136,7 +146,9 @@ protected:
     AnimPoseVec _relativePoses; // current relative poses
     AnimPoseVec _limitCenterPoses;  // relative
 
-    std::map<int, std::vector<SplineJointInfo>> _splineJointInfoMap;
+    std::map<int, AnimPose> _secondaryTargetsInRigFrame;
+
+    mutable std::map<int, std::vector<SplineJointInfo>> _splineJointInfoMap;
 
     // experimental data for moving hips during IK
     glm::vec3 _hipsOffset { Vectors::ZERO };
@@ -148,18 +160,12 @@ protected:
     int _leftHandIndex { -1 };
     int _rightHandIndex { -1 };
 
-    // _maxTargetIndex is tracked to help optimize the recalculation of absolute poses
-    // during the the cyclic coordinate descent algorithm
-    int _maxTargetIndex { 0 };
-
     float _maxErrorOnLastSolve { FLT_MAX };
     bool _previousEnableDebugIKTargets { false };
     SolutionSource _solutionSource { SolutionSource::RelaxToUnderPoses };
     QString _solutionSourceVar;
 
-    AnimPose _uncontrolledLeftHandPose { AnimPose() };
-    AnimPose _uncontrolledRightHandPose { AnimPose() };
-    AnimPose _uncontrolledHipsPose { AnimPose() };
+    JointChainInfoVec _prevJointChainInfoVec;
 };
 
 #endif // hifi_AnimInverseKinematics_h
diff --git a/libraries/animation/src/AnimSkeleton.cpp b/libraries/animation/src/AnimSkeleton.cpp
index 062e016660..804ffb0583 100644
--- a/libraries/animation/src/AnimSkeleton.cpp
+++ b/libraries/animation/src/AnimSkeleton.cpp
@@ -42,6 +42,20 @@ int AnimSkeleton::getNumJoints() const {
     return _jointsSize;
 }
 
+int AnimSkeleton::getChainDepth(int jointIndex) const {
+    if (jointIndex >= 0) {
+        int chainDepth = 0;
+        int index = jointIndex;
+        do {
+            chainDepth++;
+            index = _joints[index].parentIndex;
+        } while (index != -1);
+        return chainDepth;
+    } else {
+        return 0;
+    }
+}
+
 const AnimPose& AnimSkeleton::getAbsoluteBindPose(int jointIndex) const {
     return _absoluteBindPoses[jointIndex];
 }
diff --git a/libraries/animation/src/AnimSkeleton.h b/libraries/animation/src/AnimSkeleton.h
index 6315f2d62b..99c9a148f7 100644
--- a/libraries/animation/src/AnimSkeleton.h
+++ b/libraries/animation/src/AnimSkeleton.h
@@ -28,6 +28,7 @@ public:
     int nameToJointIndex(const QString& jointName) const;
     const QString& getJointName(int jointIndex) const;
     int getNumJoints() const;
+    int getChainDepth(int jointIndex) const;
 
     // absolute pose, not relative to parent
     const AnimPose& getAbsoluteBindPose(int jointIndex) const;
diff --git a/libraries/animation/src/AnimUtil.cpp b/libraries/animation/src/AnimUtil.cpp
index a4659f1e76..65c605b5ba 100644
--- a/libraries/animation/src/AnimUtil.cpp
+++ b/libraries/animation/src/AnimUtil.cpp
@@ -28,7 +28,7 @@ void blend(size_t numPoses, const AnimPose* a, const AnimPose* b, float alpha, A
         }
 
         result[i].scale() = lerp(aPose.scale(), bPose.scale(), alpha);
-        result[i].rot() = glm::normalize(glm::lerp(aPose.rot(), q2, alpha));
+        result[i].rot() = safeLerp(aPose.rot(), bPose.rot(), alpha);
         result[i].trans() = lerp(aPose.trans(), bPose.trans(), alpha);
     }
 }
@@ -96,3 +96,14 @@ float accumulateTime(float startFrame, float endFrame, float timeScale, float cu
     return frame;
 }
 
+// rotate bone's y-axis with target.
+AnimPose boneLookAt(const glm::vec3& target, const AnimPose& bone) {
+    glm::vec3 u, v, w;
+    generateBasisVectors(target - bone.trans(), bone.rot() * Vectors::UNIT_X, u, v, w);
+    glm::mat4 lookAt(glm::vec4(v, 0.0f),
+                     glm::vec4(u, 0.0f),
+                     // AJT: TODO REVISIT THIS, this could be -w.
+                     glm::vec4(glm::normalize(glm::cross(v, u)), 0.0f),
+                     glm::vec4(bone.trans(), 1.0f));
+    return AnimPose(lookAt);
+}
diff --git a/libraries/animation/src/AnimUtil.h b/libraries/animation/src/AnimUtil.h
index 055fd630eb..f2cceb361b 100644
--- a/libraries/animation/src/AnimUtil.h
+++ b/libraries/animation/src/AnimUtil.h
@@ -21,4 +21,16 @@ glm::quat averageQuats(size_t numQuats, const glm::quat* quats);
 float accumulateTime(float startFrame, float endFrame, float timeScale, float currentFrame, float dt, bool loopFlag,
                      const QString& id, AnimNode::Triggers& triggersOut);
 
+inline glm::quat safeLerp(const glm::quat& a, const glm::quat& b, float alpha) {
+    // adjust signs if necessary
+    glm::quat bTemp = b;
+    float dot = glm::dot(a, bTemp);
+    if (dot < 0.0f) {
+        bTemp = -bTemp;
+    }
+    return glm::normalize(glm::lerp(a, bTemp, alpha));
+}
+
+AnimPose boneLookAt(const glm::vec3& target, const AnimPose& bone);
+
 #endif
diff --git a/libraries/animation/src/AnimationCache.cpp b/libraries/animation/src/AnimationCache.cpp
index 7d4c0f4e92..9aa315beb8 100644
--- a/libraries/animation/src/AnimationCache.cpp
+++ b/libraries/animation/src/AnimationCache.cpp
@@ -9,15 +9,18 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AnimationCache.h"
+
 #include <QRunnable>
 #include <QThreadPool>
 
-#include "AnimationCache.h"
-#include "AnimationLogging.h"
+#include <shared/QtHelpers.h>
 #include <Trace.h>
 #include <StatTracker.h>
 #include <Profile.h>
 
+#include "AnimationLogging.h"
+
 int animationPointerMetaTypeId = qRegisterMetaType<AnimationPointer>();
 
 AnimationCache::AnimationCache(QObject* parent) :
@@ -31,7 +34,7 @@ AnimationCache::AnimationCache(QObject* parent) :
 AnimationPointer AnimationCache::getAnimation(const QUrl& url) {
     if (QThread::currentThread() != thread()) {
         AnimationPointer result;
-        QMetaObject::invokeMethod(this, "getAnimation", Qt::BlockingQueuedConnection,
+        BLOCKING_INVOKE_METHOD(this, "getAnimation",
             Q_RETURN_ARG(AnimationPointer, result), Q_ARG(const QUrl&, url));
         return result;
     }
@@ -97,7 +100,7 @@ bool Animation::isLoaded() const {
 QStringList Animation::getJointNames() const {
     if (QThread::currentThread() != thread()) {
         QStringList result;
-        QMetaObject::invokeMethod(const_cast<Animation*>(this), "getJointNames", Qt::BlockingQueuedConnection,
+        BLOCKING_INVOKE_METHOD(const_cast<Animation*>(this), "getJointNames",
             Q_RETURN_ARG(QStringList, result));
         return result;
     }
@@ -111,7 +114,7 @@ QStringList Animation::getJointNames() const {
 QVector<FBXAnimationFrame> Animation::getFrames() const {
     if (QThread::currentThread() != thread()) {
         QVector<FBXAnimationFrame> result;
-        QMetaObject::invokeMethod(const_cast<Animation*>(this), "getFrames", Qt::BlockingQueuedConnection,
+        BLOCKING_INVOKE_METHOD(const_cast<Animation*>(this), "getFrames", 
             Q_RETURN_ARG(QVector<FBXAnimationFrame>, result));
         return result;
     }
diff --git a/libraries/animation/src/IKTarget.h b/libraries/animation/src/IKTarget.h
index 5567539659..325a1b40b6 100644
--- a/libraries/animation/src/IKTarget.h
+++ b/libraries/animation/src/IKTarget.h
@@ -56,8 +56,8 @@ private:
     glm::vec3 _poleReferenceVector;
     bool _poleVectorEnabled { false };
     int _index { -1 };
-    Type _type { Type::RotationAndPosition };
-    float _weight;
+    Type _type { Type::Unknown };
+    float _weight { 0.0f };
     float _flexCoefficients[MAX_FLEX_COEFFICIENTS];
     size_t _numFlexCoefficients;
 };
diff --git a/libraries/animation/src/Rig.cpp b/libraries/animation/src/Rig.cpp
index 3d04b0b26f..78aa1f4ba8 100644
--- a/libraries/animation/src/Rig.cpp
+++ b/libraries/animation/src/Rig.cpp
@@ -32,9 +32,19 @@
 #include "AnimUtil.h"
 #include "IKTarget.h"
 
+
+static int nextRigId = 1;
+static std::map<int, Rig*> rigRegistry;
+static std::mutex rigRegistryMutex;
+
 static bool isEqual(const glm::vec3& u, const glm::vec3& v) {
     const float EPSILON = 0.0001f;
-    return glm::length(u - v) / glm::length(u) <= EPSILON;
+    float uLen = glm::length(u);
+    if (uLen == 0.0f) {
+        return glm::length(v) <= EPSILON;
+    } else {
+        return (glm::length(u - v) / uLen) <= EPSILON;
+    }
 }
 
 static bool isEqual(const glm::quat& p, const glm::quat& q) {
@@ -49,6 +59,26 @@ const glm::vec3 DEFAULT_RIGHT_EYE_POS(-0.3f, 0.9f, 0.0f);
 const glm::vec3 DEFAULT_LEFT_EYE_POS(0.3f, 0.9f, 0.0f);
 const glm::vec3 DEFAULT_HEAD_POS(0.0f, 0.75f, 0.0f);
 
+Rig::Rig() {
+    // Ensure thread-safe access to the rigRegistry.
+    std::lock_guard<std::mutex> guard(rigRegistryMutex);
+
+    // Insert this newly allocated rig into the rig registry
+    _rigId = nextRigId;
+    rigRegistry[_rigId] = this;
+    nextRigId++;
+}
+
+Rig::~Rig() {
+    // Ensure thread-safe access to the rigRegstry, but also prevent the rig from being deleted
+    // while Rig::animationStateHandlerResult is being invoked on a script thread.
+    std::lock_guard<std::mutex> guard(rigRegistryMutex);
+    auto iter = rigRegistry.find(_rigId);
+    if (iter != rigRegistry.end()) {
+        rigRegistry.erase(iter);
+    }
+}
+
 void Rig::overrideAnimation(const QString& url, float fps, bool loop, float firstFrame, float lastFrame) {
 
     UserAnimState::ClipNodeEnum clipNodeEnum;
@@ -127,6 +157,7 @@ void Rig::overrideRoleAnimation(const QString& role, const QString& url, float f
             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);
+            _roleAnimStates[role] = { role, url, fps, loop, firstFrame, lastFrame };
             AnimNode::Pointer parent = node->getParent();
             parent->replaceChild(node, clipNode);
         } else {
@@ -148,6 +179,11 @@ void Rig::restoreRoleAnimation(const QString& role) {
             } else {
                 qCWarning(animation) << "Rig::restoreRoleAnimation could not find role " << role;
             }
+            
+            auto statesIter = _roleAnimStates.find(role);
+            if (statesIter != _roleAnimStates.end()) {
+                _roleAnimStates.erase(statesIter);
+            }
         }
     } else {
         qCWarning(animation) << "Rig::overrideRoleAnimation avatar not ready yet";
@@ -168,6 +204,8 @@ void Rig::destroyAnimGraph() {
 void Rig::initJointStates(const FBXGeometry& geometry, const glm::mat4& modelOffset) {
     _geometryOffset = AnimPose(geometry.offset);
     _invGeometryOffset = _geometryOffset.inverse();
+    _geometryToRigTransform = modelOffset * geometry.offset;
+    _rigToGeometryTransform = glm::inverse(_geometryToRigTransform);
     setModelOffset(modelOffset);
 
     _animSkeleton = std::make_shared<AnimSkeleton>(geometry);
@@ -223,6 +261,7 @@ void Rig::reset(const FBXGeometry& geometry) {
     _rightShoulderJointIndex = _rightElbowJointIndex >= 0 ? geometry.joints.at(_rightElbowJointIndex).parentIndex : -1;
 
     if (!_animGraphURL.isEmpty()) {
+        _animNode.reset();
         initAnimGraph(_animGraphURL);
     }
 }
@@ -274,7 +313,9 @@ void Rig::setModelOffset(const glm::mat4& modelOffsetMat) {
         _rigToGeometryTransform = glm::inverse(_geometryToRigTransform);
 
         // rebuild cached default poses
-        buildAbsoluteRigPoses(_animSkeleton->getRelativeDefaultPoses(), _absoluteDefaultPoses);
+        if (_animSkeleton) {
+            buildAbsoluteRigPoses(_animSkeleton->getRelativeDefaultPoses(), _absoluteDefaultPoses);
+        }
     }
 }
 
@@ -404,8 +445,18 @@ void Rig::setJointRotation(int index, bool valid, const glm::quat& rotation, flo
 }
 
 bool Rig::getJointPositionInWorldFrame(int jointIndex, glm::vec3& position, glm::vec3 translation, glm::quat rotation) const {
-    if (isIndexValid(jointIndex)) {
-        position = (rotation * _internalPoseSet._absolutePoses[jointIndex].trans()) + translation;
+    if (QThread::currentThread() == thread()) {
+        if (isIndexValid(jointIndex)) {
+            position = (rotation * _internalPoseSet._absolutePoses[jointIndex].trans()) + translation;
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    QReadLocker readLock(&_externalPoseSetLock);
+    if (jointIndex >= 0 && jointIndex < (int)_externalPoseSet._absolutePoses.size()) {
+        position = (rotation * _externalPoseSet._absolutePoses[jointIndex].trans()) + translation;
         return true;
     } else {
         return false;
@@ -413,17 +464,31 @@ bool Rig::getJointPositionInWorldFrame(int jointIndex, glm::vec3& position, glm:
 }
 
 bool Rig::getJointPosition(int jointIndex, glm::vec3& position) const {
-    if (isIndexValid(jointIndex)) {
-        position = _internalPoseSet._absolutePoses[jointIndex].trans();
-        return true;
+    if (QThread::currentThread() == thread()) {
+        if (isIndexValid(jointIndex)) {
+            position = _internalPoseSet._absolutePoses[jointIndex].trans();
+            return true;
+        } else {
+            return false;
+        }
     } else {
-        return false;
+        return getAbsoluteJointTranslationInRigFrame(jointIndex, position);
     }
 }
 
 bool Rig::getJointRotationInWorldFrame(int jointIndex, glm::quat& result, const glm::quat& rotation) const {
-    if (isIndexValid(jointIndex)) {
-        result = rotation * _internalPoseSet._absolutePoses[jointIndex].rot();
+    if (QThread::currentThread() == thread()) {
+        if (isIndexValid(jointIndex)) {
+            result = rotation * _internalPoseSet._absolutePoses[jointIndex].rot();
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    QReadLocker readLock(&_externalPoseSetLock);
+    if (jointIndex >= 0 && jointIndex < (int)_externalPoseSet._absolutePoses.size()) {
+        result = rotation * _externalPoseSet._absolutePoses[jointIndex].rot();
         return true;
     } else {
         return false;
@@ -431,6 +496,15 @@ bool Rig::getJointRotationInWorldFrame(int jointIndex, glm::quat& result, const
 }
 
 bool Rig::getJointRotation(int jointIndex, glm::quat& rotation) const {
+    if (QThread::currentThread() == thread()) {
+        if (isIndexValid(jointIndex)) {
+            rotation = _internalPoseSet._relativePoses[jointIndex].rot();
+            return true;
+        } else {
+            return false;
+        }
+    }
+
     QReadLocker readLock(&_externalPoseSetLock);
     if (jointIndex >= 0 && jointIndex < (int)_externalPoseSet._relativePoses.size()) {
         rotation = _externalPoseSet._relativePoses[jointIndex].rot();
@@ -900,8 +974,19 @@ void Rig::updateAnimationStateHandlers() { // called on avatar update thread (wh
         int identifier = data.key();
         StateHandler& value = data.value();
         QScriptValue& function = value.function;
-        auto handleResult = [this, identifier](QScriptValue result) { // called in script thread to get the result back to us.
-            animationStateHandlerResult(identifier, result);
+        int rigId = _rigId;
+        auto handleResult = [rigId, identifier](QScriptValue result) { // called in script thread to get the result back to us.
+            // Hold the rigRegistryMutex to ensure thread-safe access to the rigRegistry, but
+            // also to prevent the rig from being deleted while this lambda is being executed.
+            std::lock_guard<std::mutex> guard(rigRegistryMutex);
+
+            // if the rig pointer is in the registry, it has not been deleted yet.
+            auto iter = rigRegistry.find(rigId);
+            if (iter != rigRegistry.end()) {
+                Rig* rig = iter->second;
+                assert(rig);
+                rig->animationStateHandlerResult(identifier, result);
+            }
         };
         // invokeMethod makes a copy of the args, and copies of AnimVariantMap do copy the underlying map, so this will correctly capture
         // the state of _animVars and allow continued changes to _animVars in this thread without conflict.
@@ -928,14 +1013,13 @@ void Rig::updateAnimationStateHandlers() { // called on avatar update thread (wh
 }
 
 void Rig::updateAnimations(float deltaTime, const glm::mat4& rootTransform, const glm::mat4& rigToWorldTransform) {
-
-    PROFILE_RANGE_EX(simulation_animation_detail, __FUNCTION__, 0xffff00ff, 0);
-    PerformanceTimer perfTimer("updateAnimations");
+    DETAILED_PROFILE_RANGE_EX(simulation_animation_detail, __FUNCTION__, 0xffff00ff, 0);
+    DETAILED_PERFORMANCE_TIMER("updateAnimations");
 
     setModelOffset(rootTransform);
 
     if (_animNode && _enabledAnimations) {
-        PerformanceTimer perfTimer("handleTriggers");
+        DETAILED_PERFORMANCE_TIMER("handleTriggers");
 
         updateAnimationStateHandlers();
         _animVars.setRigToGeometryTransform(_rigToGeometryTransform);
@@ -1066,67 +1150,144 @@ void Rig::updateHead(bool headEnabled, bool hipsEnabled, const AnimPose& headPos
     }
 }
 
-void Rig::updateHands(bool leftHandEnabled, bool rightHandEnabled, bool hipsEnabled, bool leftArmEnabled, bool rightArmEnabled, float dt,
-                      const AnimPose& leftHandPose, const AnimPose& rightHandPose,
-                      float bodyCapsuleRadius, float bodyCapsuleHalfHeight, const glm::vec3& bodyCapsuleLocalOffset) {
+const float INV_SQRT_3 = 1.0f / sqrtf(3.0f);
+const int DOP14_COUNT = 14;
+const glm::vec3 DOP14_NORMALS[DOP14_COUNT] = {
+    Vectors::UNIT_X,
+    -Vectors::UNIT_X,
+    Vectors::UNIT_Y,
+    -Vectors::UNIT_Y,
+    Vectors::UNIT_Z,
+    -Vectors::UNIT_Z,
+    glm::vec3(INV_SQRT_3, INV_SQRT_3, INV_SQRT_3),
+    -glm::vec3(INV_SQRT_3, INV_SQRT_3, INV_SQRT_3),
+    glm::vec3(INV_SQRT_3, -INV_SQRT_3, INV_SQRT_3),
+    -glm::vec3(INV_SQRT_3, -INV_SQRT_3, INV_SQRT_3),
+    glm::vec3(INV_SQRT_3, INV_SQRT_3, -INV_SQRT_3),
+    -glm::vec3(INV_SQRT_3, INV_SQRT_3, -INV_SQRT_3),
+    glm::vec3(INV_SQRT_3, -INV_SQRT_3, -INV_SQRT_3),
+    -glm::vec3(INV_SQRT_3, -INV_SQRT_3, -INV_SQRT_3)
+};
 
-    // Use this capsule to represent the avatar body.
-    int hipsIndex = indexOfJoint("Hips");
-    glm::vec3 hipsTrans;
-    if (hipsIndex >= 0) {
-        hipsTrans = _internalPoseSet._absolutePoses[hipsIndex].trans();
+// returns true if the given point lies inside of the k-dop, specified by shapeInfo & shapePose.
+// if the given point does lie within the k-dop, it also returns the amount of displacement necessary to push that point outward
+// such that it lies on the surface of the kdop.
+static bool findPointKDopDisplacement(const glm::vec3& point, const AnimPose& shapePose, const FBXJointShapeInfo& shapeInfo, glm::vec3& displacementOut) {
+
+    // transform point into local space of jointShape.
+    glm::vec3 localPoint = shapePose.inverse().xformPoint(point);
+
+    // Only works for 14-dop shape infos.
+    if (shapeInfo.dots.size() != DOP14_COUNT) {
+        return false;
     }
 
-    const glm::vec3 bodyCapsuleCenter = hipsTrans - bodyCapsuleLocalOffset;
-    const glm::vec3 bodyCapsuleStart = bodyCapsuleCenter - glm::vec3(0, bodyCapsuleHalfHeight, 0);
-    const glm::vec3 bodyCapsuleEnd = bodyCapsuleCenter + glm::vec3(0, bodyCapsuleHalfHeight, 0);
+    glm::vec3 minDisplacement(FLT_MAX);
+    float minDisplacementLen = FLT_MAX;
+    glm::vec3 p = localPoint - shapeInfo.avgPoint;
+    float pLen = glm::length(p);
+    if (pLen > 0.0f) {
+        int slabCount = 0;
+        for (int i = 0; i < DOP14_COUNT; i++) {
+            float dot = glm::dot(p, DOP14_NORMALS[i]);
+            if (dot > 0.0f && dot < shapeInfo.dots[i]) {
+                slabCount++;
+                float distToPlane = pLen * (shapeInfo.dots[i] / dot);
+                float displacementLen = distToPlane - pLen;
 
-    const float HAND_RADIUS = 0.05f;
+                // keep track of the smallest displacement
+                if (displacementLen < minDisplacementLen) {
+                    minDisplacementLen = displacementLen;
+                    minDisplacement = (p / pLen) * displacementLen;
+                }
+            }
+        }
+        if (slabCount == (DOP14_COUNT / 2) && minDisplacementLen != FLT_MAX) {
+            // we are within the k-dop so push the point along the minimum displacement found
+            displacementOut = shapePose.xformVectorFast(minDisplacement);
+            return true;
+        } else {
+            // point is outside of kdop
+            return false;
+        }
+    } else {
+        // point is directly on top of shapeInfo.avgPoint.
+        // push the point out along the x axis.
+        displacementOut = shapePose.xformVectorFast(shapeInfo.points[0]);
+        return true;
+    }
+}
 
-    const float RELAX_DURATION = 0.6f;
-    const float CONTROL_DURATION = 0.4f;
-    const bool TO_CONTROLLED = true;
-    const bool FROM_CONTROLLED = false;
-    const bool LEFT_HAND = true;
-    const bool RIGHT_HAND = false;
+glm::vec3 Rig::deflectHandFromTorso(const glm::vec3& handPosition, const FBXJointShapeInfo& hipsShapeInfo, const FBXJointShapeInfo& spineShapeInfo,
+                                    const FBXJointShapeInfo& spine1ShapeInfo, const FBXJointShapeInfo& spine2ShapeInfo) const {
+    glm::vec3 position = handPosition;
+    glm::vec3 displacement;
+    int hipsJoint = indexOfJoint("Hips");
+    if (hipsJoint >= 0) {
+        AnimPose hipsPose;
+        if (getAbsoluteJointPoseInRigFrame(hipsJoint, hipsPose)) {
+            if (findPointKDopDisplacement(position, hipsPose, hipsShapeInfo, displacement)) {
+                position += displacement;
+            }
+        }
+    }
+
+    int spineJoint = indexOfJoint("Spine");
+    if (spineJoint >= 0) {
+        AnimPose spinePose;
+        if (getAbsoluteJointPoseInRigFrame(spineJoint, spinePose)) {
+            if (findPointKDopDisplacement(position, spinePose, spineShapeInfo, displacement)) {
+                position += displacement;
+            }
+        }
+    }
+
+    int spine1Joint = indexOfJoint("Spine1");
+    if (spine1Joint >= 0) {
+        AnimPose spine1Pose;
+        if (getAbsoluteJointPoseInRigFrame(spine1Joint, spine1Pose)) {
+            if (findPointKDopDisplacement(position, spine1Pose, spine1ShapeInfo, displacement)) {
+                position += displacement;
+            }
+        }
+    }
+
+    int spine2Joint = indexOfJoint("Spine2");
+    if (spine2Joint >= 0) {
+        AnimPose spine2Pose;
+        if (getAbsoluteJointPoseInRigFrame(spine2Joint, spine2Pose)) {
+            if (findPointKDopDisplacement(position, spine2Pose, spine2ShapeInfo, displacement)) {
+                position += displacement;
+            }
+        }
+    }
+
+    return position;
+}
+
+void Rig::updateHands(bool leftHandEnabled, bool rightHandEnabled, bool hipsEnabled, bool leftArmEnabled, bool rightArmEnabled, float dt,
+                      const AnimPose& leftHandPose, const AnimPose& rightHandPose,
+                      const FBXJointShapeInfo& hipsShapeInfo, const FBXJointShapeInfo& spineShapeInfo,
+                      const FBXJointShapeInfo& spine1ShapeInfo, const FBXJointShapeInfo& spine2ShapeInfo) {
 
     const float ELBOW_POLE_VECTOR_BLEND_FACTOR = 0.95f;
 
+    int hipsIndex = indexOfJoint("Hips");
+
     if (leftHandEnabled) {
-        if (!_isLeftHandControlled) {
-            _leftHandControlTimeRemaining = CONTROL_DURATION;
-            _isLeftHandControlled = true;
-        }
 
         glm::vec3 handPosition = leftHandPose.trans();
         glm::quat handRotation = leftHandPose.rot();
 
-        if (_leftHandControlTimeRemaining > 0.0f) {
-            // Move hand from non-controlled position to controlled position.
-            _leftHandControlTimeRemaining = std::max(_leftHandControlTimeRemaining - dt, 0.0f);
-            AnimPose handPose(Vectors::ONE, handRotation, handPosition);
-            if (transitionHandPose(_leftHandControlTimeRemaining, CONTROL_DURATION, handPose,
-                                   LEFT_HAND, TO_CONTROLLED, handPose)) {
-                handPosition = handPose.trans();
-                handRotation = handPose.rot();
-            }
-        }
-
         if (!hipsEnabled) {
-            // prevent the hand IK targets from intersecting the body capsule
-            glm::vec3 displacement;
-            if (findSphereCapsulePenetration(handPosition, HAND_RADIUS, bodyCapsuleStart, bodyCapsuleEnd, bodyCapsuleRadius, displacement)) {
-                handPosition -= displacement;
-            }
+            // prevent the hand IK targets from intersecting the torso
+            handPosition = deflectHandFromTorso(handPosition, hipsShapeInfo, spineShapeInfo, spine1ShapeInfo, spine2ShapeInfo);
         }
 
         _animVars.set("leftHandPosition", handPosition);
         _animVars.set("leftHandRotation", handRotation);
         _animVars.set("leftHandType", (int)IKTarget::Type::RotationAndPosition);
 
-        _lastLeftHandControlledPose = AnimPose(Vectors::ONE, handRotation, handPosition);
-        _isLeftHandControlled = true;
-
         // compute pole vector
         int handJointIndex = _animSkeleton->nameToJointIndex("LeftHand");
         int armJointIndex = _animSkeleton->nameToJointIndex("LeftArm");
@@ -1154,62 +1315,26 @@ void Rig::updateHands(bool leftHandEnabled, bool rightHandEnabled, bool hipsEnab
         _prevLeftHandPoleVectorValid = false;
         _animVars.set("leftHandPoleVectorEnabled", false);
 
-        if (_isLeftHandControlled) {
-            _leftHandRelaxTimeRemaining = RELAX_DURATION;
-            _isLeftHandControlled = false;
-        }
+        _animVars.unset("leftHandPosition");
+        _animVars.unset("leftHandRotation");
+        _animVars.set("leftHandType", (int)IKTarget::Type::HipsRelativeRotationAndPosition);
 
-        if (_leftHandRelaxTimeRemaining > 0.0f) {
-            // Move hand from controlled position to non-controlled position.
-            _leftHandRelaxTimeRemaining = std::max(_leftHandRelaxTimeRemaining - dt, 0.0f);
-            AnimPose handPose;
-            if (transitionHandPose(_leftHandRelaxTimeRemaining, RELAX_DURATION, _lastLeftHandControlledPose,
-                                   LEFT_HAND, FROM_CONTROLLED, handPose)) {
-                _animVars.set("leftHandPosition", handPose.trans());
-                _animVars.set("leftHandRotation", handPose.rot());
-                _animVars.set("leftHandType", (int)IKTarget::Type::RotationAndPosition);
-            }
-        } else {
-            _animVars.unset("leftHandPosition");
-            _animVars.unset("leftHandRotation");
-            _animVars.set("leftHandType", (int)IKTarget::Type::HipsRelativeRotationAndPosition);
-        }
     }
 
     if (rightHandEnabled) {
-        if (!_isRightHandControlled) {
-            _rightHandControlTimeRemaining = CONTROL_DURATION;
-            _isRightHandControlled = true;
-        }
 
         glm::vec3 handPosition = rightHandPose.trans();
         glm::quat handRotation = rightHandPose.rot();
 
-        if (_rightHandControlTimeRemaining > 0.0f) {
-            // Move hand from non-controlled position to controlled position.
-            _rightHandControlTimeRemaining = std::max(_rightHandControlTimeRemaining - dt, 0.0f);
-            AnimPose handPose(Vectors::ONE, handRotation, handPosition);
-            if (transitionHandPose(_rightHandControlTimeRemaining, CONTROL_DURATION, handPose, RIGHT_HAND, TO_CONTROLLED, handPose)) {
-                handPosition = handPose.trans();
-                handRotation = handPose.rot();
-            }
-        }
-
         if (!hipsEnabled) {
-            // prevent the hand IK targets from intersecting the body capsule
-            glm::vec3 displacement;
-            if (findSphereCapsulePenetration(handPosition, HAND_RADIUS, bodyCapsuleStart, bodyCapsuleEnd, bodyCapsuleRadius, displacement)) {
-                handPosition -= displacement;
-            }
+            // prevent the hand IK targets from intersecting the torso
+            handPosition = deflectHandFromTorso(handPosition, hipsShapeInfo, spineShapeInfo, spine1ShapeInfo, spine2ShapeInfo);
         }
 
         _animVars.set("rightHandPosition", handPosition);
         _animVars.set("rightHandRotation", handRotation);
         _animVars.set("rightHandType", (int)IKTarget::Type::RotationAndPosition);
 
-        _lastRightHandControlledPose = AnimPose(Vectors::ONE, handRotation, handPosition);
-        _isRightHandControlled = true;
-
         // compute pole vector
         int handJointIndex = _animSkeleton->nameToJointIndex("RightHand");
         int armJointIndex = _animSkeleton->nameToJointIndex("RightArm");
@@ -1237,25 +1362,9 @@ void Rig::updateHands(bool leftHandEnabled, bool rightHandEnabled, bool hipsEnab
         _prevRightHandPoleVectorValid = false;
         _animVars.set("rightHandPoleVectorEnabled", false);
 
-        if (_isRightHandControlled) {
-            _rightHandRelaxTimeRemaining = RELAX_DURATION;
-            _isRightHandControlled = false;
-        }
-
-        if (_rightHandRelaxTimeRemaining > 0.0f) {
-            // Move hand from controlled position to non-controlled position.
-            _rightHandRelaxTimeRemaining = std::max(_rightHandRelaxTimeRemaining - dt, 0.0f);
-            AnimPose handPose;
-            if (transitionHandPose(_rightHandRelaxTimeRemaining, RELAX_DURATION, _lastRightHandControlledPose, RIGHT_HAND, FROM_CONTROLLED, handPose)) {
-                _animVars.set("rightHandPosition", handPose.trans());
-                _animVars.set("rightHandRotation", handPose.rot());
-                _animVars.set("rightHandType", (int)IKTarget::Type::RotationAndPosition);
-            }
-        } else {
-            _animVars.unset("rightHandPosition");
-            _animVars.unset("rightHandRotation");
-            _animVars.set("rightHandType", (int)IKTarget::Type::HipsRelativeRotationAndPosition);
-        }
+        _animVars.unset("rightHandPosition");
+        _animVars.unset("rightHandRotation");
+        _animVars.set("rightHandType", (int)IKTarget::Type::HipsRelativeRotationAndPosition);
     }
 }
 
@@ -1441,24 +1550,25 @@ void Rig::updateFromControllerParameters(const ControllerParameters& params, flo
     _animVars.set("isTalking", params.isTalking);
     _animVars.set("notIsTalking", !params.isTalking);
 
-    bool headEnabled = params.controllerActiveFlags[ControllerType_Head];
-    bool leftHandEnabled = params.controllerActiveFlags[ControllerType_LeftHand];
-    bool rightHandEnabled = params.controllerActiveFlags[ControllerType_RightHand];
-    bool hipsEnabled = params.controllerActiveFlags[ControllerType_Hips];
-    bool leftFootEnabled = params.controllerActiveFlags[ControllerType_LeftFoot];
-    bool rightFootEnabled = params.controllerActiveFlags[ControllerType_RightFoot];
-    bool leftArmEnabled = params.controllerActiveFlags[ControllerType_LeftArm];
-    bool rightArmEnabled = params.controllerActiveFlags[ControllerType_RightArm];
-    bool spine2Enabled = params.controllerActiveFlags[ControllerType_Spine2];
+    bool headEnabled = params.primaryControllerActiveFlags[PrimaryControllerType_Head];
+    bool leftHandEnabled = params.primaryControllerActiveFlags[PrimaryControllerType_LeftHand];
+    bool rightHandEnabled = params.primaryControllerActiveFlags[PrimaryControllerType_RightHand];
+    bool hipsEnabled = params.primaryControllerActiveFlags[PrimaryControllerType_Hips];
+    bool leftFootEnabled = params.primaryControllerActiveFlags[PrimaryControllerType_LeftFoot];
+    bool rightFootEnabled = params.primaryControllerActiveFlags[PrimaryControllerType_RightFoot];
+    bool spine2Enabled = params.primaryControllerActiveFlags[PrimaryControllerType_Spine2];
 
-    updateHead(headEnabled, hipsEnabled, params.controllerPoses[ControllerType_Head]);
+    bool leftArmEnabled = params.secondaryControllerActiveFlags[SecondaryControllerType_LeftArm];
+    bool rightArmEnabled = params.secondaryControllerActiveFlags[SecondaryControllerType_RightArm];
+
+    updateHead(headEnabled, hipsEnabled, params.primaryControllerPoses[PrimaryControllerType_Head]);
 
     updateHands(leftHandEnabled, rightHandEnabled, hipsEnabled, leftArmEnabled, rightArmEnabled, dt,
-                params.controllerPoses[ControllerType_LeftHand], params.controllerPoses[ControllerType_RightHand],
-                params.bodyCapsuleRadius, params.bodyCapsuleHalfHeight, params.bodyCapsuleLocalOffset);
+                params.primaryControllerPoses[PrimaryControllerType_LeftHand], params.primaryControllerPoses[PrimaryControllerType_RightHand],
+                params.hipsShapeInfo, params.spineShapeInfo, params.spine1ShapeInfo, params.spine2ShapeInfo);
 
     updateFeet(leftFootEnabled, rightFootEnabled,
-               params.controllerPoses[ControllerType_LeftFoot], params.controllerPoses[ControllerType_RightFoot]);
+               params.primaryControllerPoses[PrimaryControllerType_LeftFoot], params.primaryControllerPoses[PrimaryControllerType_RightFoot]);
 
     // if the hips or the feet are being controlled.
     if (hipsEnabled || rightFootEnabled || leftFootEnabled) {
@@ -1479,60 +1589,81 @@ void Rig::updateFromControllerParameters(const ControllerParameters& params, flo
 
     if (hipsEnabled) {
         _animVars.set("hipsType", (int)IKTarget::Type::RotationAndPosition);
-        _animVars.set("hipsPosition", params.controllerPoses[ControllerType_Hips].trans());
-        _animVars.set("hipsRotation", params.controllerPoses[ControllerType_Hips].rot());
+        _animVars.set("hipsPosition", params.primaryControllerPoses[PrimaryControllerType_Hips].trans());
+        _animVars.set("hipsRotation", params.primaryControllerPoses[PrimaryControllerType_Hips].rot());
     } else {
         _animVars.set("hipsType", (int)IKTarget::Type::Unknown);
     }
 
     if (hipsEnabled && spine2Enabled) {
         _animVars.set("spine2Type", (int)IKTarget::Type::Spline);
-        _animVars.set("spine2Position", params.controllerPoses[ControllerType_Spine2].trans());
-        _animVars.set("spine2Rotation", params.controllerPoses[ControllerType_Spine2].rot());
+        _animVars.set("spine2Position", params.primaryControllerPoses[PrimaryControllerType_Spine2].trans());
+        _animVars.set("spine2Rotation", params.primaryControllerPoses[PrimaryControllerType_Spine2].rot());
     } else {
         _animVars.set("spine2Type", (int)IKTarget::Type::Unknown);
     }
 
-    if (leftArmEnabled) {
-        _animVars.set("leftArmType", (int)IKTarget::Type::RotationAndPosition);
-        _animVars.set("leftArmPosition", params.controllerPoses[ControllerType_LeftArm].trans());
-        _animVars.set("leftArmRotation", params.controllerPoses[ControllerType_LeftArm].rot());
-    } else {
-        _animVars.set("leftArmType", (int)IKTarget::Type::Unknown);
-    }
+    // set secondary targets
+    static const std::vector<QString> secondaryControllerJointNames = {
+        "LeftShoulder",
+        "RightShoulder",
+        "LeftArm",
+        "RightArm",
+        "LeftForeArm",
+        "RightForeArm",
+        "LeftUpLeg",
+        "RightUpLeg",
+        "LeftLeg",
+        "RightLeg",
+        "LeftToeBase",
+        "RightToeBase"
+    };
 
-    if (rightArmEnabled) {
-        _animVars.set("rightArmType", (int)IKTarget::Type::RotationAndPosition);
-        _animVars.set("rightArmPosition", params.controllerPoses[ControllerType_RightArm].trans());
-        _animVars.set("rightArmRotation", params.controllerPoses[ControllerType_RightArm].rot());
-    } else {
-        _animVars.set("rightArmType", (int)IKTarget::Type::Unknown);
+    std::shared_ptr<AnimInverseKinematics> ikNode = getAnimInverseKinematicsNode();
+    for (int i = 0; i < (int)NumSecondaryControllerTypes; i++) {
+        int index = indexOfJoint(secondaryControllerJointNames[i]);
+        if (index >= 0) {
+            if (params.secondaryControllerActiveFlags[i]) {
+                ikNode->setSecondaryTargetInRigFrame(index, params.secondaryControllerPoses[i]);
+            } else {
+                ikNode->clearSecondaryTarget(index);
+            }
+        }
     }
 }
 
 void Rig::initAnimGraph(const QUrl& url) {
-    _animGraphURL = url;
+    if (_animGraphURL != url || (!_animNode && !_animLoading)) {
+        _animGraphURL = url;
 
-    _animNode.reset();
+        _animNode.reset();
 
-    // load the anim graph
-    _animLoader.reset(new AnimNodeLoader(url));
-    connect(_animLoader.get(), &AnimNodeLoader::success, [this](AnimNode::Pointer nodeIn) {
-        _animNode = nodeIn;
-        _animNode->setSkeleton(_animSkeleton);
+        // load the anim graph
+        _animLoader.reset(new AnimNodeLoader(url));
+        _animLoading = true;
+        connect(_animLoader.get(), &AnimNodeLoader::success, [this](AnimNode::Pointer nodeIn) {
+            _animNode = nodeIn;
+            _animNode->setSkeleton(_animSkeleton);
 
-        if (_userAnimState.clipNodeEnum != UserAnimState::None) {
-            // restore the user animation we had before reset.
-            UserAnimState origState = _userAnimState;
-            _userAnimState = { UserAnimState::None, "", 30.0f, false, 0.0f, 0.0f };
-            overrideAnimation(origState.url, origState.fps, origState.loop, origState.firstFrame, origState.lastFrame);
-        }
+            if (_userAnimState.clipNodeEnum != UserAnimState::None) {
+                // restore the user animation we had before reset.
+                UserAnimState origState = _userAnimState;
+                _userAnimState = { UserAnimState::None, "", 30.0f, false, 0.0f, 0.0f };
+                overrideAnimation(origState.url, origState.fps, origState.loop, origState.firstFrame, origState.lastFrame);
+            }
+            // restore the role animations we had before reset.
+            for (auto& roleAnimState : _roleAnimStates) {
+                auto roleState = roleAnimState.second;
+                overrideRoleAnimation(roleState.role, roleState.url, roleState.fps, roleState.loop, roleState.firstFrame, roleState.lastFrame);
+            }
+            _animLoading = false;
 
-        emit onLoadComplete();
-    });
-    connect(_animLoader.get(), &AnimNodeLoader::error, [url](int error, QString str) {
-        qCCritical(animation) << "Error loading" << url.toDisplayString() << "code = " << error << "str =" << str;
-    });
+            emit onLoadComplete();
+        });
+        connect(_animLoader.get(), &AnimNodeLoader::error, [url](int error, QString str) {
+            qCCritical(animation) << "Error loading" << url.toDisplayString() << "code = " << error << "str =" << str;
+        });
+    }
 }
 
 bool Rig::getModelRegistrationPoint(glm::vec3& modelRegistrationPointOut) const {
@@ -1545,7 +1676,7 @@ bool Rig::getModelRegistrationPoint(glm::vec3& modelRegistrationPointOut) const
 }
 
 void Rig::applyOverridePoses() {
-    PerformanceTimer perfTimer("override");
+    DETAILED_PERFORMANCE_TIMER("override");
     if (_numOverrides == 0 || !_animSkeleton) {
         return;
     }
@@ -1562,7 +1693,7 @@ void Rig::applyOverridePoses() {
 }
 
 void Rig::buildAbsoluteRigPoses(const AnimPoseVec& relativePoses, AnimPoseVec& absolutePosesOut) {
-    PerformanceTimer perfTimer("buildAbsolute");
+    DETAILED_PERFORMANCE_TIMER("buildAbsolute");
     if (!_animSkeleton) {
         return;
     }
@@ -1617,8 +1748,9 @@ void Rig::copyJointsIntoJointData(QVector<JointData>& jointDataVec) const {
 }
 
 void Rig::copyJointsFromJointData(const QVector<JointData>& jointDataVec) {
-    PerformanceTimer perfTimer("copyJoints");
-    PROFILE_RANGE(simulation_animation_detail, "copyJoints");
+    DETAILED_PROFILE_RANGE(simulation_animation_detail, "copyJoints");
+    DETAILED_PERFORMANCE_TIMER("copyJoints");
+
     if (!_animSkeleton) {
         return;
     }
@@ -1689,60 +1821,11 @@ void Rig::computeAvatarBoundingCapsule(
         return;
     }
 
-    AnimInverseKinematics ikNode("boundingShape");
-    ikNode.setSkeleton(_animSkeleton);
-
-    ikNode.setTargetVars("LeftHand", "leftHandPosition", "leftHandRotation",
-                         "leftHandType", "leftHandWeight", 1.0f, {},
-                         QString(), QString(), QString());
-    ikNode.setTargetVars("RightHand", "rightHandPosition", "rightHandRotation",
-                         "rightHandType", "rightHandWeight", 1.0f, {},
-                         QString(), QString(), QString());
-    ikNode.setTargetVars("LeftFoot", "leftFootPosition", "leftFootRotation",
-                         "leftFootType", "leftFootWeight", 1.0f, {},
-                         QString(), QString(), QString());
-    ikNode.setTargetVars("RightFoot", "rightFootPosition", "rightFootRotation",
-                         "rightFootType", "rightFootWeight", 1.0f, {},
-                         QString(), QString(), QString());
-
-    AnimPose geometryToRig = _modelOffset * _geometryOffset;
-
-    AnimPose hips(glm::vec3(1), glm::quat(), glm::vec3());
+    glm::vec3 hipsPosition(0.0f);
     int hipsIndex = indexOfJoint("Hips");
     if (hipsIndex >= 0) {
-        hips = geometryToRig * _animSkeleton->getAbsoluteBindPose(hipsIndex);
+        hipsPosition = transformPoint(_geometryToRigTransform, _animSkeleton->getAbsoluteDefaultPose(hipsIndex).trans());
     }
-    AnimVariantMap animVars;
-    glm::quat handRotation = glm::angleAxis(PI, Vectors::UNIT_X);
-    animVars.set("leftHandPosition", hips.trans());
-    animVars.set("leftHandRotation", handRotation);
-    animVars.set("leftHandType", (int)IKTarget::Type::RotationAndPosition);
-    animVars.set("rightHandPosition", hips.trans());
-    animVars.set("rightHandRotation", handRotation);
-    animVars.set("rightHandType", (int)IKTarget::Type::RotationAndPosition);
-
-    int rightFootIndex = indexOfJoint("RightFoot");
-    int leftFootIndex = indexOfJoint("LeftFoot");
-    if (rightFootIndex != -1 && leftFootIndex != -1) {
-        glm::vec3 foot = Vectors::ZERO;
-        glm::quat footRotation = glm::angleAxis(0.5f * PI, Vectors::UNIT_X);
-        animVars.set("leftFootPosition", foot);
-        animVars.set("leftFootRotation", footRotation);
-        animVars.set("leftFootType", (int)IKTarget::Type::RotationAndPosition);
-        animVars.set("rightFootPosition", foot);
-        animVars.set("rightFootRotation", footRotation);
-        animVars.set("rightFootType", (int)IKTarget::Type::RotationAndPosition);
-    }
-
-    // call overlay twice: once to verify AnimPoseVec joints and again to do the IK
-    AnimNode::Triggers triggersOut;
-    AnimContext context(false, false, false, glm::mat4(), glm::mat4());
-    float dt = 1.0f; // the value of this does not matter
-    ikNode.overlay(animVars, context, dt, triggersOut, _animSkeleton->getRelativeBindPoses());
-    AnimPoseVec finalPoses =  ikNode.overlay(animVars, context, dt, triggersOut, _animSkeleton->getRelativeBindPoses());
-
-    // convert relative poses to absolute
-    _animSkeleton->convertRelativePosesToAbsolute(finalPoses);
 
     // compute bounding box that encloses all points
     Extents totalExtents;
@@ -1753,15 +1836,15 @@ void Rig::computeAvatarBoundingCapsule(
     // even if they do not have legs (default robot)
     totalExtents.addPoint(glm::vec3(0.0f));
 
-    // HACK to reduce the radius of the bounding capsule to be tight with the torso, we only consider joints
+    // To reduce the radius of the bounding capsule to be tight with the torso, we only consider joints
     // from the head to the hips when computing the rest of the bounding capsule.
     int index = indexOfJoint("Head");
     while (index != -1) {
         const FBXJointShapeInfo& shapeInfo = geometry.joints.at(index).shapeInfo;
-        AnimPose pose = finalPoses[index];
+        AnimPose pose = _animSkeleton->getAbsoluteDefaultPose(index);
         if (shapeInfo.points.size() > 0) {
-            for (int j = 0; j < shapeInfo.points.size(); ++j) {
-                totalExtents.addPoint((pose * shapeInfo.points[j]));
+            for (auto& point : shapeInfo.points) {
+                totalExtents.addPoint((pose * point));
             }
         }
         index = _animSkeleton->getParentIndex(index);
@@ -1769,34 +1852,12 @@ void Rig::computeAvatarBoundingCapsule(
 
     // compute bounding shape parameters
     // NOTE: we assume that the longest side of totalExtents is the yAxis...
-    glm::vec3 diagonal = (geometryToRig * totalExtents.maximum) - (geometryToRig * totalExtents.minimum);
+    glm::vec3 diagonal = (transformPoint(_geometryToRigTransform, totalExtents.maximum) -
+                          transformPoint(_geometryToRigTransform, totalExtents.minimum));
     // ... and assume the radiusOut is half the RMS of the X and Z sides:
     radiusOut = 0.5f * sqrtf(0.5f * (diagonal.x * diagonal.x + diagonal.z * diagonal.z));
     heightOut = diagonal.y - 2.0f * radiusOut;
 
-    glm::vec3 rootPosition = finalPoses[geometry.rootJointIndex].trans();
-    glm::vec3 rigCenter = (geometryToRig * (0.5f * (totalExtents.maximum + totalExtents.minimum)));
-    localOffsetOut = rigCenter - (geometryToRig * rootPosition);
-}
-
-bool Rig::transitionHandPose(float deltaTime, float totalDuration, AnimPose& controlledHandPose, bool isLeftHand,
-                             bool isToControlled, AnimPose& returnHandPose) {
-    auto ikNode = getAnimInverseKinematicsNode();
-    if (ikNode) {
-        float alpha = 1.0f - deltaTime / totalDuration;
-        const AnimPose geometryToRigTransform(_geometryToRigTransform);
-        AnimPose uncontrolledHandPose;
-        if (isLeftHand) {
-            uncontrolledHandPose = geometryToRigTransform * ikNode->getUncontrolledLeftHandPose();
-        } else {
-            uncontrolledHandPose = geometryToRigTransform * ikNode->getUncontrolledRightHandPose();
-        }
-        if (isToControlled) {
-            ::blend(1, &uncontrolledHandPose, &controlledHandPose, alpha, &returnHandPose);
-        } else {
-            ::blend(1, &controlledHandPose, &uncontrolledHandPose, alpha, &returnHandPose);
-        }
-        return true;
-    }
-    return false;
+    glm::vec3 capsuleCenter = transformPoint(_geometryToRigTransform, (0.5f * (totalExtents.maximum + totalExtents.minimum)));
+    localOffsetOut = capsuleCenter - hipsPosition;
 }
diff --git a/libraries/animation/src/Rig.h b/libraries/animation/src/Rig.h
index c17a7b9c8f..e9cc444bd4 100644
--- a/libraries/animation/src/Rig.h
+++ b/libraries/animation/src/Rig.h
@@ -41,26 +41,44 @@ public:
         bool useNames;
     };
 
-    enum ControllerType {
-        ControllerType_Head = 0,
-        ControllerType_LeftHand,
-        ControllerType_RightHand,
-        ControllerType_Hips,
-        ControllerType_LeftFoot,
-        ControllerType_RightFoot,
-        ControllerType_LeftArm,
-        ControllerType_RightArm,
-        ControllerType_Spine2,
-        NumControllerTypes
+    enum PrimaryControllerType {
+        PrimaryControllerType_Head = 0,
+        PrimaryControllerType_LeftHand,
+        PrimaryControllerType_RightHand,
+        PrimaryControllerType_Hips,
+        PrimaryControllerType_LeftFoot,
+        PrimaryControllerType_RightFoot,
+        PrimaryControllerType_Spine2,
+        NumPrimaryControllerTypes
+    };
+
+    // NOTE: These should ordered such that joint parents appear before their children.
+    enum SecondaryControllerType {
+        SecondaryControllerType_LeftShoulder = 0,
+        SecondaryControllerType_RightShoulder,
+        SecondaryControllerType_LeftArm,
+        SecondaryControllerType_RightArm,
+        SecondaryControllerType_LeftForeArm,
+        SecondaryControllerType_RightForeArm,
+        SecondaryControllerType_LeftUpLeg,
+        SecondaryControllerType_RightUpLeg,
+        SecondaryControllerType_LeftLeg,
+        SecondaryControllerType_RightLeg,
+        SecondaryControllerType_LeftToeBase,
+        SecondaryControllerType_RightToeBase,
+        NumSecondaryControllerTypes
     };
 
     struct ControllerParameters {
-        AnimPose controllerPoses[NumControllerTypes];  // rig space
-        bool controllerActiveFlags[NumControllerTypes];
+        AnimPose primaryControllerPoses[NumPrimaryControllerTypes];  // rig space
+        bool primaryControllerActiveFlags[NumPrimaryControllerTypes];
+        AnimPose secondaryControllerPoses[NumSecondaryControllerTypes];  // rig space
+        bool secondaryControllerActiveFlags[NumSecondaryControllerTypes];
         bool isTalking;
-        float bodyCapsuleRadius;
-        float bodyCapsuleHalfHeight;
-        glm::vec3 bodyCapsuleLocalOffset;
+        FBXJointShapeInfo hipsShapeInfo;
+        FBXJointShapeInfo spineShapeInfo;
+        FBXJointShapeInfo spine1ShapeInfo;
+        FBXJointShapeInfo spine2ShapeInfo;
     };
 
     struct EyeParameters {
@@ -79,8 +97,8 @@ public:
         Hover
     };
 
-    Rig() {}
-    virtual ~Rig() {}
+    Rig();
+    virtual ~Rig();
 
     void destroyAnimGraph();
 
@@ -232,7 +250,8 @@ protected:
     void updateHead(bool headEnabled, bool hipsEnabled, const AnimPose& headMatrix);
     void updateHands(bool leftHandEnabled, bool rightHandEnabled, bool hipsEnabled, bool leftArmEnabled, bool rightArmEnabled, float dt,
                      const AnimPose& leftHandPose, const AnimPose& rightHandPose,
-                     float bodyCapsuleRadius, float bodyCapsuleHalfHeight, const glm::vec3& bodyCapsuleLocalOffset);
+                     const FBXJointShapeInfo& hipsShapeInfo, const FBXJointShapeInfo& spineShapeInfo,
+                     const FBXJointShapeInfo& spine1ShapeInfo, const FBXJointShapeInfo& spine2ShapeInfo);
     void updateFeet(bool leftFootEnabled, bool rightFootEnabled, const AnimPose& leftFootPose, const AnimPose& rightFootPose);
 
     void updateEyeJoint(int index, const glm::vec3& modelTranslation, const glm::quat& modelRotation, const glm::vec3& lookAt, const glm::vec3& saccade);
@@ -240,6 +259,8 @@ protected:
 
     glm::vec3 calculateElbowPoleVector(int handIndex, int elbowIndex, int armIndex, int hipsIndex, bool isLeft) const;
     glm::vec3 calculateKneePoleVector(int footJointIndex, int kneeJoint, int upLegIndex, int hipsIndex, const AnimPose& targetFootPose) const;
+    glm::vec3 deflectHandFromTorso(const glm::vec3& handPosition, const FBXJointShapeInfo& hipsShapeInfo, const FBXJointShapeInfo& spineShapeInfo,
+                                   const FBXJointShapeInfo& spine1ShapeInfo, const FBXJointShapeInfo& spine2ShapeInfo) const;
 
     AnimPose _modelOffset;  // model to rig space
     AnimPose _geometryOffset; // geometry to model space (includes unit offset & fst offsets)
@@ -282,6 +303,7 @@ protected:
     std::shared_ptr<AnimNode> _animNode;
     std::shared_ptr<AnimSkeleton> _animSkeleton;
     std::unique_ptr<AnimNodeLoader> _animLoader;
+    bool _animLoading { false };
     AnimVariantMap _animVars;
     enum class RigRole {
         Idle = 0,
@@ -313,8 +335,22 @@ protected:
         float firstFrame;
         float lastFrame;
     };
+    
+    struct RoleAnimState {
+       RoleAnimState() {}
+       RoleAnimState(const QString& roleId, const QString& urlIn, float fpsIn, bool loopIn, float firstFrameIn, float lastFrameIn) :
+            role(roleId), url(urlIn), fps(fpsIn), loop(loopIn), firstFrame(firstFrameIn), lastFrame(lastFrameIn) {}
+
+        QString role;
+        QString url;
+        float fps;
+        bool loop;
+        float firstFrame;
+        float lastFrame;
+    };
 
     UserAnimState _userAnimState;
+    std::map<QString, RoleAnimState> _roleAnimStates;
 
     float _leftHandOverlayAlpha { 0.0f };
     float _rightHandOverlayAlpha { 0.0f };
@@ -340,18 +376,6 @@ protected:
     int _nextStateHandlerId { 0 };
     QMutex _stateMutex;
 
-    bool transitionHandPose(float deltaTime, float totalDuration, AnimPose& controlledHandPose, bool isLeftHand,
-                            bool isToControlled, AnimPose& returnHandPose);
-
-    bool _isLeftHandControlled { false };
-    bool _isRightHandControlled { false };
-    float _leftHandControlTimeRemaining { 0.0f };
-    float _rightHandControlTimeRemaining { 0.0f };
-    float _leftHandRelaxTimeRemaining { 0.0f };
-    float _rightHandRelaxTimeRemaining { 0.0f };
-    AnimPose _lastLeftHandControlledPose;
-    AnimPose _lastRightHandControlledPose;
-
     glm::vec3 _prevRightFootPoleVector { Vectors::UNIT_Z };
     bool _prevRightFootPoleVectorValid { false };
 
@@ -363,6 +387,8 @@ protected:
 
     glm::vec3 _prevLeftHandPoleVector { -Vectors::UNIT_Z };
     bool _prevLeftHandPoleVectorValid { false };
+
+    int _rigId;
 };
 
 #endif /* defined(__hifi__Rig__) */
diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp
index 43af7afdef..78475f5b68 100644
--- a/libraries/audio-client/src/AudioClient.cpp
+++ b/libraries/audio-client/src/AudioClient.cpp
@@ -78,7 +78,7 @@ Setting::Handle<int> staticJitterBufferFrames("staticJitterBufferFrames",
 // protect the Qt internal device list
 using Mutex = std::mutex;
 using Lock = std::unique_lock<Mutex>;
-static Mutex _deviceMutex;
+Mutex _deviceMutex;
 
 // thread-safe
 QList<QAudioDeviceInfo> getAvailableDevices(QAudio::Mode mode) {
@@ -92,6 +92,7 @@ void AudioClient::checkDevices() {
     auto inputDevices = getAvailableDevices(QAudio::AudioInput);
     auto outputDevices = getAvailableDevices(QAudio::AudioOutput);
 
+    Lock lock(_deviceMutex);
     if (inputDevices != _inputDevices) {
         _inputDevices.swap(inputDevices);
         emit devicesChanged(QAudio::AudioInput, _inputDevices);
@@ -159,6 +160,7 @@ AudioClient::AudioClient() :
     AbstractAudioInterface(),
     _gate(this),
     _audioInput(NULL),
+    _dummyAudioInput(NULL),
     _desiredInputFormat(),
     _inputFormat(),
     _numInputCallbackBytes(0),
@@ -210,9 +212,9 @@ AudioClient::AudioClient() :
 
     connect(&_receivedAudioStream, &MixedProcessedAudioStream::processSamples,
             this, &AudioClient::processReceivedSamples, Qt::DirectConnection);
-    connect(this, &AudioClient::changeDevice, this, [=](const QAudioDeviceInfo& outputDeviceInfo) { 
+    connect(this, &AudioClient::changeDevice, this, [=](const QAudioDeviceInfo& outputDeviceInfo) {
         qCDebug(audioclient) << "got AudioClient::changeDevice signal, about to call switchOutputToAudioDevice() outputDeviceInfo: [" << outputDeviceInfo.deviceName() << "]";
-        switchOutputToAudioDevice(outputDeviceInfo); 
+        switchOutputToAudioDevice(outputDeviceInfo);
     });
 
     connect(&_receivedAudioStream, &InboundAudioStream::mismatchedAudioCodec, this, &AudioClient::handleMismatchAudioFormat);
@@ -225,13 +227,18 @@ AudioClient::AudioClient() :
     // start a thread to detect any device changes
     _checkDevicesTimer = new QTimer(this);
     connect(_checkDevicesTimer, &QTimer::timeout, [this] {
-        QtConcurrent::run(QThreadPool::globalInstance(), [this] {
-            checkDevices();
-        });
+        QtConcurrent::run(QThreadPool::globalInstance(), [this] { checkDevices(); });
     });
     const unsigned long DEVICE_CHECK_INTERVAL_MSECS = 2 * 1000;
     _checkDevicesTimer->start(DEVICE_CHECK_INTERVAL_MSECS);
 
+    // start a thread to detect peak value changes
+    _checkPeakValuesTimer = new QTimer(this);
+    connect(_checkPeakValuesTimer, &QTimer::timeout, [this] {
+        QtConcurrent::run(QThreadPool::globalInstance(), [this] { checkPeakValues(); });
+    });
+    const unsigned long PEAK_VALUES_CHECK_INTERVAL_MSECS = 50;
+    _checkPeakValuesTimer->start(PEAK_VALUES_CHECK_INTERVAL_MSECS);
 
     configureReverb();
 
@@ -259,10 +266,22 @@ void AudioClient::customDeleter() {
 void AudioClient::cleanupBeforeQuit() {
     // FIXME: this should be put in customDeleter, but there is still a reference to this when it is called,
     //        so this must be explicitly, synchronously stopped
+    static ConditionalGuard guard;
+    if (QThread::currentThread() != thread()) {
+        // This will likely be called from the main thread, but we don't want to do blocking queued calls
+        // from the main thread, so we use a normal auto-connection invoke, and then use a conditional to wait
+        // for completion
+        // The effect is the same, yes, but we actually want to avoid the use of Qt::BlockingQueuedConnection
+        // in the code
+        QMetaObject::invokeMethod(this, "cleanupBeforeQuit");
+        guard.wait();
+        return;
+    }
 
     stop();
-
     _checkDevicesTimer->stop();
+    _checkPeakValuesTimer->stop();
+    guard.trigger();
 }
 
 void AudioClient::handleMismatchAudioFormat(SharedNodePointer node, const QString& currentCodec, const QString& recievedCodec) {
@@ -303,8 +322,6 @@ QString getWinDeviceName(IMMDevice* pEndpoint) {
     QString deviceName;
     IPropertyStore* pPropertyStore;
     pEndpoint->OpenPropertyStore(STGM_READ, &pPropertyStore);
-    pEndpoint->Release();
-    pEndpoint = nullptr;
     PROPVARIANT pv;
     PropVariantInit(&pv);
     HRESULT hr = pPropertyStore->GetValue(PKEY_Device_FriendlyName, &pv);
@@ -333,6 +350,8 @@ QString AudioClient::getWinDeviceName(wchar_t* guid) {
         deviceName = QString("NONE");
     } else {
         deviceName = ::getWinDeviceName(pEndpoint);
+        pEndpoint->Release();
+        pEndpoint = nullptr;
     }
     pMMDeviceEnumerator->Release();
     pMMDeviceEnumerator = nullptr;
@@ -416,6 +435,8 @@ QAudioDeviceInfo defaultAudioDeviceForMode(QAudio::Mode mode) {
             deviceName = QString("NONE");
         } else {
             deviceName = getWinDeviceName(pEndpoint);
+            pEndpoint->Release();
+            pEndpoint = nullptr;
         }
         pMMDeviceEnumerator->Release();
         pMMDeviceEnumerator = NULL;
@@ -605,12 +626,11 @@ void AudioClient::start() {
 
 void AudioClient::stop() {
 
-    // "switch" to invalid devices in order to shut down the state
-    qCDebug(audioclient) << "AudioClient::stop(), about to call switchInputToAudioDevice(null)";
-    switchInputToAudioDevice(QAudioDeviceInfo());
+    qCDebug(audioclient) << "AudioClient::stop(), requesting switchInputToAudioDevice() to shut down";
+    switchInputToAudioDevice(QAudioDeviceInfo(), true);
 
-    qCDebug(audioclient) << "AudioClient::stop(), about to call switchOutputToAudioDevice(null)";
-    switchOutputToAudioDevice(QAudioDeviceInfo());
+    qCDebug(audioclient) << "AudioClient::stop(), requesting switchOutputToAudioDevice() to shut down";
+    switchOutputToAudioDevice(QAudioDeviceInfo(), true);
 }
 
 void AudioClient::handleAudioEnvironmentDataPacket(QSharedPointer<ReceivedMessage> message) {
@@ -619,7 +639,7 @@ void AudioClient::handleAudioEnvironmentDataPacket(QSharedPointer<ReceivedMessag
     message->readPrimitive(&bitset);
 
     bool hasReverb = oneAtBit(bitset, HAS_REVERB_BIT);
-    
+
     if (hasReverb) {
         float reverbTime, wetLevel;
         message->readPrimitive(&reverbTime);
@@ -717,7 +737,7 @@ void AudioClient::Gate::flush() {
 void AudioClient::handleNoisyMutePacket(QSharedPointer<ReceivedMessage> message) {
     if (!_muted) {
         toggleMute();
-        
+
         // have the audio scripting interface emit a signal to say we were muted by the mixer
         emit mutedByMixer();
     }
@@ -726,7 +746,7 @@ void AudioClient::handleNoisyMutePacket(QSharedPointer<ReceivedMessage> message)
 void AudioClient::handleMuteEnvironmentPacket(QSharedPointer<ReceivedMessage> message) {
     glm::vec3 position;
     float radius;
-    
+
     message->readPrimitive(&position);
     message->readPrimitive(&radius);
 
@@ -759,7 +779,7 @@ void AudioClient::handleSelectedAudioFormat(QSharedPointer<ReceivedMessage> mess
 }
 
 void AudioClient::selectAudioFormat(const QString& selectedCodecName) {
-    
+
     _selectedCodecName = selectedCodecName;
 
     qCDebug(audioclient) << "Selected Codec:" << _selectedCodecName;
@@ -776,7 +796,7 @@ void AudioClient::selectAudioFormat(const QString& selectedCodecName) {
     for (auto& plugin : codecPlugins) {
         if (_selectedCodecName == plugin->getName()) {
             _codec = plugin;
-            _receivedAudioStream.setupCodec(plugin, _selectedCodecName, AudioConstants::STEREO); 
+            _receivedAudioStream.setupCodec(plugin, _selectedCodecName, AudioConstants::STEREO);
             _encoder = plugin->createEncoder(AudioConstants::SAMPLE_RATE, AudioConstants::MONO);
             qCDebug(audioclient) << "Selected Codec Plugin:" << _codec.get();
             break;
@@ -784,7 +804,7 @@ void AudioClient::selectAudioFormat(const QString& selectedCodecName) {
     }
 
 }
-   
+
 bool AudioClient::switchAudioDevice(QAudio::Mode mode, const QAudioDeviceInfo& deviceInfo) {
     auto device = deviceInfo;
 
@@ -1113,6 +1133,15 @@ void AudioClient::handleMicAudioInput() {
     }
 }
 
+void AudioClient::handleDummyAudioInput() {
+    const int numNetworkBytes = _isStereoInput
+        ? AudioConstants::NETWORK_FRAME_BYTES_STEREO
+        : AudioConstants::NETWORK_FRAME_BYTES_PER_CHANNEL;
+
+    QByteArray audioBuffer(numNetworkBytes, 0); // silent
+    handleAudioInput(audioBuffer);
+}
+
 void AudioClient::handleRecordedAudioInput(const QByteArray& audio) {
     QByteArray audioBuffer(audio);
     handleAudioInput(audioBuffer);
@@ -1192,11 +1221,11 @@ bool AudioClient::mixLocalAudioInjectors(float* mixBuffer) {
     // lock the injectors
     Lock lock(_injectorsMutex);
 
-    QVector<AudioInjector*> injectorsToRemove;
+    QVector<AudioInjectorPointer> injectorsToRemove;
 
     memset(mixBuffer, 0, AudioConstants::NETWORK_FRAME_SAMPLES_STEREO * sizeof(float));
 
-    for (AudioInjector* injector : _activeLocalAudioInjectors) {
+    for (const AudioInjectorPointer& injector : _activeLocalAudioInjectors) {
         // the lock guarantees that injectorBuffer, if found, is invariant
         AudioInjectorLocalBuffer* injectorBuffer = injector->getLocalBuffer();
         if (injectorBuffer) {
@@ -1209,7 +1238,7 @@ bool AudioClient::mixLocalAudioInjectors(float* mixBuffer) {
             // get one frame from the injector
             memset(_localScratchBuffer, 0, bytesToRead);
             if (0 < injectorBuffer->readData((char*)_localScratchBuffer, bytesToRead)) {
-                
+
                 if (injector->isAmbisonic()) {
 
                     // no distance attenuation
@@ -1238,36 +1267,36 @@ bool AudioClient::mixLocalAudioInjectors(float* mixBuffer) {
                     for (int i = 0; i < AudioConstants::NETWORK_FRAME_SAMPLES_STEREO; i++) {
                         mixBuffer[i] += convertToFloat(_localScratchBuffer[i]) * gain;
                     }
-                    
+
                 } else {
 
                     // calculate distance, gain and azimuth for hrtf
                     glm::vec3 relativePosition = injector->getPosition() - _positionGetter();
                     float distance = glm::max(glm::length(relativePosition), EPSILON);
-                    float gain = gainForSource(distance, injector->getVolume()); 
+                    float gain = gainForSource(distance, injector->getVolume());
                     float azimuth = azimuthForSource(relativePosition);
-                
+
                     // mono gets spatialized into mixBuffer
-                    injector->getLocalHRTF().render(_localScratchBuffer, mixBuffer, HRTF_DATASET_INDEX, 
+                    injector->getLocalHRTF().render(_localScratchBuffer, mixBuffer, HRTF_DATASET_INDEX,
                                                     azimuth, distance, gain, AudioConstants::NETWORK_FRAME_SAMPLES_PER_CHANNEL);
                 }
-            
+
             } else {
-                
+
                 qCDebug(audioclient) << "injector has no more data, marking finished for removal";
                 injector->finishLocalInjection();
                 injectorsToRemove.append(injector);
             }
 
         } else {
-            
+
             qCDebug(audioclient) << "injector has no local buffer, marking as finished for removal";
             injector->finishLocalInjection();
             injectorsToRemove.append(injector);
         }
     }
-    
-    for (AudioInjector* injector : injectorsToRemove) {
+
+    for (const AudioInjectorPointer& injector : injectorsToRemove) {
         qCDebug(audioclient) << "removing injector";
         _activeLocalAudioInjectors.removeOne(injector);
     }
@@ -1335,6 +1364,14 @@ void AudioClient::toggleMute() {
     emit muteToggled();
 }
 
+void AudioClient::setNoiseReduction(bool enable) {
+    if (_isNoiseGateEnabled != enable) {
+        _isNoiseGateEnabled = enable;
+        emit noiseReductionChanged();
+    }
+}
+
+
 void AudioClient::setIsStereoInput(bool isStereoInput) {
     if (isStereoInput != _isStereoInput) {
         _isStereoInput = isStereoInput;
@@ -1350,7 +1387,7 @@ void AudioClient::setIsStereoInput(bool isStereoInput) {
     }
 }
 
-bool AudioClient::outputLocalInjector(AudioInjector* injector) {
+bool AudioClient::outputLocalInjector(const AudioInjectorPointer& injector) {
     AudioInjectorLocalBuffer* injectorBuffer = injector->getLocalBuffer();
     if (injectorBuffer) {
         // local injectors are on the AudioInjectorsThread, so we must guard access
@@ -1381,7 +1418,7 @@ void AudioClient::outputFormatChanged() {
     _receivedAudioStream.outputFormatChanged(_outputFormat.sampleRate(), OUTPUT_CHANNEL_COUNT);
 }
 
-bool AudioClient::switchInputToAudioDevice(const QAudioDeviceInfo& inputDeviceInfo) {
+bool AudioClient::switchInputToAudioDevice(const QAudioDeviceInfo& inputDeviceInfo, bool isShutdownRequest) {
     qCDebug(audioclient) << __FUNCTION__ << "inputDeviceInfo: [" << inputDeviceInfo.deviceName() << "]";
     bool supportedFormat = false;
 
@@ -1403,16 +1440,29 @@ bool AudioClient::switchInputToAudioDevice(const QAudioDeviceInfo& inputDeviceIn
         _inputDeviceInfo = QAudioDeviceInfo();
     }
 
+    if (_dummyAudioInput) {
+        _dummyAudioInput->stop();
+
+        _dummyAudioInput->deleteLater();
+        _dummyAudioInput = NULL;
+    }
+
     if (_inputToNetworkResampler) {
         // if we were using an input to network resampler, delete it here
         delete _inputToNetworkResampler;
         _inputToNetworkResampler = NULL;
     }
+
     if (_audioGate) {
         delete _audioGate;
         _audioGate = nullptr;
     }
 
+    if (isShutdownRequest) {
+        qCDebug(audioclient) << "The audio input device has shut down.";
+        return true;
+    }
+
     if (!inputDeviceInfo.isNull()) {
         qCDebug(audioclient) << "The audio input device " << inputDeviceInfo.deviceName() << "is available.";
         _inputDeviceInfo = inputDeviceInfo;
@@ -1446,11 +1496,18 @@ bool AudioClient::switchInputToAudioDevice(const QAudioDeviceInfo& inputDeviceIn
                 _audioInput = new QAudioInput(inputDeviceInfo, _inputFormat, this);
                 _numInputCallbackBytes = calculateNumberOfInputCallbackBytes(_inputFormat);
                 _audioInput->setBufferSize(_numInputCallbackBytes);
+                // different audio input devices may have different volumes
+                emit inputVolumeChanged(_audioInput->volume());
 
                 // how do we want to handle input working, but output not working?
                 int numFrameSamples = calculateNumberOfFrameSamples(_numInputCallbackBytes);
                 _inputRingBuffer.resizeForFrameSize(numFrameSamples);
 
+#if defined(Q_OS_ANDROID)
+                if (_audioInput) {
+                    connect(_audioInput, SIGNAL(stateChanged(QAudio::State)), this, SLOT(audioInputStateChanged(QAudio::State)));
+                }
+#endif
                 _inputDevice = _audioInput->start();
 
                 if (_inputDevice) {
@@ -1458,14 +1515,62 @@ bool AudioClient::switchInputToAudioDevice(const QAudioDeviceInfo& inputDeviceIn
                     supportedFormat = true;
                 } else {
                     qCDebug(audioclient) << "Error starting audio input -" <<  _audioInput->error();
+                    _audioInput->deleteLater();
+                    _audioInput = NULL;
                 }
             }
         }
     }
 
+    // If there is no working input device, use the dummy input device.
+    // It generates audio callbacks on a timer to simulate a mic stream of silent packets.
+    // 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();
+        emit deviceChanged(QAudio::AudioInput, _inputDeviceInfo);
+
+        _inputFormat = _desiredInputFormat;
+        qCDebug(audioclient) << "The format to be used for audio input is" << _inputFormat;
+        qCDebug(audioclient) << "No resampling required for audio input to match desired network format.";
+
+        _audioGate = new AudioGate(_desiredInputFormat.sampleRate(), _desiredInputFormat.channelCount());
+        qCDebug(audioclient) << "Noise gate created with" << _desiredInputFormat.channelCount() << "channels.";
+
+        // generate audio callbacks at the network sample rate
+        _dummyAudioInput = new QTimer(this);
+        connect(_dummyAudioInput, SIGNAL(timeout()), this, SLOT(handleDummyAudioInput()));
+        _dummyAudioInput->start((int)(AudioConstants::NETWORK_FRAME_MSECS + 0.5f));
+    }
+
     return supportedFormat;
 }
 
+#if defined(Q_OS_ANDROID)
+void AudioClient::audioInputStateChanged(QAudio::State state) {
+    switch (state) {
+        case QAudio::StoppedState:
+            if (!_audioInput) {
+                break;
+            }
+                // Stopped on purpose
+            if (_shouldRestartInputSetup) {
+                Lock lock(_deviceMutex);
+                _inputDevice = _audioInput->start();
+                lock.unlock();
+                if (_inputDevice) {
+                    connect(_inputDevice, SIGNAL(readyRead()), this, SLOT(handleMicAudioInput()));
+                }
+            }
+            break;
+        case QAudio::ActiveState:
+            break;
+        default:
+            break;
+    }
+}
+#endif
+
 void AudioClient::outputNotify() {
     int recentUnfulfilled = _audioOutputIODevice.getRecentUnfulfilledReads();
     if (recentUnfulfilled > 0) {
@@ -1496,9 +1601,8 @@ void AudioClient::outputNotify() {
     }
 }
 
-bool AudioClient::switchOutputToAudioDevice(const QAudioDeviceInfo& outputDeviceInfo) {
+bool AudioClient::switchOutputToAudioDevice(const QAudioDeviceInfo& outputDeviceInfo, bool isShutdownRequest) {
     qCDebug(audioclient) << "AudioClient::switchOutputToAudioDevice() outputDeviceInfo: [" << outputDeviceInfo.deviceName() << "]";
-
     bool supportedFormat = false;
 
     // NOTE: device start() uses the Qt internal device list
@@ -1542,6 +1646,11 @@ bool AudioClient::switchOutputToAudioDevice(const QAudioDeviceInfo& outputDevice
         _localToOutputResampler = NULL;
     }
 
+    if (isShutdownRequest) {
+        qCDebug(audioclient) << "The audio output device has shut down.";
+        return true;
+    }
+
     if (!outputDeviceInfo.isNull()) {
         qCDebug(audioclient) << "The audio output device " << outputDeviceInfo.deviceName() << "is available.";
         _outputDeviceInfo = outputDeviceInfo;
@@ -1646,14 +1755,6 @@ int AudioClient::setOutputBufferSize(int numFrames, bool persist) {
         if (persist) {
             _outputBufferSizeFrames.set(numFrames);
         }
-
-        if (_audioOutput) {
-            // The buffer size can't be adjusted after QAudioOutput::start() has been called, so
-            // recreate the device by switching to the default.
-            QAudioDeviceInfo outputDeviceInfo = defaultAudioDeviceForMode(QAudio::AudioOutput);
-            qCDebug(audioclient) << __FUNCTION__ << "about to send changeDevice signal outputDeviceInfo: [" << outputDeviceInfo.deviceName() << "]";
-            emit changeDevice(outputDeviceInfo);  // On correct thread, please, as setOutputBufferSize can be called from main thread.
-        }
     }
     return numFrames;
 }
@@ -1690,9 +1791,9 @@ int AudioClient::calculateNumberOfFrameSamples(int numBytes) const {
 
 float AudioClient::azimuthForSource(const glm::vec3& relativePosition) {
     glm::quat inverseOrientation = glm::inverse(_orientationGetter());
-    
+
     glm::vec3 rotatedSourcePosition = inverseOrientation * relativePosition;
-    
+
     // project the rotated source position vector onto the XZ plane
     rotatedSourcePosition.y = 0.0f;
 
@@ -1700,15 +1801,15 @@ float AudioClient::azimuthForSource(const glm::vec3& relativePosition) {
 
     float rotatedSourcePositionLength2 = glm::length2(rotatedSourcePosition);
     if (rotatedSourcePositionLength2 > SOURCE_DISTANCE_THRESHOLD) {
-        
+
         // 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 {   
+    } else {
         // no azimuth if they are in same spot
-        return 0.0f; 
+        return 0.0f;
     }
 }
 
@@ -1847,3 +1948,10 @@ void AudioClient::setAvatarBoundingBoxParameters(glm::vec3 corner, glm::vec3 sca
 void AudioClient::startThread() {
     moveToNewNamedThread(this, "Audio Thread", [this] { start(); });
 }
+
+void AudioClient::setInputVolume(float volume) {
+    if (_audioInput && volume != (float)_audioInput->volume()) {
+        _audioInput->setVolume(volume);
+        emit inputVolumeChanged(_audioInput->volume());
+    }
+}
diff --git a/libraries/audio-client/src/AudioClient.h b/libraries/audio-client/src/AudioClient.h
index 54ce3aa6c2..01a487455c 100644
--- a/libraries/audio-client/src/AudioClient.h
+++ b/libraries/audio-client/src/AudioClient.h
@@ -18,7 +18,7 @@
 #include <mutex>
 #include <queue>
 
-#include <QtCore/qsystemdetection.h>
+#include <QtCore/QtGlobal>
 #include <QtCore/QByteArray>
 #include <QtCore/QElapsedTimer>
 #include <QtCore/QObject>
@@ -143,11 +143,14 @@ public:
 
     Q_INVOKABLE void setAvatarBoundingBoxParameters(glm::vec3 corner, glm::vec3 scale);
 
-    bool outputLocalInjector(AudioInjector* injector) override;
+    bool outputLocalInjector(const AudioInjectorPointer& injector) override;
 
     QAudioDeviceInfo getActiveAudioDevice(QAudio::Mode mode) const;
     QList<QAudioDeviceInfo> getAudioDevices(QAudio::Mode mode) const;
 
+    void enablePeakValues(bool enable) { _enablePeakValues = enable; }
+    bool peakValuesAvailable() const;
+
     static const float CALLBACK_ACCELERATOR_RATIO;
 
     bool getNamedAudioDeviceForModeExists(QAudio::Mode mode, const QString& deviceName);
@@ -170,6 +173,10 @@ public slots:
 
     void sendDownstreamAudioStatsPacket() { _stats.publish(); }
     void handleMicAudioInput();
+#if defined(Q_OS_ANDROID)
+    void audioInputStateChanged(QAudio::State state);
+#endif
+    void handleDummyAudioInput();
     void handleRecordedAudioInput(const QByteArray& audio);
     void reset();
     void audioMixerKilled();
@@ -180,7 +187,8 @@ public slots:
 
     virtual void setIsStereoInput(bool stereo) override;
 
-    void setNoiseReduction(bool isNoiseGateEnabled) { _isNoiseGateEnabled = isNoiseGateEnabled; }
+    void setNoiseReduction(bool isNoiseGateEnabled);
+    bool isNoiseReductionEnabled() const { return _isNoiseGateEnabled; }
 
     void toggleLocalEcho() { _shouldEchoLocally = !_shouldEchoLocally; }
     void toggleServerEcho() { _shouldEchoToServer = !_shouldEchoToServer; }
@@ -197,7 +205,7 @@ public slots:
     bool switchAudioDevice(QAudio::Mode mode, const QString& deviceName);
 
     float getInputVolume() const { return (_audioInput) ? (float)_audioInput->volume() : 0.0f; }
-    void setInputVolume(float volume) { if (_audioInput) _audioInput->setVolume(volume); }
+    void setInputVolume(float volume);
     void setReverb(bool reverb);
     void setReverbOptions(const AudioEffectOptions* options);
 
@@ -207,7 +215,9 @@ public slots:
     void saveSettings();
 
 signals:
-    bool muteToggled();
+    void inputVolumeChanged(float volume);
+    void muteToggled();
+    void noiseReductionChanged();
     void mutedByMixer();
     void inputReceived(const QByteArray& inputSamples);
     void inputLoudnessChanged(float loudness);
@@ -220,6 +230,7 @@ signals:
 
     void deviceChanged(QAudio::Mode mode, const QAudioDeviceInfo& device);
     void devicesChanged(QAudio::Mode mode, const QList<QAudioDeviceInfo>& devices);
+    void peakValueListChanged(const QList<float> peakValueList);
 
     void receivedFirstPacket();
     void disconnected();
@@ -238,9 +249,12 @@ private:
     friend class CheckDevicesThread;
     friend class LocalInjectorsThread;
 
+    // background tasks
+    void checkDevices();
+    void checkPeakValues();
+
     void outputFormatChanged();
     void handleAudioInput(QByteArray& audioBuffer);
-    void checkDevices();
     void prepareLocalAudioInjectors(std::unique_ptr<Lock> localAudioLock = nullptr);
     bool mixLocalAudioInjectors(float* mixBuffer);
     float azimuthForSource(const glm::vec3& relativePosition);
@@ -274,6 +288,7 @@ private:
 
     Mutex _injectorsMutex;
     QAudioInput* _audioInput;
+    QTimer* _dummyAudioInput;
     QAudioFormat _desiredInputFormat;
     QAudioFormat _inputFormat;
     QIODevice* _inputDevice;
@@ -293,6 +308,7 @@ private:
     std::atomic<bool> _localInjectorsAvailable { false };
     MixedProcessedAudioStream _receivedAudioStream;
     bool _isStereoInput;
+    std::atomic<bool> _enablePeakValues { false };
 
     quint64 _outputStarveDetectionStartTimeMsec;
     int _outputStarveDetectionCount;
@@ -347,8 +363,8 @@ private:
 
     void handleLocalEchoAndReverb(QByteArray& inputByteArray);
 
-    bool switchInputToAudioDevice(const QAudioDeviceInfo& inputDeviceInfo);
-    bool switchOutputToAudioDevice(const QAudioDeviceInfo& outputDeviceInfo);
+    bool switchInputToAudioDevice(const QAudioDeviceInfo& inputDeviceInfo, bool isShutdownRequest = false);
+    bool switchOutputToAudioDevice(const QAudioDeviceInfo& outputDeviceInfo, bool isShutdownRequest = false);
 
     // Callback acceleration dependent calculations
     int calculateNumberOfInputCallbackBytes(const QAudioFormat& format) const;
@@ -361,7 +377,7 @@ private:
     AudioIOStats _stats;
 
     AudioGate* _audioGate { nullptr };
-    bool _audioGateOpen { false };
+    bool _audioGateOpen { true };
 
     AudioPositionGetter _positionGetter;
     AudioOrientationGetter _orientationGetter;
@@ -377,7 +393,7 @@ private:
 
     bool _hasReceivedFirstPacket { false };
 
-    QVector<AudioInjector*> _activeLocalAudioInjectors;
+    QVector<AudioInjectorPointer> _activeLocalAudioInjectors;
 
     bool _isPlayingBackRecording { false };
 
@@ -390,7 +406,12 @@ private:
     RateCounter<> _silentInbound;
     RateCounter<> _audioInbound;
 
+#if defined(Q_OS_ANDROID)
+    bool _shouldRestartInputSetup { true }; // Should we restart the input device because of an unintended stop?
+#endif
+    
     QTimer* _checkDevicesTimer { nullptr };
+    QTimer* _checkPeakValuesTimer { nullptr };
 };
 
 
diff --git a/libraries/audio-client/src/AudioPeakValues.cpp b/libraries/audio-client/src/AudioPeakValues.cpp
new file mode 100644
index 0000000000..3df469b830
--- /dev/null
+++ b/libraries/audio-client/src/AudioPeakValues.cpp
@@ -0,0 +1,176 @@
+//
+//  AudioPeakValues.cpp
+//  interface/src
+//
+//  Created by Zach Pomerantz on 6/26/2017
+//  Copyright 2013 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 "AudioClient.h"
+
+#ifdef Q_OS_WIN
+
+#include <windows.h>
+#include <mmdeviceapi.h>
+#include <endpointvolume.h>
+#include <audioclient.h>
+
+#include <QString>
+
+#define RETURN_ON_FAIL(result) if (FAILED(result)) { return; }
+#define CONTINUE_ON_FAIL(result) if (FAILED(result)) { continue; }
+
+extern QString getWinDeviceName(IMMDevice* pEndpoint);
+extern std::mutex _deviceMutex;
+
+std::map<std::wstring, std::shared_ptr<IAudioClient>> activeClients;
+
+template <class T>
+void release(T* t) {
+    t->Release();
+}
+
+template <>
+void release(IAudioClient* audioClient) {
+    audioClient->Stop();
+    audioClient->Release();
+}
+
+void AudioClient::checkPeakValues() {
+    // prepare the windows environment
+    CoInitialize(NULL);
+
+    // if disabled, clean up active clients
+    if (!_enablePeakValues) {
+        activeClients.clear();
+        return;
+    }
+
+    // lock the devices so the _inputDevices list is static
+    std::unique_lock<std::mutex> lock(_deviceMutex);
+    HRESULT result;
+
+    // initialize the payload
+    QList<float> peakValueList;
+    for (int i = 0; i < _inputDevices.size(); ++i) {
+        peakValueList.push_back(0.0f);
+    }
+
+    std::shared_ptr<IMMDeviceEnumerator> enumerator;
+    {
+        IMMDeviceEnumerator* pEnumerator;
+        result = CoCreateInstance(
+            __uuidof(MMDeviceEnumerator), NULL, CLSCTX_INPROC_SERVER,
+            __uuidof(IMMDeviceEnumerator), (void**)&pEnumerator);
+        RETURN_ON_FAIL(result);
+        enumerator = std::shared_ptr<IMMDeviceEnumerator>(pEnumerator, &release<IMMDeviceEnumerator>);
+    }
+
+    std::shared_ptr<IMMDeviceCollection> endpoints;
+    {
+        IMMDeviceCollection* pEndpoints;
+        result = enumerator->EnumAudioEndpoints(eCapture, DEVICE_STATE_ACTIVE, &pEndpoints);
+        RETURN_ON_FAIL(result);
+        endpoints = std::shared_ptr<IMMDeviceCollection>(pEndpoints, &release<IMMDeviceCollection>);
+    }
+
+    UINT count;
+    {
+        result = endpoints->GetCount(&count);
+        RETURN_ON_FAIL(result);
+    }
+
+    IMMDevice* pDevice;
+    std::shared_ptr<IMMDevice> device;
+    IAudioMeterInformation* pMeterInfo;
+    std::shared_ptr<IAudioMeterInformation> meterInfo;
+    IAudioClient* pAudioClient;
+    std::shared_ptr<IAudioClient> audioClient;
+    DWORD hardwareSupport;
+    LPWSTR pDeviceId = NULL;
+    LPWAVEFORMATEX format;
+    float peakValue;
+    QString deviceName;
+    int deviceIndex;
+    for (UINT i = 0; i < count; ++i) {
+        result = endpoints->Item(i, &pDevice);
+        CONTINUE_ON_FAIL(result);
+        device = std::shared_ptr<IMMDevice>(pDevice, &release<IMMDevice>);
+
+        // if the device isn't listed through Qt, skip it
+        deviceName = ::getWinDeviceName(pDevice);
+        deviceIndex = 0;
+        for (;  deviceIndex < _inputDevices.size(); ++deviceIndex) {
+            if (deviceName == _inputDevices[deviceIndex].deviceName()) {
+                break;
+            }
+        }
+        if (deviceIndex >= _inputDevices.size()) {
+            continue;
+        }
+
+        //continue;
+
+        result = device->Activate(__uuidof(IAudioMeterInformation), CLSCTX_ALL, NULL, (void**)&pMeterInfo);
+        CONTINUE_ON_FAIL(result);
+        meterInfo = std::shared_ptr<IAudioMeterInformation>(pMeterInfo, &release<IAudioMeterInformation>);
+
+        //continue;
+
+        hardwareSupport;
+        result = meterInfo->QueryHardwareSupport(&hardwareSupport);
+        CONTINUE_ON_FAIL(result);
+
+        //continue;
+
+        // if the device has no hardware support (USB)...
+        if (!(hardwareSupport & ENDPOINT_HARDWARE_SUPPORT_METER)) {
+            result = device->GetId(&pDeviceId);
+            CONTINUE_ON_FAIL(result);
+            std::wstring deviceId(pDeviceId);
+            CoTaskMemFree(pDeviceId);
+
+            //continue;
+
+            // ...and no active client...
+            if (activeClients.find(deviceId) == activeClients.end()) {
+                result = device->Activate(__uuidof(IAudioClient), CLSCTX_ALL, NULL, (void**)&pAudioClient);
+                CONTINUE_ON_FAIL(result);
+                audioClient = std::shared_ptr<IAudioClient>(pAudioClient, &release<IAudioClient>);
+
+                //continue;
+
+                // ...activate a client
+                audioClient->GetMixFormat(&format);
+                audioClient->Initialize(AUDCLNT_SHAREMODE_SHARED, 0, 0, 0, format, NULL);
+                audioClient->Start();
+
+                //continue;
+
+                activeClients[deviceId] = audioClient;
+            }
+        }
+
+        // get the peak value and put it in the payload
+        meterInfo->GetPeakValue(&peakValue);
+        peakValueList[deviceIndex] = peakValue;
+    }
+
+    emit peakValueListChanged(peakValueList);
+}
+
+bool AudioClient::peakValuesAvailable() const {
+    return true;
+}
+
+#else
+void AudioClient::checkPeakValues() {
+}
+
+bool AudioClient::peakValuesAvailable() const {
+    return false;
+}
+#endif
\ No newline at end of file
diff --git a/libraries/audio/src/AbstractAudioInterface.h b/libraries/audio/src/AbstractAudioInterface.h
index 2e14b9956b..8b48b55206 100644
--- a/libraries/audio/src/AbstractAudioInterface.h
+++ b/libraries/audio/src/AbstractAudioInterface.h
@@ -18,6 +18,7 @@
 #include <udt/PacketHeaders.h>
 
 #include "AudioInjectorOptions.h"
+#include "AudioInjector.h"
 
 class AudioInjector;
 class AudioInjectorLocalBuffer;
@@ -35,7 +36,7 @@ public:
     // threadsafe
     // moves injector->getLocalBuffer() to another thread (so removes its parent)
     // take care to delete it when ~AudioInjector, as parenting Qt semantics will not work
-    virtual bool outputLocalInjector(AudioInjector* injector) = 0;
+    virtual bool outputLocalInjector(const AudioInjectorPointer& injector) = 0;
 
 public slots:
     virtual bool shouldLoopbackInjectors() { return false; }
diff --git a/libraries/audio/src/AudioDynamics.h b/libraries/audio/src/AudioDynamics.h
index 08daa21348..6f36605025 100644
--- a/libraries/audio/src/AudioDynamics.h
+++ b/libraries/audio/src/AudioDynamics.h
@@ -31,6 +31,9 @@
 #define MULQ31(a,b)     ((int32_t)(MUL64(a, b) >> 31))
 #define MULDIV64(a,b,c) (int32_t)(MUL64(a, b) / (c))
 
+#define ADDMOD32(a,b)   (int32_t)((uint32_t)(a) + (uint32_t)(b))
+#define SUBMOD32(a,b)   (int32_t)((uint32_t)(a) - (uint32_t)(b))
+
 //
 // on x86 architecture, assume that SSE2 is present
 //
@@ -132,6 +135,7 @@ static const int32_t exp2Table[1 << EXP2_TABBITS][3] = {
 
 static const int IEEE754_FABS_MASK = 0x7fffffff;
 static const int IEEE754_MANT_BITS = 23;
+static const int IEEE754_EXPN_BITS = 8;
 static const int IEEE754_EXPN_BIAS = 127;
 
 //
@@ -149,7 +153,7 @@ static inline int32_t peaklog2(float* input) {
 
     // split into e and x - 1.0
     int32_t e = IEEE754_EXPN_BIAS - (peak >> IEEE754_MANT_BITS) + LOG2_HEADROOM;
-    int32_t x = (peak << (31 - IEEE754_MANT_BITS)) & 0x7fffffff;
+    int32_t x = (peak << IEEE754_EXPN_BITS) & 0x7fffffff;
 
     // saturate
     if (e > 31) {
@@ -188,7 +192,7 @@ static inline int32_t peaklog2(float* input0, float* input1) {
 
     // split into e and x - 1.0
     int32_t e = IEEE754_EXPN_BIAS - (peak >> IEEE754_MANT_BITS) + LOG2_HEADROOM;
-    int32_t x = (peak << (31 - IEEE754_MANT_BITS)) & 0x7fffffff;
+    int32_t x = (peak << IEEE754_EXPN_BITS) & 0x7fffffff;
 
     // saturate
     if (e > 31) {
@@ -231,7 +235,7 @@ static inline int32_t peaklog2(float* input0, float* input1, float* input2, floa
 
     // split into e and x - 1.0
     int32_t e = IEEE754_EXPN_BIAS - (peak >> IEEE754_MANT_BITS) + LOG2_HEADROOM;
-    int32_t x = (peak << (31 - IEEE754_MANT_BITS)) & 0x7fffffff;
+    int32_t x = (peak << IEEE754_EXPN_BITS) & 0x7fffffff;
 
     // saturate
     if (e > 31) {
@@ -256,30 +260,30 @@ static inline int32_t peaklog2(float* input0, float* input1, float* input2, floa
 // Count Leading Zeros
 // Emulates the CLZ (ARM) and LZCNT (x86) instruction
 //
-static inline int CLZ(uint32_t x) {
+static inline int CLZ(uint32_t u) {
 
-    if (x == 0) {
+    if (u == 0) {
         return 32;
     }
 
     int e = 0;
-    if (x < 0x00010000) {
-        x <<= 16;
+    if (u < 0x00010000) {
+        u <<= 16;
         e += 16;
     }
-    if (x < 0x01000000) {
-        x <<= 8;
+    if (u < 0x01000000) {
+        u <<= 8;
         e += 8;
     }
-    if (x < 0x10000000) {
-        x <<= 4;
+    if (u < 0x10000000) {
+        u <<= 4;
         e += 4;
     }
-    if (x < 0x40000000) {
-        x <<= 2;
+    if (u < 0x40000000) {
+        u <<= 2;
         e += 2;
     }
-    if (x < 0x80000000) {
+    if (u < 0x80000000) {
         e += 1;
     }
     return e;
@@ -287,19 +291,19 @@ static inline int CLZ(uint32_t x) {
 
 //
 // Compute -log2(x) for x=[0,1] in Q31, result in Q26
-// x = 0 returns 0x7fffffff
-// x < 0 undefined
+// x <= 0 returns 0x7fffffff
 //
 static inline int32_t fixlog2(int32_t x) {
 
-    if (x == 0) {
+    if (x <= 0) {
         return 0x7fffffff;
     }
 
     // split into e and x - 1.0
-    int e = CLZ((uint32_t)x);
-    x <<= e;            // normalize to [0x80000000, 0xffffffff]
-    x &= 0x7fffffff;    // x - 1.0
+    uint32_t u = (uint32_t)x;
+    int e = CLZ(u);
+    u <<= e;            // normalize to [0x80000000, 0xffffffff]
+    x = u & 0x7fffffff; // x - 1.0
 
     int k = x >> (31 - LOG2_TABBITS);
 
@@ -317,13 +321,18 @@ static inline int32_t fixlog2(int32_t x) {
 
 //
 // Compute exp2(-x) for x=[0,32] in Q26, result in Q31
-// x < 0 undefined
+// x <= 0 returns 0x7fffffff
 //
 static inline int32_t fixexp2(int32_t x) {
 
+    if (x <= 0) {
+        return 0x7fffffff;
+    }
+
     // split into e and 1.0 - x
-    int e = x >> LOG2_FRACBITS;
-    x = ~(x << LOG2_INTBITS) & 0x7fffffff;
+    uint32_t u = (uint32_t)x;
+    int e = u >> LOG2_FRACBITS;
+    x = ~(u << LOG2_INTBITS) & 0x7fffffff;
 
     int k = x >> (31 - EXP2_TABBITS);
 
@@ -394,19 +403,21 @@ public:
 
         // Fast FIR attack/lowpass filter using a 2-stage CIC filter.
         // The step response reaches final value after N-1 samples.
+        // NOTE: CIC integrators intentionally overflow, using modulo arithmetic.
+        // See E. B. Hogenauer, "An economical class of digital filters for decimation and interpolation"
 
         const int32_t CICGAIN = 0xffffffff / (CIC1 * CIC2); // Q32
         x = MULHI(x, CICGAIN);
 
         _buffer[i] = _acc1;
-        _acc1 += x;                 // integrator
+        _acc1 = ADDMOD32(_acc1, x);         // integrator
         i = (i + CIC1 - 1) & MASK;
-        x = _acc1 - _buffer[i];     // comb
+        x = SUBMOD32(_acc1, _buffer[i]);    // comb
 
         _buffer[i] = _acc2;
-        _acc2 += x;                 // integrator
+        _acc2 = ADDMOD32(_acc2, x);         // integrator
         i = (i + CIC2 - 1) & MASK;
-        x = _acc2 - _buffer[i];     // comb
+        x = SUBMOD32(_acc2, _buffer[i]);    // comb
 
         _index = (i + 1) & MASK;    // skip unused tap
         return x;
@@ -459,19 +470,21 @@ public:
 
         // Fast FIR attack/lowpass filter using a 2-stage CIC filter.
         // The step response reaches final value after N-1 samples.
+        // NOTE: CIC integrators intentionally overflow, using modulo arithmetic.
+        // See E. B. Hogenauer, "An economical class of digital filters for decimation and interpolation"
 
         const int32_t CICGAIN = 0xffffffff / (CIC1 * CIC2); // Q32
         x = MULHI(x, CICGAIN);
 
         _buffer[i] = _acc1;
-        _acc1 += x;                 // integrator
+        _acc1 = ADDMOD32(_acc1, x);         // integrator
         i = (i + CIC1 - 1) & MASK;
-        x = _acc1 - _buffer[i];     // comb
+        x = SUBMOD32(_acc1, _buffer[i]);    // comb
 
         _buffer[i] = _acc2;
-        _acc2 += x;                 // integrator
+        _acc2 = ADDMOD32(_acc2, x);         // integrator
         i = (i + CIC2 - 1) & MASK;
-        x = _acc2 - _buffer[i];     // comb
+        x = SUBMOD32(_acc2, _buffer[i]);    // comb
 
         _index = (i + 1) & MASK;    // skip unused tap
         return x;
diff --git a/libraries/audio/src/AudioGate.cpp b/libraries/audio/src/AudioGate.cpp
index 0afeee19be..5ef5ee25b5 100644
--- a/libraries/audio/src/AudioGate.cpp
+++ b/libraries/audio/src/AudioGate.cpp
@@ -7,6 +7,7 @@
 //
 
 #include <string.h>
+#include <stdlib.h>
 #include <assert.h>
 
 #include "AudioDynamics.h"
@@ -25,10 +26,10 @@ static inline int32_t saturateQ30(int32_t x) {
 }
 
 //
-// First-order DC-blocking filter, with zero at 1.0 and pole at 0.99994
+// First-order DC-blocking filter, with zero at 1.0 and pole at 0.9999
 //
-// -3dB @ 0.5 Hz (48KHz)
-// -3dB @ 0.2 Hz (24KHz)
+// -3dB @ 1.0 Hz (48KHz)
+// -3dB @ 0.5 Hz (24KHz)
 //
 // input in Q15, output in Q30
 //
@@ -39,9 +40,9 @@ class MonoDCBlock {
 public:
     void process(int32_t& x) {
 
-        x <<= 15;               // scale to Q30
+        x *= (1 << 15);         // scale to Q30
         x -= _dcOffset;         // remove DC
-        _dcOffset += x >> 14;   // pole = (1.0 - 2^-14) = 0.99994
+        _dcOffset += x >> 13;   // pole = (1.0 - 2^-13) = 0.9999
     }
 };
 
@@ -52,8 +53,8 @@ class StereoDCBlock {
 public:
     void process(int32_t& x0, int32_t& x1) {
 
-        x0 <<= 15;
-        x1 <<= 15;
+        x0 *= (1 << 15);
+        x1 *= (1 << 15);
 
         x0 -= _dcOffset[0];
         x1 -= _dcOffset[1];
@@ -70,10 +71,10 @@ class QuadDCBlock {
 public:
     void process(int32_t& x0, int32_t& x1, int32_t& x2, int32_t& x3) {
 
-        x0 <<= 15;
-        x1 <<= 15;
-        x2 <<= 15;
-        x3 <<= 15;
+        x0 *= (1 << 15);
+        x1 *= (1 << 15);
+        x2 *= (1 << 15);
+        x3 *= (1 << 15);
 
         x0 -= _dcOffset[0];
         x1 -= _dcOffset[1];
@@ -99,10 +100,10 @@ protected:
     int _histogram[NHIST] = {};
 
     // peakhold
-    int32_t _holdMin = 0x7fffffff;
-    int32_t _holdInc = 0x7fffffff;
+    uint32_t _holdMin = 0x7fffffff;
+    uint32_t _holdInc = 0x7fffffff;
     uint32_t _holdMax = 0x7fffffff;
-    int32_t _holdRel = 0x7fffffff;
+    uint32_t _holdRel = 0x7fffffff;
     int32_t _holdPeak = 0x7fffffff;
 
     // hysteresis
@@ -147,10 +148,10 @@ GateImpl::GateImpl(int sampleRate) {
     _sampleRate = sampleRate;
 
     // defaults
-    setThreshold(-36.0);
-    setHold(20.0);
-    setHysteresis(6.0);
-    setRelease(1000.0);
+    setThreshold(-30.0f);
+    setHold(20.0f);
+    setHysteresis(6.0f);
+    setRelease(1000.0f);
 }
 
 //
@@ -176,18 +177,23 @@ void GateImpl::setThreshold(float threshold) {
 void GateImpl::setHold(float hold) {
 
     const double RELEASE = 100.0;   // release = 100ms
-    const double PROGHOLD = 0.100;  // progressive hold = 100ms
+    const double PROGHOLD = 100.0;  // progressive hold = 100ms
 
     // pure hold = 1 to 1000ms
     hold = MAX(hold, 1.0f);
     hold = MIN(hold, 1000.0f);
 
+    // compute final tc
     _holdMin = msToTc(RELEASE, _sampleRate);
 
-    _holdInc = (int32_t)((_holdMin - 0x7fffffff) / (PROGHOLD * _sampleRate));
-    _holdInc = MIN(_holdInc, -1); // prevent 0 on long releases
-
-    _holdMax = 0x7fffffff - (uint32_t)(_holdInc * (double)hold/1000.0 * _sampleRate);
+    // compute tc increment, to progress from 0x7fffffff to _holdMin in PROGHOLD ms
+    double progSamples = PROGHOLD/1000.0 * _sampleRate;
+    _holdInc = (uint32_t)((0x7fffffff - _holdMin) / progSamples);
+    _holdInc = MAX(_holdInc, 1);    // prevent 0 on long releases
+    
+    // compute initial tc, to progress from _holdMax to 0x7fffffff in hold ms
+    double holdSamples = (double)hold/1000.0 * _sampleRate;
+    _holdMax = 0x7fffffff + (uint32_t)(_holdInc * holdSamples);
 }
 
 //
@@ -317,8 +323,6 @@ void GateImpl::processHistogram(int numFrames) {
 
     // smooth threshold update
     _threshAdapt = threshold + MULQ31((_threshAdapt - threshold), tcThreshold);
-
-    //printf("threshold = %0.1f\n", (_threshAdapt - (LOG2_HEADROOM_Q15 << LOG2_FRACBITS)) * -6.02f / (1 << LOG2_FRACBITS));
 }
 
 //
@@ -335,10 +339,8 @@ int32_t GateImpl::peakhold(int32_t peak) {
         // (_holdRel > _holdMin) progressive hold
         // (_holdRel = _holdMin) release
 
-        _holdRel += _holdInc;                                   // update progressive hold
-        _holdRel = MAX((uint32_t)_holdRel, (uint32_t)_holdMin); // saturate at final value
-
-        int32_t tc = MIN((uint32_t)_holdRel, 0x7fffffff);
+        _holdRel -= _holdInc;                                   // update progressive hold
+        int32_t tc = MIN(MAX(_holdRel, _holdMin), 0x7fffffff);  // saturate to [_holdMin, 0x7fffffff]
         peak += MULQ31((_holdPeak - peak), tc);                 // apply release
 
     } else {
diff --git a/libraries/audio/src/AudioInjector.cpp b/libraries/audio/src/AudioInjector.cpp
index 47e6c98144..9f32372a8e 100644
--- a/libraries/audio/src/AudioInjector.cpp
+++ b/libraries/audio/src/AudioInjector.cpp
@@ -27,8 +27,6 @@
 #include "AudioSRC.h"
 #include "AudioHelpers.h"
 
-int audioInjectorPtrMetaTypeId = qRegisterMetaType<AudioInjector*>();
-
 AbstractAudioInterface* AudioInjector::_localAudioInterface{ nullptr };
 
 AudioInjectorState operator& (AudioInjectorState lhs, AudioInjectorState rhs) {
@@ -92,11 +90,6 @@ void AudioInjector::finish() {
     emit finished();
 
     deleteLocalBuffer();
-
-    if (stateHas(AudioInjectorState::PendingDelete)) {
-        // we've been asked to delete after finishing, trigger a deleteLater here
-        deleteLater();
-    }
 }
 
 void AudioInjector::restart() {
@@ -132,7 +125,7 @@ void AudioInjector::restart() {
     }
 }
 
-bool AudioInjector::inject(bool(AudioInjectorManager::*injection)(AudioInjector*)) {
+bool AudioInjector::inject(bool(AudioInjectorManager::*injection)(const AudioInjectorPointer&)) {
     _state = AudioInjectorState::NotFinished;
 
     int byteOffset = 0;
@@ -150,7 +143,7 @@ bool AudioInjector::inject(bool(AudioInjectorManager::*injection)(AudioInjector*
     bool success = true;
     if (!_options.localOnly) {
         auto injectorManager = DependencyManager::get<AudioInjectorManager>();
-        if (!(*injectorManager.*injection)(this)) {
+        if (!(*injectorManager.*injection)(sharedFromThis())) {
             success = false;
             finishNetworkInjection();
         }
@@ -173,7 +166,7 @@ bool AudioInjector::injectLocally() {
 
             // call this function on the AudioClient's thread
             // this will move the local buffer's thread to the LocalInjectorThread
-            success = _localAudioInterface->outputLocalInjector(this);
+            success = _localAudioInterface->outputLocalInjector(sharedFromThis());
 
             if (!success) {
                 qCDebug(audio) << "AudioInjector::injectLocally could not output locally via _localAudioInterface";
@@ -418,20 +411,16 @@ void AudioInjector::triggerDeleteAfterFinish() {
     }
 
     if (stateHas(AudioInjectorState::Finished)) {
-        stopAndDeleteLater();
+        stop();
     } else {
         _state |= AudioInjectorState::PendingDelete;
     }
 }
 
-void AudioInjector::stopAndDeleteLater() {
-    stop();
-    QMetaObject::invokeMethod(this, "deleteLater", Qt::QueuedConnection);
-}
-
-AudioInjector* AudioInjector::playSound(SharedSoundPointer sound, const float volume, const float stretchFactor, const glm::vec3 position) {
+AudioInjectorPointer AudioInjector::playSound(SharedSoundPointer sound, const float volume,
+                                              const float stretchFactor, const glm::vec3 position) {
     if (!sound || !sound->isReady()) {
-        return nullptr;
+        return AudioInjectorPointer();
     }
 
     AudioInjectorOptions options;
@@ -462,8 +451,8 @@ AudioInjector* AudioInjector::playSound(SharedSoundPointer sound, const float vo
     return playSoundAndDelete(resampled, options);
 }
 
-AudioInjector* AudioInjector::playSoundAndDelete(const QByteArray& buffer, const AudioInjectorOptions options) {
-    AudioInjector* sound = playSound(buffer, options);
+AudioInjectorPointer AudioInjector::playSoundAndDelete(const QByteArray& buffer, const AudioInjectorOptions options) {
+    AudioInjectorPointer sound = playSound(buffer, options);
 
     if (sound) {
         sound->_state |= AudioInjectorState::PendingDelete;
@@ -473,8 +462,9 @@ AudioInjector* AudioInjector::playSoundAndDelete(const QByteArray& buffer, const
 }
 
 
-AudioInjector* AudioInjector::playSound(const QByteArray& buffer, const AudioInjectorOptions options) {
-    AudioInjector* injector = new AudioInjector(buffer, options);
+AudioInjectorPointer AudioInjector::playSound(const QByteArray& buffer, const AudioInjectorOptions options) {
+    AudioInjectorPointer injector = AudioInjectorPointer::create(buffer, options);
+
     if (!injector->inject(&AudioInjectorManager::threadInjector)) {
         qWarning() << "AudioInjector::playSound failed to thread injector";
     }
diff --git a/libraries/audio/src/AudioInjector.h b/libraries/audio/src/AudioInjector.h
index a901c2520f..fc197f7ba0 100644
--- a/libraries/audio/src/AudioInjector.h
+++ b/libraries/audio/src/AudioInjector.h
@@ -32,6 +32,8 @@
 
 class AbstractAudioInterface;
 class AudioInjectorManager;
+class AudioInjector;
+using AudioInjectorPointer = QSharedPointer<AudioInjector>;
 
 
 enum class AudioInjectorState : uint8_t {
@@ -46,19 +48,19 @@ AudioInjectorState operator& (AudioInjectorState lhs, AudioInjectorState rhs);
 AudioInjectorState& operator|= (AudioInjectorState& lhs, AudioInjectorState rhs);
 
 // In order to make scripting cleaner for the AudioInjector, the script now holds on to the AudioInjector object
-// until it dies. 
-class AudioInjector : public QObject {
+// until it dies.
+class AudioInjector : public QObject, public QEnableSharedFromThis<AudioInjector> {
     Q_OBJECT
 public:
     AudioInjector(const Sound& sound, const AudioInjectorOptions& injectorOptions);
     AudioInjector(const QByteArray& audioData, const AudioInjectorOptions& injectorOptions);
     ~AudioInjector();
-    
+
     bool isFinished() const { return (stateHas(AudioInjectorState::Finished)); }
-    
+
     int getCurrentSendOffset() const { return _currentSendOffset; }
     void setCurrentSendOffset(int currentSendOffset) { _currentSendOffset = currentSendOffset; }
-    
+
     AudioInjectorLocalBuffer* getLocalBuffer() const { return _localBuffer; }
     AudioHRTF& getLocalHRTF() { return _localHRTF; }
     AudioFOA& getLocalFOA() { return _localFOA; }
@@ -72,36 +74,36 @@ public:
 
     bool stateHas(AudioInjectorState state) const ;
     static void setLocalAudioInterface(AbstractAudioInterface* audioInterface) { _localAudioInterface = audioInterface; }
-    static AudioInjector* playSoundAndDelete(const QByteArray& buffer, const AudioInjectorOptions options);
-    static AudioInjector* playSound(const QByteArray& buffer, const AudioInjectorOptions options);
-    static AudioInjector* playSound(SharedSoundPointer sound, const float volume, const float stretchFactor, const glm::vec3 position);
+    static AudioInjectorPointer playSoundAndDelete(const QByteArray& buffer, const AudioInjectorOptions options);
+    static AudioInjectorPointer playSound(const QByteArray& buffer, const AudioInjectorOptions options);
+    static AudioInjectorPointer playSound(SharedSoundPointer sound, const float volume,
+                                          const float stretchFactor, const glm::vec3 position);
 
 public slots:
     void restart();
-    
+
     void stop();
     void triggerDeleteAfterFinish();
-    void stopAndDeleteLater();
-    
+
     const AudioInjectorOptions& getOptions() const { return _options; }
     void setOptions(const AudioInjectorOptions& options);
-    
+
     float getLoudness() const { return _loudness; }
     bool isPlaying() const { return !stateHas(AudioInjectorState::Finished); }
     void finish();
     void finishLocalInjection();
     void finishNetworkInjection();
-    
+
 signals:
     void finished();
     void restarting();
-    
+
 private:
     int64_t injectNextFrame();
-    bool inject(bool(AudioInjectorManager::*injection)(AudioInjector*));
+    bool inject(bool(AudioInjectorManager::*injection)(const AudioInjectorPointer&));
     bool injectLocally();
     void deleteLocalBuffer();
-    
+
     static AbstractAudioInterface* _localAudioInterface;
 
     QByteArray _audioData;
@@ -112,17 +114,15 @@ private:
     int _currentSendOffset { 0 };
     std::unique_ptr<NLPacket> _currentPacket { nullptr };
     AudioInjectorLocalBuffer* _localBuffer { nullptr };
-    
+
     int64_t _nextFrame { 0 };
     std::unique_ptr<QElapsedTimer> _frameTimer { nullptr };
     quint16 _outgoingSequenceNumber { 0 };
-    
+
     // when the injector is local, we need this
     AudioHRTF _localHRTF;
     AudioFOA _localFOA;
     friend class AudioInjectorManager;
 };
 
-Q_DECLARE_METATYPE(AudioInjector*)
-    
 #endif // hifi_AudioInjector_h
diff --git a/libraries/audio/src/AudioInjectorManager.cpp b/libraries/audio/src/AudioInjectorManager.cpp
index c66e209ea9..f30d3093ec 100644
--- a/libraries/audio/src/AudioInjectorManager.cpp
+++ b/libraries/audio/src/AudioInjectorManager.cpp
@@ -21,26 +21,26 @@
 
 AudioInjectorManager::~AudioInjectorManager() {
     _shouldStop = true;
-    
+
     Lock lock(_injectorsMutex);
-    
+
     // make sure any still living injectors are stopped and deleted
     while (!_injectors.empty()) {
         // grab the injector at the front
         auto& timePointerPair = _injectors.top();
-        
+
         // ask it to stop and be deleted
-        timePointerPair.second->stopAndDeleteLater();
-        
+        timePointerPair.second->stop();
+
         _injectors.pop();
     }
-    
+
     // get rid of the lock now that we've stopped all living injectors
     lock.unlock();
-    
+
     // in case the thread is waiting for injectors wake it up now
     _injectorReady.notify_one();
-    
+
     // quit and wait on the manager thread, if we ever created it
     if (_thread) {
         _thread->quit();
@@ -51,10 +51,10 @@ AudioInjectorManager::~AudioInjectorManager() {
 void AudioInjectorManager::createThread() {
     _thread = new QThread;
     _thread->setObjectName("Audio Injector Thread");
-    
+
     // when the thread is started, have it call our run to handle injection of audio
     connect(_thread, &QThread::started, this, &AudioInjectorManager::run, Qt::DirectConnection);
-    
+
     // start the thread
     _thread->start();
 }
@@ -63,20 +63,20 @@ void AudioInjectorManager::run() {
     while (!_shouldStop) {
         // wait until the next injector is ready, or until we get a new injector given to us
         Lock lock(_injectorsMutex);
-        
+
         if (_injectors.size() > 0) {
             // when does the next injector need to send a frame?
             // do we get to wait or should we just go for it now?
-            
+
             auto timeInjectorPair = _injectors.top();
-            
+
             auto nextTimestamp = timeInjectorPair.first;
             int64_t difference = int64_t(nextTimestamp - usecTimestampNow());
-            
+
             if (difference > 0) {
                 _injectorReady.wait_for(lock, std::chrono::microseconds(difference));
             }
-            
+
             if (_injectors.size() > 0) {
                 // loop through the injectors in the map and send whatever frames need to go out
                 auto front = _injectors.top();
@@ -90,7 +90,7 @@ void AudioInjectorManager::run() {
                     // either way we're popping this injector off - get a copy first
                     auto injector = front.second;
                     _injectors.pop();
-                    
+
                     if (!injector.isNull()) {
                         // this is an injector that's ready to go, have it send a frame now
                         auto nextCallDelta = injector->injectNextFrame();
@@ -100,7 +100,7 @@ void AudioInjectorManager::run() {
                             heldInjectors.emplace(heldInjectors.end(), usecTimestampNow() + nextCallDelta, injector);
                         }
                     }
-                    
+
                     if (_injectors.size() > 0) {
                         front = _injectors.top();
                     } else {
@@ -120,10 +120,10 @@ void AudioInjectorManager::run() {
             // we have no current injectors, wait until we get at least one before we do anything
             _injectorReady.wait(lock);
         }
-        
+
         // unlock the lock in case something in process events needs to modify the queue
         lock.unlock();
-        
+
         QCoreApplication::processEvents();
     }
 }
@@ -139,36 +139,36 @@ bool AudioInjectorManager::wouldExceedLimits() { // Should be called inside of a
     return false;
 }
 
-bool AudioInjectorManager::threadInjector(AudioInjector* injector) {
+bool AudioInjectorManager::threadInjector(const AudioInjectorPointer& injector) {
     if (_shouldStop) {
         qCDebug(audio)  << "AudioInjectorManager::threadInjector asked to thread injector but is shutting down.";
         return false;
     }
-    
+
     // guard the injectors vector with a mutex
     Lock lock(_injectorsMutex);
-    
+
     if (wouldExceedLimits()) {
         return false;
     } else {
         if (!_thread) {
             createThread();
         }
-        
+
         // move the injector to the QThread
         injector->moveToThread(_thread);
-        
+
         // add the injector to the queue with a send timestamp of now
-        _injectors.emplace(usecTimestampNow(), InjectorQPointer { injector });
-        
+        _injectors.emplace(usecTimestampNow(), injector);
+
         // notify our wait condition so we can inject two frames for this injector immediately
         _injectorReady.notify_one();
-        
+
         return true;
     }
 }
 
-bool AudioInjectorManager::restartFinishedInjector(AudioInjector* injector) {
+bool AudioInjectorManager::restartFinishedInjector(const AudioInjectorPointer& injector) {
     if (_shouldStop) {
         qCDebug(audio)  << "AudioInjectorManager::threadInjector asked to thread injector but is shutting down.";
         return false;
@@ -181,8 +181,8 @@ bool AudioInjectorManager::restartFinishedInjector(AudioInjector* injector) {
         return false;
     } else {
         // add the injector to the queue with a send timestamp of now
-        _injectors.emplace(usecTimestampNow(), InjectorQPointer { injector });
-        
+        _injectors.emplace(usecTimestampNow(), injector);
+
         // notify our wait condition so we can inject two frames for this injector immediately
         _injectorReady.notify_one();
     }
diff --git a/libraries/audio/src/AudioInjectorManager.h b/libraries/audio/src/AudioInjectorManager.h
index de5537856e..9aca3014e3 100644
--- a/libraries/audio/src/AudioInjectorManager.h
+++ b/libraries/audio/src/AudioInjectorManager.h
@@ -23,7 +23,7 @@
 
 #include <DependencyManager.h>
 
-class AudioInjector;
+#include "AudioInjector.h"
 
 class AudioInjectorManager : public QObject, public Dependency {
     Q_OBJECT
@@ -33,39 +33,38 @@ public:
 private slots:
     void run();
 private:
-    
-    using InjectorQPointer = QPointer<AudioInjector>;
-    using TimeInjectorPointerPair = std::pair<uint64_t, InjectorQPointer>;
-    
+
+    using TimeInjectorPointerPair = std::pair<uint64_t, AudioInjectorPointer>;
+
     struct greaterTime {
         bool operator() (const TimeInjectorPointerPair& x, const TimeInjectorPointerPair& y) const {
             return x.first > y.first;
         }
     };
-    
+
     using InjectorQueue = std::priority_queue<TimeInjectorPointerPair,
                                               std::deque<TimeInjectorPointerPair>,
                                               greaterTime>;
     using Mutex = std::mutex;
     using Lock = std::unique_lock<Mutex>;
-    
-    bool threadInjector(AudioInjector* injector);
-    bool restartFinishedInjector(AudioInjector* injector);
+
+    bool threadInjector(const AudioInjectorPointer& injector);
+    bool restartFinishedInjector(const AudioInjectorPointer& injector);
     void notifyInjectorReadyCondition() { _injectorReady.notify_one(); }
     bool wouldExceedLimits();
-    
+
     AudioInjectorManager() {};
     AudioInjectorManager(const AudioInjectorManager&) = delete;
     AudioInjectorManager& operator=(const AudioInjectorManager&) = delete;
-    
+
     void createThread();
-    
+
     QThread* _thread { nullptr };
     bool _shouldStop { false };
     InjectorQueue _injectors;
     Mutex _injectorsMutex;
     std::condition_variable _injectorReady;
-    
+
     friend class AudioInjector;
 };
 
diff --git a/libraries/audio/src/AudioLimiter.cpp b/libraries/audio/src/AudioLimiter.cpp
index 4ddff1f5a5..e20a070bd6 100644
--- a/libraries/audio/src/AudioLimiter.cpp
+++ b/libraries/audio/src/AudioLimiter.cpp
@@ -52,8 +52,8 @@ LimiterImpl::LimiterImpl(int sampleRate) {
     _sampleRate = sampleRate;
 
     // defaults
-    setThreshold(0.0);
-    setRelease(250.0);
+    setThreshold(0.0f);
+    setRelease(250.0f);
 }
 
 //
diff --git a/libraries/audio/src/InboundAudioStream.cpp b/libraries/audio/src/InboundAudioStream.cpp
index da8997895c..72acc7fcf6 100644
--- a/libraries/audio/src/InboundAudioStream.cpp
+++ b/libraries/audio/src/InboundAudioStream.cpp
@@ -46,6 +46,10 @@ static const int STATS_FOR_STATS_PACKET_WINDOW_SECONDS = 30;
 // _currentJitterBufferFrames is updated with the time-weighted avg and the running time-weighted avg is reset.
 static const quint64 FRAMES_AVAILABLE_STAT_WINDOW_USECS = 10 * USECS_PER_SECOND;
 
+// When the audio codec is switched, temporary codec mismatch is expected due to packets in-flight.
+// A SelectedAudioFormat packet is not sent until this threshold is exceeded.
+static const int MAX_MISMATCHED_AUDIO_CODEC_COUNT = 10;
+
 InboundAudioStream::InboundAudioStream(int numChannels, int numFrames, int numBlocks, int numStaticJitterBlocks) :
     _ringBuffer(numChannels * numFrames, numBlocks),
     _numChannels(numChannels),
@@ -153,6 +157,7 @@ int InboundAudioStream::parseData(ReceivedMessage& message) {
                 // If we recieved a SilentAudioFrame from our sender, we might want to drop
                 // some of the samples in order to catch up to our desired jitter buffer size.
                 writeDroppableSilentFrames(networkFrames);
+
             } else {
                 // note: PCM and no codec are identical
                 bool selectedPCM = _selectedCodecName == "pcm" || _selectedCodecName == "";
@@ -160,20 +165,33 @@ int InboundAudioStream::parseData(ReceivedMessage& message) {
                 if (codecInPacket == _selectedCodecName || (packetPCM && selectedPCM)) {
                     auto afterProperties = message.readWithoutCopy(message.getBytesLeftToRead());
                     parseAudioData(message.getType(), afterProperties);
+                    _mismatchedAudioCodecCount = 0;
+
                 } else {
-                    qDebug(audio) << "Codec mismatch: expected" << _selectedCodecName << "got" << codecInPacket << "writing silence";
+                    _mismatchedAudioCodecCount++;
+                    qDebug(audio) << "Codec mismatch: expected" << _selectedCodecName << "got" << codecInPacket;
 
-                    // Since the data in the stream is using a codec that we aren't prepared for,
-                    // we need to let the codec know that we don't have data for it, this will
-                    // allow the codec to interpolate missing data and produce a fade to silence.
-                    lostAudioData(1);
-
-                    // inform others of the mismatch
-                    auto sendingNode = DependencyManager::get<NodeList>()->nodeWithUUID(message.getSourceID());
-                    if (sendingNode) {
-                        emit mismatchedAudioCodec(sendingNode, _selectedCodecName, codecInPacket);
+                    if (packetPCM) {
+                        // If there are PCM packets in-flight after the codec is changed, use them.
+                        auto afterProperties = message.readWithoutCopy(message.getBytesLeftToRead());
+                        _ringBuffer.writeData(afterProperties.data(), afterProperties.size());
+                    } else {
+                        // Since the data in the stream is using a codec that we aren't prepared for,
+                        // we need to let the codec know that we don't have data for it, this will
+                        // allow the codec to interpolate missing data and produce a fade to silence.
+                        lostAudioData(1);
                     }
 
+                    if (_mismatchedAudioCodecCount > MAX_MISMATCHED_AUDIO_CODEC_COUNT) {
+                        _mismatchedAudioCodecCount = 0;
+
+                        // inform others of the mismatch
+                        auto sendingNode = DependencyManager::get<NodeList>()->nodeWithUUID(message.getSourceID());
+                        if (sendingNode) {
+                            emit mismatchedAudioCodec(sendingNode, _selectedCodecName, codecInPacket);
+                            qDebug(audio) << "Codec mismatch threshold exceeded, SelectedAudioFormat(" << _selectedCodecName << " ) sent";
+                        }
+                    }
                 }
             }
             break;
diff --git a/libraries/audio/src/InboundAudioStream.h b/libraries/audio/src/InboundAudioStream.h
index 9494b2f204..ecd1a118f9 100644
--- a/libraries/audio/src/InboundAudioStream.h
+++ b/libraries/audio/src/InboundAudioStream.h
@@ -186,6 +186,7 @@ protected:
     CodecPluginPointer _codec;
     QString _selectedCodecName;
     Decoder* _decoder { nullptr };
+    int _mismatchedAudioCodecCount { 0 };
 };
 
 float calculateRepeatedFrameFadeFactor(int indexOfRepeat);
diff --git a/libraries/audio/src/SoundCache.cpp b/libraries/audio/src/SoundCache.cpp
index 1646540da6..162e833da2 100644
--- a/libraries/audio/src/SoundCache.cpp
+++ b/libraries/audio/src/SoundCache.cpp
@@ -9,10 +9,13 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include <qthread.h>
+#include "SoundCache.h"
+
+#include <QtCore/QThread>
+
+#include <shared/QtHelpers.h>
 
 #include "AudioLogging.h"
-#include "SoundCache.h"
 
 static const int SOUNDS_LOADING_PRIORITY { -7 }; // Make sure sounds load after the low rez texture mips
 
@@ -29,7 +32,7 @@ SoundCache::SoundCache(QObject* parent) :
 SharedSoundPointer SoundCache::getSound(const QUrl& url) {
     if (QThread::currentThread() != thread()) {
         SharedSoundPointer result;
-        QMetaObject::invokeMethod(this, "getSound", Qt::BlockingQueuedConnection,
+        BLOCKING_INVOKE_METHOD(this, "getSound", 
                                   Q_RETURN_ARG(SharedSoundPointer, result), Q_ARG(const QUrl&, url));
         return result;
     }
diff --git a/libraries/audio/src/SoundCache.h b/libraries/audio/src/SoundCache.h
index 97d5f659d8..bc4ddf303f 100644
--- a/libraries/audio/src/SoundCache.h
+++ b/libraries/audio/src/SoundCache.h
@@ -23,7 +23,6 @@ class SoundCache : public ResourceCache, public Dependency {
 
 public:
     Q_INVOKABLE SharedSoundPointer getSound(const QUrl& url);
-
 protected:
     virtual QSharedPointer<Resource> createResource(const QUrl& url, const QSharedPointer<Resource>& fallback,
         const void* extra) override;
diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
index 6cdffff844..6bf9cc1666 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
+++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
@@ -15,6 +15,8 @@
 #include <glm/gtx/transform.hpp>
 #include <glm/gtx/vector_query.hpp>
 
+#include <AvatarConstants.h>
+#include <shared/QtHelpers.h>
 #include <DeferredLightingEffect.h>
 #include <EntityTreeRenderer.h>
 #include <NodeList.h>
@@ -29,6 +31,7 @@
 #include <DebugDraw.h>
 #include <shared/Camera.h>
 #include <SoftAttachmentModel.h>
+#include <render/TransitionStage.h>
 
 #include "Logging.h"
 
@@ -60,7 +63,7 @@ namespace render {
     template <> uint32_t metaFetchMetaSubItems(const AvatarSharedPointer& avatar, ItemIDs& subItems) {
         auto avatarPtr = static_pointer_cast<Avatar>(avatar);
         if (avatarPtr->getSkeletonModel()) {
-            auto metaSubItems = avatarPtr->getSkeletonModel()->fetchRenderItemIDs();
+            auto& metaSubItems = avatarPtr->getSkeletonModel()->fetchRenderItemIDs();
             subItems.insert(subItems.end(), metaSubItems.begin(), metaSubItems.end());
             return (uint32_t) metaSubItems.size();
         }
@@ -104,7 +107,7 @@ Avatar::Avatar(QThread* thread) :
     // we may have been created in the network thread, but we live in the main thread
     moveToThread(thread);
 
-    setScale(glm::vec3(1.0f)); // avatar scale is uniform
+    setModelScale(1.0f); // avatar scale is uniform
 
     auto geometryCache = DependencyManager::get<GeometryCache>();
     _nameRectGeometryID = geometryCache->allocateID();
@@ -150,22 +153,17 @@ glm::vec3 Avatar::getNeckPosition() const {
     return _skeletonModel->getNeckPosition(neckPosition) ? neckPosition : getPosition();
 }
 
-
-glm::quat Avatar::getWorldAlignedOrientation () const {
-    return computeRotationFromBodyToWorldUp() * getOrientation();
-}
-
 AABox Avatar::getBounds() const {
     if (!_skeletonModel->isRenderable() || _skeletonModel->needsFixupInScene()) {
         // approximately 2m tall, scaled to user request.
-        return AABox(getPosition() - glm::vec3(getUniformScale()), getUniformScale() * 2.0f);
+        return AABox(getPosition() - glm::vec3(getModelScale()), getModelScale() * 2.0f);
     }
     return _skeletonModel->getRenderableMeshBound();
 }
 
 void Avatar::animateScaleChanges(float deltaTime) {
     if (_isAnimatingScale) {
-        float currentScale = getUniformScale();
+        float currentScale = getModelScale();
         float desiredScale = getDomainLimitedScale();
 
         // use exponential decay toward the domain limit clamped scale
@@ -180,7 +178,7 @@ void Avatar::animateScaleChanges(float deltaTime) {
             animatedScale = desiredScale;
             _isAnimatingScale = false;
         }
-        setScale(glm::vec3(animatedScale)); // avatar scale is uniform
+        setModelScale(animatedScale); // avatar scale is uniform
 
         // flag the joints as having changed for force update to RenderItem
         _hasNewJointData = true;
@@ -288,6 +286,13 @@ void Avatar::updateAvatarEntities() {
                 properties.setScript(noScript);
             }
 
+            auto specifiedHref = properties.getHref();
+            if (!isMyAvatar() && !specifiedHref.isEmpty()) {
+                qCDebug(avatars_renderer) << "removing entity href from avatar attached entity:" << entityID << "old href:" << specifiedHref;
+                QString noHref;
+                properties.setHref(noHref);
+            }
+
             // When grabbing avatar entities, they are parented to the joint moving them, then when un-grabbed
             // they go back to the default parent (null uuid).  When un-gripped, others saw the entity disappear.
             // The thinking here is the local position was noticed as changing, but not the parentID (since it is now
@@ -367,7 +372,7 @@ void Avatar::simulate(float deltaTime, bool inView) {
                 }
                 head->setPosition(headPosition);
             }
-            head->setScale(getUniformScale());
+            head->setScale(getModelScale());
             head->simulate(deltaTime);
         } else {
             // a non-full update is still required so that the position, rotation, scale and bounds of the skeletonModel are updated.
@@ -425,7 +430,7 @@ bool Avatar::isLookingAtMe(AvatarSharedPointer avatar) const {
     glm::vec3 theirLookAt = dynamic_pointer_cast<Avatar>(avatar)->getHead()->getLookAtPosition();
     glm::vec3 myEyePosition = getHead()->getEyePosition();
 
-    return glm::distance(theirLookAt, myEyePosition) <= (HEAD_SPHERE_RADIUS * getUniformScale());
+    return glm::distance(theirLookAt, myEyePosition) <= (HEAD_SPHERE_RADIUS * getModelScale());
 }
 
 void Avatar::slamPosition(const glm::vec3& newPosition) {
@@ -435,6 +440,11 @@ void Avatar::slamPosition(const glm::vec3& newPosition) {
     _lastVelocity = glm::vec3(0.0f);
 }
 
+void Avatar::updateAttitude(const glm::quat& orientation) {
+    _skeletonModel->updateAttitude(orientation);
+    _worldUpDirection = orientation * Vectors::UNIT_Y;
+}
+
 void Avatar::applyPositionDelta(const glm::vec3& delta) {
     setPosition(getPosition() + delta);
     _positionDeltaAccumulator += delta;
@@ -443,7 +453,9 @@ void Avatar::applyPositionDelta(const glm::vec3& delta) {
 void Avatar::measureMotionDerivatives(float deltaTime) {
     PerformanceTimer perfTimer("derivatives");
     // linear
-    float invDeltaTime = 1.0f / deltaTime;
+    const float MIN_DELTA_TIME = 0.001f;
+    const float safeDeltaTime = glm::max(deltaTime, MIN_DELTA_TIME);
+    float invDeltaTime = 1.0f / safeDeltaTime;
     // Floating point error prevents us from computing velocity in a naive way
     // (e.g. vel = (pos - oldPos) / dt) so instead we use _positionOffsetAccumulator.
     glm::vec3 velocity = _positionDeltaAccumulator * invDeltaTime;
@@ -492,6 +504,48 @@ void Avatar::addToScene(AvatarSharedPointer self, const render::ScenePointer& sc
     for (auto& attachmentModel : _attachmentModels) {
         attachmentModel->addToScene(scene, transaction);
     }
+
+    _mustFadeIn = true;
+}
+
+void Avatar::fadeIn(render::ScenePointer scene) {
+    render::Transaction transaction;
+    fade(transaction, render::Transition::USER_ENTER_DOMAIN);
+    scene->enqueueTransaction(transaction);
+}
+
+void Avatar::fadeOut(render::ScenePointer scene, KillAvatarReason reason) {
+    render::Transition::Type transitionType = render::Transition::USER_LEAVE_DOMAIN;
+    render::Transaction transaction;
+
+    if (reason == KillAvatarReason::YourAvatarEnteredTheirBubble) {
+        transitionType = render::Transition::BUBBLE_ISECT_TRESPASSER;
+    }
+    else if (reason == KillAvatarReason::TheirAvatarEnteredYourBubble) {
+        transitionType = render::Transition::BUBBLE_ISECT_OWNER;
+    }
+    fade(transaction, transitionType);
+    scene->enqueueTransaction(transaction);
+}
+
+void Avatar::fade(render::Transaction& transaction, render::Transition::Type type) {
+    transaction.addTransitionToItem(_renderItemID, type);
+    for (auto& attachmentModel : _attachmentModels) {
+        for (auto itemId : attachmentModel->fetchRenderItemIDs()) {
+            transaction.addTransitionToItem(itemId, type, _renderItemID);
+        }
+    }
+    _isFading = true;
+}
+
+void Avatar::updateFadingStatus(render::ScenePointer scene) {
+    render::Transaction transaction;
+    transaction.queryTransitionOnItem(_renderItemID, [this](render::ItemID id, const render::Transition* transition) {
+        if (transition == nullptr || transition->isFinished) {
+            _isFading = false;
+        }
+    });
+    scene->enqueueTransaction(transaction);
 }
 
 void Avatar::removeFromScene(AvatarSharedPointer self, const render::ScenePointer& scene, render::Transaction& transaction) {
@@ -509,12 +563,12 @@ void Avatar::updateRenderItem(render::Transaction& transaction) {
     }
 }
 
-void Avatar::postUpdate(float deltaTime) {
+void Avatar::postUpdate(float deltaTime, const render::ScenePointer& scene) {
 
     if (isMyAvatar() ? showMyLookAtVectors : showOtherLookAtVectors) {
         const float EYE_RAY_LENGTH = 10.0;
-        const glm::vec4 BLUE(0.0f, 0.0f, 1.0f, 1.0f);
-        const glm::vec4 RED(1.0f, 0.0f, 0.0f, 1.0f);
+        const glm::vec4 BLUE(0.0f, 0.0f, _lookAtSnappingEnabled ? 1.0f : 0.25f, 1.0f);
+        const glm::vec4 RED(_lookAtSnappingEnabled ? 1.0f : 0.25f, 0.0f, 0.0f, 1.0f);
 
         int leftEyeJoint = getJointIndex("LeftEye");
         glm::vec3 leftEyePosition;
@@ -533,6 +587,8 @@ void Avatar::postUpdate(float deltaTime) {
             DebugDraw::getInstance().drawRay(rightEyePosition, rightEyePosition + rightEyeRotation * Vectors::UNIT_Z * EYE_RAY_LENGTH, RED);
         }
     }
+
+    fixupModelsInScene(scene);
 }
 
 void Avatar::render(RenderArgs* renderArgs) {
@@ -604,12 +660,10 @@ void Avatar::render(RenderArgs* renderArgs) {
         return;
     }
 
-    fixupModelsInScene(renderArgs->_scene);
-
     if (showCollisionShapes && shouldRenderHead(renderArgs) && _skeletonModel->isRenderable()) {
         PROFILE_RANGE_BATCH(batch, __FUNCTION__":skeletonBoundingCollisionShapes");
         const float BOUNDING_SHAPE_ALPHA = 0.7f;
-        _skeletonModel->renderBoundingCollisionShapes(renderArgs, *renderArgs->_batch, getUniformScale(), BOUNDING_SHAPE_ALPHA);
+        _skeletonModel->renderBoundingCollisionShapes(renderArgs, *renderArgs->_batch, getModelScale(), BOUNDING_SHAPE_ALPHA);
     }
 
     if (showReceiveStats || showNamesAboveHeads) {
@@ -627,23 +681,9 @@ void Avatar::render(RenderArgs* renderArgs) {
     }
 }
 
-glm::quat Avatar::computeRotationFromBodyToWorldUp(float proportion) const {
-    glm::quat orientation = getOrientation();
-    glm::vec3 currentUp = orientation * IDENTITY_UP;
-    float angle = acosf(glm::clamp(glm::dot(currentUp, _worldUpDirection), -1.0f, 1.0f));
-    if (angle < EPSILON) {
-        return glm::quat();
-    }
-    glm::vec3 axis;
-    if (angle > 179.99f * RADIANS_PER_DEGREE) { // 180 degree rotation; must use another axis
-        axis = orientation * IDENTITY_RIGHT;
-    } else {
-        axis = glm::normalize(glm::cross(currentUp, _worldUpDirection));
-    }
-    return glm::angleAxis(angle * proportion, axis);
-}
-
 void Avatar::fixupModelsInScene(const render::ScenePointer& scene) {
+    bool canTryFade{ false };
+
     _attachmentsToDelete.clear();
 
     // check to see if when we added our models to the scene they were ready, if they were not ready, then
@@ -652,6 +692,7 @@ void Avatar::fixupModelsInScene(const render::ScenePointer& scene) {
     if (_skeletonModel->isRenderable() && _skeletonModel->needsFixupInScene()) {
         _skeletonModel->removeFromScene(scene, transaction);
         _skeletonModel->addToScene(scene, transaction);
+        canTryFade = true;
     }
     for (auto attachmentModel : _attachmentModels) {
         if (attachmentModel->isRenderable() && attachmentModel->needsFixupInScene()) {
@@ -660,6 +701,12 @@ void Avatar::fixupModelsInScene(const render::ScenePointer& scene) {
         }
     }
 
+    if (_mustFadeIn && canTryFade) {
+        // Do it now to be sure all the sub items are ready and the fade is sent to them too
+        fade(transaction, render::Transition::USER_ENTER_DOMAIN);
+        _mustFadeIn = false;
+    }
+
     for (auto attachmentModelToRemove : _attachmentsToRemove) {
         attachmentModelToRemove->removeFromScene(scene, transaction);
     }
@@ -683,19 +730,19 @@ void Avatar::simulateAttachments(float deltaTime) {
         glm::quat jointRotation;
         if (attachment.isSoft) {
             // soft attachments do not have transform offsets
-            model->setTranslation(getPosition());
-            model->setRotation(getOrientation() * Quaternions::Y_180);
+            model->setTransformNoUpdateRenderItems(Transform(getOrientation() * Quaternions::Y_180, glm::vec3(1.0), getPosition()));
             model->simulate(deltaTime);
+            model->updateRenderItems();
         } else {
             if (_skeletonModel->getJointPositionInWorldFrame(jointIndex, jointPosition) &&
                 _skeletonModel->getJointRotationInWorldFrame(jointIndex, jointRotation)) {
-                model->setTranslation(jointPosition + jointRotation * attachment.translation * getUniformScale());
-                model->setRotation(jointRotation * attachment.rotation);
-                float scale = getUniformScale() * attachment.scale;
+                model->setTransformNoUpdateRenderItems(Transform(jointRotation * attachment.rotation, glm::vec3(1.0), jointPosition + jointRotation * attachment.translation * getModelScale()));
+                float scale = getModelScale() * attachment.scale;
                 model->setScaleToFit(true, model->getNaturalDimensions() * scale, true); // hack to force rescale
                 model->setSnapModelToCenter(false); // hack to force resnap
                 model->setSnapModelToCenter(true);
                 model->simulate(deltaTime);
+                model->updateRenderItems();
             }
         }
     }
@@ -851,7 +898,7 @@ void Avatar::renderDisplayName(gpu::Batch& batch, const ViewFrustum& view, const
 }
 
 void Avatar::setSkeletonOffset(const glm::vec3& offset) {
-    const float MAX_OFFSET_LENGTH = getUniformScale() * 0.5f;
+    const float MAX_OFFSET_LENGTH = getModelScale() * 0.5f;
     float offsetLength = glm::length(offset);
     if (offsetLength > MAX_OFFSET_LENGTH) {
         _skeletonOffset = (MAX_OFFSET_LENGTH / offsetLength) * offset;
@@ -914,17 +961,34 @@ glm::vec3 Avatar::getDefaultJointTranslation(int index) const {
 }
 
 glm::quat Avatar::getAbsoluteDefaultJointRotationInObjectFrame(int index) const {
-    glm::quat rotation;
-    glm::quat rot = _skeletonModel->getRig().getAnimSkeleton()->getAbsoluteDefaultPose(index).rot();
-    return Quaternions::Y_180 * rot;
+    // To make this thread safe, we hold onto the model by smart ptr, which prevents it from being deleted while we are accessing it.
+    auto model = getSkeletonModel();
+    if (model) {
+        auto skeleton = model->getRig().getAnimSkeleton();
+        if (skeleton && index >= 0 && index < skeleton->getNumJoints()) {
+            // The rotation part of the geometry-to-rig transform is always identity so we can skip it.
+            // Y_180 is to convert from rig-frame into avatar-frame
+            return Quaternions::Y_180 * skeleton->getAbsoluteDefaultPose(index).rot();
+        }
+    }
+    return Quaternions::Y_180;
 }
 
 glm::vec3 Avatar::getAbsoluteDefaultJointTranslationInObjectFrame(int index) const {
-    glm::vec3 translation;
-    const Rig& rig = _skeletonModel->getRig();
-    glm::vec3 trans = rig.getAnimSkeleton()->getAbsoluteDefaultPose(index).trans();
-    glm::mat4 y180Mat = createMatFromQuatAndPos(Quaternions::Y_180, glm::vec3());
-    return transformPoint(y180Mat * rig.getGeometryToRigTransform(), trans);
+    // To make this thread safe, we hold onto the model by smart ptr, which prevents it from being deleted while we are accessing it.
+    auto model = getSkeletonModel();
+    if (model) {
+        const Rig& rig = model->getRig();
+        auto skeleton = rig.getAnimSkeleton();
+        if (skeleton && index >= 0 && index < skeleton->getNumJoints()) {
+            // trans is in geometry frame.
+            glm::vec3 trans = skeleton->getAbsoluteDefaultPose(index).trans();
+            // Y_180 is to convert from rig-frame into avatar-frame
+            glm::mat4 geomToAvatarMat = Matrices::Y_180 * rig.getGeometryToRigTransform();
+            return transformPoint(geomToAvatarMat, trans);
+        }
+    }
+    return Vectors::ZERO;
 }
 
 glm::quat Avatar::getAbsoluteJointRotationInObjectFrame(int index) const {
@@ -932,19 +996,19 @@ glm::quat Avatar::getAbsoluteJointRotationInObjectFrame(int index) const {
         index += numeric_limits<unsigned short>::max() + 1; // 65536
     }
 
-    switch(index) {
+    switch (index) {
         case SENSOR_TO_WORLD_MATRIX_INDEX: {
             glm::mat4 sensorToWorldMatrix = getSensorToWorldMatrix();
-            bool success;
-            Transform avatarTransform;
-            Transform::mult(avatarTransform, getParentTransform(success), getLocalTransform());
-            glm::mat4 invAvatarMat = avatarTransform.getInverseMatrix();
-            return glmExtractRotation(invAvatarMat * sensorToWorldMatrix);
+            glm::mat4 avatarMatrix = getLocalTransform().getMatrix();
+            glm::mat4 finalMat = glm::inverse(avatarMatrix) * sensorToWorldMatrix;
+            return glmExtractRotation(finalMat);
         }
+        case CAMERA_RELATIVE_CONTROLLER_LEFTHAND_INDEX:
         case CONTROLLER_LEFTHAND_INDEX: {
             Transform controllerLeftHandTransform = Transform(getControllerLeftHandMatrix());
             return controllerLeftHandTransform.getRotation();
         }
+        case CAMERA_RELATIVE_CONTROLLER_RIGHTHAND_INDEX:
         case CONTROLLER_RIGHTHAND_INDEX: {
             Transform controllerRightHandTransform = Transform(getControllerRightHandMatrix());
             return controllerRightHandTransform.getRotation();
@@ -972,19 +1036,19 @@ glm::vec3 Avatar::getAbsoluteJointTranslationInObjectFrame(int index) const {
         index += numeric_limits<unsigned short>::max() + 1; // 65536
     }
 
-    switch(index) {
+    switch (index) {
         case SENSOR_TO_WORLD_MATRIX_INDEX: {
             glm::mat4 sensorToWorldMatrix = getSensorToWorldMatrix();
-            bool success;
-            Transform avatarTransform;
-            Transform::mult(avatarTransform, getParentTransform(success), getLocalTransform());
-            glm::mat4 invAvatarMat = avatarTransform.getInverseMatrix();
-            return extractTranslation(invAvatarMat * sensorToWorldMatrix);
+            glm::mat4 avatarMatrix = getLocalTransform().getMatrix();
+            glm::mat4 finalMat = glm::inverse(avatarMatrix) * sensorToWorldMatrix;
+            return extractTranslation(finalMat);
         }
+        case CAMERA_RELATIVE_CONTROLLER_LEFTHAND_INDEX:
         case CONTROLLER_LEFTHAND_INDEX: {
             Transform controllerLeftHandTransform = Transform(getControllerLeftHandMatrix());
             return controllerLeftHandTransform.getTranslation();
         }
+        case CAMERA_RELATIVE_CONTROLLER_RIGHTHAND_INDEX:
         case CONTROLLER_RIGHTHAND_INDEX: {
             Transform controllerRightHandTransform = Transform(getControllerRightHandMatrix());
             return controllerRightHandTransform.getTranslation();
@@ -1007,49 +1071,103 @@ glm::vec3 Avatar::getAbsoluteJointTranslationInObjectFrame(int index) const {
     }
 }
 
-int Avatar::getJointIndex(const QString& name) const {
-    if (QThread::currentThread() != thread()) {
-        int result;
-        QMetaObject::invokeMethod(const_cast<Avatar*>(this), "getJointIndex", Qt::BlockingQueuedConnection,
-            Q_RETURN_ARG(int, result), Q_ARG(const QString&, name));
-        return result;
+glm::vec3 Avatar::getAbsoluteJointScaleInObjectFrame(int index) const {
+    if (index < 0) {
+        index += numeric_limits<unsigned short>::max() + 1; // 65536
     }
+
+    // only sensor to world matrix has non identity scale.
+    switch (index) {
+        case SENSOR_TO_WORLD_MATRIX_INDEX: {
+            glm::mat4 sensorToWorldMatrix = getSensorToWorldMatrix();
+            return extractScale(sensorToWorldMatrix);
+        }
+        default:
+            return AvatarData::getAbsoluteJointScaleInObjectFrame(index);
+    }
+}
+
+void Avatar::invalidateJointIndicesCache() const {
+    QWriteLocker writeLock(&_modelJointIndicesCacheLock);
+    _modelJointsCached = false;
+}
+
+void Avatar::withValidJointIndicesCache(std::function<void()> const& worker) const {
+    QReadLocker readLock(&_modelJointIndicesCacheLock);
+    if (_modelJointsCached) {
+        worker();
+    } else {
+        readLock.unlock();
+        {
+            QWriteLocker writeLock(&_modelJointIndicesCacheLock);
+            if (!_modelJointsCached) {
+                _modelJointIndicesCache.clear();
+                if (_skeletonModel && _skeletonModel->isActive()) {
+                    _modelJointIndicesCache = _skeletonModel->getFBXGeometry().jointIndices;
+                    _modelJointsCached = true;
+                }
+            }
+            worker();
+        }
+    }
+}
+
+int Avatar::getJointIndex(const QString& name) const {
     int result = getFauxJointIndex(name);
     if (result != -1) {
         return result;
     }
-    return _skeletonModel->isActive() ? _skeletonModel->getFBXGeometry().getJointIndex(name) : -1;
+
+    withValidJointIndicesCache([&]() {
+        if (_modelJointIndicesCache.contains(name)) {
+            result = _modelJointIndicesCache[name] - 1;
+        }
+    });
+    return result;
 }
 
 QStringList Avatar::getJointNames() const {
-    if (QThread::currentThread() != thread()) {
-        QStringList result;
-        QMetaObject::invokeMethod(const_cast<Avatar*>(this), "getJointNames", Qt::BlockingQueuedConnection,
-            Q_RETURN_ARG(QStringList, result));
-        return result;
-    }
-    return _skeletonModel->isActive() ? _skeletonModel->getFBXGeometry().getJointNames() : QStringList();
+    QStringList result;
+    withValidJointIndicesCache([&]() {
+        // find out how large the vector needs to be
+        int maxJointIndex = -1;
+        QHashIterator<QString, int> k(_modelJointIndicesCache);
+        while (k.hasNext()) {
+            k.next();
+            int index = k.value();
+            if (index > maxJointIndex) {
+                maxJointIndex = index;
+            }
+        }
+        // iterate through the hash and put joint names
+        // into the vector at their indices
+        QVector<QString> resultVector(maxJointIndex+1);
+        QHashIterator<QString, int> i(_modelJointIndicesCache);
+        while (i.hasNext()) {
+            i.next();
+            int index = i.value();
+            resultVector[index] = i.key();
+        }
+        // convert to QList and drop out blanks
+        result = resultVector.toList();
+        QMutableListIterator<QString> j(result);
+        while (j.hasNext()) {
+            QString jointName = j.next();
+            if (jointName.isEmpty()) {
+                j.remove();
+            }
+        }
+    });
+    return result;
 }
 
 glm::vec3 Avatar::getJointPosition(int index) const {
-    if (QThread::currentThread() != thread()) {
-        glm::vec3 position;
-        QMetaObject::invokeMethod(const_cast<Avatar*>(this), "getJointPosition", Qt::BlockingQueuedConnection,
-                                  Q_RETURN_ARG(glm::vec3, position), Q_ARG(const int, index));
-        return position;
-    }
     glm::vec3 position;
     _skeletonModel->getJointPositionInWorldFrame(index, position);
     return position;
 }
 
 glm::vec3 Avatar::getJointPosition(const QString& name) const {
-    if (QThread::currentThread() != thread()) {
-        glm::vec3 position;
-        QMetaObject::invokeMethod(const_cast<Avatar*>(this), "getJointPosition", Qt::BlockingQueuedConnection,
-                                  Q_RETURN_ARG(glm::vec3, position), Q_ARG(const QString&, name));
-        return position;
-    }
     glm::vec3 position;
     _skeletonModel->getJointPositionInWorldFrame(getJointIndex(name), position);
     return position;
@@ -1057,7 +1175,7 @@ glm::vec3 Avatar::getJointPosition(const QString& name) const {
 
 void Avatar::scaleVectorRelativeToPosition(glm::vec3 &positionToScale) const {
     //Scale a world space vector as if it was relative to the position
-    positionToScale = getPosition() + getUniformScale() * (positionToScale - getPosition());
+    positionToScale = getPosition() + getModelScale() * (positionToScale - getPosition());
 }
 
 void Avatar::setSkeletonModelURL(const QUrl& skeletonModelURL) {
@@ -1070,6 +1188,8 @@ void Avatar::setSkeletonModelURL(const QUrl& skeletonModelURL) {
 }
 
 void Avatar::setModelURLFinished(bool success) {
+    invalidateJointIndicesCache();
+
     if (!success && _skeletonModelURL != AvatarData::defaultFullAvatarModelUrl()) {
         const int MAX_SKELETON_DOWNLOAD_ATTEMPTS = 4; // NOTE: we don't want to be as generous as ResourceCache is, we only want 4 attempts
         if (_skeletonModel->getResourceDownloadAttemptsRemaining() <= 0 ||
@@ -1105,7 +1225,7 @@ static std::shared_ptr<Model> allocateAttachmentModel(bool isSoft, const Rig& ri
 
 void Avatar::setAttachmentData(const QVector<AttachmentData>& attachmentData) {
     if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "setAttachmentData", Qt::BlockingQueuedConnection,
+        BLOCKING_INVOKE_METHOD(this, "setAttachmentData",
                                   Q_ARG(const QVector<AttachmentData>, attachmentData));
         return;
     }
@@ -1257,7 +1377,7 @@ void Avatar::updateDisplayNameAlpha(bool showDisplayName) {
 
 // virtual
 void Avatar::computeShapeInfo(ShapeInfo& shapeInfo) {
-    float uniformScale = getUniformScale();
+    float uniformScale = getModelScale();
     shapeInfo.setCapsuleY(uniformScale * _skeletonModel->getBoundingCapsuleRadius(),
             0.5f * uniformScale *  _skeletonModel->getBoundingCapsuleHeight());
     shapeInfo.setOffset(uniformScale * _skeletonModel->getBoundingCapsuleOffset());
@@ -1360,14 +1480,14 @@ glm::quat Avatar::getUncachedRightPalmRotation() const {
     return rightPalmRotation;
 }
 
-void Avatar::setPosition(const glm::vec3& position) {
-    AvatarData::setPosition(position);
-    updateAttitude();
+void Avatar::setPositionViaScript(const glm::vec3& position) {
+    setPosition(position);
+    updateAttitude(getOrientation());
 }
 
-void Avatar::setOrientation(const glm::quat& orientation) {
-    AvatarData::setOrientation(orientation);
-    updateAttitude();
+void Avatar::setOrientationViaScript(const glm::quat& orientation) {
+    setOrientation(orientation);
+    updateAttitude(orientation);
 }
 
 void Avatar::updatePalms() {
@@ -1439,8 +1559,7 @@ void Avatar::addToScene(AvatarSharedPointer myHandle, const render::ScenePointer
     if (scene) {
         auto nodelist = DependencyManager::get<NodeList>();
         if (showAvatars
-            && !nodelist->isIgnoringNode(getSessionUUID())
-            && !nodelist->isRadiusIgnoringNode(getSessionUUID())) {
+            && !nodelist->isIgnoringNode(getSessionUUID())) {
             render::Transaction transaction;
             addToScene(myHandle, scene, transaction);
             scene->enqueueTransaction(transaction);
@@ -1455,3 +1574,54 @@ void Avatar::ensureInScene(AvatarSharedPointer self, const render::ScenePointer&
         addToScene(self, scene);
     }
 }
+
+float Avatar::getEyeHeight() const {
+
+    if (QThread::currentThread() != thread()) {
+        float result = DEFAULT_AVATAR_EYE_HEIGHT;
+        BLOCKING_INVOKE_METHOD(const_cast<Avatar*>(this), "getEyeHeight", Q_RETURN_ARG(float, result));
+        return result;
+    }
+
+    // TODO: if performance becomes a concern we can cache this value rather then computing it everytime.
+    // Makes assumption that the y = 0 plane in geometry is the ground plane.
+    // We also make that assumption in Rig::computeAvatarBoundingCapsule()
+    float avatarScale = getModelScale();
+    if (_skeletonModel) {
+        auto& rig = _skeletonModel->getRig();
+        int headTopJoint = rig.indexOfJoint("HeadTop_End");
+        int headJoint = rig.indexOfJoint("Head");
+        int eyeJoint = rig.indexOfJoint("LeftEye") != -1 ? rig.indexOfJoint("LeftEye") : rig.indexOfJoint("RightEye");
+        int toeJoint = rig.indexOfJoint("LeftToeBase") != -1 ? rig.indexOfJoint("LeftToeBase") : rig.indexOfJoint("RightToeBase");
+        if (eyeJoint >= 0 && toeJoint >= 0) {
+            // measure from eyes to toes.
+            float eyeHeight = rig.getAbsoluteDefaultPose(eyeJoint).trans().y - rig.getAbsoluteDefaultPose(toeJoint).trans().y;
+            return eyeHeight;
+        } else if (eyeJoint >= 0) {
+            // measure eyes to y = 0 plane.
+            float groundHeight = transformPoint(rig.getGeometryToRigTransform(), glm::vec3(0.0f)).y;
+            float eyeHeight = rig.getAbsoluteDefaultPose(eyeJoint).trans().y - groundHeight;
+            return eyeHeight;
+        } else if (headTopJoint >= 0 && toeJoint >= 0) {
+            // measure toe to top of head.  Note: default poses already include avatar scale factor
+            const float ratio = DEFAULT_AVATAR_EYE_TO_TOP_OF_HEAD / DEFAULT_AVATAR_HEIGHT;
+            float height = rig.getAbsoluteDefaultPose(headTopJoint).trans().y - rig.getAbsoluteDefaultPose(toeJoint).trans().y;
+            return height - height * ratio;
+        } else if (headTopJoint >= 0) {
+            const float ratio = DEFAULT_AVATAR_EYE_TO_TOP_OF_HEAD / DEFAULT_AVATAR_HEIGHT;
+            float groundHeight = transformPoint(rig.getGeometryToRigTransform(), glm::vec3(0.0f)).y;
+            float headHeight = rig.getAbsoluteDefaultPose(headTopJoint).trans().y - groundHeight;
+            return headHeight - headHeight * ratio;
+        } else if (headJoint >= 0) {
+            float groundHeight = transformPoint(rig.getGeometryToRigTransform(), glm::vec3(0.0f)).y;
+            const float DEFAULT_AVATAR_NECK_TO_EYE = DEFAULT_AVATAR_NECK_TO_TOP_OF_HEAD - DEFAULT_AVATAR_EYE_TO_TOP_OF_HEAD;
+            const float ratio = DEFAULT_AVATAR_NECK_TO_EYE / DEFAULT_AVATAR_NECK_HEIGHT;
+            float neckHeight = rig.getAbsoluteDefaultPose(headJoint).trans().y - groundHeight;
+            return neckHeight + neckHeight * ratio;
+        } else {
+            return avatarScale * DEFAULT_AVATAR_EYE_HEIGHT;
+        }
+    } else {
+        return avatarScale * DEFAULT_AVATAR_EYE_HEIGHT;
+    }
+}
diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.h b/libraries/avatars-renderer/src/avatars-renderer/Avatar.h
index 1724d42510..a5ec307c50 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.h
+++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.h
@@ -98,7 +98,7 @@ public:
 
     void updateRenderItem(render::Transaction& transaction);
 
-    virtual void postUpdate(float deltaTime);
+    virtual void postUpdate(float deltaTime, const render::ScenePointer& scene);
 
     //setters
     void setIsLookAtTarget(const bool isLookAtTarget) { _isLookAtTarget = isLookAtTarget; }
@@ -108,12 +108,9 @@ public:
     SkeletonModelPointer getSkeletonModel() { return _skeletonModel; }
     const SkeletonModelPointer getSkeletonModel() const { return _skeletonModel; }
     glm::vec3 getChestPosition() const;
-    float getUniformScale() const { return getScale().y; }
     const Head* getHead() const { return static_cast<const Head*>(_headData); }
     Head* getHead() { return static_cast<Head*>(_headData); }
 
-    glm::quat getWorldAlignedOrientation() const;
-
     AABox getBounds() const;
 
     /// Returns the distance to use as a LOD parameter.
@@ -122,8 +119,10 @@ public:
     virtual bool isMyAvatar() const override { return false; }
 
     virtual QVector<glm::quat> getJointRotations() const override;
+    using AvatarData::getJointRotation;
     virtual glm::quat getJointRotation(int index) const override;
     virtual QVector<glm::vec3> getJointTranslations() const override;
+    using AvatarData::getJointTranslation;
     virtual glm::vec3 getJointTranslation(int index) const override;
     virtual int getJointIndex(const QString& name) const override;
     virtual QStringList getJointNames() const override;
@@ -151,6 +150,7 @@ public:
      */
     Q_INVOKABLE virtual glm::vec3 getAbsoluteDefaultJointTranslationInObjectFrame(int index) const;
 
+    virtual glm::vec3 getAbsoluteJointScaleInObjectFrame(int index) const override;
     virtual glm::quat getAbsoluteJointRotationInObjectFrame(int index) const override;
     virtual glm::vec3 getAbsoluteJointTranslationInObjectFrame(int index) const override;
     virtual bool setAbsoluteJointRotationInObjectFrame(int index, const glm::quat& rotation) override { return false; }
@@ -184,7 +184,7 @@ public:
     void scaleVectorRelativeToPosition(glm::vec3 &positionToScale) const;
 
     void slamPosition(const glm::vec3& position);
-    virtual void updateAttitude() override { _skeletonModel->updateAttitude(); }
+    virtual void updateAttitude(const glm::quat& orientation) override;
 
     // Call this when updating Avatar position with a delta.  This will allow us to
     // _accurately_ measure position changes and compute the resulting velocity
@@ -197,10 +197,8 @@ public:
     void getCapsule(glm::vec3& start, glm::vec3& end, float& radius);
     float computeMass();
 
-    using SpatiallyNestable::setPosition;
-    virtual void setPosition(const glm::vec3& position) override;
-    using SpatiallyNestable::setOrientation;
-    virtual void setOrientation(const glm::quat& orientation) override;
+    void setPositionViaScript(const glm::vec3& position) override;
+    void setOrientationViaScript(const glm::quat& orientation) override;
 
     // these call through to the SpatiallyNestable versions, but they are here to expose these to javascript.
     Q_INVOKABLE virtual const QUuid getParentID() const override { return SpatiallyNestable::getParentID(); }
@@ -234,22 +232,39 @@ public:
 
     void animateScaleChanges(float deltaTime);
     void setTargetScale(float targetScale) override;
+    float getTargetScale() const { return _targetScale; }
 
     Q_INVOKABLE float getSimulationRate(const QString& rateName = QString("")) const;
 
     bool hasNewJointData() const { return _hasNewJointData; }
 
     float getBoundingRadius() const;
-    
+
     void addToScene(AvatarSharedPointer self, const render::ScenePointer& scene);
     void ensureInScene(AvatarSharedPointer self, const render::ScenePointer& scene);
     bool isInScene() const { return render::Item::isValidID(_renderItemID); }
+    render::ItemID getRenderItemID() { return _renderItemID; }
     bool isMoving() const { return _moving; }
 
     void setPhysicsCallback(AvatarPhysicsCallback cb);
     void addPhysicsFlags(uint32_t flags);
     bool isInPhysicsSimulation() const { return _physicsCallback != nullptr; }
 
+    void fadeIn(render::ScenePointer scene);
+    void fadeOut(render::ScenePointer scene, KillAvatarReason reason);
+    bool isFading() const { return _isFading; }
+    void updateFadingStatus(render::ScenePointer scene);
+
+    /**jsdoc
+     * Provides read only access to the current eye height of the avatar.
+     * @function Avatar.getEyeHeight
+     * @returns {number} eye height of avatar in meters
+     */
+    Q_INVOKABLE float getEyeHeight() const;
+
+    virtual float getModelScale() const { return _modelScale; }
+    virtual void setModelScale(float scale) { _modelScale = scale; }
+
 public slots:
 
     // FIXME - these should be migrated to use Pose data instead
@@ -267,6 +282,13 @@ protected:
     virtual void maybeUpdateSessionDisplayNameFromTransport(const QString& sessionDisplayName) override { _sessionDisplayName = sessionDisplayName; } // don't use no-op setter!
 
     SkeletonModelPointer _skeletonModel;
+
+    void invalidateJointIndicesCache() const;
+    void withValidJointIndicesCache(std::function<void()> const& worker) const;
+    mutable QHash<QString, int> _modelJointIndicesCache;
+    mutable QReadWriteLock _modelJointIndicesCacheLock;
+    mutable bool _modelJointsCached { false };
+
     glm::vec3 _skeletonOffset;
     std::vector<std::shared_ptr<Model>> _attachmentModels;
     std::vector<std::shared_ptr<Model>> _attachmentsToRemove;
@@ -294,9 +316,10 @@ protected:
     // protected methods...
     bool isLookingAtMe(AvatarSharedPointer avatar) const;
 
+    void fade(render::Transaction& transaction, render::Transition::Type type);
+
     glm::vec3 getBodyRightDirection() const { return getOrientation() * IDENTITY_RIGHT; }
     glm::vec3 getBodyUpDirection() const { return getOrientation() * IDENTITY_UP; }
-    glm::quat computeRotationFromBodyToWorldUp(float proportion = 1.0f) const;
     void measureMotionDerivatives(float deltaTime);
 
     float getSkeletonHeight() const;
@@ -342,6 +365,9 @@ private:
     bool _initialized { false };
     bool _isLookAtTarget { false };
     bool _isAnimatingScale { false };
+    bool _mustFadeIn { false };
+    bool _isFading { false };
+    float _modelScale { 1.0f };
 
     static int _jointConesID;
 
@@ -351,7 +377,6 @@ private:
 
     float _displayNameTargetAlpha { 1.0f };
     float _displayNameAlpha { 1.0f };
-
 };
 
 #endif // hifi_Avatar_h
diff --git a/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.cpp b/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.cpp
index 9651951b46..eaa62ecb0a 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.cpp
+++ b/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.cpp
@@ -118,16 +118,16 @@ void SkeletonModel::updateRig(float deltaTime, glm::mat4 parentTransform) {
     _rig.updateFromEyeParameters(eyeParams);
 }
 
-void SkeletonModel::updateAttitude() {
+void SkeletonModel::updateAttitude(const glm::quat& orientation) {
     setTranslation(_owningAvatar->getSkeletonPosition());
-    setRotation(_owningAvatar->getOrientation() * Quaternions::Y_180);
-    setScale(glm::vec3(1.0f, 1.0f, 1.0f) * _owningAvatar->getScale());
+    setRotation(orientation * Quaternions::Y_180);
+    setScale(glm::vec3(1.0f, 1.0f, 1.0f) * _owningAvatar->getModelScale());
 }
 
 // Called by Avatar::simulate after it has set the joint states (fullUpdate true if changed),
 // but just before head has been simulated.
 void SkeletonModel::simulate(float deltaTime, bool fullUpdate) {
-    updateAttitude();
+    updateAttitude(_owningAvatar->getOrientation());
     if (fullUpdate) {
         setBlendshapeCoefficients(_owningAvatar->getHead()->getSummedBlendshapeCoefficients());
 
@@ -294,7 +294,7 @@ bool SkeletonModel::getEyePositions(glm::vec3& firstEyePosition, glm::vec3& seco
 }
 
 glm::vec3 SkeletonModel::getDefaultEyeModelPosition() const {
-    return _owningAvatar->getScale() * _defaultEyeModelPosition;
+    return _owningAvatar->getModelScale() * _defaultEyeModelPosition;
 }
 
 float DENSITY_OF_WATER = 1000.0f; // kg/m^3
@@ -316,7 +316,7 @@ void SkeletonModel::computeBoundingShape() {
     float radius, height;
     glm::vec3 offset;
     _rig.computeAvatarBoundingCapsule(geometry, radius, height, offset);
-    float invScale = 1.0f / _owningAvatar->getUniformScale();
+    float invScale = 1.0f / _owningAvatar->getModelScale();
     _boundingCapsuleRadius = invScale * radius;
     _boundingCapsuleHeight = invScale * height;
     _boundingCapsuleLocalOffset = invScale * offset;
diff --git a/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.h b/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.h
index e48884c581..919e82825c 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.h
+++ b/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.h
@@ -35,7 +35,7 @@ public:
 
     void simulate(float deltaTime, bool fullUpdate = true) override;
     void updateRig(float deltaTime, glm::mat4 parentTransform) override;
-    void updateAttitude();
+    void updateAttitude(const glm::quat& orientation);
 
     /// Returns the index of the left hand joint, or -1 if not found.
     int getLeftHandJointIndex() const { return isActive() ? getFBXGeometry().leftHandJointIndex : -1; }
diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index 5023bd7ae5..bd313ac133 100644
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -25,6 +25,7 @@
 #include <QtNetwork/QNetworkReply>
 #include <QtNetwork/QNetworkRequest>
 
+#include <shared/QtHelpers.h>
 #include <QVariantGLM.h>
 #include <Transform.h>
 #include <NetworkAccessManager.h>
@@ -56,6 +57,27 @@ static const float DEFAULT_AVATAR_DENSITY = 1000.0f; // density of water
 
 #define ASSERT(COND)  do { if (!(COND)) { abort(); } } while(0)
 
+size_t AvatarDataPacket::maxFaceTrackerInfoSize(size_t numBlendshapeCoefficients) {
+    return FACE_TRACKER_INFO_SIZE + numBlendshapeCoefficients * sizeof(float);
+}
+
+size_t AvatarDataPacket::maxJointDataSize(size_t numJoints) {
+    const size_t validityBitsSize = (size_t)std::ceil(numJoints / (float)BITS_IN_BYTE);
+
+    size_t totalSize = sizeof(uint8_t); // numJoints
+
+    totalSize += validityBitsSize; // Orientations mask
+    totalSize += numJoints * sizeof(SixByteQuat); // Orientations
+    totalSize += validityBitsSize; // Translations mask
+    totalSize += numJoints * sizeof(SixByteTrans); // Translations
+
+    size_t NUM_FAUX_JOINT = 2;
+    totalSize += NUM_FAUX_JOINT * (sizeof(SixByteQuat) + sizeof(SixByteTrans)); // faux joints
+
+    return totalSize;
+}
+
+
 AvatarData::AvatarData() :
     SpatiallyNestable(NestableType::Avatar, QUuid()),
     _handPosition(0.0f),
@@ -69,22 +91,7 @@ AvatarData::AvatarData() :
     _targetVelocity(0.0f),
     _density(DEFAULT_AVATAR_DENSITY)
 {
-    setBodyPitch(0.0f);
-    setBodyYaw(-90.0f);
-    setBodyRoll(0.0f);
-
-    ASSERT(sizeof(AvatarDataPacket::Header) == AvatarDataPacket::HEADER_SIZE);
-    ASSERT(sizeof(AvatarDataPacket::AvatarGlobalPosition) == AvatarDataPacket::AVATAR_GLOBAL_POSITION_SIZE);
-    ASSERT(sizeof(AvatarDataPacket::AvatarLocalPosition) == AvatarDataPacket::AVATAR_LOCAL_POSITION_SIZE);
-    ASSERT(sizeof(AvatarDataPacket::AvatarBoundingBox) == AvatarDataPacket::AVATAR_BOUNDING_BOX_SIZE);
-    ASSERT(sizeof(AvatarDataPacket::AvatarOrientation) == AvatarDataPacket::AVATAR_ORIENTATION_SIZE);
-    ASSERT(sizeof(AvatarDataPacket::AvatarScale) == AvatarDataPacket::AVATAR_SCALE_SIZE);
-    ASSERT(sizeof(AvatarDataPacket::LookAtPosition) == AvatarDataPacket::LOOK_AT_POSITION_SIZE);
-    ASSERT(sizeof(AvatarDataPacket::AudioLoudness) == AvatarDataPacket::AUDIO_LOUDNESS_SIZE);
-    ASSERT(sizeof(AvatarDataPacket::SensorToWorldMatrix) == AvatarDataPacket::SENSOR_TO_WORLD_SIZE);
-    ASSERT(sizeof(AvatarDataPacket::AdditionalFlags) == AvatarDataPacket::ADDITIONAL_FLAGS_SIZE);
-    ASSERT(sizeof(AvatarDataPacket::ParentInfo) == AvatarDataPacket::PARENT_INFO_SIZE);
-    ASSERT(sizeof(AvatarDataPacket::FaceTrackerInfo) == AvatarDataPacket::FACE_TRACKER_INFO_SIZE);
+    connect(this, &AvatarData::lookAtSnappingChanged, this, &AvatarData::markIdentityDataChanged);
 }
 
 AvatarData::~AvatarData() {
@@ -96,28 +103,11 @@ AvatarData::~AvatarData() {
 QUrl AvatarData::_defaultFullAvatarModelUrl = {}; // In C++, if this initialization were in the AvatarInfo, every file would have it's own copy, even for class vars.
 const QUrl& AvatarData::defaultFullAvatarModelUrl() {
     if (_defaultFullAvatarModelUrl.isEmpty()) {
-        _defaultFullAvatarModelUrl = QUrl::fromLocalFile(PathUtils::resourcesPath() + "meshes/defaultAvatar_full.fst");
+        _defaultFullAvatarModelUrl = QUrl::fromLocalFile(PathUtils::resourcesPath() + "/meshes/defaultAvatar_full.fst");
     }
     return _defaultFullAvatarModelUrl;
 }
 
-// There are a number of possible strategies for this set of tools through endRender, below.
-void AvatarData::nextAttitude(glm::vec3 position, glm::quat orientation) {
-    bool success;
-    Transform trans = getTransform(success);
-    if (!success) {
-        qCWarning(avatars) << "Warning -- AvatarData::nextAttitude failed";
-        return;
-    }
-    trans.setTranslation(position);
-    trans.setRotation(orientation);
-    SpatiallyNestable::setTransform(trans, success);
-    if (!success) {
-        qCWarning(avatars) << "Warning -- AvatarData::nextAttitude failed";
-    }
-    updateAttitude();
-}
-
 void AvatarData::setTargetScale(float targetScale) {
     auto newValue = glm::clamp(targetScale, MIN_AVATAR_SCALE, MAX_AVATAR_SCALE);
     if (_targetScale != newValue) {
@@ -168,12 +158,12 @@ float AvatarData::getDistanceBasedMinTranslationDistance(glm::vec3 viewerPositio
 
 
 // we want to track outbound data in this case...
-QByteArray AvatarData::toByteArrayStateful(AvatarDataDetail dataDetail) {
+QByteArray AvatarData::toByteArrayStateful(AvatarDataDetail dataDetail, bool dropFaceTracking) {
     AvatarDataPacket::HasFlags hasFlagsOut;
     auto lastSentTime = _lastToByteArray;
     _lastToByteArray = usecTimestampNow();
     return AvatarData::toByteArray(dataDetail, lastSentTime, getLastSentJointData(),
-                        hasFlagsOut, false, false, glm::vec3(0), nullptr,
+                        hasFlagsOut, dropFaceTracking, false, glm::vec3(0), nullptr,
                         &_outboundDataRate);
 }
 
@@ -188,15 +178,11 @@ QByteArray AvatarData::toByteArray(AvatarDataDetail dataDetail, quint64 lastSent
 
     lazyInitHeadData();
 
-    QByteArray avatarDataByteArray(udt::MAX_PACKET_SIZE, 0);
-    unsigned char* destinationBuffer = reinterpret_cast<unsigned char*>(avatarDataByteArray.data());
-    unsigned char* startPosition = destinationBuffer;
-
     // special case, if we were asked for no data, then just include the flags all set to nothing
     if (dataDetail == NoData) {
         AvatarDataPacket::HasFlags packetStateFlags = 0;
-        memcpy(destinationBuffer, &packetStateFlags, sizeof(packetStateFlags));
-        return avatarDataByteArray.left(sizeof(packetStateFlags));
+        QByteArray avatarDataByteArray(reinterpret_cast<char*>(&packetStateFlags), sizeof(packetStateFlags));
+        return avatarDataByteArray;
     }
 
     // FIXME -
@@ -257,6 +243,15 @@ QByteArray AvatarData::toByteArray(AvatarDataDetail dataDetail, quint64 lastSent
         hasJointData = sendAll || !sendMinimum;
     }
 
+
+    const size_t byteArraySize = AvatarDataPacket::MAX_CONSTANT_HEADER_SIZE +
+        (hasFaceTrackerInfo ? AvatarDataPacket::maxFaceTrackerInfoSize(_headData->getNumSummedBlendshapeCoefficients()) : 0) +
+        (hasJointData ? AvatarDataPacket::maxJointDataSize(_jointData.size()) : 0);
+
+    QByteArray avatarDataByteArray((int)byteArraySize, 0);
+    unsigned char* destinationBuffer = reinterpret_cast<unsigned char*>(avatarDataByteArray.data());
+    unsigned char* startPosition = destinationBuffer;
+
     // Leading flags, to indicate how much data is actually included in the packet...
     AvatarDataPacket::HasFlags packetStateFlags =
         (hasAvatarGlobalPosition ? AvatarDataPacket::PACKET_HAS_AVATAR_GLOBAL_POSITION : 0)
@@ -477,12 +472,15 @@ QByteArray AvatarData::toByteArray(AvatarDataDetail dataDetail, quint64 lastSent
         unsigned char* validityPosition = destinationBuffer;
         unsigned char validity = 0;
         int validityBit = 0;
+        int numValidityBytes = (int)std::ceil(numJoints / (float)BITS_IN_BYTE);
 
 #ifdef WANT_DEBUG
         int rotationSentCount = 0;
         unsigned char* beforeRotations = destinationBuffer;
 #endif
 
+        destinationBuffer += numValidityBytes; // Move pointer past the validity bytes
+
         if (sentJointDataOut) {
             sentJointDataOut->resize(_jointData.size()); // Make sure the destination is resized before using it
         }
@@ -502,6 +500,8 @@ QByteArray AvatarData::toByteArray(AvatarDataDetail dataDetail, quint64 lastSent
 #ifdef WANT_DEBUG
                         rotationSentCount++;
 #endif
+                        destinationBuffer += packOrientationQuatToSixBytes(destinationBuffer, data.rotation);
+
                         if (sentJointDataOut) {
                             auto jointDataOut = *sentJointDataOut;
                             jointDataOut[i].rotation = data.rotation;
@@ -511,28 +511,14 @@ QByteArray AvatarData::toByteArray(AvatarDataDetail dataDetail, quint64 lastSent
                 }
             }
             if (++validityBit == BITS_IN_BYTE) {
-                *destinationBuffer++ = validity;
+                *validityPosition++ = validity;
                 validityBit = validity = 0;
             }
         }
         if (validityBit != 0) {
-            *destinationBuffer++ = validity;
+            *validityPosition++ = validity;
         }
 
-        validityBit = 0;
-        validity = *validityPosition++;
-        for (int i = 0; i < _jointData.size(); i++) {
-            const JointData& data = _jointData[i];
-            if (validity & (1 << validityBit)) {
-                destinationBuffer += packOrientationQuatToSixBytes(destinationBuffer, data.rotation);
-            }
-            if (++validityBit == BITS_IN_BYTE) {
-                validityBit = 0;
-                validity = *validityPosition++;
-            }
-        }
-
-
         // joint translation data
         validityPosition = destinationBuffer;
         validity = 0;
@@ -543,6 +529,8 @@ QByteArray AvatarData::toByteArray(AvatarDataDetail dataDetail, quint64 lastSent
         unsigned char* beforeTranslations = destinationBuffer;
 #endif
 
+        destinationBuffer += numValidityBytes; // Move pointer past the validity bytes
+
         float minTranslation = !distanceAdjust ? AVATAR_MIN_TRANSLATION : getDistanceBasedMinTranslationDistance(viewerPosition);
 
         float maxTranslationDimension = 0.0;
@@ -561,6 +549,9 @@ QByteArray AvatarData::toByteArray(AvatarDataDetail dataDetail, quint64 lastSent
                         maxTranslationDimension = glm::max(fabsf(data.translation.y), maxTranslationDimension);
                         maxTranslationDimension = glm::max(fabsf(data.translation.z), maxTranslationDimension);
 
+                        destinationBuffer +=
+                            packFloatVec3ToSignedTwoByteFixed(destinationBuffer, data.translation, TRANSLATION_COMPRESSION_RADIX);
+
                         if (sentJointDataOut) {
                             auto jointDataOut = *sentJointDataOut;
                             jointDataOut[i].translation = data.translation;
@@ -570,27 +561,13 @@ QByteArray AvatarData::toByteArray(AvatarDataDetail dataDetail, quint64 lastSent
                 }
             }
             if (++validityBit == BITS_IN_BYTE) {
-                *destinationBuffer++ = validity;
+                *validityPosition++ = validity;
                 validityBit = validity = 0;
             }
         }
 
         if (validityBit != 0) {
-            *destinationBuffer++ = validity;
-        }
-
-        validityBit = 0;
-        validity = *validityPosition++;
-        for (int i = 0; i < _jointData.size(); i++) {
-            const JointData& data = _jointData[i];
-            if (validity & (1 << validityBit)) {
-                destinationBuffer +=
-                    packFloatVec3ToSignedTwoByteFixed(destinationBuffer, data.translation, TRANSLATION_COMPRESSION_RADIX);
-            }
-            if (++validityBit == BITS_IN_BYTE) {
-                validityBit = 0;
-                validity = *validityPosition++;
-            }
+            *validityPosition++ = validity;
         }
 
         // faux joints
@@ -623,6 +600,12 @@ QByteArray AvatarData::toByteArray(AvatarDataDetail dataDetail, quint64 lastSent
     }
 
     int avatarDataSize = destinationBuffer - startPosition;
+
+    if (avatarDataSize > (int)byteArraySize) {
+        qCCritical(avatars) << "AvatarData::toByteArray buffer overflow"; // We've overflown into the heap
+        ASSERT(false);
+    }
+
     return avatarDataByteArray.left(avatarDataSize);
 }
 // NOTE: This is never used in a "distanceAdjust" mode, so it's ok that it doesn't use a variable minimum rotation/translation
@@ -1191,10 +1174,6 @@ void AvatarData::setJointData(int index, const glm::quat& rotation, const glm::v
     if (index == -1) {
         return;
     }
-    if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "setJointData", Q_ARG(int, index), Q_ARG(const glm::quat&, rotation));
-        return;
-    }
     QWriteLocker writeLock(&_jointDataLock);
     if (_jointData.size() <= index) {
         _jointData.resize(index + 1);
@@ -1210,27 +1189,19 @@ void AvatarData::clearJointData(int index) {
     if (index == -1) {
         return;
     }
-    if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "clearJointData", Q_ARG(int, index));
-        return;
-    }
     QWriteLocker writeLock(&_jointDataLock);
     // FIXME: I don't understand how this "clears" the joint data at index
     if (_jointData.size() <= index) {
         _jointData.resize(index + 1);
     }
+    _jointData[index] = {};
 }
 
 bool AvatarData::isJointDataValid(int index) const {
     if (index == -1) {
         return false;
     }
-    if (QThread::currentThread() != thread()) {
-        bool result;
-        QMetaObject::invokeMethod(const_cast<AvatarData*>(this), "isJointDataValid", Qt::BlockingQueuedConnection,
-            Q_RETURN_ARG(bool, result), Q_ARG(int, index));
-        return result;
-    }
+    QReadLocker readLock(&_jointDataLock);
     return index < _jointData.size();
 }
 
@@ -1238,75 +1209,63 @@ glm::quat AvatarData::getJointRotation(int index) const {
     if (index == -1) {
         return glm::quat();
     }
-    if (QThread::currentThread() != thread()) {
-        glm::quat result;
-        QMetaObject::invokeMethod(const_cast<AvatarData*>(this), "getJointRotation", Qt::BlockingQueuedConnection,
-            Q_RETURN_ARG(glm::quat, result), Q_ARG(int, index));
-        return result;
-    }
     QReadLocker readLock(&_jointDataLock);
     return index < _jointData.size() ? _jointData.at(index).rotation : glm::quat();
 }
 
-
 glm::vec3 AvatarData::getJointTranslation(int index) const {
     if (index == -1) {
         return glm::vec3();
     }
-    if (QThread::currentThread() != thread()) {
-        glm::vec3 result;
-        QMetaObject::invokeMethod(const_cast<AvatarData*>(this), "getJointTranslation", Qt::BlockingQueuedConnection,
-            Q_RETURN_ARG(glm::vec3, result), Q_ARG(int, index));
-        return result;
-    }
     QReadLocker readLock(&_jointDataLock);
     return index < _jointData.size() ? _jointData.at(index).translation : glm::vec3();
 }
 
 glm::vec3 AvatarData::getJointTranslation(const QString& name) const {
-    if (QThread::currentThread() != thread()) {
-        glm::vec3 result;
-        QMetaObject::invokeMethod(const_cast<AvatarData*>(this), "getJointTranslation", Qt::BlockingQueuedConnection,
-            Q_RETURN_ARG(glm::vec3, result), Q_ARG(const QString&, name));
-        return result;
-    }
-    return getJointTranslation(getJointIndex(name));
+    // Can't do this, because the lock needs to cover the entire set of logic.  In theory, the joints could change 
+    // on another thread in between the call to getJointIndex and getJointTranslation
+    // return getJointTranslation(getJointIndex(name));
+    return readLockWithNamedJointIndex<glm::vec3>(name, [this](int index) {
+        return _jointData.at(index).translation;
+    });
 }
 
 void AvatarData::setJointData(const QString& name, const glm::quat& rotation, const glm::vec3& translation) {
-    if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "setJointData", Q_ARG(const QString&, name), Q_ARG(const glm::quat&, rotation),
-            Q_ARG(const glm::vec3&, translation));
-        return;
-    }
-    setJointData(getJointIndex(name), rotation, translation);
+    // Can't do this, not thread safe
+    // setJointData(getJointIndex(name), rotation, translation);
+
+    writeLockWithNamedJointIndex(name, [&](int index) {
+        auto& jointData = _jointData[index];
+        jointData.rotation = rotation;
+        jointData.translation = translation;
+        jointData.rotationSet = jointData.translationSet = true;
+    });
 }
 
 void AvatarData::setJointRotation(const QString& name, const glm::quat& rotation) {
-    if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "setJointRotation", Q_ARG(const QString&, name), Q_ARG(const glm::quat&, rotation));
-        return;
-    }
-    setJointRotation(getJointIndex(name), rotation);
+    // Can't do this, not thread safe
+    // setJointRotation(getJointIndex(name), rotation);
+    writeLockWithNamedJointIndex(name, [&](int index) {
+        auto& data = _jointData[index];
+        data.rotation = rotation;
+        data.rotationSet = true;
+    });
 }
 
 void AvatarData::setJointTranslation(const QString& name, const glm::vec3& translation) {
-    if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "setJointTranslation", Q_ARG(const QString&, name),
-            Q_ARG(const glm::vec3&, translation));
-        return;
-    }
-    setJointTranslation(getJointIndex(name), translation);
+    // Can't do this, not thread safe
+    // setJointTranslation(getJointIndex(name), translation);
+    writeLockWithNamedJointIndex(name, [&](int index) {
+        auto& data = _jointData[index];
+        data.translation = translation;
+        data.translationSet = true;
+    });
 }
 
 void AvatarData::setJointRotation(int index, const glm::quat& rotation) {
     if (index == -1) {
         return;
     }
-    if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "setJointRotation", Q_ARG(int, index), Q_ARG(const glm::quat&, rotation));
-        return;
-    }
     QWriteLocker writeLock(&_jointDataLock);
     if (_jointData.size() <= index) {
         _jointData.resize(index + 1);
@@ -1320,10 +1279,6 @@ void AvatarData::setJointTranslation(int index, const glm::vec3& translation) {
     if (index == -1) {
         return;
     }
-    if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "setJointTranslation", Q_ARG(int, index), Q_ARG(const glm::vec3&, translation));
-        return;
-    }
     QWriteLocker writeLock(&_jointDataLock);
     if (_jointData.size() <= index) {
         _jointData.resize(index + 1);
@@ -1334,38 +1289,38 @@ void AvatarData::setJointTranslation(int index, const glm::vec3& translation) {
 }
 
 void AvatarData::clearJointData(const QString& name) {
-    if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "clearJointData", Q_ARG(const QString&, name));
-        return;
-    }
-    clearJointData(getJointIndex(name));
+    // Can't do this, not thread safe
+    // clearJointData(getJointIndex(name));
+    writeLockWithNamedJointIndex(name, [&](int index) {
+        _jointData[index] = {};
+    });
 }
 
 bool AvatarData::isJointDataValid(const QString& name) const {
-    if (QThread::currentThread() != thread()) {
-        bool result;
-        QMetaObject::invokeMethod(const_cast<AvatarData*>(this), "isJointDataValid", Qt::BlockingQueuedConnection,
-            Q_RETURN_ARG(bool, result), Q_ARG(const QString&, name));
-        return result;
-    }
-    return isJointDataValid(getJointIndex(name));
+    // Can't do this, not thread safe
+    // return isJointDataValid(getJointIndex(name));
+
+    return readLockWithNamedJointIndex<bool>(name, false, [&](int index) {
+        // This is technically superfluous....  the lambda is only called if index is a valid 
+        // offset for _jointData.  Nevertheless, it would be confusing to leave the lamdba as
+        // `return true`
+        return index < _jointData.size();
+    });
 }
 
 glm::quat AvatarData::getJointRotation(const QString& name) const {
-    if (QThread::currentThread() != thread()) {
-        glm::quat result;
-        QMetaObject::invokeMethod(const_cast<AvatarData*>(this), "getJointRotation", Qt::BlockingQueuedConnection,
-            Q_RETURN_ARG(glm::quat, result), Q_ARG(const QString&, name));
-        return result;
-    }
-    return getJointRotation(getJointIndex(name));
+    // Can't do this, not thread safe
+    // return getJointRotation(getJointIndex(name));
+
+    return readLockWithNamedJointIndex<glm::quat>(name, [&](int index) {
+        return _jointData.at(index).rotation;
+    });
 }
 
 QVector<glm::quat> AvatarData::getJointRotations() const {
     if (QThread::currentThread() != thread()) {
         QVector<glm::quat> result;
-        QMetaObject::invokeMethod(const_cast<AvatarData*>(this),
-                                  "getJointRotations", Qt::BlockingQueuedConnection,
+        BLOCKING_INVOKE_METHOD(const_cast<AvatarData*>(this), "getJointRotations",
                                   Q_RETURN_ARG(QVector<glm::quat>, result));
         return result;
     }
@@ -1377,32 +1332,20 @@ QVector<glm::quat> AvatarData::getJointRotations() const {
     return jointRotations;
 }
 
-void AvatarData::setJointRotations(QVector<glm::quat> jointRotations) {
-    if (QThread::currentThread() != thread()) {
-        QVector<glm::quat> result;
-        QMetaObject::invokeMethod(const_cast<AvatarData*>(this),
-                                  "setJointRotations", Qt::BlockingQueuedConnection,
-                                  Q_ARG(QVector<glm::quat>, jointRotations));
-    }
+void AvatarData::setJointRotations(const QVector<glm::quat>& jointRotations) {
     QWriteLocker writeLock(&_jointDataLock);
-    if (_jointData.size() < jointRotations.size()) {
-        _jointData.resize(jointRotations.size());
+    auto size = jointRotations.size();
+    if (_jointData.size() < size) {
+        _jointData.resize(size);
     }
-    for (int i = 0; i < jointRotations.size(); ++i) {
-        if (i < _jointData.size()) {
-            setJointRotation(i, jointRotations[i]);
-        }
+    for (int i = 0; i < size; ++i) {
+        auto& data = _jointData[i];
+        data.rotation = jointRotations[i];
+        data.rotationSet = true;
     }
 }
 
 QVector<glm::vec3> AvatarData::getJointTranslations() const {
-    if (QThread::currentThread() != thread()) {
-        QVector<glm::vec3> result;
-        QMetaObject::invokeMethod(const_cast<AvatarData*>(this),
-                                  "getJointTranslations", Qt::BlockingQueuedConnection,
-                                  Q_RETURN_ARG(QVector<glm::vec3>, result));
-        return result;
-    }
     QReadLocker readLock(&_jointDataLock);
     QVector<glm::vec3> jointTranslations(_jointData.size());
     for (int i = 0; i < _jointData.size(); ++i) {
@@ -1411,30 +1354,24 @@ QVector<glm::vec3> AvatarData::getJointTranslations() const {
     return jointTranslations;
 }
 
-void AvatarData::setJointTranslations(QVector<glm::vec3> jointTranslations) {
-    if (QThread::currentThread() != thread()) {
-        QVector<glm::quat> result;
-        QMetaObject::invokeMethod(const_cast<AvatarData*>(this),
-                                  "setJointTranslations", Qt::BlockingQueuedConnection,
-                                  Q_ARG(QVector<glm::vec3>, jointTranslations));
-    }
+void AvatarData::setJointTranslations(const QVector<glm::vec3>& jointTranslations) {
     QWriteLocker writeLock(&_jointDataLock);
-    if (_jointData.size() < jointTranslations.size()) {
-        _jointData.resize(jointTranslations.size());
+    auto size = jointTranslations.size();
+    if (_jointData.size() < size) {
+        _jointData.resize(size);
     }
-    for (int i = 0; i < jointTranslations.size(); ++i) {
-        if (i < _jointData.size()) {
-            setJointTranslation(i, jointTranslations[i]);
-        }
+    for (int i = 0; i < size; ++i) {
+        auto& data = _jointData[i];
+        data.translation = jointTranslations[i];
+        data.translationSet = true;
     }
 }
 
 void AvatarData::clearJointsData() {
-    // FIXME: this method is terribly inefficient and probably doesn't even work
-    // (see implementation of clearJointData(index))
-    for (int i = 0; i < _jointData.size(); ++i) {
-        clearJointData(i);
-    }
+    QWriteLocker writeLock(&_jointDataLock);
+    QVector<JointData> newJointData;
+    newJointData.resize(_jointData.size());
+    _jointData.swap(newJointData);
 }
 
 int AvatarData::getFauxJointIndex(const QString& name) const {
@@ -1465,12 +1402,12 @@ int AvatarData::getJointIndex(const QString& name) const {
         return result;
     }
     QReadLocker readLock(&_jointDataLock);
-    return _jointIndices.value(name) - 1;
+    return _fstJointIndices.value(name) - 1;
 }
 
 QStringList AvatarData::getJointNames() const {
     QReadLocker readLock(&_jointDataLock);
-    return _jointNames;
+    return _fstJointNames;
 }
 
 glm::quat AvatarData::getOrientationOutbound() const {
@@ -1510,7 +1447,9 @@ void AvatarData::processAvatarIdentity(const QByteArray& identityData, bool& ide
             >> identity.displayName
             >> identity.sessionDisplayName
             >> identity.isReplicated
-            >> identity.avatarEntityData;
+            >> identity.avatarEntityData
+            >> identity.lookAtSnappingEnabled
+        ;
 
         // set the store identity sequence number to match the incoming identity
         _identitySequenceNumber = incomingSequenceNumber;
@@ -1552,6 +1491,11 @@ void AvatarData::processAvatarIdentity(const QByteArray& identityData, bool& ide
             identityChanged = true;
         }
 
+    if (identity.lookAtSnappingEnabled != _lookAtSnappingEnabled) {
+        setProperty("lookAtSnappingEnabled", identity.lookAtSnappingEnabled);
+        identityChanged = true;
+    }
+
 #ifdef WANT_DEBUG
         qCDebug(avatars) << __FUNCTION__
             << "identity.uuid:" << identity.uuid
@@ -1583,7 +1527,9 @@ QByteArray AvatarData::identityByteArray(bool setIsReplicated) const {
             << _displayName
             << getSessionDisplayNameForTransport() // depends on _sessionDisplayName
             << (_isReplicated || setIsReplicated)
-            << _avatarEntityData;
+            << _avatarEntityData
+            << _lookAtSnappingEnabled
+        ;
     });
 
     return identityData;
@@ -1616,7 +1562,7 @@ void AvatarData::setDisplayName(const QString& displayName) {
 QVector<AttachmentData> AvatarData::getAttachmentData() const {
     if (QThread::currentThread() != thread()) {
         QVector<AttachmentData> result;
-        QMetaObject::invokeMethod(const_cast<AvatarData*>(this), "getAttachmentData", Qt::BlockingQueuedConnection,
+        BLOCKING_INVOKE_METHOD(const_cast<AvatarData*>(this), "getAttachmentData",
             Q_RETURN_ARG(QVector<AttachmentData>, result));
         return result;
     }
@@ -1723,14 +1669,14 @@ void AvatarData::setJointMappingsFromNetworkReply() {
             bool ok;
             int jointIndex = line.mid(secondSeparatorIndex + 1).trimmed().toInt(&ok);
             if (ok) {
-                while (_jointNames.size() < jointIndex + 1) {
-                    _jointNames.append(QString());
+                while (_fstJointNames.size() < jointIndex + 1) {
+                    _fstJointNames.append(QString());
                 }
-                _jointNames[jointIndex] = jointName;
+                _fstJointNames[jointIndex] = jointName;
             }
         }
-        for (int i = 0; i < _jointNames.size(); i++) {
-            _jointIndices.insert(_jointNames.at(i), i + 1);
+        for (int i = 0; i < _fstJointNames.size(); i++) {
+            _fstJointIndices.insert(_fstJointNames.at(i), i + 1);
         }
     }
 
@@ -1746,6 +1692,24 @@ void AvatarData::sendAvatarDataPacket() {
     bool cullSmallData = (randFloat() < AVATAR_SEND_FULL_UPDATE_RATIO);
     auto dataDetail = cullSmallData ? SendAllData : CullSmallData;
     QByteArray avatarByteArray = toByteArrayStateful(dataDetail);
+
+    int maximumByteArraySize = NLPacket::maxPayloadSize(PacketType::AvatarData) - sizeof(AvatarDataSequenceNumber);
+
+    if (avatarByteArray.size() > maximumByteArraySize) {
+        qCWarning(avatars) << "toByteArrayStateful() resulted in very large buffer:" << avatarByteArray.size() << "... attempt to drop facial data";
+        avatarByteArray = toByteArrayStateful(dataDetail, true);
+
+        if (avatarByteArray.size() > maximumByteArraySize) {
+            qCWarning(avatars) << "toByteArrayStateful() without facial data resulted in very large buffer:" << avatarByteArray.size() << "... reduce to MinimumData";
+            avatarByteArray = toByteArrayStateful(MinimumData, true);
+
+            if (avatarByteArray.size() > maximumByteArraySize) {
+                qCWarning(avatars) << "toByteArrayStateful() MinimumData resulted in very large buffer:" << avatarByteArray.size() << "... FAIL!!";
+                return;
+            }
+        }
+    }
+
     doneEncoding(cullSmallData);
 
     static AvatarDataSequenceNumber sequenceNumber = 0;
@@ -1784,8 +1748,8 @@ void AvatarData::sendIdentityPacket() {
 void AvatarData::updateJointMappings() {
     {
         QWriteLocker writeLock(&_jointDataLock);
-        _jointIndices.clear();
-        _jointNames.clear();
+        _fstJointIndices.clear();
+        _fstJointNames.clear();
         _jointData.clear();
     }
 
@@ -2084,6 +2048,7 @@ void AvatarData::fromJson(const QJsonObject& json, bool useFrameSkeleton) {
         currentBasis = std::make_shared<Transform>(Transform::fromJson(json[JSON_AVATAR_BASIS]));
     }
 
+    glm::quat orientation;
     if (json.contains(JSON_AVATAR_RELATIVE)) {
         // During playback you can either have the recording basis set to the avatar current state
         // meaning that all playback is relative to this avatars starting position, or
@@ -2095,12 +2060,14 @@ void AvatarData::fromJson(const QJsonObject& json, bool useFrameSkeleton) {
         auto relativeTransform = Transform::fromJson(json[JSON_AVATAR_RELATIVE]);
         auto worldTransform = currentBasis->worldTransform(relativeTransform);
         setPosition(worldTransform.getTranslation());
-        setOrientation(worldTransform.getRotation());
+        orientation = worldTransform.getRotation();
     } else {
         // We still set the position in the case that there is no movement.
         setPosition(currentBasis->getTranslation());
-        setOrientation(currentBasis->getRotation());
+        orientation = currentBasis->getRotation();
     }
+    setOrientation(orientation);
+    updateAttitude(orientation);
 
     // Do after avatar orientation because head look-at needs avatar orientation.
     if (json.contains(JSON_AVATAR_HEAD)) {
@@ -2218,11 +2185,11 @@ void AvatarData::setBodyRoll(float bodyRoll) {
     setOrientation(glm::quat(glm::radians(eulerAngles)));
 }
 
-void AvatarData::setPosition(const glm::vec3& position) {
+void AvatarData::setPositionViaScript(const glm::vec3& position) {
     SpatiallyNestable::setPosition(position);
 }
 
-void AvatarData::setOrientation(const glm::quat& orientation) {
+void AvatarData::setOrientationViaScript(const glm::quat& orientation) {
     SpatiallyNestable::setOrientation(orientation);
 }
 
@@ -2256,11 +2223,13 @@ glm::vec3 variantToVec3(const QVariant& var) {
     return result;
 }
 
-void AttachmentData::fromVariant(const QVariant& variant) {
+bool AttachmentData::fromVariant(const QVariant& variant) {
+    bool isValid = false;
     auto map = variant.toMap();
     if (map.contains("modelUrl")) {
         auto urlString = map["modelUrl"].toString();
         modelURL = urlString;
+        isValid = true;
     }
     if (map.contains("jointName")) {
         jointName = map["jointName"].toString();
@@ -2277,6 +2246,7 @@ void AttachmentData::fromVariant(const QVariant& variant) {
     if (map.contains("soft")) {
         isSoft = map["soft"].toBool();
     }
+    return isValid;
 }
 
 QVariantList AvatarData::getAttachmentsVariant() const {
@@ -2292,8 +2262,7 @@ void AvatarData::setAttachmentsVariant(const QVariantList& variant) {
     newAttachments.reserve(variant.size());
     for (const auto& attachmentVar : variant) {
         AttachmentData attachment;
-        attachment.fromVariant(attachmentVar);
-        if (!attachment.modelURL.isEmpty()) {
+        if (attachment.fromVariant(attachmentVar)) {
             newAttachments.append(attachment);
         }
     }
@@ -2303,10 +2272,6 @@ void AvatarData::setAttachmentsVariant(const QVariantList& variant) {
 const int MAX_NUM_AVATAR_ENTITIES = 42;
 
 void AvatarData::updateAvatarEntity(const QUuid& entityID, const QByteArray& entityData) {
-    if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "updateAvatarEntity", Q_ARG(const QUuid&, entityID), Q_ARG(QByteArray, entityData));
-        return;
-    }
     _avatarEntitiesLock.withWriteLock([&] {
         AvatarEntityMap::iterator itr = _avatarEntityData.find(entityID);
         if (itr == _avatarEntityData.end()) {
@@ -2324,11 +2289,6 @@ void AvatarData::updateAvatarEntity(const QUuid& entityID, const QByteArray& ent
 }
 
 void AvatarData::clearAvatarEntity(const QUuid& entityID) {
-    if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "clearAvatarEntity", Q_ARG(const QUuid&, entityID));
-        return;
-    }
-
     _avatarEntitiesLock.withWriteLock([&] {
         _avatarEntityData.remove(entityID);
         _avatarEntityDataLocallyEdited = true;
@@ -2338,28 +2298,24 @@ void AvatarData::clearAvatarEntity(const QUuid& entityID) {
 
 AvatarEntityMap AvatarData::getAvatarEntityData() const {
     AvatarEntityMap result;
-    if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(const_cast<AvatarData*>(this), "getAvatarEntityData", Qt::BlockingQueuedConnection,
-                                  Q_RETURN_ARG(AvatarEntityMap, result));
-        return result;
-    }
-
     _avatarEntitiesLock.withReadLock([&] {
         result = _avatarEntityData;
     });
     return result;
 }
 
+void AvatarData::insertDetachedEntityID(const QUuid entityID) {
+    _avatarEntitiesLock.withWriteLock([&] {
+        _avatarEntityDetached.insert(entityID);
+    });
+}
+
 void AvatarData::setAvatarEntityData(const AvatarEntityMap& avatarEntityData) {
     if (avatarEntityData.size() > MAX_NUM_AVATAR_ENTITIES) {
         // the data is suspect
         qCDebug(avatars) << "discard suspect AvatarEntityData with size =" << avatarEntityData.size();
         return;
     }
-    if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "setAvatarEntityData", Q_ARG(const AvatarEntityMap&, avatarEntityData));
-        return;
-    }
     _avatarEntitiesLock.withWriteLock([&] {
         if (_avatarEntityData != avatarEntityData) {
             // keep track of entities that were attached to this avatar but no longer are
@@ -2379,11 +2335,6 @@ void AvatarData::setAvatarEntityData(const AvatarEntityMap& avatarEntityData) {
 
 AvatarEntityIDs AvatarData::getAndClearRecentlyDetachedIDs() {
     AvatarEntityIDs result;
-    if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(const_cast<AvatarData*>(this), "getAndClearRecentlyDetachedIDs", Qt::BlockingQueuedConnection,
-                                  Q_RETURN_ARG(AvatarEntityIDs, result));
-        return result;
-    }
     _avatarEntitiesLock.withWriteLock([&] {
         result = _avatarEntityDetached;
         _avatarEntityDetached.clear();
@@ -2396,6 +2347,11 @@ glm::mat4 AvatarData::getSensorToWorldMatrix() const {
     return _sensorToWorldMatrixCache.get();
 }
 
+// thread-safe
+float AvatarData::getSensorToWorldScale() const {
+    return extractUniformScale(_sensorToWorldMatrixCache.get());
+}
+
 // thread-safe
 glm::mat4 AvatarData::getControllerLeftHandMatrix() const {
     return _controllerLeftHandMatrixCache.get();
diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h
index 63bdd1112f..4dabbb3ff5 100644
--- a/libraries/avatars/src/AvatarData.h
+++ b/libraries/avatars/src/AvatarData.h
@@ -15,21 +15,7 @@
 #include <string>
 #include <memory>
 #include <queue>
-
-/* VS2010 defines stdint.h, but not inttypes.h */
-#if defined(_MSC_VER)
-typedef signed char  int8_t;
-typedef signed short int16_t;
-typedef signed int   int32_t;
-typedef unsigned char  uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned int   uint32_t;
-typedef signed long long   int64_t;
-typedef unsigned long long quint64;
-#define PRId64 "I64d"
-#else
 #include <inttypes.h>
-#endif
 #include <vector>
 
 #include <glm/glm.hpp>
@@ -140,35 +126,41 @@ namespace AvatarDataPacket {
     const HasFlags PACKET_HAS_JOINT_DATA             = 1U << 11;
     const size_t AVATAR_HAS_FLAGS_SIZE = 2;
 
+    using SixByteQuat = uint8_t[6];
+    using SixByteTrans = uint8_t[6];
+
     // NOTE: AvatarDataPackets start with a uint16_t sequence number that is not reflected in the Header structure.
 
     PACKED_BEGIN struct Header {
         HasFlags packetHasFlags;        // state flags, indicated which additional records are included in the packet
     } PACKED_END;
     const size_t HEADER_SIZE = 2;
+    static_assert(sizeof(Header) == HEADER_SIZE, "AvatarDataPacket::Header size doesn't match.");
 
     PACKED_BEGIN struct AvatarGlobalPosition {
         float globalPosition[3];          // avatar's position
     } PACKED_END;
     const size_t AVATAR_GLOBAL_POSITION_SIZE = 12;
+    static_assert(sizeof(AvatarGlobalPosition) == AVATAR_GLOBAL_POSITION_SIZE, "AvatarDataPacket::AvatarGlobalPosition size doesn't match.");
 
     PACKED_BEGIN struct AvatarBoundingBox {
         float avatarDimensions[3];        // avatar's bounding box in world space units, but relative to the position.
         float boundOriginOffset[3];       // offset from the position of the avatar to the origin of the bounding box
     } PACKED_END;
     const size_t AVATAR_BOUNDING_BOX_SIZE = 24;
+    static_assert(sizeof(AvatarBoundingBox) == AVATAR_BOUNDING_BOX_SIZE, "AvatarDataPacket::AvatarBoundingBox size doesn't match.");
 
-
-    using SixByteQuat = uint8_t[6];
     PACKED_BEGIN struct AvatarOrientation {
         SixByteQuat avatarOrientation;      // encodeded and compressed by packOrientationQuatToSixBytes()
     } PACKED_END;
     const size_t AVATAR_ORIENTATION_SIZE = 6;
+    static_assert(sizeof(AvatarOrientation) == AVATAR_ORIENTATION_SIZE, "AvatarDataPacket::AvatarOrientation size doesn't match.");
 
     PACKED_BEGIN struct AvatarScale {
         SmallFloat scale;                 // avatar's scale, compressed by packFloatRatioToTwoByte()
     } PACKED_END;
     const size_t AVATAR_SCALE_SIZE = 2;
+    static_assert(sizeof(AvatarScale) == AVATAR_SCALE_SIZE, "AvatarDataPacket::AvatarScale size doesn't match.");
 
     PACKED_BEGIN struct LookAtPosition {
         float lookAtPosition[3];          // world space position that eyes are focusing on.
@@ -180,11 +172,13 @@ namespace AvatarDataPacket {
                                           // POTENTIAL SAVINGS - 12 bytes
     } PACKED_END;
     const size_t LOOK_AT_POSITION_SIZE = 12;
+    static_assert(sizeof(LookAtPosition) == LOOK_AT_POSITION_SIZE, "AvatarDataPacket::LookAtPosition size doesn't match.");
 
     PACKED_BEGIN struct AudioLoudness {
         uint8_t audioLoudness;            // current loudness of microphone compressed with packFloatGainToByte()
     } PACKED_END;
     const size_t AUDIO_LOUDNESS_SIZE = 1;
+    static_assert(sizeof(AudioLoudness) == AUDIO_LOUDNESS_SIZE, "AvatarDataPacket::AudioLoudness size doesn't match.");
 
     PACKED_BEGIN struct SensorToWorldMatrix {
         // FIXME - these 20 bytes are only used by viewers if my avatar has "attachments"
@@ -199,11 +193,13 @@ namespace AvatarDataPacket {
                                           // relative to the avatar position.
     } PACKED_END;
     const size_t SENSOR_TO_WORLD_SIZE = 20;
+    static_assert(sizeof(SensorToWorldMatrix) == SENSOR_TO_WORLD_SIZE, "AvatarDataPacket::SensorToWorldMatrix size doesn't match.");
 
     PACKED_BEGIN struct AdditionalFlags {
         uint8_t flags;                    // additional flags: hand state, key state, eye tracking
     } PACKED_END;
     const size_t ADDITIONAL_FLAGS_SIZE = 1;
+    static_assert(sizeof(AdditionalFlags) == ADDITIONAL_FLAGS_SIZE, "AvatarDataPacket::AdditionalFlags size doesn't match.");
 
     // only present if HAS_REFERENTIAL flag is set in AvatarInfo.flags
     PACKED_BEGIN struct ParentInfo {
@@ -211,6 +207,7 @@ namespace AvatarDataPacket {
         uint16_t parentJointIndex;
     } PACKED_END;
     const size_t PARENT_INFO_SIZE = 18;
+    static_assert(sizeof(ParentInfo) == PARENT_INFO_SIZE, "AvatarDataPacket::ParentInfo size doesn't match.");
 
     // will only ever be included if the avatar has a parent but can change independent of changes to parent info
     // and so we keep it a separate record
@@ -218,6 +215,22 @@ namespace AvatarDataPacket {
         float localPosition[3];           // parent frame translation of the avatar
     } PACKED_END;
     const size_t AVATAR_LOCAL_POSITION_SIZE = 12;
+    static_assert(sizeof(AvatarLocalPosition) == AVATAR_LOCAL_POSITION_SIZE, "AvatarDataPacket::AvatarLocalPosition size doesn't match.");
+
+    const size_t MAX_CONSTANT_HEADER_SIZE = HEADER_SIZE +
+        AVATAR_GLOBAL_POSITION_SIZE +
+        AVATAR_BOUNDING_BOX_SIZE +
+        AVATAR_ORIENTATION_SIZE +
+        AVATAR_SCALE_SIZE +
+        LOOK_AT_POSITION_SIZE +
+        AUDIO_LOUDNESS_SIZE +
+        SENSOR_TO_WORLD_SIZE +
+        ADDITIONAL_FLAGS_SIZE +
+        PARENT_INFO_SIZE +
+        AVATAR_LOCAL_POSITION_SIZE;
+
+
+    // variable length structure follows
 
     // only present if IS_FACE_TRACKER_CONNECTED flag is set in AvatarInfo.flags
     PACKED_BEGIN struct FaceTrackerInfo {
@@ -229,8 +242,9 @@ namespace AvatarDataPacket {
         // float blendshapeCoefficients[numBlendshapeCoefficients];
     } PACKED_END;
     const size_t FACE_TRACKER_INFO_SIZE = 17;
+    static_assert(sizeof(FaceTrackerInfo) == FACE_TRACKER_INFO_SIZE, "AvatarDataPacket::FaceTrackerInfo size doesn't match.");
+    size_t maxFaceTrackerInfoSize(size_t numBlendshapeCoefficients);
 
-    // variable length structure follows
     /*
     struct JointData {
         uint8_t numJoints;
@@ -240,6 +254,7 @@ namespace AvatarDataPacket {
         SixByteTrans translation[numValidTranslations];        // encodeded and compressed by packFloatVec3ToSignedTwoByteFixed()
     };
     */
+    size_t maxJointDataSize(size_t numJoints);
 }
 
 static const float MAX_AVATAR_SCALE = 1000.0f;
@@ -322,14 +337,15 @@ public:
 class AvatarData : public QObject, public SpatiallyNestable {
     Q_OBJECT
 
-    Q_PROPERTY(glm::vec3 position READ getPosition WRITE setPosition)
+    Q_PROPERTY(glm::vec3 position READ getPosition WRITE setPositionViaScript)
     Q_PROPERTY(float scale READ getTargetScale WRITE setTargetScale)
+    Q_PROPERTY(float density READ getDensity)
     Q_PROPERTY(glm::vec3 handPosition READ getHandPosition WRITE setHandPosition)
     Q_PROPERTY(float bodyYaw READ getBodyYaw WRITE setBodyYaw)
     Q_PROPERTY(float bodyPitch READ getBodyPitch WRITE setBodyPitch)
     Q_PROPERTY(float bodyRoll READ getBodyRoll WRITE setBodyRoll)
 
-    Q_PROPERTY(glm::quat orientation READ getOrientation WRITE setOrientation)
+    Q_PROPERTY(glm::quat orientation READ getOrientation WRITE setOrientationViaScript)
     Q_PROPERTY(glm::quat headOrientation READ getHeadOrientation WRITE setHeadOrientation)
     Q_PROPERTY(float headPitch READ getHeadPitch WRITE setHeadPitch)
     Q_PROPERTY(float headYaw READ getHeadYaw WRITE setHeadYaw)
@@ -345,17 +361,20 @@ class AvatarData : public QObject, public SpatiallyNestable {
     // sessionDisplayName is sanitized, defaulted version displayName that is defined by the AvatarMixer rather than by Interface clients.
     // The result is unique among all avatars present at the time.
     Q_PROPERTY(QString sessionDisplayName READ getSessionDisplayName WRITE setSessionDisplayName)
+    Q_PROPERTY(bool lookAtSnappingEnabled MEMBER _lookAtSnappingEnabled NOTIFY lookAtSnappingChanged)
     Q_PROPERTY(QString skeletonModelURL READ getSkeletonModelURLFromScript WRITE setSkeletonModelURLFromScript)
     Q_PROPERTY(QVector<AttachmentData> attachmentData READ getAttachmentData WRITE setAttachmentData)
 
     Q_PROPERTY(QStringList jointNames READ getJointNames)
 
-    Q_PROPERTY(QUuid sessionUUID READ getSessionUUID)
+    Q_PROPERTY(QUuid sessionUUID READ getSessionUUID NOTIFY sessionUUIDChanged)
 
     Q_PROPERTY(glm::mat4 sensorToWorldMatrix READ getSensorToWorldMatrix)
     Q_PROPERTY(glm::mat4 controllerLeftHandMatrix READ getControllerLeftHandMatrix)
     Q_PROPERTY(glm::mat4 controllerRightHandMatrix READ getControllerRightHandMatrix)
 
+    Q_PROPERTY(float sensorToWorldScale READ getSensorToWorldScale)
+
 public:
 
     virtual QString getName() const override { return QString("Avatar:") + _displayName; }
@@ -387,7 +406,7 @@ public:
         SendAllData
     } AvatarDataDetail;
 
-    virtual QByteArray toByteArrayStateful(AvatarDataDetail dataDetail);
+    virtual QByteArray toByteArrayStateful(AvatarDataDetail dataDetail, bool dropFaceTracking = false);
 
     virtual QByteArray toByteArray(AvatarDataDetail dataDetail, quint64 lastSentTime, const QVector<JointData>& lastSentJointData,
         AvatarDataPacket::HasFlags& hasFlagsOut, bool dropFaceTracking, bool distanceAdjust, glm::vec3 viewerPosition,
@@ -411,13 +430,10 @@ public:
     float getBodyRoll() const;
     void setBodyRoll(float bodyRoll);
 
-    using SpatiallyNestable::setPosition;
-    virtual void setPosition(const glm::vec3& position) override;
-    using SpatiallyNestable::setOrientation;
-    virtual void setOrientation(const glm::quat& orientation) override;
+    virtual void setPositionViaScript(const glm::vec3& position);
+    virtual void setOrientationViaScript(const glm::quat& orientation);
 
-    void nextAttitude(glm::vec3 position, glm::quat orientation); // Can be safely called at any time.
-    virtual void updateAttitude() {} // Tell skeleton mesh about changes
+    virtual void updateAttitude(const glm::quat& orientation) {}
 
     glm::quat getHeadOrientation() const {
         lazyInitHeadData();
@@ -490,18 +506,18 @@ public:
     Q_INVOKABLE virtual glm::quat getJointRotation(int index) const;
     Q_INVOKABLE virtual glm::vec3 getJointTranslation(int index) const;
 
-    Q_INVOKABLE void setJointData(const QString& name, const glm::quat& rotation, const glm::vec3& translation);
-    Q_INVOKABLE void setJointRotation(const QString& name, const glm::quat& rotation);
-    Q_INVOKABLE void setJointTranslation(const QString& name, const glm::vec3& translation);
-    Q_INVOKABLE void clearJointData(const QString& name);
-    Q_INVOKABLE bool isJointDataValid(const QString& name) const;
-    Q_INVOKABLE glm::quat getJointRotation(const QString& name) const;
-    Q_INVOKABLE glm::vec3 getJointTranslation(const QString& name) const;
+    Q_INVOKABLE virtual void setJointData(const QString& name, const glm::quat& rotation, const glm::vec3& translation);
+    Q_INVOKABLE virtual void setJointRotation(const QString& name, const glm::quat& rotation);
+    Q_INVOKABLE virtual void setJointTranslation(const QString& name, const glm::vec3& translation);
+    Q_INVOKABLE virtual void clearJointData(const QString& name);
+    Q_INVOKABLE virtual bool isJointDataValid(const QString& name) const;
+    Q_INVOKABLE virtual glm::quat getJointRotation(const QString& name) const;
+    Q_INVOKABLE virtual glm::vec3 getJointTranslation(const QString& name) const;
 
     Q_INVOKABLE virtual QVector<glm::quat> getJointRotations() const;
     Q_INVOKABLE virtual QVector<glm::vec3> getJointTranslations() const;
-    Q_INVOKABLE virtual void setJointRotations(QVector<glm::quat> jointRotations);
-    Q_INVOKABLE virtual void setJointTranslations(QVector<glm::vec3> jointTranslations);
+    Q_INVOKABLE virtual void setJointRotations(const QVector<glm::quat>& jointRotations);
+    Q_INVOKABLE virtual void setJointTranslations(const QVector<glm::vec3>& jointTranslations);
 
     Q_INVOKABLE virtual void clearJointsData();
 
@@ -518,7 +534,7 @@ public:
     Q_INVOKABLE void updateAvatarEntity(const QUuid& entityID, const QByteArray& entityData);
     Q_INVOKABLE void clearAvatarEntity(const QUuid& entityID);
 
-    void setForceFaceTrackerConnected(bool connected) { _forceFaceTrackerConnected = connected; }
+    Q_INVOKABLE void setForceFaceTrackerConnected(bool connected) { _forceFaceTrackerConnected = connected; }
 
     // key state
     void setKeyState(KeyState s) { _keyState = s; }
@@ -533,6 +549,7 @@ public:
         QString sessionDisplayName;
         bool isReplicated;
         AvatarEntityMap avatarEntityData;
+        bool lookAtSnappingEnabled;
     };
 
     // identityChanged returns true if identity has changed, false otherwise.
@@ -545,6 +562,7 @@ public:
     const QUrl& getSkeletonModelURL() const { return _skeletonModelURL; }
     const QString& getDisplayName() const { return _displayName; }
     const QString& getSessionDisplayName() const { return _sessionDisplayName; }
+    bool getLookAtSnappingEnabled() const { return _lookAtSnappingEnabled; }
     virtual void setSkeletonModelURL(const QUrl& skeletonModelURL);
 
     virtual void setDisplayName(const QString& displayName);
@@ -586,10 +604,12 @@ public:
     Q_INVOKABLE AvatarEntityMap getAvatarEntityData() const;
     Q_INVOKABLE void setAvatarEntityData(const AvatarEntityMap& avatarEntityData);
     void setAvatarEntityDataChanged(bool value) { _avatarEntityDataChanged = value; }
+    void insertDetachedEntityID(const QUuid entityID);
     AvatarEntityIDs getAndClearRecentlyDetachedIDs();
 
     // thread safe
     Q_INVOKABLE glm::mat4 getSensorToWorldMatrix() const;
+    Q_INVOKABLE float getSensorToWorldScale() const;
     Q_INVOKABLE glm::mat4 getControllerLeftHandMatrix() const;
     Q_INVOKABLE glm::mat4 getControllerRightHandMatrix() const;
 
@@ -627,6 +647,7 @@ public:
     void markIdentityDataChanged() { _identityDataChanged = true; }
 
     void pushIdentitySequenceNumber() { ++_identitySequenceNumber; };
+    bool hasProcessedFirstIdentity() const { return _hasProcessedFirstIdentity; }
 
     float getDensity() const { return _density; }
 
@@ -634,13 +655,20 @@ public:
 
 signals:
     void displayNameChanged();
+    void lookAtSnappingChanged(bool enabled);
+    void sessionUUIDChanged();
 
 public slots:
     void sendAvatarDataPacket();
     void sendIdentityPacket();
 
     void setJointMappingsFromNetworkReply();
-    void setSessionUUID(const QUuid& sessionUUID) { setID(sessionUUID); }
+    void setSessionUUID(const QUuid& sessionUUID) {
+        if (sessionUUID != getID()) {
+            setID(sessionUUID);
+            emit sessionUUIDChanged();
+        }
+    }
 
     virtual glm::quat getAbsoluteJointRotationInObjectFrame(int index) const override;
     virtual glm::vec3 getAbsoluteJointTranslationInObjectFrame(int index) const override;
@@ -702,9 +730,10 @@ protected:
     QVector<AttachmentData> _attachmentData;
     QString _displayName;
     QString _sessionDisplayName { };
+    bool _lookAtSnappingEnabled { true };
 
-    QHash<QString, int> _jointIndices; ///< 1-based, since zero is returned for missing keys
-    QStringList _jointNames; ///< in order of depth-first traversal
+    QHash<QString, int> _fstJointIndices; ///< 1-based, since zero is returned for missing keys
+    QStringList _fstJointNames; ///< in order of depth-first traversal
 
     quint64 _errorLogExpiry; ///< time in future when to log an error
 
@@ -794,6 +823,43 @@ protected:
     bool _hasProcessedFirstIdentity { false };
     float _density;
 
+    template <typename T, typename F>
+    T readLockWithNamedJointIndex(const QString& name, const T& defaultValue, F f) const {
+        int index = getFauxJointIndex(name);
+        QReadLocker readLock(&_jointDataLock);
+        if (index == -1) {
+            index = _fstJointIndices.value(name) - 1;
+        }
+
+        // The first conditional is superfluous, but illsutrative
+        if (index == -1 || index < _jointData.size()) {
+            return defaultValue;
+        }
+
+        return f(index);
+    }
+
+    template <typename T, typename F>
+    T readLockWithNamedJointIndex(const QString& name, F f) const {
+        return readLockWithNamedJointIndex(name, T(), f);
+    }
+
+    template <typename F>
+    void writeLockWithNamedJointIndex(const QString& name, F f) {
+        int index = getFauxJointIndex(name);
+        QWriteLocker writeLock(&_jointDataLock);
+        if (index == -1) {
+            index = _fstJointIndices.value(name) - 1;
+        }
+        if (index == -1) {
+            return;
+        }
+        if (_jointData.size() <= index) {
+            _jointData.resize(index + 1);
+        }
+        f(index);
+    }
+
 private:
     friend void avatarStateFromFrame(const QByteArray& frameData, AvatarData* _avatar);
     static QUrl _defaultFullAvatarModelUrl;
@@ -823,7 +889,7 @@ public:
     void fromJson(const QJsonObject& json);
 
     QVariant toVariant() const;
-    void fromVariant(const QVariant& variant);
+    bool fromVariant(const QVariant& variant);
 };
 
 QDataStream& operator<<(QDataStream& out, const AttachmentData& attachment);
diff --git a/libraries/avatars/src/AvatarHashMap.cpp b/libraries/avatars/src/AvatarHashMap.cpp
index e8c37bdaa8..3712080cdb 100644
--- a/libraries/avatars/src/AvatarHashMap.cpp
+++ b/libraries/avatars/src/AvatarHashMap.cpp
@@ -170,13 +170,6 @@ void AvatarHashMap::processKillAvatar(QSharedPointer<ReceivedMessage> message, S
     removeAvatar(sessionUUID, reason);
 }
 
-void AvatarHashMap::processExitingSpaceBubble(QSharedPointer<ReceivedMessage> message, SharedNodePointer sendingNode) {
-    // read the node id
-    QUuid sessionUUID = QUuid::fromRfc4122(message->readWithoutCopy(NUM_BYTES_RFC4122_UUID));
-    auto nodeList = DependencyManager::get<NodeList>();
-    nodeList->radiusIgnoreNodeBySessionID(sessionUUID, false);
-}
-
 void AvatarHashMap::removeAvatar(const QUuid& sessionUUID, KillAvatarReason removalReason) {
     QWriteLocker locker(&_hashLock);
 
diff --git a/libraries/avatars/src/AvatarHashMap.h b/libraries/avatars/src/AvatarHashMap.h
index 21ea8081c7..68fc232685 100644
--- a/libraries/avatars/src/AvatarHashMap.h
+++ b/libraries/avatars/src/AvatarHashMap.h
@@ -60,7 +60,6 @@ protected slots:
     void processAvatarDataPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer sendingNode);
     void processAvatarIdentityPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer sendingNode);
     void processKillAvatar(QSharedPointer<ReceivedMessage> message, SharedNodePointer sendingNode);
-    void processExitingSpaceBubble(QSharedPointer<ReceivedMessage> message, SharedNodePointer sendingNode);
 
 protected:
     AvatarHashMap();
diff --git a/libraries/avatars/src/HeadData.cpp b/libraries/avatars/src/HeadData.cpp
index 8ae33a1b4f..1fda984e78 100644
--- a/libraries/avatars/src/HeadData.cpp
+++ b/libraries/avatars/src/HeadData.cpp
@@ -83,6 +83,11 @@ static const QMap<QString, int>& getBlendshapesLookupMap() {
     return blendshapeLookupMap;
 }
 
+int HeadData::getNumSummedBlendshapeCoefficients() const {
+    int maxSize = std::max(_blendshapeCoefficients.size(), _transientBlendshapeCoefficients.size());
+    return maxSize;
+}
+
 const QVector<float>& HeadData::getSummedBlendshapeCoefficients() {
     int maxSize = std::max(_blendshapeCoefficients.size(), _transientBlendshapeCoefficients.size());
     if (_summedBlendshapeCoefficients.size() != maxSize) {
diff --git a/libraries/avatars/src/HeadData.h b/libraries/avatars/src/HeadData.h
index c15714bd73..bcc2cacde5 100644
--- a/libraries/avatars/src/HeadData.h
+++ b/libraries/avatars/src/HeadData.h
@@ -57,6 +57,7 @@ public:
     void setBlendshape(QString name, float val);
     const QVector<float>& getBlendshapeCoefficients() const { return _blendshapeCoefficients; }
     const QVector<float>& getSummedBlendshapeCoefficients();
+    int getNumSummedBlendshapeCoefficients() const;
     void setBlendshapeCoefficients(const QVector<float>& blendshapeCoefficients) { _blendshapeCoefficients = blendshapeCoefficients; }
 
     const glm::vec3& getLookAtPosition() const { return _lookAtPosition; }
diff --git a/libraries/avatars/src/ScriptAvatarData.cpp b/libraries/avatars/src/ScriptAvatarData.cpp
index 90ec7ec309..d0643d28f8 100644
--- a/libraries/avatars/src/ScriptAvatarData.cpp
+++ b/libraries/avatars/src/ScriptAvatarData.cpp
@@ -15,6 +15,7 @@ ScriptAvatarData::ScriptAvatarData(AvatarSharedPointer avatarData) :
     _avatarData(avatarData)
 {
     QObject::connect(avatarData.get(), &AvatarData::displayNameChanged, this, &ScriptAvatarData::displayNameChanged);
+    QObject::connect(avatarData.get(), &AvatarData::lookAtSnappingChanged, this, &ScriptAvatarData::lookAtSnappingChanged);
 }
 
 //
@@ -161,6 +162,13 @@ bool ScriptAvatarData::getIsReplicated() const {
     }
 }
 
+bool ScriptAvatarData::getLookAtSnappingEnabled() const {
+    if (AvatarSharedPointer sharedAvatarData = _avatarData.lock()) {
+        return sharedAvatarData->getLookAtSnappingEnabled();
+    } else {
+        return false;
+    }
+}
 //
 // IDENTIFIER PROPERTIES
 // END
diff --git a/libraries/avatars/src/ScriptAvatarData.h b/libraries/avatars/src/ScriptAvatarData.h
index 1b6944e01d..46dfb5325f 100644
--- a/libraries/avatars/src/ScriptAvatarData.h
+++ b/libraries/avatars/src/ScriptAvatarData.h
@@ -46,6 +46,7 @@ class ScriptAvatarData : public QObject {
     Q_PROPERTY(QString displayName READ getDisplayName NOTIFY displayNameChanged)
     Q_PROPERTY(QString sessionDisplayName READ getSessionDisplayName)
     Q_PROPERTY(bool isReplicated READ getIsReplicated)
+    Q_PROPERTY(bool lookAtSnappingEnabled READ getLookAtSnappingEnabled NOTIFY lookAtSnappingChanged)
 
     //
     // ATTACHMENT AND JOINT PROPERTIES
@@ -97,6 +98,7 @@ public:
     QString getDisplayName() const;
     QString getSessionDisplayName() const;
     bool getIsReplicated() const;
+    bool getLookAtSnappingEnabled() const;
 
     //
     // ATTACHMENT AND JOINT PROPERTIES
@@ -129,6 +131,7 @@ public:
     
 signals:
     void displayNameChanged();
+    void lookAtSnappingChanged(bool enabled);
 
 public slots:
     glm::quat getAbsoluteJointRotationInObjectFrame(int index) const;
diff --git a/libraries/baking/CMakeLists.txt b/libraries/baking/CMakeLists.txt
new file mode 100644
index 0000000000..66cf791776
--- /dev/null
+++ b/libraries/baking/CMakeLists.txt
@@ -0,0 +1,10 @@
+set(TARGET_NAME baking)
+setup_hifi_library(Concurrent)
+
+link_hifi_libraries(shared model networking ktx image fbx)
+include_hifi_library_headers(gpu)
+
+add_dependency_external_projects(draco)
+find_package(Draco REQUIRED)
+target_include_directories(${TARGET_NAME} SYSTEM PRIVATE ${DRACO_INCLUDE_DIRS})
+target_link_libraries(${TARGET_NAME} ${DRACO_LIBRARY} ${DRACO_ENCODER_LIBRARY})
diff --git a/tools/oven/src/Baker.cpp b/libraries/baking/src/Baker.cpp
similarity index 62%
rename from tools/oven/src/Baker.cpp
rename to libraries/baking/src/Baker.cpp
index c0cbd8d124..2adedf08a1 100644
--- a/tools/oven/src/Baker.cpp
+++ b/libraries/baking/src/Baker.cpp
@@ -13,20 +13,49 @@
 
 #include "Baker.h"
 
+bool Baker::shouldStop() {
+    if (_shouldAbort) {
+        setWasAborted(true);
+        return true;
+    }
+
+    if (hasErrors()) {
+        return true;
+    }
+
+    return false;
+}
+
 void Baker::handleError(const QString& error) {
     qCCritical(model_baking).noquote() << error;
     _errorList.append(error);
-    emit finished();
+    setIsFinished(true);
 }
 
 void Baker::handleErrors(const QStringList& errors) {
     // we're appending errors, presumably from a baking operation we called
     // add those to our list and emit that we are finished
     _errorList.append(errors);
-    emit finished();
+    setIsFinished(true);
 }
 
 void Baker::handleWarning(const QString& warning) {
     qCWarning(model_baking).noquote() << warning;
     _warningList.append(warning);
 }
+
+void Baker::setIsFinished(bool isFinished) {
+    _isFinished.store(isFinished);
+
+    if (isFinished) {
+        emit finished();
+    }
+}
+
+void Baker::setWasAborted(bool wasAborted) {
+    _wasAborted.store(wasAborted);
+
+    if (wasAborted) {
+        emit aborted();
+    }
+}
diff --git a/tools/oven/src/Baker.h b/libraries/baking/src/Baker.h
similarity index 56%
rename from tools/oven/src/Baker.h
rename to libraries/baking/src/Baker.h
index d7107428bf..c1b2ddf959 100644
--- a/tools/oven/src/Baker.h
+++ b/libraries/baking/src/Baker.h
@@ -18,17 +18,32 @@ class Baker : public QObject {
     Q_OBJECT
 
 public:
+    virtual ~Baker() = default;
+
+    bool shouldStop();
+
     bool hasErrors() const { return !_errorList.isEmpty(); }
     QStringList getErrors() const { return _errorList; }
 
     bool hasWarnings() const { return !_warningList.isEmpty(); }
     QStringList getWarnings() const { return _warningList; }
 
+    std::vector<QString> getOutputFiles() const { return _outputFiles; }
+
+    virtual void setIsFinished(bool isFinished);
+    bool isFinished() const { return _isFinished.load(); }
+
+    virtual void setWasAborted(bool wasAborted);
+
+    bool wasAborted() const { return _wasAborted.load(); }
+
 public slots:
     virtual void bake() = 0;
+    virtual void abort() { _shouldAbort.store(true); }
 
 signals:
     void finished();
+    void aborted();
 
 protected:
     void handleError(const QString& error);
@@ -36,8 +51,17 @@ protected:
 
     void handleErrors(const QStringList& errors);
 
+    // List of baked output files. For instance, for an FBX this would
+    // include the .fbx and all of its texture files.
+    std::vector<QString> _outputFiles;
+
     QStringList _errorList;
     QStringList _warningList;
+
+    std::atomic<bool> _isFinished { false };
+
+    std::atomic<bool> _shouldAbort { false };
+    std::atomic<bool> _wasAborted { false };
 };
 
 #endif // hifi_Baker_h
diff --git a/libraries/baking/src/FBXBaker.cpp b/libraries/baking/src/FBXBaker.cpp
new file mode 100644
index 0000000000..ee24d6a4c2
--- /dev/null
+++ b/libraries/baking/src/FBXBaker.cpp
@@ -0,0 +1,842 @@
+//
+//  FBXBaker.cpp
+//  tools/baking/src
+//
+//  Created by Stephen Birarda on 3/30/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include <cmath> // need this include so we don't get an error looking for std::isnan
+
+#include <QtConcurrent>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDir>
+#include <QtCore/QEventLoop>
+#include <QtCore/QFileInfo>
+#include <QtCore/QThread>
+
+#include <mutex>
+
+#include <NetworkAccessManager.h>
+#include <SharedUtil.h>
+
+#include <PathUtils.h>
+
+#include <FBXReader.h>
+#include <FBXWriter.h>
+
+#include "ModelBakingLoggingCategory.h"
+#include "TextureBaker.h"
+
+#include "FBXBaker.h"
+
+#ifdef _WIN32
+#pragma warning( push )
+#pragma warning( disable : 4267 )
+#endif
+
+#include <draco/mesh/triangle_soup_mesh_builder.h>
+#include <draco/compression/encode.h>
+
+#ifdef _WIN32
+#pragma warning( pop )
+#endif
+
+
+FBXBaker::FBXBaker(const QUrl& fbxURL, TextureBakerThreadGetter textureThreadGetter,
+                   const QString& bakedOutputDir, const QString& originalOutputDir) :
+    _fbxURL(fbxURL),
+    _bakedOutputDir(bakedOutputDir),
+    _originalOutputDir(originalOutputDir),
+    _textureThreadGetter(textureThreadGetter)
+{
+
+}
+
+FBXBaker::~FBXBaker() {
+    if (_tempDir.exists()) {
+        if (!_tempDir.remove(_originalFBXFilePath)) {
+            qCWarning(model_baking) << "Failed to remove temporary copy of fbx file:" << _originalFBXFilePath;
+        }
+        if (!_tempDir.rmdir(".")) {
+            qCWarning(model_baking) << "Failed to remove temporary directory:" << _tempDir;
+        }
+    }
+}
+
+void FBXBaker::abort() {
+    Baker::abort();
+
+    // tell our underlying TextureBaker instances to abort
+    // the FBXBaker will wait until all are aborted before emitting its own abort signal
+    for (auto& textureBaker : _bakingTextures) {
+        textureBaker->abort();
+    }
+}
+
+void FBXBaker::bake() {
+    qDebug() << "FBXBaker" << _fbxURL << "bake starting";
+    
+    auto tempDir = PathUtils::generateTemporaryDir();
+
+    if (tempDir.isEmpty()) {
+        handleError("Failed to create a temporary directory.");
+        return;
+    }
+
+    _tempDir = tempDir;
+
+    _originalFBXFilePath = _tempDir.filePath(_fbxURL.fileName());
+    qDebug() << "Made temporary dir " << _tempDir;
+    qDebug() << "Origin file path: " << _originalFBXFilePath;
+
+    // setup the output folder for the results of this bake
+    setupOutputFolder();
+
+    if (shouldStop()) {
+        return;
+    }
+
+    connect(this, &FBXBaker::sourceCopyReadyToLoad, this, &FBXBaker::bakeSourceCopy);
+
+    // make a local copy of the FBX file
+    loadSourceFBX();
+}
+
+void FBXBaker::bakeSourceCopy() {
+    // load the scene from the FBX file
+    importScene();
+
+    if (shouldStop()) {
+        return;
+    }
+
+    // enumerate the models and textures found in the scene and start a bake for them
+    rewriteAndBakeSceneTextures();
+
+    if (shouldStop()) {
+        return;
+    }
+
+    rewriteAndBakeSceneModels();
+
+    if (shouldStop()) {
+        return;
+    }
+
+    // export the FBX with re-written texture references
+    exportScene();
+
+    if (shouldStop()) {
+        return;
+    }
+
+    // check if we're already done with textures (in case we had none to re-write)
+    checkIfTexturesFinished();
+}
+
+void FBXBaker::setupOutputFolder() {
+    // make sure there isn't already an output directory using the same name
+    if (QDir(_bakedOutputDir).exists()) {
+        qWarning() << "Output path" << _bakedOutputDir << "already exists. Continuing.";
+    } else {
+        qCDebug(model_baking) << "Creating FBX output folder" << _bakedOutputDir;
+
+        // attempt to make the output folder
+        if (!QDir().mkpath(_bakedOutputDir)) {
+            handleError("Failed to create FBX output folder " + _bakedOutputDir);
+            return;
+        }
+        // attempt to make the output folder
+        if (!QDir().mkpath(_originalOutputDir)) {
+            handleError("Failed to create FBX output folder " + _bakedOutputDir);
+            return;
+        }
+    }
+}
+
+void FBXBaker::loadSourceFBX() {
+    // check if the FBX is local or first needs to be downloaded
+    if (_fbxURL.isLocalFile()) {
+        // load up the local file
+        QFile localFBX { _fbxURL.toLocalFile() };
+
+        qDebug() << "Local file url: " << _fbxURL << _fbxURL.toString() << _fbxURL.toLocalFile() << ", copying to: " << _originalFBXFilePath;
+
+        if (!localFBX.exists()) {
+            //QMessageBox::warning(this, "Could not find " + _fbxURL.toString(), "");
+            handleError("Could not find " + _fbxURL.toString());
+            return;
+        }
+
+        // make a copy in the output folder
+        if (!_originalOutputDir.isEmpty()) {
+            qDebug() << "Copying to: " << _originalOutputDir << "/" << _fbxURL.fileName();
+            localFBX.copy(_originalOutputDir + "/" + _fbxURL.fileName());
+        }
+
+        localFBX.copy(_originalFBXFilePath);
+
+        // emit our signal to start the import of the FBX source copy
+        emit sourceCopyReadyToLoad();
+    } else {
+        // remote file, kick off a download
+        auto& networkAccessManager = NetworkAccessManager::getInstance();
+
+        QNetworkRequest networkRequest;
+
+        // setup the request to follow re-directs and always hit the network
+        networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
+        networkRequest.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::AlwaysNetwork);
+        networkRequest.setHeader(QNetworkRequest::UserAgentHeader, HIGH_FIDELITY_USER_AGENT);
+
+        networkRequest.setUrl(_fbxURL);
+
+        qCDebug(model_baking) << "Downloading" << _fbxURL;
+        auto networkReply = networkAccessManager.get(networkRequest);
+
+        connect(networkReply, &QNetworkReply::finished, this, &FBXBaker::handleFBXNetworkReply);
+    }
+}
+
+void FBXBaker::handleFBXNetworkReply() {
+    auto requestReply = qobject_cast<QNetworkReply*>(sender());
+
+    if (requestReply->error() == QNetworkReply::NoError) {
+        qCDebug(model_baking) << "Downloaded" << _fbxURL;
+
+        // grab the contents of the reply and make a copy in the output folder
+        QFile copyOfOriginal(_originalFBXFilePath);
+
+        qDebug(model_baking) << "Writing copy of original FBX to" << _originalFBXFilePath << copyOfOriginal.fileName();
+
+        if (!copyOfOriginal.open(QIODevice::WriteOnly)) {
+            // add an error to the error list for this FBX stating that a duplicate of the original FBX could not be made
+            handleError("Could not create copy of " + _fbxURL.toString() + " (Failed to open " + _originalFBXFilePath + ")");
+            return;
+        }
+        if (copyOfOriginal.write(requestReply->readAll()) == -1) {
+            handleError("Could not create copy of " + _fbxURL.toString() + " (Failed to write)");
+            return;
+        }
+
+        // close that file now that we are done writing to it
+        copyOfOriginal.close();
+
+        if (!_originalOutputDir.isEmpty()) {
+            copyOfOriginal.copy(_originalOutputDir + "/" + _fbxURL.fileName());
+        }
+
+        // emit our signal to start the import of the FBX source copy
+        emit sourceCopyReadyToLoad();
+    } else {
+        // add an error to our list stating that the FBX could not be downloaded
+        handleError("Failed to download " + _fbxURL.toString());
+    }
+}
+
+void FBXBaker::importScene() {
+    qDebug() << "file path: " << _originalFBXFilePath.toLocal8Bit().data() << QDir(_originalFBXFilePath).exists();
+
+    QFile fbxFile(_originalFBXFilePath);
+    if (!fbxFile.open(QIODevice::ReadOnly)) {
+        handleError("Error opening " + _originalFBXFilePath + " for reading");
+        return;
+    }
+
+    FBXReader reader;
+
+    qCDebug(model_baking) << "Parsing" << _fbxURL;
+    _rootNode = reader._rootNode = reader.parseFBX(&fbxFile);
+    _geometry = reader.extractFBXGeometry({}, _fbxURL.toString());
+    _textureContent = reader._textureContent;
+}
+
+QString texturePathRelativeToFBX(QUrl fbxURL, QUrl textureURL) {
+    auto fbxPath = fbxURL.toString(QUrl::RemoveFilename | QUrl::RemoveQuery | QUrl::RemoveFragment);
+    auto texturePath = textureURL.toString(QUrl::RemoveFilename | QUrl::RemoveQuery | QUrl::RemoveFragment);
+
+    if (texturePath.startsWith(fbxPath)) {
+        // texture path is a child of the FBX path, return the texture path without the fbx path
+        return texturePath.mid(fbxPath.length());
+    } else {
+        // the texture path was not a child of the FBX path, return the empty string
+        return "";
+    }
+}
+
+QString FBXBaker::createBakedTextureFileName(const QFileInfo& textureFileInfo) {
+    // first make sure we have a unique base name for this texture
+    // in case another texture referenced by this model has the same base name
+    auto& nameMatches = _textureNameMatchCount[textureFileInfo.baseName()];
+
+    QString bakedTextureFileName { textureFileInfo.completeBaseName() };
+
+    if (nameMatches > 0) {
+        // there are already nameMatches texture with this name
+        // append - and that number to our baked texture file name so that it is unique
+        bakedTextureFileName += "-" + QString::number(nameMatches);
+    }
+
+    bakedTextureFileName += BAKED_TEXTURE_EXT;
+
+    // increment the number of name matches
+    ++nameMatches;
+
+    return bakedTextureFileName;
+}
+
+QUrl FBXBaker::getTextureURL(const QFileInfo& textureFileInfo, QString relativeFileName, bool isEmbedded) {
+
+    QUrl urlToTexture;
+
+    auto apparentRelativePath = QFileInfo(relativeFileName.replace("\\", "/"));
+
+    if (isEmbedded) {
+        urlToTexture = _fbxURL.toString() + "/" + apparentRelativePath.filePath();
+    } else  {
+        if (textureFileInfo.exists() && textureFileInfo.isFile()) {
+            // set the texture URL to the local texture that we have confirmed exists
+            urlToTexture = QUrl::fromLocalFile(textureFileInfo.absoluteFilePath());
+        } else {
+            // external texture that we'll need to download or find
+
+            // this is a relative file path which will require different handling
+            // depending on the location of the original FBX
+            if (_fbxURL.isLocalFile() && apparentRelativePath.exists() && apparentRelativePath.isFile()) {
+                // the absolute path we ran into for the texture in the FBX exists on this machine
+                // so use that file
+                urlToTexture = QUrl::fromLocalFile(apparentRelativePath.absoluteFilePath());
+            } else {
+                // we didn't find the texture on this machine at the absolute path
+                // so assume that it is right beside the FBX to match the behaviour of interface
+                urlToTexture = _fbxURL.resolved(apparentRelativePath.fileName());
+            }
+        }
+    }
+
+    return urlToTexture;
+}
+
+void FBXBaker::rewriteAndBakeSceneModels() {
+    unsigned int meshIndex = 0;
+    bool hasDeformers { false };
+    for (FBXNode& rootChild : _rootNode.children) {
+        if (rootChild.name == "Objects") {
+            for (FBXNode& objectChild : rootChild.children) {
+                if (objectChild.name == "Deformer") {
+                    hasDeformers = true;
+                    break;
+                }
+            }
+        }
+        if (hasDeformers) {
+            break;
+        }
+    }
+    for (FBXNode& rootChild : _rootNode.children) {
+        if (rootChild.name == "Objects") {
+            for (FBXNode& objectChild : rootChild.children) {
+                if (objectChild.name == "Geometry") {
+
+                    // TODO Pull this out of _geometry instead so we don't have to reprocess it
+                    auto extractedMesh = FBXReader::extractMesh(objectChild, meshIndex, false);
+                    auto& mesh = extractedMesh.mesh;
+
+                    if (mesh.wasCompressed) {
+                        handleError("Cannot re-bake a file that contains compressed mesh");
+                        return;
+                    }
+
+                    Q_ASSERT(mesh.normals.size() == 0 || mesh.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());
+
+                    int64_t numTriangles { 0 };
+                    for (auto& part : mesh.parts) {
+                        if ((part.quadTrianglesIndices.size() % 3) != 0 || (part.triangleIndices.size() % 3) != 0) {
+                            handleWarning("Found a mesh part with invalid index data, skipping");
+                            continue;
+                        }
+                        numTriangles += part.quadTrianglesIndices.size() / 3;
+                        numTriangles += part.triangleIndices.size() / 3;
+                    }
+
+                    if (numTriangles == 0) {
+                        continue;
+                    }
+
+                    draco::TriangleSoupMeshBuilder meshBuilder;
+
+                    meshBuilder.Start(numTriangles);
+
+                    bool hasNormals { mesh.normals.size() > 0 };
+                    bool hasColors { mesh.colors.size() > 0 };
+                    bool hasTexCoords { mesh.texCoords.size() > 0 };
+                    bool hasTexCoords1 { mesh.texCoords1.size() > 0 };
+                    bool hasPerFaceMaterials { mesh.parts.size() > 1
+                        || extractedMesh.partMaterialTextures[0].first != 0 };
+                    bool needsOriginalIndices { hasDeformers };
+
+                    int normalsAttributeID { -1 };
+                    int colorsAttributeID { -1 };
+                    int texCoordsAttributeID { -1 };
+                    int texCoords1AttributeID { -1 };
+                    int faceMaterialAttributeID { -1 };
+                    int originalIndexAttributeID { -1 };
+
+                    const int positionAttributeID = meshBuilder.AddAttribute(draco::GeometryAttribute::POSITION,
+                                                                             3, draco::DT_FLOAT32);
+                    if (needsOriginalIndices) {
+                        originalIndexAttributeID = meshBuilder.AddAttribute(
+                            (draco::GeometryAttribute::Type)DRACO_ATTRIBUTE_ORIGINAL_INDEX,
+                            1, draco::DT_INT32);
+                    }
+
+                    if (hasNormals) {
+                        normalsAttributeID = meshBuilder.AddAttribute(draco::GeometryAttribute::NORMAL,
+                                                                     3, draco::DT_FLOAT32);
+                    }
+                    if (hasColors) {
+                        colorsAttributeID = meshBuilder.AddAttribute(draco::GeometryAttribute::COLOR,
+                                                                    3, draco::DT_FLOAT32);
+                    }
+                    if (hasTexCoords) {
+                        texCoordsAttributeID = meshBuilder.AddAttribute(draco::GeometryAttribute::TEX_COORD,
+                                                                        2, draco::DT_FLOAT32);
+                    }
+                    if (hasTexCoords1) {
+                        texCoords1AttributeID = meshBuilder.AddAttribute(
+                            (draco::GeometryAttribute::Type)DRACO_ATTRIBUTE_TEX_COORD_1,
+                            2, draco::DT_FLOAT32);
+                    }
+                    if (hasPerFaceMaterials) {
+                        faceMaterialAttributeID = meshBuilder.AddAttribute(
+                            (draco::GeometryAttribute::Type)DRACO_ATTRIBUTE_MATERIAL_ID,
+                            1, draco::DT_UINT16);
+                    }
+
+
+                    auto partIndex = 0;
+                    draco::FaceIndex face;
+                    for (auto& part : mesh.parts) {
+                        const auto& matTex = extractedMesh.partMaterialTextures[partIndex];
+                        uint16_t materialID = matTex.first;
+
+                        auto addFace = [&](QVector<int>& indices, int index, draco::FaceIndex face) {
+                            int32_t idx0 = indices[index];
+                            int32_t idx1 = indices[index + 1];
+                            int32_t idx2 = indices[index + 2];
+
+                            if (hasPerFaceMaterials) {
+                                meshBuilder.SetPerFaceAttributeValueForFace(faceMaterialAttributeID, face, &materialID);
+                            }
+
+                            meshBuilder.SetAttributeValuesForFace(positionAttributeID, face,
+                                                                  &mesh.vertices[idx0], &mesh.vertices[idx1],
+                                                                  &mesh.vertices[idx2]);
+
+                            if (needsOriginalIndices) {
+                                meshBuilder.SetAttributeValuesForFace(originalIndexAttributeID, face,
+                                                                      &mesh.originalIndices[idx0],
+                                                                      &mesh.originalIndices[idx1],
+                                                                      &mesh.originalIndices[idx2]);
+                            }
+                            if (hasNormals) {
+                                meshBuilder.SetAttributeValuesForFace(normalsAttributeID, face,
+                                                                      &mesh.normals[idx0], &mesh.normals[idx1],
+                                                                      &mesh.normals[idx2]);
+                            }
+                            if (hasColors) {
+                                meshBuilder.SetAttributeValuesForFace(colorsAttributeID, face,
+                                                                      &mesh.colors[idx0], &mesh.colors[idx1],
+                                                                      &mesh.colors[idx2]);
+                            }
+                            if (hasTexCoords) {
+                                meshBuilder.SetAttributeValuesForFace(texCoordsAttributeID, face,
+                                                                      &mesh.texCoords[idx0], &mesh.texCoords[idx1],
+                                                                      &mesh.texCoords[idx2]);
+                            }
+                            if (hasTexCoords1) {
+                                meshBuilder.SetAttributeValuesForFace(texCoords1AttributeID, face,
+                                                                      &mesh.texCoords1[idx0], &mesh.texCoords1[idx1],
+                                                                      &mesh.texCoords1[idx2]);
+                            }
+                        };
+
+                        for (int i = 0; (i + 2) < part.quadTrianglesIndices.size(); i += 3) {
+                            addFace(part.quadTrianglesIndices, i, face++);
+                        }
+
+                        for (int i = 0; (i + 2) < part.triangleIndices.size(); i += 3) {
+                            addFace(part.triangleIndices, i, face++);
+                        }
+
+                        partIndex++;
+                    }
+
+                    auto dracoMesh = meshBuilder.Finalize();
+
+                    if (!dracoMesh) {
+                        handleWarning("Failed to finalize the baking of a draco Geometry node");
+                        continue;
+                    }
+
+                    // we need to modify unique attribute IDs for custom attributes
+                    // so the attributes are easily retrievable on the other side
+                    if (hasPerFaceMaterials) {
+                        dracoMesh->attribute(faceMaterialAttributeID)->set_unique_id(DRACO_ATTRIBUTE_MATERIAL_ID);
+                    }
+
+                    if (hasTexCoords1) {
+                        dracoMesh->attribute(texCoords1AttributeID)->set_unique_id(DRACO_ATTRIBUTE_TEX_COORD_1);
+                    }
+
+                    if (needsOriginalIndices) {
+                        dracoMesh->attribute(originalIndexAttributeID)->set_unique_id(DRACO_ATTRIBUTE_ORIGINAL_INDEX);
+                    }
+
+                    draco::Encoder encoder;
+
+                    encoder.SetAttributeQuantization(draco::GeometryAttribute::POSITION, 14);
+                    encoder.SetAttributeQuantization(draco::GeometryAttribute::TEX_COORD, 12);
+                    encoder.SetAttributeQuantization(draco::GeometryAttribute::NORMAL, 10);
+                    encoder.SetSpeedOptions(0, 5);
+
+                    draco::EncoderBuffer buffer;
+                    encoder.EncodeMeshToBuffer(*dracoMesh, &buffer);
+
+                    FBXNode dracoMeshNode;
+                    dracoMeshNode.name = "DracoMesh";
+                    auto value = QVariant::fromValue(QByteArray(buffer.data(), (int) buffer.size()));
+                    dracoMeshNode.properties.append(value);
+
+                    objectChild.children.push_back(dracoMeshNode);
+
+                    static const std::vector<QString> nodeNamesToDelete {
+                        // Node data that is packed into the draco mesh
+                        "Vertices",
+                        "PolygonVertexIndex",
+                        "LayerElementNormal",
+                        "LayerElementColor",
+                        "LayerElementUV",
+                        "LayerElementMaterial",
+                        "LayerElementTexture",
+
+                        // Node data that we don't support
+                        "Edges",
+                        "LayerElementTangent",
+                        "LayerElementBinormal",
+                        "LayerElementSmoothing"
+                    };
+                    auto& children = objectChild.children;
+                    auto it = children.begin();
+                    while (it != children.end()) {
+                        auto begin = nodeNamesToDelete.begin();
+                        auto end = nodeNamesToDelete.end();
+                        if (find(begin, end, it->name) != end) {
+                            it = children.erase(it);
+                        } else {
+                            ++it;
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+void FBXBaker::rewriteAndBakeSceneTextures() {
+    using namespace image::TextureUsage;
+    QHash<QString, image::TextureUsage::Type> textureTypes;
+
+    // enumerate the materials in the extracted geometry so we can determine the texture type for each texture ID
+    for (const auto& material : _geometry->materials) {
+        if (material.normalTexture.isBumpmap) {
+            textureTypes[material.normalTexture.id] = BUMP_TEXTURE;
+        } else {
+            textureTypes[material.normalTexture.id] = NORMAL_TEXTURE;
+        }
+
+        textureTypes[material.albedoTexture.id] = ALBEDO_TEXTURE;
+        textureTypes[material.glossTexture.id] = GLOSS_TEXTURE;
+        textureTypes[material.roughnessTexture.id] = ROUGHNESS_TEXTURE;
+        textureTypes[material.specularTexture.id] = SPECULAR_TEXTURE;
+        textureTypes[material.metallicTexture.id] = METALLIC_TEXTURE;
+        textureTypes[material.emissiveTexture.id] = EMISSIVE_TEXTURE;
+        textureTypes[material.occlusionTexture.id] = OCCLUSION_TEXTURE;
+        textureTypes[material.lightmapTexture.id] = LIGHTMAP_TEXTURE;
+    }
+
+    // enumerate the children of the root node
+    for (FBXNode& rootChild : _rootNode.children) {
+
+        if (rootChild.name == "Objects") {
+
+            // enumerate the objects
+            auto object = rootChild.children.begin();
+            while (object != rootChild.children.end()) {
+                if (object->name == "Texture") {
+
+                    // double check that we didn't get an abort while baking the last texture
+                    if (shouldStop()) {
+                        return;
+                    }
+
+                    // enumerate the texture children
+                    for (FBXNode& textureChild : object->children) {
+
+                        if (textureChild.name == "RelativeFilename") {
+
+                            // use QFileInfo to easily split up the existing texture filename into its components
+                            QString fbxTextureFileName { textureChild.properties.at(0).toByteArray() };
+                            QFileInfo textureFileInfo { fbxTextureFileName.replace("\\", "/") };
+
+                            if (hasErrors()) {
+                                return;
+                            }
+
+                            if (textureFileInfo.suffix() == BAKED_TEXTURE_EXT.mid(1)) {
+                                // re-baking an FBX that already references baked textures is a fail
+                                // so we add an error and return from here
+                                handleError("Cannot re-bake a file that references compressed textures");
+
+                                return;
+                            }
+
+                            if (!TextureBaker::getSupportedFormats().contains(textureFileInfo.suffix())) {
+                                // this is a texture format we don't bake, skip it
+                                handleWarning(fbxTextureFileName + " is not a bakeable texture format");
+                                continue;
+                            }
+
+                            // make sure this texture points to something and isn't one we've already re-mapped
+                            if (!textureFileInfo.filePath().isEmpty()) {
+                                // check if this was an embedded texture we have already have in-memory content for
+                                auto textureContent = _textureContent.value(fbxTextureFileName.toLocal8Bit());
+
+                                // figure out the URL to this texture, embedded or external
+                                auto urlToTexture = getTextureURL(textureFileInfo, fbxTextureFileName,
+                                                                  !textureContent.isNull());
+
+                                QString bakedTextureFileName;
+                                if (_remappedTexturePaths.contains(urlToTexture)) {
+                                    bakedTextureFileName = _remappedTexturePaths[urlToTexture];
+                                } else {
+                                    // construct the new baked texture file name and file path
+                                    // ensuring that the baked texture will have a unique name
+                                    // even if there was another texture with the same name at a different path
+                                    bakedTextureFileName = createBakedTextureFileName(textureFileInfo);
+                                    _remappedTexturePaths[urlToTexture] = bakedTextureFileName;
+                                }
+
+                                qCDebug(model_baking).noquote() << "Re-mapping" << fbxTextureFileName
+                                    << "to" << bakedTextureFileName;
+
+                                QString bakedTextureFilePath {
+                                    _bakedOutputDir + "/" + bakedTextureFileName
+                                };
+
+                                // write the new filename into the FBX scene
+                                textureChild.properties[0] = bakedTextureFileName.toLocal8Bit();
+
+                                if (!_bakingTextures.contains(urlToTexture)) {
+                                    _outputFiles.push_back(bakedTextureFilePath);
+
+                                    // grab the ID for this texture so we can figure out the
+                                    // texture type from the loaded materials
+                                    QString textureID { object->properties[0].toByteArray() };
+                                    auto textureType = textureTypes[textureID];
+
+                                    // bake this texture asynchronously
+                                    bakeTexture(urlToTexture, textureType, _bakedOutputDir, bakedTextureFileName, textureContent);
+                                }
+                            }
+                        }
+                    }
+
+                    ++object;
+
+                } else if (object->name == "Video") {
+                    // this is an embedded texture, we need to remove it from the FBX
+                    object = rootChild.children.erase(object);
+                } else {
+                    ++object;
+                }
+            }
+        }
+    }
+}
+
+void FBXBaker::bakeTexture(const QUrl& textureURL, image::TextureUsage::Type textureType,
+                           const QDir& outputDir, const QString& bakedFilename, const QByteArray& textureContent) {
+    // start a bake for this texture and add it to our list to keep track of
+    QSharedPointer<TextureBaker> bakingTexture {
+        new TextureBaker(textureURL, textureType, outputDir, bakedFilename, textureContent),
+        &TextureBaker::deleteLater
+    };
+
+    // make sure we hear when the baking texture is done or aborted
+    connect(bakingTexture.data(), &Baker::finished, this, &FBXBaker::handleBakedTexture);
+    connect(bakingTexture.data(), &TextureBaker::aborted, this, &FBXBaker::handleAbortedTexture);
+
+    // keep a shared pointer to the baking texture
+    _bakingTextures.insert(textureURL, bakingTexture);
+
+    // start baking the texture on one of our available worker threads
+    bakingTexture->moveToThread(_textureThreadGetter());
+    QMetaObject::invokeMethod(bakingTexture.data(), "bake");
+}
+
+void FBXBaker::handleBakedTexture() {
+    TextureBaker* bakedTexture = qobject_cast<TextureBaker*>(sender());
+
+    // make sure we haven't already run into errors, and that this is a valid texture
+    if (bakedTexture) {
+        if (!shouldStop()) {
+            if (!bakedTexture->hasErrors()) {
+                if (!_originalOutputDir.isEmpty()) {
+                    // we've been asked to make copies of the originals, so we need to make copies of this if it is a linked texture
+
+                    // use the path to the texture being baked to determine if this was an embedded or a linked texture
+
+                    // it is embeddded if the texure being baked was inside a folder with the name of the FBX
+                    // since that is the fake URL we provide when baking external textures
+
+                    if (!_fbxURL.isParentOf(bakedTexture->getTextureURL())) {
+                        // for linked textures we want to save a copy of original texture beside the original FBX
+
+                        qCDebug(model_baking) << "Saving original texture for" << bakedTexture->getTextureURL();
+
+                        // check if we have a relative path to use for the texture
+                        auto relativeTexturePath = texturePathRelativeToFBX(_fbxURL, bakedTexture->getTextureURL());
+
+                        QFile originalTextureFile {
+                            _originalOutputDir + "/" + relativeTexturePath + bakedTexture->getTextureURL().fileName()
+                        };
+
+                        if (relativeTexturePath.length() > 0) {
+                            // make the folders needed by the relative path
+                        }
+
+                        if (originalTextureFile.open(QIODevice::WriteOnly) && originalTextureFile.write(bakedTexture->getOriginalTexture()) != -1) {
+                            qCDebug(model_baking) << "Saved original texture file" << originalTextureFile.fileName()
+                                << "for" << _fbxURL;
+                        } else {
+                            handleError("Could not save original external texture " + originalTextureFile.fileName()
+                                        + " for " + _fbxURL.toString());
+                            return;
+                        }
+                    }
+                }
+
+
+                // now that this texture has been baked and handled, we can remove that TextureBaker from our hash
+                _bakingTextures.remove(bakedTexture->getTextureURL());
+
+                checkIfTexturesFinished();
+            } else {
+                // there was an error baking this texture - add it to our list of errors
+                _errorList.append(bakedTexture->getErrors());
+
+                // we don't emit finished yet so that the other textures can finish baking first
+                _pendingErrorEmission = true;
+
+                // now that this texture has been baked, even though it failed, we can remove that TextureBaker from our list
+                _bakingTextures.remove(bakedTexture->getTextureURL());
+
+                // abort any other ongoing texture bakes since we know we'll end up failing
+                for (auto& bakingTexture : _bakingTextures) {
+                    bakingTexture->abort();
+                }
+
+                checkIfTexturesFinished();
+            }
+        } else {
+            // we have errors to attend to, so we don't do extra processing for this texture
+            // but we do need to remove that TextureBaker from our list
+            // and then check if we're done with all textures
+            _bakingTextures.remove(bakedTexture->getTextureURL());
+
+            checkIfTexturesFinished();
+        }
+    }
+}
+
+void FBXBaker::handleAbortedTexture() {
+    // grab the texture bake that was aborted and remove it from our hash since we don't need to track it anymore
+    TextureBaker* bakedTexture = qobject_cast<TextureBaker*>(sender());
+
+    if (bakedTexture) {
+        _bakingTextures.remove(bakedTexture->getTextureURL());
+    }
+
+    // since a texture we were baking aborted, our status is also aborted
+    _shouldAbort.store(true);
+
+    // abort any other ongoing texture bakes since we know we'll end up failing
+    for (auto& bakingTexture : _bakingTextures) {
+        bakingTexture->abort();
+    }
+
+    checkIfTexturesFinished();
+}
+
+void FBXBaker::exportScene() {
+    // save the relative path to this FBX inside our passed output folder
+    auto fileName = _fbxURL.fileName();
+    auto baseName = fileName.left(fileName.lastIndexOf('.'));
+    auto bakedFilename = baseName + BAKED_FBX_EXTENSION;
+
+    _bakedFBXFilePath = _bakedOutputDir + "/" + bakedFilename;
+
+    auto fbxData = FBXWriter::encodeFBX(_rootNode);
+
+    QFile bakedFile(_bakedFBXFilePath);
+
+    if (!bakedFile.open(QIODevice::WriteOnly)) {
+        handleError("Error opening " + _bakedFBXFilePath + " for writing");
+        return;
+    }
+
+    bakedFile.write(fbxData);
+
+    _outputFiles.push_back(_bakedFBXFilePath);
+
+    qCDebug(model_baking) << "Exported" << _fbxURL << "with re-written paths to" << _bakedFBXFilePath;
+}
+
+void FBXBaker::checkIfTexturesFinished() {
+    // check if we're done everything we need to do for this FBX
+    // and emit our finished signal if we're done
+
+    if (_bakingTextures.isEmpty()) {
+        if (shouldStop()) {
+            // if we're checking for completion but we have errors
+            // that means one or more of our texture baking operations failed
+
+            if (_pendingErrorEmission) {
+                setIsFinished(true);
+            }
+
+            return;
+        } else {
+            qCDebug(model_baking) << "Finished baking, emitting finsihed" << _fbxURL;
+
+            setIsFinished(true);
+        }
+    }
+}
+
+void FBXBaker::setWasAborted(bool wasAborted) {
+    if (wasAborted != _wasAborted.load()) {
+        Baker::setWasAborted(wasAborted);
+
+        if (wasAborted) {
+            qCDebug(model_baking) << "Aborted baking" << _fbxURL;
+        }
+    }
+}
diff --git a/tools/oven/src/FBXBaker.h b/libraries/baking/src/FBXBaker.h
similarity index 57%
rename from tools/oven/src/FBXBaker.h
rename to libraries/baking/src/FBXBaker.h
index bcfebbe2a8..a6034ee2b7 100644
--- a/tools/oven/src/FBXBaker.h
+++ b/libraries/baking/src/FBXBaker.h
@@ -1,6 +1,6 @@
 //
 //  FBXBaker.h
-//  tools/oven/src
+//  tools/baking/src
 //
 //  Created by Stephen Birarda on 3/30/17.
 //  Copyright 2017 High Fidelity, Inc.
@@ -20,33 +20,31 @@
 #include "Baker.h"
 #include "TextureBaker.h"
 
+#include "ModelBakingLoggingCategory.h"
+
 #include <gpu/Texture.h> 
 
-namespace fbxsdk {
-    class FbxManager;
-    class FbxProperty;
-    class FbxScene;
-    class FbxFileTexture;
-}
+#include <FBX.h>
 
 static const QString BAKED_FBX_EXTENSION = ".baked.fbx";
-using FBXSDKManagerUniquePointer = std::unique_ptr<fbxsdk::FbxManager, std::function<void (fbxsdk::FbxManager *)>>;
 
 using TextureBakerThreadGetter = std::function<QThread*()>;
 
 class FBXBaker : public Baker {
     Q_OBJECT
 public:
-    FBXBaker(const QUrl& fbxURL, const QString& baseOutputPath,
-             TextureBakerThreadGetter textureThreadGetter, bool copyOriginals = true);
+    FBXBaker(const QUrl& fbxURL, TextureBakerThreadGetter textureThreadGetter,
+             const QString& bakedOutputDir, const QString& originalOutputDir = "");
+    ~FBXBaker() override;
 
     QUrl getFBXUrl() const { return _fbxURL; }
-    QString getBakedFBXRelativePath() const { return _bakedFBXRelativePath; }
+    QString getBakedFBXFilePath() const { return _bakedFBXFilePath; }
+
+    virtual void setWasAborted(bool wasAborted) override;
 
 public slots:
-    // all calls to FBXBaker::bake for FBXBaker instances must be from the same thread
-    // because the Autodesk SDK will cause a crash if it is called from multiple threads
     virtual void bake() override;
+    virtual void abort() override;
 
 signals:
     void sourceCopyReadyToLoad();
@@ -55,46 +53,49 @@ private slots:
     void bakeSourceCopy();
     void handleFBXNetworkReply();
     void handleBakedTexture();
+    void handleAbortedTexture();
 
 private:
     void setupOutputFolder();
 
     void loadSourceFBX();
 
-    void bakeCopiedFBX();
-
     void importScene();
+    void rewriteAndBakeSceneModels();
     void rewriteAndBakeSceneTextures();
     void exportScene();
     void removeEmbeddedMediaFolder();
-    void possiblyCleanupOriginals();
 
     void checkIfTexturesFinished();
 
     QString createBakedTextureFileName(const QFileInfo& textureFileInfo);
-    QUrl getTextureURL(const QFileInfo& textureFileInfo, fbxsdk::FbxFileTexture* fileTexture);
+    QUrl getTextureURL(const QFileInfo& textureFileInfo, QString relativeFileName, bool isEmbedded = false);
 
-    void bakeTexture(const QUrl& textureURL, image::TextureUsage::Type textureType, const QDir& outputDir);
-
-    QString pathToCopyOfOriginal() const;
+    void bakeTexture(const QUrl& textureURL, image::TextureUsage::Type textureType, const QDir& outputDir,
+                     const QString& bakedFilename, const QByteArray& textureContent = QByteArray());
 
     QUrl _fbxURL;
-    QString _fbxName;
-    
-    QString _baseOutputPath;
-    QString _uniqueOutputPath;
-    QString _bakedFBXRelativePath;
 
-    static FBXSDKManagerUniquePointer _sdkManager;
-    fbxsdk::FbxScene* _scene { nullptr };
+    FBXNode _rootNode;
+    FBXGeometry* _geometry;
+    QHash<QByteArray, QByteArray> _textureContent;
+    
+    QString _bakedFBXFilePath;
+
+    QString _bakedOutputDir;
+
+    // If set, the original FBX and textures will also be copied here
+    QString _originalOutputDir;
+
+    QDir _tempDir;
+    QString _originalFBXFilePath;
 
     QMultiHash<QUrl, QSharedPointer<TextureBaker>> _bakingTextures;
     QHash<QString, int> _textureNameMatchCount;
+    QHash<QUrl, QString> _remappedTexturePaths;
 
     TextureBakerThreadGetter _textureThreadGetter;
 
-    bool _copyOriginals { true };
-
     bool _pendingErrorEmission { false };
 };
 
diff --git a/libraries/baking/src/JSBaker.cpp b/libraries/baking/src/JSBaker.cpp
new file mode 100644
index 0000000000..a97a7fe5b3
--- /dev/null
+++ b/libraries/baking/src/JSBaker.cpp
@@ -0,0 +1,247 @@
+//
+//  JSBaker.cpp
+//  libraries/baking/src
+//
+//  Created by Utkarsh Gautam on 9/18/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include <PathUtils.h>
+
+#include "JSBaker.h"
+#include "Baker.h"
+
+const int ASCII_CHARACTERS_UPPER_LIMIT = 126;
+
+JSBaker::JSBaker(const QUrl& jsURL, const QString& bakedOutputDir) :
+    _jsURL(jsURL),
+    _bakedOutputDir(bakedOutputDir)
+{
+
+}
+
+void JSBaker::bake() {
+    qCDebug(js_baking) << "JS Baker " << _jsURL << "bake starting";
+
+    // Import file to start baking
+    QFile jsFile(_jsURL.toLocalFile());
+    if (!jsFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        handleError("Error opening " + _jsURL.fileName() + " for reading");
+        return;
+    }
+
+    // Read file into an array
+    QByteArray inputJS = jsFile.readAll();
+    QByteArray outputJS;
+
+    // Call baking on inputJS and store result in outputJS 
+    bool success = bakeJS(inputJS, outputJS);
+    if (!success) {
+        qCDebug(js_baking) << "Bake Failed";
+        handleError("Unterminated multi-line comment");
+        return;
+    }
+
+    // Bake Successful. Export the file
+    auto fileName = _jsURL.fileName();
+    auto baseName = fileName.left(fileName.lastIndexOf('.'));
+    auto bakedFilename = baseName + BAKED_JS_EXTENSION;
+
+    _bakedJSFilePath = _bakedOutputDir + "/" + bakedFilename;
+
+    QFile bakedFile;
+    bakedFile.setFileName(_bakedJSFilePath);
+    if (!bakedFile.open(QIODevice::WriteOnly)) {
+        handleError("Error opening " + _bakedJSFilePath + " for writing");
+        return;
+    }
+
+    bakedFile.write(outputJS);
+
+    // Export successful
+    _outputFiles.push_back(_bakedJSFilePath);
+    qCDebug(js_baking) << "Exported" << _jsURL << "minified to" << _bakedJSFilePath;
+
+    // emit signal to indicate the JS baking is finished
+    emit finished();
+}
+
+bool JSBaker::bakeJS(const QByteArray& inputFile, QByteArray& outputFile) {
+    // Read from inputFile and write to outputFile per character 
+    QTextStream in(inputFile, QIODevice::ReadOnly);
+    QTextStream out(&outputFile, QIODevice::WriteOnly);
+
+    // Algorithm requires the knowledge of previous and next character for each character read
+    QChar currentCharacter;
+    QChar nextCharacter;
+    // Initialize previousCharacter with new line
+    QChar previousCharacter = '\n';
+
+    in >> currentCharacter;
+
+    while (!in.atEnd()) {
+        in >> nextCharacter;
+
+        if (currentCharacter == '\r') {
+            out << '\n';
+        } else if (currentCharacter == '/') {
+            // Check if single line comment i.e. //
+            if (nextCharacter == '/') {
+                handleSingleLineComments(in);
+
+                //Start fresh after handling comments
+                previousCharacter = '\n';
+                in >> currentCharacter;
+                continue;
+            } else if (nextCharacter == '*') {
+                // Check if multi line comment i.e. /*
+                bool success = handleMultiLineComments(in);
+                if (!success) {
+                    // Errors present return false
+                    return false;
+                }
+                //Start fresh after handling comments
+                previousCharacter = '\n';
+                in >> currentCharacter;
+                continue;
+            } else {
+                // If '/' is not followed by '/' or '*' print '/'
+                out << currentCharacter;
+            }
+        } else if (isSpaceOrTab(currentCharacter)) {
+            // Check if white space or tab
+
+            // Skip multiple spaces or tabs
+            while (isSpaceOrTab(nextCharacter)) {
+                in >> nextCharacter;
+                if (nextCharacter == '\n') {
+                    break;
+                }
+            }
+
+            // check if space can be omitted
+            if (!canOmitSpace(previousCharacter, nextCharacter)) {
+                out << ' ';
+            }
+        } else if (currentCharacter == '\n') {
+            // Check if new line
+
+            //Skip multiple new lines
+            //Skip new line followed by space or tab
+            while (nextCharacter == '\n' || isSpaceOrTab(nextCharacter)) {
+                in >> nextCharacter;
+            }
+
+            // Check if new line can be omitted
+            if (!canOmitNewLine(previousCharacter, nextCharacter)) {
+                out << '\n';
+            }
+        } else if (isQuote(currentCharacter)) {
+            // Print the current quote and nextCharacter as is
+            out << currentCharacter;
+            out << nextCharacter;
+
+            // Store the type of quote we are processing
+            QChar quote = currentCharacter;
+
+            // Don't modify the quoted strings
+            while (nextCharacter != quote) {
+                in >> nextCharacter;
+                out << nextCharacter;
+            }
+
+            //Start fresh after handling quoted strings
+            previousCharacter = nextCharacter;
+            in >> currentCharacter;
+            continue;
+        } else {
+            // In all other cases write the currentCharacter to outputFile
+            out << currentCharacter;
+        }
+
+        previousCharacter = currentCharacter;
+        currentCharacter = nextCharacter;
+    }
+
+    //write currentCharacter to output file when nextCharacter reaches EOF
+    if (currentCharacter != '\n') {
+        out << currentCharacter;
+    }
+
+    // Successful bake. Return true
+    return true;
+}
+
+void JSBaker::handleSingleLineComments(QTextStream& in) {
+    QChar character;
+    while (!in.atEnd()) {
+        in >> character;
+        if (character == '\n') {
+            break;
+        }
+    }
+}
+
+bool JSBaker::handleMultiLineComments(QTextStream& in) {
+    QChar character;
+    while (!in.atEnd()) {
+        in >> character;
+        if (character == '*') {
+            if (in.read(1) == '/') {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+bool JSBaker::canOmitSpace(QChar previousCharacter, QChar nextCharacter) {
+    return(!((isAlphanum(previousCharacter) || isNonAscii(previousCharacter) || isSpecialCharacter(previousCharacter)) &&
+        (isAlphanum(nextCharacter) || isNonAscii(nextCharacter) || isSpecialCharacter(nextCharacter)))
+           );
+}
+
+bool JSBaker::canOmitNewLine(QChar previousCharacter, QChar nextCharacter) {
+    return (!((isAlphanum(previousCharacter) || isNonAscii(previousCharacter) || isSpecialCharacterPrevious(previousCharacter)) &&
+        (isAlphanum(nextCharacter) || isNonAscii(nextCharacter) || isSpecialCharacterNext(nextCharacter)))
+            );
+}
+
+//Check if character is alphabet, number or one of the following: '_', '$', '\\' or a non-ASCII character
+bool JSBaker::isAlphanum(QChar c) {
+    return ((c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') || (c >= 'A' && c <= 'Z')
+            || c == '_' || c == '$' || c == '\\' || c > ASCII_CHARACTERS_UPPER_LIMIT);
+}
+
+bool JSBaker::isNonAscii(QChar c) {
+    return ((int)c.toLatin1() > ASCII_CHARACTERS_UPPER_LIMIT);
+}
+
+// If previous and next characters are special characters, don't omit space
+bool JSBaker::isSpecialCharacter(QChar c) {
+    return (c == '\'' || c == '$' || c == '_' || c == '/' || c== '+' || c == '-');
+}
+
+// If previous character is a special character, maybe don't omit new line (depends on next character as well)
+bool JSBaker::isSpecialCharacterPrevious(QChar c) {
+    return (c == '\'' || c == '$' || c == '_' || c == '}' || c == ']' || c == ')' || c == '+' || c == '-'
+            || c == '"' || c == "'");
+}
+
+// If next character is a special character, maybe don't omit new line (depends on previous character as well)
+bool JSBaker::isSpecialCharacterNext(QChar c) {
+    return (c == '\'' || c == '$' || c == '_' || c == '{' || c == '[' || c == '(' || c == '+' || c == '-');
+}
+
+// Check if white space or tab
+bool JSBaker::isSpaceOrTab(QChar c) {
+    return (c == ' ' || c == '\t');
+}
+
+// Check If the currentCharacter is " or ' or `
+bool JSBaker::isQuote(QChar c) {
+    return (c == '"' || c == "'" || c == '`');
+}
diff --git a/libraries/baking/src/JSBaker.h b/libraries/baking/src/JSBaker.h
new file mode 100644
index 0000000000..b5889440cb
--- /dev/null
+++ b/libraries/baking/src/JSBaker.h
@@ -0,0 +1,49 @@
+//
+//  JSBaker.h
+//  libraries/baking/src
+//
+//  Created by Utkarsh Gautam on 9/18/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_JSBaker_h
+#define hifi_JSBaker_h
+
+#include "Baker.h"
+#include "JSBakingLoggingCategory.h"
+
+static const QString BAKED_JS_EXTENSION = ".baked.js";
+
+class JSBaker : public Baker {
+    Q_OBJECT
+public:
+    JSBaker(const QUrl& jsURL, const QString& bakedOutputDir);
+    static bool bakeJS(const QByteArray& inputFile, QByteArray& outputFile);
+
+public slots:
+    virtual void bake() override;
+
+private:
+    QUrl _jsURL;
+    QString _bakedOutputDir;
+    QString _bakedJSFilePath;
+
+    static void handleSingleLineComments(QTextStream& in);
+    static bool handleMultiLineComments(QTextStream& in);
+
+    static bool canOmitSpace(QChar previousCharacter, QChar nextCharacter);
+    static bool canOmitNewLine(QChar previousCharacter, QChar nextCharacter);
+
+    static bool isAlphanum(QChar c);
+    static bool isNonAscii(QChar c);
+    static bool isSpecialCharacter(QChar c);
+    static bool isSpecialCharacterPrevious(QChar c);
+    static bool isSpecialCharacterNext(QChar c);
+    static bool isSpaceOrTab(QChar c);
+    static bool isQuote(QChar c);
+};
+
+#endif // !hifi_JSBaker_h
diff --git a/libraries/baking/src/JSBakingLoggingCategory.cpp b/libraries/baking/src/JSBakingLoggingCategory.cpp
new file mode 100644
index 0000000000..77c667922f
--- /dev/null
+++ b/libraries/baking/src/JSBakingLoggingCategory.cpp
@@ -0,0 +1,14 @@
+//
+//  JSBakingLoggingCategory.cpp
+//  libraries/baking/src
+//
+//  Created by Utkarsh Gautam on 9/18/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include "JSBakingLoggingCategory.h"
+
+Q_LOGGING_CATEGORY(js_baking, "hifi.JS-baking");
diff --git a/libraries/baking/src/JSBakingLoggingCategory.h b/libraries/baking/src/JSBakingLoggingCategory.h
new file mode 100644
index 0000000000..2c3ff535af
--- /dev/null
+++ b/libraries/baking/src/JSBakingLoggingCategory.h
@@ -0,0 +1,19 @@
+//
+//  JSBakingLoggingCategory.h
+//  libraries/baking/src
+//
+//  Created by Utkarsh Gautam on 9/18/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_JSBakingLoggingCategory_h
+#define hifi_JSBakingLoggingCategory_h
+
+#include <QtCore/QLoggingCategory>
+
+Q_DECLARE_LOGGING_CATEGORY(js_baking)
+
+#endif // hifi_ModelBakingLoggingCategory_h
diff --git a/tools/oven/src/ModelBakingLoggingCategory.cpp b/libraries/baking/src/ModelBakingLoggingCategory.cpp
similarity index 100%
rename from tools/oven/src/ModelBakingLoggingCategory.cpp
rename to libraries/baking/src/ModelBakingLoggingCategory.cpp
diff --git a/tools/oven/src/ModelBakingLoggingCategory.h b/libraries/baking/src/ModelBakingLoggingCategory.h
similarity index 100%
rename from tools/oven/src/ModelBakingLoggingCategory.h
rename to libraries/baking/src/ModelBakingLoggingCategory.h
diff --git a/tools/oven/src/TextureBaker.cpp b/libraries/baking/src/TextureBaker.cpp
similarity index 71%
rename from tools/oven/src/TextureBaker.cpp
rename to libraries/baking/src/TextureBaker.cpp
index 70df511d2c..1a320efabc 100644
--- a/tools/oven/src/TextureBaker.cpp
+++ b/libraries/baking/src/TextureBaker.cpp
@@ -25,22 +25,48 @@
 
 const QString BAKED_TEXTURE_EXT = ".ktx";
 
-TextureBaker::TextureBaker(const QUrl& textureURL, image::TextureUsage::Type textureType, const QDir& outputDirectory) :
+TextureBaker::TextureBaker(const QUrl& textureURL, image::TextureUsage::Type textureType,
+                           const QDir& outputDirectory, const QString& bakedFilename,
+                           const QByteArray& textureContent) :
     _textureURL(textureURL),
+    _originalTexture(textureContent),
     _textureType(textureType),
-    _outputDirectory(outputDirectory)
+    _outputDirectory(outputDirectory),
+    _bakedTextureFileName(bakedFilename)
 {
-    // figure out the baked texture filename
-    auto originalFilename = textureURL.fileName();
-    _bakedTextureFileName = originalFilename.left(originalFilename.lastIndexOf('.')) + BAKED_TEXTURE_EXT;
+    if (bakedFilename.isEmpty()) {
+        // figure out the baked texture filename
+        auto originalFilename = textureURL.fileName();
+        _bakedTextureFileName = originalFilename.left(originalFilename.lastIndexOf('.')) + BAKED_TEXTURE_EXT;
+    }
 }
 
 void TextureBaker::bake() {
     // once our texture is loaded, kick off a the processing
     connect(this, &TextureBaker::originalTextureLoaded, this, &TextureBaker::processTexture);
 
-    // first load the texture (either locally or remotely)
-    loadTexture();
+    if (_originalTexture.isEmpty()) {
+        // first load the texture (either locally or remotely)
+        loadTexture();
+    } else {
+        // we already have a texture passed to us, use that
+        emit originalTextureLoaded();
+    }
+}
+
+void TextureBaker::abort() {
+    Baker::abort();
+
+    // flip our atomic bool so any ongoing texture processing is stopped
+    _abortProcessing.store(true);
+}
+
+const QStringList TextureBaker::getSupportedFormats() {
+    auto formats = QImageReader::supportedImageFormats();
+    QStringList stringFormats;
+    std::transform(formats.begin(), formats.end(), std::back_inserter(stringFormats),
+                   [](QByteArray& format) -> QString { return format; });
+    return stringFormats;
 }
 
 void TextureBaker::loadTexture() {
@@ -96,7 +122,11 @@ void TextureBaker::handleTextureNetworkReply() {
 
 void TextureBaker::processTexture() {
     auto processedTexture = image::processImage(_originalTexture, _textureURL.toString().toStdString(),
-                                                ABSOLUTE_MAX_TEXTURE_NUM_PIXELS, _textureType);
+                                                ABSOLUTE_MAX_TEXTURE_NUM_PIXELS, _textureType, _abortProcessing);
+
+    if (shouldStop()) {
+        return;
+    }
 
     if (!processedTexture) {
         handleError("Could not process texture " + _textureURL.toString());
@@ -120,12 +150,21 @@ void TextureBaker::processTexture() {
     const size_t length = memKTX->_storage->size();
 
     // attempt to write the baked texture to the destination file path
-    QFile bakedTextureFile { _outputDirectory.absoluteFilePath(_bakedTextureFileName) };
+    auto filePath = _outputDirectory.absoluteFilePath(_bakedTextureFileName);
+    QFile bakedTextureFile { filePath };
 
     if (!bakedTextureFile.open(QIODevice::WriteOnly) || bakedTextureFile.write(data, length) == -1) {
         handleError("Could not write baked texture for " + _textureURL.toString());
+    } else {
+        _outputFiles.push_back(filePath);
     }
 
     qCDebug(model_baking) << "Baked texture" << _textureURL;
-    emit finished();
+    setIsFinished(true);
+}
+
+void TextureBaker::setWasAborted(bool wasAborted) {
+    Baker::setWasAborted(wasAborted);
+
+    qCDebug(model_baking) << "Aborted baking" << _textureURL;
 }
diff --git a/tools/oven/src/TextureBaker.h b/libraries/baking/src/TextureBaker.h
similarity index 77%
rename from tools/oven/src/TextureBaker.h
rename to libraries/baking/src/TextureBaker.h
index ee1e968f20..b2e86b2b5b 100644
--- a/tools/oven/src/TextureBaker.h
+++ b/libraries/baking/src/TextureBaker.h
@@ -15,6 +15,7 @@
 #include <QtCore/QObject>
 #include <QtCore/QUrl>
 #include <QtCore/QRunnable>
+#include <QImageReader>
 
 #include <image/Image.h>
 
@@ -26,7 +27,11 @@ class TextureBaker : public Baker {
     Q_OBJECT
 
 public:
-    TextureBaker(const QUrl& textureURL, image::TextureUsage::Type textureType, const QDir& outputDirectory);
+    TextureBaker(const QUrl& textureURL, image::TextureUsage::Type textureType,
+                 const QDir& outputDirectory, const QString& bakedFilename = QString(),
+                 const QByteArray& textureContent = QByteArray());
+
+    static const QStringList getSupportedFormats();
 
     const QByteArray& getOriginalTexture() const { return _originalTexture; }
 
@@ -35,8 +40,11 @@ public:
     QString getDestinationFilePath() const { return _outputDirectory.absoluteFilePath(_bakedTextureFileName); }
     QString getBakedTextureFileName() const { return _bakedTextureFileName; }
 
+    virtual void setWasAborted(bool wasAborted) override;
+
 public slots:
     virtual void bake() override;
+    virtual void abort() override; 
 
 signals:
     void originalTextureLoaded();
@@ -54,6 +62,8 @@ private:
 
     QDir _outputDirectory;
     QString _bakedTextureFileName;
+
+    std::atomic<bool> _abortProcessing { false };
 };
 
 #endif // hifi_TextureBaker_h
diff --git a/libraries/controllers/CMakeLists.txt b/libraries/controllers/CMakeLists.txt
index 6b1ab72c60..9c6bbf4aae 100644
--- a/libraries/controllers/CMakeLists.txt
+++ b/libraries/controllers/CMakeLists.txt
@@ -8,7 +8,3 @@ link_hifi_libraries(shared)
 include_hifi_library_headers(networking)
 
 GroupSources("src/controllers")
-
-add_dependency_external_projects(glm)
-find_package(GLM REQUIRED)
-target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS} "${CMAKE_BINARY_DIR}/includes")
diff --git a/libraries/controllers/src/controllers/Actions.cpp b/libraries/controllers/src/controllers/Actions.cpp
index 96e433bcc8..d8dd7f5e35 100644
--- a/libraries/controllers/src/controllers/Actions.cpp
+++ b/libraries/controllers/src/controllers/Actions.cpp
@@ -59,6 +59,65 @@ namespace controller {
             makePosePair(Action::SPINE2, "Spine2"),
             makePosePair(Action::HEAD, "Head"),
 
+            makePosePair(Action::LEFT_HAND_THUMB1, "LeftHandThumb1"),
+            makePosePair(Action::LEFT_HAND_THUMB2, "LeftHandThumb2"),
+            makePosePair(Action::LEFT_HAND_THUMB3, "LeftHandThumb3"),
+            makePosePair(Action::LEFT_HAND_THUMB4, "LeftHandThumb4"),
+            makePosePair(Action::LEFT_HAND_INDEX1, "LeftHandIndex1"),
+            makePosePair(Action::LEFT_HAND_INDEX2, "LeftHandIndex2"),
+            makePosePair(Action::LEFT_HAND_INDEX3, "LeftHandIndex3"),
+            makePosePair(Action::LEFT_HAND_INDEX4, "LeftHandIndex4"),
+            makePosePair(Action::LEFT_HAND_MIDDLE1, "LeftHandMiddle1"),
+            makePosePair(Action::LEFT_HAND_MIDDLE2, "LeftHandMiddle2"),
+            makePosePair(Action::LEFT_HAND_MIDDLE3, "LeftHandMiddle3"),
+            makePosePair(Action::LEFT_HAND_MIDDLE4, "LeftHandMiddle4"),
+            makePosePair(Action::LEFT_HAND_RING1, "LeftHandRing1"),
+            makePosePair(Action::LEFT_HAND_RING2, "LeftHandRing2"),
+            makePosePair(Action::LEFT_HAND_RING3, "LeftHandRing3"),
+            makePosePair(Action::LEFT_HAND_RING4, "LeftHandRing4"),
+            makePosePair(Action::LEFT_HAND_PINKY1, "LeftHandPinky1"),
+            makePosePair(Action::LEFT_HAND_PINKY2, "LeftHandPinky2"),
+            makePosePair(Action::LEFT_HAND_PINKY3, "LeftHandPinky3"),
+            makePosePair(Action::LEFT_HAND_PINKY4, "LeftHandPinky4"),
+
+            makePosePair(Action::RIGHT_HAND_THUMB1, "RightHandThumb1"),
+            makePosePair(Action::RIGHT_HAND_THUMB2, "RightHandThumb2"),
+            makePosePair(Action::RIGHT_HAND_THUMB3, "RightHandThumb3"),
+            makePosePair(Action::RIGHT_HAND_THUMB4, "RightHandThumb4"),
+            makePosePair(Action::RIGHT_HAND_INDEX1, "RightHandIndex1"),
+            makePosePair(Action::RIGHT_HAND_INDEX2, "RightHandIndex2"),
+            makePosePair(Action::RIGHT_HAND_INDEX3, "RightHandIndex3"),
+            makePosePair(Action::RIGHT_HAND_INDEX4, "RightHandIndex4"),
+            makePosePair(Action::RIGHT_HAND_MIDDLE1, "RightHandMiddle1"),
+            makePosePair(Action::RIGHT_HAND_MIDDLE2, "RightHandMiddle2"),
+            makePosePair(Action::RIGHT_HAND_MIDDLE3, "RightHandMiddle3"),
+            makePosePair(Action::RIGHT_HAND_MIDDLE4, "RightHandMiddle4"),
+            makePosePair(Action::RIGHT_HAND_RING1, "RightHandRing1"),
+            makePosePair(Action::RIGHT_HAND_RING2, "RightHandRing2"),
+            makePosePair(Action::RIGHT_HAND_RING3, "RightHandRing3"),
+            makePosePair(Action::RIGHT_HAND_RING4, "RightHandRing4"),
+            makePosePair(Action::RIGHT_HAND_PINKY1, "RightHandPinky1"),
+            makePosePair(Action::RIGHT_HAND_PINKY2, "RightHandPinky2"),
+            makePosePair(Action::RIGHT_HAND_PINKY3, "RightHandPinky3"),
+            makePosePair(Action::RIGHT_HAND_PINKY4, "RightHandPinky4"),
+
+            makePosePair(Action::TRACKED_OBJECT_00, "TrackedObject00"),
+            makePosePair(Action::TRACKED_OBJECT_01, "TrackedObject01"),
+            makePosePair(Action::TRACKED_OBJECT_02, "TrackedObject02"),
+            makePosePair(Action::TRACKED_OBJECT_03, "TrackedObject03"),
+            makePosePair(Action::TRACKED_OBJECT_04, "TrackedObject04"),
+            makePosePair(Action::TRACKED_OBJECT_05, "TrackedObject05"),
+            makePosePair(Action::TRACKED_OBJECT_06, "TrackedObject06"),
+            makePosePair(Action::TRACKED_OBJECT_07, "TrackedObject07"),
+            makePosePair(Action::TRACKED_OBJECT_08, "TrackedObject08"),
+            makePosePair(Action::TRACKED_OBJECT_09, "TrackedObject09"),
+            makePosePair(Action::TRACKED_OBJECT_10, "TrackedObject10"),
+            makePosePair(Action::TRACKED_OBJECT_11, "TrackedObject11"),
+            makePosePair(Action::TRACKED_OBJECT_12, "TrackedObject12"),
+            makePosePair(Action::TRACKED_OBJECT_13, "TrackedObject13"),
+            makePosePair(Action::TRACKED_OBJECT_14, "TrackedObject14"),
+            makePosePair(Action::TRACKED_OBJECT_15, "TrackedObject15"),
+
             makeButtonPair(Action::LEFT_HAND_CLICK, "LeftHandClick"),
             makeButtonPair(Action::RIGHT_HAND_CLICK, "RightHandClick"),
 
diff --git a/libraries/controllers/src/controllers/Actions.h b/libraries/controllers/src/controllers/Actions.h
index 2cb500c42a..a133d62c9f 100644
--- a/libraries/controllers/src/controllers/Actions.h
+++ b/libraries/controllers/src/controllers/Actions.h
@@ -101,11 +101,81 @@ enum class Action {
     // Bisected aliases for TRANSLATE_CAMERA_Z
     BOOM_IN,
     BOOM_OUT,
+
     LEFT_ARM,
     RIGHT_ARM,
 
+    LEFT_HAND_THUMB1,
+    LEFT_HAND_THUMB2,
+    LEFT_HAND_THUMB3,
+    LEFT_HAND_THUMB4,
+    LEFT_HAND_INDEX1,
+    LEFT_HAND_INDEX2,
+    LEFT_HAND_INDEX3,
+    LEFT_HAND_INDEX4,
+    LEFT_HAND_MIDDLE1,
+    LEFT_HAND_MIDDLE2,
+    LEFT_HAND_MIDDLE3,
+    LEFT_HAND_MIDDLE4,
+    LEFT_HAND_RING1,
+    LEFT_HAND_RING2,
+    LEFT_HAND_RING3,
+    LEFT_HAND_RING4,
+    LEFT_HAND_PINKY1,
+    LEFT_HAND_PINKY2,
+    LEFT_HAND_PINKY3,
+    LEFT_HAND_PINKY4,
 
-    NUM_ACTIONS,
+    RIGHT_HAND_THUMB1,
+    RIGHT_HAND_THUMB2,
+    RIGHT_HAND_THUMB3,
+    RIGHT_HAND_THUMB4,
+    RIGHT_HAND_INDEX1,
+    RIGHT_HAND_INDEX2,
+    RIGHT_HAND_INDEX3,
+    RIGHT_HAND_INDEX4,
+    RIGHT_HAND_MIDDLE1,
+    RIGHT_HAND_MIDDLE2,
+    RIGHT_HAND_MIDDLE3,
+    RIGHT_HAND_MIDDLE4,
+    RIGHT_HAND_RING1,
+    RIGHT_HAND_RING2,
+    RIGHT_HAND_RING3,
+    RIGHT_HAND_RING4,
+    RIGHT_HAND_PINKY1,
+    RIGHT_HAND_PINKY2,
+    RIGHT_HAND_PINKY3,
+    RIGHT_HAND_PINKY4,
+
+    LEFT_SHOULDER,
+    RIGHT_SHOULDER,
+    LEFT_FORE_ARM,
+    RIGHT_FORE_ARM,
+    LEFT_LEG,
+    RIGHT_LEG,
+    LEFT_UP_LEG,
+    RIGHT_UP_LEG,
+    LEFT_TOE_BASE,
+    RIGHT_TOE_BASE,
+
+    TRACKED_OBJECT_00,
+    TRACKED_OBJECT_01,
+    TRACKED_OBJECT_02,
+    TRACKED_OBJECT_03,
+    TRACKED_OBJECT_04,
+    TRACKED_OBJECT_05,
+    TRACKED_OBJECT_06,
+    TRACKED_OBJECT_07,
+    TRACKED_OBJECT_08,
+    TRACKED_OBJECT_09,
+    TRACKED_OBJECT_10,
+    TRACKED_OBJECT_11,
+    TRACKED_OBJECT_12,
+    TRACKED_OBJECT_13,
+    TRACKED_OBJECT_14,
+    TRACKED_OBJECT_15,
+
+    NUM_ACTIONS
 };
 
 template <typename T>
diff --git a/libraries/controllers/src/controllers/InputDevice.cpp b/libraries/controllers/src/controllers/InputDevice.cpp
index dd27726a55..a907842a17 100644
--- a/libraries/controllers/src/controllers/InputDevice.cpp
+++ b/libraries/controllers/src/controllers/InputDevice.cpp
@@ -15,20 +15,6 @@
 
 namespace controller {
 
-    const float DEFAULT_HAND_RETICLE_MOVE_SPEED = 37.5f;
-    float InputDevice::_reticleMoveSpeed = DEFAULT_HAND_RETICLE_MOVE_SPEED;
-
-    //Constants for getCursorPixelRangeMultiplier()
-    const float MIN_PIXEL_RANGE_MULT = 0.4f;
-    const float MAX_PIXEL_RANGE_MULT = 2.0f;
-    const float RANGE_MULT = (MAX_PIXEL_RANGE_MULT - MIN_PIXEL_RANGE_MULT) * 0.01f;
-
-    //Returns a multiplier to be applied to the cursor range for the controllers
-    float InputDevice::getCursorPixelRangeMult() {
-        //scales (0,100) to (MINIMUM_PIXEL_RANGE_MULT, MAXIMUM_PIXEL_RANGE_MULT)
-        return InputDevice::_reticleMoveSpeed * RANGE_MULT + MIN_PIXEL_RANGE_MULT;
-    }
-
     float InputDevice::getButton(int channel) const {
         if (!_buttonPressedMap.empty()) {
             if (_buttonPressedMap.find(channel) != _buttonPressedMap.end()) {
diff --git a/libraries/controllers/src/controllers/InputDevice.h b/libraries/controllers/src/controllers/InputDevice.h
index 9d46930104..ff665d912d 100644
--- a/libraries/controllers/src/controllers/InputDevice.h
+++ b/libraries/controllers/src/controllers/InputDevice.h
@@ -73,10 +73,6 @@ public:
     int getDeviceID() { return _deviceID; }
     void setDeviceID(int deviceID) { _deviceID = deviceID; }
 
-    static float getCursorPixelRangeMult();
-    static float getReticleMoveSpeed() { return _reticleMoveSpeed; }
-    static void setReticleMoveSpeed(float reticleMoveSpeed) { _reticleMoveSpeed = reticleMoveSpeed; }
-
     Input makeInput(StandardButtonChannel button) const;
     Input makeInput(StandardAxisChannel axis) const;
     Input makeInput(StandardPoseChannel pose) const;
@@ -99,9 +95,6 @@ protected:
     ButtonPressedMap _buttonPressedMap;
     AxisStateMap _axisStateMap;
     PoseStateMap _poseStateMap;
-
-private:
-    static float _reticleMoveSpeed;
 };
 
 }
diff --git a/libraries/controllers/src/controllers/StandardController.cpp b/libraries/controllers/src/controllers/StandardController.cpp
index 8e49bb0ebf..ed729867df 100644
--- a/libraries/controllers/src/controllers/StandardController.cpp
+++ b/libraries/controllers/src/controllers/StandardController.cpp
@@ -101,7 +101,47 @@ Input::NamedVector StandardController::getAvailableInputs() const {
 
         // Poses
         makePair(LEFT_HAND, "LeftHand"),
+        makePair(LEFT_HAND_THUMB1, "LeftHandThumb1"),
+        makePair(LEFT_HAND_THUMB2, "LeftHandThumb2"),
+        makePair(LEFT_HAND_THUMB3, "LeftHandThumb3"),
+        makePair(LEFT_HAND_THUMB4, "LeftHandThumb4"),
+        makePair(LEFT_HAND_INDEX1, "LeftHandIndex1"),
+        makePair(LEFT_HAND_INDEX2, "LeftHandIndex2"),
+        makePair(LEFT_HAND_INDEX3, "LeftHandIndex3"),
+        makePair(LEFT_HAND_INDEX4, "LeftHandIndex4"),
+        makePair(LEFT_HAND_MIDDLE1, "LeftHandMiddle1"),
+        makePair(LEFT_HAND_MIDDLE2, "LeftHandMiddle2"),
+        makePair(LEFT_HAND_MIDDLE3, "LeftHandMiddle3"),
+        makePair(LEFT_HAND_MIDDLE4, "LeftHandMiddle4"),
+        makePair(LEFT_HAND_RING1, "LeftHandRing1"),
+        makePair(LEFT_HAND_RING2, "LeftHandRing2"),
+        makePair(LEFT_HAND_RING3, "LeftHandRing3"),
+        makePair(LEFT_HAND_RING4, "LeftHandRing4"),
+        makePair(LEFT_HAND_PINKY1, "LeftHandPinky1"),
+        makePair(LEFT_HAND_PINKY2, "LeftHandPinky2"),
+        makePair(LEFT_HAND_PINKY3, "LeftHandPinky3"),
+        makePair(LEFT_HAND_PINKY4, "LeftHandPinky4"),
         makePair(RIGHT_HAND, "RightHand"),
+        makePair(RIGHT_HAND_THUMB1, "RightHandThumb1"),
+        makePair(RIGHT_HAND_THUMB2, "RightHandThumb2"),
+        makePair(RIGHT_HAND_THUMB3, "RightHandThumb3"),
+        makePair(RIGHT_HAND_THUMB4, "RightHandThumb4"),
+        makePair(RIGHT_HAND_INDEX1, "RightHandIndex1"),
+        makePair(RIGHT_HAND_INDEX2, "RightHandIndex2"),
+        makePair(RIGHT_HAND_INDEX3, "RightHandIndex3"),
+        makePair(RIGHT_HAND_INDEX4, "RightHandIndex4"),
+        makePair(RIGHT_HAND_MIDDLE1, "RightHandMiddle1"),
+        makePair(RIGHT_HAND_MIDDLE2, "RightHandMiddle2"),
+        makePair(RIGHT_HAND_MIDDLE3, "RightHandMiddle3"),
+        makePair(RIGHT_HAND_MIDDLE4, "RightHandMiddle4"),
+        makePair(RIGHT_HAND_RING1, "RightHandRing1"),
+        makePair(RIGHT_HAND_RING2, "RightHandRing2"),
+        makePair(RIGHT_HAND_RING3, "RightHandRing3"),
+        makePair(RIGHT_HAND_RING4, "RightHandRing4"),
+        makePair(RIGHT_HAND_PINKY1, "RightHandPinky1"),
+        makePair(RIGHT_HAND_PINKY2, "RightHandPinky2"),
+        makePair(RIGHT_HAND_PINKY3, "RightHandPinky3"),
+        makePair(RIGHT_HAND_PINKY4, "RightHandPinky4"),
         makePair(LEFT_FOOT, "LeftFoot"),
         makePair(RIGHT_FOOT, "RightFoot"),
         makePair(RIGHT_ARM, "RightArm"),
@@ -126,6 +166,23 @@ Input::NamedVector StandardController::getAvailableInputs() const {
         makePair(DD, "Down"),
         makePair(DL, "Left"),
         makePair(DR, "Right"),
+
+        makePair(TRACKED_OBJECT_00, "TrackedObject00"),
+        makePair(TRACKED_OBJECT_01, "TrackedObject01"),
+        makePair(TRACKED_OBJECT_02, "TrackedObject02"),
+        makePair(TRACKED_OBJECT_03, "TrackedObject03"),
+        makePair(TRACKED_OBJECT_04, "TrackedObject04"),
+        makePair(TRACKED_OBJECT_05, "TrackedObject05"),
+        makePair(TRACKED_OBJECT_06, "TrackedObject06"),
+        makePair(TRACKED_OBJECT_07, "TrackedObject07"),
+        makePair(TRACKED_OBJECT_08, "TrackedObject08"),
+        makePair(TRACKED_OBJECT_09, "TrackedObject09"),
+        makePair(TRACKED_OBJECT_10, "TrackedObject10"),
+        makePair(TRACKED_OBJECT_11, "TrackedObject11"),
+        makePair(TRACKED_OBJECT_12, "TrackedObject12"),
+        makePair(TRACKED_OBJECT_13, "TrackedObject13"),
+        makePair(TRACKED_OBJECT_14, "TrackedObject14"),
+        makePair(TRACKED_OBJECT_15, "TrackedObject15")
     };
     return availableInputs;
 }
diff --git a/libraries/controllers/src/controllers/impl/Filter.cpp b/libraries/controllers/src/controllers/impl/Filter.cpp
index e75465f007..b6c3ed4d27 100644
--- a/libraries/controllers/src/controllers/impl/Filter.cpp
+++ b/libraries/controllers/src/controllers/impl/Filter.cpp
@@ -22,6 +22,7 @@
 #include "filters/DeadZoneFilter.h"
 #include "filters/HysteresisFilter.h"
 #include "filters/InvertFilter.h"
+#include "filters/NotFilter.h"
 #include "filters/PulseFilter.h"
 #include "filters/ScaleFilter.h"
 #include "filters/TranslateFilter.h"
@@ -40,6 +41,7 @@ REGISTER_FILTER_CLASS_INSTANCE(ConstrainToPositiveIntegerFilter, "constrainToPos
 REGISTER_FILTER_CLASS_INSTANCE(DeadZoneFilter, "deadZone")
 REGISTER_FILTER_CLASS_INSTANCE(HysteresisFilter, "hysteresis")
 REGISTER_FILTER_CLASS_INSTANCE(InvertFilter, "invert")
+REGISTER_FILTER_CLASS_INSTANCE(NotFilter, "logicalNot")
 REGISTER_FILTER_CLASS_INSTANCE(ScaleFilter, "scale")
 REGISTER_FILTER_CLASS_INSTANCE(PulseFilter, "pulse")
 REGISTER_FILTER_CLASS_INSTANCE(TranslateFilter, "translate")
diff --git a/libraries/controllers/src/controllers/impl/RouteBuilderProxy.cpp b/libraries/controllers/src/controllers/impl/RouteBuilderProxy.cpp
index 581d51ea61..bc1ef55725 100644
--- a/libraries/controllers/src/controllers/impl/RouteBuilderProxy.cpp
+++ b/libraries/controllers/src/controllers/impl/RouteBuilderProxy.cpp
@@ -24,6 +24,7 @@
 #include "filters/DeadZoneFilter.h"
 #include "filters/HysteresisFilter.h"
 #include "filters/InvertFilter.h"
+#include "filters/NotFilter.h"
 #include "filters/PulseFilter.h"
 #include "filters/ScaleFilter.h"
 #include "filters/TranslateFilter.h"
@@ -148,6 +149,11 @@ QObject* RouteBuilderProxy::pulse(float interval) {
     return this;
 }
 
+QObject* RouteBuilderProxy::logicalNot() {
+    addFilter(std::make_shared<NotFilter>());
+    return this;
+}
+
 void RouteBuilderProxy::addFilter(Filter::Pointer filter) {
     _route->filters.push_back(filter);
 }
diff --git a/libraries/controllers/src/controllers/impl/RouteBuilderProxy.h b/libraries/controllers/src/controllers/impl/RouteBuilderProxy.h
index 102e72b3ad..75f3747566 100644
--- a/libraries/controllers/src/controllers/impl/RouteBuilderProxy.h
+++ b/libraries/controllers/src/controllers/impl/RouteBuilderProxy.h
@@ -53,6 +53,7 @@ class RouteBuilderProxy : public QObject {
         Q_INVOKABLE QObject* postTransform(glm::mat4 transform);
         Q_INVOKABLE QObject* rotate(glm::quat rotation);
         Q_INVOKABLE QObject* lowVelocity(float rotationConstant, float translationConstant);
+        Q_INVOKABLE QObject* logicalNot();
 
     private:
         void to(const Endpoint::Pointer& destination);
diff --git a/libraries/controllers/src/controllers/impl/filters/NotFilter.cpp b/libraries/controllers/src/controllers/impl/filters/NotFilter.cpp
new file mode 100644
index 0000000000..73460aed91
--- /dev/null
+++ b/libraries/controllers/src/controllers/impl/filters/NotFilter.cpp
@@ -0,0 +1,10 @@
+#include "NotFilter.h"
+
+using namespace controller;
+
+NotFilter::NotFilter() {
+}
+
+float NotFilter::apply(float value) const {
+    return (value == 0.0f) ? 1.0f : 0.0f;
+}
diff --git a/libraries/controllers/src/controllers/impl/filters/NotFilter.h b/libraries/controllers/src/controllers/impl/filters/NotFilter.h
new file mode 100644
index 0000000000..ceb7d29de3
--- /dev/null
+++ b/libraries/controllers/src/controllers/impl/filters/NotFilter.h
@@ -0,0 +1,21 @@
+#pragma once
+#ifndef hifi_Controllers_Filters_Not_h
+#define hifi_Controllers_Filters_Not_h
+
+#include "../Filter.h"
+
+namespace controller {
+
+class NotFilter : public Filter {
+    REGISTER_FILTER_CLASS(NotFilter);
+public:
+    NotFilter();
+
+    virtual float apply(float value) const override;
+    virtual Pose apply(Pose value) const override { return value; }
+};
+
+}
+
+#endif
+
diff --git a/libraries/display-plugins/src/display-plugins/CompositorHelper.cpp b/libraries/display-plugins/src/display-plugins/CompositorHelper.cpp
index d8e0c59da7..7b639e8308 100644
--- a/libraries/display-plugins/src/display-plugins/CompositorHelper.cpp
+++ b/libraries/display-plugins/src/display-plugins/CompositorHelper.cpp
@@ -11,14 +11,17 @@
 #include <memory>
 #include <math.h>
 
+#include <glm/gtc/type_ptr.hpp>
+
 #include <QtCore/QTimer>
 #include <QtCore/QThread>
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QDesktopWidget>
-#include <glm/gtc/type_ptr.hpp>
 #include <QtGui/QWindow>
 #include <QQuickWindow>
 
+#include <DebugDraw.h>
+#include <shared/QtHelpers.h>
 #include <ui/Menu.h>
 #include <NumericalConstants.h>
 #include <DependencyManager.h>
@@ -231,7 +234,8 @@ void CompositorHelper::handleLeaveEvent() {
 
 bool CompositorHelper::handleRealMouseMoveEvent(bool sendFakeEvent) {
     // If the mouse move came from a capture mouse related move, we completely ignore it.
-    if (_ignoreMouseMove) {
+    // Note: if not going to synthesize event - do not touch _ignoreMouseMove flag
+    if (_ignoreMouseMove && sendFakeEvent) {
         _ignoreMouseMove = false;
         return true; // swallow the event
     }
@@ -243,7 +247,12 @@ bool CompositorHelper::handleRealMouseMoveEvent(bool sendFakeEvent) {
         auto changeInRealMouse = newPosition - _lastKnownRealMouse;
         auto newReticlePosition = _reticlePositionInHMD + toGlm(changeInRealMouse);
         setReticlePosition(newReticlePosition, sendFakeEvent);
-        _ignoreMouseMove = true;
+
+        // Note: if not going to synthesize event - do not touch _ignoreMouseMove flag
+        if (sendFakeEvent) {
+            _ignoreMouseMove = true;
+        }
+
         QCursor::setPos(QPoint(_lastKnownRealMouse.x(), _lastKnownRealMouse.y())); // move cursor back to where it was
         return true;  // swallow the event
     } else {
@@ -289,7 +298,7 @@ glm::vec2 CompositorHelper::getReticleMaximumPosition() const {
 
 void CompositorHelper::sendFakeMouseEvent() {
     if (qApp->thread() != QThread::currentThread()) {
-        QMetaObject::invokeMethod(this, "sendFakeMouseEvent", Qt::BlockingQueuedConnection);
+        BLOCKING_INVOKE_METHOD(this, "sendFakeMouseEvent");
         return;
     }
 
@@ -337,24 +346,29 @@ void CompositorHelper::computeHmdPickRay(const glm::vec2& cursorPos, glm::vec3&
 glm::mat4 CompositorHelper::getUiTransform() const {
     glm::mat4 modelMat;
     _modelTransform.getMatrix(modelMat);
-    return _currentCamera * glm::inverse(_currentDisplayPlugin->getHeadPose()) * modelMat;
+    return _sensorToWorldMatrix * modelMat;
 }
 
 //Finds the collision point of a world space ray
 bool CompositorHelper::calculateRayUICollisionPoint(const glm::vec3& position, const glm::vec3& direction, glm::vec3& result) const {
-    auto UITransform = getUiTransform();
-    auto relativePosition4 = glm::inverse(UITransform) * vec4(position, 1);
-    auto relativePosition = vec3(relativePosition4) / relativePosition4.w;
-    auto relativeDirection = glm::inverse(glm::quat_cast(UITransform)) * direction;
-
-    float uiRadius = _hmdUIRadius; // * myAvatar->getUniformScale(); // FIXME - how do we want to handle avatar scale
+    glm::mat4 uiToWorld = getUiTransform();
+    glm::mat4 worldToUi = glm::inverse(uiToWorld);
+    glm::vec3 localPosition = transformPoint(worldToUi, position);
+    glm::vec3 localDirection = glm::normalize(transformVectorFast(worldToUi, direction));
 
+    const float UI_RADIUS = 1.0f;
     float instersectionDistance;
-    if (raySphereIntersect(relativeDirection, relativePosition, uiRadius, &instersectionDistance)){
-        result = position + glm::normalize(direction) * instersectionDistance;
+    if (raySphereIntersect(localDirection, localPosition, UI_RADIUS, &instersectionDistance)) {
+        result = transformPoint(uiToWorld, localPosition + localDirection * instersectionDistance);
+#ifdef WANT_DEBUG
+        DebugDraw::getInstance().drawRay(position, result, glm::vec4(0.0f, 1.0f, 0.0f, 1.0f));
+#endif
         return true;
+    } else {
+#ifdef WANT_DEBUG
+        DebugDraw::getInstance().drawRay(position, position + (direction * 1000.0f), glm::vec4(1.0f, 0.0f, 0.0f, 1.0f));
+#endif
     }
-
     return false;
 }
 
@@ -436,7 +450,7 @@ glm::mat4 CompositorHelper::getReticleTransform(const glm::mat4& eyePose, const
         mousePosition -= 1.0;
         mousePosition.y *= -1.0f;
 
-        vec2 mouseSize = CURSOR_PIXEL_SIZE / canvasSize;
+        vec2 mouseSize = CURSOR_PIXEL_SIZE * Cursor::Manager::instance().getScale() / canvasSize;
         result = glm::scale(glm::translate(glm::mat4(), vec3(mousePosition, 0.0f)), vec3(mouseSize, 1.0f));
     }
     return result;
@@ -450,3 +464,13 @@ QVariant ReticleInterface::getPosition() const {
 void ReticleInterface::setPosition(QVariant position) {
     _compositor->setReticlePosition(vec2FromVariant(position));
 }
+
+float ReticleInterface::getScale() const {
+    auto& cursorManager = Cursor::Manager::instance();
+    return cursorManager.getScale();
+}
+
+void ReticleInterface::setScale(float scale) {
+    auto& cursorManager = Cursor::Manager::instance();
+    cursorManager.setScale(scale);
+}
diff --git a/libraries/display-plugins/src/display-plugins/CompositorHelper.h b/libraries/display-plugins/src/display-plugins/CompositorHelper.h
index 5be2d68cf9..f448375f0d 100644
--- a/libraries/display-plugins/src/display-plugins/CompositorHelper.h
+++ b/libraries/display-plugins/src/display-plugins/CompositorHelper.h
@@ -74,6 +74,7 @@ public:
 
     void setModelTransform(const Transform& transform) { _modelTransform = transform; }
     const Transform& getModelTransform() const { return _modelTransform; }
+    glm::mat4 getUiTransform() const;
 
     float getAlpha() const { return _alpha; }
     void setAlpha(float alpha) { if (alpha != _alpha) { emit alphaChanged();  _alpha = alpha; } }
@@ -109,9 +110,10 @@ public:
     void setReticleOverDesktop(bool value) { _isOverDesktop = value; }
 
     void setDisplayPlugin(const DisplayPluginPointer& displayPlugin) { _currentDisplayPlugin = displayPlugin; }
-    void setFrameInfo(uint32_t frame, const glm::mat4& camera) { _currentCamera = camera; }
-
-    float getHmdUiRadius() const { return _hmdUIRadius; }
+    void setFrameInfo(uint32_t frame, const glm::mat4& camera, const glm::mat4& sensorToWorldMatrix) {
+        _currentCamera = camera;
+        _sensorToWorldMatrix = sensorToWorldMatrix;
+    }
 
 signals:
     void allowMouseCaptureChanged();
@@ -121,11 +123,11 @@ protected slots:
     void sendFakeMouseEvent();
 
 private:
-    glm::mat4 getUiTransform() const;
     void updateTooltips();
 
     DisplayPluginPointer _currentDisplayPlugin;
     glm::mat4 _currentCamera;
+    glm::mat4 _sensorToWorldMatrix;
     QWidget* _renderingWidget{ nullptr };
 
     //// Support for hovering and tooltips
@@ -142,7 +144,6 @@ private:
     float _textureAspectRatio { VIRTUAL_UI_ASPECT_RATIO };
 
     float _alpha { 1.0f };
-    float _hmdUIRadius { 1.0f };
 
     int _previousBorderWidth { -1 };
     int _previousBorderHeight { -1 };
@@ -179,6 +180,7 @@ class ReticleInterface : public QObject {
     Q_PROPERTY(QVariant position READ getPosition WRITE setPosition)
     Q_PROPERTY(bool visible READ getVisible WRITE setVisible)
     Q_PROPERTY(float depth READ getDepth WRITE setDepth)
+    Q_PROPERTY(float scale READ getScale WRITE setScale)
     Q_PROPERTY(glm::vec2 maximumPosition READ getMaximumPosition)
     Q_PROPERTY(bool mouseCaptured READ isMouseCaptured)
     Q_PROPERTY(bool allowMouseCapture READ getAllowMouseCapture WRITE setAllowMouseCapture)
@@ -200,6 +202,9 @@ public:
     Q_INVOKABLE float getDepth() { return _compositor->getReticleDepth(); }
     Q_INVOKABLE void setDepth(float depth) { _compositor->setReticleDepth(depth); }
 
+    Q_INVOKABLE float getScale() const;
+    Q_INVOKABLE void setScale(float scale);
+
     Q_INVOKABLE QVariant getPosition() const;
     Q_INVOKABLE void setPosition(QVariant position);
 
diff --git a/libraries/display-plugins/src/display-plugins/DisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/DisplayPlugin.cpp
index 3e090dc7b3..da226d146b 100644
--- a/libraries/display-plugins/src/display-plugins/DisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/DisplayPlugin.cpp
@@ -28,11 +28,14 @@ DisplayPluginList getDisplayPlugins() {
 #ifdef DEBUG
         new NullDisplayPlugin(),
 #endif
+
+#if !defined(Q_OS_ANDROID)
         // Stereo modes
         // SBS left/right
         new SideBySideStereoDisplayPlugin(),
         // Interleaved left/right
         new InterleavedStereoDisplayPlugin(),
+#endif        
         nullptr
     };
 
diff --git a/libraries/display-plugins/src/display-plugins/NullDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/NullDisplayPlugin.cpp
index a4777b087b..6a19a34727 100644
--- a/libraries/display-plugins/src/display-plugins/NullDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/NullDisplayPlugin.cpp
@@ -34,3 +34,7 @@ void NullDisplayPlugin::submitFrame(const gpu::FramePointer& frame) {
 QImage NullDisplayPlugin::getScreenshot(float aspectRatio) const {
     return QImage();
 }
+
+QImage NullDisplayPlugin::getSecondaryCameraScreenshot() const {
+    return QImage();
+}
diff --git a/libraries/display-plugins/src/display-plugins/NullDisplayPlugin.h b/libraries/display-plugins/src/display-plugins/NullDisplayPlugin.h
index 1da0441d8f..97b71b5780 100644
--- a/libraries/display-plugins/src/display-plugins/NullDisplayPlugin.h
+++ b/libraries/display-plugins/src/display-plugins/NullDisplayPlugin.h
@@ -19,6 +19,8 @@ public:
     bool hasFocus() const override;
     void submitFrame(const gpu::FramePointer& newFrame) override;
     QImage getScreenshot(float aspectRatio = 0.0f) const override;
+    QImage getSecondaryCameraScreenshot() const override;
+    void copyTextureToQuickFramebuffer(NetworkTexturePointer source, QOpenGLFramebufferObject* target, GLsync* fenceSync) override {};
 private:
     static const QString NAME;
 };
diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
index 67bbb452ca..0993daaa8b 100644
--- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
@@ -16,6 +16,7 @@
 
 #include <QtOpenGL/QGLWidget>
 #include <QtGui/QImage>
+#include <QOpenGLFramebufferObject>
 #if defined(Q_OS_MAC)
 #include <OpenGL/CGLCurrent.h>
 #endif
@@ -41,7 +42,7 @@
 #include <ui-plugins/PluginContainer.h>
 #include <ui/Menu.h>
 #include <CursorManager.h>
-
+#include <TextureCache.h>
 #include "CompositorHelper.h"
 #include "Logging.h"
 
@@ -55,7 +56,7 @@ out vec4 outFragColor;
 
 float sRGBFloatToLinear(float value) {
     const float SRGB_ELBOW = 0.04045;
-    
+
     return (value <= SRGB_ELBOW) ? value / 12.92 : pow((value + 0.055) / 1.055, 2.4);
 }
 
@@ -121,10 +122,10 @@ public:
         PROFILE_SET_THREAD_NAME("Present Thread");
 
         // FIXME determine the best priority balance between this and the main thread...
-        // It may be dependent on the display plugin being used, since VR plugins should 
+        // It may be dependent on the display plugin being used, since VR plugins should
         // have higher priority on rendering (although we could say that the Oculus plugin
         // doesn't need that since it has async timewarp).
-        // A higher priority here 
+        // A higher priority here
         setPriority(QThread::HighPriority);
         OpenGLDisplayPlugin* currentPlugin{ nullptr };
         Q_ASSERT(_context);
@@ -233,7 +234,7 @@ public:
         // Move the context back to the presentation thread
         _context->moveToThread(this);
 
-        // restore control of the context to the presentation thread and signal 
+        // restore control of the context to the presentation thread and signal
         // the end of the operation
         _finishedMainThreadOperation = true;
         lock.unlock();
@@ -291,7 +292,7 @@ bool OpenGLDisplayPlugin::activate() {
     if (!RENDER_THREAD) {
         RENDER_THREAD = _presentThread;
     }
-    
+
     // Child classes may override this in order to do things like initialize
     // libraries, etc
     if (!internalActivate()) {
@@ -306,7 +307,7 @@ bool OpenGLDisplayPlugin::activate() {
     auto compositorHelper = DependencyManager::get<CompositorHelper>();
     connect(compositorHelper.data(), &CompositorHelper::alphaChanged, [this] {
         auto compositorHelper = DependencyManager::get<CompositorHelper>();
-        auto animation = new QPropertyAnimation(this, "overlayAlpha");
+        auto animation = new QPropertyAnimation(this, "hudAlpha");
         animation->setDuration(200);
         animation->setEndValue(compositorHelper->getAlpha());
         animation->start();
@@ -411,10 +412,23 @@ void OpenGLDisplayPlugin::customizeContext() {
             gpu::Shader::makeProgram(*program);
             gpu::StatePointer state = gpu::StatePointer(new gpu::State());
             state->setDepthTest(gpu::State::DepthTest(false));
-            state->setBlendFunction(true, 
+            state->setBlendFunction(true,
                 gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::INV_SRC_ALPHA,
                 gpu::State::FACTOR_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::ONE);
-            _overlayPipeline = gpu::Pipeline::create(program, state);
+            _hudPipeline = gpu::Pipeline::create(program, state);
+        }
+
+        {
+            auto vs = gpu::StandardShaderLib::getDrawUnitQuadTexcoordVS();
+            auto ps = gpu::StandardShaderLib::getDrawTextureMirroredXPS();
+            gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
+            gpu::Shader::makeProgram(*program);
+            gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+            state->setDepthTest(gpu::State::DepthTest(false));
+            state->setBlendFunction(true,
+                gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::INV_SRC_ALPHA,
+                gpu::State::FACTOR_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::ONE);
+            _mirrorHUDPipeline = gpu::Pipeline::create(program, state);
         }
 
         {
@@ -436,7 +450,8 @@ void OpenGLDisplayPlugin::customizeContext() {
 void OpenGLDisplayPlugin::uncustomizeContext() {
     _presentPipeline.reset();
     _cursorPipeline.reset();
-    _overlayPipeline.reset();
+    _hudPipeline.reset();
+    _mirrorHUDPipeline.reset();
     _compositeFramebuffer.reset();
     withPresentThreadLock([&] {
         _currentFrame.reset();
@@ -496,16 +511,48 @@ void OpenGLDisplayPlugin::submitFrame(const gpu::FramePointer& newFrame) {
         _newFrameQueue.push(newFrame);
     });
 }
+
 void OpenGLDisplayPlugin::renderFromTexture(gpu::Batch& batch, const gpu::TexturePointer texture, glm::ivec4 viewport, const glm::ivec4 scissor) {
+    renderFromTexture(batch, texture, viewport, scissor, gpu::FramebufferPointer());
+}
+
+void OpenGLDisplayPlugin::renderFromTexture(gpu::Batch& batch, const gpu::TexturePointer texture, glm::ivec4 viewport, const glm::ivec4 scissor, gpu::FramebufferPointer copyFbo /*=gpu::FramebufferPointer()*/) {
+    auto fbo = gpu::FramebufferPointer();
     batch.enableStereo(false);
     batch.resetViewTransform();
-    batch.setFramebuffer(gpu::FramebufferPointer());
+    batch.setFramebuffer(fbo);
     batch.clearColorFramebuffer(gpu::Framebuffer::BUFFER_COLOR0, vec4(0));
     batch.setStateScissorRect(scissor);
     batch.setViewportTransform(viewport);
     batch.setResourceTexture(0, texture);
     batch.setPipeline(_presentPipeline);
     batch.draw(gpu::TRIANGLE_STRIP, 4);
+    if (copyFbo) {
+        gpu::Vec4i copyFboRect(0, 0, copyFbo->getWidth(), copyFbo->getHeight());
+        gpu::Vec4i sourceRect(scissor.x, scissor.y, scissor.x + scissor.z, scissor.y + scissor.w);
+        float aspectRatio = (float)scissor.w / (float) scissor.z; // height/width
+        // scale width first
+        int xOffset = 0;
+        int yOffset = 0;
+        int newWidth = copyFbo->getWidth();
+        int newHeight = std::round(aspectRatio * (float) copyFbo->getWidth());
+        if (newHeight > copyFbo->getHeight()) {
+            // ok, so now fill height instead
+            newHeight = copyFbo->getHeight();
+            newWidth = std::round((float)copyFbo->getHeight() / aspectRatio);
+            xOffset = (copyFbo->getWidth() - newWidth) / 2;
+        } else {
+            yOffset = (copyFbo->getHeight() - newHeight) / 2;
+        }
+        gpu::Vec4i copyRect(xOffset, yOffset, xOffset + newWidth, yOffset + newHeight);
+        batch.setFramebuffer(copyFbo);
+
+        batch.resetViewTransform();
+        batch.setViewportTransform(copyFboRect);
+        batch.setStateScissorRect(copyFboRect);
+        batch.clearColorFramebuffer(gpu::Framebuffer::BUFFER_COLOR0, {0.0f, 0.0f, 0.0f, 1.0f});
+        batch.blit(fbo, sourceRect, copyFbo, copyRect);
+    }
 }
 
 void OpenGLDisplayPlugin::updateFrameData() {
@@ -529,22 +576,23 @@ void OpenGLDisplayPlugin::updateFrameData() {
     });
 }
 
-void OpenGLDisplayPlugin::compositeOverlay() {
-    render([&](gpu::Batch& batch){
-        batch.enableStereo(false);
-        batch.setFramebuffer(_compositeFramebuffer);
-        batch.setPipeline(_overlayPipeline);
-        batch.setResourceTexture(0, _currentFrame->overlay);
-        if (isStereo()) {
-            for_each_eye([&](Eye eye) {
-                batch.setViewportTransform(eyeViewport(eye));
+std::function<void(gpu::Batch&, const gpu::TexturePointer&, bool mirror)> OpenGLDisplayPlugin::getHUDOperator() {
+    return [this](gpu::Batch& batch, const gpu::TexturePointer& hudTexture, bool mirror) {
+        if (_hudPipeline) {
+            batch.enableStereo(false);
+            batch.setPipeline(mirror ? _mirrorHUDPipeline : _hudPipeline);
+            batch.setResourceTexture(0, hudTexture);
+            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);
-            });
-        } else {
-            batch.setViewportTransform(ivec4(uvec2(0), _compositeFramebuffer->getSize()));
-            batch.draw(gpu::TRIANGLE_STRIP, 4);
+            }
         }
-    });
+    };
 }
 
 void OpenGLDisplayPlugin::compositePointer() {
@@ -593,25 +641,28 @@ void OpenGLDisplayPlugin::compositeLayers() {
         compositeScene();
     }
 
-
 #ifdef HIFI_ENABLE_NSIGHT_DEBUG
-    if (false) // do not compositeoverlay if running nsight debug
+    if (false) // do not draw the HUD if running nsight debug
 #endif
     {
-        PROFILE_RANGE_EX(render_detail, "compositeOverlay", 0xff0077ff, (uint64_t)presentCount())
-        compositeOverlay();
-    }
-
-    auto compositorHelper = DependencyManager::get<CompositorHelper>();
-    if (compositorHelper->getReticleVisible()) {
-        PROFILE_RANGE_EX(render_detail, "compositePointer", 0xff0077ff, (uint64_t)presentCount())
-        compositePointer();
+        PROFILE_RANGE_EX(render_detail, "handleHUDBatch", 0xff0077ff, (uint64_t)presentCount())
+        auto hudOperator = getHUDOperator();
+        withPresentThreadLock([&] {
+            _hudOperator = hudOperator;
+        });
     }
 
     {
         PROFILE_RANGE_EX(render_detail, "compositeExtra", 0xff0077ff, (uint64_t)presentCount())
         compositeExtra();
     }
+
+    // Draw the pointer last so it's on top of everything
+    auto compositorHelper = DependencyManager::get<CompositorHelper>();
+    if (compositorHelper->getReticleVisible()) {
+        PROFILE_RANGE_EX(render_detail, "compositePointer", 0xff0077ff, (uint64_t)presentCount())
+            compositePointer();
+    }
 }
 
 void OpenGLDisplayPlugin::internalPresent() {
@@ -686,7 +737,7 @@ void OpenGLDisplayPlugin::resetPresentRate() {
     // _presentRate = RateCounter<100>();
 }
 
-float OpenGLDisplayPlugin::renderRate() const { 
+float OpenGLDisplayPlugin::renderRate() const {
     return _renderRate.rate();
 }
 
@@ -742,6 +793,19 @@ QImage OpenGLDisplayPlugin::getScreenshot(float aspectRatio) const {
     return screenshot.mirrored(false, true);
 }
 
+QImage OpenGLDisplayPlugin::getSecondaryCameraScreenshot() const {
+    auto textureCache = DependencyManager::get<TextureCache>();
+    auto secondaryCameraFramebuffer = textureCache->getSpectatorCameraFramebuffer();
+    gpu::Vec4i region(0, 0, secondaryCameraFramebuffer->getWidth(), secondaryCameraFramebuffer->getHeight());
+
+    auto glBackend = const_cast<OpenGLDisplayPlugin&>(*this).getGLBackend();
+    QImage screenshot(region.z, region.w, QImage::Format_ARGB32);
+    withMainThreadContext([&] {
+        glBackend->downloadFramebuffer(secondaryCameraFramebuffer, region, screenshot);
+    });
+    return screenshot.mirrored(false, true);
+}
+
 glm::uvec2 OpenGLDisplayPlugin::getSurfacePixels() const {
     uvec2 result;
     auto window = _container->getPrimaryWidget();
@@ -775,7 +839,7 @@ void OpenGLDisplayPlugin::assertIsPresentThread() const {
 
 bool OpenGLDisplayPlugin::beginFrameRender(uint32_t frameIndex) {
     withNonPresentThreadLock([&] {
-        _compositeOverlayAlpha = _overlayAlpha;
+        _compositeHUDAlpha = _hudAlpha;
     });
     return Parent::beginFrameRender(frameIndex);
 }
@@ -821,3 +885,53 @@ void OpenGLDisplayPlugin::updateCompositeFramebuffer() {
         _compositeFramebuffer = gpu::FramebufferPointer(gpu::Framebuffer::create("OpenGLDisplayPlugin::composite", gpu::Element::COLOR_RGBA_32, renderSize.x, renderSize.y));
     }
 }
+
+void OpenGLDisplayPlugin::copyTextureToQuickFramebuffer(NetworkTexturePointer networkTexture, QOpenGLFramebufferObject* target, GLsync* fenceSync) {
+    auto glBackend = const_cast<OpenGLDisplayPlugin&>(*this).getGLBackend();
+    withMainThreadContext([&] {
+        GLuint sourceTexture = glBackend->getTextureID(networkTexture->getGPUTexture());
+        GLuint targetTexture = target->texture();
+        GLuint fbo[2] {0, 0};
+
+        // need mipmaps for blitting texture
+        glGenerateTextureMipmap(sourceTexture);
+
+        // create 2 fbos (one for initial texture, second for scaled one)
+        glCreateFramebuffers(2, fbo);
+
+        // setup source fbo
+        glBindFramebuffer(GL_FRAMEBUFFER, fbo[0]);
+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, sourceTexture, 0);
+
+        GLint texWidth = networkTexture->getWidth();
+        GLint texHeight = networkTexture->getHeight();
+
+        // setup destination fbo
+        glBindFramebuffer(GL_FRAMEBUFFER, fbo[1]);
+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, targetTexture, 0);
+        glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+        glClear(GL_COLOR_BUFFER_BIT);
+
+
+        // maintain aspect ratio, filling the width first if possible.  If that makes the height too
+        // much, fill height instead. TODO: only do this when texture changes
+        GLint newX = 0;
+        GLint newY = 0;
+        float aspectRatio = (float)texHeight / (float)texWidth;
+        GLint newWidth = target->width();
+        GLint newHeight = std::round(aspectRatio * (float) target->width());
+        if (newHeight > target->height()) {
+            newHeight = target->height();
+            newWidth = std::round((float)target->height() / aspectRatio);
+            newX = (target->width() - newWidth) / 2;
+        } else {
+            newY = (target->height() - newHeight) / 2;
+        }
+        glBlitNamedFramebuffer(fbo[0], fbo[1], 0, 0, texWidth, texHeight, newX, newY, newX + newWidth, newY + newHeight, GL_DEPTH_BUFFER_BIT|GL_COLOR_BUFFER_BIT, GL_NEAREST);
+
+        // don't delete the textures!
+        glDeleteFramebuffers(2, fbo);
+        *fenceSync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
+    });
+}
+
diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h
index 7e7889ff47..d67c0b8663 100644
--- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h
+++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h
@@ -22,6 +22,8 @@
 #include <SimpleMovingAverage.h>
 #include <shared/RateCounter.h>
 
+#include <gpu/Batch.h>
+
 namespace gpu {
     namespace gl {
         class GLBackend;
@@ -30,7 +32,7 @@ namespace gpu {
 
 class OpenGLDisplayPlugin : public DisplayPlugin {
     Q_OBJECT
-    Q_PROPERTY(float overlayAlpha MEMBER _overlayAlpha)
+    Q_PROPERTY(float hudAlpha MEMBER _hudAlpha)
     using Parent = DisplayPlugin;
 protected:
     using Mutex = std::mutex;
@@ -38,7 +40,7 @@ protected:
     using Condition = std::condition_variable;
 public:
     ~OpenGLDisplayPlugin();
-    // These must be final to ensure proper ordering of operations 
+    // These must be final to ensure proper ordering of operations
     // between the main thread and the presentation thread
     bool activate() override final;
     void deactivate() override final;
@@ -60,6 +62,7 @@ public:
     virtual bool setDisplayTexture(const QString& name) override;
     virtual bool onDisplayTextureReset() { return false; };
     QImage getScreenshot(float aspectRatio = 0.0f) const override;
+    QImage getSecondaryCameraScreenshot() const override;
 
     float presentRate() const override;
 
@@ -79,6 +82,8 @@ public:
     // Three threads, one for rendering, one for texture transfers, one reserved for the GL driver
     int getRequiredThreadCount() const override { return 3; }
 
+    void copyTextureToQuickFramebuffer(NetworkTexturePointer source, QOpenGLFramebufferObject* target, GLsync* fenceSync) override;
+
 protected:
     friend class PresentThread;
 
@@ -90,7 +95,7 @@ protected:
     virtual QThread::Priority getPresentPriority() { return QThread::HighPriority; }
     virtual void compositeLayers();
     virtual void compositeScene();
-    virtual void compositeOverlay();
+    virtual std::function<void(gpu::Batch&, const gpu::TexturePointer&, bool mirror)> getHUDOperator();
     virtual void compositePointer();
     virtual void compositeExtra() {};
 
@@ -103,7 +108,7 @@ protected:
     // Returns true on successful activation
     virtual bool internalActivate() { return true; }
     virtual void internalDeactivate() {}
-	
+
     // Returns true on successful activation of standby session
     virtual bool activateStandBySession() { return true; }
     virtual void deactivateSession() {}
@@ -111,6 +116,7 @@ protected:
     // Plugin specific functionality to send the composed scene to the output window or device
     virtual void internalPresent();
 
+    void renderFromTexture(gpu::Batch& batch, const gpu::TexturePointer texture, glm::ivec4 viewport, const glm::ivec4 scissor, gpu::FramebufferPointer fbo);
     void renderFromTexture(gpu::Batch& batch, const gpu::TexturePointer texture, glm::ivec4 viewport, const glm::ivec4 scissor);
     virtual void updateFrameData();
 
@@ -125,20 +131,22 @@ protected:
     bool _vsyncEnabled { true };
     QThread* _presentThread{ nullptr };
     std::queue<gpu::FramePointer> _newFrameQueue;
-    RateCounter<100> _droppedFrameRate;
-    RateCounter<100> _newFrameRate;
-    RateCounter<100> _presentRate;
-    RateCounter<100> _renderRate;
+    RateCounter<200> _droppedFrameRate;
+    RateCounter<200> _newFrameRate;
+    RateCounter<200> _presentRate;
+    RateCounter<200> _renderRate;
 
     gpu::FramePointer _currentFrame;
     gpu::Frame* _lastFrame { nullptr };
     gpu::FramebufferPointer _compositeFramebuffer;
-    gpu::PipelinePointer _overlayPipeline;
+    gpu::PipelinePointer _hudPipeline;
+    gpu::PipelinePointer _mirrorHUDPipeline;
+    gpu::ShaderPointer _mirrorHUDPS;
     gpu::PipelinePointer _simplePipeline;
     gpu::PipelinePointer _presentPipeline;
     gpu::PipelinePointer _cursorPipeline;
     gpu::TexturePointer _displayTexture{};
-    float _compositeOverlayAlpha { 1.0f };
+    float _compositeHUDAlpha { 1.0f };
 
     struct CursorData {
         QImage image;
@@ -172,6 +180,6 @@ protected:
     // Any resource shared by the main thread and the presentation thread must
     // be serialized through this mutex
     mutable Mutex _presentMutex;
-    float _overlayAlpha{ 1.0f };
+    float _hudAlpha{ 1.0f };
 };
 
diff --git a/libraries/display-plugins/src/display-plugins/hmd/DebugHmdDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/hmd/DebugHmdDisplayPlugin.cpp
index fd45398236..6e397efbe5 100644
--- a/libraries/display-plugins/src/display-plugins/hmd/DebugHmdDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/hmd/DebugHmdDisplayPlugin.cpp
@@ -35,28 +35,11 @@ bool DebugHmdDisplayPlugin::beginFrameRender(uint32_t frameIndex) {
     //_currentRenderFrameInfo.presentPose = _currentRenderFrameInfo.renderPose;
 
     withNonPresentThreadLock([&] {
-        _uiModelTransform = DependencyManager::get<CompositorHelper>()->getModelTransform();
         _frameInfos[frameIndex] = _currentRenderFrameInfo;
-        
-        _handPoses[0] = glm::translate(mat4(), vec3(0.3f * cosf(secTimestampNow() * 3.0f), -0.3f * sinf(secTimestampNow() * 5.0f), 0.0f));
-        _handLasers[0].color = vec4(1, 0, 0, 1);
-        _handLasers[0].mode = HandLaserMode::Overlay;
-
-        _handPoses[1] = glm::translate(mat4(), vec3(0.3f * sinf(secTimestampNow() * 3.0f), -0.3f * cosf(secTimestampNow() * 5.0f), 0.0f));
-        _handLasers[1].color = vec4(0, 1, 1, 1);
-        _handLasers[1].mode = HandLaserMode::Overlay;
     });
     return Parent::beginFrameRender(frameIndex);
 }
 
-// DLL based display plugins MUST initialize GLEW inside the DLL code.
-void DebugHmdDisplayPlugin::customizeContext() {
-    glewExperimental = true;
-    glewInit();
-    glGetError(); // clear the potential error from glewExperimental
-    Parent::customizeContext();
-}
-
 bool DebugHmdDisplayPlugin::internalActivate() {
     _ipd = 0.0327499993f * 2.0f;
     _eyeProjections[0][0] = vec4{ 0.759056330, 0.000000000, 0.000000000, 0.000000000 };
@@ -70,7 +53,7 @@ bool DebugHmdDisplayPlugin::internalActivate() {
     _eyeInverseProjections[0] = glm::inverse(_eyeProjections[0]);
     _eyeInverseProjections[1] = glm::inverse(_eyeProjections[1]);
     _eyeOffsets[0][3] = vec4{ -0.0327499993, 0.0, 0.0149999997, 1.0 };
-    _eyeOffsets[0][3] = vec4{ 0.0327499993, 0.0, 0.0149999997, 1.0 };
+    _eyeOffsets[1][3] = vec4{ 0.0327499993, 0.0, 0.0149999997, 1.0 };
     _renderTargetSize = { 3024, 1680 };
     _cullingProjection = _eyeProjections[0];
     // This must come after the initialization, so that the values calculated
diff --git a/libraries/display-plugins/src/display-plugins/hmd/DebugHmdDisplayPlugin.h b/libraries/display-plugins/src/display-plugins/hmd/DebugHmdDisplayPlugin.h
index 9bb82b1836..cd6fdd44b9 100644
--- a/libraries/display-plugins/src/display-plugins/hmd/DebugHmdDisplayPlugin.h
+++ b/libraries/display-plugins/src/display-plugins/hmd/DebugHmdDisplayPlugin.h
@@ -26,7 +26,6 @@ protected:
     void updatePresentPose() override;
     void hmdPresent() override {}
     bool isHmdMounted() const override { return true; }
-    void customizeContext() override;
     bool internalActivate() override;
 private:
     static const QString NAME;
diff --git a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
index ea91890f33..1d7fee38eb 100644
--- a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
@@ -32,9 +32,9 @@
 
 #include "../Logging.h"
 #include "../CompositorHelper.h"
-#include <../render-utils/shaders/render-utils/glowLine_vert.h>
-#include <../render-utils/shaders/render-utils/glowLine_frag.h>
 
+#include "render-utils/hmd_ui_vert.h"
+#include "render-utils/hmd_ui_frag.h"
 
 static const QString MONO_PREVIEW = "Mono Preview";
 static const QString DISABLE_PREVIEW = "Disable Preview";
@@ -45,51 +45,21 @@ static const bool DEFAULT_MONO_VIEW = true;
 static const bool DEFAULT_DISABLE_PREVIEW = false;
 #endif
 static const glm::mat4 IDENTITY_MATRIX;
-static const size_t NUMBER_OF_HANDS = 2;
 
 //#define LIVE_SHADER_RELOAD 1
 extern glm::vec3 getPoint(float yaw, float pitch);
 
-struct HandLaserData {
-    vec4 p1;
-    vec4 p2;
-    vec4 color;
-};
-
-static QString readFile(const QString& filename) {
-    QFile file(filename);
-    file.open(QFile::Text | QFile::ReadOnly);
-    QString result;
-    result.append(QTextStream(&file).readAll());
-    return result;
-}
-
 glm::uvec2 HmdDisplayPlugin::getRecommendedUiSize() const {
     return CompositorHelper::VIRTUAL_SCREEN_SIZE;
 }
 
-QRect HmdDisplayPlugin::getRecommendedOverlayRect() const {
+QRect HmdDisplayPlugin::getRecommendedHUDRect() const {
     return CompositorHelper::VIRTUAL_SCREEN_RECOMMENDED_OVERLAY_RECT;
 }
 
-bool HmdDisplayPlugin::beginFrameRender(uint32_t frameIndex) {
-    if (!_vsyncEnabled && !_disablePreviewItemAdded) {
-        _container->addMenuItem(PluginType::DISPLAY_PLUGIN, MENU_PATH(), DISABLE_PREVIEW,
-            [this](bool clicked) {
-                _disablePreview = clicked;
-                _container->setBoolSetting("disableHmdPreview", _disablePreview);
-                if (_disablePreview) {
-                    _clearPreviewFlag = true;
-                }
-            }, true, _disablePreview);
-        _disablePreviewItemAdded = true;
-    }
-    return Parent::beginFrameRender(frameIndex);
-}
-
+#define DISABLE_PREVIEW_MENU_ITEM_DELAY_MS 500
 
 bool HmdDisplayPlugin::internalActivate() {
-    _disablePreviewItemAdded = false;
     _monoPreview = _container->getBoolSetting("monoPreview", DEFAULT_MONO_VIEW);
     _clearPreviewFlag = true;
     _container->addMenuItem(PluginType::DISPLAY_PLUGIN, MENU_PATH(), MONO_PREVIEW,
@@ -104,6 +74,19 @@ bool HmdDisplayPlugin::internalActivate() {
     _disablePreview = _container->getBoolSetting("disableHmdPreview", DEFAULT_DISABLE_PREVIEW || _vsyncEnabled);
 #endif
 
+    QTimer::singleShot(DISABLE_PREVIEW_MENU_ITEM_DELAY_MS, [this] {
+        if (isActive() && !_vsyncEnabled) {
+            _container->addMenuItem(PluginType::DISPLAY_PLUGIN, MENU_PATH(), DISABLE_PREVIEW,
+                [this](bool clicked) {
+                _disablePreview = clicked;
+                _container->setBoolSetting("disableHmdPreview", _disablePreview);
+                if (_disablePreview) {
+                    _clearPreviewFlag = true;
+                }
+            }, true, _disablePreview);
+        }
+    });
+
     _container->removeMenu(FRAMERATE);
     for_each_eye([&](Eye eye) {
         _eyeInverseProjections[eye] = glm::inverse(_eyeProjections[eye]);
@@ -118,31 +101,9 @@ void HmdDisplayPlugin::internalDeactivate() {
     Parent::internalDeactivate();
 }
 
-static const int32_t LINE_DATA_SLOT = 1;
-
 void HmdDisplayPlugin::customizeContext() {
     Parent::customizeContext();
-    _overlayRenderer.build();
-
-    {
-        auto state = std::make_shared<gpu::State>();
-        auto VS = gpu::Shader::createVertex(std::string(glowLine_vert));
-        auto PS = gpu::Shader::createPixel(std::string(glowLine_frag));
-        auto program = gpu::Shader::createProgram(VS, PS);
-        state->setCullMode(gpu::State::CULL_NONE);
-        state->setDepthTest(true, false, gpu::LESS_EQUAL);
-        state->setBlendFunction(true,
-            gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::INV_SRC_ALPHA,
-            gpu::State::FACTOR_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::ONE);
-        
-        gpu::Shader::BindingSet bindings;
-        bindings.insert({ "lineData", LINE_DATA_SLOT });;
-        gpu::Shader::makeProgram(*program, bindings);
-        _glowLinePipeline = gpu::Pipeline::create(program, state);
-        _handLaserUniforms = std::array<gpu::BufferPointer, 2>{ { std::make_shared<gpu::Buffer>(), std::make_shared<gpu::Buffer>() } };
-        _extraLaserUniforms = std::make_shared<gpu::Buffer>();
-    };
-
+    _hudRenderer.build();
 }
 
 void HmdDisplayPlugin::uncustomizeContext() {
@@ -155,12 +116,8 @@ void HmdDisplayPlugin::uncustomizeContext() {
         batch.setFramebuffer(_compositeFramebuffer);
         batch.clearColorFramebuffer(gpu::Framebuffer::BUFFER_COLOR0, vec4(0));
     });
-    _overlayRenderer = OverlayRenderer();
+    _hudRenderer = HUDRenderer();
     _previewTexture.reset();
-    _handLaserUniforms[0].reset();
-    _handLaserUniforms[1].reset();
-    _extraLaserUniforms.reset();
-    _glowLinePipeline.reset();
     Parent::uncustomizeContext();
 }
 
@@ -209,7 +166,7 @@ float HmdDisplayPlugin::getLeftCenterPixel() const {
 void HmdDisplayPlugin::internalPresent() {
     PROFILE_RANGE_EX(render, __FUNCTION__, 0xff00ff00, (uint64_t)presentCount())
 
-    // Composite together the scene, overlay and mouse cursor
+    // Composite together the scene, hud and mouse cursor
     hmdPresent();
 
     if (_displayTexture) {
@@ -243,6 +200,8 @@ void HmdDisplayPlugin::internalPresent() {
         glm::ivec4 viewport = getViewportForSourceSize(sourceSize);
         glm::ivec4 scissor = viewport;
 
+        auto fbo = gpu::FramebufferPointer();
+
         render([&](gpu::Batch& batch) {
 
             if (_monoPreview) {
@@ -285,11 +244,15 @@ void HmdDisplayPlugin::internalPresent() {
                     viewport = ivec4(scissorOffset - scaledShiftLeftBy, viewportOffset, viewportSizeX, viewportSizeY);
                 }
 
+                // TODO: only bother getting and passing in the hmdPreviewFramebuffer if the camera is on
+                fbo = DependencyManager::get<TextureCache>()->getHmdPreviewFramebuffer(windowSize.x, windowSize.y);
+
                 viewport.z *= 2;
             }
-            renderFromTexture(batch, _compositeFramebuffer->getRenderBuffer(0), viewport, scissor);
+            renderFromTexture(batch, _compositeFramebuffer->getRenderBuffer(0), viewport, scissor, fbo);
         });
         swapBuffers();
+
     } else if (_clearPreviewFlag) {
         QImage image;
         if (_vsyncEnabled) {
@@ -312,7 +275,7 @@ void HmdDisplayPlugin::internalPresent() {
             _previewTexture->assignStoredMip(0, image.byteCount(), image.constBits());
             _previewTexture->setAutoGenerateMips(true);
         }
-        
+
         auto viewport = getViewportForSourceSize(uvec2(_previewTexture->getDimensions()));
 
         render([&](gpu::Batch& batch) {
@@ -323,7 +286,7 @@ void HmdDisplayPlugin::internalPresent() {
     }
     postPreview();
 
-    // If preview is disabled, we need to check to see if the window size has changed 
+    // If preview is disabled, we need to check to see if the window size has changed
     // and re-render the no-preview message
     if (_disablePreview) {
         auto window = _container->getPrimaryWidget();
@@ -376,141 +339,14 @@ void HmdDisplayPlugin::updateFrameData() {
         auto correction = glm::inverse(batchPose) * currentPose;
         getGLBackend()->setCameraCorrection(correction);
     }
-
-    withPresentThreadLock([&] {
-        _presentHandLasers = _handLasers;
-        _presentHandPoses = _handPoses;
-        _presentUiModelTransform = _uiModelTransform;
-
-        _presentExtraLaser = _extraLaser;
-        _presentExtraLaserStart = _extraLaserStart;
-    });
-
-    auto compositorHelper = DependencyManager::get<CompositorHelper>();
-    glm::mat4 modelMat = compositorHelper->getModelTransform().getMatrix();
-    static const float OUT_OF_BOUNDS = -1;
-    std::array<vec2, NUMBER_OF_HANDS> handGlowPoints { { vec2(OUT_OF_BOUNDS), vec2(OUT_OF_BOUNDS) } };
-    vec2 extraGlowPoint(OUT_OF_BOUNDS);
-
-    float uiRadius = compositorHelper->getHmdUiRadius();
-
-    // compute the glow point interesections
-    for (size_t i = 0; i < NUMBER_OF_HANDS; ++i) {
-        if (_presentHandPoses[i] == IDENTITY_MATRIX) {
-            continue;
-        }
-        const auto& handLaser = _presentHandLasers[i];
-        if (!handLaser.valid()) {
-            continue;
-        }
-
-        const vec3& laserDirection = handLaser.direction;
-        mat4 model = _presentHandPoses[i];
-        vec3 castStart = vec3(model[3]);
-        vec3 castDirection = glm::quat_cast(model) * laserDirection;
-
-        // this offset needs to match GRAB_POINT_SPHERE_OFFSET in scripts/system/libraries/controllers.js:19
-        static const vec3 GRAB_POINT_SPHERE_OFFSET(0.04f, 0.13f, 0.039f);  // x = upward, y = forward, z = lateral
-
-        // swizzle grab point so that (x = upward, y = lateral, z = forward)
-        vec3 grabPointOffset = glm::vec3(GRAB_POINT_SPHERE_OFFSET.x, GRAB_POINT_SPHERE_OFFSET.z, -GRAB_POINT_SPHERE_OFFSET.y);
-        if (i == 0) {
-            grabPointOffset.x *= -1.0f; // this changes between left and right hands
-        }
-        castStart += glm::quat_cast(model) * grabPointOffset;
-
-        // Find the intersection of the laser with he UI and use it to scale the model matrix
-        float distance;
-        if (!glm::intersectRaySphere(castStart, castDirection,
-                                     _presentUiModelTransform.getTranslation(), uiRadius * uiRadius, distance)) {
-            continue;
-        }
-
-        _presentHandLaserPoints[i].first = castStart;
-        _presentHandLaserPoints[i].second = _presentHandLaserPoints[i].first + (castDirection * distance);
-
-        vec3 intersectionPosition = castStart + (castDirection * distance) - _presentUiModelTransform.getTranslation();
-        intersectionPosition = glm::inverse(_presentUiModelTransform.getRotation()) * intersectionPosition;
-
-        // Take the interesection normal and convert it to a texture coordinate
-        vec2 yawPitch;
-        {
-            vec2 xdir = glm::normalize(vec2(intersectionPosition.x, -intersectionPosition.z));
-            yawPitch.x = glm::atan(xdir.x, xdir.y);
-            yawPitch.y = (acosf(intersectionPosition.y) * -1.0f) + (float)M_PI_2;
-        }
-        vec2 halfFov = CompositorHelper::VIRTUAL_UI_TARGET_FOV / 2.0f;
-
-        // Are we out of range
-        if (glm::any(glm::greaterThan(glm::abs(yawPitch), halfFov))) {
-            continue;
-        }
-
-        yawPitch /= CompositorHelper::VIRTUAL_UI_TARGET_FOV;
-        yawPitch += 0.5f;
-        handGlowPoints[i] = yawPitch;
-    }
-
-    // compute the glow point interesections
-    if (_presentExtraLaser.valid()) {
-        const vec3& laserDirection = _presentExtraLaser.direction;
-        vec3 castStart = _presentExtraLaserStart;
-        vec3 castDirection = laserDirection;
-
-        // Find the intersection of the laser with he UI and use it to scale the model matrix
-        float distance;
-        if (glm::intersectRaySphere(castStart, castDirection,
-            _presentUiModelTransform.getTranslation(), uiRadius * uiRadius, distance)) {
-
-
-            _presentExtraLaserPoints.first = castStart;
-            _presentExtraLaserPoints.second = _presentExtraLaserPoints.first + (castDirection * distance);
-
-            vec3 intersectionPosition = castStart + (castDirection * distance) - _presentUiModelTransform.getTranslation();
-            intersectionPosition = glm::inverse(_presentUiModelTransform.getRotation()) * intersectionPosition;
-
-            // Take the interesection normal and convert it to a texture coordinate
-            vec2 yawPitch;
-            {
-                vec2 xdir = glm::normalize(vec2(intersectionPosition.x, -intersectionPosition.z));
-                yawPitch.x = glm::atan(xdir.x, xdir.y);
-                yawPitch.y = (acosf(intersectionPosition.y) * -1.0f) + (float)M_PI_2;
-            }
-            vec2 halfFov = CompositorHelper::VIRTUAL_UI_TARGET_FOV / 2.0f;
-
-            // Are we out of range
-            if (!glm::any(glm::greaterThan(glm::abs(yawPitch), halfFov))) {
-                yawPitch /= CompositorHelper::VIRTUAL_UI_TARGET_FOV;
-                yawPitch += 0.5f;
-                extraGlowPoint = yawPitch;
-            }
-        }
-    }
-
-
-    for_each_eye([&](Eye eye) {
-        auto modelView = glm::inverse(_currentPresentFrameInfo.presentPose * getEyeToHeadTransform(eye)) * modelMat;
-        _overlayRenderer.mvps[eye] = _eyeProjections[eye] * modelView;
-    });
-
-    // Setup the uniforms
-    {
-        auto& uniforms = _overlayRenderer.uniforms;
-        uniforms.alpha = _compositeOverlayAlpha;
-        uniforms.glowPoints = vec4(handGlowPoints[0], handGlowPoints[1]);
-        uniforms.glowColors[0] = _presentHandLasers[0].color;
-        uniforms.glowColors[1] = _presentHandLasers[1].color;
-        uniforms.extraGlowPoint = extraGlowPoint;
-        uniforms.extraGlowColor = _presentExtraLaser.color;
-    }
 }
 
-void HmdDisplayPlugin::OverlayRenderer::build() {
+void HmdDisplayPlugin::HUDRenderer::build() {
     vertices = std::make_shared<gpu::Buffer>();
     indices = std::make_shared<gpu::Buffer>();
 
     //UV mapping source: http://www.mvps.org/directx/articles/spheremap.htm
-    
+
     static const float fov = CompositorHelper::VIRTUAL_UI_TARGET_FOV.y;
     static const float aspectRatio = CompositorHelper::VIRTUAL_UI_ASPECT_RATIO;
     static const uint16_t stacks = 128;
@@ -561,38 +397,20 @@ void HmdDisplayPlugin::OverlayRenderer::build() {
     format = std::make_shared<gpu::Stream::Format>(); // 1 for everyone
     format->setAttribute(gpu::Stream::POSITION, gpu::Stream::POSITION, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ), 0);
     format->setAttribute(gpu::Stream::TEXCOORD, gpu::Stream::TEXCOORD, gpu::Element(gpu::VEC2, gpu::FLOAT, gpu::UV));
-    uniformBuffers[0] = std::make_shared<gpu::Buffer>(sizeof(Uniforms), nullptr);
-    uniformBuffers[1] = std::make_shared<gpu::Buffer>(sizeof(Uniforms), nullptr);
+    uniformsBuffer = std::make_shared<gpu::Buffer>(sizeof(Uniforms), nullptr);
     updatePipeline();
 }
 
-void HmdDisplayPlugin::OverlayRenderer::updatePipeline() {
-    static const QString vsFile = PathUtils::resourcesPath() + "/shaders/hmd_ui_glow.vert";
-    static const QString fsFile = PathUtils::resourcesPath() + "/shaders/hmd_ui_glow.frag";
-
-#if LIVE_SHADER_RELOAD
-    static qint64 vsBuiltAge = 0;
-    static qint64 fsBuiltAge = 0;
-    QFileInfo vsInfo(vsFile);
-    QFileInfo fsInfo(fsFile);
-    auto vsAge = vsInfo.lastModified().toMSecsSinceEpoch();
-    auto fsAge = fsInfo.lastModified().toMSecsSinceEpoch();
-    if (!pipeline || vsAge > vsBuiltAge || fsAge > fsBuiltAge) {
-        vsBuiltAge = vsAge;
-        fsBuiltAge = fsAge;
-#else
+void HmdDisplayPlugin::HUDRenderer::updatePipeline() {
     if (!pipeline) {
-#endif
-        QString vsSource = readFile(vsFile);
-        QString fsSource = readFile(fsFile);
-        auto vs = gpu::Shader::createVertex(vsSource.toLocal8Bit().toStdString());
-        auto ps = gpu::Shader::createPixel(fsSource.toLocal8Bit().toStdString());
+        auto vs = gpu::Shader::createVertex(std::string(hmd_ui_vert));
+        auto ps = gpu::Shader::createPixel(std::string(hmd_ui_frag));
         auto program = gpu::Shader::createProgram(vs, ps);
         gpu::gl::GLBackend::makeProgram(*program, gpu::Shader::BindingSet());
-        this->uniformsLocation = program->getUniformBuffers().findLocation("overlayBuffer");
+        uniformsLocation = program->getUniformBuffers().findLocation("hudBuffer");
 
         gpu::StatePointer state = gpu::StatePointer(new gpu::State());
-        state->setDepthTest(gpu::State::DepthTest(false));
+        state->setDepthTest(gpu::State::DepthTest(true, true, gpu::LESS_EQUAL));
         state->setBlendFunction(true,
             gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::INV_SRC_ALPHA,
             gpu::State::FACTOR_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::ONE);
@@ -601,30 +419,33 @@ void HmdDisplayPlugin::OverlayRenderer::updatePipeline() {
     }
 }
 
-void HmdDisplayPlugin::OverlayRenderer::render(HmdDisplayPlugin& plugin) {
+std::function<void(gpu::Batch&, const gpu::TexturePointer&, bool mirror)> HmdDisplayPlugin::HUDRenderer::render(HmdDisplayPlugin& plugin) {
     updatePipeline();
-    for_each_eye([&](Eye eye){
-        uniforms.mvp = mvps[eye];
-        uniformBuffers[eye]->setSubData(0, uniforms);
-    });
-    plugin.render([&](gpu::Batch& batch) {
-        batch.enableStereo(false);
-        batch.setFramebuffer(plugin._compositeFramebuffer);
-        batch.setPipeline(pipeline);
-        batch.setInputFormat(format);
-        gpu::BufferView posView(vertices, VERTEX_OFFSET, vertices->getSize(), VERTEX_STRIDE, format->getAttributes().at(gpu::Stream::POSITION)._element);
-        gpu::BufferView uvView(vertices, TEXTURE_OFFSET, vertices->getSize(), VERTEX_STRIDE, format->getAttributes().at(gpu::Stream::TEXCOORD)._element);
-        batch.setInputBuffer(gpu::Stream::POSITION, posView);
-        batch.setInputBuffer(gpu::Stream::TEXCOORD, uvView);
-        batch.setIndexBuffer(gpu::UINT16, indices, 0);
-        batch.setResourceTexture(0, plugin._currentFrame->overlay);
-        // FIXME use stereo information input to set both MVPs in the uniforms
-        for_each_eye([&](Eye eye) {
-            batch.setUniformBuffer(uniformsLocation, uniformBuffers[eye]);
-            batch.setViewportTransform(plugin.eyeViewport(eye));
+    return [this](gpu::Batch& batch, const gpu::TexturePointer& hudTexture, bool mirror) {
+        if (pipeline) {
+            batch.setPipeline(pipeline);
+
+            batch.setInputFormat(format);
+            gpu::BufferView posView(vertices, VERTEX_OFFSET, vertices->getSize(), VERTEX_STRIDE, format->getAttributes().at(gpu::Stream::POSITION)._element);
+            gpu::BufferView uvView(vertices, TEXTURE_OFFSET, vertices->getSize(), VERTEX_STRIDE, format->getAttributes().at(gpu::Stream::TEXCOORD)._element);
+            batch.setInputBuffer(gpu::Stream::POSITION, posView);
+            batch.setInputBuffer(gpu::Stream::TEXCOORD, uvView);
+            batch.setIndexBuffer(gpu::UINT16, indices, 0);
+
+            uniformsBuffer->setSubData(0, uniforms);
+            batch.setUniformBuffer(uniformsLocation, uniformsBuffer);
+
+            auto compositorHelper = DependencyManager::get<CompositorHelper>();
+            glm::mat4 modelTransform = compositorHelper->getUiTransform();
+            if (mirror) {
+                modelTransform = glm::scale(modelTransform, glm::vec3(-1, 1, 1));
+            }
+            batch.setModelTransform(modelTransform);
+            batch.setResourceTexture(0, hudTexture);
+
             batch.drawIndexed(gpu::TRIANGLES, indexCount);
-        });
-    });
+        }
+    };
 }
 
 void HmdDisplayPlugin::compositePointer() {
@@ -651,90 +472,8 @@ void HmdDisplayPlugin::compositePointer() {
     });
 }
 
-void HmdDisplayPlugin::compositeOverlay() {
-    if (!_currentFrame || !_currentFrame->overlay) {
-        return;
-    }
-
-    _overlayRenderer.render(*this);
-}
-
-bool HmdDisplayPlugin::setHandLaser(uint32_t hands, HandLaserMode mode, const vec4& color, const vec3& direction) {
-    HandLaserInfo info;
-    info.mode = mode;
-    info.color = color;
-    info.direction = direction;
-    withNonPresentThreadLock([&] {
-        if (hands & Hand::LeftHand) {
-            _handLasers[0] = info;
-        }
-        if (hands & Hand::RightHand) {
-            _handLasers[1] = info;
-        }
-    });
-    // FIXME defer to a child class plugin to determine if hand lasers are actually 
-    // available based on the presence or absence of hand controllers
-    return true;
-}
-
-bool HmdDisplayPlugin::setExtraLaser(HandLaserMode mode, const vec4& color, const glm::vec3& sensorSpaceStart, const vec3& sensorSpaceDirection) {
-    HandLaserInfo info;
-    info.mode = mode;
-    info.color = color;
-    info.direction = sensorSpaceDirection;
-    withNonPresentThreadLock([&] {
-        _extraLaser = info;
-        _extraLaserStart = sensorSpaceStart;
-    });
-
-    // FIXME defer to a child class plugin to determine if hand lasers are actually 
-    // available based on the presence or absence of hand controllers
-    return true;
-}
-
-
-void HmdDisplayPlugin::compositeExtra() {
-    // If neither hand laser is activated, exit
-    if (!_presentHandLasers[0].valid() && !_presentHandLasers[1].valid() && !_presentExtraLaser.valid()) {
-        return;
-    }
-
-    if (_presentHandPoses[0] == IDENTITY_MATRIX && _presentHandPoses[1] == IDENTITY_MATRIX && !_presentExtraLaser.valid()) {
-        return;
-    }
-    
-    render([&](gpu::Batch& batch) {
-        batch.setFramebuffer(_compositeFramebuffer);
-        batch.setModelTransform(Transform());
-        batch.setViewportTransform(ivec4(uvec2(0), _renderTargetSize));
-        batch.setViewTransform(_currentPresentFrameInfo.presentPose, false);
-        // Compile the shaders
-        batch.setPipeline(_glowLinePipeline);
-
-
-        bilateral::for_each_side([&](bilateral::Side side){
-            auto index = bilateral::index(side);
-            if (_presentHandPoses[index] == IDENTITY_MATRIX) {
-                return;
-            }
-            const auto& laser = _presentHandLasers[index];
-            if (laser.valid()) {
-                const auto& points = _presentHandLaserPoints[index];
-                _handLaserUniforms[index]->resize(sizeof(HandLaserData));
-                _handLaserUniforms[index]->setSubData(0, HandLaserData { vec4(points.first, 1.0f), vec4(points.second, 1.0f), _handLasers[index].color });
-                batch.setUniformBuffer(LINE_DATA_SLOT, _handLaserUniforms[index]);
-                batch.draw(gpu::TRIANGLE_STRIP, 4, 0);
-            }
-        });
-
-        if (_presentExtraLaser.valid()) {
-            const auto& points = _presentExtraLaserPoints;
-            _extraLaserUniforms->resize(sizeof(HandLaserData));
-            _extraLaserUniforms->setSubData(0, HandLaserData { vec4(points.first, 1.0f), vec4(points.second, 1.0f), _presentExtraLaser.color });
-            batch.setUniformBuffer(LINE_DATA_SLOT, _extraLaserUniforms);
-            batch.draw(gpu::TRIANGLE_STRIP, 4, 0);
-        }
-    });
+std::function<void(gpu::Batch&, const gpu::TexturePointer&, bool mirror)> HmdDisplayPlugin::getHUDOperator() {
+    return _hudRenderer.render(*this);
 }
 
 HmdDisplayPlugin::~HmdDisplayPlugin() {
diff --git a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h
index 055328ee21..d2d30df093 100644
--- a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h
+++ b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h
@@ -27,19 +27,16 @@ public:
     bool isHmd() const override final { return true; }
     float getIPD() const override final { return _ipd; }
     glm::mat4 getEyeToHeadTransform(Eye eye) const override final { return _eyeOffsets[eye]; }
-    glm::mat4 getEyeProjection(Eye eye, const glm::mat4& baseProjection) const override final { return _eyeProjections[eye]; }
-    glm::mat4 getCullingProjection(const glm::mat4& baseProjection) const override final { return _cullingProjection; }
+    glm::mat4 getEyeProjection(Eye eye, const glm::mat4& baseProjection) const override { return _eyeProjections[eye]; }
+    glm::mat4 getCullingProjection(const glm::mat4& baseProjection) const override { return _cullingProjection; }
     glm::uvec2 getRecommendedUiSize() const override final;
     glm::uvec2 getRecommendedRenderSize() const override final { return _renderTargetSize; }
     bool isDisplayVisible() const override { return isHmdMounted(); }
 
-    QRect getRecommendedOverlayRect() const override final;
+    QRect getRecommendedHUDRect() const override final;
 
     virtual glm::mat4 getHeadPose() const override;
 
-    bool setHandLaser(uint32_t hands, HandLaserMode mode, const vec4& color, const vec3& direction) override;
-    bool setExtraLaser(HandLaserMode mode, const vec4& color, const glm::vec3& sensorSpaceStart, const vec3& sensorSpaceDirection) override;
-
     bool wantVsync() const override {
         return false;
     }
@@ -54,42 +51,14 @@ protected:
     virtual void postPreview() {};
     virtual void updatePresentPose();
 
-    bool beginFrameRender(uint32_t frameIndex) override;
     bool internalActivate() override;
     void internalDeactivate() override;
-    void compositeOverlay() override;
+    std::function<void(gpu::Batch&, const gpu::TexturePointer&, bool mirror)> getHUDOperator() override;
     void compositePointer() override;
     void internalPresent() override;
     void customizeContext() override;
     void uncustomizeContext() override;
     void updateFrameData() override;
-    void compositeExtra() override;
-
-    struct HandLaserInfo {
-        HandLaserMode mode { HandLaserMode::None };
-        vec4 color { 1.0f };
-        vec3 direction { 0, 0, -1 };
-
-        // Is this hand laser info suitable for drawing?
-        bool valid() const {
-            return (mode != HandLaserMode::None && color.a > 0.0f && direction != vec3());
-        }
-    };
-
-    Transform _uiModelTransform;
-    std::array<HandLaserInfo, 2> _handLasers;
-    std::array<mat4, 2> _handPoses;
-
-    Transform _presentUiModelTransform;
-    std::array<HandLaserInfo, 2> _presentHandLasers;
-    std::array<mat4, 2> _presentHandPoses;
-    std::array<std::pair<vec3, vec3>, 2> _presentHandLaserPoints;
-
-    HandLaserInfo _extraLaser;
-    HandLaserInfo _presentExtraLaser;
-    vec3 _extraLaserStart;
-    vec3 _presentExtraLaserStart;
-    std::pair<vec3, vec3> _presentExtraLaserPoints;
 
     std::array<mat4, 2> _eyeOffsets;
     std::array<mat4, 2> _eyeProjections;
@@ -117,16 +86,12 @@ private:
     ivec4 getViewportForSourceSize(const uvec2& size) const;
     float getLeftCenterPixel() const;
 
-    bool _disablePreviewItemAdded { false };
     bool _monoPreview { true };
     bool _clearPreviewFlag { false };
-    std::array<gpu::BufferPointer, 2> _handLaserUniforms;
-    gpu::BufferPointer _extraLaserUniforms;
-    gpu::PipelinePointer _glowLinePipeline;
     gpu::TexturePointer _previewTexture;
     glm::vec2 _lastWindowSize;
 
-    struct OverlayRenderer {
+    struct HUDRenderer {
         gpu::Stream::FormatPointer format;
         gpu::BufferPointer vertices;
         gpu::BufferPointer indices;
@@ -134,20 +99,10 @@ private:
         gpu::PipelinePointer pipeline;
         int32_t uniformsLocation { -1 };
 
-        // FIXME this is stupid, use the built in transformation pipeline
-        std::array<gpu::BufferPointer, 2> uniformBuffers;
-        std::array<mat4, 2> mvps;
+        gpu::BufferPointer uniformsBuffer;
 
         struct Uniforms {
-            mat4 mvp;
-            vec4 glowPoints { -1 };
-            vec4 glowColors[2];
-            vec2 resolution { CompositorHelper::VIRTUAL_SCREEN_SIZE };
-            float radius { 0.005f };
             float alpha { 1.0f };
-
-            vec4 extraGlowColor;
-            vec2 extraGlowPoint { -1 };
         } uniforms;
         
         struct Vertex {
@@ -161,6 +116,6 @@ private:
 
         void build();
         void updatePipeline();
-        void render(HmdDisplayPlugin& plugin);
-    } _overlayRenderer;
+        std::function<void(gpu::Batch&, const gpu::TexturePointer&, bool mirror)> render(HmdDisplayPlugin& plugin);
+    } _hudRenderer;
 };
diff --git a/libraries/embedded-webserver/src/HTTPConnection.cpp b/libraries/embedded-webserver/src/HTTPConnection.cpp
index b0cd55c085..0a8448108e 100644
--- a/libraries/embedded-webserver/src/HTTPConnection.cpp
+++ b/libraries/embedded-webserver/src/HTTPConnection.cpp
@@ -17,6 +17,7 @@
 #include "HTTPConnection.h"
 #include "EmbeddedWebserverLogging.h"
 #include "HTTPManager.h"
+#include <QUrlQuery>
 
 const char* HTTPConnection::StatusCode200 = "200 OK";
 const char* HTTPConnection::StatusCode301 = "301 Moved Permanently";
@@ -52,10 +53,31 @@ HTTPConnection::~HTTPConnection() {
     }
 }
 
+QHash<QString, QString> HTTPConnection::parseUrlEncodedForm() {
+    // make sure we have the correct MIME type
+    QList<QByteArray> elements = _requestHeaders.value("Content-Type").split(';');
+
+    QString contentType = elements.at(0).trimmed();
+    if (contentType != "application/x-www-form-urlencoded") {
+        return QHash<QString, QString>();
+    }
+
+    QUrlQuery form { _requestContent };
+    QHash<QString, QString> pairs;
+    for (auto pair : form.queryItems()) {
+        pairs[QUrl::fromPercentEncoding(pair.first.toLatin1())] = QUrl::fromPercentEncoding(pair.second.toLatin1());
+    }
+
+    return pairs;
+}
+
 QList<FormData> HTTPConnection::parseFormData() const {
     // make sure we have the correct MIME type
     QList<QByteArray> elements = _requestHeaders.value("Content-Type").split(';');
-    if (elements.at(0).trimmed() != "multipart/form-data") {
+
+    QString contentType = elements.at(0).trimmed();
+
+    if (contentType != "multipart/form-data") {
         return QList<FormData>();
     }
 
diff --git a/libraries/embedded-webserver/src/HTTPConnection.h b/libraries/embedded-webserver/src/HTTPConnection.h
index 23a4db5bc2..966fc26949 100644
--- a/libraries/embedded-webserver/src/HTTPConnection.h
+++ b/libraries/embedded-webserver/src/HTTPConnection.h
@@ -79,6 +79,10 @@ public:
     /// Parses the request content as form data, returning a list of header/content pairs.
     QList<FormData> parseFormData () const;
 
+    /// Parses the request content as a url encoded form, returning a hash of key/value pairs.
+    /// Duplicate keys are not supported.
+    QHash<QString, QString> parseUrlEncodedForm();
+
     /// Sends a response and closes the connection.
     void respond (const char* code, const QByteArray& content = QByteArray(),
         const char* contentType = DefaultContentType,
diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
index 1684c06512..07d8716656 100644
--- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp
+++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
@@ -17,6 +17,7 @@
 #include <QScriptSyntaxCheckResult>
 #include <QThreadPool>
 
+#include <shared/QtHelpers.h>
 #include <ColorUtils.h>
 #include <AbstractScriptingServicesInterface.h>
 #include <AbstractViewStateInterface.h>
@@ -25,25 +26,19 @@
 #include <PerfStat.h>
 #include <SceneScriptingInterface.h>
 #include <ScriptEngine.h>
+#include <AddressManager.h>
+#include <Rig.h>
+#include <EntitySimulation.h>
+#include <AddressManager.h>
+#include <ZoneRenderer.h>
 
-
+#include "EntitiesRendererLogging.h"
 #include "RenderableEntityItem.h"
 
-#include "RenderableLightEntityItem.h"
-#include "RenderableModelEntityItem.h"
-#include "RenderableParticleEffectEntityItem.h"
-#include "RenderableTextEntityItem.h"
 #include "RenderableWebEntityItem.h"
-#include "RenderableZoneEntityItem.h"
-#include "RenderableLineEntityItem.h"
-#include "RenderablePolyVoxEntityItem.h"
-#include "RenderablePolyLineEntityItem.h"
-#include "RenderableShapeEntityItem.h"
-#include "EntitiesRendererLogging.h"
-#include "AddressManager.h"
-#include <Rig.h>
 
-#include "ZoneRenderer.h"
+size_t std::hash<EntityItemID>::operator()(const EntityItemID& id) const { return qHash(id); }
+std::function<bool()> EntityTreeRenderer::_entitiesShouldFadeFunction;
 
 EntityTreeRenderer::EntityTreeRenderer(bool wantScripts, AbstractViewStateInterface* viewState,
                                             AbstractScriptingServicesInterface* scriptingServices) :
@@ -52,27 +47,42 @@ EntityTreeRenderer::EntityTreeRenderer(bool wantScripts, AbstractViewStateInterf
     _viewState(viewState),
     _scriptingServices(scriptingServices),
     _displayModelBounds(false),
-    _dontDoPrecisionPicking(false),
     _layeredZones(this)
 {
-    REGISTER_ENTITY_TYPE_WITH_FACTORY(Model, RenderableModelEntityItem::factory)
-    REGISTER_ENTITY_TYPE_WITH_FACTORY(Light, RenderableLightEntityItem::factory)
-    REGISTER_ENTITY_TYPE_WITH_FACTORY(Text, RenderableTextEntityItem::factory)
-    // Offscreen web surfaces are incompatible with nSight
-    if (!nsightActive()) {
-        REGISTER_ENTITY_TYPE_WITH_FACTORY(Web, RenderableWebEntityItem::factory)
-    }
-    REGISTER_ENTITY_TYPE_WITH_FACTORY(ParticleEffect, RenderableParticleEffectEntityItem::factory)
-    REGISTER_ENTITY_TYPE_WITH_FACTORY(Zone, RenderableZoneEntityItem::factory)
-    REGISTER_ENTITY_TYPE_WITH_FACTORY(Line, RenderableLineEntityItem::factory)
-    REGISTER_ENTITY_TYPE_WITH_FACTORY(PolyVox, RenderablePolyVoxEntityItem::factory)
-    REGISTER_ENTITY_TYPE_WITH_FACTORY(PolyLine, RenderablePolyLineEntityItem::factory)
-    REGISTER_ENTITY_TYPE_WITH_FACTORY(Shape, RenderableShapeEntityItem::factory)
-    REGISTER_ENTITY_TYPE_WITH_FACTORY(Box, RenderableShapeEntityItem::boxFactory)
-    REGISTER_ENTITY_TYPE_WITH_FACTORY(Sphere, RenderableShapeEntityItem::sphereFactory)
-
+    setMouseRayPickResultOperator([](QUuid rayPickID) {
+        RayToEntityIntersectionResult entityResult;
+        return entityResult;
+    });
+    setSetPrecisionPickingOperator([](QUuid rayPickID, bool value) {});
+    EntityRenderer::initEntityRenderers();
     _currentHoverOverEntityID = UNKNOWN_ENTITY_ID;
     _currentClickingOnEntityID = UNKNOWN_ENTITY_ID;
+
+    // Forward mouse events to web entities
+    auto handlePointerEvent = [&](const EntityItemID& entityID, const PointerEvent& event) {
+        std::shared_ptr<render::entities::WebEntityRenderer> thisEntity;
+        auto entity = getEntity(entityID);
+        if (entity && entity->getType() == EntityTypes::Web) {
+            thisEntity = std::static_pointer_cast<render::entities::WebEntityRenderer>(renderableForEntityId(entityID));
+        }
+        if (thisEntity) {
+            QMetaObject::invokeMethod(thisEntity.get(), "handlePointerEvent", Q_ARG(PointerEvent, event));
+        }
+    };
+    auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
+    connect(entityScriptingInterface.data(), &EntityScriptingInterface::mousePressOnEntity, this, handlePointerEvent);
+    connect(entityScriptingInterface.data(), &EntityScriptingInterface::mouseReleaseOnEntity, this, handlePointerEvent);
+    connect(entityScriptingInterface.data(), &EntityScriptingInterface::mouseMoveOnEntity, this, handlePointerEvent);
+    connect(entityScriptingInterface.data(), &EntityScriptingInterface::hoverLeaveEntity, this, [&](const EntityItemID& entityID, const PointerEvent& event) {
+        std::shared_ptr<render::entities::WebEntityRenderer> thisEntity;
+        auto entity = getEntity(entityID);
+        if (entity && entity->getType() == EntityTypes::Web) {
+            thisEntity = std::static_pointer_cast<render::entities::WebEntityRenderer>(renderableForEntityId(entityID));
+        }
+        if (thisEntity) {
+            QMetaObject::invokeMethod(thisEntity.get(), "hoverLeaveEntity", Q_ARG(PointerEvent, event));
+        }
+    });
 }
 
 EntityTreeRenderer::~EntityTreeRenderer() {
@@ -80,35 +90,69 @@ EntityTreeRenderer::~EntityTreeRenderer() {
     //       it is registered with ScriptEngines, which will call deleteLater for us.
 }
 
-int EntityTreeRenderer::_entitiesScriptEngineCount = 0;
-
-void entitiesScriptEngineDeleter(ScriptEngine* engine) {
-    class WaitRunnable : public QRunnable {
-        public:
-            WaitRunnable(ScriptEngine* engine) : _engine(engine) {}
-            virtual void run() override {
-                _engine->waitTillDoneRunning();
-                _engine->deleteLater();
-            }
-
-        private:
-            ScriptEngine* _engine;
-    };
-
-    // Wait for the scripting thread from the thread pool to avoid hanging the main thread
-    QThreadPool::globalInstance()->start(new WaitRunnable(engine));
+EntityRendererPointer EntityTreeRenderer::renderableForEntityId(const EntityItemID& id) const {
+    auto itr = _entitiesInScene.find(id);
+    if (itr == _entitiesInScene.end()) {
+        return EntityRendererPointer();
+    }
+    return itr->second;
 }
 
+render::ItemID EntityTreeRenderer::renderableIdForEntityId(const EntityItemID& id) const {
+    auto renderable = renderableForEntityId(id);
+    if (renderable) {
+        return renderable->getRenderItemID();
+    } else {
+        return render::Item::INVALID_ITEM_ID;
+    }
+}
+
+int EntityTreeRenderer::_entitiesScriptEngineCount = 0;
+
 void EntityTreeRenderer::resetEntitiesScriptEngine() {
-    // Keep a ref to oldEngine until newEngine is ready so EntityScriptingInterface has something to use
-    auto oldEngine = _entitiesScriptEngine;
-
-    auto newEngine = new ScriptEngine(ScriptEngine::ENTITY_CLIENT_SCRIPT, NO_SCRIPT, QString("about:Entities %1").arg(++_entitiesScriptEngineCount));
-    _entitiesScriptEngine = QSharedPointer<ScriptEngine>(newEngine, entitiesScriptEngineDeleter);
-
-    _scriptingServices->registerScriptEngineWithApplicationServices(_entitiesScriptEngine.data());
+    _entitiesScriptEngine = scriptEngineFactory(ScriptEngine::ENTITY_CLIENT_SCRIPT, NO_SCRIPT,
+                                                QString("about:Entities %1").arg(++_entitiesScriptEngineCount));
+    _scriptingServices->registerScriptEngineWithApplicationServices(_entitiesScriptEngine);
     _entitiesScriptEngine->runInThread();
-    DependencyManager::get<EntityScriptingInterface>()->setEntitiesScriptEngine(_entitiesScriptEngine.data());
+    auto entitiesScriptEngineProvider = qSharedPointerCast<EntitiesScriptEngineProvider>(_entitiesScriptEngine);
+    auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
+    entityScriptingInterface->setEntitiesScriptEngine(entitiesScriptEngineProvider);
+
+    // Connect mouse events to entity script callbacks
+    connect(entityScriptingInterface.data(), &EntityScriptingInterface::mousePressOnEntity, _entitiesScriptEngine.data(), [&](const EntityItemID& entityID, const PointerEvent& event) {
+        _entitiesScriptEngine->callEntityScriptMethod(entityID, "mousePressOnEntity", event);
+    });
+    connect(entityScriptingInterface.data(), &EntityScriptingInterface::mouseDoublePressOnEntity, _entitiesScriptEngine.data(), [&](const EntityItemID& entityID, const PointerEvent& event) {
+        _entitiesScriptEngine->callEntityScriptMethod(entityID, "mouseDoublePressOnEntity", event);
+    });
+    connect(entityScriptingInterface.data(), &EntityScriptingInterface::mouseMoveOnEntity, _entitiesScriptEngine.data(), [&](const EntityItemID& entityID, const PointerEvent& event) {
+        _entitiesScriptEngine->callEntityScriptMethod(entityID, "mouseMoveOnEntity", event);
+        // FIXME: this is a duplicate of mouseMoveOnEntity, but it seems like some scripts might use this naming
+        _entitiesScriptEngine->callEntityScriptMethod(entityID, "mouseMoveEvent", event);
+    });
+    connect(entityScriptingInterface.data(), &EntityScriptingInterface::mouseReleaseOnEntity, _entitiesScriptEngine.data(), [&](const EntityItemID& entityID, const PointerEvent& event) {
+        _entitiesScriptEngine->callEntityScriptMethod(entityID, "mouseReleaseOnEntity", event);
+    });
+
+    connect(entityScriptingInterface.data(), &EntityScriptingInterface::clickDownOnEntity, _entitiesScriptEngine.data(), [&](const EntityItemID& entityID, const PointerEvent& event) {
+        _entitiesScriptEngine->callEntityScriptMethod(entityID, "clickDownOnEntity", event);
+    });
+    connect(entityScriptingInterface.data(), &EntityScriptingInterface::holdingClickOnEntity, _entitiesScriptEngine.data(), [&](const EntityItemID& entityID, const PointerEvent& event) {
+        _entitiesScriptEngine->callEntityScriptMethod(entityID, "holdingClickOnEntity", event);
+    });
+    connect(entityScriptingInterface.data(), &EntityScriptingInterface::clickReleaseOnEntity, _entitiesScriptEngine.data(), [&](const EntityItemID& entityID, const PointerEvent& event) {
+        _entitiesScriptEngine->callEntityScriptMethod(entityID, "clickReleaseOnEntity", event);
+    });
+
+    connect(entityScriptingInterface.data(), &EntityScriptingInterface::hoverEnterEntity, _entitiesScriptEngine.data(), [&](const EntityItemID& entityID, const PointerEvent& event) {
+        _entitiesScriptEngine->callEntityScriptMethod(entityID, "hoverEnterEntity", event);
+    });
+    connect(entityScriptingInterface.data(), &EntityScriptingInterface::hoverOverEntity, _entitiesScriptEngine.data(), [&](const EntityItemID& entityID, const PointerEvent& event) {
+        _entitiesScriptEngine->callEntityScriptMethod(entityID, "hoverOverEntity", event);
+    });
+    connect(entityScriptingInterface.data(), &EntityScriptingInterface::hoverLeaveEntity, _entitiesScriptEngine.data(), [&](const EntityItemID& entityID, const PointerEvent& event) {
+        _entitiesScriptEngine->callEntityScriptMethod(entityID, "hoverLeaveEntity", event);
+    });
 }
 
 void EntityTreeRenderer::clear() {
@@ -130,13 +174,9 @@ void EntityTreeRenderer::clear() {
     auto scene = _viewState->getMain3DScene();
     if (scene) {
         render::Transaction transaction;
-        foreach(auto entity, _entitiesInScene) {
-            auto renderable = entity->getRenderableInterface();
-            if (!renderable) {
-                qCWarning(entitiesrenderer) << "EntityTreeRenderer::deletingEntity(), trying to remove non-renderable entity";
-                continue;
-            }
-            renderable->removeFromScene(entity, scene, transaction);
+        for (const auto& entry :  _entitiesInScene) {
+            const auto& renderer = entry.second;
+            renderer->removeFromScene(scene, transaction);
         }
         scene->enqueueTransaction(transaction);
     } else {
@@ -153,7 +193,9 @@ void EntityTreeRenderer::clear() {
 void EntityTreeRenderer::reloadEntityScripts() {
     _entitiesScriptEngine->unloadAllEntityScripts();
     _entitiesScriptEngine->resetModuleCache();
-    foreach(auto entity, _entitiesInScene) {
+    for (const auto& entry : _entitiesInScene) {
+        const auto& renderer = entry.second;
+        const auto& entity = renderer->getEntity();
         if (!entity->getScript().isEmpty()) {
             _entitiesScriptEngine->loadEntityScript(entity->getEntityItemID(), entity->getScript(), true);
         }
@@ -185,29 +227,116 @@ void EntityTreeRenderer::shutdown() {
     clear(); // always clear() on shutdown
 }
 
-void EntityTreeRenderer::setTree(OctreePointer newTree) {
-    OctreeProcessor::setTree(newTree);
+void EntityTreeRenderer::addPendingEntities(const render::ScenePointer& scene, render::Transaction& transaction) {
+    PROFILE_RANGE_EX(simulation_physics, "Add", 0xffff00ff, (uint64_t)_entitiesToAdd.size());
+    PerformanceTimer pt("add");
+    // Clear any expired entities 
+    // FIXME should be able to use std::remove_if, but it fails due to some 
+    // weird compilation error related to EntityItemID assignment operators
+    for (auto itr = _entitiesToAdd.begin(); _entitiesToAdd.end() != itr; ) {
+        if (itr->second.expired()) {
+            _entitiesToAdd.erase(itr++);
+        } else {
+            ++itr;
+        }
+    }
+
+    if (!_entitiesToAdd.empty()) {
+        std::unordered_set<EntityItemID> processedIds;
+        for (const auto& entry : _entitiesToAdd) {
+            auto entity = entry.second.lock();
+            if (!entity) {
+                continue;
+            }
+
+            // Path to the parent transforms is not valid, 
+            // don't add to the scene graph yet
+            if (!entity->isParentPathComplete()) {
+                continue;
+            }
+
+            auto entityID = entity->getEntityItemID();
+            processedIds.insert(entityID);
+            auto renderable = EntityRenderer::addToScene(*this, entity, scene, transaction);
+            if (renderable) {
+                _entitiesInScene.insert({ entityID, renderable });
+            }
+        }
+
+
+        if (!processedIds.empty()) {
+            for (const auto& processedId : processedIds) {
+                _entitiesToAdd.erase(processedId);
+            }
+        }
+    }
 }
 
-void EntityTreeRenderer::update() {
+void EntityTreeRenderer::updateChangedEntities(const render::ScenePointer& scene, render::Transaction& transaction) {
+    PROFILE_RANGE_EX(simulation_physics, "Change", 0xffff00ff, (uint64_t)_changedEntities.size());
+    PerformanceTimer pt("change");
+    std::unordered_set<EntityItemID> changedEntities;
+    _changedEntitiesGuard.withWriteLock([&] {
+#if 0
+        // FIXME Weird build failure in latest VC update that fails to compile when using std::swap
+        changedEntities.swap(_changedEntities);
+#else
+        changedEntities.insert(_changedEntities.begin(), _changedEntities.end());
+        _changedEntities.clear();
+#endif
+    });
+
+    for (const auto& entityId : changedEntities) {
+        auto renderable = renderableForEntityId(entityId);
+        if (!renderable) {
+            continue;
+        }
+        _renderablesToUpdate.insert({ entityId, renderable });
+    }
+
+    if (!_renderablesToUpdate.empty()) {
+        PROFILE_RANGE_EX(simulation_physics, "UpdateRenderables", 0xffff00ff, (uint64_t)_renderablesToUpdate.size());
+        for (const auto& entry : _renderablesToUpdate) {
+            const auto& renderable = entry.second;
+            renderable->updateInScene(scene, transaction);
+        }
+        _renderablesToUpdate.clear();
+    }
+}
+
+void EntityTreeRenderer::update(bool simulate) {
+    PROFILE_RANGE(simulation_physics, "ETR::update");
     PerformanceTimer perfTimer("ETRupdate");
     if (_tree && !_shuttingDown) {
         EntityTreePointer tree = std::static_pointer_cast<EntityTree>(_tree);
-        tree->update();
+        tree->update(simulate);
 
-        // Handle enter/leave entity logic
-        checkEnterLeaveEntities();
+        // Update the rendereable entities as needed
+        {
+            PROFILE_RANGE(simulation_physics, "Scene");
+            PerformanceTimer sceneTimer("scene");
+            auto scene = _viewState->getMain3DScene();
+            if (scene) {
+                render::Transaction transaction;
+                addPendingEntities(scene, transaction);
+                updateChangedEntities(scene, transaction);
+                scene->enqueueTransaction(transaction);
+            }
+        }
 
-        // Even if we're not moving the mouse, if we started clicking on an entity and we have
-        // not yet released the hold then this is still considered a holdingClickOnEntity event
-        // and we want to simulate this message here as well as in mouse move
-        if (_lastPointerEventValid && !_currentClickingOnEntityID.isInvalidID()) {
-            emit holdingClickOnEntity(_currentClickingOnEntityID, _lastPointerEvent);
-            _entitiesScriptEngine->callEntityScriptMethod(_currentClickingOnEntityID, "holdingClickOnEntity", _lastPointerEvent);
+        if (simulate) {
+            // Handle enter/leave entity logic
+            checkEnterLeaveEntities();
+
+            // Even if we're not moving the mouse, if we started clicking on an entity and we have
+            // not yet released the hold then this is still considered a holdingClickOnEntity event
+            // and we want to simulate this message here as well as in mouse move
+            if (_lastPointerEventValid && !_currentClickingOnEntityID.isInvalidID()) {
+                emit DependencyManager::get<EntityScriptingInterface>()->holdingClickOnEntity(_currentClickingOnEntityID, _lastPointerEvent);
+            }
         }
 
     }
-    deleteReleasedModels();
 }
 
 bool EntityTreeRenderer::findBestZoneAndMaybeContainingEntities(QVector<EntityItemID>* entitiesContainingAvatar) {
@@ -243,18 +372,13 @@ bool EntityTreeRenderer::findBestZoneAndMaybeContainingEntities(QVector<EntityIt
                     }
 
                     // if this entity is a zone and visible, determine if it is the bestZone
-                    if (isZone && entity->getVisible()) {
-                        auto renderID = std::dynamic_pointer_cast<RenderableZoneEntityItem>(entity)->getRenderItemID();
-                        bool isValidRenderID = (renderID != render::Item::INVALID_ITEM_ID);
-
-                        if (isValidRenderID) {
+                    if (isZone && entity->getVisible() && renderableForEntity(entity)) {
                             auto zone = std::dynamic_pointer_cast<ZoneEntityItem>(entity);
                             _layeredZones.insert(zone);
                         }
                     }
                 }
             }
-        }
 
         // check if our layered zones have changed
         if (_layeredZones.empty()) {
@@ -277,7 +401,8 @@ bool EntityTreeRenderer::findBestZoneAndMaybeContainingEntities(QVector<EntityIt
 }
 
 bool EntityTreeRenderer::checkEnterLeaveEntities() {
-    PerformanceTimer perfTimer("checkEnterLeaveEntities");
+    PROFILE_RANGE(simulation_physics, "EnterLeave");
+    PerformanceTimer perfTimer("enterLeave");
     auto now = usecTimestampNow();
     bool didUpdate = false;
 
@@ -354,11 +479,12 @@ bool EntityTreeRenderer::applyLayeredZones() {
     if (scene) {
         render::Transaction transaction;
         render::ItemIDs list;
-
         for (auto& zone : _layeredZones) {
-            auto id = std::dynamic_pointer_cast<RenderableZoneEntityItem>(zone.zone)->getRenderItemID();
-            Q_ASSERT(id != render::Item::INVALID_ITEM_ID);
-            list.push_back(id);
+            auto id = renderableIdForEntity(zone.zone);
+            // The zone may not have been rendered yet.
+            if (id != render::Item::INVALID_ITEM_ID) {
+                list.push_back(id);
+            }
         }
         render::Selection selection("RankedZones", list);
         transaction.resetSelection(selection);
@@ -375,94 +501,7 @@ void EntityTreeRenderer::processEraseMessage(ReceivedMessage& message, const Sha
     std::static_pointer_cast<EntityTree>(_tree)->processEraseMessage(message, sourceNode);
 }
 
-ModelPointer EntityTreeRenderer::allocateModel(const QString& url, float loadingPriority, SpatiallyNestable* spatiallyNestableOverride) {
-    ModelPointer model = nullptr;
-
-    // Only create and delete models on the thread that owns the EntityTreeRenderer
-    if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "allocateModel", Qt::BlockingQueuedConnection,
-                Q_RETURN_ARG(ModelPointer, model),
-                Q_ARG(const QString&, url));
-
-        return model;
-    }
-
-    model = std::make_shared<Model>(nullptr, spatiallyNestableOverride);
-    model->setLoadingPriority(loadingPriority);
-    model->init();
-    model->setURL(QUrl(url));
-    return model;
-}
-
-ModelPointer EntityTreeRenderer::updateModel(ModelPointer model, const QString& newUrl) {
-    // Only create and delete models on the thread that owns the EntityTreeRenderer
-    if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "updateModel", Qt::BlockingQueuedConnection,
-            Q_RETURN_ARG(ModelPointer, model),
-                Q_ARG(ModelPointer, model),
-                Q_ARG(const QString&, newUrl));
-
-        return model;
-    }
-
-    model->setURL(QUrl(newUrl));
-    return model;
-}
-
-void EntityTreeRenderer::releaseModel(ModelPointer model) {
-    // If we're not on the renderer's thread, then remember this model to be deleted later
-    if (QThread::currentThread() != thread()) {
-        _releasedModels << model;
-    } else { // otherwise just delete it right away
-        model.reset();
-    }
-}
-
-void EntityTreeRenderer::deleteReleasedModels() {
-    if (_releasedModels.size() > 0) {
-        foreach(ModelPointer model, _releasedModels) {
-            model.reset();
-        }
-        _releasedModels.clear();
-    }
-}
-
-RayToEntityIntersectionResult EntityTreeRenderer::findRayIntersectionWorker(const PickRay& ray, Octree::lockType lockType,
-                                                                                    bool precisionPicking, const QVector<EntityItemID>& entityIdsToInclude,
-                                                                                    const QVector<EntityItemID>& entityIdsToDiscard, bool visibleOnly, bool collidableOnly) {
-    RayToEntityIntersectionResult result;
-    if (_tree) {
-        EntityTreePointer entityTree = std::static_pointer_cast<EntityTree>(_tree);
-
-        OctreeElementPointer element;
-        EntityItemPointer intersectedEntity = NULL;
-        result.intersects = entityTree->findRayIntersection(ray.origin, ray.direction,
-            entityIdsToInclude, entityIdsToDiscard, visibleOnly, collidableOnly, precisionPicking,
-            element, result.distance, result.face, result.surfaceNormal,
-            (void**)&intersectedEntity, lockType, &result.accurate);
-        if (result.intersects && intersectedEntity) {
-            result.entityID = intersectedEntity->getEntityItemID();
-            result.intersection = ray.origin + (ray.direction * result.distance);
-            result.entity = intersectedEntity;
-        }
-    }
-    return result;
-}
-
 void EntityTreeRenderer::connectSignalsToSlots(EntityScriptingInterface* entityScriptingInterface) {
-
-    connect(this, &EntityTreeRenderer::mousePressOnEntity, entityScriptingInterface, &EntityScriptingInterface::mousePressOnEntity);
-    connect(this, &EntityTreeRenderer::mouseMoveOnEntity, entityScriptingInterface, &EntityScriptingInterface::mouseMoveOnEntity);
-    connect(this, &EntityTreeRenderer::mouseReleaseOnEntity, entityScriptingInterface, &EntityScriptingInterface::mouseReleaseOnEntity);
-
-    connect(this, &EntityTreeRenderer::clickDownOnEntity, entityScriptingInterface, &EntityScriptingInterface::clickDownOnEntity);
-    connect(this, &EntityTreeRenderer::holdingClickOnEntity, entityScriptingInterface, &EntityScriptingInterface::holdingClickOnEntity);
-    connect(this, &EntityTreeRenderer::clickReleaseOnEntity, entityScriptingInterface, &EntityScriptingInterface::clickReleaseOnEntity);
-
-    connect(this, &EntityTreeRenderer::hoverEnterEntity, entityScriptingInterface, &EntityScriptingInterface::hoverEnterEntity);
-    connect(this, &EntityTreeRenderer::hoverOverEntity, entityScriptingInterface, &EntityScriptingInterface::hoverOverEntity);
-    connect(this, &EntityTreeRenderer::hoverLeaveEntity, entityScriptingInterface, &EntityScriptingInterface::hoverLeaveEntity);
-
     connect(this, &EntityTreeRenderer::enterEntity, entityScriptingInterface, &EntityScriptingInterface::enterEntity);
     connect(this, &EntityTreeRenderer::leaveEntity, entityScriptingInterface, &EntityScriptingInterface::leaveEntity);
     connect(this, &EntityTreeRenderer::collisionWithEntity, entityScriptingInterface, &EntityScriptingInterface::collisionWithEntity);
@@ -529,16 +568,13 @@ void EntityTreeRenderer::mousePressEvent(QMouseEvent* event) {
     if (!_tree || _shuttingDown) {
         return;
     }
+
     PerformanceTimer perfTimer("EntityTreeRenderer::mousePressEvent");
+    auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
     PickRay ray = _viewState->computePickRay(event->x(), event->y());
-
-    bool precisionPicking = !_dontDoPrecisionPicking;
-    RayToEntityIntersectionResult rayPickResult = findRayIntersectionWorker(ray, Octree::Lock, precisionPicking);
-    if (rayPickResult.intersects) {
-        //qCDebug(entitiesrenderer) << "mousePressEvent over entity:" << rayPickResult.entityID;
-
-        auto entity = getTree()->findEntityByEntityItemID(rayPickResult.entityID);
-        auto properties = entity->getProperties();
+    RayToEntityIntersectionResult rayPickResult = _getPrevRayPickResultOperator(_mouseRayPickID);
+    if (rayPickResult.intersects && rayPickResult.entity) {
+        auto properties = rayPickResult.entity->getProperties();
         QString urlString = properties.getHref();
         QUrl url = QUrl(urlString, QUrl::StrictMode);
         if (url.isValid() && !url.isEmpty()){
@@ -552,23 +588,16 @@ void EntityTreeRenderer::mousePressEvent(QMouseEvent* event) {
                                   toPointerButton(*event), toPointerButtons(*event),
                                   Qt::NoModifier); // TODO -- check for modifier keys?
 
-        emit mousePressOnEntity(rayPickResult.entityID, pointerEvent);
-
-        if (_entitiesScriptEngine) {
-            _entitiesScriptEngine->callEntityScriptMethod(rayPickResult.entityID, "mousePressOnEntity", pointerEvent);
-        }
+        emit entityScriptingInterface->mousePressOnEntity(rayPickResult.entityID, pointerEvent);
 
         _currentClickingOnEntityID = rayPickResult.entityID;
-        emit clickDownOnEntity(_currentClickingOnEntityID, pointerEvent);
-        if (_entitiesScriptEngine) {
-            _entitiesScriptEngine->callEntityScriptMethod(_currentClickingOnEntityID, "clickDownOnEntity", pointerEvent);
-        }
+        emit entityScriptingInterface->clickDownOnEntity(_currentClickingOnEntityID, pointerEvent);
 
         _lastPointerEvent = pointerEvent;
         _lastPointerEventValid = true;
 
     } else {
-        emit mousePressOffEntity();
+        emit entityScriptingInterface->mousePressOffEntity();
     }
 }
 
@@ -578,37 +607,27 @@ void EntityTreeRenderer::mouseDoublePressEvent(QMouseEvent* event) {
     if (!_tree || _shuttingDown) {
         return;
     }
+
     PerformanceTimer perfTimer("EntityTreeRenderer::mouseDoublePressEvent");
+    auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
     PickRay ray = _viewState->computePickRay(event->x(), event->y());
-
-    bool precisionPicking = !_dontDoPrecisionPicking;
-    RayToEntityIntersectionResult rayPickResult = findRayIntersectionWorker(ray, Octree::Lock, precisionPicking);
-    if (rayPickResult.intersects) {
-        //qCDebug(entitiesrenderer) << "mouseDoublePressEvent over entity:" << rayPickResult.entityID;
-
+    RayToEntityIntersectionResult rayPickResult = _getPrevRayPickResultOperator(_mouseRayPickID);
+    if (rayPickResult.intersects && rayPickResult.entity) {
         glm::vec2 pos2D = projectOntoEntityXYPlane(rayPickResult.entity, ray, rayPickResult);
         PointerEvent pointerEvent(PointerEvent::Press, MOUSE_POINTER_ID,
             pos2D, rayPickResult.intersection,
             rayPickResult.surfaceNormal, ray.direction,
             toPointerButton(*event), toPointerButtons(*event), Qt::NoModifier);
 
-        emit mouseDoublePressOnEntity(rayPickResult.entityID, pointerEvent);
-
-        if (_entitiesScriptEngine) {
-            _entitiesScriptEngine->callEntityScriptMethod(rayPickResult.entityID, "mouseDoublePressOnEntity", pointerEvent);
-        }
+        emit entityScriptingInterface->mouseDoublePressOnEntity(rayPickResult.entityID, pointerEvent);
 
         _currentClickingOnEntityID = rayPickResult.entityID;
-        emit clickDownOnEntity(_currentClickingOnEntityID, pointerEvent);
-        if (_entitiesScriptEngine) {
-            _entitiesScriptEngine->callEntityScriptMethod(_currentClickingOnEntityID, "doubleclickOnEntity", pointerEvent);
-        }
+        emit entityScriptingInterface->clickDownOnEntity(_currentClickingOnEntityID, pointerEvent);
 
         _lastPointerEvent = pointerEvent;
         _lastPointerEventValid = true;
-
     } else {
-        emit mouseDoublePressOffEntity();
+        emit entityScriptingInterface->mouseDoublePressOffEntity();
     }
 }
 
@@ -620,10 +639,10 @@ void EntityTreeRenderer::mouseReleaseEvent(QMouseEvent* event) {
     }
 
     PerformanceTimer perfTimer("EntityTreeRenderer::mouseReleaseEvent");
+    auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
     PickRay ray = _viewState->computePickRay(event->x(), event->y());
-    bool precisionPicking = !_dontDoPrecisionPicking;
-    RayToEntityIntersectionResult rayPickResult = findRayIntersectionWorker(ray, Octree::Lock, precisionPicking);
-    if (rayPickResult.intersects) {
+    RayToEntityIntersectionResult rayPickResult = _getPrevRayPickResultOperator(_mouseRayPickID);
+    if (rayPickResult.intersects && rayPickResult.entity) {
         //qCDebug(entitiesrenderer) << "mouseReleaseEvent over entity:" << rayPickResult.entityID;
 
         glm::vec2 pos2D = projectOntoEntityXYPlane(rayPickResult.entity, ray, rayPickResult);
@@ -633,31 +652,23 @@ void EntityTreeRenderer::mouseReleaseEvent(QMouseEvent* event) {
                                   toPointerButton(*event), toPointerButtons(*event),
                                   Qt::NoModifier); // TODO -- check for modifier keys?
 
-        emit mouseReleaseOnEntity(rayPickResult.entityID, pointerEvent);
-        if (_entitiesScriptEngine) {
-            _entitiesScriptEngine->callEntityScriptMethod(rayPickResult.entityID, "mouseReleaseOnEntity", pointerEvent);
-        }
+        emit entityScriptingInterface->mouseReleaseOnEntity(rayPickResult.entityID, pointerEvent);
 
         _lastPointerEvent = pointerEvent;
         _lastPointerEventValid = true;
     }
 
     // Even if we're no longer intersecting with an entity, if we started clicking on it, and now
-    // we're releasing the button, then this is considered a clickOn event
+    // we're releasing the button, then this is considered a clickReleaseOn event
     if (!_currentClickingOnEntityID.isInvalidID()) {
-
-        auto entity = getTree()->findEntityByID(_currentClickingOnEntityID);
-        glm::vec2 pos2D = projectOntoEntityXYPlane(entity, ray, rayPickResult);
+        glm::vec2 pos2D = projectOntoEntityXYPlane(rayPickResult.entity, ray, rayPickResult);
         PointerEvent pointerEvent(PointerEvent::Release, MOUSE_POINTER_ID,
                                   pos2D, rayPickResult.intersection,
                                   rayPickResult.surfaceNormal, ray.direction,
                                   toPointerButton(*event), toPointerButtons(*event),
                                   Qt::NoModifier); // TODO -- check for modifier keys?
 
-        emit clickReleaseOnEntity(_currentClickingOnEntityID, pointerEvent);
-        if (_entitiesScriptEngine) {
-            _entitiesScriptEngine->callEntityScriptMethod(rayPickResult.entityID, "clickReleaseOnEntity", pointerEvent);
-        }
+        emit entityScriptingInterface->clickReleaseOnEntity(_currentClickingOnEntityID, pointerEvent);
     }
 
     // makes it the unknown ID, we just released so we can't be clicking on anything
@@ -670,14 +681,12 @@ void EntityTreeRenderer::mouseMoveEvent(QMouseEvent* event) {
     if (!_tree || _shuttingDown) {
         return;
     }
+
     PerformanceTimer perfTimer("EntityTreeRenderer::mouseMoveEvent");
-
+    auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
     PickRay ray = _viewState->computePickRay(event->x(), event->y());
-
-    bool precisionPicking = false; // for mouse moves we do not do precision picking
-    RayToEntityIntersectionResult rayPickResult = findRayIntersectionWorker(ray, Octree::TryLock, precisionPicking);
-    if (rayPickResult.intersects) {
-
+    RayToEntityIntersectionResult rayPickResult = _getPrevRayPickResultOperator(_mouseRayPickID);
+    if (rayPickResult.intersects && rayPickResult.entity) {
         glm::vec2 pos2D = projectOntoEntityXYPlane(rayPickResult.entity, ray, rayPickResult);
         PointerEvent pointerEvent(PointerEvent::Move, MOUSE_POINTER_ID,
                                   pos2D, rayPickResult.intersection,
@@ -685,48 +694,32 @@ void EntityTreeRenderer::mouseMoveEvent(QMouseEvent* event) {
                                   toPointerButton(*event), toPointerButtons(*event),
                                   Qt::NoModifier); // TODO -- check for modifier keys?
 
-        emit mouseMoveOnEntity(rayPickResult.entityID, pointerEvent);
-
-        if (_entitiesScriptEngine) {
-            _entitiesScriptEngine->callEntityScriptMethod(rayPickResult.entityID, "mouseMoveEvent", pointerEvent);
-            _entitiesScriptEngine->callEntityScriptMethod(rayPickResult.entityID, "mouseMoveOnEntity", pointerEvent);
-        }
+        emit entityScriptingInterface->mouseMoveOnEntity(rayPickResult.entityID, pointerEvent);
 
         // handle the hover logic...
 
         // if we were previously hovering over an entity, and this new entity is not the same as our previous entity
         // then we need to send the hover leave.
         if (!_currentHoverOverEntityID.isInvalidID() && rayPickResult.entityID != _currentHoverOverEntityID) {
-
-            auto entity = getTree()->findEntityByID(_currentHoverOverEntityID);
-            glm::vec2 pos2D = projectOntoEntityXYPlane(entity, ray, rayPickResult);
+            glm::vec2 pos2D = projectOntoEntityXYPlane(rayPickResult.entity, ray, rayPickResult);
             PointerEvent pointerEvent(PointerEvent::Move, MOUSE_POINTER_ID,
                                       pos2D, rayPickResult.intersection,
                                       rayPickResult.surfaceNormal, ray.direction,
                                       toPointerButton(*event), toPointerButtons(*event),
                                       Qt::NoModifier); // TODO -- check for modifier keys?
 
-            emit hoverLeaveEntity(_currentHoverOverEntityID, pointerEvent);
-            if (_entitiesScriptEngine) {
-                _entitiesScriptEngine->callEntityScriptMethod(_currentHoverOverEntityID, "hoverLeaveEntity", pointerEvent);
-            }
+            emit entityScriptingInterface->hoverLeaveEntity(_currentHoverOverEntityID, pointerEvent);
         }
 
         // If the new hover entity does not match the previous hover entity then we are entering the new one
         // this is true if the _currentHoverOverEntityID is known or unknown
         if (rayPickResult.entityID != _currentHoverOverEntityID) {
-            emit hoverEnterEntity(rayPickResult.entityID, pointerEvent);
-            if (_entitiesScriptEngine) {
-                _entitiesScriptEngine->callEntityScriptMethod(rayPickResult.entityID, "hoverEnterEntity", pointerEvent);
-            }
+            emit entityScriptingInterface->hoverEnterEntity(rayPickResult.entityID, pointerEvent);
         }
 
         // and finally, no matter what, if we're intersecting an entity then we're definitely hovering over it, and
         // we should send our hover over event
-        emit hoverOverEntity(rayPickResult.entityID, pointerEvent);
-        if (_entitiesScriptEngine) {
-            _entitiesScriptEngine->callEntityScriptMethod(rayPickResult.entityID, "hoverOverEntity", pointerEvent);
-        }
+        emit entityScriptingInterface->hoverOverEntity(rayPickResult.entityID, pointerEvent);
 
         // remember what we're hovering over
         _currentHoverOverEntityID = rayPickResult.entityID;
@@ -739,44 +732,29 @@ void EntityTreeRenderer::mouseMoveEvent(QMouseEvent* event) {
         // if we were previously hovering over an entity, and we're no longer hovering over any entity then we need to
         // send the hover leave for our previous entity
         if (!_currentHoverOverEntityID.isInvalidID()) {
-
-            auto entity = getTree()->findEntityByID(_currentHoverOverEntityID);
-            glm::vec2 pos2D = projectOntoEntityXYPlane(entity, ray, rayPickResult);
+            glm::vec2 pos2D = projectOntoEntityXYPlane(rayPickResult.entity, ray, rayPickResult);
             PointerEvent pointerEvent(PointerEvent::Move, MOUSE_POINTER_ID,
                                   pos2D, rayPickResult.intersection,
                                   rayPickResult.surfaceNormal, ray.direction,
                                       toPointerButton(*event), toPointerButtons(*event),
                                       Qt::NoModifier); // TODO -- check for modifier keys?
 
-            emit hoverLeaveEntity(_currentHoverOverEntityID, pointerEvent);
-            if (_entitiesScriptEngine) {
-                _entitiesScriptEngine->callEntityScriptMethod(_currentHoverOverEntityID, "hoverLeaveEntity", pointerEvent);
-            }
+            emit entityScriptingInterface->hoverLeaveEntity(_currentHoverOverEntityID, pointerEvent);
             _currentHoverOverEntityID = UNKNOWN_ENTITY_ID; // makes it the unknown ID
-        }
-    }
 
-    // Even if we're no longer intersecting with an entity, if we started clicking on an entity and we have
-    // not yet released the hold then this is still considered a holdingClickOnEntity event
-    if (!_currentClickingOnEntityID.isInvalidID()) {
-
-        auto entity = getTree()->findEntityByID(_currentClickingOnEntityID);
-        glm::vec2 pos2D = projectOntoEntityXYPlane(entity, ray, rayPickResult);
-        PointerEvent pointerEvent(PointerEvent::Move, MOUSE_POINTER_ID,
-                                  pos2D, rayPickResult.intersection,
-                                  rayPickResult.surfaceNormal, ray.direction,
-                                  toPointerButton(*event), toPointerButtons(*event),
-                                  Qt::NoModifier); // TODO -- check for modifier keys?
-
-        emit holdingClickOnEntity(_currentClickingOnEntityID, pointerEvent);
-        if (_entitiesScriptEngine) {
-            _entitiesScriptEngine->callEntityScriptMethod(_currentClickingOnEntityID, "holdingClickOnEntity", pointerEvent);
+            _lastPointerEvent = pointerEvent;
+            _lastPointerEventValid = true;
         }
     }
 }
 
 void EntityTreeRenderer::deletingEntity(const EntityItemID& entityID) {
-    if (!_entitiesInScene.contains(entityID)) {
+    // If it's in the pending queue, remove it
+    _entitiesToAdd.erase(entityID);
+
+    auto itr = _entitiesInScene.find(entityID);
+    if (_entitiesInScene.end() == itr) {
+        // Not in the scene, and no longer potentially in the pending queue, we're done
         return;
     }
         
@@ -790,8 +768,9 @@ void EntityTreeRenderer::deletingEntity(const EntityItemID& entityID) {
         return;
     }
 
-    auto entity = _entitiesInScene.take(entityID);
-    auto renderable = entity->getRenderableInterface();
+    auto renderable = itr->second;
+    _entitiesInScene.erase(itr);
+
     if (!renderable) {
         qCWarning(entitiesrenderer) << "EntityTreeRenderer::deletingEntity(), trying to remove non-renderable entity";
         return;
@@ -801,7 +780,7 @@ void EntityTreeRenderer::deletingEntity(const EntityItemID& entityID) {
 
     // here's where we remove the entity payload from the scene
     render::Transaction transaction;
-    renderable->removeFromScene(entity, scene, transaction);
+    renderable->removeFromScene(scene, transaction);
     scene->enqueueTransaction(transaction);
 }
 
@@ -810,32 +789,10 @@ void EntityTreeRenderer::addingEntity(const EntityItemID& entityID) {
     checkAndCallPreload(entityID);
     auto entity = std::static_pointer_cast<EntityTree>(_tree)->findEntityByID(entityID);
     if (entity) {
-        addEntityToScene(entity);
+        _entitiesToAdd.insert({ entity->getEntityItemID(),  entity });
     }
 }
 
-void EntityTreeRenderer::addEntityToScene(const EntityItemPointer& entity) {
-    // here's where we add the entity payload to the scene
-    auto scene = _viewState->getMain3DScene();
-    if (!scene) {
-        qCWarning(entitiesrenderer) << "EntityTreeRenderer::addEntityToScene(), Unexpected null scene, possibly during application shutdown";
-        return;
-    }
-
-    auto renderable = entity->getRenderableInterface();
-    if (!renderable) {
-        qCWarning(entitiesrenderer) << "EntityTreeRenderer::addEntityToScene(), Unexpected non-renderable entity";
-        return;
-    }
-
-    render::Transaction transaction;
-    if (renderable->addToScene(entity, scene, transaction)) {
-        _entitiesInScene.insert(entity->getEntityItemID(), entity);
-    }
-    scene->enqueueTransaction(transaction);
-}
-
-
 void EntityTreeRenderer::entityScriptChanging(const EntityItemID& entityID, bool reload) {
     checkAndCallPreload(entityID, reload, true);
 }
@@ -849,7 +806,9 @@ void EntityTreeRenderer::checkAndCallPreload(const EntityItemID& entityID, bool
         bool shouldLoad = entity->shouldPreloadScript() && _entitiesScriptEngine;
         QString scriptUrl = entity->getScript();
         if ((shouldLoad && unloadFirst) || scriptUrl.isEmpty()) {
+            if (_entitiesScriptEngine) {
             _entitiesScriptEngine->unloadEntityScript(entityID);
+            }
             entity->scriptHasUnloaded();
         }
         if (shouldLoad) {
@@ -860,9 +819,9 @@ void EntityTreeRenderer::checkAndCallPreload(const EntityItemID& entityID, bool
     }
 }
 
-void EntityTreeRenderer::playEntityCollisionSound(EntityItemPointer entity, const Collision& collision) {
+void EntityTreeRenderer::playEntityCollisionSound(const EntityItemPointer& entity, const Collision& collision) {
     assert((bool)entity);
-    auto renderable = entity->getRenderableInterface();
+    auto renderable = renderableForEntity(entity);
     if (!renderable) { 
         return; 
     }
@@ -962,7 +921,11 @@ void EntityTreeRenderer::updateEntityRenderStatus(bool shouldRenderEntities) {
         }
         _entityIDsLastInScene.clear();
     } else {
-        _entityIDsLastInScene = _entitiesInScene.keys();
+        _entityIDsLastInScene.clear();
+        using MapEntry = std::pair<EntityItemID, EntityRendererPointer>;
+        std::transform(_entitiesInScene.begin(), _entitiesInScene.end(), 
+            std::back_inserter(_entityIDsLastInScene), [](const MapEntry& entry) { return entry.first; });
+
         for (auto entityID : _entityIDsLastInScene) {
             // FIXME - is this really right? do we want to do the deletingEntity() code or just remove from the scene.
             deletingEntity(entityID);
@@ -1057,3 +1020,59 @@ bool EntityTreeRenderer::LayeredZones::contains(const LayeredZones& other) {
     return result;
 }
 
+CalculateEntityLoadingPriority EntityTreeRenderer::_calculateEntityLoadingPriorityFunc = [](const EntityItem& item) -> float {
+    return 0.0f;
+};
+
+bool EntityTreeRenderer::wantsKeyboardFocus(const EntityItemID& id) const {
+    auto renderable = renderableForEntityId(id);
+    if (!renderable) {
+        return false;
+    }
+    return renderable->wantsKeyboardFocus();
+}
+
+QObject* EntityTreeRenderer::getEventHandler(const EntityItemID& id) {
+    auto renderable = renderableForEntityId(id);
+    if (!renderable) {
+        return nullptr;
+    }
+    return renderable->getEventHandler();
+
+}
+
+bool EntityTreeRenderer::wantsHandControllerPointerEvents(const EntityItemID& id) const {
+    auto renderable = renderableForEntityId(id);
+    if (!renderable) {
+        return false;
+    }
+    return renderable->wantsHandControllerPointerEvents();
+}
+
+void EntityTreeRenderer::setProxyWindow(const EntityItemID& id, QWindow* proxyWindow) {
+    auto renderable = renderableForEntityId(id);
+    if (renderable) {
+        renderable->setProxyWindow(proxyWindow);
+    }
+}
+
+void EntityTreeRenderer::setCollisionSound(const EntityItemID& id, const SharedSoundPointer& sound) {
+    auto renderable = renderableForEntityId(id);
+    if (renderable) {
+        renderable->setCollisionSound(sound);
+    }
+}
+EntityItemPointer EntityTreeRenderer::getEntity(const EntityItemID& id) {
+    EntityItemPointer result;
+    auto renderable = renderableForEntityId(id);
+    if (renderable) {
+        result = renderable->getEntity();
+    }
+    return result;
+}
+
+void EntityTreeRenderer::onEntityChanged(const EntityItemID& id) {
+    _changedEntitiesGuard.withWriteLock([&] {
+        _changedEntities.insert(id);
+    });
+}
diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.h b/libraries/entities-renderer/src/EntityTreeRenderer.h
index f4909a2036..1eb44f996a 100644
--- a/libraries/entities-renderer/src/EntityTreeRenderer.h
+++ b/libraries/entities-renderer/src/EntityTreeRenderer.h
@@ -32,6 +32,19 @@ class ScriptEngine;
 class ZoneEntityItem;
 class EntityItem;
 
+namespace render { namespace entities {
+    class EntityRenderer;
+    using EntityRendererPointer = std::shared_ptr<EntityRenderer>;
+    using EntityRendererWeakPointer = std::weak_ptr<EntityRenderer>;
+
+} }
+
+// Allow the use of std::unordered_map with QUuid keys
+namespace std { template<> struct hash<EntityItemID> { size_t operator()(const EntityItemID& id) const; }; }
+
+using EntityRenderer = render::entities::EntityRenderer;
+using EntityRendererPointer = render::entities::EntityRendererPointer;
+using EntityRendererWeakPointer = render::entities::EntityRendererWeakPointer;
 class Model;
 using ModelPointer = std::shared_ptr<Model>;
 using ModelWeakPointer = std::weak_ptr<Model>;
@@ -42,6 +55,9 @@ using CalculateEntityLoadingPriority = std::function<float(const EntityItem& ite
 class EntityTreeRenderer : public OctreeProcessor, public Dependency {
     Q_OBJECT
 public:
+    static void setEntitiesShouldFadeFunction(std::function<bool()> func) { _entitiesShouldFadeFunction = func; }
+    static std::function<bool()> getEntitiesShouldFadeFunction() { return _entitiesShouldFadeFunction; }
+
     EntityTreeRenderer(bool wantScripts, AbstractViewStateInterface* viewState,
                                 AbstractScriptingServicesInterface* scriptingServices);
     virtual ~EntityTreeRenderer();
@@ -53,14 +69,17 @@ public:
     virtual char getMyNodeType() const override { return NodeType::EntityServer; }
     virtual PacketType getMyQueryMessageType() const override { return PacketType::EntityQuery; }
     virtual PacketType getExpectedPacketType() const override { return PacketType::EntityData; }
-    virtual void setTree(OctreePointer newTree) override;
 
     // Returns the priority at which an entity should be loaded. Higher values indicate higher priority.
-    float getEntityLoadingPriority(const EntityItem& item) const { return _calculateEntityLoadingPriorityFunc(item); }
-    void setEntityLoadingPriorityFunction(CalculateEntityLoadingPriority fn) { this->_calculateEntityLoadingPriorityFunc = fn; }
+    static float getEntityLoadingPriority(const EntityItem& item) { return _calculateEntityLoadingPriorityFunc(item); }
+    static void setEntityLoadingPriorityFunction(CalculateEntityLoadingPriority fn) { _calculateEntityLoadingPriorityFunc = fn; }
+
+    void setMouseRayPickID(QUuid rayPickID) { _mouseRayPickID = rayPickID; }
+    void setMouseRayPickResultOperator(std::function<RayToEntityIntersectionResult(QUuid)> getPrevRayPickResultOperator) { _getPrevRayPickResultOperator = getPrevRayPickResultOperator;  }
+    void setSetPrecisionPickingOperator(std::function<void(QUuid, bool)> setPrecisionPickingOperator) { _setPrecisionPickingOperator = setPrecisionPickingOperator; }
 
     void shutdown();
-    void update();
+    void update(bool simulate);
 
     EntityTreePointer getTree() { return std::static_pointer_cast<EntityTree>(_tree); }
 
@@ -74,17 +93,6 @@ public:
     /// reloads the entity scripts, calling unload and preload
     void reloadEntityScripts();
 
-    /// if a renderable entity item needs a model, we will allocate it for them
-    Q_INVOKABLE ModelPointer allocateModel(const QString& url, float loadingPriority = 0.0f, SpatiallyNestable* spatiallyNestableOverride = nullptr);
-
-    /// if a renderable entity item needs to update the URL of a model, we will handle that for the entity
-    Q_INVOKABLE ModelPointer updateModel(ModelPointer original, const QString& newUrl);
-
-    /// if a renderable entity item is done with a model, it should return it to us
-    void releaseModel(ModelPointer model);
-
-    void deleteReleasedModels();
-
     // event handles which may generate entity related events
     void mouseReleaseEvent(QMouseEvent* event);
     void mousePressEvent(QMouseEvent* event);
@@ -100,22 +108,15 @@ public:
 
     std::shared_ptr<ZoneEntityItem> myAvatarZone() { return _layeredZones.getZone(); }
 
+    bool wantsKeyboardFocus(const EntityItemID& id) const;
+    QObject* getEventHandler(const EntityItemID& id);
+    bool wantsHandControllerPointerEvents(const EntityItemID& id) const;
+    void setProxyWindow(const EntityItemID& id, QWindow* proxyWindow);
+    void setCollisionSound(const EntityItemID& id, const SharedSoundPointer& sound);
+    EntityItemPointer getEntity(const EntityItemID& id);
+    void onEntityChanged(const EntityItemID& id);
+
 signals:
-    void mousePressOnEntity(const EntityItemID& entityItemID, const PointerEvent& event);
-    void mouseDoublePressOnEntity(const EntityItemID& entityItemID, const PointerEvent& event);
-    void mouseMoveOnEntity(const EntityItemID& entityItemID, const PointerEvent& event);
-    void mouseReleaseOnEntity(const EntityItemID& entityItemID, const PointerEvent& event);
-    void mousePressOffEntity();
-    void mouseDoublePressOffEntity();
-
-    void clickDownOnEntity(const EntityItemID& entityItemID, const PointerEvent& event);
-    void holdingClickOnEntity(const EntityItemID& entityItemID, const PointerEvent& event);
-    void clickReleaseOnEntity(const EntityItemID& entityItemID, const PointerEvent& event);
-
-    void hoverEnterEntity(const EntityItemID& entityItemID, const PointerEvent& event);
-    void hoverOverEntity(const EntityItemID& entityItemID, const PointerEvent& event);
-    void hoverLeaveEntity(const EntityItemID& entityItemID, const PointerEvent& event);
-
     void enterEntity(const EntityItemID& entityItemID);
     void leaveEntity(const EntityItemID& entityItemID);
     void collisionWithEntity(const EntityItemID& idA, const EntityItemID& idB, const Collision& collision);
@@ -130,7 +131,9 @@ public slots:
 
     // optional slots that can be wired to menu items
     void setDisplayModelBounds(bool value) { _displayModelBounds = value; }
-    void setDontDoPrecisionPicking(bool value) { _dontDoPrecisionPicking = value; }
+    void setPrecisionPicking(bool value) { _setPrecisionPickingOperator(_mouseRayPickID, value); }
+    EntityRendererPointer renderableForEntityId(const EntityItemID& id) const;
+    render::ItemID renderableIdForEntityId(const EntityItemID& id) const;
 
 protected:
     virtual OctreePointer createTree() override {
@@ -140,21 +143,19 @@ protected:
     }
 
 private:
+    void addPendingEntities(const render::ScenePointer& scene, render::Transaction& transaction);
+    void updateChangedEntities(const render::ScenePointer& scene, render::Transaction& transaction);
+    EntityRendererPointer renderableForEntity(const EntityItemPointer& entity) const { return renderableForEntityId(entity->getID()); }
+    render::ItemID renderableIdForEntity(const EntityItemPointer& entity) const { return renderableIdForEntityId(entity->getID()); }
+
     void resetEntitiesScriptEngine();
 
-    void addEntityToScene(const EntityItemPointer& entity);
     bool findBestZoneAndMaybeContainingEntities(QVector<EntityItemID>* entitiesContainingAvatar = nullptr);
 
     bool applyLayeredZones();
 
     void checkAndCallPreload(const EntityItemID& entityID, bool reload = false, bool unloadFirst = false);
 
-    QList<ModelPointer> _releasedModels;
-    RayToEntityIntersectionResult findRayIntersectionWorker(const PickRay& ray, Octree::lockType lockType,
-                                                                bool precisionPicking, const QVector<EntityItemID>& entityIdsToInclude = QVector<EntityItemID>(),
-                                                                const QVector<EntityItemID>& entityIdsToDiscard = QVector<EntityItemID>(), bool visibleOnly=false,
-                                                                bool collidableOnly = false);
-
     EntityItemID _currentHoverOverEntityID;
     EntityItemID _currentClickingOnEntityID;
 
@@ -167,21 +168,24 @@ private:
     QVector<EntityItemID> _currentEntitiesInside;
 
     bool _wantScripts;
-    QSharedPointer<ScriptEngine> _entitiesScriptEngine;
+    ScriptEnginePointer _entitiesScriptEngine;
 
-    static void playEntityCollisionSound(EntityItemPointer entity, const Collision& collision);
+    void playEntityCollisionSound(const EntityItemPointer& entity, const Collision& collision);
 
     bool _lastPointerEventValid;
     PointerEvent _lastPointerEvent;
     AbstractViewStateInterface* _viewState;
     AbstractScriptingServicesInterface* _scriptingServices;
     bool _displayModelBounds;
-    bool _dontDoPrecisionPicking;
 
     bool _shuttingDown { false };
 
     QMultiMap<QUrl, EntityItemID> _waitingOnPreload;
 
+    QUuid _mouseRayPickID;
+    std::function<RayToEntityIntersectionResult(QUuid)> _getPrevRayPickResultOperator;
+    std::function<void(QUuid, bool)> _setPrecisionPickingOperator;
+
     class LayeredZone {
     public:
         LayeredZone(std::shared_ptr<ZoneEntityItem> zone, QUuid id, float volume) : zone(zone), id(id), volume(volume) {}
@@ -238,15 +242,18 @@ private:
     const quint64 ZONE_CHECK_INTERVAL = USECS_PER_MSEC * 100; // ~10hz
     const float ZONE_CHECK_DISTANCE = 0.001f;
 
-    QHash<EntityItemID, EntityItemPointer> _entitiesInScene;
+    ReadWriteLockable _changedEntitiesGuard;
+    std::unordered_set<EntityItemID> _changedEntities;
+
+    std::unordered_map<EntityItemID, EntityRendererPointer> _renderablesToUpdate;
+    std::unordered_map<EntityItemID, EntityRendererPointer> _entitiesInScene;
+    std::unordered_map<EntityItemID, EntityItemWeakPointer> _entitiesToAdd;
     // For Scene.shouldRenderEntities
     QList<EntityItemID> _entityIDsLastInScene;
 
     static int _entitiesScriptEngineCount;
-
-    CalculateEntityLoadingPriority _calculateEntityLoadingPriorityFunc = [](const EntityItem& item) -> float {
-        return 0.0f;
-    };
+    static CalculateEntityLoadingPriority _calculateEntityLoadingPriorityFunc;
+    static std::function<bool()> _entitiesShouldFadeFunction;
 };
 
 
diff --git a/libraries/entities-renderer/src/RenderableEntityItem.cpp b/libraries/entities-renderer/src/RenderableEntityItem.cpp
index f8d155600a..9e4d832037 100644
--- a/libraries/entities-renderer/src/RenderableEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableEntityItem.cpp
@@ -10,64 +10,64 @@
 //
 
 
-#include <ObjectMotionState.h>
 #include "RenderableEntityItem.h"
 
-namespace render {
-    template <> const ItemKey payloadGetKey(const RenderableEntityItemProxy::Pointer& payload) { 
-        if (payload && payload->_entity) {
-            if (payload->_entity->getType() == EntityTypes::Light) {
-                return ItemKey::Builder::light().withTypeMeta();
-            }
-            if (payload && payload->_entity->isTransparent()) {
-                return ItemKey::Builder::transparentShape().withTypeMeta();
-            }
-        }
-        return ItemKey::Builder::opaqueShape().withTypeMeta();
-    }
-    
-    template <> const Item::Bound payloadGetBound(const RenderableEntityItemProxy::Pointer& payload) { 
-        if (payload && payload->_entity) {
-            bool success;
-            auto result = payload->_entity->getAABox(success);
-            if (!success) {
-                return render::Item::Bound();
-            }
-            return result;
-        }
-        return render::Item::Bound();
-    }
-    template <> void payloadRender(const RenderableEntityItemProxy::Pointer& payload, RenderArgs* args) {
-        if (args) {
-            if (payload && payload->_entity && payload->_entity->getVisible()) {
-                payload->_entity->getRenderableInterface()->render(args);
-            }
-        }
-    }
-    template <> uint32_t metaFetchMetaSubItems(const RenderableEntityItemProxy::Pointer& payload, ItemIDs& subItems) {
-        auto metaID = payload->_metaID;
-        if (Item::isValidID(metaID)) {
-            subItems.emplace_back(metaID);
-            return 1;
-        }
-        return 0;
-    }
+#include <ObjectMotionState.h>
+
+#include "EntityTreeRenderer.h"
+#include "RenderableLightEntityItem.h"
+#include "RenderableLineEntityItem.h"
+#include "RenderableModelEntityItem.h"
+#include "RenderableParticleEffectEntityItem.h"
+#include "RenderablePolyVoxEntityItem.h"
+#include "RenderablePolyLineEntityItem.h"
+#include "RenderableShapeEntityItem.h"
+#include "RenderableTextEntityItem.h"
+#include "RenderableWebEntityItem.h"
+#include "RenderableZoneEntityItem.h"
+
+
+using namespace render;
+using namespace render::entities;
+
+// These or the icon "name" used by the render item status value, they correspond to the atlas texture used by the DrawItemStatus
+// job in the current rendering pipeline defined as of now  (11/2015) in render-utils/RenderDeferredTask.cpp.
+enum class RenderItemStatusIcon {
+    ACTIVE_IN_BULLET = 0,
+    PACKET_SENT = 1,
+    PACKET_RECEIVED = 2,
+    SIMULATION_OWNER = 3,
+    HAS_ACTIONS = 4,
+    OTHER_SIMULATION_OWNER = 5,
+    CLIENT_ONLY = 6,
+    NONE = 255
+};
+
+std::function<bool()> EntityRenderer::_entitiesShouldFadeFunction = []() { return true; };
+
+void EntityRenderer::initEntityRenderers() {
+    REGISTER_ENTITY_TYPE_WITH_FACTORY(Model, RenderableModelEntityItem::factory)
+    REGISTER_ENTITY_TYPE_WITH_FACTORY(PolyVox, RenderablePolyVoxEntityItem::factory)
 }
 
-void makeEntityItemStatusGetters(EntityItemPointer entity, render::Item::Status::Getters& statusGetters) {
+const Transform& EntityRenderer::getModelTransform() const {
+    return _modelTransform;
+}
+
+void EntityRenderer::makeStatusGetters(const EntityItemPointer& entity, Item::Status::Getters& statusGetters) {
     auto nodeList = DependencyManager::get<NodeList>();
     const QUuid& myNodeID = nodeList->getSessionUUID();
 
-    statusGetters.push_back([entity] () -> render::Item::Status::Value {
+    statusGetters.push_back([entity]() -> render::Item::Status::Value {
         quint64 delta = usecTimestampNow() - entity->getLastEditedFromRemote();
         const float WAIT_THRESHOLD_INV = 1.0f / (0.2f * USECS_PER_SECOND);
         float normalizedDelta = delta * WAIT_THRESHOLD_INV;
         // Status icon will scale from 1.0f down to 0.0f after WAIT_THRESHOLD
         // Color is red if last update is after WAIT_THRESHOLD, green otherwise (120 deg is green)
         return render::Item::Status::Value(1.0f - normalizedDelta, (normalizedDelta > 1.0f ?
-                                                                    render::Item::Status::Value::GREEN :
-                                                                    render::Item::Status::Value::RED),
-                                           (unsigned char) RenderItemStatusIcon::PACKET_RECEIVED);
+            render::Item::Status::Value::GREEN :
+            render::Item::Status::Value::RED),
+            (unsigned char)RenderItemStatusIcon::PACKET_RECEIVED);
     });
 
     statusGetters.push_back([entity] () -> render::Item::Status::Value {
@@ -77,19 +77,19 @@ void makeEntityItemStatusGetters(EntityItemPointer entity, render::Item::Status:
         // Status icon will scale from 1.0f down to 0.0f after WAIT_THRESHOLD
         // Color is Magenta if last update is after WAIT_THRESHOLD, cyan otherwise (180 deg is green)
         return render::Item::Status::Value(1.0f - normalizedDelta, (normalizedDelta > 1.0f ?
-                                                                    render::Item::Status::Value::MAGENTA :
-                                                                    render::Item::Status::Value::CYAN),
-                                           (unsigned char)RenderItemStatusIcon::PACKET_SENT);
+            render::Item::Status::Value::MAGENTA :
+            render::Item::Status::Value::CYAN),
+            (unsigned char)RenderItemStatusIcon::PACKET_SENT);
     });
 
     statusGetters.push_back([entity] () -> render::Item::Status::Value {
         ObjectMotionState* motionState = static_cast<ObjectMotionState*>(entity->getPhysicsInfo());
         if (motionState && motionState->isActive()) {
             return render::Item::Status::Value(1.0f, render::Item::Status::Value::BLUE,
-                                               (unsigned char)RenderItemStatusIcon::ACTIVE_IN_BULLET);
+                (unsigned char)RenderItemStatusIcon::ACTIVE_IN_BULLET);
         }
         return render::Item::Status::Value(0.0f, render::Item::Status::Value::BLUE,
-                                           (unsigned char)RenderItemStatusIcon::ACTIVE_IN_BULLET);
+            (unsigned char)RenderItemStatusIcon::ACTIVE_IN_BULLET);
     });
 
     statusGetters.push_back([entity, myNodeID] () -> render::Item::Status::Value {
@@ -98,35 +98,289 @@ void makeEntityItemStatusGetters(EntityItemPointer entity, render::Item::Status:
 
         if (weOwnSimulation) {
             return render::Item::Status::Value(1.0f, render::Item::Status::Value::BLUE,
-                                               (unsigned char)RenderItemStatusIcon::SIMULATION_OWNER);
+                (unsigned char)RenderItemStatusIcon::SIMULATION_OWNER);
         } else if (otherOwnSimulation) {
             return render::Item::Status::Value(1.0f, render::Item::Status::Value::RED,
-                                               (unsigned char)RenderItemStatusIcon::OTHER_SIMULATION_OWNER);
+                (unsigned char)RenderItemStatusIcon::OTHER_SIMULATION_OWNER);
         }
         return render::Item::Status::Value(0.0f, render::Item::Status::Value::BLUE,
-                                           (unsigned char)RenderItemStatusIcon::SIMULATION_OWNER);
+            (unsigned char)RenderItemStatusIcon::SIMULATION_OWNER);
     });
 
     statusGetters.push_back([entity] () -> render::Item::Status::Value {
         if (entity->hasActions()) {
             return render::Item::Status::Value(1.0f, render::Item::Status::Value::GREEN,
-                                               (unsigned char)RenderItemStatusIcon::HAS_ACTIONS);
+                (unsigned char)RenderItemStatusIcon::HAS_ACTIONS);
         }
         return render::Item::Status::Value(0.0f, render::Item::Status::Value::GREEN,
-                                           (unsigned char)RenderItemStatusIcon::HAS_ACTIONS);
+            (unsigned char)RenderItemStatusIcon::HAS_ACTIONS);
     });
 
     statusGetters.push_back([entity, myNodeID] () -> render::Item::Status::Value {
         if (entity->getClientOnly()) {
             if (entity->getOwningAvatarID() == myNodeID) {
                 return render::Item::Status::Value(1.0f, render::Item::Status::Value::GREEN,
-                                                   (unsigned char)RenderItemStatusIcon::CLIENT_ONLY);
+                    (unsigned char)RenderItemStatusIcon::CLIENT_ONLY);
             } else {
                 return render::Item::Status::Value(1.0f, render::Item::Status::Value::RED,
-                                                   (unsigned char)RenderItemStatusIcon::CLIENT_ONLY);
+                    (unsigned char)RenderItemStatusIcon::CLIENT_ONLY);
             }
         }
         return render::Item::Status::Value(0.0f, render::Item::Status::Value::GREEN,
-                                           (unsigned char)RenderItemStatusIcon::CLIENT_ONLY);
+            (unsigned char)RenderItemStatusIcon::CLIENT_ONLY);
     });
 }
+
+
+template <typename T> 
+std::shared_ptr<T> make_renderer(const EntityItemPointer& entity) {
+    T* rawResult = new T(entity);
+
+    // We want to use deleteLater so that renderer destruction gets pushed to the main thread
+    return std::shared_ptr<T>(rawResult, std::bind(&QObject::deleteLater, rawResult));
+}
+
+EntityRenderer::EntityRenderer(const EntityItemPointer& entity) : _entity(entity) {
+}
+
+EntityRenderer::~EntityRenderer() { }
+
+//
+// Smart payload proxy members, implementing the payload interface
+//
+
+Item::Bound EntityRenderer::getBound() {
+    return _bound;
+}
+
+ItemKey EntityRenderer::getKey() {
+    if (isTransparent()) {
+        return ItemKey::Builder::transparentShape().withTypeMeta();
+    }
+
+    return ItemKey::Builder::opaqueShape().withTypeMeta();
+}
+
+uint32_t EntityRenderer::metaFetchMetaSubItems(ItemIDs& subItems) {
+    if (Item::isValidID(_renderItemID)) {
+        subItems.emplace_back(_renderItemID);
+        return 1;
+    }
+    return 0;
+}
+
+void EntityRenderer::render(RenderArgs* args) {
+    if (!isValidRenderItem()) {
+        return;
+    }
+
+    if (!_renderUpdateQueued && needsRenderUpdate()) {
+        // FIXME find a way to spread out the calls to needsRenderUpdate so that only a given subset of the 
+        // items checks every frame, like 1/N of the tree ever N frames
+        _renderUpdateQueued = true;
+        emit requestRenderUpdate();
+    }
+
+    if (_visible) {
+        doRender(args);
+    }
+}
+
+//
+// Methods called by the EntityTreeRenderer
+//
+
+EntityRenderer::Pointer EntityRenderer::addToScene(EntityTreeRenderer& renderer, const EntityItemPointer& entity, const ScenePointer& scene, Transaction& transaction) {
+    EntityRenderer::Pointer result;
+    if (!entity) {
+        return result;
+    }
+
+    using Type = EntityTypes::EntityType_t;
+    auto type = entity->getType();
+    switch (type) {
+        case Type::Light:
+            result = make_renderer<LightEntityRenderer>(entity);
+            break;
+
+        case Type::Line:
+            result = make_renderer<LineEntityRenderer>(entity);
+            break;
+
+        case Type::Model:
+            result = make_renderer<ModelEntityRenderer>(entity);
+            break;
+
+        case Type::ParticleEffect:
+            result = make_renderer<ParticleEffectEntityRenderer>(entity);
+            break;
+
+        case Type::PolyLine:
+            result = make_renderer<PolyLineEntityRenderer>(entity);
+            break;
+
+        case Type::PolyVox:
+            result = make_renderer<PolyVoxEntityRenderer>(entity);
+            break;
+
+        case Type::Shape:
+        case Type::Box:
+        case Type::Sphere:
+            result = make_renderer<ShapeEntityRenderer>(entity);
+            break;
+
+        case Type::Text:
+            result = make_renderer<TextEntityRenderer>(entity);
+            break;
+
+        case Type::Web:
+            if (!nsightActive()) {
+                result = make_renderer<WebEntityRenderer>(entity);
+            }
+            break;
+
+        case Type::Zone:
+            result = make_renderer<ZoneEntityRenderer>(entity);
+            break;
+
+        default:
+            break;
+    }
+
+    if (result) {
+        result->addToScene(scene, transaction);
+    }
+
+    return result;
+}
+
+bool EntityRenderer::addToScene(const ScenePointer& scene, Transaction& transaction) {
+    _renderItemID = scene->allocateID();
+    // Complicated series of trusses
+    auto renderPayload = std::make_shared<PayloadProxyInterface::ProxyPayload>(shared_from_this());
+    Item::Status::Getters statusGetters;
+    makeStatusGetters(_entity, statusGetters);
+    renderPayload->addStatusGetters(statusGetters);
+    transaction.resetItem(_renderItemID, renderPayload);
+    updateInScene(scene, transaction);
+    onAddToScene(_entity);
+    return true;
+}
+
+void EntityRenderer::removeFromScene(const ScenePointer& scene, Transaction& transaction) {
+    onRemoveFromScene(_entity);
+    transaction.removeItem(_renderItemID);
+    Item::clearID(_renderItemID);
+}
+
+void EntityRenderer::updateInScene(const ScenePointer& scene, Transaction& transaction) {
+    DETAILED_PROFILE_RANGE(simulation_physics, __FUNCTION__);
+    if (!isValidRenderItem()) {
+        return;
+    }
+
+    // FIXME is this excessive?
+    if (!needsRenderUpdate()) {
+        return;
+    }
+
+    doRenderUpdateSynchronous(scene, transaction, _entity);
+    transaction.updateItem<EntityRenderer>(_renderItemID, [this](EntityRenderer& self) {
+        if (!isValidRenderItem()) {
+            return;
+        }
+        // Happens on the render thread.  Classes should use
+        doRenderUpdateAsynchronous(_entity);
+        _renderUpdateQueued = false;
+    });
+}
+
+void EntityRenderer::clearSubRenderItemIDs() {
+    _subRenderItemIDs.clear();
+}
+
+void EntityRenderer::setSubRenderItemIDs(const render::ItemIDs& ids) {
+    _subRenderItemIDs = ids;
+}
+
+//
+// Internal methods
+//
+
+// Returns true if the item needs to have updateInscene called because of internal rendering 
+// changes (animation, fading, etc)
+bool EntityRenderer::needsRenderUpdate() const {
+    if (_prevIsTransparent != isTransparent()) {
+        return true;
+    }
+    return needsRenderUpdateFromEntity(_entity);
+}
+
+// Returns true if the item in question needs to have updateInScene called because of changes in the entity
+bool EntityRenderer::needsRenderUpdateFromEntity(const EntityItemPointer& entity) const {
+    bool success = false;
+    auto bound = _entity->getAABox(success);
+    if (success && _bound != bound) {
+        return true;
+    }
+
+    auto newModelTransform = _entity->getTransformToCenter(success);
+    // FIXME can we use a stale model transform here?
+    if (success && newModelTransform != _modelTransform) {
+        return true;
+    }
+
+    if (_visible != entity->getVisible()) {
+        return true;
+    }
+
+    if (_moving != entity->isMovingRelativeToParent()) {
+        return true;
+    }
+
+    return false;
+}
+
+void EntityRenderer::doRenderUpdateSynchronous(const ScenePointer& scene, Transaction& transaction, const EntityItemPointer& entity) {
+    DETAILED_PROFILE_RANGE(simulation_physics, __FUNCTION__);
+    withWriteLock([&] {
+        auto transparent = isTransparent();
+        if (_prevIsTransparent && !transparent) {
+            _isFading = false;
+        }
+        _prevIsTransparent = transparent;
+
+        bool success = false;
+        auto bound = entity->getAABox(success);
+        if (success) {
+            _bound = bound;
+        }
+        auto newModelTransform = entity->getTransformToCenter(success);
+        if (success) {
+            _modelTransform = newModelTransform;
+        }
+
+        _moving = entity->isMovingRelativeToParent();
+        _visible = entity->getVisible();
+    });
+}
+
+void EntityRenderer::onAddToScene(const EntityItemPointer& entity) {
+    QObject::connect(this, &EntityRenderer::requestRenderUpdate, this, [this] { 
+        auto renderer = DependencyManager::get<EntityTreeRenderer>();
+        if (renderer) {
+            renderer->onEntityChanged(_entity->getID());
+        }
+    }, Qt::QueuedConnection);
+    _changeHandlerId = entity->registerChangeHandler([this](const EntityItemID& changedEntity) { 
+        auto renderer = DependencyManager::get<EntityTreeRenderer>();
+        if (renderer) {
+            renderer->onEntityChanged(changedEntity);
+        }
+    });
+}
+
+void EntityRenderer::onRemoveFromScene(const EntityItemPointer& entity) { 
+    entity->deregisterChangeHandler(_changeHandlerId);
+    QObject::disconnect(this, &EntityRenderer::requestRenderUpdate, this, nullptr);
+}
diff --git a/libraries/entities-renderer/src/RenderableEntityItem.h b/libraries/entities-renderer/src/RenderableEntityItem.h
index c848b10f6a..ed636ebf73 100644
--- a/libraries/entities-renderer/src/RenderableEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableEntityItem.h
@@ -18,115 +18,175 @@
 #include "AbstractViewStateInterface.h"
 #include "EntitiesRendererLogging.h"
 
+class EntityTreeRenderer;
 
-// These or the icon "name" used by the render item status value, they correspond to the atlas texture used by the DrawItemStatus
-// job in the current rendering pipeline defined as of now  (11/2015) in render-utils/RenderDeferredTask.cpp.
-enum class RenderItemStatusIcon {
-    ACTIVE_IN_BULLET = 0,
-    PACKET_SENT = 1,
-    PACKET_RECEIVED = 2,
-    SIMULATION_OWNER = 3,
-    HAS_ACTIONS = 4,
-    OTHER_SIMULATION_OWNER = 5,
-    CLIENT_ONLY = 6,
-    NONE = 255
-};
+namespace render { namespace entities {
 
-void makeEntityItemStatusGetters(EntityItemPointer entity, render::Item::Status::Getters& statusGetters);
+// Base class for all renderable entities
+class EntityRenderer : public QObject, public std::enable_shared_from_this<EntityRenderer>, public PayloadProxyInterface, protected ReadWriteLockable {
+    Q_OBJECT
 
+    using Pointer = std::shared_ptr<EntityRenderer>;
 
-// Renderable entity item interface
-class RenderableEntityInterface {
 public:
-    virtual void render(RenderArgs* args) {};
-    virtual bool addToScene(const EntityItemPointer& self, const render::ScenePointer& scene, render::Transaction& transaction) = 0;
-    virtual void removeFromScene(const EntityItemPointer& self, const render::ScenePointer& scene, render::Transaction& transaction) = 0;
+    static void initEntityRenderers();
+    static Pointer addToScene(EntityTreeRenderer& renderer, const EntityItemPointer& entity, const ScenePointer& scene, Transaction& transaction);
+
+    // Allow classes to override this to interact with the user
+    virtual bool wantsHandControllerPointerEvents() const { return false; }
+    virtual bool wantsKeyboardFocus() const { return false; }
+    virtual void setProxyWindow(QWindow* proxyWindow) {}
+    virtual QObject* getEventHandler() { return nullptr; }
+    const EntityItemPointer& getEntity() { return _entity; }
+    const ItemID& getRenderItemID() const { return _renderItemID; }
+
     const SharedSoundPointer& getCollisionSound() { return _collisionSound; }
     void setCollisionSound(const SharedSoundPointer& sound) { _collisionSound = sound; }
-    virtual RenderableEntityInterface* getRenderableInterface() { return nullptr; }
-private:
+
+    // Handlers for rendering events... executed on the main thread, only called by EntityTreeRenderer, 
+    // cannot be overridden or accessed by subclasses
+    virtual void updateInScene(const ScenePointer& scene, Transaction& transaction) final;
+    virtual bool addToScene(const ScenePointer& scene, Transaction& transaction) final;
+    virtual void removeFromScene(const ScenePointer& scene, Transaction& transaction);
+
+    void clearSubRenderItemIDs();
+    void setSubRenderItemIDs(const render::ItemIDs& ids);
+
+protected:
+    virtual bool needsRenderUpdateFromEntity() const final { return needsRenderUpdateFromEntity(_entity); }
+    virtual void onAddToScene(const EntityItemPointer& entity);
+    virtual void onRemoveFromScene(const EntityItemPointer& entity);
+
+protected:
+    EntityRenderer(const EntityItemPointer& entity);
+    ~EntityRenderer();
+
+    // Implementing the PayloadProxyInterface methods
+    virtual ItemKey getKey() override;
+    virtual ShapeKey getShapeKey() override { return ShapeKey::Builder::ownPipeline(); }
+    virtual Item::Bound getBound() override;
+    virtual void render(RenderArgs* args) override final;
+    virtual uint32_t metaFetchMetaSubItems(ItemIDs& subItems) override;
+
+    // Returns true if the item in question needs to have updateInScene called because of internal rendering state changes
+    virtual bool needsRenderUpdate() const;
+
+    // Returns true if the item in question needs to have updateInScene called because of changes in the entity
+    virtual bool needsRenderUpdateFromEntity(const EntityItemPointer& entity) const;
+
+    // Will be called on the main thread from updateInScene.  This can be used to fetch things like 
+    // network textures or model geometry from resource caches
+    virtual void doRenderUpdateSynchronous(const ScenePointer& scene, Transaction& transaction, const EntityItemPointer& entity);
+
+    // Will be called by the lambda posted to the scene in updateInScene.  
+    // This function will execute on the rendering thread, so you cannot use network caches to fetch
+    // data in this method if using multi-threaded rendering
+    
+    virtual void doRenderUpdateAsynchronous(const EntityItemPointer& entity) { }
+
+    // Called by the `render` method after `needsRenderUpdate`
+    virtual void doRender(RenderArgs* args) = 0;
+
+    bool isFading() const { return _isFading; }
+    virtual bool isTransparent() const { return _isFading ? Interpolate::calculateFadeRatio(_fadeStartTime) < 1.0f : false; }
+    inline bool isValidRenderItem() const { return _renderItemID != Item::INVALID_ITEM_ID; }
+    
+    template <typename F, typename T>
+    T withReadLockResult(const std::function<T()>& f) {
+        T result;
+        withReadLock([&] {
+            result = f();
+        });
+        return result;
+    }
+
+
+signals:
+    void requestRenderUpdate();
+
+protected:
+    template<typename T>
+    std::shared_ptr<T> asTypedEntity() { return std::static_pointer_cast<T>(_entity); }
+        
+
+    static void makeStatusGetters(const EntityItemPointer& entity, Item::Status::Getters& statusGetters);
+    static std::function<bool()> _entitiesShouldFadeFunction;
+    const Transform& getModelTransform() const;
+
     SharedSoundPointer _collisionSound;
-};
-
-class RenderableEntityItemProxy {
-public:
-    RenderableEntityItemProxy(const EntityItemPointer& entity, render::ItemID metaID)
-        : _entity(entity), _metaID(metaID) {}
-    typedef render::Payload<RenderableEntityItemProxy> Payload;
-    typedef Payload::DataPointer Pointer;
-
-    const EntityItemPointer _entity;
-    render::ItemID _metaID;
-};
-
-namespace render {
-   template <> const ItemKey payloadGetKey(const RenderableEntityItemProxy::Pointer& payload);
-   template <> const Item::Bound payloadGetBound(const RenderableEntityItemProxy::Pointer& payload);
-   template <> void payloadRender(const RenderableEntityItemProxy::Pointer& payload, RenderArgs* args);
-   template <> uint32_t metaFetchMetaSubItems(const RenderableEntityItemProxy::Pointer& payload, ItemIDs& subItems);
-}
+    QUuid _changeHandlerId;
+    ItemID _renderItemID{ Item::INVALID_ITEM_ID };
+    ItemIDs _subRenderItemIDs;
+    quint64 _fadeStartTime{ usecTimestampNow() };
+    bool _isFading{ _entitiesShouldFadeFunction() };
+    bool _prevIsTransparent { false };
+    Item::Bound _bound;
+    bool _visible { false };
+    bool _moving { false };
+    // Only touched on the rendering thread
+    bool _renderUpdateQueued{ false };
 
 
-// Mixin class for implementing basic single item rendering
-class SimplerRenderableEntitySupport : public RenderableEntityInterface {
-public:
-    bool addToScene(const EntityItemPointer& self, const render::ScenePointer& scene, render::Transaction& transaction) override {
-        _myItem = scene->allocateID();
-
-        auto renderData = std::make_shared<RenderableEntityItemProxy>(self, _myItem);
-        auto renderPayload = std::make_shared<RenderableEntityItemProxy::Payload>(renderData);
-
-        render::Item::Status::Getters statusGetters;
-        makeEntityItemStatusGetters(self, statusGetters);
-        renderPayload->addStatusGetters(statusGetters);
-
-        transaction.resetItem(_myItem, renderPayload);
-
-        return true;
-    }
-
-    void removeFromScene(const EntityItemPointer& self, const render::ScenePointer& scene, render::Transaction& transaction) override {
-        transaction.removeItem(_myItem);
-        render::Item::clearID(_myItem);
-    }
-
-    void notifyChanged() {
-        if (!render::Item::isValidID(_myItem)) {
-            return;
-        }
-
-        render::Transaction transaction;
-        render::ScenePointer scene = AbstractViewStateInterface::instance()->getMain3DScene();
-
-        if (scene) {
-            transaction.updateItem<RenderableEntityItemProxy>(_myItem, [](RenderableEntityItemProxy& data) {
-            });
-
-            scene->enqueueTransaction(transaction);
-        } else {
-            qCWarning(entitiesrenderer) << "SimpleRenderableEntityItem::notifyChanged(), Unexpected null scene, possibly during application shutdown";
-        }
-    }
 private:
-    render::ItemID _myItem { render::Item::INVALID_ITEM_ID };
+    // The base class relies on comparing the model transform to the entity transform in order 
+    // to trigger an update, so the member must not be visible to derived classes as a modifiable
+    // transform
+    Transform _modelTransform;
+    // The rendering code only gets access to the entity in very specific circumstances
+    // i.e. to see if the rendering code needs to update because of a change in state of the 
+    // entity.  This forces all the rendering code itself to be independent of the entity
+    const EntityItemPointer _entity;
 };
 
+template <typename T>
+class TypedEntityRenderer : public EntityRenderer {
+    using Parent = EntityRenderer;
 
-#define SIMPLE_RENDERABLE() \
-public: \
-    virtual void locationChanged(bool tellPhysics = true) override { EntityItem::locationChanged(tellPhysics); notifyChanged(); } \
-    virtual void dimensionsChanged() override { EntityItem::dimensionsChanged(); notifyChanged(); } \
-    virtual RenderableEntityInterface* getRenderableInterface() override { return this; } \
-    void checkFading() { \
-        bool transparent = isTransparent(); \
-        if (transparent != _prevIsTransparent) { \
-            notifyChanged(); \
-            _isFading = false; \
-            _prevIsTransparent = transparent; \
-        } \
-    } \
-private: \
-    bool _prevIsTransparent { isTransparent() };
+public:
+    TypedEntityRenderer(const EntityItemPointer& entity) : Parent(entity), _typedEntity(asTypedEntity<T>()) {}
 
+protected:
+    using TypedEntityPointer = std::shared_ptr<T>;
+
+    virtual void onAddToScene(const EntityItemPointer& entity) override final {
+        Parent::onAddToScene(entity);
+        onAddToSceneTyped(_typedEntity);
+    }
+
+    virtual void onRemoveFromScene(const EntityItemPointer& entity) override final {
+        Parent::onRemoveFromScene(entity);
+        onRemoveFromSceneTyped(_typedEntity);
+    }
+
+    using Parent::needsRenderUpdateFromEntity;
+    // Returns true if the item in question needs to have updateInScene called because of changes in the entity
+    virtual bool needsRenderUpdateFromEntity(const EntityItemPointer& entity) const override final {
+        if (Parent::needsRenderUpdateFromEntity(entity)) {
+            return true;
+        }
+        return needsRenderUpdateFromTypedEntity(_typedEntity);
+    }
+
+    virtual void doRenderUpdateSynchronous(const ScenePointer& scene, Transaction& transaction, const EntityItemPointer& entity) override final {
+        Parent::doRenderUpdateSynchronous(scene, transaction, entity);
+        doRenderUpdateSynchronousTyped(scene, transaction, _typedEntity);
+    }
+
+    virtual void doRenderUpdateAsynchronous(const EntityItemPointer& entity) override final {
+        Parent::doRenderUpdateAsynchronous(entity);
+        doRenderUpdateAsynchronousTyped(_typedEntity);
+    }
+
+    virtual bool needsRenderUpdateFromTypedEntity(const TypedEntityPointer& entity) const { return false; }
+    virtual void doRenderUpdateSynchronousTyped(const ScenePointer& scene, Transaction& transaction, const TypedEntityPointer& entity) { }
+    virtual void doRenderUpdateAsynchronousTyped(const TypedEntityPointer& entity) { }
+    virtual void onAddToSceneTyped(const TypedEntityPointer& entity) { }
+    virtual void onRemoveFromSceneTyped(const TypedEntityPointer& entity) { }
+
+private:
+    const TypedEntityPointer _typedEntity;
+};
+
+} } // namespace render::entities
 
 #endif // hifi_RenderableEntityItem_h
diff --git a/libraries/entities-renderer/src/RenderableLightEntityItem.cpp b/libraries/entities-renderer/src/RenderableLightEntityItem.cpp
index 09cbe3dcf2..738b1a253e 100644
--- a/libraries/entities-renderer/src/RenderableLightEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableLightEntityItem.cpp
@@ -9,115 +9,23 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include <glm/gtx/quaternion.hpp>
-
+#include "RenderableLightEntityItem.h"
 
 #include <GLMHelpers.h>
 #include <PerfStat.h>
 
-#include "RenderableLightEntityItem.h"
+using namespace render;
+using namespace render::entities;
 
-EntityItemPointer RenderableLightEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
-    EntityItemPointer entity{ new RenderableLightEntityItem(entityID) };
-    entity->setProperties(properties);
-    return entity;
-}
+void LightEntityRenderer::doRenderUpdateAsynchronousTyped(const TypedEntityPointer& entity) {
+    // Reset the value before reading the data!
+    // otherwise there could be a race condition where the value changes
+    // after we read it but before we reset, and we never see the change
+    entity->resetLightPropertiesChanged();
 
-RenderableLightEntityItem::RenderableLightEntityItem(const EntityItemID& entityItemID) : LightEntityItem(entityItemID)
-{
-}
+    auto& lightPayload = *_lightPayload;
 
-bool RenderableLightEntityItem::addToScene(const EntityItemPointer& self, const render::ScenePointer& scene, render::Transaction& transaction) {
-    _myItem = scene->allocateID();
-
-    auto renderItem = std::make_shared<LightPayload>();
-    updateRenderItemFromEntity((*renderItem));
-
-    auto renderPayload = std::make_shared<LightPayload::Payload>(renderItem);
-
-    render::Item::Status::Getters statusGetters;
-    makeEntityItemStatusGetters(self, statusGetters);
-    renderPayload->addStatusGetters(statusGetters);
-
-    transaction.resetItem(_myItem, renderPayload);
-
-    return true;
-}
-
-void RenderableLightEntityItem::somethingChangedNotification() {
-    if (_lightPropertiesChanged) {
-        notifyChanged();
-    }
-    LightEntityItem::somethingChangedNotification();
-}
-
-void RenderableLightEntityItem::removeFromScene(const EntityItemPointer& self, const render::ScenePointer& scene, render::Transaction& transaction) {
-    transaction.removeItem(_myItem);
-    render::Item::clearID(_myItem);
-}
-
-void RenderableLightEntityItem::locationChanged(bool tellPhysics) {
-    EntityItem::locationChanged(tellPhysics);
-    notifyChanged();
-}
-
-void RenderableLightEntityItem::dimensionsChanged() {
-    EntityItem::dimensionsChanged();
-    notifyChanged();
-}
-
-void RenderableLightEntityItem::checkFading() {
-    bool transparent = isTransparent();
-    if (transparent != _prevIsTransparent) {
-        notifyChanged();
-        _isFading = false;
-        _prevIsTransparent = transparent;
-    }
-}
-
-void RenderableLightEntityItem::notifyChanged() {
-
-    if (!render::Item::isValidID(_myItem)) {
-        return;
-    }
-
-    render::Transaction transaction;
-    render::ScenePointer scene = AbstractViewStateInterface::instance()->getMain3DScene();
-
-    updateLightFromEntity(transaction);
-
-    scene->enqueueTransaction(transaction);
-}
-
-bool RenderableLightEntityItem::findDetailedRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
-                        bool& keepSearching, OctreeElementPointer& element, float& distance, 
-                        BoxFace& face, glm::vec3& surfaceNormal,
-                        void** intersectedObject, bool precisionPicking) const {
-
-    // TODO: consider if this is really what we want to do. We've made it so that "lights are pickable" is a global state
-    // this is probably reasonable since there's typically only one tree you'd be picking on at a time. Technically we could 
-    // be on the clipboard and someone might be trying to use the ray intersection API there. Anyway... if you ever try to 
-    // do ray intersection testing off of trees other than the main tree of the main entity renderer, then we'll need to 
-    // fix this mechanism.
-    return _lightsArePickable;
-}
-
-
-void RenderableLightEntityItem::updateLightFromEntity(render::Transaction& transaction) {
-    if (!render::Item::isValidID(_myItem)) {
-        return;
-    }
-
-
-    transaction.updateItem<LightPayload>(_myItem, [&](LightPayload& data) {
-        updateRenderItemFromEntity(data);
-    });
-}
-
-void RenderableLightEntityItem::updateRenderItemFromEntity(LightPayload& lightPayload) {
-    auto entity = this;
-
-    lightPayload.setVisible(entity->getVisible());
+    lightPayload.setVisible(_visible);
 
     auto light = lightPayload.editLight();
     light->setPosition(entity->getPosition());
@@ -151,9 +59,21 @@ void RenderableLightEntityItem::updateRenderItemFromEntity(LightPayload& lightPa
         light->setSpotAngle(cutoff);
         light->setSpotExponent(exponent);
     }
-
 }
 
+ItemKey LightEntityRenderer::getKey() {
+    return payloadGetKey(_lightPayload);
+}
 
+Item::Bound LightEntityRenderer::getBound() {
+    return payloadGetBound(_lightPayload);
+}
 
+bool LightEntityRenderer::needsRenderUpdateFromTypedEntity(const TypedEntityPointer& entity) const {
+    return entity->lightPropertiesChanged();
+}
+
+void LightEntityRenderer::doRender(RenderArgs* args) {
+    _lightPayload->render(args);
+}
 
diff --git a/libraries/entities-renderer/src/RenderableLightEntityItem.h b/libraries/entities-renderer/src/RenderableLightEntityItem.h
index a9f4ba84b6..7d75261d03 100644
--- a/libraries/entities-renderer/src/RenderableLightEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableLightEntityItem.h
@@ -12,48 +12,31 @@
 #ifndef hifi_RenderableLightEntityItem_h
 #define hifi_RenderableLightEntityItem_h
 
+#include "RenderableEntityItem.h"
 #include <LightEntityItem.h>
 #include <LightPayload.h>
-#include "RenderableEntityItem.h"
 
+namespace render { namespace entities { 
+
+class LightEntityRenderer final : public TypedEntityRenderer<LightEntityItem> {
+    using Parent = TypedEntityRenderer<LightEntityItem>;
+    friend class EntityRenderer;
 
-class RenderableLightEntityItem : public LightEntityItem, public RenderableEntityInterface {
 public:
-    static EntityItemPointer factory(const EntityItemID& entityID, const EntityItemProperties& properties);
-    RenderableLightEntityItem(const EntityItemID& entityItemID);
+    LightEntityRenderer(const EntityItemPointer& entity) : Parent(entity) { }
 
-    RenderableEntityInterface* getRenderableInterface() override { return this; }
+protected:
+    virtual bool needsRenderUpdateFromTypedEntity(const TypedEntityPointer& entity) const override;
+    virtual void doRenderUpdateAsynchronousTyped(const TypedEntityPointer& entity) override;
 
-    virtual bool supportsDetailedRayIntersection() const override { return true; }
-    virtual bool findDetailedRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
-                         bool& keepSearching, OctreeElementPointer& element, float& distance, 
-                         BoxFace& face, glm::vec3& surfaceNormal,
-                         void** intersectedObject, bool precisionPicking) const override;
-
-    void updateLightFromEntity(render::Transaction& transaction);
-
-    virtual bool addToScene(const EntityItemPointer& self, const render::ScenePointer& scene, render::Transaction& transaction) override;
-
-    virtual void somethingChangedNotification() override;
-    virtual void removeFromScene(const EntityItemPointer& self, const render::ScenePointer& scene, render::Transaction& transaction) override;
-
-    virtual void locationChanged(bool tellPhysics = true) override;
-
-    virtual void dimensionsChanged() override;
-
-    void checkFading();
-
-    void notifyChanged();
+    virtual ItemKey getKey() override;
+    virtual Item::Bound getBound() override;
+    virtual void doRender(RenderArgs* args) override;
 
 private:
-    bool _prevIsTransparent { isTransparent() };
-    render::ItemID _myItem { render::Item::INVALID_ITEM_ID };
-
-    // Dirty flag turn true when either setSubClassProperties or readEntitySubclassDataFromBuffer is changing a value 
-
-    void updateRenderItemFromEntity(LightPayload& lightPayload);
-
+    const LightPayload::Pointer _lightPayload{ std::make_shared<LightPayload>() };
 };
 
+} } // namespace 
 
 #endif // hifi_RenderableLightEntityItem_h
diff --git a/libraries/entities-renderer/src/RenderableLineEntityItem.cpp b/libraries/entities-renderer/src/RenderableLineEntityItem.cpp
index 4da9efe883..9ac7e9921f 100644
--- a/libraries/entities-renderer/src/RenderableLineEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableLineEntityItem.cpp
@@ -9,57 +9,53 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include <glm/gtx/quaternion.hpp>
-
-#include <gpu/Batch.h>
-#include <GeometryCache.h>
-
-#include <PerfStat.h>
-
 #include "RenderableLineEntityItem.h"
 
-EntityItemPointer RenderableLineEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
-    EntityItemPointer entity{ new RenderableLineEntityItem(entityID) };
-    entity->setProperties(properties);
-    return entity;
-}
+#include <gpu/Batch.h>
+#include <PerfStat.h>
 
-RenderableLineEntityItem::~RenderableLineEntityItem() {
-    auto geometryCache = DependencyManager::get<GeometryCache>();
-    if (geometryCache) {
-        geometryCache->releaseID(_lineVerticesID);
+using namespace render;
+using namespace render::entities;
+
+void LineEntityRenderer::onRemoveFromSceneTyped(const TypedEntityPointer& entity) {
+    if (_lineVerticesID != GeometryCache::UNKNOWN_ID) {
+        auto geometryCache = DependencyManager::get<GeometryCache>();
+        if (geometryCache) {
+            geometryCache->releaseID(_lineVerticesID);
+        }
     }
 }
 
-void RenderableLineEntityItem::updateGeometry() {
+bool LineEntityRenderer::needsRenderUpdateFromTypedEntity(const TypedEntityPointer& entity) const {
+    return entity->pointsChanged();
+}
+
+void LineEntityRenderer::doRenderUpdateAsynchronousTyped(const TypedEntityPointer& entity) {
+    entity->resetPointsChanged();
+    _linePoints = entity->getLinePoints();
     auto geometryCache = DependencyManager::get<GeometryCache>();
     if (_lineVerticesID == GeometryCache::UNKNOWN_ID) {
-        _lineVerticesID = geometryCache ->allocateID();
-    }
-    if (_pointsChanged) {
-        glm::vec4 lineColor(toGlm(getXColor()), getLocalRenderAlpha());
-        geometryCache->updateVertices(_lineVerticesID, getLinePoints(), lineColor);
-        _pointsChanged = false;
+        _lineVerticesID = geometryCache->allocateID();
     }
+    glm::vec4 lineColor(toGlm(entity->getXColor()), entity->getLocalRenderAlpha());
+    geometryCache->updateVertices(_lineVerticesID, _linePoints, lineColor);
 }
 
+void LineEntityRenderer::doRender(RenderArgs* args) {
+    if (_lineVerticesID == GeometryCache::UNKNOWN_ID) {
+        return;
+    }
 
-
-
-void RenderableLineEntityItem::render(RenderArgs* args) {
     PerformanceTimer perfTimer("RenderableLineEntityItem::render");
-    Q_ASSERT(getType() == EntityTypes::Line);
-    updateGeometry();
-    
     Q_ASSERT(args->_batch);
     gpu::Batch& batch = *args->_batch;
+    const auto& modelTransform = getModelTransform();
     Transform transform = Transform();
-    transform.setTranslation(getPosition());
-    transform.setRotation(getRotation());
+    transform.setTranslation(modelTransform.getTranslation());
+    transform.setRotation(modelTransform.getRotation());
     batch.setModelTransform(transform);
-
-    if (getLinePoints().size() > 1) {
+    if (_linePoints.size() > 1) {
         DependencyManager::get<GeometryCache>()->bindSimpleProgram(batch);
         DependencyManager::get<GeometryCache>()->renderVertices(batch, gpu::LINE_STRIP, _lineVerticesID);
     }
-};
+}
diff --git a/libraries/entities-renderer/src/RenderableLineEntityItem.h b/libraries/entities-renderer/src/RenderableLineEntityItem.h
index b8663c0055..799ba5b78c 100644
--- a/libraries/entities-renderer/src/RenderableLineEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableLineEntityItem.h
@@ -12,28 +12,31 @@
 #ifndef hifi_RenderableLineEntityItem_h
 #define hifi_RenderableLineEntityItem_h
 
-#include <LineEntityItem.h>
 #include "RenderableEntityItem.h"
+#include <LineEntityItem.h>
 #include <GeometryCache.h>
 
-class RenderableLineEntityItem : public LineEntityItem, public SimplerRenderableEntitySupport {
+
+namespace render { namespace entities { 
+
+class LineEntityRenderer : public TypedEntityRenderer<LineEntityItem> {
+    using Parent = TypedEntityRenderer<LineEntityItem>;
+    friend class EntityRenderer;
+
 public:
-    static EntityItemPointer factory(const EntityItemID& entityID, const EntityItemProperties& properties);
-    RenderableLineEntityItem(const EntityItemID& entityItemID) :
-        LineEntityItem(entityItemID),
-       _lineVerticesID(GeometryCache::UNKNOWN_ID)
-    { }
-    ~RenderableLineEntityItem();
-
-    virtual void render(RenderArgs* args) override;
-
-    SIMPLE_RENDERABLE();
+    LineEntityRenderer(const EntityItemPointer& entity) : Parent(entity) { }
 
 protected:
-    void updateGeometry();
-    
-    int _lineVerticesID;
+    virtual void onRemoveFromSceneTyped(const TypedEntityPointer& entity) override;
+    virtual bool needsRenderUpdateFromTypedEntity(const TypedEntityPointer& entity) const override;
+    virtual void doRenderUpdateAsynchronousTyped(const TypedEntityPointer& entity) override;
+    virtual void doRender(RenderArgs* args) override;
+
+private:
+    int _lineVerticesID { GeometryCache::UNKNOWN_ID };
+    QVector<glm::vec3> _linePoints;
 };
 
+} } // namespace 
 
 #endif // hifi_RenderableLineEntityItem_h
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index 0b6271a6b1..6b30d2a7e8 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -9,104 +9,80 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include <glm/gtx/quaternion.hpp>
+#include "RenderableModelEntityItem.h"
+
 #include <set>
 
-#include <QJsonDocument>
-#include <QtCore/QThread>
-#include <QUrlQuery>
+#include <glm/gtx/quaternion.hpp>
 #include <glm/gtx/transform.hpp>
 
+#include <QtCore/QJsonDocument>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QThread>
+#include <QtCore/QUrlQuery>
+
 #include <AbstractViewStateInterface.h>
 #include <CollisionRenderMeshCache.h>
 #include <Model.h>
 #include <PerfStat.h>
 #include <render/Scene.h>
 #include <DependencyManager.h>
+#include <AnimationCache.h>
+#include <shared/QtHelpers.h>
 
 #include "EntityTreeRenderer.h"
 #include "EntitiesRendererLogging.h"
-#include "RenderableEntityItem.h"
-#include "RenderableModelEntityItem.h"
-#include "RenderableEntityItem.h"
+
 
 static CollisionRenderMeshCache collisionMeshCache;
 
+void ModelEntityWrapper::setModel(const ModelPointer& model) {
+    withWriteLock([&] {
+        if (_model != model) {
+            _model = model;
+            if (_model) {
+                _needsInitialSimulation = true;
+            }
+        }
+    });
+}
+
+ModelPointer ModelEntityWrapper::getModel() const {
+    return resultWithReadLock<ModelPointer>([&] {
+        return _model;
+    });
+}
+
+bool ModelEntityWrapper::isModelLoaded() const {
+    return resultWithReadLock<bool>([&] {
+        return _model.operator bool() && _model->isLoaded();
+    });
+}
 
 EntityItemPointer RenderableModelEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
-    EntityItemPointer entity{ new RenderableModelEntityItem(entityID, properties.getDimensionsInitialized()) };
+    EntityItemPointer entity(new RenderableModelEntityItem(entityID, properties.getDimensionsInitialized()),
+                             [](EntityItem* ptr) { ptr->deleteLater(); });
     entity->setProperties(properties);
     return entity;
 }
 
 RenderableModelEntityItem::RenderableModelEntityItem(const EntityItemID& entityItemID, bool dimensionsInitialized) :
-    ModelEntityItem(entityItemID),
+    ModelEntityWrapper(entityItemID),
     _dimensionsInitialized(dimensionsInitialized) {
 }
 
-RenderableModelEntityItem::~RenderableModelEntityItem() {
-    assert(_myRenderer || !_model); // if we have a model, we need to know our renderer
-    if (_myRenderer && _model) {
-        _myRenderer->releaseModel(_model);
-        _model = NULL;
-    }
-}
-
-void RenderableModelEntityItem::setModelURL(const QString& url) {
-    auto& currentURL = getParsedModelURL();
-    ModelEntityItem::setModelURL(url);
-
-    if (currentURL != getParsedModelURL()) {
-        _needsModelReload = true;
-    }
-    if (_needsModelReload || !_model) {
-        EntityTreePointer tree = getTree();
-        if (tree) {
-            QMetaObject::invokeMethod(tree.get(), "callLoader", Qt::QueuedConnection, Q_ARG(EntityItemID, getID()));
-        }
-    }
-}
-
-void RenderableModelEntityItem::loader() {
-    _needsModelReload = true;
-    {
-        PerformanceTimer perfTimer("getModel");
-        getModel();
-    }
-}
+RenderableModelEntityItem::~RenderableModelEntityItem() { }
 
 void RenderableModelEntityItem::setDimensions(const glm::vec3& value) {
     _dimensionsInitialized = true;
     ModelEntityItem::setDimensions(value);
 }
 
-bool RenderableModelEntityItem::setProperties(const EntityItemProperties& properties) {
-    QString oldModelURL = getModelURL();
-    bool somethingChanged = ModelEntityItem::setProperties(properties);
-    if (somethingChanged && oldModelURL != getModelURL()) {
-        _needsModelReload = true;
-    }
-    return somethingChanged;
-}
-
-int RenderableModelEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data, int bytesLeftToRead,
-                                                ReadBitstreamToTreeParams& args,
-                                                EntityPropertyFlags& propertyFlags, bool overwriteLocalData,
-                                                bool& somethingChanged) {
-    QString oldModelURL = getModelURL();
-    int bytesRead = ModelEntityItem::readEntitySubclassDataFromBuffer(data, bytesLeftToRead,
-                                                                      args, propertyFlags,
-                                                                      overwriteLocalData, somethingChanged);
-    if (oldModelURL != getModelURL()) {
-        _needsModelReload = true;
-    }
-    return bytesRead;
-}
-
-QVariantMap RenderableModelEntityItem::parseTexturesToMap(QString textures) {
+QVariantMap parseTexturesToMap(QString textures, const QVariantMap& defaultTextures) {
     // If textures are unset, revert to original textures
     if (textures.isEmpty()) {
-        return _originalTextures;
+        return defaultTextures;
     }
 
     // Legacy: a ,\n-delimited list of filename:"texturepath"
@@ -119,473 +95,173 @@ QVariantMap RenderableModelEntityItem::parseTexturesToMap(QString textures) {
     // If textures are invalid, revert to original textures
     if (error.error != QJsonParseError::NoError) {
         qCWarning(entitiesrenderer) << "Could not evaluate textures property value:" << textures;
-        return _originalTextures;
+        return defaultTextures;
     }
 
     QVariantMap texturesMap = texturesJson.toVariant().toMap();
     // If textures are unset, revert to original textures
     if (texturesMap.isEmpty()) {
-        return _originalTextures;
+        return defaultTextures;
     }
 
     return texturesJson.toVariant().toMap();
 }
 
-void RenderableModelEntityItem::remapTextures() {
-    if (!_model) {
-        return; // nothing to do if we don't have a model
-    }
-
-    if (!_model->isLoaded()) {
-        return; // nothing to do if the model has not yet loaded
-    }
-
-    if (!_originalTexturesRead) {
-        _originalTextures = _model->getTextures();
-        _originalTexturesRead = true;
-
-        // Default to _originalTextures to avoid remapping immediately and lagging on load
-        _currentTextures = _originalTextures;
-    }
-
-    auto textures = getTextures();
-    if (textures == _lastTextures) {
+void RenderableModelEntityItem::doInitialModelSimulation() {
+    DETAILED_PROFILE_RANGE(simulation_physics, __FUNCTION__);
+    ModelPointer model = getModel();
+    if (!model) {
         return;
     }
-
-    _lastTextures = textures;
-    auto newTextures = parseTexturesToMap(textures);
-
-    if (newTextures != _currentTextures) {
-        _model->setTextures(newTextures);
-        _currentTextures = newTextures;
-    }
-}
-
-void RenderableModelEntityItem::doInitialModelSimulation() {
     // The machinery for updateModelBounds will give existing models the opportunity to fix their
     // translation/rotation/scale/registration.  The first two are straightforward, but the latter two have guards to
     // make sure they don't happen after they've already been set.  Here we reset those guards. This doesn't cause the
     // entity values to change -- it just allows the model to match once it comes in.
-    _model->setScaleToFit(false, getDimensions());
-    _model->setSnapModelToRegistrationPoint(false, getRegistrationPoint());
+    model->setScaleToFit(false, getDimensions());
+    model->setSnapModelToRegistrationPoint(false, getRegistrationPoint());
 
     // now recalculate the bounds and registration
-    _model->setScaleToFit(true, getDimensions());
-    _model->setSnapModelToRegistrationPoint(true, getRegistrationPoint());
-    _model->setRotation(getRotation());
-    _model->setTranslation(getPosition());
-    {
-        PerformanceTimer perfTimer("_model->simulate");
-        _model->simulate(0.0f);
-    }
-    _needsInitialSimulation = false;
-}
+    model->setScaleToFit(true, getDimensions());
+    model->setSnapModelToRegistrationPoint(true, getRegistrationPoint());
+    model->setRotation(getRotation());
+    model->setTranslation(getPosition());
 
-class RenderableModelEntityItemMeta {
-public:
-    RenderableModelEntityItemMeta(EntityItemPointer entity) : entity(entity){ }
-    typedef render::Payload<RenderableModelEntityItemMeta> Payload;
-    typedef Payload::DataPointer Pointer;
-
-    EntityItemPointer entity;
-};
-
-namespace render {
-    template <> const ItemKey payloadGetKey(const RenderableModelEntityItemMeta::Pointer& payload) {
-        return ItemKey::Builder::opaqueShape().withTypeMeta();
-    }
-
-    template <> const Item::Bound payloadGetBound(const RenderableModelEntityItemMeta::Pointer& payload) {
-        if (payload && payload->entity) {
-            bool success;
-            auto result = payload->entity->getAABox(success);
-            if (!success) {
-                return render::Item::Bound();
-            }
-            return result;
-        }
-        return render::Item::Bound();
-    }
-    template <> void payloadRender(const RenderableModelEntityItemMeta::Pointer& payload, RenderArgs* args) {
-        if (args) {
-            if (payload && payload->entity) {
-                PROFILE_RANGE(render_detail, "MetaModelRender");
-                payload->entity->getRenderableInterface()->render(args);
-            }
-        }
-    }
-    template <> uint32_t metaFetchMetaSubItems(const RenderableModelEntityItemMeta::Pointer& payload, ItemIDs& subItems) {
-        auto modelEntity = std::static_pointer_cast<RenderableModelEntityItem>(payload->entity);
-        if (modelEntity->hasModel()) {
-            auto metaSubItems = modelEntity->getModelNotSafe()->fetchRenderItemIDs();
-            subItems.insert(subItems.end(), metaSubItems.begin(), metaSubItems.end());
-            return (uint32_t) metaSubItems.size();
-        }
-        return 0;
+    if (_needsInitialSimulation) {
+        model->simulate(0.0f);
+        _needsInitialSimulation = false;
     }
 }
 
-bool RenderableModelEntityItem::addToScene(const EntityItemPointer& self, const render::ScenePointer& scene,
-                                            render::Transaction& transaction) {
-    _myMetaItem = scene->allocateID();
-
-    auto renderData = std::make_shared<RenderableModelEntityItemMeta>(self);
-    auto renderPayload = std::make_shared<RenderableModelEntityItemMeta::Payload>(renderData);
-
-    transaction.resetItem(_myMetaItem, renderPayload);
-
-    if (_model) {
-        render::Item::Status::Getters statusGetters;
-        makeEntityItemStatusGetters(getThisPointer(), statusGetters);
-
-        // note: we don't mind if the model fails to add, we'll retry (in render()) until it succeeds
-        _model->addToScene(scene, transaction, statusGetters);
-    }
-
-    // we've successfully added _myMetaItem so we always return true
-    return true;
-}
-
-void RenderableModelEntityItem::removeFromScene(const EntityItemPointer& self, const render::ScenePointer& scene,
-                                                render::Transaction& transaction) {
-    transaction.removeItem(_myMetaItem);
-    render::Item::clearID(_myMetaItem);
-    if (_model) {
-        _model->removeFromScene(scene, transaction);
+void RenderableModelEntityItem::autoResizeJointArrays() {
+    ModelPointer model = getModel();
+    if (model && model->isLoaded() && !_needsInitialSimulation) {
+        resizeJointArrays(model->getJointStateCount());
     }
 }
 
-void RenderableModelEntityItem::resizeJointArrays(int newSize) {
-    if (newSize < 0) {
-        if (_model && _model->isActive() && _model->isLoaded() && !_needsInitialSimulation) {
-            newSize = _model->getJointStateCount();
-        }
-    }
-    ModelEntityItem::resizeJointArrays(newSize);
-}
-
-bool RenderableModelEntityItem::getAnimationFrame() {
-    bool newFrame = false;
-
-    if (!_model || !_model->isActive() || !_model->isLoaded() || _needsInitialSimulation) {
+bool RenderableModelEntityItem::needsUpdateModelBounds() const {
+    DETAILED_PROFILE_RANGE(simulation_physics, __FUNCTION__);
+    ModelPointer model = getModel();
+    if (!hasModel() || !model) {
         return false;
     }
 
-    if (!hasRenderAnimation() || !_jointMappingCompleted) {
+    if (!_dimensionsInitialized || !model->isActive()) {
         return false;
     }
 
-    auto animation = getAnimation();
-    if (animation && animation->isLoaded()) {
+    if (model->needsReload()) {
+        return true;
+    }
 
-        const QVector<FBXAnimationFrame>&  frames = animation->getFramesReference(); // NOTE: getFrames() is too heavy
-        auto& fbxJoints = animation->getGeometry().joints;
+    if (isAnimatingSomething()) {
+        return true;
+    }
 
-        int frameCount = frames.size();
-        if (frameCount > 0) {
-            int animationCurrentFrame = (int)(glm::floor(getAnimationCurrentFrame())) % frameCount;
-            if (animationCurrentFrame < 0 || animationCurrentFrame > frameCount) {
-                animationCurrentFrame = 0;
-            }
+    if (_needsInitialSimulation || _needsJointSimulation) {
+        return true;
+    }
 
-            if (animationCurrentFrame != _lastKnownCurrentFrame) {
-                _lastKnownCurrentFrame = animationCurrentFrame;
-                newFrame = true;
+    if (model->getScaleToFitDimensions() != getDimensions()) {
+        return true;
+    }
 
-                resizeJointArrays();
-                if (_jointMapping.size() != _model->getJointStateCount()) {
-                    qCDebug(entities) << "RenderableModelEntityItem::getAnimationFrame -- joint count mismatch"
-                             << _jointMapping.size() << _model->getJointStateCount();
-                    assert(false);
-                    return false;
-                }
+    if (model->getRegistrationPoint() != getRegistrationPoint()) {
+        return true;
+    }
 
-                const QVector<glm::quat>& rotations = frames[animationCurrentFrame].rotations;
-                const QVector<glm::vec3>& translations = frames[animationCurrentFrame].translations;
-
-                for (int j = 0; j < _jointMapping.size(); j++) {
-                    int index = _jointMapping[j];
-                    if (index >= 0) {
-                        glm::mat4 translationMat;
-                        if (index < translations.size()) {
-                            translationMat = glm::translate(translations[index]);
-                        }
-                        glm::mat4 rotationMat;
-                        if (index < rotations.size()) {
-                            rotationMat = glm::mat4_cast(fbxJoints[index].preRotation * rotations[index] * fbxJoints[index].postRotation);
-                        } else {
-                            rotationMat = glm::mat4_cast(fbxJoints[index].preRotation * fbxJoints[index].postRotation);
-                        }
-                        glm::mat4 finalMat = (translationMat * fbxJoints[index].preTransform *
-                                              rotationMat * fbxJoints[index].postTransform);
-                        _localJointTranslations[j] = extractTranslation(finalMat);
-                        _localJointTranslationsDirty[j] = true;
-
-                        _localJointRotations[j] = glmExtractRotation(finalMat);
-                        _localJointRotationsDirty[j] = true;
-                    }
-                }
-            }
+    bool success;
+    auto transform = getTransform(success);
+    if (success) {
+        if (model->getTranslation() != transform.getTranslation()) {
+            return true;
+        }
+        if (model->getRotation() != transform.getRotation()) {
+            return true;
         }
     }
 
-    return newFrame;
+    return model->needsReload();
 }
 
 void RenderableModelEntityItem::updateModelBounds() {
-    if (!hasModel() || !_model) {
-        return;
-    }
-    if (!_dimensionsInitialized || !_model->isActive()) {
+    DETAILED_PROFILE_RANGE(simulation_physics, "updateModelBounds");
+
+    if (!_dimensionsInitialized || !hasModel()) {
         return;
     }
 
-    bool movingOrAnimating = isMovingRelativeToParent() || isAnimatingSomething();
-    glm::vec3 dimensions = getDimensions();
+    ModelPointer model = getModel();
+    if (!model || !model->isLoaded()) {
+        return;
+    }
+
+    bool updateRenderItems = false;
+    if (model->needsReload()) {
+        model->updateGeometry();
+        updateRenderItems = true;
+    }
+
+    if (model->getScaleToFitDimensions() != getDimensions() ||
+            model->getRegistrationPoint() != getRegistrationPoint()) {
+        // The machinery for updateModelBounds will give existing models the opportunity to fix their
+        // translation/rotation/scale/registration.  The first two are straightforward, but the latter two
+        // have guards to make sure they don't happen after they've already been set.  Here we reset those guards.
+        // This doesn't cause the entity values to change -- it just allows the model to match once it comes in.
+        model->setScaleToFit(false, getDimensions());
+        model->setSnapModelToRegistrationPoint(false, getRegistrationPoint());
+
+        // now recalculate the bounds and registration
+        model->setScaleToFit(true, getDimensions());
+        model->setSnapModelToRegistrationPoint(true, getRegistrationPoint());
+        updateRenderItems = true;
+        model->scaleToFit();
+    }
+
     bool success;
     auto transform = getTransform(success);
+    if (success && (model->getTranslation() != transform.getTranslation() ||
+            model->getRotation() != transform.getRotation())) {
+        model->setTransformNoUpdateRenderItems(transform);
+        updateRenderItems = true;
+    }
 
-    if (movingOrAnimating ||
-         _needsInitialSimulation ||
-         _needsJointSimulation ||
-         _model->getTranslation() != transform.getTranslation() ||
-         _model->getScaleToFitDimensions() != dimensions ||
-         _model->getRotation() != transform.getRotation() ||
-         _model->getRegistrationPoint() != getRegistrationPoint()) {
-        doInitialModelSimulation();
+    if (_needsInitialSimulation || _needsJointSimulation || isAnimatingSomething()) {
+        // NOTE: on isAnimatingSomething() we need to call Model::simulate() which calls Rig::updateRig()
+        // TODO: there is opportunity to further optimize the isAnimatingSomething() case.
+        model->simulate(0.0f);
+        _needsInitialSimulation = false;
         _needsJointSimulation = false;
+        updateRenderItems = true;
+    }
+
+    if (updateRenderItems) {
+        model->updateRenderItems();
     }
 }
 
 
-// NOTE: this only renders the "meta" portion of the Model, namely it renders debugging items, and it handles
-// the per frame simulation/update that might be required if the models properties changed.
-void RenderableModelEntityItem::render(RenderArgs* args) {
-    PerformanceTimer perfTimer("RMEIrender");
-    assert(getType() == EntityTypes::Model);
-
-    // When the individual mesh parts of a model finish fading, they will mark their Model as needing updating
-    // we will watch for that and ask the model to update it's render items
-    if (_model && _model->getRenderItemsNeedUpdate()) {
-        _model->updateRenderItems();
-    }
-
-    if (!hasModel() || (_model && _model->didVisualGeometryRequestFail())) {
-        static glm::vec4 greenColor(0.0f, 1.0f, 0.0f, 1.0f);
-        gpu::Batch& batch = *args->_batch;
-        bool success;
-        auto shapeTransform = getTransformToCenter(success);
-        if (success) {
-            batch.setModelTransform(shapeTransform); // we want to include the scale as well
-            DependencyManager::get<GeometryCache>()->renderWireCubeInstance(args, batch, greenColor);
-        }
-        return;
-    }
-
-    // Prepare the current frame
-    {
-        if (!_model || _needsModelReload) {
-            // TODO: this getModel() appears to be about 3% of model render time. We should optimize
-            PerformanceTimer perfTimer("getModel");
-            getModel();
-
-            // Remap textures immediately after loading to avoid flicker
-            remapTextures();
-        }
-
-        if (_model) {
-            if (hasRenderAnimation()) {
-                if (!jointsMapped()) {
-                    QStringList modelJointNames = _model->getJointNames();
-                    mapJoints(modelJointNames);
-                }
-            }
-
-            _jointDataLock.withWriteLock([&] {
-                getAnimationFrame();
-
-                // relay any inbound joint changes from scripts/animation/network to the model/rig
-                for (int index = 0; index < _localJointRotations.size(); index++) {
-                    if (_localJointRotationsDirty[index]) {
-                        glm::quat rotation = _localJointRotations[index];
-                        _model->setJointRotation(index, true, rotation, 1.0f);
-                        _localJointRotationsDirty[index] = false;
-                    }
-                }
-                for (int index = 0; index < _localJointTranslations.size(); index++) {
-                    if (_localJointTranslationsDirty[index]) {
-                        glm::vec3 translation = _localJointTranslations[index];
-                        _model->setJointTranslation(index, true, translation, 1.0f);
-                        _localJointTranslationsDirty[index] = false;
-                    }
-                }
-            });
-            updateModelBounds();
-        }
-    }
-
-    // Enqueue updates for the next frame
-    if (_model) {
-
-#ifdef WANT_EXTRA_RENDER_DEBUGGING
-        // debugging...
-        gpu::Batch& batch = *args->_batch;
-        _model->renderDebugMeshBoxes(batch);
-#endif
-
-        const render::ScenePointer& scene = AbstractViewStateInterface::instance()->getMain3DScene();
-
-        // FIXME: this seems like it could be optimized if we tracked our last known visible state in
-        //        the renderable item. As it stands now the model checks it's visible/invisible state
-        //        so most of the time we don't do anything in this function.
-        _model->setVisibleInScene(getVisible(), scene);
-
-        // Remap textures for the next frame to avoid flicker
-        remapTextures();
-
-        // update whether the model should be showing collision mesh (this may flag for fixupInScene)
-        bool showingCollisionGeometry = (bool)(args->_debugFlags & (int)RenderArgs::RENDER_DEBUG_HULLS);
-        if (showingCollisionGeometry != _showCollisionGeometry) {
-            ShapeType type = getShapeType();
-            _showCollisionGeometry = showingCollisionGeometry;
-            if (_showCollisionGeometry && type != SHAPE_TYPE_STATIC_MESH && type != SHAPE_TYPE_NONE) {
-                // NOTE: it is OK if _collisionMeshKey is nullptr
-                model::MeshPointer mesh = collisionMeshCache.getMesh(_collisionMeshKey);
-                // NOTE: the model will render the collisionGeometry if it has one
-                _model->setCollisionMesh(mesh);
-            } else {
-                // release mesh
-                if (_collisionMeshKey) {
-                    collisionMeshCache.releaseMesh(_collisionMeshKey);
-                }
-                // clear model's collision geometry
-                model::MeshPointer mesh = nullptr;
-                _model->setCollisionMesh(mesh);
-            }
-        }
-
-        if (_model->needsFixupInScene()) {
-            render::Transaction transaction;
-
-            _model->removeFromScene(scene, transaction);
-
-            render::Item::Status::Getters statusGetters;
-            makeEntityItemStatusGetters(getThisPointer(), statusGetters);
-            _model->addToScene(scene, transaction, statusGetters);
-
-            scene->enqueueTransaction(transaction);
-        }
-
-        auto& currentURL = getParsedModelURL();
-        if (currentURL != _model->getURL()) {
-            // Defer setting the url to the render thread
-            getModel();
-        }
-    }
-}
-
-ModelPointer RenderableModelEntityItem::getModelNotSafe() {
-    return _model;
-}
-
-ModelPointer RenderableModelEntityItem::getModel() {
-    // make sure our renderer is setup
-    if (!_myRenderer) {
-        _myRenderer = DependencyManager::get<EntityTreeRenderer>();
-    }
-
-    if (!_myRenderer || QThread::currentThread() != _myRenderer->thread()) {
-        return _model;
-    }
-
-    _needsModelReload = false; // this is the reload
-
-    // If we have a URL, then we will want to end up returning a model...
-    if (!getModelURL().isEmpty()) {
-        // If we don't have a model, allocate one *immediately*
-        if (!_model) {
-            _model = _myRenderer->allocateModel(getModelURL(), _myRenderer->getEntityLoadingPriority(*this), this);
-            _needsInitialSimulation = true;
-        // If we need to change URLs, update it *after rendering* (to avoid access violations)
-        } else if (QUrl(getModelURL()) != _model->getURL()) {
-            QMetaObject::invokeMethod(_myRenderer.data(), "updateModel", Qt::QueuedConnection,
-                Q_ARG(ModelPointer, _model),
-                Q_ARG(const QString&, getModelURL()));
-            _needsInitialSimulation = true;
-        }
-        // Else we can just return the _model
-    // If we have no URL, then we can delete any model we do have...
-    } else if (_model) {
-        // remove from scene
-        const render::ScenePointer& scene = AbstractViewStateInterface::instance()->getMain3DScene();
-        render::Transaction transaction;
-        _model->removeFromScene(scene, transaction);
-        scene->enqueueTransaction(transaction);
-
-        // release interest
-        _myRenderer->releaseModel(_model);
-        _model = nullptr;
-        _needsInitialSimulation = true;
-    }
-
-    return _model;
-}
-
-bool RenderableModelEntityItem::needsToCallUpdate() const {
-    return !_dimensionsInitialized || _needsInitialSimulation || ModelEntityItem::needsToCallUpdate();
-}
-
-void RenderableModelEntityItem::update(const quint64& now) {
-    if (!_dimensionsInitialized) {
-        if (_model) {
-            if (_model->isActive() && _model->isLoaded()) {
-                EntityItemProperties properties;
-                properties.setLastEdited(usecTimestampNow()); // we must set the edit time since we're editing it
-                auto extents = _model->getMeshExtents();
-                properties.setDimensions(extents.maximum - extents.minimum);
-                qCDebug(entitiesrenderer) << "Autoresizing" << (!getName().isEmpty() ? getName() : getModelURL())
-                    << "from mesh extents";
-                QMetaObject::invokeMethod(DependencyManager::get<EntityScriptingInterface>().data(), "editEntity",
-                                        Qt::QueuedConnection,
-                                        Q_ARG(QUuid, getEntityItemID()),
-                                        Q_ARG(EntityItemProperties, properties));
-            }
-        } else if (_needsModelReload) {
-            EntityTreePointer tree = getTree();
-            if (tree) {
-                QMetaObject::invokeMethod(tree.get(), "callLoader", Qt::QueuedConnection, Q_ARG(EntityItemID, getID()));
-            }
-        }
-    }
-
-    // make a copy of the animation properites
-    _renderAnimationProperties = getAnimationProperties();
-
-    ModelEntityItem::update(now);
-}
-
 EntityItemProperties RenderableModelEntityItem::getProperties(EntityPropertyFlags desiredProperties) const {
     EntityItemProperties properties = ModelEntityItem::getProperties(desiredProperties); // get the properties from our base class
     if (_originalTexturesRead) {
         properties.setTextureNames(_originalTextures);
     }
 
-    if (_model) {
-        properties.setRenderInfoVertexCount(_model->getRenderInfoVertexCount());
-        properties.setRenderInfoTextureCount(_model->getRenderInfoTextureCount());
-        properties.setRenderInfoTextureSize(_model->getRenderInfoTextureSize());
-        properties.setRenderInfoDrawCalls(_model->getRenderInfoDrawCalls());
-        properties.setRenderInfoHasTransparent(_model->getRenderInfoHasTransparent());
-    }
+    ModelPointer model = getModel();
+    if (model) {
+        properties.setRenderInfoVertexCount(model->getRenderInfoVertexCount());
+        properties.setRenderInfoTextureCount(model->getRenderInfoTextureCount());
+        properties.setRenderInfoTextureSize(model->getRenderInfoTextureSize());
+        properties.setRenderInfoDrawCalls(model->getRenderInfoDrawCalls());
+        properties.setRenderInfoHasTransparent(model->getRenderInfoHasTransparent());
 
-
-    if (_model && _model->isLoaded()) {
-        // TODO: improve naturalDimensions in the future,
-        //       for now we've added this hack for setting natural dimensions of models
-        Extents meshExtents = _model->getFBXGeometry().getUnscaledMeshExtents();
-        properties.setNaturalDimensions(meshExtents.maximum - meshExtents.minimum);
-        properties.calculateNaturalPosition(meshExtents.minimum, meshExtents.maximum);
+        if (model->isLoaded()) {
+            // TODO: improve naturalDimensions in the future,
+            //       for now we've added this hack for setting natural dimensions of models
+            Extents meshExtents = model->getFBXGeometry().getUnscaledMeshExtents();
+            properties.setNaturalDimensions(meshExtents.maximum - meshExtents.minimum);
+            properties.calculateNaturalPosition(meshExtents.minimum, meshExtents.maximum);
+        }
     }
 
 
@@ -594,20 +270,21 @@ EntityItemProperties RenderableModelEntityItem::getProperties(EntityPropertyFlag
 }
 
 bool RenderableModelEntityItem::supportsDetailedRayIntersection() const {
-    return _model && _model->isLoaded();
+    return isModelLoaded();
 }
 
 bool RenderableModelEntityItem::findDetailedRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
                          bool& keepSearching, OctreeElementPointer& element, float& distance, BoxFace& face,
                          glm::vec3& surfaceNormal, void** intersectedObject, bool precisionPicking) const {
-    if (!_model) {
+    auto model = getModel();
+    if (!model) {
         return true;
     }
     // qCDebug(entitiesrenderer) << "RenderableModelEntityItem::findDetailedRayIntersection() precisionPicking:"
     //                           << precisionPicking;
 
     QString extraInfo;
-    return _model->findRayIntersectionAgainstSubMeshes(origin, direction, distance,
+    return model->findRayIntersectionAgainstSubMeshes(origin, direction, distance,
                                                        face, surfaceNormal, extraInfo, precisionPicking, false);
 }
 
@@ -638,59 +315,47 @@ void RenderableModelEntityItem::setCompoundShapeURL(const QString& url) {
     // parse it twice.
     auto currentCompoundShapeURL = getCompoundShapeURL();
     ModelEntityItem::setCompoundShapeURL(url);
-
-    if (getCompoundShapeURL() != currentCompoundShapeURL || !_model) {
-        EntityTreePointer tree = getTree();
-        if (tree) {
-            QMetaObject::invokeMethod(tree.get(), "callLoader", Qt::QueuedConnection, Q_ARG(EntityItemID, getID()));
-        }
+    if (getCompoundShapeURL() != currentCompoundShapeURL || !getModel()) {
         if (getShapeType() == SHAPE_TYPE_COMPOUND) {
             getCollisionGeometryResource();
         }
     }
 }
 
-bool RenderableModelEntityItem::isReadyToComputeShape() {
+bool RenderableModelEntityItem::isReadyToComputeShape() const {
     ShapeType type = getShapeType();
 
+    auto model = getModel();
     if (type == SHAPE_TYPE_COMPOUND) {
-        if (!_model || getCompoundShapeURL().isEmpty()) {
-            EntityTreePointer tree = getTree();
-            if (tree) {
-                QMetaObject::invokeMethod(tree.get(), "callLoader", Qt::QueuedConnection, Q_ARG(EntityItemID, getID()));
-            }
+        if (!model || getCompoundShapeURL().isEmpty()) {
             return false;
         }
 
-        if (_model->getURL().isEmpty()) {
+        if (model->getURL().isEmpty()) {
             // we need a render geometry with a scale to proceed, so give up.
             return false;
         }
 
-        if (_model->isLoaded()) {
+        if (model->isLoaded()) {
+            if (!getCompoundShapeURL().isEmpty() && !_compoundShapeResource) {
+                const_cast<RenderableModelEntityItem*>(this)->getCollisionGeometryResource();
+            }
+
             if (_compoundShapeResource && _compoundShapeResource->isLoaded()) {
                 // we have both URLs AND both geometries AND they are both fully loaded.
                 if (_needsInitialSimulation) {
                     // the _model's offset will be wrong until _needsInitialSimulation is false
-                    PerformanceTimer perfTimer("_model->simulate");
-                    doInitialModelSimulation();
+                    DETAILED_PERFORMANCE_TIMER("_model->simulate");
+                    const_cast<RenderableModelEntityItem*>(this)->doInitialModelSimulation();
                 }
                 return true;
-            } else if (!getCompoundShapeURL().isEmpty()) {
-                getCollisionGeometryResource();
             }
         }
 
         // the model is still being downloaded.
         return false;
     } else if (type >= SHAPE_TYPE_SIMPLE_HULL && type <= SHAPE_TYPE_STATIC_MESH) {
-        if (!_model) {
-            EntityTreePointer tree = getTree();
-            if (tree) {
-                QMetaObject::invokeMethod(tree.get(), "callLoader", Qt::QueuedConnection, Q_ARG(EntityItemID, getID()));
-            }
-        }
-        return (_model && _model->isLoaded());
+        return isModelLoaded();
     }
     return true;
 }
@@ -701,12 +366,13 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& shapeInfo) {
 
     ShapeType type = getShapeType();
     glm::vec3 dimensions = getDimensions();
+    auto model = getModel();
     if (type == SHAPE_TYPE_COMPOUND) {
         updateModelBounds();
 
         // should never fall in here when collision model not fully loaded
-        // hence we assert that all geometries exist and are loaded
-        assert(_model && _model->isLoaded() && _compoundShapeResource && _compoundShapeResource->isLoaded());
+        // TODO: assert that all geometries exist and are loaded
+        //assert(_model && _model->isLoaded() && _compoundShapeResource && _compoundShapeResource->isLoaded());
         const FBXGeometry& collisionGeometry = _compoundShapeResource->getFBXGeometry();
 
         ShapeInfo::PointCollection& pointCollection = shapeInfo.getPointCollection();
@@ -782,27 +448,27 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& shapeInfo) {
         // to the visual model and apply them to the collision model (without regard for the
         // collision model's extents).
 
-        glm::vec3 scaleToFit = dimensions / _model->getFBXGeometry().getUnscaledMeshExtents().size();
+        glm::vec3 scaleToFit = dimensions / model->getFBXGeometry().getUnscaledMeshExtents().size();
         // multiply each point by scale before handing the point-set off to the physics engine.
         // also determine the extents of the collision model.
         glm::vec3 registrationOffset = dimensions * (ENTITY_ITEM_DEFAULT_REGISTRATION_POINT - getRegistrationPoint());
         for (int32_t i = 0; i < pointCollection.size(); i++) {
             for (int32_t j = 0; j < pointCollection[i].size(); j++) {
                 // back compensate for registration so we can apply that offset to the shapeInfo later
-                pointCollection[i][j] = scaleToFit * (pointCollection[i][j] + _model->getOffset()) - registrationOffset;
+                pointCollection[i][j] = scaleToFit * (pointCollection[i][j] + model->getOffset()) - registrationOffset;
             }
         }
         shapeInfo.setParams(type, dimensions, getCompoundShapeURL());
     } else if (type >= SHAPE_TYPE_SIMPLE_HULL && type <= SHAPE_TYPE_STATIC_MESH) {
-        // should never fall in here when model not fully loaded
-        assert(_model && _model->isLoaded());
+        // TODO: assert we never fall in here when model not fully loaded
+        //assert(_model && _model->isLoaded());
 
         updateModelBounds();
-        _model->updateGeometry();
+        model->updateGeometry();
 
         // compute meshPart local transforms
         QVector<glm::mat4> localTransforms;
-        const FBXGeometry& fbxGeometry = _model->getFBXGeometry();
+        const FBXGeometry& fbxGeometry = model->getFBXGeometry();
         int numFbxMeshes = fbxGeometry.meshes.size();
         int totalNumVertices = 0;
         glm::mat4 invRegistraionOffset = glm::translate(dimensions * (getRegistrationPoint() - ENTITY_ITEM_DEFAULT_REGISTRATION_POINT));
@@ -810,7 +476,7 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& shapeInfo) {
             const FBXMesh& mesh = fbxGeometry.meshes.at(i);
             if (mesh.clusters.size() > 0) {
                 const FBXCluster& cluster = mesh.clusters.at(0);
-                auto jointMatrix = _model->getRig().getJointTransform(cluster.jointIndex);
+                auto jointMatrix = model->getRig().getJointTransform(cluster.jointIndex);
                 // we backtranslate by the registration offset so we can apply that offset to the shapeInfo later
                 localTransforms.push_back(invRegistraionOffset * jointMatrix * cluster.inverseBindMatrix);
             } else {
@@ -826,7 +492,7 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& shapeInfo) {
             return;
         }
 
-        auto& meshes = _model->getGeometry()->getMeshes();
+        auto& meshes = model->getGeometry()->getMeshes();
         int32_t numMeshes = (int32_t)(meshes.size());
 
         const int MAX_ALLOWED_MESH_COUNT = 1000;
@@ -1030,17 +696,14 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& shapeInfo) {
 void RenderableModelEntityItem::setCollisionShape(const btCollisionShape* shape) {
     const void* key = static_cast<const void*>(shape);
     if (_collisionMeshKey != key) {
-        if (_collisionMeshKey) {
-            collisionMeshCache.releaseMesh(_collisionMeshKey);
-        }
         _collisionMeshKey = key;
-        // toggle _showCollisionGeometry forces re-evaluation later
-        _showCollisionGeometry = !_showCollisionGeometry;
+        emit requestCollisionGeometryUpdate();
     }
 }
 
 bool RenderableModelEntityItem::contains(const glm::vec3& point) const {
-    if (EntityItem::contains(point) && _model && _compoundShapeResource && _compoundShapeResource->isLoaded()) {
+    auto model = getModel();
+    if (EntityItem::contains(point) && model && _compoundShapeResource && _compoundShapeResource->isLoaded()) {
         return _compoundShapeResource->getFBXGeometry().convexHullContains(worldToEntity(point));
     }
 
@@ -1048,11 +711,12 @@ bool RenderableModelEntityItem::contains(const glm::vec3& point) const {
 }
 
 bool RenderableModelEntityItem::shouldBePhysical() const {
+    auto model = getModel();
     // If we have a model, make sure it hasn't failed to download.
     // If it has, we'll report back that we shouldn't be physical so that physics aren't held waiting for us to be ready.
-    if (_model && getShapeType() == SHAPE_TYPE_COMPOUND && _model->didCollisionGeometryRequestFail()) {
+    if (model && getShapeType() == SHAPE_TYPE_COMPOUND && model->didCollisionGeometryRequestFail()) {
         return false;
-    } else if (_model && getShapeType() != SHAPE_TYPE_NONE && _model->didVisualGeometryRequestFail()) {
+    } else if (model && getShapeType() != SHAPE_TYPE_NONE && model->didVisualGeometryRequestFail()) {
         return false;
     } else {
         return ModelEntityItem::shouldBePhysical();
@@ -1060,9 +724,10 @@ bool RenderableModelEntityItem::shouldBePhysical() const {
 }
 
 glm::quat RenderableModelEntityItem::getAbsoluteJointRotationInObjectFrame(int index) const {
-    if (_model) {
+    auto model = getModel();
+    if (model) {
         glm::quat result;
-        if (_model->getAbsoluteJointRotationInRigFrame(index, result)) {
+        if (model->getAbsoluteJointRotationInRigFrame(index, result)) {
             return result;
         }
     }
@@ -1070,9 +735,10 @@ glm::quat RenderableModelEntityItem::getAbsoluteJointRotationInObjectFrame(int i
 }
 
 glm::vec3 RenderableModelEntityItem::getAbsoluteJointTranslationInObjectFrame(int index) const {
-    if (_model) {
+    auto model = getModel();
+    if (model) {
         glm::vec3 result;
-        if (_model->getAbsoluteJointTranslationInRigFrame(index, result)) {
+        if (model->getAbsoluteJointTranslationInRigFrame(index, result)) {
             return result;
         }
     }
@@ -1080,10 +746,11 @@ glm::vec3 RenderableModelEntityItem::getAbsoluteJointTranslationInObjectFrame(in
 }
 
 bool RenderableModelEntityItem::setAbsoluteJointRotationInObjectFrame(int index, const glm::quat& rotation) {
-    if (!_model) {
+    auto model = getModel();
+    if (!model) {
         return false;
     }
-    const Rig& rig = _model->getRig();
+    const Rig& rig = model->getRig();
     int jointParentIndex = rig.getJointParentIndex(index);
     if (jointParentIndex == -1) {
         return setLocalJointRotation(index, rotation);
@@ -1109,10 +776,11 @@ bool RenderableModelEntityItem::setAbsoluteJointRotationInObjectFrame(int index,
 }
 
 bool RenderableModelEntityItem::setAbsoluteJointTranslationInObjectFrame(int index, const glm::vec3& translation) {
-    if (!_model) {
+    auto model = getModel();
+    if (!model) {
         return false;
     }
-    const Rig& rig = _model->getRig();
+    const Rig& rig = model->getRig();
 
     int jointParentIndex = rig.getJointParentIndex(index);
     if (jointParentIndex == -1) {
@@ -1139,9 +807,10 @@ bool RenderableModelEntityItem::setAbsoluteJointTranslationInObjectFrame(int ind
 }
 
 glm::quat RenderableModelEntityItem::getLocalJointRotation(int index) const {
-    if (_model) {
+    auto model = getModel();
+    if (model) {
         glm::quat result;
-        if (_model->getJointRotation(index, result)) {
+        if (model->getJointRotation(index, result)) {
             return result;
         }
     }
@@ -1149,9 +818,10 @@ glm::quat RenderableModelEntityItem::getLocalJointRotation(int index) const {
 }
 
 glm::vec3 RenderableModelEntityItem::getLocalJointTranslation(int index) const {
-    if (_model) {
+    auto model = getModel();
+    if (model) {
         glm::vec3 result;
-        if (_model->getJointTranslation(index, result)) {
+        if (model->getJointTranslation(index, result)) {
             return result;
         }
     }
@@ -1159,34 +829,38 @@ glm::vec3 RenderableModelEntityItem::getLocalJointTranslation(int index) const {
 }
 
 bool RenderableModelEntityItem::setLocalJointRotation(int index, const glm::quat& rotation) {
+    autoResizeJointArrays();
     bool result = false;
     _jointDataLock.withWriteLock([&] {
         _jointRotationsExplicitlySet = true;
-        resizeJointArrays();
-        if (index >= 0 && index < _localJointRotations.size() &&
-            _localJointRotations[index] != rotation) {
-            _localJointRotations[index] = rotation;
-            _localJointRotationsSet[index] = true;
-            _localJointRotationsDirty[index] = true;
-            result = true;
-            _needsJointSimulation = true;
+        if (index >= 0 && index < _localJointData.size()) {
+            auto& jointData = _localJointData[index];
+            if (jointData.joint.rotation != rotation) {
+                jointData.joint.rotation = rotation;
+                jointData.joint.rotationSet = true;
+                jointData.rotationDirty = true;
+                result = true;
+                _needsJointSimulation = true;
+            }
         }
     });
     return result;
 }
 
 bool RenderableModelEntityItem::setLocalJointTranslation(int index, const glm::vec3& translation) {
+    autoResizeJointArrays();
     bool result = false;
     _jointDataLock.withWriteLock([&] {
         _jointTranslationsExplicitlySet = true;
-        resizeJointArrays();
-        if (index >= 0 && index < _localJointTranslations.size() &&
-            _localJointTranslations[index] != translation) {
-            _localJointTranslations[index] = translation;
-            _localJointTranslationsSet[index] = true;
-            _localJointTranslationsDirty[index] = true;
-            result = true;
-            _needsJointSimulation = true;
+        if (index >= 0 && index < _localJointData.size()) {
+            auto& jointData = _localJointData[index];
+            if (jointData.joint.translation != translation) {
+                jointData.joint.translation = translation;
+                jointData.joint.translationSet = true;
+                jointData.translationDirty = true;
+                result = true;
+                _needsJointSimulation = true;
+            }
         }
     });
     return result;
@@ -1212,45 +886,25 @@ void RenderableModelEntityItem::setJointTranslationsSet(const QVector<bool>& tra
     _needsJointSimulation = true;
 }
 
-
 void RenderableModelEntityItem::locationChanged(bool tellPhysics) {
-    PerformanceTimer pertTimer("locationChanged");
+    DETAILED_PERFORMANCE_TIMER("locationChanged");
     EntityItem::locationChanged(tellPhysics);
-    if (_model && _model->isActive()) {
-        _model->updateRenderItems();
-
-        void* key = (void*)this;
-        std::weak_ptr<RenderableModelEntityItem> weakSelf =
-            std::static_pointer_cast<RenderableModelEntityItem>(getThisPointer());
-
-        AbstractViewStateInterface::instance()->pushPostUpdateLambda(key, [weakSelf]() {
-            auto self = weakSelf.lock();
-            if (!self) {
-                return;
-            }
-
-            render::ItemID myMetaItem = self->getMetaRenderItem();
-
-            if (myMetaItem == render::Item::INVALID_ITEM_ID) {
-                return;
-            }
-
-            render::Transaction transaction;
-
-            transaction.updateItem(myMetaItem);
-            AbstractViewStateInterface::instance()->getMain3DScene()->enqueueTransaction(transaction);
-        });
+    auto model = getModel();
+    if (model && model->isLoaded()) {
+        model->updateRenderItems();
     }
 }
 
 int RenderableModelEntityItem::getJointIndex(const QString& name) const {
-    return (_model && _model->isActive()) ? _model->getRig().indexOfJoint(name) : -1;
+    auto model = getModel();
+    return (model && model->isActive()) ? model->getRig().indexOfJoint(name) : -1;
 }
 
 QStringList RenderableModelEntityItem::getJointNames() const {
     QStringList result;
-    if (_model && _model->isActive()) {
-        const Rig& rig = _model->getRig();
+    auto model = getModel();
+    if (model && model->isActive()) {
+        const Rig& rig = model->getRig();
         int jointCount = rig.getJointStateCount();
         for (int jointIndex = 0; jointIndex < jointCount; jointIndex++) {
             result << rig.nameOfJoint(jointIndex);
@@ -1259,14 +913,481 @@ QStringList RenderableModelEntityItem::getJointNames() const {
     return result;
 }
 
-void RenderableModelEntityItem::mapJoints(const QStringList& modelJointNames) {
-    // if we don't have animation, or we're already joint mapped then bail early
-    if (!hasAnimation() || jointsMapped()) {
+bool RenderableModelEntityItem::getMeshes(MeshProxyList& result) {
+    auto model = getModel();
+    if (!model || !model->isLoaded()) {
+        return false;
+    }
+    BLOCKING_INVOKE_METHOD(model.get(), "getMeshes", Q_RETURN_ARG(MeshProxyList, result));
+    return !result.isEmpty();
+}
+
+void RenderableModelEntityItem::copyAnimationJointDataToModel() {
+    auto model = getModel();
+    if (!model || !model->isLoaded()) {
         return;
     }
 
-    if (!_animation || _animation->getURL().toString() != getAnimationURL()) {
-        _animation = DependencyManager::get<AnimationCache>()->getAnimation(getAnimationURL());
+    // relay any inbound joint changes from scripts/animation/network to the model/rig
+    _jointDataLock.withWriteLock([&] {
+        for (int index = 0; index < _localJointData.size(); ++index) {
+            auto& jointData = _localJointData[index];
+            if (jointData.rotationDirty) {
+                model->setJointRotation(index, true, jointData.joint.rotation, 1.0f);
+                jointData.rotationDirty = false;
+            }
+            if (jointData.translationDirty) {
+                model->setJointTranslation(index, true, jointData.joint.translation, 1.0f);
+                jointData.translationDirty = false;
+            }
+        }
+    });
+}
+
+using namespace render;
+using namespace render::entities;
+
+ItemKey ModelEntityRenderer::getKey() {
+    return ItemKey::Builder().withTypeMeta().withTypeShape();
+}
+
+uint32_t ModelEntityRenderer::metaFetchMetaSubItems(ItemIDs& subItems) { 
+    if (_model) {
+        auto metaSubItems = _subRenderItemIDs;
+        subItems.insert(subItems.end(), metaSubItems.begin(), metaSubItems.end());
+        return (uint32_t)metaSubItems.size();
+    }
+    return 0;
+}
+
+void ModelEntityRenderer::removeFromScene(const ScenePointer& scene, Transaction& transaction) {
+    if (_model) {
+        _model->removeFromScene(scene, transaction);
+    }
+    Parent::removeFromScene(scene, transaction);
+}
+
+void ModelEntityRenderer::onRemoveFromSceneTyped(const TypedEntityPointer& entity) {
+    entity->setModel({});
+}
+
+bool operator!=(const AnimationPropertyGroup& a, const AnimationPropertyGroup& b) {
+    return !(a == b);
+}
+
+void ModelEntityRenderer::animate(const TypedEntityPointer& entity) {
+    if (!_animation || !_animation->isLoaded()) {
+        return;
+    }
+
+    QVector<JointData> jointsData;
+
+    const QVector<FBXAnimationFrame>&  frames = _animation->getFramesReference(); // NOTE: getFrames() is too heavy
+    int frameCount = frames.size();
+    if (frameCount <= 0) {
+        return;
+    }
+
+    if (!_lastAnimated) {
+        _lastAnimated = usecTimestampNow();
+        return;
+    }
+
+    auto now = usecTimestampNow();
+    auto interval = now - _lastAnimated;
+    _lastAnimated = now;
+    float deltaTime = (float)interval / (float)USECS_PER_SECOND;
+    _currentFrame += (deltaTime * _renderAnimationProperties.getFPS());
+
+    {
+        int animationCurrentFrame = (int)(glm::floor(_currentFrame)) % frameCount;
+        if (animationCurrentFrame < 0 || animationCurrentFrame > frameCount) {
+            animationCurrentFrame = 0;
+        }
+
+        if (animationCurrentFrame == _lastKnownCurrentFrame) {
+            return;
+        }
+        _lastKnownCurrentFrame = animationCurrentFrame;
+    }
+
+    if (_jointMapping.size() != _model->getJointStateCount()) {
+        qCWarning(entitiesrenderer) << "RenderableModelEntityItem::getAnimationFrame -- joint count mismatch"
+                    << _jointMapping.size() << _model->getJointStateCount();
+        return;
+    }
+
+    QStringList animationJointNames = _animation->getGeometry().getJointNames();
+    auto& fbxJoints = _animation->getGeometry().joints;
+
+    auto& originalFbxJoints = _model->getFBXGeometry().joints;
+    auto& originalFbxIndices = _model->getFBXGeometry().jointIndices;
+
+    bool allowTranslation = entity->getAnimationAllowTranslation();
+
+    const QVector<glm::quat>& rotations = frames[_lastKnownCurrentFrame].rotations;
+    const QVector<glm::vec3>& translations = frames[_lastKnownCurrentFrame].translations;
+                
+    jointsData.resize(_jointMapping.size());
+    for (int j = 0; j < _jointMapping.size(); j++) {
+        int index = _jointMapping[j];
+
+        if (index >= 0) {
+            glm::mat4 translationMat;
+
+            if (allowTranslation) {
+                if(index < translations.size()){
+                    translationMat = glm::translate(translations[index]);
+                }
+            } else if (index < animationJointNames.size()){
+                QString jointName = fbxJoints[index].name; // Pushing this here so its not done on every entity, with the exceptions of those allowing for translation
+                
+                if (originalFbxIndices.contains(jointName)) {
+                    // Making sure the joint names exist in the original model the animation is trying to apply onto. If they do, then remap and get it's translation.
+                    int remappedIndex = originalFbxIndices[jointName] - 1; // JointIndeces seem to always start from 1 and the found index is always 1 higher than actual.
+                    translationMat = glm::translate(originalFbxJoints[remappedIndex].translation);
+                }
+            } 
+            glm::mat4 rotationMat;
+            if (index < rotations.size()) {
+                rotationMat = glm::mat4_cast(fbxJoints[index].preRotation * rotations[index] * fbxJoints[index].postRotation);
+            } else {
+                rotationMat = glm::mat4_cast(fbxJoints[index].preRotation * fbxJoints[index].postRotation);
+            }
+
+            glm::mat4 finalMat = (translationMat * fbxJoints[index].preTransform *
+                rotationMat * fbxJoints[index].postTransform);
+            auto& jointData = jointsData[j];
+            jointData.translation = extractTranslation(finalMat);
+            jointData.translationSet = true;
+            jointData.rotation = glmExtractRotation(finalMat);
+            jointData.rotationSet = true;
+        }
+    }
+    // Set the data in the entity
+    entity->setAnimationJointsData(jointsData);
+
+    entity->copyAnimationJointDataToModel();
+}
+
+bool ModelEntityRenderer::needsRenderUpdate() const {
+    ModelPointer model;
+    withReadLock([&] {
+        model = _model;
+    });
+
+    if (model) {
+        if (_needsJointSimulation || _moving || _animating) {
+            return true;
+        }
+
+        // When the individual mesh parts of a model finish fading, they will mark their Model as needing updating
+        // we will watch for that and ask the model to update it's render items
+        if (_parsedModelURL != model->getURL()) {
+            return true;
+        }
+
+        if (model->needsReload()) {
+            return true;
+        }
+
+        // FIXME what is the difference between these two?
+        if (model->needsFixupInScene()) {
+            return true;
+        }
+
+        // FIXME what is the difference between these two? ^^^^
+        if (model->getRenderItemsNeedUpdate()) {
+            return true;
+        }
+
+        if (_needsCollisionGeometryUpdate) {
+            return true;
+        }
+    }
+    return Parent::needsRenderUpdate();
+}
+
+bool ModelEntityRenderer::needsRenderUpdateFromTypedEntity(const TypedEntityPointer& entity) const {
+    if (resultWithReadLock<bool>([&] {
+        if (entity->hasModel() != _hasModel) {
+            return true;
+        }
+
+        if (_lastModelURL != entity->getModelURL()) {
+            return true;
+        }
+
+        // No model to render, early exit
+        if (!_hasModel) {
+            return false;
+        }
+
+        if (_lastTextures != entity->getTextures()) {
+            return true;
+        }
+
+        if (_renderAnimationProperties != entity->getAnimationProperties()) {
+            return true;
+        }
+
+        if (_animating != entity->isAnimatingSomething()) {
+            return true;
+        }
+
+        return false;
+    })) { return true; }
+
+    ModelPointer model;
+    withReadLock([&] {
+        model = _model;
+    });
+
+    if (model && model->isLoaded()) {
+        if (!entity->_dimensionsInitialized || entity->_needsInitialSimulation) {
+            return true;
+        }
+
+        // Check to see if we need to update the model bounds
+        if (entity->needsUpdateModelBounds()) {
+            return true;
+        }
+
+        // Check to see if we need to update the model bounds
+        auto transform = entity->getTransform();
+        if (model->getTranslation() != transform.getTranslation() ||
+            model->getRotation() != transform.getRotation()) {
+            return true;
+        }
+
+
+        if (model->getScaleToFitDimensions() != entity->getDimensions() ||
+            model->getRegistrationPoint() != entity->getRegistrationPoint()) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+void ModelEntityRenderer::setCollisionMeshKey(const void*key) {
+    if (key != _collisionMeshKey) {
+        if (_collisionMeshKey) {
+            collisionMeshCache.releaseMesh(_collisionMeshKey);
+        }
+        _collisionMeshKey = key;
+    }
+}
+
+void ModelEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& scene, Transaction& transaction, const TypedEntityPointer& entity) {
+    DETAILED_PROFILE_RANGE(simulation_physics, __FUNCTION__);
+    if (_hasModel != entity->hasModel()) {
+        _hasModel = entity->hasModel();
+    }
+
+    _marketplaceEntity = entity->getMarketplaceID().length() != 0;
+    _animating = entity->isAnimatingSomething();
+
+    withWriteLock([&] {
+        if (_lastModelURL != entity->getModelURL()) {
+            _lastModelURL = entity->getModelURL();
+            _parsedModelURL = QUrl(_lastModelURL);
+        }
+    });
+
+    // Check for removal
+    ModelPointer model;
+    withReadLock([&] { model = _model; });
+    if (!_hasModel) {
+        if ((bool)model) {
+            model->removeFromScene(scene, transaction);
+            withWriteLock([&] { _model.reset(); });
+            transaction.updateItem<PayloadProxyInterface>(getRenderItemID(), [](PayloadProxyInterface& data) {
+                auto entityRenderer = static_cast<EntityRenderer*>(&data);
+                entityRenderer->clearSubRenderItemIDs();
+            });
+        }
+        return;
+    }
+
+    // Check for addition
+    if (_hasModel && !(bool)_model) {
+        model = std::make_shared<Model>(nullptr, entity.get());
+        connect(model.get(), &Model::setURLFinished, this, &ModelEntityRenderer::requestRenderUpdate);
+        connect(model.get(), &Model::requestRenderUpdate, this, &ModelEntityRenderer::requestRenderUpdate);
+        connect(entity.get(), &RenderableModelEntityItem::requestCollisionGeometryUpdate, this, &ModelEntityRenderer::flagForCollisionGeometryUpdate);
+        model->setLoadingPriority(EntityTreeRenderer::getEntityLoadingPriority(*entity));
+        model->init();
+        entity->setModel(model);
+        withWriteLock([&] { _model = model; });
+    }
+
+    // From here on, we are guaranteed a populated model
+    withWriteLock([&] {
+        if (_parsedModelURL != model->getURL()) {
+            model->setURL(_parsedModelURL);
+        }
+    });
+
+    // Nothing else to do unless the model is loaded
+    if (!model->isLoaded()) {
+        return;
+    }
+
+    // Check for initializing the model
+    if (!entity->_dimensionsInitialized) {
+        EntityItemProperties properties;
+        properties.setLastEdited(usecTimestampNow()); // we must set the edit time since we're editing it
+        auto extents = model->getMeshExtents();
+        properties.setDimensions(extents.maximum - extents.minimum);
+        qCDebug(entitiesrenderer) << "Autoresizing"
+            << (!entity->getName().isEmpty() ? entity->getName() : entity->getModelURL())
+            << "from mesh extents";
+
+        QMetaObject::invokeMethod(DependencyManager::get<EntityScriptingInterface>().data(), "editEntity",
+            Qt::QueuedConnection, Q_ARG(QUuid, entity->getEntityItemID()), Q_ARG(EntityItemProperties, properties));
+    }
+
+    if (!entity->_originalTexturesRead) {
+        // Default to _originalTextures to avoid remapping immediately and lagging on load
+        entity->_originalTextures = model->getTextures();
+        entity->_originalTexturesRead = true;
+        _currentTextures = entity->_originalTextures;
+    }
+
+    if (_lastTextures != entity->getTextures()) {
+        _lastTextures = entity->getTextures();
+        auto newTextures = parseTexturesToMap(_lastTextures, entity->_originalTextures);
+        if (newTextures != _currentTextures) {
+            model->setTextures(newTextures);
+            _currentTextures = newTextures;
+        }
+    }
+
+    entity->updateModelBounds();
+
+    if (model->isVisible() != _visible) {
+        // FIXME: this seems like it could be optimized if we tracked our last known visible state in
+        //        the renderable item. As it stands now the model checks it's visible/invisible state
+        //        so most of the time we don't do anything in this function.
+        model->setVisibleInScene(_visible, scene);
+    }
+    // TODO? early exit here when not visible?
+
+    if (_needsCollisionGeometryUpdate) {
+        setCollisionMeshKey(entity->getCollisionMeshKey());
+        _needsCollisionGeometryUpdate = false;
+        ShapeType type = entity->getShapeType();
+        if (_showCollisionGeometry && type != SHAPE_TYPE_STATIC_MESH && type != SHAPE_TYPE_NONE) {
+            // NOTE: it is OK if _collisionMeshKey is nullptr
+            model::MeshPointer mesh = collisionMeshCache.getMesh(_collisionMeshKey);
+            // NOTE: the model will render the collisionGeometry if it has one
+            _model->setCollisionMesh(mesh);
+        } else {
+            if (_collisionMeshKey) {
+                // release mesh
+                collisionMeshCache.releaseMesh(_collisionMeshKey);
+            }
+            // clear model's collision geometry
+            model::MeshPointer mesh = nullptr;
+            _model->setCollisionMesh(mesh);
+        }
+    }
+
+    {
+        DETAILED_PROFILE_RANGE(simulation_physics, "Fixup");
+        if (model->needsFixupInScene()) {
+            model->removeFromScene(scene, transaction);
+            render::Item::Status::Getters statusGetters;
+            makeStatusGetters(entity, statusGetters);
+            model->addToScene(scene, transaction, statusGetters);
+
+            auto newRenderItemIDs{ model->fetchRenderItemIDs() };
+            transaction.updateItem<PayloadProxyInterface>(getRenderItemID(), [newRenderItemIDs](PayloadProxyInterface& data) {
+                auto entityRenderer = static_cast<EntityRenderer*>(&data);
+                entityRenderer->setSubRenderItemIDs(newRenderItemIDs);
+            });
+        }
+    }
+
+    // When the individual mesh parts of a model finish fading, they will mark their Model as needing updating
+    // we will watch for that and ask the model to update it's render items
+    if (model->getRenderItemsNeedUpdate()) {
+        model->updateRenderItems();
+    }
+
+    {
+        DETAILED_PROFILE_RANGE(simulation_physics, "CheckAnimation");
+        // make a copy of the animation properites
+        auto newAnimationProperties = entity->getAnimationProperties();
+        if (newAnimationProperties != _renderAnimationProperties) {
+            withWriteLock([&] {
+                _renderAnimationProperties = newAnimationProperties;
+                _currentFrame = _renderAnimationProperties.getCurrentFrame();
+            });
+        }
+    }
+
+    if (_animating) {
+        DETAILED_PROFILE_RANGE(simulation_physics, "Animate");
+        if (!jointsMapped()) {
+            mapJoints(entity, model->getJointNames());
+        }
+        animate(entity);
+        emit requestRenderUpdate();
+    }
+}
+
+void ModelEntityRenderer::flagForCollisionGeometryUpdate() {
+    _needsCollisionGeometryUpdate = true;
+    emit requestRenderUpdate();
+}
+
+// NOTE: this only renders the "meta" portion of the Model, namely it renders debugging items
+void ModelEntityRenderer::doRender(RenderArgs* args) {
+    DETAILED_PROFILE_RANGE(render_detail, "MetaModelRender");
+    DETAILED_PERFORMANCE_TIMER("RMEIrender");
+
+    ModelPointer model;
+    withReadLock([&]{
+        model = _model;
+    });
+
+    // If we don't have a model, or the model doesn't have visual geometry, render our bounding box as green wireframe
+    if (!model || (model && model->didVisualGeometryRequestFail())) {
+        static glm::vec4 greenColor(0.0f, 1.0f, 0.0f, 1.0f);
+        gpu::Batch& batch = *args->_batch;
+        batch.setModelTransform(getModelTransform()); // we want to include the scale as well
+        DependencyManager::get<GeometryCache>()->renderWireCubeInstance(args, batch, greenColor);
+        return;
+    }
+
+
+    // Enqueue updates for the next frame
+#if WANT_EXTRA_DEBUGGING
+    // debugging...
+    gpu::Batch& batch = *args->_batch;
+    _model->renderDebugMeshBoxes(batch);
+#endif
+
+    // Remap textures for the next frame to avoid flicker
+    // remapTextures();
+
+    bool showCollisionGeometry = (bool)(args->_debugFlags & (int)RenderArgs::RENDER_DEBUG_HULLS);
+    if (showCollisionGeometry != _showCollisionGeometry) {
+        _showCollisionGeometry = showCollisionGeometry;
+        flagForCollisionGeometryUpdate();
+    }
+}
+
+void ModelEntityRenderer::mapJoints(const TypedEntityPointer& entity, const QStringList& modelJointNames) {
+    // if we don't have animation, or we're already joint mapped then bail early
+    if (!entity->hasAnimation() || jointsMapped()) {
+        return;
+    }
+
+    if (!_animation || _animation->getURL().toString() != entity->getAnimationURL()) {
+        _animation = DependencyManager::get<AnimationCache>()->getAnimation(entity->getAnimationURL());
     }
 
     if (_animation && _animation->isLoaded()) {
@@ -1278,7 +1399,7 @@ void RenderableModelEntityItem::mapJoints(const QStringList& modelJointNames) {
                 _jointMapping[i] = animationJointNames.indexOf(modelJointNames[i]);
             }
             _jointMappingCompleted = true;
-            _jointMappingURL = _animationProperties.getURL();
         }
     }
 }
+
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.h b/libraries/entities-renderer/src/RenderableModelEntityItem.h
index 2d240c01a6..0272bed575 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.h
@@ -12,58 +12,70 @@
 #ifndef hifi_RenderableModelEntityItem_h
 #define hifi_RenderableModelEntityItem_h
 
+#include <ModelEntityItem.h>
+
 #include <QString>
 #include <QStringList>
 
 #include <ModelEntityItem.h>
 #include <AnimationCache.h>
+#include <Model.h>
+#include <model-networking/ModelCache.h>
+
+#include "RenderableEntityItem.h"
+
+
 
 class Model;
 class EntityTreeRenderer;
 
-class RenderableModelEntityItem : public ModelEntityItem, RenderableEntityInterface {
+namespace render { namespace entities {
+class ModelEntityRenderer;
+} }
+
+//#define MODEL_ENTITY_USE_FADE_EFFECT
+class ModelEntityWrapper : public ModelEntityItem {
+    using Parent = ModelEntityItem;
+    friend class render::entities::ModelEntityRenderer;
+
+protected:
+    ModelEntityWrapper(const EntityItemID& entityItemID) : Parent(entityItemID) {}
+    void setModel(const ModelPointer& model);
+    ModelPointer getModel() const;
+    bool isModelLoaded() const;
+
+    bool _needsInitialSimulation{ true };
+private:
+    ModelPointer _model;
+};
+
+class RenderableModelEntityItem : public ModelEntityWrapper {
+    Q_OBJECT
+
+    friend class render::entities::ModelEntityRenderer;
+    using Parent = ModelEntityWrapper;
 public:
     static EntityItemPointer factory(const EntityItemID& entityID, const EntityItemProperties& properties);
 
     RenderableModelEntityItem(const EntityItemID& entityItemID, bool dimensionsInitialized);
-
     virtual ~RenderableModelEntityItem();
 
-    RenderableEntityInterface* getRenderableInterface() override { return this; }
-
     virtual void setDimensions(const glm::vec3& value) override;
-    virtual void setModelURL(const QString& url) override;
 
     virtual EntityItemProperties getProperties(EntityPropertyFlags desiredProperties = EntityPropertyFlags()) const override;
-    virtual bool setProperties(const EntityItemProperties& properties) override;
-    virtual int readEntitySubclassDataFromBuffer(const unsigned char* data, int bytesLeftToRead,
-                                                ReadBitstreamToTreeParams& args,
-                                                EntityPropertyFlags& propertyFlags, bool overwriteLocalData,
-                                                bool& somethingChanged) override;
-
     void doInitialModelSimulation();
-
-    virtual bool addToScene(const EntityItemPointer& self, const render::ScenePointer& scene, render::Transaction& transaction) override;
-    virtual void removeFromScene(const EntityItemPointer& self, const render::ScenePointer& scene, render::Transaction& transaction) override;
-
-
     void updateModelBounds();
-    virtual void render(RenderArgs* args) override;
+
     virtual bool supportsDetailedRayIntersection() const override;
     virtual bool findDetailedRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
                         bool& keepSearching, OctreeElementPointer& element, float& distance,
                         BoxFace& face, glm::vec3& surfaceNormal,
                         void** intersectedObject, bool precisionPicking) const override;
-    ModelPointer getModel();
-    ModelPointer getModelNotSafe();
-
-    virtual bool needsToCallUpdate() const override;
-    virtual void update(const quint64& now) override;
 
     virtual void setShapeType(ShapeType type) override;
     virtual void setCompoundShapeURL(const QString& url) override;
 
-    virtual bool isReadyToComputeShape() override;
+    virtual bool isReadyToComputeShape() const override;
     virtual void computeShapeInfo(ShapeInfo& shapeInfo) override;
 
     void setCollisionShape(const btCollisionShape* shape) override;
@@ -89,64 +101,93 @@ public:
     virtual void setJointTranslations(const QVector<glm::vec3>& translations) override;
     virtual void setJointTranslationsSet(const QVector<bool>& translationsSet) override;
 
-    virtual void loader() override;
     virtual void locationChanged(bool tellPhysics = true) override;
 
-    virtual void resizeJointArrays(int newSize = -1) override;
-
     virtual int getJointIndex(const QString& name) const override;
     virtual QStringList getJointNames() const override;
 
-    // These operate on a copy of the animationProperties, so they can be accessed
-    // without having the entityTree lock.
-    bool hasRenderAnimation() const { return !_renderAnimationProperties.getURL().isEmpty(); }
-    const QString& getRenderAnimationURL() const { return _renderAnimationProperties.getURL(); }
+    bool getMeshes(MeshProxyList& result) override;
+    const void* getCollisionMeshKey() const { return _collisionMeshKey; }
 
-    render::ItemID getMetaRenderItem() { return _myMetaItem; }
-
-    // Transparency is handled in ModelMeshPartPayload
-    bool isTransparent() override { return false; }
-
-    void mapJoints(const QStringList& modelJointNames);
-    bool jointsMapped() const {
-        return _jointMappingURL == getAnimationURL() && _jointMappingCompleted;
-    }
-
-    AnimationPointer getAnimation() const {
-        return _animation;
-    }
+signals:
+    void requestCollisionGeometryUpdate();
 
 private:
-    QVariantMap parseTexturesToMap(QString textures);
-    void remapTextures();
+    bool needsUpdateModelBounds() const;
+    void autoResizeJointArrays();
+    void copyAnimationJointDataToModel();
 
     void getCollisionGeometryResource();
     GeometryResource::Pointer _compoundShapeResource;
-    ModelPointer _model = nullptr;
-    bool _needsInitialSimulation = true;
-    bool _needsModelReload = true;
-    QSharedPointer<EntityTreeRenderer> _myRenderer;
+    bool _originalTexturesRead { false };
+    QVariantMap _originalTextures;
+    bool _dimensionsInitialized { true };
+    bool _needsJointSimulation { false };
+    const void* _collisionMeshKey { nullptr };
+};
+
+namespace render { namespace entities { 
+
+class ModelEntityRenderer : public TypedEntityRenderer<RenderableModelEntityItem> {
+    using Parent = TypedEntityRenderer<RenderableModelEntityItem>;
+    friend class EntityRenderer;
+
+public:
+    ModelEntityRenderer(const EntityItemPointer& entity) : Parent(entity) { }
+
+protected:
+    virtual void removeFromScene(const ScenePointer& scene, Transaction& transaction) override;
+    virtual void onRemoveFromSceneTyped(const TypedEntityPointer& entity) override;
+
+    virtual ItemKey getKey() override;
+    virtual uint32_t metaFetchMetaSubItems(ItemIDs& subItems) override;
+
+    virtual bool needsRenderUpdateFromTypedEntity(const TypedEntityPointer& entity) const override;
+    virtual bool needsRenderUpdate() const override;
+    virtual void doRender(RenderArgs* args) override;
+    virtual void doRenderUpdateSynchronousTyped(const ScenePointer& scene, Transaction& transaction, const TypedEntityPointer& entity) override;
+    void flagForCollisionGeometryUpdate();
+    void setCollisionMeshKey(const void* key);
+
+private:
+    void animate(const TypedEntityPointer& entity);
+    void mapJoints(const TypedEntityPointer& entity, const QStringList& modelJointNames);
+    bool jointsMapped() const { return _jointMappingURL == _renderAnimationProperties.getURL() && _jointMappingCompleted; }
+
+    // Transparency is handled in ModelMeshPartPayload
+    virtual bool isTransparent() const override { return false; }
+
+    bool _hasModel { false };
+    ::ModelPointer _model;
+    GeometryResource::Pointer _compoundShapeResource;
     QString _lastTextures;
     QVariantMap _currentTextures;
-    QVariantMap _originalTextures;
-    bool _originalTexturesRead = false;
-    bool _dimensionsInitialized = true;
-
     AnimationPropertyGroup _renderAnimationProperties;
+    int _lastKnownCurrentFrame { -1 };
+#ifdef MODEL_ENTITY_USE_FADE_EFFECT
+    bool _hasTransitioned{ false };
+#endif
 
-    render::ItemID _myMetaItem{ render::Item::INVALID_ITEM_ID };
-
-    bool getAnimationFrame();
-
-    bool _needsJointSimulation { false };
-    bool _showCollisionGeometry { false };
-    const void* _collisionMeshKey { nullptr };
+    bool _needsJointSimulation{ false };
+    bool _showCollisionGeometry{ false };
+    bool _needsCollisionGeometryUpdate{ false };
+    const void* _collisionMeshKey{ nullptr };
 
     // used on client side
-    bool _jointMappingCompleted { false };
+    bool _jointMappingCompleted{ false };
     QVector<int> _jointMapping; // domain is index into model-joints, range is index into animation-joints
     QString _jointMappingURL;
     AnimationPointer _animation;
+    QString _lastModelURL;
+    QUrl _parsedModelURL;
+    bool _marketplaceEntity { false };
+    bool _shouldHighlight { false };
+    bool _animating { false };
+    uint64_t _lastAnimated { 0 };
+    float _currentFrame { 0 };
+
 };
 
+} } // namespace 
+
 #endif // hifi_RenderableModelEntityItem_h
diff --git a/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp b/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp
index 10bd70be13..bc96e45881 100644
--- a/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp
@@ -8,322 +8,324 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include <glm/gtx/quaternion.hpp>
-
-#include <DependencyManager.h>
-#include <PerfStat.h>
-#include <GeometryCache.h>
-#include <StencilMaskPass.h>
-#include <AbstractViewStateInterface.h>
-#include "EntitiesRendererLogging.h"
-
 #include "RenderableParticleEffectEntityItem.h"
 
-#include "untextured_particle_vert.h"
-#include "untextured_particle_frag.h"
+#include <StencilMaskPass.h>
+
+#include <GeometryCache.h>
+
 #include "textured_particle_vert.h"
 #include "textured_particle_frag.h"
 
+using namespace render;
+using namespace render::entities;
 
-class ParticlePayloadData {
-public:
-    static const size_t VERTEX_PER_PARTICLE = 4;
+static uint8_t CUSTOM_PIPELINE_NUMBER = 0;
+static gpu::Stream::FormatPointer _vertexFormat;
+static std::weak_ptr<gpu::Pipeline> _texturedPipeline;
 
-    template<typename T>
-    struct InterpolationData {
-        T start;
-        T middle;
-        T finish;
-        T spread;
-    };
-    struct ParticleUniforms {
-        InterpolationData<float> radius;
-        InterpolationData<glm::vec4> color; // rgba
-        float lifespan;
-        glm::vec3 spare;
-    };
-    
-    struct ParticlePrimitive {
-        ParticlePrimitive(glm::vec3 xyzIn, glm::vec2 uvIn) : xyz(xyzIn), uv(uvIn) {}
-        glm::vec3 xyz; // Position
-        glm::vec2 uv; // Lifetime + seed
-    };
-    
-    using Payload = render::Payload<ParticlePayloadData>;
-    using Pointer = Payload::DataPointer;
-    using PipelinePointer = gpu::PipelinePointer;
-    using FormatPointer = gpu::Stream::FormatPointer;
-    using BufferPointer = gpu::BufferPointer;
-    using TexturePointer = gpu::TexturePointer;
-    using Format = gpu::Stream::Format;
-    using Buffer = gpu::Buffer;
-    using BufferView = gpu::BufferView;
-    using ParticlePrimitives = std::vector<ParticlePrimitive>;
-    
-    ParticlePayloadData() {
-        ParticleUniforms uniforms;
-        _uniformBuffer = std::make_shared<Buffer>(sizeof(ParticleUniforms), (const gpu::Byte*) &uniforms);
-        
-        _vertexFormat->setAttribute(gpu::Stream::POSITION, 0, gpu::Element::VEC3F_XYZ,
-                                    offsetof(ParticlePrimitive, xyz), gpu::Stream::PER_INSTANCE);
-        _vertexFormat->setAttribute(gpu::Stream::COLOR, 0, gpu::Element::VEC2F_UV,
-                                    offsetof(ParticlePrimitive, uv), gpu::Stream::PER_INSTANCE);
-    }
-
-    void setPipeline(PipelinePointer pipeline) { _pipeline = pipeline; }
-    const PipelinePointer& getPipeline() const { return _pipeline; }
-
-    const Transform& getModelTransform() const { return _modelTransform; }
-    void setModelTransform(const Transform& modelTransform) { _modelTransform = modelTransform; }
-
-    const AABox& getBound() const { return _bound; }
-    void setBound(const AABox& bound) { _bound = bound; }
-
-    BufferPointer getParticleBuffer() { return _particleBuffer; }
-    const BufferPointer& getParticleBuffer() const { return _particleBuffer; }
-    
-    const ParticleUniforms& getParticleUniforms() const { return _uniformBuffer.get<ParticleUniforms>(); }
-    ParticleUniforms& editParticleUniforms() { return _uniformBuffer.edit<ParticleUniforms>(); }
-
-    void setTexture(TexturePointer texture) { _texture = texture; }
-    const TexturePointer& getTexture() const { return _texture; }
-
-    bool getVisibleFlag() const { return _visibleFlag; }
-    void setVisibleFlag(bool visibleFlag) { _visibleFlag = visibleFlag; }
-    
-    void render(RenderArgs* args) const {
-        assert(_pipeline);
-
-        gpu::Batch& batch = *args->_batch;
-        batch.setPipeline(_pipeline);
-
-        if (_texture) {
-            batch.setResourceTexture(0, _texture);
-        }
-
-        batch.setModelTransform(_modelTransform);
-        batch.setUniformBuffer(0, _uniformBuffer);
-        batch.setInputFormat(_vertexFormat);
-        batch.setInputBuffer(0, _particleBuffer, 0, sizeof(ParticlePrimitive));
-
-        auto numParticles = _particleBuffer->getSize() / sizeof(ParticlePrimitive);
-        batch.drawInstanced((gpu::uint32)numParticles, gpu::TRIANGLE_STRIP, (gpu::uint32)VERTEX_PER_PARTICLE);
-    }
-
-protected:
-    Transform _modelTransform;
-    AABox _bound;
-    PipelinePointer _pipeline;
-    FormatPointer _vertexFormat { std::make_shared<Format>() };
-    BufferPointer _particleBuffer { std::make_shared<Buffer>() };
-    BufferView _uniformBuffer;
-    TexturePointer _texture;
-    bool _visibleFlag = true;
-};
-
-namespace render {
-    template <>
-    const ItemKey payloadGetKey(const ParticlePayloadData::Pointer& payload) {
-        if (payload->getVisibleFlag()) {
-            return ItemKey::Builder::transparentShape();
-        } else {
-            return ItemKey::Builder().withInvisible().build();
-        }
-    }
-
-    template <>
-    const Item::Bound payloadGetBound(const ParticlePayloadData::Pointer& payload) {
-        return payload->getBound();
-    }
-
-    template <>
-    void payloadRender(const ParticlePayloadData::Pointer& payload, RenderArgs* args) {
-        if (payload->getVisibleFlag()) {
-            payload->render(args);
-        }
-    }
-}
-
-
-
-EntityItemPointer RenderableParticleEffectEntityItem::factory(const EntityItemID& entityID,
-                                                              const EntityItemProperties& properties) {
-    auto entity = std::make_shared<RenderableParticleEffectEntityItem>(entityID);
-    entity->setProperties(properties);
-    return entity;
-}
-
-RenderableParticleEffectEntityItem::RenderableParticleEffectEntityItem(const EntityItemID& entityItemID) :
-    ParticleEffectEntityItem(entityItemID) {
-    // lazy creation of particle system pipeline
-    if (!_untexturedPipeline || !_texturedPipeline) {
-        createPipelines();
-    }
-}
-
-bool RenderableParticleEffectEntityItem::addToScene(const EntityItemPointer& self,
-                                                    const render::ScenePointer& scene,
-                                                    render::Transaction& transaction) {
-    _scene = scene;
-    _renderItemId = _scene->allocateID();
-    auto particlePayloadData = std::make_shared<ParticlePayloadData>();
-    particlePayloadData->setPipeline(_untexturedPipeline);
-    auto renderPayload = std::make_shared<ParticlePayloadData::Payload>(particlePayloadData);
-    render::Item::Status::Getters statusGetters;
-    makeEntityItemStatusGetters(getThisPointer(), statusGetters);
-    renderPayload->addStatusGetters(statusGetters);
-    transaction.resetItem(_renderItemId, renderPayload);
-    return true;
-}
-
-void RenderableParticleEffectEntityItem::removeFromScene(const EntityItemPointer& self,
-                                                         const render::ScenePointer& scene,
-                                                         render::Transaction& transaction) {
-    transaction.removeItem(_renderItemId);
-    _scene = nullptr;
-    render::Item::clearID(_renderItemId);
-};
-
-void RenderableParticleEffectEntityItem::update(const quint64& now) {
-    ParticleEffectEntityItem::update(now);
-
-    if (_texturesChangedFlag) {
-        if (_textures.isEmpty()) {
-            _texture.clear();
-        } else {
-            // for now use the textures string directly.
-            // Eventually we'll want multiple textures in a map or array.
-            _texture = DependencyManager::get<TextureCache>()->getTexture(_textures);
-        }
-        _texturesChangedFlag = false;
-    }
-
-    updateRenderItem();
-}
-
-void RenderableParticleEffectEntityItem::updateRenderItem() {
-    // this 2 tests are synonyms for this class, but we would like to get rid of the _scene pointer ultimately
-    if (!_scene || !render::Item::isValidID(_renderItemId)) { 
-        return;
-    }
-    if (!getVisible()) {
-        render::Transaction transaction;
-        transaction.updateItem<ParticlePayloadData>(_renderItemId, [](ParticlePayloadData& payload) {
-            payload.setVisibleFlag(false);
-        });
-        
-        _scene->enqueueTransaction(transaction);
-        return;
-    }
-    
-    using ParticleUniforms = ParticlePayloadData::ParticleUniforms;
-    using ParticlePrimitive = ParticlePayloadData::ParticlePrimitive;
-    using ParticlePrimitives = ParticlePayloadData::ParticlePrimitives;
-
-    // Fill in Uniforms structure
-    ParticleUniforms particleUniforms;
-    particleUniforms.radius.start = getRadiusStart();
-    particleUniforms.radius.middle = getParticleRadius();
-    particleUniforms.radius.finish = getRadiusFinish();
-    particleUniforms.radius.spread = getRadiusSpread();
-    particleUniforms.color.start = glm::vec4(getColorStartRGB(), getAlphaStart());
-    particleUniforms.color.middle = glm::vec4(getColorRGB(), getAlpha());
-    particleUniforms.color.finish = glm::vec4(getColorFinishRGB(), getAlphaFinish());
-    particleUniforms.color.spread = glm::vec4(getColorSpreadRGB(), getAlphaSpread());
-    particleUniforms.lifespan = getLifespan();
-    
-    // Build particle primitives
-    auto particlePrimitives = std::make_shared<ParticlePrimitives>();
-    particlePrimitives->reserve(_particles.size()); // Reserve space
-    for (auto& particle : _particles) {
-        particlePrimitives->emplace_back(particle.position, glm::vec2(particle.lifetime, particle.seed));
-    }
-
-    bool successb, successp, successr;
-    auto bounds = getAABox(successb);
-    auto position = getPosition(successp);
-    auto rotation = getOrientation(successr);
-    bool success = successb && successp && successr;
-    if (!success) {
-        return;
-    }
-    Transform transform;
-    if (!getEmitterShouldTrail()) {
-        transform.setTranslation(position);
-        transform.setRotation(rotation);
-    }
-
-
-    render::Transaction transaction;
-    transaction.updateItem<ParticlePayloadData>(_renderItemId, [=](ParticlePayloadData& payload) {
-        payload.setVisibleFlag(true);
-        
-        // Update particle uniforms
-        memcpy(&payload.editParticleUniforms(), &particleUniforms, sizeof(ParticleUniforms));
-        
-        // Update particle buffer
-        auto particleBuffer = payload.getParticleBuffer();
-        size_t numBytes = sizeof(ParticlePrimitive) * particlePrimitives->size();
-        particleBuffer->resize(numBytes);
-        if (numBytes == 0) {
-            return;
-        }
-        particleBuffer->setData(numBytes, (const gpu::Byte*)particlePrimitives->data());
-
-        // Update transform and bounds
-        payload.setModelTransform(transform);
-        payload.setBound(bounds);
-
-        if (_texture && _texture->isLoaded()) {
-            payload.setTexture(_texture->getGPUTexture());
-            payload.setPipeline(_texturedPipeline);
-        } else {
-            payload.setTexture(nullptr);
-            payload.setPipeline(_untexturedPipeline);
-        }
-    });
-
-    _scene->enqueueTransaction(transaction);
-}
-
-void RenderableParticleEffectEntityItem::createPipelines() {
-    if (!_untexturedPipeline) {
+static ShapePipelinePointer shapePipelineFactory(const ShapePlumber& plumber, const ShapeKey& key) {
+    auto texturedPipeline = _texturedPipeline.lock();
+    if (!texturedPipeline) {
         auto state = std::make_shared<gpu::State>();
         state->setCullMode(gpu::State::CULL_BACK);
         state->setDepthTest(true, false, gpu::LESS_EQUAL);
         state->setBlendFunction(true, gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::ONE,
-                                gpu::State::FACTOR_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::ONE);
-        PrepareStencil::testMask(*state);
-
-        auto vertShader = gpu::Shader::createVertex(std::string(untextured_particle_vert));
-        auto fragShader = gpu::Shader::createPixel(std::string(untextured_particle_frag));
-
-        auto program = gpu::Shader::createProgram(vertShader, fragShader);
-        _untexturedPipeline = gpu::Pipeline::create(program, state);
-    }
-    if (!_texturedPipeline) {
-        auto state = std::make_shared<gpu::State>();
-        state->setCullMode(gpu::State::CULL_BACK);
-        state->setDepthTest(true, false, gpu::LESS_EQUAL);
-        state->setBlendFunction(true, gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::ONE,
-                                gpu::State::FACTOR_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::ONE);
+            gpu::State::FACTOR_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::ONE);
         PrepareStencil::testMask(*state);
 
         auto vertShader = gpu::Shader::createVertex(std::string(textured_particle_vert));
         auto fragShader = gpu::Shader::createPixel(std::string(textured_particle_frag));
 
         auto program = gpu::Shader::createProgram(vertShader, fragShader);
-        _texturedPipeline = gpu::Pipeline::create(program, state);
+        _texturedPipeline = texturedPipeline = gpu::Pipeline::create(program, state);
+    }
+
+    return std::make_shared<render::ShapePipeline>(texturedPipeline, nullptr, nullptr, nullptr);
+}
+
+struct GpuParticle {
+    GpuParticle(const glm::vec3& xyzIn, const glm::vec2& uvIn) : xyz(xyzIn), uv(uvIn) {}
+    glm::vec3 xyz; // Position
+    glm::vec2 uv; // Lifetime + seed
+};
+
+using GpuParticles = std::vector<GpuParticle>;
+
+ParticleEffectEntityRenderer::ParticleEffectEntityRenderer(const EntityItemPointer& entity) : Parent(entity) {
+    ParticleUniforms uniforms;
+    _uniformBuffer = std::make_shared<Buffer>(sizeof(ParticleUniforms), (const gpu::Byte*) &uniforms);
+
+    static std::once_flag once;
+    std::call_once(once, [] {
+        // As we create the first ParticuleSystem entity, let s register its special shapePIpeline factory:
+        CUSTOM_PIPELINE_NUMBER = render::ShapePipeline::registerCustomShapePipelineFactory(shapePipelineFactory);
+        _vertexFormat = std::make_shared<Format>();
+        _vertexFormat->setAttribute(gpu::Stream::POSITION, 0, gpu::Element::VEC3F_XYZ,
+            offsetof(GpuParticle, xyz), gpu::Stream::PER_INSTANCE);
+        _vertexFormat->setAttribute(gpu::Stream::COLOR, 0, gpu::Element::VEC2F_UV,
+            offsetof(GpuParticle, uv), gpu::Stream::PER_INSTANCE);
+    });
+}
+
+bool ParticleEffectEntityRenderer::needsRenderUpdateFromTypedEntity(const TypedEntityPointer& entity) const {
+    entity->updateQueryAACube();
+
+    if (_emitting != entity->getIsEmitting()) {
+        return true;
+    }
+
+    auto particleProperties = entity->getParticleProperties();
+    if (particleProperties != _particleProperties) {
+        return true;
+    }
+
+    return false;
+}
+
+void ParticleEffectEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& scene, Transaction& transaction, const TypedEntityPointer& entity) {
+    auto newParticleProperties = entity->getParticleProperties();
+    if (!newParticleProperties.valid()) {
+        qCWarning(entitiesrenderer) << "Bad particle properties";
+        if (!entity->getParticleProperties().valid()) {
+            qCWarning(entitiesrenderer) << "Bad particle properties";
+        }
+    }
+    
+    if (resultWithReadLock<bool>([&]{ return _particleProperties != newParticleProperties; })) {
+        _timeUntilNextEmit = 0;
+        withWriteLock([&]{
+            _particleProperties = newParticleProperties;
+        });
+    }
+    _emitting = entity->getIsEmitting();
+
+    bool hasTexture = resultWithReadLock<bool>([&]{ return _particleProperties.textures.isEmpty(); });
+    if (hasTexture) {
+        if (_networkTexture) {
+            withWriteLock([&] { 
+                _networkTexture.reset();
+            });
+        }
+    } else {
+        bool textureNeedsUpdate = resultWithReadLock<bool>([&]{
+            return !_networkTexture || _networkTexture->getURL() != QUrl(_particleProperties.textures);
+        });
+        if (textureNeedsUpdate) {
+            withWriteLock([&] { 
+                _networkTexture = DependencyManager::get<TextureCache>()->getTexture(_particleProperties.textures);
+            });
+        }
     }
 }
 
-void RenderableParticleEffectEntityItem::notifyBoundChanged() {
-    if (!render::Item::isValidID(_renderItemId)) {
+void ParticleEffectEntityRenderer::doRenderUpdateAsynchronousTyped(const TypedEntityPointer& entity) {
+    // Fill in Uniforms structure
+    ParticleUniforms particleUniforms;
+    withReadLock([&]{
+        particleUniforms.radius.start = _particleProperties.radius.range.start;
+        particleUniforms.radius.middle = _particleProperties.radius.gradient.target;
+        particleUniforms.radius.finish = _particleProperties.radius.range.finish;
+        particleUniforms.radius.spread = _particleProperties.radius.gradient.spread;
+        particleUniforms.color.start = _particleProperties.getColorStart();
+        particleUniforms.color.middle = _particleProperties.getColorMiddle();
+        particleUniforms.color.finish = _particleProperties.getColorFinish();
+        particleUniforms.color.spread = _particleProperties.getColorSpread();
+        particleUniforms.lifespan = _particleProperties.lifespan;
+    });
+    // Update particle uniforms
+    memcpy(&_uniformBuffer.edit<ParticleUniforms>(), &particleUniforms, sizeof(ParticleUniforms));
+}
+
+ItemKey ParticleEffectEntityRenderer::getKey() {
+    if (_visible) {
+        return ItemKey::Builder::transparentShape();
+    } else {
+        return ItemKey::Builder().withInvisible().build();
+    }
+}
+
+ShapeKey ParticleEffectEntityRenderer::getShapeKey() {
+    return ShapeKey::Builder().withCustom(CUSTOM_PIPELINE_NUMBER).withTranslucent().build();
+}
+
+Item::Bound ParticleEffectEntityRenderer::getBound() {
+    return _bound;
+}
+
+static const size_t VERTEX_PER_PARTICLE = 4;
+
+ParticleEffectEntityRenderer::CpuParticle ParticleEffectEntityRenderer::createParticle(uint64_t now, const Transform& baseTransform, const particle::Properties& particleProperties) {
+    CpuParticle particle;
+
+    const auto& accelerationSpread = particleProperties.emission.acceleration.spread;
+    const auto& azimuthStart = particleProperties.azimuth.start;
+    const auto& azimuthFinish = particleProperties.azimuth.finish;
+    const auto& emitDimensions = particleProperties.emission.dimensions;
+    const auto& emitAcceleration = particleProperties.emission.acceleration.target;
+    auto emitOrientation = particleProperties.emission.orientation;
+    const auto& emitRadiusStart = glm::max(particleProperties.radiusStart, EPSILON); // Avoid math complications at center
+    const auto& emitSpeed = particleProperties.emission.speed.target;
+    const auto& speedSpread = particleProperties.emission.speed.spread;
+    const auto& polarStart = particleProperties.polar.start;
+    const auto& polarFinish = particleProperties.polar.finish;
+
+    particle.seed = randFloatInRange(-1.0f, 1.0f);
+    particle.expiration = now + (uint64_t)(particleProperties.lifespan * USECS_PER_SECOND);
+    if (particleProperties.emission.shouldTrail) {
+        particle.position = baseTransform.getTranslation();
+        emitOrientation = baseTransform.getRotation() * emitOrientation;
+    }
+
+    // Position, velocity, and acceleration
+    if (polarStart == 0.0f && polarFinish == 0.0f && emitDimensions.z == 0.0f) {
+        // Emit along z-axis from position
+
+        particle.velocity = (emitSpeed + 0.2f * speedSpread) * (emitOrientation * Vectors::UNIT_Z);
+        particle.acceleration = emitAcceleration + randFloatInRange(-1.0f, 1.0f) * accelerationSpread;
+
+    } else {
+        // Emit around point or from ellipsoid
+        // - Distribute directions evenly around point
+        // - Distribute points relatively evenly over ellipsoid surface
+        // - Distribute points relatively evenly within ellipsoid volume
+
+        float elevationMinZ = sin(PI_OVER_TWO - polarFinish);
+        float elevationMaxZ = sin(PI_OVER_TWO - polarStart);
+        //  float elevation = asin(elevationMinZ + (elevationMaxZ - elevationMinZ) * randFloat());
+        float elevation = asin(elevationMinZ + (elevationMaxZ - elevationMinZ) *randFloat());
+
+        float azimuth;
+        if (azimuthFinish >= azimuthStart) {
+            azimuth = azimuthStart + (azimuthFinish - azimuthStart) *  randFloat();
+        } else {
+            azimuth = azimuthStart + (TWO_PI + azimuthFinish - azimuthStart) * randFloat();
+        }
+
+        glm::vec3 emitDirection;
+        if (emitDimensions == Vectors::ZERO) {
+            // Point
+            emitDirection = glm::quat(glm::vec3(PI_OVER_TWO - elevation, 0.0f, azimuth)) * Vectors::UNIT_Z;
+        } else {
+            // Ellipsoid
+            float radiusScale = 1.0f;
+            if (emitRadiusStart < 1.0f) {
+                float randRadius =
+                    emitRadiusStart + randFloatInRange(0.0f, particle::MAXIMUM_EMIT_RADIUS_START - emitRadiusStart);
+                radiusScale = 1.0f - std::pow(1.0f - randRadius, 3.0f);
+            }
+
+            glm::vec3 radii = radiusScale * 0.5f * emitDimensions;
+            float x = radii.x * glm::cos(elevation) * glm::cos(azimuth);
+            float y = radii.y * glm::cos(elevation) * glm::sin(azimuth);
+            float z = radii.z * glm::sin(elevation);
+            glm::vec3 emitPosition = glm::vec3(x, y, z);
+            emitDirection = glm::normalize(glm::vec3(
+                radii.x > 0.0f ? x / (radii.x * radii.x) : 0.0f,
+                radii.y > 0.0f ? y / (radii.y * radii.y) : 0.0f,
+                radii.z > 0.0f ? z / (radii.z * radii.z) : 0.0f
+            ));
+            particle.position += emitOrientation * emitPosition;
+        }
+
+        particle.velocity = (emitSpeed + randFloatInRange(-1.0f, 1.0f) * speedSpread) * (emitOrientation * emitDirection);
+        particle.acceleration = emitAcceleration + randFloatInRange(-1.0f, 1.0f) * accelerationSpread;
+    }
+
+    return particle;
+}
+
+void ParticleEffectEntityRenderer::stepSimulation() {
+    if (_lastSimulated == 0) {
+        _lastSimulated = usecTimestampNow();
         return;
     }
-    render::Transaction transaction;
-    transaction.updateItem<ParticlePayloadData>(_renderItemId, [](ParticlePayloadData& payload) {
+
+    const auto now = usecTimestampNow();
+    const auto interval = std::min<uint64_t>(USECS_PER_SECOND / 60, now - _lastSimulated);
+    _lastSimulated = now;
+    
+    particle::Properties particleProperties;
+    withReadLock([&]{
+        particleProperties = _particleProperties;
     });
 
-    _scene->enqueueTransaction(transaction);
+    if (_emitting && particleProperties.emitting()) {
+        const auto& modelTransform = getModelTransform();
+        uint64_t emitInterval = particleProperties.emitIntervalUsecs();
+        if (emitInterval > 0 && interval >= _timeUntilNextEmit) {
+            auto timeRemaining = interval;
+            while (timeRemaining > _timeUntilNextEmit) {
+                // emit particle
+                _cpuParticles.push_back(createParticle(now, modelTransform, particleProperties));
+                _timeUntilNextEmit = emitInterval;
+                if (emitInterval < timeRemaining) {
+                    timeRemaining -= emitInterval;
+                }
+            }
+        } else {
+            _timeUntilNextEmit -= interval;
+        }
+    }
+
+    // Kill any particles that have expired or are over the max size
+    while (_cpuParticles.size() > particleProperties.maxParticles || (!_cpuParticles.empty() && _cpuParticles.front().expiration <= now)) {
+        _cpuParticles.pop_front();
+    }
+
+    const float deltaTime = (float)interval / (float)USECS_PER_SECOND;
+    // update the particles 
+    for (auto& particle : _cpuParticles) {
+        particle.integrate(deltaTime);
+    }
+
+    // Build particle primitives
+    static GpuParticles gpuParticles;
+    gpuParticles.clear();
+    gpuParticles.reserve(_cpuParticles.size()); // Reserve space
+    std::transform(_cpuParticles.begin(), _cpuParticles.end(), std::back_inserter(gpuParticles), [](const CpuParticle& particle) {
+        return GpuParticle(particle.position, glm::vec2(particle.lifetime, particle.seed));
+    });
+
+    // Update particle buffer
+    auto& particleBuffer = _particleBuffer;
+    size_t numBytes = sizeof(GpuParticle) * gpuParticles.size();
+    particleBuffer->resize(numBytes);
+    if (numBytes != 0) {
+        particleBuffer->setData(numBytes, (const gpu::Byte*)gpuParticles.data());
+    }
 }
+
+void ParticleEffectEntityRenderer::doRender(RenderArgs* args) {
+    if (!_visible) {
+        return;
+    }
+
+
+    // FIXME migrate simulation to a compute stage
+    stepSimulation();
+
+    gpu::Batch& batch = *args->_batch;
+    if (_networkTexture && _networkTexture->isLoaded()) {
+        batch.setResourceTexture(0, _networkTexture->getGPUTexture());
+    } else {
+        batch.setResourceTexture(0, DependencyManager::get<TextureCache>()->getWhiteTexture());
+    }
+
+    Transform transform; 
+    // In trail mode, the particles are created in world space.
+    // so we only set a transform if they're not in trail mode
+    if (!_particleProperties.emission.shouldTrail) {
+        transform = getModelTransform();
+        transform.setScale(vec3(1));
+    }
+    batch.setModelTransform(transform);
+    batch.setUniformBuffer(0, _uniformBuffer);
+    batch.setInputFormat(_vertexFormat);
+    batch.setInputBuffer(0, _particleBuffer, 0, sizeof(GpuParticle));
+
+    auto numParticles = _particleBuffer->getSize() / sizeof(GpuParticle);
+    batch.drawInstanced((gpu::uint32)numParticles, gpu::TRIANGLE_STRIP, (gpu::uint32)VERTEX_PER_PARTICLE);
+}
+
+
diff --git a/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.h b/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.h
index 678b582b41..be2641c0c9 100644
--- a/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.h
@@ -11,40 +11,103 @@
 #ifndef hifi_RenderableParticleEffectEntityItem_h
 #define hifi_RenderableParticleEffectEntityItem_h
 
+#include "RenderableEntityItem.h"
 #include <ParticleEffectEntityItem.h>
 #include <TextureCache.h>
-#include "RenderableEntityItem.h"
 
-class RenderableParticleEffectEntityItem : public ParticleEffectEntityItem, public RenderableEntityInterface {
-    friend class ParticlePayloadData;
+namespace render { namespace entities {
+
+class ParticleEffectEntityRenderer : public TypedEntityRenderer<ParticleEffectEntityItem> {
+    using Parent = TypedEntityRenderer<ParticleEffectEntityItem>;
+    friend class EntityRenderer;
+
 public:
-    static EntityItemPointer factory(const EntityItemID& entityID, const EntityItemProperties& properties);
-    RenderableParticleEffectEntityItem(const EntityItemID& entityItemID);
-
-    RenderableEntityInterface* getRenderableInterface() override { return this; }
-
-    virtual void update(const quint64& now) override;
-
-    void updateRenderItem();
-
-    virtual bool addToScene(const EntityItemPointer& self, const render::ScenePointer& scene, render::Transaction& transaction) override;
-    virtual void removeFromScene(const EntityItemPointer& self, const render::ScenePointer& scene, render::Transaction& transaction) override;
+    ParticleEffectEntityRenderer(const EntityItemPointer& entity);
 
 protected:
-    virtual void locationChanged(bool tellPhysics = true) override { EntityItem::locationChanged(tellPhysics); notifyBoundChanged(); }
-    virtual void dimensionsChanged() override { EntityItem::dimensionsChanged(); notifyBoundChanged(); }
+    virtual bool needsRenderUpdateFromTypedEntity(const TypedEntityPointer& entity) const override;
 
-    void notifyBoundChanged();
+    virtual void doRenderUpdateSynchronousTyped(const ScenePointer& scene, Transaction& transaction, const TypedEntityPointer& entity) override;
+    virtual void doRenderUpdateAsynchronousTyped(const TypedEntityPointer& entity) override;
 
-    void createPipelines();
-    
-    render::ScenePointer _scene;
-    render::ItemID _renderItemId{ render::Item::INVALID_ITEM_ID };
-    
-    NetworkTexturePointer _texture;
-    gpu::PipelinePointer _untexturedPipeline;
-    gpu::PipelinePointer _texturedPipeline;
+    virtual ItemKey getKey() override;
+    virtual ShapeKey getShapeKey() override;
+    virtual Item::Bound getBound() override;
+    virtual void doRender(RenderArgs* args) override;
+
+private:
+    using PipelinePointer = gpu::PipelinePointer;
+    using BufferPointer = gpu::BufferPointer;
+    using TexturePointer = gpu::TexturePointer;
+    using Format = gpu::Stream::Format;
+    using Buffer = gpu::Buffer;
+    using BufferView = gpu::BufferView;
+
+    // CPU particles
+    // FIXME either switch to GPU compute particles or switch to simd updating of the particles
+#if 1
+    struct CpuParticle {
+        float seed{ 0.0f };
+        uint64_t expiration { 0 };
+        float lifetime { 0.0f };
+        glm::vec3 position;
+        glm::vec3 velocity;
+        glm::vec3 acceleration;
+
+        void integrate(float deltaTime) {
+            glm::vec3 atSquared = (0.5f * deltaTime * deltaTime) * acceleration;
+            position += velocity * deltaTime + atSquared;
+            velocity += acceleration * deltaTime;
+            lifetime += deltaTime;
+        }
+    };
+    using CpuParticles = std::deque<CpuParticle>;
+#else
+    struct CpuParticles {
+        std::vector<float> seeds;
+        std::vector<float> lifetimes;
+        std::vector<vec4> positions;
+        std::vector<vec4> velocities;
+        std::vector<vec4> accelerations;
+
+        size_t size() const;
+        void resize(size_t size);
+        void integrate(float deltaTime);
+    };
+#endif
+
+
+    template<typename T>
+    struct InterpolationData {
+        T start;
+        T middle;
+        T finish;
+        T spread;
+    };
+
+    struct ParticleUniforms {
+        InterpolationData<float> radius;
+        InterpolationData<glm::vec4> color; // rgba
+        float lifespan;
+        glm::vec3 spare;
+    };
+
+
+    static CpuParticle createParticle(uint64_t now, const Transform& baseTransform, const particle::Properties& particleProperties);
+    void stepSimulation();
+
+    particle::Properties _particleProperties;
+    CpuParticles _cpuParticles;
+    bool _emitting { false };
+    uint64_t _timeUntilNextEmit { 0 };
+    BufferPointer _particleBuffer{ std::make_shared<Buffer>() };
+    BufferView _uniformBuffer;
+    quint64 _lastSimulated { 0 };
+
+    NetworkTexturePointer _networkTexture;
+    ScenePointer _scene;
 };
 
+} } // namespace 
 
 #endif // hifi_RenderableParticleEffectEntityItem_h
diff --git a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
index d2bf8e3532..3fd1d024c1 100644
--- a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
@@ -9,7 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include <glm/gtx/quaternion.hpp>
+#include "RenderablePolyLineEntityItem.h"
+#include <ParticleEffectEntityItem.h>
 
 #include <GeometryCache.h>
 #include <StencilMaskPass.h>
@@ -17,206 +18,297 @@
 #include <PathUtils.h>
 #include <PerfStat.h>
 
-#include "RenderablePolyLineEntityItem.h"
+//#define POLYLINE_ENTITY_USE_FADE_EFFECT
+#ifdef POLYLINE_ENTITY_USE_FADE_EFFECT
+#   include <FadeEffect.h>
+#endif
 
 #include "paintStroke_vert.h"
 #include "paintStroke_frag.h"
 
+#include "paintStroke_fade_vert.h"
+#include "paintStroke_fade_frag.h"
 
+using namespace render;
+using namespace render::entities;
+
+static uint8_t CUSTOM_PIPELINE_NUMBER { 0 };
+static const int32_t PAINTSTROKE_TEXTURE_SLOT{ 0 };
+static const int32_t PAINTSTROKE_UNIFORM_SLOT{ 0 };
+static gpu::Stream::FormatPointer polylineFormat;
+static gpu::PipelinePointer polylinePipeline;
+#ifdef POLYLINE_ENTITY_USE_FADE_EFFECT
+static gpu::PipelinePointer polylineFadePipeline;
+#endif
 
 struct PolyLineUniforms {
     glm::vec3 color;
 };
 
+static render::ShapePipelinePointer shapePipelineFactory(const render::ShapePlumber& plumber, const render::ShapeKey& key) {
+    if (!polylinePipeline) {
+        auto VS = gpu::Shader::createVertex(std::string(paintStroke_vert));
+        auto PS = gpu::Shader::createPixel(std::string(paintStroke_frag));
+        gpu::ShaderPointer program = gpu::Shader::createProgram(VS, PS);
+#ifdef POLYLINE_ENTITY_USE_FADE_EFFECT
+        auto fadeVS = gpu::Shader::createVertex(std::string(paintStroke_fade_vert));
+        auto fadePS = gpu::Shader::createPixel(std::string(paintStroke_fade_frag));
+        gpu::ShaderPointer fadeProgram = gpu::Shader::createProgram(fadeVS, fadePS);
+#endif
+        gpu::Shader::BindingSet slotBindings;
+        slotBindings.insert(gpu::Shader::Binding(std::string("originalTexture"), PAINTSTROKE_TEXTURE_SLOT));
+        slotBindings.insert(gpu::Shader::Binding(std::string("polyLineBuffer"), PAINTSTROKE_UNIFORM_SLOT));
+        gpu::Shader::makeProgram(*program, slotBindings);
+#ifdef POLYLINE_ENTITY_USE_FADE_EFFECT
+        slotBindings.insert(gpu::Shader::Binding(std::string("fadeMaskMap"), PAINTSTROKE_TEXTURE_SLOT + 1));
+        slotBindings.insert(gpu::Shader::Binding(std::string("fadeParametersBuffer"), PAINTSTROKE_UNIFORM_SLOT + 1));
+        gpu::Shader::makeProgram(*fadeProgram, slotBindings);
+#endif
+        gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+        state->setDepthTest(true, true, gpu::LESS_EQUAL);
+        PrepareStencil::testMask(*state);
+        state->setBlendFunction(true,
+            gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::INV_SRC_ALPHA,
+            gpu::State::FACTOR_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::ONE);
+        polylinePipeline = gpu::Pipeline::create(program, state);
+#ifdef POLYLINE_ENTITY_USE_FADE_EFFECT
+        _fadePipeline = gpu::Pipeline::create(fadeProgram, state);
+#endif
+    }
 
-
-EntityItemPointer RenderablePolyLineEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
-    EntityItemPointer entity{ new RenderablePolyLineEntityItem(entityID) };
-    entity->setProperties(properties);
-    return entity;
+#ifdef POLYLINE_ENTITY_USE_FADE_EFFECT
+    if (key.isFaded()) {
+        auto fadeEffect = DependencyManager::get<FadeEffect>();
+        return std::make_shared<render::ShapePipeline>(_fadePipeline, nullptr, fadeEffect->getBatchSetter(), fadeEffect->getItemUniformSetter());
+    } else {
+#endif
+        return std::make_shared<render::ShapePipeline>(polylinePipeline, nullptr, nullptr, nullptr);
+#ifdef POLYLINE_ENTITY_USE_FADE_EFFECT
+    }
+#endif
 }
 
-RenderablePolyLineEntityItem::RenderablePolyLineEntityItem(const EntityItemID& entityItemID) :
-PolyLineEntityItem(entityItemID),
-_numVertices(0)
-{
-    _vertices = QVector<glm::vec3>(0.0f);
+PolyLineEntityRenderer::PolyLineEntityRenderer(const EntityItemPointer& entity) : Parent(entity) {
+    static std::once_flag once;
+    std::call_once(once, [&] {
+        CUSTOM_PIPELINE_NUMBER = render::ShapePipeline::registerCustomShapePipelineFactory(shapePipelineFactory);
+        polylineFormat.reset(new gpu::Stream::Format());
+        polylineFormat->setAttribute(gpu::Stream::POSITION, 0, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ), offsetof(Vertex, position));
+        polylineFormat->setAttribute(gpu::Stream::NORMAL, 0, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ), offsetof(Vertex, normal));
+        polylineFormat->setAttribute(gpu::Stream::TEXCOORD, 0, gpu::Element(gpu::VEC2, gpu::FLOAT, gpu::UV), offsetof(Vertex, uv));
+        polylineFormat->setAttribute(gpu::Stream::COLOR, 0, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::RGB), offsetof(Vertex, color));
+    });
+
     PolyLineUniforms uniforms;
     _uniformBuffer = std::make_shared<gpu::Buffer>(sizeof(PolyLineUniforms), (const gpu::Byte*) &uniforms);
+    _verticesBuffer = std::make_shared<gpu::Buffer>();
 }
 
-gpu::PipelinePointer RenderablePolyLineEntityItem::_pipeline;
-gpu::Stream::FormatPointer RenderablePolyLineEntityItem::_format;
-const int32_t RenderablePolyLineEntityItem::PAINTSTROKE_TEXTURE_SLOT;
-const int32_t RenderablePolyLineEntityItem::PAINTSTROKE_UNIFORM_SLOT;
-
-void RenderablePolyLineEntityItem::createPipeline() {
-    static const int NORMAL_OFFSET = 12;
-    static const int TEXTURE_OFFSET = 24;
-
-    _format.reset(new gpu::Stream::Format());
-    _format->setAttribute(gpu::Stream::POSITION, 0, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ), 0);
-    _format->setAttribute(gpu::Stream::NORMAL, 0, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ), NORMAL_OFFSET);
-    _format->setAttribute(gpu::Stream::TEXCOORD, 0, gpu::Element(gpu::VEC2, gpu::FLOAT, gpu::UV), TEXTURE_OFFSET);
-
-    auto VS = gpu::Shader::createVertex(std::string(paintStroke_vert));
-    auto PS = gpu::Shader::createPixel(std::string(paintStroke_frag));
-    gpu::ShaderPointer program = gpu::Shader::createProgram(VS, PS);
-
-    gpu::Shader::BindingSet slotBindings;
-    slotBindings.insert(gpu::Shader::Binding(std::string("originalTexture"), PAINTSTROKE_TEXTURE_SLOT));
-    slotBindings.insert(gpu::Shader::Binding(std::string("polyLineBuffer"), PAINTSTROKE_UNIFORM_SLOT));
-    gpu::Shader::makeProgram(*program, slotBindings);
-
-    gpu::StatePointer state = gpu::StatePointer(new gpu::State());
-    state->setDepthTest(true, true, gpu::LESS_EQUAL);
-    PrepareStencil::testMask(*state);
-    state->setBlendFunction(true,
-        gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::INV_SRC_ALPHA,
-        gpu::State::FACTOR_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::ONE);
-    _pipeline = gpu::Pipeline::create(program, state);
+ItemKey PolyLineEntityRenderer::getKey() {
+    return ItemKey::Builder::transparentShape().withTypeMeta();
 }
 
-void RenderablePolyLineEntityItem::updateGeometry() {
-    _numVertices = 0;
-    _verticesBuffer.reset(new gpu::Buffer());
-    int vertexIndex = 0;
-    vec2 uv;
-    float uCoord, vCoord;
-    uCoord = 0.0f;
-    float uCoordInc = 1.0 / (_vertices.size() / 2);
-    for (int i = 0; i < _vertices.size() / 2; i++) {
-        vCoord = 0.0f;
-  
+ShapeKey PolyLineEntityRenderer::getShapeKey() {
+    return ShapeKey::Builder().withCustom(CUSTOM_PIPELINE_NUMBER).build();
+}
 
-        uv = vec2(uCoord, vCoord);
+bool PolyLineEntityRenderer::needsRenderUpdateFromTypedEntity(const TypedEntityPointer& entity) const {
+    return (
+        entity->pointsChanged() ||
+        entity->strokeWidthsChanged() ||
+        entity->normalsChanged() ||
+        entity->texturesChanged() ||
+        entity->strokeColorsChanged()
+    );
+}
 
-        _verticesBuffer->append(sizeof(glm::vec3), (const gpu::Byte*)&_vertices.at(vertexIndex));
-        _verticesBuffer->append(sizeof(glm::vec3), (const gpu::Byte*)&_normals.at(i));
-        _verticesBuffer->append(sizeof(glm::vec2), (gpu::Byte*)&uv);
-        vertexIndex++;
-
-        uv.y = 1.0f;
-        _verticesBuffer->append(sizeof(glm::vec3), (const gpu::Byte*)&_vertices.at(vertexIndex));
-        _verticesBuffer->append(sizeof(glm::vec3), (const gpu::Byte*)&_normals.at(i));
-        _verticesBuffer->append(sizeof(glm::vec2), (const gpu::Byte*)&uv);
-        vertexIndex++;
-
-        _numVertices += 2;
-        uCoord += uCoordInc;
+void PolyLineEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& scene, Transaction& transaction, const TypedEntityPointer& entity) {
+    static const QUrl DEFAULT_POLYLINE_TEXTURE = QUrl(PathUtils::resourcesPath() + "images/paintStroke.png");
+    QUrl entityTextures = DEFAULT_POLYLINE_TEXTURE;
+    if (entity->texturesChanged()) {
+        entity->resetTexturesChanged();
+        auto textures = entity->getTextures();
+        if (!textures.isEmpty()) {
+            entityTextures = QUrl(textures);
+        }
+        _texture = DependencyManager::get<TextureCache>()->getTexture(entityTextures);
+    }
+    
+    
+    if (!_texture) {
+        _texture = DependencyManager::get<TextureCache>()->getTexture(entityTextures);
     }
-    _pointsChanged = false;
-    _normalsChanged = false;
-    _strokeWidthsChanged = false;
 }
 
-void RenderablePolyLineEntityItem::updateVertices() {
+void PolyLineEntityRenderer::doRenderUpdateAsynchronousTyped(const TypedEntityPointer& entity) {
+    PolyLineUniforms uniforms;
+    uniforms.color = toGlm(entity->getXColor());
+    memcpy(&_uniformBuffer.edit<PolyLineUniforms>(), &uniforms, sizeof(PolyLineUniforms));
+    auto pointsChanged = entity->pointsChanged();
+    auto strokeWidthsChanged = entity->strokeWidthsChanged();
+    auto normalsChanged = entity->normalsChanged();
+    auto strokeColorsChanged = entity->strokeColorsChanged();
+    
+
+    bool isUVModeStretch = entity->getIsUVModeStretch();
+    entity->resetPolyLineChanged();
+
+    _polylineTransform = Transform();
+    _polylineTransform.setTranslation(entity->getPosition());
+    _polylineTransform.setRotation(entity->getRotation());
+
+    if (pointsChanged) {
+        _lastPoints = entity->getLinePoints();
+    }
+    if (strokeWidthsChanged) {
+        _lastStrokeWidths = entity->getStrokeWidths();
+    }
+    if (normalsChanged) {
+        _lastNormals = entity->getNormals();
+    }
+    if (strokeColorsChanged) {
+        _lastStrokeColors = entity->getStrokeColors();
+        _lastStrokeColors = _lastNormals.size() == _lastStrokeColors.size() ? _lastStrokeColors : QVector<glm::vec3>({ toGlm(entity->getXColor()) });
+    }
+    if (pointsChanged || strokeWidthsChanged || normalsChanged || strokeColorsChanged) {
+        _empty = std::min(_lastPoints.size(), std::min(_lastNormals.size(), _lastStrokeWidths.size())) < 2;
+        if (!_empty) {
+            updateGeometry(updateVertices(_lastPoints, _lastNormals, _lastStrokeWidths, _lastStrokeColors, isUVModeStretch, _textureAspectRatio));
+        }
+    }
+}
+
+void PolyLineEntityRenderer::updateGeometry(const std::vector<Vertex>& vertices) {
+    _numVertices = (uint32_t)vertices.size();
+    auto bufferSize = _numVertices * sizeof(Vertex);
+    if (bufferSize > _verticesBuffer->getSize()) {
+        _verticesBuffer->resize(bufferSize);
+    }
+    _verticesBuffer->setSubData(0, vertices);
+}
+
+std::vector<PolyLineEntityRenderer::Vertex> PolyLineEntityRenderer::updateVertices(const QVector<glm::vec3>& points, 
+                                                                                   const QVector<glm::vec3>& normals, 
+                                                                                   const QVector<float>& strokeWidths, 
+                                                                                   const QVector<glm::vec3>& strokeColors, 
+                                                                                   const bool isUVModeStretch,
+                                                                                   const float textureAspectRatio) {
     // Calculate the minimum vector size out of normals, points, and stroke widths
-    int minVectorSize = _normals.size();
-    if (_points.size() < minVectorSize) {
-        minVectorSize = _points.size();
-    }
-    if (_strokeWidths.size() < minVectorSize) {
-        minVectorSize = _strokeWidths.size();
-    }
+    int size = std::min(points.size(), std::min(normals.size(), strokeWidths.size()));
 
-    _vertices.clear();
-    glm::vec3 v1, v2, tangent, binormal, point;
-
-    int finalIndex = minVectorSize - 1;
+    std::vector<Vertex> vertices;
 
     // Guard against an empty polyline
-    if (finalIndex < 0) {
-        return;
+    if (size <= 0) {
+        return vertices;
     }
 
-    for (int i = 0; i < finalIndex; i++) {
-        float width = _strokeWidths.at(i);
-        point = _points.at(i);
-
-        tangent = _points.at(i);
-
-        tangent = _points.at(i + 1) - point;
-        glm::vec3 normal = _normals.at(i);
-        binormal = glm::normalize(glm::cross(tangent, normal)) * width;
-
-        // Check to make sure binormal is not a NAN. If it is, don't add to vertices vector
-        if (binormal.x != binormal.x) {
-            continue;
-        }
-        v1 = point + binormal;
-        v2 = point - binormal;
-        _vertices << v1 << v2;
-    }
-
-    // For last point we can assume binormals are the same since it represents the last two vertices of quad
-    point = _points.at(finalIndex);
-    v1 = point + binormal;
-    v2 = point - binormal;
-    _vertices << v1 << v2;
+    float uCoordInc = 1.0f / size;
+    float uCoord = 0.0f;
+    int finalIndex = size - 1;
+    glm::vec3 binormal;
+    float accumulatedDistance = 0.0f;
+    float distanceToLastPoint = 0.0f;
+    float accumulatedStrokeWidth = 0.0f;
+    float strokeWidth = 0.0f;
+    bool doesStrokeWidthVary = false;
 
 
-}
-
-void RenderablePolyLineEntityItem::update(const quint64& now) {
-    PolyLineUniforms uniforms;
-    uniforms.color = toGlm(getXColor());
-    memcpy(&_uniformBuffer.edit<PolyLineUniforms>(), &uniforms, sizeof(PolyLineUniforms));
-    if (_pointsChanged || _strokeWidthsChanged || _normalsChanged) {
-        QWriteLocker lock(&_quadReadWriteLock);
-        _empty = (_points.size() < 2 || _normals.size() < 2 || _strokeWidths.size() < 2);
-        if (!_empty) {
-            updateVertices();
-            updateGeometry();
+    for (int i = 1; i < strokeWidths.size(); i++) {
+        if (strokeWidths[i] != strokeWidths[i - 1]) {
+            doesStrokeWidthVary = true;
+            break;
         }
     }
 
+    for (int i = 0; i <= finalIndex; i++) {
+        const float& width = strokeWidths.at(i);
+        const auto& point = points.at(i);
+        const auto& normal = normals.at(i);
+        const auto& color = strokeColors.size() == normals.size() ? strokeColors.at(i) : strokeColors.at(0);
+        int vertexIndex = i * 2;
+        
+
+        if (!isUVModeStretch && i >= 1) {
+            distanceToLastPoint = glm::distance(points.at(i), points.at(i - 1));
+            accumulatedDistance += distanceToLastPoint;
+            strokeWidth = 2 * strokeWidths[i];
+
+            if (doesStrokeWidthVary) {
+                //If the stroke varies along the line the texture will stretch more or less depending on the speed
+                //because it looks better than using the same method as below
+                accumulatedStrokeWidth += strokeWidth;
+                float increaseValue = 1;
+                if (accumulatedStrokeWidth != 0) {
+                    float newUcoord = glm::ceil(((1.0f / textureAspectRatio) * accumulatedDistance) / (accumulatedStrokeWidth / i));
+                    increaseValue = newUcoord - uCoord;
+                }
+
+                increaseValue = increaseValue > 0 ? increaseValue : 1;
+                uCoord += increaseValue;
+            } else {
+                //If the stroke width is constant then the textures should keep the aspect ratio along the line
+                uCoord = ((1.0f / textureAspectRatio) * accumulatedDistance) / strokeWidth;
+            }
+        } else if (vertexIndex >= 2) {
+            uCoord += uCoordInc;
+        }
+
+        // For last point we can assume binormals are the same since it represents the last two vertices of quad
+        if (i < finalIndex) {
+            const auto tangent = points.at(i + 1) - point;
+            binormal = glm::normalize(glm::cross(tangent, normal)) * width;
+
+            // Check to make sure binormal is not a NAN. If it is, don't add to vertices vector
+            if (binormal.x != binormal.x) {
+                continue;
+            }
+        }
+
+        const auto v1 = points.at(i) + binormal;
+        const auto v2 = points.at(i) - binormal;
+        vertices.emplace_back(v1, normal, vec2(uCoord, 0.0f), color);
+        vertices.emplace_back(v2, normal, vec2(uCoord, 1.0f), color);
+    }
+
+    return vertices;
 }
 
-void RenderablePolyLineEntityItem::render(RenderArgs* args) {
-    checkFading();
 
+void PolyLineEntityRenderer::doRender(RenderArgs* args) {
     if (_empty) {
         return;
     }
 
-    if (!_pipeline) {
-        createPipeline();
-    }
-
-    if (!_texture || _texturesChangedFlag) {
-        auto textureCache = DependencyManager::get<TextureCache>();
-        QString path = _textures.isEmpty() ? PathUtils::resourcesPath() + "images/paintStroke.png" : _textures;
-        _texture = textureCache->getTexture(QUrl(path));
-        _texturesChangedFlag = false;
-    }
-
     PerformanceTimer perfTimer("RenderablePolyLineEntityItem::render");
-    Q_ASSERT(getType() == EntityTypes::PolyLine);
     Q_ASSERT(args->_batch);
 
     gpu::Batch& batch = *args->_batch;
-    Transform transform = Transform();
-    transform.setTranslation(getPosition());
-    transform.setRotation(getRotation());
+    batch.setModelTransform(_polylineTransform);
     batch.setUniformBuffer(PAINTSTROKE_UNIFORM_SLOT, _uniformBuffer);
-    batch.setModelTransform(transform);
 
-    batch.setPipeline(_pipeline);
-    if (_texture->isLoaded()) {
+    if (_texture && _texture->isLoaded()) {
         batch.setResourceTexture(PAINTSTROKE_TEXTURE_SLOT, _texture->getGPUTexture());
     } else {
-        batch.setResourceTexture(PAINTSTROKE_TEXTURE_SLOT, nullptr);
+        batch.setResourceTexture(PAINTSTROKE_TEXTURE_SLOT, DependencyManager::get<TextureCache>()->getWhiteTexture());
     }
-   
-    batch.setInputFormat(_format);
-    batch.setInputBuffer(0, _verticesBuffer, 0, _format->getChannels().at(0)._stride);
 
+    float textureWidth = (float)_texture->getOriginalWidth();
+    float textureHeight = (float)_texture->getOriginalHeight();
+    if (textureWidth != 0 && textureHeight != 0) {
+        _textureAspectRatio = textureWidth / textureHeight;
+    }
+
+    batch.setInputFormat(polylineFormat);
+    batch.setInputBuffer(0, _verticesBuffer, 0, sizeof(Vertex));
+
+#ifndef POLYLINE_ENTITY_USE_FADE_EFFECT
     if (_isFading) {
         batch._glColor4f(1.0f, 1.0f, 1.0f, Interpolate::calculateFadeRatio(_fadeStartTime));
     } else {
         batch._glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
     }
+#endif
 
     batch.draw(gpu::TRIANGLE_STRIP, _numVertices, 0);
-};
+}
\ No newline at end of file
diff --git a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h
index 8a62a761e0..1e27ac9ae7 100644
--- a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h
+++ b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h
@@ -12,47 +12,67 @@
 #ifndef hifi_RenderablePolyLineEntityItem_h
 #define hifi_RenderablePolyLineEntityItem_h
 
-
-#include <gpu/Batch.h>
-#include <GeometryCache.h>
-#include <PolyLineEntityItem.h>
 #include "RenderableEntityItem.h"
+#include <PolyLineEntityItem.h>
 #include <TextureCache.h>
 
-#include <QReadWriteLock>
+namespace render { namespace entities {
 
+class PolyLineEntityRenderer : public TypedEntityRenderer<PolyLineEntityItem> {
+    using Parent = TypedEntityRenderer<PolyLineEntityItem>;
+    friend class EntityRenderer;
 
-class RenderablePolyLineEntityItem : public PolyLineEntityItem, public SimplerRenderableEntitySupport {
 public:
-    static EntityItemPointer factory(const EntityItemID& entityID, const EntityItemProperties& properties);
-    static void createPipeline();
-    RenderablePolyLineEntityItem(const EntityItemID& entityItemID);
-
-    virtual void render(RenderArgs* args) override;
-    virtual void update(const quint64& now) override;
-    virtual bool needsToCallUpdate() const override { return true; }
-
-    bool isTransparent() override { return true; }
-
-    SIMPLE_RENDERABLE();
-
-    NetworkTexturePointer _texture;
-
-    static gpu::PipelinePointer _pipeline;
-    static gpu::Stream::FormatPointer _format;
-
-    static const int32_t PAINTSTROKE_TEXTURE_SLOT { 0 };
-    static const int32_t PAINTSTROKE_UNIFORM_SLOT { 0 };
+    PolyLineEntityRenderer(const EntityItemPointer& entity);
 
 protected:
-    void updateGeometry();
-    void updateVertices();
+    virtual bool needsRenderUpdateFromTypedEntity(const TypedEntityPointer& entity) const override;
+    virtual void doRenderUpdateSynchronousTyped(const ScenePointer& scene, 
+                                                Transaction& transaction, 
+                                                const TypedEntityPointer& entity) override;
+    virtual void doRenderUpdateAsynchronousTyped(const TypedEntityPointer& entity) override;
+
+    virtual ItemKey getKey() override;
+    virtual ShapeKey getShapeKey() override;
+    virtual void doRender(RenderArgs* args) override;
+
+    virtual bool isTransparent() const override { return true; }
+
+    struct Vertex {
+        Vertex() {}
+        Vertex(const vec3& position, const vec3& normal, const vec2& uv, const vec3& color) : position(position), 
+                                                                                              normal(normal), 
+                                                                                              uv(uv), 
+                                                                                              color(color) {}
+        vec3 position;
+        vec3 normal;
+        vec2 uv;
+        vec3 color;
+    };
+
+    void updateGeometry(const std::vector<Vertex>& vertices);
+    static std::vector<Vertex> updateVertices(const QVector<glm::vec3>& points, 
+                                              const QVector<glm::vec3>& normals, 
+                                              const QVector<float>& strokeWidths, 
+                                              const QVector<glm::vec3>& strokeColors, 
+                                              const bool isUVModeStretch,
+                                              const float textureAspectRatio);
+
+    Transform _polylineTransform;
+    QVector<glm::vec3> _lastPoints;
+    QVector<glm::vec3> _lastNormals;
+    QVector<glm::vec3> _lastStrokeColors;
+    QVector<float> _lastStrokeWidths;
     gpu::BufferPointer _verticesBuffer;
     gpu::BufferView _uniformBuffer;
-    unsigned int _numVertices;
-    bool _empty { true };
-    QVector<glm::vec3> _vertices;
+    
+    uint32_t _numVertices { 0 };
+    bool _empty{ true };
+    NetworkTexturePointer _texture;
+    float _textureAspectRatio { 1.0f };
+
 };
 
+} } // namespace 
 
 #endif // hifi_RenderablePolyLineEntityItem_h
diff --git a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
index 88a5d2b873..b11ab76c2f 100644
--- a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
@@ -13,12 +13,28 @@
 #include "RenderablePolyVoxEntityItem.h"
 
 #include <math.h>
+
+#include <glm/gtx/transform.hpp>
+
 #include <QObject>
 #include <QByteArray>
 #include <QtConcurrent/QtConcurrentRun>
-#include <glm/gtx/transform.hpp>
+
 #include <model-networking/SimpleMeshProxy.h>
-#include "ModelScriptingInterface.h"
+#include <ModelScriptingInterface.h>
+#include <EntityEditPacketSender.h>
+#include <PhysicalEntitySimulation.h>
+#include <StencilMaskPass.h>
+
+#include "EntityTreeRenderer.h"
+#include "polyvox_vert.h"
+#include "polyvox_frag.h"
+#include "polyvox_fade_vert.h"
+#include "polyvox_fade_frag.h"
+
+#ifdef POLYVOX_ENTITY_USE_FADE_EFFECT
+#   include <FadeEffect.h>
+#endif
 
 #if defined(__GNUC__) && !defined(__clang__)
 #pragma GCC diagnostic push
@@ -56,15 +72,15 @@
 #include "EntityTreeRenderer.h"
 #include "polyvox_vert.h"
 #include "polyvox_frag.h"
+#include "polyvox_fade_vert.h"
+#include "polyvox_fade_frag.h"
+
+#include "RenderablePolyVoxEntityItem.h"
 #include "EntityEditPacketSender.h"
 #include "PhysicalEntitySimulation.h"
 
-gpu::PipelinePointer RenderablePolyVoxEntityItem::_pipeline = nullptr;
-gpu::PipelinePointer RenderablePolyVoxEntityItem::_wireframePipeline = nullptr;
-
 const float MARCHING_CUBE_COLLISION_HULL_OFFSET = 0.5;
 
-
 /*
   A PolyVoxEntity has several interdependent parts:
 
@@ -108,31 +124,31 @@ const float MARCHING_CUBE_COLLISION_HULL_OFFSET = 0.5;
 
  */
 
-
-
-
+ // FIXME move to GLM helpers
+template <typename T, typename F>
+void loop3(const T& start, const T& end, F f) {
+    T current;
+    for (current.z = start.z; current.z < end.z; ++current.z) {
+        for (current.y = start.y; current.y < end.y; ++current.y) {
+            for (current.x = start.x; current.x < end.x; ++current.x) {
+                f(current);
+            }
+        }
+    }
+}
 
 EntityItemPointer RenderablePolyVoxEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
-    EntityItemPointer entity{ new RenderablePolyVoxEntityItem(entityID) };
+    std::shared_ptr<RenderablePolyVoxEntityItem> entity(new RenderablePolyVoxEntityItem(entityID), [](EntityItem* ptr) { ptr->deleteLater(); });
     entity->setProperties(properties);
-    std::static_pointer_cast<RenderablePolyVoxEntityItem>(entity)->initializePolyVox();
+    entity->initializePolyVox();
     return entity;
 }
 
-RenderablePolyVoxEntityItem::RenderablePolyVoxEntityItem(const EntityItemID& entityItemID) :
-    PolyVoxEntityItem(entityItemID),
-    _mesh(new model::Mesh()),
-    _meshDirty(true),
-    _xTexture(nullptr),
-    _yTexture(nullptr),
-    _zTexture(nullptr) {
-}
+RenderablePolyVoxEntityItem::RenderablePolyVoxEntityItem(const EntityItemID& entityItemID) : PolyVoxEntityItem(entityItemID) { }
 
 RenderablePolyVoxEntityItem::~RenderablePolyVoxEntityItem() {
     withWriteLock([&] {
-        if (_volData) {
-            delete _volData;
-        }
+        _volData.reset();
     });
 }
 
@@ -152,7 +168,7 @@ bool isEdged(PolyVoxEntityItem::PolyVoxSurfaceStyle surfaceStyle) {
     return false;
 }
 
-void RenderablePolyVoxEntityItem::setVoxelData(QByteArray voxelData) {
+void RenderablePolyVoxEntityItem::setVoxelData(const QByteArray& voxelData) {
     // compressed voxel information from the entity-server
     withWriteLock([&] {
         if (_voxelData != voxelData) {
@@ -173,15 +189,12 @@ void RenderablePolyVoxEntityItem::setVoxelSurfaceStyle(PolyVoxSurfaceStyle voxel
         }
 
         // if we are switching to or from "edged" we need to force a resize of _volData.
-        bool wasEdged = isEdged(_voxelSurfaceStyle);
+        bool wasEdged = isEdged();
         bool willBeEdged = isEdged(voxelSurfaceStyle);
 
         if (wasEdged != willBeEdged) {
             _volDataDirty = true;
-            if (_volData) {
-                delete _volData;
-            }
-            _volData = nullptr;
+            _volData.reset();
             _voxelSurfaceStyle = voxelSurfaceStyle;
             _voxelDataDirty = true;
             volSizeChanged = true;
@@ -244,14 +257,14 @@ glm::mat4 RenderablePolyVoxEntityItem::worldToVoxelMatrix() const {
     return worldToModelMatrix;
 }
 
-bool RenderablePolyVoxEntityItem::setVoxel(int x, int y, int z, uint8_t toValue) {
+bool RenderablePolyVoxEntityItem::setVoxel(const ivec3& v, uint8_t toValue) {
     if (_locked) {
         return false;
     }
 
     bool result = false;
     withWriteLock([&] {
-        result = setVoxelInternal(x, y, z, toValue);
+        result = setVoxelInternal(v, toValue);
     });
     if (result) {
         compressVolumeDataAndSendEditPacket();
@@ -260,46 +273,32 @@ bool RenderablePolyVoxEntityItem::setVoxel(int x, int y, int z, uint8_t toValue)
     return result;
 }
 
-void RenderablePolyVoxEntityItem::forEachVoxelValue(quint16 voxelXSize, quint16 voxelYSize, quint16 voxelZSize,
-                                                    std::function<void(int, int, int, uint8_t)> thunk) {
+void RenderablePolyVoxEntityItem::forEachVoxelValue(const ivec3& voxelSize, std::function<void(const ivec3& v, uint8_t)> thunk) {
     // a thread-safe way for code outside this class to iterate over a range of voxels
     withReadLock([&] {
-        for (int z = 0; z < voxelZSize; z++) {
-            for (int y = 0; y < voxelYSize; y++) {
-                for (int x = 0; x < voxelXSize; x++) {
-                    uint8_t uVoxelValue = getVoxelInternal(x, y, z);
-                    thunk(x, y, z, uVoxelValue);
-                }
-            }
-        }
+        loop3(ivec3(0), voxelSize, [&](const ivec3& v) {
+            uint8_t uVoxelValue = getVoxelInternal(v);
+            thunk(v, uVoxelValue);
+        });
     });
 }
 
 QByteArray RenderablePolyVoxEntityItem::volDataToArray(quint16 voxelXSize, quint16 voxelYSize, quint16 voxelZSize) const {
     int totalSize = voxelXSize * voxelYSize * voxelZSize;
-    QByteArray result = QByteArray(totalSize, '\0');
+    ivec3 voxelSize{ voxelXSize, voxelYSize, voxelZSize };
+    ivec3 low{ 0 };
     int index = 0;
-    int lowX = 0;
-    int lowY = 0;
-    int lowZ = 0;
 
+    QByteArray result = QByteArray(totalSize, '\0');
     withReadLock([&] {
-        if (isEdged(_voxelSurfaceStyle)) {
-            lowX++;
-            lowY++;
-            lowZ++;
-            voxelXSize++;
-            voxelYSize++;
-            voxelZSize++;
+        if (isEdged()) {
+            low += 1;
+            voxelSize += 1;
         }
 
-        for (int z = lowZ; z < voxelZSize; z++) {
-            for (int y = lowY; y < voxelYSize; y++) {
-                for (int x = lowX; x < voxelXSize; x++) {
-                    result[index++] = _volData->getVoxelAt(x, y, z);
-                }
-            }
-        }
+        loop3(low, voxelSize, [&](const ivec3& v){
+            result[index++] = _volData->getVoxelAt(v.x, v.y, v.z);
+        });
     });
 
     return result;
@@ -312,13 +311,9 @@ bool RenderablePolyVoxEntityItem::setAll(uint8_t toValue) {
     }
 
     withWriteLock([&] {
-        for (int z = 0; z < _voxelVolumeSize.z; z++) {
-            for (int y = 0; y < _voxelVolumeSize.y; y++) {
-                for (int x = 0; x < _voxelVolumeSize.x; x++) {
-                    result |= setVoxelInternal(x, y, z, toValue);
-                }
-            }
-        }
+        loop3(ivec3(0), ivec3(_voxelVolumeSize), [&](const ivec3& v) {
+            result |= setVoxelInternal(v, toValue);
+        });
     });
     if (result) {
         compressVolumeDataAndSendEditPacket();
@@ -333,21 +328,17 @@ bool RenderablePolyVoxEntityItem::setCuboid(const glm::vec3& lowPosition, const
         return result;
     }
 
-    int xLow = std::max(std::min((int)roundf(lowPosition.x), (int)roundf(_voxelVolumeSize.x) - 1), 0);
-    int yLow = std::max(std::min((int)roundf(lowPosition.y), (int)roundf(_voxelVolumeSize.y) - 1), 0);
-    int zLow = std::max(std::min((int)roundf(lowPosition.z), (int)roundf(_voxelVolumeSize.z) - 1), 0);
-    int xHigh = std::max(std::min(xLow + (int)roundf(cuboidSize.x), (int)roundf(_voxelVolumeSize.x)), xLow);
-    int yHigh = std::max(std::min(yLow + (int)roundf(cuboidSize.y), (int)roundf(_voxelVolumeSize.y)), yLow);
-    int zHigh = std::max(std::min(zLow + (int)roundf(cuboidSize.z), (int)roundf(_voxelVolumeSize.z)), zLow);
+    ivec3 iLowPosition = ivec3{ glm::round(lowPosition) };
+    ivec3 iCuboidSize = ivec3{ glm::round(cuboidSize) };
+    ivec3 iVoxelVolumeSize = ivec3{ glm::round(_voxelVolumeSize) };
+
+    ivec3 low = glm::max(glm::min(iLowPosition, iVoxelVolumeSize - 1), ivec3(0));
+    ivec3 high = glm::max(glm::min(low + iCuboidSize, iVoxelVolumeSize), low);
 
     withWriteLock([&] {
-        for (int x = xLow; x < xHigh; x++) {
-            for (int y = yLow; y < yHigh; y++) {
-                for (int z = zLow; z < zHigh; z++) {
-                    result |= setVoxelInternal(x, y, z, toValue);
-                }
-            }
-        }
+        loop3(low, high, [&] (const ivec3& v){
+            result |= setVoxelInternal(v, toValue);
+        });
     });
     if (result) {
         compressVolumeDataAndSendEditPacket();
@@ -357,37 +348,34 @@ bool RenderablePolyVoxEntityItem::setCuboid(const glm::vec3& lowPosition, const
 
 
 
-bool RenderablePolyVoxEntityItem::setVoxelInVolume(glm::vec3 position, uint8_t toValue) {
+bool RenderablePolyVoxEntityItem::setVoxelInVolume(const vec3& position, uint8_t toValue) {
     if (_locked) {
         return false;
     }
 
     // same as setVoxel but takes a vector rather than 3 floats.
-    return setVoxel(roundf(position.x), roundf(position.y), roundf(position.z), toValue);
+    return setVoxel(glm::round(position), toValue);
 }
 
-bool RenderablePolyVoxEntityItem::setSphereInVolume(glm::vec3 center, float radius, uint8_t toValue) {
+bool RenderablePolyVoxEntityItem::setSphereInVolume(const vec3& center, float radius, uint8_t toValue) {
     bool result = false;
     if (_locked) {
         return result;
     }
 
+    float radiusSquared = radius * radius;
     // This three-level for loop iterates over every voxel in the volume
     withWriteLock([&] {
-        for (int z = 0; z < _voxelVolumeSize.z; z++) {
-            for (int y = 0; y < _voxelVolumeSize.y; y++) {
-                for (int x = 0; x < _voxelVolumeSize.x; x++) {
-                    // Store our current position as a vector...
-                    glm::vec3 pos(x + 0.5f, y + 0.5f, z + 0.5f); // consider voxels cenetered on their coordinates
-                    // And compute how far the current position is from the center of the volume
-                    float fDistToCenter = glm::distance(pos, center);
-                    // If the current voxel is less than 'radius' units from the center then we set its value
-                    if (fDistToCenter <= radius) {
-                        result |= setVoxelInternal(x, y, z, toValue);
-                    }
-                }
+        loop3(ivec3(0), ivec3(_voxelVolumeSize), [&](const ivec3& v) {
+            // Store our current position as a vector...
+            glm::vec3 pos = vec3(v) + 0.5f; // consider voxels cenetered on their coordinates
+            // And compute how far the current position is from the center of the volume
+            float fDistToCenterSquared = glm::distance2(pos, center);
+            // If the current voxel is less than 'radius' units from the center then we set its value
+            if (fDistToCenterSquared <= radiusSquared) {
+                result |= setVoxelInternal(v, toValue);
             }
-        }
+        });
     });
 
     if (result) {
@@ -396,7 +384,7 @@ bool RenderablePolyVoxEntityItem::setSphereInVolume(glm::vec3 center, float radi
     return result;
 }
 
-bool RenderablePolyVoxEntityItem::setSphere(glm::vec3 centerWorldCoords, float radiusWorldCoords, uint8_t toValue) {
+bool RenderablePolyVoxEntityItem::setSphere(const vec3& centerWorldCoords, float radiusWorldCoords, uint8_t toValue) {
     bool result = false;
     if (_locked) {
         return result;
@@ -429,30 +417,25 @@ bool RenderablePolyVoxEntityItem::setSphere(glm::vec3 centerWorldCoords, float r
 
     // This three-level for loop iterates over every voxel in the volume that might be in the sphere
     withWriteLock([&] {
-        for (int z = lowI.z; z < highI.z; z++) {
-            for (int y = lowI.y; y < highI.y; y++) {
-                for (int x = lowI.x; x < highI.x; x++) {
-
-                    // set voxels whose bounding-box touches the sphere
-                    AABox voxelBox(glm::vec3(x - 0.5f, y - 0.5f, z - 0.5f), glm::vec3(1.0f, 1.0f, 1.0f));
-                    if (voxelBox.touchesAAEllipsoid(centerInVoxelCoords, radials)) {
-                        result |= setVoxelInternal(x, y, z, toValue);
-                    }
-
-                    // TODO -- this version only sets voxels which have centers inside the sphere.  which is best?
-                    // // Store our current position as a vector...
-                    // glm::vec4 pos(x + 0.5f, y + 0.5f, z + 0.5f, 1.0); // consider voxels cenetered on their coordinates
-                    // // convert to world coordinates
-                    // glm::vec3 worldPos = glm::vec3(vtwMatrix * pos);
-                    // // compute how far the current position is from the center of the volume
-                    // float fDistToCenter = glm::distance(worldPos, centerWorldCoords);
-                    // // If the current voxel is less than 'radius' units from the center then we set its value
-                    // if (fDistToCenter <= radiusWorldCoords) {
-                    //     result |= setVoxelInternal(x, y, z, toValue);
-                    // }
-                }
+        loop3(lowI, highI, [&](const ivec3& v) {
+            // set voxels whose bounding-box touches the sphere
+            AABox voxelBox(glm::vec3(v) - 0.5f, glm::vec3(1.0f, 1.0f, 1.0f));
+            if (voxelBox.touchesAAEllipsoid(centerInVoxelCoords, radials)) {
+                result |= setVoxelInternal(v, toValue);
             }
-        }
+
+            // TODO -- this version only sets voxels which have centers inside the sphere.  which is best?
+            // // Store our current position as a vector...
+            // glm::vec4 pos(x + 0.5f, y + 0.5f, z + 0.5f, 1.0); // consider voxels cenetered on their coordinates
+            // // convert to world coordinates
+            // glm::vec3 worldPos = glm::vec3(vtwMatrix * pos);
+            // // compute how far the current position is from the center of the volume
+            // float fDistToCenter = glm::distance(worldPos, centerWorldCoords);
+            // // If the current voxel is less than 'radius' units from the center then we set its value
+            // if (fDistToCenter <= radiusWorldCoords) {
+            //     result |= setVoxelInternal(x, y, z, toValue);
+            // }
+        });
     });
 
     if (result) {
@@ -461,7 +444,7 @@ bool RenderablePolyVoxEntityItem::setSphere(glm::vec3 centerWorldCoords, float r
     return result;
 }
 
-bool RenderablePolyVoxEntityItem::setCapsule(glm::vec3 startWorldCoords, glm::vec3 endWorldCoords,
+bool RenderablePolyVoxEntityItem::setCapsule(const vec3& startWorldCoords, const vec3& endWorldCoords,
                                              float radiusWorldCoords, uint8_t toValue) {
     bool result = false;
     if (_locked) {
@@ -492,19 +475,15 @@ bool RenderablePolyVoxEntityItem::setCapsule(glm::vec3 startWorldCoords, glm::ve
 
     // This three-level for loop iterates over every voxel in the volume that might be in the capsule
     withWriteLock([&] {
-        for (int z = lowI.z; z < highI.z; z++) {
-            for (int y = lowI.y; y < highI.y; y++) {
-                for (int x = lowI.x; x < highI.x; x++) {
-                    // Store our current position as a vector...
-                    glm::vec4 pos(x + 0.5f, y + 0.5f, z + 0.5f, 1.0); // consider voxels cenetered on their coordinates
-                    // convert to world coordinates
-                    glm::vec3 worldPos = glm::vec3(vtwMatrix * pos);
-                    if (pointInCapsule(worldPos, startWorldCoords, endWorldCoords, radiusWorldCoords)) {
-                        result |= setVoxelInternal(x, y, z, toValue);
-                    }
-                }
+        loop3(lowI, highI, [&](const ivec3& v) {
+            // Store our current position as a vector...
+            glm::vec4 pos{ vec3(v) + 0.5f, 1.0 }; // consider voxels cenetered on their coordinates
+            // convert to world coordinates
+            glm::vec3 worldPos = glm::vec3(vtwMatrix * pos);
+            if (pointInCapsule(worldPos, startWorldCoords, endWorldCoords, radiusWorldCoords)) {
+                result |= setVoxelInternal(v, toValue);
             }
-        }
+        });
     });
 
     if (result) {
@@ -513,7 +492,39 @@ bool RenderablePolyVoxEntityItem::setCapsule(glm::vec3 startWorldCoords, glm::ve
     return result;
 }
 
+class RaycastFunctor {
+public:
+    RaycastFunctor(const std::shared_ptr<PolyVox::SimpleVolume<uint8_t>>& vol) :
+        _result(glm::vec4(0.0f, 0.0f, 0.0f, 1.0f)),
+        _vol(vol) {
+    }
 
+    static bool inBounds(const std::shared_ptr<PolyVox::SimpleVolume<uint8_t>>& vol, const ivec3& v) {
+        // x, y, z are in polyvox volume coords
+        ivec3 volSize{ vol->getWidth(), vol->getHeight(), vol->getDepth() };
+        return glm::all(glm::greaterThanEqual(v, ivec3(0))) && glm::all(glm::lessThan(v, volSize));
+    }
+
+    bool operator()(PolyVox::SimpleVolume<unsigned char>::Sampler& sampler) {
+        PolyVox::Vector3DInt32 positionIndex = sampler.getPosition();
+        ivec3 v{ positionIndex.getX(), positionIndex.getY(), positionIndex.getZ() };
+
+        if (!inBounds(_vol, v)) {
+            return true;
+        }
+
+        if (sampler.getVoxel() == 0) {
+            return true; // keep raycasting
+        }
+
+        _result = glm::vec4(v, 1.0f);
+        return false;
+    }
+    glm::vec4 _result;
+    const std::shared_ptr<PolyVox::SimpleVolume<uint8_t>> _vol;
+};
+
+#if 0
 class RaycastFunctor
 {
 public:
@@ -549,6 +560,7 @@ public:
     glm::vec4 _result;
     const PolyVox::SimpleVolume<uint8_t>* _vol = nullptr;
 };
+#endif
 
 bool RenderablePolyVoxEntityItem::findDetailedRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
                                                               bool& keepSearching, OctreeElementPointer& element,
@@ -611,7 +623,7 @@ PolyVox::RaycastResult RenderablePolyVoxEntityItem::doRayCast(glm::vec4 originIn
     PolyVox::RaycastResult raycastResult;
     withReadLock([&] {
         RaycastFunctor callback(_volData);
-        raycastResult = PolyVox::raycastWithEndpoints(_volData, startPoint, endPoint, callback);
+        raycastResult = PolyVox::raycastWithEndpoints(_volData.get(), startPoint, endPoint, callback);
 
         // result is in voxel-space coordinates.
         result = callback._result;
@@ -636,7 +648,7 @@ void RenderablePolyVoxEntityItem::updateRegistrationPoint(const glm::vec3& value
     }
 }
 
-bool RenderablePolyVoxEntityItem::isReadyToComputeShape() {
+bool RenderablePolyVoxEntityItem::isReadyToComputeShape() const {
     ShapeType shapeType = getShapeType();
     if (shapeType == SHAPE_TYPE_NONE) {
         return true;
@@ -646,8 +658,8 @@ bool RenderablePolyVoxEntityItem::isReadyToComputeShape() {
     // 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) {
-        _meshDirty = false;
-        computeShapeInfoWorker();
+        const_cast<RenderablePolyVoxEntityItem*>(this)->_meshDirty = false;
+        const_cast<RenderablePolyVoxEntityItem*>(this)->computeShapeInfoWorker();
         return false;
     }
     return true;
@@ -666,28 +678,6 @@ void RenderablePolyVoxEntityItem::computeShapeInfo(ShapeInfo& info) {
     });
 }
 
-void RenderablePolyVoxEntityItem::setXTextureURL(const QString& xTextureURL) {
-    if (xTextureURL != getXTextureURL()) {
-        _xTexture.clear();
-        PolyVoxEntityItem::setXTextureURL(xTextureURL);
-    }
-}
-
-void RenderablePolyVoxEntityItem::setYTextureURL(const QString& yTextureURL) {
-    if (yTextureURL != getYTextureURL()) {
-        _yTexture.clear();
-        PolyVoxEntityItem::setYTextureURL(yTextureURL);
-    }
-}
-
-void RenderablePolyVoxEntityItem::setZTextureURL(const QString& zTextureURL) {
-    if (zTextureURL != getZTextureURL()) {
-        _zTexture.clear();
-        PolyVoxEntityItem::setZTextureURL(zTextureURL);
-    }
-}
-
-
 bool RenderablePolyVoxEntityItem::updateDependents() {
     bool voxelDataDirty;
     bool volDataDirty;
@@ -711,197 +701,7 @@ bool RenderablePolyVoxEntityItem::updateDependents() {
     return !volDataDirty;
 }
 
-
-void RenderablePolyVoxEntityItem::render(RenderArgs* args) {
-    PerformanceTimer perfTimer("RenderablePolyVoxEntityItem::render");
-    assert(getType() == EntityTypes::PolyVox);
-    Q_ASSERT(args->_batch);
-
-    if (_voxelDataDirty || _volDataDirty) {
-        updateDependents();
-    }
-
-    model::MeshPointer mesh;
-    glm::vec3 voxelVolumeSize;
-    withReadLock([&] {
-        mesh = _mesh;
-        voxelVolumeSize = _voxelVolumeSize;
-    });
-
-    if (!mesh ||
-        !mesh->getIndexBuffer()._buffer) {
-        return;
-    }
-    
-    if (!_pipeline) {
-        gpu::ShaderPointer vertexShader = gpu::Shader::createVertex(std::string(polyvox_vert));
-        gpu::ShaderPointer pixelShader = gpu::Shader::createPixel(std::string(polyvox_frag));
-
-        gpu::Shader::BindingSet slotBindings;
-        slotBindings.insert(gpu::Shader::Binding(std::string("materialBuffer"), MATERIAL_GPU_SLOT));
-        slotBindings.insert(gpu::Shader::Binding(std::string("xMap"), 0));
-        slotBindings.insert(gpu::Shader::Binding(std::string("yMap"), 1));
-        slotBindings.insert(gpu::Shader::Binding(std::string("zMap"), 2));
-
-        gpu::ShaderPointer program = gpu::Shader::createProgram(vertexShader, pixelShader);
-        gpu::Shader::makeProgram(*program, slotBindings);
-
-        auto state = std::make_shared<gpu::State>();
-        state->setCullMode(gpu::State::CULL_BACK);
-        state->setDepthTest(true, true, gpu::LESS_EQUAL);
-        PrepareStencil::testMaskDrawShape(*state);
-
-        _pipeline = gpu::Pipeline::create(program, state);
-
-        auto wireframeState = std::make_shared<gpu::State>();
-        wireframeState->setCullMode(gpu::State::CULL_BACK);
-        wireframeState->setDepthTest(true, true, gpu::LESS_EQUAL);
-        wireframeState->setFillMode(gpu::State::FILL_LINE);
-        PrepareStencil::testMaskDrawShape(*wireframeState);
-
-        _wireframePipeline = gpu::Pipeline::create(program, wireframeState);
-    }
-
-    if (!_vertexFormat) {
-        auto vf = std::make_shared<gpu::Stream::Format>();
-        vf->setAttribute(gpu::Stream::POSITION, 0, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ), 0);
-        vf->setAttribute(gpu::Stream::NORMAL, 0, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ), 12);
-        _vertexFormat = vf;
-    }
-
-    gpu::Batch& batch = *args->_batch;
-
-    // Pick correct Pipeline
-    bool wireframe = (render::ShapeKey(args->_globalShapeKey).isWireframe());
-    auto pipeline = (wireframe ? _wireframePipeline : _pipeline);
-    batch.setPipeline(pipeline);
-
-    Transform transform(voxelToWorldMatrix());
-    batch.setModelTransform(transform);
-    batch.setInputFormat(_vertexFormat);
-    batch.setInputBuffer(gpu::Stream::POSITION, mesh->getVertexBuffer()._buffer,
-                         0,
-                         sizeof(PolyVox::PositionMaterialNormal));
-
-    // TODO -- should we be setting this?
-    // batch.setInputBuffer(gpu::Stream::NORMAL, mesh->getVertexBuffer()._buffer,
-    //                      12,
-    //                      sizeof(PolyVox::PositionMaterialNormal));
-
-
-    batch.setIndexBuffer(gpu::UINT32, mesh->getIndexBuffer()._buffer, 0);
-
-    if (!_xTextureURL.isEmpty() && !_xTexture) {
-        _xTexture = DependencyManager::get<TextureCache>()->getTexture(_xTextureURL);
-    }
-    if (!_yTextureURL.isEmpty() && !_yTexture) {
-        _yTexture = DependencyManager::get<TextureCache>()->getTexture(_yTextureURL);
-    }
-    if (!_zTextureURL.isEmpty() && !_zTexture) {
-        _zTexture = DependencyManager::get<TextureCache>()->getTexture(_zTextureURL);
-    }
-
-    if (_xTexture) {
-        batch.setResourceTexture(0, _xTexture->getGPUTexture());
-    } else {
-        batch.setResourceTexture(0, DependencyManager::get<TextureCache>()->getWhiteTexture());
-    }
-    if (_yTexture) {
-        batch.setResourceTexture(1, _yTexture->getGPUTexture());
-    } else {
-        batch.setResourceTexture(1, DependencyManager::get<TextureCache>()->getWhiteTexture());
-    }
-    if (_zTexture) {
-        batch.setResourceTexture(2, _zTexture->getGPUTexture());
-    } else {
-        batch.setResourceTexture(2, DependencyManager::get<TextureCache>()->getWhiteTexture());
-    }
-
-    int voxelVolumeSizeLocation = pipeline->getProgram()->getUniforms().findLocation("voxelVolumeSize");
-    batch._glUniform3f(voxelVolumeSizeLocation, voxelVolumeSize.x, voxelVolumeSize.y, voxelVolumeSize.z);
-
-    batch.drawIndexed(gpu::TRIANGLES, (gpu::uint32)mesh->getNumIndices(), 0);
-}
-
-bool RenderablePolyVoxEntityItem::addToScene(const EntityItemPointer& self,
-                                             const render::ScenePointer& scene,
-                                             render::Transaction& transaction) {
-    _myItem = scene->allocateID();
-
-    auto renderItem = std::make_shared<PolyVoxPayload>(getThisPointer());
-    auto renderData = PolyVoxPayload::Pointer(renderItem);
-    auto renderPayload = std::make_shared<PolyVoxPayload::Payload>(renderData);
-
-    render::Item::Status::Getters statusGetters;
-    makeEntityItemStatusGetters(getThisPointer(), statusGetters);
-    renderPayload->addStatusGetters(statusGetters);
-
-    transaction.resetItem(_myItem, renderPayload);
-
-    return true;
-}
-
-void RenderablePolyVoxEntityItem::removeFromScene(const EntityItemPointer& self,
-                                                  const render::ScenePointer& scene,
-                                                  render::Transaction& transaction) {
-    transaction.removeItem(_myItem);
-    render::Item::clearID(_myItem);
-}
-
-namespace render {
-    template <> const ItemKey payloadGetKey(const PolyVoxPayload::Pointer& payload) {
-        return ItemKey::Builder::opaqueShape();
-    }
-
-    template <> const Item::Bound payloadGetBound(const PolyVoxPayload::Pointer& payload) {
-        if (payload && payload->_owner) {
-            auto polyVoxEntity = std::dynamic_pointer_cast<RenderablePolyVoxEntityItem>(payload->_owner);
-            bool success;
-            auto result = polyVoxEntity->getAABox(success);
-            if (!success) {
-                return render::Item::Bound();
-            }
-            return result;
-        }
-        return render::Item::Bound();
-    }
-
-    template <> void payloadRender(const PolyVoxPayload::Pointer& payload, RenderArgs* args) {
-        if (args && payload && payload->_owner) {
-            payload->_owner->getRenderableInterface()->render(args);
-        }
-    }
-}
-
-
-glm::vec3 RenderablePolyVoxEntityItem::voxelCoordsToWorldCoords(glm::vec3& voxelCoords) const {
-    glm::vec3 adjustedCoords;
-    if (isEdged(_voxelSurfaceStyle)) {
-        adjustedCoords = voxelCoords + Vectors::HALF;
-    } else {
-        adjustedCoords = voxelCoords - Vectors::HALF;
-    }
-    return glm::vec3(voxelToWorldMatrix() * glm::vec4(adjustedCoords, 1.0f));
-}
-
-glm::vec3 RenderablePolyVoxEntityItem::worldCoordsToVoxelCoords(glm::vec3& worldCoords) const {
-    glm::vec3 result = glm::vec3(worldToVoxelMatrix() * glm::vec4(worldCoords, 1.0f));
-    if (isEdged(_voxelSurfaceStyle)) {
-        return result - Vectors::HALF;
-    }
-    return result + Vectors::HALF;
-}
-
-glm::vec3 RenderablePolyVoxEntityItem::voxelCoordsToLocalCoords(glm::vec3& voxelCoords) const {
-    return glm::vec3(voxelToLocalMatrix() * glm::vec4(voxelCoords, 0.0f));
-}
-
-glm::vec3 RenderablePolyVoxEntityItem::localCoordsToVoxelCoords(glm::vec3& localCoords) const {
-    return glm::vec3(localToVoxelMatrix() * glm::vec4(localCoords, 0.0f));
-}
-
-
-void RenderablePolyVoxEntityItem::setVoxelVolumeSize(glm::vec3 voxelVolumeSize) {
+void RenderablePolyVoxEntityItem::setVoxelVolumeSize(const glm::vec3& voxelVolumeSize) {
     // This controls how many individual voxels are in the entity.  This is unrelated to
     // the dimentions of the entity -- it defines the sizes of the arrays that hold voxel values.
     // In addition to setting the number of voxels, this is used in a few places for its
@@ -913,99 +713,96 @@ void RenderablePolyVoxEntityItem::setVoxelVolumeSize(glm::vec3 voxelVolumeSize)
 
         _voxelDataDirty = true;
         _voxelVolumeSize = voxelVolumeSize;
-
-        if (_volData) {
-            delete _volData;
-        }
+        _volData.reset();
         _onCount = 0;
 
-        if (isEdged(_voxelSurfaceStyle)) {
+        static const PolyVox::Vector3DInt32 lowCorner(0, 0, 0);
+        PolyVox::Vector3DInt32 highCorner;
+
+        if (isEdged()) {
             // with _EDGED_ we maintain an extra box of voxels around those that the user asked for.  This
             // changes how the surface extractor acts -- it becomes impossible to have holes in the
             // generated mesh.  The non _EDGED_ modes will leave holes in the mesh at the edges of the
             // voxel space.
-            PolyVox::Vector3DInt32 lowCorner(0, 0, 0);
-            PolyVox::Vector3DInt32 highCorner(_voxelVolumeSize.x + 1, // corners are inclusive
-                                              _voxelVolumeSize.y + 1,
-                                              _voxelVolumeSize.z + 1);
-            _volData = new PolyVox::SimpleVolume<uint8_t>(PolyVox::Region(lowCorner, highCorner));
+            highCorner = PolyVox::Vector3DInt32(_voxelVolumeSize.x + 1, // corners are inclusive
+                                                _voxelVolumeSize.y + 1,
+                                                _voxelVolumeSize.z + 1);
         } else {
-            PolyVox::Vector3DInt32 lowCorner(0, 0, 0);
             // these should each have -1 after them, but if we leave layers on the upper-axis faces,
             // they act more like I expect.
-            PolyVox::Vector3DInt32 highCorner(_voxelVolumeSize.x,
-                                              _voxelVolumeSize.y,
-                                              _voxelVolumeSize.z);
-            _volData = new PolyVox::SimpleVolume<uint8_t>(PolyVox::Region(lowCorner, highCorner));
+            highCorner = PolyVox::Vector3DInt32(_voxelVolumeSize.x,
+                                                _voxelVolumeSize.y,
+                                                _voxelVolumeSize.z);
         }
 
+        _volData.reset(new PolyVox::SimpleVolume<uint8_t>(PolyVox::Region(lowCorner, highCorner)));
         // having the "outside of voxel-space" value be 255 has helped me notice some problems.
         _volData->setBorderValue(255);
     });
 }
 
-
-bool inUserBounds(const PolyVox::SimpleVolume<uint8_t>* vol,
+bool inUserBounds(const std::shared_ptr<PolyVox::SimpleVolume<uint8_t>> vol,
                   PolyVoxEntityItem::PolyVoxSurfaceStyle surfaceStyle,
-                  int x, int y, int z) {
-    // x, y, z are in user voxel-coords, not adjusted-for-edge voxel-coords.
-    if (isEdged(surfaceStyle)) {
-        if (x < 0 || y < 0 || z < 0 ||
-            x >= vol->getWidth() - 2 || y >= vol->getHeight() - 2 || z >= vol->getDepth() - 2) {
-            return false;
-        }
-        return true;
-    } else {
-        if (x < 0 || y < 0 || z < 0 ||
-            x >= vol->getWidth() || y >= vol->getHeight() || z >= vol->getDepth()) {
-            return false;
-        }
-        return true;
+                  const ivec3& v) {
+    if (glm::any(glm::lessThan(v, ivec3(0)))) {
+        return false;
     }
+
+    ivec3 volume { vol->getWidth(), vol->getHeight(), vol->getDepth() };
+    // x, y, z are in user voxel-coords, not adjusted-for-edge voxel-coords.
+    if (PolyVoxEntityItem::isEdged(surfaceStyle)) {
+        volume -= 2;
+    }
+
+    if (glm::any(glm::greaterThanEqual(v, volume))) {
+        return false;
+    }
+
+    return true;
 }
 
 
-uint8_t RenderablePolyVoxEntityItem::getVoxel(int x, int y, int z) {
+uint8_t RenderablePolyVoxEntityItem::getVoxel(const ivec3& v) const {
     uint8_t result;
     withReadLock([&] {
-        result = getVoxelInternal(x, y, z);
+        result = getVoxelInternal(v);
     });
     return result;
 }
 
 
-uint8_t RenderablePolyVoxEntityItem::getVoxelInternal(int x, int y, int z) const {
-    if (!inUserBounds(_volData, _voxelSurfaceStyle, x, y, z)) {
+uint8_t RenderablePolyVoxEntityItem::getVoxelInternal(const ivec3& v) const {
+    if (!inUserBounds(_volData, _voxelSurfaceStyle, v)) {
         return 0;
     }
 
     // if _voxelSurfaceStyle is *_EDGED_*, we maintain an extra layer of
     // voxels all around the requested voxel space.  Having the empty voxels around
     // the edges changes how the surface extractor behaves.
-    if (isEdged(_voxelSurfaceStyle)) {
-        return _volData->getVoxelAt(x + 1, y + 1, z + 1);
+    if (isEdged()) {
+        return _volData->getVoxelAt(v.x + 1, v.y + 1, v.z + 1);
     }
-    return _volData->getVoxelAt(x, y, z);
+    return _volData->getVoxelAt(v.x, v.y, v.z);
 }
 
 
-bool RenderablePolyVoxEntityItem::setVoxelInternal(int x, int y, int z, uint8_t toValue) {
+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, x, y, z)) {
+    if (!inUserBounds(_volData, _voxelSurfaceStyle, v)) {
         return result;
     }
 
-    result = updateOnCount(x, y, z, toValue);
+    result = updateOnCount(v, toValue);
 
-    if (isEdged(_voxelSurfaceStyle)) {
-        _volData->setVoxelAt(x + 1, y + 1, z + 1, toValue);
+    if (isEdged()) {
+        _volData->setVoxelAt(v.x + 1, v.y + 1, v.z + 1, toValue);
     } else {
-        _volData->setVoxelAt(x, y, z, toValue);
+        _volData->setVoxelAt(v.x, v.y, v.z, toValue);
     }
 
-    if (x == 0 || y == 0 || z == 0) {
+    if (glm::any(glm::equal(ivec3(0), v))) {
         _neighborsNeedUpdate = true;
     }
 
@@ -1015,13 +812,13 @@ bool RenderablePolyVoxEntityItem::setVoxelInternal(int x, int y, int z, uint8_t
 }
 
 
-bool RenderablePolyVoxEntityItem::updateOnCount(int x, int y, int z, uint8_t toValue) {
+bool RenderablePolyVoxEntityItem::updateOnCount(const ivec3& v, uint8_t toValue) {
     // keep _onCount up to date
-    if (!inUserBounds(_volData, _voxelSurfaceStyle, x, y, z)) {
+    if (!inUserBounds(_volData, _voxelSurfaceStyle, v)) {
         return false;
     }
 
-    uint8_t uVoxelValue = getVoxelInternal(x, y, z);
+    uint8_t uVoxelValue = getVoxelInternal(v);
     if (toValue != 0) {
         if (uVoxelValue == 0) {
             _onCount++;
@@ -1057,7 +854,7 @@ 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(entities) << "voxelSize is not reasonable, skipping decompressions."
+            qCDebug(entitiesrenderer) << "voxelSize is not reasonable, skipping decompressions."
                      << voxelXSize << voxelYSize << voxelZSize << getName() << getID();
             entity->setVoxelDataDirty(false);
             return;
@@ -1070,7 +867,7 @@ void RenderablePolyVoxEntityItem::decompressVolumeData() {
         QByteArray uncompressedData = qUncompress(compressedData);
 
         if (uncompressedData.size() != rawSize) {
-            qCDebug(entities) << "PolyVox decompress -- size is (" << voxelXSize << voxelYSize << voxelZSize << ")"
+            qCDebug(entitiesrenderer) << "PolyVox decompress -- size is (" << voxelXSize << voxelYSize << voxelZSize << ")"
                      << "so expected uncompressed length of" << rawSize << "but length is" << uncompressedData.size()
                      << getName() << getID();
             entity->setVoxelDataDirty(false);
@@ -1085,14 +882,10 @@ void RenderablePolyVoxEntityItem::setVoxelsFromData(QByteArray uncompressedData,
                                                     quint16 voxelXSize, quint16 voxelYSize, quint16 voxelZSize) {
     // this accepts the payload from decompressVolumeData
     withWriteLock([&] {
-        for (int z = 0; z < voxelZSize; z++) {
-            for (int y = 0; y < voxelYSize; y++) {
-                for (int x = 0; x < voxelXSize; x++) {
-                    int uncompressedIndex = (z * voxelYSize * voxelXSize) + (y * voxelZSize) + x;
-                    setVoxelInternal(x, y, z, uncompressedData[uncompressedIndex]);
-                }
-            }
-        }
+        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;
     });
 }
@@ -1131,7 +924,7 @@ void RenderablePolyVoxEntityItem::compressVolumeDataAndSendEditPacket() {
         if (newVoxelData.size() > 1150) {
             // 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(entities) << "compressed voxel data is too large" << entity->getName() << entity->getID();
+            qCDebug(entitiesrenderer) << "compressed voxel data is too large" << entity->getName() << entity->getID();
             return;
         }
 
@@ -1212,7 +1005,7 @@ void RenderablePolyVoxEntityItem::copyUpperEdgesFromNeighbors() {
         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);
+                    uint8_t neighborValue = currentXPNeighbor->getVoxel({ 0, y, z });
                     if ((y == 0 || z == 0) && _volData->getVoxelAt(_volData->getWidth() - 1, y, z) != neighborValue) {
                         bonkNeighbors();
                     }
@@ -1227,7 +1020,7 @@ void RenderablePolyVoxEntityItem::copyUpperEdgesFromNeighbors() {
         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);
+                    uint8_t neighborValue = currentYPNeighbor->getVoxel({ x, 0, z });
                     if ((x == 0 || z == 0) && _volData->getVoxelAt(x, _volData->getHeight() - 1, z) != neighborValue) {
                         bonkNeighbors();
                     }
@@ -1242,7 +1035,7 @@ void RenderablePolyVoxEntityItem::copyUpperEdgesFromNeighbors() {
         withWriteLock([&] {
             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 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();
@@ -1356,6 +1149,8 @@ void RenderablePolyVoxEntityItem::setMesh(model::MeshPointer mesh) {
     if (neighborsNeedUpdate) {
         bonkNeighbors();
     }
+
+    somethingChangedNotification();
 }
 
 void RenderablePolyVoxEntityItem::computeShapeInfoWorker() {
@@ -1428,15 +1223,19 @@ void RenderablePolyVoxEntityItem::computeShapeInfoWorker() {
             }
         } else {
             unsigned int i = 0;
-            polyVoxEntity->forEachVoxelValue(voxelVolumeSize.x, voxelVolumeSize.y, voxelVolumeSize.z,
-                                             [&](int x, int y, int z, uint8_t value) {
+            polyVoxEntity->forEachVoxelValue(voxelVolumeSize, [&](const ivec3& v, uint8_t value) {
                 if (value > 0) {
-                    if ((x > 0 && polyVoxEntity->getVoxelInternal(x - 1, y, z) > 0) &&
-                        (y > 0 && polyVoxEntity->getVoxelInternal(x, y - 1, z) > 0) &&
-                        (z > 0 && polyVoxEntity->getVoxelInternal(x, y, z - 1) > 0) &&
-                        (x < voxelVolumeSize.x - 1 && polyVoxEntity->getVoxelInternal(x + 1, y, z) > 0) &&
-                        (y < voxelVolumeSize.y - 1 && polyVoxEntity->getVoxelInternal(x, y + 1, z) > 0) &&
-                        (z < voxelVolumeSize.z - 1 && polyVoxEntity->getVoxelInternal(x, y, z + 1) > 0)) {
+                    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)) && 
+                        (polyVoxEntity->getVoxelInternal({ x - 1, y, z }) > 0) &&
+                        (polyVoxEntity->getVoxelInternal({ x, y - 1, z }) > 0) &&
+                        (polyVoxEntity->getVoxelInternal({ x, y, z - 1 }) > 0) &&
+                        (polyVoxEntity->getVoxelInternal({ x + 1, y, z }) > 0) &&
+                        (polyVoxEntity->getVoxelInternal({ x, y + 1, z }) > 0) &&
+                        (polyVoxEntity->getVoxelInternal({ x, y, z + 1 }) > 0)) {
                         // this voxel has neighbors in every cardinal direction, so there's no need
                         // to include it in the collision hull.
                         return;
@@ -1617,19 +1416,6 @@ void RenderablePolyVoxEntityItem::bonkNeighbors() {
     }
 }
 
-void RenderablePolyVoxEntityItem::locationChanged(bool tellPhysics) {
-    EntityItem::locationChanged(tellPhysics);
-    if (!_pipeline || !render::Item::isValidID(_myItem)) {
-        return;
-    }
-    render::ScenePointer scene = AbstractViewStateInterface::instance()->getMain3DScene();
-    render::Transaction transaction;
-    transaction.updateItem<PolyVoxPayload>(_myItem, [](PolyVoxPayload& payload) {});
-
-    scene->enqueueTransaction(transaction);
-}
-
-
 bool RenderablePolyVoxEntityItem::getMeshes(MeshProxyList& result) {
     if (!updateDependents()) {
         return false;
@@ -1651,6 +1437,7 @@ bool RenderablePolyVoxEntityItem::getMeshes(MeshProxyList& result) {
             // the mesh will be in voxel-space.  transform it into object-space
             meshProxy = new SimpleMeshProxy(
                 _mesh->map([=](glm::vec3 position){ return glm::vec3(transform * glm::vec4(position, 1.0f)); },
+                           [=](glm::vec3 color){ return color; },
                            [=](glm::vec3 normal){ return glm::normalize(glm::vec3(transform * glm::vec4(normal, 0.0f))); },
                            [&](uint32_t index){ return index; }));
             result << meshProxy;
@@ -1658,3 +1445,182 @@ bool RenderablePolyVoxEntityItem::getMeshes(MeshProxyList& result) {
     });
     return success;
 }
+
+using namespace render;
+using namespace render::entities;
+
+static const int MATERIAL_GPU_SLOT { 3 };
+static uint8_t CUSTOM_PIPELINE_NUMBER;
+static gpu::PipelinePointer _pipelines[2];
+static gpu::PipelinePointer _wireframePipelines[2];
+static gpu::Stream::FormatPointer _vertexFormat;
+
+ShapePipelinePointer shapePipelineFactory(const ShapePlumber& plumber, const ShapeKey& key) {
+    if (!_pipelines[0]) {
+        gpu::ShaderPointer vertexShaders[2] = { gpu::Shader::createVertex(std::string(polyvox_vert)), gpu::Shader::createVertex(std::string(polyvox_fade_vert)) };
+        gpu::ShaderPointer pixelShaders[2] = { gpu::Shader::createPixel(std::string(polyvox_frag)), gpu::Shader::createPixel(std::string(polyvox_fade_frag)) };
+
+        gpu::Shader::BindingSet slotBindings;
+        slotBindings.insert(gpu::Shader::Binding(std::string("materialBuffer"), MATERIAL_GPU_SLOT));
+        slotBindings.insert(gpu::Shader::Binding(std::string("xMap"), 0));
+        slotBindings.insert(gpu::Shader::Binding(std::string("yMap"), 1));
+        slotBindings.insert(gpu::Shader::Binding(std::string("zMap"), 2));
+#ifdef POLYVOX_ENTITY_USE_FADE_EFFECT
+        slotBindings.insert(gpu::Shader::Binding(std::string("fadeMaskMap"), 3));
+#endif
+
+        auto state = std::make_shared<gpu::State>();
+        state->setCullMode(gpu::State::CULL_BACK);
+        state->setDepthTest(true, true, gpu::LESS_EQUAL);
+        PrepareStencil::testMaskDrawShape(*state);
+
+        auto wireframeState = std::make_shared<gpu::State>();
+        wireframeState->setCullMode(gpu::State::CULL_BACK);
+        wireframeState->setDepthTest(true, true, gpu::LESS_EQUAL);
+        wireframeState->setFillMode(gpu::State::FILL_LINE);
+        PrepareStencil::testMaskDrawShape(*wireframeState);
+
+        // Two sets of pipelines: normal and fading
+        for (auto i = 0; i < 2; i++) {
+            gpu::ShaderPointer program = gpu::Shader::createProgram(vertexShaders[i], pixelShaders[i]);
+            gpu::Shader::makeProgram(*program, slotBindings);
+
+            _pipelines[i] = gpu::Pipeline::create(program, state);
+            _wireframePipelines[i] = gpu::Pipeline::create(program, wireframeState);
+        }
+    }
+
+#ifdef POLYVOX_ENTITY_USE_FADE_EFFECT
+    if (key.isFaded()) {
+        const auto& fadeEffect = DependencyManager::get<FadeEffect>();
+        if (key.isWireframe()) {
+            return std::make_shared<render::ShapePipeline>(_wireframePipelines[1], nullptr, fadeEffect->getBatchSetter(), fadeEffect->getItemUniformSetter());
+        } else {
+            return std::make_shared<render::ShapePipeline>(_pipelines[1], nullptr, fadeEffect->getBatchSetter(), fadeEffect->getItemUniformSetter());
+        }
+    } else {
+#endif
+        if (key.isWireframe()) {
+            return std::make_shared<render::ShapePipeline>(_wireframePipelines[0], nullptr, nullptr, nullptr);
+        } else {
+            return std::make_shared<render::ShapePipeline>(_pipelines[0], nullptr, nullptr, nullptr);
+        }
+#ifdef POLYVOX_ENTITY_USE_FADE_EFFECT
+    }
+#endif
+}
+
+PolyVoxEntityRenderer::PolyVoxEntityRenderer(const EntityItemPointer& entity) : Parent(entity) {
+    static std::once_flag once;
+    std::call_once(once, [&] {
+        CUSTOM_PIPELINE_NUMBER = render::ShapePipeline::registerCustomShapePipelineFactory(shapePipelineFactory);
+        _vertexFormat = std::make_shared<gpu::Stream::Format>();
+        _vertexFormat->setAttribute(gpu::Stream::POSITION, 0, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ), 0);
+        _vertexFormat->setAttribute(gpu::Stream::NORMAL, 0, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ), 12);
+    });
+}
+
+ShapeKey PolyVoxEntityRenderer::getShapeKey() {
+    return ShapeKey::Builder().withCustom(CUSTOM_PIPELINE_NUMBER).build();
+}
+
+bool PolyVoxEntityRenderer::needsRenderUpdateFromTypedEntity(const TypedEntityPointer& entity) const {
+    std::array<QString, 3> xyzTextureURLs{ {
+        entity->getXTextureURL(),
+        entity->getYTextureURL(),
+        entity->getZTextureURL()
+    } };
+
+    if (xyzTextureURLs != _xyzTextureUrls) {
+        return true;
+    }
+
+    if (entity->getVoxelVolumeSize() != _lastVoxelVolumeSize) {
+        return true;
+    }
+
+    if (entity->voxelToWorldMatrix() != _lastVoxelToWorldMatrix) {
+        return true;
+    }
+
+    if (entity->_mesh != _mesh) {
+        return true;
+    }
+
+    return false;
+}
+
+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) {
+        transaction.addTransitionToItem(_renderItemID, render::Transition::ELEMENT_ENTER_DOMAIN);
+        _hasTransitioned = true;
+    }
+#endif
+
+    std::array<QString, 3> xyzTextureURLs{ {
+        entity->getXTextureURL(),
+        entity->getYTextureURL(),
+        entity->getZTextureURL()
+    } };
+    for (size_t i = 0; i < xyzTextureURLs.size(); ++i) {
+        auto& texture = _xyzTextures[i];
+        const auto& textureURL = xyzTextureURLs[i];
+        if (textureURL.isEmpty()) {
+            texture.reset();
+        } else if (!texture || texture->getURL() != QUrl(textureURL)) {
+            texture = DependencyManager::get<TextureCache>()->getTexture(textureURL);
+        }
+    }
+}
+
+void PolyVoxEntityRenderer::doRenderUpdateAsynchronousTyped(const TypedEntityPointer& entity) {
+    _lastVoxelToWorldMatrix = entity->voxelToWorldMatrix();
+    model::MeshPointer newMesh;
+    entity->withReadLock([&] {
+        newMesh = entity->_mesh;
+    });
+
+    if (newMesh && newMesh->getIndexBuffer()._buffer) {
+        _mesh = newMesh;
+    }
+}
+
+void PolyVoxEntityRenderer::doRender(RenderArgs* args) {
+    if (!_mesh || !_mesh->getIndexBuffer()._buffer) {
+        return;
+    }
+
+    PerformanceTimer perfTimer("RenderablePolyVoxEntityItem::render");
+    gpu::Batch& batch = *args->_batch;
+
+    Transform transform(_lastVoxelToWorldMatrix);
+    batch.setModelTransform(transform);
+    batch.setInputFormat(_vertexFormat);
+    batch.setInputBuffer(gpu::Stream::POSITION, _mesh->getVertexBuffer()._buffer, 0,
+        sizeof(PolyVox::PositionMaterialNormal));
+
+    // TODO -- should we be setting this?
+    // batch.setInputBuffer(gpu::Stream::NORMAL, mesh->getVertexBuffer()._buffer,
+    //                      12,
+    //                      sizeof(PolyVox::PositionMaterialNormal));
+    batch.setIndexBuffer(gpu::UINT32, _mesh->getIndexBuffer()._buffer, 0);
+
+    for (size_t i = 0; i < _xyzTextures.size(); ++i) {
+        const auto& texture = _xyzTextures[i];
+        if (texture) {
+            batch.setResourceTexture((uint32_t)i, texture->getGPUTexture());
+        } else {
+            batch.setResourceTexture((uint32_t)i, DependencyManager::get<TextureCache>()->getWhiteTexture());
+        }
+    }
+
+    int voxelVolumeSizeLocation = args->_shapePipeline->pipeline->getProgram()->getUniforms().findLocation("voxelVolumeSize");
+    batch._glUniform3f(voxelVolumeSizeLocation, _lastVoxelVolumeSize.x, _lastVoxelVolumeSize.y, _lastVoxelVolumeSize.z);
+    batch.drawIndexed(gpu::TRIANGLES, (gpu::uint32)_mesh->getNumIndices(), 0);
+}
+
diff --git a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.h b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.h
index 45625ada6d..fc12a2b5ee 100644
--- a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.h
+++ b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.h
@@ -19,63 +19,46 @@
 #include <PolyVoxCore/SimpleVolume.h>
 #include <PolyVoxCore/Raycast.h>
 
+#include <gpu/Forward.h>
 #include <gpu/Context.h>
 #include <model/Forward.h>
+#include <model/Geometry.h>
 #include <TextureCache.h>
 #include <PolyVoxEntityItem.h>
 
 #include "RenderableEntityItem.h"
 
-class PolyVoxPayload {
-public:
-    PolyVoxPayload(EntityItemPointer owner) : _owner(owner), _bounds(AABox()) { }
-    typedef render::Payload<PolyVoxPayload> Payload;
-    typedef Payload::DataPointer Pointer;
+namespace render { namespace entities {
+class PolyVoxEntityRenderer;
+} } 
 
-    EntityItemPointer _owner;
-    AABox _bounds;
-};
+class RenderablePolyVoxEntityItem : public PolyVoxEntityItem {
+    friend class render::entities::PolyVoxEntityRenderer;
 
-namespace render {
-   template <> const ItemKey payloadGetKey(const PolyVoxPayload::Pointer& payload);
-   template <> const Item::Bound payloadGetBound(const PolyVoxPayload::Pointer& payload);
-   template <> void payloadRender(const PolyVoxPayload::Pointer& payload, RenderArgs* args);
-}
-
-
-class RenderablePolyVoxEntityItem : public PolyVoxEntityItem, public RenderableEntityInterface {
 public:
     static EntityItemPointer factory(const EntityItemID& entityID, const EntityItemProperties& properties);
     RenderablePolyVoxEntityItem(const EntityItemID& entityItemID);
 
     virtual ~RenderablePolyVoxEntityItem();
 
-    RenderableEntityInterface* getRenderableInterface() override { return this; }
-
     void initializePolyVox();
 
-    virtual void somethingChangedNotification() override {
-        // This gets called from EnityItem::readEntityDataFromBuffer every time a packet describing
-        // this entity comes from the entity-server.  It gets called even if nothing has actually changed
-        // (see the comment in EntityItem.cpp).  If that gets fixed, this could be used to know if we
-        // need to redo the voxel data.
-        // _needsModelReload = true;
-    }
+    using PolyVoxEntityItem::getVoxel;
+    virtual uint8_t getVoxel(const ivec3& v) const override;
 
-    virtual uint8_t getVoxel(int x, int y, int z) override;
-    virtual bool setVoxel(int x, int y, int z, uint8_t toValue) override;
+    using PolyVoxEntityItem::setVoxel;
+    virtual bool setVoxel(const ivec3& v, uint8_t toValue) override;
 
     int getOnCount() const override { return _onCount; }
 
-    void render(RenderArgs* args) override;
     virtual bool supportsDetailedRayIntersection() const override { return true; }
     virtual bool findDetailedRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
                         bool& keepSearching, OctreeElementPointer& element, float& distance,
                         BoxFace& face, glm::vec3& surfaceNormal,
                         void** intersectedObject, bool precisionPicking) const override;
 
-    virtual void setVoxelData(QByteArray voxelData) override;
-    virtual void setVoxelVolumeSize(glm::vec3 voxelVolumeSize) override;
+    virtual void setVoxelData(const QByteArray& voxelData) override;
+    virtual void setVoxelVolumeSize(const glm::vec3& voxelVolumeSize) override;
     virtual void setVoxelSurfaceStyle(PolyVoxSurfaceStyle voxelSurfaceStyle) override;
 
     glm::vec3 getSurfacePositionAdjustment() const;
@@ -86,35 +69,19 @@ public:
 
     virtual ShapeType getShapeType() const override;
     virtual bool shouldBePhysical() const override { return !isDead(); }
-    virtual bool isReadyToComputeShape() override;
+    virtual bool isReadyToComputeShape() const override;
     virtual void computeShapeInfo(ShapeInfo& info) override;
 
-    virtual glm::vec3 voxelCoordsToWorldCoords(glm::vec3& voxelCoords) const override;
-    virtual glm::vec3 worldCoordsToVoxelCoords(glm::vec3& worldCoords) const override;
-    virtual glm::vec3 voxelCoordsToLocalCoords(glm::vec3& voxelCoords) const override;
-    virtual glm::vec3 localCoordsToVoxelCoords(glm::vec3& localCoords) const override;
-
     // coords are in voxel-volume space
-    virtual bool setSphereInVolume(glm::vec3 center, float radius, uint8_t toValue) override;
-    virtual bool setVoxelInVolume(glm::vec3 position, uint8_t toValue) override;
+    virtual bool setSphereInVolume(const vec3& center, float radius, uint8_t toValue) override;
+    virtual bool setVoxelInVolume(const vec3& position, uint8_t toValue) override;
 
     // coords are in world-space
-    virtual bool setSphere(glm::vec3 center, float radius, uint8_t toValue) override;
-    virtual bool setCapsule(glm::vec3 startWorldCoords, glm::vec3 endWorldCoords,
+    virtual bool setSphere(const vec3& center, float radius, uint8_t toValue) override;
+    virtual bool setCapsule(const vec3& startWorldCoords, const vec3& endWorldCoords,
                             float radiusWorldCoords, uint8_t toValue) override;
     virtual bool setAll(uint8_t toValue) override;
-    virtual bool setCuboid(const glm::vec3& lowPosition, const glm::vec3& cuboidSize, int toValue) override;
-
-    virtual void setXTextureURL(const QString& xTextureURL) override;
-    virtual void setYTextureURL(const QString& yTextureURL) override;
-    virtual void setZTextureURL(const QString& zTextureURL) override;
-
-    virtual bool addToScene(const EntityItemPointer& self,
-                            const render::ScenePointer& scene,
-                            render::Transaction& transaction) override;
-    virtual void removeFromScene(const EntityItemPointer& self,
-                                 const render::ScenePointer& scene,
-                                 render::Transaction& transaction) override;
+    virtual bool setCuboid(const vec3& lowPosition, const vec3& cuboidSize, int toValue) override;
 
     virtual void setXNNeighborID(const EntityItemID& xNNeighborID) override;
     virtual void setYNNeighborID(const EntityItemID& yNNeighborID) override;
@@ -134,62 +101,50 @@ public:
     virtual void updateRegistrationPoint(const glm::vec3& value) override;
 
     void setVoxelsFromData(QByteArray uncompressedData, quint16 voxelXSize, quint16 voxelYSize, quint16 voxelZSize);
-    void forEachVoxelValue(quint16 voxelXSize, quint16 voxelYSize, quint16 voxelZSize,
-                           std::function<void(int, int, int, uint8_t)> thunk);
+    void forEachVoxelValue(const ivec3& voxelSize, std::function<void(const ivec3&, uint8_t)> thunk);
     QByteArray volDataToArray(quint16 voxelXSize, quint16 voxelYSize, quint16 voxelZSize) const;
 
     void setMesh(model::MeshPointer mesh);
     void setCollisionPoints(ShapeInfo::PointCollection points, AABox box);
-    PolyVox::SimpleVolume<uint8_t>* getVolData() { return _volData; }
+    PolyVox::SimpleVolume<uint8_t>* getVolData() { return _volData.get(); }
 
-    uint8_t getVoxelInternal(int x, int y, int z) const;
-    bool setVoxelInternal(int x, int y, int z, uint8_t toValue);
+    uint8_t getVoxelInternal(const ivec3& v) const;
+    bool setVoxelInternal(const ivec3& v, uint8_t toValue);
 
     void setVolDataDirty() { withWriteLock([&] { _volDataDirty = true; _meshReady = false; }); }
 
-    // Transparent polyvox didn't seem to be working so disable for now
-    bool isTransparent() override { return false; }
-
     bool getMeshes(MeshProxyList& result) override;
 
-protected:
-    virtual void locationChanged(bool tellPhysics = true) override;
-
 private:
-    // The PolyVoxEntityItem class has _voxelData which contains dimensions and compressed voxel data.  The dimensions
-    // may not match _voxelVolumeSize.
-
-    model::MeshPointer _mesh;
-    gpu::Stream::FormatPointer _vertexFormat;
-    bool _meshDirty { true }; // does collision-shape need to be recomputed?
-    bool _meshReady { false };
-
-    NetworkTexturePointer _xTexture;
-    NetworkTexturePointer _yTexture;
-    NetworkTexturePointer _zTexture;
-
-    const int MATERIAL_GPU_SLOT = 3;
-    render::ItemID _myItem{ render::Item::INVALID_ITEM_ID };
-    static gpu::PipelinePointer _pipeline;
-    static gpu::PipelinePointer _wireframePipeline;
-
-    ShapeInfo _shapeInfo;
-
-    PolyVox::SimpleVolume<uint8_t>* _volData = nullptr;
-    bool _volDataDirty = false; // does recomputeMesh need to be called?
-    int _onCount; // how many non-zero voxels are in _volData
-
-    bool _neighborsNeedUpdate { false };
-
-    bool updateOnCount(int x, int y, int z, uint8_t toValue);
+    bool updateOnCount(const ivec3& v, uint8_t toValue);
     PolyVox::RaycastResult doRayCast(glm::vec4 originInVoxel, glm::vec4 farInVoxel, glm::vec4& result) const;
 
+    void recomputeMesh();
+    void cacheNeighbors();
+    void copyUpperEdgesFromNeighbors();
+    void bonkNeighbors();
+    bool updateDependents();
+
     // these are run off the main thread
     void decompressVolumeData();
     void compressVolumeDataAndSendEditPacket();
-    virtual void recomputeMesh() override; // recompute mesh
     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 };
+    model::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 };
+
     // these are cached lookups of _xNNeighborID, _yNNeighborID, _zNNeighborID, _xPNeighborID, _yPNeighborID, _zPNeighborID
     EntityItemWeakPointer _xNNeighbor; // neighbor found by going along negative X axis
     EntityItemWeakPointer _yNNeighbor;
@@ -197,13 +152,42 @@ private:
     EntityItemWeakPointer _xPNeighbor; // neighbor found by going along positive X axis
     EntityItemWeakPointer _yPNeighbor;
     EntityItemWeakPointer _zPNeighbor;
-    void cacheNeighbors();
-    void copyUpperEdgesFromNeighbors();
-    void bonkNeighbors();
-    bool updateDependents();
+
 };
 
-bool inUserBounds(const PolyVox::SimpleVolume<uint8_t>* vol, PolyVoxEntityItem::PolyVoxSurfaceStyle surfaceStyle,
-                  int x, int y, int z);
+namespace render { namespace entities {
+
+class PolyVoxEntityRenderer : public TypedEntityRenderer<RenderablePolyVoxEntityItem> {
+    using Parent = TypedEntityRenderer<RenderablePolyVoxEntityItem>;
+    friend class EntityRenderer;
+
+public:
+    PolyVoxEntityRenderer(const EntityItemPointer& entity);
+    
+protected:
+    virtual ItemKey getKey() override { return ItemKey::Builder::opaqueShape(); }
+    virtual ShapeKey getShapeKey() override;
+    virtual bool needsRenderUpdateFromTypedEntity(const TypedEntityPointer& entity) const override;
+    virtual void doRenderUpdateSynchronousTyped(const ScenePointer& scene, Transaction& transaction, const TypedEntityPointer& entity) override;
+    virtual void doRenderUpdateAsynchronousTyped(const TypedEntityPointer& entity) override;
+    virtual void doRender(RenderArgs* args) override;
+    virtual bool isTransparent() const override { return false; }
+
+private:
+#ifdef POLYVOX_ENTITY_USE_FADE_EFFECT
+    bool _hasTransitioned{ false };
+#endif
+
+    model::MeshPointer _mesh;
+    std::array<NetworkTexturePointer, 3> _xyzTextures;
+    glm::vec3 _lastVoxelVolumeSize;
+    glm::mat4 _lastVoxelToWorldMatrix;
+    PolyVoxEntityItem::PolyVoxSurfaceStyle _lastSurfaceStyle { PolyVoxEntityItem::SURFACE_MARCHING_CUBES };
+    std::array<QString, 3> _xyzTextureUrls;
+    bool _neighborsNeedUpdate{ false };
+};
+
+} }
+
 
 #endif // hifi_RenderablePolyVoxEntityItem_h
diff --git a/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp b/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
index 62ab3377a8..332d87f930 100644
--- a/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
@@ -11,7 +11,6 @@
 #include <glm/gtx/quaternion.hpp>
 
 #include <gpu/Batch.h>
-
 #include <DependencyManager.h>
 #include <StencilMaskPass.h>
 #include <GeometryCache.h>
@@ -20,120 +19,141 @@
 #include <render-utils/simple_vert.h>
 #include <render-utils/simple_frag.h>
 
+//#define SHAPE_ENTITY_USE_FADE_EFFECT
+#ifdef SHAPE_ENTITY_USE_FADE_EFFECT
+#include <FadeEffect.h>
+#endif
+using namespace render;
+using namespace render::entities;
+
 // Sphere entities should fit inside a cube entity of the same size, so a sphere that has dimensions 1x1x1 
 // is a half unit sphere.  However, the geometry cache renders a UNIT sphere, so we need to scale down.
 static const float SPHERE_ENTITY_SCALE = 0.5f;
 
-static std::array<GeometryCache::Shape, entity::NUM_SHAPES> MAPPING { {
-    GeometryCache::Triangle,
-    GeometryCache::Quad,
-    GeometryCache::Hexagon,
-    GeometryCache::Octagon,
-    GeometryCache::Circle,
-    GeometryCache::Cube,
-    GeometryCache::Sphere,
-    GeometryCache::Tetrahedron,
-    GeometryCache::Octahedron,
-    GeometryCache::Dodecahedron,
-    GeometryCache::Icosahedron,
-    GeometryCache::Torus,
-    GeometryCache::Cone,
-    GeometryCache::Cylinder,
-} };
 
-RenderableShapeEntityItem::Pointer RenderableShapeEntityItem::baseFactory(const EntityItemID& entityID, const EntityItemProperties& properties) {
-    Pointer entity = std::make_shared<RenderableShapeEntityItem>(entityID);
-    entity->setProperties(properties);
-    return entity;
+ShapeEntityRenderer::ShapeEntityRenderer(const EntityItemPointer& entity) : Parent(entity) {
+    _procedural._vertexSource = simple_vert;
+    _procedural._fragmentSource = simple_frag;
+    _procedural._opaqueState->setCullMode(gpu::State::CULL_NONE);
+    _procedural._opaqueState->setDepthTest(true, true, gpu::LESS_EQUAL);
+    PrepareStencil::testMaskDrawShape(*_procedural._opaqueState);
+    _procedural._opaqueState->setBlendFunction(false,
+        gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::INV_SRC_ALPHA,
+        gpu::State::FACTOR_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::ONE);
 }
 
-EntityItemPointer RenderableShapeEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
-    return baseFactory(entityID, properties);
+bool ShapeEntityRenderer::needsRenderUpdate() const {
+    if (_procedural.isEnabled() && _procedural.isFading()) {
+        return true;
+    }
+
+    return Parent::needsRenderUpdate();
 }
 
-EntityItemPointer RenderableShapeEntityItem::boxFactory(const EntityItemID& entityID, const EntityItemProperties& properties) {
-    auto result = baseFactory(entityID, properties);
-    result->setShape(entity::Cube);
-    return result;
+bool ShapeEntityRenderer::needsRenderUpdateFromTypedEntity(const TypedEntityPointer& entity) const {
+    if (_lastUserData != entity->getUserData()) {
+        return true;
+    }
+    glm::vec4 newColor(toGlm(entity->getXColor()), entity->getLocalRenderAlpha());
+    if (newColor != _color) {
+        return true;
+    }
+
+    if (_shape != entity->getShape()) {
+        return true;
+    }
+
+    if (_dimensions != entity->getDimensions()) {
+        return true;
+    }
+
+    return false;
 }
 
-EntityItemPointer RenderableShapeEntityItem::sphereFactory(const EntityItemID& entityID, const EntityItemProperties& properties) {
-    auto result = baseFactory(entityID, properties);
-    result->setShape(entity::Sphere);
-    return result;
-}
-
-void RenderableShapeEntityItem::setUserData(const QString& value) {
-    if (value != getUserData()) {
-        ShapeEntityItem::setUserData(value);
-        if (_procedural) {
-            _procedural->parse(value);
+void ShapeEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& scene, Transaction& transaction, const TypedEntityPointer& entity) {
+    withWriteLock([&] {
+        auto userData = entity->getUserData();
+        if (_lastUserData != userData) {
+            _lastUserData = userData;
+            _procedural.setProceduralData(ProceduralData::parse(_lastUserData));
         }
-    }
+
+        _color = vec4(toGlm(entity->getXColor()), entity->getLocalRenderAlpha());
+
+        _shape = entity->getShape();
+        _position = entity->getPosition();
+        _dimensions = entity->getDimensions();
+        _orientation = entity->getOrientation();
+        _renderTransform = getModelTransform();
+
+        if (_shape == entity::Sphere) {
+            _renderTransform.postScale(SPHERE_ENTITY_SCALE);
+        }
+
+        _renderTransform.postScale(_dimensions);
+    });
 }
 
-bool RenderableShapeEntityItem::isTransparent() {
-    if (_procedural && _procedural->isFading()) {
-        float isFading = Interpolate::calculateFadeRatio(_procedural->getFadeStartTime()) < 1.0f;
-        _procedural->setIsFading(isFading);
-        return isFading;
-    } else {
-        return getLocalRenderAlpha() < 1.0f || EntityItem::isTransparent();
-    }
+void ShapeEntityRenderer::doRenderUpdateAsynchronousTyped(const TypedEntityPointer& entity) {
+    withReadLock([&] {
+        if (_procedural.isEnabled() && _procedural.isFading()) {
+            float isFading = Interpolate::calculateFadeRatio(_procedural.getFadeStartTime()) < 1.0f;
+            _procedural.setIsFading(isFading);
+        }
+    });
 }
 
-void RenderableShapeEntityItem::render(RenderArgs* args) {
+bool ShapeEntityRenderer::isTransparent() const {
+    if (_procedural.isEnabled() && _procedural.isFading()) {
+        return Interpolate::calculateFadeRatio(_procedural.getFadeStartTime()) < 1.0f;
+    }
+    
+    //        return _entity->getLocalRenderAlpha() < 1.0f || Parent::isTransparent();
+    return Parent::isTransparent();
+}
+
+
+
+void ShapeEntityRenderer::doRender(RenderArgs* args) {
     PerformanceTimer perfTimer("RenderableShapeEntityItem::render");
-    //Q_ASSERT(getType() == EntityTypes::Shape);
     Q_ASSERT(args->_batch);
-    checkFading();
-
-    if (!_procedural) {
-        _procedural.reset(new Procedural(getUserData()));
-        _procedural->_vertexSource = simple_vert;
-        _procedural->_fragmentSource = simple_frag;
-        _procedural->_opaqueState->setCullMode(gpu::State::CULL_NONE);
-        _procedural->_opaqueState->setDepthTest(true, true, gpu::LESS_EQUAL);
-        PrepareStencil::testMaskDrawShape(*_procedural->_opaqueState);
-        _procedural->_opaqueState->setBlendFunction(false,
-            gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::INV_SRC_ALPHA,
-            gpu::State::FACTOR_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::ONE);
-    }
 
     gpu::Batch& batch = *args->_batch;
-    glm::vec4 color(toGlm(getXColor()), getLocalRenderAlpha());
-    bool success;
-    Transform modelTransform = getTransformToCenter(success);
-    if (!success) {
-        return;
-    }
-    if (_shape == entity::Sphere) {
-        modelTransform.postScale(SPHERE_ENTITY_SCALE);
-    }
-    batch.setModelTransform(modelTransform); // use a transform with scale, rotation, registration point and translation
-    if (_procedural->ready()) {
-        _procedural->prepare(batch, getPosition(), getDimensions(), getOrientation());
-        auto outColor = _procedural->getColor(color);
-        outColor.a *= _procedural->isFading() ? Interpolate::calculateFadeRatio(_procedural->getFadeStartTime()) : 1.0f;
+
+    auto geometryCache = DependencyManager::get<GeometryCache>();
+    GeometryCache::Shape geometryShape;
+    bool proceduralRender = false;
+    glm::vec4 outColor;
+    withReadLock([&] {
+        geometryShape = geometryCache->getShapeForEntityShape(_shape);
+        batch.setModelTransform(_renderTransform); // use a transform with scale, rotation, registration point and translation
+        outColor = _color;
+        if (_procedural.isReady()) {
+            _procedural.prepare(batch, _position, _dimensions, _orientation);
+            outColor = _procedural.getColor(_color);
+            outColor.a *= _procedural.isFading() ? Interpolate::calculateFadeRatio(_procedural.getFadeStartTime()) : 1.0f;
+            proceduralRender = true;
+        }
+    });
+
+    if (proceduralRender) {
         batch._glColor4f(outColor.r, outColor.g, outColor.b, outColor.a);
         if (render::ShapeKey(args->_globalShapeKey).isWireframe()) {
-            DependencyManager::get<GeometryCache>()->renderWireShape(batch, MAPPING[_shape]);
+            geometryCache->renderWireShape(batch, geometryShape);
         } else {
-            DependencyManager::get<GeometryCache>()->renderShape(batch, MAPPING[_shape]);
+            geometryCache->renderShape(batch, geometryShape);
         }
     } else {
         // FIXME, support instanced multi-shape rendering using multidraw indirect
-        color.a *= _isFading ? Interpolate::calculateFadeRatio(_fadeStartTime) : 1.0f;
-        auto geometryCache = DependencyManager::get<GeometryCache>();
-        auto pipeline = color.a < 1.0f ? geometryCache->getTransparentShapePipeline() : geometryCache->getOpaqueShapePipeline();
-        
+        outColor.a *= _isFading ? Interpolate::calculateFadeRatio(_fadeStartTime) : 1.0f;
+        auto pipeline = outColor.a < 1.0f ? geometryCache->getTransparentShapePipeline() : geometryCache->getOpaqueShapePipeline();
         if (render::ShapeKey(args->_globalShapeKey).isWireframe()) {
-            geometryCache->renderWireShapeInstance(args, batch, MAPPING[_shape], color, pipeline);
+            geometryCache->renderWireShapeInstance(args, batch, geometryShape, outColor, pipeline);
         } else {
-            geometryCache->renderSolidShapeInstance(args, batch, MAPPING[_shape], color, pipeline);
+            geometryCache->renderSolidShapeInstance(args, batch, geometryShape, outColor, pipeline);
         }
     }
 
-    static const auto triCount = DependencyManager::get<GeometryCache>()->getShapeTriangleCount(MAPPING[_shape]);
+    const auto triCount = geometryCache->getShapeTriangleCount(geometryShape);
     args->_details._trianglesRendered += (int)triCount;
 }
diff --git a/libraries/entities-renderer/src/RenderableShapeEntityItem.h b/libraries/entities-renderer/src/RenderableShapeEntityItem.h
index 0cc6a54f81..433cb41ad2 100644
--- a/libraries/entities-renderer/src/RenderableShapeEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableShapeEntityItem.h
@@ -9,30 +9,36 @@
 #ifndef hifi_RenderableShapeEntityItem_h
 #define hifi_RenderableShapeEntityItem_h
 
-#include <ShapeEntityItem.h>
-#include <procedural/Procedural.h>
-
 #include "RenderableEntityItem.h"
 
-class RenderableShapeEntityItem : public ShapeEntityItem, private SimplerRenderableEntitySupport {
-    using Pointer = std::shared_ptr<RenderableShapeEntityItem>;
-    static Pointer baseFactory(const EntityItemID& entityID, const EntityItemProperties& properties);
+#include <procedural/Procedural.h>
+#include <ShapeEntityItem.h>
+
+namespace render { namespace entities { 
+
+class ShapeEntityRenderer : public TypedEntityRenderer<ShapeEntityItem> {
+    using Parent = TypedEntityRenderer<ShapeEntityItem>;
+    using Pointer = std::shared_ptr<ShapeEntityRenderer>;
 public:
-    static EntityItemPointer factory(const EntityItemID& entityID, const EntityItemProperties& properties);
-    static EntityItemPointer boxFactory(const EntityItemID& entityID, const EntityItemProperties& properties);
-    static EntityItemPointer sphereFactory(const EntityItemID& entityID, const EntityItemProperties& properties);
-    RenderableShapeEntityItem(const EntityItemID& entityItemID) : ShapeEntityItem(entityItemID) {}
-
-    void render(RenderArgs* args) override;
-    void setUserData(const QString& value) override;
-
-    bool isTransparent() override;
+    ShapeEntityRenderer(const EntityItemPointer& entity);
 
 private:
-    std::unique_ptr<Procedural> _procedural { nullptr };
+    virtual bool needsRenderUpdate() const override;
+    virtual bool needsRenderUpdateFromTypedEntity(const TypedEntityPointer& entity) const override;
+    virtual void doRenderUpdateSynchronousTyped(const ScenePointer& scene, Transaction& transaction, const TypedEntityPointer& entity) override;
+    virtual void doRenderUpdateAsynchronousTyped(const TypedEntityPointer& entity) override;
+    virtual void doRender(RenderArgs* args) override;
+    virtual bool isTransparent() const override;
 
-    SIMPLE_RENDERABLE();
+    Procedural _procedural;
+    QString _lastUserData;
+    Transform _renderTransform;
+    entity::Shape _shape { entity::Sphere };
+    glm::vec4 _color;
+    glm::vec3 _position;
+    glm::vec3 _dimensions;
+    glm::quat _orientation;
 };
 
-
+} } 
 #endif // hifi_RenderableShapeEntityItem_h
diff --git a/libraries/entities-renderer/src/RenderableTextEntityItem.cpp b/libraries/entities-renderer/src/RenderableTextEntityItem.cpp
index a58ed8bbff..6c0f4447ae 100644
--- a/libraries/entities-renderer/src/RenderableTextEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableTextEntityItem.cpp
@@ -9,40 +9,80 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include <glm/gtx/quaternion.hpp>
+#include "RenderableTextEntityItem.h"
 
+#include <TextEntityItem.h>
 #include <GeometryCache.h>
 #include <PerfStat.h>
 #include <Transform.h>
+#include <TextEntityItem.h>
+#include <TextRenderer3D.h>
 
-#include "RenderableTextEntityItem.h"
 #include "GLMHelpers.h"
 
-EntityItemPointer RenderableTextEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
-    EntityItemPointer entity{ new RenderableTextEntityItem(entityID) };
-    entity->setProperties(properties);
-    return entity;
+using namespace render::entities;
+
+static const int FIXED_FONT_POINT_SIZE = 40;
+
+TextEntityRenderer::TextEntityRenderer(const EntityItemPointer& entity) :
+    Parent(entity),
+    _textRenderer(TextRenderer3D::getInstance(SANS_FONT_FAMILY, FIXED_FONT_POINT_SIZE / 2.0f)) {
+
 }
 
-RenderableTextEntityItem::~RenderableTextEntityItem() { 
+TextEntityRenderer::~TextEntityRenderer() {
     auto geometryCache = DependencyManager::get<GeometryCache>();
     if (_geometryID && geometryCache) {
         geometryCache->releaseID(_geometryID);
     }
-    delete _textRenderer;
 }
 
-void RenderableTextEntityItem::render(RenderArgs* args) {
+bool TextEntityRenderer::needsRenderUpdateFromTypedEntity(const TypedEntityPointer& entity) const {
+    if (_text != entity->getText()) {
+        return true;
+    }
+
+    if (_lineHeight != entity->getLineHeight()) {
+        return true;
+    }
+
+    if (_textColor != toGlm(entity->getTextColorX())) {
+        return true;
+    }
+
+    if (_backgroundColor != toGlm(entity->getBackgroundColorX())) {
+        return true;
+    }
+
+    if (_dimensions != entity->getDimensions()) {
+        return true;
+    }
+
+    if (_faceCamera != entity->getFaceCamera()) {
+        return true;
+    }
+    return false;
+}
+
+void TextEntityRenderer::doRenderUpdateAsynchronousTyped(const TypedEntityPointer& entity) {
+    _textColor = toGlm(entity->getTextColorX());
+    _backgroundColor = toGlm(entity->getBackgroundColorX());
+    _dimensions = entity->getDimensions();
+    _faceCamera = entity->getFaceCamera();
+    _lineHeight = entity->getLineHeight();
+    _text = entity->getText();
+}
+
+
+void TextEntityRenderer::doRender(RenderArgs* args) {
     PerformanceTimer perfTimer("RenderableTextEntityItem::render");
-    Q_ASSERT(getType() == EntityTypes::Text);
-    checkFading();
-    
+   
     static const float SLIGHTLY_BEHIND = -0.005f;
     float fadeRatio = _isFading ? Interpolate::calculateFadeRatio(_fadeStartTime) : 1.0f;
     bool transparent = fadeRatio < 1.0f;
-    glm::vec4 textColor = glm::vec4(toGlm(getTextColorX()), fadeRatio);
-    glm::vec4 backgroundColor = glm::vec4(toGlm(getBackgroundColorX()), fadeRatio);
-    glm::vec3 dimensions = getDimensions();
+    glm::vec4 textColor = glm::vec4(_textColor, fadeRatio);
+    glm::vec4 backgroundColor = glm::vec4(_backgroundColor, fadeRatio);
+    const glm::vec3& dimensions = _dimensions;
     
     // Render background
     glm::vec3 minCorner = glm::vec3(0.0f, -dimensions.y, SLIGHTLY_BEHIND);
@@ -53,20 +93,17 @@ void RenderableTextEntityItem::render(RenderArgs* args) {
     Q_ASSERT(args->_batch);
     gpu::Batch& batch = *args->_batch;
 
-    bool success;
-    Transform transformToTopLeft = getTransformToCenter(success);
-    if (!success) {
-        return;
-    }
-    if (getFaceCamera()) {
+    const auto& modelTransform = getModelTransform();
+    auto transformToTopLeft = modelTransform;
+    if (_faceCamera) {
         //rotate about vertical to face the camera
-        glm::vec3 dPosition = args->getViewFrustum().getPosition() - getPosition();
+        glm::vec3 dPosition = args->getViewFrustum().getPosition() - modelTransform.getTranslation();
         // If x and z are 0, atan(x, z) is undefined, so default to 0 degrees
         float yawRotation = dPosition.x == 0.0f && dPosition.z == 0.0f ? 0.0f : glm::atan(dPosition.x, dPosition.z);
         glm::quat orientation = glm::quat(glm::vec3(0.0f, yawRotation, 0.0f));
         transformToTopLeft.setRotation(orientation);
     }
-    transformToTopLeft.postTranslate(glm::vec3(-0.5f, 0.5f, 0.0f)); // Go to the top left
+    transformToTopLeft.postTranslate(dimensions * glm::vec3(-0.5f, 0.5f, 0.0f)); // Go to the top left
     transformToTopLeft.setScale(1.0f); // Use a scale of one so that the text is not deformed
     
     batch.setModelTransform(transformToTopLeft);
@@ -74,21 +111,15 @@ void RenderableTextEntityItem::render(RenderArgs* args) {
     if (!_geometryID) {
         _geometryID = geometryCache->allocateID();
     }
-    geometryCache->bindSimpleProgram(batch, false, transparent, false, false, true);
+    geometryCache->bindSimpleProgram(batch, false, transparent, false, false, false, false);
     geometryCache->renderQuad(batch, minCorner, maxCorner, backgroundColor, _geometryID);
     
-    float lineheight = getLineHeight();
-    float scale = lineheight / _textRenderer->getFontSize();
+    float scale = _lineHeight / _textRenderer->getFontSize();
     transformToTopLeft.setScale(scale); // Scale to have the correct line height
     batch.setModelTransform(transformToTopLeft);
     
-    float leftMargin = 0.1f * lineheight, topMargin = 0.1f * lineheight;
+    float leftMargin = 0.1f * _lineHeight, topMargin = 0.1f * _lineHeight;
     glm::vec2 bounds = glm::vec2(dimensions.x - 2.0f * leftMargin,
                                  dimensions.y - 2.0f * topMargin);
-    auto text = getText();
-    _textRenderer->draw(batch, leftMargin / scale, -topMargin / scale, text, textColor, bounds / scale);
-    
+    _textRenderer->draw(batch, leftMargin / scale, -topMargin / scale, _text, textColor, bounds / scale);
 }
-
-
-
diff --git a/libraries/entities-renderer/src/RenderableTextEntityItem.h b/libraries/entities-renderer/src/RenderableTextEntityItem.h
index 3ca1260b7b..b0a72cf253 100644
--- a/libraries/entities-renderer/src/RenderableTextEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableTextEntityItem.h
@@ -12,27 +12,33 @@
 #ifndef hifi_RenderableTextEntityItem_h
 #define hifi_RenderableTextEntityItem_h
 
-#include <TextEntityItem.h>
-#include <TextRenderer3D.h>
-
 #include "RenderableEntityItem.h"
 
-const int FIXED_FONT_POINT_SIZE = 40;
+class TextEntityItem;
+class TextRenderer3D;
 
-class RenderableTextEntityItem : public TextEntityItem, public SimplerRenderableEntitySupport {
+namespace render { namespace entities {
+
+class TextEntityRenderer : public TypedEntityRenderer<TextEntityItem> {
+    using Parent = TypedEntityRenderer<TextEntityItem>;
+    using Pointer = std::shared_ptr<TextEntityRenderer>;
 public:
-    static EntityItemPointer factory(const EntityItemID& entityID, const EntityItemProperties& properties);
-    RenderableTextEntityItem(const EntityItemID& entityItemID) : TextEntityItem(entityItemID) { }
-    ~RenderableTextEntityItem();
-
-    virtual void render(RenderArgs* args) override;
-
-    SIMPLE_RENDERABLE();
-    
+    TextEntityRenderer(const EntityItemPointer& entity);
+    ~TextEntityRenderer();
 private:
-    int _geometryID { 0 };
-    TextRenderer3D* _textRenderer = TextRenderer3D::getInstance(SANS_FONT_FAMILY, FIXED_FONT_POINT_SIZE / 2.0f);
+    virtual bool needsRenderUpdateFromTypedEntity(const TypedEntityPointer& entity) const override;
+    virtual void doRenderUpdateAsynchronousTyped(const TypedEntityPointer& entity) override;
+    virtual void doRender(RenderArgs* args) override;
+    int _geometryID{ 0 };
+    std::shared_ptr<TextRenderer3D> _textRenderer;
+    bool _faceCamera;
+    glm::vec3 _dimensions;
+    glm::vec3 _textColor;
+    glm::vec3 _backgroundColor;
+    QString _text;
+    float _lineHeight;
 };
 
+} } 
 
 #endif // hifi_RenderableTextEntityItem_h
diff --git a/libraries/entities-renderer/src/RenderableWebEntityItem.cpp b/libraries/entities-renderer/src/RenderableWebEntityItem.cpp
index 9a898b4071..a2e574a829 100644
--- a/libraries/entities-renderer/src/RenderableWebEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableWebEntityItem.cpp
@@ -8,28 +8,30 @@
 
 #include "RenderableWebEntityItem.h"
 
-#include <QMouseEvent>
-#include <QQuickItem>
-#include <QQuickWindow>
-#include <QQmlContext>
-#include <QOpenGLContext>
+#include <QtCore/QTimer>
+#include <QtGui/QOpenGLContext>
+#include <QtGui/QTouchDevice>
+#include <QtQuick/QQuickItem>
+#include <QtQuick/QQuickWindow>
+#include <QtQml/QQmlContext>
 
-#include <glm/gtx/quaternion.hpp>
 
 #include <GeometryCache.h>
-#include <PerfStat.h>
-#include <AbstractViewStateInterface.h>
-#include <GLMHelpers.h>
 #include <PathUtils.h>
-#include <TextureCache.h>
-#include <gpu/Context.h>
+#include <PointerEvent.h>
+#include <gl/GLHelpers.h>
+#include <ui/OffscreenQmlSurface.h>
 #include <ui/TabletScriptingInterface.h>
+#include <EntityScriptingInterface.h>
 
-#include "EntityTreeRenderer.h"
 #include "EntitiesRendererLogging.h"
 
+
+using namespace render;
+using namespace render::entities;
+
 const float METERS_TO_INCHES = 39.3701f;
-static uint32_t _currentWebCount { 0 };
+static uint32_t _currentWebCount{ 0 };
 // Don't allow more than 100 concurrent web views
 static const uint32_t MAX_CONCURRENT_WEB_VIEWS = 20;
 // If a web-view hasn't been rendered for 30 seconds, de-allocate the framebuffer
@@ -40,53 +42,169 @@ static float OPAQUE_ALPHA_THRESHOLD = 0.99f;
 static int DEFAULT_MAX_FPS = 10;
 static int YOUTUBE_MAX_FPS = 30;
 
-EntityItemPointer RenderableWebEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
-    EntityItemPointer entity{ new RenderableWebEntityItem(entityID) };
-    entity->setProperties(properties);
-    return entity;
-}
+static QTouchDevice _touchDevice;
 
-RenderableWebEntityItem::RenderableWebEntityItem(const EntityItemID& entityItemID) :
-    WebEntityItem(entityItemID) {
-
-    qCDebug(entities) << "Created web entity " << getID();
-
-    _touchDevice.setCapabilities(QTouchDevice::Position);
-    _touchDevice.setType(QTouchDevice::TouchScreen);
-    _touchDevice.setName("RenderableWebEntityItemTouchDevice");
-    _touchDevice.setMaximumTouchPoints(4);
+WebEntityRenderer::WebEntityRenderer(const EntityItemPointer& entity) : Parent(entity) {
+    static std::once_flag once;
+    std::call_once(once, [&]{
+        _touchDevice.setCapabilities(QTouchDevice::Position);
+        _touchDevice.setType(QTouchDevice::TouchScreen);
+        _touchDevice.setName("WebEntityRendererTouchDevice");
+        _touchDevice.setMaximumTouchPoints(4);
+    });
     _geometryId = DependencyManager::get<GeometryCache>()->allocateID();
+    _texture = gpu::Texture::createExternal(OffscreenQmlSurface::getDiscardLambda());
+    _texture->setSource(__FUNCTION__);
+    _timer.setInterval(MSECS_PER_SECOND);
+    connect(&_timer, &QTimer::timeout, this, &WebEntityRenderer::onTimeout);
 }
 
-RenderableWebEntityItem::~RenderableWebEntityItem() {
+void WebEntityRenderer::onRemoveFromSceneTyped(const TypedEntityPointer& entity) {
     destroyWebSurface();
 
-    qCDebug(entities) << "Destroyed web entity " << getID();
-
     auto geometryCache = DependencyManager::get<GeometryCache>();
     if (geometryCache) {
         geometryCache->releaseID(_geometryId);
     }
 }
 
-bool RenderableWebEntityItem::buildWebSurface(QSharedPointer<EntityTreeRenderer> renderer) {
+bool WebEntityRenderer::needsRenderUpdateFromTypedEntity(const TypedEntityPointer& entity) const {
+    if (_contextPosition != entity->getPosition()) {
+        return true;
+    }
+
+    if (uvec2(getWindowSize(entity)) != toGlm(_webSurface->size())) {
+        return true;
+    }
+
+    if (_lastSourceUrl != entity->getSourceUrl()) {
+        return true;
+    }
+
+    if (_lastDPI != entity->getDPI()) {
+        return true;
+    }
+
+    if (_lastLocked != entity->getLocked()) {
+        return true;
+    }
+
+    return false;
+}
+
+bool WebEntityRenderer::needsRenderUpdate() const {
+    if (!_webSurface) {
+        // If we have rendered recently, and there is no web surface, we're going to create one
+        return true;
+    }
+
+    return Parent::needsRenderUpdate();
+}
+
+void WebEntityRenderer::onTimeout() {
+    bool needsCheck = resultWithReadLock<bool>([&] {
+        return (_lastRenderTime != 0 && (bool)_webSurface);
+    });
+
+    if (!needsCheck) {
+        return;
+    }
+
+    uint64_t interval;
+    withReadLock([&] {
+        interval = usecTimestampNow() - _lastRenderTime;
+    });
+
+    if (interval > MAX_NO_RENDER_INTERVAL) {
+        destroyWebSurface();
+    }
+}
+
+void WebEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& scene, Transaction& transaction, const TypedEntityPointer& entity) {
+    withWriteLock([&] {
+        // This work must be done on the main thread
+        if (!hasWebSurface()) {
+            buildWebSurface(entity);
+        }
+
+        if (_contextPosition != entity->getPosition()) {
+            // update globalPosition
+            _contextPosition = entity->getPosition();
+            _webSurface->getSurfaceContext()->setContextProperty("globalPosition", vec3toVariant(_contextPosition));
+        }
+
+        if (_lastSourceUrl != entity->getSourceUrl()) {
+            _lastSourceUrl = entity->getSourceUrl();
+            loadSourceURL();
+        }
+
+        _lastDPI = entity->getDPI();
+        _lastLocked = entity->getLocked();
+
+        glm::vec2 windowSize = getWindowSize(entity);
+        _webSurface->resize(QSize(windowSize.x, windowSize.y));
+        _renderTransform = getModelTransform();
+        _renderTransform.postScale(entity->getDimensions());
+    });
+}
+
+void WebEntityRenderer::doRender(RenderArgs* args) {
+    withWriteLock([&] {
+        _lastRenderTime = usecTimestampNow();
+    });
+
+#ifdef WANT_EXTRA_DEBUGGING
+    {
+        gpu::Batch& batch = *args->_batch;
+        batch.setModelTransform(getTransformToCenter()); // we want to include the scale as well
+        glm::vec4 cubeColor{ 1.0f, 0.0f, 0.0f, 1.0f };
+        DependencyManager::get<GeometryCache>()->renderWireCube(batch, 1.0f, cubeColor);
+    }
+#endif
+
+    // Try to update the texture
+    {
+        QSharedPointer<OffscreenQmlSurface> webSurface;
+        withReadLock([&] {
+            webSurface = _webSurface;
+        });
+        if (!webSurface) {
+            return;
+        }
+
+        OffscreenQmlSurface::TextureAndFence newTextureAndFence;
+        bool newTextureAvailable = webSurface->fetchTexture(newTextureAndFence);
+        if (newTextureAvailable) {
+            _texture->setExternalTexture(newTextureAndFence.first, newTextureAndFence.second);
+        }
+    }
+
+    PerformanceTimer perfTimer("WebEntityRenderer::render");
+    static const glm::vec2 texMin(0.0f), texMax(1.0f), topLeft(-0.5f), bottomRight(0.5f);
+
+    gpu::Batch& batch = *args->_batch;
+    withReadLock([&] {
+        batch.setModelTransform(_renderTransform);
+    });
+    batch.setResourceTexture(0, _texture);
+    float fadeRatio = _isFading ? Interpolate::calculateFadeRatio(_fadeStartTime) : 1.0f;
+    batch._glColor4f(1.0f, 1.0f, 1.0f, fadeRatio);
+
+    DependencyManager::get<GeometryCache>()->bindWebBrowserProgram(batch, fadeRatio < OPAQUE_ALPHA_THRESHOLD);
+    DependencyManager::get<GeometryCache>()->renderQuad(batch, topLeft, bottomRight, texMin, texMax, glm::vec4(1.0f, 1.0f, 1.0f, fadeRatio), _geometryId);
+}
+
+bool WebEntityRenderer::hasWebSurface() {
+    return (bool)_webSurface;
+}
+
+bool WebEntityRenderer::buildWebSurface(const TypedEntityPointer& entity) {
     if (_currentWebCount >= MAX_CONCURRENT_WEB_VIEWS) {
         qWarning() << "Too many concurrent web views to create new view";
         return false;
     }
 
-    // Save the original GL context, because creating a QML surface will create a new context
-    QOpenGLContext* currentContext = QOpenGLContext::currentContext();
-    if (!currentContext) {
-        return false;
-    }
-
     ++_currentWebCount;
-
-    qCDebug(entities) << "Building web surface: " << getID() << ", #" << _currentWebCount << ", url = " << _sourceUrl;
-
-    QSurface * currentSurface = currentContext->surface();
-
     auto deleter = [](OffscreenQmlSurface* webSurface) {
         AbstractViewStateInterface::instance()->postLambdaEvent([webSurface] {
             if (AbstractViewStateInterface::instance()->isAboutToQuit()) {
@@ -98,70 +216,64 @@ bool RenderableWebEntityItem::buildWebSurface(QSharedPointer<EntityTreeRenderer>
             }
         });
     };
-    _webSurface = QSharedPointer<OffscreenQmlSurface>(new OffscreenQmlSurface(), deleter);
+
+    {
+        _webSurface = QSharedPointer<OffscreenQmlSurface>(new OffscreenQmlSurface(), deleter);
+        _webSurface->create();
+    }
 
     // FIXME, the max FPS could be better managed by being dynamic (based on the number of current surfaces
     // and the current rendering load)
     _webSurface->setMaxFps(DEFAULT_MAX_FPS);
-
-    // The lifetime of the QML surface MUST be managed by the main thread
-    // Additionally, we MUST use local variables copied by value, rather than
-    // member variables, since they would implicitly refer to a this that
-    // is no longer valid
-    _webSurface->create(currentContext);
-
-    loadSourceURL();
-
-    _webSurface->resume();
-    _webSurface->getRootItem()->setProperty("url", _sourceUrl);
-    _webSurface->getSurfaceContext()->setContextProperty("desktop", QVariant());
     // FIXME - Keyboard HMD only: Possibly add "HMDinfo" object to context for WebView.qml.
+    _webSurface->getSurfaceContext()->setContextProperty("desktop", QVariant());
+    _fadeStartTime = usecTimestampNow();
+    loadSourceURL();
+    _webSurface->resume();
 
     // forward web events to EntityScriptingInterface
     auto entities = DependencyManager::get<EntityScriptingInterface>();
-    const EntityItemID entityItemID = getID();
+    const EntityItemID entityItemID = entity->getID();
     QObject::connect(_webSurface.data(), &OffscreenQmlSurface::webEventReceived, [=](const QVariant& message) {
         emit entities->webEventReceived(entityItemID, message);
     });
 
-    // Restore the original GL context
-    currentContext->makeCurrent(currentSurface);
-
-    auto forwardPointerEvent = [=](const EntityItemID& entityItemID, const PointerEvent& event) {
-        if (entityItemID == getID()) {
-            handlePointerEvent(event);
-        }
-    };
-    _mousePressConnection = QObject::connect(renderer.data(), &EntityTreeRenderer::mousePressOnEntity, forwardPointerEvent);
-    _mouseReleaseConnection = QObject::connect(renderer.data(), &EntityTreeRenderer::mouseReleaseOnEntity, forwardPointerEvent);
-    _mouseMoveConnection = QObject::connect(renderer.data(), &EntityTreeRenderer::mouseMoveOnEntity, forwardPointerEvent);
-    _hoverLeaveConnection = QObject::connect(renderer.data(), &EntityTreeRenderer::hoverLeaveEntity,
-                                             [=](const EntityItemID& entityItemID, const PointerEvent& event) {
-        if (this->_pressed && this->getID() == entityItemID) {
-            // If the user mouses off the entity while the button is down, simulate a touch end.
-            QTouchEvent::TouchPoint point;
-            point.setId(event.getID());
-            point.setState(Qt::TouchPointReleased);
-            glm::vec2 windowPos = event.getPos2D() * (METERS_TO_INCHES * _dpi);
-            QPointF windowPoint(windowPos.x, windowPos.y);
-            point.setScenePos(windowPoint);
-            point.setPos(windowPoint);
-            QList<QTouchEvent::TouchPoint> touchPoints;
-            touchPoints.push_back(point);
-            QTouchEvent* touchEvent = new QTouchEvent(QEvent::TouchEnd, nullptr,
-                                                      Qt::NoModifier, Qt::TouchPointReleased, touchPoints);
-            touchEvent->setWindow(_webSurface->getWindow());
-            touchEvent->setDevice(&_touchDevice);
-            touchEvent->setTarget(_webSurface->getRootItem());
-            QCoreApplication::postEvent(_webSurface->getWindow(), touchEvent);
-        }
-    });
     return true;
 }
 
-glm::vec2 RenderableWebEntityItem::getWindowSize() const {
-    glm::vec2 dims = glm::vec2(getDimensions());
-    dims *= METERS_TO_INCHES * _dpi;
+void WebEntityRenderer::destroyWebSurface() {
+    QSharedPointer<OffscreenQmlSurface> webSurface;
+    withWriteLock([&] {
+        webSurface.swap(_webSurface);
+    });
+
+    if (webSurface) {
+        --_currentWebCount;
+        QQuickItem* rootItem = webSurface->getRootItem();
+
+        if (rootItem && rootItem->objectName() == "tabletRoot") {
+            auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
+            tabletScriptingInterface->setQmlTabletRoot("com.highfidelity.interface.tablet.system", nullptr);
+        }
+
+        // Fix for crash in QtWebEngineCore when rapidly switching domains
+        // Call stop on the QWebEngineView before destroying OffscreenQMLSurface.
+        if (rootItem) {
+            QObject* obj = rootItem->findChild<QObject*>("webEngineView");
+            if (obj) {
+                // stop loading
+                QMetaObject::invokeMethod(obj, "stop");
+            }
+        }
+
+        webSurface->pause();
+        webSurface.reset();
+    }
+}
+
+glm::vec2 WebEntityRenderer::getWindowSize(const TypedEntityPointer& entity) const {
+    glm::vec2 dims = glm::vec2(entity->getDimensions());
+    dims *= METERS_TO_INCHES * _lastDPI;
 
     // ensure no side is never larger then MAX_WINDOW_SIZE
     float max = (dims.x > dims.y) ? dims.x : dims.y;
@@ -172,77 +284,10 @@ glm::vec2 RenderableWebEntityItem::getWindowSize() const {
     return dims;
 }
 
-void RenderableWebEntityItem::render(RenderArgs* args) {
-    checkFading();
-
-    #ifdef WANT_EXTRA_DEBUGGING
-    {
-        gpu::Batch& batch = *args->_batch;
-        batch.setModelTransform(getTransformToCenter()); // we want to include the scale as well
-        glm::vec4 cubeColor{ 1.0f, 0.0f, 0.0f, 1.0f};
-        DependencyManager::get<GeometryCache>()->renderWireCube(batch, 1.0f, cubeColor);
-    }
-    #endif
-
-    if (!_webSurface) {
-        auto renderer = qSharedPointerCast<EntityTreeRenderer>(args->_renderData);
-        if (!buildWebSurface(renderer)) {
-            return;
-        }
-        _fadeStartTime = usecTimestampNow();
-    }
-
-    _lastRenderTime = usecTimestampNow();
-
-    glm::vec2 windowSize = getWindowSize();
-
-    // The offscreen surface is idempotent for resizes (bails early
-    // if it's a no-op), so it's safe to just call resize every frame
-    // without worrying about excessive overhead.
-    _webSurface->resize(QSize(windowSize.x, windowSize.y));
-
-    if (!_texture) {
-        auto webSurface = _webSurface;
-        _texture = gpu::Texture::createExternal(OffscreenQmlSurface::getDiscardLambda());
-        _texture->setSource(__FUNCTION__);
-    }
-    OffscreenQmlSurface::TextureAndFence newTextureAndFence;
-    bool newTextureAvailable = _webSurface->fetchTexture(newTextureAndFence);
-    if (newTextureAvailable) {
-        _texture->setExternalTexture(newTextureAndFence.first, newTextureAndFence.second);
-    }
-
-    PerformanceTimer perfTimer("RenderableWebEntityItem::render");
-    Q_ASSERT(getType() == EntityTypes::Web);
-    static const glm::vec2 texMin(0.0f), texMax(1.0f), topLeft(-0.5f), bottomRight(0.5f);
-
-    Q_ASSERT(args->_batch);
-    gpu::Batch& batch = *args->_batch;
-
-    bool success;
-    batch.setModelTransform(getTransformToCenter(success));
-    if (!success) {
-        return;
-    }
-    batch.setResourceTexture(0, _texture);
-
-    float fadeRatio = _isFading ? Interpolate::calculateFadeRatio(_fadeStartTime) : 1.0f;
-
-    batch._glColor4f(1.0f, 1.0f, 1.0f, fadeRatio);
-
-    const bool IS_AA = true;
-    if (fadeRatio < OPAQUE_ALPHA_THRESHOLD) {
-        DependencyManager::get<GeometryCache>()->bindTransparentWebBrowserProgram(batch, IS_AA);
-    } else {
-        DependencyManager::get<GeometryCache>()->bindOpaqueWebBrowserProgram(batch, IS_AA);
-    }
-    DependencyManager::get<GeometryCache>()->renderQuad(batch, topLeft, bottomRight, texMin, texMax, glm::vec4(1.0f, 1.0f, 1.0f, fadeRatio), _geometryId);
-}
-
-void RenderableWebEntityItem::loadSourceURL() {
-    QUrl sourceUrl(_sourceUrl);
+void WebEntityRenderer::loadSourceURL() {
+    const QUrl sourceUrl(_lastSourceUrl);
     if (sourceUrl.scheme() == "http" || sourceUrl.scheme() == "https" ||
-        _sourceUrl.toLower().endsWith(".htm") || _sourceUrl.toLower().endsWith(".html")) {
+        _lastSourceUrl.toLower().endsWith(".htm") || _lastSourceUrl.toLower().endsWith(".html")) {
         _contentType = htmlContent;
         _webSurface->setBaseUrl(QUrl::fromLocalFile(PathUtils::resourcesPath() + "qml/controls/"));
 
@@ -253,62 +298,48 @@ void RenderableWebEntityItem::loadSourceURL() {
             _webSurface->setMaxFps(DEFAULT_MAX_FPS);
         }
 
-        _webSurface->load("WebEntityView.qml");
-        _webSurface->getRootItem()->setProperty("url", _sourceUrl);
-        _webSurface->getSurfaceContext()->setContextProperty("desktop", QVariant());
-
+        _webSurface->load("WebEntityView.qml", [this](QQmlContext* context, QObject* item) {
+            item->setProperty("url", _lastSourceUrl);
+        });
     } else {
         _contentType = qmlContent;
         _webSurface->setBaseUrl(QUrl::fromLocalFile(PathUtils::resourcesPath()));
-        _webSurface->load(_sourceUrl, [&](QQmlContext* context, QObject* obj) {});
-
+        _webSurface->load(_lastSourceUrl);
         if (_webSurface->getRootItem() && _webSurface->getRootItem()->objectName() == "tabletRoot") {
             auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
             tabletScriptingInterface->setQmlTabletRoot("com.highfidelity.interface.tablet.system", _webSurface.data());
         }
     }
-    _webSurface->getSurfaceContext()->setContextProperty("globalPosition", vec3toVariant(getPosition()));
 }
 
-
-void RenderableWebEntityItem::setSourceUrl(const QString& value) {
-    auto valueBeforeSuperclassSet = _sourceUrl;
-
-    WebEntityItem::setSourceUrl(value);
-
-    if (_sourceUrl != valueBeforeSuperclassSet && _webSurface) {
-        qCDebug(entities) << "Changing web entity source URL to " << _sourceUrl;
-
-        AbstractViewStateInterface::instance()->postLambdaEvent([this] {
-            loadSourceURL();
-            if (_contentType == htmlContent) {
-                _webSurface->getRootItem()->setProperty("url", _sourceUrl);
-            }
-        });
+void WebEntityRenderer::hoverLeaveEntity(const PointerEvent& event) {
+    if (!_lastLocked && _webSurface && _pressed) {
+        // If the user mouses off the entity while the button is down, simulate a touch end.
+        QTouchEvent::TouchPoint point;
+        point.setId(event.getID());
+        point.setState(Qt::TouchPointReleased);
+        glm::vec2 windowPos = event.getPos2D() * (METERS_TO_INCHES * _lastDPI);
+        QPointF windowPoint(windowPos.x, windowPos.y);
+        point.setScenePos(windowPoint);
+        point.setPos(windowPoint);
+        QList<QTouchEvent::TouchPoint> touchPoints;
+        touchPoints.push_back(point);
+        QTouchEvent* touchEvent = new QTouchEvent(QEvent::TouchEnd, nullptr,
+            Qt::NoModifier, Qt::TouchPointReleased, touchPoints);
+        touchEvent->setWindow(_webSurface->getWindow());
+        touchEvent->setDevice(&_touchDevice);
+        touchEvent->setTarget(_webSurface->getRootItem());
+        QCoreApplication::postEvent(_webSurface->getWindow(), touchEvent);
     }
 }
 
-void RenderableWebEntityItem::setProxyWindow(QWindow* proxyWindow) {
-    if (_webSurface) {
-        _webSurface->setProxyWindow(proxyWindow);
-    }
-}
-
-QObject* RenderableWebEntityItem::getEventHandler() {
-    if (!_webSurface) {
-        return nullptr;
-    }
-    return _webSurface->getEventHandler();
-}
-
-void RenderableWebEntityItem::handlePointerEvent(const PointerEvent& event) {
-
+void WebEntityRenderer::handlePointerEvent(const PointerEvent& event) {
     // Ignore mouse interaction if we're locked
-    if (getLocked() || !_webSurface) {
+    if (_lastLocked || !_webSurface) {
         return;
     }
 
-    glm::vec2 windowPos = event.getPos2D() * (METERS_TO_INCHES * _dpi);
+    glm::vec2 windowPos = event.getPos2D() * (METERS_TO_INCHES * _lastDPI);
     QPointF windowPoint(windowPos.x, windowPos.y);
     if (event.getType() == PointerEvent::Move) {
         // Forward a mouse move event to webSurface
@@ -327,19 +358,19 @@ void RenderableWebEntityItem::handlePointerEvent(const PointerEvent& event) {
         QEvent::Type type;
         Qt::TouchPointState touchPointState;
         switch (event.getType()) {
-        case PointerEvent::Press:
-            type = QEvent::TouchBegin;
-            touchPointState = Qt::TouchPointPressed;
-            break;
-        case PointerEvent::Release:
-            type = QEvent::TouchEnd;
-            touchPointState = Qt::TouchPointReleased;
-            break;
-        case PointerEvent::Move:
-        default:
-            type = QEvent::TouchUpdate;
-            touchPointState = Qt::TouchPointMoved;
-            break;
+            case PointerEvent::Press:
+                type = QEvent::TouchBegin;
+                touchPointState = Qt::TouchPointPressed;
+                break;
+            case PointerEvent::Release:
+                type = QEvent::TouchEnd;
+                touchPointState = Qt::TouchPointReleased;
+                break;
+            case PointerEvent::Move:
+            default:
+                type = QEvent::TouchUpdate;
+                touchPointState = Qt::TouchPointMoved;
+                break;
         }
 
         QTouchEvent::TouchPoint point;
@@ -361,71 +392,21 @@ void RenderableWebEntityItem::handlePointerEvent(const PointerEvent& event) {
     }
 }
 
-void RenderableWebEntityItem::destroyWebSurface() {
+void WebEntityRenderer::setProxyWindow(QWindow* proxyWindow) {
     if (_webSurface) {
-        --_currentWebCount;
-
-        QQuickItem* rootItem = _webSurface->getRootItem();
-
-        if (rootItem && rootItem->objectName() == "tabletRoot") {
-            auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
-            tabletScriptingInterface->setQmlTabletRoot("com.highfidelity.interface.tablet.system", nullptr);
-        }
-
-        // Fix for crash in QtWebEngineCore when rapidly switching domains
-        // Call stop on the QWebEngineView before destroying OffscreenQMLSurface.
-        if (rootItem) {
-            QObject* obj = rootItem->findChild<QObject*>("webEngineView");
-            if (obj) {
-                // stop loading
-                QMetaObject::invokeMethod(obj, "stop");
-            }
-        }
-
-        _webSurface->pause();
-
-        _webSurface->disconnect(_connection);
-        QObject::disconnect(_mousePressConnection);
-        _mousePressConnection = QMetaObject::Connection();
-        QObject::disconnect(_mouseReleaseConnection);
-        _mouseReleaseConnection = QMetaObject::Connection();
-        QObject::disconnect(_mouseMoveConnection);
-        _mouseMoveConnection = QMetaObject::Connection();
-        QObject::disconnect(_hoverLeaveConnection);
-        _hoverLeaveConnection = QMetaObject::Connection();
-        _webSurface.reset();
-
-        qCDebug(entities) << "Delete web surface: " << getID() << ", #" << _currentWebCount << ", url = " << _sourceUrl;
+        _webSurface->setProxyWindow(proxyWindow);
     }
 }
 
-void RenderableWebEntityItem::update(const quint64& now) {
-
-    if (_webSurface) {
-        // update globalPosition
-        _webSurface->getSurfaceContext()->setContextProperty("globalPosition", vec3toVariant(getPosition()));
-    }
-
-    auto interval = now - _lastRenderTime;
-    if (interval > MAX_NO_RENDER_INTERVAL) {
-        destroyWebSurface();
+QObject* WebEntityRenderer::getEventHandler() {
+    if (!_webSurface) {
+        return nullptr;
     }
+    return _webSurface->getEventHandler();
 }
 
-bool RenderableWebEntityItem::isTransparent() {
+bool WebEntityRenderer::isTransparent() const {
     float fadeRatio = _isFading ? Interpolate::calculateFadeRatio(_fadeStartTime) : 1.0f;
     return fadeRatio < OPAQUE_ALPHA_THRESHOLD;
 }
 
-QObject* RenderableWebEntityItem::getRootItem() {
-    if (_webSurface) {
-        return dynamic_cast<QObject*>(_webSurface->getRootItem());
-    }
-    return nullptr;
-}
-
-void RenderableWebEntityItem::emitScriptEvent(const QVariant& message) {
-    if (_webSurface) {
-        _webSurface->emitScriptEvent(message);
-    }
-}
diff --git a/libraries/entities-renderer/src/RenderableWebEntityItem.h b/libraries/entities-renderer/src/RenderableWebEntityItem.h
index 0f5d307766..2d162e57fe 100644
--- a/libraries/entities-renderer/src/RenderableWebEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableWebEntityItem.h
@@ -9,76 +9,68 @@
 #ifndef hifi_RenderableWebEntityItem_h
 #define hifi_RenderableWebEntityItem_h
 
-#include <QSharedPointer>
-#include <QMouseEvent>
-#include <QTouchEvent>
-#include <PointerEvent.h>
-#include <ui/OffscreenQmlSurface.h>
-
 #include <WebEntityItem.h>
-
 #include "RenderableEntityItem.h"
 
+class OffscreenQmlSurface;
+class PointerEvent;
 
-class QWindow;
-class QObject;
-class EntityTreeRenderer;
-class RenderableWebEntityItem;
+namespace render { namespace entities {
 
+class WebEntityRenderer : public TypedEntityRenderer<WebEntityItem> {
+    Q_OBJECT
+    using Parent = TypedEntityRenderer<WebEntityItem>;
+    friend class EntityRenderer;
 
-class RenderableWebEntityItem : public WebEntityItem, SimplerRenderableEntitySupport {
 public:
-    static EntityItemPointer factory(const EntityItemID& entityID, const EntityItemProperties& properties);
-    RenderableWebEntityItem(const EntityItemID& entityItemID);
-    ~RenderableWebEntityItem();
+    WebEntityRenderer(const EntityItemPointer& entity);
 
-    virtual void render(RenderArgs* args) override;
-    void loadSourceURL();
-    virtual void setSourceUrl(const QString& value) override;
+    Q_INVOKABLE void hoverLeaveEntity(const PointerEvent& event);
+    Q_INVOKABLE void handlePointerEvent(const PointerEvent& event);
+
+protected:
+    virtual void onRemoveFromSceneTyped(const TypedEntityPointer& entity) override;
+    virtual bool needsRenderUpdate() const override;
+    virtual bool needsRenderUpdateFromTypedEntity(const TypedEntityPointer& entity) const override;
+    virtual void doRenderUpdateSynchronousTyped(const ScenePointer& scene, Transaction& transaction, const TypedEntityPointer& entity) override;
+    virtual void doRender(RenderArgs* args) override;
+    virtual bool isTransparent() const override;
 
     virtual bool wantsHandControllerPointerEvents() const override { return true; }
     virtual bool wantsKeyboardFocus() const override { return true; }
     virtual void setProxyWindow(QWindow* proxyWindow) override;
     virtual QObject* getEventHandler() override;
 
-    void handlePointerEvent(const PointerEvent& event);
-
-    void update(const quint64& now) override;
-    bool needsToCallUpdate() const override { return _webSurface != nullptr; }
-
-    virtual void emitScriptEvent(const QVariant& message) override;
-
-    SIMPLE_RENDERABLE();
-
-    virtual bool isTransparent() override;
-
- public:
-
-    virtual QObject* getRootItem() override;
-
 private:
-    bool buildWebSurface(QSharedPointer<EntityTreeRenderer> renderer);
+    void onTimeout();
+    bool buildWebSurface(const TypedEntityPointer& entity);
     void destroyWebSurface();
-    glm::vec2 getWindowSize() const;
-
-    QSharedPointer<OffscreenQmlSurface> _webSurface;
-    QMetaObject::Connection _connection;
-    gpu::TexturePointer _texture;
-    bool _pressed{ false };
-    uint64_t _lastRenderTime{ 0 };
-    QTouchDevice _touchDevice;
-
-    QMetaObject::Connection _mousePressConnection;
-    QMetaObject::Connection _mouseReleaseConnection;
-    QMetaObject::Connection _mouseMoveConnection;
-    QMetaObject::Connection _hoverLeaveConnection;
+    bool hasWebSurface();
+    void loadSourceURL();
+    glm::vec2 getWindowSize(const TypedEntityPointer& entity) const;
 
+    int _geometryId{ 0 };
     enum contentType {
         htmlContent,
         qmlContent
     };
     contentType _contentType;
-    int _geometryId { 0 };
+    QSharedPointer<OffscreenQmlSurface> _webSurface;
+    glm::vec3 _contextPosition;
+    gpu::TexturePointer _texture;
+    bool _pressed{ false };
+    QString _lastSourceUrl;
+    uint16_t _lastDPI;
+    bool _lastLocked;
+    QTimer _timer;
+    uint64_t _lastRenderTime { 0 };
+    Transform _renderTransform;
 };
 
+} } // namespace 
+
+#if 0
+    virtual void emitScriptEvent(const QVariant& message) override;
+#endif
+
 #endif // hifi_RenderableWebEntityItem_h
diff --git a/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp b/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp
index a57a6e5d52..54cc888c35 100644
--- a/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp
@@ -15,558 +15,108 @@
 
 #include <model/Stage.h>
 
-#include <AbstractViewStateInterface.h>
 #include <DependencyManager.h>
 #include <GeometryCache.h>
 #include <PerfStat.h>
 #include <procedural/ProceduralSkybox.h>
+#include <LightPayload.h>
+#include <DeferredLightingEffect.h>
 
 #include "EntityTreeRenderer.h"
-#include "RenderableEntityItem.h"
-
-#include <LightPayload.h>
-#include "DeferredLightingEffect.h"
-
-
-class RenderableZoneEntityItemMeta {
-public:
-    RenderableZoneEntityItemMeta(EntityItemPointer entity);
-    ~RenderableZoneEntityItemMeta();
-
-    typedef render::Payload<RenderableZoneEntityItemMeta> Payload;
-    typedef Payload::DataPointer Pointer;
-
-    EntityItemPointer entity;
-
-    void render(RenderArgs* args);
-
-    void setVisible(bool visible) { _isVisible = visible; }
-    bool isVisible() const { return _isVisible; }
-
-    render::Item::Bound& editBound() { _needUpdate = true; return _bound; }
-
-    model::LightPointer editSunLight() { _needSunUpdate = true; return _sunLight; }
-    model::LightPointer editAmbientLight() { _needAmbientUpdate = true; return _ambientLight; }
-    model::SunSkyStagePointer editBackground() { _needBackgroundUpdate = true; return _background; }
-    model::SkyboxPointer editSkybox() { return editBackground()->getSkybox(); }
-
-    void setAmbientURL(const QString& ambientUrl);
-
-    void setSkyboxURL(const QString& skyboxUrl);
-
-    void setBackgroundMode(BackgroundMode mode);
-    void setSkyboxColor(const glm::vec3& color);
-    void setProceduralUserData(QString userData);
-
-protected:
-    render::Item::Bound _bound;
-
-    model::LightPointer _sunLight;
-    model::LightPointer _ambientLight;
-    model::SunSkyStagePointer _background;
-    BackgroundMode _backgroundMode { BACKGROUND_MODE_INHERIT };
-
-    LightStagePointer _stage;
-    LightStage::Index _sunIndex { LightStage::INVALID_INDEX };
-    LightStage::Index _ambientIndex { LightStage::INVALID_INDEX };
-
-    BackgroundStagePointer _backgroundStage;
-    BackgroundStage::Index _backgroundIndex { BackgroundStage::INVALID_INDEX };
-
-    bool _needUpdate { true };
-    bool _needSunUpdate { true };
-    bool _needAmbientUpdate { true };
-    bool _needBackgroundUpdate { true };
-    bool _isVisible { true };
-
-
-    void updateAmbientMap();
-    void updateSkyboxMap();
-
-    // More attributes used for rendering:
-    QString _ambientTextureURL;
-    NetworkTexturePointer _ambientTexture;
-    bool _pendingAmbientTexture { false };
-    bool _validAmbientTexture { false };
-
-    QString _skyboxTextureURL;
-    NetworkTexturePointer _skyboxTexture;
-    bool _pendingSkyboxTexture { false };
-    bool _validSkyboxTexture { false };
-
-    QString _proceduralUserData;
-};
 
 // Sphere entities should fit inside a cube entity of the same size, so a sphere that has dimensions 1x1x1
 // is a half unit sphere.  However, the geometry cache renders a UNIT sphere, so we need to scale down.
 static const float SPHERE_ENTITY_SCALE = 0.5f;
 
-EntityItemPointer RenderableZoneEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
-    EntityItemPointer entity{ new RenderableZoneEntityItem(entityID) };
-    entity->setProperties(properties);
-    return entity;
-}
+using namespace render;
+using namespace render::entities;
 
-template<typename Lambda>
-void RenderableZoneEntityItem::changeProperties(Lambda setNewProperties) {
-    QString oldShapeURL = getCompoundShapeURL();
-    glm::vec3 oldPosition = getPosition(), oldDimensions = getDimensions();
-    glm::quat oldRotation = getRotation();
-
-    setNewProperties();
-
-    if (oldShapeURL != getCompoundShapeURL()) {
-        if (_model) {
-            _model.reset();
-        }
-
-        _model = std::make_shared<Model>();
-        _model->setIsWireframe(true);
-        _model->init();
-        _needsInitialSimulation = true;
-        _model->setURL(getCompoundShapeURL());
-    }
-    if (oldPosition != getPosition() ||
-        oldRotation != getRotation() ||
-        oldDimensions != getDimensions()) {
-        _needsInitialSimulation = true;
-    }
-}
-
-bool RenderableZoneEntityItem::setProperties(const EntityItemProperties& properties) {
-    bool somethingChanged = false;
-    changeProperties([&]() {
-        somethingChanged = this->ZoneEntityItem::setProperties(properties);
-    });
-    return somethingChanged;
-}
-
-void RenderableZoneEntityItem::somethingChangedNotification() {
-    DependencyManager::get<EntityTreeRenderer>()->updateZone(_id);
-
-    // If graphics elements are changed, we need to update the render items
-    notifyChangedRenderItem();
-
-    // Poopagate back to parent
-    ZoneEntityItem::somethingChangedNotification();
-}
-
-
-int RenderableZoneEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data, int bytesLeftToRead,
-                                                                ReadBitstreamToTreeParams& args,
-                                                                EntityPropertyFlags& propertyFlags, bool overwriteLocalData,
-                                                                bool& somethingChanged) {
-    int bytesRead = 0;
-    changeProperties([&]() {
-        bytesRead = ZoneEntityItem::readEntitySubclassDataFromBuffer(data, bytesLeftToRead,
-                                                                     args, propertyFlags, 
-                                                                     overwriteLocalData, somethingChanged);
-    });
-    return bytesRead;
-}
-
-void RenderableZoneEntityItem::updateGeometry() {
-    if (_model && !_model->isActive() && hasCompoundShapeURL()) {
-        // Since we have a delayload, we need to update the geometry if it has been downloaded
-        _model->setURL(getCompoundShapeURL());
-    }
-    if (_model && _model->isActive() && _needsInitialSimulation) {
-        _model->setScaleToFit(true, getDimensions());
-        _model->setSnapModelToRegistrationPoint(true, getRegistrationPoint());
-        _model->setRotation(getRotation());
-        _model->setTranslation(getPosition());
-        _model->simulate(0.0f);
-        _needsInitialSimulation = false;
-    }
-}
-
-void RenderableZoneEntityItem::render(RenderArgs* args) {
-    Q_ASSERT(getType() == EntityTypes::Zone);
-
-    if (_drawZoneBoundaries) {
-        switch (getShapeType()) {
-            case SHAPE_TYPE_COMPOUND: {
-                PerformanceTimer perfTimer("zone->renderCompound");
-                updateGeometry();
-                if (_model && _model->needsFixupInScene()) {
-                    // check to see if when we added our models to the scene they were ready, if they were not ready, then
-                    // fix them up in the scene
-                    render::ScenePointer scene = AbstractViewStateInterface::instance()->getMain3DScene();
-                    render::Transaction transaction;
-                    _model->removeFromScene(scene, transaction);
-                    render::Item::Status::Getters statusGetters;
-                    makeEntityItemStatusGetters(getThisPointer(), statusGetters);
-                    _model->addToScene(scene, transaction);
-
-                    scene->enqueueTransaction(transaction);
-
-                    _model->setVisibleInScene(getVisible(), scene);
-                }
-                break;
-            }
-            case SHAPE_TYPE_BOX:
-            case SHAPE_TYPE_SPHERE: {
-                PerformanceTimer perfTimer("zone->renderPrimitive");
-                glm::vec4 DEFAULT_COLOR(1.0f, 1.0f, 1.0f, 1.0f);
-
-                Q_ASSERT(args->_batch);
-                gpu::Batch& batch = *args->_batch;
-
-                bool success;
-                auto shapeTransform = getTransformToCenter(success);
-                if (!success) {
-                    break;
-                }
-                auto geometryCache = DependencyManager::get<GeometryCache>();
-                if (getShapeType() == SHAPE_TYPE_SPHERE) {
-                    shapeTransform.postScale(SPHERE_ENTITY_SCALE);
-                    batch.setModelTransform(shapeTransform);
-                    geometryCache->renderWireSphereInstance(args, batch, DEFAULT_COLOR);
-                } else {
-                    batch.setModelTransform(shapeTransform);
-                    geometryCache->renderWireCubeInstance(args, batch, DEFAULT_COLOR);
-                }
-                break;
-            }
-            default:
-                // Not handled
-                break;
-        }
-    }
-
-    if ((!_drawZoneBoundaries || getShapeType() != SHAPE_TYPE_COMPOUND) &&
-        _model && !_model->needsFixupInScene()) {
-        // If the model is in the scene but doesn't need to be, remove it.
-        render::ScenePointer scene = AbstractViewStateInterface::instance()->getMain3DScene();
-        render::Transaction transaction;
-        _model->removeFromScene(scene, transaction);
-        scene->enqueueTransaction(transaction);
-    }
-}
-
-bool RenderableZoneEntityItem::contains(const glm::vec3& point) const {
-    if (getShapeType() != SHAPE_TYPE_COMPOUND) {
-        return EntityItem::contains(point);
-    }
-    const_cast<RenderableZoneEntityItem*>(this)->updateGeometry();
-
-    if (_model && _model->isActive() && EntityItem::contains(point)) {
-        return _model->convexHullContains(point);
-    }
-
-    return false;
-}
-
-bool RenderableZoneEntityItem::addToScene(const EntityItemPointer& self, const render::ScenePointer& scene,
-    render::Transaction& transaction) {
-    _myMetaItem = scene->allocateID();
-
-    auto renderData = std::make_shared<RenderableZoneEntityItemMeta>(self);
-    auto renderPayload = std::make_shared<RenderableZoneEntityItemMeta::Payload>(renderData);
-    updateKeyZoneItemFromEntity((*renderData));
-    updateKeySunFromEntity((*renderData));
-    updateKeyAmbientFromEntity((*renderData));
-    updateKeyBackgroundFromEntity((*renderData));
-
-    render::Item::Status::Getters statusGetters;
-    makeEntityItemStatusGetters(getThisPointer(), statusGetters);
-    renderPayload->addStatusGetters(statusGetters);
-
-    transaction.resetItem(_myMetaItem, renderPayload);
-
-    return true;
-}
-
-void RenderableZoneEntityItem::removeFromScene(const EntityItemPointer& self, const render::ScenePointer& scene,
-    render::Transaction& transaction) {
-    transaction.removeItem(_myMetaItem);
-    render::Item::clearID(_myMetaItem);
-    if (_model) {
-        _model->removeFromScene(scene, transaction);
-    }
-}
-
-void RenderableZoneEntityItem::notifyBoundChanged() {
-    notifyChangedRenderItem();
-}
-
-void RenderableZoneEntityItem::updateKeySunFromEntity(RenderableZoneEntityItemMeta& keyZonePayload) {
-    auto sunLight = keyZonePayload.editSunLight();
-    sunLight->setType(model::Light::SUN);
-
-    sunLight->setPosition(this->getPosition());
-    sunLight->setOrientation(this->getRotation());
-
-    // Set the keylight
-    sunLight->setColor(ColorUtils::toVec3(this->getKeyLightProperties().getColor()));
-    sunLight->setIntensity(this->getKeyLightProperties().getIntensity());
-    sunLight->setDirection(this->getKeyLightProperties().getDirection());
-}
-
-void RenderableZoneEntityItem::updateKeyAmbientFromEntity(RenderableZoneEntityItemMeta& keyZonePayload) {
-    auto ambientLight = keyZonePayload.editAmbientLight();
-    ambientLight->setType(model::Light::AMBIENT);
-
-    ambientLight->setPosition(this->getPosition());
-    ambientLight->setOrientation(this->getRotation());
-
-
-    // Set the keylight
-    ambientLight->setAmbientIntensity(this->getKeyLightProperties().getAmbientIntensity());
- 
-    if (this->getKeyLightProperties().getAmbientURL().isEmpty()) {
-        keyZonePayload.setAmbientURL(this->getSkyboxProperties().getURL());
-    } else {
-        keyZonePayload.setAmbientURL(this->getKeyLightProperties().getAmbientURL());
-    }
-
-}
-
-void RenderableZoneEntityItem::updateKeyBackgroundFromEntity(RenderableZoneEntityItemMeta& keyZonePayload) {
-    auto background = keyZonePayload.editBackground();
-
-    keyZonePayload.setBackgroundMode(this->getBackgroundMode());
-    keyZonePayload.setSkyboxColor(this->getSkyboxProperties().getColorVec3());
-    keyZonePayload.setProceduralUserData(this->getUserData());
-    keyZonePayload.setSkyboxURL(this->getSkyboxProperties().getURL());
-}
-
-
-void RenderableZoneEntityItem::updateKeyZoneItemFromEntity(RenderableZoneEntityItemMeta& keyZonePayload) {
-
-    keyZonePayload.setVisible(this->getVisible());
-
-    bool success;
-    keyZonePayload.editBound() = this->getAABox(success);
-    if (!success) {
-        keyZonePayload.editBound() = render::Item::Bound();
-    }
-
-    /* TODO: Implement the sun model behavior / Keep this code here for reference, this is how we
-    {
-        // Set the stage
-        bool isSunModelEnabled = this->getStageProperties().getSunModelEnabled();
-        sceneStage->setSunModelEnable(isSunModelEnabled);
-        if (isSunModelEnabled) {
-            sceneStage->setLocation(this->getStageProperties().getLongitude(),
-                this->getStageProperties().getLatitude(),
-                this->getStageProperties().getAltitude());
-
-            auto sceneTime = sceneStage->getTime();
-            sceneTime->setHour(this->getStageProperties().calculateHour());
-            sceneTime->setDay(this->getStageProperties().calculateDay());
-        }
-    }*/
-}
-
-
-void RenderableZoneEntityItem::sceneUpdateRenderItemFromEntity(render::Transaction& transaction) {
-    if (!render::Item::isValidID(_myMetaItem)) {
-        return;
-    }
-
-    bool sunChanged = _keyLightPropertiesChanged;
-    bool backgroundChanged = _backgroundPropertiesChanged;
-    bool skyboxChanged = _skyboxPropertiesChanged;
-
-    transaction.updateItem<RenderableZoneEntityItemMeta>(_myMetaItem, [=](RenderableZoneEntityItemMeta& data) {
-        
-        updateKeyZoneItemFromEntity(data);
-
-        if (sunChanged) {
-            updateKeySunFromEntity(data);
-        }
-
-        if (sunChanged || skyboxChanged) {
-            updateKeyAmbientFromEntity(data);
-        }
-        if (backgroundChanged || skyboxChanged) {
-            updateKeyBackgroundFromEntity(data);
-        }
-    });
-}
-
-void RenderableZoneEntityItem::notifyChangedRenderItem() {
-    if (!render::Item::isValidID(_myMetaItem)) {
-        return;
-    }
-
-    render::Transaction transaction;
-    render::ScenePointer scene = AbstractViewStateInterface::instance()->getMain3DScene();
-    sceneUpdateRenderItemFromEntity(transaction);
-    scene->enqueueTransaction(transaction);
-}
-
-
-
-
-
-
-
-
-
-namespace render {
-    template <> const ItemKey payloadGetKey(const RenderableZoneEntityItemMeta::Pointer& payload) {
-        return ItemKey::Builder().withTypeMeta().build();
-    }
-
-    template <> const Item::Bound payloadGetBound(const RenderableZoneEntityItemMeta::Pointer& payload) {
-        if (payload && payload->entity) {
-            bool success;
-            auto result = payload->entity->getAABox(success);
-            if (!success) {
-                return render::Item::Bound();
-            }
-            return result;
-        }
-        return render::Item::Bound();
-    }
-    template <> void payloadRender(const RenderableZoneEntityItemMeta::Pointer& payload, RenderArgs* args) {
-        payload->render(args);
-    }
-}
-
-RenderableZoneEntityItemMeta::RenderableZoneEntityItemMeta(EntityItemPointer entity) :
-    entity(entity),
-    _sunLight(std::make_shared<model::Light>()),
-    _ambientLight(std::make_shared<model::Light>()),
-    _background(std::make_shared<model::SunSkyStage>())
-{
+ZoneEntityRenderer::ZoneEntityRenderer(const EntityItemPointer& entity)
+    : Parent(entity) {
     _background->setSkybox(std::make_shared<ProceduralSkybox>());
 }
 
-
-RenderableZoneEntityItemMeta::~RenderableZoneEntityItemMeta() {
+void ZoneEntityRenderer::onRemoveFromSceneTyped(const TypedEntityPointer& entity) {
     if (_stage) {
         if (!LightStage::isIndexInvalid(_sunIndex)) {
             _stage->removeLight(_sunIndex);
+            _sunIndex = INVALID_INDEX;
+            _shadowIndex = INVALID_INDEX;
         }
         if (!LightStage::isIndexInvalid(_ambientIndex)) {
-            _stage->removeLight(_ambientIndex); 
-             
+            _stage->removeLight(_ambientIndex);
+            _ambientIndex = INVALID_INDEX;
         }
     }
 
     if (_backgroundStage) {
         if (!BackgroundStage::isIndexInvalid(_backgroundIndex)) {
             _backgroundStage->removeBackground(_backgroundIndex);
+            _backgroundIndex = INVALID_INDEX;
+        }
+    }
+
+    if (_hazeStage) {
+        if (!HazeStage::isIndexInvalid(_hazeIndex)) {
+            _hazeStage->removeHaze(_hazeIndex);
+            _hazeIndex = INVALID_INDEX;
         }
     }
 }
 
-void RenderableZoneEntityItemMeta::setAmbientURL(const QString& ambientUrl) {
-    // nothing change if nothing change
-    if (_ambientTextureURL == ambientUrl) {
-        return;
-    }
-    _ambientTextureURL = ambientUrl;
-
-    if (_ambientTextureURL.isEmpty()) {
-        _validAmbientTexture = false;
-        _pendingAmbientTexture = false;
-        _ambientTexture.clear();
-
-        _ambientLight->setAmbientMap(nullptr);
-        _ambientLight->setAmbientSpherePreset(gpu::SphericalHarmonics::BREEZEWAY);
-    } else {
-        _pendingAmbientTexture = true;
-        auto textureCache = DependencyManager::get<TextureCache>();
-        _ambientTexture = textureCache->getTexture(_ambientTextureURL, image::TextureUsage::CUBE_TEXTURE);
-    
-        // keep whatever is assigned on the ambient map/sphere until texture is loaded
-    }
-}
-
-void RenderableZoneEntityItemMeta::updateAmbientMap() {
-    if (_pendingAmbientTexture) {
-        if (_ambientTexture && _ambientTexture->isLoaded()) {
-            _pendingAmbientTexture = false;
-
-            auto texture = _ambientTexture->getGPUTexture();
-            if (texture) {
-                if (texture->getIrradiance()) {
-                    _ambientLight->setAmbientSphere(*texture->getIrradiance());
-                } else {
-                    _ambientLight->setAmbientSpherePreset(gpu::SphericalHarmonics::BREEZEWAY);
+void ZoneEntityRenderer::doRender(RenderArgs* args) {
+#if 0
+    if (ZoneEntityItem::getDrawZoneBoundaries()) {
+        switch (_entity->getShapeType()) {
+            case SHAPE_TYPE_BOX:
+            case SHAPE_TYPE_SPHERE:
+                {
+                    PerformanceTimer perfTimer("zone->renderPrimitive");
+                    static const glm::vec4 DEFAULT_COLOR(1.0f, 1.0f, 1.0f, 1.0f);
+                    if (!updateModelTransform()) {
+                        break;
+                    }
+                    auto geometryCache = DependencyManager::get<GeometryCache>();
+                    gpu::Batch& batch = *args->_batch;
+                    batch.setModelTransform(_modelTransform);
+                    if (_entity->getShapeType() == SHAPE_TYPE_SPHERE) {
+                        geometryCache->renderWireSphereInstance(args, batch, DEFAULT_COLOR);
+                    } else {
+                        geometryCache->renderWireCubeInstance(args, batch, DEFAULT_COLOR);
+                    }
                 }
-                editAmbientLight()->setAmbientMap(texture);
-                _validAmbientTexture = true;
-            } else {
-                qCDebug(entitiesrenderer) << "Failed to load ambient texture:" << _ambientTexture->getURL();
-            }
+                break;
+
+            // Compund shapes are handled by the _model member
+            case SHAPE_TYPE_COMPOUND:
+            default:
+                // Not handled
+                break;
         }
     }
-}
-
-
-void RenderableZoneEntityItemMeta::setSkyboxURL(const QString& skyboxUrl) {
-    // nothing change if nothing change
-    if (_skyboxTextureURL == skyboxUrl) {
-        return;
-    }
-    _skyboxTextureURL = skyboxUrl;
-
-    if (_skyboxTextureURL.isEmpty()) {
-        _validSkyboxTexture = false;
-        _pendingSkyboxTexture = false;
-        _skyboxTexture.clear();
-
-        editSkybox()->setCubemap(nullptr);
-    } else {
-        _pendingSkyboxTexture = true;
-        auto textureCache = DependencyManager::get<TextureCache>();
-        _skyboxTexture = textureCache->getTexture(_skyboxTextureURL, image::TextureUsage::CUBE_TEXTURE);
-    }
-}
-
-void RenderableZoneEntityItemMeta::updateSkyboxMap() {
-    if (_pendingSkyboxTexture) {
-        if (_skyboxTexture && _skyboxTexture->isLoaded()) {
-            _pendingSkyboxTexture = false;
-
-            auto texture = _skyboxTexture->getGPUTexture();
-            if (texture) {
-                editSkybox()->setCubemap(texture);
-                _validSkyboxTexture = true;
-            } else {
-                qCDebug(entitiesrenderer) << "Failed to load Skybox texture:" << _skyboxTexture->getURL();
-            }
-        }
-    }
-}
-
-void RenderableZoneEntityItemMeta::setBackgroundMode(BackgroundMode mode) {
-    _backgroundMode = mode;
-}
-
-void RenderableZoneEntityItemMeta::setSkyboxColor(const glm::vec3& color) {
-    editSkybox()->setColor(color);
-}
-
-void RenderableZoneEntityItemMeta::setProceduralUserData(QString userData) {
-    if (_proceduralUserData != userData) {
-        _proceduralUserData = userData;
-        std::dynamic_pointer_cast<ProceduralSkybox>(editSkybox())->parse(_proceduralUserData);
-    }
-}
-
-
-
-void RenderableZoneEntityItemMeta::render(RenderArgs* args) {
+#endif
     if (!_stage) {
         _stage = args->_scene->getStage<LightStage>();
+        assert(_stage);
     }
 
     if (!_backgroundStage) {
         _backgroundStage = args->_scene->getStage<BackgroundStage>();
+        assert(_backgroundStage);
+    }
+
+    if (!_hazeStage) {
+        _hazeStage = args->_scene->getStage<HazeStage>();
+        assert(_hazeStage);
     }
 
     { // Sun 
-        // Need an update ?
+      // Need an update ?
         if (_needSunUpdate) {
             // Do we need to allocate the light in the stage ?
             if (LightStage::isIndexInvalid(_sunIndex)) {
                 _sunIndex = _stage->addLight(_sunLight);
+                _shadowIndex = _stage->addShadow(_sunIndex);
             } else {
                 _stage->updateLightArrayBuffer(_sunIndex);
             }
@@ -602,7 +152,16 @@ void RenderableZoneEntityItemMeta::render(RenderArgs* args) {
         }
     }
 
-    if (isVisible()) {
+    {
+        if (_needHazeUpdate) {
+            if (HazeStage::isIndexInvalid(_hazeIndex)) {
+                _hazeIndex = _hazeStage->addHaze(_haze);
+            }
+            _needHazeUpdate = false;
+        }
+    }
+
+    if (_visible) {
         // FInally, push the light visible in the frame
         // THe directional key light for sure
         _stage->_currentFrame.pushSunLight(_sunIndex);
@@ -616,5 +175,339 @@ void RenderableZoneEntityItemMeta::render(RenderArgs* args) {
         if (_backgroundMode != BACKGROUND_MODE_INHERIT) {
             _backgroundStage->_currentFrame.pushBackground(_backgroundIndex);
         }
+
+        // Haze only if the mode is not inherit
+        if (_hazeMode != COMPONENT_MODE_INHERIT) {
+            _hazeStage->_currentFrame.pushHaze(_hazeIndex);
+        }
     }
 }
+
+void ZoneEntityRenderer::removeFromScene(const ScenePointer& scene, Transaction& transaction) {
+#if 0
+    if (_model) {
+        _model->removeFromScene(scene, transaction);
+    }
+#endif
+    Parent::removeFromScene(scene, transaction);
+}
+
+
+void ZoneEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& scene, Transaction& transaction, const TypedEntityPointer& entity) {
+    DependencyManager::get<EntityTreeRenderer>()->updateZone(entity->getID());
+
+    // FIXME one of the bools here could become true between being fetched and being reset, 
+    // resulting in a lost update
+    bool sunChanged = entity->keyLightPropertiesChanged();
+    bool backgroundChanged = entity->backgroundPropertiesChanged();
+    bool skyboxChanged = entity->skyboxPropertiesChanged();
+    bool hazeChanged = entity->hazePropertiesChanged();
+
+    entity->resetRenderingPropertiesChanged();
+    _lastPosition = entity->getPosition();
+    _lastRotation = entity->getRotation();
+    _lastDimensions = entity->getDimensions();
+
+    _keyLightProperties = entity->getKeyLightProperties();
+    _skyboxProperties = entity->getSkyboxProperties();
+    _hazeProperties = entity->getHazeProperties();
+    _stageProperties = entity->getStageProperties();
+
+#if 0
+    if (_lastShapeURL != _typedEntity->getCompoundShapeURL()) {
+        _lastShapeURL = _typedEntity->getCompoundShapeURL();
+        _model.reset();
+        _model = std::make_shared<Model>();
+        _model->setIsWireframe(true);
+        _model->init();
+        _model->setURL(_lastShapeURL);
+    }
+
+    if (_model && _model->isActive()) {
+        _model->setScaleToFit(true, _lastDimensions);
+        _model->setSnapModelToRegistrationPoint(true, _entity->getRegistrationPoint());
+        _model->setRotation(_lastRotation);
+        _model->setTranslation(_lastPosition);
+        _model->simulate(0.0f);
+    }
+#endif
+
+    updateKeyZoneItemFromEntity();
+
+    if (sunChanged) {
+        updateKeySunFromEntity();
+    }
+
+    if (sunChanged || skyboxChanged) {
+        updateKeyAmbientFromEntity();
+    }
+
+    if (backgroundChanged || skyboxChanged) {
+        updateKeyBackgroundFromEntity(entity);
+    }
+
+    if (hazeChanged) {
+        updateHazeFromEntity(entity);
+    }
+}
+
+void ZoneEntityRenderer::doRenderUpdateAsynchronousTyped(const TypedEntityPointer& entity) {
+    if (entity->getShapeType() == SHAPE_TYPE_SPHERE) {
+        _renderTransform = getModelTransform();
+        _renderTransform.postScale(SPHERE_ENTITY_SCALE);
+    }
+}
+
+
+ItemKey ZoneEntityRenderer::getKey() {
+    return ItemKey::Builder().withTypeMeta().build();
+}
+
+bool ZoneEntityRenderer::needsRenderUpdateFromTypedEntity(const TypedEntityPointer& entity) const {
+    if (entity->keyLightPropertiesChanged() ||
+        entity->backgroundPropertiesChanged() ||
+        entity->hazePropertiesChanged() ||
+        entity->skyboxPropertiesChanged()) {
+        return true;
+    }
+
+    if (_skyboxTextureURL != entity->getSkyboxProperties().getURL()) {
+        return true;
+    }
+
+    if (entity->getPosition() != _lastPosition) {
+        return true;
+    }
+    if (entity->getDimensions() != _lastDimensions) {
+        return true;
+    }
+    if (entity->getRotation() != _lastRotation) {
+        return true;
+    }
+
+#if 0
+    if (_typedEntity->getCompoundShapeURL() != _lastShapeURL) {
+        return true;
+    }
+
+    if (_model) {
+        if (!_model->needsFixupInScene() && (!ZoneEntityItem::getDrawZoneBoundaries() || _entity->getShapeType() != SHAPE_TYPE_COMPOUND)) {
+            return true;
+        }
+
+        if (_model->needsFixupInScene() && (ZoneEntityItem::getDrawZoneBoundaries() || _entity->getShapeType() == SHAPE_TYPE_COMPOUND)) {
+            return true;
+        }
+
+        if (_lastModelActive != _model->isActive()) {
+            return true;
+        }
+    }
+#endif
+
+    return false;
+}
+
+void ZoneEntityRenderer::updateKeySunFromEntity() {
+    const auto& sunLight = editSunLight();
+    sunLight->setType(model::Light::SUN);
+    sunLight->setPosition(_lastPosition);
+    sunLight->setOrientation(_lastRotation);
+
+    // Set the keylight
+    sunLight->setColor(ColorUtils::toVec3(_keyLightProperties.getColor()));
+    sunLight->setIntensity(_keyLightProperties.getIntensity());
+    sunLight->setDirection(_keyLightProperties.getDirection());
+}
+
+void ZoneEntityRenderer::updateKeyAmbientFromEntity() {
+    const auto& ambientLight = editAmbientLight();
+    ambientLight->setType(model::Light::AMBIENT);
+    ambientLight->setPosition(_lastPosition);
+    ambientLight->setOrientation(_lastRotation);
+
+
+    // Set the keylight
+    ambientLight->setAmbientIntensity(_keyLightProperties.getAmbientIntensity());
+
+    if (_keyLightProperties.getAmbientURL().isEmpty()) {
+        setAmbientURL(_skyboxProperties.getURL());
+    } else {
+        setAmbientURL(_keyLightProperties.getAmbientURL());
+    }
+}
+
+void ZoneEntityRenderer::updateHazeFromEntity(const TypedEntityPointer& entity) {
+    setHazeMode((ComponentMode)entity->getHazeMode());
+
+    const auto& haze = editHaze();
+
+    const uint32_t hazeMode = entity->getHazeMode();
+    haze->setHazeActive(hazeMode == COMPONENT_MODE_ENABLED);
+    haze->setAltitudeBased(_hazeProperties.getHazeAltitudeEffect());
+
+    haze->setHazeRangeFactor(model::Haze::convertHazeRangeToHazeRangeFactor(_hazeProperties.getHazeRange()));
+    xColor hazeColor = _hazeProperties.getHazeColor();
+    haze->setHazeColor(glm::vec3(hazeColor.red / 255.0, hazeColor.green / 255.0, hazeColor.blue / 255.0));
+    xColor hazeGlareColor = _hazeProperties.getHazeGlareColor();
+    haze->setHazeGlareColor(glm::vec3(hazeGlareColor.red / 255.0, hazeGlareColor.green / 255.0, hazeGlareColor.blue / 255.0));
+    haze->setHazeEnableGlare(_hazeProperties.getHazeEnableGlare());
+    haze->setHazeGlareBlend(model::Haze::convertGlareAngleToPower(_hazeProperties.getHazeGlareAngle()));
+
+    float hazeAltitude = _hazeProperties.getHazeCeiling() - _hazeProperties.getHazeBaseRef();
+    haze->setHazeAltitudeFactor(model::Haze::convertHazeAltitudeToHazeAltitudeFactor(hazeAltitude));
+    haze->setHazeBaseReference(_hazeProperties.getHazeBaseRef());
+
+    haze->setHazeBackgroundBlend(_hazeProperties.getHazeBackgroundBlend());
+
+    haze->setHazeAttenuateKeyLight(_hazeProperties.getHazeAttenuateKeyLight());
+    haze->setHazeKeyLightRangeFactor(model::Haze::convertHazeRangeToHazeRangeFactor(_hazeProperties.getHazeKeyLightRange()));
+    haze->setHazeKeyLightAltitudeFactor(model::Haze::convertHazeAltitudeToHazeAltitudeFactor(_hazeProperties.getHazeKeyLightAltitude()));
+
+    haze->setZoneTransform(entity->getTransform().getMatrix());
+}
+
+void ZoneEntityRenderer::updateKeyBackgroundFromEntity(const TypedEntityPointer& entity) {
+    editBackground();
+    setBackgroundMode(entity->getBackgroundMode());
+    setSkyboxColor(_skyboxProperties.getColorVec3());
+    setProceduralUserData(entity->getUserData());
+    setSkyboxURL(_skyboxProperties.getURL());
+}
+
+void ZoneEntityRenderer::updateKeyZoneItemFromEntity() {
+    /* TODO: Implement the sun model behavior / Keep this code here for reference, this is how we
+    {
+    // Set the stage
+    bool isSunModelEnabled = this->getStageProperties().getSunModelEnabled();
+    sceneStage->setSunModelEnable(isSunModelEnabled);
+    if (isSunModelEnabled) {
+    sceneStage->setLocation(this->getStageProperties().getLongitude(),
+    this->getStageProperties().getLatitude(),
+    this->getStageProperties().getAltitude());
+
+    auto sceneTime = sceneStage->getTime();
+    sceneTime->setHour(this->getStageProperties().calculateHour());
+    sceneTime->setDay(this->getStageProperties().calculateDay());
+    }
+    }*/
+}
+
+void ZoneEntityRenderer::setAmbientURL(const QString& ambientUrl) {
+    // nothing change if nothing change
+    if (_ambientTextureURL == ambientUrl) {
+        return;
+    }
+    _ambientTextureURL = ambientUrl;
+
+    if (_ambientTextureURL.isEmpty()) {
+        _validAmbientTexture = false;
+        _pendingAmbientTexture = false;
+        _ambientTexture.clear();
+
+        _ambientLight->setAmbientMap(nullptr);
+        _ambientLight->setAmbientSpherePreset(gpu::SphericalHarmonics::BREEZEWAY);
+    } else {
+        _pendingAmbientTexture = true;
+        auto textureCache = DependencyManager::get<TextureCache>();
+        _ambientTexture = textureCache->getTexture(_ambientTextureURL, image::TextureUsage::CUBE_TEXTURE);
+
+        // keep whatever is assigned on the ambient map/sphere until texture is loaded
+}
+}
+
+void ZoneEntityRenderer::updateAmbientMap() {
+    if (_pendingAmbientTexture) {
+        if (_ambientTexture && _ambientTexture->isLoaded()) {
+            _pendingAmbientTexture = false;
+
+            auto texture = _ambientTexture->getGPUTexture();
+            if (texture) {
+                if (texture->getIrradiance()) {
+                    _ambientLight->setAmbientSphere(*texture->getIrradiance());
+                } else {
+                    _ambientLight->setAmbientSpherePreset(gpu::SphericalHarmonics::BREEZEWAY);
+                }
+                editAmbientLight()->setAmbientMap(texture);
+                _validAmbientTexture = true;
+            } else {
+                qCDebug(entitiesrenderer) << "Failed to load ambient texture:" << _ambientTexture->getURL();
+            }
+        }
+    }
+}
+
+void ZoneEntityRenderer::setSkyboxURL(const QString& skyboxUrl) {
+    // nothing change if nothing change
+    if (_skyboxTextureURL == skyboxUrl) {
+        return;
+    }
+    _skyboxTextureURL = skyboxUrl;
+
+    if (_skyboxTextureURL.isEmpty()) {
+        _validSkyboxTexture = false;
+        _pendingSkyboxTexture = false;
+        _skyboxTexture.clear();
+
+        editSkybox()->setCubemap(nullptr);
+    } else {
+        _pendingSkyboxTexture = true;
+        auto textureCache = DependencyManager::get<TextureCache>();
+        _skyboxTexture = textureCache->getTexture(_skyboxTextureURL, image::TextureUsage::CUBE_TEXTURE);
+    }
+}
+
+void ZoneEntityRenderer::updateSkyboxMap() {
+    if (_pendingSkyboxTexture) {
+        if (_skyboxTexture && _skyboxTexture->isLoaded()) {
+            _pendingSkyboxTexture = false;
+
+            auto texture = _skyboxTexture->getGPUTexture();
+            if (texture) {
+                editSkybox()->setCubemap(texture);
+                _validSkyboxTexture = true;
+            } else {
+                qCDebug(entitiesrenderer) << "Failed to load Skybox texture:" << _skyboxTexture->getURL();
+            }
+        }
+    }
+}
+
+void ZoneEntityRenderer::setBackgroundMode(BackgroundMode mode) {
+    _backgroundMode = mode;
+}
+
+void ZoneEntityRenderer::setHazeMode(ComponentMode mode) {
+    _hazeMode = mode;
+}
+
+void ZoneEntityRenderer::setSkyboxColor(const glm::vec3& color) {
+    editSkybox()->setColor(color);
+}
+
+void ZoneEntityRenderer::setProceduralUserData(const QString& userData) {
+    if (_proceduralUserData != userData) {
+        _proceduralUserData = userData;
+        std::dynamic_pointer_cast<ProceduralSkybox>(editSkybox())->parse(_proceduralUserData);
+    }
+}
+
+#if 0
+bool RenderableZoneEntityItem::contains(const glm::vec3& point) const {
+    if (getShapeType() != SHAPE_TYPE_COMPOUND) {
+        return EntityItem::contains(point);
+    }
+    const_cast<RenderableZoneEntityItem*>(this)->updateGeometry();
+
+    if (_model && _model->isActive() && EntityItem::contains(point)) {
+        return _model->convexHullContains(point);
+    }
+
+    return false;
+}
+
+void RenderableZoneEntityItem::notifyBoundChanged() {
+    notifyChangedRenderItem();
+}
+
+#endif
diff --git a/libraries/entities-renderer/src/RenderableZoneEntityItem.h b/libraries/entities-renderer/src/RenderableZoneEntityItem.h
index 4685a0d3e1..050a8a4386 100644
--- a/libraries/entities-renderer/src/RenderableZoneEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableZoneEntityItem.h
@@ -12,9 +12,120 @@
 #ifndef hifi_RenderableZoneEntityItem_h
 #define hifi_RenderableZoneEntityItem_h
 
-#include <Model.h>
 #include <ZoneEntityItem.h>
+#include <model/Skybox.h>
+#include <model/Haze.h>
+#include <model/Stage.h>
+#include <LightStage.h>
+#include <BackgroundStage.h>
+#include <HazeStage.h>
+#include <TextureCache.h>
 #include "RenderableEntityItem.h"
+#include <ComponentMode.h>
+
+#if 0
+#include <Model.h>
+#endif
+namespace render { namespace entities { 
+
+class ZoneEntityRenderer : public TypedEntityRenderer<ZoneEntityItem> {
+    using Parent = TypedEntityRenderer<ZoneEntityItem>;
+    friend class EntityRenderer;
+
+public:
+    ZoneEntityRenderer(const EntityItemPointer& entity);
+
+protected:
+    virtual void onRemoveFromSceneTyped(const TypedEntityPointer& entity) override;
+    virtual ItemKey getKey() override;
+    virtual void doRender(RenderArgs* args) override;
+    virtual void removeFromScene(const ScenePointer& scene, Transaction& transaction) override;
+    virtual bool needsRenderUpdateFromTypedEntity(const TypedEntityPointer& entity) const override;
+    virtual void doRenderUpdateSynchronousTyped(const ScenePointer& scene, Transaction& transaction, const TypedEntityPointer& entity) override;
+    virtual void doRenderUpdateAsynchronousTyped(const TypedEntityPointer& entity) override;
+
+private:
+    void updateKeyZoneItemFromEntity();
+    void updateKeySunFromEntity();
+    void updateKeyAmbientFromEntity();
+    void updateHazeFromEntity(const TypedEntityPointer& entity);
+    void updateKeyBackgroundFromEntity(const TypedEntityPointer& entity);
+    void updateAmbientMap();
+    void updateSkyboxMap();
+    void setAmbientURL(const QString& ambientUrl);
+    void setSkyboxURL(const QString& skyboxUrl);
+    void setBackgroundMode(BackgroundMode mode);
+    void setHazeMode(ComponentMode mode);
+    void setSkyboxColor(const glm::vec3& color);
+    void setProceduralUserData(const QString& userData);
+
+    model::LightPointer editSunLight() { _needSunUpdate = true; return _sunLight; }
+    model::LightPointer editAmbientLight() { _needAmbientUpdate = true; return _ambientLight; }
+    model::SunSkyStagePointer editBackground() { _needBackgroundUpdate = true; return _background; }
+    model::SkyboxPointer editSkybox() { return editBackground()->getSkybox(); }
+    model::HazePointer editHaze() { _needHazeUpdate = true; return _haze; }
+
+    bool _needsInitialSimulation{ true };
+    glm::vec3 _lastPosition;
+    glm::vec3 _lastDimensions;
+    glm::quat _lastRotation;
+
+    // FIXME compount shapes are currently broken
+    // FIXME draw zone boundaries are currently broken (also broken in master)
+#if 0
+    ModelPointer _model;
+    bool _lastModelActive { false };
+    QString _lastShapeURL;
+#endif
+
+    LightStagePointer _stage;
+    const model::LightPointer _sunLight{ std::make_shared<model::Light>() };
+    const model::LightPointer _ambientLight{ std::make_shared<model::Light>() };
+    const model::SunSkyStagePointer _background{ std::make_shared<model::SunSkyStage>() };
+    const model::HazePointer _haze{ std::make_shared<model::Haze>() };
+
+    BackgroundMode _backgroundMode{ BACKGROUND_MODE_INHERIT };
+    ComponentMode _hazeMode{ COMPONENT_MODE_INHERIT };
+
+    indexed_container::Index _sunIndex{ LightStage::INVALID_INDEX };
+    indexed_container::Index _shadowIndex{ LightStage::INVALID_INDEX };
+    indexed_container::Index _ambientIndex{ LightStage::INVALID_INDEX };
+
+    BackgroundStagePointer _backgroundStage;
+    BackgroundStage::Index _backgroundIndex{ BackgroundStage::INVALID_INDEX };
+
+    HazeStagePointer _hazeStage;
+    HazeStage::Index _hazeIndex{ HazeStage::INVALID_INDEX };
+
+    bool _needUpdate{ true };
+    bool _needSunUpdate{ true };
+    bool _needAmbientUpdate{ true };
+    bool _needBackgroundUpdate{ true };
+    bool _needHazeUpdate{ true };
+
+    KeyLightPropertyGroup _keyLightProperties;
+    HazePropertyGroup _hazeProperties;
+    StagePropertyGroup _stageProperties;
+    SkyboxPropertyGroup _skyboxProperties;
+
+    // More attributes used for rendering:
+    QString _ambientTextureURL;
+    NetworkTexturePointer _ambientTexture;
+    bool _pendingAmbientTexture{ false };
+    bool _validAmbientTexture{ false };
+
+    QString _skyboxTextureURL;
+    NetworkTexturePointer _skyboxTexture;
+    bool _pendingSkyboxTexture{ false };
+    bool _validSkyboxTexture{ false };
+
+    QString _proceduralUserData;
+    Transform _renderTransform;
+};
+
+} } // namespace 
+
+#if 0
 
 class NetworkGeometry;
 class KeyLightPayload;
@@ -23,54 +134,16 @@ class RenderableZoneEntityItemMeta;
 
 class RenderableZoneEntityItem : public ZoneEntityItem, public RenderableEntityInterface  {
 public:
-    static EntityItemPointer factory(const EntityItemID& entityID, const EntityItemProperties& properties);
-    
-    RenderableZoneEntityItem(const EntityItemID& entityItemID) :
-        ZoneEntityItem(entityItemID),
-        _model(nullptr),
-        _needsInitialSimulation(true)
-    { }
-    
-    RenderableEntityInterface* getRenderableInterface() override { return this; }
-
-    virtual bool setProperties(const EntityItemProperties& properties) override;
-    virtual void somethingChangedNotification() override;
-
-    virtual int readEntitySubclassDataFromBuffer(const unsigned char* data, int bytesLeftToRead,
-                                                 ReadBitstreamToTreeParams& args,
-                                                 EntityPropertyFlags& propertyFlags, bool overwriteLocalData,
-                                                 bool& somethingChanged) override;
-
-    virtual void render(RenderArgs* args) override;
     virtual bool contains(const glm::vec3& point) const override;
-    
     virtual bool addToScene(const EntityItemPointer& self, const render::ScenePointer& scene, render::Transaction& transaction) override;
     virtual void removeFromScene(const EntityItemPointer& self, const render::ScenePointer& scene, render::Transaction& transaction) override;
-    
-    render::ItemID getRenderItemID() const { return _myMetaItem; }
-    
 private:
     virtual void locationChanged(bool tellPhysics = true) override { EntityItem::locationChanged(tellPhysics); notifyBoundChanged(); }
     virtual void dimensionsChanged() override { EntityItem::dimensionsChanged(); notifyBoundChanged(); }
     void notifyBoundChanged();
-
-    void updateGeometry();
-    
-    template<typename Lambda>
-    void changeProperties(Lambda functor);
-
     void notifyChangedRenderItem();
     void sceneUpdateRenderItemFromEntity(render::Transaction& transaction);
-    void updateKeyZoneItemFromEntity(RenderableZoneEntityItemMeta& keyZonePayload);
-
-    void updateKeySunFromEntity(RenderableZoneEntityItemMeta& keyZonePayload);
-    void updateKeyAmbientFromEntity(RenderableZoneEntityItemMeta& keyZonePayload);
-    void updateKeyBackgroundFromEntity(RenderableZoneEntityItemMeta& keyZonePayload);
-
-    ModelPointer _model;
-    bool _needsInitialSimulation;
-
-    render::ItemID _myMetaItem{ render::Item::INVALID_ITEM_ID };
 };
+#endif
 
 #endif // hifi_RenderableZoneEntityItem_h
diff --git a/libraries/entities-renderer/src/paintStroke.slf b/libraries/entities-renderer/src/paintStroke.slf
index bfbe6d7e5a..738561eccc 100644
--- a/libraries/entities-renderer/src/paintStroke.slf
+++ b/libraries/entities-renderer/src/paintStroke.slf
@@ -38,9 +38,9 @@ void main(void) {
     int frontCondition = 1 -int(gl_FrontFacing) * 2;
     vec3 color = varColor.rgb;
     packDeferredFragmentTranslucent(
-        interpolatedNormal * frontCondition,
+        float(frontCondition) * interpolatedNormal,
         texel.a * varColor.a,
-        polyline.color * texel.rgb,
+        color * texel.rgb,
         vec3(0.01, 0.01, 0.01),
         10.0);
 }
diff --git a/libraries/entities-renderer/src/paintStroke_fade.slf b/libraries/entities-renderer/src/paintStroke_fade.slf
new file mode 100644
index 0000000000..cc037aeac4
--- /dev/null
+++ b/libraries/entities-renderer/src/paintStroke_fade.slf
@@ -0,0 +1,53 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  paintStroke_fade.slf
+//  fragment shader
+//
+//  Created by Olivier Prat on 19/07/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+<@include DeferredBufferWrite.slh@>
+
+<@include Fade.slh@>
+<$declareFadeFragment()$>
+
+// the albedo texture
+uniform sampler2D originalTexture;
+
+// the interpolated normal
+in vec3 interpolatedNormal;
+in vec2 varTexcoord;
+in vec4 varColor;
+in vec4 _worldPosition;
+
+struct PolyLineUniforms {
+    vec3 color;
+};
+
+uniform polyLineBuffer {
+    PolyLineUniforms polyline;
+};
+
+void main(void) {
+    vec3 fadeEmissive;
+    FadeObjectParams fadeParams;
+
+    <$fetchFadeObjectParams(fadeParams)$>
+    applyFade(fadeParams, _worldPosition.xyz, fadeEmissive);
+    
+    vec4 texel = texture(originalTexture, varTexcoord);
+    int frontCondition = 1 -int(gl_FrontFacing) * 2;
+    vec3 color = varColor.rgb;
+    packDeferredFragmentTranslucent(
+        interpolatedNormal * frontCondition,
+        texel.a * varColor.a,
+        polyline.color * texel.rgb + fadeEmissive,
+        vec3(0.01, 0.01, 0.01),
+        10.0);
+}
diff --git a/libraries/entities-renderer/src/paintStroke_fade.slv b/libraries/entities-renderer/src/paintStroke_fade.slv
new file mode 100644
index 0000000000..9f10fa5d91
--- /dev/null
+++ b/libraries/entities-renderer/src/paintStroke_fade.slv
@@ -0,0 +1,43 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  paintStroke_fade.slv
+//  vertex shader
+//
+//  Created by Olivier Prat on 19/07/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+<@include gpu/Inputs.slh@>
+<@include gpu/Color.slh@>
+<@include gpu/Transform.slh@>
+<$declareStandardTransform()$>
+
+// the interpolated normal
+out vec3 interpolatedNormal;
+
+//the diffuse texture
+out vec2 varTexcoord;
+
+out vec4 varColor;
+out vec4 _worldPosition;
+
+void main(void) {
+    
+    varTexcoord = inTexCoord0.st;
+    
+    // pass along the diffuse color
+    varColor = colorToLinearRGBA(inColor);
+
+
+    // standard transform
+    TransformCamera cam = getTransformCamera();
+    TransformObject obj = getTransformObject();
+    <$transformModelToClipPos(cam, obj, inPosition, gl_Position)$>
+    <$transformModelToEyeDir(cam, obj, inNormal.xyz, interpolatedNormal)$>
+    <$transformModelToWorldPos(obj, inPosition, _worldPosition)$>
+}
\ No newline at end of file
diff --git a/libraries/entities-renderer/src/polyvox_fade.slf b/libraries/entities-renderer/src/polyvox_fade.slf
new file mode 100644
index 0000000000..7af43be53f
--- /dev/null
+++ b/libraries/entities-renderer/src/polyvox_fade.slf
@@ -0,0 +1,64 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//  polyvox_fade.frag
+//  fragment shader
+//
+//  Created by Olivier Prat on 2017-06-08
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+<@include model/Material.slh@>
+<@include DeferredBufferWrite.slh@>
+
+<@include Fade.slh@>
+
+in vec3 _normal;
+in vec4 _position;
+in vec4 _worldPosition;
+in vec4 _worldFadePosition;
+
+uniform sampler2D xMap;
+uniform sampler2D yMap;
+uniform sampler2D zMap;
+uniform vec3 voxelVolumeSize;
+
+// Declare after all samplers to prevent sampler location mix up with voxel shading (sampler locations are hardcoded in RenderablePolyVoxEntityItem)
+<$declareFadeFragment()$>
+
+void main(void) {
+    vec3    emissive;
+    FadeObjectParams fadeParams;
+
+    <$fetchFadeObjectParams(fadeParams)$>
+    applyFade(fadeParams, _worldFadePosition.xyz, emissive);
+
+    vec3 worldNormal = cross(dFdy(_worldPosition.xyz), dFdx(_worldPosition.xyz));
+    worldNormal = normalize(worldNormal);
+
+    float inPositionX = (_worldPosition.x - 0.5) / voxelVolumeSize.x;
+    float inPositionY = (_worldPosition.y - 0.5) / voxelVolumeSize.y;
+    float inPositionZ = (_worldPosition.z - 0.5) / voxelVolumeSize.z;
+
+    vec4 xyDiffuse = texture(xMap, vec2(-inPositionX, -inPositionY));
+    vec4 xzDiffuse = texture(yMap, vec2(-inPositionX, inPositionZ));
+    vec4 yzDiffuse = texture(zMap, vec2(inPositionZ, -inPositionY));
+
+    vec3 xyDiffuseScaled = xyDiffuse.rgb * abs(worldNormal.z);
+    vec3 xzDiffuseScaled = xzDiffuse.rgb * abs(worldNormal.y);
+    vec3 yzDiffuseScaled = yzDiffuse.rgb * abs(worldNormal.x);
+    vec4 diffuse = vec4(xyDiffuseScaled + xzDiffuseScaled + yzDiffuseScaled, 1.0);
+
+    packDeferredFragment(
+        _normal,
+        1.0,
+        vec3(diffuse),
+        DEFAULT_ROUGHNESS,
+        DEFAULT_METALLIC,
+        DEFAULT_EMISSIVE+emissive,
+        DEFAULT_OCCLUSION,
+        DEFAULT_SCATTERING);
+}
diff --git a/libraries/entities-renderer/src/polyvox_fade.slv b/libraries/entities-renderer/src/polyvox_fade.slv
new file mode 100644
index 0000000000..506b5d16e7
--- /dev/null
+++ b/libraries/entities-renderer/src/polyvox_fade.slv
@@ -0,0 +1,33 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//  polyvox_fade.vert
+//  vertex shader
+//
+//  Created by Seth Alves on 2015-8-3
+//  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 gpu/Inputs.slh@>
+
+<@include gpu/Transform.slh@>
+
+<$declareStandardTransform()$>
+
+out vec4 _position;
+out vec4 _worldPosition;
+out vec4 _worldFadePosition;
+out vec3 _normal;
+
+void main(void) {
+    // standard transform
+    TransformCamera cam = getTransformCamera();
+    TransformObject obj = getTransformObject();
+    <$transformModelToEyeAndClipPos(cam, obj, inPosition, _position, gl_Position)$>
+    <$transformModelToEyeDir(cam, obj, inNormal.xyz, _normal)$>
+    <$transformModelToWorldPos(obj, inPosition, _worldFadePosition)$>
+    _worldPosition = inPosition;
+}
diff --git a/libraries/entities/CMakeLists.txt b/libraries/entities/CMakeLists.txt
index 19341ec3e2..c23740654e 100644
--- a/libraries/entities/CMakeLists.txt
+++ b/libraries/entities/CMakeLists.txt
@@ -1,3 +1,4 @@
 set(TARGET_NAME entities)
 setup_hifi_library(Network Script)
-link_hifi_libraries(shared networking octree avatars)
+include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}")
+link_hifi_libraries(shared networking octree avatars model)
diff --git a/libraries/entities/src/AddEntityOperator.cpp b/libraries/entities/src/AddEntityOperator.cpp
index e86e70dd80..2ff1c6f622 100644
--- a/libraries/entities/src/AddEntityOperator.cpp
+++ b/libraries/entities/src/AddEntityOperator.cpp
@@ -9,18 +9,17 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AddEntityOperator.h"
+
 #include "EntityItem.h"
 #include "EntityTree.h"
 #include "EntityTreeElement.h"
 
-#include "AddEntityOperator.h"
-
 AddEntityOperator::AddEntityOperator(EntityTreePointer tree, EntityItemPointer newEntity) :
     _tree(tree),
     _newEntity(newEntity),
-    _foundNew(false),
-    _changeTime(usecTimestampNow()),
-    _newEntityBox()
+    _newEntityBox(),
+    _foundNew(false)
 {
     // caller must have verified existence of newEntity
     assert(_newEntity);
@@ -46,10 +45,8 @@ bool AddEntityOperator::preRecursion(const OctreeElementPointer& element) {
 
         // If this element is the best fit for the new entity properties, then add/or update it
         if (entityTreeElement->bestFitBounds(_newEntityBox)) {
-
+            _tree->addEntityMapEntry(_newEntity);
             entityTreeElement->addEntityItem(_newEntity);
-            _tree->setContainingElement(_newEntity->getEntityItemID(), entityTreeElement);
-
             _foundNew = true;
             keepSearching = false;
         } else {
diff --git a/libraries/entities/src/AddEntityOperator.h b/libraries/entities/src/AddEntityOperator.h
index 48ee49f4d1..0c36797e24 100644
--- a/libraries/entities/src/AddEntityOperator.h
+++ b/libraries/entities/src/AddEntityOperator.h
@@ -12,20 +12,28 @@
 #ifndef hifi_AddEntityOperator_h
 #define hifi_AddEntityOperator_h
 
+#include <memory>
+
+#include <AABox.h>
+#include <Octree.h>
+
+#include "EntityTypes.h"
+
+class EntityTree;
+using EntityTreePointer = std::shared_ptr<EntityTree>;
+
 class AddEntityOperator : public RecurseOctreeOperator {
 public:
     AddEntityOperator(EntityTreePointer tree, EntityItemPointer newEntity);
-                            
+
     virtual bool preRecursion(const OctreeElementPointer& element) override;
     virtual bool postRecursion(const OctreeElementPointer& element) override;
     virtual OctreeElementPointer possiblyCreateChildAt(const OctreeElementPointer& element, int childIndex) override;
 private:
     EntityTreePointer _tree;
     EntityItemPointer _newEntity;
-    bool _foundNew;
-    quint64 _changeTime;
-
     AABox _newEntityBox;
+    bool _foundNew;
 };
 
 
diff --git a/libraries/entities/src/AnimationPropertyGroup.cpp b/libraries/entities/src/AnimationPropertyGroup.cpp
index 848d4352a7..d6a2937553 100644
--- a/libraries/entities/src/AnimationPropertyGroup.cpp
+++ b/libraries/entities/src/AnimationPropertyGroup.cpp
@@ -18,86 +18,65 @@
 #include "EntityItemProperties.h"
 #include "EntityItemPropertiesMacros.h"
 
+const float AnimationPropertyGroup::MAXIMUM_POSSIBLE_FRAME = 100000.0f;
+
+bool operator==(const AnimationPropertyGroup& a, const AnimationPropertyGroup& b) {
+    return
+        (a._url == b._url) &&
+        (a._currentFrame == b._currentFrame) &&
+        (a._running == b._running) &&
+        (a._loop == b._loop) &&
+        (a._firstFrame == b._firstFrame) &&
+        (a._lastFrame == b._lastFrame) &&
+        (a._hold == b._hold);
+}
+
 void AnimationPropertyGroup::copyToScriptValue(const EntityPropertyFlags& desiredProperties, QScriptValue& properties, QScriptEngine* engine, bool skipDefaults, EntityItemProperties& defaultEntityProperties) const {
     COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_ANIMATION_URL, Animation, animation, URL, url);
-
-    if (_animationLoop) {
-        COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE_GETTER(PROP_ANIMATION_FPS, Animation, animation, FPS, fps, _animationLoop->getFPS);
-        COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE_GETTER(PROP_ANIMATION_FRAME_INDEX, Animation, animation, CurrentFrame, currentFrame, _animationLoop->getCurrentFrame);
-        COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE_GETTER(PROP_ANIMATION_PLAYING, Animation, animation, Running, running, _animationLoop->getRunning);
-        COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE_GETTER(PROP_ANIMATION_LOOP, Animation, animation, Loop, loop, _animationLoop->getLoop);
-        COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE_GETTER(PROP_ANIMATION_FIRST_FRAME, Animation, animation, FirstFrame, firstFrame, _animationLoop->getFirstFrame);
-        COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE_GETTER(PROP_ANIMATION_LAST_FRAME, Animation, animation, LastFrame, lastFrame, _animationLoop->getLastFrame);
-        COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE_GETTER(PROP_ANIMATION_HOLD, Animation, animation, Hold, hold, _animationLoop->getHold);
-    } else {
-        COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_ANIMATION_FPS, Animation, animation, FPS, fps);
-        COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_ANIMATION_FRAME_INDEX, Animation, animation, CurrentFrame, currentFrame);
-        COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_ANIMATION_PLAYING, Animation, animation, Running, running);
-        COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_ANIMATION_LOOP, Animation, animation, Loop, loop);
-        COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_ANIMATION_FIRST_FRAME, Animation, animation, FirstFrame, firstFrame);
-        COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_ANIMATION_LAST_FRAME, Animation, animation, LastFrame, lastFrame);
-        COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_ANIMATION_HOLD, Animation, animation, Hold, hold);
-    }
+    COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_ANIMATION_ALLOW_TRANSLATION, Animation, animation, AllowTranslation, allowTranslation);
+    COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_ANIMATION_FPS, Animation, animation, FPS, fps);
+    COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_ANIMATION_FRAME_INDEX, Animation, animation, CurrentFrame, currentFrame);
+    COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_ANIMATION_PLAYING, Animation, animation, Running, running);
+    COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_ANIMATION_LOOP, Animation, animation, Loop, loop);
+    COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_ANIMATION_FIRST_FRAME, Animation, animation, FirstFrame, firstFrame);
+    COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_ANIMATION_LAST_FRAME, Animation, animation, LastFrame, lastFrame);
+    COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_ANIMATION_HOLD, Animation, animation, Hold, hold);
 }
 
+
 void AnimationPropertyGroup::copyFromScriptValue(const QScriptValue& object, bool& _defaultSettings) {
 
     COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(animation, url, QString, setURL);
+    COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(animation, allowTranslation, bool, setAllowTranslation);
 
     // legacy property support
     COPY_PROPERTY_FROM_QSCRIPTVALUE_GETTER(animationURL, QString, setURL, getURL);
     COPY_PROPERTY_FROM_QSCRIPTVALUE_NOCHECK(animationSettings, QString, setFromOldAnimationSettings);
 
-    if (_animationLoop) {
-        COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(animation, fps, float, _animationLoop->setFPS);
-        COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(animation, currentFrame, float, _animationLoop->setCurrentFrame);
-        COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(animation, running, bool, _animationLoop->setRunning);
-        COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(animation, loop, bool, _animationLoop->setLoop);
-        COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(animation, firstFrame, float, _animationLoop->setFirstFrame);
-        COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(animation, lastFrame, float, _animationLoop->setLastFrame);
-        COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(animation, hold, bool, _animationLoop->setHold);
-
-        // legacy property support
-        COPY_PROPERTY_FROM_QSCRIPTVALUE_GETTER(animationFPS, float, _animationLoop->setFPS, _animationLoop->getFPS);
-        COPY_PROPERTY_FROM_QSCRIPTVALUE_GETTER(animationIsPlaying, bool, _animationLoop->setRunning, _animationLoop->getRunning);
-        COPY_PROPERTY_FROM_QSCRIPTVALUE_GETTER(animationFrameIndex, float, _animationLoop->setCurrentFrame, _animationLoop->getCurrentFrame);
-
-    } else {
-        COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(animation, fps, float, setFPS);
-        COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(animation, currentFrame, float, setCurrentFrame);
-        COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(animation, running, bool, setRunning);
-        COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(animation, loop, bool, setLoop);
-        COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(animation, firstFrame, float, setFirstFrame);
-        COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(animation, lastFrame, float, setLastFrame);
-        COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(animation, hold, bool, setHold);
-
-        // legacy property support
-        COPY_PROPERTY_FROM_QSCRIPTVALUE_GETTER(animationFPS, float, setFPS, getFPS);
-        COPY_PROPERTY_FROM_QSCRIPTVALUE_GETTER(animationIsPlaying, bool, setRunning, getRunning);
-        COPY_PROPERTY_FROM_QSCRIPTVALUE_GETTER(animationFrameIndex, float, setCurrentFrame, getCurrentFrame);
-    }
+    COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(animation, fps, float, setFPS);
+    COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(animation, currentFrame, float, setCurrentFrame);
+    COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(animation, running, bool, setRunning);
+    COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(animation, loop, bool, setLoop);
+    COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(animation, firstFrame, float, setFirstFrame);
+    COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(animation, lastFrame, float, setLastFrame);
+    COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(animation, hold, bool, setHold);
 
+    // legacy property support
+    COPY_PROPERTY_FROM_QSCRIPTVALUE_GETTER(animationFPS, float, setFPS, getFPS);
+    COPY_PROPERTY_FROM_QSCRIPTVALUE_GETTER(animationIsPlaying, bool, setRunning, getRunning);
+    COPY_PROPERTY_FROM_QSCRIPTVALUE_GETTER(animationFrameIndex, float, setCurrentFrame, getCurrentFrame);
 }
 
 void AnimationPropertyGroup::merge(const AnimationPropertyGroup& other) {
     COPY_PROPERTY_IF_CHANGED(url);
-    if (_animationLoop) {
-        _fps = _animationLoop->getFPS();
-        _currentFrame = _animationLoop->getCurrentFrame();
-        _running = _animationLoop->getRunning();
-        _loop = _animationLoop->getLoop();
-        _firstFrame = _animationLoop->getFirstFrame();
-        _lastFrame = _animationLoop->getLastFrame();
-        _hold = _animationLoop->getHold();
-    } else {
-        COPY_PROPERTY_IF_CHANGED(fps);
-        COPY_PROPERTY_IF_CHANGED(currentFrame);
-        COPY_PROPERTY_IF_CHANGED(running);
-        COPY_PROPERTY_IF_CHANGED(loop);
-        COPY_PROPERTY_IF_CHANGED(firstFrame);
-        COPY_PROPERTY_IF_CHANGED(lastFrame);
-        COPY_PROPERTY_IF_CHANGED(hold);
-    }
+    COPY_PROPERTY_IF_CHANGED(allowTranslation);
+    COPY_PROPERTY_IF_CHANGED(fps);
+    COPY_PROPERTY_IF_CHANGED(currentFrame);
+    COPY_PROPERTY_IF_CHANGED(running);
+    COPY_PROPERTY_IF_CHANGED(loop);
+    COPY_PROPERTY_IF_CHANGED(firstFrame);
+    COPY_PROPERTY_IF_CHANGED(lastFrame);
+    COPY_PROPERTY_IF_CHANGED(hold);
 }
 
 void AnimationPropertyGroup::setFromOldAnimationSettings(const QString& value) {
@@ -105,13 +84,14 @@ void AnimationPropertyGroup::setFromOldAnimationSettings(const QString& value) {
     // if it includes fps, currentFrame, or running, those values will be parsed out and
     // will over ride the regular animation settings
 
-    float fps = _animationLoop ? _animationLoop->getFPS() : getFPS();
-    float currentFrame = _animationLoop ? _animationLoop->getCurrentFrame() : getCurrentFrame();
-    bool running = _animationLoop ? _animationLoop->getRunning() : getRunning();
-    float firstFrame = _animationLoop ? _animationLoop->getFirstFrame() : getFirstFrame();
-    float lastFrame = _animationLoop ? _animationLoop->getLastFrame() : getLastFrame();
-    bool loop = _animationLoop ? _animationLoop->getLoop() : getLoop();
-    bool hold = _animationLoop ? _animationLoop->getHold() : getHold();
+    float fps = getFPS();
+    float currentFrame = getCurrentFrame();
+    bool running = getRunning();
+    float firstFrame = getFirstFrame();
+    float lastFrame = getLastFrame();
+    bool loop = getLoop();
+    bool hold = getHold();
+    bool allowTranslation = getAllowTranslation();
 
     QJsonDocument settingsAsJson = QJsonDocument::fromJson(value.toUtf8());
     QJsonObject settingsAsJsonObject = settingsAsJson.object();
@@ -146,23 +126,18 @@ void AnimationPropertyGroup::setFromOldAnimationSettings(const QString& value) {
         running = settingsMap["hold"].toBool();
     }
 
-    if (_animationLoop) {
-        _animationLoop->setFPS(fps);
-        _animationLoop->setCurrentFrame(currentFrame);
-        _animationLoop->setRunning(running);
-        _animationLoop->setFirstFrame(firstFrame);
-        _animationLoop->setLastFrame(lastFrame);
-        _animationLoop->setLoop(loop);
-        _animationLoop->setHold(hold);
-    } else {
-        setFPS(fps);
-        setCurrentFrame(currentFrame);
-        setRunning(running);
-        setFirstFrame(firstFrame);
-        setLastFrame(lastFrame);
-        setLoop(loop);
-        setHold(hold);
+    if (settingsMap.contains("allowTranslation")) {
+        allowTranslation = settingsMap["allowTranslation"].toBool();
     }
+
+    setAllowTranslation(allowTranslation);
+    setFPS(fps);
+    setCurrentFrame(currentFrame);
+    setRunning(running);
+    setFirstFrame(firstFrame);
+    setLastFrame(lastFrame);
+    setLoop(loop);
+    setHold(hold);
 }
 
 
@@ -171,6 +146,7 @@ void AnimationPropertyGroup::debugDump() const {
     qCDebug(entities) << "       url:" << getURL() << " has changed:" << urlChanged();
     qCDebug(entities) << "       fps:" << getFPS() << " has changed:" << fpsChanged();
     qCDebug(entities) << "currentFrame:" << getCurrentFrame() << " has changed:" << currentFrameChanged();
+    qCDebug(entities) << "allowTranslation:" << getAllowTranslation() << " has changed:" << allowTranslationChanged(); 
 }
 
 void AnimationPropertyGroup::listChangedProperties(QList<QString>& out) {
@@ -183,6 +159,9 @@ void AnimationPropertyGroup::listChangedProperties(QList<QString>& out) {
     if (currentFrameChanged()) {
         out << "animation-currentFrame";
     }
+    if (allowTranslationChanged()) {
+        out << "animation-allowTranslation";
+    }
 }
 
 
@@ -196,23 +175,14 @@ bool AnimationPropertyGroup::appendToEditPacket(OctreePacketData* packetData,
     bool successPropertyFits = true;
 
     APPEND_ENTITY_PROPERTY(PROP_ANIMATION_URL, getURL());
-    if (_animationLoop) {
-        APPEND_ENTITY_PROPERTY(PROP_ANIMATION_FPS, _animationLoop->getFPS());
-        APPEND_ENTITY_PROPERTY(PROP_ANIMATION_FRAME_INDEX, _animationLoop->getCurrentFrame());
-        APPEND_ENTITY_PROPERTY(PROP_ANIMATION_PLAYING, _animationLoop->getRunning());
-        APPEND_ENTITY_PROPERTY(PROP_ANIMATION_LOOP, _animationLoop->getLoop());
-        APPEND_ENTITY_PROPERTY(PROP_ANIMATION_FIRST_FRAME, _animationLoop->getFirstFrame());
-        APPEND_ENTITY_PROPERTY(PROP_ANIMATION_LAST_FRAME, _animationLoop->getLastFrame());
-        APPEND_ENTITY_PROPERTY(PROP_ANIMATION_HOLD, _animationLoop->getHold());
-    } else {
-        APPEND_ENTITY_PROPERTY(PROP_ANIMATION_FPS, getFPS());
-        APPEND_ENTITY_PROPERTY(PROP_ANIMATION_FRAME_INDEX, getCurrentFrame());
-        APPEND_ENTITY_PROPERTY(PROP_ANIMATION_PLAYING, getRunning());
-        APPEND_ENTITY_PROPERTY(PROP_ANIMATION_LOOP, getLoop());
-        APPEND_ENTITY_PROPERTY(PROP_ANIMATION_FIRST_FRAME, getFirstFrame());
-        APPEND_ENTITY_PROPERTY(PROP_ANIMATION_LAST_FRAME, getLastFrame());
-        APPEND_ENTITY_PROPERTY(PROP_ANIMATION_HOLD, getHold());
-    }
+    APPEND_ENTITY_PROPERTY(PROP_ANIMATION_ALLOW_TRANSLATION, getAllowTranslation());
+    APPEND_ENTITY_PROPERTY(PROP_ANIMATION_FPS, getFPS());
+    APPEND_ENTITY_PROPERTY(PROP_ANIMATION_FRAME_INDEX, getCurrentFrame());
+    APPEND_ENTITY_PROPERTY(PROP_ANIMATION_PLAYING, getRunning());
+    APPEND_ENTITY_PROPERTY(PROP_ANIMATION_LOOP, getLoop());
+    APPEND_ENTITY_PROPERTY(PROP_ANIMATION_FIRST_FRAME, getFirstFrame());
+    APPEND_ENTITY_PROPERTY(PROP_ANIMATION_LAST_FRAME, getLastFrame());
+    APPEND_ENTITY_PROPERTY(PROP_ANIMATION_HOLD, getHold());
 
     return true;
 }
@@ -225,24 +195,15 @@ bool AnimationPropertyGroup::decodeFromEditPacket(EntityPropertyFlags& propertyF
     bool somethingChanged = false;
 
     READ_ENTITY_PROPERTY(PROP_ANIMATION_URL, QString, setURL);
+    READ_ENTITY_PROPERTY(PROP_ANIMATION_ALLOW_TRANSLATION, bool, setAllowTranslation);
 
-    if (_animationLoop) {
-        READ_ENTITY_PROPERTY(PROP_ANIMATION_FPS, float, _animationLoop->setFPS);
-        READ_ENTITY_PROPERTY(PROP_ANIMATION_FRAME_INDEX, float, _animationLoop->setCurrentFrame);
-        READ_ENTITY_PROPERTY(PROP_ANIMATION_PLAYING, bool, _animationLoop->setRunning);
-        READ_ENTITY_PROPERTY(PROP_ANIMATION_LOOP, bool, _animationLoop->setLoop);
-        READ_ENTITY_PROPERTY(PROP_ANIMATION_FIRST_FRAME, float, _animationLoop->setFirstFrame);
-        READ_ENTITY_PROPERTY(PROP_ANIMATION_LAST_FRAME, float, _animationLoop->setLastFrame);
-        READ_ENTITY_PROPERTY(PROP_ANIMATION_HOLD, bool, _animationLoop->setHold);
-    } else {
-        READ_ENTITY_PROPERTY(PROP_ANIMATION_FPS, float, setFPS);
-        READ_ENTITY_PROPERTY(PROP_ANIMATION_FRAME_INDEX, float, setCurrentFrame);
-        READ_ENTITY_PROPERTY(PROP_ANIMATION_PLAYING, bool, setRunning);
-        READ_ENTITY_PROPERTY(PROP_ANIMATION_LOOP, bool, setLoop);
-        READ_ENTITY_PROPERTY(PROP_ANIMATION_FIRST_FRAME, float, setFirstFrame);
-        READ_ENTITY_PROPERTY(PROP_ANIMATION_LAST_FRAME, float, setLastFrame);
-        READ_ENTITY_PROPERTY(PROP_ANIMATION_HOLD, bool, setHold);
-    }
+    READ_ENTITY_PROPERTY(PROP_ANIMATION_FPS, float, setFPS);
+    READ_ENTITY_PROPERTY(PROP_ANIMATION_FRAME_INDEX, float, setCurrentFrame);
+    READ_ENTITY_PROPERTY(PROP_ANIMATION_PLAYING, bool, setRunning);
+    READ_ENTITY_PROPERTY(PROP_ANIMATION_LOOP, bool, setLoop);
+    READ_ENTITY_PROPERTY(PROP_ANIMATION_FIRST_FRAME, float, setFirstFrame);
+    READ_ENTITY_PROPERTY(PROP_ANIMATION_LAST_FRAME, float, setLastFrame);
+    READ_ENTITY_PROPERTY(PROP_ANIMATION_HOLD, bool, setHold);
 
     DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_ANIMATION_URL, URL);
     DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_ANIMATION_FPS, FPS);
@@ -252,7 +213,8 @@ bool AnimationPropertyGroup::decodeFromEditPacket(EntityPropertyFlags& propertyF
     DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_ANIMATION_FIRST_FRAME, FirstFrame);
     DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_ANIMATION_LAST_FRAME, LastFrame);
     DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_ANIMATION_HOLD, Hold);
-
+    DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_ANIMATION_ALLOW_TRANSLATION, AllowTranslation);
+    
     processedBytes += bytesRead;
 
     Q_UNUSED(somethingChanged);
@@ -269,6 +231,7 @@ void AnimationPropertyGroup::markAllChanged() {
     _firstFrameChanged = true;
     _lastFrameChanged = true;
     _holdChanged = true;
+    _allowTranslationChanged = true;
 }
 
 EntityPropertyFlags AnimationPropertyGroup::getChangedProperties() const {
@@ -282,53 +245,35 @@ EntityPropertyFlags AnimationPropertyGroup::getChangedProperties() const {
     CHECK_PROPERTY_CHANGE(PROP_ANIMATION_FIRST_FRAME, firstFrame);
     CHECK_PROPERTY_CHANGE(PROP_ANIMATION_LAST_FRAME, lastFrame);
     CHECK_PROPERTY_CHANGE(PROP_ANIMATION_HOLD, hold);
+    CHECK_PROPERTY_CHANGE(PROP_ANIMATION_ALLOW_TRANSLATION, allowTranslation);
 
     return changedProperties;
 }
 
 void AnimationPropertyGroup::getProperties(EntityItemProperties& properties) const {
     COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Animation, URL, getURL);
-    if (_animationLoop) {
-        COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Animation, FPS, _animationLoop->getFPS);
-        COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Animation, CurrentFrame, _animationLoop->getCurrentFrame);
-        COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Animation, Running, _animationLoop->getRunning);
-        COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Animation, Loop, _animationLoop->getLoop);
-        COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Animation, FirstFrame, _animationLoop->getFirstFrame);
-        COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Animation, LastFrame, _animationLoop->getLastFrame);
-        COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Animation, Hold, _animationLoop->getHold);
-    } else {
-        COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Animation, FPS, getFPS);
-        COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Animation, CurrentFrame, getCurrentFrame);
-        COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Animation, Running, getRunning);
-        COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Animation, Loop, getLoop);
-        COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Animation, FirstFrame, getFirstFrame);
-        COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Animation, LastFrame, getLastFrame);
-        COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Animation, Hold, getHold);
-    }
+    COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Animation, AllowTranslation, getAllowTranslation);
+    COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Animation, FPS, getFPS);
+    COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Animation, CurrentFrame, getCurrentFrame);
+    COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Animation, Running, getRunning);
+    COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Animation, Loop, getLoop);
+    COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Animation, FirstFrame, getFirstFrame);
+    COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Animation, LastFrame, getLastFrame);
+    COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Animation, Hold, getHold);
 }
 
 bool AnimationPropertyGroup::setProperties(const EntityItemProperties& properties) {
     bool somethingChanged = false;
 
     SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Animation, URL, url, setURL);
-    if (_animationLoop) {
-        SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Animation, FPS, fps, _animationLoop->setFPS);
-        SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Animation, CurrentFrame, currentFrame, _animationLoop->setCurrentFrame);
-        SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Animation, Running, running, _animationLoop->setRunning);
-        SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Animation, Loop, loop, _animationLoop->setLoop);
-        SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Animation, FirstFrame, firstFrame, _animationLoop->setFirstFrame);
-        SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Animation, LastFrame, lastFrame, _animationLoop->setLastFrame);
-        SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Animation, Hold, hold, _animationLoop->setHold);
-    } else {
-        SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Animation, FPS, fps, setFPS);
-        SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Animation, CurrentFrame, currentFrame, setCurrentFrame);
-        SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Animation, Running, running, setRunning);
-        SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Animation, Loop, loop, setLoop);
-        SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Animation, FirstFrame, firstFrame, setFirstFrame);
-        SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Animation, LastFrame, lastFrame, setLastFrame);
-        SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Animation, Hold, hold, setHold);
-    }
-
+    SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Animation, AllowTranslation, allowTranslation, setAllowTranslation);
+    SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Animation, FPS, fps, setFPS);
+    SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Animation, CurrentFrame, currentFrame, setCurrentFrame);
+    SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Animation, Running, running, setRunning);
+    SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Animation, Loop, loop, setLoop);
+    SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Animation, FirstFrame, firstFrame, setFirstFrame);
+    SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Animation, LastFrame, lastFrame, setLastFrame);
+    SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Animation, Hold, hold, setHold);
     return somethingChanged;
 }
 
@@ -343,6 +288,7 @@ EntityPropertyFlags AnimationPropertyGroup::getEntityProperties(EncodeBitstreamP
     requestedProperties += PROP_ANIMATION_FIRST_FRAME;
     requestedProperties += PROP_ANIMATION_LAST_FRAME;
     requestedProperties += PROP_ANIMATION_HOLD;
+    requestedProperties += PROP_ANIMATION_ALLOW_TRANSLATION;
 
     return requestedProperties;
 }
@@ -358,23 +304,14 @@ void AnimationPropertyGroup::appendSubclassData(OctreePacketData* packetData, En
     bool successPropertyFits = true;
 
     APPEND_ENTITY_PROPERTY(PROP_ANIMATION_URL, getURL());
-    if (_animationLoop) {
-        APPEND_ENTITY_PROPERTY(PROP_ANIMATION_FPS, _animationLoop->getFPS());
-        APPEND_ENTITY_PROPERTY(PROP_ANIMATION_FRAME_INDEX, _animationLoop->getCurrentFrame());
-        APPEND_ENTITY_PROPERTY(PROP_ANIMATION_PLAYING, _animationLoop->getRunning());
-        APPEND_ENTITY_PROPERTY(PROP_ANIMATION_LOOP, _animationLoop->getLoop());
-        APPEND_ENTITY_PROPERTY(PROP_ANIMATION_FIRST_FRAME, _animationLoop->getFirstFrame());
-        APPEND_ENTITY_PROPERTY(PROP_ANIMATION_LAST_FRAME, _animationLoop->getLastFrame());
-        APPEND_ENTITY_PROPERTY(PROP_ANIMATION_HOLD, _animationLoop->getHold());
-    } else {
-        APPEND_ENTITY_PROPERTY(PROP_ANIMATION_FPS, getFPS());
-        APPEND_ENTITY_PROPERTY(PROP_ANIMATION_FRAME_INDEX, getCurrentFrame());
-        APPEND_ENTITY_PROPERTY(PROP_ANIMATION_PLAYING, getRunning());
-        APPEND_ENTITY_PROPERTY(PROP_ANIMATION_LOOP, getLoop());
-        APPEND_ENTITY_PROPERTY(PROP_ANIMATION_FIRST_FRAME, getFirstFrame());
-        APPEND_ENTITY_PROPERTY(PROP_ANIMATION_LAST_FRAME, getLastFrame());
-        APPEND_ENTITY_PROPERTY(PROP_ANIMATION_HOLD, getHold());
-    }
+    APPEND_ENTITY_PROPERTY(PROP_ANIMATION_ALLOW_TRANSLATION, getAllowTranslation());
+    APPEND_ENTITY_PROPERTY(PROP_ANIMATION_FPS, getFPS());
+    APPEND_ENTITY_PROPERTY(PROP_ANIMATION_FRAME_INDEX, getCurrentFrame());
+    APPEND_ENTITY_PROPERTY(PROP_ANIMATION_PLAYING, getRunning());
+    APPEND_ENTITY_PROPERTY(PROP_ANIMATION_LOOP, getLoop());
+    APPEND_ENTITY_PROPERTY(PROP_ANIMATION_FIRST_FRAME, getFirstFrame());
+    APPEND_ENTITY_PROPERTY(PROP_ANIMATION_LAST_FRAME, getLastFrame());
+    APPEND_ENTITY_PROPERTY(PROP_ANIMATION_HOLD, getHold());
 }
 
 int AnimationPropertyGroup::readEntitySubclassDataFromBuffer(const unsigned char* data, int bytesLeftToRead,
@@ -386,25 +323,13 @@ int AnimationPropertyGroup::readEntitySubclassDataFromBuffer(const unsigned char
     const unsigned char* dataAt = data;
 
     READ_ENTITY_PROPERTY(PROP_ANIMATION_URL, QString, setURL);
-
-    if (_animationLoop) {
-        // apply new properties to our associated AnimationLoop
-        READ_ENTITY_PROPERTY(PROP_ANIMATION_FPS, float, _animationLoop->setFPS);
-        READ_ENTITY_PROPERTY(PROP_ANIMATION_FRAME_INDEX, float, _animationLoop->setCurrentFrame);
-        READ_ENTITY_PROPERTY(PROP_ANIMATION_PLAYING, bool, _animationLoop->setRunning);
-        READ_ENTITY_PROPERTY(PROP_ANIMATION_LOOP, bool, _animationLoop->setLoop);
-        READ_ENTITY_PROPERTY(PROP_ANIMATION_FIRST_FRAME, float, _animationLoop->setFirstFrame);
-        READ_ENTITY_PROPERTY(PROP_ANIMATION_LAST_FRAME, float, _animationLoop->setLastFrame);
-        READ_ENTITY_PROPERTY(PROP_ANIMATION_HOLD, bool, _animationLoop->setHold);
-    } else {
-        READ_ENTITY_PROPERTY(PROP_ANIMATION_FPS, float, setFPS);
-        READ_ENTITY_PROPERTY(PROP_ANIMATION_FRAME_INDEX, float, setCurrentFrame);
-        READ_ENTITY_PROPERTY(PROP_ANIMATION_PLAYING, bool, setRunning);
-        READ_ENTITY_PROPERTY(PROP_ANIMATION_LOOP, bool, setLoop);
-        READ_ENTITY_PROPERTY(PROP_ANIMATION_FIRST_FRAME, float, setFirstFrame);
-        READ_ENTITY_PROPERTY(PROP_ANIMATION_LAST_FRAME, float, setLastFrame);
-        READ_ENTITY_PROPERTY(PROP_ANIMATION_HOLD, bool, setHold);
-    }
-
+    READ_ENTITY_PROPERTY(PROP_ANIMATION_ALLOW_TRANSLATION, bool, setAllowTranslation);
+    READ_ENTITY_PROPERTY(PROP_ANIMATION_FPS, float, setFPS);
+    READ_ENTITY_PROPERTY(PROP_ANIMATION_FRAME_INDEX, float, setCurrentFrame);
+    READ_ENTITY_PROPERTY(PROP_ANIMATION_PLAYING, bool, setRunning);
+    READ_ENTITY_PROPERTY(PROP_ANIMATION_LOOP, bool, setLoop);
+    READ_ENTITY_PROPERTY(PROP_ANIMATION_FIRST_FRAME, float, setFirstFrame);
+    READ_ENTITY_PROPERTY(PROP_ANIMATION_LAST_FRAME, float, setLastFrame);
+    READ_ENTITY_PROPERTY(PROP_ANIMATION_HOLD, bool, setHold);
     return bytesRead;
 }
diff --git a/libraries/entities/src/AnimationPropertyGroup.h b/libraries/entities/src/AnimationPropertyGroup.h
index c0086b41b3..affa960d66 100644
--- a/libraries/entities/src/AnimationPropertyGroup.h
+++ b/libraries/entities/src/AnimationPropertyGroup.h
@@ -19,7 +19,6 @@
 
 #include <QtScript/QScriptEngine>
 
-#include <shared/types/AnimationLoop.h> // for Animation, AnimationCache, and AnimationPointer classes
 #include "EntityItemPropertiesMacros.h"
 #include "PropertyGroup.h"
 
@@ -31,7 +30,7 @@ class ReadBitstreamToTreeParams;
 
 class AnimationPropertyGroup : public PropertyGroup {
 public:
-    void associateWithAnimationLoop(AnimationLoop* animationLoop) { _animationLoop = animationLoop; }
+    static const float MAXIMUM_POSSIBLE_FRAME;
 
     // EntityItemProperty related helpers
     virtual void copyToScriptValue(const EntityPropertyFlags& desiredProperties, QScriptValue& properties,
@@ -84,13 +83,13 @@ public:
     DEFINE_PROPERTY(PROP_ANIMATION_PLAYING, Running, running, bool, false); // was animationIsPlaying
     DEFINE_PROPERTY(PROP_ANIMATION_LOOP, Loop, loop, bool, true); // was animationSettings.loop
     DEFINE_PROPERTY(PROP_ANIMATION_FIRST_FRAME, FirstFrame, firstFrame, float, 0.0f); // was animationSettings.firstFrame
-    DEFINE_PROPERTY(PROP_ANIMATION_LAST_FRAME, LastFrame, lastFrame, float, AnimationLoop::MAXIMUM_POSSIBLE_FRAME); // was animationSettings.lastFrame
+    DEFINE_PROPERTY(PROP_ANIMATION_LAST_FRAME, LastFrame, lastFrame, float, MAXIMUM_POSSIBLE_FRAME); // was animationSettings.lastFrame
     DEFINE_PROPERTY(PROP_ANIMATION_HOLD, Hold, hold, bool, false); // was animationSettings.hold
+    DEFINE_PROPERTY(PROP_ANIMATION_ALLOW_TRANSLATION, AllowTranslation, allowTranslation, bool, true); 
 
 protected:
+    friend bool operator==(const AnimationPropertyGroup& a, const AnimationPropertyGroup& b);
     void setFromOldAnimationSettings(const QString& value);
-
-    AnimationLoop* _animationLoop = nullptr;
 };
 
 #endif // hifi_AnimationPropertyGroup_h
diff --git a/libraries/entities/src/DeleteEntityOperator.cpp b/libraries/entities/src/DeleteEntityOperator.cpp
index 709c281341..cbd0ad7839 100644
--- a/libraries/entities/src/DeleteEntityOperator.cpp
+++ b/libraries/entities/src/DeleteEntityOperator.cpp
@@ -96,7 +96,7 @@ bool DeleteEntityOperator::preRecursion(const OctreeElementPointer& element) {
                 bool entityDeleted = entityTreeElement->removeEntityItem(theEntity); // remove it from the element
                 assert(entityDeleted);
                 (void)entityDeleted; // quite warning
-                _tree->setContainingElement(details.entity->getEntityItemID(), NULL); // update or id to element lookup
+                _tree->clearEntityMapEntry(details.entity->getEntityItemID());
                 _foundCount++;
             }
         }
diff --git a/libraries/entities/src/DiffTraversal.cpp b/libraries/entities/src/DiffTraversal.cpp
new file mode 100644
index 0000000000..764c420197
--- /dev/null
+++ b/libraries/entities/src/DiffTraversal.cpp
@@ -0,0 +1,253 @@
+//
+//  DiffTraversal.cpp
+//  assignment-client/src/entities
+//
+//  Created by Andrew Meadows 2017.08.08
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include "DiffTraversal.h"
+
+#include <OctreeUtils.h>
+
+
+DiffTraversal::Waypoint::Waypoint(EntityTreeElementPointer& element) : _nextIndex(0) {
+    assert(element);
+    _weakElement = element;
+}
+
+void DiffTraversal::Waypoint::getNextVisibleElementFirstTime(DiffTraversal::VisibleElement& next,
+        const DiffTraversal::View& view) {
+    // NOTE: no need to set next.intersection in the "FirstTime" context
+    if (_nextIndex == -1) {
+        // root case is special:
+        // its intersection is always INTERSECT,
+        // we never bother checking for LOD culling, and
+        // we can skip it if the content hasn't changed
+        ++_nextIndex;
+        next.element = _weakElement.lock();
+        return;
+    } else if (_nextIndex < NUMBER_OF_CHILDREN) {
+        EntityTreeElementPointer element = _weakElement.lock();
+        if (element) {
+            while (_nextIndex < NUMBER_OF_CHILDREN) {
+                EntityTreeElementPointer nextElement = element->getChildAtIndex(_nextIndex);
+                ++_nextIndex;
+                if (nextElement) {
+                    if (!view.usesViewFrustum) {
+                        // No LOD truncation if we aren't using the view frustum
+                        next.element = nextElement;
+                        return;
+                    } else if (view.viewFrustum.cubeIntersectsKeyhole(nextElement->getAACube())) {
+                        // check for LOD truncation
+                        float distance = glm::distance(view.viewFrustum.getPosition(), nextElement->getAACube().calcCenter()) + MIN_VISIBLE_DISTANCE;
+                        float angularDiameter = nextElement->getAACube().getScale() / distance;
+                        if (angularDiameter > MIN_ELEMENT_ANGULAR_DIAMETER * view.lodScaleFactor) {
+                            next.element = nextElement;
+                            return;
+                        }
+                    }
+                }
+            }
+        }
+    }
+    next.element.reset();
+}
+
+void DiffTraversal::Waypoint::getNextVisibleElementRepeat(
+        DiffTraversal::VisibleElement& next, const DiffTraversal::View& view, uint64_t lastTime) {
+    if (_nextIndex == -1) {
+        // root case is special
+        ++_nextIndex;
+        EntityTreeElementPointer element = _weakElement.lock();
+        if (element->getLastChangedContent() > lastTime) {
+            next.element = element;
+            next.intersection = ViewFrustum::INTERSECT;
+            return;
+        }
+    }
+    if (_nextIndex < NUMBER_OF_CHILDREN) {
+        EntityTreeElementPointer element = _weakElement.lock();
+        if (element) {
+            while (_nextIndex < NUMBER_OF_CHILDREN) {
+                EntityTreeElementPointer nextElement = element->getChildAtIndex(_nextIndex);
+                ++_nextIndex;
+                if (nextElement && nextElement->getLastChanged() > lastTime) {
+                    if (!view.usesViewFrustum) {
+                        // No LOD truncation if we aren't using the view frustum
+                        next.element = nextElement;
+                        next.intersection = ViewFrustum::INSIDE;
+                        return;
+                    } else {
+                        // check for LOD truncation
+                        float distance = glm::distance(view.viewFrustum.getPosition(), nextElement->getAACube().calcCenter()) + MIN_VISIBLE_DISTANCE;
+                        float angularDiameter = nextElement->getAACube().getScale() / distance;
+                        if (angularDiameter > MIN_ELEMENT_ANGULAR_DIAMETER * view.lodScaleFactor) {
+                            ViewFrustum::intersection intersection = view.viewFrustum.calculateCubeKeyholeIntersection(nextElement->getAACube());
+                            if (intersection != ViewFrustum::OUTSIDE) {
+                                next.element = nextElement;
+                                next.intersection = intersection;
+                                return;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    next.element.reset();
+    next.intersection = ViewFrustum::OUTSIDE;
+}
+
+void DiffTraversal::Waypoint::getNextVisibleElementDifferential(DiffTraversal::VisibleElement& next,
+        const DiffTraversal::View& view, const DiffTraversal::View& lastView) {
+    if (_nextIndex == -1) {
+        // root case is special
+        ++_nextIndex;
+        EntityTreeElementPointer element = _weakElement.lock();
+        next.element = element;
+        next.intersection = ViewFrustum::INTERSECT;
+        return;
+    } else if (_nextIndex < NUMBER_OF_CHILDREN) {
+        EntityTreeElementPointer element = _weakElement.lock();
+        if (element) {
+            while (_nextIndex < NUMBER_OF_CHILDREN) {
+                EntityTreeElementPointer nextElement = element->getChildAtIndex(_nextIndex);
+                ++_nextIndex;
+                if (nextElement) {
+                    AACube cube = nextElement->getAACube();
+                    // check for LOD truncation
+                    float distance = glm::distance(view.viewFrustum.getPosition(), cube.calcCenter()) + MIN_VISIBLE_DISTANCE;
+                    float angularDiameter = cube.getScale() / distance;
+                    if (angularDiameter > MIN_ELEMENT_ANGULAR_DIAMETER * view.lodScaleFactor) {
+                        if (view.viewFrustum.calculateCubeKeyholeIntersection(cube) != ViewFrustum::OUTSIDE) {
+                            next.element = nextElement;
+                            next.intersection = ViewFrustum::OUTSIDE;
+                            return;
+                        }
+                    }
+                }
+            }
+        }
+    }
+    next.element.reset();
+    next.intersection = ViewFrustum::OUTSIDE;
+}
+
+DiffTraversal::DiffTraversal() {
+    const int32_t MIN_PATH_DEPTH = 16;
+    _path.reserve(MIN_PATH_DEPTH);
+}
+
+DiffTraversal::Type DiffTraversal::prepareNewTraversal(const ViewFrustum& viewFrustum, EntityTreeElementPointer root, 
+        int32_t lodLevelOffset, bool usesViewFrustum) {
+    assert(root);
+    // there are three types of traversal:
+    //
+    //   (1) First = fresh view --> find all elements in view
+    //   (2) Repeat = view hasn't changed --> find elements changed since last complete traversal
+    //   (3) Differential = view has changed --> find elements changed or in new view but not old
+    //
+    // for each traversal type we assign the appropriate _getNextVisibleElementCallback
+    //
+    //   _getNextVisibleElementCallback = identifies elements that need to be traversed,
+    //        updates VisibleElement ref argument with pointer-to-element and view-intersection
+    //        (INSIDE, INTERSECT, or OUTSIDE)
+    //
+    // external code should update the _scanElementCallback after calling prepareNewTraversal
+    //
+    _currentView.usesViewFrustum = usesViewFrustum;
+    float lodScaleFactor = powf(2.0f, lodLevelOffset);
+
+    Type type;
+    // If usesViewFrustum changes, treat it as a First traversal
+    if (_completedView.startTime == 0 || _currentView.usesViewFrustum != _completedView.usesViewFrustum) {
+        type = Type::First;
+        _currentView.viewFrustum = viewFrustum;
+        _currentView.lodScaleFactor = lodScaleFactor;
+        _getNextVisibleElementCallback = [this](DiffTraversal::VisibleElement& next) {
+            _path.back().getNextVisibleElementFirstTime(next, _currentView);
+        };
+    } else if (!_currentView.usesViewFrustum ||
+               (_completedView.viewFrustum.isVerySimilar(viewFrustum) &&
+                lodScaleFactor == _completedView.lodScaleFactor)) {
+        type = Type::Repeat;
+        _getNextVisibleElementCallback = [this](DiffTraversal::VisibleElement& next) {
+            _path.back().getNextVisibleElementRepeat(next, _completedView, _completedView.startTime);
+        };
+    } else {
+        type = Type::Differential;
+        _currentView.viewFrustum = viewFrustum;
+        _currentView.lodScaleFactor = lodScaleFactor;
+        _getNextVisibleElementCallback = [this](DiffTraversal::VisibleElement& next) {
+            _path.back().getNextVisibleElementDifferential(next, _currentView, _completedView);
+        };
+    }
+
+    _path.clear();
+    _path.push_back(DiffTraversal::Waypoint(root));
+    // set root fork's index such that root element returned at getNextElement()
+    _path.back().initRootNextIndex();
+
+    _currentView.startTime = usecTimestampNow();
+
+    return type;
+}
+
+void DiffTraversal::getNextVisibleElement(DiffTraversal::VisibleElement& next) {
+    if (_path.empty()) {
+        next.element.reset();
+        next.intersection = ViewFrustum::OUTSIDE;
+        return;
+    }
+    _getNextVisibleElementCallback(next);
+    if (next.element) {
+        int8_t nextIndex = _path.back().getNextIndex();
+        if (nextIndex > 0) {
+            _path.push_back(DiffTraversal::Waypoint(next.element));
+        }
+    } else {
+        // we're done at this level
+        while (!next.element) {
+            // pop one level
+            _path.pop_back();
+            if (_path.empty()) {
+                // we've traversed the entire tree
+                _completedView = _currentView;
+                return;
+            }
+            // keep looking for next
+            _getNextVisibleElementCallback(next);
+            if (next.element) {
+                // we've descended one level so add it to the path
+                _path.push_back(DiffTraversal::Waypoint(next.element));
+            }
+        }
+    }
+}
+
+void DiffTraversal::setScanCallback(std::function<void (DiffTraversal::VisibleElement&)> cb) {
+    if (!cb) {
+        _scanElementCallback = [](DiffTraversal::VisibleElement& a){};
+    } else {
+        _scanElementCallback = cb;
+    }
+}
+
+void DiffTraversal::traverse(uint64_t timeBudget) {
+    uint64_t expiry = usecTimestampNow() + timeBudget;
+    DiffTraversal::VisibleElement next;
+    getNextVisibleElement(next);
+    while (next.element) {
+        if (next.element->hasContent()) {
+            _scanElementCallback(next);
+        }
+        if (usecTimestampNow() > expiry) {
+            break;
+        }
+        getNextVisibleElement(next);
+    }
+}
diff --git a/libraries/entities/src/DiffTraversal.h b/libraries/entities/src/DiffTraversal.h
new file mode 100644
index 0000000000..eb7168356e
--- /dev/null
+++ b/libraries/entities/src/DiffTraversal.h
@@ -0,0 +1,86 @@
+//
+//  DiffTraversal.h
+//  assignment-client/src/entities
+//
+//  Created by Andrew Meadows 2017.08.08
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_DiffTraversal_h
+#define hifi_DiffTraversal_h
+
+#include <ViewFrustum.h>
+
+#include "EntityTreeElement.h"
+
+// DiffTraversal traverses the tree and applies _scanElementCallback on elements it finds
+class DiffTraversal {
+public:
+    // VisibleElement is a struct identifying an element and how it intersected the view.
+    // The intersection is used to optimize culling entities from the sendQueue.
+    class VisibleElement {
+    public:
+        EntityTreeElementPointer element;
+        ViewFrustum::intersection intersection { ViewFrustum::OUTSIDE };
+    };
+
+    // View is a struct with a ViewFrustum and LOD parameters
+    class View {
+    public:
+        ViewFrustum viewFrustum;
+        uint64_t startTime { 0 };
+        float lodScaleFactor { 1.0f };
+        bool usesViewFrustum { true };
+    };
+
+    // Waypoint is an bookmark in a "path" of waypoints during a traversal.
+    class Waypoint {
+    public:
+        Waypoint(EntityTreeElementPointer& element);
+
+        void getNextVisibleElementFirstTime(VisibleElement& next, const View& view);
+        void getNextVisibleElementRepeat(VisibleElement& next, const View& view, uint64_t lastTime);
+        void getNextVisibleElementDifferential(VisibleElement& next, const View& view, const View& lastView);
+
+        int8_t getNextIndex() const { return _nextIndex; }
+        void initRootNextIndex() { _nextIndex = -1; }
+
+    protected:
+        EntityTreeElementWeakPointer _weakElement;
+        int8_t _nextIndex;
+    };
+
+    typedef enum { First, Repeat, Differential } Type;
+
+    DiffTraversal();
+
+    Type prepareNewTraversal(const ViewFrustum& viewFrustum, EntityTreeElementPointer root, int32_t lodLevelOffset, 
+        bool usesViewFrustum);
+
+    const ViewFrustum& getCurrentView() const { return _currentView.viewFrustum; }
+    const ViewFrustum& getCompletedView() const { return _completedView.viewFrustum; }
+
+    bool doesCurrentUseViewFrustum() const { return _currentView.usesViewFrustum; }
+    float getCurrentLODScaleFactor() const { return _currentView.lodScaleFactor; }
+    float getCompletedLODScaleFactor() const { return _completedView.lodScaleFactor; }
+
+    uint64_t getStartOfCompletedTraversal() const { return _completedView.startTime; }
+    bool finished() const { return _path.empty(); }
+
+    void setScanCallback(std::function<void (VisibleElement&)> cb);
+    void traverse(uint64_t timeBudget);
+
+private:
+    void getNextVisibleElement(VisibleElement& next);
+
+    View _currentView;
+    View _completedView;
+    std::vector<Waypoint> _path;
+    std::function<void (VisibleElement&)> _getNextVisibleElementCallback { nullptr };
+    std::function<void (VisibleElement&)> _scanElementCallback { [](VisibleElement& e){} };
+};
+
+#endif // hifi_EntityPriorityQueue_h
diff --git a/libraries/entities/src/EntitiesScriptEngineProvider.h b/libraries/entities/src/EntitiesScriptEngineProvider.h
index d87dd105c2..100c17df5f 100644
--- a/libraries/entities/src/EntitiesScriptEngineProvider.h
+++ b/libraries/entities/src/EntitiesScriptEngineProvider.h
@@ -20,7 +20,8 @@
 
 class EntitiesScriptEngineProvider {
 public:
-    virtual void callEntityScriptMethod(const EntityItemID& entityID, const QString& methodName, const QStringList& params = QStringList()) = 0;
+    virtual void callEntityScriptMethod(const EntityItemID& entityID, const QString& methodName, 
+                                        const QStringList& params = QStringList(), const QUuid& remoteCallerID = QUuid()) = 0;
     virtual QFuture<QVariant> getLocalEntityScriptDetails(const EntityItemID& entityID) = 0;
 };
 
diff --git a/libraries/entities/src/EntityEditPacketSender.cpp b/libraries/entities/src/EntityEditPacketSender.cpp
index 7845b0d5e3..168b0cd446 100644
--- a/libraries/entities/src/EntityEditPacketSender.cpp
+++ b/libraries/entities/src/EntityEditPacketSender.cpp
@@ -18,6 +18,7 @@
 #include "EntitiesLogging.h"
 #include "EntityItem.h"
 #include "EntityItemProperties.h"
+#include <AddressManager.h>
 
 EntityEditPacketSender::EntityEditPacketSender() {
     auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();
@@ -45,7 +46,7 @@ void EntityEditPacketSender::queueEditAvatarEntityMessage(PacketType type,
     }
     EntityItemPointer entity = entityTree->findEntityByEntityItemID(entityItemID);
     if (!entity) {
-        qCDebug(entities) << "EntityEditPacketSender::queueEditEntityMessage can't find entity.";
+        qCDebug(entities) << "EntityEditPacketSender::queueEditAvatarEntityMessage can't find entity: " << entityItemID;
         return;
     }
 
@@ -54,6 +55,7 @@ void EntityEditPacketSender::queueEditAvatarEntityMessage(PacketType type,
     EntityItemProperties entityProperties = entity->getProperties();
     entityProperties.merge(properties);
 
+    std::lock_guard<std::mutex> lock(_mutex);
     QScriptValue scriptProperties = EntityItemNonDefaultPropertiesToScriptValue(&_scriptEngine, entityProperties);
     QVariant variantProperties = scriptProperties.toVariant();
     QJsonDocument jsonProperties = QJsonDocument::fromVariant(variantProperties);
@@ -91,24 +93,41 @@ void EntityEditPacketSender::queueEditEntityMessage(PacketType type,
 
     QByteArray bufferOut(NLPacket::maxPayloadSize(type), 0);
 
-    bool success;
+    OctreeElement::AppendState encodeResult = OctreeElement::PARTIAL; // start the loop assuming there's more to send
+    auto nodeList = DependencyManager::get<NodeList>();
+
+    EntityPropertyFlags didntFitProperties;
+    EntityItemProperties propertiesCopy = properties;
+
     if (properties.parentIDChanged() && properties.getParentID() == AVATAR_SELF_ID) {
-        EntityItemProperties propertiesCopy = properties;
-        auto nodeList = DependencyManager::get<NodeList>();
         const QUuid myNodeID = nodeList->getSessionUUID();
         propertiesCopy.setParentID(myNodeID);
-        success = EntityItemProperties::encodeEntityEditPacket(type, entityItemID, propertiesCopy, bufferOut);
-    } else {
-        success = EntityItemProperties::encodeEntityEditPacket(type, entityItemID, properties, bufferOut);
     }
 
-    if (success) {
-        #ifdef WANT_DEBUG
-            qCDebug(entities) << "calling queueOctreeEditMessage()...";
-            qCDebug(entities) << "    id:" << entityItemID;
-            qCDebug(entities) << "    properties:" << properties;
-        #endif
-        queueOctreeEditMessage(type, bufferOut);
+    EntityPropertyFlags requestedProperties = propertiesCopy.getChangedProperties();
+
+    while (encodeResult == OctreeElement::PARTIAL) {
+        encodeResult = EntityItemProperties::encodeEntityEditPacket(type, entityItemID, propertiesCopy, bufferOut, requestedProperties, didntFitProperties);
+
+        if (encodeResult != OctreeElement::NONE) {
+            #ifdef WANT_DEBUG
+                qCDebug(entities) << "calling queueOctreeEditMessage()...";
+                qCDebug(entities) << "    id:" << entityItemID;
+                qCDebug(entities) << "    properties:" << properties;
+            #endif
+            queueOctreeEditMessage(type, bufferOut);
+            if (type == PacketType::EntityAdd && !properties.getCertificateID().isEmpty()) {
+                emit addingEntityWithCertificate(properties.getCertificateID(), DependencyManager::get<AddressManager>()->getPlaceName());
+            }
+        }
+
+        // if we still have properties to send, switch the message type to edit, and request only the packets that didn't fit
+        if (encodeResult != OctreeElement::COMPLETED) {
+            type = PacketType::EntityEdit;
+            requestedProperties = didntFitProperties;
+        }
+
+        bufferOut.resize(NLPacket::maxPayloadSize(type)); // resize our output buffer for the next packet
     }
 }
 
diff --git a/libraries/entities/src/EntityEditPacketSender.h b/libraries/entities/src/EntityEditPacketSender.h
index 9190a8296a..bf79bb9203 100644
--- a/libraries/entities/src/EntityEditPacketSender.h
+++ b/libraries/entities/src/EntityEditPacketSender.h
@@ -14,6 +14,8 @@
 
 #include <OctreeEditPacketSender.h>
 
+#include <mutex>
+
 #include "EntityItem.h"
 #include "AvatarData.h"
 
@@ -41,6 +43,9 @@ public:
     virtual char getMyNodeType() const override { return NodeType::EntityServer; }
     virtual void adjustEditPacketForClockSkew(PacketType type, QByteArray& buffer, qint64 clockSkew) override;
 
+signals:
+    void addingEntityWithCertificate(const QString& certificateID, const QString& placeName);
+
 public slots:
     void processEntityEditNackPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer sendingNode);
 
@@ -49,6 +54,7 @@ private:
                                       EntityItemID entityItemID, const EntityItemProperties& properties);
 
 private:
+    std::mutex _mutex;
     AvatarData* _myAvatar { nullptr };
     QScriptEngine _scriptEngine;
 };
diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp
index 23ce097cc2..3f054e1ccb 100644
--- a/libraries/entities/src/EntityItem.cpp
+++ b/libraries/entities/src/EntityItem.cpp
@@ -13,6 +13,11 @@
 
 #include <QtCore/QObject>
 #include <QtEndian>
+#include <QJsonDocument>
+#include <NetworkingConstants.h>
+#include <NetworkAccessManager.h>
+#include <QtNetwork/QNetworkReply>
+#include <QtNetwork/QNetworkRequest>
 
 #include <glm/gtx/transform.hpp>
 
@@ -32,56 +37,21 @@
 #include "EntitySimulation.h"
 #include "EntityDynamicFactoryInterface.h"
 
+Q_DECLARE_METATYPE(EntityItemPointer);
+int entityItemPointernMetaTypeId = qRegisterMetaType<EntityItemPointer>();
 
 int EntityItem::_maxActionsDataSize = 800;
 quint64 EntityItem::_rememberDeletedActionTime = 20 * USECS_PER_SECOND;
-std::function<bool()> EntityItem::_entitiesShouldFadeFunction = [](){ return true; };
+QString EntityItem::_marketplacePublicKey;
 
 EntityItem::EntityItem(const EntityItemID& entityItemID) :
-    SpatiallyNestable(NestableType::Entity, entityItemID),
-    _type(EntityTypes::Unknown),
-    _lastSimulated(0),
-    _lastUpdated(0),
-    _lastEdited(0),
-    _lastEditedBy(ENTITY_ITEM_DEFAULT_LAST_EDITED_BY),
-    _lastEditedFromRemote(0),
-    _lastEditedFromRemoteInRemoteTime(0),
-    _created(UNKNOWN_CREATED_TIME),
-    _changedOnServer(0),
-    _localRenderAlpha(ENTITY_ITEM_DEFAULT_LOCAL_RENDER_ALPHA),
-    _density(ENTITY_ITEM_DEFAULT_DENSITY),
-    _volumeMultiplier(1.0f),
-    _gravity(ENTITY_ITEM_DEFAULT_GRAVITY),
-    _acceleration(ENTITY_ITEM_DEFAULT_ACCELERATION),
-    _damping(ENTITY_ITEM_DEFAULT_DAMPING),
-    _restitution(ENTITY_ITEM_DEFAULT_RESTITUTION),
-    _friction(ENTITY_ITEM_DEFAULT_FRICTION),
-    _lifetime(ENTITY_ITEM_DEFAULT_LIFETIME),
-    _script(ENTITY_ITEM_DEFAULT_SCRIPT),
-    _scriptTimestamp(ENTITY_ITEM_DEFAULT_SCRIPT_TIMESTAMP),
-    _collisionSoundURL(ENTITY_ITEM_DEFAULT_COLLISION_SOUND_URL),
-    _registrationPoint(ENTITY_ITEM_DEFAULT_REGISTRATION_POINT),
-    _angularDamping(ENTITY_ITEM_DEFAULT_ANGULAR_DAMPING),
-    _visible(ENTITY_ITEM_DEFAULT_VISIBLE),
-    _collisionless(ENTITY_ITEM_DEFAULT_COLLISIONLESS),
-    _collisionMask(ENTITY_COLLISION_MASK_DEFAULT),
-    _dynamic(ENTITY_ITEM_DEFAULT_DYNAMIC),
-    _locked(ENTITY_ITEM_DEFAULT_LOCKED),
-    _userData(ENTITY_ITEM_DEFAULT_USER_DATA),
-    _simulationOwner(),
-    _marketplaceID(ENTITY_ITEM_DEFAULT_MARKETPLACE_ID),
-    _name(ENTITY_ITEM_DEFAULT_NAME),
-    _href(""),
-    _description(""),
-    _dirtyFlags(0),
-    _element(nullptr),
-    _physicsInfo(nullptr),
-    _simulated(false)
+    SpatiallyNestable(NestableType::Entity, entityItemID)
 {
     setLocalVelocity(ENTITY_ITEM_DEFAULT_VELOCITY);
     setLocalAngularVelocity(ENTITY_ITEM_DEFAULT_ANGULAR_VELOCITY);
     // explicitly set transform parts to set dirty flags used by batch rendering
-    setScale(ENTITY_ITEM_DEFAULT_DIMENSIONS);
+    locationChanged();
+    dimensionsChanged();
     quint64 now = usecTimestampNow();
     _lastSimulated = now;
     _lastUpdated = now;
@@ -89,7 +59,8 @@ EntityItem::EntityItem(const EntityItemID& entityItemID) :
 
 EntityItem::~EntityItem() {
     // clear out any left-over actions
-    EntityTreePointer entityTree = _element ? _element->getTree() : nullptr;
+    EntityTreeElementPointer element = _element; // use local copy of _element for logic below
+    EntityTreePointer entityTree = element ? element->getTree() : nullptr;
     EntitySimulationPointer simulation = entityTree ? entityTree->getSimulation() : nullptr;
     if (simulation) {
         clearActions(simulation);
@@ -112,7 +83,7 @@ EntityPropertyFlags EntityItem::getEntityProperties(EncodeBitstreamParams& param
     requestedProperties += PROP_ANGULAR_VELOCITY;
     requestedProperties += PROP_ACCELERATION;
 
-    requestedProperties += PROP_DIMENSIONS; // NOTE: PROP_RADIUS obsolete
+    requestedProperties += PROP_DIMENSIONS;
     requestedProperties += PROP_DENSITY;
     requestedProperties += PROP_GRAVITY;
     requestedProperties += PROP_DAMPING;
@@ -131,7 +102,19 @@ EntityPropertyFlags EntityItem::getEntityProperties(EncodeBitstreamParams& param
     requestedProperties += PROP_DYNAMIC;
     requestedProperties += PROP_LOCKED;
     requestedProperties += PROP_USER_DATA;
+
+    // Certifiable properties
+    requestedProperties += PROP_ITEM_NAME;
+    requestedProperties += PROP_ITEM_DESCRIPTION;
+    requestedProperties += PROP_ITEM_CATEGORIES;
+    requestedProperties += PROP_ITEM_ARTIST;
+    requestedProperties += PROP_ITEM_LICENSE;
+    requestedProperties += PROP_LIMITED_RUN;
     requestedProperties += PROP_MARKETPLACE_ID;
+    requestedProperties += PROP_EDITION_NUMBER;
+    requestedProperties += PROP_ENTITY_INSTANCE_NUMBER;
+    requestedProperties += PROP_CERTIFICATE_ID;
+
     requestedProperties += PROP_NAME;
     requestedProperties += PROP_HREF;
     requestedProperties += PROP_DESCRIPTION;
@@ -181,7 +164,6 @@ OctreeElement::AppendState EntityItem::appendEntityData(OctreePacketData* packet
 
     EntityPropertyFlags propertyFlags(PROP_LAST_ITEM);
     EntityPropertyFlags requestedProperties = getEntityProperties(params);
-    EntityPropertyFlags propertiesDidntFit = requestedProperties;
 
     // If we are being called for a subsequent pass at appendEntityData() that failed to completely encode this item,
     // then our entityTreeElementExtraEncodeData should include data about which properties we need to append.
@@ -189,6 +171,8 @@ OctreeElement::AppendState EntityItem::appendEntityData(OctreePacketData* packet
         requestedProperties = entityTreeElementExtraEncodeData->entities.value(getEntityItemID());
     }
 
+    EntityPropertyFlags propertiesDidntFit = requestedProperties;
+
     LevelDetails entityLevel = packetData->startLevel();
 
     quint64 lastEdited = getLastEdited();
@@ -257,7 +241,7 @@ OctreeElement::AppendState EntityItem::appendEntityData(OctreePacketData* packet
         APPEND_ENTITY_PROPERTY(PROP_ANGULAR_VELOCITY, getLocalAngularVelocity());
         APPEND_ENTITY_PROPERTY(PROP_ACCELERATION, getAcceleration());
 
-        APPEND_ENTITY_PROPERTY(PROP_DIMENSIONS, getDimensions()); // NOTE: PROP_RADIUS obsolete
+        APPEND_ENTITY_PROPERTY(PROP_DIMENSIONS, getDimensions());
         APPEND_ENTITY_PROPERTY(PROP_DENSITY, getDensity());
         APPEND_ENTITY_PROPERTY(PROP_GRAVITY, getGravity());
         APPEND_ENTITY_PROPERTY(PROP_DAMPING, getDamping());
@@ -275,7 +259,19 @@ OctreeElement::AppendState EntityItem::appendEntityData(OctreePacketData* packet
         APPEND_ENTITY_PROPERTY(PROP_DYNAMIC, getDynamic());
         APPEND_ENTITY_PROPERTY(PROP_LOCKED, getLocked());
         APPEND_ENTITY_PROPERTY(PROP_USER_DATA, getUserData());
+
+        // Certifiable Properties
         APPEND_ENTITY_PROPERTY(PROP_MARKETPLACE_ID, getMarketplaceID());
+        APPEND_ENTITY_PROPERTY(PROP_ITEM_NAME, getItemName());
+        APPEND_ENTITY_PROPERTY(PROP_ITEM_DESCRIPTION, getItemDescription());
+        APPEND_ENTITY_PROPERTY(PROP_ITEM_CATEGORIES, getItemCategories());
+        APPEND_ENTITY_PROPERTY(PROP_ITEM_ARTIST, getItemArtist());
+        APPEND_ENTITY_PROPERTY(PROP_ITEM_LICENSE, getItemLicense());
+        APPEND_ENTITY_PROPERTY(PROP_LIMITED_RUN, getLimitedRun());
+        APPEND_ENTITY_PROPERTY(PROP_EDITION_NUMBER, getEditionNumber());
+        APPEND_ENTITY_PROPERTY(PROP_ENTITY_INSTANCE_NUMBER, getEntityInstanceNumber());
+        APPEND_ENTITY_PROPERTY(PROP_CERTIFICATE_ID, getCertificateID());
+
         APPEND_ENTITY_PROPERTY(PROP_NAME, getName());
         APPEND_ENTITY_PROPERTY(PROP_COLLISION_SOUND_URL, getCollisionSoundURL());
         APPEND_ENTITY_PROPERTY(PROP_HREF, getHref());
@@ -361,14 +357,6 @@ int EntityItem::expectedBytes() {
 
 // clients use this method to unpack FULL updates from entity-server
 int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLeftToRead, ReadBitstreamToTreeParams& args) {
-    if (args.bitstreamVersion < VERSION_ENTITIES_SUPPORT_SPLIT_MTU) {
-
-        // NOTE: This shouldn't happen. The only versions of the bit stream that didn't support split mtu buffers should
-        // be handled by the model subclass and shouldn't call this routine.
-        qCDebug(entities) << "EntityItem::readEntityDataFromBuffer()... "
-                        "ERROR CASE...args.bitstreamVersion < VERSION_ENTITIES_SUPPORT_SPLIT_MTU";
-        return 0;
-    }
     setSourceUUID(args.sourceUUID);
 
     args.entitiesPerPacket++;
@@ -594,34 +582,32 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
 
     // Newer bitstreams will have a last simulated and a last updated value
     quint64 lastSimulatedFromBufferAdjusted = now;
-    if (args.bitstreamVersion >= VERSION_ENTITIES_HAS_LAST_SIMULATED_TIME) {
-        // last simulated is stored as ByteCountCoded delta from lastEdited
-        quint64 simulatedDelta;
-        parser.readCompressedCount(simulatedDelta);
+    // last simulated is stored as ByteCountCoded delta from lastEdited
+    quint64 simulatedDelta;
+    parser.readCompressedCount(simulatedDelta);
 #ifdef VALIDATE_ENTITY_ITEM_PARSER
-        {
-            QByteArray encodedSimulatedDelta = originalDataBuffer.mid(bytesRead); // maximum possible size
-            ByteCountCoded<quint64> simulatedDeltaCoder = encodedSimulatedDelta;
-            quint64 simulatedDelta2 = simulatedDeltaCoder;
-            Q_ASSERT(simulatedDelta2 == simulatedDelta);
-            encodedSimulatedDelta = simulatedDeltaCoder; // determine true length
-            dataAt += encodedSimulatedDelta.size();
-            bytesRead += encodedSimulatedDelta.size();
-            Q_ASSERT(parser.offset() == (unsigned int) bytesRead);
-        }
+    {
+        QByteArray encodedSimulatedDelta = originalDataBuffer.mid(bytesRead); // maximum possible size
+        ByteCountCoded<quint64> simulatedDeltaCoder = encodedSimulatedDelta;
+        quint64 simulatedDelta2 = simulatedDeltaCoder;
+        Q_ASSERT(simulatedDelta2 == simulatedDelta);
+        encodedSimulatedDelta = simulatedDeltaCoder; // determine true length
+        dataAt += encodedSimulatedDelta.size();
+        bytesRead += encodedSimulatedDelta.size();
+        Q_ASSERT(parser.offset() == (unsigned int) bytesRead);
+    }
 #endif
 
-        if (overwriteLocalData) {
-            lastSimulatedFromBufferAdjusted = lastEditedFromBufferAdjusted + simulatedDelta; // don't adjust for clock skew since we already did that
-            if (lastSimulatedFromBufferAdjusted > now) {
-                lastSimulatedFromBufferAdjusted = now;
-            }
-            #ifdef WANT_DEBUG
-                qCDebug(entities) << "                            _lastEdited:" << debugTime(_lastEdited, now);
-                qCDebug(entities) << "           lastEditedFromBufferAdjusted:" << debugTime(lastEditedFromBufferAdjusted, now);
-                qCDebug(entities) << "        lastSimulatedFromBufferAdjusted:" << debugTime(lastSimulatedFromBufferAdjusted, now);
-            #endif
+    if (overwriteLocalData) {
+        lastSimulatedFromBufferAdjusted = lastEditedFromBufferAdjusted + simulatedDelta; // don't adjust for clock skew since we already did that
+        if (lastSimulatedFromBufferAdjusted > now) {
+            lastSimulatedFromBufferAdjusted = now;
         }
+        #ifdef WANT_DEBUG
+            qCDebug(entities) << "                            _lastEdited:" << debugTime(_lastEdited, now);
+            qCDebug(entities) << "           lastEditedFromBufferAdjusted:" << debugTime(lastEditedFromBufferAdjusted, now);
+            qCDebug(entities) << "        lastSimulatedFromBufferAdjusted:" << debugTime(lastSimulatedFromBufferAdjusted, now);
+        #endif
     }
 
     #ifdef WANT_DEBUG
@@ -723,9 +709,17 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
             weOwnSimulation = _simulationOwner.matchesValidID(myNodeID);
         }
     }
+
+    auto lastEdited = lastEditedFromBufferAdjusted;
+    bool otherOverwrites = overwriteLocalData && !weOwnSimulation;
+    auto shouldUpdate = [lastEdited, otherOverwrites, filterRejection](quint64 updatedTimestamp, bool valueChanged) {
+        bool simulationChanged = lastEdited > updatedTimestamp;
+        return otherOverwrites && simulationChanged && (valueChanged || filterRejection);
+    };
+
     {   // When we own the simulation we don't accept updates to the entity's transform/velocities
         // we also want to ignore any duplicate packets that have the same "recently updated" values
-        // as a packet we've already recieved. This is because we want multiple edits of the same 
+        // as a packet we've already recieved. This is because we want multiple edits of the same
         // information to be idempotent, but if we applied new physics properties we'd resimulation
         // with small differences in results.
 
@@ -733,17 +727,11 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
         // made these lambdas that can access other details about the previous updates to suppress
         // any duplicates.
 
-        // Note: duplicate packets are expected and not wrong. They may be sent for any number of 
+        // Note: duplicate packets are expected and not wrong. They may be sent for any number of
         // reasons and the contract is that the client handles them in an idempotent manner.
-        auto lastEdited = lastEditedFromBufferAdjusted;
-        bool otherOverwrites = overwriteLocalData && !weOwnSimulation;
-        auto shouldUpdate = [lastEdited, otherOverwrites, filterRejection](quint64 updatedTimestamp, bool valueChanged) {
-            bool simulationChanged = lastEdited > updatedTimestamp;
-            return otherOverwrites && simulationChanged && (valueChanged || filterRejection);
-        };
         auto customUpdatePositionFromNetwork = [this, shouldUpdate, lastEdited](glm::vec3 value){
             if (shouldUpdate(_lastUpdatedPositionTimestamp, value != _lastUpdatedPositionValue)) {
-                updatePositionFromNetwork(value);
+                updatePosition(value);
                 _lastUpdatedPositionTimestamp = lastEdited;
                 _lastUpdatedPositionValue = value;
             }
@@ -751,7 +739,7 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
 
         auto customUpdateRotationFromNetwork = [this, shouldUpdate, lastEdited](glm::quat value){
             if (shouldUpdate(_lastUpdatedRotationTimestamp, value != _lastUpdatedRotationValue)) {
-                updateRotationFromNetwork(value);
+                updateRotation(value);
                 _lastUpdatedRotationTimestamp = lastEdited;
                 _lastUpdatedRotationValue = value;
             }
@@ -759,7 +747,7 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
 
         auto customUpdateVelocityFromNetwork = [this, shouldUpdate, lastEdited](glm::vec3 value){
              if (shouldUpdate(_lastUpdatedVelocityTimestamp, value != _lastUpdatedVelocityValue)) {
-                updateVelocityFromNetwork(value);
+                updateVelocity(value);
                 _lastUpdatedVelocityTimestamp = lastEdited;
                 _lastUpdatedVelocityValue = value;
             }
@@ -767,7 +755,7 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
 
         auto customUpdateAngularVelocityFromNetwork = [this, shouldUpdate, lastEdited](glm::vec3 value){
             if (shouldUpdate(_lastUpdatedAngularVelocityTimestamp, value != _lastUpdatedAngularVelocityValue)) {
-                updateAngularVelocityFromNetwork(value);
+                updateAngularVelocity(value);
                 _lastUpdatedAngularVelocityTimestamp = lastEdited;
                 _lastUpdatedAngularVelocityValue = value;
             }
@@ -786,8 +774,6 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
         READ_ENTITY_PROPERTY(PROP_VELOCITY, glm::vec3, customUpdateVelocityFromNetwork);
         READ_ENTITY_PROPERTY(PROP_ANGULAR_VELOCITY, glm::vec3, customUpdateAngularVelocityFromNetwork);
         READ_ENTITY_PROPERTY(PROP_ACCELERATION, glm::vec3, customSetAcceleration);
-
-
     }
 
     READ_ENTITY_PROPERTY(PROP_DIMENSIONS, glm::vec3, updateDimensions);
@@ -823,9 +809,16 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
     READ_ENTITY_PROPERTY(PROP_LOCKED, bool, updateLocked);
     READ_ENTITY_PROPERTY(PROP_USER_DATA, QString, setUserData);
 
-    if (args.bitstreamVersion >= VERSION_ENTITIES_HAS_MARKETPLACE_ID) {
-        READ_ENTITY_PROPERTY(PROP_MARKETPLACE_ID, QString, setMarketplaceID);
-    }
+    READ_ENTITY_PROPERTY(PROP_MARKETPLACE_ID, QString, setMarketplaceID);
+    READ_ENTITY_PROPERTY(PROP_ITEM_NAME, QString, setItemName);
+    READ_ENTITY_PROPERTY(PROP_ITEM_DESCRIPTION, QString, setItemDescription);
+    READ_ENTITY_PROPERTY(PROP_ITEM_CATEGORIES, QString, setItemCategories);
+    READ_ENTITY_PROPERTY(PROP_ITEM_ARTIST, QString, setItemArtist);
+    READ_ENTITY_PROPERTY(PROP_ITEM_LICENSE, QString, setItemLicense);
+    READ_ENTITY_PROPERTY(PROP_LIMITED_RUN, quint32, setLimitedRun);
+    READ_ENTITY_PROPERTY(PROP_EDITION_NUMBER, quint32, setEditionNumber);
+    READ_ENTITY_PROPERTY(PROP_ENTITY_INSTANCE_NUMBER, quint32, setEntityInstanceNumber);
+    READ_ENTITY_PROPERTY(PROP_CERTIFICATE_ID, QString, setCertificateID);
 
     READ_ENTITY_PROPERTY(PROP_NAME, QString, setName);
     READ_ENTITY_PROPERTY(PROP_COLLISION_SOUND_URL, QString, setCollisionSoundURL);
@@ -841,7 +834,18 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
         overwriteLocalData = oldOverwrite;
     }
 
-    READ_ENTITY_PROPERTY(PROP_QUERY_AA_CUBE, AACube, setQueryAACube);
+
+    {
+        auto customUpdateQueryAACubeFromNetwork = [this, shouldUpdate, lastEdited](AACube value){
+            if (shouldUpdate(_lastUpdatedQueryAACubeTimestamp, value != _lastUpdatedQueryAACubeValue)) {
+                setQueryAACube(value);
+                _lastUpdatedQueryAACubeTimestamp = lastEdited;
+                _lastUpdatedQueryAACubeValue = value;
+            }
+        };
+        READ_ENTITY_PROPERTY(PROP_QUERY_AA_CUBE, AACube, customUpdateQueryAACubeFromNetwork);
+    }
+
     READ_ENTITY_PROPERTY(PROP_LAST_EDITED_BY, QUuid, setLastEditedBy);
 
     bytesRead += readEntitySubclassDataFromBuffer(dataAt, (bytesLeftToRead - bytesRead), args,
@@ -853,10 +857,6 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
     // NOTE: we had a bad version of the stream that we added stream data after the subclass. We can attempt to recover
     // by doing this parsing here... but it's not likely going to fully recover the content.
     //
-    // TODO: Remove this code once we've sufficiently migrated content past this damaged version
-    if (args.bitstreamVersion == VERSION_ENTITIES_HAS_MARKETPLACE_ID_DAMAGED) {
-        READ_ENTITY_PROPERTY(PROP_MARKETPLACE_ID, QString, setMarketplaceID);
-    }
 
     if (overwriteLocalData && (getDirtyFlags() & (Simulation::DIRTY_TRANSFORM | Simulation::DIRTY_VELOCITIES))) {
         // NOTE: This code is attempting to "repair" the old data we just got from the server to make it more
@@ -880,8 +880,9 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
     // Tracking for editing roundtrips here. We will tell our EntityTree that we just got incoming data about
     // and entity that was edited at some time in the past. The tree will determine how it wants to track this
     // information.
-    if (_element && _element->getTree()) {
-        _element->getTree()->trackIncomingEntityLastEdited(lastEditedFromBufferAdjusted, bytesRead);
+    EntityTreeElementPointer element = _element; // use local copy of _element for logic below
+    if (element && element->getTree()) {
+        element->getTree()->trackIncomingEntityLastEdited(lastEditedFromBufferAdjusted, bytesRead);
     }
 
 
@@ -1242,7 +1243,19 @@ EntityItemProperties EntityItem::getProperties(EntityPropertyFlags desiredProper
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(dynamic, getDynamic);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(locked, getLocked);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(userData, getUserData);
+
+    // Certifiable Properties
+    COPY_ENTITY_PROPERTY_TO_PROPERTIES(itemName, getItemName);
+    COPY_ENTITY_PROPERTY_TO_PROPERTIES(itemDescription, getItemDescription);
+    COPY_ENTITY_PROPERTY_TO_PROPERTIES(itemCategories, getItemCategories);
+    COPY_ENTITY_PROPERTY_TO_PROPERTIES(itemArtist, getItemArtist);
+    COPY_ENTITY_PROPERTY_TO_PROPERTIES(itemLicense, getItemLicense);
+    COPY_ENTITY_PROPERTY_TO_PROPERTIES(limitedRun, getLimitedRun);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(marketplaceID, getMarketplaceID);
+    COPY_ENTITY_PROPERTY_TO_PROPERTIES(editionNumber, getEditionNumber);
+    COPY_ENTITY_PROPERTY_TO_PROPERTIES(entityInstanceNumber, getEntityInstanceNumber);
+    COPY_ENTITY_PROPERTY_TO_PROPERTIES(certificateID, getCertificateID);
+
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(name, getName);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(href, getHref);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(description, getDescription);
@@ -1337,7 +1350,19 @@ bool EntityItem::setProperties(const EntityItemProperties& properties) {
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(localRenderAlpha, setLocalRenderAlpha);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(visible, setVisible);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(userData, setUserData);
+
+    // Certifiable Properties
+    SET_ENTITY_PROPERTY_FROM_PROPERTIES(itemName, setItemName);
+    SET_ENTITY_PROPERTY_FROM_PROPERTIES(itemDescription, setItemDescription);
+    SET_ENTITY_PROPERTY_FROM_PROPERTIES(itemCategories, setItemCategories);
+    SET_ENTITY_PROPERTY_FROM_PROPERTIES(itemArtist, setItemArtist);
+    SET_ENTITY_PROPERTY_FROM_PROPERTIES(itemLicense, setItemLicense);
+    SET_ENTITY_PROPERTY_FROM_PROPERTIES(limitedRun, setLimitedRun);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(marketplaceID, setMarketplaceID);
+    SET_ENTITY_PROPERTY_FROM_PROPERTIES(editionNumber, setEditionNumber);
+    SET_ENTITY_PROPERTY_FROM_PROPERTIES(entityInstanceNumber, setEntityInstanceNumber);
+    SET_ENTITY_PROPERTY_FROM_PROPERTIES(certificateID, setCertificateID);
+
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(name, setName);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(href, setHref);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(description, setDescription);
@@ -1351,9 +1376,7 @@ bool EntityItem::setProperties(const EntityItemProperties& properties) {
 
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(lastEditedBy, setLastEditedBy);
 
-    AACube saveQueryAACube = _queryAACube;
-    checkAndAdjustQueryAACube();
-    if (saveQueryAACube != _queryAACube) {
+    if (updateQueryAACube()) {
         somethingChanged = true;
     }
 
@@ -1404,7 +1427,7 @@ void EntityItem::recordCreationTime() {
 const Transform EntityItem::getTransformToCenter(bool& success) const {
     Transform result = getTransform(success);
     if (getRegistrationPoint() != ENTITY_ITEM_HALF_VEC3) { // If it is not already centered, translate to center
-        result.postTranslate(ENTITY_ITEM_HALF_VEC3 - getRegistrationPoint()); // Position to center
+        result.postTranslate((ENTITY_ITEM_HALF_VEC3 - getRegistrationPoint()) * getDimensions()); // Position to center
     }
     return result;
 }
@@ -1413,7 +1436,11 @@ void EntityItem::setDimensions(const glm::vec3& value) {
     if (value.x <= 0.0f || value.y <= 0.0f || value.z <= 0.0f) {
         return;
     }
-    setScale(value);
+    if (_dimensions != value) {
+        _dimensions = value;
+        locationChanged();
+        dimensionsChanged();
+    }
 }
 
 /// The maximum bounding cube for the entity, independent of it's rotation.
@@ -1421,26 +1448,20 @@ void EntityItem::setDimensions(const glm::vec3& value) {
 ///
 AACube EntityItem::getMaximumAACube(bool& success) const {
     if (_recalcMaxAACube) {
-        // * we know that the position is the center of rotation
         glm::vec3 centerOfRotation = getPosition(success); // also where _registration point is
         if (success) {
             _recalcMaxAACube = false;
-            // * we know that the registration point is the center of rotation
-            // * we can calculate the length of the furthest extent from the registration point
-            //   as the dimensions * max (registrationPoint, (1.0,1.0,1.0) - registrationPoint)
-            glm::vec3 dimensions = getDimensions();
-            glm::vec3 registrationPoint = (dimensions * _registrationPoint);
-            glm::vec3 registrationRemainder = (dimensions * (glm::vec3(1.0f, 1.0f, 1.0f) - _registrationPoint));
-            glm::vec3 furthestExtentFromRegistration = glm::max(registrationPoint, registrationRemainder);
+            // we want to compute the furthestExtent that an entity can extend out from its "position"
+            // to do this we compute the max of these two vec3s: registration and 1-registration
+            // and then scale by dimensions
+            glm::vec3 maxExtents = getDimensions() * glm::max(_registrationPoint, glm::vec3(1.0f) - _registrationPoint);
 
-            // * we know that if you rotate in any direction you would create a sphere
-            //   that has a radius of the length of furthest extent from registration point
-            float radius = glm::length(furthestExtentFromRegistration);
+            // there exists a sphere that contains maxExtents for all rotations
+            float radius = glm::length(maxExtents);
 
-            // * we know that the minimum bounding cube of this maximum possible sphere is
-            //   (center - radius) to (center + radius)
+            // put a cube around the sphere
+            // TODO? replace _maxAACube with _boundingSphereRadius
             glm::vec3 minimumCorner = centerOfRotation - glm::vec3(radius, radius, radius);
-
             _maxAACube = AACube(minimumCorner, radius * 2.0f);
         }
     } else {
@@ -1519,6 +1540,9 @@ AACube EntityItem::getQueryAACube(bool& success) const {
     return result;
 }
 
+bool EntityItem::shouldPuffQueryAACube() const {
+    return hasActions() || isChildOfMyAvatar() || isMovingRelativeToParent();
+}
 
 // NOTE: This should only be used in cases of old bitstreams which only contain radius data
 //    0,0,0 --> maxDimension,maxDimension,maxDimension
@@ -1608,30 +1632,29 @@ void EntityItem::updatePosition(const glm::vec3& value) {
 }
 
 void EntityItem::updateParentID(const QUuid& value) {
-    if (getParentID() != value) {
+    QUuid oldParentID = getParentID();
+    if (oldParentID != value) {
+        EntityTreePointer tree = getTree();
+        if (!oldParentID.isNull()) {
+            tree->removeFromChildrenOfAvatars(getThisPointer());
+        }
         setParentID(value);
         // children are forced to be kinematic
         // may need to not collide with own avatar
         markDirtyFlags(Simulation::DIRTY_MOTION_TYPE | Simulation::DIRTY_COLLISION_GROUP);
 
-        EntityTreePointer tree = getTree();
         if (tree) {
             tree->addToNeedsParentFixupList(getThisPointer());
         }
+        updateQueryAACube();
     }
 }
 
-void EntityItem::updatePositionFromNetwork(const glm::vec3& value) {
-    if (shouldSuppressLocationEdits()) {
-        return;
-    }
-    updatePosition(value);
-}
-
 void EntityItem::updateDimensions(const glm::vec3& value) {
     if (getDimensions() != value) {
         setDimensions(value);
         markDirtyFlags(Simulation::DIRTY_SHAPE | Simulation::DIRTY_MASS);
+        _queryAACubeSet = false;
     }
 }
 
@@ -1648,13 +1671,6 @@ void EntityItem::updateRotation(const glm::quat& rotation) {
     }
 }
 
-void EntityItem::updateRotationFromNetwork(const glm::quat& rotation) {
-    if (shouldSuppressLocationEdits()) {
-        return;
-    }
-    updateRotation(rotation);
-}
-
 void EntityItem::updateMass(float mass) {
     // Setting the mass actually changes the _density (at fixed volume), however
     // we must protect the density range to help maintain stability of physics simulation
@@ -1705,13 +1721,6 @@ void EntityItem::updateVelocity(const glm::vec3& value) {
     }
 }
 
-void EntityItem::updateVelocityFromNetwork(const glm::vec3& value) {
-    if (shouldSuppressLocationEdits()) {
-        return;
-    }
-    updateVelocity(value);
-}
-
 void EntityItem::updateDamping(float value) {
     auto clampedDamping = glm::clamp(value, 0.0f, 1.0f);
     if (_damping != clampedDamping) {
@@ -1763,13 +1772,6 @@ void EntityItem::updateAngularVelocity(const glm::vec3& value) {
     }
 }
 
-void EntityItem::updateAngularVelocityFromNetwork(const glm::vec3& value) {
-    if (shouldSuppressLocationEdits()) {
-        return;
-    }
-    updateAngularVelocity(value);
-}
-
 void EntityItem::updateAngularDamping(float value) {
     auto clampedDamping = glm::clamp(value, 0.0f, 1.0f);
     if (_angularDamping != clampedDamping) {
@@ -1882,9 +1884,7 @@ void EntityItem::computeCollisionGroupAndFinalMask(int16_t& group, int16_t& mask
             // if this entity is a descendant of MyAvatar, don't collide with MyAvatar.  This avoids the
             // "bootstrapping" problem where you can shoot yourself across the room by grabbing something
             // and holding it against your own avatar.
-            QUuid ancestorID = findAncestorOfType(NestableType::Avatar);
-            if (!ancestorID.isNull() &&
-                (ancestorID == Physics::getSessionUUID() || ancestorID == AVATAR_SELF_ID)) {
+            if (isChildOfMyAvatar()) {
                 iAmHoldingThis = true;
             }
             // also, don't bootstrap our own avatar with a hold action
@@ -1991,6 +1991,7 @@ bool EntityItem::addAction(EntitySimulationPointer simulation, EntityDynamicPoin
             removeActionInternal(action->getID());
         }
     });
+    updateQueryAACube();
 
     return result;
 }
@@ -2049,6 +2050,8 @@ bool EntityItem::removeAction(EntitySimulationPointer simulation, const QUuid& a
         checkWaitingToRemove(simulation);
         success = removeActionInternal(actionID);
     });
+    updateQueryAACube();
+
     return success;
 }
 
@@ -2056,7 +2059,8 @@ bool EntityItem::removeActionInternal(const QUuid& actionID, EntitySimulationPoi
     _previouslyDeletedActions.insert(actionID, usecTimestampNow());
     if (_objectActions.contains(actionID)) {
         if (!simulation) {
-            EntityTreePointer entityTree = _element ? _element->getTree() : nullptr;
+            EntityTreeElementPointer element = _element; // use local copy of _element for logic below
+            EntityTreePointer entityTree = element ? element->getTree() : nullptr;
             simulation = entityTree ? entityTree->getSimulation() : nullptr;
         }
 
@@ -2290,6 +2294,7 @@ QVariantMap EntityItem::getActionArguments(const QUuid& actionID) const {
 }
 
 bool EntityItem::shouldSuppressLocationEdits() const {
+    // if any of the actions indicate they'd like suppression, suppress
     QHash<QUuid, EntityDynamicPointer>::const_iterator i = _objectActions.begin();
     while (i != _objectActions.end()) {
         if (i.value()->shouldSuppressLocationEdits()) {
@@ -2298,6 +2303,11 @@ bool EntityItem::shouldSuppressLocationEdits() const {
         i++;
     }
 
+    // if any of the ancestors are MyAvatar, suppress
+    if (isChildOfMyAvatar()) {
+        return true;
+    }
+
     return false;
 }
 
@@ -2326,11 +2336,13 @@ void EntityItem::locationChanged(bool tellPhysics) {
         }
     }
     SpatiallyNestable::locationChanged(tellPhysics); // tell all the children, also
+    somethingChangedNotification();
 }
 
 void EntityItem::dimensionsChanged() {
     requiresRecalcBoxes();
     SpatiallyNestable::dimensionsChanged(); // Do what you have to do
+    somethingChangedNotification();
 }
 
 void EntityItem::globalizeProperties(EntityItemProperties& properties, const QString& messageTemplate, const glm::vec3& offset) const {
@@ -2358,16 +2370,16 @@ void EntityItem::globalizeProperties(EntityItemProperties& properties, const QSt
 
 
 bool EntityItem::matchesJSONFilters(const QJsonObject& jsonFilters) const {
-    
+
     // The intention for the query JSON filter and this method is to be flexible to handle a variety of filters for
     // ALL entity properties. Some work will need to be done to the property system so that it can be more flexible
     // (to grab the value and default value of a property given the string representation of that property, for example)
-    
+
     // currently the only property filter we handle is '+' for serverScripts
     // which means that we only handle a filtered query asking for entities where the serverScripts property is non-default
-    
+
     static const QString SERVER_SCRIPTS_PROPERTY = "serverScripts";
-    
+
     foreach(const auto& property, jsonFilters.keys()) {
         if (property == SERVER_SCRIPTS_PROPERTY  && jsonFilters[property] == EntityQueryFilterSymbol::NonDefault) {
             // check if this entity has a non-default value for serverScripts
@@ -2378,7 +2390,7 @@ bool EntityItem::matchesJSONFilters(const QJsonObject& jsonFilters) const {
             }
         }
     }
-    
+
     // the json filter syntax did not match what we expected, return a match
     return true;
 }
@@ -2391,7 +2403,7 @@ quint64 EntityItem::getLastSimulated() const {
     return result;
 }
 
-void EntityItem::setLastSimulated(quint64 now) { 
+void EntityItem::setLastSimulated(quint64 now) {
     withWriteLock([&] {
         _lastSimulated = now;
     });
@@ -2412,7 +2424,7 @@ void EntityItem::setLastEdited(quint64 lastEdited) {
     });
 }
 
-quint64 EntityItem::getLastBroadcast() const { 
+quint64 EntityItem::getLastBroadcast() const {
     quint64 result;
     withReadLock([&] {
         result = _lastBroadcast;
@@ -2420,19 +2432,19 @@ quint64 EntityItem::getLastBroadcast() const {
     return result;
 }
 
-void EntityItem::setLastBroadcast(quint64 lastBroadcast) { 
+void EntityItem::setLastBroadcast(quint64 lastBroadcast) {
     withWriteLock([&] {
         _lastBroadcast = lastBroadcast;
     });
 }
 
-void EntityItem::markAsChangedOnServer() { 
+void EntityItem::markAsChangedOnServer() {
     withWriteLock([&] {
         _changedOnServer = usecTimestampNow();
     });
 }
 
-quint64 EntityItem::getLastChangedOnServer() const { 
+quint64 EntityItem::getLastChangedOnServer() const {
     quint64 result;
     withReadLock([&] {
         result = _changedOnServer;
@@ -2440,13 +2452,13 @@ quint64 EntityItem::getLastChangedOnServer() const {
     return result;
 }
 
-void EntityItem::update(const quint64& now) { 
+void EntityItem::update(const quint64& now) {
     withWriteLock([&] {
-        _lastUpdated = now; 
+        _lastUpdated = now;
     });
 }
 
-quint64 EntityItem::getLastUpdated() const { 
+quint64 EntityItem::getLastUpdated() const {
     quint64 result;
     withReadLock([&] {
         result = _lastUpdated;
@@ -2454,10 +2466,10 @@ quint64 EntityItem::getLastUpdated() const {
     return result;
 }
 
-void EntityItem::requiresRecalcBoxes() { 
+void EntityItem::requiresRecalcBoxes() {
     withWriteLock([&] {
-        _recalcAABox = true; 
-        _recalcMinAACube = true; 
+        _recalcAABox = true;
+        _recalcMinAACube = true;
         _recalcMaxAACube = true;
     });
 }
@@ -2470,7 +2482,7 @@ QString EntityItem::getHref() const {
     return result;
 }
 
-QString EntityItem::getDescription() const { 
+QString EntityItem::getDescription() const {
     QString result;
     withReadLock([&] {
         result = _description;
@@ -2492,54 +2504,54 @@ float EntityItem::getLocalRenderAlpha() const {
     return result;
 }
 
-void EntityItem::setLocalRenderAlpha(float localRenderAlpha) { 
+void EntityItem::setLocalRenderAlpha(float localRenderAlpha) {
     withWriteLock([&] {
         _localRenderAlpha = localRenderAlpha;
     });
 }
 
-glm::vec3 EntityItem::getGravity() const { 
+glm::vec3 EntityItem::getGravity() const {
     glm::vec3 result;
     withReadLock([&] {
         result = _gravity;
     });
     return result;
-} 
+}
 
-void EntityItem::setGravity(const glm::vec3& value) { 
+void EntityItem::setGravity(const glm::vec3& value) {
     withWriteLock([&] {
         _gravity = value;
     });
 }
 
-glm::vec3 EntityItem::getAcceleration() const { 
+glm::vec3 EntityItem::getAcceleration() const {
     glm::vec3 result;
     withReadLock([&] {
         result = _acceleration;
     });
     return result;
-} 
+}
 
-void EntityItem::setAcceleration(const glm::vec3& value) { 
+void EntityItem::setAcceleration(const glm::vec3& value) {
     withWriteLock([&] {
         _acceleration = value;
     });
 }
 
-float EntityItem::getDamping() const { 
+float EntityItem::getDamping() const {
     float result;
     withReadLock([&] {
         result = _damping;
     });
     return result;
 }
-void EntityItem::setDamping(float value) { 
+void EntityItem::setDamping(float value) {
     withWriteLock([&] {
         _damping = value;
     });
 }
 
-float EntityItem::getRestitution() const { 
+float EntityItem::getRestitution() const {
     float result;
     withReadLock([&] {
         result = _restitution;
@@ -2547,7 +2559,7 @@ float EntityItem::getRestitution() const {
     return result;
 }
 
-float EntityItem::getFriction() const { 
+float EntityItem::getFriction() const {
     float result;
     withReadLock([&] {
         result = _friction;
@@ -2556,35 +2568,35 @@ float EntityItem::getFriction() const {
 }
 
 // lifetime related properties.
-float EntityItem::getLifetime() const { 
+float EntityItem::getLifetime() const {
     float result;
     withReadLock([&] {
         result = _lifetime;
     });
     return result;
-} 
+}
 
-void EntityItem::setLifetime(float value) { 
+void EntityItem::setLifetime(float value) {
     withWriteLock([&] {
         _lifetime = value;
     });
 }
 
-quint64 EntityItem::getCreated() const { 
+quint64 EntityItem::getCreated() const {
     quint64 result;
     withReadLock([&] {
         result = _created;
     });
     return result;
-} 
+}
 
-void EntityItem::setCreated(quint64 value) { 
+void EntityItem::setCreated(quint64 value) {
     withWriteLock([&] {
         _created = value;
     });
 }
 
-QString EntityItem::getScript() const { 
+QString EntityItem::getScript() const {
     QString result;
     withReadLock([&] {
         result = _script;
@@ -2592,13 +2604,13 @@ QString EntityItem::getScript() const {
     return result;
 }
 
-void EntityItem::setScript(const QString& value) { 
+void EntityItem::setScript(const QString& value) {
     withWriteLock([&] {
         _script = value;
     });
 }
 
-quint64 EntityItem::getScriptTimestamp() const { 
+quint64 EntityItem::getScriptTimestamp() const {
     quint64 result;
     withReadLock([&] {
         result = _scriptTimestamp;
@@ -2606,13 +2618,13 @@ quint64 EntityItem::getScriptTimestamp() const {
     return result;
 }
 
-void EntityItem::setScriptTimestamp(const quint64 value) { 
+void EntityItem::setScriptTimestamp(const quint64 value) {
     withWriteLock([&] {
         _scriptTimestamp = value;
     });
 }
 
-QString EntityItem::getServerScripts() const { 
+QString EntityItem::getServerScripts() const {
     QString result;
     withReadLock([&] {
         result = _serverScripts;
@@ -2622,12 +2634,12 @@ QString EntityItem::getServerScripts() const {
 
 void EntityItem::setServerScripts(const QString& serverScripts) {
     withWriteLock([&] {
-        _serverScripts = serverScripts; 
+        _serverScripts = serverScripts;
         _serverScriptsChangedTimestamp = usecTimestampNow();
     });
 }
 
-QString EntityItem::getCollisionSoundURL() const { 
+QString EntityItem::getCollisionSoundURL() const {
     QString result;
     withReadLock([&] {
         result = _collisionSoundURL;
@@ -2635,22 +2647,22 @@ QString EntityItem::getCollisionSoundURL() const {
     return result;
 }
 
-glm::vec3 EntityItem::getRegistrationPoint() const { 
+glm::vec3 EntityItem::getRegistrationPoint() const {
     glm::vec3 result;
     withReadLock([&] {
         result = _registrationPoint;
     });
     return result;
-} 
+}
 
 void EntityItem::setRegistrationPoint(const glm::vec3& value) {
     withWriteLock([&] {
-        _registrationPoint = glm::clamp(value, 0.0f, 1.0f); 
+        _registrationPoint = glm::clamp(value, 0.0f, 1.0f);
     });
     dimensionsChanged(); // Registration Point affects the bounding box
 }
 
-float EntityItem::getAngularDamping() const { 
+float EntityItem::getAngularDamping() const {
     float result;
     withReadLock([&] {
         result = _angularDamping;
@@ -2658,13 +2670,13 @@ float EntityItem::getAngularDamping() const {
     return result;
 }
 
-void EntityItem::setAngularDamping(float value) { 
+void EntityItem::setAngularDamping(float value) {
     withWriteLock([&] {
         _angularDamping = value;
     });
 }
 
-QString EntityItem::getName() const { 
+QString EntityItem::getName() const {
     QString result;
     withReadLock([&] {
         result = _name;
@@ -2672,13 +2684,13 @@ QString EntityItem::getName() const {
     return result;
 }
 
-void EntityItem::setName(const QString& value) { 
+void EntityItem::setName(const QString& value) {
     withWriteLock([&] {
         _name = value;
     });
 }
 
-QString EntityItem::getDebugName() { 
+QString EntityItem::getDebugName() {
     QString result = getName();
     if (result.isEmpty()) {
         result = getID().toString();
@@ -2686,7 +2698,7 @@ QString EntityItem::getDebugName() {
     return result;
 }
 
-bool EntityItem::getVisible() const { 
+bool EntityItem::getVisible() const {
     bool result;
     withReadLock([&] {
         result = _visible;
@@ -2694,13 +2706,18 @@ bool EntityItem::getVisible() const {
     return result;
 }
 
-void EntityItem::setVisible(bool value) { 
+void EntityItem::setVisible(bool value) {
     withWriteLock([&] {
         _visible = value;
     });
 }
 
-bool EntityItem::getCollisionless() const { 
+bool EntityItem::isChildOfMyAvatar() const {
+    QUuid ancestorID = findAncestorOfType(NestableType::Avatar);
+    return !ancestorID.isNull() && (ancestorID == Physics::getSessionUUID() || ancestorID == AVATAR_SELF_ID);
+}
+
+bool EntityItem::getCollisionless() const {
     bool result;
     withReadLock([&] {
         result = _collisionless;
@@ -2708,13 +2725,13 @@ bool EntityItem::getCollisionless() const {
     return result;
 }
 
-void EntityItem::setCollisionless(bool value) { 
+void EntityItem::setCollisionless(bool value) {
     withWriteLock([&] {
         _collisionless = value;
     });
 }
 
-uint8_t EntityItem::getCollisionMask() const { 
+uint8_t EntityItem::getCollisionMask() const {
     uint8_t result;
     withReadLock([&] {
         result = _collisionMask;
@@ -2722,13 +2739,13 @@ uint8_t EntityItem::getCollisionMask() const {
     return result;
 }
 
-void EntityItem::setCollisionMask(uint8_t value) { 
+void EntityItem::setCollisionMask(uint8_t value) {
     withWriteLock([&] {
         _collisionMask = value;
     });
 }
 
-bool EntityItem::getDynamic() const { 
+bool EntityItem::getDynamic() const {
     if (SHAPE_TYPE_STATIC_MESH == getShapeType()) {
         return false;
     }
@@ -2739,13 +2756,13 @@ bool EntityItem::getDynamic() const {
     return result;
 }
 
-void EntityItem::setDynamic(bool value) { 
+void EntityItem::setDynamic(bool value) {
     withWriteLock([&] {
         _dynamic = value;
     });
 }
 
-bool EntityItem::getLocked() const { 
+bool EntityItem::getLocked() const {
     bool result;
     withReadLock([&] {
         result = _locked;
@@ -2753,7 +2770,7 @@ bool EntityItem::getLocked() const {
     return result;
 }
 
-void EntityItem::setLocked(bool value) { 
+void EntityItem::setLocked(bool value) {
     withWriteLock([&] {
         _locked = value;
     });
@@ -2776,7 +2793,7 @@ void EntityItem::updateLocked(bool value) {
     }
 }
 
-QString EntityItem::getUserData() const { 
+QString EntityItem::getUserData() const {
     QString result;
     withReadLock([&] {
         result = _userData;
@@ -2784,27 +2801,41 @@ QString EntityItem::getUserData() const {
     return result;
 }
 
-void EntityItem::setUserData(const QString& value) { 
+void EntityItem::setUserData(const QString& value) {
     withWriteLock([&] {
         _userData = value;
     });
 }
 
-QString EntityItem::getMarketplaceID() const { 
-    QString result;
-    withReadLock([&] {
-        result = _marketplaceID;
-    });
-    return result;
+// Certifiable Properties
+#define DEFINE_PROPERTY_GETTER(type, accessor, var) \
+type EntityItem::get##accessor() const {            \
+    type result;         \
+    withReadLock([&] {   \
+        result = _##var; \
+    });                  \
+    return result;       \
 }
 
-void EntityItem::setMarketplaceID(const QString& value) { 
-    withWriteLock([&] {
-        _marketplaceID = value;
-    });
+#define DEFINE_PROPERTY_SETTER(type, accessor, var)   \
+void EntityItem::set##accessor(const type & value) { \
+    withWriteLock([&] {                               \
+       _##var = value;                                \
+    });                                               \
 }
+#define DEFINE_PROPERTY_ACCESSOR(type, accessor, var) DEFINE_PROPERTY_GETTER(type, accessor, var) DEFINE_PROPERTY_SETTER(type, accessor, var)
+DEFINE_PROPERTY_ACCESSOR(QString, ItemName, itemName)
+DEFINE_PROPERTY_ACCESSOR(QString, ItemDescription, itemDescription)
+DEFINE_PROPERTY_ACCESSOR(QString, ItemCategories, itemCategories)
+DEFINE_PROPERTY_ACCESSOR(QString, ItemArtist, itemArtist)
+DEFINE_PROPERTY_ACCESSOR(QString, ItemLicense, itemLicense)
+DEFINE_PROPERTY_ACCESSOR(quint32, LimitedRun, limitedRun)
+DEFINE_PROPERTY_ACCESSOR(QString, MarketplaceID, marketplaceID)
+DEFINE_PROPERTY_ACCESSOR(quint32, EditionNumber, editionNumber)
+DEFINE_PROPERTY_ACCESSOR(quint32, EntityInstanceNumber, entityInstanceNumber)
+DEFINE_PROPERTY_ACCESSOR(QString, CertificateID, certificateID)
 
-uint32_t EntityItem::getDirtyFlags() const { 
+uint32_t EntityItem::getDirtyFlags() const {
     uint32_t result;
     withReadLock([&] {
         result = _dirtyFlags;
@@ -2819,7 +2850,7 @@ void EntityItem::markDirtyFlags(uint32_t mask) {
     });
 }
 
-void EntityItem::clearDirtyFlags(uint32_t mask) { 
+void EntityItem::clearDirtyFlags(uint32_t mask) {
     withWriteLock([&] {
         _dirtyFlags &= ~mask;
     });
@@ -2833,3 +2864,56 @@ float EntityItem::getDensity() const {
     return result;
 }
 
+EntityItem::ChangeHandlerId EntityItem::registerChangeHandler(const ChangeHandlerCallback& handler) {
+    ChangeHandlerId result = QUuid::createUuid();
+    withWriteLock([&] {
+        _changeHandlers[result] = handler;
+    });
+    return result;
+}
+
+void EntityItem::deregisterChangeHandler(const ChangeHandlerId& changeHandlerId) {
+    withWriteLock([&] {
+        _changeHandlers.remove(changeHandlerId);
+    });
+}
+
+void EntityItem::somethingChangedNotification() {
+    auto id = getEntityItemID();
+    withReadLock([&] {
+        for (const auto& handler : _changeHandlers.values()) {
+            handler(id);
+        }
+    });
+}
+
+void EntityItem::retrieveMarketplacePublicKey() {
+    QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
+    QNetworkRequest networkRequest;
+    networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
+    QUrl requestURL = NetworkingConstants::METAVERSE_SERVER_URL;
+    requestURL.setPath("/api/v1/commerce/marketplace_key");
+    QJsonObject request;
+    networkRequest.setUrl(requestURL);
+
+    QNetworkReply* networkReply = NULL;
+    networkReply = networkAccessManager.get(networkRequest);
+
+    connect(networkReply, &QNetworkReply::finished, [=]() {
+        QJsonObject jsonObject = QJsonDocument::fromJson(networkReply->readAll()).object();
+        jsonObject = jsonObject["data"].toObject();
+
+        if (networkReply->error() == QNetworkReply::NoError) {
+            if (!jsonObject["public_key"].toString().isEmpty()) {
+                EntityItem::_marketplacePublicKey = jsonObject["public_key"].toString();
+                qCWarning(entities) << "Marketplace public key has been set to" << _marketplacePublicKey;
+            } else {
+                qCWarning(entities) << "Marketplace public key is empty!";
+            }
+        } else {
+            qCWarning(entities) << "Call to" << networkRequest.url() << "failed! Error:" << networkReply->error();
+        }
+
+        networkReply->deleteLater();
+    });
+}
diff --git a/libraries/entities/src/EntityItem.h b/libraries/entities/src/EntityItem.h
index 92c83651aa..76a5205960 100644
--- a/libraries/entities/src/EntityItem.h
+++ b/libraries/entities/src/EntityItem.h
@@ -19,7 +19,6 @@
 
 #include <QtGui/QWindow>
 
-#include <shared/types/AnimationLoop.h> // for Animation, AnimationCache, and AnimationPointer classes
 #include <Octree.h> // for EncodeBitstreamParams class
 #include <OctreeElement.h> // for OctreeElement::AppendState
 #include <OctreePacketData.h>
@@ -60,13 +59,11 @@ using EntityTreeElementExtraEncodeDataPointer = std::shared_ptr<EntityTreeElemen
 
 class MeshProxyList;
 
-class RenderableEntityInterface;
-
-
 /// EntityItem class this is the base class for all entity types. It handles the basic properties and functionality available
 /// to all other entity types. In particular: postion, size, rotation, age, lifetime, velocity, gravity. You can not instantiate
 /// one directly, instead you must only construct one of it's derived classes with additional features.
-class EntityItem : public SpatiallyNestable, public ReadWriteLockable {
+class EntityItem : public QObject, public SpatiallyNestable, public ReadWriteLockable {
+    Q_OBJECT
     // These two classes manage lists of EntityItem pointers and must be able to cleanup pointers when an EntityItem is deleted.
     // To make the cleanup robust each EntityItem has backpointers to its manager classes (which are only ever set/cleared by
     // the managers themselves, hence they are fiends) whose NULL status can be used to determine which managers still need to
@@ -80,8 +77,6 @@ public:
     EntityItem(const EntityItemID& entityItemID);
     virtual ~EntityItem();
 
-    virtual RenderableEntityInterface* getRenderableInterface() { return nullptr; }
-
     inline EntityItemPointer getThisPointer() const {
         return std::static_pointer_cast<EntityItem>(std::const_pointer_cast<SpatiallyNestable>(shared_from_this()));
     }
@@ -104,10 +99,6 @@ public:
     // Update properties with empty parent id and globalized/absolute values (applying offset), and apply (non-empty) log template to args id, name-or-type, parent id.
     void globalizeProperties(EntityItemProperties& properties, const QString& messageTemplate = QString(), const glm::vec3& offset = glm::vec3(0.0f)) const;
 
-    /// Override this in your derived class if you'd like to be informed when something about the state of the entity
-    /// has changed. This will be called with properties change or when new data is loaded from a stream
-    virtual void somethingChangedNotification() { }
-
     void recordCreationTime();    // set _created to 'now'
     quint64 getLastSimulated() const; /// Last simulated time of this entity universal usecs
     void setLastSimulated(quint64 now);
@@ -189,7 +180,7 @@ public:
     void setDescription(const QString& value);
 
     /// Dimensions in meters (0.0 - TREE_SCALE)
-    inline const glm::vec3 getDimensions() const { return getScale(); }
+    inline const glm::vec3 getDimensions() const { return _dimensions; }
     virtual void setDimensions(const glm::vec3& value);
 
     float getLocalRenderAlpha() const;
@@ -246,6 +237,7 @@ public:
 
     using SpatiallyNestable::getQueryAACube;
     virtual AACube getQueryAACube(bool& success) const override;
+    virtual bool shouldPuffQueryAACube() const override;
 
     QString getScript() const;
     void setScript(const QString& value);
@@ -262,7 +254,7 @@ public:
     glm::vec3 getRegistrationPoint() const; /// registration point as ratio of entity
 
     /// registration point as ratio of entity
-    void setRegistrationPoint(const glm::vec3& value);
+    virtual void setRegistrationPoint(const glm::vec3& value);
 
     bool hasAngularVelocity() const { return getAngularVelocity() != ENTITY_ITEM_ZERO_VEC3; }
     bool hasLocalAngularVelocity() const { return getLocalAngularVelocity() != ENTITY_ITEM_ZERO_VEC3; }
@@ -279,6 +271,8 @@ public:
     inline bool isVisible() const { return getVisible(); }
     inline bool isInvisible() const { return !getVisible(); }
 
+    bool isChildOfMyAvatar() const;
+
     bool getCollisionless() const;
     void setCollisionless(bool value);
 
@@ -313,8 +307,27 @@ public:
     uint8_t getPendingOwnershipPriority() const { return _simulationOwner.getPendingPriority(); }
     void rememberHasSimulationOwnershipBid() const;
 
+    // Certifiable Properties
+    QString getItemName() const;
+    void setItemName(const QString& value);
+    QString getItemDescription() const;
+    void setItemDescription(const QString& value);
+    QString getItemCategories() const;
+    void setItemCategories(const QString& value);
+    QString getItemArtist() const;
+    void setItemArtist(const QString& value);
+    QString getItemLicense() const;
+    void setItemLicense(const QString& value);
+    quint32 getLimitedRun() const;
+    void setLimitedRun(const quint32&);
     QString getMarketplaceID() const;
     void setMarketplaceID(const QString& value);
+    quint32 getEditionNumber() const;
+    void setEditionNumber(const quint32&);
+    quint32 getEntityInstanceNumber() const;
+    void setEntityInstanceNumber(const quint32&);
+    QString getCertificateID() const;
+    void setCertificateID(const QString& value);
 
     // TODO: get rid of users of getRadius()...
     float getRadius() const;
@@ -322,7 +335,7 @@ public:
     virtual void adjustShapeInfoByRegistration(ShapeInfo& info) const;
     virtual bool contains(const glm::vec3& point) const;
 
-    virtual bool isReadyToComputeShape() { return !isDead(); }
+    virtual bool isReadyToComputeShape() const { return !isDead(); }
     virtual void computeShapeInfo(ShapeInfo& info);
     virtual float getVolumeEstimate() const;
 
@@ -335,20 +348,16 @@ public:
     virtual void updateRegistrationPoint(const glm::vec3& value);
     void updatePosition(const glm::vec3& value);
     void updateParentID(const QUuid& value);
-    void updatePositionFromNetwork(const glm::vec3& value);
     void updateDimensions(const glm::vec3& value);
     void updateRotation(const glm::quat& rotation);
-    void updateRotationFromNetwork(const glm::quat& rotation);
     void updateDensity(float value);
     void updateMass(float value);
     void updateVelocity(const glm::vec3& value);
-    void updateVelocityFromNetwork(const glm::vec3& value);
     void updateDamping(float value);
     void updateRestitution(float value);
     void updateFriction(float value);
     void updateGravity(const glm::vec3& value);
     void updateAngularVelocity(const glm::vec3& value);
-    void updateAngularVelocityFromNetwork(const glm::vec3& value);
     void updateAngularDamping(float value);
     void updateCollisionless(bool value);
     void updateCollisionMask(uint8_t value);
@@ -444,18 +453,11 @@ public:
     QUuid getOwningAvatarID() const { return _owningAvatarID; }
     void setOwningAvatarID(const QUuid& owningAvatarID) { _owningAvatarID = owningAvatarID; }
 
-    static void setEntitiesShouldFadeFunction(std::function<bool()> func) { _entitiesShouldFadeFunction = func; }
-    static std::function<bool()> getEntitiesShouldFadeFunction() { return _entitiesShouldFadeFunction; }
-    virtual bool isTransparent() { return _isFading ? Interpolate::calculateFadeRatio(_fadeStartTime) < 1.0f : false; }
-
     virtual bool wantsHandControllerPointerEvents() const { return false; }
     virtual bool wantsKeyboardFocus() const { return false; }
     virtual void setProxyWindow(QWindow* proxyWindow) {}
     virtual QObject* getEventHandler() { return nullptr; }
 
-    bool isFading() const { return _isFading; }
-    float getFadingRatio() const { return (isFading() ? Interpolate::calculateFadeRatio(_fadeStartTime) : 1.0f); }
-
     virtual void emitScriptEvent(const QVariant& message) {}
 
     QUuid getLastEditedBy() const { return _lastEditedBy; }
@@ -467,7 +469,18 @@ public:
 
     virtual void locationChanged(bool tellPhysics = true) override;
 
+    using ChangeHandlerCallback = std::function<void(const EntityItemID&)>;
+    using ChangeHandlerId = QUuid;
+    ChangeHandlerId registerChangeHandler(const ChangeHandlerCallback& handler);
+    void deregisterChangeHandler(const ChangeHandlerId& changeHandlerId);
+
+    static QString _marketplacePublicKey;
+    static void retrieveMarketplacePublicKey();
+
 protected:
+    QHash<ChangeHandlerId, ChangeHandlerCallback> _changeHandlers;
+
+    void somethingChangedNotification();
 
     void setSimulated(bool simulated) { _simulated = simulated; }
 
@@ -476,18 +489,19 @@ protected:
 
     virtual void dimensionsChanged() override;
 
-    EntityTypes::EntityType _type;
-    quint64 _lastSimulated; // last time this entity called simulate(), this includes velocity, angular velocity,
+    glm::vec3 _dimensions { ENTITY_ITEM_DEFAULT_DIMENSIONS };
+    EntityTypes::EntityType _type { EntityTypes::Unknown };
+    quint64 _lastSimulated { 0 }; // last time this entity called simulate(), this includes velocity, angular velocity,
                             // and physics changes
-    quint64 _lastUpdated; // last time this entity called update(), this includes animations and non-physics changes
-    quint64 _lastEdited; // last official local or remote edit time
-    QUuid _lastEditedBy; // id of last editor
+    quint64 _lastUpdated { 0 }; // last time this entity called update(), this includes animations and non-physics changes
+    quint64 _lastEdited { 0 }; // last official local or remote edit time
+    QUuid _lastEditedBy { ENTITY_ITEM_DEFAULT_LAST_EDITED_BY }; // id of last editor
     quint64 _lastBroadcast; // the last time we sent an edit packet about this entity
 
-    quint64 _lastEditedFromRemote; // last time we received and edit from the server
-    quint64 _lastEditedFromRemoteInRemoteTime; // last time we received an edit from the server (in server-time-frame)
-    quint64 _created;
-    quint64 _changedOnServer;
+    quint64 _lastEditedFromRemote { 0 }; // last time we received and edit from the server
+    quint64 _lastEditedFromRemoteInRemoteTime { 0 }; // last time we received an edit from the server (in server-time-frame)
+    quint64 _created { 0 };
+    quint64 _changedOnServer { 0 };
 
     mutable AABox _cachedAABox;
     mutable AACube _maxAACube;
@@ -496,20 +510,20 @@ protected:
     mutable bool _recalcMinAACube { true };
     mutable bool _recalcMaxAACube { true };
 
-    float _localRenderAlpha;
+    float _localRenderAlpha { ENTITY_ITEM_DEFAULT_LOCAL_RENDER_ALPHA };
     float _density { ENTITY_ITEM_DEFAULT_DENSITY }; // kg/m^3
     // NOTE: _volumeMultiplier is used to allow some mass properties code exist in the EntityItem base class
     // rather than in all of the derived classes.  If we ever collapse these classes to one we could do it a
     // different way.
     float _volumeMultiplier { 1.0f };
-    glm::vec3 _gravity;
-    glm::vec3 _acceleration;
-    float _damping;
-    float _restitution;
-    float _friction;
-    float _lifetime;
+    glm::vec3 _gravity { ENTITY_ITEM_DEFAULT_GRAVITY };
+    glm::vec3 _acceleration { ENTITY_ITEM_DEFAULT_ACCELERATION };
+    float _damping { ENTITY_ITEM_DEFAULT_DAMPING };
+    float _restitution { ENTITY_ITEM_DEFAULT_RESTITUTION };
+    float _friction { ENTITY_ITEM_DEFAULT_FRICTION };
+    float _lifetime { ENTITY_ITEM_DEFAULT_LIFETIME };
 
-    QString _script; /// the value of the script property
+    QString _script { ENTITY_ITEM_DEFAULT_SCRIPT }; /// the value of the script property
     QString _loadedScript; /// the value of _script when the last preload signal was sent
     quint64 _scriptTimestamp { ENTITY_ITEM_DEFAULT_SCRIPT_TIMESTAMP }; /// the script loaded property used for forced reload
 
@@ -521,21 +535,34 @@ protected:
     // NOTE: on construction we want this to be different from _scriptTimestamp so we intentionally bump it
     quint64 _loadedScriptTimestamp { ENTITY_ITEM_DEFAULT_SCRIPT_TIMESTAMP + 1 };
 
-    QString _collisionSoundURL;
-    glm::vec3 _registrationPoint;
-    float _angularDamping;
-    bool _visible;
-    bool _collisionless;
+    QString _collisionSoundURL { ENTITY_ITEM_DEFAULT_COLLISION_SOUND_URL };
+    glm::vec3 _registrationPoint { ENTITY_ITEM_DEFAULT_REGISTRATION_POINT };
+    float _angularDamping { ENTITY_ITEM_DEFAULT_ANGULAR_DAMPING };
+    bool _visible { ENTITY_ITEM_DEFAULT_VISIBLE };
+    bool _collisionless { ENTITY_ITEM_DEFAULT_COLLISIONLESS };
     uint8_t _collisionMask { ENTITY_COLLISION_MASK_DEFAULT };
-    bool _dynamic;
-    bool _locked;
-    QString _userData;
+    bool _dynamic { ENTITY_ITEM_DEFAULT_DYNAMIC };
+    bool _locked { ENTITY_ITEM_DEFAULT_LOCKED };
+    QString _userData { ENTITY_ITEM_DEFAULT_USER_DATA };
     SimulationOwner _simulationOwner;
-    QString _marketplaceID;
-    QString _name;
+    bool _shouldHighlight { false };
+    QString _name { ENTITY_ITEM_DEFAULT_NAME };
     QString _href; //Hyperlink href
     QString _description; //Hyperlink description
 
+    // Certifiable Properties
+    QString _itemName { ENTITY_ITEM_DEFAULT_ITEM_NAME };
+    QString _itemDescription { ENTITY_ITEM_DEFAULT_ITEM_DESCRIPTION };
+    QString _itemCategories { ENTITY_ITEM_DEFAULT_ITEM_CATEGORIES };
+    QString _itemArtist { ENTITY_ITEM_DEFAULT_ITEM_ARTIST };
+    QString _itemLicense { ENTITY_ITEM_DEFAULT_ITEM_LICENSE };
+    quint32 _limitedRun { ENTITY_ITEM_DEFAULT_LIMITED_RUN };
+    QString _certificateID { ENTITY_ITEM_DEFAULT_CERTIFICATE_ID };
+    quint32 _editionNumber { ENTITY_ITEM_DEFAULT_EDITION_NUMBER };
+    quint32 _entityInstanceNumber { ENTITY_ITEM_DEFAULT_ENTITY_INSTANCE_NUMBER };
+    QString _marketplaceID { ENTITY_ITEM_DEFAULT_MARKETPLACE_ID };
+
+
     // NOTE: Damping is applied like this:  v *= pow(1 - damping, dt)
     //
     // Hence the damping coefficient must range from 0 (no damping) to 1 (immediate stop).
@@ -553,12 +580,12 @@ protected:
     void setRadius(float value);
 
     // DirtyFlags are set whenever a property changes that the EntitySimulation needs to know about.
-    uint32_t _dirtyFlags;   // things that have changed from EXTERNAL changes (via script or packet) but NOT from simulation
+    uint32_t _dirtyFlags { 0 };   // things that have changed from EXTERNAL changes (via script or packet) but NOT from simulation
 
     // these backpointers are only ever set/cleared by friends:
-    EntityTreeElementPointer _element { nullptr }; // set by EntityTreeElement
+    EntityTreeElementPointer _element; // set by EntityTreeElement
     void* _physicsInfo { nullptr }; // set by EntitySimulation
-    bool _simulated; // set by EntitySimulation
+    bool _simulated { false }; // set by EntitySimulation
 
     bool addActionInternal(EntitySimulationPointer simulation, EntityDynamicPointer action);
     bool removeActionInternal(const QUuid& actionID, EntitySimulationPointer simulation = nullptr);
@@ -595,16 +622,15 @@ protected:
     glm::vec3 _lastUpdatedVelocityValue;
     glm::vec3 _lastUpdatedAngularVelocityValue;
     glm::vec3 _lastUpdatedAccelerationValue;
+    AACube _lastUpdatedQueryAACubeValue;
 
     quint64 _lastUpdatedPositionTimestamp { 0 };
     quint64 _lastUpdatedRotationTimestamp { 0 };
     quint64 _lastUpdatedVelocityTimestamp { 0 };
     quint64 _lastUpdatedAngularVelocityTimestamp { 0 };
     quint64 _lastUpdatedAccelerationTimestamp { 0 };
+    quint64 _lastUpdatedQueryAACubeTimestamp { 0 };
 
-    quint64 _fadeStartTime { usecTimestampNow() };
-    static std::function<bool()> _entitiesShouldFadeFunction;
-    bool _isFading { _entitiesShouldFadeFunction() };
 };
 
 #endif // hifi_EntityItem_h
diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp
index a207902789..108fc14e30 100644
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@@ -14,6 +14,15 @@
 #include <QObject>
 #include <QtCore/QJsonDocument>
 
+#include <openssl/err.h>
+#include <openssl/rsa.h>
+#include <openssl/pem.h>
+#include <openssl/x509.h>
+#include <NetworkingConstants.h>
+#include <NetworkAccessManager.h>
+#include <QtNetwork/QNetworkReply>
+#include <QtNetwork/QNetworkRequest>
+
 #include <ByteCountCoding.h>
 #include <GLMHelpers.h>
 #include <RegisteredMetaTypes.h>
@@ -27,6 +36,7 @@
 
 AnimationPropertyGroup EntityItemProperties::_staticAnimation;
 SkyboxPropertyGroup EntityItemProperties::_staticSkybox;
+HazePropertyGroup EntityItemProperties::_staticHaze;
 StagePropertyGroup EntityItemProperties::_staticStage;
 KeyLightPropertyGroup EntityItemProperties::_staticKeyLight;
 
@@ -71,6 +81,7 @@ void EntityItemProperties::debugDump() const {
 
     getAnimation().debugDump();
     getSkybox().debugDump();
+    getHaze().debugDump();
     getKeyLight().debugDump();
 
     qCDebug(entities) << "   changed properties...";
@@ -82,28 +93,11 @@ void EntityItemProperties::setLastEdited(quint64 usecTime) {
     _lastEdited = usecTime > _created ? usecTime : _created;
 }
 
-const char* shapeTypeNames[] = {
-    "none",
-    "box",
-    "sphere",
-    "capsule-x",
-    "capsule-y",
-    "capsule-z",
-    "cylinder-x",
-    "cylinder-y",
-    "cylinder-z",
-    "hull",
-    "plane",
-    "compound",
-    "simple-hull",
-    "simple-compound",
-    "static-mesh"
-};
 
 QHash<QString, ShapeType> stringToShapeTypeLookup;
 
 void addShapeType(ShapeType type) {
-    stringToShapeTypeLookup[shapeTypeNames[type]] = type;
+    stringToShapeTypeLookup[ShapeInfo::getNameForShapeType(type)] = type;
 }
 
 void buildStringToShapeTypeLookup() {
@@ -178,9 +172,7 @@ void EntityItemProperties::setCollisionMaskFromString(const QString& maskString)
 }
 
 QString EntityItemProperties::getShapeTypeAsString() const {
-    if (_shapeType < sizeof(shapeTypeNames) / sizeof(char *))
-        return QString(shapeTypeNames[_shapeType]);
-    return QString(shapeTypeNames[SHAPE_TYPE_NONE]);
+    return ShapeInfo::getNameForShapeType(_shapeType);
 }
 
 void EntityItemProperties::setShapeTypeFromString(const QString& shapeName) {
@@ -218,6 +210,42 @@ void EntityItemProperties::setBackgroundModeFromString(const QString& background
     }
 }
 
+using ComponentPair = std::pair<const ComponentMode, const QString>;
+const std::array<ComponentPair, COMPONENT_MODE_ITEM_COUNT> COMPONENT_MODES = { {
+        ComponentPair{ COMPONENT_MODE_INHERIT,{ "inherit" } },
+        ComponentPair{ COMPONENT_MODE_DISABLED,{ "disabled" } },
+        ComponentPair{ COMPONENT_MODE_ENABLED,{ "enabled" } }
+} };
+
+QString EntityItemProperties::getHazeModeAsString() const {
+    // return "inherit" if _hazeMode is not valid
+    if (_hazeMode < COMPONENT_MODE_ITEM_COUNT) {
+        return COMPONENT_MODES[_hazeMode].second;
+    } else {
+        return COMPONENT_MODES[COMPONENT_MODE_INHERIT].second;
+    }
+}
+
+QString EntityItemProperties::getHazeModeString(uint32_t mode) {
+    // return "inherit" if mode is not valid
+    if (mode < COMPONENT_MODE_ITEM_COUNT) {
+        return COMPONENT_MODES[mode].second;
+    } else {
+        return COMPONENT_MODES[COMPONENT_MODE_INHERIT].second;
+    }
+}
+
+void EntityItemProperties::setHazeModeFromString(const QString& hazeMode) {
+    auto result = std::find_if(COMPONENT_MODES.begin(), COMPONENT_MODES.end(), [&](const ComponentPair& pair) {
+        return (pair.second == hazeMode);
+    });
+
+    if (result != COMPONENT_MODES.end()) {
+        _hazeMode = result->first;
+        _hazeModeChanged = true;
+    }
+}
+
 EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
     EntityPropertyFlags changedProperties;
 
@@ -288,9 +316,24 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
     CHECK_PROPERTY_CHANGE(PROP_RADIUS_SPREAD, radiusSpread);
     CHECK_PROPERTY_CHANGE(PROP_RADIUS_START, radiusStart);
     CHECK_PROPERTY_CHANGE(PROP_RADIUS_FINISH, radiusFinish);
+
+    // Certifiable Properties
+    CHECK_PROPERTY_CHANGE(PROP_ITEM_NAME, itemName);
+    CHECK_PROPERTY_CHANGE(PROP_ITEM_DESCRIPTION, itemDescription);
+    CHECK_PROPERTY_CHANGE(PROP_ITEM_CATEGORIES, itemCategories);
+    CHECK_PROPERTY_CHANGE(PROP_ITEM_ARTIST, itemArtist);
+    CHECK_PROPERTY_CHANGE(PROP_ITEM_LICENSE, itemLicense);
+    CHECK_PROPERTY_CHANGE(PROP_LIMITED_RUN, limitedRun);
     CHECK_PROPERTY_CHANGE(PROP_MARKETPLACE_ID, marketplaceID);
+    CHECK_PROPERTY_CHANGE(PROP_EDITION_NUMBER, editionNumber);
+    CHECK_PROPERTY_CHANGE(PROP_ENTITY_INSTANCE_NUMBER, entityInstanceNumber);
+    CHECK_PROPERTY_CHANGE(PROP_CERTIFICATE_ID, certificateID);
+
     CHECK_PROPERTY_CHANGE(PROP_NAME, name);
     CHECK_PROPERTY_CHANGE(PROP_BACKGROUND_MODE, backgroundMode);
+
+    CHECK_PROPERTY_CHANGE(PROP_HAZE_MODE, hazeMode);
+
     CHECK_PROPERTY_CHANGE(PROP_SOURCE_URL, sourceUrl);
     CHECK_PROPERTY_CHANGE(PROP_VOXEL_VOLUME_SIZE, voxelVolumeSize);
     CHECK_PROPERTY_CHANGE(PROP_VOXEL_DATA, voxelData);
@@ -302,7 +345,9 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
     CHECK_PROPERTY_CHANGE(PROP_FACE_CAMERA, faceCamera);
     CHECK_PROPERTY_CHANGE(PROP_ACTION_DATA, actionData);
     CHECK_PROPERTY_CHANGE(PROP_NORMALS, normals);
+    CHECK_PROPERTY_CHANGE(PROP_STROKE_COLORS, strokeColors);
     CHECK_PROPERTY_CHANGE(PROP_STROKE_WIDTHS, strokeWidths);
+    CHECK_PROPERTY_CHANGE(PROP_IS_UV_MODE_STRETCH, isUVModeStretch);
     CHECK_PROPERTY_CHANGE(PROP_X_TEXTURE_URL, xTextureURL);
     CHECK_PROPERTY_CHANGE(PROP_Y_TEXTURE_URL, yTextureURL);
     CHECK_PROPERTY_CHANGE(PROP_Z_TEXTURE_URL, zTextureURL);
@@ -338,6 +383,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
     changedProperties += _keyLight.getChangedProperties();
     changedProperties += _skybox.getChangedProperties();
     changedProperties += _stage.getChangedProperties();
+    changedProperties += _haze.getChangedProperties();
 
     return changedProperties;
 }
@@ -405,7 +451,19 @@ QScriptValue EntityItemProperties::copyToScriptValue(QScriptEngine* engine, bool
     COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_ACTION_DATA, actionData);
     COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_LOCKED, locked);
     COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_USER_DATA, userData);
+
+    // Certifiable Properties
+    COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_ITEM_NAME, itemName);
+    COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_ITEM_DESCRIPTION, itemDescription);
+    COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_ITEM_CATEGORIES, itemCategories);
+    COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_ITEM_ARTIST, itemArtist);
+    COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_ITEM_LICENSE, itemLicense);
+    COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_LIMITED_RUN, limitedRun);
     COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_MARKETPLACE_ID, marketplaceID);
+    COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_EDITION_NUMBER, editionNumber);
+    COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_ENTITY_INSTANCE_NUMBER, entityInstanceNumber);
+    COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_CERTIFICATE_ID, certificateID);
+
     COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_NAME, name);
     COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_COLLISION_SOUND_URL, collisionSoundURL);
 
@@ -505,6 +563,9 @@ QScriptValue EntityItemProperties::copyToScriptValue(QScriptEngine* engine, bool
         COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_FLYING_ALLOWED, flyingAllowed);
         COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_GHOSTING_ALLOWED, ghostingAllowed);
         COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_FILTER_URL, filterURL);
+
+        COPY_PROPERTY_TO_QSCRIPTVALUE_GETTER(PROP_HAZE_MODE, hazeMode, getHazeModeAsString());
+        _haze.copyToScriptValue(_desiredProperties, properties, engine, skipDefaults, defaultEntityProperties);
     }
 
     // Web only
@@ -536,8 +597,10 @@ QScriptValue EntityItemProperties::copyToScriptValue(QScriptEngine* engine, bool
         COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_LINE_WIDTH, lineWidth);
         COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_LINE_POINTS, linePoints);
         COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_NORMALS, normals);
+        COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_STROKE_COLORS, strokeColors);
         COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_STROKE_WIDTHS, strokeWidths);
         COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_TEXTURES, textures);
+        COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_IS_UV_MODE_STRETCH, isUVModeStretch);
     }
 
     if (!skipDefaults && !strictSemantics) {
@@ -671,11 +734,26 @@ void EntityItemProperties::copyFromScriptValue(const QScriptValue& object, bool
     COPY_PROPERTY_FROM_QSCRIPTVALUE(radiusSpread, float, setRadiusSpread);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(radiusStart, float, setRadiusStart);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(radiusFinish, float, setRadiusFinish);
+
+    // Certifiable Properties
+    COPY_PROPERTY_FROM_QSCRIPTVALUE(itemName, QString, setItemName);
+    COPY_PROPERTY_FROM_QSCRIPTVALUE(itemDescription, QString, setItemDescription);
+    COPY_PROPERTY_FROM_QSCRIPTVALUE(itemCategories, QString, setItemCategories);
+    COPY_PROPERTY_FROM_QSCRIPTVALUE(itemArtist, QString, setItemArtist);
+    COPY_PROPERTY_FROM_QSCRIPTVALUE(itemLicense, QString, setItemLicense);
+    COPY_PROPERTY_FROM_QSCRIPTVALUE(limitedRun, quint32, setLimitedRun);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(marketplaceID, QString, setMarketplaceID);
+    COPY_PROPERTY_FROM_QSCRIPTVALUE(editionNumber, quint32, setEditionNumber);
+    COPY_PROPERTY_FROM_QSCRIPTVALUE(entityInstanceNumber, quint32, setEntityInstanceNumber);
+    COPY_PROPERTY_FROM_QSCRIPTVALUE(certificateID, QString, setCertificateID);
+
     COPY_PROPERTY_FROM_QSCRIPTVALUE(name, QString, setName);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(collisionSoundURL, QString, setCollisionSoundURL);
 
     COPY_PROPERTY_FROM_QSCRITPTVALUE_ENUM(backgroundMode, BackgroundMode);
+
+    COPY_PROPERTY_FROM_QSCRITPTVALUE_ENUM(hazeMode, HazeMode);
+
     COPY_PROPERTY_FROM_QSCRIPTVALUE(sourceUrl, QString, setSourceUrl);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(voxelVolumeSize, glmVec3, setVoxelVolumeSize);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(voxelData, QByteArray, setVoxelData);
@@ -687,7 +765,10 @@ void EntityItemProperties::copyFromScriptValue(const QScriptValue& object, bool
     COPY_PROPERTY_FROM_QSCRIPTVALUE(faceCamera, bool, setFaceCamera);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(actionData, QByteArray, setActionData);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(normals, qVectorVec3, setNormals);
+    COPY_PROPERTY_FROM_QSCRIPTVALUE(strokeColors, qVectorVec3, setStrokeColors);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(strokeWidths,qVectorFloat, setStrokeWidths);
+    COPY_PROPERTY_FROM_QSCRIPTVALUE(isUVModeStretch, bool, setIsUVModeStretch);
+    
 
     if (!honorReadOnly) {
         // this is used by the json reader to set things that we don't want javascript to able to affect.
@@ -703,6 +784,7 @@ void EntityItemProperties::copyFromScriptValue(const QScriptValue& object, bool
     _keyLight.copyFromScriptValue(object, _defaultSettings);
     _skybox.copyFromScriptValue(object, _defaultSettings);
     _stage.copyFromScriptValue(object, _defaultSettings);
+    _haze.copyFromScriptValue(object, _defaultSettings);
 
     COPY_PROPERTY_FROM_QSCRIPTVALUE(xTextureURL, QString, setXTextureURL);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(yTextureURL, QString, setYTextureURL);
@@ -809,11 +891,26 @@ void EntityItemProperties::merge(const EntityItemProperties& other) {
     COPY_PROPERTY_IF_CHANGED(radiusSpread);
     COPY_PROPERTY_IF_CHANGED(radiusStart);
     COPY_PROPERTY_IF_CHANGED(radiusFinish);
+
+    // Certifiable Properties
+    COPY_PROPERTY_IF_CHANGED(itemName);
+    COPY_PROPERTY_IF_CHANGED(itemDescription);
+    COPY_PROPERTY_IF_CHANGED(itemCategories);
+    COPY_PROPERTY_IF_CHANGED(itemArtist);
+    COPY_PROPERTY_IF_CHANGED(itemLicense);
+    COPY_PROPERTY_IF_CHANGED(limitedRun);
     COPY_PROPERTY_IF_CHANGED(marketplaceID);
+    COPY_PROPERTY_IF_CHANGED(editionNumber);
+    COPY_PROPERTY_IF_CHANGED(entityInstanceNumber);
+    COPY_PROPERTY_IF_CHANGED(certificateID);
+
     COPY_PROPERTY_IF_CHANGED(name);
     COPY_PROPERTY_IF_CHANGED(collisionSoundURL);
 
     COPY_PROPERTY_IF_CHANGED(backgroundMode);
+
+    COPY_PROPERTY_IF_CHANGED(hazeMode);
+
     COPY_PROPERTY_IF_CHANGED(sourceUrl);
     COPY_PROPERTY_IF_CHANGED(voxelVolumeSize);
     COPY_PROPERTY_IF_CHANGED(voxelData);
@@ -825,13 +922,16 @@ void EntityItemProperties::merge(const EntityItemProperties& other) {
     COPY_PROPERTY_IF_CHANGED(faceCamera);
     COPY_PROPERTY_IF_CHANGED(actionData);
     COPY_PROPERTY_IF_CHANGED(normals);
+    COPY_PROPERTY_IF_CHANGED(strokeColors);
     COPY_PROPERTY_IF_CHANGED(strokeWidths);
+    COPY_PROPERTY_IF_CHANGED(isUVModeStretch);
     COPY_PROPERTY_IF_CHANGED(created);
 
     _animation.merge(other._animation);
     _keyLight.merge(other._keyLight);
     _skybox.merge(other._skybox);
     _stage.merge(other._stage);
+    _haze.merge(other._haze);
 
     COPY_PROPERTY_IF_CHANGED(xTextureURL);
     COPY_PROPERTY_IF_CHANGED(yTextureURL);
@@ -981,7 +1081,19 @@ void EntityItemProperties::entityPropertyFlagsFromScriptValue(const QScriptValue
         ADD_PROPERTY_TO_MAP(PROP_RADIUS_SPREAD, RadiusSpread, radiusSpread, float);
         ADD_PROPERTY_TO_MAP(PROP_RADIUS_START, RadiusStart, radiusStart, float);
         ADD_PROPERTY_TO_MAP(PROP_RADIUS_FINISH, RadiusFinish, radiusFinish, float);
+
+        // Certifiable Properties
+        ADD_PROPERTY_TO_MAP(PROP_ITEM_NAME, ItemName, itemName, QString);
+        ADD_PROPERTY_TO_MAP(PROP_ITEM_DESCRIPTION, ItemDescription, itemDescription, QString);
+        ADD_PROPERTY_TO_MAP(PROP_ITEM_CATEGORIES, ItemCategories, itemCategories, QString);
+        ADD_PROPERTY_TO_MAP(PROP_ITEM_ARTIST, ItemArtist, itemArtist, QString);
+        ADD_PROPERTY_TO_MAP(PROP_ITEM_LICENSE, ItemLicense, itemLicense, QString);
+        ADD_PROPERTY_TO_MAP(PROP_LIMITED_RUN, LimitedRun, limitedRun, quint32);
         ADD_PROPERTY_TO_MAP(PROP_MARKETPLACE_ID, MarketplaceID, marketplaceID, QString);
+        ADD_PROPERTY_TO_MAP(PROP_EDITION_NUMBER, EditionNumber, editionNumber, quint32);
+        ADD_PROPERTY_TO_MAP(PROP_ENTITY_INSTANCE_NUMBER, EntityInstanceNumber, entityInstanceNumber, quint32);
+        ADD_PROPERTY_TO_MAP(PROP_CERTIFICATE_ID, CertificateID, certificateID, QString);
+
         ADD_PROPERTY_TO_MAP(PROP_KEYLIGHT_COLOR, KeyLightColor, keyLightColor, xColor);
         ADD_PROPERTY_TO_MAP(PROP_KEYLIGHT_INTENSITY, KeyLightIntensity, keyLightIntensity, float);
         ADD_PROPERTY_TO_MAP(PROP_KEYLIGHT_AMBIENT_INTENSITY, KeyLightAmbientIntensity, keyLightAmbientIntensity, float);
@@ -999,7 +1111,9 @@ void EntityItemProperties::entityPropertyFlagsFromScriptValue(const QScriptValue
         ADD_PROPERTY_TO_MAP(PROP_FACE_CAMERA, FaceCamera, faceCamera, bool);
         ADD_PROPERTY_TO_MAP(PROP_ACTION_DATA, ActionData, actionData, QByteArray);
         ADD_PROPERTY_TO_MAP(PROP_NORMALS, Normals, normals, QVector<glm::vec3>);
+        ADD_PROPERTY_TO_MAP(PROP_STROKE_COLORS, StrokeColors, strokeColors, QVector<glm::vec3>);
         ADD_PROPERTY_TO_MAP(PROP_STROKE_WIDTHS, StrokeWidths, strokeWidths, QVector<float>);
+        ADD_PROPERTY_TO_MAP(PROP_IS_UV_MODE_STRETCH, IsUVModeStretch, isUVModeStretch, QVector<float>);
         ADD_PROPERTY_TO_MAP(PROP_X_TEXTURE_URL, XTextureURL, xTextureURL, QString);
         ADD_PROPERTY_TO_MAP(PROP_Y_TEXTURE_URL, YTextureURL, yTextureURL, QString);
         ADD_PROPERTY_TO_MAP(PROP_Z_TEXTURE_URL, ZTextureURL, zTextureURL, QString);
@@ -1033,6 +1147,7 @@ void EntityItemProperties::entityPropertyFlagsFromScriptValue(const QScriptValue
         ADD_GROUP_PROPERTY_TO_MAP(PROP_ANIMATION_FIRST_FRAME, Animation, animation, FirstFrame, firstFrame);
         ADD_GROUP_PROPERTY_TO_MAP(PROP_ANIMATION_LAST_FRAME, Animation, animation, LastFrame, lastFrame);
         ADD_GROUP_PROPERTY_TO_MAP(PROP_ANIMATION_HOLD, Animation, animation, Hold, hold);
+        ADD_GROUP_PROPERTY_TO_MAP(PROP_ANIMATION_ALLOW_TRANSLATION, Animation, animation, AllowTranslation, allowTranslation);
 
         ADD_GROUP_PROPERTY_TO_MAP(PROP_SKYBOX_COLOR, Skybox, skybox, Color, color);
         ADD_GROUP_PROPERTY_TO_MAP(PROP_SKYBOX_URL, Skybox, skybox, URL, url);
@@ -1049,6 +1164,24 @@ void EntityItemProperties::entityPropertyFlagsFromScriptValue(const QScriptValue
         ADD_PROPERTY_TO_MAP(PROP_GHOSTING_ALLOWED, GhostingAllowed, ghostingAllowed, bool);
         ADD_PROPERTY_TO_MAP(PROP_FILTER_URL, FilterURL, filterURL, QString);
 
+        ADD_PROPERTY_TO_MAP(PROP_HAZE_MODE, HazeMode, hazeMode, uint32_t);
+
+        ADD_GROUP_PROPERTY_TO_MAP(PROP_HAZE_RANGE, Haze, haze, HazeRange, hazeRange);
+        ADD_GROUP_PROPERTY_TO_MAP(PROP_HAZE_COLOR, Haze, haze, HazeColor, hazeColor);
+        ADD_GROUP_PROPERTY_TO_MAP(PROP_HAZE_GLARE_COLOR, Haze, haze, HazeGlareColor, hazeGlareColor);
+        ADD_GROUP_PROPERTY_TO_MAP(PROP_HAZE_ENABLE_GLARE, Haze, haze, HazeEnableGlare, hazeEnableGlare);
+        ADD_GROUP_PROPERTY_TO_MAP(PROP_HAZE_GLARE_ANGLE, Haze, haze, HazeGlareAngle, hazeGlareAngle);
+
+        ADD_GROUP_PROPERTY_TO_MAP(PROP_HAZE_ALTITUDE_EFFECT, Haze, haze, HazeAltitudeEffect, hazeAltitudeEfect);
+        ADD_GROUP_PROPERTY_TO_MAP(PROP_HAZE_CEILING, Haze, haze, HazeCeiling, hazeCeiling);
+        ADD_GROUP_PROPERTY_TO_MAP(PROP_HAZE_BASE_REF, Haze, haze, HazeBaseRef, hazeBaseRef);
+
+        ADD_GROUP_PROPERTY_TO_MAP(PROP_HAZE_BACKGROUND_BLEND, Haze, haze, HazeBackgroundBlend, hazeBackgroundBlend);
+
+        ADD_GROUP_PROPERTY_TO_MAP(PROP_HAZE_ATTENUATE_KEYLIGHT, Haze, haze, HazeAttenuateKeyLight, hazeAttenuateKeyLight);
+        ADD_GROUP_PROPERTY_TO_MAP(PROP_HAZE_KEYLIGHT_RANGE, Haze, haze, HazeKeyLightRange, hazeKeyLightRange);
+        ADD_GROUP_PROPERTY_TO_MAP(PROP_HAZE_KEYLIGHT_ALTITUDE, Haze, haze, HazeKeyLightAltitude, hazeKeyLightAltitude);
+
         ADD_PROPERTY_TO_MAP(PROP_DPI, DPI, dpi, uint16_t);
 
         // FIXME - these are not yet handled
@@ -1088,8 +1221,9 @@ void EntityItemProperties::entityPropertyFlagsFromScriptValue(const QScriptValue
 //
 // TODO: Implement support for script and visible properties.
 //
-bool EntityItemProperties::encodeEntityEditPacket(PacketType command, EntityItemID id, const EntityItemProperties& properties,
-                                                  QByteArray& buffer) {
+OctreeElement::AppendState EntityItemProperties::encodeEntityEditPacket(PacketType command, EntityItemID id, const EntityItemProperties& properties,
+                QByteArray& buffer, EntityPropertyFlags requestedProperties, EntityPropertyFlags& didntFitProperties) {
+
     OctreePacketData ourDataPacket(false, buffer.size()); // create a packetData object to add out packet details too.
     OctreePacketData* packetData = &ourDataPacket; // we want a pointer to this so we can use our APPEND_ENTITY_PROPERTY macro
 
@@ -1131,17 +1265,8 @@ bool EntityItemProperties::encodeEntityEditPacket(PacketType command, EntityItem
         QByteArray encodedUpdateDelta = updateDeltaCoder;
 
         EntityPropertyFlags propertyFlags(PROP_LAST_ITEM);
-        EntityPropertyFlags requestedProperties = properties.getChangedProperties();
         EntityPropertyFlags propertiesDidntFit = requestedProperties;
 
-        // TODO: we need to handle the multi-pass form of this, similar to how we handle entity data
-        //
-        // If we are being called for a subsequent pass at appendEntityData() that failed to completely encode this item,
-        // then our modelTreeElementExtraEncodeData should include data about which properties we need to append.
-        //if (modelTreeElementExtraEncodeData && modelTreeElementExtraEncodeData->includedItems.contains(getEntityItemID())) {
-        //    requestedProperties = modelTreeElementExtraEncodeData->includedItems.value(getEntityItemID());
-        //}
-
         LevelDetails entityLevel = packetData->startLevel();
 
         // Last Edited quint64 always first, before any other details, which allows us easy access to adjusting this
@@ -1169,7 +1294,7 @@ bool EntityItemProperties::encodeEntityEditPacket(PacketType command, EntityItem
         int propertyCount = 0;
 
         bool headerFits = successIDFits && successTypeFits && successLastEditedFits
-        && successLastUpdatedFits && successPropertyFlagsFits;
+                && successLastUpdatedFits && successPropertyFlagsFits;
 
         int startOfEntityItemData = packetData->getUncompressedByteOffset();
 
@@ -1183,7 +1308,7 @@ bool EntityItemProperties::encodeEntityEditPacket(PacketType command, EntityItem
 
             APPEND_ENTITY_PROPERTY(PROP_SIMULATION_OWNER, properties._simulationOwner.toByteArray());
             APPEND_ENTITY_PROPERTY(PROP_POSITION, properties.getPosition());
-            APPEND_ENTITY_PROPERTY(PROP_DIMENSIONS, properties.getDimensions()); // NOTE: PROP_RADIUS obsolete
+            APPEND_ENTITY_PROPERTY(PROP_DIMENSIONS, properties.getDimensions());
             APPEND_ENTITY_PROPERTY(PROP_ROTATION, properties.getRotation());
             APPEND_ENTITY_PROPERTY(PROP_DENSITY, properties.getDensity());
             APPEND_ENTITY_PROPERTY(PROP_VELOCITY, properties.getVelocity());
@@ -1297,6 +1422,10 @@ bool EntityItemProperties::encodeEntityEditPacket(PacketType command, EntityItem
                 APPEND_ENTITY_PROPERTY(PROP_FLYING_ALLOWED, properties.getFlyingAllowed());
                 APPEND_ENTITY_PROPERTY(PROP_GHOSTING_ALLOWED, properties.getGhostingAllowed());
                 APPEND_ENTITY_PROPERTY(PROP_FILTER_URL, properties.getFilterURL());
+
+                APPEND_ENTITY_PROPERTY(PROP_HAZE_MODE, (uint32_t)properties.getHazeMode());
+                _staticHaze.setProperties(properties);
+                _staticHaze.appendToEditPacket(packetData, requestedProperties, propertyFlags, propertiesDidntFit, propertyCount, appendState);
             }
 
             if (properties.getType() == EntityTypes::PolyVox) {
@@ -1322,9 +1451,11 @@ bool EntityItemProperties::encodeEntityEditPacket(PacketType command, EntityItem
             if (properties.getType() == EntityTypes::PolyLine) {
                 APPEND_ENTITY_PROPERTY(PROP_LINE_WIDTH, properties.getLineWidth());
                 APPEND_ENTITY_PROPERTY(PROP_LINE_POINTS, properties.getLinePoints());
-                APPEND_ENTITY_PROPERTY(PROP_NORMALS, properties.getNormals());
+                APPEND_ENTITY_PROPERTY(PROP_NORMALS, properties.getPackedNormals());
+                APPEND_ENTITY_PROPERTY(PROP_STROKE_COLORS, properties.getPackedStrokeColors());
                 APPEND_ENTITY_PROPERTY(PROP_STROKE_WIDTHS, properties.getStrokeWidths());
                 APPEND_ENTITY_PROPERTY(PROP_TEXTURES, properties.getTextures());
+                APPEND_ENTITY_PROPERTY(PROP_IS_UV_MODE_STRETCH, properties.getIsUVModeStretch());
             }
             // NOTE: Spheres and Boxes are just special cases of Shape, and they need to include their PROP_SHAPE
             // when encoding/decoding edits because otherwise they can't polymorph to other shape types
@@ -1333,11 +1464,23 @@ bool EntityItemProperties::encodeEntityEditPacket(PacketType command, EntityItem
                 properties.getType() == EntityTypes::Sphere) {
                 APPEND_ENTITY_PROPERTY(PROP_SHAPE, properties.getShape());
             }
-            APPEND_ENTITY_PROPERTY(PROP_MARKETPLACE_ID, properties.getMarketplaceID());
+
             APPEND_ENTITY_PROPERTY(PROP_NAME, properties.getName());
             APPEND_ENTITY_PROPERTY(PROP_COLLISION_SOUND_URL, properties.getCollisionSoundURL());
             APPEND_ENTITY_PROPERTY(PROP_ACTION_DATA, properties.getActionData());
             APPEND_ENTITY_PROPERTY(PROP_ALPHA, properties.getAlpha());
+
+            // Certifiable Properties
+            APPEND_ENTITY_PROPERTY(PROP_ITEM_NAME, properties.getItemName());
+            APPEND_ENTITY_PROPERTY(PROP_ITEM_DESCRIPTION, properties.getItemDescription());
+            APPEND_ENTITY_PROPERTY(PROP_ITEM_CATEGORIES, properties.getItemCategories());
+            APPEND_ENTITY_PROPERTY(PROP_ITEM_ARTIST, properties.getItemArtist());
+            APPEND_ENTITY_PROPERTY(PROP_ITEM_LICENSE, properties.getItemLicense());
+            APPEND_ENTITY_PROPERTY(PROP_LIMITED_RUN, properties.getLimitedRun());
+            APPEND_ENTITY_PROPERTY(PROP_MARKETPLACE_ID, properties.getMarketplaceID());
+            APPEND_ENTITY_PROPERTY(PROP_EDITION_NUMBER, properties.getEditionNumber());
+            APPEND_ENTITY_PROPERTY(PROP_ENTITY_INSTANCE_NUMBER, properties.getEntityInstanceNumber());
+            APPEND_ENTITY_PROPERTY(PROP_CERTIFICATE_ID, properties.getCertificateID());
         }
 
         if (propertyCount > 0) {
@@ -1372,12 +1515,7 @@ bool EntityItemProperties::encodeEntityEditPacket(PacketType command, EntityItem
 
         // If any part of the model items didn't fit, then the element is considered partial
         if (appendState != OctreeElement::COMPLETED) {
-            // TODO: handle mechanism for handling partial fitting data!
-            // add this item into our list for the next appendElementData() pass
-            //modelTreeElementExtraEncodeData->includedItems.insert(getEntityItemID(), propertiesDidntFit);
-
-            // for now, if it's not complete, it's not successful
-            success = false;
+            didntFitProperties = propertiesDidntFit;
         }
     }
 
@@ -1393,11 +1531,53 @@ bool EntityItemProperties::encodeEntityEditPacket(PacketType command, EntityItem
         } else {
             qCDebug(entities) << "ERROR - encoded edit message doesn't fit in output buffer.";
             success = false;
+            appendState = OctreeElement::NONE; // if we got here, then we didn't include the item
+            // maybe we should assert!!!
         }
     } else {
         packetData->discardSubTree();
     }
-    return success;
+
+
+    return appendState;
+}
+
+QByteArray EntityItemProperties::getPackedNormals() const {
+    return packNormals(getNormals());
+}
+
+QByteArray EntityItemProperties::packNormals(const QVector<glm::vec3>& normals) const {
+    int normalsSize = normals.size();
+    QByteArray packedNormals = QByteArray(normalsSize * 6 + 1, '0');
+    // add size of the array
+    packedNormals[0] = ((uint8_t)normalsSize);
+
+    int index = 1;
+    for (int i = 0; i < normalsSize; i++) {
+        int numBytes = packFloatVec3ToSignedTwoByteFixed((unsigned char*)packedNormals.data() + index, normals[i], 15);
+        index += numBytes;
+    }
+    return packedNormals;
+}
+
+QByteArray EntityItemProperties::getPackedStrokeColors() const {
+    return packStrokeColors(getStrokeColors());
+}
+QByteArray EntityItemProperties::packStrokeColors(const QVector<glm::vec3>& strokeColors) const {
+    int strokeColorsSize = strokeColors.size();
+    QByteArray packedStrokeColors = QByteArray(strokeColorsSize * 3 + 1, '0');
+
+    // add size of the array
+    packedStrokeColors[0] = ((uint8_t)strokeColorsSize);
+
+
+    for (int i = 0; i < strokeColorsSize; i++) {
+        // add the color to the QByteArray
+        packedStrokeColors[i * 3 + 1] = strokeColors[i].r * 255;
+        packedStrokeColors[i * 3 + 2] = strokeColors[i].g * 255;
+        packedStrokeColors[i * 3 + 3] = strokeColors[i].b * 255;
+    }
+    return packedStrokeColors;
 }
 
 // TODO:
@@ -1485,7 +1665,7 @@ bool EntityItemProperties::decodeEntityEditPacket(const unsigned char* data, int
 
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_SIMULATION_OWNER, QByteArray, setSimulationOwner);
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_POSITION, glm::vec3, setPosition);
-    READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_DIMENSIONS, glm::vec3, setDimensions);  // NOTE: PROP_RADIUS obsolete
+    READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_DIMENSIONS, glm::vec3, setDimensions);
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_ROTATION, glm::quat, setRotation);
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_DENSITY, float, setDensity);
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_VELOCITY, glm::vec3, setVelocity);
@@ -1592,7 +1772,10 @@ bool EntityItemProperties::decodeEntityEditPacket(const unsigned char* data, int
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_FLYING_ALLOWED, bool, setFlyingAllowed);
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_GHOSTING_ALLOWED, bool, setGhostingAllowed);
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_FILTER_URL, QString, setFilterURL);
-    }
+ 
+        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_HAZE_MODE, uint32_t, setHazeMode);
+        properties.getHaze().decodeFromEditPacket(propertyFlags, dataAt, processedBytes);
+   }
 
     if (properties.getType() == EntityTypes::PolyVox) {
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_VOXEL_VOLUME_SIZE, glm::vec3, setVoxelVolumeSize);
@@ -1618,9 +1801,11 @@ bool EntityItemProperties::decodeEntityEditPacket(const unsigned char* data, int
     if (properties.getType() == EntityTypes::PolyLine) {
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_LINE_WIDTH, float, setLineWidth);
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_LINE_POINTS, QVector<glm::vec3>, setLinePoints);
-        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_NORMALS, QVector<glm::vec3>, setNormals);
+        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_NORMALS, QByteArray, setPackedNormals);
+        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_STROKE_COLORS, QByteArray, setPackedStrokeColors);
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_STROKE_WIDTHS, QVector<float>, setStrokeWidths);
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_TEXTURES, QString, setTextures);
+        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_IS_UV_MODE_STRETCH, bool, setIsUVModeStretch);
     }
 
     // NOTE: Spheres and Boxes are just special cases of Shape, and they need to include their PROP_SHAPE
@@ -1631,15 +1816,73 @@ bool EntityItemProperties::decodeEntityEditPacket(const unsigned char* data, int
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_SHAPE, QString, setShape);
     }
 
-    READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_MARKETPLACE_ID, QString, setMarketplaceID);
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_NAME, QString, setName);
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_COLLISION_SOUND_URL, QString, setCollisionSoundURL);
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_ACTION_DATA, QByteArray, setActionData);
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_ALPHA, float, setAlpha);
 
+    // Certifiable Properties
+    READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_ITEM_NAME, QString, setItemName);
+    READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_ITEM_DESCRIPTION, QString, setItemDescription);
+    READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_ITEM_CATEGORIES, QString, setItemCategories);
+    READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_ITEM_ARTIST, QString, setItemArtist);
+    READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_ITEM_LICENSE, QString, setItemLicense);
+    READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_LIMITED_RUN, quint32, setLimitedRun);
+    READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_MARKETPLACE_ID, QString, setMarketplaceID);
+    READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_EDITION_NUMBER, quint32, setEditionNumber);
+    READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_ENTITY_INSTANCE_NUMBER, quint32, setEntityInstanceNumber);
+    READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_CERTIFICATE_ID, QString, setCertificateID);
+
     return valid;
 }
 
+void EntityItemProperties::setPackedNormals(const QByteArray& value) {
+    setNormals(unpackNormals(value));
+}
+
+QVector<glm::vec3> EntityItemProperties::unpackNormals(const QByteArray& normals) {
+    // the size of the vector is packed first
+    QVector<glm::vec3> unpackedNormals = QVector<glm::vec3>((int)normals[0]);
+
+    if ((int)normals[0] == normals.size() / 6) {
+        int j = 0;
+        for (int i = 1; i < normals.size();) {
+            glm::vec3 aux = glm::vec3();
+            i += unpackFloatVec3FromSignedTwoByteFixed((unsigned char*)normals.data() + i, aux, 15);
+            unpackedNormals[j] = aux;
+            j++;
+        }
+    } else {
+        qCDebug(entities) << "WARNING - Expected received size for normals does not match. Expected: " << (int)normals[0] 
+                          << " Received: " << (normals.size() / 6);
+    }
+    return unpackedNormals;
+}
+
+void EntityItemProperties::setPackedStrokeColors(const QByteArray& value) {
+    setStrokeColors(unpackStrokeColors(value));
+}
+
+QVector<glm::vec3> EntityItemProperties::unpackStrokeColors(const QByteArray& strokeColors) {
+    // the size of the vector is packed first
+    QVector<glm::vec3> unpackedStrokeColors = QVector<glm::vec3>((int)strokeColors[0]);
+   
+    if ((int)strokeColors[0] == strokeColors.size() / 3) {
+        int j = 0;
+        for (int i = 1; i < strokeColors.size();) {
+
+            float r = (uint8_t)strokeColors[i++] / 255.0f;
+            float g = (uint8_t)strokeColors[i++] / 255.0f;
+            float b = (uint8_t)strokeColors[i++] / 255.0f;
+            unpackedStrokeColors[j++] = glmVec3(r, g, b);
+        }
+    } else {
+        qCDebug(entities) << "WARNING - Expected received size for stroke colors does not match. Expected: " 
+            << (int)strokeColors[0] << " Received: " << (strokeColors.size() / 3);
+    }
+
+    return unpackedStrokeColors;
+}
 
 // NOTE: This version will only encode the portion of the edit message immediately following the
 // header it does not include the send times and sequence number because that is handled by the
@@ -1745,15 +1988,27 @@ void EntityItemProperties::markAllChanged() {
     //_alphaStartChanged = true;
     //_alphaFinishChanged = true;
 
+    // Certifiable Properties
+    _itemNameChanged = true;
+    _itemDescriptionChanged = true;
+    _itemCategoriesChanged = true;
+    _itemArtistChanged = true;
+    _itemLicenseChanged = true;
+    _limitedRunChanged = true;
     _marketplaceIDChanged = true;
+    _editionNumberChanged = true;
+    _entityInstanceNumberChanged = true;
+    _certificateIDChanged = true;
 
     _keyLight.markAllChanged();
 
     _backgroundModeChanged = true;
+    _hazeModeChanged = true;
 
     _animation.markAllChanged();
     _skybox.markAllChanged();
     _stage.markAllChanged();
+    _haze.markAllChanged();
 
     _sourceUrlChanged = true;
     _voxelVolumeSizeChanged = true;
@@ -1769,7 +2024,9 @@ void EntityItemProperties::markAllChanged() {
     _actionDataChanged = true;
 
     _normalsChanged = true;
+    _strokeColorsChanged = true;
     _strokeWidthsChanged = true;
+    _isUVModeStretchChanged = true;
 
     _xTextureURLChanged = true;
     _yTextureURLChanged = true;
@@ -2052,12 +2309,47 @@ QList<QString> EntityItemProperties::listChangedProperties() {
     if (radiusFinishChanged()) {
         out += "radiusFinish";
     }
+
+    // Certifiable Properties
+    if (itemNameChanged()) {
+        out += "itemName";
+    }
+    if (itemDescriptionChanged()) {
+        out += "itemDescription";
+    }
+    if (itemCategoriesChanged()) {
+        out += "itemCategories";
+    }
+    if (itemArtistChanged()) {
+        out += "itemArtist";
+    }
+    if (itemLicenseChanged()) {
+        out += "itemLicense";
+    }
+    if (limitedRunChanged()) {
+        out += "limitedRun";
+    }
     if (marketplaceIDChanged()) {
         out += "marketplaceID";
     }
+    if (editionNumberChanged()) {
+        out += "editionNumber";
+    }
+    if (entityInstanceNumberChanged()) {
+        out += "entityInstanceNumber";
+    }
+    if (certificateIDChanged()) {
+        out += "certificateID";
+    }
+
     if (backgroundModeChanged()) {
         out += "backgroundMode";
     }
+
+    if (hazeModeChanged()) {
+        out += "hazeMode";
+    }
+
     if (voxelVolumeSizeChanged()) {
         out += "voxelVolumeSize";
     }
@@ -2149,20 +2441,141 @@ QList<QString> EntityItemProperties::listChangedProperties() {
         out += "shape";
     }
 
+    if (strokeColorsChanged()) {
+        out += "strokeColors";
+    }
+
+    if (isUVModeStretchChanged()) {
+        out += "isUVModeStretch";
+    }
+
     getAnimation().listChangedProperties(out);
     getKeyLight().listChangedProperties(out);
     getSkybox().listChangedProperties(out);
     getStage().listChangedProperties(out);
+    getHaze().listChangedProperties(out);
 
     return out;
 }
 
-bool EntityItemProperties::parentDependentPropertyChanged() const {
-    return localPositionChanged() || positionChanged() ||
-        localRotationChanged() || rotationChanged() ||
-        localVelocityChanged() || localAngularVelocityChanged();
+bool EntityItemProperties::transformChanged() const {
+    return positionChanged() || rotationChanged() ||
+        localPositionChanged() || localRotationChanged();
 }
 
 bool EntityItemProperties::parentRelatedPropertyChanged() const {
-    return parentDependentPropertyChanged() || parentIDChanged() || parentJointIndexChanged();
+    return positionChanged() || rotationChanged() ||
+        localPositionChanged() || localRotationChanged() ||
+        parentIDChanged() || parentJointIndexChanged();
+}
+
+bool EntityItemProperties::queryAACubeRelatedPropertyChanged() const {
+    return parentRelatedPropertyChanged() || dimensionsChanged();
+}
+
+// Checking Certifiable Properties
+#define ADD_STRING_PROPERTY(n, N) if (!get##N().isEmpty()) json[#n] = get##N()
+#define ADD_ENUM_PROPERTY(n, N) json[#n] = get##N##AsString()
+#define ADD_INT_PROPERTY(n, N) if (get##N() != 0) json[#n] = (get##N() == (quint32) -1) ? -1.0 : ((double) get##N())
+QByteArray EntityItemProperties::getStaticCertificateJSON() const {
+    // Produce a compact json of every non-default static certificate property, with the property names in alphabetical order.
+    // The static certificate properties include all an only those properties that cannot be changed without altering the identity
+    // of the entity as reviewed during the certification submission.
+
+    QJsonObject json;
+    if (!getAnimation().getURL().isEmpty()) {
+        json["animationURL"] = getAnimation().getURL();
+    }
+    ADD_STRING_PROPERTY(collisionSoundURL, CollisionSoundURL);
+    ADD_STRING_PROPERTY(compoundShapeURL, CompoundShapeURL);
+    ADD_INT_PROPERTY(editionNumber, EditionNumber);
+    ADD_INT_PROPERTY(instanceNumber, EntityInstanceNumber);
+    ADD_STRING_PROPERTY(itemArtist, ItemArtist);
+    ADD_STRING_PROPERTY(itemCategories, ItemCategories);
+    ADD_STRING_PROPERTY(itemDescription, ItemDescription);
+    ADD_STRING_PROPERTY(itemLicenseUrl, ItemLicense);
+    ADD_STRING_PROPERTY(itemName, ItemName);
+    ADD_INT_PROPERTY(limitedRun, LimitedRun);
+    ADD_STRING_PROPERTY(marketplaceID, MarketplaceID);
+    ADD_STRING_PROPERTY(modelURL, ModelURL);
+    ADD_STRING_PROPERTY(script, Script);
+    ADD_ENUM_PROPERTY(shapeType, ShapeType);
+    json["type"] = EntityTypes::getEntityTypeName(getType());
+
+    return QJsonDocument(json).toJson(QJsonDocument::Compact);
+}
+QByteArray EntityItemProperties::getStaticCertificateHash() const {
+    return QCryptographicHash::hash(getStaticCertificateJSON(), QCryptographicHash::Sha256);
+}
+
+bool EntityItemProperties::verifyStaticCertificateProperties() {
+    // True IIF a non-empty certificateID matches the static certificate json.
+    // I.e., if we can verify that the certificateID was produced by High Fidelity signing the static certificate hash.
+
+    if (getCertificateID().isEmpty()) {
+        return false;
+    }
+
+    const QByteArray marketplacePublicKeyByteArray = EntityItem::_marketplacePublicKey.toUtf8();
+    const unsigned char* marketplacePublicKey = reinterpret_cast<const unsigned char*>(marketplacePublicKeyByteArray.constData());
+    int marketplacePublicKeyLength = marketplacePublicKeyByteArray.length();
+
+    BIO *bio = BIO_new_mem_buf((void*)marketplacePublicKey, marketplacePublicKeyLength);
+    EVP_PKEY* evp_key = PEM_read_bio_PUBKEY(bio, NULL, NULL, NULL);
+    if (evp_key) {
+        RSA* rsa = EVP_PKEY_get1_RSA(evp_key);
+        if (rsa) {
+            const QByteArray digestByteArray = getStaticCertificateHash();
+            const unsigned char* digest = reinterpret_cast<const unsigned char*>(digestByteArray.constData());
+            int digestLength = digestByteArray.length();
+
+            const QByteArray signatureByteArray = QByteArray::fromBase64(getCertificateID().toUtf8());
+            const unsigned char* signature = reinterpret_cast<const unsigned char*>(signatureByteArray.constData());
+            int signatureLength = signatureByteArray.length();
+
+            ERR_clear_error();
+            bool answer = RSA_verify(NID_sha256,
+                digest,
+                digestLength,
+                signature,
+                signatureLength,
+                rsa);
+            long error = ERR_get_error();
+            if (error != 0) {
+                const char* error_str = ERR_error_string(error, NULL);
+                qCWarning(entities) << "ERROR while verifying static certificate properties! RSA error:" << error_str
+                    << "\nStatic Cert JSON:" << getStaticCertificateJSON()
+                    << "\nKey:" << EntityItem::_marketplacePublicKey << "\nKey Length:" << marketplacePublicKeyLength
+                    << "\nDigest:" << digest << "\nDigest Length:" << digestLength
+                    << "\nSignature:" << signature << "\nSignature Length:" << signatureLength;
+            }
+            RSA_free(rsa);
+            if (bio) {
+                BIO_free(bio);
+            }
+            if (evp_key) {
+                EVP_PKEY_free(evp_key);
+            }
+            return answer;
+        } else {
+            if (bio) {
+                BIO_free(bio);
+            }
+            if (evp_key) {
+                EVP_PKEY_free(evp_key);
+            }
+            long error = ERR_get_error();
+            const char* error_str = ERR_error_string(error, NULL);
+            qCWarning(entities) << "Failed to verify static certificate properties! RSA error:" << error_str;
+            return false;
+        }
+    } else {
+        if (bio) {
+            BIO_free(bio);
+        }
+        long error = ERR_get_error();
+        const char* error_str = ERR_error_string(error, NULL);
+        qCWarning(entities) << "Failed to verify static certificate properties! RSA error:" << error_str;
+        return false;
+    }
 }
diff --git a/libraries/entities/src/EntityItemProperties.h b/libraries/entities/src/EntityItemProperties.h
index b526ac663c..732dbdf69f 100644
--- a/libraries/entities/src/EntityItemProperties.h
+++ b/libraries/entities/src/EntityItemProperties.h
@@ -40,6 +40,7 @@
 #include "PolyVoxEntityItem.h"
 #include "SimulationOwner.h"
 #include "SkyboxPropertyGroup.h"
+#include "HazePropertyGroup.h"
 #include "StagePropertyGroup.h"
 #include "TextEntityItem.h"
 #include "ZoneEntityItem.h"
@@ -86,8 +87,9 @@ public:
 
     EntityPropertyFlags getChangedProperties() const;
 
-    bool parentDependentPropertyChanged() const; // was there a changed in a property that requires parent info to interpret?
-    bool parentRelatedPropertyChanged() const; // parentDependentPropertyChanged or parentID or parentJointIndex
+    bool transformChanged() const;
+    bool parentRelatedPropertyChanged() const;
+    bool queryAACubeRelatedPropertyChanged() const;
 
     AABox getAABox() const;
 
@@ -119,14 +121,14 @@ public:
     DEFINE_PROPERTY_REF(PROP_SCRIPT, Script, script, QString, ENTITY_ITEM_DEFAULT_SCRIPT);
     DEFINE_PROPERTY(PROP_SCRIPT_TIMESTAMP, ScriptTimestamp, scriptTimestamp, quint64, ENTITY_ITEM_DEFAULT_SCRIPT_TIMESTAMP);
     DEFINE_PROPERTY_REF(PROP_COLLISION_SOUND_URL, CollisionSoundURL, collisionSoundURL, QString, ENTITY_ITEM_DEFAULT_COLLISION_SOUND_URL);
-    DEFINE_PROPERTY_REF(PROP_COLOR, Color, color, xColor, ParticleEffectEntityItem::DEFAULT_COLOR);
-    DEFINE_PROPERTY_REF(PROP_COLOR_SPREAD, ColorSpread, colorSpread, xColor, ParticleEffectEntityItem::DEFAULT_COLOR_SPREAD);
-    DEFINE_PROPERTY_REF(PROP_COLOR_START, ColorStart, colorStart, xColor, ParticleEffectEntityItem::DEFAULT_COLOR);
-    DEFINE_PROPERTY_REF(PROP_COLOR_FINISH, ColorFinish, colorFinish, xColor, ParticleEffectEntityItem::DEFAULT_COLOR);
-    DEFINE_PROPERTY(PROP_ALPHA, Alpha, alpha, float, ParticleEffectEntityItem::DEFAULT_ALPHA);
-    DEFINE_PROPERTY(PROP_ALPHA_SPREAD, AlphaSpread, alphaSpread, float, ParticleEffectEntityItem::DEFAULT_ALPHA_SPREAD);
-    DEFINE_PROPERTY(PROP_ALPHA_START, AlphaStart, alphaStart, float, ParticleEffectEntityItem::DEFAULT_ALPHA);
-    DEFINE_PROPERTY(PROP_ALPHA_FINISH, AlphaFinish, alphaFinish, float, ParticleEffectEntityItem::DEFAULT_ALPHA);
+    DEFINE_PROPERTY_REF(PROP_COLOR, Color, color, xColor, particle::DEFAULT_COLOR);
+    DEFINE_PROPERTY_REF(PROP_COLOR_SPREAD, ColorSpread, colorSpread, xColor, particle::DEFAULT_COLOR_SPREAD);
+    DEFINE_PROPERTY_REF(PROP_COLOR_START, ColorStart, colorStart, xColor, particle::DEFAULT_COLOR);
+    DEFINE_PROPERTY_REF(PROP_COLOR_FINISH, ColorFinish, colorFinish, xColor, particle::DEFAULT_COLOR);
+    DEFINE_PROPERTY(PROP_ALPHA, Alpha, alpha, float, particle::DEFAULT_ALPHA);
+    DEFINE_PROPERTY(PROP_ALPHA_SPREAD, AlphaSpread, alphaSpread, float, particle::DEFAULT_ALPHA_SPREAD);
+    DEFINE_PROPERTY(PROP_ALPHA_START, AlphaStart, alphaStart, float, particle::DEFAULT_ALPHA);
+    DEFINE_PROPERTY(PROP_ALPHA_FINISH, AlphaFinish, alphaFinish, float, particle::DEFAULT_ALPHA);
     DEFINE_PROPERTY_REF(PROP_MODEL_URL, ModelURL, modelURL, QString, "");
     DEFINE_PROPERTY_REF(PROP_COMPOUND_SHAPE_URL, CompoundShapeURL, compoundShapeURL, QString, "");
     DEFINE_PROPERTY_REF(PROP_REGISTRATION_POINT, RegistrationPoint, registrationPoint, glm::vec3, ENTITY_ITEM_DEFAULT_REGISTRATION_POINT);
@@ -149,27 +151,26 @@ public:
     DEFINE_PROPERTY_REF(PROP_TEXT_COLOR, TextColor, textColor, xColor, TextEntityItem::DEFAULT_TEXT_COLOR);
     DEFINE_PROPERTY_REF(PROP_BACKGROUND_COLOR, BackgroundColor, backgroundColor, xColor, TextEntityItem::DEFAULT_BACKGROUND_COLOR);
     DEFINE_PROPERTY_REF_ENUM(PROP_SHAPE_TYPE, ShapeType, shapeType, ShapeType, SHAPE_TYPE_NONE);
-    DEFINE_PROPERTY(PROP_MAX_PARTICLES, MaxParticles, maxParticles, quint32, ParticleEffectEntityItem::DEFAULT_MAX_PARTICLES);
-    DEFINE_PROPERTY(PROP_LIFESPAN, Lifespan, lifespan, float, ParticleEffectEntityItem::DEFAULT_LIFESPAN);
+    DEFINE_PROPERTY(PROP_MAX_PARTICLES, MaxParticles, maxParticles, quint32, particle::DEFAULT_MAX_PARTICLES);
+    DEFINE_PROPERTY(PROP_LIFESPAN, Lifespan, lifespan, float, particle::DEFAULT_LIFESPAN);
     DEFINE_PROPERTY(PROP_EMITTING_PARTICLES, IsEmitting, isEmitting, bool, true);
-    DEFINE_PROPERTY(PROP_EMIT_RATE, EmitRate, emitRate, float, ParticleEffectEntityItem::DEFAULT_EMIT_RATE);
-    DEFINE_PROPERTY(PROP_EMIT_SPEED, EmitSpeed, emitSpeed, float, ParticleEffectEntityItem::DEFAULT_EMIT_SPEED);
-    DEFINE_PROPERTY(PROP_SPEED_SPREAD, SpeedSpread, speedSpread, float, ParticleEffectEntityItem::DEFAULT_SPEED_SPREAD);
-    DEFINE_PROPERTY_REF(PROP_EMIT_ORIENTATION, EmitOrientation, emitOrientation, glm::quat, ParticleEffectEntityItem::DEFAULT_EMIT_ORIENTATION);
-    DEFINE_PROPERTY_REF(PROP_EMIT_DIMENSIONS, EmitDimensions, emitDimensions, glm::vec3, ParticleEffectEntityItem::DEFAULT_EMIT_DIMENSIONS);
-    DEFINE_PROPERTY(PROP_EMIT_RADIUS_START, EmitRadiusStart, emitRadiusStart, float, ParticleEffectEntityItem::DEFAULT_EMIT_RADIUS_START);
-    DEFINE_PROPERTY(PROP_POLAR_START, PolarStart, polarStart, float, ParticleEffectEntityItem::DEFAULT_POLAR_START);
-    DEFINE_PROPERTY(PROP_POLAR_FINISH, PolarFinish, polarFinish, float, ParticleEffectEntityItem::DEFAULT_POLAR_FINISH);
-    DEFINE_PROPERTY(PROP_AZIMUTH_START, AzimuthStart, azimuthStart, float, ParticleEffectEntityItem::DEFAULT_AZIMUTH_START);
-    DEFINE_PROPERTY(PROP_AZIMUTH_FINISH, AzimuthFinish, azimuthFinish, float, ParticleEffectEntityItem::DEFAULT_AZIMUTH_FINISH);
-    DEFINE_PROPERTY_REF(PROP_EMIT_ACCELERATION, EmitAcceleration, emitAcceleration, glm::vec3, ParticleEffectEntityItem::DEFAULT_EMIT_ACCELERATION);
-    DEFINE_PROPERTY_REF(PROP_ACCELERATION_SPREAD, AccelerationSpread, accelerationSpread, glm::vec3, ParticleEffectEntityItem::DEFAULT_ACCELERATION_SPREAD);
-    DEFINE_PROPERTY(PROP_PARTICLE_RADIUS, ParticleRadius, particleRadius, float, ParticleEffectEntityItem::DEFAULT_PARTICLE_RADIUS);
-    DEFINE_PROPERTY(PROP_RADIUS_SPREAD, RadiusSpread, radiusSpread, float, ParticleEffectEntityItem::DEFAULT_RADIUS_SPREAD);
-    DEFINE_PROPERTY(PROP_RADIUS_START, RadiusStart, radiusStart, float, ParticleEffectEntityItem::DEFAULT_RADIUS_START);
-    DEFINE_PROPERTY(PROP_RADIUS_FINISH, RadiusFinish, radiusFinish, float, ParticleEffectEntityItem::DEFAULT_RADIUS_FINISH);
-    DEFINE_PROPERTY(PROP_EMITTER_SHOULD_TRAIL, EmitterShouldTrail, emitterShouldTrail, bool, ParticleEffectEntityItem::DEFAULT_EMITTER_SHOULD_TRAIL);
-    DEFINE_PROPERTY_REF(PROP_MARKETPLACE_ID, MarketplaceID, marketplaceID, QString, ENTITY_ITEM_DEFAULT_MARKETPLACE_ID);
+    DEFINE_PROPERTY(PROP_EMIT_RATE, EmitRate, emitRate, float, particle::DEFAULT_EMIT_RATE);
+    DEFINE_PROPERTY(PROP_EMIT_SPEED, EmitSpeed, emitSpeed, float, particle::DEFAULT_EMIT_SPEED);
+    DEFINE_PROPERTY(PROP_SPEED_SPREAD, SpeedSpread, speedSpread, float, particle::DEFAULT_SPEED_SPREAD);
+    DEFINE_PROPERTY_REF(PROP_EMIT_ORIENTATION, EmitOrientation, emitOrientation, glm::quat, particle::DEFAULT_EMIT_ORIENTATION);
+    DEFINE_PROPERTY_REF(PROP_EMIT_DIMENSIONS, EmitDimensions, emitDimensions, glm::vec3, particle::DEFAULT_EMIT_DIMENSIONS);
+    DEFINE_PROPERTY(PROP_EMIT_RADIUS_START, EmitRadiusStart, emitRadiusStart, float, particle::DEFAULT_EMIT_RADIUS_START);
+    DEFINE_PROPERTY(PROP_POLAR_START, PolarStart, polarStart, float, particle::DEFAULT_POLAR_START);
+    DEFINE_PROPERTY(PROP_POLAR_FINISH, PolarFinish, polarFinish, float, particle::DEFAULT_POLAR_FINISH);
+    DEFINE_PROPERTY(PROP_AZIMUTH_START, AzimuthStart, azimuthStart, float, particle::DEFAULT_AZIMUTH_START);
+    DEFINE_PROPERTY(PROP_AZIMUTH_FINISH, AzimuthFinish, azimuthFinish, float, particle::DEFAULT_AZIMUTH_FINISH);
+    DEFINE_PROPERTY_REF(PROP_EMIT_ACCELERATION, EmitAcceleration, emitAcceleration, glm::vec3, particle::DEFAULT_EMIT_ACCELERATION);
+    DEFINE_PROPERTY_REF(PROP_ACCELERATION_SPREAD, AccelerationSpread, accelerationSpread, glm::vec3, particle::DEFAULT_ACCELERATION_SPREAD);
+    DEFINE_PROPERTY(PROP_PARTICLE_RADIUS, ParticleRadius, particleRadius, float, particle::DEFAULT_PARTICLE_RADIUS);
+    DEFINE_PROPERTY(PROP_RADIUS_SPREAD, RadiusSpread, radiusSpread, float, particle::DEFAULT_RADIUS_SPREAD);
+    DEFINE_PROPERTY(PROP_RADIUS_START, RadiusStart, radiusStart, float, particle::DEFAULT_RADIUS_START);
+    DEFINE_PROPERTY(PROP_RADIUS_FINISH, RadiusFinish, radiusFinish, float, particle::DEFAULT_RADIUS_FINISH);
+    DEFINE_PROPERTY(PROP_EMITTER_SHOULD_TRAIL, EmitterShouldTrail, emitterShouldTrail, bool, particle::DEFAULT_EMITTER_SHOULD_TRAIL);
     DEFINE_PROPERTY_GROUP(KeyLight, keyLight, KeyLightPropertyGroup);
     DEFINE_PROPERTY_REF(PROP_VOXEL_VOLUME_SIZE, VoxelVolumeSize, voxelVolumeSize, glm::vec3, PolyVoxEntityItem::DEFAULT_VOXEL_VOLUME_SIZE);
     DEFINE_PROPERTY_REF(PROP_VOXEL_DATA, VoxelData, voxelData, QByteArray, PolyVoxEntityItem::DEFAULT_VOXEL_DATA);
@@ -177,7 +178,11 @@ public:
     DEFINE_PROPERTY_REF(PROP_NAME, Name, name, QString, ENTITY_ITEM_DEFAULT_NAME);
     DEFINE_PROPERTY_REF_ENUM(PROP_BACKGROUND_MODE, BackgroundMode, backgroundMode, BackgroundMode, BACKGROUND_MODE_INHERIT);
     DEFINE_PROPERTY_GROUP(Stage, stage, StagePropertyGroup);
+
+    DEFINE_PROPERTY_REF_ENUM(PROP_HAZE_MODE, HazeMode, hazeMode, uint32_t, (uint32_t)COMPONENT_MODE_INHERIT);
+
     DEFINE_PROPERTY_GROUP(Skybox, skybox, SkyboxPropertyGroup);
+    DEFINE_PROPERTY_GROUP(Haze, haze, HazePropertyGroup);
     DEFINE_PROPERTY_GROUP(Animation, animation, AnimationPropertyGroup);
     DEFINE_PROPERTY_REF(PROP_SOURCE_URL, SourceUrl, sourceUrl, QString, "");
     DEFINE_PROPERTY(PROP_LINE_WIDTH, LineWidth, lineWidth, float, LineEntityItem::DEFAULT_LINE_WIDTH);
@@ -186,8 +191,10 @@ public:
     DEFINE_PROPERTY_REF(PROP_DESCRIPTION, Description, description, QString, "");
     DEFINE_PROPERTY(PROP_FACE_CAMERA, FaceCamera, faceCamera, bool, TextEntityItem::DEFAULT_FACE_CAMERA);
     DEFINE_PROPERTY_REF(PROP_ACTION_DATA, ActionData, actionData, QByteArray, QByteArray());
-    DEFINE_PROPERTY(PROP_NORMALS, Normals, normals, QVector<glm::vec3>, QVector<glm::vec3>());
+    DEFINE_PROPERTY(PROP_NORMALS, Normals, normals, QVector<glm::vec3>, ENTITY_ITEM_DEFAULT_EMPTY_VEC3_QVEC);
+    DEFINE_PROPERTY(PROP_STROKE_COLORS, StrokeColors, strokeColors, QVector<glm::vec3>, ENTITY_ITEM_DEFAULT_EMPTY_VEC3_QVEC);
     DEFINE_PROPERTY(PROP_STROKE_WIDTHS, StrokeWidths, strokeWidths, QVector<float>, QVector<float>());
+	DEFINE_PROPERTY(PROP_IS_UV_MODE_STRETCH, IsUVModeStretch, isUVModeStretch, bool, true);
     DEFINE_PROPERTY_REF(PROP_X_TEXTURE_URL, XTextureURL, xTextureURL, QString, "");
     DEFINE_PROPERTY_REF(PROP_Y_TEXTURE_URL, YTextureURL, yTextureURL, QString, "");
     DEFINE_PROPERTY_REF(PROP_Z_TEXTURE_URL, ZTextureURL, zTextureURL, QString, "");
@@ -202,6 +209,18 @@ public:
     DEFINE_PROPERTY_REF(PROP_QUERY_AA_CUBE, QueryAACube, queryAACube, AACube, AACube());
     DEFINE_PROPERTY_REF(PROP_SHAPE, Shape, shape, QString, "Sphere");
 
+    // Certifiable Properties - related to Proof of Purchase certificates
+    DEFINE_PROPERTY_REF(PROP_ITEM_NAME, ItemName, itemName, QString, ENTITY_ITEM_DEFAULT_ITEM_NAME);
+    DEFINE_PROPERTY_REF(PROP_ITEM_DESCRIPTION, ItemDescription, itemDescription, QString, ENTITY_ITEM_DEFAULT_ITEM_DESCRIPTION);
+    DEFINE_PROPERTY_REF(PROP_ITEM_CATEGORIES, ItemCategories, itemCategories, QString, ENTITY_ITEM_DEFAULT_ITEM_CATEGORIES);
+    DEFINE_PROPERTY_REF(PROP_ITEM_ARTIST, ItemArtist, itemArtist, QString, ENTITY_ITEM_DEFAULT_ITEM_ARTIST);
+    DEFINE_PROPERTY_REF(PROP_ITEM_LICENSE, ItemLicense, itemLicense, QString, ENTITY_ITEM_DEFAULT_ITEM_LICENSE);
+    DEFINE_PROPERTY_REF(PROP_LIMITED_RUN, LimitedRun, limitedRun, quint32, ENTITY_ITEM_DEFAULT_LIMITED_RUN);
+    DEFINE_PROPERTY_REF(PROP_MARKETPLACE_ID, MarketplaceID, marketplaceID, QString, ENTITY_ITEM_DEFAULT_MARKETPLACE_ID);
+    DEFINE_PROPERTY_REF(PROP_EDITION_NUMBER, EditionNumber, editionNumber, quint32, ENTITY_ITEM_DEFAULT_EDITION_NUMBER);
+    DEFINE_PROPERTY_REF(PROP_ENTITY_INSTANCE_NUMBER, EntityInstanceNumber, entityInstanceNumber, quint32, ENTITY_ITEM_DEFAULT_ENTITY_INSTANCE_NUMBER);
+    DEFINE_PROPERTY_REF(PROP_CERTIFICATE_ID, CertificateID, certificateID, QString, ENTITY_ITEM_DEFAULT_CERTIFICATE_ID);
+
     // these are used when bouncing location data into and out of scripts
     DEFINE_PROPERTY_REF(PROP_LOCAL_POSITION, LocalPosition, localPosition, glmVec3, ENTITY_ITEM_ZERO_VEC3);
     DEFINE_PROPERTY_REF(PROP_LOCAL_ROTATION, LocalRotation, localRotation, glmQuat, ENTITY_ITEM_DEFAULT_ROTATION);
@@ -227,6 +246,7 @@ public:
     DEFINE_PROPERTY_REF(PROP_SERVER_SCRIPTS, ServerScripts, serverScripts, QString, ENTITY_ITEM_DEFAULT_SERVER_SCRIPTS);
 
     static QString getBackgroundModeString(BackgroundMode mode);
+    static QString getHazeModeString(uint32_t mode);
 
 
 public:
@@ -242,8 +262,8 @@ public:
     float getLocalRenderAlpha() const { return _localRenderAlpha; }
     void setLocalRenderAlpha(float value) { _localRenderAlpha = value; _localRenderAlphaChanged = true; }
 
-    static bool encodeEntityEditPacket(PacketType command, EntityItemID id, const EntityItemProperties& properties,
-                                       QByteArray& buffer);
+    static OctreeElement::AppendState encodeEntityEditPacket(PacketType command, EntityItemID id, const EntityItemProperties& properties,
+                                       QByteArray& buffer, EntityPropertyFlags requestedProperties, EntityPropertyFlags& didntFitProperties);
 
     static bool encodeEraseEntityMessage(const EntityItemID& entityItemID, QByteArray& buffer);
 
@@ -304,6 +324,21 @@ public:
     bool getRenderInfoHasTransparent() const { return _renderInfoHasTransparent; }
     void setRenderInfoHasTransparent(bool value) { _renderInfoHasTransparent = value; }
 
+    void setPackedNormals(const QByteArray& value);
+    QVector<glm::vec3> unpackNormals(const QByteArray& normals);
+
+    void setPackedStrokeColors(const QByteArray& value);
+    QVector<glm::vec3> unpackStrokeColors(const QByteArray& strokeColors);
+
+    QByteArray getPackedNormals() const;
+    QByteArray packNormals(const QVector<glm::vec3>& normals) const;
+
+    QByteArray getPackedStrokeColors() const;
+    QByteArray packStrokeColors(const QVector<glm::vec3>& strokeColors) const;
+
+    QByteArray getStaticCertificateJSON() const;
+    QByteArray getStaticCertificateHash() const;
+    bool verifyStaticCertificateProperties();
 
 protected:
     QString getCollisionMaskAsString() const;
@@ -425,8 +460,21 @@ inline QDebug operator<<(QDebug debug, const EntityItemProperties& properties) {
     DEBUG_PROPERTY_IF_CHANGED(debug, properties, RadiusSpread, radiusSpread, "");
     DEBUG_PROPERTY_IF_CHANGED(debug, properties, RadiusStart, radiusStart, "");
     DEBUG_PROPERTY_IF_CHANGED(debug, properties, RadiusFinish, radiusFinish, "");
+
+    // Certifiable Properties
+    DEBUG_PROPERTY_IF_CHANGED(debug, properties, ItemName, itemName, "");
+    DEBUG_PROPERTY_IF_CHANGED(debug, properties, ItemDescription, itemDescription, "");
+    DEBUG_PROPERTY_IF_CHANGED(debug, properties, ItemCategories, itemCategories, "");
+    DEBUG_PROPERTY_IF_CHANGED(debug, properties, ItemArtist, itemArtist, "");
+    DEBUG_PROPERTY_IF_CHANGED(debug, properties, ItemLicense, itemLicense, "");
+    DEBUG_PROPERTY_IF_CHANGED(debug, properties, LimitedRun, limitedRun, "");
     DEBUG_PROPERTY_IF_CHANGED(debug, properties, MarketplaceID, marketplaceID, "");
+    DEBUG_PROPERTY_IF_CHANGED(debug, properties, EditionNumber, editionNumber, "");
+    DEBUG_PROPERTY_IF_CHANGED(debug, properties, EntityInstanceNumber, entityInstanceNumber, "");
+    DEBUG_PROPERTY_IF_CHANGED(debug, properties, CertificateID, certificateID, "");
+
     DEBUG_PROPERTY_IF_CHANGED(debug, properties, BackgroundMode, backgroundMode, "");
+    DEBUG_PROPERTY_IF_CHANGED(debug, properties, HazeMode, hazeMode, "");
     DEBUG_PROPERTY_IF_CHANGED(debug, properties, VoxelVolumeSize, voxelVolumeSize, "");
     DEBUG_PROPERTY_IF_CHANGED(debug, properties, VoxelData, voxelData, "");
     DEBUG_PROPERTY_IF_CHANGED(debug, properties, VoxelSurfaceStyle, voxelSurfaceStyle, "");
diff --git a/libraries/entities/src/EntityItemPropertiesDefaults.h b/libraries/entities/src/EntityItemPropertiesDefaults.h
index d52c5d9aab..f4e8a18012 100644
--- a/libraries/entities/src/EntityItemPropertiesDefaults.h
+++ b/libraries/entities/src/EntityItemPropertiesDefaults.h
@@ -24,11 +24,24 @@ const glm::vec3 ENTITY_ITEM_ZERO_VEC3 = glm::vec3(0.0f);
 const glm::vec3 ENTITY_ITEM_ONE_VEC3 = glm::vec3(1.0f);
 const glm::vec3 ENTITY_ITEM_HALF_VEC3 = glm::vec3(0.5f);
 
+const QVector<glm::vec3> ENTITY_ITEM_DEFAULT_EMPTY_VEC3_QVEC = QVector<glm::vec3>();
+
 const bool ENTITY_ITEM_DEFAULT_LOCKED = false;
 const QString ENTITY_ITEM_DEFAULT_USER_DATA = QString("");
-const QString ENTITY_ITEM_DEFAULT_MARKETPLACE_ID = QString("");
 const QUuid ENTITY_ITEM_DEFAULT_SIMULATOR_ID = QUuid();
 
+// Certifiable Properties
+const QString ENTITY_ITEM_DEFAULT_ITEM_NAME = QString("");
+const QString ENTITY_ITEM_DEFAULT_ITEM_DESCRIPTION = QString("");
+const QString ENTITY_ITEM_DEFAULT_ITEM_CATEGORIES = QString("");
+const QString ENTITY_ITEM_DEFAULT_ITEM_ARTIST = QString("");
+const QString ENTITY_ITEM_DEFAULT_ITEM_LICENSE = QString("");
+const quint32 ENTITY_ITEM_DEFAULT_LIMITED_RUN = -1;
+const QString ENTITY_ITEM_DEFAULT_MARKETPLACE_ID = QString("");
+const quint32 ENTITY_ITEM_DEFAULT_EDITION_NUMBER = 0;
+const quint32 ENTITY_ITEM_DEFAULT_ENTITY_INSTANCE_NUMBER = 0;
+const QString ENTITY_ITEM_DEFAULT_CERTIFICATE_ID = QString("");
+
 const float ENTITY_ITEM_DEFAULT_ALPHA = 1.0f;
 const float ENTITY_ITEM_DEFAULT_LOCAL_RENDER_ALPHA = 1.0f;
 const bool ENTITY_ITEM_DEFAULT_VISIBLE = true;
diff --git a/libraries/entities/src/EntityPropertyFlags.h b/libraries/entities/src/EntityPropertyFlags.h
index b3cfc143c2..35d40b669a 100644
--- a/libraries/entities/src/EntityPropertyFlags.h
+++ b/libraries/entities/src/EntityPropertyFlags.h
@@ -21,8 +21,7 @@ enum EntityPropertyList {
     // these properties are supported by the EntityItem base class
     PROP_VISIBLE,
     PROP_POSITION,
-    PROP_RADIUS, // NOTE: PROP_RADIUS is obsolete and only included in old format streams
-    PROP_DIMENSIONS = PROP_RADIUS,
+    PROP_DIMENSIONS,
     PROP_ROTATION,
     PROP_DENSITY,
     PROP_VELOCITY,
@@ -40,19 +39,20 @@ enum EntityPropertyList {
     PROP_ANIMATION_FPS,
     PROP_ANIMATION_FRAME_INDEX,
     PROP_ANIMATION_PLAYING,
+    PROP_ANIMATION_ALLOW_TRANSLATION,
 
     // these properties are supported by the EntityItem base class
     PROP_REGISTRATION_POINT,
     PROP_ANGULAR_VELOCITY,
     PROP_ANGULAR_DAMPING,
     PROP_COLLISIONLESS,
-    PROP_DYNAMIC,
+    PROP_DYNAMIC, // 24
 
     // property used by Light entity
     PROP_IS_SPOTLIGHT,
     PROP_DIFFUSE_COLOR,
-    PROP_AMBIENT_COLOR_UNUSED,
-    PROP_SPECULAR_COLOR_UNUSED,
+    PROP_AMBIENT_COLOR_UNUSED, // FIXME - No longer used, can remove and bump protocol
+    PROP_SPECULAR_COLOR_UNUSED, // FIXME - No longer used, can remove and bump protocol
     PROP_INTENSITY, // Previously PROP_CONSTANT_ATTENUATION
     PROP_LINEAR_ATTENUATION_UNUSED,
     PROP_QUADRATIC_ATTENUATION_UNUSED,
@@ -60,30 +60,30 @@ enum EntityPropertyList {
     PROP_CUTOFF,
 
     // available to all entities
-    PROP_LOCKED,
+    PROP_LOCKED,  // 34
 
     PROP_TEXTURES,  // used by Model entities
-    PROP_ANIMATION_SETTINGS,  // used by Model entities
-    PROP_USER_DATA,  // all entities
+    PROP_ANIMATION_SETTINGS_UNUSED,  // FIXME - No longer used, can remove and bump protocol
+    PROP_USER_DATA,  // all entities -- 37
     PROP_SHAPE_TYPE, // used by Model + zones entities
 
     // used by ParticleEffect entities
-    PROP_MAX_PARTICLES,
-    PROP_LIFESPAN,
+    PROP_MAX_PARTICLES, // 39
+    PROP_LIFESPAN, // 40 -- used by all entities
     PROP_EMIT_RATE,
     PROP_EMIT_SPEED,
     PROP_EMIT_STRENGTH,
-    PROP_EMIT_ACCELERATION,
-    PROP_PARTICLE_RADIUS,
+    PROP_EMIT_ACCELERATION, // FIXME - doesn't seem to get set in mark all changed????
+    PROP_PARTICLE_RADIUS,  // 45!!
 
     PROP_COMPOUND_SHAPE_URL, // used by Model + zones entities
     PROP_MARKETPLACE_ID, // all entities
     PROP_ACCELERATION, // all entities
     PROP_SIMULATION_OWNER, // formerly known as PROP_SIMULATOR_ID
-    PROP_NAME, // all entities
+    PROP_NAME, // all entities -- 50
     PROP_COLLISION_SOUND_URL,
     PROP_RESTITUTION,
-    PROP_FRICTION,
+    PROP_FRICTION, // 53
 
     PROP_VOXEL_VOLUME_SIZE,
     PROP_VOXEL_DATA,
@@ -95,7 +95,7 @@ enum EntityPropertyList {
 
     // used by hyperlinks
     PROP_HREF,
-    PROP_DESCRIPTION,
+    PROP_DESCRIPTION, // 61
 
     PROP_FACE_CAMERA,
     PROP_SCRIPT_TIMESTAMP,
@@ -108,7 +108,9 @@ enum EntityPropertyList {
 
     // Used by PolyLine entity
     PROP_NORMALS,
+    PROP_STROKE_COLORS,
     PROP_STROKE_WIDTHS,
+    PROP_IS_UV_MODE_STRETCH,
 
     // used by particles
     PROP_SPEED_SPREAD,
@@ -186,7 +188,37 @@ enum EntityPropertyList {
     PROP_SERVER_SCRIPTS,
 
     PROP_FILTER_URL,
-    
+
+    // Certificable Properties
+    PROP_ITEM_NAME,
+    PROP_ITEM_DESCRIPTION,
+    PROP_ITEM_CATEGORIES,
+    PROP_ITEM_ARTIST,
+    PROP_ITEM_LICENSE,
+    PROP_LIMITED_RUN,
+    // PROP_MARKETPLACE_ID is above
+    PROP_EDITION_NUMBER,
+    PROP_ENTITY_INSTANCE_NUMBER,
+    PROP_CERTIFICATE_ID,
+
+    PROP_HAZE_MODE,
+
+    PROP_HAZE_RANGE,
+    PROP_HAZE_COLOR,
+    PROP_HAZE_GLARE_COLOR,
+    PROP_HAZE_ENABLE_GLARE,
+    PROP_HAZE_GLARE_ANGLE,
+
+    PROP_HAZE_ALTITUDE_EFFECT,
+    PROP_HAZE_CEILING,
+    PROP_HAZE_BASE_REF,
+
+    PROP_HAZE_BACKGROUND_BLEND,
+
+    PROP_HAZE_ATTENUATE_KEYLIGHT,
+    PROP_HAZE_KEYLIGHT_RANGE,
+    PROP_HAZE_KEYLIGHT_ALTITUDE,
+
     ////////////////////////////////////////////////////////////////////////////////////////////////////
     // ATTENTION: add new properties to end of list just ABOVE this line
     PROP_AFTER_LAST_ITEM,
@@ -218,6 +250,7 @@ enum EntityPropertyList {
     PROP_STAGE_HOUR = PROP_QUADRATIC_ATTENUATION_UNUSED,
     PROP_STAGE_AUTOMATIC_HOURDAY = PROP_ANIMATION_FRAME_INDEX,
     PROP_BACKGROUND_MODE = PROP_MODEL_URL,
+
     PROP_SKYBOX_COLOR = PROP_ANIMATION_URL,
     PROP_SKYBOX_URL = PROP_ANIMATION_FPS,
     PROP_KEYLIGHT_AMBIENT_URL = PROP_ANIMATION_PLAYING,
diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp
index 7351d49dff..998a2d4dfe 100644
--- a/libraries/entities/src/EntityScriptingInterface.cpp
+++ b/libraries/entities/src/EntityScriptingInterface.cpp
@@ -9,19 +9,21 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "EntityScriptingInterface.h"
+
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtx/transform.hpp>
 
-#include "EntityScriptingInterface.h"
-
 #include <QFutureWatcher>
 #include <QtConcurrent/QtConcurrentRun>
 
-#include "EntityItemID.h"
+#include <shared/QtHelpers.h>
 #include <VariantMapToScriptValue.h>
 #include <SharedUtil.h>
 #include <SpatialParentFinder.h>
+#include <AvatarHashMap.h>
 
+#include "EntityItemID.h"
 #include "EntitiesLogging.h"
 #include "EntityDynamicFactoryInterface.h"
 #include "EntityDynamicInterface.h"
@@ -45,7 +47,17 @@ EntityScriptingInterface::EntityScriptingInterface(bool bidOnSimulationOwnership
     connect(nodeList.data(), &NodeList::isAllowedEditorChanged, this, &EntityScriptingInterface::canAdjustLocksChanged);
     connect(nodeList.data(), &NodeList::canRezChanged, this, &EntityScriptingInterface::canRezChanged);
     connect(nodeList.data(), &NodeList::canRezTmpChanged, this, &EntityScriptingInterface::canRezTmpChanged);
+    connect(nodeList.data(), &NodeList::canRezCertifiedChanged, this, &EntityScriptingInterface::canRezCertifiedChanged);
+    connect(nodeList.data(), &NodeList::canRezTmpCertifiedChanged, this, &EntityScriptingInterface::canRezTmpCertifiedChanged);
     connect(nodeList.data(), &NodeList::canWriteAssetsChanged, this, &EntityScriptingInterface::canWriteAssetsChanged);
+
+    // If the user clicks somewhere where there is no entity at all, we will release focus
+    connect(this, &EntityScriptingInterface::mousePressOffEntity, [=]() {
+        setKeyboardFocusEntity(UNKNOWN_ENTITY_ID);
+    });
+
+    auto& packetReceiver = nodeList->getPacketReceiver();
+    packetReceiver.registerListener(PacketType::EntityScriptCallMethod, this, "handleEntityScriptCallMethodPacket");
 }
 
 void EntityScriptingInterface::queueEntityMessage(PacketType packetType,
@@ -74,6 +86,16 @@ bool EntityScriptingInterface::canRezTmp() {
     return nodeList->getThisNodeCanRezTmp();
 }
 
+bool EntityScriptingInterface::canRezCertified() {
+    auto nodeList = DependencyManager::get<NodeList>();
+    return nodeList->getThisNodeCanRezCertified();
+}
+
+bool EntityScriptingInterface::canRezTmpCertified() {
+    auto nodeList = DependencyManager::get<NodeList>();
+    return nodeList->getThisNodeCanRezTmpCertified();
+}
+
 bool EntityScriptingInterface::canWriteAssets() {
     auto nodeList = DependencyManager::get<NodeList>();
     return nodeList->getThisNodeCanWriteAssets();
@@ -219,7 +241,7 @@ QUuid EntityScriptingInterface::addEntity(const EntityItemProperties& properties
         _entityTree->withWriteLock([&] {
             EntityItemPointer entity = _entityTree->addEntity(id, propertiesWithSimID);
             if (entity) {
-                if (propertiesWithSimID.parentRelatedPropertyChanged()) {
+                if (propertiesWithSimID.queryAACubeRelatedPropertyChanged()) {
                     // due to parenting, the server may not know where something is in world-space, so include the bounding cube.
                     bool success;
                     AACube queryAACube = entity->getQueryAACube(success);
@@ -433,7 +455,7 @@ QUuid EntityScriptingInterface::editEntity(QUuid id, const EntityItemProperties&
                     entity->rememberHasSimulationOwnershipBid();
                 }
             }
-            if (properties.parentRelatedPropertyChanged() && entity->computePuffedQueryAACube()) {
+            if (properties.queryAACubeRelatedPropertyChanged()) {
                 properties.setQueryAACube(entity->getQueryAACube());
             }
             entity->setLastBroadcast(usecTimestampNow());
@@ -443,7 +465,7 @@ QUuid EntityScriptingInterface::editEntity(QUuid id, const EntityItemProperties&
             // if they've changed.
             entity->forEachDescendant([&](SpatiallyNestablePointer descendant) {
                 if (descendant->getNestableType() == NestableType::Entity) {
-                    if (descendant->computePuffedQueryAACube()) {
+                    if (descendant->updateQueryAACube()) {
                         EntityItemPointer entityDescendant = std::static_pointer_cast<EntityItem>(descendant);
                         EntityItemProperties newQueryCubeProperties;
                         newQueryCubeProperties.setQueryAACube(descendant->getQueryAACube());
@@ -498,6 +520,11 @@ void EntityScriptingInterface::deleteEntity(QUuid id) {
                 const QUuid myNodeID = nodeList->getSessionUUID();
                 if (entity->getClientOnly() && entity->getOwningAvatarID() != myNodeID) {
                     // don't delete other avatar's avatarEntities
+                    // If you actually own the entity but the onwership property is not set because of a domain switch
+                    // The lines below makes sure the entity is deleted once its properties are set.
+                    auto avatarHashMap = DependencyManager::get<AvatarHashMap>();
+                    AvatarSharedPointer myAvatar = avatarHashMap->getAvatarBySessionID(myNodeID);
+                    myAvatar->insertDetachedEntityID(id);
                     shouldDelete = false;
                     return;
                 }
@@ -532,7 +559,7 @@ void EntityScriptingInterface::deleteEntity(QUuid id) {
     }
 }
 
-void EntityScriptingInterface::setEntitiesScriptEngine(EntitiesScriptEngineProvider* engine) {
+void EntityScriptingInterface::setEntitiesScriptEngine(QSharedPointer<EntitiesScriptEngineProvider> engine) {
     std::lock_guard<std::recursive_mutex> lock(_entitiesScriptEngineLock);
     _entitiesScriptEngine = engine;
 }
@@ -547,6 +574,53 @@ void EntityScriptingInterface::callEntityMethod(QUuid id, const QString& method,
     }
 }
 
+void EntityScriptingInterface::callEntityServerMethod(QUuid id, const QString& method, const QStringList& params) {
+    PROFILE_RANGE(script_entities, __FUNCTION__);
+    DependencyManager::get<EntityScriptClient>()->callEntityServerMethod(id, method, params);
+}
+
+void EntityScriptingInterface::callEntityClientMethod(QUuid clientSessionID, QUuid entityID, const QString& method, const QStringList& params) {
+    PROFILE_RANGE(script_entities, __FUNCTION__);
+    auto scriptServerServices = DependencyManager::get<EntityScriptServerServices>();
+
+    // this won't be available on clients
+    if (scriptServerServices) {
+        scriptServerServices->callEntityClientMethod(clientSessionID, entityID, method, params);
+    } else {
+        qWarning() << "Entities.callEntityClientMethod() not allowed in client";
+    }
+}
+
+
+void EntityScriptingInterface::handleEntityScriptCallMethodPacket(QSharedPointer<ReceivedMessage> receivedMessage, SharedNodePointer senderNode) {
+    PROFILE_RANGE(script_entities, __FUNCTION__);
+
+    auto nodeList = DependencyManager::get<NodeList>();
+    SharedNodePointer entityScriptServer = nodeList->soloNodeOfType(NodeType::EntityScriptServer);
+
+    if (entityScriptServer == senderNode) {
+        auto entityID = QUuid::fromRfc4122(receivedMessage->read(NUM_BYTES_RFC4122_UUID));
+
+        auto method = receivedMessage->readString();
+
+        quint16 paramCount;
+        receivedMessage->readPrimitive(&paramCount);
+
+        QStringList params;
+        for (int param = 0; param < paramCount; param++) {
+            auto paramString = receivedMessage->readString();
+            params << paramString;
+        }
+
+        std::lock_guard<std::recursive_mutex> lock(_entitiesScriptEngineLock);
+        if (_entitiesScriptEngine) {
+            _entitiesScriptEngine->callEntityScriptMethod(entityID, method, params, senderNode->getUUID());
+        }
+    }
+}
+
+
+
 QUuid EntityScriptingInterface::findClosestEntity(const glm::vec3& center, float radius) const {
     PROFILE_RANGE(script_entities, __FUNCTION__);
 
@@ -652,31 +726,37 @@ QVector<QUuid> EntityScriptingInterface::findEntitiesInFrustum(QVariantMap frust
 }
 
 QVector<QUuid> EntityScriptingInterface::findEntitiesByType(const QString entityType, const glm::vec3& center, float radius) const {
-	EntityTypes::EntityType type = EntityTypes::getEntityTypeFromName(entityType);
+    EntityTypes::EntityType type = EntityTypes::getEntityTypeFromName(entityType);
 
-	QVector<QUuid> result;
-	if (_entityTree) {
-		QVector<EntityItemPointer> entities;
-		_entityTree->withReadLock([&] {
-			_entityTree->findEntities(center, radius, entities);
-		});
+    QVector<QUuid> result;
+    if (_entityTree) {
+        QVector<EntityItemPointer> entities;
+        _entityTree->withReadLock([&] {
+            _entityTree->findEntities(center, radius, entities);
+        });
 
-		foreach(EntityItemPointer entity, entities) {
-			if (entity->getType() == type) {
-				result << entity->getEntityItemID();
-			}
-		}
-	}
-	return result;
+        foreach(EntityItemPointer entity, entities) {
+            if (entity->getType() == type) {
+                result << entity->getEntityItemID();
+            }
+        }
+    }
+    return result;
 }
 
 RayToEntityIntersectionResult EntityScriptingInterface::findRayIntersection(const PickRay& ray, bool precisionPicking, 
                 const QScriptValue& entityIdsToInclude, const QScriptValue& entityIdsToDiscard, bool visibleOnly, bool collidableOnly) {
-    PROFILE_RANGE(script_entities, __FUNCTION__);
-
     QVector<EntityItemID> entitiesToInclude = qVectorEntityItemIDFromScriptValue(entityIdsToInclude);
     QVector<EntityItemID> entitiesToDiscard = qVectorEntityItemIDFromScriptValue(entityIdsToDiscard);
-    return findRayIntersectionWorker(ray, Octree::Lock, precisionPicking, entitiesToInclude, entitiesToDiscard, visibleOnly, collidableOnly);
+
+    return findRayIntersectionVector(ray, precisionPicking, entitiesToInclude, entitiesToDiscard, visibleOnly, collidableOnly);
+}
+
+RayToEntityIntersectionResult EntityScriptingInterface::findRayIntersectionVector(const PickRay& ray, bool precisionPicking,
+                const QVector<EntityItemID>& entityIdsToInclude, const QVector<EntityItemID>& entityIdsToDiscard, bool visibleOnly, bool collidableOnly) {
+    PROFILE_RANGE(script_entities, __FUNCTION__);
+
+    return findRayIntersectionWorker(ray, Octree::Lock, precisionPicking, entityIdsToInclude, entityIdsToDiscard, visibleOnly, collidableOnly);
 }
 
 // FIXME - we should remove this API and encourage all users to use findRayIntersection() instead. We've changed
@@ -736,7 +816,7 @@ bool EntityPropertyMetadataRequest::script(EntityItemID entityID, QScriptValue h
         request->deleteLater();
     });
     auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
-    entityScriptingInterface->withEntitiesScriptEngine([&](EntitiesScriptEngineProvider* entitiesScriptEngine) {
+    entityScriptingInterface->withEntitiesScriptEngine([&](QSharedPointer<EntitiesScriptEngineProvider> entitiesScriptEngine) {
         if (entitiesScriptEngine) {
             request->setFuture(entitiesScriptEngine->getLocalEntityScriptDetails(entityID));
         }
@@ -1488,7 +1568,7 @@ int EntityScriptingInterface::getJointIndex(const QUuid& entityID, const QString
         return -1;
     }
     int result;
-    QMetaObject::invokeMethod(_entityTree.get(), "getJointIndex", Qt::BlockingQueuedConnection,
+    BLOCKING_INVOKE_METHOD(_entityTree.get(), "getJointIndex",
                               Q_RETURN_ARG(int, result), Q_ARG(QUuid, entityID), Q_ARG(QString, name));
     return result;
 }
@@ -1498,7 +1578,7 @@ QStringList EntityScriptingInterface::getJointNames(const QUuid& entityID) {
         return QStringList();
     }
     QStringList result;
-    QMetaObject::invokeMethod(_entityTree.get(), "getJointNames", Qt::BlockingQueuedConnection,
+    BLOCKING_INVOKE_METHOD(_entityTree.get(), "getJointNames",
                               Q_RETURN_ARG(QStringList, result), Q_ARG(QUuid, entityID));
     return result;
 }
@@ -1598,44 +1678,44 @@ QUuid EntityScriptingInterface::getKeyboardFocusEntity() const {
     return result;
 }
 
-void EntityScriptingInterface::setKeyboardFocusEntity(QUuid id) {
-    QMetaObject::invokeMethod(qApp, "setKeyboardFocusEntity", Qt::QueuedConnection, Q_ARG(QUuid, id));
+void EntityScriptingInterface::setKeyboardFocusEntity(const EntityItemID& id) {
+    QMetaObject::invokeMethod(qApp, "setKeyboardFocusEntity", Qt::DirectConnection, Q_ARG(EntityItemID, id));
 }
 
-void EntityScriptingInterface::sendMousePressOnEntity(QUuid id, PointerEvent event) {
-    QMetaObject::invokeMethod(qApp, "sendMousePressOnEntity", Qt::QueuedConnection, Q_ARG(QUuid, id), Q_ARG(PointerEvent, event));
+void EntityScriptingInterface::sendMousePressOnEntity(const EntityItemID& id, const PointerEvent& event) {
+    emit mousePressOnEntity(id, event);
 }
 
-void EntityScriptingInterface::sendMouseMoveOnEntity(QUuid id, PointerEvent event) {
-    QMetaObject::invokeMethod(qApp, "sendMouseMoveOnEntity", Qt::QueuedConnection, Q_ARG(QUuid, id), Q_ARG(PointerEvent, event));
+void EntityScriptingInterface::sendMouseMoveOnEntity(const EntityItemID& id, const PointerEvent& event) {
+    emit mouseMoveOnEntity(id, event);
 }
 
-void EntityScriptingInterface::sendMouseReleaseOnEntity(QUuid id, PointerEvent event) {
-    QMetaObject::invokeMethod(qApp, "sendMouseReleaseOnEntity", Qt::QueuedConnection, Q_ARG(QUuid, id), Q_ARG(PointerEvent, event));
+void EntityScriptingInterface::sendMouseReleaseOnEntity(const EntityItemID& id, const PointerEvent& event) {
+    emit mouseReleaseOnEntity(id, event);
 }
 
-void EntityScriptingInterface::sendClickDownOnEntity(QUuid id, PointerEvent event) {
-    QMetaObject::invokeMethod(qApp, "sendClickDownOnEntity", Qt::QueuedConnection, Q_ARG(QUuid, id), Q_ARG(PointerEvent, event));
+void EntityScriptingInterface::sendClickDownOnEntity(const EntityItemID& id, const PointerEvent& event) {
+    emit clickDownOnEntity(id, event);
 }
 
-void EntityScriptingInterface::sendHoldingClickOnEntity(QUuid id, PointerEvent event) {
-    QMetaObject::invokeMethod(qApp, "sendHoldingClickOnEntity", Qt::QueuedConnection, Q_ARG(QUuid, id), Q_ARG(PointerEvent, event));
+void EntityScriptingInterface::sendHoldingClickOnEntity(const EntityItemID& id, const PointerEvent& event) {
+    emit holdingClickOnEntity(id, event);
 }
 
-void EntityScriptingInterface::sendClickReleaseOnEntity(QUuid id, PointerEvent event) {
-    QMetaObject::invokeMethod(qApp, "sendClickReleaseOnEntity", Qt::QueuedConnection, Q_ARG(QUuid, id), Q_ARG(PointerEvent, event));
+void EntityScriptingInterface::sendClickReleaseOnEntity(const EntityItemID& id, const PointerEvent& event) {
+    emit clickReleaseOnEntity(id, event);
 }
 
-void EntityScriptingInterface::sendHoverEnterEntity(QUuid id, PointerEvent event) {
-    QMetaObject::invokeMethod(qApp, "sendHoverEnterEntity", Qt::QueuedConnection, Q_ARG(QUuid, id), Q_ARG(PointerEvent, event));
+void EntityScriptingInterface::sendHoverEnterEntity(const EntityItemID& id, const PointerEvent& event) {
+    emit hoverEnterEntity(id, event);
 }
 
-void EntityScriptingInterface::sendHoverOverEntity(QUuid id, PointerEvent event) {
-    QMetaObject::invokeMethod(qApp, "sendHoverOverEntity", Qt::QueuedConnection, Q_ARG(QUuid, id), Q_ARG(PointerEvent, event));
+void EntityScriptingInterface::sendHoverOverEntity(const EntityItemID& id, const PointerEvent& event) {
+    emit hoverOverEntity(id, event);
 }
 
-void EntityScriptingInterface::sendHoverLeaveEntity(QUuid id, PointerEvent event) {
-    QMetaObject::invokeMethod(qApp, "sendHoverLeaveEntity", Qt::QueuedConnection, Q_ARG(QUuid, id), Q_ARG(PointerEvent, event));
+void EntityScriptingInterface::sendHoverLeaveEntity(const EntityItemID& id, const PointerEvent& event) {
+    emit hoverLeaveEntity(id, event);
 }
 
 bool EntityScriptingInterface::wantsHandControllerPointerEvents(QUuid id) {
@@ -1679,16 +1759,6 @@ void EntityScriptingInterface::setCostMultiplier(float value) {
     costMultiplier = value;
 }
 
-QObject* EntityScriptingInterface::getWebViewRoot(const QUuid& entityID) {
-    if (auto entity = checkForTreeEntityAndTypeMatch(entityID, EntityTypes::Web)) {
-        auto webEntity = std::dynamic_pointer_cast<WebEntityItem>(entity);
-        QObject* root = webEntity->getRootItem();
-        return root;
-    } else {
-        return nullptr;
-    }
-}
-
 // TODO move this someplace that makes more sense...
 bool EntityScriptingInterface::AABoxIntersectsCapsule(const glm::vec3& low, const glm::vec3& dimensions,
                                                       const glm::vec3& start, const glm::vec3& end, float radius) {
@@ -1729,9 +1799,7 @@ glm::mat4 EntityScriptingInterface::getEntityTransform(const QUuid& entityID) {
             if (entity) {
                 glm::mat4 translation = glm::translate(entity->getPosition());
                 glm::mat4 rotation = glm::mat4_cast(entity->getRotation());
-                glm::mat4 registration = glm::translate(ENTITY_ITEM_DEFAULT_REGISTRATION_POINT -
-                                                        entity->getRegistrationPoint());
-                result = translation * rotation * registration;
+                result = translation * rotation;
             }
         });
     }
@@ -1746,9 +1814,20 @@ glm::mat4 EntityScriptingInterface::getEntityLocalTransform(const QUuid& entityI
             if (entity) {
                 glm::mat4 translation = glm::translate(entity->getLocalPosition());
                 glm::mat4 rotation = glm::mat4_cast(entity->getLocalOrientation());
-                glm::mat4 registration = glm::translate(ENTITY_ITEM_DEFAULT_REGISTRATION_POINT -
-                                                        entity->getRegistrationPoint());
-                result = translation * rotation * registration;
+                result = translation * rotation;
+            }
+        });
+    }
+    return result;
+}
+
+bool EntityScriptingInterface::verifyStaticCertificateProperties(const QUuid& entityID) {
+    bool result = false;
+    if (_entityTree) {
+        _entityTree->withReadLock([&] {
+            EntityItemPointer entity = _entityTree->findEntityByEntityItemID(EntityItemID(entityID));
+            if (entity) {
+                result = entity->getProperties().verifyStaticCertificateProperties();
             }
         });
     }
diff --git a/libraries/entities/src/EntityScriptingInterface.h b/libraries/entities/src/EntityScriptingInterface.h
index 575528fa78..cc5d8ff16f 100644
--- a/libraries/entities/src/EntityScriptingInterface.h
+++ b/libraries/entities/src/EntityScriptingInterface.h
@@ -99,7 +99,7 @@ public:
 
     void setEntityTree(EntityTreePointer modelTree);
     EntityTreePointer getEntityTree() { return _entityTree; }
-    void setEntitiesScriptEngine(EntitiesScriptEngineProvider* engine);
+    void setEntitiesScriptEngine(QSharedPointer<EntitiesScriptEngineProvider> engine);
     float calculateCost(float mass, float oldVelocity, float newVelocity);
 
     void resetActivityTracking();
@@ -126,6 +126,18 @@ public slots:
      */
     Q_INVOKABLE bool canRezTmp();
 
+    /**jsdoc
+    * @function Entities.canRezCertified
+    * @return {bool} `true` if the DomainServer will allow this Node/Avatar to rez new certified entities
+    */
+    Q_INVOKABLE bool canRezCertified();
+
+    /**jsdoc
+    * @function Entities.canRezTmpCertified
+    * @return {bool} `true` if the DomainServer will allow this Node/Avatar to rez new temporary certified entities
+    */
+    Q_INVOKABLE bool canRezTmpCertified();
+
     /**jsdoc
     * @function Entities.canWriteAsseets
     * @return {bool} `true` if the DomainServer will allow this Node/Avatar to write to the asset server
@@ -176,13 +188,16 @@ public slots:
      */
     Q_INVOKABLE void deleteEntity(QUuid entityID);
 
-    /// Allows a script to call a method on an entity's script. The method will execute in the entity script
-    /// engine. If the entity does not have an entity script or the method does not exist, this call will have
-    /// no effect.
     /**jsdoc
-     * Call a method on an entity. If it is running an entity script (specified by the `script` property)
+     * Call a method on an entity in the same context as this function is called. Allows a script 
+     * to call a method on an entity's script. The method will execute in the entity script engine. 
+     * If the entity does not have an  entity script or the method does not exist, this call will 
+     * have no effect. If it is running an entity script (specified by the `script` property)
      * and it exposes a property with the specified name `method`, it will be called
-     * using `params` as the list of arguments.
+     * using `params` as the list of arguments. If this is called within an entity script, the
+     * method will be executed on the client in the entity script engine in which it was called. If
+     * this is called in an entity server script, the method will be executed on the entity server 
+     * script engine.
      *
      * @function Entities.callEntityMethod
      * @param {EntityID} entityID The ID of the entity to call the method on.
@@ -191,10 +206,44 @@ public slots:
      */
     Q_INVOKABLE void callEntityMethod(QUuid entityID, const QString& method, const QStringList& params = QStringList());
 
-    /// finds the closest model to the center point, within the radius
-    /// will return a EntityItemID.isKnownID = false if no models are in the radius
-    /// this function will not find any models in script engine contexts which don't have access to models
     /**jsdoc
+    * Call a server method on an entity. Allows a client entity script to call a method on an 
+    * entity's server script. The method will execute in the entity server script engine. If 
+    * the entity does not have an entity server script or the method does not exist, this call will 
+    * have no effect. If the entity is running an entity script (specified by the `serverScripts` property)
+    * and it exposes a property with the specified name `method`, it will be called using `params` as 
+    * the list of arguments.
+    *
+    * @function Entities.callEntityServerMethod
+    * @param {EntityID} entityID The ID of the entity to call the method on.
+    * @param {string} method The name of the method to call.
+    * @param {string[]} params The list of parameters to call the specified method with.
+    */
+    Q_INVOKABLE void callEntityServerMethod(QUuid entityID, const QString& method, const QStringList& params = QStringList());
+
+    /**jsdoc
+    * Call a client method on an entity on a specific client node. Allows a server entity script to call a 
+    * method on an entity's client script for a particular client. The method will execute in the entity script 
+    * engine on that single client. If the entity does not have an entity script or the method does not exist, or
+    * the client is not connected to the domain, or you attempt to make this call outside of the entity server 
+    * script, this call will have no effect.
+    *
+    * @function Entities.callEntityClientMethod
+    * @param {SessionID} clientSessionID The session ID of the client to call the method on.
+    * @param {EntityID} entityID The ID of the entity to call the method on.
+    * @param {string} method The name of the method to call.
+    * @param {string[]} params The list of parameters to call the specified method with.
+    */
+    Q_INVOKABLE void callEntityClientMethod(QUuid clientSessionID, QUuid entityID, const QString& method, const QStringList& params = QStringList());
+
+    /**jsdoc
+     * finds the closest model to the center point, within the radius
+     * will return a EntityItemID.isKnownID = false if no models are in the radius
+     * this function will not find any models in script engine contexts which don't have access to models
+     * @function Entities.findClosestEntity
+     * @param {vec3} center point
+     * @param {float} radius to search
+     * @return {EntityID} The EntityID of the entity that is closest and in the radius.
      */
     Q_INVOKABLE QUuid findClosestEntity(const glm::vec3& center, float radius) const;
 
@@ -215,12 +264,12 @@ public slots:
     /// this function will not find any models in script engine contexts which don't have access to entities
     Q_INVOKABLE QVector<QUuid> findEntitiesInFrustum(QVariantMap frustum) const;
 
-	/// finds entities of the indicated type within a sphere given by the center point and radius
-	/// @param {QString} string representation of entity type
-	/// @param {vec3} center point
-	/// @param {float} radius to search
-	/// this function will not find any entities in script engine contexts which don't have access to entities
-	Q_INVOKABLE QVector<QUuid> findEntitiesByType(const QString entityType, const glm::vec3& center, float radius) const;
+    /// finds entities of the indicated type within a sphere given by the center point and radius
+    /// @param {QString} string representation of entity type
+    /// @param {vec3} center point
+    /// @param {float} radius to search
+    /// this function will not find any entities in script engine contexts which don't have access to entities
+    Q_INVOKABLE QVector<QUuid> findEntitiesByType(const QString entityType, const glm::vec3& center, float radius) const;
 
     /// If the scripting context has visible entities, this will determine a ray intersection, the results
     /// may be inaccurate if the engine is unable to access the visible entities, in which case result.accurate
@@ -229,6 +278,11 @@ public slots:
         const QScriptValue& entityIdsToInclude = QScriptValue(), const QScriptValue& entityIdsToDiscard = QScriptValue(),
         bool visibleOnly = false, bool collidableOnly = false);
 
+    /// Same as above but with QVectors
+    RayToEntityIntersectionResult findRayIntersectionVector(const PickRay& ray, bool precisionPicking,
+        const QVector<EntityItemID>& entityIdsToInclude, const QVector<EntityItemID>& entityIdsToDiscard,
+        bool visibleOnly, bool collidableOnly);
+
     /// If the scripting context has visible entities, this will determine a ray intersection, and will block in
     /// order to return an accurate result
     Q_INVOKABLE RayToEntityIntersectionResult findRayIntersectionBlocking(const PickRay& ray, bool precisionPicking = false, const QScriptValue& entityIdsToInclude = QScriptValue(), const QScriptValue& entityIdsToDiscard = QScriptValue());
@@ -256,18 +310,23 @@ public slots:
 
     Q_INVOKABLE bool getServerScriptStatus(QUuid entityID, QScriptValue callback);
 
+    // FIXME move to a renderable entity interface
     Q_INVOKABLE void setLightsArePickable(bool value);
     Q_INVOKABLE bool getLightsArePickable() const;
 
+    // FIXME move to a renderable entity interface
     Q_INVOKABLE void setZonesArePickable(bool value);
     Q_INVOKABLE bool getZonesArePickable() const;
 
+    // FIXME move to a renderable entity interface
     Q_INVOKABLE void setDrawZoneBoundaries(bool value);
     Q_INVOKABLE bool getDrawZoneBoundaries() const;
 
+    // FIXME move to a renderable entity interface
     Q_INVOKABLE bool setVoxelSphere(QUuid entityID, const glm::vec3& center, float radius, int value);
     Q_INVOKABLE bool setVoxelCapsule(QUuid entityID, const glm::vec3& start, const glm::vec3& end, float radius, int value);
 
+    // FIXME move to a renderable entity interface
     Q_INVOKABLE bool setVoxel(QUuid entityID, const glm::vec3& position, int value);
     Q_INVOKABLE bool setAllVoxels(QUuid entityID, int value);
     Q_INVOKABLE bool setVoxelsInCuboid(QUuid entityID, const glm::vec3& lowPosition,
@@ -284,29 +343,36 @@ public slots:
     Q_INVOKABLE QVector<QUuid> getActionIDs(const QUuid& entityID);
     Q_INVOKABLE QVariantMap getActionArguments(const QUuid& entityID, const QUuid& actionID);
 
+    // FIXME move to a renderable entity interface
     Q_INVOKABLE glm::vec3 voxelCoordsToWorldCoords(const QUuid& entityID, glm::vec3 voxelCoords);
     Q_INVOKABLE glm::vec3 worldCoordsToVoxelCoords(const QUuid& entityID, glm::vec3 worldCoords);
     Q_INVOKABLE glm::vec3 voxelCoordsToLocalCoords(const QUuid& entityID, glm::vec3 voxelCoords);
     Q_INVOKABLE glm::vec3 localCoordsToVoxelCoords(const QUuid& entityID, glm::vec3 localCoords);
 
+    // FIXME move to a renderable entity interface
     Q_INVOKABLE glm::vec3 getAbsoluteJointTranslationInObjectFrame(const QUuid& entityID, int jointIndex);
     Q_INVOKABLE glm::quat getAbsoluteJointRotationInObjectFrame(const QUuid& entityID, int jointIndex);
     Q_INVOKABLE bool setAbsoluteJointTranslationInObjectFrame(const QUuid& entityID, int jointIndex, glm::vec3 translation);
     Q_INVOKABLE bool setAbsoluteJointRotationInObjectFrame(const QUuid& entityID, int jointIndex, glm::quat rotation);
 
+    // FIXME move to a renderable entity interface
     Q_INVOKABLE glm::vec3 getLocalJointTranslation(const QUuid& entityID, int jointIndex);
     Q_INVOKABLE glm::quat getLocalJointRotation(const QUuid& entityID, int jointIndex);
     Q_INVOKABLE bool setLocalJointTranslation(const QUuid& entityID, int jointIndex, glm::vec3 translation);
     Q_INVOKABLE bool setLocalJointRotation(const QUuid& entityID, int jointIndex, glm::quat rotation);
 
+    // FIXME move to a renderable entity interface
     Q_INVOKABLE bool setLocalJointRotations(const QUuid& entityID, const QVector<glm::quat>& rotations);
     Q_INVOKABLE bool setLocalJointTranslations(const QUuid& entityID, const QVector<glm::vec3>& translations);
     Q_INVOKABLE bool setLocalJointsData(const QUuid& entityID,
                                         const QVector<glm::quat>& rotations,
                                         const QVector<glm::vec3>& translations);
 
+    // FIXME move to a renderable entity interface
     Q_INVOKABLE int getJointIndex(const QUuid& entityID, const QString& name);
     Q_INVOKABLE QStringList getJointNames(const QUuid& entityID);
+
+
     Q_INVOKABLE QVector<QUuid> getChildrenIDs(const QUuid& parentID);
     Q_INVOKABLE QVector<QUuid> getChildrenIDsOfJoint(const QUuid& parentID, int jointIndex);
     Q_INVOKABLE bool isChildOfParent(QUuid childID, QUuid parentID);
@@ -314,30 +380,28 @@ public slots:
     Q_INVOKABLE QString getNestableType(QUuid id);
 
     Q_INVOKABLE QUuid getKeyboardFocusEntity() const;
-    Q_INVOKABLE void setKeyboardFocusEntity(QUuid id);
+    Q_INVOKABLE void setKeyboardFocusEntity(const EntityItemID& id);
 
-    Q_INVOKABLE void sendMousePressOnEntity(QUuid id, PointerEvent event);
-    Q_INVOKABLE void sendMouseMoveOnEntity(QUuid id, PointerEvent event);
-    Q_INVOKABLE void sendMouseReleaseOnEntity(QUuid id, PointerEvent event);
+    Q_INVOKABLE void sendMousePressOnEntity(const EntityItemID& id, const PointerEvent& event);
+    Q_INVOKABLE void sendMouseMoveOnEntity(const EntityItemID& id, const PointerEvent& event);
+    Q_INVOKABLE void sendMouseReleaseOnEntity(const EntityItemID& id, const PointerEvent& event);
 
-    Q_INVOKABLE void sendClickDownOnEntity(QUuid id, PointerEvent event);
-    Q_INVOKABLE void sendHoldingClickOnEntity(QUuid id, PointerEvent event);
-    Q_INVOKABLE void sendClickReleaseOnEntity(QUuid id, PointerEvent event);
+    Q_INVOKABLE void sendClickDownOnEntity(const EntityItemID& id, const PointerEvent& event);
+    Q_INVOKABLE void sendHoldingClickOnEntity(const EntityItemID& id, const PointerEvent& event);
+    Q_INVOKABLE void sendClickReleaseOnEntity(const EntityItemID& id, const PointerEvent& event);
 
-    Q_INVOKABLE void sendHoverEnterEntity(QUuid id, PointerEvent event);
-    Q_INVOKABLE void sendHoverOverEntity(QUuid id, PointerEvent event);
-    Q_INVOKABLE void sendHoverLeaveEntity(QUuid id, PointerEvent event);
+    Q_INVOKABLE void sendHoverEnterEntity(const EntityItemID& id, const PointerEvent& event);
+    Q_INVOKABLE void sendHoverOverEntity(const EntityItemID& id, const PointerEvent& event);
+    Q_INVOKABLE void sendHoverLeaveEntity(const EntityItemID& id, const PointerEvent& event);
 
     Q_INVOKABLE bool wantsHandControllerPointerEvents(QUuid id);
 
     Q_INVOKABLE void emitScriptEvent(const EntityItemID& entityID, const QVariant& message);
 
-    Q_INVOKABLE QObject* getWebViewRoot(const QUuid& entityID);
-
     Q_INVOKABLE bool AABoxIntersectsCapsule(const glm::vec3& low, const glm::vec3& dimensions,
                                             const glm::vec3& start, const glm::vec3& end, float radius);
 
-
+    // FIXME move to a renderable entity interface
     Q_INVOKABLE void getMeshes(QUuid entityID, QScriptValue callback);
 
     /**jsdoc
@@ -359,17 +423,24 @@ public slots:
      */
     Q_INVOKABLE glm::mat4 getEntityLocalTransform(const QUuid& entityID);
 
+    Q_INVOKABLE bool verifyStaticCertificateProperties(const QUuid& entityID);
+
 signals:
     void collisionWithEntity(const EntityItemID& idA, const EntityItemID& idB, const Collision& collision);
 
     void canAdjustLocksChanged(bool canAdjustLocks);
     void canRezChanged(bool canRez);
     void canRezTmpChanged(bool canRez);
+    void canRezCertifiedChanged(bool canRez);
+    void canRezTmpCertifiedChanged(bool canRez);
     void canWriteAssetsChanged(bool canWriteAssets);
 
     void mousePressOnEntity(const EntityItemID& entityItemID, const PointerEvent& event);
+    void mouseDoublePressOnEntity(const EntityItemID& entityItemID, const PointerEvent& event);
     void mouseMoveOnEntity(const EntityItemID& entityItemID, const PointerEvent& event);
     void mouseReleaseOnEntity(const EntityItemID& entityItemID, const PointerEvent& event);
+    void mousePressOffEntity();
+    void mouseDoublePressOffEntity();
 
     void clickDownOnEntity(const EntityItemID& entityItemID, const PointerEvent& event);
     void holdingClickOnEntity(const EntityItemID& entityItemID, const PointerEvent& event);
@@ -390,10 +461,14 @@ signals:
     void webEventReceived(const EntityItemID& entityItemID, const QVariant& message);
 
 protected:
-    void withEntitiesScriptEngine(std::function<void(EntitiesScriptEngineProvider*)> function) {
+    void withEntitiesScriptEngine(std::function<void(QSharedPointer<EntitiesScriptEngineProvider>)> function) {
         std::lock_guard<std::recursive_mutex> lock(_entitiesScriptEngineLock);
         function(_entitiesScriptEngine);
     };
+
+private slots:
+    void handleEntityScriptCallMethodPacket(QSharedPointer<ReceivedMessage> receivedMessage, SharedNodePointer senderNode);
+
 private:
     bool actionWorker(const QUuid& entityID, std::function<bool(EntitySimulationPointer, EntityItemPointer)> actor);
     bool polyVoxWorker(QUuid entityID, std::function<bool(PolyVoxEntityItem&)> actor);
@@ -412,7 +487,7 @@ private:
     EntityTreePointer _entityTree;
 
     std::recursive_mutex _entitiesScriptEngineLock;
-    EntitiesScriptEngineProvider* _entitiesScriptEngine { nullptr };
+    QSharedPointer<EntitiesScriptEngineProvider> _entitiesScriptEngine;
 
     bool _bidOnSimulationOwnership { false };
     float _currentAvatarEnergy = { FLT_MAX };
diff --git a/libraries/entities/src/EntitySimulation.cpp b/libraries/entities/src/EntitySimulation.cpp
index fbbc1bde71..f91d728d78 100644
--- a/libraries/entities/src/EntitySimulation.cpp
+++ b/libraries/entities/src/EntitySimulation.cpp
@@ -9,9 +9,11 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include <AACube.h>
-
 #include "EntitySimulation.h"
+
+#include <AACube.h>
+#include <Profile.h>
+
 #include "EntitiesLogging.h"
 #include "MovingEntitiesOperator.h"
 
@@ -27,6 +29,7 @@ void EntitySimulation::setEntityTree(EntityTreePointer tree) {
 }
 
 void EntitySimulation::updateEntities() {
+    PROFILE_RANGE(simulation_physics, "ES::updateEntities");
     QMutexLocker lock(&_mutex);
     quint64 now = usecTimestampNow();
 
@@ -35,8 +38,12 @@ void EntitySimulation::updateEntities() {
     callUpdateOnEntitiesThatNeedIt(now);
     moveSimpleKinematics(now);
     updateEntitiesInternal(now);
-    PerformanceTimer perfTimer("sortingEntities");
-    sortEntitiesThatMoved();
+
+    {
+        PROFILE_RANGE(simulation_physics, "Sort");
+        PerformanceTimer perfTimer("sortingEntities");
+        sortEntitiesThatMoved();
+    }
 }
 
 void EntitySimulation::takeEntitiesToDelete(VectorOfEntities& entitiesToDelete) {
@@ -141,7 +148,7 @@ void EntitySimulation::callUpdateOnEntitiesThatNeedIt(const quint64& now) {
 void EntitySimulation::sortEntitiesThatMoved() {
     // NOTE: this is only for entities that have been moved by THIS EntitySimulation.
     // External changes to entity position/shape are expected to be sorted outside of the EntitySimulation.
-    MovingEntitiesOperator moveOperator(_entityTree);
+    MovingEntitiesOperator moveOperator;
     AACube domainBounds(glm::vec3((float)-HALF_TREE_SCALE), (float)TREE_SCALE);
     SetOfEntities::iterator itemItr = _entitiesToSort.begin();
     while (itemItr != _entitiesToSort.end()) {
@@ -258,6 +265,7 @@ void EntitySimulation::clearEntities() {
 }
 
 void EntitySimulation::moveSimpleKinematics(const quint64& now) {
+    PROFILE_RANGE_EX(simulation_physics, "Kinematics", 0xffff00ff, (uint64_t)_simpleKinematicEntities.size());
     SetOfEntities::iterator itemItr = _simpleKinematicEntities.begin();
     while (itemItr != _simpleKinematicEntities.end()) {
         EntityItemPointer entity = *itemItr;
@@ -280,24 +288,24 @@ void EntitySimulation::moveSimpleKinematics(const quint64& now) {
 }
 
 void EntitySimulation::addDynamic(EntityDynamicPointer dynamic) {
-    QMutexLocker lock(&_mutex);
+    QMutexLocker lock(&_dynamicsMutex);
     _dynamicsToAdd += dynamic;
 }
 
 void EntitySimulation::removeDynamic(const QUuid dynamicID) {
-    QMutexLocker lock(&_mutex);
+    QMutexLocker lock(&_dynamicsMutex);
     _dynamicsToRemove += dynamicID;
 }
 
 void EntitySimulation::removeDynamics(QList<QUuid> dynamicIDsToRemove) {
-    QMutexLocker lock(&_mutex);
+    QMutexLocker lock(&_dynamicsMutex);
     foreach(QUuid uuid, dynamicIDsToRemove) {
         _dynamicsToRemove.insert(uuid);
     }
 }
 
 void EntitySimulation::applyDynamicChanges() {
-    QMutexLocker lock(&_mutex);
+    QMutexLocker lock(&_dynamicsMutex);
     _dynamicsToAdd.clear();
     _dynamicsToRemove.clear();
 }
diff --git a/libraries/entities/src/EntitySimulation.h b/libraries/entities/src/EntitySimulation.h
index 84d30c495d..1c633aa9dc 100644
--- a/libraries/entities/src/EntitySimulation.h
+++ b/libraries/entities/src/EntitySimulation.h
@@ -105,6 +105,7 @@ protected:
     SetOfEntities _simpleKinematicEntities; // entities undergoing non-colliding kinematic motion
     QList<EntityDynamicPointer> _dynamicsToAdd;
     QSet<QUuid> _dynamicsToRemove;
+    QMutex _dynamicsMutex { QMutex::Recursive };
 
 protected:
     SetOfEntities _entitiesToDelete; // entities simulation decided needed to be deleted (EntityTree will actually delete)
diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index 4773f45af7..333a514377 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -13,16 +13,26 @@
 #include <QtCore/QDateTime>
 #include <QtCore/QQueue>
 
+#include <openssl/err.h>
+#include <openssl/rsa.h>
+#include <openssl/pem.h>
+#include <openssl/x509.h>
+#include <NetworkingConstants.h>
+#include "AccountManager.h"
+#include <QJsonObject>
+#include <QJsonDocument>
+#include <QJsonArray>
+
 #include <QtScript/QScriptEngine>
 
-#include <PerfStat.h>
 #include <Extents.h>
+#include <PerfStat.h>
+#include <Profile.h>
 
 #include "EntitySimulation.h"
 #include "VariantMapToScriptValue.h"
 
 #include "AddEntityOperator.h"
-#include "MovingEntitiesOperator.h"
 #include "UpdateEntityOperator.h"
 #include "QVariantGLM.h"
 #include "EntitiesLogging.h"
@@ -62,6 +72,8 @@ EntityTree::EntityTree(bool shouldReaverage) :
     Octree(shouldReaverage)
 {
     resetClientEditStats();
+
+    EntityItem::retrieveMarketplacePublicKey();
 }
 
 EntityTree::~EntityTree() {
@@ -90,19 +102,128 @@ void EntityTree::eraseAllOctreeElements(bool createNewRoot) {
     if (_simulation) {
         _simulation->clearEntities();
     }
-    {
-        QWriteLocker locker(&_entityToElementLock);
-        foreach(EntityTreeElementPointer element, _entityToElementMap) {
-            element->cleanupEntities();
+    QHash<EntityItemID, EntityItemPointer> localMap;
+    localMap.swap(_entityMap);
+    this->withWriteLock([&] {
+        foreach(EntityItemPointer entity, localMap) {
+            EntityTreeElementPointer element = entity->getElement();
+            if (element) {
+                element->cleanupEntities();
+            }
         }
-        _entityToElementMap.clear();
-    }
+    });
+    localMap.clear();
     Octree::eraseAllOctreeElements(createNewRoot);
 
     resetClientEditStats();
     clearDeletedEntities();
 }
 
+void EntityTree::readBitstreamToTree(const unsigned char* bitstream,
+            uint64_t bufferSizeBytes, ReadBitstreamToTreeParams& args) {
+    Octree::readBitstreamToTree(bitstream, bufferSizeBytes, args);
+
+    // add entities
+    QHash<EntityItemID, EntityItemPointer>::const_iterator itr;
+    for (itr = _entitiesToAdd.constBegin(); itr != _entitiesToAdd.constEnd(); ++itr) {
+        const EntityItemPointer& entityItem = itr.value();
+        AddEntityOperator theOperator(getThisPointer(), entityItem);
+        recurseTreeWithOperator(&theOperator);
+        postAddEntity(entityItem);
+    }
+    _entitiesToAdd.clear();
+
+    // move entities
+    if (_entityMover.hasMovingEntities()) {
+        PerformanceTimer perfTimer("recurseTreeWithOperator");
+        recurseTreeWithOperator(&_entityMover);
+        _entityMover.reset();
+    }
+}
+
+int EntityTree::readEntityDataFromBuffer(const unsigned char* data, int bytesLeftToRead, ReadBitstreamToTreeParams& args) {
+    const unsigned char* dataAt = data;
+    int bytesRead = 0;
+    uint16_t numberOfEntities = 0;
+    int expectedBytesPerEntity = EntityItem::expectedBytes();
+
+    args.elementsPerPacket++;
+
+    if (bytesLeftToRead >= (int)sizeof(numberOfEntities)) {
+        // read our entities in....
+        numberOfEntities = *(uint16_t*)dataAt;
+
+        dataAt += sizeof(numberOfEntities);
+        bytesLeftToRead -= (int)sizeof(numberOfEntities);
+        bytesRead += sizeof(numberOfEntities);
+
+        if (bytesLeftToRead >= (int)(numberOfEntities * expectedBytesPerEntity)) {
+            for (uint16_t i = 0; i < numberOfEntities; i++) {
+                int bytesForThisEntity = 0;
+                EntityItemID entityItemID = EntityItemID::readEntityItemIDFromBuffer(dataAt, bytesLeftToRead);
+                EntityItemPointer entity = findEntityByEntityItemID(entityItemID);
+
+                if (entity) {
+                    QString entityScriptBefore = entity->getScript();
+                    QUuid parentIDBefore = entity->getParentID();
+                    QString entityServerScriptsBefore = entity->getServerScripts();
+                    quint64 entityScriptTimestampBefore = entity->getScriptTimestamp();
+
+                    bytesForThisEntity = entity->readEntityDataFromBuffer(dataAt, bytesLeftToRead, args);
+                    if (entity->getDirtyFlags()) {
+                        entityChanged(entity);
+                    }
+                    _entityMover.addEntityToMoveList(entity, entity->getQueryAACube());
+
+                    QString entityScriptAfter = entity->getScript();
+                    QString entityServerScriptsAfter = entity->getServerScripts();
+                    quint64 entityScriptTimestampAfter = entity->getScriptTimestamp();
+                    bool reload = entityScriptTimestampBefore != entityScriptTimestampAfter;
+
+                    // If the script value has changed on us, or it's timestamp has changed to force
+                    // a reload then we want to send out a script changing signal...
+                    if (reload || entityScriptBefore != entityScriptAfter) {
+                        emitEntityScriptChanging(entityItemID, reload); // the entity script has changed
+                    }
+                    if (reload || entityServerScriptsBefore != entityServerScriptsAfter) {
+                        emitEntityServerScriptChanging(entityItemID, reload); // the entity server script has changed
+                    }
+
+                    QUuid parentIDAfter = entity->getParentID();
+                    if (parentIDBefore != parentIDAfter) {
+                        addToNeedsParentFixupList(entity);
+                    }
+                } else {
+                    entity = EntityTypes::constructEntityItem(dataAt, bytesLeftToRead, args);
+                    if (entity) {
+                        bytesForThisEntity = entity->readEntityDataFromBuffer(dataAt, bytesLeftToRead, args);
+
+                        // don't add if we've recently deleted....
+                        if (!isDeletedEntity(entityItemID)) {
+                            _entitiesToAdd.insert(entityItemID, entity);
+
+                            if (entity->getCreated() == UNKNOWN_CREATED_TIME) {
+                                entity->recordCreationTime();
+                            }
+                        #ifdef WANT_DEBUG
+                        } else {
+                                qCDebug(entities) << "Received packet for previously deleted entity [" <<
+                                        entityItemID << "] ignoring. (inside " << __FUNCTION__ << ")";
+                        #endif
+                        }
+                    }
+                }
+                // Move the buffer forward to read more entities
+                dataAt += bytesForThisEntity;
+                bytesLeftToRead -= bytesForThisEntity;
+                bytesRead += bytesForThisEntity;
+            }
+        }
+    }
+
+    return bytesRead;
+}
+
 bool EntityTree::handlesEditPacketType(PacketType packetType) const {
     // we handle these types of "edit" packets
     switch (packetType) {
@@ -119,6 +240,31 @@ bool EntityTree::handlesEditPacketType(PacketType packetType) const {
 /// Adds a new entity item to the tree
 void EntityTree::postAddEntity(EntityItemPointer entity) {
     assert(entity);
+
+    if (getIsServer()) {
+        QString certID(entity->getCertificateID());
+        EntityItemID entityItemID = entity->getEntityItemID();
+        EntityItemID existingEntityItemID;
+
+        {
+            QWriteLocker locker(&_entityCertificateIDMapLock);
+            existingEntityItemID = _entityCertificateIDMap.value(certID);
+            if (!certID.isEmpty()) {
+                _entityCertificateIDMap.insert(certID, entityItemID);
+                qCDebug(entities) << "Certificate ID" << certID << "belongs to" << entityItemID;
+            }
+        }
+
+        // Delete an already-existing entity from the tree if it has the same
+        //     CertificateID as the entity we're trying to add.
+        if (!existingEntityItemID.isNull()) {
+            qCDebug(entities) << "Certificate ID" << certID << "already exists on entity with ID"
+                << existingEntityItemID << ". Deleting existing entity.";
+            deleteEntity(existingEntityItemID, true);
+            return;
+        }
+    }
+    
     // check to see if we need to simulate this entity..
     if (_simulation) {
         _simulation->addEntity(entity);
@@ -136,29 +282,24 @@ void EntityTree::postAddEntity(EntityItemPointer entity) {
 }
 
 bool EntityTree::updateEntity(const EntityItemID& entityID, const EntityItemProperties& properties, const SharedNodePointer& senderNode) {
-    EntityTreeElementPointer containingElement = getContainingElement(entityID);
+    EntityItemPointer entity;
+    {
+        QReadLocker locker(&_entityMapLock);
+        entity = _entityMap.value(entityID);
+    }
+    if (!entity) {
+        return false;
+    }
+    return updateEntity(entity, properties, senderNode);
+}
+
+bool EntityTree::updateEntity(EntityItemPointer entity, const EntityItemProperties& origProperties,
+        const SharedNodePointer& senderNode) {
+    EntityTreeElementPointer containingElement = entity->getElement();
     if (!containingElement) {
         return false;
     }
 
-    EntityItemPointer existingEntity = containingElement->getEntityWithEntityItemID(entityID);
-    if (!existingEntity) {
-        return false;
-    }
-
-    return updateEntityWithElement(existingEntity, properties, containingElement, senderNode);
-}
-
-bool EntityTree::updateEntity(EntityItemPointer entity, const EntityItemProperties& properties, const SharedNodePointer& senderNode) {
-    EntityTreeElementPointer containingElement = getContainingElement(entity->getEntityItemID());
-    if (!containingElement) {
-        return false;
-    }
-    return updateEntityWithElement(entity, properties, containingElement, senderNode);
-}
-
-bool EntityTree::updateEntityWithElement(EntityItemPointer entity, const EntityItemProperties& origProperties,
-                                         EntityTreeElementPointer containingElement, const SharedNodePointer& senderNode) {
     EntityItemProperties properties = origProperties;
 
     bool allowLockChange;
@@ -190,11 +331,13 @@ bool EntityTree::updateEntityWithElement(EntityItemPointer entity, const EntityI
                 bool success;
                 AACube queryCube = entity->getQueryAACube(success);
                 if (!success) {
-                    qCDebug(entities) << "Warning -- failed to get query-cube for" << entity->getID();
+                    qCWarning(entities) << "failed to get query-cube for" << entity->getID();
                 }
                 UpdateEntityOperator theOperator(getThisPointer(), containingElement, entity, queryCube);
                 recurseTreeWithOperator(&theOperator);
-                entity->setProperties(tempProperties);
+                if (entity->setProperties(tempProperties)) {
+                    emit editingEntityPointer(entity);
+                }
                 _isDirty = true;
             }
         }
@@ -269,7 +412,9 @@ bool EntityTree::updateEntityWithElement(EntityItemPointer entity, const EntityI
         }
         UpdateEntityOperator theOperator(getThisPointer(), containingElement, entity, newQueryAACube);
         recurseTreeWithOperator(&theOperator);
-        entity->setProperties(properties);
+        if (entity->setProperties(properties)) {
+            emit editingEntityPointer(entity);
+        }
 
         // if the entity has children, run UpdateEntityOperator on them.  If the children have children, recurse
         QQueue<SpatiallyNestablePointer> toProcess;
@@ -331,9 +476,8 @@ bool EntityTree::updateEntityWithElement(EntityItemPointer entity, const EntityI
      }
 
     // TODO: this final containingElement check should eventually be removed (or wrapped in an #ifdef DEBUG).
-    containingElement = getContainingElement(entity->getEntityItemID());
-    if (!containingElement) {
-        qCDebug(entities) << "UNEXPECTED!!!! after updateEntity() we no longer have a containing element??? entityID="
+    if (!entity->getElement()) {
+        qCWarning(entities) << "EntityTree::updateEntity() we no longer have a containing element for entityID="
                 << entity->getEntityItemID();
         return false;
     }
@@ -352,7 +496,8 @@ EntityItemPointer EntityTree::addEntity(const EntityItemID& entityID, const Enti
     }
 
     if (!properties.getClientOnly() && getIsClient() &&
-        !nodeList->getThisNodeCanRez() && !nodeList->getThisNodeCanRezTmp()) {
+        !nodeList->getThisNodeCanRez() && !nodeList->getThisNodeCanRezTmp() &&
+        !nodeList->getThisNodeCanRezCertified() && !nodeList->getThisNodeCanRezTmpCertified()) {
         return nullptr;
     }
 
@@ -366,7 +511,7 @@ EntityItemPointer EntityTree::addEntity(const EntityItemID& entityID, const Enti
     // You should not call this on existing entities that are already part of the tree! Call updateEntity()
     EntityTreeElementPointer containingElement = getContainingElement(entityID);
     if (containingElement) {
-        qCDebug(entities) << "UNEXPECTED!!! ----- don't call addEntity() on existing entity items. entityID=" << entityID
+        qCWarning(entities) << "EntityTree::addEntity() on existing entity item with entityID=" << entityID
                           << "containingElement=" << containingElement.get();
         return result;
     }
@@ -422,7 +567,7 @@ void EntityTree::deleteEntity(const EntityItemID& entityID, bool force, bool ign
     EntityTreeElementPointer containingElement = getContainingElement(entityID);
     if (!containingElement) {
         if (!ignoreWarnings) {
-            qCDebug(entities) << "UNEXPECTED!!!!  EntityTree::deleteEntity() entityID doesn't exist!!! entityID=" << entityID;
+            qCWarning(entities) << "EntityTree::deleteEntity() on non-existent entityID=" << entityID;
         }
         return;
     }
@@ -430,8 +575,7 @@ void EntityTree::deleteEntity(const EntityItemID& entityID, bool force, bool ign
     EntityItemPointer existingEntity = containingElement->getEntityWithEntityItemID(entityID);
     if (!existingEntity) {
         if (!ignoreWarnings) {
-            qCDebug(entities) << "UNEXPECTED!!!! don't call EntityTree::deleteEntity() on entity items that don't exist. "
-                        "entityID=" << entityID;
+            qCWarning(entities) << "EntityTree::deleteEntity() on non-existant entity item with entityID=" << entityID;
         }
         return;
     }
@@ -445,6 +589,7 @@ void EntityTree::deleteEntity(const EntityItemID& entityID, bool force, bool ign
 
     unhookChildAvatar(entityID);
     emit deletingEntity(entityID);
+    emit deletingEntityPointer(existingEntity.get());
 
     // NOTE: callers must lock the tree before using this method
     DeleteEntityOperator theOperator(getThisPointer(), entityID);
@@ -453,6 +598,10 @@ void EntityTree::deleteEntity(const EntityItemID& entityID, bool force, bool ign
         auto descendantID = descendant->getID();
         theOperator.addEntityIDToDeleteList(descendantID);
         emit deletingEntity(descendantID);
+        EntityItemPointer descendantEntity = std::dynamic_pointer_cast<EntityItem>(descendant);
+        if (descendantEntity) {
+            emit deletingEntityPointer(descendantEntity.get());
+        }
     });
 
     recurseTreeWithOperator(&theOperator);
@@ -478,7 +627,7 @@ void EntityTree::deleteEntities(QSet<EntityItemID> entityIDs, bool force, bool i
         EntityTreeElementPointer containingElement = getContainingElement(entityID);
         if (!containingElement) {
             if (!ignoreWarnings) {
-                qCDebug(entities) << "UNEXPECTED!!!!  EntityTree::deleteEntities() entityID doesn't exist!!! entityID=" << entityID;
+                qCWarning(entities) << "EntityTree::deleteEntities() on non-existent entityID=" << entityID;
             }
             continue;
         }
@@ -486,8 +635,7 @@ void EntityTree::deleteEntities(QSet<EntityItemID> entityIDs, bool force, bool i
         EntityItemPointer existingEntity = containingElement->getEntityWithEntityItemID(entityID);
         if (!existingEntity) {
             if (!ignoreWarnings) {
-                qCDebug(entities) << "UNEXPECTED!!!! don't call EntityTree::deleteEntities() on entity items that don't exist. "
-                            "entityID=" << entityID;
+                qCWarning(entities) << "EntityTree::deleteEntities() on non-existent entity item with entityID=" << entityID;
             }
             continue;
         }
@@ -503,6 +651,7 @@ void EntityTree::deleteEntities(QSet<EntityItemID> entityIDs, bool force, bool i
         unhookChildAvatar(entityID);
         theOperator.addEntityIDToDeleteList(entityID);
         emit deletingEntity(entityID);
+        emit deletingEntityPointer(existingEntity.get());
     }
 
     if (theOperator.getEntities().size() > 0) {
@@ -531,8 +680,16 @@ void EntityTree::processRemovedEntities(const DeleteEntityOperator& theOperator)
         theEntity->die();
 
         if (getIsServer()) {
+            {
+                QWriteLocker entityCertificateIDMapLocker(&_entityCertificateIDMapLock);
+                QString certID = theEntity->getCertificateID();
+                if (theEntity->getEntityItemID() == _entityCertificateIDMap.value(certID)) {
+                    _entityCertificateIDMap.remove(certID);
+                }
+            }
+
             // set up the deleted entities ID
-            QWriteLocker locker(&_recentlyDeletedEntitiesLock);
+            QWriteLocker recentlyDeletedEntitiesLocker(&_recentlyDeletedEntitiesLock);
             _recentlyDeletedEntityItemIDs.insert(deletedAt, theEntity->getEntityItemID());
         } else {
             // on the client side, we also remember that we deleted this entity, we don't care about the time
@@ -594,7 +751,7 @@ bool EntityTree::findNearPointOperation(const OctreeElementPointer& element, voi
 bool findRayIntersectionOp(const OctreeElementPointer& element, void* extraData) {
     RayArgs* args = static_cast<RayArgs*>(extraData);
     bool keepSearching = true;
-    EntityTreeElementPointer entityTreeElementPointer = std::dynamic_pointer_cast<EntityTreeElement>(element);
+    EntityTreeElementPointer entityTreeElementPointer = std::static_pointer_cast<EntityTreeElement>(element);
     if (entityTreeElementPointer->findRayIntersection(args->origin, args->direction, keepSearching,
         args->element, args->distance, args->face, args->surfaceNormal, args->entityIdsToInclude,
         args->entityIdsToDiscard, args->visibleOnly, args->collidableOnly, args->intersectedObject, args->precisionPicking)) {
@@ -753,6 +910,12 @@ void EntityTree::findEntities(const ViewFrustum& frustum, QVector<EntityItemPoin
     foundEntities.swap(args.entities);
 }
 
+// NOTE: assumes caller has handled locking
+void EntityTree::findEntities(RecurseOctreeOperation& elementFilter,
+                              QVector<EntityItemPointer>& foundEntities) {
+    recurseTreeWithOperation(elementFilter, nullptr);
+}
+
 EntityItemPointer EntityTree::findEntityByID(const QUuid& id) {
     EntityItemID entityID(id);
     return findEntityByEntityItemID(entityID);
@@ -911,7 +1074,8 @@ void EntityTree::fixupTerseEditLogging(EntityItemProperties& properties, QList<Q
         changedProperties[index] = QString("queryAACube:") +
             QString::number((int)center.x) + "," +
             QString::number((int)center.y) + "," +
-            QString::number((int)center.z);
+            QString::number((int)center.z) + "/" +
+            QString::number(properties.getQueryAACube().getDimensions().x);
     }
     if (properties.positionChanged()) {
         int index = changedProperties.indexOf("position");
@@ -971,11 +1135,285 @@ bool EntityTree::isScriptInWhitelist(const QString& scriptProperty) {
     return false;
 }
 
+void EntityTree::startChallengeOwnershipTimer(const EntityItemID& entityItemID) {
+    QTimer* _challengeOwnershipTimeoutTimer = new QTimer(this);
+    connect(this, &EntityTree::killChallengeOwnershipTimeoutTimer, this, [=](const QString& certID) {
+        QReadLocker locker(&_entityCertificateIDMapLock);
+        EntityItemID id = _entityCertificateIDMap.value(certID);
+        if (entityItemID == id && _challengeOwnershipTimeoutTimer) {
+            _challengeOwnershipTimeoutTimer->stop();
+            _challengeOwnershipTimeoutTimer->deleteLater();
+        }
+    });
+    connect(_challengeOwnershipTimeoutTimer, &QTimer::timeout, this, [=]() {
+        qCDebug(entities) << "Ownership challenge timed out, deleting entity" << entityItemID;
+        deleteEntity(entityItemID, true);
+        if (_challengeOwnershipTimeoutTimer) {
+            _challengeOwnershipTimeoutTimer->stop();
+            _challengeOwnershipTimeoutTimer->deleteLater();
+        }
+    });
+    _challengeOwnershipTimeoutTimer->setSingleShot(true);
+    _challengeOwnershipTimeoutTimer->start(5000);
+}
+
+void EntityTree::startPendingTransferStatusTimer(const QString& certID, const EntityItemID& entityItemID, const SharedNodePointer& senderNode) {
+    qCDebug(entities) << "'transfer_status' is 'pending', checking again in 90 seconds..." << entityItemID;
+    QTimer* transferStatusRetryTimer = new QTimer(this);
+    connect(transferStatusRetryTimer, &QTimer::timeout, this, [=]() {
+        validatePop(certID, entityItemID, senderNode, true);
+    });
+    transferStatusRetryTimer->setSingleShot(true);
+    transferStatusRetryTimer->start(90000);
+}
+
+QByteArray EntityTree::computeEncryptedNonce(const QString& certID, const QString ownerKey) {
+    QString ownerKeyWithHeaders = ("-----BEGIN RSA PUBLIC KEY-----\n" + ownerKey + "\n-----END RSA PUBLIC KEY-----");
+    BIO* bio = BIO_new_mem_buf((void*)ownerKeyWithHeaders.toUtf8().constData(), -1);
+    BIO_set_flags(bio, BIO_FLAGS_BASE64_NO_NL); // NO NEWLINE
+    RSA* rsa = PEM_read_bio_RSAPublicKey(bio, NULL, NULL, NULL);
+
+    if (rsa) {
+        QUuid nonce = QUuid::createUuid();
+        const unsigned int textLength = nonce.toString().length();
+        QByteArray encryptedText(RSA_size(rsa), 0);
+        const int encryptStatus = RSA_public_encrypt(textLength,
+            reinterpret_cast<const unsigned char*>(qPrintable(nonce.toString())),
+            reinterpret_cast<unsigned char*>(encryptedText.data()),
+            rsa,
+            RSA_PKCS1_OAEP_PADDING);
+        if (bio) {
+            BIO_free(bio);
+        }
+        RSA_free(rsa);
+        if (encryptStatus == -1) {
+            long error = ERR_get_error();
+            const char* error_str = ERR_error_string(error, NULL);
+            qCWarning(entities) << "Unable to compute encrypted nonce for" << certID << "\nRSA error:" << error_str;
+            return "";
+        }
+
+        QWriteLocker locker(&_certNonceMapLock);
+        _certNonceMap.insert(certID, nonce);
+
+        return encryptedText;
+    } else {
+        if (bio) {
+            BIO_free(bio);
+        }
+        return "";
+    }
+}
+
+bool EntityTree::verifyDecryptedNonce(const QString& certID, const QString& decryptedNonce, EntityItemID& id) {
+    {
+        QReadLocker certIdMapLocker(&_entityCertificateIDMapLock);
+        id = _entityCertificateIDMap.value(certID);
+    }
+
+    QString actualNonce;
+    {
+        QWriteLocker locker(&_certNonceMapLock);
+        actualNonce = _certNonceMap.take(certID).toString();
+    }
+
+    bool verificationSuccess = (actualNonce == decryptedNonce);
+
+    if (verificationSuccess) {
+        qCDebug(entities) << "Ownership challenge for Cert ID" << certID << "succeeded.";
+    } else {
+        qCDebug(entities) << "Ownership challenge for Cert ID" << certID << "failed."
+            << "\nActual nonce:" << actualNonce << "\nDecrypted nonce:" << decryptedNonce;
+    }
+
+    return verificationSuccess;
+}
+
+void EntityTree::processChallengeOwnershipRequestPacket(ReceivedMessage& message, const SharedNodePointer& sourceNode) {
+    int certIDByteArraySize;
+    int encryptedTextByteArraySize;
+    int nodeToChallengeByteArraySize;
+
+    message.readPrimitive(&certIDByteArraySize);
+    message.readPrimitive(&encryptedTextByteArraySize);
+    message.readPrimitive(&nodeToChallengeByteArraySize);
+
+    QByteArray certID(message.read(certIDByteArraySize));
+    QByteArray encryptedText(message.read(encryptedTextByteArraySize));
+    QByteArray nodeToChallenge(message.read(nodeToChallengeByteArraySize));
+
+    sendChallengeOwnershipRequestPacket(certID, encryptedText, nodeToChallenge, sourceNode);
+}
+
+void EntityTree::processChallengeOwnershipReplyPacket(ReceivedMessage& message, const SharedNodePointer& sourceNode) {
+    auto nodeList = DependencyManager::get<NodeList>();
+
+    int certIDByteArraySize;
+    int decryptedTextByteArraySize;
+    int challengingNodeUUIDByteArraySize;
+
+    message.readPrimitive(&certIDByteArraySize);
+    message.readPrimitive(&decryptedTextByteArraySize);
+    message.readPrimitive(&challengingNodeUUIDByteArraySize);
+
+    QByteArray certID(message.read(certIDByteArraySize));
+    QByteArray decryptedText(message.read(decryptedTextByteArraySize));
+    QUuid challengingNode = QUuid::fromRfc4122(message.read(challengingNodeUUIDByteArraySize));
+
+    auto challengeOwnershipReplyPacket = NLPacket::create(PacketType::ChallengeOwnershipReply,
+        certIDByteArraySize + decryptedText.length() + 2 * sizeof(int),
+        true);
+    challengeOwnershipReplyPacket->writePrimitive(certIDByteArraySize);
+    challengeOwnershipReplyPacket->writePrimitive(decryptedText.length());
+    challengeOwnershipReplyPacket->write(certID);
+    challengeOwnershipReplyPacket->write(decryptedText);
+
+    nodeList->sendPacket(std::move(challengeOwnershipReplyPacket), *(nodeList->nodeWithUUID(challengingNode)));
+}
+
+void EntityTree::sendChallengeOwnershipPacket(const QString& certID, const QString& ownerKey, const EntityItemID& entityItemID, const SharedNodePointer& senderNode) {
+    // 1. Encrypt a nonce with the owner's public key
+    auto nodeList = DependencyManager::get<NodeList>();
+
+    QByteArray encryptedText = computeEncryptedNonce(certID, ownerKey);
+
+    if (encryptedText == "") {
+        qCDebug(entities) << "CRITICAL ERROR: Couldn't compute encrypted nonce. Deleting entity...";
+        deleteEntity(entityItemID, true);
+    } else {
+        qCDebug(entities) << "Challenging ownership of Cert ID" << certID;
+        // 2. Send the encrypted text to the rezzing avatar's node
+        QByteArray certIDByteArray = certID.toUtf8();
+        int certIDByteArraySize = certIDByteArray.size();
+        auto challengeOwnershipPacket = NLPacket::create(PacketType::ChallengeOwnership,
+            certIDByteArraySize + encryptedText.length() + 2 * sizeof(int),
+            true);
+        challengeOwnershipPacket->writePrimitive(certIDByteArraySize);
+        challengeOwnershipPacket->writePrimitive(encryptedText.length());
+        challengeOwnershipPacket->write(certIDByteArray);
+        challengeOwnershipPacket->write(encryptedText);
+        nodeList->sendPacket(std::move(challengeOwnershipPacket), *senderNode);
+
+        // 3. Kickoff a 10-second timeout timer that deletes the entity if we don't get an ownership response in time
+        if (thread() != QThread::currentThread()) {
+            QMetaObject::invokeMethod(this, "startChallengeOwnershipTimer", Q_ARG(const EntityItemID&, entityItemID));
+            return;
+        } else {
+            startChallengeOwnershipTimer(entityItemID);
+        }
+    }
+}
+
+void EntityTree::sendChallengeOwnershipRequestPacket(const QByteArray& certID, const QByteArray& encryptedText, const QByteArray& nodeToChallenge, const SharedNodePointer& senderNode) {
+    auto nodeList = DependencyManager::get<NodeList>();
+
+    // In this case, Client A is challenging Client B. Client A is inspecting a certified entity that it wants
+    //     to make sure belongs to Avatar B.
+    QByteArray senderNodeUUID = senderNode->getUUID().toRfc4122();
+
+    int certIDByteArraySize = certID.length();
+    int encryptedTextByteArraySize = encryptedText.length();
+    int senderNodeUUIDSize = senderNodeUUID.length();
+
+    auto challengeOwnershipPacket = NLPacket::create(PacketType::ChallengeOwnershipRequest,
+        certIDByteArraySize + encryptedTextByteArraySize + senderNodeUUIDSize + 3 * sizeof(int),
+        true);
+    challengeOwnershipPacket->writePrimitive(certIDByteArraySize);
+    challengeOwnershipPacket->writePrimitive(encryptedTextByteArraySize);
+    challengeOwnershipPacket->writePrimitive(senderNodeUUIDSize);
+    challengeOwnershipPacket->write(certID);
+    challengeOwnershipPacket->write(encryptedText);
+    challengeOwnershipPacket->write(senderNodeUUID);
+
+    nodeList->sendPacket(std::move(challengeOwnershipPacket), *(nodeList->nodeWithUUID(QUuid::fromRfc4122(nodeToChallenge))));
+}
+
+void EntityTree::validatePop(const QString& certID, const EntityItemID& entityItemID, const SharedNodePointer& senderNode, bool isRetryingValidation) {
+    // Start owner verification.
+    auto nodeList = DependencyManager::get<NodeList>();
+    //     First, asynchronously hit "proof_of_purchase_status?transaction_type=transfer" endpoint.
+    QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
+    QNetworkRequest networkRequest;
+    networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
+    networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
+    QUrl requestURL = NetworkingConstants::METAVERSE_SERVER_URL;
+    requestURL.setPath("/api/v1/commerce/proof_of_purchase_status/transfer");
+    QJsonObject request;
+    request["certificate_id"] = certID;
+    networkRequest.setUrl(requestURL);
+
+    QNetworkReply* networkReply = NULL;
+    networkReply = networkAccessManager.put(networkRequest, QJsonDocument(request).toJson());
+
+    connect(networkReply, &QNetworkReply::finished, [=]() {
+        QJsonObject jsonObject = QJsonDocument::fromJson(networkReply->readAll()).object();
+        jsonObject = jsonObject["data"].toObject();
+
+        if (networkReply->error() == QNetworkReply::NoError) {
+            if (!jsonObject["invalid_reason"].toString().isEmpty()) {
+                qCDebug(entities) << "invalid_reason not empty, deleting entity" << entityItemID;
+                deleteEntity(entityItemID, true);
+            } else if (jsonObject["transfer_status"].toArray().first().toString() == "failed") {
+                qCDebug(entities) << "'transfer_status' is 'failed', deleting entity" << entityItemID;
+                deleteEntity(entityItemID, true);
+            } else if (jsonObject["transfer_status"].toArray().first().toString() == "pending") {
+                if (isRetryingValidation) {
+                    qCDebug(entities) << "'transfer_status' is 'pending' after retry, deleting entity" << entityItemID;
+                    deleteEntity(entityItemID, true);
+                } else {
+                    if (thread() != QThread::currentThread()) {
+                        QMetaObject::invokeMethod(this, "startPendingTransferStatusTimer",
+                            Q_ARG(const QString&, certID),
+                            Q_ARG(const EntityItemID&, entityItemID),
+                            Q_ARG(const SharedNodePointer&, senderNode));
+                        return;
+                    } else {
+                        startPendingTransferStatusTimer(certID, entityItemID, senderNode);
+                    }
+                }
+            } else {
+                // Second, challenge ownership of the PoP cert
+                sendChallengeOwnershipPacket(certID,
+                    jsonObject["transfer_recipient_key"].toString(),
+                    entityItemID,
+                    senderNode);
+
+            }
+        } else {
+            qCDebug(entities) << "Call to" << networkReply->url() << "failed with error" << networkReply->error() << "; deleting entity" << entityItemID
+                << "More info:" << jsonObject;
+            deleteEntity(entityItemID, true);
+        }
+
+        networkReply->deleteLater();
+    });
+}
+
+void EntityTree::processChallengeOwnershipPacket(ReceivedMessage& message, const SharedNodePointer& sourceNode) {
+    int certIDByteArraySize;
+    int decryptedTextByteArraySize;
+
+    message.readPrimitive(&certIDByteArraySize);
+    message.readPrimitive(&decryptedTextByteArraySize);
+
+    QString certID(message.read(certIDByteArraySize));
+    QString decryptedText(message.read(decryptedTextByteArraySize));
+
+    emit killChallengeOwnershipTimeoutTimer(certID);
+
+    EntityItemID id;
+    if (!verifyDecryptedNonce(certID, decryptedText, id)) {
+        if (!id.isNull()) {
+            deleteEntity(id, true);
+        }
+    }
+}
+
 int EntityTree::processEditPacketData(ReceivedMessage& message, const unsigned char* editData, int maxLength,
                                      const SharedNodePointer& senderNode) {
 
     if (!getIsServer()) {
-        qCDebug(entities) << "UNEXPECTED!!! processEditPacketData() should only be called on a server tree.";
+        qCWarning(entities) << "EntityTree::processEditPacketData() should only be called on a server tree.";
         return 0;
     }
 
@@ -1080,7 +1518,8 @@ int EntityTree::processEditPacketData(ReceivedMessage& message, const unsigned c
             }
 
             if ((isAdd || properties.lifetimeChanged()) &&
-                !senderNode->getCanRez() && senderNode->getCanRezTmp()) {
+                ((!senderNode->getCanRez() && senderNode->getCanRezTmp()) ||
+                (!senderNode->getCanRezCertified() && senderNode->getCanRezTmpCertified()))) {
                 // this node is only allowed to rez temporary entities.  if need be, cap the lifetime.
                 if (properties.getLifetime() == ENTITY_ITEM_IMMORTAL_LIFETIME ||
                     properties.getLifetime() > _maxTmpEntityLifetime) {
@@ -1139,19 +1578,23 @@ int EntityTree::processEditPacketData(ReceivedMessage& message, const unsigned c
                     if (!isPhysics) {
                         properties.setLastEditedBy(senderNode->getUUID());
                     }
-                    updateEntity(entityItemID, properties, senderNode);
+                    updateEntity(existingEntity, properties, senderNode);
                     existingEntity->markAsChangedOnServer();
                     endUpdate = usecTimestampNow();
                     _totalUpdates++;
                 } else if (isAdd) {
                     bool failedAdd = !allowed;
+                    bool isCertified = !properties.getCertificateID().isEmpty();
                     if (!allowed) {
                         qCDebug(entities) << "Filtered entity add. ID:" << entityItemID;
-                    } else if (!senderNode->getCanRez() && !senderNode->getCanRezTmp()) {
+                    } else if (!isCertified && !senderNode->getCanRez() && !senderNode->getCanRezTmp()) {
                         failedAdd = true;
-                        qCDebug(entities) << "User without 'rez rights' [" << senderNode->getUUID()
-                                          << "] attempted to add an entity ID:" << entityItemID;
-
+                        qCDebug(entities) << "User without 'uncertified rez rights' [" << senderNode->getUUID()
+                            << "] attempted to add an uncertified entity with ID:" << entityItemID;
+                    } else if (isCertified && !senderNode->getCanRezCertified() && !senderNode->getCanRezTmpCertified()) {
+                        failedAdd = true;
+                        qCDebug(entities) << "User without 'certified rez rights' [" << senderNode->getUUID()
+                            << "] attempted to add a certified entity with ID:" << entityItemID;
                     } else {
                         // this is a new entity... assign a new entityID
                         properties.setCreated(properties.getLastEdited());
@@ -1160,6 +1603,19 @@ int EntityTree::processEditPacketData(ReceivedMessage& message, const unsigned c
                         EntityItemPointer newEntity = addEntity(entityItemID, properties);
                         endCreate = usecTimestampNow();
                         _totalCreates++;
+
+                        if (newEntity && isCertified && getIsServer()) {
+                            if (!properties.verifyStaticCertificateProperties()) {
+                                qCDebug(entities) << "User" << senderNode->getUUID()
+                                    << "attempted to add a certified entity with ID" << entityItemID << "which failed"
+                                    << "static certificate verification.";
+                                // Delete the entity we just added if it doesn't pass static certificate verification
+                                deleteEntity(entityItemID, true);
+                            } else {
+                                validatePop(properties.getCertificateID(), entityItemID, senderNode, false);
+                            }
+                        }
+
                         if (newEntity) {
                             newEntity->markAsChangedOnServer();
                             notifyNewlyCreatedEntity(*newEntity, senderNode);
@@ -1252,7 +1708,8 @@ void EntityTree::entityChanged(EntityItemPointer entity) {
 
 
 void EntityTree::fixupNeedsParentFixups() {
-    MovingEntitiesOperator moveOperator(getThisPointer());
+    PROFILE_RANGE(simulation_physics, "FixupParents");
+    MovingEntitiesOperator moveOperator;
 
     QWriteLocker locker(&_needsParentFixupLock);
 
@@ -1328,14 +1785,22 @@ void EntityTree::deleteDescendantsOfAvatar(QUuid avatarID) {
     }
 }
 
+void EntityTree::removeFromChildrenOfAvatars(EntityItemPointer entity) {
+    QUuid avatarID = entity->getParentID();
+    if (_childrenOfAvatars.contains(avatarID)) {
+        _childrenOfAvatars[avatarID].remove(entity->getID());
+    }
+}
+
 void EntityTree::addToNeedsParentFixupList(EntityItemPointer entity) {
     QWriteLocker locker(&_needsParentFixupLock);
     _needsParentFixup.append(entity);
 }
 
-void EntityTree::update() {
+void EntityTree::update(bool simulate) {
+    PROFILE_RANGE(simulation_physics, "ET::update");
     fixupNeedsParentFixups();
-    if (_simulation) {
+    if (simulate && _simulation) {
         withWriteLock([&] {
             _simulation->updateEntities();
             VectorOfEntities pendingDeletes;
@@ -1502,27 +1967,43 @@ int EntityTree::processEraseMessageDetails(const QByteArray& dataByteArray, cons
 }
 
 EntityTreeElementPointer EntityTree::getContainingElement(const EntityItemID& entityItemID)  /*const*/ {
-    QReadLocker locker(&_entityToElementLock);
-    EntityTreeElementPointer element = _entityToElementMap.value(entityItemID);
-    return element;
+    EntityItemPointer entity;
+    {
+        QReadLocker locker(&_entityMapLock);
+        entity = _entityMap.value(entityItemID);
+    }
+    if (entity) {
+        return entity->getElement();
+    }
+    return EntityTreeElementPointer(nullptr);
 }
 
-void EntityTree::setContainingElement(const EntityItemID& entityItemID, EntityTreeElementPointer element) {
-    QWriteLocker locker(&_entityToElementLock);
-    if (element) {
-        _entityToElementMap[entityItemID] = element;
-    } else {
-        _entityToElementMap.remove(entityItemID);
+void EntityTree::addEntityMapEntry(EntityItemPointer entity) {
+    EntityItemID id = entity->getEntityItemID();
+    QWriteLocker locker(&_entityMapLock);
+    EntityItemPointer otherEntity = _entityMap.value(id);
+    if (otherEntity) {
+        qCWarning(entities) << "EntityTree::addEntityMapEntry() found pre-existing id " << id;
+        assert(false);
+        return;
     }
+    _entityMap.insert(id, entity);
+}
+
+void EntityTree::clearEntityMapEntry(const EntityItemID& id) {
+    QWriteLocker locker(&_entityMapLock);
+    _entityMap.remove(id);
 }
 
 void EntityTree::debugDumpMap() {
+    // QHash's are implicitly shared, so we make a shared copy and use that instead.
+    // This way we might be able to avoid both a lock and a true copy.
+    QHash<EntityItemID, EntityItemPointer> localMap(_entityMap);
     qCDebug(entities) << "EntityTree::debugDumpMap() --------------------------";
-    QReadLocker locker(&_entityToElementLock);
-    QHashIterator<EntityItemID, EntityTreeElementPointer> i(_entityToElementMap);
+    QHashIterator<EntityItemID, EntityItemPointer> i(localMap);
     while (i.hasNext()) {
         i.next();
-        qCDebug(entities) << i.key() << ": " << i.value().get();
+        qCDebug(entities) << i.key() << ": " << i.value()->getElement().get();
     }
     qCDebug(entities) << "-----------------------------------------------------";
 }
@@ -1653,7 +2134,7 @@ QVector<EntityItemID> EntityTree::sendEntities(EntityEditPacketSender* packetSen
     // add-entity packet to the server.
 
     // fix the queryAACubes of any children that were read in before their parents, get them into the correct element
-    MovingEntitiesOperator moveOperator(localTree);
+    MovingEntitiesOperator moveOperator;
     QHash<EntityItemID, EntityItemID>::iterator i = map.begin();
     while (i != map.end()) {
         EntityItemID newID = i.value();
@@ -1663,6 +2144,7 @@ QVector<EntityItemID> EntityTree::sendEntities(EntityEditPacketSender* packetSen
                 addToNeedsParentFixupList(entity);
             }
             entity->forceQueryAACubeUpdate();
+            entity->updateQueryAACube();
             moveOperator.addEntityToMoveList(entity, entity->getQueryAACube());
             i++;
         } else {
@@ -1681,7 +2163,7 @@ QVector<EntityItemID> EntityTree::sendEntities(EntityEditPacketSender* packetSen
         EntityItemPointer entity = localTree->findEntityByEntityItemID(newID);
         if (entity) {
             // queue the packet to send to the server
-            entity->computePuffedQueryAACube();
+            entity->updateQueryAACube();
             EntityItemProperties properties = entity->getProperties();
             properties.markAllChanged(); // so the entire property set is considered new, since we're making a new entity
             packetSender->queueEditEntityMessage(PacketType::EntityAdd, localTree, newID, properties);
@@ -1706,7 +2188,13 @@ bool EntityTree::sendEntitiesOperation(const OctreeElementPointer& element, void
 
         QHash<EntityItemID, EntityItemID>::iterator iter = args->map->find(oldID);
         if (iter == args->map->end()) {
-            EntityItemID newID = QUuid::createUuid();
+            EntityItemID newID;
+            if (oldID == AVATAR_SELF_ID) {
+                auto nodeList = DependencyManager::get<NodeList>();
+                newID = EntityItemID(nodeList->getSessionUUID());
+            } else {
+                newID = QUuid::createUuid();
+            }
             args->map->insert(oldID, newID);
             return newID;
         }
@@ -1723,8 +2211,8 @@ bool EntityTree::sendEntitiesOperation(const OctreeElementPointer& element, void
             properties.setPosition(properties.getPosition() + args->root);
         } else {
             EntityItemPointer parentEntity = args->ourTree->findEntityByEntityItemID(oldParentID);
-            if (parentEntity) { // map the parent
-                properties.setParentID(getMapped(parentEntity->getID()));
+            if (parentEntity || oldParentID == AVATAR_SELF_ID) { // map the parent
+                properties.setParentID(getMapped(oldParentID));
                 // But do not add root offset in this case.
             } else { // Should not happen, but let's try to be helpful...
                 item->globalizeProperties(properties, "Cannot find %3 parent of %2 %1", args->root);
@@ -1799,6 +2287,12 @@ bool EntityTree::readFromMap(QVariantMap& map) {
             entityItemID = EntityItemID(QUuid::createUuid());
         }
 
+        if (properties.getClientOnly()) {
+            auto nodeList = DependencyManager::get<NodeList>();
+            const QUuid myNodeID = nodeList->getSessionUUID();
+            properties.setOwningAvatarID(myNodeID);
+        }
+
         EntityItemPointer entity = addEntity(entityItemID, properties);
         if (!entity) {
             qCDebug(entities) << "adding Entity failed:" << entityItemID << properties.getType();
@@ -1834,16 +2328,6 @@ void EntityTree::trackIncomingEntityLastEdited(quint64 lastEditedTime, int bytes
     }
 }
 
-void EntityTree::callLoader(EntityItemID entityID) {
-    // this is used to bounce from the networking thread to the main thread
-    this->withWriteLock([&] {
-        EntityItemPointer entity = findEntityByEntityItemID(entityID);
-        if (entity) {
-            entity->loader();
-        }
-    });
-}
-
 int EntityTree::getJointIndex(const QUuid& entityID, const QString& name) const {
     EntityTree* nonConstThis = const_cast<EntityTree*>(this);
     EntityItemPointer entity = nonConstThis->findEntityByEntityItemID(entityID);
diff --git a/libraries/entities/src/EntityTree.h b/libraries/entities/src/EntityTree.h
index 24e6c364b1..86bfe984f6 100644
--- a/libraries/entities/src/EntityTree.h
+++ b/libraries/entities/src/EntityTree.h
@@ -19,11 +19,12 @@
 #include <SpatialParentFinder.h>
 
 class EntityTree;
-typedef std::shared_ptr<EntityTree> EntityTreePointer;
-
+using EntityTreePointer = std::shared_ptr<EntityTree>;
 
+#include "AddEntityOperator.h"
 #include "EntityTreeElement.h"
 #include "DeleteEntityOperator.h"
+#include "MovingEntitiesOperator.h"
 
 class EntityEditFilters;
 class Model;
@@ -80,16 +81,21 @@ public:
 
     virtual void eraseAllOctreeElements(bool createNewRoot = true) override;
 
+    virtual void readBitstreamToTree(const unsigned char* bitstream,
+            uint64_t bufferSizeBytes, ReadBitstreamToTreeParams& args) override;
+    int readEntityDataFromBuffer(const unsigned char* data, int bytesLeftToRead, ReadBitstreamToTreeParams& args);
+
     // These methods will allow the OctreeServer to send your tree inbound edit packets of your
     // own definition. Implement these to allow your octree based server to support editing
     virtual bool getWantSVOfileVersions() const override { return true; }
     virtual PacketType expectedDataPacketType() const override { return PacketType::EntityData; }
-    virtual bool canProcessVersion(PacketVersion thisVersion) const override
-                    { return thisVersion >= VERSION_ENTITIES_USE_METERS_AND_RADIANS; }
     virtual bool handlesEditPacketType(PacketType packetType) const override;
     void fixupTerseEditLogging(EntityItemProperties& properties, QList<QString>& changedProperties);
     virtual int processEditPacketData(ReceivedMessage& message, const unsigned char* editData, int maxLength,
                                       const SharedNodePointer& senderNode) override;
+    virtual void processChallengeOwnershipRequestPacket(ReceivedMessage& message, const SharedNodePointer& sourceNode) override;
+    virtual void processChallengeOwnershipReplyPacket(ReceivedMessage& message, const SharedNodePointer& sourceNode) override;
+    virtual void processChallengeOwnershipPacket(ReceivedMessage& message, const SharedNodePointer& sourceNode) override;
 
     virtual bool findRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
         QVector<EntityItemID> entityIdsToInclude, QVector<EntityItemID> entityIdsToDiscard,
@@ -106,10 +112,9 @@ public:
     virtual void releaseSceneEncodeData(OctreeElementExtraEncodeData* extraEncodeData) const override;
     virtual bool mustIncludeAllChildData() const override { return false; }
 
-    virtual bool versionHasSVOfileBreaks(PacketVersion thisVersion) const override
-                    { return thisVersion >= VERSION_ENTITIES_HAS_FILE_BREAKS; }
+    virtual void update() override { update(true); }
 
-    virtual void update() override;
+    void update(bool simulate);
 
     // The newer API...
     void postAddEntity(EntityItemPointer entityItem);
@@ -119,9 +124,6 @@ public:
     // use this method if you only know the entityID
     bool updateEntity(const EntityItemID& entityID, const EntityItemProperties& properties, const SharedNodePointer& senderNode = SharedNodePointer(nullptr));
 
-    // use this method if you have a pointer to the entity (avoid an extra entity lookup)
-    bool updateEntity(EntityItemPointer entity, const EntityItemProperties& properties, const SharedNodePointer& senderNode = SharedNodePointer(nullptr));
-
     // check if the avatar is a child of this entity, If so set the avatar parentID to null
     void unhookChildAvatar(const EntityItemID entityID);
     void deleteEntity(const EntityItemID& entityID, bool force = false, bool ignoreWarnings = true);
@@ -161,6 +163,11 @@ public:
     /// \param foundEntities[out] vector of EntityItemPointer
     void findEntities(const ViewFrustum& frustum, QVector<EntityItemPointer>& foundEntities);
 
+    /// finds all entities that match scanOperator
+    /// \parameter scanOperator function that scans entities that match criteria
+    /// \parameter foundEntities[out] vector of EntityItemPointer
+    void findEntities(RecurseOctreeOperation& scanOperator, QVector<EntityItemPointer>& foundEntities);
+
     void addNewlyCreatedHook(NewlyCreatedEntityHook* hook);
     void removeNewlyCreatedHook(NewlyCreatedEntityHook* hook);
 
@@ -177,13 +184,19 @@ public:
         return _recentlyDeletedEntityItemIDs;
     }
 
+    QHash<QString, EntityItemID> getEntityCertificateIDMap() const {
+        QReadLocker locker(&_entityCertificateIDMapLock);
+        return _entityCertificateIDMap;
+    }
+
     void forgetEntitiesDeletedBefore(quint64 sinceTime);
 
     int processEraseMessage(ReceivedMessage& message, const SharedNodePointer& sourceNode);
     int processEraseMessageDetails(const QByteArray& buffer, const SharedNodePointer& sourceNode);
 
     EntityTreeElementPointer getContainingElement(const EntityItemID& entityItemID)  /*const*/;
-    void setContainingElement(const EntityItemID& entityItemID, EntityTreeElementPointer element);
+    void addEntityMapEntry(EntityItemPointer entity);
+    void clearEntityMapEntry(const EntityItemID& id);
     void debugDumpMap();
     virtual void dumpTree() override;
     virtual void pruneTree() override;
@@ -254,6 +267,7 @@ public:
     void knowAvatarID(QUuid avatarID) { _avatarIDs += avatarID; }
     void forgetAvatarID(QUuid avatarID) { _avatarIDs -= avatarID; }
     void deleteDescendantsOfAvatar(QUuid avatarID);
+    void removeFromChildrenOfAvatars(EntityItemPointer entity);
 
     void addToNeedsParentFixupList(EntityItemPointer entity);
 
@@ -261,23 +275,25 @@ public:
 
     static const float DEFAULT_MAX_TMP_ENTITY_LIFETIME;
 
-public slots:
-    void callLoader(EntityItemID entityID);
+    QByteArray computeEncryptedNonce(const QString& certID, const QString ownerKey);
+    bool verifyDecryptedNonce(const QString& certID, const QString& decryptedNonce, EntityItemID& id);
 
 signals:
     void deletingEntity(const EntityItemID& entityID);
+    void deletingEntityPointer(EntityItem* entityID);
     void addingEntity(const EntityItemID& entityID);
+    void editingEntityPointer(const EntityItemPointer& entityID);
     void entityScriptChanging(const EntityItemID& entityItemID, const bool reload);
     void entityServerScriptChanging(const EntityItemID& entityItemID, const bool reload);
     void newCollisionSoundURL(const QUrl& url, const EntityItemID& entityID);
     void clearingEntities();
+    void killChallengeOwnershipTimeoutTimer(const QString& certID);
 
 protected:
 
     void processRemovedEntities(const DeleteEntityOperator& theOperator);
-    bool updateEntityWithElement(EntityItemPointer entity, const EntityItemProperties& properties,
-                                 EntityTreeElementPointer containingElement,
-                                 const SharedNodePointer& senderNode = SharedNodePointer(nullptr));
+    bool updateEntity(EntityItemPointer entity, const EntityItemProperties& properties,
+            const SharedNodePointer& senderNode = SharedNodePointer(nullptr));
     static bool findNearPointOperation(const OctreeElementPointer& element, void* extraData);
     static bool findInSphereOperation(const OctreeElementPointer& element, void* extraData);
     static bool findInCubeOperation(const OctreeElementPointer& element, void* extraData);
@@ -309,8 +325,14 @@ protected:
         _deletedEntityItemIDs << id;
     }
 
-    mutable QReadWriteLock _entityToElementLock;
-    QHash<EntityItemID, EntityTreeElementPointer> _entityToElementMap;
+    mutable QReadWriteLock _entityMapLock;
+    QHash<EntityItemID, EntityItemPointer> _entityMap;
+
+    mutable QReadWriteLock _entityCertificateIDMapLock;
+    QHash<QString, EntityItemID> _entityCertificateIDMap;
+
+    mutable QReadWriteLock _certNonceMapLock;
+    QHash<QString, QUuid> _certNonceMap;
 
     EntitySimulationPointer _simulation;
 
@@ -350,6 +372,17 @@ protected:
     bool filterProperties(EntityItemPointer& existingEntity, EntityItemProperties& propertiesIn, EntityItemProperties& propertiesOut, bool& wasChanged, FilterType filterType);
     bool _hasEntityEditFilter{ false };
     QStringList _entityScriptSourceWhitelist;
+
+    MovingEntitiesOperator _entityMover;
+    QHash<EntityItemID, EntityItemPointer> _entitiesToAdd;
+
+    Q_INVOKABLE void startChallengeOwnershipTimer(const EntityItemID& entityItemID);
+    Q_INVOKABLE void startPendingTransferStatusTimer(const QString& certID, const EntityItemID& entityItemID, const SharedNodePointer& senderNode);
+
+private:
+    void sendChallengeOwnershipPacket(const QString& certID, const QString& ownerKey, const EntityItemID& entityItemID, const SharedNodePointer& senderNode);
+    void sendChallengeOwnershipRequestPacket(const QByteArray& certID, const QByteArray& encryptedText, const QByteArray& nodeToChallenge, const SharedNodePointer& senderNode);
+    void validatePop(const QString& certID, const EntityItemID& entityItemID, const SharedNodePointer& senderNode, bool isRetryingValidation);
 };
 
 #endif // hifi_EntityTree_h
diff --git a/libraries/entities/src/EntityTreeElement.cpp b/libraries/entities/src/EntityTreeElement.cpp
index cce7ee006f..2696377028 100644
--- a/libraries/entities/src/EntityTreeElement.cpp
+++ b/libraries/entities/src/EntityTreeElement.cpp
@@ -107,7 +107,7 @@ bool EntityTreeElement::shouldIncludeChildData(int childIndex, EncodeBitstreamPa
 
     OctreeElementExtraEncodeData* extraEncodeData = &entityNodeData->extraEncodeData;
     assert(extraEncodeData); // EntityTrees always require extra encode data on their encoding passes
-    
+
     if (extraEncodeData->contains(this)) {
         EntityTreeElementExtraEncodeDataPointer entityTreeElementExtraEncodeData
                         = std::static_pointer_cast<EntityTreeElementExtraEncodeData>((*extraEncodeData)[this]);
@@ -305,7 +305,7 @@ OctreeElement::AppendState EntityTreeElement::appendElementData(OctreePacketData
     int numberOfEntitiesOffset = 0;
     withReadLock([&] {
         QVector<uint16_t> indexesOfEntitiesToInclude;
-        
+
         // It's possible that our element has been previous completed. In this case we'll simply not include any of our
         // entities for encoding. This is needed because we encode the element data at the "parent" level, and so we
         // need to handle the case where our sibling elements need encoding but we don't.
@@ -432,11 +432,11 @@ OctreeElement::AppendState EntityTreeElement::appendElementData(OctreePacketData
                     // and include the entity in our final count of entities
                     packetData->endLevel(entityLevel);
                     actualNumberOfEntities++;
-                }
 
-                // If the entity item got completely appended, then we can remove it from the extra encode data
-                if (appendEntityState == OctreeElement::COMPLETED) {
-                    entityTreeElementExtraEncodeData->entities.remove(entity->getEntityItemID());
+                    // If the entity item got completely appended, then we can remove it from the extra encode data
+                    if (appendEntityState == OctreeElement::COMPLETED) {
+                        entityTreeElementExtraEncodeData->entities.remove(entity->getEntityItemID());
+                    }
                 }
 
                 // If any part of the entity items didn't fit, then the element is considered partial
@@ -869,6 +869,14 @@ void EntityTreeElement::getEntities(const ViewFrustum& frustum, QVector<EntityIt
     });
 }
 
+void EntityTreeElement::getEntities(EntityItemFilter& filter,  QVector<EntityItemPointer>& foundEntities) {
+    forEachEntity([&](EntityItemPointer entity) {
+        if (filter(entity)) {
+            foundEntities.push_back(entity);
+        }
+    });
+}
+
 EntityItemPointer EntityTreeElement::getEntityWithEntityItemID(const EntityItemID& id) const {
     EntityItemPointer foundEntity = NULL;
     withReadLock([&] {
@@ -885,14 +893,15 @@ EntityItemPointer EntityTreeElement::getEntityWithEntityItemID(const EntityItemI
 void EntityTreeElement::cleanupEntities() {
     withWriteLock([&] {
         foreach(EntityItemPointer entity, _entityItems) {
+            // NOTE: only EntityTreeElement should ever be changing the value of entity->_element
             // NOTE: We explicitly don't delete the EntityItem here because since we only
             // access it by smart pointers, when we remove it from the _entityItems
             // we know that it will be deleted.
-            //delete entity;
             entity->_element = NULL;
         }
         _entityItems.clear();
     });
+    bumpChangedContent();
 }
 
 bool EntityTreeElement::removeEntityWithEntityItemID(const EntityItemID& id) {
@@ -903,8 +912,10 @@ bool EntityTreeElement::removeEntityWithEntityItemID(const EntityItemID& id) {
             EntityItemPointer& entity = _entityItems[i];
             if (entity->getEntityItemID() == id) {
                 foundEntity = true;
+                // NOTE: only EntityTreeElement should ever be changing the value of entity->_element
                 entity->_element = NULL;
                 _entityItems.removeAt(i);
+                bumpChangedContent();
                 break;
             }
         }
@@ -918,144 +929,19 @@ bool EntityTreeElement::removeEntityItem(EntityItemPointer entity) {
         numEntries = _entityItems.removeAll(entity);
     });
     if (numEntries > 0) {
+        // NOTE: only EntityTreeElement should ever be changing the value of entity->_element
         assert(entity->_element.get() == this);
         entity->_element = NULL;
+        bumpChangedContent();
         return true;
     }
     return false;
 }
 
 
-// Things we want to accomplish as we read these entities from the data buffer.
-//
-// 1) correctly update the properties of the entity
-// 2) add any new entities that didn't previously exist
-//
-// TODO: Do we also need to do this?
-//    3) mark our tree as dirty down to the path of the previous location of the entity
-//    4) mark our tree as dirty down to the path of the new location of the entity
-//
-// Since we're potentially reading several entities, we'd prefer to do all the moving around
-// and dirty path marking in one pass.
 int EntityTreeElement::readElementDataFromBuffer(const unsigned char* data, int bytesLeftToRead,
             ReadBitstreamToTreeParams& args) {
-    // If we're the root, but this bitstream doesn't support root elements with data, then
-    // return without reading any bytes
-    if (this == _myTree->getRoot().get() && args.bitstreamVersion < VERSION_ROOT_ELEMENT_HAS_DATA) {
-        return 0;
-    }
-
-    const unsigned char* dataAt = data;
-    int bytesRead = 0;
-    uint16_t numberOfEntities = 0;
-    int expectedBytesPerEntity = EntityItem::expectedBytes();
-
-    args.elementsPerPacket++;
-
-    if (bytesLeftToRead >= (int)sizeof(numberOfEntities)) {
-        // read our entities in....
-        numberOfEntities = *(uint16_t*)dataAt;
-
-        dataAt += sizeof(numberOfEntities);
-        bytesLeftToRead -= (int)sizeof(numberOfEntities);
-        bytesRead += sizeof(numberOfEntities);
-
-        if (bytesLeftToRead >= (int)(numberOfEntities * expectedBytesPerEntity)) {
-            for (uint16_t i = 0; i < numberOfEntities; i++) {
-                int bytesForThisEntity = 0;
-                EntityItemID entityItemID;
-                EntityItemPointer entityItem = NULL;
-
-                // Old model files don't have UUIDs in them. So we don't want to try to read those IDs from the stream.
-                // Since this can only happen on loading an old file, we can safely treat these as new entity cases,
-                // which will correctly handle the case of creating models and letting them parse the old format.
-                if (args.bitstreamVersion >= VERSION_ENTITIES_SUPPORT_SPLIT_MTU) {
-                    entityItemID = EntityItemID::readEntityItemIDFromBuffer(dataAt, bytesLeftToRead);
-                    entityItem = _myTree->findEntityByEntityItemID(entityItemID);
-                }
-
-                // If the item already exists in our tree, we want do the following...
-                // 1) allow the existing item to read from the databuffer
-                // 2) check to see if after reading the item, the containing element is still correct, fix it if needed
-                //
-                // TODO: Do we need to also do this?
-                //    3) remember the old cube for the entity so we can mark it as dirty
-                if (entityItem) {
-                    QString entityScriptBefore = entityItem->getScript();
-                    QUuid parentIDBefore = entityItem->getParentID();
-                    QString entityServerScriptsBefore = entityItem->getServerScripts();
-                    quint64 entityScriptTimestampBefore = entityItem->getScriptTimestamp();
-                    bool bestFitBefore = bestFitEntityBounds(entityItem);
-                    EntityTreeElementPointer currentContainingElement = _myTree->getContainingElement(entityItemID);
-
-                    bytesForThisEntity = entityItem->readEntityDataFromBuffer(dataAt, bytesLeftToRead, args);
-                    if (entityItem->getDirtyFlags()) {
-                        _myTree->entityChanged(entityItem);
-                    }
-                    bool bestFitAfter = bestFitEntityBounds(entityItem);
-
-                    if (bestFitBefore != bestFitAfter) {
-                        // This is the case where the entity existed, and is in some element in our tree...
-                        if (!bestFitBefore && bestFitAfter) {
-                            // This is the case where the entity existed, and is in some element in our tree...
-                            if (currentContainingElement.get() != this) {
-                                currentContainingElement->removeEntityItem(entityItem);
-                                addEntityItem(entityItem);
-                                _myTree->setContainingElement(entityItemID, getThisPointer());
-                            }
-                        }
-                    }
-
-                    QString entityScriptAfter = entityItem->getScript();
-                    QString entityServerScriptsAfter = entityItem->getServerScripts();
-                    quint64 entityScriptTimestampAfter = entityItem->getScriptTimestamp();
-                    bool reload = entityScriptTimestampBefore != entityScriptTimestampAfter;
-
-                    // If the script value has changed on us, or it's timestamp has changed to force
-                    // a reload then we want to send out a script changing signal...
-                    if (entityScriptBefore != entityScriptAfter || reload) {
-                        _myTree->emitEntityScriptChanging(entityItemID, reload); // the entity script has changed
-                    }
-                    if (entityServerScriptsBefore != entityServerScriptsAfter || reload) {
-                        _myTree->emitEntityServerScriptChanging(entityItemID, reload); // the entity server script has changed
-                    }
-
-                    QUuid parentIDAfter = entityItem->getParentID();
-                    if (parentIDBefore != parentIDAfter) {
-                        _myTree->addToNeedsParentFixupList(entityItem);
-                    }
-
-                } else {
-                    entityItem = EntityTypes::constructEntityItem(dataAt, bytesLeftToRead, args);
-                    if (entityItem) {
-                        bytesForThisEntity = entityItem->readEntityDataFromBuffer(dataAt, bytesLeftToRead, args);
-
-                        // don't add if we've recently deleted....
-                        if (!_myTree->isDeletedEntity(entityItem->getID())) {
-                            addEntityItem(entityItem); // add this new entity to this elements entities
-                            entityItemID = entityItem->getEntityItemID();
-                            _myTree->setContainingElement(entityItemID, getThisPointer());
-                            _myTree->postAddEntity(entityItem);
-                            if (entityItem->getCreated() == UNKNOWN_CREATED_TIME) {
-                                entityItem->recordCreationTime();
-                            }
-                        } else {
-                            #ifdef WANT_DEBUG
-                                qCDebug(entities) << "Received packet for previously deleted entity [" <<
-                                        entityItem->getID() << "] ignoring. (inside " << __FUNCTION__ << ")";
-                            #endif
-                        }
-                    }
-                }
-                // Move the buffer forward to read more entities
-                dataAt += bytesForThisEntity;
-                bytesLeftToRead -= bytesForThisEntity;
-                bytesRead += bytesForThisEntity;
-            }
-        }
-    }
-
-    return bytesRead;
+    return _myTree->readEntityDataFromBuffer(data, bytesLeftToRead, args);
 }
 
 void EntityTreeElement::addEntityItem(EntityItemPointer entity) {
@@ -1064,6 +950,7 @@ void EntityTreeElement::addEntityItem(EntityItemPointer entity) {
     withWriteLock([&] {
         _entityItems.push_back(entity);
     });
+    bumpChangedContent();
     entity->_element = getThisPointer();
 }
 
diff --git a/libraries/entities/src/EntityTreeElement.h b/libraries/entities/src/EntityTreeElement.h
index aee8c7cfd6..cafae9941a 100644
--- a/libraries/entities/src/EntityTreeElement.h
+++ b/libraries/entities/src/EntityTreeElement.h
@@ -21,11 +21,13 @@
 #include "EntityItem.h"
 #include "EntityTree.h"
 
-typedef QVector<EntityItemPointer> EntityItems;
-
 class EntityTree;
 class EntityTreeElement;
-typedef std::shared_ptr<EntityTreeElement> EntityTreeElementPointer;
+
+using EntityItems = QVector<EntityItemPointer>;
+using EntityTreeElementWeakPointer = std::weak_ptr<EntityTreeElement>;
+using EntityTreeElementPointer = std::shared_ptr<EntityTreeElement>;
+using EntityItemFilter = std::function<bool(EntityItemPointer&)>;
 
 class EntityTreeUpdateArgs {
 public:
@@ -173,7 +175,6 @@ public:
     void setTree(EntityTreePointer tree) { _myTree = tree; }
     EntityTreePointer getTree() const { return _myTree; }
 
-    bool updateEntity(const EntityItem& entity);
     void addEntityItem(EntityItemPointer entity);
 
     EntityItemPointer getClosestEntity(glm::vec3 position) const;
@@ -199,6 +200,11 @@ public:
     /// \param entities[out] vector of non-const EntityItemPointer
     void getEntities(const ViewFrustum& frustum, QVector<EntityItemPointer>& foundEntities);
 
+    /// finds all entities that match filter
+    /// \param filter function that adds matching entities to foundEntities
+    /// \param entities[out] vector of non-const EntityItemPointer
+    void getEntities(EntityItemFilter& filter,  QVector<EntityItemPointer>& foundEntities);
+
     EntityItemPointer getEntityWithID(uint32_t id) const;
     EntityItemPointer getEntityWithEntityItemID(const EntityItemID& id) const;
     void getEntitiesInside(const AACube& box, QVector<EntityItemPointer>& foundEntities);
@@ -238,10 +244,14 @@ public:
         return std::static_pointer_cast<const OctreeElement>(shared_from_this());
     }
 
+    void bumpChangedContent() { _lastChangedContent = usecTimestampNow(); }
+    uint64_t getLastChangedContent() const { return _lastChangedContent; }
+
 protected:
     virtual void init(unsigned char * octalCode) override;
     EntityTreePointer _myTree;
     EntityItems _entityItems;
+    uint64_t _lastChangedContent { 0 };
 };
 
 #endif // hifi_EntityTreeElement_h
diff --git a/libraries/entities/src/EntityTypes.cpp b/libraries/entities/src/EntityTypes.cpp
index 4ba4ad5676..cb17c28fd7 100644
--- a/libraries/entities/src/EntityTypes.cpp
+++ b/libraries/entities/src/EntityTypes.cpp
@@ -102,12 +102,6 @@ EntityItemPointer EntityTypes::constructEntityItem(EntityType entityType, const
 EntityItemPointer EntityTypes::constructEntityItem(const unsigned char* data, int bytesToRead,
             ReadBitstreamToTreeParams& args) {
 
-    if (args.bitstreamVersion < VERSION_ENTITIES_SUPPORT_SPLIT_MTU) {
-        EntityItemID tempEntityID;
-        EntityItemProperties tempProperties;
-        return constructEntityItem(Model, tempEntityID, tempProperties);
-    }
-
     // Header bytes
     //    object ID [16 bytes]
     //    ByteCountCoded(type code) [~1 byte]
diff --git a/libraries/entities/src/HazePropertyGroup.cpp b/libraries/entities/src/HazePropertyGroup.cpp
new file mode 100644
index 0000000000..f137fca5ce
--- /dev/null
+++ b/libraries/entities/src/HazePropertyGroup.cpp
@@ -0,0 +1,361 @@
+//
+//  HazePropertyGroup.h
+//  libraries/entities/src
+//
+//  Created by Nissim hadar on 9/21/17.
+//  Copyright 2013 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 <OctreePacketData.h>
+
+#include "HazePropertyGroup.h"
+#include "EntityItemProperties.h"
+#include "EntityItemPropertiesMacros.h"
+
+void HazePropertyGroup::copyToScriptValue(const EntityPropertyFlags& desiredProperties, QScriptValue& properties, QScriptEngine* engine, bool skipDefaults, EntityItemProperties& defaultEntityProperties) const {
+    COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_HAZE_RANGE, Haze, haze, HazeRange, hazeRange);
+    COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_HAZE_COLOR, Haze, haze, HazeColor, hazeColor);
+    COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_HAZE_GLARE_COLOR, Haze, haze, HazeGlareColor, hazeGlareColor);
+    COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_HAZE_ENABLE_GLARE, Haze, haze, HazeEnableGlare, hazeEnableGlare);
+    COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_HAZE_GLARE_ANGLE, Haze, haze, HazeGlareAngle, hazeGlareAngle);
+
+    COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_HAZE_ALTITUDE_EFFECT, Haze, haze, HazeAltitudeEffect, hazeAltitudeEffect);
+    COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_HAZE_CEILING, Haze, haze, HazeCeiling, hazeCeiling);
+    COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_HAZE_BASE_REF, Haze, haze, HazeBaseRef, hazeBaseRef);
+
+    COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_HAZE_BACKGROUND_BLEND, Haze, haze, HazeBackgroundBlend, hazeBackgroundBlend);
+
+    COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_HAZE_ATTENUATE_KEYLIGHT, Haze, haze, HazeAttenuateKeyLight, hazeAttenuateKeyLight);
+    COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_HAZE_KEYLIGHT_RANGE, Haze, haze, HazeKeyLightRange, hazeKeyLightRange);
+    COPY_GROUP_PROPERTY_TO_QSCRIPTVALUE(PROP_HAZE_KEYLIGHT_ALTITUDE, Haze, haze, HazeKeyLightAltitude, hazeKeyLightAltitude);
+}
+
+void HazePropertyGroup::copyFromScriptValue(const QScriptValue& object, bool& _defaultSettings) {
+    COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(haze, hazeRange, float, setHazeRange);
+    COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(haze, hazeColor, xColor, setHazeColor);
+    COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(haze, hazeGlareColor, xColor, setHazeGlareColor);
+    COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(haze, hazeEnableGlare, bool, setHazeEnableGlare);
+    COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(haze, hazeGlareAngle, float, setHazeGlareAngle);
+
+    COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(haze, hazeAltitudeEffect, bool, setHazeAltitudeEffect);
+    COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(haze, hazeCeiling, float, setHazeCeiling);
+    COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(haze, hazeBaseRef, float, setHazeBaseRef);
+
+    COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(haze, hazeBackgroundBlend, float, setHazeBackgroundBlend);
+
+    COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(haze, hazeAttenuateKeyLight, bool, setHazeAttenuateKeyLight);
+    COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(haze, hazeKeyLightRange, float, setHazeKeyLightRange);
+    COPY_GROUP_PROPERTY_FROM_QSCRIPTVALUE(haze, hazeKeyLightAltitude, float, setHazeKeyLightAltitude);
+}
+
+void HazePropertyGroup::merge(const HazePropertyGroup& other) {
+    COPY_PROPERTY_IF_CHANGED(hazeRange);
+    COPY_PROPERTY_IF_CHANGED(hazeColor);
+    COPY_PROPERTY_IF_CHANGED(hazeGlareColor);
+    COPY_PROPERTY_IF_CHANGED(hazeEnableGlare);
+    COPY_PROPERTY_IF_CHANGED(hazeGlareAngle);
+
+    COPY_PROPERTY_IF_CHANGED(hazeAltitudeEffect);
+    COPY_PROPERTY_IF_CHANGED(hazeCeiling);
+    COPY_PROPERTY_IF_CHANGED(hazeBaseRef);
+
+    COPY_PROPERTY_IF_CHANGED(hazeBackgroundBlend);
+
+    COPY_PROPERTY_IF_CHANGED(hazeAttenuateKeyLight);
+    COPY_PROPERTY_IF_CHANGED(hazeKeyLightRange);
+    COPY_PROPERTY_IF_CHANGED(hazeKeyLightAltitude);
+}
+
+void HazePropertyGroup::debugDump() const {
+    qCDebug(entities) << "   HazePropertyGroup: ---------------------------------------------";
+
+    qCDebug(entities) << "            _hazeRange:" << _hazeRange;
+    qCDebug(entities) << "            _hazeColor:" << _hazeColor;
+    qCDebug(entities) << "            _hazeGlareColor:" << _hazeGlareColor;
+    qCDebug(entities) << "            _hazeEnableGlare:" << _hazeEnableGlare;
+    qCDebug(entities) << "            _hazeGlareAngle:" << _hazeGlareAngle;
+
+    qCDebug(entities) << "            _hazeAltitudeEffect:" << _hazeAltitudeEffect;
+    qCDebug(entities) << "            _hazeCeiling:" << _hazeCeiling;
+    qCDebug(entities) << "            _hazeBaseRef:" << _hazeBaseRef;
+
+    qCDebug(entities) << "            _hazeBackgroundBlend:" << _hazeBackgroundBlend;
+
+    qCDebug(entities) << "            _hazeAttenuateKeyLight:" << _hazeAttenuateKeyLight;
+    qCDebug(entities) << "            _hazeKeyLightRange:" << _hazeKeyLightRange;
+    qCDebug(entities) << "            _hazeKeyLightAltitude:" << _hazeKeyLightAltitude;
+}
+
+void HazePropertyGroup::listChangedProperties(QList<QString>& out) {
+    if (hazeRangeChanged()) {
+        out << "haze-hazeRange";
+    }
+    if (hazeColorChanged()) {
+        out << "haze-hazeColor";
+    }
+    if (hazeGlareColorChanged()) {
+        out << "haze-hazeGlareColor";
+    }
+    if (hazeEnableGlareChanged()) {
+        out << "haze-hazeEnableGlare";
+    }
+    if (hazeGlareAngleChanged()) {
+        out << "haze-hazeGlareAngle";
+    }
+
+    if (hazeAltitudeEffectChanged()) {
+        out << "haze-hazeAltitudeEffect";
+    }
+    if (hazeCeilingChanged()) {
+        out << "haze-hazeCeiling";
+    }
+    if (hazeBaseRefChanged()) {
+        out << "haze-hazeBaseRef";
+    }
+
+    if (hazeBackgroundBlendChanged()) {
+        out << "haze-hazeBackgroundBlend";
+    }
+
+    if (hazeAttenuateKeyLightChanged()) {
+        out << "haze-hazeAttenuateKeyLight";
+    }
+    if (hazeKeyLightRangeChanged()) {
+        out << "haze-hazeKeyLightRange";
+    }
+    if (hazeKeyLightAltitudeChanged()) {
+        out << "haze-hazeKeyLightAltitude";
+    }
+}
+
+bool HazePropertyGroup::appendToEditPacket(OctreePacketData* packetData,
+                                    EntityPropertyFlags& requestedProperties,
+                                    EntityPropertyFlags& propertyFlags,
+                                    EntityPropertyFlags& propertiesDidntFit,
+                                    int& propertyCount, 
+                                    OctreeElement::AppendState& appendState) const {
+
+    bool successPropertyFits = true;
+
+    APPEND_ENTITY_PROPERTY(PROP_HAZE_RANGE, getHazeRange());
+    APPEND_ENTITY_PROPERTY(PROP_HAZE_COLOR, getHazeColor());
+    APPEND_ENTITY_PROPERTY(PROP_HAZE_GLARE_COLOR, getHazeGlareColor());
+    APPEND_ENTITY_PROPERTY(PROP_HAZE_ENABLE_GLARE, getHazeEnableGlare());
+    APPEND_ENTITY_PROPERTY(PROP_HAZE_GLARE_ANGLE, getHazeGlareAngle());
+
+    APPEND_ENTITY_PROPERTY(PROP_HAZE_ALTITUDE_EFFECT, getHazeAltitudeEffect());
+    APPEND_ENTITY_PROPERTY(PROP_HAZE_CEILING, getHazeCeiling());
+    APPEND_ENTITY_PROPERTY(PROP_HAZE_BASE_REF, getHazeBaseRef());
+
+    APPEND_ENTITY_PROPERTY(PROP_HAZE_BACKGROUND_BLEND, getHazeBackgroundBlend());
+
+    APPEND_ENTITY_PROPERTY(PROP_HAZE_ATTENUATE_KEYLIGHT, getHazeAttenuateKeyLight());
+    APPEND_ENTITY_PROPERTY(PROP_HAZE_KEYLIGHT_RANGE, getHazeKeyLightRange());
+    APPEND_ENTITY_PROPERTY(PROP_HAZE_KEYLIGHT_ALTITUDE, getHazeKeyLightAltitude());
+
+    return true;
+}
+
+bool HazePropertyGroup::decodeFromEditPacket(EntityPropertyFlags& propertyFlags, const unsigned char*& dataAt , int& processedBytes) {
+
+    int bytesRead = 0;
+    bool overwriteLocalData = true;
+    bool somethingChanged = false;
+
+    READ_ENTITY_PROPERTY(PROP_HAZE_RANGE, float, setHazeRange);
+    READ_ENTITY_PROPERTY(PROP_HAZE_COLOR, xColor, setHazeColor);
+    READ_ENTITY_PROPERTY(PROP_HAZE_GLARE_COLOR, xColor, setHazeGlareColor);
+    READ_ENTITY_PROPERTY(PROP_HAZE_ENABLE_GLARE, bool, setHazeEnableGlare);
+    READ_ENTITY_PROPERTY(PROP_HAZE_GLARE_ANGLE, float, setHazeGlareAngle);
+
+    READ_ENTITY_PROPERTY(PROP_HAZE_ALTITUDE_EFFECT, bool, setHazeAltitudeEffect);
+    READ_ENTITY_PROPERTY(PROP_HAZE_CEILING, float, setHazeCeiling);
+    READ_ENTITY_PROPERTY(PROP_HAZE_BASE_REF, float, setHazeBaseRef);
+
+    READ_ENTITY_PROPERTY(PROP_HAZE_BACKGROUND_BLEND, float, setHazeBackgroundBlend);
+
+    READ_ENTITY_PROPERTY(PROP_HAZE_ATTENUATE_KEYLIGHT, bool, setHazeAttenuateKeyLight);
+    READ_ENTITY_PROPERTY(PROP_HAZE_KEYLIGHT_RANGE, float, setHazeKeyLightRange);
+    READ_ENTITY_PROPERTY(PROP_HAZE_KEYLIGHT_ALTITUDE, float, setHazeKeyLightAltitude);
+
+    DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_HAZE_RANGE, HazeRange);
+    DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_HAZE_COLOR, HazeColor);
+    DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_HAZE_GLARE_COLOR, HazeGlareColor);
+    DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_HAZE_ENABLE_GLARE, HazeEnableGlare);
+    DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_HAZE_GLARE_ANGLE, HazeGlareAngle);
+
+    DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_HAZE_ALTITUDE_EFFECT, HazeAltitudeEffect);
+    DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_HAZE_CEILING, HazeCeiling);
+    DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_HAZE_BASE_REF, HazeBaseRef);
+
+    DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_HAZE_BACKGROUND_BLEND, HazeBackgroundBlend);
+
+    DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_HAZE_ATTENUATE_KEYLIGHT, HazeAttenuateKeyLight);
+    DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_HAZE_KEYLIGHT_RANGE, HazeKeyLightRange);
+    DECODE_GROUP_PROPERTY_HAS_CHANGED(PROP_HAZE_KEYLIGHT_ALTITUDE, HazeKeyLightAltitude);
+
+    processedBytes += bytesRead;
+
+    Q_UNUSED(somethingChanged);
+
+    return true;
+}
+
+void HazePropertyGroup::markAllChanged() {
+    _hazeRangeChanged = true;
+    _hazeColorChanged = true;
+    _hazeGlareColorChanged = true;
+    _hazeEnableGlareChanged = true;
+    _hazeGlareAngleChanged = true;
+
+    _hazeAltitudeEffectChanged = true;
+    _hazeCeilingChanged = true;
+    _hazeBaseRefChanged = true;
+
+    _hazeBackgroundBlendChanged = true;
+
+    _hazeAttenuateKeyLightChanged = true;
+    _hazeKeyLightRangeChanged = true;
+    _hazeKeyLightAltitudeChanged = true;
+}
+
+EntityPropertyFlags HazePropertyGroup::getChangedProperties() const {
+    EntityPropertyFlags changedProperties;
+
+    CHECK_PROPERTY_CHANGE(PROP_HAZE_RANGE, hazeRange);
+    CHECK_PROPERTY_CHANGE(PROP_HAZE_COLOR, hazeColor);
+    CHECK_PROPERTY_CHANGE(PROP_HAZE_GLARE_COLOR, hazeGlareColor);
+    CHECK_PROPERTY_CHANGE(PROP_HAZE_ENABLE_GLARE, hazeEnableGlare);
+    CHECK_PROPERTY_CHANGE(PROP_HAZE_GLARE_ANGLE, hazeGlareAngle);
+
+    CHECK_PROPERTY_CHANGE(PROP_HAZE_ALTITUDE_EFFECT, hazeAltitudeEffect);
+    CHECK_PROPERTY_CHANGE(PROP_HAZE_CEILING, hazeCeiling);
+    CHECK_PROPERTY_CHANGE(PROP_HAZE_BASE_REF, hazeBaseRef);
+
+    CHECK_PROPERTY_CHANGE(PROP_HAZE_BACKGROUND_BLEND, hazeBackgroundBlend);
+
+    CHECK_PROPERTY_CHANGE(PROP_HAZE_ATTENUATE_KEYLIGHT, hazeAttenuateKeyLight);
+    CHECK_PROPERTY_CHANGE(PROP_HAZE_KEYLIGHT_RANGE, hazeKeyLightRange);
+    CHECK_PROPERTY_CHANGE(PROP_HAZE_KEYLIGHT_ALTITUDE, hazeKeyLightAltitude);
+
+    return changedProperties;
+}
+
+void HazePropertyGroup::getProperties(EntityItemProperties& properties) const {
+    COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Haze, HazeRange, getHazeRange);
+    COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Haze, HazeColor, getHazeColor);
+    COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Haze, HazeGlareColor, getHazeGlareColor);
+    COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Haze, HazeEnableGlare, getHazeEnableGlare);
+    COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Haze, HazeGlareAngle, getHazeGlareAngle);
+
+    COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Haze, HazeAltitudeEffect, getHazeAltitudeEffect);
+    COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Haze, HazeCeiling, getHazeCeiling);
+    COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Haze, HazeBaseRef, getHazeBaseRef);
+
+    COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Haze, HazeBackgroundBlend, getHazeBackgroundBlend);
+
+    COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Haze, HazeAttenuateKeyLight, getHazeAttenuateKeyLight);
+    COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Haze, HazeKeyLightRange, getHazeKeyLightRange);
+    COPY_ENTITY_GROUP_PROPERTY_TO_PROPERTIES(Haze, HazeKeyLightAltitude, getHazeKeyLightAltitude);
+}
+
+bool HazePropertyGroup::setProperties(const EntityItemProperties& properties) {
+    bool somethingChanged = false;
+
+    SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Haze, HazeRange, hazeRange, setHazeRange);
+    SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Haze, HazeColor, hazeColor, setHazeColor);
+    SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Haze, HazeGlareColor, hazeGlareColor, setHazeGlareColor);
+    SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Haze, HazeEnableGlare, hazeEnableGlare, setHazeEnableGlare);
+    SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Haze, HazeGlareAngle, hazeGlareAngle, setHazeGlareAngle);
+
+    SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Haze, HazeAltitudeEffect, hazeAltitudeEffect, setHazeAltitudeEffect);
+    SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Haze, HazeCeiling, hazeCeiling, setHazeCeiling);
+    SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Haze, HazeBaseRef, hazeBaseRef, setHazeBaseRef);
+
+    SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Haze, HazeBackgroundBlend, hazeBackgroundBlend, setHazeBackgroundBlend);
+
+    SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Haze, HazeAttenuateKeyLight, hazeAttenuateKeyLight, setHazeAttenuateKeyLight);
+    SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Haze, HazeKeyLightRange, hazeKeyLightRange, setHazeKeyLightRange);
+    SET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(Haze, HazeKeyLightAltitude, hazeKeyLightAltitude, setHazeKeyLightAltitude);
+
+    return somethingChanged;
+}
+
+EntityPropertyFlags HazePropertyGroup::getEntityProperties(EncodeBitstreamParams& params) const {
+    EntityPropertyFlags requestedProperties;
+
+    requestedProperties += PROP_HAZE_RANGE;
+    requestedProperties += PROP_HAZE_COLOR;
+    requestedProperties += PROP_HAZE_GLARE_COLOR;
+    requestedProperties += PROP_HAZE_ENABLE_GLARE;
+    requestedProperties += PROP_HAZE_GLARE_ANGLE;
+
+    requestedProperties += PROP_HAZE_ALTITUDE_EFFECT;
+    requestedProperties += PROP_HAZE_CEILING;
+    requestedProperties += PROP_HAZE_BASE_REF;
+
+    requestedProperties += PROP_HAZE_BACKGROUND_BLEND;
+
+    requestedProperties += PROP_HAZE_ATTENUATE_KEYLIGHT;
+    requestedProperties += PROP_HAZE_KEYLIGHT_RANGE;
+    requestedProperties += PROP_HAZE_KEYLIGHT_ALTITUDE;
+
+    return requestedProperties;
+}
+    
+void HazePropertyGroup::appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params,
+                                EntityTreeElementExtraEncodeDataPointer entityTreeElementExtraEncodeData,
+                                EntityPropertyFlags& requestedProperties,
+                                EntityPropertyFlags& propertyFlags,
+                                EntityPropertyFlags& propertiesDidntFit,
+                                int& propertyCount, 
+                                OctreeElement::AppendState& appendState) const {
+
+    bool successPropertyFits = true;
+
+    APPEND_ENTITY_PROPERTY(PROP_HAZE_RANGE, getHazeRange());
+    APPEND_ENTITY_PROPERTY(PROP_HAZE_COLOR, getHazeColor());
+    APPEND_ENTITY_PROPERTY(PROP_HAZE_GLARE_COLOR, getHazeGlareColor());
+    APPEND_ENTITY_PROPERTY(PROP_HAZE_ENABLE_GLARE, getHazeEnableGlare());
+    APPEND_ENTITY_PROPERTY(PROP_HAZE_GLARE_ANGLE, getHazeGlareAngle());
+
+    APPEND_ENTITY_PROPERTY(PROP_HAZE_ALTITUDE_EFFECT, getHazeAltitudeEffect());
+    APPEND_ENTITY_PROPERTY(PROP_HAZE_CEILING, getHazeCeiling());
+    APPEND_ENTITY_PROPERTY(PROP_HAZE_BASE_REF, getHazeBaseRef());
+
+    APPEND_ENTITY_PROPERTY(PROP_HAZE_BACKGROUND_BLEND, getHazeBackgroundBlend());
+
+    APPEND_ENTITY_PROPERTY(PROP_HAZE_ATTENUATE_KEYLIGHT, getHazeAttenuateKeyLight());
+    APPEND_ENTITY_PROPERTY(PROP_HAZE_KEYLIGHT_RANGE, getHazeKeyLightRange());
+    APPEND_ENTITY_PROPERTY(PROP_HAZE_KEYLIGHT_ALTITUDE, getHazeKeyLightAltitude());
+}
+
+int HazePropertyGroup::readEntitySubclassDataFromBuffer(const unsigned char* data, int bytesLeftToRead,
+                                            ReadBitstreamToTreeParams& args,
+                                            EntityPropertyFlags& propertyFlags, bool overwriteLocalData,
+                                            bool& somethingChanged) {
+
+    int bytesRead = 0;
+    const unsigned char* dataAt = data;
+
+    READ_ENTITY_PROPERTY(PROP_HAZE_RANGE, float, setHazeRange);
+    READ_ENTITY_PROPERTY(PROP_HAZE_COLOR, xColor, setHazeColor);
+    READ_ENTITY_PROPERTY(PROP_HAZE_GLARE_COLOR, xColor, setHazeGlareColor);
+    READ_ENTITY_PROPERTY(PROP_HAZE_ENABLE_GLARE, bool, setHazeEnableGlare);
+    READ_ENTITY_PROPERTY(PROP_HAZE_GLARE_ANGLE, float, setHazeGlareAngle);
+
+    READ_ENTITY_PROPERTY(PROP_HAZE_ALTITUDE_EFFECT, bool, setHazeAltitudeEffect);
+    READ_ENTITY_PROPERTY(PROP_HAZE_CEILING, float, setHazeCeiling);
+    READ_ENTITY_PROPERTY(PROP_HAZE_BASE_REF, float, setHazeBaseRef);
+
+    READ_ENTITY_PROPERTY(PROP_HAZE_BACKGROUND_BLEND, float, setHazeBackgroundBlend);
+
+    READ_ENTITY_PROPERTY(PROP_HAZE_ATTENUATE_KEYLIGHT, bool, setHazeAttenuateKeyLight);
+    READ_ENTITY_PROPERTY(PROP_HAZE_KEYLIGHT_RANGE, float, setHazeKeyLightRange);
+    READ_ENTITY_PROPERTY(PROP_HAZE_KEYLIGHT_ALTITUDE, float, setHazeKeyLightAltitude);
+
+    return bytesRead;
+}
diff --git a/libraries/entities/src/HazePropertyGroup.h b/libraries/entities/src/HazePropertyGroup.h
new file mode 100644
index 0000000000..939391caf9
--- /dev/null
+++ b/libraries/entities/src/HazePropertyGroup.h
@@ -0,0 +1,111 @@
+//
+//  HazePropertyGroup.h
+//  libraries/entities/src
+//
+//  Created by Nissim hadar on 9/21/17.
+//  Copyright 2013 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_HazePropertyGroup_h
+#define hifi_HazePropertyGroup_h
+
+#include <stdint.h>
+
+#include <glm/glm.hpp>
+
+#include <QtScript/QScriptEngine>
+
+#include "PropertyGroup.h"
+#include "EntityItemPropertiesMacros.h"
+
+class EntityItemProperties;
+class EncodeBitstreamParams;
+class OctreePacketData;
+class EntityTreeElementExtraEncodeData;
+class ReadBitstreamToTreeParams;
+
+static const float INITIAL_HAZE_RANGE{ 1000.0f };
+static const xColor initialHazeGlareColorXcolor{ 255, 229, 179 };
+static const xColor initialHazeColorXcolor{ 128, 154, 179 };
+static const float INITIAL_HAZE_GLARE_ANGLE{ 20.0f };
+
+static const float INITIAL_HAZE_BASE_REFERENCE{ 0.0f };
+static const float INITIAL_HAZE_HEIGHT{ 200.0f };
+
+static const float INITIAL_HAZE_BACKGROUND_BLEND{ 0.0f };
+
+static const float INITIAL_KEY_LIGHT_RANGE{ 1000.0f };
+static const float INITIAL_KEY_LIGHT_ALTITUDE{ 200.0f };
+
+class HazePropertyGroup : public PropertyGroup {
+public:
+    // EntityItemProperty related helpers
+    virtual void copyToScriptValue(const EntityPropertyFlags& desiredProperties, QScriptValue& properties,
+                                   QScriptEngine* engine, bool skipDefaults,
+                                   EntityItemProperties& defaultEntityProperties) const override;
+    virtual void copyFromScriptValue(const QScriptValue& object, bool& _defaultSettings) override;
+
+    void merge(const HazePropertyGroup& other);
+
+    virtual void debugDump() const override;
+    virtual void listChangedProperties(QList<QString>& out) override;
+
+    virtual bool appendToEditPacket(OctreePacketData* packetData,
+                                    EntityPropertyFlags& requestedProperties,
+                                    EntityPropertyFlags& propertyFlags,
+                                    EntityPropertyFlags& propertiesDidntFit,
+                                    int& propertyCount,
+                                    OctreeElement::AppendState& appendState) const override;
+
+    virtual bool decodeFromEditPacket(EntityPropertyFlags& propertyFlags,
+                                      const unsigned char*& dataAt, int& processedBytes) override;
+    virtual void markAllChanged() override;
+    virtual EntityPropertyFlags getChangedProperties() const override;
+
+    // EntityItem related helpers
+    // methods for getting/setting all properties of an entity
+    virtual void getProperties(EntityItemProperties& propertiesOut) const override;
+
+    /// returns true if something changed
+    virtual bool setProperties(const EntityItemProperties& properties) override;
+
+    virtual EntityPropertyFlags getEntityProperties(EncodeBitstreamParams& params) const override;
+
+    virtual void appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params,
+                                    EntityTreeElementExtraEncodeDataPointer entityTreeElementExtraEncodeData,
+                                    EntityPropertyFlags& requestedProperties,
+                                    EntityPropertyFlags& propertyFlags,
+                                    EntityPropertyFlags& propertiesDidntFit,
+                                    int& propertyCount,
+                                    OctreeElement::AppendState& appendState) const override;
+
+    virtual int readEntitySubclassDataFromBuffer(const unsigned char* data, int bytesLeftToRead,
+                                                ReadBitstreamToTreeParams& args,
+                                                EntityPropertyFlags& propertyFlags, bool overwriteLocalData,
+                                                bool& somethingChanged) override;
+
+    // Range only parameters
+    DEFINE_PROPERTY(PROP_HAZE_RANGE, HazeRange, hazeRange, float, INITIAL_HAZE_RANGE);
+    DEFINE_PROPERTY_REF(PROP_HAZE_COLOR, HazeColor, hazeColor, xColor, initialHazeColorXcolor);
+    DEFINE_PROPERTY_REF(PROP_HAZE_GLARE_COLOR, HazeGlareColor, hazeGlareColor, xColor, initialHazeGlareColorXcolor);
+    DEFINE_PROPERTY(PROP_HAZE_ENABLE_GLARE, HazeEnableGlare, hazeEnableGlare, bool, false);
+    DEFINE_PROPERTY_REF(PROP_HAZE_GLARE_ANGLE, HazeGlareAngle, hazeGlareAngle, float, INITIAL_HAZE_GLARE_ANGLE);
+
+    // Altitude parameters
+    DEFINE_PROPERTY(PROP_HAZE_ALTITUDE_EFFECT, HazeAltitudeEffect, hazeAltitudeEffect, bool, false);
+    DEFINE_PROPERTY_REF(PROP_HAZE_CEILING, HazeCeiling, hazeCeiling, float, INITIAL_HAZE_BASE_REFERENCE + INITIAL_HAZE_HEIGHT);
+    DEFINE_PROPERTY_REF(PROP_HAZE_BASE_REF, HazeBaseRef, hazeBaseRef, float, INITIAL_HAZE_BASE_REFERENCE);
+
+    // Background (skybox) blend value
+    DEFINE_PROPERTY_REF(PROP_HAZE_BACKGROUND_BLEND, HazeBackgroundBlend, hazeBackgroundBlend, float, INITIAL_HAZE_BACKGROUND_BLEND);
+
+    // hazeDirectional light attenuation
+    DEFINE_PROPERTY(PROP_HAZE_ATTENUATE_KEYLIGHT, HazeAttenuateKeyLight, hazeAttenuateKeyLight, bool, false);
+    DEFINE_PROPERTY_REF(PROP_HAZE_KEYLIGHT_RANGE, HazeKeyLightRange, hazeKeyLightRange, float, INITIAL_KEY_LIGHT_RANGE);
+    DEFINE_PROPERTY_REF(PROP_HAZE_KEYLIGHT_ALTITUDE, HazeKeyLightAltitude, hazeKeyLightAltitude, float, INITIAL_KEY_LIGHT_ALTITUDE);
+};
+
+#endif // hifi_HazePropertyGroup_h
diff --git a/libraries/entities/src/KeyLightPropertyGroup.cpp b/libraries/entities/src/KeyLightPropertyGroup.cpp
index f0d059af67..4246da309b 100644
--- a/libraries/entities/src/KeyLightPropertyGroup.cpp
+++ b/libraries/entities/src/KeyLightPropertyGroup.cpp
@@ -1,5 +1,5 @@
 //
-//  KeyLightPropertyGroup.h
+//  KeyLightPropertyGroup.cpp
 //  libraries/entities/src
 //
 //  Created by Sam Gateau on 2015/10/23.
diff --git a/libraries/entities/src/LightEntityItem.cpp b/libraries/entities/src/LightEntityItem.cpp
index c59c4b90e3..f4944603f1 100644
--- a/libraries/entities/src/LightEntityItem.cpp
+++ b/libraries/entities/src/LightEntityItem.cpp
@@ -30,7 +30,7 @@ const float LightEntityItem::DEFAULT_CUTOFF = PI / 2.0f;
 bool LightEntityItem::_lightsArePickable = false;
 
 EntityItemPointer LightEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
-    EntityItemPointer entity { new LightEntityItem(entityID) };
+    EntityItemPointer entity(new LightEntityItem(entityID), [](EntityItem* ptr) { ptr->deleteLater(); });
     entity->setProperties(properties);
     return entity;
 }
@@ -54,6 +54,20 @@ void LightEntityItem::setDimensions(const glm::vec3& value) {
     }
 }
 
+void LightEntityItem::locationChanged(bool tellPhysics) {
+    EntityItem::locationChanged(tellPhysics);
+    withWriteLock([&] {
+        _lightPropertiesChanged = true;
+    });
+}
+
+void LightEntityItem::dimensionsChanged() {
+    EntityItem::dimensionsChanged();
+    withWriteLock([&] {
+        _lightPropertiesChanged = true;
+    });
+}
+
 
 EntityItemProperties LightEntityItem::getProperties(EntityPropertyFlags desiredProperties) const {
     EntityItemProperties properties = EntityItem::getProperties(desiredProperties); // get the properties from our base class
@@ -161,35 +175,12 @@ int LightEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data,
     int bytesRead = 0;
     const unsigned char* dataAt = data;
 
-    if (args.bitstreamVersion < VERSION_ENTITIES_LIGHT_HAS_INTENSITY_AND_COLOR_PROPERTIES) {
-        READ_ENTITY_PROPERTY(PROP_IS_SPOTLIGHT, bool, setIsSpotlight);
-
-        // _diffuseColor has been renamed to _color
-        READ_ENTITY_PROPERTY(PROP_DIFFUSE_COLOR, rgbColor, setColor);
-
-        // Ambient and specular color are from an older format and are no longer supported.
-        // Their values will be ignored.
-        READ_ENTITY_PROPERTY(PROP_AMBIENT_COLOR_UNUSED, rgbColor, setIgnoredColor);
-        READ_ENTITY_PROPERTY(PROP_SPECULAR_COLOR_UNUSED, rgbColor, setIgnoredColor);
-
-        // _constantAttenuation has been renamed to _intensity
-        READ_ENTITY_PROPERTY(PROP_INTENSITY, float, setIntensity);
-
-        // Linear and quadratic attenuation are from an older format and are no longer supported.
-        // Their values will be ignored.
-        READ_ENTITY_PROPERTY(PROP_LINEAR_ATTENUATION_UNUSED, float, setIgnoredAttenuation);
-        READ_ENTITY_PROPERTY(PROP_QUADRATIC_ATTENUATION_UNUSED, float, setIgnoredAttenuation);
-
-        READ_ENTITY_PROPERTY(PROP_EXPONENT, float, setExponent);
-        READ_ENTITY_PROPERTY(PROP_CUTOFF, float, setCutoff);
-    } else {
-        READ_ENTITY_PROPERTY(PROP_IS_SPOTLIGHT, bool, setIsSpotlight);
-        READ_ENTITY_PROPERTY(PROP_COLOR, rgbColor, setColor);
-        READ_ENTITY_PROPERTY(PROP_INTENSITY, float, setIntensity);
-        READ_ENTITY_PROPERTY(PROP_EXPONENT, float, setExponent);
-        READ_ENTITY_PROPERTY(PROP_CUTOFF, float, setCutoff);
-        READ_ENTITY_PROPERTY(PROP_FALLOFF_RADIUS, float, setFalloffRadius);
-    }
+    READ_ENTITY_PROPERTY(PROP_IS_SPOTLIGHT, bool, setIsSpotlight);
+    READ_ENTITY_PROPERTY(PROP_COLOR, rgbColor, setColor);
+    READ_ENTITY_PROPERTY(PROP_INTENSITY, float, setIntensity);
+    READ_ENTITY_PROPERTY(PROP_EXPONENT, float, setExponent);
+    READ_ENTITY_PROPERTY(PROP_CUTOFF, float, setCutoff);
+    READ_ENTITY_PROPERTY(PROP_FALLOFF_RADIUS, float, setFalloffRadius);
 
     return bytesRead;
 }
@@ -224,13 +215,6 @@ void LightEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBit
     APPEND_ENTITY_PROPERTY(PROP_FALLOFF_RADIUS, getFalloffRadius());
 }
 
-void LightEntityItem::somethingChangedNotification() {
-    EntityItem::somethingChangedNotification();
-    withWriteLock([&] {
-        _lightPropertiesChanged = false;
-    });
-}
-
 const rgbColor& LightEntityItem::getColor() const { 
     return _color; 
 }
@@ -309,3 +293,20 @@ float LightEntityItem::getCutoff() const {
     return result;
 }
 
+void LightEntityItem::resetLightPropertiesChanged() {
+    withWriteLock([&] { _lightPropertiesChanged = false; });
+}
+
+bool LightEntityItem::findDetailedRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
+                        bool& keepSearching, OctreeElementPointer& element, float& distance,
+                        BoxFace& face, glm::vec3& surfaceNormal,
+                        void** intersectedObject, bool precisionPicking) const {
+
+    // TODO: consider if this is really what we want to do. We've made it so that "lights are pickable" is a global state
+    // this is probably reasonable since there's typically only one tree you'd be picking on at a time. Technically we could
+    // be on the clipboard and someone might be trying to use the ray intersection API there. Anyway... if you ever try to
+    // do ray intersection testing off of trees other than the main tree of the main entity renderer, then we'll need to
+    // fix this mechanism.
+    return _lightsArePickable;
+}
+
diff --git a/libraries/entities/src/LightEntityItem.h b/libraries/entities/src/LightEntityItem.h
index b3cadcf0c7..edc7376079 100644
--- a/libraries/entities/src/LightEntityItem.h
+++ b/libraries/entities/src/LightEntityItem.h
@@ -37,11 +37,6 @@ public:
     // methods for getting/setting all properties of an entity
     virtual EntityItemProperties getProperties(EntityPropertyFlags desiredProperties = EntityPropertyFlags()) const override;
 
-    /// Override this in your derived class if you'd like to be informed when something about the state of the entity
-    /// has changed. This will be called with properties change or when new data is loaded from a stream
-    /// Overriding this function to capture the information that a light properties has changed
-    virtual void somethingChangedNotification() override;
-
     virtual EntityPropertyFlags getEntityProperties(EncodeBitstreamParams& params) const override;
 
     virtual void appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params,
@@ -83,9 +78,19 @@ public:
     static bool getLightsArePickable() { return _lightsArePickable; }
     static void setLightsArePickable(bool value) { _lightsArePickable = value; }
     
+    virtual void locationChanged(bool tellPhysics) override;
+    virtual void dimensionsChanged() override;
+
+    bool lightPropertiesChanged() const { return _lightPropertiesChanged; }
+    void resetLightPropertiesChanged();
+
+    virtual bool supportsDetailedRayIntersection() const override { return true; }
+    virtual bool findDetailedRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
+                            bool& keepSearching, OctreeElementPointer& element, float& distance,
+                            BoxFace& face, glm::vec3& surfaceNormal,
+                            void** intersectedObject, bool precisionPicking) const override;
+
 private:
-
-
     // properties of a light
     rgbColor _color;
     bool _isSpotlight { DEFAULT_IS_SPOTLIGHT };
@@ -93,11 +98,7 @@ private:
     float _falloffRadius { DEFAULT_FALLOFF_RADIUS };
     float _exponent { DEFAULT_EXPONENT };
     float _cutoff { DEFAULT_CUTOFF };
-
-protected:
     // Dirty flag turn true when either light properties is changing values.
-    // This gets back to false in the somethingChangedNotification() call
-    // Which is called after a setProperties() or a readEntitySubClassFromBUfferCall on the entity.
     bool _lightPropertiesChanged { false };
 
     static bool _lightsArePickable;
diff --git a/libraries/entities/src/LineEntityItem.cpp b/libraries/entities/src/LineEntityItem.cpp
index 4ba58ef9b2..119236e32d 100644
--- a/libraries/entities/src/LineEntityItem.cpp
+++ b/libraries/entities/src/LineEntityItem.cpp
@@ -26,16 +26,13 @@ const int LineEntityItem::MAX_POINTS_PER_LINE = 70;
 
 
 EntityItemPointer LineEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
-    EntityItemPointer entity { new LineEntityItem(entityID) };
+    EntityItemPointer entity(new LineEntityItem(entityID), [](EntityItem* ptr) { ptr->deleteLater(); });
     entity->setProperties(properties);
     return entity;
 }
 
 LineEntityItem::LineEntityItem(const EntityItemID& entityItemID) :
-    EntityItem(entityItemID),
-    _lineWidth(DEFAULT_LINE_WIDTH),
-    _points(QVector<glm::vec3>(0)),
-    _pointsChanged(true)
+    EntityItem(entityItemID)
 {
     _type = EntityTypes::Line;
 }
@@ -212,3 +209,9 @@ QVector<glm::vec3> LineEntityItem::getLinePoints() const {
     });
     return result;
 }
+
+void LineEntityItem::resetPointsChanged() { 
+    withWriteLock([&] {
+        _pointsChanged = false;
+    });
+}
diff --git a/libraries/entities/src/LineEntityItem.h b/libraries/entities/src/LineEntityItem.h
index bbe0828e57..7fda113510 100644
--- a/libraries/entities/src/LineEntityItem.h
+++ b/libraries/entities/src/LineEntityItem.h
@@ -65,17 +65,17 @@ class LineEntityItem : public EntityItem {
                                              BoxFace& face, glm::vec3& surfaceNormal,
                                              void** intersectedObject,
                                              bool precisionPicking) const override { return false; }
-
+    bool pointsChanged() const { return _pointsChanged; }
+    void resetPointsChanged();
     virtual void debugDump() const override;
     static const float DEFAULT_LINE_WIDTH;
     static const int MAX_POINTS_PER_LINE;
 
  private:
     rgbColor _color;
-    float _lineWidth;
+    float _lineWidth { DEFAULT_LINE_WIDTH };
     QVector<glm::vec3> _points;
-protected:
-    bool _pointsChanged;
+    bool _pointsChanged { true };
 };
 
 #endif // hifi_LineEntityItem_h
diff --git a/libraries/entities/src/ModelEntityItem.cpp b/libraries/entities/src/ModelEntityItem.cpp
index b5e759d2d8..26f063f7cc 100644
--- a/libraries/entities/src/ModelEntityItem.cpp
+++ b/libraries/entities/src/ModelEntityItem.cpp
@@ -26,16 +26,13 @@ const QString ModelEntityItem::DEFAULT_MODEL_URL = QString("");
 const QString ModelEntityItem::DEFAULT_COMPOUND_SHAPE_URL = QString("");
 
 EntityItemPointer ModelEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
-    EntityItemPointer entity { new ModelEntityItem(entityID) };
+    EntityItemPointer entity(new ModelEntityItem(entityID), [](EntityItem* ptr) { ptr->deleteLater(); });
     entity->setProperties(properties);
     return entity;
 }
 
 ModelEntityItem::ModelEntityItem(const EntityItemID& entityItemID) : EntityItem(entityItemID)
 {
-    _animationProperties.associateWithAnimationLoop(&_animationLoop);
-    _animationLoop.setResetOnRunning(false);
-
     _type = EntityTypes::Model;
     _lastKnownCurrentFrame = -1;
     _color[0] = _color[1] = _color[2] = 0;
@@ -114,35 +111,19 @@ int ModelEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data,
 
     READ_ENTITY_PROPERTY(PROP_COLOR, rgbColor, setColor);
     READ_ENTITY_PROPERTY(PROP_MODEL_URL, QString, setModelURL);
-    if (args.bitstreamVersion < VERSION_ENTITIES_HAS_COLLISION_MODEL) {
-        setCompoundShapeURL("");
-    } else {
-        READ_ENTITY_PROPERTY(PROP_COMPOUND_SHAPE_URL, QString, setCompoundShapeURL);
-    }
-
-    // Because we're using AnimationLoop which will reset the frame index if you change it's running state
-    // we want to read these values in the order they appear in the buffer, but call our setters in an
-    // order that allows AnimationLoop to preserve the correct frame rate.
-    if (args.bitstreamVersion < VERSION_ENTITIES_ANIMATION_PROPERTIES_GROUP) {
-        READ_ENTITY_PROPERTY(PROP_ANIMATION_URL, QString, setAnimationURL);
-        READ_ENTITY_PROPERTY(PROP_ANIMATION_FPS, float, setAnimationFPS);
-        READ_ENTITY_PROPERTY(PROP_ANIMATION_FRAME_INDEX, float, setAnimationCurrentFrame);
-        READ_ENTITY_PROPERTY(PROP_ANIMATION_PLAYING, bool, setAnimationIsPlaying);
-    }
-
+    READ_ENTITY_PROPERTY(PROP_COMPOUND_SHAPE_URL, QString, setCompoundShapeURL);
     READ_ENTITY_PROPERTY(PROP_TEXTURES, QString, setTextures);
 
-    if (args.bitstreamVersion < VERSION_ENTITIES_ANIMATION_PROPERTIES_GROUP) {
-        READ_ENTITY_PROPERTY(PROP_ANIMATION_SETTINGS, QString, setAnimationSettings);
-    } else {
+    int bytesFromAnimation;
+    withWriteLock([&] {
         // Note: since we've associated our _animationProperties with our _animationLoop, the readEntitySubclassDataFromBuffer()
         // will automatically read into the animation loop
-        int bytesFromAnimation = _animationProperties.readEntitySubclassDataFromBuffer(dataAt, (bytesLeftToRead - bytesRead), args,
-                                                                        propertyFlags, overwriteLocalData, animationPropertiesChanged);
+        bytesFromAnimation = _animationProperties.readEntitySubclassDataFromBuffer(dataAt, (bytesLeftToRead - bytesRead), args,
+            propertyFlags, overwriteLocalData, animationPropertiesChanged);
+    });
 
-        bytesRead += bytesFromAnimation;
-        dataAt += bytesFromAnimation;
-    }
+    bytesRead += bytesFromAnimation;
+    dataAt += bytesFromAnimation;
 
     READ_ENTITY_PROPERTY(PROP_SHAPE_TYPE, ShapeType, setShapeType);
 
@@ -191,8 +172,10 @@ void ModelEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBit
     APPEND_ENTITY_PROPERTY(PROP_COMPOUND_SHAPE_URL, getCompoundShapeURL());
     APPEND_ENTITY_PROPERTY(PROP_TEXTURES, getTextures());
 
-    _animationProperties.appendSubclassData(packetData, params, entityTreeElementExtraEncodeData, requestedProperties,
-        propertyFlags, propertiesDidntFit, propertyCount, appendState);
+    withReadLock([&] {
+        _animationProperties.appendSubclassData(packetData, params, entityTreeElementExtraEncodeData, requestedProperties,
+            propertyFlags, propertiesDidntFit, propertyCount, appendState);
+    });
 
     APPEND_ENTITY_PROPERTY(PROP_SHAPE_TYPE, (uint32_t)getShapeType());
 
@@ -203,26 +186,6 @@ void ModelEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBit
 }
 
 
-bool ModelEntityItem::isAnimatingSomething() const {
-    return getAnimationIsPlaying() &&
-            getAnimationFPS() != 0.0f &&
-            !getAnimationURL().isEmpty();
-}
-
-bool ModelEntityItem::needsToCallUpdate() const {
-    return isAnimatingSomething() || EntityItem::needsToCallUpdate();
-}
-
-void ModelEntityItem::update(const quint64& now) {
-
-    // only advance the frame index if we're playing
-    if (getAnimationIsPlaying()) {
-        _animationLoop.simulateAtTime(now);
-    }
-
-    EntityItem::update(now); // let our base class handle it's updates...
-}
-
 void ModelEntityItem::debugDump() const {
     qCDebug(entities) << "ModelEntityItem id:" << getEntityItemID();
     qCDebug(entities) << "    edited ago:" << getEditedAgo();
@@ -233,16 +196,18 @@ void ModelEntityItem::debugDump() const {
 }
 
 void ModelEntityItem::setShapeType(ShapeType type) {
-    if (type != _shapeType) {
-        if (type == SHAPE_TYPE_STATIC_MESH && _dynamic) {
-            // dynamic and STATIC_MESH are incompatible
-            // since the shape is being set here we clear the dynamic bit
-            _dynamic = false;
-            _dirtyFlags |= Simulation::DIRTY_MOTION_TYPE;
+    withWriteLock([&] {
+        if (type != _shapeType) {
+            if (type == SHAPE_TYPE_STATIC_MESH && _dynamic) {
+                // dynamic and STATIC_MESH are incompatible
+                // since the shape is being set here we clear the dynamic bit
+                _dynamic = false;
+                _dirtyFlags |= Simulation::DIRTY_MOTION_TYPE;
+            }
+            _shapeType = type;
+            _dirtyFlags |= Simulation::DIRTY_SHAPE | Simulation::DIRTY_MASS;
         }
-        _shapeType = type;
-        _dirtyFlags |= Simulation::DIRTY_SHAPE | Simulation::DIRTY_MASS;
-    }
+    });
 }
 
 ShapeType ModelEntityItem::getShapeType() const {
@@ -264,28 +229,33 @@ ShapeType ModelEntityItem::computeTrueShapeType() const {
 }
 
 void ModelEntityItem::setModelURL(const QString& url) {
-    if (_modelURL != url) {
-        _modelURL = url;
-        _parsedModelURL = QUrl(url);
-        if (_shapeType == SHAPE_TYPE_STATIC_MESH) {
-            _dirtyFlags |= Simulation::DIRTY_SHAPE | Simulation::DIRTY_MASS;
+    withWriteLock([&] {
+        if (_modelURL != url) {
+            _modelURL = url;
+            if (_shapeType == SHAPE_TYPE_STATIC_MESH) {
+                _dirtyFlags |= Simulation::DIRTY_SHAPE | Simulation::DIRTY_MASS;
+            }
         }
-    }
+    });
 }
 
 void ModelEntityItem::setCompoundShapeURL(const QString& url) {
-    if (_compoundShapeURL != url) {
-        ShapeType oldType = computeTrueShapeType();
-        _compoundShapeURL = url;
-        if (oldType != computeTrueShapeType()) {
-            _dirtyFlags |= Simulation::DIRTY_SHAPE | Simulation::DIRTY_MASS;
+    withWriteLock([&] {
+        if (_compoundShapeURL.get() != url) {
+            ShapeType oldType = computeTrueShapeType();
+            _compoundShapeURL.set(url);
+            if (oldType != computeTrueShapeType()) {
+                _dirtyFlags |= Simulation::DIRTY_SHAPE | Simulation::DIRTY_MASS;
+            }
         }
-    }
+    });
 }
 
 void ModelEntityItem::setAnimationURL(const QString& url) {
     _dirtyFlags |= Simulation::DIRTY_UPDATEABLE;
-    _animationProperties.setURL(url);
+    withWriteLock([&] {
+        _animationProperties.setURL(url);
+    });
 }
 
 void ModelEntityItem::setAnimationSettings(const QString& value) {
@@ -305,7 +275,7 @@ void ModelEntityItem::setAnimationSettings(const QString& value) {
     if (settingsMap.contains("frameIndex")) {
         float currentFrame = settingsMap["frameIndex"].toFloat();
 #ifdef WANT_DEBUG
-        if (isAnimatingSomething()) {
+        if (!getAnimationURL().isEmpty()) {
             qCDebug(entities) << "ModelEntityItem::setAnimationSettings() calling setAnimationFrameIndex()...";
             qCDebug(entities) << "    model URL:" << getModelURL();
             qCDebug(entities) << "    animation URL:" << getAnimationURL();
@@ -345,17 +315,21 @@ void ModelEntityItem::setAnimationSettings(const QString& value) {
         setAnimationHold(hold);
     }
 
+    if (settingsMap.contains("allowTranslation")) {
+        bool allowTranslation = settingsMap["allowTranslation"].toBool();
+        setAnimationAllowTranslation(allowTranslation);
+    }
     _dirtyFlags |= Simulation::DIRTY_UPDATEABLE;
 }
 
 void ModelEntityItem::setAnimationIsPlaying(bool value) {
     _dirtyFlags |= Simulation::DIRTY_UPDATEABLE;
-    _animationLoop.setRunning(value);
+    _animationProperties.setRunning(value);
 }
 
 void ModelEntityItem::setAnimationFPS(float value) {
     _dirtyFlags |= Simulation::DIRTY_UPDATEABLE;
-    _animationLoop.setFPS(value);
+    _animationProperties.setFPS(value);
 }
 
 // virtual
@@ -364,58 +338,79 @@ bool ModelEntityItem::shouldBePhysical() const {
 }
 
 void ModelEntityItem::resizeJointArrays(int newSize) {
-    if (newSize >= 0 && newSize > _localJointRotations.size()) {
-        _localJointRotations.resize(newSize);
-        _localJointRotationsSet.resize(newSize);
-        _localJointRotationsDirty.resize(newSize);
-        _localJointTranslations.resize(newSize);
-        _localJointTranslationsSet.resize(newSize);
-        _localJointTranslationsDirty.resize(newSize);
+    if (newSize < 0) {
+        return;
     }
+
+    _jointDataLock.withWriteLock([&] {
+        if (newSize > _localJointData.size()) {
+            _localJointData.resize(newSize);
+        }
+    });
+}
+
+void ModelEntityItem::setAnimationJointsData(const QVector<JointData>& jointsData) {
+    resizeJointArrays(jointsData.size());
+    _jointDataLock.withWriteLock([&] {
+        for (auto index = 0; index < jointsData.size(); ++index) {
+            const auto& newJointData = jointsData[index];
+            auto& localJointData = _localJointData[index];
+            if (newJointData.translationSet) {
+                localJointData.joint.translation = newJointData.translation;
+                localJointData.translationDirty = true;
+            }
+            if (newJointData.rotationSet) {
+                localJointData.joint.rotation = newJointData.rotation;
+                localJointData.rotationDirty = true;
+            }
+        }
+    });
 }
 
 void ModelEntityItem::setJointRotations(const QVector<glm::quat>& rotations) {
+    resizeJointArrays(rotations.size());
     _jointDataLock.withWriteLock([&] {
         _jointRotationsExplicitlySet = rotations.size() > 0;
-        resizeJointArrays(rotations.size());
         for (int index = 0; index < rotations.size(); index++) {
-            if (_localJointRotationsSet[index]) {
-                _localJointRotations[index] = rotations[index];
-                _localJointRotationsDirty[index] = true;
+            auto& jointData = _localJointData[index];
+            if (jointData.joint.rotationSet) {
+                jointData.joint.rotation = rotations[index];
+                jointData.rotationDirty = true;
             }
         }
     });
 }
 
 void ModelEntityItem::setJointRotationsSet(const QVector<bool>& rotationsSet) {
+    resizeJointArrays(rotationsSet.size());
     _jointDataLock.withWriteLock([&] {
         _jointRotationsExplicitlySet = rotationsSet.size() > 0;
-        resizeJointArrays(rotationsSet.size());
         for (int index = 0; index < rotationsSet.size(); index++) {
-            _localJointRotationsSet[index] = rotationsSet[index];
+            _localJointData[index].joint.rotationSet = rotationsSet[index];
         }
     });
 }
 
 void ModelEntityItem::setJointTranslations(const QVector<glm::vec3>& translations) {
+    resizeJointArrays(translations.size());
     _jointDataLock.withWriteLock([&] {
         _jointTranslationsExplicitlySet = translations.size() > 0;
-        resizeJointArrays(translations.size());
         for (int index = 0; index < translations.size(); index++) {
-            if (_localJointTranslationsSet[index]) {
-                _localJointTranslations[index] = translations[index];
-                _localJointTranslationsDirty[index] = true;
+            auto& jointData = _localJointData[index];
+            if (jointData.joint.translationSet) {
+                jointData.joint.translation = translations[index];
+                jointData.translationDirty = true;
             }
         }
     });
 }
 
 void ModelEntityItem::setJointTranslationsSet(const QVector<bool>& translationsSet) {
+    resizeJointArrays(translationsSet.size());
     _jointDataLock.withWriteLock([&] {
         _jointTranslationsExplicitlySet = translationsSet.size() > 0;
-        resizeJointArrays(translationsSet.size());
         for (int index = 0; index < translationsSet.size(); index++) {
-            _localJointTranslationsSet[index] = translationsSet[index];
+            _localJointData[index].joint.translationSet = translationsSet[index];
         }
     });
 }
@@ -424,7 +419,10 @@ QVector<glm::quat> ModelEntityItem::getJointRotations() const {
     QVector<glm::quat> result;
     _jointDataLock.withReadLock([&] {
         if (_jointRotationsExplicitlySet) {
-            result = _localJointRotations;
+            result.resize(_localJointData.size());
+            for (auto i = 0; i < _localJointData.size(); ++i) {
+                result[i] = _localJointData[i].joint.rotation;
+            }
         }
     });
     return result;
@@ -434,7 +432,10 @@ QVector<bool> ModelEntityItem::getJointRotationsSet() const {
     QVector<bool> result;
     _jointDataLock.withReadLock([&] {
         if (_jointRotationsExplicitlySet) {
-            result = _localJointRotationsSet;
+            result.resize(_localJointData.size());
+            for (auto i = 0; i < _localJointData.size(); ++i) {
+                result[i] = _localJointData[i].joint.rotationSet;
+            }
         }
     });
 
@@ -445,7 +446,10 @@ QVector<glm::vec3> ModelEntityItem::getJointTranslations() const {
     QVector<glm::vec3> result;
     _jointDataLock.withReadLock([&] {
         if (_jointTranslationsExplicitlySet) {
-            result = _localJointTranslations;
+            result.resize(_localJointData.size());
+            for (auto i = 0; i < _localJointData.size(); ++i) {
+                result[i] = _localJointData[i].joint.translation;
+            }
         }
     });
     return result;
@@ -455,8 +459,136 @@ QVector<bool> ModelEntityItem::getJointTranslationsSet() const {
     QVector<bool> result;
     _jointDataLock.withReadLock([&] {
         if (_jointTranslationsExplicitlySet) {
-            result = _localJointTranslationsSet;
+            result.resize(_localJointData.size());
+            for (auto i = 0; i < _localJointData.size(); ++i) {
+                result[i] = _localJointData[i].joint.translationSet;
+            }
         }
     });
     return result;
 }
+
+
+xColor ModelEntityItem::getXColor() const { 
+    xColor color = { _color[RED_INDEX], _color[GREEN_INDEX], _color[BLUE_INDEX] }; return color; 
+}
+bool ModelEntityItem::hasModel() const { 
+    return resultWithReadLock<bool>([&] {
+        return !_modelURL.isEmpty();
+    });
+}
+bool ModelEntityItem::hasCompoundShapeURL() const {
+    return !_compoundShapeURL.get().isEmpty();
+}
+
+QString ModelEntityItem::getModelURL() const {
+    return resultWithReadLock<QString>([&] {
+        return _modelURL;
+    });
+}
+
+QString ModelEntityItem::getCompoundShapeURL() const {
+    return _compoundShapeURL.get();
+}
+
+void ModelEntityItem::setColor(const rgbColor& value) { 
+    withWriteLock([&] {
+        memcpy(_color, value, sizeof(_color));
+    });
+}
+
+void ModelEntityItem::setColor(const xColor& value) {
+    withWriteLock([&] {
+        _color[RED_INDEX] = value.red;
+        _color[GREEN_INDEX] = value.green;
+        _color[BLUE_INDEX] = value.blue;
+    });
+}
+
+// Animation related items...
+AnimationPropertyGroup ModelEntityItem::getAnimationProperties() const { 
+    AnimationPropertyGroup result;
+    withReadLock([&] {
+        result = _animationProperties;
+    });
+    return result; 
+}
+
+bool ModelEntityItem::hasAnimation() const { 
+    return resultWithReadLock<bool>([&] { 
+        return !_animationProperties.getURL().isEmpty();
+    });
+}
+
+QString ModelEntityItem::getAnimationURL() const { 
+    return resultWithReadLock<QString>([&] {
+        return _animationProperties.getURL();
+    });
+}
+
+void ModelEntityItem::setAnimationCurrentFrame(float value) {
+    withWriteLock([&] {
+        _animationProperties.setCurrentFrame(value);
+    });
+}
+
+void ModelEntityItem::setAnimationLoop(bool loop) { 
+    withWriteLock([&] {
+        _animationProperties.setLoop(loop);
+    });
+}
+
+void ModelEntityItem::setAnimationHold(bool hold) { 
+    withWriteLock([&] {
+        _animationProperties.setHold(hold);
+    });
+}
+
+bool ModelEntityItem::getAnimationHold() const { 
+    return resultWithReadLock<bool>([&] {
+        return _animationProperties.getHold();
+    });
+}
+
+void ModelEntityItem::setAnimationFirstFrame(float firstFrame) { 
+    withWriteLock([&] {
+        _animationProperties.setFirstFrame(firstFrame);
+    });
+}
+
+float ModelEntityItem::getAnimationFirstFrame() const { 
+    return resultWithReadLock<float>([&] {
+        return _animationProperties.getFirstFrame();
+    });
+}
+
+void ModelEntityItem::setAnimationLastFrame(float lastFrame) { 
+    withWriteLock([&] {
+        _animationProperties.setLastFrame(lastFrame);
+    });
+}
+
+float ModelEntityItem::getAnimationLastFrame() const { 
+    return resultWithReadLock<float>([&] {
+        return _animationProperties.getLastFrame();
+    });
+}
+bool ModelEntityItem::getAnimationIsPlaying() const { 
+    return resultWithReadLock<float>([&] {
+        return _animationProperties.getRunning();
+    });
+}
+
+float ModelEntityItem::getAnimationCurrentFrame() const { 
+    return resultWithReadLock<float>([&] {
+        return _animationProperties.getCurrentFrame();
+    });
+}
+
+bool ModelEntityItem::isAnimatingSomething() const {
+    return resultWithReadLock<float>([&] {
+        return !_animationProperties.getURL().isEmpty() &&
+            _animationProperties.getRunning() &&
+            (_animationProperties.getFPS() != 0.0f);
+        });
+}
diff --git a/libraries/entities/src/ModelEntityItem.h b/libraries/entities/src/ModelEntityItem.h
index 0c6132e211..2c3ef3aa2d 100644
--- a/libraries/entities/src/ModelEntityItem.h
+++ b/libraries/entities/src/ModelEntityItem.h
@@ -13,6 +13,8 @@
 #define hifi_ModelEntityItem_h
 
 #include "EntityItem.h"
+#include <JointData.h>
+#include <ThreadSafeValueCache.h>
 #include "AnimationPropertyGroup.h"
 
 class ModelEntityItem : public EntityItem {
@@ -44,8 +46,8 @@ public:
                                                 EntityPropertyFlags& propertyFlags, bool overwriteLocalData,
                                                 bool& somethingChanged) override;
 
-    virtual void update(const quint64& now) override;
-    virtual bool needsToCallUpdate() const override;
+    //virtual void update(const quint64& now) override;
+    //virtual bool needsToCallUpdate() const override;
     virtual void debugDump() const override;
 
     void setShapeType(ShapeType type) override;
@@ -56,55 +58,51 @@ public:
     // getters/setters applicable to models and particles
 
     const rgbColor& getColor() const { return _color; }
-    xColor getXColor() const { xColor color = { _color[RED_INDEX], _color[GREEN_INDEX], _color[BLUE_INDEX] }; return color; }
-    bool hasModel() const { return !_modelURL.isEmpty(); }
-    virtual bool hasCompoundShapeURL() const { return !_compoundShapeURL.isEmpty(); }
+    xColor getXColor() const;
+    bool hasModel() const;
+    virtual bool hasCompoundShapeURL() const;
 
     static const QString DEFAULT_MODEL_URL;
-    const QString& getModelURL() const { return _modelURL; }
-    const QUrl& getParsedModelURL() const { return _parsedModelURL; }
+    QString getModelURL() const;
 
     static const QString DEFAULT_COMPOUND_SHAPE_URL;
-    const QString& getCompoundShapeURL() const { return _compoundShapeURL; }
+    QString getCompoundShapeURL() const;
 
-    void setColor(const rgbColor& value) { memcpy(_color, value, sizeof(_color)); }
-    void setColor(const xColor& value) {
-            _color[RED_INDEX] = value.red;
-            _color[GREEN_INDEX] = value.green;
-            _color[BLUE_INDEX] = value.blue;
-    }
+    void setColor(const rgbColor& value);
+    void setColor(const xColor& value);
 
     // model related properties
     virtual void setModelURL(const QString& url);
     virtual void setCompoundShapeURL(const QString& url);
 
     // Animation related items...
-    const AnimationPropertyGroup& getAnimationProperties() const { return _animationProperties; }
+    AnimationPropertyGroup getAnimationProperties() const;
 
-    bool hasAnimation() const { return !_animationProperties.getURL().isEmpty(); }
-    const QString& getAnimationURL() const { return _animationProperties.getURL(); }
+    bool hasAnimation() const;
+    QString getAnimationURL() const;
     void setAnimationURL(const QString& url);
 
-    void setAnimationCurrentFrame(float value) { _animationLoop.setCurrentFrame(value); }
+    void setAnimationCurrentFrame(float value);
     void setAnimationIsPlaying(bool value);
-    void setAnimationFPS(float value);
+    void setAnimationFPS(float value); 
 
-    void setAnimationLoop(bool loop) { _animationLoop.setLoop(loop); }
-    bool getAnimationLoop() const { return _animationLoop.getLoop(); }
+    void setAnimationAllowTranslation(bool value) { _animationProperties.setAllowTranslation(value); };
+    bool getAnimationAllowTranslation() const { return _animationProperties.getAllowTranslation(); };
 
-    void setAnimationHold(bool hold) { _animationLoop.setHold(hold); }
-    bool getAnimationHold() const { return _animationLoop.getHold(); }
+    void setAnimationLoop(bool loop);
 
-    void setAnimationFirstFrame(float firstFrame) { _animationLoop.setFirstFrame(firstFrame); }
-    float getAnimationFirstFrame() const { return _animationLoop.getFirstFrame(); }
+    void setAnimationHold(bool hold);
+    bool getAnimationHold() const;
 
-    void setAnimationLastFrame(float lastFrame) { _animationLoop.setLastFrame(lastFrame); }
-    float getAnimationLastFrame() const { return _animationLoop.getLastFrame(); }
+    void setAnimationFirstFrame(float firstFrame);
+    float getAnimationFirstFrame() const;
 
+    void setAnimationLastFrame(float lastFrame);
+    float getAnimationLastFrame() const;
 
-    bool getAnimationIsPlaying() const { return _animationLoop.getRunning(); }
-    float getAnimationCurrentFrame() const { return _animationLoop.getCurrentFrame(); }
-    float getAnimationFPS() const { return _animationLoop.getFPS(); }
+    bool getAnimationIsPlaying() const;
+    float getAnimationCurrentFrame() const;
+    bool isAnimatingSomething() const;
 
     static const QString DEFAULT_TEXTURES;
     const QString getTextures() const;
@@ -116,6 +114,9 @@ public:
     virtual void setJointRotationsSet(const QVector<bool>& rotationsSet);
     virtual void setJointTranslations(const QVector<glm::vec3>& translations);
     virtual void setJointTranslationsSet(const QVector<bool>& translationsSet);
+
+    virtual void setAnimationJointsData(const QVector<JointData>& jointsData);
+
     QVector<glm::quat> getJointRotations() const;
     QVector<bool> getJointRotationsSet() const;
     QVector<glm::vec3> getJointTranslations() const;
@@ -126,6 +127,8 @@ private:
     ShapeType computeTrueShapeType() const;
 
 protected:
+    void resizeJointArrays(int newSize);
+
     // these are used:
     // - to bounce joint data from an animation into the model/rig.
     // - to relay changes from scripts to model/rig.
@@ -135,26 +138,23 @@ protected:
     ReadWriteLockable _jointDataLock;
 
     bool _jointRotationsExplicitlySet { false }; // were the joints set as a property or just side effect of animations
-    QVector<glm::quat> _localJointRotations;
-    QVector<bool> _localJointRotationsSet; // ever set?
-    QVector<bool> _localJointRotationsDirty; // needs a relay to model/rig?
+    bool _jointTranslationsExplicitlySet{ false }; // were the joints set as a property or just side effect of animations
 
-    bool _jointTranslationsExplicitlySet { false }; // were the joints set as a property or just side effect of animations
-    QVector<glm::vec3> _localJointTranslations;
-    QVector<bool> _localJointTranslationsSet; // ever set?
-    QVector<bool> _localJointTranslationsDirty; // needs a relay to model/rig?
+    struct ModelJointData {
+        JointData joint;
+        bool rotationDirty { false };
+        bool translationDirty { false };
+    };
+
+    QVector<ModelJointData> _localJointData;
     int _lastKnownCurrentFrame;
-    virtual void resizeJointArrays(int newSize = -1);
-
-    bool isAnimatingSomething() const;
 
     rgbColor _color;
     QString _modelURL;
-    QUrl _parsedModelURL;
-    QString _compoundShapeURL;
+
+    ThreadSafeValueCache<QString> _compoundShapeURL;
 
     AnimationPropertyGroup _animationProperties;
-    AnimationLoop _animationLoop;
 
     mutable QReadWriteLock _texturesLock;
     QString _textures;
diff --git a/libraries/entities/src/MovingEntitiesOperator.cpp b/libraries/entities/src/MovingEntitiesOperator.cpp
index ab97c67aa2..cf043dd93e 100644
--- a/libraries/entities/src/MovingEntitiesOperator.cpp
+++ b/libraries/entities/src/MovingEntitiesOperator.cpp
@@ -16,15 +16,7 @@
 
 #include "MovingEntitiesOperator.h"
 
-MovingEntitiesOperator::MovingEntitiesOperator(EntityTreePointer tree) :
-    _tree(tree),
-    _changeTime(usecTimestampNow()),
-    _foundOldCount(0),
-    _foundNewCount(0),
-    _lookingCount(0),
-    _wantDebug(false)
-{
-}
+MovingEntitiesOperator::MovingEntitiesOperator() { }
 
 MovingEntitiesOperator::~MovingEntitiesOperator() {
     if (_wantDebug) {
@@ -51,7 +43,7 @@ MovingEntitiesOperator::~MovingEntitiesOperator() {
 
 
 void MovingEntitiesOperator::addEntityToMoveList(EntityItemPointer entity, const AACube& newCube) {
-    EntityTreeElementPointer oldContainingElement = _tree->getContainingElement(entity->getEntityItemID());
+    EntityTreeElementPointer oldContainingElement = entity->getElement();
     AABox newCubeClamped = newCube.clamp((float)-HALF_TREE_SCALE, (float)HALF_TREE_SCALE);
 
     if (_wantDebug) {
@@ -146,7 +138,7 @@ bool MovingEntitiesOperator::preRecursion(const OctreeElementPointer& element) {
     
     // In Pre-recursion, we're generally deciding whether or not we want to recurse this
     // path of the tree. For this operation, we want to recurse the branch of the tree if
-    // and of the following are true:
+    // any of the following are true:
     //   * We have not yet found the old entity, and this branch contains our old entity
     //   * We have not yet found the new entity, and this branch contains our new entity
     //
@@ -193,7 +185,6 @@ bool MovingEntitiesOperator::preRecursion(const OctreeElementPointer& element) {
 
             // If this element is the best fit for the new bounds of this entity then add the entity to the element
             if (!details.newFound && entityTreeElement->bestFitBounds(details.newCube)) {
-                EntityItemID entityItemID = details.entity->getEntityItemID();
                 // remove from the old before adding
                 EntityTreeElementPointer oldElement = details.entity->getElement();
                 if (oldElement != entityTreeElement) {
@@ -201,7 +192,8 @@ bool MovingEntitiesOperator::preRecursion(const OctreeElementPointer& element) {
                         oldElement->removeEntityItem(details.entity);
                     }
                     entityTreeElement->addEntityItem(details.entity);
-                    _tree->setContainingElement(entityItemID, entityTreeElement);
+                } else {
+                    entityTreeElement->bumpChangedContent();
                 }
                 _foundNewCount++;
                 //details.newFound = true; // TODO: would be nice to add this optimization
@@ -232,8 +224,6 @@ bool MovingEntitiesOperator::postRecursion(const OctreeElementPointer& element)
     if ((shouldRecurseSubTree(element))) {
         element->markWithChangedTime();
     }
-    
-
 
     // It's not OK to prune if we have the potential of deleting the original containing element
     // because if we prune the containing element then new might end up reallocating the same memory later 
@@ -288,3 +278,10 @@ OctreeElementPointer MovingEntitiesOperator::possiblyCreateChildAt(const OctreeE
     }
     return NULL; 
 }
+
+void MovingEntitiesOperator::reset() {
+    _entitiesToMove.clear();
+    _foundOldCount = 0;
+    _foundNewCount = 0;
+    _lookingCount = 0;
+}
diff --git a/libraries/entities/src/MovingEntitiesOperator.h b/libraries/entities/src/MovingEntitiesOperator.h
index fc6ccf2513..d93efa60f2 100644
--- a/libraries/entities/src/MovingEntitiesOperator.h
+++ b/libraries/entities/src/MovingEntitiesOperator.h
@@ -12,6 +12,11 @@
 #ifndef hifi_MovingEntitiesOperator_h
 #define hifi_MovingEntitiesOperator_h
 
+#include <QSet>
+
+#include "EntityTypes.h"
+#include "EntityTreeElement.h"
+
 class EntityToMoveDetails {
 public:
     EntityItemPointer entity;
@@ -34,7 +39,7 @@ inline bool operator==(const EntityToMoveDetails& a, const EntityToMoveDetails&
 
 class MovingEntitiesOperator : public RecurseOctreeOperator {
 public:
-    MovingEntitiesOperator(EntityTreePointer tree);
+    MovingEntitiesOperator();
     ~MovingEntitiesOperator();
 
     void addEntityToMoveList(EntityItemPointer entity, const AACube& newCube);
@@ -42,16 +47,15 @@ public:
     virtual bool postRecursion(const OctreeElementPointer& element) override;
     virtual OctreeElementPointer possiblyCreateChildAt(const OctreeElementPointer& element, int childIndex) override;
     bool hasMovingEntities() const { return _entitiesToMove.size() > 0; }
+    void reset();
 private:
-    EntityTreePointer _tree;
-    QSet<EntityToMoveDetails> _entitiesToMove;
-    quint64 _changeTime;
-    int _foundOldCount;
-    int _foundNewCount;
-    int _lookingCount;
     bool shouldRecurseSubTree(const OctreeElementPointer& element);
-    
-    bool _wantDebug;
+
+    QSet<EntityToMoveDetails> _entitiesToMove;
+    int _foundOldCount { 0 };
+    int _foundNewCount { 0 };
+    int _lookingCount { 0 };
+    bool _wantDebug { false };
 };
 
 #endif // hifi_MovingEntitiesOperator_h
diff --git a/libraries/entities/src/ParticleEffectEntityItem.cpp b/libraries/entities/src/ParticleEffectEntityItem.cpp
index b1366e96b8..b216144ded 100644
--- a/libraries/entities/src/ParticleEffectEntityItem.cpp
+++ b/libraries/entities/src/ParticleEffectEntityItem.cpp
@@ -40,259 +40,316 @@
 #include "EntityScriptingInterface.h"
 #include "ParticleEffectEntityItem.h"
 
-const float SCRIPT_MAXIMUM_PI = 3.1416f;  // Round up so that reasonable property values work
 
-const xColor ParticleEffectEntityItem::DEFAULT_COLOR = { 255, 255, 255 };
-const xColor ParticleEffectEntityItem::DEFAULT_COLOR_SPREAD = { 0, 0, 0 };
-const float ParticleEffectEntityItem::DEFAULT_ALPHA = 1.0f;
-const float ParticleEffectEntityItem::DEFAULT_ALPHA_SPREAD = 0.0f;
-const float ParticleEffectEntityItem::DEFAULT_ALPHA_START = DEFAULT_ALPHA;
-const float ParticleEffectEntityItem::DEFAULT_ALPHA_FINISH = DEFAULT_ALPHA;
-const float ParticleEffectEntityItem::MINIMUM_ALPHA = 0.0f;
-const float ParticleEffectEntityItem::MAXIMUM_ALPHA = 1.0f;
-const quint32 ParticleEffectEntityItem::DEFAULT_MAX_PARTICLES = 1000;
-const quint32 ParticleEffectEntityItem::MINIMUM_MAX_PARTICLES = 1;
-const quint32 ParticleEffectEntityItem::MAXIMUM_MAX_PARTICLES = 100000;
-const float ParticleEffectEntityItem::DEFAULT_LIFESPAN = 3.0f;
-const float ParticleEffectEntityItem::MINIMUM_LIFESPAN = 0.0f;
-const float ParticleEffectEntityItem::MAXIMUM_LIFESPAN = 86400.0f;  // 1 day
-const float ParticleEffectEntityItem::DEFAULT_EMIT_RATE = 15.0f;
-const float ParticleEffectEntityItem::MINIMUM_EMIT_RATE = 0.0f;
-const float ParticleEffectEntityItem::MAXIMUM_EMIT_RATE = 100000.0f;
-const float ParticleEffectEntityItem::DEFAULT_EMIT_SPEED = 5.0f;
-const float ParticleEffectEntityItem::MINIMUM_EMIT_SPEED = 0.0f;
-const float ParticleEffectEntityItem::MAXIMUM_EMIT_SPEED = 1000.0f;  // Approx mach 3
-const float ParticleEffectEntityItem::DEFAULT_SPEED_SPREAD = 1.0f;
-const glm::quat ParticleEffectEntityItem::DEFAULT_EMIT_ORIENTATION = glm::angleAxis(-PI_OVER_TWO, Vectors::UNIT_X);  // Vertical
-const glm::vec3 ParticleEffectEntityItem::DEFAULT_EMIT_DIMENSIONS = Vectors::ZERO;  // Emit from point
-const float ParticleEffectEntityItem::MINIMUM_EMIT_DIMENSION = 0.0f;
-const float ParticleEffectEntityItem::MAXIMUM_EMIT_DIMENSION = (float)TREE_SCALE;
-const float ParticleEffectEntityItem::DEFAULT_EMIT_RADIUS_START = 1.0f;  // Emit from surface (when emitDimensions > 0)
-const float ParticleEffectEntityItem::MINIMUM_EMIT_RADIUS_START = 0.0f;
-const float ParticleEffectEntityItem::MAXIMUM_EMIT_RADIUS_START = 1.0f;
-const float ParticleEffectEntityItem::MINIMUM_POLAR = 0.0f;
-const float ParticleEffectEntityItem::MAXIMUM_POLAR = SCRIPT_MAXIMUM_PI;
-const float ParticleEffectEntityItem::DEFAULT_POLAR_START = 0.0f;  // Emit along z-axis
-const float ParticleEffectEntityItem::DEFAULT_POLAR_FINISH = 0.0f; // ""
-const float ParticleEffectEntityItem::MINIMUM_AZIMUTH = -SCRIPT_MAXIMUM_PI;
-const float ParticleEffectEntityItem::MAXIMUM_AZIMUTH = SCRIPT_MAXIMUM_PI;
-const float ParticleEffectEntityItem::DEFAULT_AZIMUTH_START = -PI;  // Emit full circumference (when polarFinish > 0)
-const float ParticleEffectEntityItem::DEFAULT_AZIMUTH_FINISH = PI;  // ""
-const glm::vec3 ParticleEffectEntityItem::DEFAULT_EMIT_ACCELERATION(0.0f, -9.8f, 0.0f);
-const float ParticleEffectEntityItem::MINIMUM_EMIT_ACCELERATION = -100.0f; // ~ 10g
-const float ParticleEffectEntityItem::MAXIMUM_EMIT_ACCELERATION = 100.0f;
-const glm::vec3 ParticleEffectEntityItem::DEFAULT_ACCELERATION_SPREAD(0.0f, 0.0f, 0.0f);
-const float ParticleEffectEntityItem::MINIMUM_ACCELERATION_SPREAD = 0.0f;
-const float ParticleEffectEntityItem::MAXIMUM_ACCELERATION_SPREAD = 100.0f;
-const float ParticleEffectEntityItem::DEFAULT_PARTICLE_RADIUS = 0.025f;
-const float ParticleEffectEntityItem::MINIMUM_PARTICLE_RADIUS = 0.0f;
-const float ParticleEffectEntityItem::MAXIMUM_PARTICLE_RADIUS = (float)TREE_SCALE;
-const float ParticleEffectEntityItem::DEFAULT_RADIUS_SPREAD = 0.0f;
-const float ParticleEffectEntityItem::DEFAULT_RADIUS_START = DEFAULT_PARTICLE_RADIUS;
-const float ParticleEffectEntityItem::DEFAULT_RADIUS_FINISH = DEFAULT_PARTICLE_RADIUS;
-const QString ParticleEffectEntityItem::DEFAULT_TEXTURES = "";
-const bool ParticleEffectEntityItem::DEFAULT_EMITTER_SHOULD_TRAIL = false;
+using namespace particle;
+
+template <typename T>
+bool operator==(const Range<T>& a, const Range<T>& b) {
+    return (a.start == b.start && a.finish == b.finish);
+}
+
+template <typename T>
+bool operator==(const Gradient<T>& a, const Gradient<T>& b) {
+    return (a.target == b.target && a.spread == b.spread);
+}
+
+template <typename T>
+bool operator==(const RangeGradient<T>& a, const RangeGradient<T>& b) {
+    return (a.gradient == b.gradient && a.range == b.range);
+}
+
+template <typename T>
+bool operator!=(const Range<T>& a, const Range<T>& b) {
+    return !(a == b);
+}
+
+template <typename T>
+bool operator!=(const Gradient<T>& a, const Gradient<T>& b) {
+    return !(a == b);
+}
+
+template <typename T>
+bool operator!=(const RangeGradient<T>& a, const RangeGradient<T>& b) {
+    return !(a == b);
+}
+
+bool operator==(const EmitProperties& a, const EmitProperties& b) {
+    return 
+        (a.rate == b.rate) &&
+        (a.speed == b.speed) &&
+        (a.acceleration == b.acceleration) &&
+        (a.orientation == b.orientation) &&
+        (a.dimensions == b.dimensions) &&
+        (a.shouldTrail == b.shouldTrail);
+}
+
+bool operator!=(const EmitProperties& a, const EmitProperties& b) {
+    return !(a == b);
+}
+
+bool operator==(const Properties& a, const Properties& b) {
+    return
+        (a.color == b.color) &&
+        (a.alpha == b.alpha) &&
+        (a.radius == b.radius) &&
+        (a.radiusStart == b.radiusStart) &&
+        (a.lifespan == b.lifespan) &&
+        (a.maxParticles == b.maxParticles) &&
+        (a.emission == b.emission) &&
+        (a.polar == b.polar) &&
+        (a.azimuth == b.azimuth);
+}
+
+bool operator!=(const Properties& a, const Properties& b) {
+    return !(a == b);
+}
+
+bool Properties::valid() const {
+    if (glm::any(glm::isnan(emission.orientation))) {
+        qCWarning(entities) << "Bad particle data";
+        return false;
+    }
+
+    return
+        (alpha.gradient.target == glm::clamp(alpha.gradient.target, MINIMUM_ALPHA, MAXIMUM_ALPHA)) &&
+        (alpha.range.start == glm::clamp(alpha.range.start, MINIMUM_ALPHA, MAXIMUM_ALPHA)) &&
+        (alpha.range.finish == glm::clamp(alpha.range.finish, MINIMUM_ALPHA, MAXIMUM_ALPHA)) &&
+        (alpha.gradient.spread == glm::clamp(alpha.gradient.spread, MINIMUM_ALPHA, MAXIMUM_ALPHA)) &&
+        (lifespan == glm::clamp(lifespan, MINIMUM_LIFESPAN, MAXIMUM_LIFESPAN)) &&
+        (emission.rate == glm::clamp(emission.rate, MINIMUM_EMIT_RATE, MAXIMUM_EMIT_RATE)) &&
+        (emission.speed.target == glm::clamp(emission.speed.target, MINIMUM_EMIT_SPEED, MAXIMUM_EMIT_SPEED)) &&
+        (emission.speed.spread == glm::clamp(emission.speed.spread, MINIMUM_EMIT_SPEED, MAXIMUM_EMIT_SPEED)) &&
+        (emission.dimensions == glm::clamp(emission.dimensions, vec3(MINIMUM_EMIT_DIMENSION), vec3(MAXIMUM_EMIT_DIMENSION))) &&
+        (radiusStart == glm::clamp(radiusStart, MINIMUM_EMIT_RADIUS_START, MAXIMUM_EMIT_RADIUS_START)) &&
+        (polar.start == glm::clamp(polar.start, MINIMUM_POLAR, MAXIMUM_POLAR)) &&
+        (polar.finish == glm::clamp(polar.finish, MINIMUM_POLAR, MAXIMUM_POLAR)) &&
+        (azimuth.start == glm::clamp(azimuth.start, MINIMUM_AZIMUTH, MAXIMUM_AZIMUTH)) &&
+        (azimuth.finish == glm::clamp(azimuth.finish, MINIMUM_AZIMUTH, MAXIMUM_AZIMUTH)) &&
+        (emission.acceleration.target == glm::clamp(emission.acceleration.target, vec3(MINIMUM_EMIT_ACCELERATION), vec3(MAXIMUM_EMIT_ACCELERATION))) &&
+        (emission.acceleration.spread == glm::clamp(emission.acceleration.spread, vec3(MINIMUM_ACCELERATION_SPREAD), vec3(MAXIMUM_ACCELERATION_SPREAD))) &&
+        (radius.gradient.target == glm::clamp(radius.gradient.target, MINIMUM_PARTICLE_RADIUS, MAXIMUM_PARTICLE_RADIUS)) &&
+        (radius.range.start == glm::clamp(radius.range.start, MINIMUM_PARTICLE_RADIUS, MAXIMUM_PARTICLE_RADIUS)) &&
+        (radius.range.finish == glm::clamp(radius.range.finish, MINIMUM_PARTICLE_RADIUS, MAXIMUM_PARTICLE_RADIUS)) &&
+        (radius.gradient.spread == glm::clamp(radius.gradient.spread, MINIMUM_PARTICLE_RADIUS, MAXIMUM_PARTICLE_RADIUS));
+}
+
+bool Properties::emitting() const {
+    return emission.rate > 0.0f && lifespan > 0.0f && polar.start <= polar.finish;
+    
+}
+
+uint64_t Properties::emitIntervalUsecs() const {
+    if (emission.rate > 0.0f) {
+        return (uint64_t)(USECS_PER_SECOND / emission.rate);
+    }
+    return 0;
+}
 
 
 EntityItemPointer ParticleEffectEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
-    EntityItemPointer entity { new ParticleEffectEntityItem(entityID) };
+    EntityItemPointer entity(new ParticleEffectEntityItem(entityID), [](EntityItem* ptr) { ptr->deleteLater(); });
     entity->setProperties(properties);
     return entity;
 }
 
+#if 0
+void ParticleEffectEntityItem::checkValid() {
+    bool result;
+    withReadLock([&] {
+        result = _particleProperties.valid();
+    });
+    if (!result) {
+        qCWarning(entities) << "Invalid particle properties";
+    }
+}
+#endif
+
 // our non-pure virtual subclass for now...
 ParticleEffectEntityItem::ParticleEffectEntityItem(const EntityItemID& entityItemID) :
-    EntityItem(entityItemID),
-    _previousPosition(getPosition()),
-    _lastSimulated(usecTimestampNow())
+    EntityItem(entityItemID)
 {
     _type = EntityTypes::ParticleEffect;
     setColor(DEFAULT_COLOR);
 }
 
 void ParticleEffectEntityItem::setAlpha(float alpha) {
-    if (MINIMUM_ALPHA <= alpha && alpha <= MAXIMUM_ALPHA) {
-        _alpha = alpha;
-    }
+    withWriteLock([&] {
+        _particleProperties.alpha.gradient.target  = glm::clamp(alpha, MINIMUM_ALPHA, MAXIMUM_ALPHA);
+    });
 }
 
 void ParticleEffectEntityItem::setAlphaStart(float alphaStart) {
-    if (MINIMUM_ALPHA <= alphaStart && alphaStart <= MAXIMUM_ALPHA) {
-        _alphaStart = alphaStart;
+    withWriteLock([&] {
+        _particleProperties.alpha.range.start = glm::clamp(alphaStart, MINIMUM_ALPHA, MAXIMUM_ALPHA);
         _isAlphaStartInitialized = true;
-    }
+    });
 }
 
 void ParticleEffectEntityItem::setAlphaFinish(float alphaFinish) {
-    if (MINIMUM_ALPHA <= alphaFinish && alphaFinish <= MAXIMUM_ALPHA) {
-        _alphaFinish = alphaFinish;
+    withWriteLock([&] {
+        _particleProperties.alpha.range.finish = glm::clamp(alphaFinish, MINIMUM_ALPHA, MAXIMUM_ALPHA);
         _isAlphaFinishInitialized = true;
-    }
+    });
 }
 
 void ParticleEffectEntityItem::setAlphaSpread(float alphaSpread) {
-    if (MINIMUM_ALPHA <= alphaSpread && alphaSpread <= MAXIMUM_ALPHA) {
-        _alphaSpread = alphaSpread;
-    }
+    withWriteLock([&] {
+        _particleProperties.alpha.gradient.spread = glm::clamp(alphaSpread, MINIMUM_ALPHA, MAXIMUM_ALPHA);
+    });
 }
 
 void ParticleEffectEntityItem::setLifespan(float lifespan) {
-    if (MINIMUM_LIFESPAN <= lifespan && lifespan <= MAXIMUM_LIFESPAN) {
-        _lifespan = lifespan;
-    }
+    withWriteLock([&] {
+        _particleProperties.lifespan = glm::clamp(lifespan, MINIMUM_LIFESPAN, MAXIMUM_LIFESPAN);
+    });
 }
 
 void ParticleEffectEntityItem::setEmitRate(float emitRate) {
-    if (MINIMUM_EMIT_RATE <= emitRate && emitRate <= MAXIMUM_EMIT_RATE) {
-        _emitRate = emitRate;
-    }
+    withWriteLock([&] {
+        _particleProperties.emission.rate = glm::clamp(emitRate, MINIMUM_EMIT_RATE, MAXIMUM_EMIT_RATE);
+    });
 }
 
 void ParticleEffectEntityItem::setEmitSpeed(float emitSpeed) {
-    if (MINIMUM_EMIT_SPEED <= emitSpeed && emitSpeed <= MAXIMUM_EMIT_SPEED) {
-        _emitSpeed = emitSpeed;
+    emitSpeed = glm::clamp(emitSpeed, MINIMUM_EMIT_SPEED, MAXIMUM_EMIT_SPEED);
+    if (emitSpeed != _particleProperties.emission.speed.target) {
+        withWriteLock([&] { 
+            _particleProperties.emission.speed.target = emitSpeed; 
+        });
         computeAndUpdateDimensions();
     }
 }
 
 void ParticleEffectEntityItem::setSpeedSpread(float speedSpread) {
-    if (MINIMUM_EMIT_SPEED <= speedSpread && speedSpread <= MAXIMUM_EMIT_SPEED) {
-        _speedSpread = speedSpread;
+    speedSpread = glm::clamp(speedSpread, MINIMUM_EMIT_SPEED, MAXIMUM_EMIT_SPEED);
+    if (speedSpread != _particleProperties.emission.speed.spread) {
+        withWriteLock([&] { 
+            _particleProperties.emission.speed.spread = speedSpread;
+        });
         computeAndUpdateDimensions();
     }
 }
 
-void ParticleEffectEntityItem::setEmitOrientation(const glm::quat& emitOrientation) {
-    _emitOrientation = glm::normalize(emitOrientation);
+void ParticleEffectEntityItem::setEmitOrientation(const glm::quat& emitOrientation_) {
+    auto emitOrientation = glm::normalize(emitOrientation_);
+    withWriteLock([&] {
+        _particleProperties.emission.orientation = emitOrientation; 
+    });
     computeAndUpdateDimensions();
 }
 
-void ParticleEffectEntityItem::setEmitDimensions(const glm::vec3& emitDimensions) {
-    bool updated = false;
-    if (MINIMUM_EMIT_DIMENSION <= emitDimensions.x && emitDimensions.x <= MAXIMUM_EMIT_DIMENSION) {
-        _emitDimensions.x = emitDimensions.x;
-        updated = true;
-    }
-    if (MINIMUM_EMIT_DIMENSION <= emitDimensions.y && emitDimensions.y <= MAXIMUM_EMIT_DIMENSION) {
-        _emitDimensions.y = emitDimensions.y;
-        updated = true;
-    }
-    if (MINIMUM_EMIT_DIMENSION <= emitDimensions.z && emitDimensions.z <= MAXIMUM_EMIT_DIMENSION) {
-        _emitDimensions.z = emitDimensions.z;
-        updated = true;
-    }
-    if (updated) {
+void ParticleEffectEntityItem::setEmitDimensions(const glm::vec3& emitDimensions_) {
+    auto emitDimensions = glm::clamp(emitDimensions_, vec3(MINIMUM_EMIT_DIMENSION), vec3(MAXIMUM_EMIT_DIMENSION));
+    if (emitDimensions != _particleProperties.emission.dimensions) {
+        withWriteLock([&] { 
+            _particleProperties.emission.dimensions = emitDimensions;
+        });
         computeAndUpdateDimensions();
     }
 }
 
 void ParticleEffectEntityItem::setEmitRadiusStart(float emitRadiusStart) {
-    if (MINIMUM_EMIT_RADIUS_START <= emitRadiusStart && emitRadiusStart <= MAXIMUM_EMIT_RADIUS_START) {
-        _emitRadiusStart = emitRadiusStart;
-    }
+    withWriteLock([&] {
+        _particleProperties.radiusStart = glm::clamp(emitRadiusStart, MINIMUM_EMIT_RADIUS_START, MAXIMUM_EMIT_RADIUS_START);
+    });
 }
 
 void ParticleEffectEntityItem::setPolarStart(float polarStart) {
-    if (MINIMUM_POLAR <= polarStart && polarStart <= MAXIMUM_POLAR) {
-        _polarStart = polarStart;
-    }
+    withWriteLock([&] {
+        _particleProperties.polar.start = glm::clamp(polarStart, MINIMUM_POLAR, MAXIMUM_POLAR);
+    });
 }
 
 void ParticleEffectEntityItem::setPolarFinish(float polarFinish) {
-    if (MINIMUM_POLAR <= polarFinish && polarFinish <= MAXIMUM_POLAR) {
-        _polarFinish = polarFinish;
-    }
+    withWriteLock([&] {
+        _particleProperties.polar.finish = glm::clamp(polarFinish, MINIMUM_POLAR, MAXIMUM_POLAR);
+    });
 }
 
 void ParticleEffectEntityItem::setAzimuthStart(float azimuthStart) {
-    if (MINIMUM_AZIMUTH <= azimuthStart && azimuthStart <= MAXIMUM_AZIMUTH) {
-        _azimuthStart = azimuthStart;
-    }
+    withWriteLock([&] {
+        _particleProperties.azimuth.start = glm::clamp(azimuthStart, MINIMUM_AZIMUTH, MAXIMUM_AZIMUTH);
+    });
 }
 
 void ParticleEffectEntityItem::setAzimuthFinish(float azimuthFinish) {
-    if (MINIMUM_AZIMUTH <= azimuthFinish && azimuthFinish <= MAXIMUM_AZIMUTH) {
-        _azimuthFinish = azimuthFinish;
-    }
+    withWriteLock([&] {
+        _particleProperties.azimuth.finish = glm::clamp(azimuthFinish, MINIMUM_AZIMUTH, MAXIMUM_AZIMUTH);
+    });
 }
 
-void ParticleEffectEntityItem::setEmitAcceleration(const glm::vec3& emitAcceleration) {
-    bool updated = false;
-    if (MINIMUM_EMIT_ACCELERATION <= emitAcceleration.x && emitAcceleration.x <= MAXIMUM_EMIT_ACCELERATION) {
-        _emitAcceleration.x = emitAcceleration.x;
-        updated = true;
-    }
-    if (MINIMUM_EMIT_ACCELERATION <= emitAcceleration.y && emitAcceleration.y <= MAXIMUM_EMIT_ACCELERATION) {
-        _emitAcceleration.y = emitAcceleration.y;
-        updated = true;
-    }
-    if (MINIMUM_EMIT_ACCELERATION <= emitAcceleration.z && emitAcceleration.z <= MAXIMUM_EMIT_ACCELERATION) {
-        _emitAcceleration.z = emitAcceleration.z;
-        updated = true;
-    }
-    if (updated) {
+void ParticleEffectEntityItem::setEmitAcceleration(const glm::vec3& emitAcceleration_) {
+    auto emitAcceleration = glm::clamp(emitAcceleration_, vec3(MINIMUM_EMIT_ACCELERATION), vec3(MAXIMUM_EMIT_ACCELERATION));
+    if (emitAcceleration != _particleProperties.emission.acceleration.target) {
+        if (!_particleProperties.valid()) {
+            qCWarning(entities) << "Bad particle data";
+        }
+        withWriteLock([&] {
+            _particleProperties.emission.acceleration.target = emitAcceleration;
+        });
+        if (!_particleProperties.valid()) {
+            qCWarning(entities) << "Bad particle data";
+        }
         computeAndUpdateDimensions();
     }
 }
 
-void ParticleEffectEntityItem::setAccelerationSpread(const glm::vec3& accelerationSpread){
-    bool updated = false;
-    if (MINIMUM_ACCELERATION_SPREAD <= accelerationSpread.x && accelerationSpread.x <= MAXIMUM_ACCELERATION_SPREAD) {
-        _accelerationSpread.x = accelerationSpread.x;
-        updated = true;
-    }
-    if (MINIMUM_ACCELERATION_SPREAD <= accelerationSpread.y && accelerationSpread.y <= MAXIMUM_ACCELERATION_SPREAD) {
-        _accelerationSpread.y = accelerationSpread.y;
-        updated = true;
-    }
-    if (MINIMUM_ACCELERATION_SPREAD <= accelerationSpread.z && accelerationSpread.z <= MAXIMUM_ACCELERATION_SPREAD) {
-        _accelerationSpread.z = accelerationSpread.z;
-        updated = true;
-    }
-    if (updated) {
+void ParticleEffectEntityItem::setAccelerationSpread(const glm::vec3& accelerationSpread_){
+    auto accelerationSpread = glm::clamp(accelerationSpread_, vec3(MINIMUM_ACCELERATION_SPREAD), vec3(MAXIMUM_ACCELERATION_SPREAD));
+    if (accelerationSpread != _particleProperties.emission.acceleration.spread) {
+        withWriteLock([&] {
+            _particleProperties.emission.acceleration.spread = accelerationSpread;
+        });
         computeAndUpdateDimensions();
     }
 }
 
 void ParticleEffectEntityItem::setParticleRadius(float particleRadius) {
-    if (MINIMUM_PARTICLE_RADIUS <= particleRadius && particleRadius <= MAXIMUM_PARTICLE_RADIUS) {
-        _particleRadius = particleRadius;
-    }
+    withWriteLock([&] {
+        _particleProperties.radius.gradient.target = glm::clamp(particleRadius, MINIMUM_PARTICLE_RADIUS, MAXIMUM_PARTICLE_RADIUS);
+    });
 }
 
 void ParticleEffectEntityItem::setRadiusStart(float radiusStart) {
-    if (MINIMUM_PARTICLE_RADIUS <= radiusStart && radiusStart <= MAXIMUM_PARTICLE_RADIUS) {
-        _radiusStart = radiusStart;
+    withWriteLock([&] {
+        _particleProperties.radius.range.start = glm::clamp(radiusStart, MINIMUM_PARTICLE_RADIUS, MAXIMUM_PARTICLE_RADIUS);
         _isRadiusStartInitialized = true;
-    }
+    });
 }
 
 void ParticleEffectEntityItem::setRadiusFinish(float radiusFinish) {
-    if (MINIMUM_PARTICLE_RADIUS <= radiusFinish && radiusFinish <= MAXIMUM_PARTICLE_RADIUS) {
-        _radiusFinish = radiusFinish;
+    withWriteLock([&] {
+        _particleProperties.radius.range.finish = glm::clamp(radiusFinish, MINIMUM_PARTICLE_RADIUS, MAXIMUM_PARTICLE_RADIUS);
         _isRadiusFinishInitialized = true;
-    }
+    });
 }
 
 void ParticleEffectEntityItem::setRadiusSpread(float radiusSpread) { 
-    if (MINIMUM_PARTICLE_RADIUS <= radiusSpread && radiusSpread <= MAXIMUM_PARTICLE_RADIUS) {
-        _radiusSpread = radiusSpread;
-    }
+    withWriteLock([&] {
+        _particleProperties.radius.gradient.spread = glm::clamp(radiusSpread, MINIMUM_PARTICLE_RADIUS, MAXIMUM_PARTICLE_RADIUS);
+    });
 }
 
 
 void ParticleEffectEntityItem::computeAndUpdateDimensions() {
-    const float time = _lifespan * 1.1f; // add 10% extra time to account for incremental timer accumulation error
-
-    glm::vec3 velocity = _emitSpeed * (_emitOrientation * Vectors::UNIT_Z);
-    glm::vec3 velocitySpread = _speedSpread * (_emitOrientation * Vectors::UNIT_Z);
+    particle::Properties particleProperties;
+    withReadLock([&] {
+        particleProperties = _particleProperties;
+    });
+    const float time = particleProperties.lifespan * 1.1f; // add 10% extra time to account for incremental timer accumulation error
 
+    glm::vec3 direction = particleProperties.emission.orientation * Vectors::UNIT_Z;
+    glm::vec3 velocity = particleProperties.emission.speed.target * direction;
+    glm::vec3 velocitySpread = particleProperties.emission.speed.spread * direction;
     glm::vec3 maxVelocity = glm::abs(velocity) + velocitySpread;
-    glm::vec3 maxAccleration = glm::abs(_acceleration) + _accelerationSpread;
-    glm::vec3 maxDistance = 0.5f * _emitDimensions + time * maxVelocity + (0.5f * time * time) * maxAccleration;
-
-    float maxDistanceValue = std::max(maxDistance.x, std::max(maxDistance.y, maxDistance.z));
+    glm::vec3 maxAccleration = glm::abs(_acceleration) + particleProperties.emission.acceleration.spread;
+    glm::vec3 maxDistance = 0.5f * particleProperties.emission.dimensions + time * maxVelocity + (0.5f * time * time) * maxAccleration;
+    if (isNaN(maxDistance)) {
+        qCWarning(entities) << "Bad particle data";
+        return;
+    }
 
+    float maxDistanceValue = glm::compMax(maxDistance);
     //times 2 because dimensions are diameters not radii
     glm::vec3 dims(2.0f * maxDistanceValue);
     EntityItem::setDimensions(dims);
@@ -384,6 +441,20 @@ bool ParticleEffectEntityItem::setProperties(const EntityItemProperties& propert
     return somethingChanged;
 }
 
+void ParticleEffectEntityItem::setColor(const rgbColor& value) {
+    memcpy(_particleColorHack, value, sizeof(rgbColor));
+    _particleProperties.color.gradient.target.red = value[RED_INDEX];
+    _particleProperties.color.gradient.target.green = value[GREEN_INDEX];
+    _particleProperties.color.gradient.target.blue = value[BLUE_INDEX];
+}
+
+void ParticleEffectEntityItem::setColor(const xColor& value) {
+    _particleProperties.color.gradient.target = value;
+    _particleColorHack[RED_INDEX] = value.red;
+    _particleColorHack[GREEN_INDEX] = value.green;
+    _particleColorHack[BLUE_INDEX] = value.blue;
+}
+
 int ParticleEffectEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data, int bytesLeftToRead,
                                                                ReadBitstreamToTreeParams& args,
                                                                EntityPropertyFlags& propertyFlags, bool overwriteLocalData,
@@ -393,77 +464,40 @@ int ParticleEffectEntityItem::readEntitySubclassDataFromBuffer(const unsigned ch
     const unsigned char* dataAt = data;
 
     READ_ENTITY_PROPERTY(PROP_COLOR, rgbColor, setColor);
-
-    // Because we're using AnimationLoop which will reset the frame index if you change it's running state
-    // we want to read these values in the order they appear in the buffer, but call our setters in an
-    // order that allows AnimationLoop to preserve the correct frame rate.
-    if (args.bitstreamVersion < VERSION_ENTITIES_ANIMATION_PROPERTIES_GROUP) {
-        SKIP_ENTITY_PROPERTY(PROP_ANIMATION_FPS, float);
-        SKIP_ENTITY_PROPERTY(PROP_ANIMATION_FRAME_INDEX, float);
-        SKIP_ENTITY_PROPERTY(PROP_ANIMATION_PLAYING, bool);
-        SKIP_ENTITY_PROPERTY(PROP_ANIMATION_SETTINGS, QString);
-    } else {
-        READ_ENTITY_PROPERTY(PROP_EMITTING_PARTICLES, bool, setIsEmitting);
-    }
-
+    READ_ENTITY_PROPERTY(PROP_EMITTING_PARTICLES, bool, setIsEmitting);
     READ_ENTITY_PROPERTY(PROP_SHAPE_TYPE, ShapeType, setShapeType);
     READ_ENTITY_PROPERTY(PROP_MAX_PARTICLES, quint32, setMaxParticles);
     READ_ENTITY_PROPERTY(PROP_LIFESPAN, float, setLifespan);
     READ_ENTITY_PROPERTY(PROP_EMIT_RATE, float, setEmitRate);
-    if (args.bitstreamVersion < VERSION_ENTITIES_PARTICLE_ELLIPSOID_EMITTER) {
-        // OLD PROP_EMIT_VELOCITY FAKEOUT
-        SKIP_ENTITY_PROPERTY(PROP_EMIT_SPEED, glm::vec3);
-    }
-    
-    if (args.bitstreamVersion >= VERSION_ENTITIES_PARTICLE_MODIFICATIONS) {
-        READ_ENTITY_PROPERTY(PROP_EMIT_ACCELERATION, glm::vec3, setEmitAcceleration);
-        READ_ENTITY_PROPERTY(PROP_ACCELERATION_SPREAD, glm::vec3, setAccelerationSpread);
-        READ_ENTITY_PROPERTY(PROP_PARTICLE_RADIUS, float, setParticleRadius);
-        READ_ENTITY_PROPERTY(PROP_TEXTURES, QString, setTextures);
-        if (args.bitstreamVersion < VERSION_ENTITIES_PARTICLE_ELLIPSOID_EMITTER) {
-            // OLD PROP_VELOCITY_SPREAD FAKEOUT
-            SKIP_ENTITY_PROPERTY(PROP_SPEED_SPREAD, glm::vec3);
-        }
-    } else {
-        // OLD PROP_EMIT_ACCELERATION FAKEOUT
-        SKIP_ENTITY_PROPERTY(PROP_PARTICLE_RADIUS, float);
-        // OLD PROP_ACCELERATION_SPREAD FAKEOUT
-        SKIP_ENTITY_PROPERTY(PROP_PARTICLE_RADIUS, float);
-        READ_ENTITY_PROPERTY(PROP_PARTICLE_RADIUS, float, setParticleRadius);
-        READ_ENTITY_PROPERTY(PROP_TEXTURES, QString, setTextures);
-    }
 
-    if (args.bitstreamVersion >= VERSION_ENTITIES_PARTICLE_RADIUS_PROPERTIES) {
-        READ_ENTITY_PROPERTY(PROP_RADIUS_SPREAD, float, setRadiusSpread);
-        READ_ENTITY_PROPERTY(PROP_RADIUS_START, float, setRadiusStart);
-        READ_ENTITY_PROPERTY(PROP_RADIUS_FINISH, float, setRadiusFinish);
-    }
+    READ_ENTITY_PROPERTY(PROP_EMIT_ACCELERATION, glm::vec3, setEmitAcceleration);
+    READ_ENTITY_PROPERTY(PROP_ACCELERATION_SPREAD, glm::vec3, setAccelerationSpread);
+    READ_ENTITY_PROPERTY(PROP_PARTICLE_RADIUS, float, setParticleRadius);
+    READ_ENTITY_PROPERTY(PROP_TEXTURES, QString, setTextures);
 
-    if (args.bitstreamVersion >= VERSION_ENTITIES_PARTICLE_COLOR_PROPERTIES) {
-        READ_ENTITY_PROPERTY(PROP_COLOR_SPREAD, xColor, setColorSpread);
-        READ_ENTITY_PROPERTY(PROP_COLOR_START, xColor, setColorStart);
-        READ_ENTITY_PROPERTY(PROP_COLOR_FINISH, xColor, setColorFinish);
-        READ_ENTITY_PROPERTY(PROP_ALPHA, float, setAlpha);
-        READ_ENTITY_PROPERTY(PROP_ALPHA_SPREAD, float, setAlphaSpread);
-        READ_ENTITY_PROPERTY(PROP_ALPHA_START, float, setAlphaStart);
-        READ_ENTITY_PROPERTY(PROP_ALPHA_FINISH, float, setAlphaFinish);
-    }
+    READ_ENTITY_PROPERTY(PROP_RADIUS_SPREAD, float, setRadiusSpread);
+    READ_ENTITY_PROPERTY(PROP_RADIUS_START, float, setRadiusStart);
+    READ_ENTITY_PROPERTY(PROP_RADIUS_FINISH, float, setRadiusFinish);
 
-    if (args.bitstreamVersion >= VERSION_ENTITIES_PARTICLE_ELLIPSOID_EMITTER) {
-        READ_ENTITY_PROPERTY(PROP_EMIT_SPEED, float, setEmitSpeed);
-        READ_ENTITY_PROPERTY(PROP_SPEED_SPREAD, float, setSpeedSpread);
-        READ_ENTITY_PROPERTY(PROP_EMIT_ORIENTATION, glm::quat, setEmitOrientation);
-        READ_ENTITY_PROPERTY(PROP_EMIT_DIMENSIONS, glm::vec3, setEmitDimensions);
-        READ_ENTITY_PROPERTY(PROP_EMIT_RADIUS_START, float, setEmitRadiusStart);
-        READ_ENTITY_PROPERTY(PROP_POLAR_START, float, setPolarStart);
-        READ_ENTITY_PROPERTY(PROP_POLAR_FINISH, float, setPolarFinish);
-        READ_ENTITY_PROPERTY(PROP_AZIMUTH_START, float, setAzimuthStart);
-        READ_ENTITY_PROPERTY(PROP_AZIMUTH_FINISH, float, setAzimuthFinish);
-    }
+    READ_ENTITY_PROPERTY(PROP_COLOR_SPREAD, xColor, setColorSpread);
+    READ_ENTITY_PROPERTY(PROP_COLOR_START, xColor, setColorStart);
+    READ_ENTITY_PROPERTY(PROP_COLOR_FINISH, xColor, setColorFinish);
+    READ_ENTITY_PROPERTY(PROP_ALPHA, float, setAlpha);
+    READ_ENTITY_PROPERTY(PROP_ALPHA_SPREAD, float, setAlphaSpread);
+    READ_ENTITY_PROPERTY(PROP_ALPHA_START, float, setAlphaStart);
+    READ_ENTITY_PROPERTY(PROP_ALPHA_FINISH, float, setAlphaFinish);
 
-    if (args.bitstreamVersion >= VERSION_ENTITIES_PARTICLES_ADDITIVE_BLENDING) {
-        READ_ENTITY_PROPERTY(PROP_EMITTER_SHOULD_TRAIL, bool, setEmitterShouldTrail);
-    }
+    READ_ENTITY_PROPERTY(PROP_EMIT_SPEED, float, setEmitSpeed);
+    READ_ENTITY_PROPERTY(PROP_SPEED_SPREAD, float, setSpeedSpread);
+    READ_ENTITY_PROPERTY(PROP_EMIT_ORIENTATION, glm::quat, setEmitOrientation);
+    READ_ENTITY_PROPERTY(PROP_EMIT_DIMENSIONS, glm::vec3, setEmitDimensions);
+    READ_ENTITY_PROPERTY(PROP_EMIT_RADIUS_START, float, setEmitRadiusStart);
+    READ_ENTITY_PROPERTY(PROP_POLAR_START, float, setPolarStart);
+    READ_ENTITY_PROPERTY(PROP_POLAR_FINISH, float, setPolarFinish);
+    READ_ENTITY_PROPERTY(PROP_AZIMUTH_START, float, setAzimuthStart);
+    READ_ENTITY_PROPERTY(PROP_AZIMUTH_FINISH, float, setAzimuthFinish);
+
+    READ_ENTITY_PROPERTY(PROP_EMITTER_SHOULD_TRAIL, bool, setEmitterShouldTrail);
 
     return bytesRead;
 }
@@ -548,205 +582,66 @@ void ParticleEffectEntityItem::appendSubclassData(OctreePacketData* packetData,
     APPEND_ENTITY_PROPERTY(PROP_EMITTER_SHOULD_TRAIL, getEmitterShouldTrail());
 }
 
-bool ParticleEffectEntityItem::isEmittingParticles() const {
-    // keep emitting if there are particles still alive.
-    return (getIsEmitting() || !_particles.empty());
-}
 
-bool ParticleEffectEntityItem::needsToCallUpdate() const {
-    return true;
-}
-
-void ParticleEffectEntityItem::update(const quint64& now) {
-
-    // we check for 'now' in the past in case users set their clock backward
-    if (now < _lastSimulated) {
-        _lastSimulated = now;
-        return;
-    }
-
-    float deltaTime = (float)(now - _lastSimulated) / (float)USECS_PER_SECOND;
-    _lastSimulated = now;
-
-    if (isEmittingParticles()) {
-        stepSimulation(deltaTime);
-    }
-
-    EntityItem::update(now); // let our base class handle it's updates...
-}
 
 void ParticleEffectEntityItem::debugDump() const {
     quint64 now = usecTimestampNow();
     qCDebug(entities) << "PA EFFECT EntityItem id:" << getEntityItemID() << "---------------------------------------------";
-    qCDebug(entities) << "                  color:" << _color[0] << "," << _color[1] << "," << _color[2];
+    qCDebug(entities) << "                  color:" << 
+        _particleProperties.color.gradient.target.red << "," << 
+        _particleProperties.color.gradient.target.green << "," << 
+        _particleProperties.color.gradient.target.blue;
     qCDebug(entities) << "               position:" << debugTreeVector(getPosition());
     qCDebug(entities) << "             dimensions:" << debugTreeVector(getDimensions());
     qCDebug(entities) << "          getLastEdited:" << debugTime(getLastEdited(), now);
 }
 
 void ParticleEffectEntityItem::setShapeType(ShapeType type) {
-    if (type != _shapeType) {
-        _shapeType = type;
-        _dirtyFlags |= Simulation::DIRTY_SHAPE | Simulation::DIRTY_MASS;
-    }
-}
-
-void ParticleEffectEntityItem::integrateParticle(Particle& particle, float deltaTime) {
-    glm::vec3 atSquared = (0.5f * deltaTime * deltaTime) * particle.acceleration;
-    glm::vec3 at = particle.acceleration * deltaTime;
-    particle.position += particle.velocity * deltaTime + atSquared;
-    particle.velocity += at;
-}
-
-void ParticleEffectEntityItem::stepSimulation(float deltaTime) {
-    // update particles between head and tail
-    int popCount = 0;
-    for (Particle& particle : _particles) {
-        particle.lifetime += deltaTime;
-
-        // if particle has died.
-        if (particle.lifetime >= _lifespan) {
-            // move head forward
-            popCount++;
-        } else {
-            // Otherwise update it
-            integrateParticle(particle, deltaTime);
+    withWriteLock([&] {
+        if (type != _shapeType) {
+            _shapeType = type;
+            _dirtyFlags |= Simulation::DIRTY_SHAPE | Simulation::DIRTY_MASS;
         }
-    }
-    _particles.erase(_particles.begin(), _particles.begin() + popCount);
-
-    // emit new particles, but only if we are emmitting
-    if (getIsEmitting() && _emitRate > 0.0f && _lifespan > 0.0f && _polarStart <= _polarFinish) {
-
-        float timeLeftInFrame = deltaTime;
-        while (_timeUntilNextEmit < timeLeftInFrame) {
-            // overflow! move head forward by one.
-            // because the case of head == tail indicates an empty array, not a full one.
-            // This can drop an existing older particle, but this is by design, newer particles are a higher priority.
-            if (_particles.size() >= _maxParticles) {
-                _particles.pop_front();
-            }
-            
-            // emit a new particle at tail index.
-            _particles.push_back(createParticle(glm::mix(_previousPosition, getPosition(),
-                (deltaTime - timeLeftInFrame) / deltaTime)));
-            auto particle = _particles.back();
-            particle.lifetime += timeLeftInFrame;
-            
-            // Initialize it
-            integrateParticle(particle, deltaTime);
-            
-            // Advance in frame
-            timeLeftInFrame -= _timeUntilNextEmit;
-            _timeUntilNextEmit = 1.0f / _emitRate;
-        }
-
-        _timeUntilNextEmit -= timeLeftInFrame;
-    }
-    _previousPosition = getPosition();
-}
-
-ParticleEffectEntityItem::Particle ParticleEffectEntityItem::createParticle(const glm::vec3& position) {
-    Particle particle;
-
- 
-    particle.seed = randFloatInRange(-1.0f, 1.0f);
-    if (getEmitterShouldTrail()) {
-        particle.position = position;
-    }
-    // Position, velocity, and acceleration
-    if (_polarStart == 0.0f && _polarFinish == 0.0f && _emitDimensions.z == 0.0f) {
-        // Emit along z-axis from position
-
-        particle.velocity = (_emitSpeed + 0.2f * _speedSpread) * (_emitOrientation * Vectors::UNIT_Z);
-        particle.acceleration = _emitAcceleration + randFloatInRange(-1.0f, 1.0f) * _accelerationSpread;
-        
-    } else {
-        // Emit around point or from ellipsoid
-        // - Distribute directions evenly around point
-        // - Distribute points relatively evenly over ellipsoid surface
-        // - Distribute points relatively evenly within ellipsoid volume
-        
-        float elevationMinZ = sin(PI_OVER_TWO - _polarFinish);
-        float elevationMaxZ = sin(PI_OVER_TWO - _polarStart);
-      //  float elevation = asin(elevationMinZ + (elevationMaxZ - elevationMinZ) * randFloat());
-        float elevation = asin(elevationMinZ + (elevationMaxZ - elevationMinZ) *randFloat());
-        
-        float azimuth;
-        if (_azimuthFinish >= _azimuthStart) {
-            azimuth = _azimuthStart + (_azimuthFinish - _azimuthStart) *  randFloat();
-        } else {
-            azimuth = _azimuthStart + (TWO_PI + _azimuthFinish - _azimuthStart) * randFloat();
-        }
-        
-        glm::vec3 emitDirection;
-        
-        if (_emitDimensions == Vectors::ZERO) {
-            // Point
-            emitDirection = glm::quat(glm::vec3(PI_OVER_TWO - elevation, 0.0f, azimuth)) * Vectors::UNIT_Z;
-        } else {
-            // Ellipsoid
-            float radiusScale = 1.0f;
-            if (_emitRadiusStart < 1.0f) {
-                float emitRadiusStart = glm::max(_emitRadiusStart, EPSILON);  // Avoid math complications at center
-                float randRadius =
-                emitRadiusStart + randFloatInRange(0.0f, MAXIMUM_EMIT_RADIUS_START - emitRadiusStart);
-                radiusScale = 1.0f - std::pow(1.0f - randRadius, 3.0f);
-            }
-            
-            glm::vec3 radii = radiusScale * 0.5f * _emitDimensions;
-            float x = radii.x * glm::cos(elevation) * glm::cos(azimuth);
-            float y = radii.y * glm::cos(elevation) * glm::sin(azimuth);
-            float z = radii.z * glm::sin(elevation);
-            glm::vec3 emitPosition = glm::vec3(x, y, z);
-            emitDirection = glm::normalize(glm::vec3(
-                radii.x > 0.0f ? x / (radii.x * radii.x) : 0.0f,
-                radii.y > 0.0f ? y / (radii.y * radii.y) : 0.0f,
-                radii.z > 0.0f ? z / (radii.z * radii.z) : 0.0f
-            ));
-            
-            if (getEmitterShouldTrail()) {
-                particle.position += _emitOrientation * emitPosition;
-            }
-            else {
-                particle.position = _emitOrientation * emitPosition;
-            }
-        }
-        
-        particle.velocity = (_emitSpeed + randFloatInRange(-1.0f, 1.0f) * _speedSpread) * (_emitOrientation * emitDirection);
-        particle.acceleration = _emitAcceleration + randFloatInRange(-1.0f, 1.0f) * _accelerationSpread;
-    }
-    
-    return particle;
+    });
 }
 
 void ParticleEffectEntityItem::setMaxParticles(quint32 maxParticles) {
-    if (_maxParticles != maxParticles && MINIMUM_MAX_PARTICLES <= maxParticles && maxParticles <= MAXIMUM_MAX_PARTICLES) {
-        _maxParticles = maxParticles;
-
-        // Pop all the overflowing oldest particles
-        while (_particles.size() > _maxParticles) {
-            _particles.pop_front();
-        }
-
-        // effectively clear all particles and start emitting new ones from scratch.
-        _timeUntilNextEmit = 0.0f;
-    }
+    _particleProperties.maxParticles = glm::clamp(maxParticles, MINIMUM_MAX_PARTICLES, MAXIMUM_MAX_PARTICLES);
 }
 
 QString ParticleEffectEntityItem::getTextures() const { 
     QString result;
     withReadLock([&] {
-        result = _textures;
+        result = _particleProperties.textures;
     });
     return result;
 }
 
 void ParticleEffectEntityItem::setTextures(const QString& textures) {
     withWriteLock([&] {
-        if (_textures != textures) {
-            _textures = textures;
-            _texturesChangedFlag = true;
-        }
+        _particleProperties.textures = textures;
     });
 }
+
+particle::Properties ParticleEffectEntityItem::getParticleProperties() const {
+    particle::Properties result;  
+    withReadLock([&] { 
+        result = _particleProperties; 
+    });  
+
+    // Special case the properties that get treated differently if they're unintialized
+    result.color.range.start = getColorStart();
+    result.color.range.finish = getColorFinish();
+    result.alpha.range.start = getAlphaStart();
+    result.alpha.range.finish = getAlphaFinish();
+    result.radius.range.start = getRadiusStart();
+    result.radius.range.finish = getRadiusFinish();
+
+    if (!result.valid()) {
+        qCWarning(entities) << "failed validation";
+    }
+
+    return result; 
+}
+
+
diff --git a/libraries/entities/src/ParticleEffectEntityItem.h b/libraries/entities/src/ParticleEffectEntityItem.h
index 4d053e5a45..9c0fd0ef95 100644
--- a/libraries/entities/src/ParticleEffectEntityItem.h
+++ b/libraries/entities/src/ParticleEffectEntityItem.h
@@ -17,6 +17,177 @@
 
 #include "ColorUtils.h"
 
+namespace particle {
+    static const float SCRIPT_MAXIMUM_PI = 3.1416f;  // Round up so that reasonable property values work
+    static const xColor DEFAULT_COLOR = { 255, 255, 255 };
+    static const xColor DEFAULT_COLOR_SPREAD = { 0, 0, 0 };
+    static const float DEFAULT_ALPHA = 1.0f;
+    static const float DEFAULT_ALPHA_SPREAD = 0.0f;
+    static const float DEFAULT_ALPHA_START = DEFAULT_ALPHA;
+    static const float DEFAULT_ALPHA_FINISH = DEFAULT_ALPHA;
+    static const float MINIMUM_ALPHA = 0.0f;
+    static const float MAXIMUM_ALPHA = 1.0f;
+    static const quint32 DEFAULT_MAX_PARTICLES = 1000;
+    static const quint32 MINIMUM_MAX_PARTICLES = 1;
+    static const quint32 MAXIMUM_MAX_PARTICLES = 100000;
+    static const float DEFAULT_LIFESPAN = 3.0f;
+    static const float MINIMUM_LIFESPAN = 0.0f;
+    static const float MAXIMUM_LIFESPAN = 86400.0f;  // 1 day
+    static const float DEFAULT_EMIT_RATE = 15.0f;
+    static const float MINIMUM_EMIT_RATE = 0.0f;
+    static const float MAXIMUM_EMIT_RATE = 100000.0f;
+    static const float DEFAULT_EMIT_SPEED = 5.0f;
+    static const float MINIMUM_EMIT_SPEED = 0.0f;
+    static const float MAXIMUM_EMIT_SPEED = 1000.0f;  // Approx mach 3
+    static const float DEFAULT_SPEED_SPREAD = 1.0f;
+    static const glm::quat DEFAULT_EMIT_ORIENTATION = glm::angleAxis(-PI_OVER_TWO, Vectors::UNIT_X);  // Vertical
+    static const glm::vec3 DEFAULT_EMIT_DIMENSIONS = Vectors::ZERO;  // Emit from point
+    static const float MINIMUM_EMIT_DIMENSION = 0.0f;
+    static const float MAXIMUM_EMIT_DIMENSION = (float)TREE_SCALE;
+    static const float DEFAULT_EMIT_RADIUS_START = 1.0f;  // Emit from surface (when emitDimensions > 0)
+    static const float MINIMUM_EMIT_RADIUS_START = 0.0f;
+    static const float MAXIMUM_EMIT_RADIUS_START = 1.0f;
+    static const float MINIMUM_POLAR = 0.0f;
+    static const float MAXIMUM_POLAR = SCRIPT_MAXIMUM_PI;
+    static const float DEFAULT_POLAR_START = 0.0f;  // Emit along z-axis
+    static const float DEFAULT_POLAR_FINISH = 0.0f; // ""
+    static const float MINIMUM_AZIMUTH = -SCRIPT_MAXIMUM_PI;
+    static const float MAXIMUM_AZIMUTH = SCRIPT_MAXIMUM_PI;
+    static const float DEFAULT_AZIMUTH_START = -PI;  // Emit full circumference (when polarFinish > 0)
+    static const float DEFAULT_AZIMUTH_FINISH = PI;  // ""
+    static const glm::vec3 DEFAULT_EMIT_ACCELERATION(0.0f, -9.8f, 0.0f);
+    static const float MINIMUM_EMIT_ACCELERATION = -100.0f; // ~ 10g
+    static const float MAXIMUM_EMIT_ACCELERATION = 100.0f;
+    static const glm::vec3 DEFAULT_ACCELERATION_SPREAD(0.0f, 0.0f, 0.0f);
+    static const float MINIMUM_ACCELERATION_SPREAD = 0.0f;
+    static const float MAXIMUM_ACCELERATION_SPREAD = 100.0f;
+    static const float DEFAULT_PARTICLE_RADIUS = 0.025f;
+    static const float MINIMUM_PARTICLE_RADIUS = 0.0f;
+    static const float MAXIMUM_PARTICLE_RADIUS = (float)TREE_SCALE;
+    static const float DEFAULT_RADIUS_SPREAD = 0.0f;
+    static const float DEFAULT_RADIUS_START = DEFAULT_PARTICLE_RADIUS;
+    static const float DEFAULT_RADIUS_FINISH = DEFAULT_PARTICLE_RADIUS;
+    static const QString DEFAULT_TEXTURES = "";
+    static const bool DEFAULT_EMITTER_SHOULD_TRAIL = false;
+
+    template <typename T>
+    struct Range {
+        Range() {}
+        Range(const Range& other) { *this = other; }
+        Range(const T& defaultStart, const T& defaultFinish)
+            : start(defaultStart), finish(defaultFinish) {
+        }
+
+        Range& operator=(const Range& other) {
+            start = other.start;
+            finish = other.finish;
+            return *this;
+        }
+
+        T start;
+        T finish;
+    };
+
+    template <typename T>
+    struct Gradient {
+        Gradient() {}
+        Gradient(const Gradient& other) { *this = other; }
+        Gradient(const T& defaultTarget, const T& defaultSpread)
+            : target(defaultTarget), spread(defaultSpread) {}
+
+        Gradient& operator=(const Gradient& other) {
+            target = other.target;
+            spread = other.spread;
+            return *this;
+        }
+
+        T target;
+        T spread;
+    };
+
+    template <typename T>
+    struct RangeGradient {
+        RangeGradient() {}
+        RangeGradient(const RangeGradient& other) { *this = other; }
+        RangeGradient(const T& defaultValue, const T& defaultStart, const T& defaultFinish, const T& defaultSpread)
+            : range(defaultStart, defaultFinish), gradient(defaultValue, defaultSpread) {
+        }
+
+        RangeGradient& operator=(const RangeGradient& other) {
+            range = other.range;
+            gradient = other.gradient;
+            return *this;
+        }
+
+        Range<T> range;
+        Gradient<T> gradient;
+    };
+
+    struct EmitProperties {
+        float rate { DEFAULT_EMIT_RATE };
+        Gradient<float> speed { DEFAULT_EMIT_SPEED, DEFAULT_SPEED_SPREAD };
+        Gradient<vec3> acceleration { DEFAULT_EMIT_ACCELERATION, DEFAULT_ACCELERATION_SPREAD };
+        glm::quat orientation { DEFAULT_EMIT_ORIENTATION };
+        glm::vec3 dimensions { DEFAULT_EMIT_DIMENSIONS };
+        bool shouldTrail { DEFAULT_EMITTER_SHOULD_TRAIL };
+
+        EmitProperties() {};
+        EmitProperties(const EmitProperties& other) { *this = other; }
+        EmitProperties& operator=(const EmitProperties& other) {
+            rate = other.rate;
+            speed = other.speed;
+            acceleration = other.acceleration;
+            orientation = other.orientation;
+            dimensions = other.dimensions;
+            shouldTrail = other.shouldTrail;
+            return *this;
+        }
+    };
+
+    struct Properties {
+        RangeGradient<xColor> color{ DEFAULT_COLOR, DEFAULT_COLOR, DEFAULT_COLOR, DEFAULT_COLOR_SPREAD };
+        RangeGradient<float> alpha{ DEFAULT_ALPHA, DEFAULT_ALPHA_START, DEFAULT_ALPHA_FINISH, DEFAULT_ALPHA_SPREAD };
+        float radiusStart{ DEFAULT_EMIT_RADIUS_START };
+        RangeGradient<float> radius{ DEFAULT_PARTICLE_RADIUS, DEFAULT_RADIUS_START, DEFAULT_RADIUS_FINISH, DEFAULT_RADIUS_SPREAD };
+        float lifespan{ DEFAULT_LIFESPAN };
+        uint32_t maxParticles{ DEFAULT_MAX_PARTICLES };
+        EmitProperties emission;
+        Range<float> polar { DEFAULT_POLAR_START, DEFAULT_POLAR_FINISH };
+        Range<float> azimuth { DEFAULT_AZIMUTH_START, DEFAULT_AZIMUTH_FINISH };
+        QString textures;
+
+
+        Properties() {};
+        Properties(const Properties& other) { *this = other; }
+        bool valid() const;
+        bool emitting() const;
+        uint64_t emitIntervalUsecs() const;
+        
+        Properties& operator =(const Properties& other) {
+            color = other.color;
+            alpha = other.alpha;
+            radius = other.radius;
+            lifespan = other.lifespan;
+            maxParticles = other.maxParticles;
+            emission = other.emission;
+            polar = other.polar;
+            azimuth = other.azimuth;
+            textures = other.textures;
+            return *this;
+        }
+
+        glm::vec4 getColorStart() const { return glm::vec4(ColorUtils::sRGBToLinearVec3(toGlm(color.range.start)), alpha.range.start); }
+        glm::vec4 getColorMiddle() const { return glm::vec4(ColorUtils::sRGBToLinearVec3(toGlm(color.gradient.target)), alpha.gradient.target); }
+        glm::vec4 getColorFinish() const { return glm::vec4(ColorUtils::sRGBToLinearVec3(toGlm(color.range.finish)), alpha.range.finish); }
+        glm::vec4 getColorSpread() const { return glm::vec4(ColorUtils::sRGBToLinearVec3(toGlm(color.gradient.spread)), alpha.gradient.spread); }
+    };
+} // namespace particles
+
+
+bool operator==(const particle::Properties& a, const particle::Properties& b);
+bool operator!=(const particle::Properties& a, const particle::Properties& b);
+
+
 class ParticleEffectEntityItem : public EntityItem {
 public:
     ALLOW_INSTANTIATION // This class can be instantiated
@@ -44,244 +215,123 @@ public:
                                                  EntityPropertyFlags& propertyFlags, bool overwriteLocalData,
                                                  bool& somethingChanged) override;
 
-    virtual void update(const quint64& now) override;
-    virtual bool needsToCallUpdate() const override;
-
-    const rgbColor& getColor() const { return _color; }
-    xColor getXColor() const { xColor color = { _color[RED_INDEX], _color[GREEN_INDEX], _color[BLUE_INDEX] }; return color; }
+    const rgbColor& getColor() const { return _particleColorHack; }
+    xColor getXColor() const { return _particleProperties.color.gradient.target; }
     glm::vec3 getColorRGB() const { return  ColorUtils::sRGBToLinearVec3(toGlm(getXColor())); }
 
-    static const xColor DEFAULT_COLOR;
-    void setColor(const rgbColor& value) { memcpy(_color, value, sizeof(_color)); }
-    void setColor(const xColor& value) {
-        _color[RED_INDEX] = value.red;
-        _color[GREEN_INDEX] = value.green;
-        _color[BLUE_INDEX] = value.blue;
-    }
+    void setColor(const rgbColor& value);
+    void setColor(const xColor& value);
 
     bool _isColorStartInitialized = false;
-    void setColorStart(const xColor& colorStart) { _colorStart = colorStart; _isColorStartInitialized = true; }
-    xColor getColorStart() const { return _isColorStartInitialized ? _colorStart : getXColor(); }
-    glm::vec3 getColorStartRGB() const { return _isColorStartInitialized ? ColorUtils::sRGBToLinearVec3(toGlm(_colorStart)) : getColorRGB(); }
+    void setColorStart(const xColor& colorStart) { _particleProperties.color.range.start = colorStart; _isColorStartInitialized = true; }
+    xColor getColorStart() const { return _isColorStartInitialized ? _particleProperties.color.range.start : getXColor(); }
+    glm::vec3 getColorStartRGB() const { return _isColorStartInitialized ? ColorUtils::sRGBToLinearVec3(toGlm(_particleProperties.color.range.start)) : getColorRGB(); }
 
     bool _isColorFinishInitialized = false;
-    void setColorFinish(const xColor& colorFinish) { _colorFinish = colorFinish; _isColorFinishInitialized = true; }
-    xColor getColorFinish() const { return _isColorFinishInitialized ? _colorFinish : getXColor(); }
-    glm::vec3 getColorFinishRGB() const { return _isColorStartInitialized ? ColorUtils::sRGBToLinearVec3(toGlm(_colorFinish)) : getColorRGB(); }
+    void setColorFinish(const xColor& colorFinish) { _particleProperties.color.range.finish = colorFinish; _isColorFinishInitialized = true; }
+    xColor getColorFinish() const { return _isColorFinishInitialized ? _particleProperties.color.range.finish : getXColor(); }
+    glm::vec3 getColorFinishRGB() const { return _isColorFinishInitialized ? ColorUtils::sRGBToLinearVec3(toGlm(_particleProperties.color.range.finish)) : getColorRGB(); }
 
-    static const xColor DEFAULT_COLOR_SPREAD;
-    void setColorSpread(const xColor& colorSpread) { _colorSpread = colorSpread; }
-    xColor getColorSpread() const { return _colorSpread; }
-    glm::vec3 getColorSpreadRGB() const { return ColorUtils::sRGBToLinearVec3(toGlm(_colorSpread)); }
+    void setColorSpread(const xColor& colorSpread) { _particleProperties.color.gradient.spread = colorSpread; }
+    xColor getColorSpread() const { return _particleProperties.color.gradient.spread; }
+    glm::vec3 getColorSpreadRGB() const { return ColorUtils::sRGBToLinearVec3(toGlm(_particleProperties.color.gradient.spread)); }
 
-    static const float MAXIMUM_ALPHA;
-    static const float MINIMUM_ALPHA;
-
-    static const float DEFAULT_ALPHA;
     void setAlpha(float alpha);
-    float getAlpha() const { return _alpha; }
+    float getAlpha() const { return _particleProperties.alpha.gradient.target; }
 
-    static const float DEFAULT_ALPHA_START;
     bool _isAlphaStartInitialized = false;
     void setAlphaStart(float alphaStart);
-    float getAlphaStart() const { return _isAlphaStartInitialized ? _alphaStart : _alpha; }
+    float getAlphaStart() const { return _isAlphaStartInitialized ? _particleProperties.alpha.range.start : _particleProperties.alpha.gradient.target; }
 
-    static const float DEFAULT_ALPHA_FINISH;
     bool _isAlphaFinishInitialized = false;
     void setAlphaFinish(float alphaFinish);
-    float getAlphaFinish() const { return _isAlphaFinishInitialized ? _alphaFinish : _alpha; }
+    float getAlphaFinish() const { return _isAlphaFinishInitialized ? _particleProperties.alpha.range.finish : _particleProperties.alpha.gradient.target; }
 
-    static const float DEFAULT_ALPHA_SPREAD;
     void setAlphaSpread(float alphaSpread);
-    float getAlphaSpread() const { return _alphaSpread; }
+    float getAlphaSpread() const { return _particleProperties.alpha.gradient.spread; }
 
     void setShapeType(ShapeType type) override;
     virtual ShapeType getShapeType() const override { return _shapeType; }
 
     virtual void debugDump() const override;
 
-    bool isEmittingParticles() const; /// emitting enabled, and there are particles alive
     bool getIsEmitting() const { return _isEmitting; }
     void setIsEmitting(bool isEmitting) { _isEmitting = isEmitting; }
 
-    static const quint32 DEFAULT_MAX_PARTICLES;
-    static const quint32 MINIMUM_MAX_PARTICLES;
-    static const quint32 MAXIMUM_MAX_PARTICLES;
     void setMaxParticles(quint32 maxParticles);
-    quint32 getMaxParticles() const { return _maxParticles; }
+    quint32 getMaxParticles() const { return _particleProperties.maxParticles; }
 
-    static const float DEFAULT_LIFESPAN;
-    static const float MINIMUM_LIFESPAN;
-    static const float MAXIMUM_LIFESPAN;
     void setLifespan(float lifespan);
-    float getLifespan() const { return _lifespan; }
+    float getLifespan() const { return _particleProperties.lifespan; }
 
-    static const float DEFAULT_EMIT_RATE;
-    static const float MINIMUM_EMIT_RATE;
-    static const float MAXIMUM_EMIT_RATE;
     void setEmitRate(float emitRate);
-    float getEmitRate() const { return _emitRate; }
+    float getEmitRate() const { return _particleProperties.emission.rate; }
 
-    static const float DEFAULT_EMIT_SPEED;
-    static const float MINIMUM_EMIT_SPEED;
-    static const float MAXIMUM_EMIT_SPEED;
     void setEmitSpeed(float emitSpeed);
-    float getEmitSpeed() const { return _emitSpeed; }
+    float getEmitSpeed() const { return _particleProperties.emission.speed.target; }
 
-    static const float DEFAULT_SPEED_SPREAD;
     void setSpeedSpread(float speedSpread);
-    float getSpeedSpread() const { return _speedSpread; }
+    float getSpeedSpread() const { return _particleProperties.emission.speed.spread; }
 
-    static const glm::quat DEFAULT_EMIT_ORIENTATION;
     void setEmitOrientation(const glm::quat& emitOrientation);
-    const glm::quat& getEmitOrientation() const { return _emitOrientation; }
+    const glm::quat& getEmitOrientation() const { return _particleProperties.emission.orientation; }
 
-    static const glm::vec3 DEFAULT_EMIT_DIMENSIONS;
-    static const float MINIMUM_EMIT_DIMENSION;
-    static const float MAXIMUM_EMIT_DIMENSION;
     void setEmitDimensions(const glm::vec3& emitDimensions);
-    const glm::vec3& getEmitDimensions() const { return _emitDimensions; }
+    const glm::vec3& getEmitDimensions() const { return _particleProperties.emission.dimensions; }
 
-    static const float DEFAULT_EMIT_RADIUS_START;
-    static const float MINIMUM_EMIT_RADIUS_START;
-    static const float MAXIMUM_EMIT_RADIUS_START;
     void setEmitRadiusStart(float emitRadiusStart);
-    float getEmitRadiusStart() const { return _emitRadiusStart; }
+    float getEmitRadiusStart() const { return _particleProperties.radiusStart; }
 
-    static const float MINIMUM_POLAR;
-    static const float MAXIMUM_POLAR;
-
-    static const float DEFAULT_POLAR_START;
     void setPolarStart(float polarStart);
-    float getPolarStart() const { return _polarStart; }
+    float getPolarStart() const { return _particleProperties.polar.start; }
 
-    static const float DEFAULT_POLAR_FINISH;
     void setPolarFinish(float polarFinish);
-    float getPolarFinish() const { return _polarFinish; }
+    float getPolarFinish() const { return _particleProperties.polar.finish; }
 
-    static const float MINIMUM_AZIMUTH;
-    static const float MAXIMUM_AZIMUTH;
-
-    static const float DEFAULT_AZIMUTH_START;
     void setAzimuthStart(float azimuthStart);
-    float getAzimuthStart() const { return _azimuthStart; }
+    float getAzimuthStart() const { return _particleProperties.azimuth.start; }
 
-    static const float DEFAULT_AZIMUTH_FINISH;
     void setAzimuthFinish(float azimuthFinish);
-    float getAzimuthFinish() const { return _azimuthFinish; }
+    float getAzimuthFinish() const { return _particleProperties.azimuth.finish; }
 
-    static const glm::vec3 DEFAULT_EMIT_ACCELERATION;
-    static const float MINIMUM_EMIT_ACCELERATION;
-    static const float MAXIMUM_EMIT_ACCELERATION;
     void setEmitAcceleration(const glm::vec3& emitAcceleration);
-    const glm::vec3& getEmitAcceleration() const { return _emitAcceleration; }
+    const glm::vec3& getEmitAcceleration() const { return _particleProperties.emission.acceleration.target; }
     
-    static const glm::vec3 DEFAULT_ACCELERATION_SPREAD;
-    static const float MINIMUM_ACCELERATION_SPREAD;
-    static const float MAXIMUM_ACCELERATION_SPREAD;
     void setAccelerationSpread(const glm::vec3& accelerationSpread);
-    const glm::vec3& getAccelerationSpread() const { return _accelerationSpread; }
+    const glm::vec3& getAccelerationSpread() const { return _particleProperties.emission.acceleration.spread; }
 
-    static const float DEFAULT_PARTICLE_RADIUS;
-    static const float MINIMUM_PARTICLE_RADIUS;
-    static const float MAXIMUM_PARTICLE_RADIUS;
     void setParticleRadius(float particleRadius);
-    float getParticleRadius() const { return _particleRadius; }
+    float getParticleRadius() const { return _particleProperties.radius.gradient.target; }
 
-    static const float DEFAULT_RADIUS_START;
     bool _isRadiusStartInitialized = false;
     void setRadiusStart(float radiusStart);
-    float getRadiusStart() const { return _isRadiusStartInitialized ? _radiusStart : _particleRadius; }
+    float getRadiusStart() const { return _isRadiusStartInitialized ? _particleProperties.radius.range.start : _particleProperties.radius.gradient.target; }
 
-    static const float DEFAULT_RADIUS_FINISH;
     bool _isRadiusFinishInitialized = false;
     void setRadiusFinish(float radiusFinish);
-    float getRadiusFinish() const { return _isRadiusFinishInitialized ? _radiusFinish : _particleRadius; }
+    float getRadiusFinish() const { return _isRadiusFinishInitialized ? _particleProperties.radius.range.finish : _particleProperties.radius.gradient.target; }
 
-    static const float DEFAULT_RADIUS_SPREAD;
     void setRadiusSpread(float radiusSpread);
-    float getRadiusSpread() const { return _radiusSpread; }
+    float getRadiusSpread() const { return _particleProperties.radius.gradient.spread; }
 
     void computeAndUpdateDimensions();
 
-    static const QString DEFAULT_TEXTURES;
     QString getTextures() const;
     void setTextures(const QString& textures);
 
-    static const bool DEFAULT_EMITTER_SHOULD_TRAIL;
-    bool getEmitterShouldTrail() const { return _emitterShouldTrail; }
-    void setEmitterShouldTrail(bool emitterShouldTrail) {
-        _emitterShouldTrail = emitterShouldTrail;
-    }
+    bool getEmitterShouldTrail() const { return _particleProperties.emission.shouldTrail; }
+    void setEmitterShouldTrail(bool emitterShouldTrail) { _particleProperties.emission.shouldTrail = emitterShouldTrail; }
 
     virtual bool supportsDetailedRayIntersection() const override { return false; }
 
-protected:
-    struct Particle;
-    using Particles = std::deque<Particle>;
+    particle::Properties getParticleProperties() const; 
 
-    bool isAnimatingSomething() const;
-    
-    Particle createParticle(const glm::vec3& position);
-    void stepSimulation(float deltaTime);
-    void integrateParticle(Particle& particle, float deltaTime);
-    
-    struct Particle {
-        float seed { 0.0f };
-        float lifetime { 0.0f };
-        glm::vec3 position { Vectors::ZERO };
-        glm::vec3 velocity { Vectors::ZERO };
-        glm::vec3 acceleration { Vectors::ZERO };
-    };
-    
-    // Particles container
-    Particles _particles;
-    
-    // Particles properties
-    rgbColor _color;
-    xColor _colorStart = DEFAULT_COLOR;
-    xColor _colorFinish = DEFAULT_COLOR;
-    xColor _colorSpread = DEFAULT_COLOR_SPREAD;
-    float _alpha = DEFAULT_ALPHA;
-    float _alphaStart = DEFAULT_ALPHA_START;
-    float _alphaFinish = DEFAULT_ALPHA_FINISH;
-    float _alphaSpread = DEFAULT_ALPHA_SPREAD;
-    float _particleRadius = DEFAULT_PARTICLE_RADIUS;
-    float _radiusStart = DEFAULT_RADIUS_START;
-    float _radiusFinish = DEFAULT_RADIUS_FINISH;
-    float _radiusSpread = DEFAULT_RADIUS_SPREAD;
-    float _lifespan = DEFAULT_LIFESPAN;
-    
-    // Emiter properties
-    quint32 _maxParticles = DEFAULT_MAX_PARTICLES;
-    
-    float _emitRate = DEFAULT_EMIT_RATE;
-    float _emitSpeed = DEFAULT_EMIT_SPEED;
-    float _speedSpread = DEFAULT_SPEED_SPREAD;
-    
-    glm::quat _emitOrientation = DEFAULT_EMIT_ORIENTATION;
-    glm::vec3 _emitDimensions = DEFAULT_EMIT_DIMENSIONS;
-    float _emitRadiusStart = DEFAULT_EMIT_RADIUS_START;
-    glm::vec3 _emitAcceleration = DEFAULT_EMIT_ACCELERATION;
-    glm::vec3 _accelerationSpread = DEFAULT_ACCELERATION_SPREAD;
-    
-    float _polarStart = DEFAULT_POLAR_START;
-    float _polarFinish = DEFAULT_POLAR_FINISH;
-    float _azimuthStart = DEFAULT_AZIMUTH_START;
-    float _azimuthFinish = DEFAULT_AZIMUTH_FINISH;
-    
-    glm::vec3 _previousPosition;
-    quint64 _lastSimulated { 0 };
+protected:
+    rgbColor _particleColorHack;
+    particle::Properties _particleProperties;
     bool _isEmitting { true };
 
-    QString _textures { DEFAULT_TEXTURES };
-    bool _texturesChangedFlag { false };
     ShapeType _shapeType { SHAPE_TYPE_NONE };
-    
-    float _timeUntilNextEmit { 0.0f };
-
-    
-    bool _emitterShouldTrail { DEFAULT_EMITTER_SHOULD_TRAIL };
 };
 
 #endif // hifi_ParticleEffectEntityItem_h
diff --git a/libraries/entities/src/PolyLineEntityItem.cpp b/libraries/entities/src/PolyLineEntityItem.cpp
index c1f6508a76..7cd70fdb21 100644
--- a/libraries/entities/src/PolyLineEntityItem.cpp
+++ b/libraries/entities/src/PolyLineEntityItem.cpp
@@ -22,26 +22,17 @@
 #include "PolyLineEntityItem.h"
 
 const float PolyLineEntityItem::DEFAULT_LINE_WIDTH = 0.1f;
-const int PolyLineEntityItem::MAX_POINTS_PER_LINE = 70;
+const int PolyLineEntityItem::MAX_POINTS_PER_LINE = 60;
 
 
 EntityItemPointer PolyLineEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
-    EntityItemPointer entity{ new PolyLineEntityItem(entityID) };
+    EntityItemPointer entity(new PolyLineEntityItem(entityID), [](EntityItem* ptr) { ptr->deleteLater(); });
     entity->setProperties(properties);
     return entity;
 }
 
-PolyLineEntityItem::PolyLineEntityItem(const EntityItemID& entityItemID) :
-EntityItem(entityItemID),
-_lineWidth(DEFAULT_LINE_WIDTH),
-_pointsChanged(true),
-_normalsChanged(true),
-_strokeWidthsChanged(true),
-_points(QVector<glm::vec3>(0.0f)),
-_normals(QVector<glm::vec3>(0.0f)),
-_strokeWidths(QVector<float>(0.0f)),
-_textures("")
-{
+
+PolyLineEntityItem::PolyLineEntityItem(const EntityItemID& entityItemID) : EntityItem(entityItemID) {
     _type = EntityTypes::PolyLine;
 }
 
@@ -52,12 +43,15 @@ EntityItemProperties PolyLineEntityItem::getProperties(EntityPropertyFlags desir
 
     properties._color = getXColor();
     properties._colorChanged = false;
+    
 
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(lineWidth, getLineWidth);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(linePoints, getLinePoints);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(normals, getNormals);
+    COPY_ENTITY_PROPERTY_TO_PROPERTIES(strokeColors, getStrokeColors);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(strokeWidths, getStrokeWidths);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(textures, getTextures);
+    COPY_ENTITY_PROPERTY_TO_PROPERTIES(isUVModeStretch, getIsUVModeStretch);
     return properties;
 }
 
@@ -70,8 +64,10 @@ bool PolyLineEntityItem::setProperties(const EntityItemProperties& properties) {
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(lineWidth, setLineWidth);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(linePoints, setLinePoints);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(normals, setNormals);
+    SET_ENTITY_PROPERTY_FROM_PROPERTIES(strokeColors, setStrokeColors);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(strokeWidths, setStrokeWidths);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(textures, setTextures);
+    SET_ENTITY_PROPERTY_FROM_PROPERTIES(isUVModeStretch, setIsUVModeStretch);
 
     if (somethingChanged) {
         bool wantDebug = false;
@@ -92,13 +88,12 @@ bool PolyLineEntityItem::appendPoint(const glm::vec3& point) {
         qCDebug(entities) << "MAX POINTS REACHED!";
         return false;
     }
-    glm::vec3 halfBox = getDimensions() * 0.5f;
-    if ((point.x < -halfBox.x || point.x > halfBox.x) || (point.y < -halfBox.y || point.y > halfBox.y) || (point.z < -halfBox.z || point.z > halfBox.z)) {
-        qCDebug(entities) << "Point is outside entity's bounding box";
-        return false;
-    }
+
     _points << point;
     _pointsChanged = true;
+
+    calculateScaleAndRegistrationPoint();
+
     return true;
 }
 
@@ -119,6 +114,15 @@ bool PolyLineEntityItem::setNormals(const QVector<glm::vec3>& normals) {
     return true;
 }
 
+bool PolyLineEntityItem::setStrokeColors(const QVector<glm::vec3>& strokeColors) {
+    withWriteLock([&] {
+        _strokeColors = strokeColors;
+        _strokeColorsChanged = true;
+    });
+    return true;
+}
+
+
 bool PolyLineEntityItem::setLinePoints(const QVector<glm::vec3>& points) {
     if (points.size() > MAX_POINTS_PER_LINE) {
         return false;
@@ -141,23 +145,56 @@ bool PolyLineEntityItem::setLinePoints(const QVector<glm::vec3>& points) {
             return;
         }
 
-        for (int i = 0; i < points.size(); i++) {
-            glm::vec3 point = points.at(i);
-            glm::vec3 halfBox = getDimensions() * 0.5f;
-            if ((point.x < -halfBox.x || point.x > halfBox.x) ||
-                (point.y < -halfBox.y || point.y > halfBox.y) ||
-                (point.z < -halfBox.z || point.z > halfBox.z)) {
-                qCDebug(entities) << "Point is outside entity's bounding box";
-                return;
-            }
-        }
         _points = points;
+
         result = true;
     });
 
+    if (result) {
+        calculateScaleAndRegistrationPoint();
+    }
+
     return result;
 }
 
+void PolyLineEntityItem::calculateScaleAndRegistrationPoint() {
+    glm::vec3 high(0.0f, 0.0f, 0.0f);
+    glm::vec3 low(0.0f, 0.0f, 0.0f);
+    int pointCount = 0;
+    glm::vec3 firstPoint;
+    withReadLock([&] {
+        pointCount = _points.size();
+        if (pointCount > 0) {
+            firstPoint = _points.at(0);
+        }
+        for (int i = 0; i < pointCount; i++) {
+            const glm::vec3& point = _points.at(i);
+            high = glm::max(point, high);
+            low = glm::min(point, low);
+        }
+    });
+
+    float magnitudeSquared = glm::length2(low - high);
+    vec3 newScale { 1 };
+    vec3 newRegistrationPoint { 0.5f };
+
+    const float EPSILON = 0.0001f;
+    const float EPSILON_SQUARED = EPSILON * EPSILON;
+    const float HALF_LINE_WIDTH = 0.075f; // sadly _strokeWidths() don't seem to correspond to reality, so just use a flat assumption of the stroke width
+    const vec3 QUARTER_LINE_WIDTH { HALF_LINE_WIDTH * 0.5f };
+    if (pointCount > 1 && magnitudeSquared > EPSILON_SQUARED) {
+        newScale = glm::abs(high) + glm::abs(low) + vec3(HALF_LINE_WIDTH);
+        // Center the poly line in the bounding box
+        glm::vec3 startPointInScaleSpace = firstPoint - low;
+        startPointInScaleSpace += QUARTER_LINE_WIDTH;
+        newRegistrationPoint = startPointInScaleSpace / newScale;
+    } 
+
+    // if Polyline has only one or fewer points, use default dimension settings
+    setDimensions(newScale);
+    EntityItem::setRegistrationPoint(newRegistrationPoint);
+}
+
 int PolyLineEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data, int bytesLeftToRead,
                                                          ReadBitstreamToTreeParams& args,
                                                          EntityPropertyFlags& propertyFlags, bool overwriteLocalData,
@@ -171,8 +208,10 @@ int PolyLineEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* da
     READ_ENTITY_PROPERTY(PROP_LINE_WIDTH, float, setLineWidth);
     READ_ENTITY_PROPERTY(PROP_LINE_POINTS, QVector<glm::vec3>, setLinePoints);
     READ_ENTITY_PROPERTY(PROP_NORMALS, QVector<glm::vec3>, setNormals);
+    READ_ENTITY_PROPERTY(PROP_STROKE_COLORS, QVector<glm::vec3>, setStrokeColors);
     READ_ENTITY_PROPERTY(PROP_STROKE_WIDTHS, QVector<float>, setStrokeWidths);
     READ_ENTITY_PROPERTY(PROP_TEXTURES, QString, setTextures);
+    READ_ENTITY_PROPERTY(PROP_IS_UV_MODE_STRETCH, bool, setIsUVModeStretch);
 
     return bytesRead;
 }
@@ -185,8 +224,10 @@ EntityPropertyFlags PolyLineEntityItem::getEntityProperties(EncodeBitstreamParam
     requestedProperties += PROP_LINE_WIDTH;
     requestedProperties += PROP_LINE_POINTS;
     requestedProperties += PROP_NORMALS;
+    requestedProperties += PROP_STROKE_COLORS;
     requestedProperties += PROP_STROKE_WIDTHS;
     requestedProperties += PROP_TEXTURES;
+    requestedProperties += PROP_IS_UV_MODE_STRETCH;
     return requestedProperties;
 }
 
@@ -205,8 +246,10 @@ void PolyLineEntityItem::appendSubclassData(OctreePacketData* packetData, Encode
     APPEND_ENTITY_PROPERTY(PROP_LINE_WIDTH, getLineWidth());
     APPEND_ENTITY_PROPERTY(PROP_LINE_POINTS, getLinePoints());
     APPEND_ENTITY_PROPERTY(PROP_NORMALS, getNormals());
+    APPEND_ENTITY_PROPERTY(PROP_STROKE_COLORS, getStrokeColors());
     APPEND_ENTITY_PROPERTY(PROP_STROKE_WIDTHS, getStrokeWidths());
     APPEND_ENTITY_PROPERTY(PROP_TEXTURES, getTextures());
+    APPEND_ENTITY_PROPERTY(PROP_IS_UV_MODE_STRETCH, getIsUVModeStretch());
 }
 
 void PolyLineEntityItem::debugDump() const {
@@ -236,6 +279,14 @@ QVector<glm::vec3> PolyLineEntityItem::getNormals() const {
     return result;
 }
 
+QVector<glm::vec3> PolyLineEntityItem::getStrokeColors() const {
+    QVector<glm::vec3> result;
+    withReadLock([&] {
+        result = _strokeColors;
+    });
+    return result;
+}
+
 QVector<float> PolyLineEntityItem::getStrokeWidths() const { 
     QVector<float> result;
     withReadLock([&] {
diff --git a/libraries/entities/src/PolyLineEntityItem.h b/libraries/entities/src/PolyLineEntityItem.h
index ed161762fc..7e47ce3aa7 100644
--- a/libraries/entities/src/PolyLineEntityItem.h
+++ b/libraries/entities/src/PolyLineEntityItem.h
@@ -46,9 +46,11 @@ class PolyLineEntityItem : public EntityItem {
     xColor getXColor() const { xColor color = { _color[RED_INDEX], _color[GREEN_INDEX], _color[BLUE_INDEX] }; return color; }
 
     void setColor(const rgbColor& value) {
+        _strokeColorsChanged = true;
         memcpy(_color, value, sizeof(_color));
     }
     void setColor(const xColor& value) {
+        _strokeColorsChanged = true;
         _color[RED_INDEX] = value.red;
         _color[GREEN_INDEX] = value.green;
         _color[BLUE_INDEX] = value.blue;
@@ -64,9 +66,15 @@ class PolyLineEntityItem : public EntityItem {
     bool setNormals(const QVector<glm::vec3>& normals);
     QVector<glm::vec3> getNormals() const;
 
+    bool setStrokeColors(const QVector<glm::vec3>& strokeColors);
+    QVector<glm::vec3> getStrokeColors() const;
+
     bool setStrokeWidths(const QVector<float>& strokeWidths);
     QVector<float> getStrokeWidths() const;
 
+    void setIsUVModeStretch(bool isUVModeStretch){ _isUVModeStretch = isUVModeStretch; }
+    bool getIsUVModeStretch() const{ return _isUVModeStretch; }
+
     QString getTextures() const;
     void setTextures(const QString& textures);
 
@@ -74,6 +82,15 @@ class PolyLineEntityItem : public EntityItem {
 
     virtual ShapeType getShapeType() const override { return SHAPE_TYPE_NONE; }
 
+    bool pointsChanged() const { return _pointsChanged; } 
+    bool normalsChanged() const { return _normalsChanged; }
+    bool strokeColorsChanged() const { return _strokeColorsChanged; }
+    bool strokeWidthsChanged() const { return _strokeWidthsChanged; }
+    bool texturesChanged() const { return _texturesChangedFlag; }
+    void resetTexturesChanged() { _texturesChangedFlag = false; }
+    void resetPolyLineChanged() { _strokeColorsChanged = _strokeWidthsChanged = _normalsChanged = _pointsChanged = false; }
+
+
     // never have a ray intersection pick a PolyLineEntityItem.
     virtual bool supportsDetailedRayIntersection() const override { return true; }
     virtual bool findDetailedRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
@@ -81,20 +98,28 @@ class PolyLineEntityItem : public EntityItem {
                                              BoxFace& face, glm::vec3& surfaceNormal,
                                              void** intersectedObject, bool precisionPicking) const override { return false; }
 
+    // disable these external interfaces as PolyLineEntities caculate their own dimensions based on the points they contain
+    virtual void setRegistrationPoint(const glm::vec3& value) override {};
+
     virtual void debugDump() const override;
     static const float DEFAULT_LINE_WIDTH;
     static const int MAX_POINTS_PER_LINE;
-
+private:
+    void calculateScaleAndRegistrationPoint();
+    
  protected:
     rgbColor _color;
-    float _lineWidth;
-    bool _pointsChanged;
-    bool _normalsChanged;
-    bool _strokeWidthsChanged;
+    float _lineWidth { DEFAULT_LINE_WIDTH };
+    bool _pointsChanged { true };
+    bool _normalsChanged { true };
+    bool _strokeColorsChanged { true };
+    bool _strokeWidthsChanged { true };
     QVector<glm::vec3> _points;
     QVector<glm::vec3> _normals;
+    QVector<glm::vec3> _strokeColors;
     QVector<float> _strokeWidths;
     QString _textures;
+    bool _isUVModeStretch;
     bool _texturesChangedFlag { false };
     mutable QReadWriteLock _quadReadWriteLock;
 };
diff --git a/libraries/entities/src/PolyVoxEntityItem.cpp b/libraries/entities/src/PolyVoxEntityItem.cpp
index b5500da798..e577a6c1a7 100644
--- a/libraries/entities/src/PolyVoxEntityItem.cpp
+++ b/libraries/entities/src/PolyVoxEntityItem.cpp
@@ -9,6 +9,9 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "PolyVoxEntityItem.h"
+
+#include <glm/gtx/transform.hpp>
 
 #include <QByteArray>
 #include <QDebug>
@@ -16,11 +19,23 @@
 
 #include <ByteCountCoding.h>
 
+
 #include "EntitiesLogging.h"
 #include "EntityItemProperties.h"
 #include "EntityTree.h"
 #include "EntityTreeElement.h"
-#include "PolyVoxEntityItem.h"
+
+bool PolyVoxEntityItem::isEdged(PolyVoxSurfaceStyle surfaceStyle) {
+    switch (surfaceStyle) {
+        case PolyVoxEntityItem::SURFACE_CUBIC:
+        case PolyVoxEntityItem::SURFACE_MARCHING_CUBES:
+            return false;
+        case PolyVoxEntityItem::SURFACE_EDGED_CUBIC:
+        case PolyVoxEntityItem::SURFACE_EDGED_MARCHING_CUBES:
+            return true;
+    }
+    return false;
+}
 
 const glm::vec3 PolyVoxEntityItem::DEFAULT_VOXEL_VOLUME_SIZE = glm::vec3(32, 32, 32);
 const float PolyVoxEntityItem::MAX_VOXEL_DIMENSION = 128.0f;
@@ -32,7 +47,7 @@ const QString PolyVoxEntityItem::DEFAULT_Y_TEXTURE_URL = QString("");
 const QString PolyVoxEntityItem::DEFAULT_Z_TEXTURE_URL = QString("");
 
 EntityItemPointer PolyVoxEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
-    EntityItemPointer entity { new PolyVoxEntityItem(entityID) };
+    EntityItemPointer entity(new PolyVoxEntityItem(entityID), [](EntityItem* ptr) { ptr->deleteLater(); });
     entity->setProperties(properties);
     return entity;
 }
@@ -51,23 +66,13 @@ QByteArray PolyVoxEntityItem::makeEmptyVoxelData(quint16 voxelXSize, quint16 vox
     return newVoxelData;
 }
 
-PolyVoxEntityItem::PolyVoxEntityItem(const EntityItemID& entityItemID) :
-    EntityItem(entityItemID),
-    _voxelVolumeSize(PolyVoxEntityItem::DEFAULT_VOXEL_VOLUME_SIZE),
-    _voxelData(PolyVoxEntityItem::DEFAULT_VOXEL_DATA),
-    _voxelDataDirty(true),
-    _voxelSurfaceStyle(PolyVoxEntityItem::DEFAULT_VOXEL_SURFACE_STYLE),
-    _xTextureURL(PolyVoxEntityItem::DEFAULT_X_TEXTURE_URL),
-    _yTextureURL(PolyVoxEntityItem::DEFAULT_Y_TEXTURE_URL),
-    _zTextureURL(PolyVoxEntityItem::DEFAULT_Z_TEXTURE_URL) {
+PolyVoxEntityItem::PolyVoxEntityItem(const EntityItemID& entityItemID) : EntityItem(entityItemID) {
     _type = EntityTypes::PolyVox;
 }
 
-void PolyVoxEntityItem::setVoxelVolumeSize(glm::vec3 voxelVolumeSize) {
+void PolyVoxEntityItem::setVoxelVolumeSize(const vec3& voxelVolumeSize) {
     withWriteLock([&] {
-        assert((int)_voxelVolumeSize.x == _voxelVolumeSize.x);
-        assert((int)_voxelVolumeSize.y == _voxelVolumeSize.y);
-        assert((int)_voxelVolumeSize.z == _voxelVolumeSize.z);
+        assert(!glm::any(glm::isnan(voxelVolumeSize)));
 
         _voxelVolumeSize = glm::vec3(roundf(voxelVolumeSize.x), roundf(voxelVolumeSize.y), roundf(voxelVolumeSize.z));
         if (_voxelVolumeSize.x < 1) {
@@ -228,14 +233,14 @@ void PolyVoxEntityItem::debugDump() const {
     qCDebug(entities) << "       getLastEdited:" << debugTime(getLastEdited(), now);
 }
 
-void PolyVoxEntityItem::setVoxelData(QByteArray voxelData) {
+void PolyVoxEntityItem::setVoxelData(const QByteArray& voxelData) {
     withWriteLock([&] {
         _voxelData = voxelData;
         _voxelDataDirty = true;
     });
 }
 
-const QByteArray PolyVoxEntityItem::getVoxelData() const {
+QByteArray PolyVoxEntityItem::getVoxelData() const {
     QByteArray voxelDataCopy;
     withReadLock([&] {
         voxelDataCopy = _voxelData;
@@ -368,3 +373,103 @@ EntityItemID PolyVoxEntityItem::getZPNeighborID() const {
     });
     return result;
 }
+
+glm::vec3 PolyVoxEntityItem::getSurfacePositionAdjustment() const {
+    glm::vec3 result;
+    withReadLock([&] {
+        glm::vec3 scale = getDimensions() / _voxelVolumeSize; // meters / voxel-units
+        if (isEdged()) {
+            result = scale / -2.0f;
+        }
+        return scale / 2.0f;
+    });
+    return result;
+}
+
+glm::mat4 PolyVoxEntityItem::voxelToLocalMatrix() const {
+    glm::vec3 voxelVolumeSize;
+    withReadLock([&] {
+        voxelVolumeSize = _voxelVolumeSize;
+    });
+
+    glm::vec3 dimensions = getDimensions();
+    glm::vec3 scale = dimensions / voxelVolumeSize; // meters / voxel-units
+    bool success; // TODO -- Does this actually have to happen in world space?
+    glm::vec3 center = getCenterPosition(success); // this handles registrationPoint changes
+    glm::vec3 position = getPosition(success);
+    glm::vec3 positionToCenter = center - position;
+
+    positionToCenter -= dimensions * Vectors::HALF - getSurfacePositionAdjustment();
+    glm::mat4 centerToCorner = glm::translate(glm::mat4(), positionToCenter);
+    glm::mat4 scaled = glm::scale(centerToCorner, scale);
+    return scaled;
+}
+
+glm::mat4 PolyVoxEntityItem::localToVoxelMatrix() const {
+    glm::mat4 localToModelMatrix = glm::inverse(voxelToLocalMatrix());
+    return localToModelMatrix;
+}
+
+glm::mat4 PolyVoxEntityItem::voxelToWorldMatrix() const {
+    glm::mat4 rotation = glm::mat4_cast(getRotation());
+    glm::mat4 translation = glm::translate(getPosition());
+    return translation * rotation * voxelToLocalMatrix();
+}
+
+glm::mat4 PolyVoxEntityItem::worldToVoxelMatrix() const {
+    glm::mat4 worldToModelMatrix = glm::inverse(voxelToWorldMatrix());
+    return worldToModelMatrix;
+}
+
+glm::vec3 PolyVoxEntityItem::voxelCoordsToWorldCoords(const glm::vec3& voxelCoords) const {
+    glm::vec3 adjustedCoords;
+    if (isEdged()) {
+        adjustedCoords = voxelCoords + Vectors::HALF;
+    } else {
+        adjustedCoords = voxelCoords - Vectors::HALF;
+    }
+    return glm::vec3(voxelToWorldMatrix() * glm::vec4(adjustedCoords, 1.0f));
+}
+
+glm::vec3 PolyVoxEntityItem::worldCoordsToVoxelCoords(const glm::vec3& worldCoords) const {
+    glm::vec3 result = glm::vec3(worldToVoxelMatrix() * glm::vec4(worldCoords, 1.0f));
+    if (isEdged()) {
+        return result - Vectors::HALF;
+    }
+    return result + Vectors::HALF;
+}
+
+glm::vec3 PolyVoxEntityItem::voxelCoordsToLocalCoords(const glm::vec3& voxelCoords) const {
+    return glm::vec3(voxelToLocalMatrix() * glm::vec4(voxelCoords, 0.0f));
+}
+
+glm::vec3 PolyVoxEntityItem::localCoordsToVoxelCoords(const glm::vec3& localCoords) const {
+    return glm::vec3(localToVoxelMatrix() * glm::vec4(localCoords, 0.0f));
+}
+
+ShapeType PolyVoxEntityItem::getShapeType() const {
+    if (_collisionless) {
+        return SHAPE_TYPE_NONE;
+    }
+    return SHAPE_TYPE_COMPOUND;
+}
+
+bool PolyVoxEntityItem::isEdged() const {
+    return isEdged(_voxelSurfaceStyle);
+}
+
+std::array<EntityItemID, 3> PolyVoxEntityItem::getNNeigborIDs() const {
+    std::array<EntityItemID, 3> result;
+    withReadLock([&] {
+        result = { { _xNNeighborID, _yNNeighborID, _zNNeighborID } };
+    });
+    return result;
+}
+
+std::array<EntityItemID, 3> PolyVoxEntityItem::getPNeigborIDs() const {
+    std::array<EntityItemID, 3> result;
+    withReadLock([&] {
+        result = { { _xPNeighborID, _yPNeighborID, _zPNeighborID } };
+    });
+    return result;
+}
diff --git a/libraries/entities/src/PolyVoxEntityItem.h b/libraries/entities/src/PolyVoxEntityItem.h
index a5c8910931..d8d998b944 100644
--- a/libraries/entities/src/PolyVoxEntityItem.h
+++ b/libraries/entities/src/PolyVoxEntityItem.h
@@ -51,11 +51,11 @@ class PolyVoxEntityItem : public EntityItem {
 
     virtual void debugDump() const override;
 
-    virtual void setVoxelVolumeSize(glm::vec3 voxelVolumeSize);
+    virtual void setVoxelVolumeSize(const vec3& voxelVolumeSize);
     virtual glm::vec3 getVoxelVolumeSize() const;
 
-    virtual void setVoxelData(QByteArray voxelData);
-    virtual const QByteArray getVoxelData() const;
+    virtual void setVoxelData(const QByteArray& voxelData);
+    virtual QByteArray getVoxelData() const;
 
     virtual int getOnCount() const { return 0; }
 
@@ -65,6 +65,8 @@ class PolyVoxEntityItem : public EntityItem {
         SURFACE_EDGED_CUBIC,
         SURFACE_EDGED_MARCHING_CUBES
     };
+    static bool isEdged(PolyVoxSurfaceStyle surfaceStyle);
+
 
     virtual void setVoxelSurfaceStyle(PolyVoxSurfaceStyle voxelSurfaceStyle) { _voxelSurfaceStyle = voxelSurfaceStyle; }
     // this other version of setVoxelSurfaceStyle is needed for SET_ENTITY_PROPERTY_FROM_PROPERTIES
@@ -77,75 +79,91 @@ class PolyVoxEntityItem : public EntityItem {
     static const QByteArray DEFAULT_VOXEL_DATA;
     static const PolyVoxSurfaceStyle DEFAULT_VOXEL_SURFACE_STYLE;
 
+    glm::vec3 voxelCoordsToWorldCoords(const glm::vec3& voxelCoords) const;
+    glm::vec3 worldCoordsToVoxelCoords(const glm::vec3& worldCoords) const;
+    glm::vec3 voxelCoordsToLocalCoords(const glm::vec3& voxelCoords) const;
+    glm::vec3 localCoordsToVoxelCoords(const glm::vec3& localCoords) const;
+
     // coords are in voxel-volume space
-    virtual bool setSphereInVolume(glm::vec3 center, float radius, uint8_t toValue) { return false; }
-    virtual bool setVoxelInVolume(glm::vec3 position, uint8_t toValue) { return false; }
-
-    virtual glm::vec3 voxelCoordsToWorldCoords(glm::vec3& voxelCoords) const { return glm::vec3(0.0f); }
-    virtual glm::vec3 worldCoordsToVoxelCoords(glm::vec3& worldCoords) const { return glm::vec3(0.0f); }
-    virtual glm::vec3 voxelCoordsToLocalCoords(glm::vec3& voxelCoords) const { return glm::vec3(0.0f); }
-    virtual glm::vec3 localCoordsToVoxelCoords(glm::vec3& localCoords) const { return glm::vec3(0.0f); }
-
+    virtual bool setSphereInVolume(const vec3& center, float radius, uint8_t toValue) { return false; }
+    virtual bool setVoxelInVolume(const vec3& position, uint8_t toValue) { return false; }
     // coords are in world-space
-    virtual bool setSphere(glm::vec3 center, float radius, uint8_t toValue) { return false; }
-    virtual bool setCapsule(glm::vec3 startWorldCoords, glm::vec3 endWorldCoords,
+    virtual bool setSphere(const vec3& center, float radius, uint8_t toValue) { return false; }
+    virtual bool setCapsule(const vec3& startWorldCoords, const vec3& endWorldCoords,
                             float radiusWorldCoords, uint8_t toValue) { return false; }
     virtual bool setAll(uint8_t toValue) { return false; }
-    virtual bool setCuboid(const glm::vec3& lowPosition, const glm::vec3& cuboidSize, int value) { return false; }
+    virtual bool setCuboid(const vec3& lowPosition, const vec3& cuboidSize, int value) { return false; }
 
-    virtual uint8_t getVoxel(int x, int y, int z) { return 0; }
-    virtual bool setVoxel(int x, int y, int z, uint8_t toValue) { return false; }
+    virtual uint8_t getVoxel(int x, int y, int z) const final { return getVoxel({ x, y, z }); }
+    virtual bool setVoxel(int x, int y, int z, uint8_t toValue) final{ return setVoxel({ x, y, z }, toValue); }
+
+    virtual uint8_t getVoxel(const ivec3& v) const { return 0; }
+    virtual bool setVoxel(const ivec3& v, uint8_t toValue) { return false; }
 
     static QByteArray makeEmptyVoxelData(quint16 voxelXSize = 16, quint16 voxelYSize = 16, quint16 voxelZSize = 16);
 
     static const QString DEFAULT_X_TEXTURE_URL;
-    virtual void setXTextureURL(const QString& xTextureURL);
+    void setXTextureURL(const QString& xTextureURL);
     QString getXTextureURL() const;
 
     static const QString DEFAULT_Y_TEXTURE_URL;
-    virtual void setYTextureURL(const QString& yTextureURL);
+    void setYTextureURL(const QString& yTextureURL);
     QString getYTextureURL() const;
 
     static const QString DEFAULT_Z_TEXTURE_URL;
-    virtual void setZTextureURL(const QString& zTextureURL);
+    void setZTextureURL(const QString& zTextureURL);
     QString getZTextureURL() const;
 
     virtual void setXNNeighborID(const EntityItemID& xNNeighborID);
     void setXNNeighborID(const QString& xNNeighborID);
-    virtual EntityItemID getXNNeighborID() const;
+    EntityItemID getXNNeighborID() const;
     virtual void setYNNeighborID(const EntityItemID& yNNeighborID);
     void setYNNeighborID(const QString& yNNeighborID);
-    virtual EntityItemID getYNNeighborID() const;
+    EntityItemID getYNNeighborID() const;
     virtual void setZNNeighborID(const EntityItemID& zNNeighborID);
     void setZNNeighborID(const QString& zNNeighborID);
-    virtual EntityItemID getZNNeighborID() const;
+    EntityItemID getZNNeighborID() const;
+
+    std::array<EntityItemID, 3> getNNeigborIDs() const;
+    
 
     virtual void setXPNeighborID(const EntityItemID& xPNeighborID);
     void setXPNeighborID(const QString& xPNeighborID);
-    virtual EntityItemID getXPNeighborID() const;
+    EntityItemID getXPNeighborID() const;
     virtual void setYPNeighborID(const EntityItemID& yPNeighborID);
     void setYPNeighborID(const QString& yPNeighborID);
-    virtual EntityItemID getYPNeighborID() const;
+    EntityItemID getYPNeighborID() const;
     virtual void setZPNeighborID(const EntityItemID& zPNeighborID);
     void setZPNeighborID(const QString& zPNeighborID);
-    virtual EntityItemID getZPNeighborID() const;
+    EntityItemID getZPNeighborID() const;
 
-    virtual void rebakeMesh() {};
+    std::array<EntityItemID, 3> getPNeigborIDs() const;
 
-    void setVoxelDataDirty(bool value) { withWriteLock([&] { _voxelDataDirty = value; }); }
-    virtual void recomputeMesh() {};
+    glm::vec3 getSurfacePositionAdjustment() const;
+
+    virtual ShapeType getShapeType() const override;
+    virtual bool shouldBePhysical() const override { return !isDead(); }
+
+    bool isEdged() const;
+
+    glm::mat4 voxelToWorldMatrix() const;
+    glm::mat4 worldToVoxelMatrix() const;
+    glm::mat4 voxelToLocalMatrix() const;
+    glm::mat4 localToVoxelMatrix() const;
 
  protected:
-    glm::vec3 _voxelVolumeSize; // this is always 3 bytes
+    void setVoxelDataDirty(bool value) { withWriteLock([&] { _voxelDataDirty = value; }); }
 
-    QByteArray _voxelData;
-    bool _voxelDataDirty; // _voxelData has changed, things that depend on it should be updated
+    glm::vec3 _voxelVolumeSize { DEFAULT_VOXEL_VOLUME_SIZE }; // this is always 3 bytes
 
-    PolyVoxSurfaceStyle _voxelSurfaceStyle;
+    QByteArray _voxelData { DEFAULT_VOXEL_DATA };
+    bool _voxelDataDirty { true }; // _voxelData has changed, things that depend on it should be updated
 
-    QString _xTextureURL;
-    QString _yTextureURL;
-    QString _zTextureURL;
+    PolyVoxSurfaceStyle _voxelSurfaceStyle { DEFAULT_VOXEL_SURFACE_STYLE };
+
+    QString _xTextureURL { DEFAULT_X_TEXTURE_URL };
+    QString _yTextureURL { DEFAULT_Y_TEXTURE_URL };
+    QString _zTextureURL { DEFAULT_Z_TEXTURE_URL };
 
     // for non-edged surface styles, these are used to compute the high-axis edges
     EntityItemID _xNNeighborID{UNKNOWN_ENTITY_ID};
diff --git a/libraries/entities/src/PropertyGroup.h b/libraries/entities/src/PropertyGroup.h
index f45d19f5eb..8a9d7e9158 100644
--- a/libraries/entities/src/PropertyGroup.h
+++ b/libraries/entities/src/PropertyGroup.h
@@ -55,10 +55,6 @@ public:
     /// returns true if something changed
     virtual bool setProperties(const EntityItemProperties& properties) = 0;
 
-    /// Override this in your derived class if you'd like to be informed when something about the state of the entity
-    /// has changed. This will be called with properties change or when new data is loaded from a stream
-    virtual void somethingChangedNotification() { }
-
     virtual EntityPropertyFlags getEntityProperties(EncodeBitstreamParams& params) const = 0;
         
     virtual void appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params, 
diff --git a/libraries/entities/src/ShapeEntityItem.cpp b/libraries/entities/src/ShapeEntityItem.cpp
index 018d8c568a..2771d22cdb 100644
--- a/libraries/entities/src/ShapeEntityItem.cpp
+++ b/libraries/entities/src/ShapeEntityItem.cpp
@@ -51,8 +51,16 @@ namespace entity {
     }
 }
 
+// hullShapeCalculator is a hook for external code that knows how to configure a ShapeInfo
+// for given entity::Shape and dimensions
+ShapeEntityItem::ShapeInfoCalculator hullShapeCalculator = nullptr;
+
+void ShapeEntityItem::setShapeInfoCalulator(ShapeEntityItem::ShapeInfoCalculator callback) {
+    hullShapeCalculator = callback;
+}
+
 ShapeEntityItem::Pointer ShapeEntityItem::baseFactory(const EntityItemID& entityID, const EntityItemProperties& properties) {
-    Pointer entity { new ShapeEntityItem(entityID) };
+    Pointer entity(new ShapeEntityItem(entityID), [](EntityItem* ptr) { ptr->deleteLater(); });
     entity->setProperties(properties);
     return entity;
 }
@@ -87,6 +95,7 @@ EntityItemProperties ShapeEntityItem::getProperties(EntityPropertyFlags desiredP
 }
 
 void ShapeEntityItem::setShape(const entity::Shape& shape) {
+    const entity::Shape prevShape = _shape;
     _shape = shape;
     switch (_shape) {
         case entity::Shape::Cube:
@@ -95,10 +104,23 @@ void ShapeEntityItem::setShape(const entity::Shape& shape) {
         case entity::Shape::Sphere:
             _type = EntityTypes::Sphere;
             break;
+        case entity::Shape::Circle:
+            // Circle is implicitly flat so we enforce flat dimensions
+            setDimensions(getDimensions());
+            break;
+        case entity::Shape::Quad:
+            // Quad is implicitly flat so we enforce flat dimensions
+            setDimensions(getDimensions());
+            break;
         default:
             _type = EntityTypes::Shape;
             break;
     }
+
+    if (_shape != prevShape) {
+        // Internally grabs writeLock
+        markDirtyFlags(Simulation::DIRTY_SHAPE);
+    }
 }
 
 bool ShapeEntityItem::setProperties(const EntityItemProperties& properties) {
@@ -160,12 +182,6 @@ void ShapeEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBit
     APPEND_ENTITY_PROPERTY(PROP_ALPHA, getAlpha());
 }
 
-// This value specifes how the shape should be treated by physics calculations.  
-// For now, all polys will act as spheres
-ShapeType ShapeEntityItem::getShapeType() const {
-    return (_shape == entity::Shape::Cube) ? SHAPE_TYPE_BOX : SHAPE_TYPE_ELLIPSOID;
-}
-
 void ShapeEntityItem::setColor(const rgbColor& value) {
     memcpy(_color, value, sizeof(rgbColor));
 }
@@ -188,6 +204,18 @@ void ShapeEntityItem::setColor(const QColor& value) {
     setAlpha(value.alpha());
 }
 
+void ShapeEntityItem::setDimensions(const glm::vec3& value) {
+    const float MAX_FLAT_DIMENSION = 0.0001f;
+	if ((_shape == entity::Shape::Circle || _shape == entity::Shape::Quad) && value.y > MAX_FLAT_DIMENSION) {
+        // enforce flatness in Y
+        glm::vec3 newDimensions = value;
+        newDimensions.y = MAX_FLAT_DIMENSION;
+        EntityItem::setDimensions(newDimensions);
+	} else {
+        EntityItem::setDimensions(value);
+    }
+}
+
 bool ShapeEntityItem::supportsDetailedRayIntersection() const {
     return _shape == entity::Sphere;
 }
@@ -223,10 +251,114 @@ bool ShapeEntityItem::findDetailedRayIntersection(const glm::vec3& origin, const
 void ShapeEntityItem::debugDump() const {
     quint64 now = usecTimestampNow();
     qCDebug(entities) << "SHAPE EntityItem id:" << getEntityItemID() << "---------------------------------------------";
-    qCDebug(entities) << "              shape:" << stringFromShape(_shape);
+    qCDebug(entities) << "               name:" << _name;
+    qCDebug(entities) << "              shape:" << stringFromShape(_shape) << " (EnumId: " << _shape << " )";
+    qCDebug(entities) << " collisionShapeType:" << ShapeInfo::getNameForShapeType(getShapeType());
     qCDebug(entities) << "              color:" << _color[0] << "," << _color[1] << "," << _color[2];
     qCDebug(entities) << "           position:" << debugTreeVector(getPosition());
     qCDebug(entities) << "         dimensions:" << debugTreeVector(getDimensions());
     qCDebug(entities) << "      getLastEdited:" << debugTime(getLastEdited(), now);
+    qCDebug(entities) << "SHAPE EntityItem Ptr:" << this;
+}
+
+void ShapeEntityItem::computeShapeInfo(ShapeInfo& info) {
+
+    // This will be called whenever DIRTY_SHAPE flag (set by dimension change, etc)
+    // is set.
+
+    const glm::vec3 entityDimensions = getDimensions();
+
+    switch (_shape){
+        case entity::Shape::Quad:
+            // Quads collide like flat Cubes
+        case entity::Shape::Cube: {
+            _collisionShapeType = SHAPE_TYPE_BOX;
+        }
+        break;
+        case entity::Shape::Sphere: {
+            float diameter = entityDimensions.x;
+            const float MIN_DIAMETER = 0.001f;
+            const float MIN_RELATIVE_SPHERICAL_ERROR = 0.001f;
+            if (diameter > MIN_DIAMETER
+                && fabsf(diameter - entityDimensions.y) / diameter < MIN_RELATIVE_SPHERICAL_ERROR
+                && fabsf(diameter - entityDimensions.z) / diameter < MIN_RELATIVE_SPHERICAL_ERROR) {
+
+                _collisionShapeType = SHAPE_TYPE_SPHERE;
+            } else {
+                _collisionShapeType = SHAPE_TYPE_ELLIPSOID;
+            }
+        }
+        break;
+        case entity::Shape::Circle:
+            // Circles collide like flat Cylinders
+        case entity::Shape::Cylinder: {
+            float diameter = entityDimensions.x;
+            const float MIN_DIAMETER = 0.001f;
+            const float MIN_RELATIVE_SPHERICAL_ERROR = 0.001f;
+            if (diameter > MIN_DIAMETER
+                && fabsf(diameter - entityDimensions.z) / diameter < MIN_RELATIVE_SPHERICAL_ERROR) {
+                _collisionShapeType = SHAPE_TYPE_CYLINDER_Y;
+            } else if (hullShapeCalculator) {
+                hullShapeCalculator(this, info);
+                _collisionShapeType = SHAPE_TYPE_SIMPLE_HULL;
+            } else {
+                // woops, someone forgot to hook up the hullShapeCalculator()!
+                // final fallback is ellipsoid
+                _collisionShapeType = SHAPE_TYPE_ELLIPSOID;
+            }
+        }
+        break;
+        case entity::Shape::Cone: {
+            if (hullShapeCalculator) {
+                hullShapeCalculator(this, info);
+                _collisionShapeType = SHAPE_TYPE_SIMPLE_HULL;
+            } else {
+                _collisionShapeType = SHAPE_TYPE_ELLIPSOID;
+            }
+        }
+        break;
+        // gons, ones, & angles built via GeometryCache::extrudePolygon
+        case entity::Shape::Triangle:
+        case entity::Shape::Hexagon:
+        case entity::Shape::Octagon: {
+            if (hullShapeCalculator) {
+                hullShapeCalculator(this, info);
+                _collisionShapeType = SHAPE_TYPE_SIMPLE_HULL;
+            } else {
+                _collisionShapeType = SHAPE_TYPE_ELLIPSOID;
+            }
+        }
+        break;
+        // hedrons built via GeometryCache::setUpFlatShapes
+        case entity::Shape::Tetrahedron:
+        case entity::Shape::Octahedron:
+        case entity::Shape::Dodecahedron:
+        case entity::Shape::Icosahedron: {
+            if ( hullShapeCalculator ) {
+                hullShapeCalculator(this, info);
+                _collisionShapeType = SHAPE_TYPE_SIMPLE_HULL;
+            } else {
+                _collisionShapeType = SHAPE_TYPE_ELLIPSOID;
+            }
+        }
+        break;
+        case entity::Shape::Torus: {
+            // Not in GeometryCache::buildShapes, unsupported.
+            _collisionShapeType = SHAPE_TYPE_ELLIPSOID;
+            //TODO handle this shape more correctly
+        }
+        break;
+        default: {
+            _collisionShapeType = SHAPE_TYPE_ELLIPSOID;
+        }
+        break;
+    }
+
+    EntityItem::computeShapeInfo(info);
+}
+
+// This value specifies how the shape should be treated by physics calculations.
+ShapeType ShapeEntityItem::getShapeType() const {
+    return _collisionShapeType;
 }
 
diff --git a/libraries/entities/src/ShapeEntityItem.h b/libraries/entities/src/ShapeEntityItem.h
index 96f69deb0c..20e36c88e6 100644
--- a/libraries/entities/src/ShapeEntityItem.h
+++ b/libraries/entities/src/ShapeEntityItem.h
@@ -34,7 +34,6 @@ namespace entity {
     ::QString stringFromShape(Shape shape);
 }
 
-
 class ShapeEntityItem : public EntityItem {
     using Pointer = std::shared_ptr<ShapeEntityItem>;
     static Pointer baseFactory(const EntityItemID& entityID, const EntityItemProperties& properties);
@@ -43,6 +42,9 @@ public:
     static EntityItemPointer sphereFactory(const EntityItemID& entityID, const EntityItemProperties& properties);
     static EntityItemPointer boxFactory(const EntityItemID& entityID, const EntityItemProperties& properties);
 
+    using ShapeInfoCalculator = std::function<void( const ShapeEntityItem * const shapeEntity, ShapeInfo& info)>;
+    static void setShapeInfoCalulator(ShapeInfoCalculator callback);
+
     ShapeEntityItem(const EntityItemID& entityItemID);
 
     void pureVirtualFunctionPlaceHolder() override { };
@@ -78,13 +80,14 @@ public:
     const rgbColor& getColor() const { return _color; }
     void setColor(const rgbColor& value);
 
+	void setDimensions(const glm::vec3& value) override;
+
     xColor getXColor() const;
     void setColor(const xColor& value);
 
     QColor getQColor() const;
     void setColor(const QColor& value);
 
-    ShapeType getShapeType() const override;
     bool shouldBePhysical() const override { return !isDead(); }
     
     bool supportsDetailedRayIntersection() const override;
@@ -95,11 +98,19 @@ public:
 
     void debugDump() const override;
 
+    virtual void computeShapeInfo(ShapeInfo& info) override;
+    virtual ShapeType getShapeType() const override;
+
 protected:
 
     float _alpha { 1 };
     rgbColor _color;
     entity::Shape _shape { entity::Shape::Sphere };
+
+    //! This is SHAPE_TYPE_ELLIPSOID rather than SHAPE_TYPE_NONE to maintain
+    //! prior functionality where new or unsupported shapes are treated as
+    //! ellipsoids.
+    ShapeType _collisionShapeType{ ShapeType::SHAPE_TYPE_ELLIPSOID };
 };
 
 #endif // hifi_ShapeEntityItem_h
diff --git a/libraries/entities/src/SimpleEntitySimulation.cpp b/libraries/entities/src/SimpleEntitySimulation.cpp
index e406926141..3203c2968c 100644
--- a/libraries/entities/src/SimpleEntitySimulation.cpp
+++ b/libraries/entities/src/SimpleEntitySimulation.cpp
@@ -136,7 +136,7 @@ void SimpleEntitySimulation::sortEntitiesThatMoved() {
     SetOfEntities::iterator itemItr = _entitiesToSort.begin();
     while (itemItr != _entitiesToSort.end()) {
         EntityItemPointer entity = *itemItr;
-        entity->computePuffedQueryAACube();
+        entity->updateQueryAACube();
         ++itemItr;
     }
     EntitySimulation::sortEntitiesThatMoved();
diff --git a/libraries/entities/src/TextEntityItem.cpp b/libraries/entities/src/TextEntityItem.cpp
index 1d8cb50a4b..074691e1d4 100644
--- a/libraries/entities/src/TextEntityItem.cpp
+++ b/libraries/entities/src/TextEntityItem.cpp
@@ -30,7 +30,7 @@ const xColor TextEntityItem::DEFAULT_BACKGROUND_COLOR = { 0, 0, 0};
 const bool TextEntityItem::DEFAULT_FACE_CAMERA = false;
 
 EntityItemPointer TextEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
-    EntityItemPointer entity { new TextEntityItem(entityID) };
+    EntityItemPointer entity(new TextEntityItem(entityID), [](EntityItem* ptr) { ptr->deleteLater(); });
     entity->setProperties(properties);
     return entity;
 }
@@ -136,7 +136,7 @@ bool TextEntityItem::findDetailedRayIntersection(const glm::vec3& origin, const
     glm::vec2 xyDimensions(dimensions.x, dimensions.y);
     glm::quat rotation = getRotation();
     glm::vec3 position = getPosition() + rotation * 
-            (dimensions * (getRegistrationPoint() - ENTITY_ITEM_DEFAULT_REGISTRATION_POINT));
+            (dimensions * (ENTITY_ITEM_DEFAULT_REGISTRATION_POINT - getRegistrationPoint()));
 
     // FIXME - should set face and surfaceNormal
     return findRayRectangleIntersection(origin, direction, rotation, position, xyDimensions, distance);
diff --git a/libraries/entities/src/UpdateEntityOperator.cpp b/libraries/entities/src/UpdateEntityOperator.cpp
index ec6051af04..fa7e5ca38f 100644
--- a/libraries/entities/src/UpdateEntityOperator.cpp
+++ b/libraries/entities/src/UpdateEntityOperator.cpp
@@ -138,8 +138,8 @@ bool UpdateEntityOperator::preRecursion(const OctreeElementPointer& element) {
         qCDebug(entities) << "    _foundNew=" << _foundNew;
     }
 
-    // If we haven't yet found the old entity, and this subTreeContains our old
-    // entity, then we need to keep searching.
+    // If we haven't yet found the old element, and this subTreeContains our old element,
+    // then we need to keep searching.
     if (!_foundOld && subtreeContainsOld) {
 
         if (_wantDebug) {
@@ -169,11 +169,12 @@ bool UpdateEntityOperator::preRecursion(const OctreeElementPointer& element) {
                 // NOTE: we know we haven't yet added it to its new element because _removeOld is true
                 EntityTreeElementPointer oldElement = _existingEntity->getElement();
                 oldElement->removeEntityItem(_existingEntity);
-                _tree->setContainingElement(_entityItemID, NULL);
 
                 if (oldElement != _containingElement) {
                     qCDebug(entities) << "WARNING entity moved during UpdateEntityOperator recursion";
                     _containingElement->removeEntityItem(_existingEntity);
+                } else {
+                    _containingElement->bumpChangedContent();
                 }
 
                 if (_wantDebug) {
@@ -187,8 +188,8 @@ bool UpdateEntityOperator::preRecursion(const OctreeElementPointer& element) {
         }
     }
 
-    // If we haven't yet found the new entity,  and this subTreeContains our new
-    // entity, then we need to keep searching.
+    // If we haven't yet found the new element, and this subTreeContains our new element,
+    // then we need to keep searching.
     if (!_foundNew && subtreeContainsNew) {
 
         if (_wantDebug) {
@@ -212,6 +213,7 @@ bool UpdateEntityOperator::preRecursion(const OctreeElementPointer& element) {
                 if (_wantDebug) {
                     qCDebug(entities) << "    *** This is the same OLD ELEMENT ***";
                 }
+                _containingElement->bumpChangedContent();
             } else {
                 // otherwise, this is an add case.
                 if (oldElement) {
@@ -221,7 +223,6 @@ bool UpdateEntityOperator::preRecursion(const OctreeElementPointer& element) {
                     }
                 }
                 entityTreeElement->addEntityItem(_existingEntity);
-                _tree->setContainingElement(_entityItemID, entityTreeElement);
             }
             _foundNew = true; // we found the new element
             _removeOld = false; // and it has already been removed from the old
diff --git a/libraries/entities/src/WebEntityItem.cpp b/libraries/entities/src/WebEntityItem.cpp
index 61c6c8d80e..dd4bf518e0 100644
--- a/libraries/entities/src/WebEntityItem.cpp
+++ b/libraries/entities/src/WebEntityItem.cpp
@@ -24,7 +24,7 @@
 const QString WebEntityItem::DEFAULT_SOURCE_URL("http://www.google.com");
 
 EntityItemPointer WebEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
-    EntityItemPointer entity { new WebEntityItem(entityID) };
+    EntityItemPointer entity(new WebEntityItem(entityID), [](EntityItem* ptr) { ptr->deleteLater(); });
     entity->setProperties(properties);
     return entity;
 }
@@ -112,7 +112,7 @@ bool WebEntityItem::findDetailedRayIntersection(const glm::vec3& origin, const g
     glm::vec3 dimensions = getDimensions();
     glm::vec2 xyDimensions(dimensions.x, dimensions.y);
     glm::quat rotation = getRotation();
-    glm::vec3 position = getPosition() + rotation * (dimensions * (getRegistrationPoint() - ENTITY_ITEM_DEFAULT_REGISTRATION_POINT));
+    glm::vec3 position = getPosition() + rotation * (dimensions * (ENTITY_ITEM_DEFAULT_REGISTRATION_POINT - getRegistrationPoint()));
 
     if (findRayRectangleIntersection(origin, direction, rotation, position, xyDimensions, distance)) {
         surfaceNormal = rotation * Vectors::UNIT_Z;
diff --git a/libraries/entities/src/WebEntityItem.h b/libraries/entities/src/WebEntityItem.h
index 44c2741db2..9e84a3a776 100644
--- a/libraries/entities/src/WebEntityItem.h
+++ b/libraries/entities/src/WebEntityItem.h
@@ -54,13 +54,9 @@ public:
     virtual void setSourceUrl(const QString& value);
     QString getSourceUrl() const;
 
-    virtual bool wantsHandControllerPointerEvents() const override { return true; }
-
     void setDPI(uint16_t value);
     uint16_t getDPI() const;
 
-    virtual QObject* getRootItem() { return nullptr; }
-
 protected:
     QString _sourceUrl;
     uint16_t _dpi;
diff --git a/libraries/entities/src/ZoneEntityItem.cpp b/libraries/entities/src/ZoneEntityItem.cpp
index 074437b6b2..8b3d22daaf 100644
--- a/libraries/entities/src/ZoneEntityItem.cpp
+++ b/libraries/entities/src/ZoneEntityItem.cpp
@@ -32,7 +32,7 @@ const bool ZoneEntityItem::DEFAULT_GHOSTING_ALLOWED = true;
 const QString ZoneEntityItem::DEFAULT_FILTER_URL = "";
 
 EntityItemPointer ZoneEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
-    EntityItemPointer entity { new ZoneEntityItem(entityID) };
+    EntityItemPointer entity(new ZoneEntityItem(entityID), [](EntityItem* ptr) { ptr->deleteLater(); });
     entity->setProperties(properties);
     return entity;
 }
@@ -49,8 +49,10 @@ ZoneEntityItem::ZoneEntityItem(const EntityItemID& entityItemID) : EntityItem(en
 EntityItemProperties ZoneEntityItem::getProperties(EntityPropertyFlags desiredProperties) const {
     EntityItemProperties properties = EntityItem::getProperties(desiredProperties); // get the properties from our base class
 
-    
-    _keyLightProperties.getProperties(properties);
+    // Contains a QString property, must be synchronized
+    withReadLock([&] {
+        _keyLightProperties.getProperties(properties);
+    });
     
     _stageProperties.getProperties(properties);
 
@@ -58,12 +60,18 @@ EntityItemProperties ZoneEntityItem::getProperties(EntityPropertyFlags desiredPr
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(compoundShapeURL, getCompoundShapeURL);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(backgroundMode, getBackgroundMode);
 
-    _skyboxProperties.getProperties(properties);
+    // Contains a QString property, must be synchronized
+    withReadLock([&] {
+        _skyboxProperties.getProperties(properties);
+    });
 
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(flyingAllowed, getFlyingAllowed);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(ghostingAllowed, getGhostingAllowed);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(filterURL, getFilterURL);
 
+    COPY_ENTITY_PROPERTY_TO_PROPERTIES(hazeMode, getHazeMode);
+    _hazeProperties.getProperties(properties);
+
     return properties;
 }
 
@@ -88,8 +96,10 @@ bool ZoneEntityItem::setProperties(const EntityItemProperties& properties) {
 bool ZoneEntityItem::setSubClassProperties(const EntityItemProperties& properties) {
     bool somethingChanged = EntityItem::setSubClassProperties(properties); // set the properties in our base class
 
-
-    _keyLightPropertiesChanged = _keyLightProperties.setProperties(properties);
+    // Contains a QString property, must be synchronized
+    withWriteLock([&] {
+        _keyLightPropertiesChanged = _keyLightProperties.setProperties(properties);
+    });
 
     _stagePropertiesChanged = _stageProperties.setProperties(properties);
 
@@ -97,14 +107,19 @@ bool ZoneEntityItem::setSubClassProperties(const EntityItemProperties& propertie
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(compoundShapeURL, setCompoundShapeURL);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(backgroundMode, setBackgroundMode);
 
+    // Contains a QString property, must be synchronized
+    withWriteLock([&] {
+        _skyboxPropertiesChanged = _skyboxProperties.setProperties(properties);
+    });
+
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(flyingAllowed, setFlyingAllowed);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(ghostingAllowed, setGhostingAllowed);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(filterURL, setFilterURL);
+	
+    SET_ENTITY_PROPERTY_FROM_PROPERTIES(hazeMode, setHazeMode);
+    _hazePropertiesChanged = _hazeProperties.setProperties(properties);
 
-    _skyboxPropertiesChanged = _skyboxProperties.setProperties(properties);
-
-    somethingChanged = somethingChanged || _keyLightPropertiesChanged || _stagePropertiesChanged || _skyboxPropertiesChanged;
-
+    somethingChanged = somethingChanged || _keyLightPropertiesChanged || _stagePropertiesChanged || _skyboxPropertiesChanged || _hazePropertiesChanged;
 
     return somethingChanged;
 }
@@ -116,8 +131,12 @@ int ZoneEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data,
     int bytesRead = 0;
     const unsigned char* dataAt = data;
 
-    int bytesFromKeylight = _keyLightProperties.readEntitySubclassDataFromBuffer(dataAt, (bytesLeftToRead - bytesRead), args,
-                                                                                 propertyFlags, overwriteLocalData, _keyLightPropertiesChanged);
+    int bytesFromKeylight;
+    withWriteLock([&] {
+        bytesFromKeylight = _keyLightProperties.readEntitySubclassDataFromBuffer(dataAt, (bytesLeftToRead - bytesRead), args,
+            propertyFlags, overwriteLocalData, _keyLightPropertiesChanged);
+    });
+
     somethingChanged = somethingChanged || _keyLightPropertiesChanged;
     bytesRead += bytesFromKeylight;
     dataAt += bytesFromKeylight;
@@ -132,8 +151,11 @@ int ZoneEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data,
     READ_ENTITY_PROPERTY(PROP_COMPOUND_SHAPE_URL, QString, setCompoundShapeURL);
     READ_ENTITY_PROPERTY(PROP_BACKGROUND_MODE, BackgroundMode, setBackgroundMode);
 
-    int bytesFromSkybox = _skyboxProperties.readEntitySubclassDataFromBuffer(dataAt, (bytesLeftToRead - bytesRead), args, 
-                                                                           propertyFlags, overwriteLocalData, _skyboxPropertiesChanged);
+    int bytesFromSkybox;
+    withWriteLock([&] {
+        bytesFromSkybox = _skyboxProperties.readEntitySubclassDataFromBuffer(dataAt, (bytesLeftToRead - bytesRead), args,
+            propertyFlags, overwriteLocalData, _skyboxPropertiesChanged);
+    });
     somethingChanged = somethingChanged || _skyboxPropertiesChanged;
     bytesRead += bytesFromSkybox;
     dataAt += bytesFromSkybox;
@@ -142,6 +164,15 @@ int ZoneEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data,
     READ_ENTITY_PROPERTY(PROP_GHOSTING_ALLOWED, bool, setGhostingAllowed);
     READ_ENTITY_PROPERTY(PROP_FILTER_URL, QString, setFilterURL);
 
+    READ_ENTITY_PROPERTY(PROP_HAZE_MODE, uint32_t, setHazeMode);
+
+    int bytesFromHaze = _hazeProperties.readEntitySubclassDataFromBuffer(dataAt, (bytesLeftToRead - bytesRead), args,
+        propertyFlags, overwriteLocalData, _hazePropertiesChanged);
+
+    somethingChanged = somethingChanged || _hazePropertiesChanged;
+    bytesRead += bytesFromHaze;
+    dataAt += bytesFromHaze;
+
     return bytesRead;
 }
 
@@ -150,18 +181,27 @@ int ZoneEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data,
 EntityPropertyFlags ZoneEntityItem::getEntityProperties(EncodeBitstreamParams& params) const {
     EntityPropertyFlags requestedProperties = EntityItem::getEntityProperties(params);
 
-    requestedProperties += _keyLightProperties.getEntityProperties(params);
+    withReadLock([&] {
+        requestedProperties += _keyLightProperties.getEntityProperties(params);
+    });
+
+    requestedProperties += _stageProperties.getEntityProperties(params);
 
     requestedProperties += PROP_SHAPE_TYPE;
     requestedProperties += PROP_COMPOUND_SHAPE_URL;
     requestedProperties += PROP_BACKGROUND_MODE;
-    requestedProperties += _stageProperties.getEntityProperties(params);
-    requestedProperties += _skyboxProperties.getEntityProperties(params);
+
+    withReadLock([&] {
+        requestedProperties += _skyboxProperties.getEntityProperties(params);
+    });
 
     requestedProperties += PROP_FLYING_ALLOWED;
     requestedProperties += PROP_GHOSTING_ALLOWED;
     requestedProperties += PROP_FILTER_URL;
 
+    requestedProperties += PROP_HAZE_MODE;
+    requestedProperties += _hazeProperties.getEntityProperties(params);
+
     return requestedProperties;
 }
 
@@ -187,21 +227,15 @@ void ZoneEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBits
     APPEND_ENTITY_PROPERTY(PROP_BACKGROUND_MODE, (uint32_t)getBackgroundMode()); // could this be a uint16??
 
     _skyboxProperties.appendSubclassData(packetData, params, modelTreeElementExtraEncodeData, requestedProperties,
-                                    propertyFlags, propertiesDidntFit, propertyCount, appendState);
+        propertyFlags, propertiesDidntFit, propertyCount, appendState);
 
     APPEND_ENTITY_PROPERTY(PROP_FLYING_ALLOWED, getFlyingAllowed());
     APPEND_ENTITY_PROPERTY(PROP_GHOSTING_ALLOWED, getGhostingAllowed());
     APPEND_ENTITY_PROPERTY(PROP_FILTER_URL, getFilterURL());
-}
 
-void ZoneEntityItem::somethingChangedNotification() {
-    EntityItem::somethingChangedNotification();
-    withWriteLock([&] {
-        _keyLightPropertiesChanged = false;
-        _backgroundPropertiesChanged = false;
-        _stagePropertiesChanged = false;
-        _skyboxPropertiesChanged = false;
-    });
+    APPEND_ENTITY_PROPERTY(PROP_HAZE_MODE, (uint32_t)getHazeMode());
+    _hazeProperties.appendSubclassData(packetData, params, modelTreeElementExtraEncodeData, requestedProperties,
+        propertyFlags, propertiesDidntFit, propertyCount, appendState);
 }
 
 void ZoneEntityItem::debugDump() const {
@@ -211,10 +245,12 @@ void ZoneEntityItem::debugDump() const {
     qCDebug(entities) << "                dimensions:" << debugTreeVector(getDimensions());
     qCDebug(entities) << "             getLastEdited:" << debugTime(getLastEdited(), now);
     qCDebug(entities) << "               _backgroundMode:" << EntityItemProperties::getBackgroundModeString(_backgroundMode);
+    qCDebug(entities) << "               _hazeMode:" << EntityItemProperties::getHazeModeString(_hazeMode);
 
     _keyLightProperties.debugDump();
-    _stageProperties.debugDump();
     _skyboxProperties.debugDump();
+    _hazeProperties.debugDump();
+    _stageProperties.debugDump();
 }
 
 ShapeType ZoneEntityItem::getShapeType() const {
@@ -273,3 +309,24 @@ QString ZoneEntityItem::getCompoundShapeURL() const {
     });
     return result;
 }
+
+void ZoneEntityItem::resetRenderingPropertiesChanged() {
+    withWriteLock([&] {
+        _keyLightPropertiesChanged = false;
+        _backgroundPropertiesChanged = false;
+        _skyboxPropertiesChanged = false;
+        _hazePropertiesChanged = false;
+        _stagePropertiesChanged = false;
+    });
+}
+
+void ZoneEntityItem::setHazeMode(const uint32_t value) {
+    if (value < COMPONENT_MODE_ITEM_COUNT) {
+        _hazeMode = value;
+        _hazePropertiesChanged = true;
+    }
+}
+
+uint32_t ZoneEntityItem::getHazeMode() const {
+    return _hazeMode;
+}
diff --git a/libraries/entities/src/ZoneEntityItem.h b/libraries/entities/src/ZoneEntityItem.h
index bcb690f60e..46e8a00c24 100644
--- a/libraries/entities/src/ZoneEntityItem.h
+++ b/libraries/entities/src/ZoneEntityItem.h
@@ -16,7 +16,9 @@
 #include "EntityItem.h"
 #include "EntityTree.h"
 #include "SkyboxPropertyGroup.h"
+#include "HazePropertyGroup.h"
 #include "StagePropertyGroup.h"
+#include <ComponentMode.h>
 
 class ZoneEntityItem : public EntityItem {
 public:
@@ -34,11 +36,6 @@ public:
     // TODO: eventually only include properties changed since the params.nodeData->getLastTimeBagEmpty() time
     virtual EntityPropertyFlags getEntityProperties(EncodeBitstreamParams& params) const override;
 
-    /// Override this in your derived class if you'd like to be informed when something about the state of the entity
-    /// has changed. This will be called with properties change or when new data is loaded from a stream
-    /// Overriding this function to capture the information that a keylight / Ambient / skybox  properties has changed
-    virtual void somethingChangedNotification() override;
-
     virtual void appendSubclassData(OctreePacketData* packetData, EncodeBitstreamParams& params,
                                     EntityTreeElementExtraEncodeDataPointer modelTreeElementExtraEncodeData,
                                     EntityPropertyFlags& requestedProperties,
@@ -60,20 +57,26 @@ public:
     static bool getDrawZoneBoundaries() { return _drawZoneBoundaries; }
     static void setDrawZoneBoundaries(bool value) { _drawZoneBoundaries = value; }
 
-    virtual bool isReadyToComputeShape() override { return false; }
-    void setShapeType(ShapeType type) override { _shapeType = type; }
+    virtual bool isReadyToComputeShape() const override { return false; }
+    void setShapeType(ShapeType type) override { withWriteLock([&] { _shapeType = type; }); }
     virtual ShapeType getShapeType() const override;
 
     virtual bool hasCompoundShapeURL() const;
     QString getCompoundShapeURL() const;
     virtual void setCompoundShapeURL(const QString& url);
 
-    const KeyLightPropertyGroup& getKeyLightProperties() const { return _keyLightProperties; }
+    KeyLightPropertyGroup getKeyLightProperties() const { return resultWithReadLock<KeyLightPropertyGroup>([&] { return _keyLightProperties; }); }
 
     void setBackgroundMode(BackgroundMode value) { _backgroundMode = value; _backgroundPropertiesChanged = true; }
     BackgroundMode getBackgroundMode() const { return _backgroundMode; }
 
-    const SkyboxPropertyGroup& getSkyboxProperties() const { return _skyboxProperties; }
+    void setHazeMode(const uint32_t value);
+    uint32_t getHazeMode() const;
+
+    SkyboxPropertyGroup getSkyboxProperties() const { return resultWithReadLock<SkyboxPropertyGroup>([&] { return _skyboxProperties; }); }
+    
+    const HazePropertyGroup& getHazeProperties() const { return _hazeProperties; }
+
     const StagePropertyGroup& getStageProperties() const { return _stageProperties; }
 
     bool getFlyingAllowed() const { return _flyingAllowed; }
@@ -83,6 +86,18 @@ public:
     QString getFilterURL() const;
     void setFilterURL(const QString url); 
 
+    bool keyLightPropertiesChanged() const { return _keyLightPropertiesChanged; }
+    bool backgroundPropertiesChanged() const { return _backgroundPropertiesChanged; }
+    bool skyboxPropertiesChanged() const { return _skyboxPropertiesChanged; }
+
+    bool hazePropertiesChanged() const { 
+        return _hazePropertiesChanged; 
+    }
+
+    bool stagePropertiesChanged() const { return _stagePropertiesChanged; }
+
+    void resetRenderingPropertiesChanged();
+
     virtual bool supportsDetailedRayIntersection() const override { return true; }
     virtual bool findDetailedRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
                          bool& keepSearching, OctreeElementPointer& element, float& distance,
@@ -97,6 +112,8 @@ public:
     static const bool DEFAULT_GHOSTING_ALLOWED;
     static const QString DEFAULT_FILTER_URL;
 
+    static const uint32_t DEFAULT_HAZE_MODE{ (uint32_t)COMPONENT_MODE_INHERIT };
+
 protected:
     KeyLightPropertyGroup _keyLightProperties;
 
@@ -105,19 +122,21 @@ protected:
 
     BackgroundMode _backgroundMode = BACKGROUND_MODE_INHERIT;
 
-    StagePropertyGroup _stageProperties;
+    uint32_t _hazeMode{ DEFAULT_HAZE_MODE };
+
     SkyboxPropertyGroup _skyboxProperties;
+    HazePropertyGroup _hazeProperties;
+    StagePropertyGroup _stageProperties;
 
     bool _flyingAllowed { DEFAULT_FLYING_ALLOWED };
     bool _ghostingAllowed { DEFAULT_GHOSTING_ALLOWED };
     QString _filterURL { DEFAULT_FILTER_URL };
 
     // Dirty flags turn true when either keylight properties is changing values.
-    // This gets back to false in the somethingChangedNotification() call
-    // Which is called after a setProperties() or a readEntitySubClassFromBUfferCall on the entity.
     bool _keyLightPropertiesChanged { false };
-    bool _backgroundPropertiesChanged { false };
+    bool _backgroundPropertiesChanged{ false };
     bool _skyboxPropertiesChanged { false };
+    bool _hazePropertiesChanged{ false };
     bool _stagePropertiesChanged { false };
 
     static bool _drawZoneBoundaries;
diff --git a/libraries/fbx/CMakeLists.txt b/libraries/fbx/CMakeLists.txt
index d9c073f213..7cead5aa4f 100644
--- a/libraries/fbx/CMakeLists.txt
+++ b/libraries/fbx/CMakeLists.txt
@@ -1,4 +1,10 @@
 set(TARGET_NAME fbx)
 setup_hifi_library()
-link_hifi_libraries(shared model networking)
-include_hifi_library_headers(gpu)
+
+link_hifi_libraries(shared model networking image)
+include_hifi_library_headers(gpu image)
+
+add_dependency_external_projects(draco)
+find_package(Draco REQUIRED)
+target_include_directories(${TARGET_NAME} SYSTEM PRIVATE ${DRACO_INCLUDE_DIRS})
+target_link_libraries(${TARGET_NAME} ${DRACO_LIBRARY} ${DRACO_ENCODER_LIBRARY})
diff --git a/libraries/fbx/src/FBX.h b/libraries/fbx/src/FBX.h
new file mode 100644
index 0000000000..7d3328a2dd
--- /dev/null
+++ b/libraries/fbx/src/FBX.h
@@ -0,0 +1,345 @@
+//
+//  FBX.h
+//  libraries/fbx/src
+//
+//  Created by Ryan Huffman on 9/5/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_FBX_h_
+#define hifi_FBX_h_
+
+#include <QMetaType>
+#include <QSet>
+#include <QUrl>
+#include <QVarLengthArray>
+#include <QVariant>
+#include <QVector>
+
+#include <glm/glm.hpp>
+#include <glm/gtc/quaternion.hpp>
+
+#include <Extents.h>
+#include <Transform.h>
+
+#include <model/Geometry.h>
+#include <model/Material.h>
+
+static const QByteArray FBX_BINARY_PROLOG = "Kaydara FBX Binary  ";
+static const int FBX_HEADER_BYTES_BEFORE_VERSION = 23;
+static const quint32 FBX_VERSION_2015 = 7400;
+static const quint32 FBX_VERSION_2016 = 7500;
+
+static const int DRACO_BEGIN_CUSTOM_HIFI_ATTRIBUTES = 1000;
+static const int DRACO_ATTRIBUTE_MATERIAL_ID = DRACO_BEGIN_CUSTOM_HIFI_ATTRIBUTES;
+static const int DRACO_ATTRIBUTE_TEX_COORD_1 = DRACO_BEGIN_CUSTOM_HIFI_ATTRIBUTES + 1;
+static const int DRACO_ATTRIBUTE_ORIGINAL_INDEX = DRACO_BEGIN_CUSTOM_HIFI_ATTRIBUTES + 2;
+
+static const int32_t FBX_PROPERTY_UNCOMPRESSED_FLAG = 0;
+static const int32_t FBX_PROPERTY_COMPRESSED_FLAG = 1;
+
+class FBXNode;
+using FBXNodeList = QList<FBXNode>;
+
+
+/// A node within an FBX document.
+class FBXNode {
+public:
+    QByteArray name;
+    QVariantList properties;
+    FBXNodeList children;
+};
+
+
+/// A single blendshape extracted from an FBX document.
+class FBXBlendshape {
+public:
+    QVector<int> indices;
+    QVector<glm::vec3> vertices;
+    QVector<glm::vec3> normals;
+};
+
+struct FBXJointShapeInfo {
+    // same units and frame as FBXJoint.translation
+    glm::vec3 avgPoint;
+    std::vector<float> dots;
+    std::vector<glm::vec3> points;
+    std::vector<glm::vec3> debugLines;
+};
+
+/// A single joint (transformation node) extracted from an FBX document.
+class FBXJoint {
+public:
+
+    FBXJointShapeInfo shapeInfo;
+    QVector<int> freeLineage;
+    bool isFree;
+    int parentIndex;
+    float distanceToParent;
+
+    // http://download.autodesk.com/us/fbx/20112/FBX_SDK_HELP/SDKRef/a00209.html
+
+    glm::vec3 translation;   // T
+    glm::mat4 preTransform;  // Roff * Rp
+    glm::quat preRotation;   // Rpre
+    glm::quat rotation;      // R
+    glm::quat postRotation;  // Rpost
+    glm::mat4 postTransform; // Rp-1 * Soff * Sp * S * Sp-1
+
+    // World = ParentWorld * T * (Roff * Rp) * Rpre * R * Rpost * (Rp-1 * Soff * Sp * S * Sp-1)
+
+    glm::mat4 transform;
+    glm::vec3 rotationMin;  // radians
+    glm::vec3 rotationMax;  // radians
+    glm::quat inverseDefaultRotation;
+    glm::quat inverseBindRotation;
+    glm::mat4 bindTransform;
+    QString name;
+    bool isSkeletonJoint;
+    bool bindTransformFoundInCluster;
+
+    // geometric offset is applied in local space but does NOT affect children.
+    bool hasGeometricOffset;
+    glm::vec3 geometricTranslation;
+    glm::quat geometricRotation;
+    glm::vec3 geometricScaling;
+};
+
+
+/// A single binding to a joint in an FBX document.
+class FBXCluster {
+public:
+
+    int jointIndex;
+    glm::mat4 inverseBindMatrix;
+};
+
+const int MAX_NUM_PIXELS_FOR_FBX_TEXTURE = 2048 * 2048;
+
+/// A texture map in an FBX document.
+class FBXTexture {
+public:
+    QString id;
+    QString name;
+    QByteArray filename;
+    QByteArray content;
+
+    Transform transform;
+    int maxNumPixels { MAX_NUM_PIXELS_FOR_FBX_TEXTURE };
+    int texcoordSet;
+    QString texcoordSetName;
+
+    bool isBumpmap{ false };
+
+    bool isNull() const { return name.isEmpty() && filename.isEmpty() && content.isEmpty(); }
+};
+
+/// A single part of a mesh (with the same material).
+class FBXMeshPart {
+public:
+
+    QVector<int> quadIndices; // original indices from the FBX mesh
+    QVector<int> quadTrianglesIndices; // original indices from the FBX mesh of the quad converted as triangles
+    QVector<int> triangleIndices; // original indices from the FBX mesh
+
+    QString materialID;
+};
+
+class FBXMaterial {
+public:
+    FBXMaterial() {};
+    FBXMaterial(const glm::vec3& diffuseColor, const glm::vec3& specularColor, const glm::vec3& emissiveColor,
+         float shininess, float opacity) :
+        diffuseColor(diffuseColor),
+        specularColor(specularColor),
+        emissiveColor(emissiveColor),
+        shininess(shininess),
+        opacity(opacity)  {}
+
+    void getTextureNames(QSet<QString>& textureList) const;
+    void setMaxNumPixelsPerTexture(int maxNumPixels);
+
+    glm::vec3 diffuseColor{ 1.0f };
+    float diffuseFactor{ 1.0f };
+    glm::vec3 specularColor{ 0.02f };
+    float specularFactor{ 1.0f };
+
+    glm::vec3 emissiveColor{ 0.0f };
+    float emissiveFactor{ 0.0f };
+
+    float shininess{ 23.0f };
+    float opacity{ 1.0f };
+
+    float metallic{ 0.0f };
+    float roughness{ 1.0f };
+    float emissiveIntensity{ 1.0f };
+    float ambientFactor{ 1.0f };
+
+    QString materialID;
+    QString name;
+    QString shadingModel;
+    model::MaterialPointer _material;
+
+    FBXTexture normalTexture;
+    FBXTexture albedoTexture;
+    FBXTexture opacityTexture;
+    FBXTexture glossTexture;
+    FBXTexture roughnessTexture;
+    FBXTexture specularTexture;
+    FBXTexture metallicTexture;
+    FBXTexture emissiveTexture;
+    FBXTexture occlusionTexture;
+    FBXTexture scatteringTexture;
+    FBXTexture lightmapTexture;
+    glm::vec2 lightmapParams{ 0.0f, 1.0f };
+
+
+    bool isPBSMaterial{ false };
+    // THe use XXXMap are not really used to drive which map are going or not, debug only
+    bool useNormalMap{ false };
+    bool useAlbedoMap{ false };
+    bool useOpacityMap{ false };
+    bool useRoughnessMap{ false };
+    bool useSpecularMap{ false };
+    bool useMetallicMap{ false };
+    bool useEmissiveMap{ false };
+    bool useOcclusionMap{ false };
+
+    bool needTangentSpace() const;
+};
+
+/// A single mesh (with optional blendshapes) extracted from an FBX document.
+class FBXMesh {
+public:
+
+    QVector<FBXMeshPart> parts;
+
+    QVector<glm::vec3> vertices;
+    QVector<glm::vec3> normals;
+    QVector<glm::vec3> tangents;
+    QVector<glm::vec3> colors;
+    QVector<glm::vec2> texCoords;
+    QVector<glm::vec2> texCoords1;
+    QVector<uint16_t> clusterIndices;
+    QVector<uint8_t> clusterWeights;
+    QVector<int32_t> originalIndices;
+
+    QVector<FBXCluster> clusters;
+
+    Extents meshExtents;
+    glm::mat4 modelTransform;
+
+    QVector<FBXBlendshape> blendshapes;
+
+    unsigned int meshIndex; // the order the meshes appeared in the object file
+
+    model::MeshPointer _mesh;
+    bool wasCompressed { false };
+};
+
+class ExtractedMesh {
+public:
+    FBXMesh mesh;
+    QMultiHash<int, int> newIndices;
+    QVector<QHash<int, int> > blendshapeIndexMaps;
+    QVector<QPair<int, int> > partMaterialTextures;
+    QHash<QString, size_t> texcoordSetMap;
+};
+
+/// A single animation frame extracted from an FBX document.
+class FBXAnimationFrame {
+public:
+    QVector<glm::quat> rotations;
+    QVector<glm::vec3> translations;
+};
+
+/// A light in an FBX document.
+class FBXLight {
+public:
+    QString name;
+    Transform transform;
+    float intensity;
+    float fogValue;
+    glm::vec3 color;
+
+    FBXLight() :
+        name(),
+        transform(),
+        intensity(1.0f),
+        fogValue(0.0f),
+        color(1.0f)
+    {}
+};
+
+Q_DECLARE_METATYPE(FBXAnimationFrame)
+Q_DECLARE_METATYPE(QVector<FBXAnimationFrame>)
+
+/// A set of meshes extracted from an FBX document.
+class FBXGeometry {
+public:
+    using Pointer = std::shared_ptr<FBXGeometry>;
+
+    QString originalURL;
+    QString author;
+    QString applicationName; ///< the name of the application that generated the model
+
+    QVector<FBXJoint> joints;
+    QHash<QString, int> jointIndices; ///< 1-based, so as to more easily detect missing indices
+    bool hasSkeletonJoints;
+
+    QVector<FBXMesh> meshes;
+
+    QHash<QString, FBXMaterial> materials;
+
+    glm::mat4 offset; // This includes offset, rotation, and scale as specified by the FST file
+
+    int leftEyeJointIndex = -1;
+    int rightEyeJointIndex = -1;
+    int neckJointIndex = -1;
+    int rootJointIndex = -1;
+    int leanJointIndex = -1;
+    int headJointIndex = -1;
+    int leftHandJointIndex = -1;
+    int rightHandJointIndex = -1;
+    int leftToeJointIndex = -1;
+    int rightToeJointIndex = -1;
+
+    float leftEyeSize = 0.0f;  // Maximum mesh extents dimension
+    float rightEyeSize = 0.0f;
+
+    QVector<int> humanIKJointIndices;
+
+    glm::vec3 palmDirection;
+
+    glm::vec3 neckPivot;
+
+    Extents bindExtents;
+    Extents meshExtents;
+
+    QVector<FBXAnimationFrame> animationFrames;
+
+    int getJointIndex(const QString& name) const { return jointIndices.value(name) - 1; }
+    QStringList getJointNames() const;
+
+    bool hasBlendedMeshes() const;
+
+    /// Returns the unscaled extents of the model's mesh
+    Extents getUnscaledMeshExtents() const;
+
+    bool convexHullContains(const glm::vec3& point) const;
+
+    QHash<int, QString> meshIndicesToModelNames;
+
+    /// given a meshIndex this will return the name of the model that mesh belongs to if known
+    QString getModelNameOfMesh(int meshIndex) const;
+
+    QList<QString> blendshapeChannelNames;
+};
+
+Q_DECLARE_METATYPE(FBXGeometry)
+Q_DECLARE_METATYPE(FBXGeometry::Pointer)
+
+#endif // hifi_FBX_h_
diff --git a/libraries/fbx/src/FBXReader.cpp b/libraries/fbx/src/FBXReader.cpp
index 6d4f586c52..e4fea00a34 100644
--- a/libraries/fbx/src/FBXReader.cpp
+++ b/libraries/fbx/src/FBXReader.cpp
@@ -168,7 +168,8 @@ QString getID(const QVariantList& properties, int index = 0) {
     return processID(properties.at(index).toString());
 }
 
-const char* HUMANIK_JOINTS[] = {
+/// The names of the joints in the Maya HumanIK rig
+static const std::array<const char*, 16> HUMANIK_JOINTS = {{
     "RightHand",
     "RightForeArm",
     "RightArm",
@@ -184,9 +185,8 @@ const char* HUMANIK_JOINTS[] = {
     "RightLeg",
     "LeftLeg",
     "RightFoot",
-    "LeftFoot",
-    ""
-};
+    "LeftFoot"
+}};
 
 class FBXModel {
 public:
@@ -468,7 +468,7 @@ QByteArray fileOnUrl(const QByteArray& filepath, const QString& url) {
 }
 
 FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QString& url) {
-    const FBXNode& node = _fbxNode;
+    const FBXNode& node = _rootNode;
     QMap<QString, ExtractedMesh> meshes;
     QHash<QString, QString> modelIDsToNames;
     QHash<QString, int> meshIDsToMeshIndices;
@@ -512,11 +512,8 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
 
 
     QVector<QString> humanIKJointNames;
-    for (int i = 0;; i++) {
+    for (int i = 0; i <  (int) HUMANIK_JOINTS.size(); i++) {
         QByteArray jointName = HUMANIK_JOINTS[i];
-        if (jointName.isEmpty()) {
-            break;
-        }
         humanIKJointNames.append(processID(getString(joints.value(jointName, jointName))));
     }
     QVector<QString> humanIKJointIDs(humanIKJointNames.size());
@@ -846,12 +843,14 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
                             QByteArray filename = subobject.properties.at(0).toByteArray();
                             QByteArray filepath = filename.replace('\\', '/');
                             filename = fileOnUrl(filepath, url);
+                            qDebug() << "Filename" << filepath << filename;
                             _textureFilepaths.insert(getID(object.properties), filepath);
                             _textureFilenames.insert(getID(object.properties), filename);
                         } else if (subobject.name == "TextureName" && subobject.properties.length() >= TEXTURE_NAME_MIN_SIZE) {
                             // trim the name from the timestamp
                             QString name = QString(subobject.properties.at(0).toByteArray());
                             name = name.left(name.indexOf('['));
+                            qDebug() << "Filename" << name;
                             _textureNames.insert(getID(object.properties), name);
                         } else if (subobject.name == "Texture_Alpha_Source" && subobject.properties.length() >= TEXTURE_ALPHA_SOURCE_MIN_SIZE) {
                             tex.assign<uint8_t>(tex.alphaSource, subobject.properties.at(0).value<int>());
@@ -940,7 +939,7 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
                     QByteArray content;
                     foreach (const FBXNode& subobject, object.children) {
                         if (subobject.name == "RelativeFilename") {
-                            filepath= subobject.properties.at(0).toByteArray();
+                            filepath = subobject.properties.at(0).toByteArray();
                             filepath = filepath.replace('\\', '/');
 
                         } else if (subobject.name == "Content" && !subobject.properties.isEmpty()) {
@@ -1682,8 +1681,8 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
                         int newIndex = it.value();
 
                         // remember vertices with at least 1/4 weight
-                        const float EXPANSION_WEIGHT_THRESHOLD = 0.99f;
-                        if (weight > EXPANSION_WEIGHT_THRESHOLD) {
+                        const float EXPANSION_WEIGHT_THRESHOLD = 0.25f;
+                        if (weight >= EXPANSION_WEIGHT_THRESHOLD) {
                             // transform to joint-frame and save for later
                             const glm::mat4 vertexTransform = meshToJoint * glm::translate(extracted.mesh.vertices.at(newIndex));
                             points.push_back(extractTranslation(vertexTransform) * clusterScale);
@@ -1788,6 +1787,7 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
                 avgPoint += points[j];
             }
             avgPoint /= (float)points.size();
+            joint.shapeInfo.avgPoint = avgPoint;
 
             // compute a k-Dop bounding volume
             for (uint32_t j = 0; j < cardinalDirections.size(); ++j) {
@@ -1803,8 +1803,11 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
                     }
                 }
                 joint.shapeInfo.points.push_back(avgPoint + maxDot * cardinalDirections[j]);
+                joint.shapeInfo.dots.push_back(maxDot);
                 joint.shapeInfo.points.push_back(avgPoint + minDot * cardinalDirections[j]);
+                joint.shapeInfo.dots.push_back(-minDot);
             }
+            generateBoundryLinesForDop14(joint.shapeInfo.dots, joint.shapeInfo.avgPoint, joint.shapeInfo.debugLines);
         }
     }
     geometry.palmDirection = parseVec3(mapping.value("palmDirection", "0, -1, 0").toString());
@@ -1836,9 +1839,11 @@ FBXGeometry* readFBX(const QByteArray& model, const QVariantHash& mapping, const
 
 FBXGeometry* readFBX(QIODevice* device, const QVariantHash& mapping, const QString& url, bool loadLightmaps, float lightmapLevel) {
     FBXReader reader;
-    reader._fbxNode = FBXReader::parseFBX(device);
+    reader._rootNode = FBXReader::parseFBX(device);
     reader._loadLightmaps = loadLightmaps;
     reader._lightmapLevel = lightmapLevel;
 
+    qDebug() << "Reading FBX: " << url;
+
     return reader.extractFBXGeometry(mapping, url);
 }
diff --git a/libraries/fbx/src/FBXReader.h b/libraries/fbx/src/FBXReader.h
index f73088e7a1..843a874a62 100644
--- a/libraries/fbx/src/FBXReader.h
+++ b/libraries/fbx/src/FBXReader.h
@@ -12,6 +12,8 @@
 #ifndef hifi_FBXReader_h
 #define hifi_FBXReader_h
 
+#include "FBX.h"
+
 #include <QMetaType>
 #include <QSet>
 #include <QUrl>
@@ -31,302 +33,6 @@
 class QIODevice;
 class FBXNode;
 
-typedef QList<FBXNode> FBXNodeList;
-
-/// The names of the joints in the Maya HumanIK rig, terminated with an empty string.
-extern const char* HUMANIK_JOINTS[];
-
-/// A node within an FBX document.
-class FBXNode {
-public:
-    
-    QByteArray name;
-    QVariantList properties;
-    FBXNodeList children;
-};
-
-/// A single blendshape extracted from an FBX document.
-class FBXBlendshape {
-public:
-    
-    QVector<int> indices;
-    QVector<glm::vec3> vertices;
-    QVector<glm::vec3> normals;
-};
-
-struct FBXJointShapeInfo {
-    // same units and frame as FBXJoint.translation
-    QVector<glm::vec3> points;
-};
-
-/// A single joint (transformation node) extracted from an FBX document.
-class FBXJoint {
-public:
-
-    FBXJointShapeInfo shapeInfo;
-    QVector<int> freeLineage;
-    bool isFree;
-    int parentIndex;
-    float distanceToParent;
-
-    // http://download.autodesk.com/us/fbx/20112/FBX_SDK_HELP/SDKRef/a00209.html
-
-    glm::vec3 translation;   // T
-    glm::mat4 preTransform;  // Roff * Rp
-    glm::quat preRotation;   // Rpre
-    glm::quat rotation;      // R
-    glm::quat postRotation;  // Rpost
-    glm::mat4 postTransform; // Rp-1 * Soff * Sp * S * Sp-1
-
-    // World = ParentWorld * T * (Roff * Rp) * Rpre * R * Rpost * (Rp-1 * Soff * Sp * S * Sp-1)
-
-    glm::mat4 transform;
-    glm::vec3 rotationMin;  // radians
-    glm::vec3 rotationMax;  // radians
-    glm::quat inverseDefaultRotation;
-    glm::quat inverseBindRotation;
-    glm::mat4 bindTransform;
-    QString name;
-    bool isSkeletonJoint;
-    bool bindTransformFoundInCluster;
-
-    // geometric offset is applied in local space but does NOT affect children.
-    bool hasGeometricOffset;
-    glm::vec3 geometricTranslation;
-    glm::quat geometricRotation;
-    glm::vec3 geometricScaling;
-};
-
-
-/// A single binding to a joint in an FBX document.
-class FBXCluster {
-public:
-
-    int jointIndex;
-    glm::mat4 inverseBindMatrix;
-};
-
-const int MAX_NUM_PIXELS_FOR_FBX_TEXTURE = 2048 * 2048;
-
-/// A texture map in an FBX document.
-class FBXTexture {
-public:
-    QString name;
-    QByteArray filename;
-    QByteArray content;
-
-    Transform transform;
-    int maxNumPixels { MAX_NUM_PIXELS_FOR_FBX_TEXTURE };
-    int texcoordSet;
-    QString texcoordSetName;
-
-    bool isBumpmap{ false };
-
-    bool isNull() const { return name.isEmpty() && filename.isEmpty() && content.isEmpty(); }
-};
-
-/// A single part of a mesh (with the same material).
-class FBXMeshPart {
-public:
-
-    QVector<int> quadIndices; // original indices from the FBX mesh
-    QVector<int> quadTrianglesIndices; // original indices from the FBX mesh of the quad converted as triangles
-    QVector<int> triangleIndices; // original indices from the FBX mesh
-
-    QString materialID;
-};
-
-class FBXMaterial {
-public:
-    FBXMaterial() {};
-    FBXMaterial(const glm::vec3& diffuseColor, const glm::vec3& specularColor, const glm::vec3& emissiveColor,
-         float shininess, float opacity) :
-        diffuseColor(diffuseColor),
-        specularColor(specularColor),
-        emissiveColor(emissiveColor),
-        shininess(shininess),
-        opacity(opacity)  {}
-
-    void getTextureNames(QSet<QString>& textureList) const;
-    void setMaxNumPixelsPerTexture(int maxNumPixels);
-
-    glm::vec3 diffuseColor{ 1.0f };
-    float diffuseFactor{ 1.0f };
-    glm::vec3 specularColor{ 0.02f };
-    float specularFactor{ 1.0f };
-
-    glm::vec3 emissiveColor{ 0.0f };
-    float emissiveFactor{ 0.0f };
-
-    float shininess{ 23.0f };
-    float opacity{ 1.0f };
-
-    float metallic{ 0.0f };
-    float roughness{ 1.0f };
-    float emissiveIntensity{ 1.0f };
-    float ambientFactor{ 1.0f };
-
-    QString materialID;
-    QString name;
-    QString shadingModel;
-    model::MaterialPointer _material;
-
-    FBXTexture normalTexture;
-    FBXTexture albedoTexture;
-    FBXTexture opacityTexture;
-    FBXTexture glossTexture;
-    FBXTexture roughnessTexture;
-    FBXTexture specularTexture;
-    FBXTexture metallicTexture;
-    FBXTexture emissiveTexture;
-    FBXTexture occlusionTexture;
-    FBXTexture scatteringTexture;
-    FBXTexture lightmapTexture;
-    glm::vec2 lightmapParams{ 0.0f, 1.0f };
-
-
-    bool isPBSMaterial{ false };
-    // THe use XXXMap are not really used to drive which map are going or not, debug only
-    bool useNormalMap{ false };
-    bool useAlbedoMap{ false };
-    bool useOpacityMap{ false };
-    bool useRoughnessMap{ false };
-    bool useSpecularMap{ false };
-    bool useMetallicMap{ false };
-    bool useEmissiveMap{ false };
-    bool useOcclusionMap{ false };
-
-    bool needTangentSpace() const;
-};
-
-/// A single mesh (with optional blendshapes) extracted from an FBX document.
-class FBXMesh {
-public:
-
-    QVector<FBXMeshPart> parts;
-    
-    QVector<glm::vec3> vertices;
-    QVector<glm::vec3> normals;
-    QVector<glm::vec3> tangents;
-    QVector<glm::vec3> colors;
-    QVector<glm::vec2> texCoords;
-    QVector<glm::vec2> texCoords1;
-    QVector<uint16_t> clusterIndices;
-    QVector<uint8_t> clusterWeights;
-
-    QVector<FBXCluster> clusters;
-
-    Extents meshExtents;
-    glm::mat4 modelTransform;
-
-    QVector<FBXBlendshape> blendshapes;
-
-    unsigned int meshIndex; // the order the meshes appeared in the object file
-
-    model::MeshPointer _mesh;
-};
-
-class ExtractedMesh {
-public:
-    FBXMesh mesh;
-    QMultiHash<int, int> newIndices;
-    QVector<QHash<int, int> > blendshapeIndexMaps;
-    QVector<QPair<int, int> > partMaterialTextures;
-    QHash<QString, size_t> texcoordSetMap;
-};
-
-/// A single animation frame extracted from an FBX document.
-class FBXAnimationFrame {
-public:
-    QVector<glm::quat> rotations;
-    QVector<glm::vec3> translations;
-};
-
-/// A light in an FBX document.
-class FBXLight {
-public:
-    QString name;
-    Transform transform;
-    float intensity;
-    float fogValue;
-    glm::vec3 color;
-
-    FBXLight() :
-        name(),
-        transform(),
-        intensity(1.0f),
-        fogValue(0.0f),
-        color(1.0f)
-    {}
-};
-
-Q_DECLARE_METATYPE(FBXAnimationFrame)
-Q_DECLARE_METATYPE(QVector<FBXAnimationFrame>)
-
-/// A set of meshes extracted from an FBX document.
-class FBXGeometry {
-public:
-    using Pointer = std::shared_ptr<FBXGeometry>;
-
-    QString originalURL;
-    QString author;
-    QString applicationName; ///< the name of the application that generated the model
-
-    QVector<FBXJoint> joints;
-    QHash<QString, int> jointIndices; ///< 1-based, so as to more easily detect missing indices
-    bool hasSkeletonJoints;
-    
-    QVector<FBXMesh> meshes;
-
-    QHash<QString, FBXMaterial> materials;
-
-    glm::mat4 offset; // This includes offset, rotation, and scale as specified by the FST file
-    
-    int leftEyeJointIndex = -1;
-    int rightEyeJointIndex = -1;
-    int neckJointIndex = -1;
-    int rootJointIndex = -1;
-    int leanJointIndex = -1;
-    int headJointIndex = -1;
-    int leftHandJointIndex = -1;
-    int rightHandJointIndex = -1;
-    int leftToeJointIndex = -1;
-    int rightToeJointIndex = -1;
-
-    float leftEyeSize = 0.0f;  // Maximum mesh extents dimension
-    float rightEyeSize = 0.0f;
-
-    QVector<int> humanIKJointIndices;
-    
-    glm::vec3 palmDirection;
-    
-    glm::vec3 neckPivot;
-    
-    Extents bindExtents;
-    Extents meshExtents;
-    
-    QVector<FBXAnimationFrame> animationFrames;
-        
-    int getJointIndex(const QString& name) const { return jointIndices.value(name) - 1; }
-    QStringList getJointNames() const;
-    
-    bool hasBlendedMeshes() const;
-
-    /// Returns the unscaled extents of the model's mesh
-    Extents getUnscaledMeshExtents() const;
-
-    bool convexHullContains(const glm::vec3& point) const;
-
-    QHash<int, QString> meshIndicesToModelNames;
-    
-    /// given a meshIndex this will return the name of the model that mesh belongs to if known
-    QString getModelNameOfMesh(int meshIndex) const;
-    
-    QList<QString> blendshapeChannelNames;
-};
-
-Q_DECLARE_METATYPE(FBXGeometry)
-Q_DECLARE_METATYPE(FBXGeometry::Pointer)
 
 /// Reads FBX geometry from the supplied model and mapping data.
 /// \exception QString if an error occurs in parsing
@@ -399,12 +105,12 @@ class FBXReader {
 public:
     FBXGeometry* _fbxGeometry;
 
-    FBXNode _fbxNode;
+    FBXNode _rootNode;
     static FBXNode parseFBX(QIODevice* device);
 
     FBXGeometry* extractFBXGeometry(const QVariantHash& mapping, const QString& url);
 
-    ExtractedMesh extractMesh(const FBXNode& object, unsigned int& meshIndex);
+    static ExtractedMesh extractMesh(const FBXNode& object, unsigned int& meshIndex, bool deduplicate = true);
     QHash<QString, ExtractedMesh> meshes;
     static void buildModelMesh(FBXMesh& extractedMesh, const QString& url);
 
diff --git a/libraries/fbx/src/FBXReader_Material.cpp b/libraries/fbx/src/FBXReader_Material.cpp
index ca2ec557b4..ef6496cd10 100644
--- a/libraries/fbx/src/FBXReader_Material.cpp
+++ b/libraries/fbx/src/FBXReader_Material.cpp
@@ -92,6 +92,7 @@ FBXTexture FBXReader::getTexture(const QString& textureID) {
         texture.filename = filepath;
     }
 
+    texture.id = textureID;
     texture.name = _textureNames.value(textureID);
     texture.transform.setIdentity();
     texture.texcoordSet = 0;
diff --git a/libraries/fbx/src/FBXReader_Mesh.cpp b/libraries/fbx/src/FBXReader_Mesh.cpp
index 4e153dfe3a..c64cbcc90d 100644
--- a/libraries/fbx/src/FBXReader_Mesh.cpp
+++ b/libraries/fbx/src/FBXReader_Mesh.cpp
@@ -9,6 +9,17 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#ifdef _WIN32
+#pragma warning( push )
+#pragma warning( disable : 4267 )
+#endif
+
+#include <draco/compression/decode.h>
+
+#ifdef _WIN32
+#pragma warning( pop )
+#endif
+
 #include <iostream>
 #include <QBuffer>
 #include <QDataStream>
@@ -73,7 +84,7 @@ public:
 };
 
 
-void appendIndex(MeshData& data, QVector<int>& indices, int index) {
+void appendIndex(MeshData& data, QVector<int>& indices, int index, bool deduplicate) {
     if (index >= data.polygonIndices.size()) {
         return;
     }
@@ -145,12 +156,13 @@ void appendIndex(MeshData& data, QVector<int>& indices, int index) {
     }
 
     QHash<Vertex, int>::const_iterator it = data.indices.find(vertex);
-    if (it == data.indices.constEnd()) {
+    if (!deduplicate || it == data.indices.constEnd()) {
         int newIndex = data.extracted.mesh.vertices.size();
         indices.append(newIndex);
         data.indices.insert(vertex, newIndex);
         data.extracted.newIndices.insert(vertexIndex, newIndex);
         data.extracted.mesh.vertices.append(position);
+        data.extracted.mesh.originalIndices.append(vertexIndex);
         data.extracted.mesh.normals.append(normal);
         data.extracted.mesh.texCoords.append(vertex.texCoord);
         if (hasColors) {
@@ -165,14 +177,20 @@ void appendIndex(MeshData& data, QVector<int>& indices, int index) {
     }
 }
 
-ExtractedMesh FBXReader::extractMesh(const FBXNode& object, unsigned int& meshIndex) {
+ExtractedMesh FBXReader::extractMesh(const FBXNode& object, unsigned int& meshIndex, bool deduplicate) {
     MeshData data;
     data.extracted.mesh.meshIndex = meshIndex++;
+
     QVector<int> materials;
     QVector<int> textures;
+
     bool isMaterialPerPolygon = false;
+
     static const QVariant BY_VERTICE = QByteArray("ByVertice");
     static const QVariant INDEX_TO_DIRECT = QByteArray("IndexToDirect");
+
+    bool isDracoMesh = false;
+
     foreach (const FBXNode& child, object.children) {
         if (child.name == "Vertices") {
             data.vertices = createVec3Vector(getDoubleVector(child));
@@ -304,8 +322,9 @@ ExtractedMesh FBXReader::extractMesh(const FBXNode& object, unsigned int& meshIn
                 if (subdata.name == "Materials") {
                     materials = getIntVector(subdata);
                 } else if (subdata.name == "MappingInformationType") {
-                    if (subdata.properties.at(0) == BY_POLYGON)
+                    if (subdata.properties.at(0) == BY_POLYGON) {
                         isMaterialPerPolygon = true;
+                    }
                 } else {
                     isMaterialPerPolygon = false;
                 }
@@ -318,70 +337,206 @@ ExtractedMesh FBXReader::extractMesh(const FBXNode& object, unsigned int& meshIn
                     textures = getIntVector(subdata);
                 }
             }
-        }
-    }
+        } else if (child.name == "DracoMesh") {
+            isDracoMesh = true;
+            data.extracted.mesh.wasCompressed = true;
 
-    bool isMultiMaterial = false;
-    if (isMaterialPerPolygon) {
-        isMultiMaterial = true;
-    }
-    // TODO: make excellent use of isMultiMaterial
-    Q_UNUSED(isMultiMaterial);
+            // load the draco mesh from the FBX and create a draco::Mesh
+            draco::Decoder decoder;
+            draco::DecoderBuffer decodedBuffer;
+            QByteArray dracoArray = child.properties.at(0).value<QByteArray>();
+            decodedBuffer.Init(dracoArray.data(), dracoArray.size());
 
-    // convert the polygons to quads and triangles
-    int polygonIndex = 0;
-    QHash<QPair<int, int>, int> materialTextureParts;
-    for (int beginIndex = 0; beginIndex < data.polygonIndices.size(); polygonIndex++) {
-        int endIndex = beginIndex;
-        while (endIndex < data.polygonIndices.size() && data.polygonIndices.at(endIndex++) >= 0);
+            std::unique_ptr<draco::Mesh> dracoMesh(new draco::Mesh());
+            decoder.DecodeBufferToGeometry(&decodedBuffer, dracoMesh.get());
 
-        QPair<int, int> materialTexture((polygonIndex < materials.size()) ? materials.at(polygonIndex) : 0,
-            (polygonIndex < textures.size()) ? textures.at(polygonIndex) : 0);
-        int& partIndex = materialTextureParts[materialTexture];
-        if (partIndex == 0) {
-            data.extracted.partMaterialTextures.append(materialTexture);
-            data.extracted.mesh.parts.resize(data.extracted.mesh.parts.size() + 1);
-            partIndex = data.extracted.mesh.parts.size();
-        }
-        FBXMeshPart& part = data.extracted.mesh.parts[partIndex - 1];
-        
-        if (endIndex - beginIndex == 4) {
-            appendIndex(data, part.quadIndices, beginIndex++);
-            appendIndex(data, part.quadIndices, beginIndex++);
-            appendIndex(data, part.quadIndices, beginIndex++);
-            appendIndex(data, part.quadIndices, beginIndex++);
+            // prepare attributes for this mesh
+            auto positionAttribute = dracoMesh->GetNamedAttribute(draco::GeometryAttribute::POSITION);
+            auto normalAttribute = dracoMesh->GetNamedAttribute(draco::GeometryAttribute::NORMAL);
+            auto texCoordAttribute = dracoMesh->GetNamedAttribute(draco::GeometryAttribute::TEX_COORD);
+            auto extraTexCoordAttribute = dracoMesh->GetAttributeByUniqueId(DRACO_ATTRIBUTE_TEX_COORD_1);
+            auto colorAttribute = dracoMesh->GetNamedAttribute(draco::GeometryAttribute::COLOR);
+            auto materialIDAttribute = dracoMesh->GetAttributeByUniqueId(DRACO_ATTRIBUTE_MATERIAL_ID);
+            auto originalIndexAttribute = dracoMesh->GetAttributeByUniqueId(DRACO_ATTRIBUTE_ORIGINAL_INDEX);
 
-            int quadStartIndex = part.quadIndices.size() - 4;
-            int i0 = part.quadIndices[quadStartIndex + 0];
-            int i1 = part.quadIndices[quadStartIndex + 1];
-            int i2 = part.quadIndices[quadStartIndex + 2];
-            int i3 = part.quadIndices[quadStartIndex + 3];
+            // setup extracted mesh data structures given number of points
+            auto numVertices = dracoMesh->num_points();
 
-            // Sam's recommended triangle slices
-            // Triangle tri1 = { v0, v1, v3 };
-            // Triangle tri2 = { v1, v2, v3 };
-            // NOTE: Random guy on the internet's recommended triangle slices
-            // Triangle tri1 = { v0, v1, v2 };
-            // Triangle tri2 = { v2, v3, v0 };
+            QHash<QPair<int, int>, int> materialTextureParts;
 
-            part.quadTrianglesIndices.append(i0);
-            part.quadTrianglesIndices.append(i1);
-            part.quadTrianglesIndices.append(i3);
+            data.extracted.mesh.vertices.resize(numVertices);
 
-            part.quadTrianglesIndices.append(i1);
-            part.quadTrianglesIndices.append(i2);
-            part.quadTrianglesIndices.append(i3);
+            if (normalAttribute) {
+                data.extracted.mesh.normals.resize(numVertices);
+            }
 
-        } else {
-            for (int nextIndex = beginIndex + 1;; ) {
-                appendIndex(data, part.triangleIndices, beginIndex);
-                appendIndex(data, part.triangleIndices, nextIndex++);
-                appendIndex(data, part.triangleIndices, nextIndex);
-                if (nextIndex >= data.polygonIndices.size() || data.polygonIndices.at(nextIndex) < 0) {
-                    break;
+            if (texCoordAttribute) {
+                data.extracted.mesh.texCoords.resize(numVertices);
+            }
+
+            if (extraTexCoordAttribute) {
+                data.extracted.mesh.texCoords1.resize(numVertices);
+            }
+
+            if (colorAttribute) {
+                data.extracted.mesh.colors.resize(numVertices);
+            }
+
+            // enumerate the vertices and construct the extracted mesh
+            for (int i = 0; i < numVertices; ++i) {
+                draco::PointIndex vertexIndex(i);
+
+                if (positionAttribute) {
+                    // read position from draco mesh to extracted mesh
+                    auto mappedIndex = positionAttribute->mapped_index(vertexIndex);
+
+                    positionAttribute->ConvertValue<float, 3>(mappedIndex,
+                                                              reinterpret_cast<float*>(&data.extracted.mesh.vertices[i]));
+                }
+
+                if (normalAttribute) {
+                    // read normals from draco mesh to extracted mesh
+                    auto mappedIndex = normalAttribute->mapped_index(vertexIndex);
+
+                    normalAttribute->ConvertValue<float, 3>(mappedIndex,
+                                                            reinterpret_cast<float*>(&data.extracted.mesh.normals[i]));
+                }
+
+                if (texCoordAttribute) {
+                    // read UVs from draco mesh to extracted mesh
+                    auto mappedIndex = texCoordAttribute->mapped_index(vertexIndex);
+
+                    texCoordAttribute->ConvertValue<float, 2>(mappedIndex,
+                                                              reinterpret_cast<float*>(&data.extracted.mesh.texCoords[i]));
+                }
+
+                if (extraTexCoordAttribute) {
+                    // some meshes have a second set of UVs, read those to extracted mesh
+                    auto mappedIndex = extraTexCoordAttribute->mapped_index(vertexIndex);
+
+                    extraTexCoordAttribute->ConvertValue<float, 2>(mappedIndex,
+                                                                   reinterpret_cast<float*>(&data.extracted.mesh.texCoords1[i]));
+                }
+
+                if (colorAttribute) {
+                    // read vertex colors from draco mesh to extracted mesh
+                    auto mappedIndex = colorAttribute->mapped_index(vertexIndex);
+
+                    colorAttribute->ConvertValue<float, 3>(mappedIndex,
+                                                           reinterpret_cast<float*>(&data.extracted.mesh.colors[i]));
+                }
+
+                if (originalIndexAttribute) {
+                    auto mappedIndex = originalIndexAttribute->mapped_index(vertexIndex);
+
+                    int32_t originalIndex;
+
+                    originalIndexAttribute->ConvertValue<int32_t, 1>(mappedIndex, &originalIndex);
+
+                    data.extracted.newIndices.insert(originalIndex, i);
+                } else {
+                    data.extracted.newIndices.insert(i, i);
                 }
             }
-            beginIndex = endIndex;
+
+            for (int i = 0; i < dracoMesh->num_faces(); ++i) {
+                // grab the material ID and texture ID for this face, if we have it
+                auto& dracoFace = dracoMesh->face(draco::FaceIndex(i));
+                auto& firstCorner = dracoFace[0];
+
+                uint16_t materialID { 0 };
+
+                if (materialIDAttribute) {
+                    // read material ID and texture ID mappings into materials and texture vectors
+                    auto mappedIndex = materialIDAttribute->mapped_index(firstCorner);
+
+                    materialIDAttribute->ConvertValue<uint16_t, 1>(mappedIndex, &materialID);
+                }
+
+                QPair<int, int> materialTexture(materialID, 0);
+
+                // grab or setup the FBXMeshPart for the part this face belongs to
+                int& partIndexPlusOne = materialTextureParts[materialTexture];
+                if (partIndexPlusOne == 0) {
+                    data.extracted.partMaterialTextures.append(materialTexture);
+                    data.extracted.mesh.parts.resize(data.extracted.mesh.parts.size() + 1);
+                    partIndexPlusOne = data.extracted.mesh.parts.size();
+                }
+
+                // give the mesh part this index
+                FBXMeshPart& part = data.extracted.mesh.parts[partIndexPlusOne - 1];
+                part.triangleIndices.append(firstCorner.value());
+                part.triangleIndices.append(dracoFace[1].value());
+                part.triangleIndices.append(dracoFace[2].value());
+            }
+        }
+    }
+
+    // when we have a draco mesh, we've already built the extracted mesh, so we don't need to do the
+    // processing we do for normal meshes below
+    if (!isDracoMesh) {
+        bool isMultiMaterial = false;
+        if (isMaterialPerPolygon) {
+            isMultiMaterial = true;
+        }
+        // TODO: make excellent use of isMultiMaterial
+        Q_UNUSED(isMultiMaterial);
+
+        // convert the polygons to quads and triangles
+        int polygonIndex = 0;
+        QHash<QPair<int, int>, int> materialTextureParts;
+        for (int beginIndex = 0; beginIndex < data.polygonIndices.size(); polygonIndex++) {
+            int endIndex = beginIndex;
+            while (endIndex < data.polygonIndices.size() && data.polygonIndices.at(endIndex++) >= 0);
+
+            QPair<int, int> materialTexture((polygonIndex < materials.size()) ? materials.at(polygonIndex) : 0,
+                                            (polygonIndex < textures.size()) ? textures.at(polygonIndex) : 0);
+            int& partIndex = materialTextureParts[materialTexture];
+            if (partIndex == 0) {
+                data.extracted.partMaterialTextures.append(materialTexture);
+                data.extracted.mesh.parts.resize(data.extracted.mesh.parts.size() + 1);
+                partIndex = data.extracted.mesh.parts.size();
+            }
+            FBXMeshPart& part = data.extracted.mesh.parts[partIndex - 1];
+
+            if (endIndex - beginIndex == 4) {
+                appendIndex(data, part.quadIndices, beginIndex++, deduplicate);
+                appendIndex(data, part.quadIndices, beginIndex++, deduplicate);
+                appendIndex(data, part.quadIndices, beginIndex++, deduplicate);
+                appendIndex(data, part.quadIndices, beginIndex++, deduplicate);
+
+                int quadStartIndex = part.quadIndices.size() - 4;
+                int i0 = part.quadIndices[quadStartIndex + 0];
+                int i1 = part.quadIndices[quadStartIndex + 1];
+                int i2 = part.quadIndices[quadStartIndex + 2];
+                int i3 = part.quadIndices[quadStartIndex + 3];
+
+                // Sam's recommended triangle slices
+                // Triangle tri1 = { v0, v1, v3 };
+                // Triangle tri2 = { v1, v2, v3 };
+                // NOTE: Random guy on the internet's recommended triangle slices
+                // Triangle tri1 = { v0, v1, v2 };
+                // Triangle tri2 = { v2, v3, v0 };
+
+                part.quadTrianglesIndices.append(i0);
+                part.quadTrianglesIndices.append(i1);
+                part.quadTrianglesIndices.append(i3);
+
+                part.quadTrianglesIndices.append(i1);
+                part.quadTrianglesIndices.append(i2);
+                part.quadTrianglesIndices.append(i3);
+
+            } else {
+                for (int nextIndex = beginIndex + 1;; ) {
+                    appendIndex(data, part.triangleIndices, beginIndex, deduplicate);
+                    appendIndex(data, part.triangleIndices, nextIndex++, deduplicate);
+                    appendIndex(data, part.triangleIndices, nextIndex, deduplicate);
+                    if (nextIndex >= data.polygonIndices.size() || data.polygonIndices.at(nextIndex) < 0) {
+                        break;
+                    }
+                }
+                beginIndex = endIndex;
+            }
         }
     }
     
diff --git a/libraries/fbx/src/FBXReader_Node.cpp b/libraries/fbx/src/FBXReader_Node.cpp
index d987f885eb..c4454421b6 100644
--- a/libraries/fbx/src/FBXReader_Node.cpp
+++ b/libraries/fbx/src/FBXReader_Node.cpp
@@ -24,15 +24,18 @@
 #include <shared/NsightHelpers.h>
 #include "ModelFormatLogging.h"
 
-template<class T> int streamSize() {
+template<class T>
+int streamSize() {
     return sizeof(T);
 }
 
-template<bool> int streamSize() {
+template<bool>
+int streamSize() {
     return 1;
 }
 
-template<class T> QVariant readBinaryArray(QDataStream& in, int& position) {
+template<class T>
+QVariant readBinaryArray(QDataStream& in, int& position) {
     quint32 arrayLength;
     quint32 encoding;
     quint32 compressedLength;
@@ -45,9 +48,8 @@ template<class T> QVariant readBinaryArray(QDataStream& in, int& position) {
     QVector<T> values;
     if ((int)QSysInfo::ByteOrder == (int)in.byteOrder()) {
         values.resize(arrayLength);
-        const unsigned int DEFLATE_ENCODING = 1;
         QByteArray arrayData;
-        if (encoding == DEFLATE_ENCODING) {
+        if (encoding == FBX_PROPERTY_COMPRESSED_FLAG) {
             // preface encoded data with uncompressed length
             QByteArray compressed(sizeof(quint32) + compressedLength, 0);
             *((quint32*)compressed.data()) = qToBigEndian<quint32>(arrayLength * sizeof(T));
@@ -69,8 +71,7 @@ template<class T> QVariant readBinaryArray(QDataStream& in, int& position) {
         }
     } else {
         values.reserve(arrayLength);
-        const unsigned int DEFLATE_ENCODING = 1;
-        if (encoding == DEFLATE_ENCODING) {
+        if (encoding == FBX_PROPERTY_COMPRESSED_FLAG) {
             // preface encoded data with uncompressed length
             QByteArray compressed(sizeof(quint32) + compressedLength, 0);
             *((quint32*)compressed.data()) = qToBigEndian<quint32>(arrayLength * sizeof(T));
@@ -350,8 +351,7 @@ FBXNode parseTextFBXNode(Tokenizer& tokenizer) {
 FBXNode FBXReader::parseFBX(QIODevice* device) {
     PROFILE_RANGE_EX(resource_parse, __FUNCTION__, 0xff0000ff, device);
     // verify the prolog
-    const QByteArray BINARY_PROLOG = "Kaydara FBX Binary  ";
-    if (device->peek(BINARY_PROLOG.size()) != BINARY_PROLOG) {
+    if (device->peek(FBX_BINARY_PROLOG.size()) != FBX_BINARY_PROLOG) {
         // parse as a text file
         FBXNode top;
         Tokenizer tokenizer(device);
@@ -377,15 +377,13 @@ FBXNode FBXReader::parseFBX(QIODevice* device) {
     //   Bytes 0 - 20: Kaydara FBX Binary  \x00(file - magic, with 2 spaces at the end, then a NULL terminator).
     //   Bytes 21 - 22: [0x1A, 0x00](unknown but all observed files show these bytes).
     //   Bytes 23 - 26 : unsigned int, the version number. 7300 for version 7.3 for example.
-    const int HEADER_BEFORE_VERSION = 23;
-    const quint32 VERSION_FBX2016 = 7500;
-    in.skipRawData(HEADER_BEFORE_VERSION);
-    int position = HEADER_BEFORE_VERSION;
+    in.skipRawData(FBX_HEADER_BYTES_BEFORE_VERSION);
+    int position = FBX_HEADER_BYTES_BEFORE_VERSION;
     quint32 fileVersion;
     in >> fileVersion;
     position += sizeof(fileVersion);
     qCDebug(modelformat) << "fileVersion:" << fileVersion;
-    bool has64BitPositions = (fileVersion >= VERSION_FBX2016);
+    bool has64BitPositions = (fileVersion >= FBX_VERSION_2016);
 
     // parse the top-level node
     FBXNode top;
diff --git a/libraries/fbx/src/FBXWriter.cpp b/libraries/fbx/src/FBXWriter.cpp
new file mode 100644
index 0000000000..5029b489bc
--- /dev/null
+++ b/libraries/fbx/src/FBXWriter.cpp
@@ -0,0 +1,200 @@
+//
+//  FBXWriter.cpp
+//  libraries/fbx/src
+//
+//  Created by Ryan Huffman on 9/5/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include "FBXWriter.h"
+
+#include <QDebug>
+
+#ifdef USE_FBX_2016_FORMAT
+    using FBXEndOffset = int64_t;
+    using FBXPropertyCount = uint64_t;
+    using FBXListLength = uint64_t;
+#else
+    using FBXEndOffset = int32_t;
+    using FBXPropertyCount = uint32_t;
+    using FBXListLength = uint32_t;
+#endif
+
+template <typename T>
+void writeVector(QDataStream& out, char ch, QVector<T> vec) {
+    // Minimum number of bytes to consider compressing
+    const int ATTEMPT_COMPRESSION_THRESHOLD_BYTES = 2000;
+
+    out.device()->write(&ch, 1);
+    out << (int32_t)vec.length();
+
+    auto data { QByteArray::fromRawData((const char*)vec.constData(), vec.length() * sizeof(T)) };
+
+    if (data.size() >= ATTEMPT_COMPRESSION_THRESHOLD_BYTES) {
+        auto compressedDataWithLength { qCompress(data) };
+
+        // qCompress packs a length uint32 at the beginning of the buffer, but the FBX format
+        // does not expect it. This removes it.
+        auto compressedData = QByteArray::fromRawData(
+            compressedDataWithLength.constData() + sizeof(uint32_t), compressedDataWithLength.size() - sizeof(uint32_t));
+
+        if (compressedData.size() < data.size()) {
+            out << FBX_PROPERTY_COMPRESSED_FLAG;
+            out << (int32_t)compressedData.size();
+            out.writeRawData(compressedData.constData(), compressedData.size());
+            return;
+        }
+    }
+
+    out << FBX_PROPERTY_UNCOMPRESSED_FLAG;
+    out << (int32_t)0;
+    out.writeRawData(data.constData(), data.size());
+}
+
+
+QByteArray FBXWriter::encodeFBX(const FBXNode& root) {
+    QByteArray data;
+    QDataStream out(&data, QIODevice::WriteOnly);
+    out.setByteOrder(QDataStream::LittleEndian);
+    out.setVersion(QDataStream::Qt_4_5);
+
+    out.writeRawData(FBX_BINARY_PROLOG, FBX_BINARY_PROLOG.size());
+    auto bytes = QByteArray(FBX_HEADER_BYTES_BEFORE_VERSION - FBX_BINARY_PROLOG.size(), '\0');
+    out.writeRawData(bytes, bytes.size());
+
+#ifdef USE_FBX_2016_FORMAT
+    out << FBX_VERSION_2016;
+#else
+    out << FBX_VERSION_2015;
+#endif
+
+    for (auto& child : root.children) {
+        encodeNode(out, child);
+    }
+    encodeNode(out, FBXNode());
+
+    return data;
+}
+
+void FBXWriter::encodeNode(QDataStream& out, const FBXNode& node) {
+    auto device = out.device();
+    auto nodeStartPos = device->pos();
+
+    // endOffset (temporary, updated later)
+    out << (FBXEndOffset)0;
+
+    // Property count
+    out << (FBXPropertyCount)node.properties.size();
+
+    // Property list length (temporary, updated later)
+    out << (FBXListLength)0;
+
+    out << (quint8)node.name.size();
+    out.writeRawData(node.name, node.name.size());
+
+    auto nodePropertiesStartPos = device->pos();
+
+    for (const auto& prop : node.properties) {
+        encodeFBXProperty(out, prop);
+    }
+
+    // Go back and write property list length
+    auto nodePropertiesEndPos = device->pos();
+    device->seek(nodeStartPos + sizeof(FBXEndOffset) + sizeof(FBXPropertyCount));
+    out << (FBXListLength)(nodePropertiesEndPos - nodePropertiesStartPos);
+
+    device->seek(nodePropertiesEndPos);
+
+    for (auto& child : node.children) {
+        encodeNode(out, child);
+    }
+
+    if (node.children.length() > 0) {
+        encodeNode(out, FBXNode());
+    }
+
+    // Go back and write actual endOffset
+    auto nodeEndPos = device->pos();
+    device->seek(nodeStartPos);
+    out << (FBXEndOffset)(nodeEndPos);
+
+    device->seek(nodeEndPos);
+}
+
+void FBXWriter::encodeFBXProperty(QDataStream& out, const QVariant& prop) {
+    auto type = prop.userType();
+    switch (type) {
+        case QMetaType::Short:
+            out.device()->write("Y", 1);
+            out << prop.value<int16_t>();
+            break;
+
+        case QVariant::Type::Bool:
+            out.device()->write("C", 1);
+            out << prop.toBool();
+            break;
+
+        case QMetaType::Int:
+            out.device()->write("I", 1);
+            out << prop.toInt();
+            break;
+
+        encodeNode(out, FBXNode());
+        case QMetaType::Float:
+            out.device()->write("F", 1);
+            out << prop.toFloat();
+            break;
+
+        case QMetaType::Double:
+            out.device()->write("D", 1);
+            out << prop.toDouble();
+            break;
+
+        case QMetaType::LongLong:
+            out.device()->write("L", 1);
+            out << prop.toLongLong();
+            break;
+
+        case QMetaType::QString:
+        {
+            auto bytes = prop.toString().toUtf8();
+            out << 'S';
+            out << bytes.length();
+            out << bytes;
+            out << (int32_t)bytes.size();
+            out.writeRawData(bytes, bytes.size());
+            break;
+        }
+
+        case QMetaType::QByteArray:
+            {
+                auto bytes = prop.toByteArray();
+                out.device()->write("S", 1);
+                out << (int32_t)bytes.size();
+                out.writeRawData(bytes, bytes.size());
+                break;
+            }
+
+        default:
+        {
+            if (prop.canConvert<QVector<float>>()) {
+                writeVector(out, 'f', prop.value<QVector<float>>());
+            } else if (prop.canConvert<QVector<double>>()) {
+                writeVector(out, 'd', prop.value<QVector<double>>());
+            } else if (prop.canConvert<QVector<qint64>>()) {
+                writeVector(out, 'l', prop.value<QVector<qint64>>());
+            } else if (prop.canConvert<QVector<qint32>>()) {
+                writeVector(out, 'i', prop.value<QVector<qint32>>());
+            } else if (prop.canConvert<QVector<bool>>()) {
+                writeVector(out, 'b', prop.value<QVector<bool>>());
+            } else {
+                qDebug() << "Unsupported property type in FBXWriter::encodeNode: " << type << prop;
+                throw("Unsupported property type in FBXWriter::encodeNode: " + QString::number(type) + " " + prop.toString());
+            }
+        }
+
+    }
+}
diff --git a/libraries/fbx/src/FBXWriter.h b/libraries/fbx/src/FBXWriter.h
new file mode 100644
index 0000000000..f20d208cb1
--- /dev/null
+++ b/libraries/fbx/src/FBXWriter.h
@@ -0,0 +1,30 @@
+//
+//  FBXWriter.h
+//  libraries/fbx/src
+//
+//  Created by Ryan Huffman on 9/5/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_FBXWriter_h
+#define hifi_FBXWriter_h
+
+#include "FBX.h"
+
+#include <QByteArray>
+#include <QDataStream>
+
+//#define USE_FBX_2016_FORMAT
+
+class FBXWriter {
+public:
+    static QByteArray encodeFBX(const FBXNode& root);
+
+    static void encodeNode(QDataStream& out, const FBXNode& node);
+    static void encodeFBXProperty(QDataStream& out, const QVariant& property);
+};
+
+#endif // hifi_FBXWriter_h
diff --git a/libraries/fbx/src/FSTReader.cpp b/libraries/fbx/src/FSTReader.cpp
index 3f0a629c8c..cc4a919445 100644
--- a/libraries/fbx/src/FSTReader.cpp
+++ b/libraries/fbx/src/FSTReader.cpp
@@ -15,7 +15,6 @@
 #include <QNetworkRequest>
 
 #include <NetworkAccessManager.h>
-#include <NetworkingConstants.h>
 #include <SharedUtil.h>
 
 #include "FSTReader.h"
diff --git a/libraries/fbx/src/OBJReader.cpp b/libraries/fbx/src/OBJReader.cpp
index 417901b9ab..e0c2efd72e 100644
--- a/libraries/fbx/src/OBJReader.cpp
+++ b/libraries/fbx/src/OBJReader.cpp
@@ -28,6 +28,7 @@
 
 #include "FBXReader.h"
 #include "ModelFormatLogging.h"
+#include <shared/PlatformHacks.h>
 
 QHash<QString, float> COMMENT_SCALE_HINTS = {{"This file uses centimeters as units", 1.0f / 100.0f},
                                              {"This file uses millimeters as units", 1.0f / 1000.0f}};
@@ -51,6 +52,10 @@ const QByteArray OBJTokenizer::getLineAsDatum() {
     return _device->readLine().trimmed();
 }
 
+float OBJTokenizer::getFloat() {
+    return std::stof((nextToken() != OBJTokenizer::DATUM_TOKEN) ? nullptr : getDatum().data());
+}
+
 int OBJTokenizer::nextToken() {
     if (_pushedBackToken != NO_PUSHBACKED_TOKEN) {
         int token = _pushedBackToken;
@@ -118,11 +123,39 @@ glm::vec3 OBJTokenizer::getVec3() {
     auto z = getFloat();
     auto v = glm::vec3(x, y, z);
     while (isNextTokenFloat()) {
-        // the spec(s) get(s) vague here.  might be w, might be a color... chop it off.
+        // ignore any following floats
         nextToken();
     }
     return v;
 }
+bool OBJTokenizer::getVertex(glm::vec3& vertex, glm::vec3& vertexColor) {
+    // Used for vertices which may also have a vertex color (RGB [0,1]) to follow.
+    //    NOTE: Returns true if there is a vertex color.
+    auto x = getFloat(); // N.B.: getFloat() has side-effect
+    auto y = getFloat(); // And order of arguments is different on Windows/Linux.
+    auto z = getFloat();
+    vertex = glm::vec3(x, y, z);
+
+    auto r = 1.0f, g = 1.0f, b = 1.0f;
+    bool hasVertexColor = false;
+    if (isNextTokenFloat()) {
+        // If there's another float it's one of two things: a W component or an R component. The standard OBJ spec
+        // doesn't output a W component, so we're making the assumption that if a float follows (unless it's
+        // only a single value) that it's a vertex color.
+        r = getFloat();
+        if (isNextTokenFloat()) {
+            // Safe to assume the following values are the green/blue components.
+            g = getFloat();
+            b = getFloat();
+
+            hasVertexColor = true;
+        }
+
+        vertexColor = glm::vec3(r, g, b);
+    }
+
+    return hasVertexColor;
+}
 glm::vec2 OBJTokenizer::getVec2() {
     float uCoord = getFloat();
     float vCoord = 1.0f - getFloat();
@@ -140,7 +173,9 @@ void setMeshPartDefaults(FBXMeshPart& meshPart, QString materialID) {
 }
 
 // OBJFace
-bool OBJFace::add(const QByteArray& vertexIndex, const QByteArray& textureIndex, const QByteArray& normalIndex, const QVector<glm::vec3>& vertices) {
+//    NOTE (trent, 7/20/17): The vertexColors vector being passed-in isn't necessary here, but I'm just
+//                         pairing it with the vertices vector for consistency.
+bool OBJFace::add(const QByteArray& vertexIndex, const QByteArray& textureIndex, const QByteArray& normalIndex, const QVector<glm::vec3>& vertices, const QVector<glm::vec3>& vertexColors) {
     bool ok;
     int index = vertexIndex.toInt(&ok);
     if (!ok) {
@@ -321,6 +356,8 @@ bool OBJReader::parseOBJGroup(OBJTokenizer& tokenizer, const QVariantHash& mappi
     bool result = true;
     int originalFaceCountForDebugging = 0;
     QString currentGroup;
+    bool anyVertexColor { false };
+    int vertexCount { 0 };
 
     setMeshPartDefaults(meshPart, QString("dontknow") + QString::number(mesh.parts.count()));
 
@@ -382,7 +419,25 @@ bool OBJReader::parseOBJGroup(OBJTokenizer& tokenizer, const QVariantHash& mappi
                 #endif
             }
         } else if (token == "v") {
-            vertices.append(tokenizer.getVec3());
+            glm::vec3 vertex;
+            glm::vec3 vertexColor { glm::vec3(1.0f) };
+
+            bool hasVertexColor = tokenizer.getVertex(vertex, vertexColor);
+            vertices.append(vertex);
+
+            // if any vertex has color, they all need to.
+            if (hasVertexColor && !anyVertexColor) {
+                // we've had a gap of zero or more vertices without color, followed
+                // by one that has color.  catch up:
+                for (int i = 0; i < vertexCount; i++) {
+                    vertexColors.append(glm::vec3(1.0f));
+                }
+                anyVertexColor = true;
+            }
+            if (anyVertexColor) {
+                vertexColors.append(vertexColor);
+            }
+            vertexCount++;
         } else if (token == "vn") {
             normals.append(tokenizer.getVec3());
         } else if (token == "vt") {
@@ -410,7 +465,8 @@ bool OBJReader::parseOBJGroup(OBJTokenizer& tokenizer, const QVariantHash& mappi
                 assert(parts.count() >= 1);
                 assert(parts.count() <= 3);
                 const QByteArray noData {};
-                face.add(parts[0], (parts.count() > 1) ? parts[1] : noData, (parts.count() > 2) ? parts[2] : noData, vertices);
+                face.add(parts[0], (parts.count() > 1) ? parts[1] : noData, (parts.count() > 2) ? parts[2] : noData,
+                         vertices, vertexColors);
                 face.groupName = currentGroup;
                 face.materialName = currentMaterialName;
             }
@@ -493,9 +549,9 @@ FBXGeometry* OBJReader::readOBJ(QByteArray& model, const QVariantHash& mapping,
 
                     fbxMeshParts.append(FBXMeshPart());
                     FBXMeshPart& meshPartNew = fbxMeshParts.last();
-                    meshPartNew.quadIndices = QVector<int>(meshPart.quadIndices);					// Copy over quad indices [NOTE (trent/mittens, 4/3/17): Likely unnecessary since they go unused anyway].
+                    meshPartNew.quadIndices = QVector<int>(meshPart.quadIndices);                    // Copy over quad indices [NOTE (trent/mittens, 4/3/17): Likely unnecessary since they go unused anyway].
                     meshPartNew.quadTrianglesIndices = QVector<int>(meshPart.quadTrianglesIndices); // Copy over quad triangulated indices [NOTE (trent/mittens, 4/3/17): Likely unnecessary since they go unused anyway].
-                    meshPartNew.triangleIndices = QVector<int>(meshPart.triangleIndices);			// Copy over triangle indices.
+                    meshPartNew.triangleIndices = QVector<int>(meshPart.triangleIndices);            // Copy over triangle indices.
 
                     // Do some of the material logic (which previously lived below) now.
                     // All the faces in the same group will have the same name and material.
@@ -540,6 +596,15 @@ FBXGeometry* OBJReader::readOBJ(QByteArray& model, const QVariantHash& mapping,
                 glm::vec3 v1 = checked_at(vertices, face.vertexIndices[1]);
                 glm::vec3 v2 = checked_at(vertices, face.vertexIndices[2]);
 
+                glm::vec3 vc0, vc1, vc2;
+                bool hasVertexColors = (vertexColors.size() > 0);
+                if (hasVertexColors) {
+                    // If there are any vertex colors, it's safe to assume all meshes had them exported.
+                    vc0 = checked_at(vertexColors, face.vertexIndices[0]);
+                    vc1 = checked_at(vertexColors, face.vertexIndices[1]);
+                    vc2 = checked_at(vertexColors, face.vertexIndices[2]);
+                }
+
                 // Scale the vertices if the OBJ file scale is specified as non-one.
                 if (scaleGuess != 1.0f) {
                     v0 *= scaleGuess;
@@ -555,6 +620,13 @@ FBXGeometry* OBJReader::readOBJ(QByteArray& model, const QVariantHash& mapping,
                 meshPart.triangleIndices.append(mesh.vertices.count());
                 mesh.vertices << v2;
 
+                if (hasVertexColors) {
+                    // Add vertex colors.
+                    mesh.colors << vc0;
+                    mesh.colors << vc1;
+                    mesh.colors << vc2;
+                }
+
                 glm::vec3 n0, n1, n2;
                 if (face.normalIndices.count()) {
                     n0 = checked_at(normals, face.normalIndices[0]);
@@ -690,6 +762,7 @@ void fbxDebugDump(const FBXGeometry& fbxgeo) {
     qCDebug(modelformat) << "  meshes.count() =" << fbxgeo.meshes.count();
     foreach (FBXMesh mesh, fbxgeo.meshes) {
         qCDebug(modelformat) << "    vertices.count() =" << mesh.vertices.count();
+        qCDebug(modelformat) << "    colors.count() =" << mesh.colors.count();
         qCDebug(modelformat) << "    normals.count() =" << mesh.normals.count();
         /*if (mesh.normals.count() == mesh.vertices.count()) {
             for (int i = 0; i < mesh.normals.count(); i++) {
diff --git a/libraries/fbx/src/OBJReader.h b/libraries/fbx/src/OBJReader.h
index 18a4b89f1e..fb250833cf 100644
--- a/libraries/fbx/src/OBJReader.h
+++ b/libraries/fbx/src/OBJReader.h
@@ -20,8 +20,9 @@ public:
     void ungetChar(char ch) { _device->ungetChar(ch); }
     const QString getComment() const { return _comment; }
     glm::vec3 getVec3();
+    bool getVertex(glm::vec3& vertex, glm::vec3& vertexColor);
     glm::vec2 getVec2();
-    float getFloat() { return std::stof((nextToken() != OBJTokenizer::DATUM_TOKEN) ? nullptr : getDatum().data()); }
+    float getFloat();
 
 private:
     QIODevice* _device;
@@ -38,7 +39,8 @@ public:
     QString groupName; // We don't make use of hierarchical structure, but it can be preserved for debugging and future use.
     QString materialName;
     // Add one more set of vertex data. Answers true if successful
-    bool add(const QByteArray& vertexIndex, const QByteArray& textureIndex, const QByteArray& normalIndex, const QVector<glm::vec3>& vertices);
+    bool add(const QByteArray& vertexIndex, const QByteArray& textureIndex, const QByteArray& normalIndex,
+             const QVector<glm::vec3>& vertices, const QVector<glm::vec3>& vertexColors);
     // Return a set of one or more OBJFaces from this one, in which each is just a triangle.
     // Even though FBXMeshPart can handle quads, it would be messy to try to keep track of mixed-size faces, so we treat everything as triangles.
     QVector<OBJFace> triangulate();
@@ -65,7 +67,8 @@ class OBJReader: public QObject { // QObject so we can make network requests.
     Q_OBJECT
 public:
     typedef QVector<OBJFace> FaceGroup;
-    QVector<glm::vec3> vertices;  // all that we ever encounter while reading
+    QVector<glm::vec3> vertices;
+    QVector<glm::vec3> vertexColors;
     QVector<glm::vec2> textureUVs;
     QVector<glm::vec3> normals;
     QVector<FaceGroup> faceGroups;
diff --git a/libraries/fbx/src/OBJWriter.cpp b/libraries/fbx/src/OBJWriter.cpp
index 034263eb53..e0d3d36b06 100644
--- a/libraries/fbx/src/OBJWriter.cpp
+++ b/libraries/fbx/src/OBJWriter.cpp
@@ -40,8 +40,6 @@ static QString formatFloat(double n) {
 }
 
 bool writeOBJToTextStream(QTextStream& out, QList<MeshPointer> meshes) {
-    int attributeTypeNormal = gpu::Stream::InputSlot::NORMAL; // libraries/gpu/src/gpu/Stream.h
-
     // each mesh's vertices are numbered from zero.  We're combining all their vertices into one list here,
     // so keep track of the start index for each mesh.
     QList<int> meshVertexStartOffset;
@@ -49,10 +47,15 @@ bool writeOBJToTextStream(QTextStream& out, QList<MeshPointer> meshes) {
     int currentVertexStartOffset = 0;
     int currentNormalStartOffset = 0;
 
-    // write out vertices
+    // write out vertices (and maybe colors)
     foreach (const MeshPointer& mesh, meshes) {
         meshVertexStartOffset.append(currentVertexStartOffset);
         const gpu::BufferView& vertexBuffer = mesh->getVertexBuffer();
+
+        const gpu::BufferView& colorsBufferView = mesh->getAttributeBuffer(gpu::Stream::COLOR);
+        gpu::BufferView::Index numColors = (gpu::BufferView::Index)colorsBufferView.getNumElements();
+        gpu::BufferView::Index colorIndex = 0;
+
         int vertexCount = 0;
         gpu::BufferView::Iterator<const glm::vec3> vertexItr = vertexBuffer.cbegin<const glm::vec3>();
         while (vertexItr != vertexBuffer.cend<const glm::vec3>()) {
@@ -60,7 +63,15 @@ bool writeOBJToTextStream(QTextStream& out, QList<MeshPointer> meshes) {
             out << "v ";
             out << formatFloat(v[0]) << " ";
             out << formatFloat(v[1]) << " ";
-            out << formatFloat(v[2]) << "\n";
+            out << formatFloat(v[2]);
+            if (colorIndex < numColors) {
+                glm::vec3 color = colorsBufferView.get<glm::vec3>(colorIndex);
+                out << " " << formatFloat(color[0]);
+                out << " " << formatFloat(color[1]);
+                out << " " << formatFloat(color[2]);
+                colorIndex++;
+            }
+            out << "\n";
             vertexItr++;
             vertexCount++;
         }
@@ -72,7 +83,7 @@ bool writeOBJToTextStream(QTextStream& out, QList<MeshPointer> meshes) {
     bool haveNormals = true;
     foreach (const MeshPointer& mesh, meshes) {
         meshNormalStartOffset.append(currentNormalStartOffset);
-        const gpu::BufferView& normalsBufferView = mesh->getAttributeBuffer(attributeTypeNormal);
+        const gpu::BufferView& normalsBufferView = mesh->getAttributeBuffer(gpu::Stream::InputSlot::NORMAL);
         gpu::BufferView::Index numNormals = (gpu::BufferView::Index)normalsBufferView.getNumElements();
         for (gpu::BufferView::Index i = 0; i < numNormals; i++) {
             glm::vec3 normal = normalsBufferView.get<glm::vec3>(i);
diff --git a/libraries/gl/CMakeLists.txt b/libraries/gl/CMakeLists.txt
index fd3197410b..9fc7a0c10f 100644
--- a/libraries/gl/CMakeLists.txt
+++ b/libraries/gl/CMakeLists.txt
@@ -1,9 +1,5 @@
 set(TARGET_NAME gl)
 setup_hifi_library(OpenGL Qml Quick)
-link_hifi_libraries(shared networking)
-
+link_hifi_libraries(shared)
 target_opengl()
 
-if (NOT ANDROID)
-  target_glew()
-endif ()
diff --git a/libraries/gl/src/gl/Config.cpp b/libraries/gl/src/gl/Config.cpp
new file mode 100644
index 0000000000..1f29fe21b1
--- /dev/null
+++ b/libraries/gl/src/gl/Config.cpp
@@ -0,0 +1,35 @@
+//
+//  GPUConfig.h
+//  libraries/gpu/src/gpu
+//
+//  Created by Sam Gateau on 12/4/14.
+//  Copyright 2013 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 "Config.h"
+
+#include <mutex>
+
+#if defined(Q_OS_ANDROID)
+PFNGLQUERYCOUNTEREXTPROC glQueryCounterEXT = NULL;
+PFNGLGETQUERYOBJECTUI64VEXTPROC glGetQueryObjectui64vEXT = NULL;
+PFNGLFRAMEBUFFERTEXTUREEXTPROC glFramebufferTextureEXT = NULL;
+#endif
+
+void gl::initModuleGl() {
+    static std::once_flag once;
+    std::call_once(once, [] {
+#if defined(Q_OS_ANDROID)
+        glQueryCounterEXT = (PFNGLQUERYCOUNTEREXTPROC)eglGetProcAddress("glQueryCounterEXT");
+        glGetQueryObjectui64vEXT = (PFNGLGETQUERYOBJECTUI64VEXTPROC)eglGetProcAddress("glGetQueryObjectui64vEXT");
+        glFramebufferTextureEXT = (PFNGLFRAMEBUFFERTEXTUREEXTPROC)eglGetProcAddress("glFramebufferTextureEXT");
+#else
+        glewExperimental = true;
+        glewInit();
+#endif
+    });
+}
+
diff --git a/libraries/gl/src/gl/Config.h b/libraries/gl/src/gl/Config.h
index 9efae96f2a..ff282a1ca0 100644
--- a/libraries/gl/src/gl/Config.h
+++ b/libraries/gl/src/gl/Config.h
@@ -12,25 +12,67 @@
 #ifndef hifi_gpu_GPUConfig_h
 #define hifi_gpu_GPUConfig_h
 
-#define GL_GLEXT_PROTOTYPES 1
+#include <QtCore/QtGlobal>
 
+#if defined(QT_OPENGL_ES_3_1)
+// Minimum GL ES version required is 3.1
+#define GL_MIN_VERSION_MAJOR 0x03
+#define GL_MIN_VERSION_MINOR 0x01
+#define GL_DEFAULT_VERSION_MAJOR GL_MIN_VERSION_MAJOR
+#define GL_DEFAULT_VERSION_MINOR GL_MIN_VERSION_MINOR
+#else
+// Minimum desktop GL version required is 4.1
+#define GL_MIN_VERSION_MAJOR 0x04
+#define GL_MIN_VERSION_MINOR 0x01
+#define GL_DEFAULT_VERSION_MAJOR 0x04
+#define GL_DEFAULT_VERSION_MINOR 0x05
+#endif
+
+#define MINIMUM_GL_VERSION ((GL_MIN_VERSION_MAJOR << 8) | GL_MIN_VERSION_MINOR)
+
+#if defined(Q_OS_ANDROID)
+
+#include <EGL/egl.h>
+#include <GLES3/gl31.h>
+
+#define GL_DEPTH_COMPONENT32_OES          0x81A7
+#define GL_TIME_ELAPSED_EXT               0x88BF
+#define GL_TIMESTAMP_EXT                  0x8E28
+#define GL_FRAMEBUFFER_SRGB_EXT           0x8DB9
+#define GL_TEXTURE_BORDER_COLOR_EXT       0x1004
+#define GL_CLAMP_TO_BORDER_EXT            0x812D
+#define GL_TEXTURE_MAX_ANISOTROPY_EXT     0x84FE
+#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF
+
+
+// Add some additional extensions missing from GLES 3.1
+extern "C" {
+    typedef void (GL_APIENTRYP PFNGLQUERYCOUNTEREXTPROC) (GLuint id, GLenum target);
+    typedef void (GL_APIENTRYP PFNGLGETQUERYOBJECTUI64VEXTPROC) (GLuint id, GLenum pname, GLuint64 *params);
+    typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTUREEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
+    extern PFNGLQUERYCOUNTEREXTPROC glQueryCounterEXT;
+    extern PFNGLGETQUERYOBJECTUI64VEXTPROC glGetQueryObjectui64vEXT;
+    extern PFNGLFRAMEBUFFERTEXTUREEXTPROC glFramebufferTextureEXT;
+}
+
+#else // !defined(Q_OS_ANDROID)
+
+#define GL_GLEXT_PROTOTYPES 1
 #include <GL/glew.h>
 
-#if defined(__APPLE__)
-
+#if defined(Q_OS_DARWIN)
 #include <OpenGL/gl.h>
 #include <OpenGL/glext.h>
 #include <OpenGL/OpenGL.h>
-
-#endif
-
-#if defined(WIN32)
-
+#elif defined(Q_OS_WIN64)
 #include <GL/wglew.h>
-
-// Uncomment this define and recompile to be able to avoid code path preventing to be able to run nsight graphics debug
-//#define HIFI_ENABLE_NSIGHT_DEBUG 1
-
 #endif
 
+#endif // !defined(Q_OS_ANDROID)
+
+// Platform specific code to load the GL functions
+namespace gl {
+    void initModuleGl();
+}
+
 #endif // hifi_gpu_GPUConfig_h
diff --git a/libraries/gl/src/gl/GLHelpers.cpp b/libraries/gl/src/gl/GLHelpers.cpp
index ab91ca0902..ed0594135a 100644
--- a/libraries/gl/src/gl/GLHelpers.cpp
+++ b/libraries/gl/src/gl/GLHelpers.cpp
@@ -28,6 +28,13 @@ const QSurfaceFormat& getDefaultOpenGLSurfaceFormat() {
     static QSurfaceFormat format;
     static std::once_flag once;
     std::call_once(once, [] {
+#if defined(QT_OPENGL_ES_3_1)
+        format.setRenderableType(QSurfaceFormat::OpenGLES);
+        format.setRedBufferSize(8);
+        format.setGreenBufferSize(8);
+        format.setBlueBufferSize(8);
+        format.setAlphaBufferSize(8);
+#endif
         // Qt Quick may need a depth and stencil buffer. Always make sure these are available.
         format.setDepthBufferSize(DEFAULT_GL_DEPTH_BUFFER_BITS);
         format.setStencilBufferSize(DEFAULT_GL_STENCIL_BUFFER_BITS);
@@ -40,8 +47,11 @@ const QSurfaceFormat& getDefaultOpenGLSurfaceFormat() {
 
 int glVersionToInteger(QString glVersion) {
     QStringList versionParts = glVersion.split(QRegularExpression("[\\.\\s]"));
-    int majorNumber = versionParts[0].toInt();
-    int minorNumber = versionParts[1].toInt();
+    int majorNumber = 0, minorNumber = 0;
+    if (versionParts.size() >= 2) {
+        majorNumber = versionParts[0].toInt();
+        minorNumber = versionParts[1].toInt();
+    }
     return (majorNumber << 16) | minorNumber;
 }
 
diff --git a/libraries/gl/src/gl/GLHelpers.h b/libraries/gl/src/gl/GLHelpers.h
index 84229b97d2..80fc2c5f70 100644
--- a/libraries/gl/src/gl/GLHelpers.h
+++ b/libraries/gl/src/gl/GLHelpers.h
@@ -25,7 +25,12 @@ class QSurfaceFormat;
 class QGLFormat;
 
 template<class F>
-void setGLFormatVersion(F& format, int major = 4, int minor = 5) { format.setVersion(major, minor); }
+#if defined(QT_OPENGL_ES_3_1)
+void setGLFormatVersion(F& format, int major = 3, int minor = 1)
+#else
+void setGLFormatVersion(F& format, int major = 4, int minor = 5) 
+#endif
+    { format.setVersion(major, minor);  }
 
 size_t evalGLFormatSwapchainPixelSize(const QSurfaceFormat& format);
 
diff --git a/libraries/gl/src/gl/GLShaders.cpp b/libraries/gl/src/gl/GLShaders.cpp
index fd0c6788cb..8ef0198676 100644
--- a/libraries/gl/src/gl/GLShaders.cpp
+++ b/libraries/gl/src/gl/GLShaders.cpp
@@ -182,7 +182,6 @@ GLuint compileProgram(const std::vector<GLuint>& glshaders, std::string& error)
         filestream.close();
         }
         */
-        delete[] temp;
 
         glDeleteProgram(glprogram);
         return 0;
diff --git a/libraries/gl/src/gl/OffscreenGLCanvas.cpp b/libraries/gl/src/gl/OffscreenGLCanvas.cpp
index 3f1d629638..b974564705 100644
--- a/libraries/gl/src/gl/OffscreenGLCanvas.cpp
+++ b/libraries/gl/src/gl/OffscreenGLCanvas.cpp
@@ -59,7 +59,7 @@ bool OffscreenGLCanvas::create(QOpenGLContext* sharedContext) {
 
 bool OffscreenGLCanvas::makeCurrent() {
     bool result = _context->makeCurrent(_offscreenSurface);
-    std::call_once(_reportOnce, [this]{
+    std::call_once(_reportOnce, []{
         qCDebug(glLogging) << "GL Version: " << QString((const char*) glGetString(GL_VERSION));
         qCDebug(glLogging) << "GL Shader Language Version: " << QString((const char*) glGetString(GL_SHADING_LANGUAGE_VERSION));
         qCDebug(glLogging) << "GL Vendor: " << QString((const char*) glGetString(GL_VENDOR));
diff --git a/libraries/gl/src/gl/OpenGLVersionChecker.cpp b/libraries/gl/src/gl/OpenGLVersionChecker.cpp
index f24a9bb932..771a8b9a75 100644
--- a/libraries/gl/src/gl/OpenGLVersionChecker.cpp
+++ b/libraries/gl/src/gl/OpenGLVersionChecker.cpp
@@ -21,9 +21,6 @@
 
 #include "GLHelpers.h"
 
-// Minimum gl version required is 4.1
-#define MINIMUM_GL_VERSION 0x0401
-
 OpenGLVersionChecker::OpenGLVersionChecker(int& argc, char** argv) :
     QApplication(argc, argv)
 {
diff --git a/libraries/gpu-gl/CMakeLists.txt b/libraries/gpu-gl/CMakeLists.txt
index 65130d6d07..dc744e73f2 100644
--- a/libraries/gpu-gl/CMakeLists.txt
+++ b/libraries/gpu-gl/CMakeLists.txt
@@ -5,10 +5,5 @@ if (UNIX)
     target_link_libraries(${TARGET_NAME} pthread)
 endif(UNIX)
 GroupSources("src")
-
 target_opengl()
-target_nsight()
 
-if (NOT ANDROID)
-  target_glew()
-endif ()
diff --git a/libraries/gpu-gl/src/gpu/gl/GLBackend.cpp b/libraries/gpu-gl/src/gpu/gl/GLBackend.cpp
index 3441407f62..f138244fa2 100644
--- a/libraries/gpu-gl/src/gpu/gl/GLBackend.cpp
+++ b/libraries/gpu-gl/src/gpu/gl/GLBackend.cpp
@@ -114,7 +114,9 @@ GLBackend::CommandCall GLBackend::_commandCalls[Batch::NUM_COMMANDS] =
     (&::gpu::gl::GLBackend::do_getQuery),
 
     (&::gpu::gl::GLBackend::do_resetStages),
-
+    
+    (&::gpu::gl::GLBackend::do_disableContextViewCorrection),
+    (&::gpu::gl::GLBackend::do_restoreContextViewCorrection),
     (&::gpu::gl::GLBackend::do_disableContextStereo),
     (&::gpu::gl::GLBackend::do_restoreContextStereo),
 
@@ -194,8 +196,6 @@ GLBackend::GLBackend() {
 
 
 GLBackend::~GLBackend() {
-    resetStages();
-
     killInput();
     killTransform();
 }
@@ -374,6 +374,13 @@ void GLBackend::do_resetStages(const Batch& batch, size_t paramOffset) {
     resetStages();
 }
 
+void GLBackend::do_disableContextViewCorrection(const Batch& batch, size_t paramOffset) {
+    _transform._viewCorrectionEnabled = false;
+}
+
+void GLBackend::do_restoreContextViewCorrection(const Batch& batch, size_t paramOffset) {
+    _transform._viewCorrectionEnabled = true;
+}
 
 void GLBackend::do_disableContextStereo(const Batch& batch, size_t paramOffset) {
 
@@ -448,7 +455,7 @@ void GLBackend::do_glUniform1i(const Batch& batch, size_t paramOffset) {
     }
     updatePipeline();
 
-    glUniform1f(
+    glUniform1i(
         GET_UNIFORM_LOCATION(batch._params[paramOffset + 1]._int),
         batch._params[paramOffset + 0]._int);
     (void)CHECK_GL_ERROR();
diff --git a/libraries/gpu-gl/src/gpu/gl/GLBackend.h b/libraries/gpu-gl/src/gpu/gl/GLBackend.h
index 96217555e1..1908db614d 100644
--- a/libraries/gpu-gl/src/gpu/gl/GLBackend.h
+++ b/libraries/gpu-gl/src/gpu/gl/GLBackend.h
@@ -66,7 +66,7 @@ protected:
 public:
     static bool makeProgram(Shader& shader, const Shader::BindingSet& slotBindings = Shader::BindingSet());
 
-    ~GLBackend();
+    virtual ~GLBackend();
 
     void setCameraCorrection(const Mat4& correction);
     void render(const Batch& batch) final override;
@@ -143,6 +143,10 @@ public:
     // Reset stages
     virtual void do_resetStages(const Batch& batch, size_t paramOffset) final;
 
+    
+    virtual void do_disableContextViewCorrection(const Batch& batch, size_t paramOffset) final;
+    virtual void do_restoreContextViewCorrection(const Batch& batch, size_t paramOffset) final;
+
     virtual void do_disableContextStereo(const Batch& batch, size_t paramOffset) final;
     virtual void do_restoreContextStereo(const Batch& batch, size_t paramOffset) final;
 
@@ -333,6 +337,8 @@ protected:
         bool _skybox { false };
         Transform _view;
         CameraCorrection _correction;
+        bool _viewCorrectionEnabled{ true };
+
 
         Mat4 _projection;
         Vec4i _viewport { 0, 0, 1, 1 };
@@ -400,6 +406,7 @@ protected:
         bool _invalidProgram { false };
 
         BufferView _cameraCorrectionBuffer { gpu::BufferView(std::make_shared<gpu::Buffer>(sizeof(CameraCorrection), nullptr )) };
+        BufferView _cameraCorrectionBufferIdentity { gpu::BufferView(std::make_shared<gpu::Buffer>(sizeof(CameraCorrection), nullptr )) };
 
         State::Data _stateCache{ State::DEFAULT };
         State::Signature _stateSignatureCache { 0 };
@@ -409,6 +416,8 @@ protected:
 
         PipelineStageState() {
             _cameraCorrectionBuffer.edit<CameraCorrection>() = CameraCorrection();
+            _cameraCorrectionBufferIdentity.edit<CameraCorrection>() = CameraCorrection();
+            _cameraCorrectionBufferIdentity._buffer->flush();
         }
     } _pipeline;
 
diff --git a/libraries/gpu-gl/src/gpu/gl/GLBackendPipeline.cpp b/libraries/gpu-gl/src/gpu/gl/GLBackendPipeline.cpp
index 2d71e8ed78..7ef64343ea 100644
--- a/libraries/gpu-gl/src/gpu/gl/GLBackendPipeline.cpp
+++ b/libraries/gpu-gl/src/gpu/gl/GLBackendPipeline.cpp
@@ -77,8 +77,14 @@ void GLBackend::do_setPipeline(const Batch& batch, size_t paramOffset) {
     if (_pipeline._invalidProgram) {
         glUseProgram(_pipeline._program);
         if (_pipeline._cameraCorrectionLocation != -1) {
-            auto cameraCorrectionBuffer = syncGPUObject(*_pipeline._cameraCorrectionBuffer._buffer);
+            gl::GLBuffer* cameraCorrectionBuffer = nullptr;
+            if (_transform._viewCorrectionEnabled) {
+                cameraCorrectionBuffer = syncGPUObject(*_pipeline._cameraCorrectionBuffer._buffer);
+            } else {
+                cameraCorrectionBuffer = syncGPUObject(*_pipeline._cameraCorrectionBufferIdentity._buffer);
+            }
             glBindBufferRange(GL_UNIFORM_BUFFER, _pipeline._cameraCorrectionLocation, cameraCorrectionBuffer->_id, 0, sizeof(CameraCorrection));
+
         }
         (void) CHECK_GL_ERROR();
         _pipeline._invalidProgram = false;
diff --git a/libraries/gpu-gl/src/gpu/gl/GLBackendShader.cpp b/libraries/gpu-gl/src/gpu/gl/GLBackendShader.cpp
index ffc8140b25..0c1b6880cb 100644
--- a/libraries/gpu-gl/src/gpu/gl/GLBackendShader.cpp
+++ b/libraries/gpu-gl/src/gpu/gl/GLBackendShader.cpp
@@ -485,9 +485,15 @@ void GLBackend::makeProgramBindings(ShaderObject& shaderObject) {
         glBindAttribLocation(glprogram, gpu::Stream::TANGENT, "inTangent");
     }
 
-    loc = glGetAttribLocation(glprogram, "inTexCoord1");
-    if (loc >= 0 && loc != gpu::Stream::TEXCOORD1) {
-        glBindAttribLocation(glprogram, gpu::Stream::TEXCOORD1, "inTexCoord1");
+    char attribName[] = "inTexCoordn";
+    for (auto i = 0; i < 4; i++) {
+        auto streamId = gpu::Stream::TEXCOORD1 + i;
+
+        attribName[strlen(attribName) - 1] = '1' + i;
+        loc = glGetAttribLocation(glprogram, attribName);
+        if (loc >= 0 && loc != streamId) {
+            glBindAttribLocation(glprogram, streamId, attribName);
+        }
     }
 
     loc = glGetAttribLocation(glprogram, "inSkinClusterIndex");
diff --git a/libraries/gpu-gl/src/gpu/gl/GLBackendTransform.cpp b/libraries/gpu-gl/src/gpu/gl/GLBackendTransform.cpp
index 01f055e0d9..f286a5cca9 100644
--- a/libraries/gpu-gl/src/gpu/gl/GLBackendTransform.cpp
+++ b/libraries/gpu-gl/src/gpu/gl/GLBackendTransform.cpp
@@ -102,7 +102,7 @@ void GLBackend::TransformStageState::preUpdate(size_t commandIndex, const Stereo
 
     if (_invalidView) {
         // Apply the correction
-        if (_viewIsCamera && _correction.correction != glm::mat4()) {
+        if (_viewIsCamera && (_viewCorrectionEnabled && _correction.correction != glm::mat4())) {
             // FIXME should I switch to using the camera correction buffer in Transform.slf and leave this out?
             Transform result;
             _view.mult(result, _view, _correction.correction);
diff --git a/libraries/gpu-gl/src/gpu/gl/GLShared.h b/libraries/gpu-gl/src/gpu/gl/GLShared.h
index 1b898e5c22..a1cf27afa6 100644
--- a/libraries/gpu-gl/src/gpu/gl/GLShared.h
+++ b/libraries/gpu-gl/src/gpu/gl/GLShared.h
@@ -110,6 +110,7 @@ static const GLenum ELEMENT_TYPE_TO_GL[gpu::NUM_TYPES] = {
     GL_SHORT,
     GL_UNSIGNED_SHORT,
     GL_BYTE,
+    GL_UNSIGNED_BYTE,
     GL_UNSIGNED_BYTE
 };
 
diff --git a/libraries/gpu-gl/src/gpu/gl/GLTexelFormat.cpp b/libraries/gpu-gl/src/gpu/gl/GLTexelFormat.cpp
index ef9b6c4297..528a2b524b 100644
--- a/libraries/gpu-gl/src/gpu/gl/GLTexelFormat.cpp
+++ b/libraries/gpu-gl/src/gpu/gl/GLTexelFormat.cpp
@@ -19,6 +19,7 @@ bool GLTexelFormat::isCompressed() const {
         case GL_COMPRESSED_RED_RGTC1:
         case GL_COMPRESSED_RG_RGTC2:
         case GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM:
+        case GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT:
             return true;
         default:
             return false;
@@ -94,6 +95,11 @@ GLenum GLTexelFormat::evalGLTexelFormatInternal(const gpu::Element& dstFormat) {
                     result = GL_R11F_G11F_B10F;
                     break;
 
+                case gpu::RGB9E5:
+                    // the type should be float
+                    result = GL_RGB9_E5;
+                    break;
+
                 case gpu::DEPTH:
                     result = GL_DEPTH_COMPONENT32;
                     switch (dstFormat.getType()) {
@@ -206,6 +212,9 @@ GLenum GLTexelFormat::evalGLTexelFormatInternal(const gpu::Element& dstFormat) {
                         case gpu::NUINT8:
                             result = GL_RGBA8;
                             break;
+                        case gpu::NUINT2:
+                            result = GL_RGBA2;
+                            break;
                         case gpu::NINT8:
                             result = GL_RGBA8_SNORM;
                             break;
@@ -244,6 +253,9 @@ GLenum GLTexelFormat::evalGLTexelFormatInternal(const gpu::Element& dstFormat) {
                 case gpu::COMPRESSED_BC5_XY:
                     result = GL_COMPRESSED_RG_RGTC2;
                     break;
+                case gpu::COMPRESSED_BC6_RGB:
+                    result = GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT;
+                    break;
                 case gpu::COMPRESSED_BC7_SRGBA:
                     result = GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM;
                     break;
@@ -396,6 +408,9 @@ GLTexelFormat GLTexelFormat::evalGLTexelFormat(const Element& dstFormat, const E
             case gpu::COMPRESSED_BC5_XY:
                 texel.internalFormat = GL_COMPRESSED_RG_RGTC2;
                 break;
+            case gpu::COMPRESSED_BC6_RGB:
+                texel.internalFormat = GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT;
+                break;
             case gpu::COMPRESSED_BC7_SRGBA:
                 texel.internalFormat = GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM;
                 break;
@@ -486,6 +501,7 @@ GLTexelFormat GLTexelFormat::evalGLTexelFormat(const Element& dstFormat, const E
                     break;
                 }
                 case gpu::COMPRESSED:
+                case gpu::NUINT2:
                 case gpu::NUM_TYPES: { // quiet compiler
                     Q_UNREACHABLE();
                 }
@@ -495,10 +511,16 @@ GLTexelFormat GLTexelFormat::evalGLTexelFormat(const Element& dstFormat, const E
 
             case gpu::R11G11B10:
                 texel.format = GL_RGB;
-                // the type should be float
+                texel.type = GL_UNSIGNED_INT_10F_11F_11F_REV;
                 texel.internalFormat = GL_R11F_G11F_B10F;
                 break;
 
+            case gpu::RGB9E5:
+                texel.format = GL_RGB;
+                texel.type = GL_UNSIGNED_INT_5_9_9_9_REV;
+                texel.internalFormat = GL_RGB9_E5;
+                break;
+
             case gpu::DEPTH:
                 texel.format = GL_DEPTH_COMPONENT; // It's depth component to load it
                 texel.internalFormat = GL_DEPTH_COMPONENT32;
@@ -530,6 +552,7 @@ GLTexelFormat GLTexelFormat::evalGLTexelFormat(const Element& dstFormat, const E
                     break;
                 }
                 case gpu::COMPRESSED:
+                case gpu::NUINT2:
                 case gpu::NUM_TYPES: { // quiet compiler
                     Q_UNREACHABLE();
                 }
@@ -642,6 +665,10 @@ GLTexelFormat GLTexelFormat::evalGLTexelFormat(const Element& dstFormat, const E
                     texel.format = GL_RGBA;
                     texel.internalFormat = GL_RGBA8_SNORM;
                     break;
+                case gpu::NUINT2:
+                    texel.format = GL_RGBA;
+                    texel.internalFormat = GL_RGBA2;
+                    break;
                 case gpu::NUINT32:
                 case gpu::NINT32:
                 case gpu::COMPRESSED:
@@ -694,6 +721,9 @@ GLTexelFormat GLTexelFormat::evalGLTexelFormat(const Element& dstFormat, const E
             case gpu::COMPRESSED_BC5_XY:
                 texel.internalFormat = GL_COMPRESSED_RG_RGTC2;
                 break;
+            case gpu::COMPRESSED_BC6_RGB:
+                texel.internalFormat = GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT;
+                break;
             case gpu::COMPRESSED_BC7_SRGBA:
                 texel.internalFormat = GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM;
                 break;
diff --git a/libraries/gpu-gl/src/gpu/gl/GLTexture.cpp b/libraries/gpu-gl/src/gpu/gl/GLTexture.cpp
index 7758ddaf49..943b8148ef 100644
--- a/libraries/gpu-gl/src/gpu/gl/GLTexture.cpp
+++ b/libraries/gpu-gl/src/gpu/gl/GLTexture.cpp
@@ -467,12 +467,14 @@ void GLVariableAllocationSupport::updateMemoryPressure() {
         _demoteQueue = WorkQueue();
 
         // Populate the existing textures into the queue
-        for (const auto& texture : strongTextures) {
-            // Race conditions can still leave nulls in the list, so we need to check
-            if (!texture) {
-                continue;
+        if (_memoryPressureState != MemoryPressureState::Idle) {
+            for (const auto& texture : strongTextures) {
+                // Race conditions can still leave nulls in the list, so we need to check
+                if (!texture) {
+                    continue;
+                }
+                addToWorkQueue(texture);
             }
-            addToWorkQueue(texture);
         }
     }
 }
diff --git a/libraries/gpu-gl/src/gpu/gl41/GL41Backend.h b/libraries/gpu-gl/src/gpu/gl41/GL41Backend.h
index 2c64b9d23d..42926fdb1c 100644
--- a/libraries/gpu-gl/src/gpu/gl41/GL41Backend.h
+++ b/libraries/gpu-gl/src/gpu/gl41/GL41Backend.h
@@ -43,6 +43,11 @@ public:
 
     explicit GL41Backend(bool syncCache) : Parent(syncCache) {}
     GL41Backend() : Parent() {}
+    virtual ~GL41Backend() {
+        // call resetStages here rather than in ~GLBackend dtor because it will call releaseResourceBuffer
+        // which is pure virtual from GLBackend's dtor.
+        resetStages();
+    }
 
     static const std::string GL41_VERSION;
     const std::string& getVersion() const override { return GL41_VERSION; }
diff --git a/libraries/gpu-gl/src/gpu/gl41/GL41BackendInput.cpp b/libraries/gpu-gl/src/gpu/gl41/GL41BackendInput.cpp
index 43b48f721f..e8ebcbe05c 100644
--- a/libraries/gpu-gl/src/gpu/gl41/GL41BackendInput.cpp
+++ b/libraries/gpu-gl/src/gpu/gl41/GL41BackendInput.cpp
@@ -95,7 +95,7 @@ void GL41Backend::updateInput() {
                             // GLenum perLocationStride = strides[bufferNum];
                             GLenum perLocationStride = attrib._element.getLocationSize();
                             GLuint stride = (GLuint)strides[bufferNum];
-                            GLuint pointer = (GLuint)(attrib._offset + offsets[bufferNum]);
+                            uintptr_t pointer = (uintptr_t)(attrib._offset + offsets[bufferNum]);
                             GLboolean isNormalized = attrib._element.isNormalized();
 
                             for (size_t locNum = 0; locNum < locationCount; ++locNum) {
diff --git a/libraries/gpu-gl/src/gpu/gl41/GL41BackendShader.cpp b/libraries/gpu-gl/src/gpu/gl41/GL41BackendShader.cpp
index b5a8dcb7a9..ff9ddaae63 100644
--- a/libraries/gpu-gl/src/gpu/gl41/GL41BackendShader.cpp
+++ b/libraries/gpu-gl/src/gpu/gl41/GL41BackendShader.cpp
@@ -7,9 +7,9 @@
 //
 #include "GL41Backend.h"
 #include "../gl/GLShader.h"
-//#include <gl/GLShaders.h>
 
 using namespace gpu;
+using namespace gpu::gl;
 using namespace gpu::gl41;
 
 // GLSL version
@@ -84,7 +84,7 @@ int GL41Backend::makeResourceBufferSlots(GLuint glprogram, const Shader::Binding
     return ssboCount;
 }
 
-void GL41Backend::makeProgramBindings(gl::ShaderObject& shaderObject) {
+void GL41Backend::makeProgramBindings(ShaderObject& shaderObject) {
     if (!shaderObject.glprogram) {
         return;
     }
diff --git a/libraries/gpu-gl/src/gpu/gl41/GL41BackendTexture.cpp b/libraries/gpu-gl/src/gpu/gl41/GL41BackendTexture.cpp
index 5998aebb33..cde4ff5f75 100644
--- a/libraries/gpu-gl/src/gpu/gl41/GL41BackendTexture.cpp
+++ b/libraries/gpu-gl/src/gpu/gl41/GL41BackendTexture.cpp
@@ -114,6 +114,7 @@ Size GL41Texture::copyMipFaceLinesFromTexture(uint16_t mip, uint8_t face, const
             case GL_COMPRESSED_RED_RGTC1:
             case GL_COMPRESSED_RG_RGTC2:
             case GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM:
+            case GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT:
                 glCompressedTexSubImage2D(_target, mip, 0, yOffset, size.x, size.y, internalFormat,
                                           static_cast<GLsizei>(sourceSize), sourcePointer);
                 break;
@@ -131,6 +132,7 @@ Size GL41Texture::copyMipFaceLinesFromTexture(uint16_t mip, uint8_t face, const
             case GL_COMPRESSED_RED_RGTC1:
             case GL_COMPRESSED_RG_RGTC2:
             case GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM:
+            case GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT:
                 glCompressedTexSubImage2D(target, mip, 0, yOffset, size.x, size.y, internalFormat,
                                           static_cast<GLsizei>(sourceSize), sourcePointer);
                 break;
diff --git a/libraries/gpu-gl/src/gpu/gl45/GL45Backend.h b/libraries/gpu-gl/src/gpu/gl45/GL45Backend.h
index d5ff1a3485..1a4b63d35f 100644
--- a/libraries/gpu-gl/src/gpu/gl45/GL45Backend.h
+++ b/libraries/gpu-gl/src/gpu/gl45/GL45Backend.h
@@ -39,6 +39,11 @@ public:
 
     explicit GL45Backend(bool syncCache) : Parent(syncCache) {}
     GL45Backend() : Parent() {}
+    virtual ~GL45Backend() {
+        // call resetStages here rather than in ~GLBackend dtor because it will call releaseResourceBuffer
+        // which is pure virtual from GLBackend's dtor.
+        resetStages();
+    }
 
     static const std::string GL45_VERSION;
     const std::string& getVersion() const override { return GL45_VERSION; }
diff --git a/libraries/gpu-gl/src/gpu/gl45/GL45BackendShader.cpp b/libraries/gpu-gl/src/gpu/gl45/GL45BackendShader.cpp
index 8a5e8d0064..c2490524ae 100644
--- a/libraries/gpu-gl/src/gpu/gl45/GL45BackendShader.cpp
+++ b/libraries/gpu-gl/src/gpu/gl45/GL45BackendShader.cpp
@@ -10,6 +10,7 @@
 //#include <gl/GLShaders.h>
 
 using namespace gpu;
+using namespace gpu::gl;
 using namespace gpu::gl45;
 
 // GLSL version
@@ -132,7 +133,7 @@ int GL45Backend::makeResourceBufferSlots(GLuint glprogram, const Shader::Binding
     return ssboCount;*/
 }
 
-void GL45Backend::makeProgramBindings(gl::ShaderObject& shaderObject) {
+void GL45Backend::makeProgramBindings(ShaderObject& shaderObject) {
     if (!shaderObject.glprogram) {
         return;
     }
diff --git a/libraries/gpu-gl/src/gpu/gl45/GL45BackendTexture.cpp b/libraries/gpu-gl/src/gpu/gl45/GL45BackendTexture.cpp
index d8b3968ed8..795a630ccd 100644
--- a/libraries/gpu-gl/src/gpu/gl45/GL45BackendTexture.cpp
+++ b/libraries/gpu-gl/src/gpu/gl45/GL45BackendTexture.cpp
@@ -143,6 +143,7 @@ Size GL45Texture::copyMipFaceLinesFromTexture(uint16_t mip, uint8_t face, const
             case GL_COMPRESSED_RED_RGTC1:
             case GL_COMPRESSED_RG_RGTC2:
             case GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM:
+            case GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT:
                 glCompressedTextureSubImage2D(_id, mip, 0, yOffset, size.x, size.y, internalFormat,
                                               static_cast<GLsizei>(sourceSize), sourcePointer);
                 break;
@@ -158,6 +159,7 @@ Size GL45Texture::copyMipFaceLinesFromTexture(uint16_t mip, uint8_t face, const
             case GL_COMPRESSED_RED_RGTC1:
             case GL_COMPRESSED_RG_RGTC2:
             case GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM:
+            case GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT:
                 if (glCompressedTextureSubImage2DEXT) {
                     auto target = GLTexture::CUBE_FACE_LAYOUT[face];
                     glCompressedTextureSubImage2DEXT(_id, target, mip, 0, yOffset, size.x, size.y, internalFormat,
diff --git a/libraries/gpu-gles/CMakeLists.txt b/libraries/gpu-gles/CMakeLists.txt
new file mode 100644
index 0000000000..55ec53b184
--- /dev/null
+++ b/libraries/gpu-gles/CMakeLists.txt
@@ -0,0 +1,11 @@
+set(TARGET_NAME gpu-gles)
+setup_hifi_library(OpenGL)
+link_hifi_libraries(shared gl gpu)
+GroupSources("src")
+
+target_opengl()
+target_nsight()
+
+if (NOT ANDROID)
+  target_glew()
+endif ()
diff --git a/libraries/gpu-gles/src/gpu/gl/GLBackend.cpp b/libraries/gpu-gles/src/gpu/gl/GLBackend.cpp
new file mode 100644
index 0000000000..1d66618703
--- /dev/null
+++ b/libraries/gpu-gles/src/gpu/gl/GLBackend.cpp
@@ -0,0 +1,722 @@
+//
+//  GLBackend.cpp
+//  libraries/gpu-gl-android/src/gpu/gl
+//
+//  Created by Cristian Duarte & Gabriel Calero on 9/21/2016.
+//  Copyright 2016 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 "GLBackend.h"
+
+#include <mutex>
+#include <queue>
+#include <list>
+#include <functional>
+#include <glm/gtc/type_ptr.hpp>
+
+#include "../gles/GLESBackend.h"
+
+#if defined(NSIGHT_FOUND)
+#include "nvToolsExt.h"
+#endif
+
+#include <GPUIdent.h>
+#include <gl/QOpenGLContextWrapper.h>
+#include <QtCore/QProcessEnvironment>
+
+#include "GLTexture.h"
+#include "GLShader.h"
+using namespace gpu;
+using namespace gpu::gl;
+
+static GLBackend* INSTANCE{ nullptr };
+static const char* GL_BACKEND_PROPERTY_NAME = "com.highfidelity.gl.backend";
+
+BackendPointer GLBackend::createBackend() {
+    // FIXME provide a mechanism to override the backend for testing
+    // Where the gpuContext is initialized and where the TRUE Backend is created and assigned
+    auto version = QOpenGLContextWrapper::currentContextVersion();
+    std::shared_ptr<GLBackend> result;
+    
+    qDebug() << "Using OpenGL ES backend";
+    result = std::make_shared<gpu::gles::GLESBackend>();
+
+    result->initInput();
+    result->initTransform();
+
+    INSTANCE = result.get();
+    void* voidInstance = &(*result);
+    qApp->setProperty(GL_BACKEND_PROPERTY_NAME, QVariant::fromValue(voidInstance));
+
+    gl::GLTexture::initTextureTransferHelper();
+    return result;
+}
+
+GLBackend& getBackend() {
+    if (!INSTANCE) {
+        INSTANCE = static_cast<GLBackend*>(qApp->property(GL_BACKEND_PROPERTY_NAME).value<void*>());
+    }
+    return *INSTANCE;
+}
+
+bool GLBackend::makeProgram(Shader& shader, const Shader::BindingSet& slotBindings) {
+    return GLShader::makeProgram(getBackend(), shader, slotBindings);
+}
+
+std::array<QString, 45> commandNames = { 
+        {QString("draw"),QString("drawIndexed"),QString("drawInstanced"),QString("drawIndexedInstanced"),QString("multiDrawIndirect"),QString("multiDrawIndexedIndirect"),QString("setInputFormat"),QString("setInputBuffer"),QString("setIndexBuffer"),QString("setIndirectBuffer"),QString("setModelTransform"),QString("setViewTransform"),QString("setProjectionTransform"),QString("setViewportTransform"),QString("setDepthRangeTransform"),QString("setPipeline"),QString("setStateBlendFactor"),QString("setStateScissorRect"),QString("setUniformBuffer"),QString("setResourceTexture"),QString("setFramebuffer"),QString("clearFramebuffer"),QString("blit"),QString("generateTextureMips"),QString("beginQuery"),QString("endQuery"),QString("getQuery"),QString("resetStages"),QString("runLambda"),QString("startNamedCall"),QString("stopNamedCall"),QString("glUniform1i"),QString("glUniform1f"),QString("glUniform2f"),QString("glUniform3f"),QString("glUniform4f"),QString("glUniform3fv"),QString("glUniform4fv"),QString("glUniform4iv"),QString("glUniformMatrix3fv"),QString("glUniformMatrix4fv"),QString("glColor4f"),QString("pushProfileRange"),QString("popProfileRange"),QString("NUM_COMMANDS")}
+};
+
+GLBackend::CommandCall GLBackend::_commandCalls[Batch::NUM_COMMANDS] = 
+{
+    (&::gpu::gl::GLBackend::do_draw), 
+    (&::gpu::gl::GLBackend::do_drawIndexed),
+    (&::gpu::gl::GLBackend::do_drawInstanced),
+    (&::gpu::gl::GLBackend::do_drawIndexedInstanced),
+    (&::gpu::gl::GLBackend::do_multiDrawIndirect),
+    (&::gpu::gl::GLBackend::do_multiDrawIndexedIndirect),
+
+    (&::gpu::gl::GLBackend::do_setInputFormat),
+    (&::gpu::gl::GLBackend::do_setInputBuffer),
+    (&::gpu::gl::GLBackend::do_setIndexBuffer),
+    (&::gpu::gl::GLBackend::do_setIndirectBuffer),
+
+    (&::gpu::gl::GLBackend::do_setModelTransform),
+    (&::gpu::gl::GLBackend::do_setViewTransform),
+    (&::gpu::gl::GLBackend::do_setProjectionTransform),
+    (&::gpu::gl::GLBackend::do_setViewportTransform),
+    (&::gpu::gl::GLBackend::do_setDepthRangeTransform),
+
+    (&::gpu::gl::GLBackend::do_setPipeline),
+    (&::gpu::gl::GLBackend::do_setStateBlendFactor),
+    (&::gpu::gl::GLBackend::do_setStateScissorRect),
+
+    (&::gpu::gl::GLBackend::do_setUniformBuffer),
+    (&::gpu::gl::GLBackend::do_setResourceTexture),
+
+    (&::gpu::gl::GLBackend::do_setFramebuffer),
+    (&::gpu::gl::GLBackend::do_clearFramebuffer),
+    (&::gpu::gl::GLBackend::do_blit),
+    (&::gpu::gl::GLBackend::do_generateTextureMips),
+
+    (&::gpu::gl::GLBackend::do_beginQuery),
+    (&::gpu::gl::GLBackend::do_endQuery),
+    (&::gpu::gl::GLBackend::do_getQuery),
+
+    (&::gpu::gl::GLBackend::do_resetStages),
+
+    (&::gpu::gl::GLBackend::do_runLambda),
+
+    (&::gpu::gl::GLBackend::do_startNamedCall),
+    (&::gpu::gl::GLBackend::do_stopNamedCall),
+
+    (&::gpu::gl::GLBackend::do_glUniform1i),
+    (&::gpu::gl::GLBackend::do_glUniform1f),
+    (&::gpu::gl::GLBackend::do_glUniform2f),
+    (&::gpu::gl::GLBackend::do_glUniform3f),
+    (&::gpu::gl::GLBackend::do_glUniform4f),
+    (&::gpu::gl::GLBackend::do_glUniform3fv),
+    (&::gpu::gl::GLBackend::do_glUniform4fv),
+    (&::gpu::gl::GLBackend::do_glUniform4iv),
+    (&::gpu::gl::GLBackend::do_glUniformMatrix3fv),
+    (&::gpu::gl::GLBackend::do_glUniformMatrix4fv),
+
+    (&::gpu::gl::GLBackend::do_glColor4f),
+
+    (&::gpu::gl::GLBackend::do_pushProfileRange),
+    (&::gpu::gl::GLBackend::do_popProfileRange),
+};
+
+void GLBackend::init() {
+    static std::once_flag once;
+    std::call_once(once, [] {
+        QString vendor{ (const char*)glGetString(GL_VENDOR) };
+        QString renderer{ (const char*)glGetString(GL_RENDERER) };
+        qCDebug(gpugllogging) << "GL Version: " << QString((const char*) glGetString(GL_VERSION));
+        qCDebug(gpugllogging) << "GL Shader Language Version: " << QString((const char*) glGetString(GL_SHADING_LANGUAGE_VERSION));
+        qCDebug(gpugllogging) << "GL Vendor: " << vendor;
+        qCDebug(gpugllogging) << "GL Renderer: " << renderer;
+        GPUIdent* gpu = GPUIdent::getInstance(vendor, renderer); 
+        // From here on, GPUIdent::getInstance()->getMumble() should efficiently give the same answers.
+        qCDebug(gpugllogging) << "GPU:";
+        qCDebug(gpugllogging) << "\tcard:" << gpu->getName();
+        qCDebug(gpugllogging) << "\tdriver:" << gpu->getDriver();
+        qCDebug(gpugllogging) << "\tdedicated memory:" << gpu->getMemory() << "MB";
+
+        /*glewExperimental = true;
+        GLenum err = glewInit();
+        glGetError(); // clear the potential error from glewExperimental
+        if (GLEW_OK != err) {
+            // glewInit failed, something is seriously wrong.
+            qCDebug(gpugllogging, "Error: %s\n", glewGetErrorString(err));
+        }
+        qCDebug(gpugllogging, "Status: Using GLEW %s\n", glewGetString(GLEW_VERSION));
+        */
+
+    });
+}
+
+GLBackend::GLBackend() {
+    _pipeline._cameraCorrectionBuffer._buffer->flush();
+    glGetIntegerv(GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT, &_uboAlignment);
+}
+
+
+GLBackend::~GLBackend() {
+    resetStages();
+
+    killInput();
+    killTransform();
+}
+
+void GLBackend::renderPassTransfer(const Batch& batch) {
+    const size_t numCommands = batch.getCommands().size();
+    const Batch::Commands::value_type* command = batch.getCommands().data();
+    const Batch::CommandOffsets::value_type* offset = batch.getCommandOffsets().data();
+
+    _inRenderTransferPass = true;
+    { // Sync all the buffers
+        ANDROID_PROFILE(render, "syncGPUBuffer", 0xffaaffaa, 1)
+
+        for (auto& cached : batch._buffers._items) {
+            if (cached._data) {
+                syncGPUObject(*cached._data);
+            }
+        }
+    }
+
+    { // Sync all the buffers
+        ANDROID_PROFILE(render, "syncCPUTransform", 0xffaaaaff, 1)
+        _transform._cameras.clear();
+        _transform._cameraOffsets.clear();
+
+        for (_commandIndex = 0; _commandIndex < numCommands; ++_commandIndex) {
+            switch (*command) {
+                case Batch::COMMAND_draw:
+                case Batch::COMMAND_drawIndexed:
+                case Batch::COMMAND_drawInstanced:
+                case Batch::COMMAND_drawIndexedInstanced:
+                case Batch::COMMAND_multiDrawIndirect:
+                case Batch::COMMAND_multiDrawIndexedIndirect:
+                    _transform.preUpdate(_commandIndex, _stereo);
+                    break;
+
+                case Batch::COMMAND_setViewportTransform:
+                case Batch::COMMAND_setViewTransform:
+                case Batch::COMMAND_setProjectionTransform: {
+                    ANDROID_PROFILE_COMMAND(render, (int)(*command), 0xffeeaaff, 1)
+                    CommandCall call = _commandCalls[(*command)];
+                    (this->*(call))(batch, *offset);
+                    break;
+                }
+
+                default:
+                    break;
+            }
+            command++;
+            offset++;
+        }
+    }
+
+    { // Sync the transform buffers
+        //PROFILE_RANGE(render_gpu_gl, "transferTransformState");
+        ANDROID_PROFILE(render, "transferTransformState", 0xff0000ff, 1)
+        transferTransformState(batch);
+    }
+
+    _inRenderTransferPass = false;
+}
+
+void GLBackend::renderPassDraw(const Batch& batch) {
+    _currentDraw = -1;
+    _transform._camerasItr = _transform._cameraOffsets.begin();
+    const size_t numCommands = batch.getCommands().size();
+    const Batch::Commands::value_type* command = batch.getCommands().data();
+    const Batch::CommandOffsets::value_type* offset = batch.getCommandOffsets().data();
+    for (_commandIndex = 0; _commandIndex < numCommands; ++_commandIndex) {
+        switch (*command) {
+            // Ignore these commands on this pass, taken care of in the transfer pass
+            // Note we allow COMMAND_setViewportTransform to occur in both passes
+            // as it both updates the transform object (and thus the uniforms in the 
+            // UBO) as well as executes the actual viewport call
+            case Batch::COMMAND_setModelTransform:
+            case Batch::COMMAND_setViewTransform:
+            case Batch::COMMAND_setProjectionTransform:
+                break;
+
+            case Batch::COMMAND_draw:
+            case Batch::COMMAND_drawIndexed:
+            case Batch::COMMAND_drawInstanced:
+            case Batch::COMMAND_drawIndexedInstanced:
+            case Batch::COMMAND_multiDrawIndirect:
+            case Batch::COMMAND_multiDrawIndexedIndirect: {
+                // updates for draw calls
+                ++_currentDraw;
+                updateInput();
+                updateTransform(batch);
+                updatePipeline();
+                {ANDROID_PROFILE_COMMAND(render, (int)(*command), 0xff0000ff, 1)
+                CommandCall call = _commandCalls[(*command)];
+                (this->*(call))(batch, *offset);
+                }
+                break;
+            }
+            default: {
+                ANDROID_PROFILE_COMMAND(render, (int)(*command), 0xffff00ff, 1)
+                CommandCall call = _commandCalls[(*command)];
+                (this->*(call))(batch, *offset);
+                break;
+            }
+        }
+
+        command++;
+        offset++;
+    }
+}
+
+void GLBackend::render(const Batch& batch) {
+    ANDROID_PROFILE(render, "GLBackendRender", 0xffff00ff, 1)
+    _transform._skybox = _stereo._skybox = batch.isSkyboxEnabled();
+    // Allow the batch to override the rendering stereo settings
+    // for things like full framebuffer copy operations (deferred lighting passes)
+    bool savedStereo = _stereo._enable;
+    if (!batch.isStereoEnabled()) {
+        _stereo._enable = false;
+    }
+    
+    {
+        //PROFILE_RANGE(render_gpu_gl, "Transfer");
+        ANDROID_PROFILE(render, "Transfer", 0xff0000ff, 1)
+        renderPassTransfer(batch);
+    }
+
+    {
+        //PROFILE_RANGE(render_gpu_gl, _stereo._enable ? "Render Stereo" : "Render");
+        ANDROID_PROFILE(render, "RenderPassDraw", 0xff00ddff, 1)
+        renderPassDraw(batch);
+    }
+
+    // Restore the saved stereo state for the next batch
+    _stereo._enable = savedStereo;
+}
+
+
+void GLBackend::syncCache() {
+    syncTransformStateCache();
+    syncPipelineStateCache();
+    syncInputStateCache();
+    syncOutputStateCache();
+
+    //glEnable(GL_LINE_SMOOTH);
+    qDebug() << "TODO: GLBackend.cpp:syncCache GL_LINE_SMOOTH";
+}
+
+void GLBackend::setupStereoSide(int side) {
+    ivec4 vp = _transform._viewport;
+    vp.z /= 2;
+    glViewport(vp.x + side * vp.z, vp.y, vp.z, vp.w);
+
+#ifdef GPU_STEREO_CAMERA_BUFFER
+#ifdef GPU_STEREO_DRAWCALL_DOUBLED
+    //glVertexAttribI1i(14, side);
+    glVertexAttribI4i(14, side, 0, 0, 0);
+
+#endif
+#else
+    _transform.bindCurrentCamera(side);
+#endif
+}
+
+void GLBackend::do_resetStages(const Batch& batch, size_t paramOffset) {
+    resetStages();
+}
+
+void GLBackend::do_runLambda(const Batch& batch, size_t paramOffset) {
+    std::function<void()> f = batch._lambdas.get(batch._params[paramOffset]._uint);
+    f();
+}
+
+void GLBackend::do_startNamedCall(const Batch& batch, size_t paramOffset) {
+    batch._currentNamedCall = batch._names.get(batch._params[paramOffset]._uint);
+    _currentDraw = -1;
+}
+
+void GLBackend::do_stopNamedCall(const Batch& batch, size_t paramOffset) {
+    batch._currentNamedCall.clear();
+}
+
+void GLBackend::resetStages() {
+    resetInputStage();
+    resetPipelineStage();
+    resetTransformStage();
+    resetUniformStage();
+    resetResourceStage();
+    resetOutputStage();
+    resetQueryStage();
+
+    (void) CHECK_GL_ERROR();
+}
+
+
+void GLBackend::do_pushProfileRange(const Batch& batch, size_t paramOffset) {
+    auto name = batch._profileRanges.get(batch._params[paramOffset]._uint);
+    profileRanges.push_back(name);
+#if defined(NSIGHT_FOUND)
+    nvtxRangePush(name.c_str());
+#endif
+}
+
+void GLBackend::do_popProfileRange(const Batch& batch, size_t paramOffset) {
+    profileRanges.pop_back();
+#if defined(NSIGHT_FOUND)
+    nvtxRangePop();
+#endif
+}
+
+// TODO: As long as we have gl calls explicitely issued from interface
+// code, we need to be able to record and batch these calls. THe long 
+// term strategy is to get rid of any GL calls in favor of the HIFI GPU API
+
+// As long as we don;t use several versions of shaders we can avoid this more complex code path
+// #define GET_UNIFORM_LOCATION(shaderUniformLoc) _pipeline._programShader->getUniformLocation(shaderUniformLoc, isStereo());
+#define GET_UNIFORM_LOCATION(shaderUniformLoc) shaderUniformLoc
+
+void GLBackend::do_glUniform1i(const Batch& batch, size_t paramOffset) {
+    if (_pipeline._program == 0) {
+        // We should call updatePipeline() to bind the program but we are not doing that
+        // because these uniform setters are deprecated and we don;t want to create side effect
+        return;
+    }
+    updatePipeline();
+
+    glUniform1f(
+        GET_UNIFORM_LOCATION(batch._params[paramOffset + 1]._int),
+        batch._params[paramOffset + 0]._int);
+    (void)CHECK_GL_ERROR();
+}
+
+void GLBackend::do_glUniform1f(const Batch& batch, size_t paramOffset) {
+    if (_pipeline._program == 0) {
+        // We should call updatePipeline() to bind the program but we are not doing that
+        // because these uniform setters are deprecated and we don;t want to create side effect
+        return;
+    }
+    updatePipeline();
+
+    glUniform1f(
+        GET_UNIFORM_LOCATION(batch._params[paramOffset + 1]._int),
+        batch._params[paramOffset + 0]._float);
+    (void)CHECK_GL_ERROR();
+}
+
+void GLBackend::do_glUniform2f(const Batch& batch, size_t paramOffset) {
+    if (_pipeline._program == 0) {
+        // We should call updatePipeline() to bind the program but we are not doing that
+        // because these uniform setters are deprecated and we don;t want to create side effect
+        return;
+    }
+    updatePipeline();
+    glUniform2f(
+        GET_UNIFORM_LOCATION(batch._params[paramOffset + 2]._int),
+        batch._params[paramOffset + 1]._float,
+        batch._params[paramOffset + 0]._float);
+    (void)CHECK_GL_ERROR();
+}
+
+void GLBackend::do_glUniform3f(const Batch& batch, size_t paramOffset) {
+    if (_pipeline._program == 0) {
+        // We should call updatePipeline() to bind the program but we are not doing that
+        // because these uniform setters are deprecated and we don;t want to create side effect
+        return;
+    }
+    updatePipeline();
+    glUniform3f(
+        GET_UNIFORM_LOCATION(batch._params[paramOffset + 3]._int),
+        batch._params[paramOffset + 2]._float,
+        batch._params[paramOffset + 1]._float,
+        batch._params[paramOffset + 0]._float);
+    (void)CHECK_GL_ERROR();
+}
+
+void GLBackend::do_glUniform4f(const Batch& batch, size_t paramOffset) {
+    if (_pipeline._program == 0) {
+        // We should call updatePipeline() to bind the program but we are not doing that
+        // because these uniform setters are deprecated and we don;t want to create side effect
+        return;
+    }
+    updatePipeline();
+    glUniform4f(
+        GET_UNIFORM_LOCATION(batch._params[paramOffset + 4]._int),
+        batch._params[paramOffset + 3]._float,
+        batch._params[paramOffset + 2]._float,
+        batch._params[paramOffset + 1]._float,
+        batch._params[paramOffset + 0]._float);
+    (void)CHECK_GL_ERROR();
+}
+
+void GLBackend::do_glUniform3fv(const Batch& batch, size_t paramOffset) {
+    if (_pipeline._program == 0) {
+        // We should call updatePipeline() to bind the program but we are not doing that
+        // because these uniform setters are deprecated and we don;t want to create side effect
+        return;
+    }
+    updatePipeline();
+    glUniform3fv(
+        GET_UNIFORM_LOCATION(batch._params[paramOffset + 2]._int),
+        batch._params[paramOffset + 1]._uint,
+        (const GLfloat*)batch.readData(batch._params[paramOffset + 0]._uint));
+
+    (void)CHECK_GL_ERROR();
+}
+
+void GLBackend::do_glUniform4fv(const Batch& batch, size_t paramOffset) {
+    if (_pipeline._program == 0) {
+        // We should call updatePipeline() to bind the program but we are not doing that
+        // because these uniform setters are deprecated and we don;t want to create side effect
+        return;
+    }
+    updatePipeline();
+
+    GLint location = GET_UNIFORM_LOCATION(batch._params[paramOffset + 2]._int);
+    GLsizei count = batch._params[paramOffset + 1]._uint;
+    const GLfloat* value = (const GLfloat*)batch.readData(batch._params[paramOffset + 0]._uint);
+    glUniform4fv(location, count, value);
+
+    (void)CHECK_GL_ERROR();
+}
+
+void GLBackend::do_glUniform4iv(const Batch& batch, size_t paramOffset) {
+    if (_pipeline._program == 0) {
+        // We should call updatePipeline() to bind the program but we are not doing that
+        // because these uniform setters are deprecated and we don;t want to create side effect
+        return;
+    }
+    updatePipeline();
+    glUniform4iv(
+        GET_UNIFORM_LOCATION(batch._params[paramOffset + 2]._int),
+        batch._params[paramOffset + 1]._uint,
+        (const GLint*)batch.readData(batch._params[paramOffset + 0]._uint));
+
+    (void)CHECK_GL_ERROR();
+}
+
+void GLBackend::do_glUniformMatrix3fv(const Batch& batch, size_t paramOffset) {
+    if (_pipeline._program == 0) {
+        // We should call updatePipeline() to bind the program but we are not doing that
+        // because these uniform setters are deprecated and we don;t want to create side effect
+        return;
+    }
+    updatePipeline();
+
+    glUniformMatrix3fv(
+        GET_UNIFORM_LOCATION(batch._params[paramOffset + 3]._int),
+        batch._params[paramOffset + 2]._uint,
+        batch._params[paramOffset + 1]._uint,
+        (const GLfloat*)batch.readData(batch._params[paramOffset + 0]._uint));
+    (void)CHECK_GL_ERROR();
+}
+
+void GLBackend::do_glUniformMatrix4fv(const Batch& batch, size_t paramOffset) {
+    if (_pipeline._program == 0) {
+        // We should call updatePipeline() to bind the program but we are not doing that
+        // because these uniform setters are deprecated and we don;t want to create side effect
+        return;
+    }
+    updatePipeline();
+
+    glUniformMatrix4fv(
+        GET_UNIFORM_LOCATION(batch._params[paramOffset + 3]._int),
+        batch._params[paramOffset + 2]._uint,
+        batch._params[paramOffset + 1]._uint,
+        (const GLfloat*)batch.readData(batch._params[paramOffset + 0]._uint));
+    (void)CHECK_GL_ERROR();
+}
+
+void GLBackend::do_glColor4f(const Batch& batch, size_t paramOffset) {
+
+    glm::vec4 newColor(
+        batch._params[paramOffset + 3]._float,
+        batch._params[paramOffset + 2]._float,
+        batch._params[paramOffset + 1]._float,
+        batch._params[paramOffset + 0]._float);
+
+    if (_input._colorAttribute != newColor) {
+        _input._colorAttribute = newColor;
+        glVertexAttrib4fv(gpu::Stream::COLOR, &_input._colorAttribute.r);
+    }
+    (void)CHECK_GL_ERROR();
+}
+
+void GLBackend::releaseBuffer(GLuint id, Size size) const {
+    Lock lock(_trashMutex);
+    _buffersTrash.push_back({ id, size });
+}
+
+void GLBackend::releaseExternalTexture(GLuint id, const Texture::ExternalRecycler& recycler) const {
+    Lock lock(_trashMutex);
+    _externalTexturesTrash.push_back({ id, recycler });
+}
+
+void GLBackend::releaseTexture(GLuint id, Size size) const {
+    Lock lock(_trashMutex);
+    _texturesTrash.push_back({ id, size });
+}
+
+void GLBackend::releaseFramebuffer(GLuint id) const {
+    Lock lock(_trashMutex);
+    _framebuffersTrash.push_back(id);
+}
+
+void GLBackend::releaseShader(GLuint id) const {
+    Lock lock(_trashMutex);
+    _shadersTrash.push_back(id);
+}
+
+void GLBackend::releaseProgram(GLuint id) const {
+    Lock lock(_trashMutex);
+    _programsTrash.push_back(id);
+}
+
+void GLBackend::releaseQuery(GLuint id) const {
+    Lock lock(_trashMutex);
+    _queriesTrash.push_back(id);
+}
+
+void GLBackend::queueLambda(const std::function<void()> lambda) const {
+    Lock lock(_trashMutex);
+    _lambdaQueue.push_back(lambda);
+}
+
+void GLBackend::recycle() const {
+    {
+        std::list<std::function<void()>> lamdbasTrash;
+        {
+            Lock lock(_trashMutex);
+            std::swap(_lambdaQueue, lamdbasTrash);
+        }
+        for (auto lambda : lamdbasTrash) {
+            lambda();
+        }
+    }
+
+    {
+        std::vector<GLuint> ids;
+        std::list<std::pair<GLuint, Size>> buffersTrash;
+        {
+            Lock lock(_trashMutex);
+            std::swap(_buffersTrash, buffersTrash);
+        }
+        ids.reserve(buffersTrash.size());
+        for (auto pair : buffersTrash) {
+            ids.push_back(pair.first);
+        }
+        if (!ids.empty()) {
+            glDeleteBuffers((GLsizei)ids.size(), ids.data());
+        }
+    }
+
+    {
+        std::vector<GLuint> ids;
+        std::list<GLuint> framebuffersTrash;
+        {
+            Lock lock(_trashMutex);
+            std::swap(_framebuffersTrash, framebuffersTrash);
+        }
+        ids.reserve(framebuffersTrash.size());
+        for (auto id : framebuffersTrash) {
+            ids.push_back(id);
+        }
+        if (!ids.empty()) {
+            glDeleteFramebuffers((GLsizei)ids.size(), ids.data());
+        }
+    }
+
+    {
+        std::vector<GLuint> ids;
+        std::list<std::pair<GLuint, Size>> texturesTrash;
+        {
+            Lock lock(_trashMutex);
+            std::swap(_texturesTrash, texturesTrash);
+        }
+        ids.reserve(texturesTrash.size());
+        for (auto pair : texturesTrash) {
+            ids.push_back(pair.first);
+        }
+        if (!ids.empty()) {
+            glDeleteTextures((GLsizei)ids.size(), ids.data());
+        }
+    }
+
+    {
+        std::list<std::pair<GLuint, Texture::ExternalRecycler>> externalTexturesTrash;
+        {
+            Lock lock(_trashMutex);
+            std::swap(_externalTexturesTrash, externalTexturesTrash);
+        }
+        if (!externalTexturesTrash.empty()) {
+            std::vector<GLsync> fences;  
+            fences.resize(externalTexturesTrash.size());
+            for (size_t i = 0; i < externalTexturesTrash.size(); ++i) {
+                fences[i] = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
+            }
+            // External texture fences will be read in another thread/context, so we need a flush
+            glFlush();
+            size_t index = 0;
+            for (auto pair : externalTexturesTrash) {
+                auto fence = fences[index++];
+                pair.second(pair.first, fence);
+            }
+        }
+    }
+
+    {
+        std::list<GLuint> programsTrash;
+        {
+            Lock lock(_trashMutex);
+            std::swap(_programsTrash, programsTrash);
+        }
+        for (auto id : programsTrash) {
+            glDeleteProgram(id);
+        }
+    }
+
+    {
+        std::list<GLuint> shadersTrash;
+        {
+            Lock lock(_trashMutex);
+            std::swap(_shadersTrash, shadersTrash);
+        }
+        for (auto id : shadersTrash) {
+            glDeleteShader(id);
+        }
+    }
+
+    {
+        std::vector<GLuint> ids;
+        std::list<GLuint> queriesTrash;
+        {
+            Lock lock(_trashMutex);
+            std::swap(_queriesTrash, queriesTrash);
+        }
+        ids.reserve(queriesTrash.size());
+        for (auto id : queriesTrash) {
+            ids.push_back(id);
+        }
+        if (!ids.empty()) {
+            glDeleteQueries((GLsizei)ids.size(), ids.data());
+        }
+    }
+
+#ifndef THREADED_TEXTURE_TRANSFER
+    gl::GLTexture::_textureTransferHelper->process();
+#endif
+}
+
+void GLBackend::setCameraCorrection(const Mat4& correction) {
+    _transform._correction.correction = correction;
+    _transform._correction.correctionInverse = glm::inverse(correction);
+    _pipeline._cameraCorrectionBuffer._buffer->setSubData(0, _transform._correction);
+    _pipeline._cameraCorrectionBuffer._buffer->flush();
+}
diff --git a/libraries/gpu-gles/src/gpu/gl/GLBackend.h b/libraries/gpu-gles/src/gpu/gl/GLBackend.h
new file mode 100644
index 0000000000..f8f307bc17
--- /dev/null
+++ b/libraries/gpu-gles/src/gpu/gl/GLBackend.h
@@ -0,0 +1,427 @@
+//
+//  Created by Cristian Duarte & Gabriel Calero on 09/21/2016
+//  Copyright 2016 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_gpu_gles_Backend_h
+#define hifi_gpu_gles_Backend_h
+
+#include <assert.h>
+#include <functional>
+#include <memory>
+#include <bitset>
+#include <queue>
+#include <utility>
+#include <list>
+#include <array>
+
+#include <QtCore/QLoggingCategory>
+
+#include <gl/Config.h>
+
+#include <gpu/Forward.h>
+#include <gpu/Context.h>
+
+#include "GLShared.h"
+
+
+// Different versions for the stereo drawcall
+// Current preferred is  "instanced" which draw the shape twice but instanced and rely on clipping plane to draw left/right side only
+//#define GPU_STEREO_TECHNIQUE_DOUBLED_SMARTER
+//#define GPU_STEREO_TECHNIQUE_INSTANCED
+
+#ifdef GPU_STEREO_TECHNIQUE_DOUBLED_SMARTER
+#define GPU_STEREO_DRAWCALL_DOUBLED
+#define GPU_STEREO_CAMERA_BUFFER
+#endif
+
+#ifdef GPU_STEREO_TECHNIQUE_INSTANCED
+#define GPU_STEREO_DRAWCALL_INSTANCED
+#define GPU_STEREO_CAMERA_BUFFER
+#endif
+
+//#define ANDROID_INTENSIVE_INSTRUMENTATION 1
+
+#ifdef ANDROID_INTENSIVE_INSTRUMENTATION
+#define ANDROID_PROFILE_COMMAND(category, commandIndex, argbColor, payload, ...) PROFILE_RANGE_EX(category, commandNames[commandIndex], argbColor, payload, ##__VA_ARGS__);
+#define ANDROID_PROFILE(category, name, argbColor, payload, ...) PROFILE_RANGE_EX(category, name, argbColor, payload, ##__VA_ARGS__);
+#else
+#define ANDROID_PROFILE_COMMAND(category, commandIndex, argbColor, payload, ...)
+#define ANDROID_PROFILE(category, name, argbColor, payload, ...)
+#endif
+namespace gpu { namespace gl {
+
+        class GLBackend : public Backend, public std::enable_shared_from_this<GLBackend> {
+            // Context Backend static interface required
+            friend class gpu::Context;
+            static void init();
+            static BackendPointer createBackend();
+
+        protected:
+            explicit GLBackend(bool syncCache);
+            GLBackend();
+        public:
+            static bool makeProgram(Shader& shader, const Shader::BindingSet& slotBindings = Shader::BindingSet());
+
+            ~GLBackend();
+
+            void setCameraCorrection(const Mat4& correction);
+            void render(const Batch& batch) final override;
+
+            // This call synchronize the Full Backend cache with the current GLState
+            // THis is only intended to be used when mixing raw gl calls with the gpu api usage in order to sync
+            // the gpu::Backend state with the true gl state which has probably been messed up by these ugly naked gl calls
+            // Let's try to avoid to do that as much as possible!
+            void syncCache() final override;
+
+            // This is the ugly "download the pixels to sysmem for taking a snapshot"
+            // Just avoid using it, it's ugly and will break performances
+            virtual void downloadFramebuffer(const FramebufferPointer& srcFramebuffer,
+                                             const Vec4i& region, QImage& destImage) final override;
+
+
+            // this is the maximum numeber of available input buffers
+            size_t getNumInputBuffers() const { return _input._invalidBuffers.size(); }
+
+            // this is the maximum per shader stage on the low end apple
+            // TODO make it platform dependant at init time
+            static const int MAX_NUM_UNIFORM_BUFFERS = 12;
+            size_t getMaxNumUniformBuffers() const { return MAX_NUM_UNIFORM_BUFFERS; }
+
+            // this is the maximum per shader stage on the low end apple
+            // TODO make it platform dependant at init time
+            static const int MAX_NUM_RESOURCE_TEXTURES = 16;
+            size_t getMaxNumResourceTextures() const { return MAX_NUM_RESOURCE_TEXTURES; }
+
+            // Draw Stage
+            virtual void do_draw(const Batch& batch, size_t paramOffset) = 0;
+            virtual void do_drawIndexed(const Batch& batch, size_t paramOffset) = 0;
+            virtual void do_drawInstanced(const Batch& batch, size_t paramOffset) = 0;
+            virtual void do_drawIndexedInstanced(const Batch& batch, size_t paramOffset) = 0;
+            virtual void do_multiDrawIndirect(const Batch& batch, size_t paramOffset) = 0;
+            virtual void do_multiDrawIndexedIndirect(const Batch& batch, size_t paramOffset) = 0;
+
+            // Input Stage
+            virtual void do_setInputFormat(const Batch& batch, size_t paramOffset) final;
+            virtual void do_setInputBuffer(const Batch& batch, size_t paramOffset) final;
+            virtual void do_setIndexBuffer(const Batch& batch, size_t paramOffset) final;
+            virtual void do_setIndirectBuffer(const Batch& batch, size_t paramOffset) final;
+            virtual void do_generateTextureMips(const Batch& batch, size_t paramOffset) final;
+
+            // Transform Stage
+            virtual void do_setModelTransform(const Batch& batch, size_t paramOffset) final;
+            virtual void do_setViewTransform(const Batch& batch, size_t paramOffset) final;
+            virtual void do_setProjectionTransform(const Batch& batch, size_t paramOffset) final;
+            virtual void do_setViewportTransform(const Batch& batch, size_t paramOffset) final;
+            virtual void do_setDepthRangeTransform(const Batch& batch, size_t paramOffset) final;
+
+            // Uniform Stage
+            virtual void do_setUniformBuffer(const Batch& batch, size_t paramOffset) final;
+
+            // Resource Stage
+            virtual void do_setResourceTexture(const Batch& batch, size_t paramOffset) final;
+
+            // Pipeline Stage
+            virtual void do_setPipeline(const Batch& batch, size_t paramOffset) final;
+
+            // Output stage
+            virtual void do_setFramebuffer(const Batch& batch, size_t paramOffset) final;
+            virtual void do_clearFramebuffer(const Batch& batch, size_t paramOffset) final;
+            virtual void do_blit(const Batch& batch, size_t paramOffset) = 0;
+
+            // Query section
+            virtual void do_beginQuery(const Batch& batch, size_t paramOffset) final;
+            virtual void do_endQuery(const Batch& batch, size_t paramOffset) final;
+            virtual void do_getQuery(const Batch& batch, size_t paramOffset) final;
+
+            // Reset stages
+            virtual void do_resetStages(const Batch& batch, size_t paramOffset) final;
+
+            virtual void do_runLambda(const Batch& batch, size_t paramOffset) final;
+
+            virtual void do_startNamedCall(const Batch& batch, size_t paramOffset) final;
+            virtual void do_stopNamedCall(const Batch& batch, size_t paramOffset) final;
+
+            static const int MAX_NUM_ATTRIBUTES = Stream::NUM_INPUT_SLOTS;
+            // The drawcall Info attribute  channel is reserved and is the upper bound for the number of availables Input buffers
+            static const int MAX_NUM_INPUT_BUFFERS = Stream::DRAW_CALL_INFO;
+
+            virtual void do_pushProfileRange(const Batch& batch, size_t paramOffset) final;
+            virtual void do_popProfileRange(const Batch& batch, size_t paramOffset) final;
+
+            // TODO: As long as we have gl calls explicitely issued from interface
+            // code, we need to be able to record and batch these calls. THe long
+            // term strategy is to get rid of any GL calls in favor of the HIFI GPU API
+            virtual void do_glUniform1i(const Batch& batch, size_t paramOffset) final;
+            virtual void do_glUniform1f(const Batch& batch, size_t paramOffset) final;
+            virtual void do_glUniform2f(const Batch& batch, size_t paramOffset) final;
+            virtual void do_glUniform3f(const Batch& batch, size_t paramOffset) final;
+            virtual void do_glUniform4f(const Batch& batch, size_t paramOffset) final;
+            virtual void do_glUniform3fv(const Batch& batch, size_t paramOffset) final;
+            virtual void do_glUniform4fv(const Batch& batch, size_t paramOffset) final;
+            virtual void do_glUniform4iv(const Batch& batch, size_t paramOffset) final;
+            virtual void do_glUniformMatrix3fv(const Batch& batch, size_t paramOffset) final;
+            virtual void do_glUniformMatrix4fv(const Batch& batch, size_t paramOffset) final;
+
+            virtual void do_glColor4f(const Batch& batch, size_t paramOffset) final;
+
+            // The State setters called by the GLState::Commands when a new state is assigned
+            virtual void do_setStateFillMode(int32 mode) final;
+            virtual void do_setStateCullMode(int32 mode) final;
+            virtual void do_setStateFrontFaceClockwise(bool isClockwise) final;
+            virtual void do_setStateDepthClampEnable(bool enable) final;
+            virtual void do_setStateScissorEnable(bool enable) final;
+            virtual void do_setStateMultisampleEnable(bool enable) final;
+            virtual void do_setStateAntialiasedLineEnable(bool enable) final;
+            virtual void do_setStateDepthBias(Vec2 bias) final;
+            virtual void do_setStateDepthTest(State::DepthTest test) final;
+            virtual void do_setStateStencil(State::StencilActivation activation, State::StencilTest frontTest, State::StencilTest backTest) final;
+            virtual void do_setStateAlphaToCoverageEnable(bool enable) final;
+            virtual void do_setStateSampleMask(uint32 mask) final;
+            virtual void do_setStateBlend(State::BlendFunction blendFunction) final;
+            virtual void do_setStateColorWriteMask(uint32 mask) final;
+            virtual void do_setStateBlendFactor(const Batch& batch, size_t paramOffset) final;
+            virtual void do_setStateScissorRect(const Batch& batch, size_t paramOffset) final;
+
+            virtual GLuint getFramebufferID(const FramebufferPointer& framebuffer) = 0;
+            virtual GLuint getTextureID(const TexturePointer& texture, bool needTransfer = true) = 0;
+            virtual GLuint getBufferID(const Buffer& buffer) = 0;
+            virtual GLuint getQueryID(const QueryPointer& query) = 0;
+            virtual bool isTextureReady(const TexturePointer& texture);
+
+            virtual void releaseBuffer(GLuint id, Size size) const;
+            virtual void releaseExternalTexture(GLuint id, const Texture::ExternalRecycler& recycler) const;
+            virtual void releaseTexture(GLuint id, Size size) const;
+            virtual void releaseFramebuffer(GLuint id) const;
+            virtual void releaseShader(GLuint id) const;
+            virtual void releaseProgram(GLuint id) const;
+            virtual void releaseQuery(GLuint id) const;
+            virtual void queueLambda(const std::function<void()> lambda) const;
+
+            bool isTextureManagementSparseEnabled() const override { return (_textureManagement._sparseCapable && Texture::getEnableSparseTextures()); }
+
+        protected:
+
+            void recycle() const override;
+            virtual GLFramebuffer* syncGPUObject(const Framebuffer& framebuffer) = 0;
+            virtual GLBuffer* syncGPUObject(const Buffer& buffer) = 0;
+            virtual GLTexture* syncGPUObject(const TexturePointer& texture, bool sync = true) = 0;
+            virtual GLQuery* syncGPUObject(const Query& query) = 0;
+
+            static const size_t INVALID_OFFSET = (size_t)-1;
+            bool _inRenderTransferPass { false };
+            int32_t _uboAlignment { 0 };
+            int _currentDraw { -1 };
+
+            std::list<std::string> profileRanges;
+            mutable Mutex _trashMutex;
+            mutable std::list<std::pair<GLuint, Size>> _buffersTrash;
+            mutable std::list<std::pair<GLuint, Size>> _texturesTrash;
+            mutable std::list<std::pair<GLuint, Texture::ExternalRecycler>> _externalTexturesTrash;
+            mutable std::list<GLuint> _framebuffersTrash;
+            mutable std::list<GLuint> _shadersTrash;
+            mutable std::list<GLuint> _programsTrash;
+            mutable std::list<GLuint> _queriesTrash;
+            mutable std::list<std::function<void()>> _lambdaQueue;
+
+            void renderPassTransfer(const Batch& batch);
+            void renderPassDraw(const Batch& batch);
+            void setupStereoSide(int side);
+
+            virtual void initInput() final;
+            virtual void killInput() final;
+            virtual void syncInputStateCache() final;
+            virtual void resetInputStage();
+            virtual void updateInput();
+
+            struct InputStageState {
+                bool _invalidFormat { true };
+                Stream::FormatPointer _format;
+                std::string _formatKey;
+
+                typedef std::bitset<MAX_NUM_ATTRIBUTES> ActivationCache;
+                ActivationCache _attributeActivation { 0 };
+
+                typedef std::bitset<MAX_NUM_INPUT_BUFFERS> BuffersState;
+
+                BuffersState _invalidBuffers{ 0 };
+                BuffersState _attribBindingBuffers{ 0 };
+
+                Buffers _buffers;
+                Offsets _bufferOffsets;
+                Offsets _bufferStrides;
+                std::vector<GLuint> _bufferVBOs;
+
+                glm::vec4 _colorAttribute{ 0.0f };
+
+                BufferPointer _indexBuffer;
+                Offset _indexBufferOffset { 0 };
+                Type _indexBufferType { UINT32 };
+
+                BufferPointer _indirectBuffer;
+                Offset _indirectBufferOffset{ 0 };
+                Offset _indirectBufferStride{ 0 };
+
+                GLuint _defaultVAO { 0 };
+
+                InputStageState() :
+                        _invalidFormat(true),
+                        _format(0),
+                        _formatKey(),
+                        _attributeActivation(0),
+                        _buffers(_invalidBuffers.size(), BufferPointer(0)),
+                        _bufferOffsets(_invalidBuffers.size(), 0),
+                        _bufferStrides(_invalidBuffers.size(), 0),
+                        _bufferVBOs(_invalidBuffers.size(), 0) {}
+            } _input;
+
+            virtual void initTransform() = 0;
+            void killTransform();
+            // Synchronize the state cache of this Backend with the actual real state of the GL Context
+            void syncTransformStateCache();
+            void updateTransform(const Batch& batch);
+            void resetTransformStage();
+
+            // Allows for correction of the camera pose to account for changes
+            // between the time when a was recorded and the time(s) when it is
+            // executed
+            struct CameraCorrection {
+                Mat4 correction;
+                Mat4 correctionInverse;
+            };
+
+            struct TransformStageState {
+#ifdef GPU_STEREO_CAMERA_BUFFER
+                struct Cameras {
+            TransformCamera _cams[2];
+
+            Cameras() {};
+            Cameras(const TransformCamera& cam) { memcpy(_cams, &cam, sizeof(TransformCamera)); };
+            Cameras(const TransformCamera& camL, const TransformCamera& camR) { memcpy(_cams, &camL, sizeof(TransformCamera)); memcpy(_cams + 1, &camR, sizeof(TransformCamera)); };
+        };
+
+        using CameraBufferElement = Cameras;
+#else
+                using CameraBufferElement = TransformCamera;
+#endif
+                using TransformCameras = std::vector<CameraBufferElement>;
+
+                TransformCamera _camera;
+                TransformCameras _cameras;
+
+                mutable std::map<std::string, GLvoid*> _drawCallInfoOffsets;
+
+                GLuint _objectBuffer { 0 };
+                GLuint _cameraBuffer { 0 };
+                GLuint _drawCallInfoBuffer { 0 };
+                GLuint _objectBufferTexture { 0 };
+                size_t _cameraUboSize { 0 };
+                bool _viewIsCamera{ false };
+                bool _skybox { false };
+                Transform _view;
+                CameraCorrection _correction;
+
+                Mat4 _projection;
+                Vec4i _viewport { 0, 0, 1, 1 };
+                Vec2 _depthRange { 0.0f, 1.0f };
+                bool _invalidView { false };
+                bool _invalidProj { false };
+                bool _invalidViewport { false };
+
+                bool _enabledDrawcallInfoBuffer{ false };
+
+                using Pair = std::pair<size_t, size_t>;
+                using List = std::list<Pair>;
+                List _cameraOffsets;
+                mutable List::const_iterator _camerasItr;
+                mutable size_t _currentCameraOffset{ INVALID_OFFSET };
+
+                void preUpdate(size_t commandIndex, const StereoState& stereo);
+                void update(size_t commandIndex, const StereoState& stereo) const;
+                void bindCurrentCamera(int stereoSide) const;
+            } _transform;
+
+            virtual void transferTransformState(const Batch& batch) const = 0;
+
+            struct UniformStageState {
+                std::array<BufferPointer, MAX_NUM_UNIFORM_BUFFERS> _buffers;
+                //Buffers _buffers {  };
+            } _uniform;
+
+            void releaseUniformBuffer(uint32_t slot);
+            void resetUniformStage();
+
+            // update resource cache and do the gl unbind call with the current gpu::Texture cached at slot s
+            void releaseResourceTexture(uint32_t slot);
+
+            void resetResourceStage();
+
+            struct ResourceStageState {
+                std::array<TexturePointer, MAX_NUM_RESOURCE_TEXTURES> _textures;
+                //Textures _textures { { MAX_NUM_RESOURCE_TEXTURES } };
+                int findEmptyTextureSlot() const;
+            } _resource;
+
+            size_t _commandIndex{ 0 };
+
+            // Standard update pipeline check that the current Program and current State or good to go for a
+            void updatePipeline();
+            // Force to reset all the state fields indicated by the 'toBeReset" signature
+            void resetPipelineState(State::Signature toBeReset);
+            // Synchronize the state cache of this Backend with the actual real state of the GL Context
+            void syncPipelineStateCache();
+            void resetPipelineStage();
+
+            struct PipelineStageState {
+                PipelinePointer _pipeline;
+
+                GLuint _program { 0 };
+                GLint _cameraCorrectionLocation { -1 };
+                GLShader* _programShader { nullptr };
+                bool _invalidProgram { false };
+
+                BufferView _cameraCorrectionBuffer { gpu::BufferView(std::make_shared<gpu::Buffer>(sizeof(CameraCorrection), nullptr )) };
+
+                State::Data _stateCache{ State::DEFAULT };
+                State::Signature _stateSignatureCache { 0 };
+
+                GLState* _state { nullptr };
+                bool _invalidState { false };
+
+                PipelineStageState() {
+                    _cameraCorrectionBuffer.edit<CameraCorrection>() = CameraCorrection();
+                }
+            } _pipeline;
+
+            // Synchronize the state cache of this Backend with the actual real state of the GL Context
+            void syncOutputStateCache();
+            void resetOutputStage();
+
+            struct OutputStageState {
+                FramebufferPointer _framebuffer { nullptr };
+                GLuint _drawFBO { 0 };
+            } _output;
+
+            void resetQueryStage();
+            struct QueryStageState {
+                uint32_t _rangeQueryDepth { 0 };
+            } _queryStage;
+
+            void resetStages();
+
+            struct TextureManagementStageState {
+                bool _sparseCapable { false };
+            } _textureManagement;
+            virtual void initTextureManagementStage() {}
+
+            typedef void (GLBackend::*CommandCall)(const Batch&, size_t);
+            static CommandCall _commandCalls[Batch::NUM_COMMANDS];
+            friend class GLState;
+            friend class GLTexture;
+        };
+
+    } }
+
+#endif
diff --git a/libraries/gpu-gles/src/gpu/gl/GLBackendInput.cpp b/libraries/gpu-gles/src/gpu/gl/GLBackendInput.cpp
new file mode 100644
index 0000000000..057682584d
--- /dev/null
+++ b/libraries/gpu-gles/src/gpu/gl/GLBackendInput.cpp
@@ -0,0 +1,338 @@
+//
+//  GLBackendInput.cpp
+//  libraries/gpu/src/gpu
+//
+//  Created by Sam Gateau on 3/8/2015.
+//  Copyright 2014 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 "GLBackend.h"
+#include "GLShared.h"
+#include "GLInputFormat.h"
+
+using namespace gpu;
+using namespace gpu::gl;
+
+void GLBackend::do_setInputFormat(const Batch& batch, size_t paramOffset) {
+    Stream::FormatPointer format = batch._streamFormats.get(batch._params[paramOffset]._uint);
+    if (format != _input._format) {
+        _input._format = format;
+        if (format) {
+            auto inputFormat = GLInputFormat::sync((*format));
+            assert(inputFormat);
+            if (_input._formatKey != inputFormat->key) {
+                _input._formatKey = inputFormat->key;
+                _input._invalidFormat = true;
+            }
+        } else {
+            _input._formatKey.clear();
+            _input._invalidFormat = true;
+        }
+    }
+}
+
+void GLBackend::do_setInputBuffer(const Batch& batch, size_t paramOffset) {
+    Offset stride = batch._params[paramOffset + 0]._uint;
+    Offset offset = batch._params[paramOffset + 1]._uint;
+    BufferPointer buffer = batch._buffers.get(batch._params[paramOffset + 2]._uint);
+    uint32 channel = batch._params[paramOffset + 3]._uint;
+
+    if (channel < getNumInputBuffers()) {
+        bool isModified = false;
+        if (_input._buffers[channel] != buffer) {
+            _input._buffers[channel] = buffer;
+         
+            GLuint vbo = 0;
+            if (buffer) {
+                vbo = getBufferID((*buffer));
+            }
+            _input._bufferVBOs[channel] = vbo;
+
+            isModified = true;
+        }
+
+        if (_input._bufferOffsets[channel] != offset) {
+            _input._bufferOffsets[channel] = offset;
+            isModified = true;
+        }
+
+        if (_input._bufferStrides[channel] != stride) {
+            _input._bufferStrides[channel] = stride;
+            isModified = true;
+        }
+
+        if (isModified) {
+            _input._invalidBuffers.set(channel);
+        }
+    }
+}
+
+void GLBackend::initInput() {
+    if(!_input._defaultVAO) {
+        glGenVertexArrays(1, &_input._defaultVAO);
+    }
+    qDebug() << "glBindVertexArray(" << _input._defaultVAO << ")";
+    glBindVertexArray(_input._defaultVAO);
+    (void) CHECK_GL_ERROR();
+}
+
+void GLBackend::killInput() {
+    qDebug() << "glBindVertexArray(0)";
+    glBindVertexArray(0);    
+    if(_input._defaultVAO) {
+        glDeleteVertexArrays(1, &_input._defaultVAO);
+    }
+    (void) CHECK_GL_ERROR();
+}
+
+void GLBackend::syncInputStateCache() {
+    for (uint32_t i = 0; i < _input._attributeActivation.size(); i++) {
+        GLint active = 0;
+        glGetVertexAttribiv(i, GL_VERTEX_ATTRIB_ARRAY_ENABLED, &active);
+        _input._attributeActivation[i] = active;
+    }
+    //_input._defaultVAO
+    qDebug() << "glBindVertexArray("<<_input._defaultVAO<< ")";
+    glBindVertexArray(_input._defaultVAO);
+}
+
+void GLBackend::resetInputStage() {
+    // Reset index buffer
+    _input._indexBufferType = UINT32;
+    _input._indexBufferOffset = 0;
+    _input._indexBuffer.reset();
+    //qDebug() << "GLBackend::resetInputStage glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);";
+    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
+    (void) CHECK_GL_ERROR();
+
+    // Reset vertex buffer and format
+    _input._format.reset();
+    _input._formatKey.clear();
+    _input._invalidFormat = false;
+    _input._attributeActivation.reset();
+
+    for (uint32_t i = 0; i < _input._buffers.size(); i++) {
+        _input._buffers[i].reset();
+        _input._bufferOffsets[i] = 0;
+        _input._bufferStrides[i] = 0;
+        _input._bufferVBOs[i] = 0;
+    }
+    _input._invalidBuffers.reset();
+
+    // THe vertex array binding MUST be reset in the specific Backend versions as they use different techniques
+}
+
+void GLBackend::do_setIndexBuffer(const Batch& batch, size_t paramOffset) {
+    _input._indexBufferType = (Type)batch._params[paramOffset + 2]._uint;
+    _input._indexBufferOffset = batch._params[paramOffset + 0]._uint;
+
+    BufferPointer indexBuffer = batch._buffers.get(batch._params[paramOffset + 1]._uint);
+    if (indexBuffer != _input._indexBuffer) {
+        _input._indexBuffer = indexBuffer;
+        if (indexBuffer) {
+            glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, getBufferID(*indexBuffer));
+        } else {
+            // FIXME do we really need this?  Is there ever a draw call where we care that the element buffer is null?
+            glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
+        }
+    }
+    (void) CHECK_GL_ERROR();
+}
+
+void GLBackend::do_setIndirectBuffer(const Batch& batch, size_t paramOffset) {
+    _input._indirectBufferOffset = batch._params[paramOffset + 1]._uint;
+    _input._indirectBufferStride = batch._params[paramOffset + 2]._uint;
+
+    BufferPointer buffer = batch._buffers.get(batch._params[paramOffset]._uint);
+    if (buffer != _input._indirectBuffer) {
+        _input._indirectBuffer = buffer;
+        if (buffer) {
+            glBindBuffer(GL_DRAW_INDIRECT_BUFFER, getBufferID(*buffer));
+        } else {
+            // FIXME do we really need this?  Is there ever a draw call where we care that the element buffer is null?
+            glBindBuffer(GL_DRAW_INDIRECT_BUFFER, 0);
+        }
+    }
+
+    (void)CHECK_GL_ERROR();
+}
+
+
+// Core 41 doesn't expose the features to really separate the vertex format from the vertex buffers binding
+// Core 43 does :)
+// FIXME crashing problem with glVertexBindingDivisor / glVertexAttribFormat
+// Once resolved, break this up into the GL 4.1 and 4.5 backends
+#if 1 || (GPU_INPUT_PROFILE == GPU_CORE_41)
+#define NO_SUPPORT_VERTEX_ATTRIB_FORMAT
+#else
+#define SUPPORT_VERTEX_ATTRIB_FORMAT
+#endif
+
+void GLBackend::updateInput() {
+#if defined(SUPPORT_VERTEX_ATTRIB_FORMAT)
+    if (_input._invalidFormat) {
+
+        InputStageState::ActivationCache newActivation;
+
+        // Assign the vertex format required
+        if (_input._format) {
+            for (auto& it : _input._format->getAttributes()) {
+                const Stream::Attribute& attrib = (it).second;
+
+                GLuint slot = attrib._slot;
+                GLuint count = attrib._element.getLocationScalarCount();
+                uint8_t locationCount = attrib._element.getLocationCount();
+                GLenum type = _elementTypeToGL41Type[attrib._element.getType()];
+                GLuint offset = attrib._offset;;
+                GLboolean isNormalized = attrib._element.isNormalized();
+
+                GLenum perLocationSize = attrib._element.getLocationSize();
+
+                for (size_t locNum = 0; locNum < locationCount; ++locNum) {
+                    newActivation.set(slot + locNum);
+                    glVertexAttribFormat(slot + locNum, count, type, isNormalized, offset + locNum * perLocationSize);
+                    glVertexAttribBinding(slot + locNum, attrib._channel);
+                }
+                glVertexBindingDivisor(attrib._channel, attrib._frequency);
+            }
+            (void)CHECK_GL_ERROR();
+        }
+
+        // Manage Activation what was and what is expected now
+        for (size_t i = 0; i < newActivation.size(); i++) {
+            bool newState = newActivation[i];
+            if (newState != _input._attributeActivation[i]) {
+                if (newState) {
+                    glEnableVertexAttribArray(i);
+                } else {
+                    glDisableVertexAttribArray(i);
+                }
+                _input._attributeActivation.flip(i);
+            }
+        }
+        (void)CHECK_GL_ERROR();
+
+        _input._invalidFormat = false;
+        _stats._ISNumFormatChanges++;
+    }
+
+    if (_input._invalidBuffers.any()) {
+        int numBuffers = _input._buffers.size();
+        auto buffer = _input._buffers.data();
+        auto vbo = _input._bufferVBOs.data();
+        auto offset = _input._bufferOffsets.data();
+        auto stride = _input._bufferStrides.data();
+
+        for (int bufferNum = 0; bufferNum < numBuffers; bufferNum++) {
+            if (_input._invalidBuffers.test(bufferNum)) {
+                glBindVertexBuffer(bufferNum, (*vbo), (*offset), (*stride));
+            }
+            buffer++;
+            vbo++;
+            offset++;
+            stride++;
+        }
+        _input._invalidBuffers.reset();
+        (void)CHECK_GL_ERROR();
+    }
+#else
+    if (_input._invalidFormat || _input._invalidBuffers.any()) {
+
+        if (_input._invalidFormat) {
+            InputStageState::ActivationCache newActivation;
+
+            _stats._ISNumFormatChanges++;
+
+            // Check expected activation
+            if (_input._format) {
+                for (auto& it : _input._format->getAttributes()) {
+                    const Stream::Attribute& attrib = (it).second;
+                    uint8_t locationCount = attrib._element.getLocationCount();
+                    for (int i = 0; i < locationCount; ++i) {
+                        newActivation.set(attrib._slot + i);
+                    }
+                }
+            }
+
+            // Manage Activation what was and what is expected now
+            for (unsigned int i = 0; i < newActivation.size(); i++) {
+                bool newState = newActivation[i];
+                if (newState != _input._attributeActivation[i]) {
+
+                    if (newState) {
+                        glEnableVertexAttribArray(i);
+                    } else {
+                        glDisableVertexAttribArray(i);
+                    }
+                    (void)CHECK_GL_ERROR();
+
+                    _input._attributeActivation.flip(i);
+                }
+            }
+        }
+
+        // now we need to bind the buffers and assign the attrib pointers
+        if (_input._format) {
+            const Buffers& buffers = _input._buffers;
+            const Offsets& offsets = _input._bufferOffsets;
+            const Offsets& strides = _input._bufferStrides;
+
+            const Stream::Format::AttributeMap& attributes = _input._format->getAttributes();
+            auto& inputChannels = _input._format->getChannels();
+            _stats._ISNumInputBufferChanges++;
+
+            GLuint boundVBO = 0;
+            for (auto& channelIt : inputChannels) {
+                const Stream::Format::ChannelMap::value_type::second_type& channel = (channelIt).second;
+                if ((channelIt).first < buffers.size()) {
+                    int bufferNum = (channelIt).first;
+
+                    if (_input._invalidBuffers.test(bufferNum) || _input._invalidFormat) {
+                        //  GLuint vbo = gpu::GL41Backend::getBufferID((*buffers[bufferNum]));
+                        GLuint vbo = _input._bufferVBOs[bufferNum];
+                        if (boundVBO != vbo) {
+                            //qDebug() <<  "GLBackend::updateInput glBindBuffer(GL_ARRAY_BUFFER, " << vbo <<")";
+                            glBindBuffer(GL_ARRAY_BUFFER, vbo);
+                            (void)CHECK_GL_ERROR();
+                            boundVBO = vbo;
+                        }
+                        _input._invalidBuffers[bufferNum] = false;
+
+                        for (unsigned int i = 0; i < channel._slots.size(); i++) {
+                            const Stream::Attribute& attrib = attributes.at(channel._slots[i]);
+                            GLuint slot = attrib._slot;
+                            GLuint count = attrib._element.getLocationScalarCount();
+                            uint8_t locationCount = attrib._element.getLocationCount();
+                            GLenum type = gl::ELEMENT_TYPE_TO_GL[attrib._element.getType()];
+                            // GLenum perLocationStride = strides[bufferNum];
+                            GLenum perLocationStride = attrib._element.getLocationSize();
+                            GLuint stride = (GLuint)strides[bufferNum];
+                            GLuint pointer = (GLuint)(attrib._offset + offsets[bufferNum]);
+                            GLboolean isNormalized = attrib._element.isNormalized();
+
+                            for (size_t locNum = 0; locNum < locationCount; ++locNum) {
+                                glVertexAttribPointer(slot + (GLuint)locNum, count, type, isNormalized, stride,
+                                    reinterpret_cast<GLvoid*>(pointer + perLocationStride * (GLuint)locNum));
+#ifdef GPU_STEREO_DRAWCALL_INSTANCED
+                                glVertexAttribDivisor(slot + (GLuint)locNum, attrib._frequency * (isStereo() ? 2 : 1));
+#else
+                                glVertexAttribDivisor(slot + (GLuint)locNum, attrib._frequency);
+#endif
+                            }
+
+                            // TODO: Support properly the IAttrib version
+
+                            (void)CHECK_GL_ERROR();
+                        }
+                    }
+                }
+            }
+        }
+        // everything format related should be in sync now
+        _input._invalidFormat = false;
+    }
+#endif
+}
+
diff --git a/libraries/gpu-gles/src/gpu/gl/GLBackendOutput.cpp b/libraries/gpu-gles/src/gpu/gl/GLBackendOutput.cpp
new file mode 100644
index 0000000000..6fddb810ee
--- /dev/null
+++ b/libraries/gpu-gles/src/gpu/gl/GLBackendOutput.cpp
@@ -0,0 +1,169 @@
+//
+//  GLBackendTexture.cpp
+//  libraries/gpu/src/gpu
+//
+//  Created by Sam Gateau on 1/19/2015.
+//  Copyright 2014 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 "GLBackend.h"
+#include "GLShared.h"
+#include "GLFramebuffer.h"
+
+#include <QtGui/QImage>
+
+using namespace gpu;
+using namespace gpu::gl;
+
+void GLBackend::syncOutputStateCache() {
+    GLint currentFBO;
+    glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &currentFBO);
+
+    _output._drawFBO = currentFBO;
+    _output._framebuffer.reset();
+}
+
+void GLBackend::resetOutputStage() {
+    if (_output._framebuffer) {
+        _output._framebuffer.reset();
+        _output._drawFBO = 0;
+        glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
+    }
+
+    glEnable(GL_FRAMEBUFFER_SRGB_EXT);
+}
+
+void GLBackend::do_setFramebuffer(const Batch& batch, size_t paramOffset) {
+    auto framebuffer = batch._framebuffers.get(batch._params[paramOffset]._uint);
+    if (_output._framebuffer != framebuffer) {
+        auto newFBO = getFramebufferID(framebuffer);
+        if (_output._drawFBO != newFBO) {
+            _output._drawFBO = newFBO;
+            glBindFramebuffer(GL_DRAW_FRAMEBUFFER, newFBO);
+        }
+        _output._framebuffer = framebuffer;
+    }
+}
+
+void GLBackend::do_clearFramebuffer(const Batch& batch, size_t paramOffset) {
+    if (_stereo._enable && !_pipeline._stateCache.scissorEnable) {
+        //qWarning("Clear without scissor in stereo mode");
+    }
+
+    uint32 masks = batch._params[paramOffset + 7]._uint;
+    Vec4 color;
+    color.x = batch._params[paramOffset + 6]._float;
+    color.y = batch._params[paramOffset + 5]._float;
+    color.z = batch._params[paramOffset + 4]._float;
+    color.w = batch._params[paramOffset + 3]._float;
+    float depth = batch._params[paramOffset + 2]._float;
+    int stencil = batch._params[paramOffset + 1]._int;
+    int useScissor = batch._params[paramOffset + 0]._int;
+
+    GLuint glmask = 0;
+    if (masks & Framebuffer::BUFFER_STENCIL) {
+        glClearStencil(stencil);
+        glmask |= GL_STENCIL_BUFFER_BIT;
+        // TODO: we will probably need to also check the write mask of stencil like we do
+        // for depth buffer, but as would say a famous Fez owner "We'll cross that bridge when we come to it"
+    }
+
+    bool restoreDepthMask = false;
+    if (masks & Framebuffer::BUFFER_DEPTH) {
+        glClearDepthf(depth);
+
+        glmask |= GL_DEPTH_BUFFER_BIT;
+        
+        bool cacheDepthMask = _pipeline._stateCache.depthTest.getWriteMask();
+        if (!cacheDepthMask) {
+            restoreDepthMask = true;
+            glDepthMask(GL_TRUE);
+        }
+    }
+
+    std::vector<GLenum> drawBuffers;
+    if (masks & Framebuffer::BUFFER_COLORS) {
+        if (_output._framebuffer) {
+            for (unsigned int i = 0; i < Framebuffer::MAX_NUM_RENDER_BUFFERS; i++) {
+                if (masks & (1 << i)) {
+                    drawBuffers.push_back(GL_COLOR_ATTACHMENT0 + i);
+                }
+            }
+
+            if (!drawBuffers.empty()) {
+                glDrawBuffers((GLsizei)drawBuffers.size(), drawBuffers.data());
+                glClearColor(color.x, color.y, color.z, color.w);
+                glmask |= GL_COLOR_BUFFER_BIT;
+            
+                (void) CHECK_GL_ERROR();
+            }
+        } else {
+            glClearColor(color.x, color.y, color.z, color.w);
+            glmask |= GL_COLOR_BUFFER_BIT;
+        }
+        
+        // Force the color mask cache to WRITE_ALL if not the case
+        do_setStateColorWriteMask(State::ColorMask::WRITE_ALL);
+    }
+
+    // Apply scissor if needed and if not already on
+    bool doEnableScissor = (useScissor && (!_pipeline._stateCache.scissorEnable));
+    if (doEnableScissor) {
+        glEnable(GL_SCISSOR_TEST);
+    }
+
+    // Clear!
+    glClear(glmask);
+
+    // Restore scissor if needed
+    if (doEnableScissor) {
+        glDisable(GL_SCISSOR_TEST);
+    }
+
+    // Restore write mask meaning turn back off
+    if (restoreDepthMask) {
+        glDepthMask(GL_FALSE);
+    }
+    
+    // Restore the color draw buffers only if a frmaebuffer is bound
+    if (_output._framebuffer && !drawBuffers.empty()) {
+        auto glFramebuffer = syncGPUObject(*_output._framebuffer);
+        if (glFramebuffer) {
+            glDrawBuffers((GLsizei)glFramebuffer->_colorBuffers.size(), glFramebuffer->_colorBuffers.data());
+        }
+    }
+
+    (void) CHECK_GL_ERROR();
+}
+
+void GLBackend::downloadFramebuffer(const FramebufferPointer& srcFramebuffer, const Vec4i& region, QImage& destImage) {
+    auto readFBO = getFramebufferID(srcFramebuffer);
+    if (srcFramebuffer && readFBO) {
+        if ((srcFramebuffer->getWidth() < (region.x + region.z)) || (srcFramebuffer->getHeight() < (region.y + region.w))) {
+          qCDebug(gpugllogging) << "GLBackend::downloadFramebuffer : srcFramebuffer is too small to provide the region queried";
+          return;
+        }
+    }
+
+    if ((destImage.width() < region.z) || (destImage.height() < region.w)) {
+          qCDebug(gpugllogging) << "GLBackend::downloadFramebuffer : destImage is too small to receive the region of the framebuffer";
+          return;
+    }
+    
+    GLenum format = GL_RGBA;
+    //GLenum format = GL_BGRA;
+    qDebug() << "TODO: GLBackendOutput.cpp:do_clearFramebuffer GL_BGRA";
+
+    if (destImage.format() != QImage::Format_ARGB32) {
+          qCDebug(gpugllogging) << "GLBackend::downloadFramebuffer : destImage format must be FORMAT_ARGB32 to receive the region of the framebuffer";
+          return;
+    }
+
+    glBindFramebuffer(GL_READ_FRAMEBUFFER, getFramebufferID(srcFramebuffer));
+    glReadPixels(region.x, region.y, region.z, region.w, format, GL_UNSIGNED_BYTE, destImage.bits());
+    glBindFramebuffer(GL_READ_FRAMEBUFFER, 0);
+
+    (void) CHECK_GL_ERROR();
+}
diff --git a/libraries/gpu-gles/src/gpu/gl/GLBackendPipeline.cpp b/libraries/gpu-gles/src/gpu/gl/GLBackendPipeline.cpp
new file mode 100644
index 0000000000..c35966d440
--- /dev/null
+++ b/libraries/gpu-gles/src/gpu/gl/GLBackendPipeline.cpp
@@ -0,0 +1,250 @@
+//
+//  GLBackendPipeline.cpp
+//  libraries/gpu/src/gpu
+//
+//  Created by Sam Gateau on 3/8/2015.
+//  Copyright 2014 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 "GLBackend.h"
+#include "GLShared.h"
+#include "GLPipeline.h"
+#include "GLShader.h"
+#include "GLState.h"
+#include "GLBuffer.h"
+#include "GLTexture.h"
+
+using namespace gpu;
+using namespace gpu::gl;
+
+void GLBackend::do_setPipeline(const Batch& batch, size_t paramOffset) {
+    PipelinePointer pipeline = batch._pipelines.get(batch._params[paramOffset + 0]._uint);
+
+    if (_pipeline._pipeline == pipeline) {
+        return;
+    }
+
+    // A true new Pipeline
+    _stats._PSNumSetPipelines++;
+
+    // null pipeline == reset
+    if (!pipeline) {
+        qDebug() << " null pipeline";
+        _pipeline._pipeline.reset();
+
+        _pipeline._program = 0;
+        _pipeline._cameraCorrectionLocation = -1;
+        _pipeline._programShader = nullptr;
+        _pipeline._invalidProgram = true;
+
+        _pipeline._state = nullptr;
+        _pipeline._invalidState = true;
+    } else {
+        auto pipelineObject = GLPipeline::sync(*this, *pipeline);
+        if (!pipelineObject) {
+            return;
+        }
+
+        // check the program cache
+        // pick the program version 
+        // check the program cache
+        // pick the program version 
+#ifdef GPU_STEREO_CAMERA_BUFFER
+        GLuint glprogram = pipelineObject->_program->getProgram((GLShader::Version) isStereo());
+#else
+        GLuint glprogram = pipelineObject->_program->getProgram();
+#endif
+
+        if (_pipeline._program != glprogram) {
+            _pipeline._program = glprogram;
+            _pipeline._programShader = pipelineObject->_program;
+            _pipeline._invalidProgram = true;
+            _pipeline._cameraCorrectionLocation = pipelineObject->_cameraCorrection;
+        }
+
+        // Now for the state
+        if (_pipeline._state != pipelineObject->_state) {
+            _pipeline._state = pipelineObject->_state;
+            _pipeline._invalidState = true;
+        }
+
+        // Remember the new pipeline
+        _pipeline._pipeline = pipeline;
+    }
+
+    // THis should be done on Pipeline::update...
+    if (_pipeline._invalidProgram) {
+        glUseProgram(_pipeline._program);
+        if (_pipeline._cameraCorrectionLocation != -1) {
+            auto cameraCorrectionBuffer = syncGPUObject(*_pipeline._cameraCorrectionBuffer._buffer);
+            glBindBufferRange(GL_UNIFORM_BUFFER, _pipeline._cameraCorrectionLocation, cameraCorrectionBuffer->_id, 0, sizeof(CameraCorrection));
+        }
+        (void) CHECK_GL_ERROR();
+        _pipeline._invalidProgram = false;
+    }
+}
+
+void GLBackend::updatePipeline() {
+    if (_pipeline._invalidProgram) {
+        // doing it here is aproblem for calls to glUniform.... so will do it on assing...
+        glUseProgram(_pipeline._program);
+        (void) CHECK_GL_ERROR();
+        _pipeline._invalidProgram = false;
+    }
+
+    if (_pipeline._invalidState) {
+        if (_pipeline._state) {
+            // first reset to default what should be
+            // the fields which were not to default and are default now
+            resetPipelineState(_pipeline._state->_signature);
+            
+            // Update the signature cache with what's going to be touched
+            _pipeline._stateSignatureCache |= _pipeline._state->_signature;
+
+            // And perform
+            for (auto command: _pipeline._state->_commands) {
+                command->run(this);
+            }
+        } else {
+            // No state ? anyway just reset everything
+            resetPipelineState(0);
+        }
+        _pipeline._invalidState = false;
+    }
+}
+
+void GLBackend::resetPipelineStage() {
+    // First reset State to default
+    State::Signature resetSignature(0);
+    resetPipelineState(resetSignature);
+    _pipeline._state = nullptr;
+    _pipeline._invalidState = false;
+
+    // Second the shader side
+    _pipeline._invalidProgram = false;
+    _pipeline._program = 0;
+    _pipeline._programShader = nullptr;
+    _pipeline._pipeline.reset();
+    glUseProgram(0);
+}
+
+void GLBackend::releaseUniformBuffer(uint32_t slot) {
+    auto& buf = _uniform._buffers[slot];
+    if (buf) {
+        auto* object = Backend::getGPUObject<GLBuffer>(*buf);
+        if (object) {
+            glBindBufferBase(GL_UNIFORM_BUFFER, slot, 0); // RELEASE
+            (void) CHECK_GL_ERROR();
+        }
+        buf.reset();
+    }
+}
+
+void GLBackend::resetUniformStage() {
+    for (uint32_t i = 0; i < _uniform._buffers.size(); i++) {
+        releaseUniformBuffer(i);
+    }
+}
+
+void GLBackend::do_setUniformBuffer(const Batch& batch, size_t paramOffset) {
+    GLuint slot = batch._params[paramOffset + 3]._uint;
+    BufferPointer uniformBuffer = batch._buffers.get(batch._params[paramOffset + 2]._uint);
+    GLintptr rangeStart = batch._params[paramOffset + 1]._uint;
+    GLsizeiptr rangeSize = batch._params[paramOffset + 0]._uint;
+
+    if (!uniformBuffer) {
+        releaseUniformBuffer(slot);
+        return;
+    }
+    
+    // check cache before thinking
+    if (_uniform._buffers[slot] == uniformBuffer) {
+        return;
+    }
+
+    // Sync BufferObject
+    auto* object = syncGPUObject(*uniformBuffer);
+    if (object) {
+        glBindBufferRange(GL_UNIFORM_BUFFER, slot, object->_buffer, rangeStart, rangeSize);
+
+        _uniform._buffers[slot] = uniformBuffer;
+        (void) CHECK_GL_ERROR();
+    } else {
+        releaseUniformBuffer(slot);
+        return;
+    }
+}
+
+void GLBackend::releaseResourceTexture(uint32_t slot) {
+    auto& tex = _resource._textures[slot];
+    if (tex) {
+        auto* object = Backend::getGPUObject<GLTexture>(*tex);
+        if (object) {
+            GLuint target = object->_target;
+            glActiveTexture(GL_TEXTURE0 + slot);
+            glBindTexture(target, 0); // RELEASE
+            (void) CHECK_GL_ERROR();
+        }
+        tex.reset();
+    }
+}
+
+void GLBackend::resetResourceStage() {
+    for (uint32_t i = 0; i < _resource._textures.size(); i++) {
+        releaseResourceTexture(i);
+    }
+}
+
+void GLBackend::do_setResourceTexture(const Batch& batch, size_t paramOffset) {
+    GLuint slot = batch._params[paramOffset + 1]._uint;
+    if (slot >= (GLuint) MAX_NUM_RESOURCE_TEXTURES) {
+        // "GLBackend::do_setResourceTexture: Trying to set a resource Texture at slot #" + slot + " which doesn't exist. MaxNumResourceTextures = " + getMaxNumResourceTextures());
+        return;
+    }
+
+    TexturePointer resourceTexture = batch._textures.get(batch._params[paramOffset + 0]._uint);
+
+    if (!resourceTexture) {
+        releaseResourceTexture(slot);
+        return;
+    }
+    // check cache before thinking
+    if (_resource._textures[slot] == resourceTexture) {
+        return;
+    }
+
+    // One more True texture bound
+    _stats._RSNumTextureBounded++;
+
+    // Always make sure the GLObject is in sync
+    GLTexture* object = syncGPUObject(resourceTexture);
+    if (object) {
+        GLuint to = object->_texture;
+        GLuint target = object->_target;
+        glActiveTexture(GL_TEXTURE0 + slot);
+        glBindTexture(target, to);
+
+        (void) CHECK_GL_ERROR();
+
+        _resource._textures[slot] = resourceTexture;
+
+        _stats._RSAmountTextureMemoryBounded += object->size();
+
+    } else {
+        releaseResourceTexture(slot);
+        return;
+    }
+}
+
+int GLBackend::ResourceStageState::findEmptyTextureSlot() const {
+    // start from the end of the slots, try to find an empty one that can be used
+    for (auto i = MAX_NUM_RESOURCE_TEXTURES - 1; i > 0; i--) {
+        if (!_textures[i]) {
+            return i;
+        }
+    }
+    return -1;
+}
+
diff --git a/libraries/gpu-gles/src/gpu/gl/GLBackendQuery.cpp b/libraries/gpu-gles/src/gpu/gl/GLBackendQuery.cpp
new file mode 100644
index 0000000000..530e01d8ff
--- /dev/null
+++ b/libraries/gpu-gles/src/gpu/gl/GLBackendQuery.cpp
@@ -0,0 +1,93 @@
+//
+//  GLBackendQuery.cpp
+//  libraries/gpu/src/gpu
+//
+//  Created by Sam Gateau on 7/7/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 "GLBackend.h"
+#include "GLQuery.h"
+#include "GLShared.h"
+
+using namespace gpu;
+using namespace gpu::gl;
+
+// Eventually, we want to test with TIME_ELAPSED instead of TIMESTAMP
+#ifdef Q_OS_MAC
+const uint32_t MAX_RANGE_QUERY_DEPTH = 1;
+static bool timeElapsed = true;
+#else
+const uint32_t MAX_RANGE_QUERY_DEPTH = 10000;
+static bool timeElapsed = false;
+#endif
+
+void GLBackend::do_beginQuery(const Batch& batch, size_t paramOffset) {
+    auto query = batch._queries.get(batch._params[paramOffset]._uint);
+    GLQuery* glquery = syncGPUObject(*query);
+    if (glquery) {
+        //glGetInteger64v(GL_TIMESTAMP_EXT, (GLint64*)&glquery->_batchElapsedTime);
+        glquery->_batchElapsedTime = 1;
+        if (timeElapsed) {
+            glBeginQuery(GL_TIME_ELAPSED_EXT, glquery->_endqo);
+        } else {
+            if (glQueryCounterEXT != NULL) {
+                glQueryCounterEXT(glquery->_beginqo, GL_TIMESTAMP_EXT);
+            }
+        }
+        glquery->_rangeQueryDepth = _queryStage._rangeQueryDepth;
+        (void)CHECK_GL_ERROR();
+    }
+}
+
+void GLBackend::do_endQuery(const Batch& batch, size_t paramOffset) {
+    auto query = batch._queries.get(batch._params[paramOffset]._uint);
+    GLQuery* glquery = syncGPUObject(*query);
+    if (glquery) {
+        if (timeElapsed) {
+            glEndQuery(GL_TIME_ELAPSED_EXT);
+        } else {
+            if (glQueryCounterEXT != NULL) {
+                glQueryCounterEXT(glquery->_endqo, GL_TIMESTAMP_EXT);
+            }
+        }
+
+        --_queryStage._rangeQueryDepth;
+        GLint64 now;
+        //glGetInteger64v(GL_TIMESTAMP_EXT, &now);
+        //glquery->_batchElapsedTime = now - glquery->_batchElapsedTime;
+        now = 1;
+        glquery->_batchElapsedTime = 1;
+
+        PROFILE_RANGE_END(render_gpu_gl, glquery->_profileRangeId);
+
+        (void)CHECK_GL_ERROR();
+    }
+}
+
+void GLBackend::do_getQuery(const Batch& batch, size_t paramOffset) {
+    auto query = batch._queries.get(batch._params[paramOffset]._uint);
+    if (glGetQueryObjectui64vEXT == NULL)
+        return;
+    GLQuery* glquery = syncGPUObject(*query);
+    if (glquery) { 
+        glGetQueryObjectui64vEXT(glquery->_endqo, GL_QUERY_RESULT_AVAILABLE, &glquery->_result);
+        if (glquery->_result == GL_TRUE) {
+            if (timeElapsed) {
+                glGetQueryObjectui64vEXT(glquery->_endqo, GL_QUERY_RESULT, &glquery->_result);
+            } else {
+                GLuint64 start, end;
+                glGetQueryObjectui64vEXT(glquery->_beginqo, GL_QUERY_RESULT, &start);
+                glGetQueryObjectui64vEXT(glquery->_endqo, GL_QUERY_RESULT, &end);
+                glquery->_result = end - start;
+            }
+            query->triggerReturnHandler(glquery->_result, glquery->_batchElapsedTime);
+        }
+        (void)CHECK_GL_ERROR();
+    }
+}
+
+void GLBackend::resetQueryStage() {
+}
diff --git a/libraries/gpu-gles/src/gpu/gl/GLBackendState.cpp b/libraries/gpu-gles/src/gpu/gl/GLBackendState.cpp
new file mode 100644
index 0000000000..27b8d23bf3
--- /dev/null
+++ b/libraries/gpu-gles/src/gpu/gl/GLBackendState.cpp
@@ -0,0 +1,334 @@
+//
+//  GLBackendState.cpp
+//  libraries/gpu/src/gpu
+//
+//  Created by Sam Gateau on 3/22/2015.
+//  Copyright 2014 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 "GLBackend.h"
+#include "GLState.h"
+
+using namespace gpu;
+using namespace gpu::gl;
+
+void GLBackend::resetPipelineState(State::Signature nextSignature) {
+    auto currentNotSignature = ~_pipeline._stateSignatureCache; 
+    auto nextNotSignature = ~nextSignature;
+    auto fieldsToBeReset = currentNotSignature ^ (currentNotSignature | nextNotSignature);
+    if (fieldsToBeReset.any()) {
+        for (auto i = 0; i < State::NUM_FIELDS; i++) {
+            if (fieldsToBeReset[i]) {
+                GLState::_resetStateCommands[i]->run(this);
+                _pipeline._stateSignatureCache.reset(i);
+            }
+        }
+    }
+}
+
+void GLBackend::syncPipelineStateCache() {
+    State::Data state;
+
+    //glEnable(GL_TEXTURE_CUBE_MAP_SEAMLESS);
+    qDebug() << "TODO: GLBackendState.cpp:syncPipelineStateCache GL_TEXTURE_CUBE_MAP_SEAMLESS";
+
+    // Point size is always on
+    // FIXME CORE
+    //glHint(GL_POINT_SMOOTH_HINT, GL_NICEST);
+    //glEnable(GL_PROGRAM_POINT_SIZE_EXT);
+    qDebug() << "TODO: GLBackendState.cpp:syncPipelineStateCache GL_PROGRAM_POINT_SIZE_EXT";
+
+    //glEnable(GL_VERTEX_PROGRAM_POINT_SIZE);
+    qDebug() << "TODO: GLBackendState.cpp:syncPipelineStateCache GL_VERTEX_PROGRAM_POINT_SIZE";
+
+    // Default line width accross the board
+    glLineWidth(1.0f);
+
+    getCurrentGLState(state);
+    State::Signature signature = State::evalSignature(state);
+
+    _pipeline._stateCache = state;
+    _pipeline._stateSignatureCache = signature;
+}
+
+
+void GLBackend::do_setStateFillMode(int32 mode) {
+    if (_pipeline._stateCache.fillMode != mode) {
+        static GLenum GL_FILL_MODES[] = { /*GL_POINT, GL_LINE, GL_FILL*/ };
+        qDebug() << "TODO: GLBackendState.cpp:do_setStateFillMode GL_POINT";
+        qDebug() << "TODO: GLBackendState.cpp:do_setStateFillMode GL_LINE";
+        qDebug() << "TODO: GLBackendState.cpp:do_setStateFillMode GL_FILL";
+        //glPolygonMode(GL_FRONT_AND_BACK, GL_FILL_MODES[mode]);
+        qDebug() << "TODO: GLBackendState.cpp:do_setStateFillMode glPolygonMode";
+        (void)CHECK_GL_ERROR();
+
+        _pipeline._stateCache.fillMode = State::FillMode(mode);
+    }
+}
+
+void GLBackend::do_setStateCullMode(int32 mode) {
+    if (_pipeline._stateCache.cullMode != mode) {
+        static GLenum GL_CULL_MODES[] = { GL_FRONT_AND_BACK, GL_FRONT, GL_BACK };
+        if (mode == State::CULL_NONE) {
+            glDisable(GL_CULL_FACE);
+            glCullFace(GL_FRONT_AND_BACK);
+        } else {
+            glEnable(GL_CULL_FACE);
+            glCullFace(GL_CULL_MODES[mode]);
+        }
+        (void)CHECK_GL_ERROR();
+
+        _pipeline._stateCache.cullMode = State::CullMode(mode);
+    }
+}
+
+void GLBackend::do_setStateFrontFaceClockwise(bool isClockwise) {
+    if (_pipeline._stateCache.frontFaceClockwise != isClockwise) {
+        static GLenum  GL_FRONT_FACES[] = { GL_CCW, GL_CW };
+        glFrontFace(GL_FRONT_FACES[isClockwise]);
+        (void)CHECK_GL_ERROR();
+
+        _pipeline._stateCache.frontFaceClockwise = isClockwise;
+    }
+}
+
+void GLBackend::do_setStateDepthClampEnable(bool enable) {
+    if (_pipeline._stateCache.depthClampEnable != enable) {
+        if (enable) {
+            qDebug() << "TODO: GLBackendState.cpp:do_setStateDepthClampEnable GL_DEPTH_CLAMP";
+            //glEnable(GL_DEPTH_CLAMP);
+        } else {
+            //glDisable(GL_DEPTH_CLAMP);
+            qDebug() << "TODO: GLBackendState.cpp:do_setStateDepthClampEnable GL_DEPTH_CLAMP";
+        }
+        (void)CHECK_GL_ERROR();
+
+        _pipeline._stateCache.depthClampEnable = enable;
+    }
+}
+
+void GLBackend::do_setStateScissorEnable(bool enable) {
+    if (_pipeline._stateCache.scissorEnable != enable) {
+        if (enable) {
+            glEnable(GL_SCISSOR_TEST);
+        } else {
+            glDisable(GL_SCISSOR_TEST);
+        }
+        (void)CHECK_GL_ERROR();
+
+        _pipeline._stateCache.scissorEnable = enable;
+    }
+}
+
+void GLBackend::do_setStateMultisampleEnable(bool enable) {
+    if (_pipeline._stateCache.multisampleEnable != enable) {
+        if (enable) {
+            //glEnable(GL_MULTISAMPLE);
+            qDebug() << "TODO: GLBackendState.cpp:do_setStateMultisampleEnable GL_MULTISAMPLE";
+        } else {
+            //glDisable(GL_MULTISAMPLE);
+            qDebug() << "TODO: GLBackendState.cpp:do_setStateMultisampleEnable GL_MULTISAMPLE";
+        }
+        (void)CHECK_GL_ERROR();
+
+        _pipeline._stateCache.multisampleEnable = enable;
+    }
+}
+
+void GLBackend::do_setStateAntialiasedLineEnable(bool enable) {
+    if (_pipeline._stateCache.antialisedLineEnable != enable) {
+        if (enable) {
+            //glEnable(GL_LINE_SMOOTH);
+            qDebug() << "TODO: GLBackendState.cpp:do_setStateAntialiasedLineEnable GL_LINE_SMOOTH";
+        } else {
+            //glDisable(GL_LINE_SMOOTH);
+            qDebug() << "TODO: GLBackendState.cpp:do_setStateAntialiasedLineEnable GL_LINE_SMOOTH";
+        }
+        (void)CHECK_GL_ERROR();
+
+        _pipeline._stateCache.antialisedLineEnable = enable;
+    }
+}
+
+void GLBackend::do_setStateDepthBias(Vec2 bias) {
+    if ((bias.x != _pipeline._stateCache.depthBias) || (bias.y != _pipeline._stateCache.depthBiasSlopeScale)) {
+        if ((bias.x != 0.0f) || (bias.y != 0.0f)) {
+            glEnable(GL_POLYGON_OFFSET_FILL);
+            //glEnable(GL_POLYGON_OFFSET_LINE);
+            qDebug() << "TODO: GLBackendState.cpp:do_setStateDepthBias GL_POLYGON_OFFSET_LINE";
+            //glEnable(GL_POLYGON_OFFSET_POINT);
+            qDebug() << "TODO: GLBackendState.cpp:do_setStateDepthBias GL_POLYGON_OFFSET_POINT";
+            glPolygonOffset(bias.x, bias.y);
+        } else {
+            glDisable(GL_POLYGON_OFFSET_FILL);
+            //glDisable(GL_POLYGON_OFFSET_LINE);
+            qDebug() << "TODO: GLBackendState.cpp:do_setStateDepthBias GL_POLYGON_OFFSET_LINE";
+            //glDisable(GL_POLYGON_OFFSET_POINT);
+            qDebug() << "TODO: GLBackendState.cpp:do_setStateDepthBias GL_POLYGON_OFFSET_POINT";
+        }
+        (void)CHECK_GL_ERROR();
+
+        _pipeline._stateCache.depthBias = bias.x;
+        _pipeline._stateCache.depthBiasSlopeScale = bias.y;
+    }
+}
+
+void GLBackend::do_setStateDepthTest(State::DepthTest test) {
+    const auto& current = _pipeline._stateCache.depthTest;
+    if (current != test) {
+        if (test.isEnabled()) {
+            glEnable(GL_DEPTH_TEST);
+        } else {
+            glDisable(GL_DEPTH_TEST);
+        }
+        if (test.getWriteMask() != current.getWriteMask()) {
+            glDepthMask(test.getWriteMask());
+        }
+        if (test.getFunction() != current.getFunction()) {
+            glDepthFunc(COMPARISON_TO_GL[test.getFunction()]);
+        }
+        if (CHECK_GL_ERROR()) {
+            qDebug() << "DepthTest" << (test.isEnabled() ? "Enabled" : "Disabled")
+                << "Mask=" << (test.getWriteMask() ? "Write" : "no Write")
+                << "Func=" << test.getFunction()
+                << "Raw=" << test.getRaw();
+        }
+        _pipeline._stateCache.depthTest = test;
+    }
+}
+
+void GLBackend::do_setStateStencil(State::StencilActivation activation, State::StencilTest testFront, State::StencilTest testBack) {
+    const auto& currentActivation = _pipeline._stateCache.stencilActivation;
+    const auto& currentTestFront = _pipeline._stateCache.stencilTestFront;
+    const auto& currentTestBack = _pipeline._stateCache.stencilTestBack;
+    if ((currentActivation != activation)
+        || (currentTestFront != testFront)
+        || (currentTestBack != testBack)) {
+
+        if (activation.isEnabled()) {
+            glEnable(GL_STENCIL_TEST);
+        } else {
+            glDisable(GL_STENCIL_TEST);
+        }
+
+        if (activation.getWriteMaskFront() != activation.getWriteMaskBack()) {
+            glStencilMaskSeparate(GL_FRONT, activation.getWriteMaskFront());
+            glStencilMaskSeparate(GL_BACK, activation.getWriteMaskBack());
+        } else {
+            glStencilMask(activation.getWriteMaskFront());
+        }
+
+        static GLenum STENCIL_OPS[State::NUM_STENCIL_OPS] = {
+            GL_KEEP,
+            GL_ZERO,
+            GL_REPLACE,
+            GL_INCR_WRAP,
+            GL_DECR_WRAP,
+            GL_INVERT,
+            GL_INCR,
+            GL_DECR };
+
+        if (testFront != testBack) {
+            glStencilOpSeparate(GL_FRONT, STENCIL_OPS[testFront.getFailOp()], STENCIL_OPS[testFront.getDepthFailOp()], STENCIL_OPS[testFront.getPassOp()]);
+            glStencilFuncSeparate(GL_FRONT, COMPARISON_TO_GL[testFront.getFunction()], testFront.getReference(), testFront.getReadMask());
+
+            glStencilOpSeparate(GL_BACK, STENCIL_OPS[testBack.getFailOp()], STENCIL_OPS[testBack.getDepthFailOp()], STENCIL_OPS[testBack.getPassOp()]);
+            glStencilFuncSeparate(GL_BACK, COMPARISON_TO_GL[testBack.getFunction()], testBack.getReference(), testBack.getReadMask());
+        } else {
+            glStencilOp(STENCIL_OPS[testFront.getFailOp()], STENCIL_OPS[testFront.getDepthFailOp()], STENCIL_OPS[testFront.getPassOp()]);
+            glStencilFunc(COMPARISON_TO_GL[testFront.getFunction()], testFront.getReference(), testFront.getReadMask());
+        }
+
+        (void)CHECK_GL_ERROR();
+
+        _pipeline._stateCache.stencilActivation = activation;
+        _pipeline._stateCache.stencilTestFront = testFront;
+        _pipeline._stateCache.stencilTestBack = testBack;
+    }
+}
+
+void GLBackend::do_setStateAlphaToCoverageEnable(bool enable) {
+    if (_pipeline._stateCache.alphaToCoverageEnable != enable) {
+        if (enable) {
+            glEnable(GL_SAMPLE_ALPHA_TO_COVERAGE);
+        } else {
+            glDisable(GL_SAMPLE_ALPHA_TO_COVERAGE);
+        }
+        (void)CHECK_GL_ERROR();
+
+        _pipeline._stateCache.alphaToCoverageEnable = enable;
+    }
+}
+
+void GLBackend::do_setStateSampleMask(uint32 mask) {
+    if (_pipeline._stateCache.sampleMask != mask) {
+        if (mask == 0xFFFFFFFF) {
+            glDisable(GL_SAMPLE_MASK);
+        } else {
+            glEnable(GL_SAMPLE_MASK);
+            glSampleMaski(0, mask);
+        }
+        (void)CHECK_GL_ERROR();
+        _pipeline._stateCache.sampleMask = mask;
+    }
+}
+
+void GLBackend::do_setStateBlend(State::BlendFunction function) {
+    if (_pipeline._stateCache.blendFunction != function) {
+        if (function.isEnabled()) {
+            glEnable(GL_BLEND);
+
+            glBlendEquationSeparate(BLEND_OPS_TO_GL[function.getOperationColor()], BLEND_OPS_TO_GL[function.getOperationAlpha()]);
+            (void)CHECK_GL_ERROR();
+
+
+            glBlendFuncSeparate(BLEND_ARGS_TO_GL[function.getSourceColor()], BLEND_ARGS_TO_GL[function.getDestinationColor()],
+                BLEND_ARGS_TO_GL[function.getSourceAlpha()], BLEND_ARGS_TO_GL[function.getDestinationAlpha()]);
+        } else {
+            glDisable(GL_BLEND);
+        }
+        (void)CHECK_GL_ERROR();
+
+        _pipeline._stateCache.blendFunction = function;
+    }
+}
+
+void GLBackend::do_setStateColorWriteMask(uint32 mask) {
+    if (_pipeline._stateCache.colorWriteMask != mask) {
+        glColorMask(mask & State::ColorMask::WRITE_RED,
+            mask & State::ColorMask::WRITE_GREEN,
+            mask & State::ColorMask::WRITE_BLUE,
+            mask & State::ColorMask::WRITE_ALPHA);
+        (void)CHECK_GL_ERROR();
+
+        _pipeline._stateCache.colorWriteMask = mask;
+    }
+}
+
+
+void GLBackend::do_setStateBlendFactor(const Batch& batch, size_t paramOffset) {
+    Vec4 factor(batch._params[paramOffset + 0]._float,
+        batch._params[paramOffset + 1]._float,
+        batch._params[paramOffset + 2]._float,
+        batch._params[paramOffset + 3]._float);
+
+    glBlendColor(factor.x, factor.y, factor.z, factor.w);
+    (void)CHECK_GL_ERROR();
+}
+
+void GLBackend::do_setStateScissorRect(const Batch& batch, size_t paramOffset) {
+    Vec4i rect;
+    memcpy(&rect, batch.readData(batch._params[paramOffset]._uint), sizeof(Vec4i));
+
+    if (_stereo._enable) {
+        rect.z /= 2;
+        if (_stereo._pass) {
+            rect.x += rect.z;
+        }
+    }
+    glScissor(rect.x, rect.y, rect.z, rect.w);
+    (void)CHECK_GL_ERROR();
+}
+
diff --git a/libraries/gpu-gles/src/gpu/gl/GLBackendTexture.cpp b/libraries/gpu-gles/src/gpu/gl/GLBackendTexture.cpp
new file mode 100644
index 0000000000..4be7682a4f
--- /dev/null
+++ b/libraries/gpu-gles/src/gpu/gl/GLBackendTexture.cpp
@@ -0,0 +1,40 @@
+//
+//
+//  GLBackendTexture.cpp
+//  libraries/gpu/src/gpu
+//
+//  Created by Sam Gateau on 1/19/2015.
+//  Copyright 2014 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 "GLBackend.h"
+#include "GLTexture.h"
+
+using namespace gpu;
+using namespace gpu::gl;
+
+bool GLBackend::isTextureReady(const TexturePointer& texture) {
+    // DO not transfer the texture, this call is expected for rendering texture
+    GLTexture* object = syncGPUObject(texture, true);
+    qDebug() << "GLBackendTexture isTextureReady syncGPUObject";
+    return object && object->isReady();
+}
+
+
+void GLBackend::do_generateTextureMips(const Batch& batch, size_t paramOffset) {
+    TexturePointer resourceTexture = batch._textures.get(batch._params[paramOffset + 0]._uint);
+    if (!resourceTexture) {
+        return;
+    }
+
+    // DO not transfer the texture, this call is expected for rendering texture
+    GLTexture* object = syncGPUObject(resourceTexture, false);
+    qDebug() << "GLBackendTexture do_generateTextureMips syncGPUObject";
+    if (!object) {
+        return;
+    }
+
+    object->generateMips();
+}
diff --git a/libraries/gpu-gles/src/gpu/gl/GLBackendTransform.cpp b/libraries/gpu-gles/src/gpu/gl/GLBackendTransform.cpp
new file mode 100644
index 0000000000..3068e24dac
--- /dev/null
+++ b/libraries/gpu-gles/src/gpu/gl/GLBackendTransform.cpp
@@ -0,0 +1,212 @@
+//
+//  GLBackendTransform.cpp
+//  libraries/gpu/src/gpu
+//
+//  Created by Sam Gateau on 3/8/2015.
+//  Copyright 2014 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 "GLBackend.h"
+
+using namespace gpu;
+using namespace gpu::gl;
+
+// Transform Stage
+void GLBackend::do_setModelTransform(const Batch& batch, size_t paramOffset) {
+    qDebug() << "do_setModelTransform";
+}
+
+void GLBackend::do_setViewTransform(const Batch& batch, size_t paramOffset) {
+    _transform._view = batch._transforms.get(batch._params[paramOffset]._uint);
+    _transform._viewIsCamera = batch._params[paramOffset + 1]._uint != 0;
+    _transform._invalidView = true;
+}
+
+void GLBackend::do_setProjectionTransform(const Batch& batch, size_t paramOffset) {
+    memcpy(&_transform._projection, batch.readData(batch._params[paramOffset]._uint), sizeof(Mat4));
+    _transform._invalidProj = true;
+}
+
+void GLBackend::do_setViewportTransform(const Batch& batch, size_t paramOffset) {
+    memcpy(&_transform._viewport, batch.readData(batch._params[paramOffset]._uint), sizeof(Vec4i));
+
+#ifdef GPU_STEREO_DRAWCALL_INSTANCED
+    {
+        ivec4& vp = _transform._viewport;
+        glViewport(vp.x, vp.y, vp.z, vp.w);
+
+        // Where we assign the GL viewport
+        if (_stereo._enable) {
+            vp.z /= 2;
+            if (_stereo._pass) {
+                vp.x += vp.z;
+            }
+        }
+    }
+#else
+    if (!_inRenderTransferPass && !isStereo()) {
+        ivec4& vp = _transform._viewport;
+        glViewport(vp.x, vp.y, vp.z, vp.w);
+    }
+#endif
+
+    // The Viewport is tagged invalid because the CameraTransformUBO is not up to date and will need update on next drawcall
+    _transform._invalidViewport = true;
+}
+
+void GLBackend::do_setDepthRangeTransform(const Batch& batch, size_t paramOffset) {
+
+    Vec2 depthRange(batch._params[paramOffset + 1]._float, batch._params[paramOffset + 0]._float);
+
+    if ((depthRange.x != _transform._depthRange.x) || (depthRange.y != _transform._depthRange.y)) {
+        _transform._depthRange = depthRange;
+        
+        glDepthRangef(depthRange.x, depthRange.y);
+    }
+}
+
+void GLBackend::killTransform() {
+    glDeleteBuffers(1, &_transform._objectBuffer);
+    glDeleteBuffers(1, &_transform._cameraBuffer);
+    glDeleteBuffers(1, &_transform._drawCallInfoBuffer);
+    glDeleteTextures(1, &_transform._objectBufferTexture);
+}
+
+void GLBackend::syncTransformStateCache() {
+    _transform._invalidViewport = true;
+    _transform._invalidProj = true;
+    _transform._invalidView = true;
+
+    glGetIntegerv(GL_VIEWPORT, (GLint*) &_transform._viewport);
+
+    glGetFloatv(GL_DEPTH_RANGE, (GLfloat*)&_transform._depthRange);
+
+    Mat4 modelView;
+    auto modelViewInv = glm::inverse(modelView);
+    _transform._view.evalFromRawMatrix(modelViewInv);
+
+    glDisableVertexAttribArray(gpu::Stream::DRAW_CALL_INFO);
+    _transform._enabledDrawcallInfoBuffer = false;
+}
+
+void GLBackend::TransformStageState::preUpdate(size_t commandIndex, const StereoState& stereo) {
+    // Check all the dirty flags and update the state accordingly
+    if (_invalidViewport) {
+        _camera._viewport = glm::vec4(_viewport);
+    }
+
+    if (_invalidProj) {
+        _camera._projection = _projection;
+    }
+
+    if (_invalidView) {
+        // Apply the correction
+        if (_viewIsCamera && _correction.correction != glm::mat4()) {
+            // FIXME should I switch to using the camera correction buffer in Transform.slf and leave this out?
+            Transform result;
+            _view.mult(result, _view, _correction.correction);
+            if (_skybox) {
+                result.setTranslation(vec3());
+            }
+            _view = result;
+        }
+        // This is when the _view matrix gets assigned
+        _view.getInverseMatrix(_camera._view);
+    }
+
+    if (_invalidView || _invalidProj || _invalidViewport) {
+        size_t offset = _cameraUboSize * _cameras.size();
+        _cameraOffsets.push_back(TransformStageState::Pair(commandIndex, offset));
+
+        if (stereo._enable) {
+#ifdef GPU_STEREO_CAMERA_BUFFER
+        _cameras.push_back(CameraBufferElement(_camera.getEyeCamera(0, stereo, _view), _camera.getEyeCamera(1, stereo, _view)));
+#else
+        _cameras.push_back((_camera.getEyeCamera(0, stereo, _view)));
+        _cameras.push_back((_camera.getEyeCamera(1, stereo, _view)));
+#endif
+        } else {
+#ifdef GPU_STEREO_CAMERA_BUFFER
+            _cameras.push_back(CameraBufferElement(_camera.recomputeDerived(_view)));
+#else
+            _cameras.push_back((_camera.recomputeDerived(_view)));
+#endif
+        }
+    }
+
+    // Flags are clean
+    _invalidView = _invalidProj = _invalidViewport = false;
+}
+
+void GLBackend::TransformStageState::update(size_t commandIndex, const StereoState& stereo) const {
+    size_t offset = INVALID_OFFSET;
+    while ((_camerasItr != _cameraOffsets.end()) && (commandIndex >= (*_camerasItr).first)) {
+        offset = (*_camerasItr).second;
+        _currentCameraOffset = offset;
+        ++_camerasItr;
+    }
+
+    if (offset != INVALID_OFFSET) {
+#ifdef GPU_STEREO_CAMERA_BUFFER
+        bindCurrentCamera(0);
+#else 
+        if (!stereo._enable) {
+            bindCurrentCamera(0);
+        }
+#endif
+    }
+    (void)CHECK_GL_ERROR();
+}
+
+void GLBackend::TransformStageState::bindCurrentCamera(int eye) const {
+    if (_currentCameraOffset != INVALID_OFFSET) {
+        //qDebug() << "GLBackend::TransformStageState::bindCurrentCamera";
+        glBindBufferRange(GL_UNIFORM_BUFFER, TRANSFORM_CAMERA_SLOT, _cameraBuffer, _currentCameraOffset + eye * _cameraUboSize, sizeof(CameraBufferElement));
+    }
+}
+
+void GLBackend::updateTransform(const Batch& batch) {
+    _transform.update(_commandIndex, _stereo);
+
+    auto& drawCallInfoBuffer = batch.getDrawCallInfoBuffer();
+    if (batch._currentNamedCall.empty()) {
+        (void)CHECK_GL_ERROR();
+        auto& drawCallInfo = drawCallInfoBuffer[_currentDraw];
+        glDisableVertexAttribArray(gpu::Stream::DRAW_CALL_INFO); // Make sure attrib array is disabled
+        (void)CHECK_GL_ERROR();
+        GLint current_vao, current_vbo, maxVertexAtribs;
+        glGetIntegerv(GL_VERTEX_ARRAY_BINDING, &current_vao);
+        glGetIntegerv(GL_ARRAY_BUFFER_BINDING, &current_vbo);
+        glGetIntegerv(GL_MAX_VERTEX_ATTRIBS, &maxVertexAtribs);
+        glVertexAttribI4i(gpu::Stream::DRAW_CALL_INFO, drawCallInfo.index, drawCallInfo.unused, 0, 0);
+
+        //int values[] = {drawCallInfo.index, drawCallInfo.unused};
+        //glVertexAttribIPointer(gpu::Stream::DRAW_CALL_INFO, 2, GL_INT, 0, (const GLvoid *) values);
+
+        /*
+        //glDisableVertexAttribArray currentvao  1  current vbo  0
+        GL_INVALID_OPERATION is generated 
+                a non-zero vertex array object is bound, 
+                zero is bound to the GL_ARRAY_BUFFER buffer object binding point and
+                the pointer argument is not NULL.   TRUE
+        */
+        //qDebug() << "GLBackend::updateTransform glVertexAttribIPointer done";
+        (void)CHECK_GL_ERROR();
+
+    } else {
+        //qDebug() << "GLBackend::updateTransform else";
+        glEnableVertexAttribArray(gpu::Stream::DRAW_CALL_INFO); // Make sure attrib array is enabled
+        glBindBuffer(GL_ARRAY_BUFFER, _transform._drawCallInfoBuffer);
+        glVertexAttribIPointer(gpu::Stream::DRAW_CALL_INFO, 2, GL_UNSIGNED_SHORT, 0,
+                               _transform._drawCallInfoOffsets[batch._currentNamedCall]);
+        glVertexAttribDivisor(gpu::Stream::DRAW_CALL_INFO, 1);
+    }
+    
+    (void)CHECK_GL_ERROR();
+}
+
+void GLBackend::resetTransformStage() {
+    
+}
diff --git a/libraries/gpu-gles/src/gpu/gl/GLBuffer.cpp b/libraries/gpu-gles/src/gpu/gl/GLBuffer.cpp
new file mode 100644
index 0000000000..4f7d0a8632
--- /dev/null
+++ b/libraries/gpu-gles/src/gpu/gl/GLBuffer.cpp
@@ -0,0 +1,35 @@
+//
+//  Created by Gabriel Calero & Cristian Duarte on 09/27/2016
+//  Copyright 2013-2016 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 "GLBuffer.h"
+#include "GLBackend.h"
+
+using namespace gpu;
+using namespace gpu::gl;
+
+GLBuffer::~GLBuffer() {
+    Backend::bufferCount.decrement();
+    Backend::bufferGPUMemSize.update(_size, 0);
+    
+    if (_id) {
+        auto backend = _backend.lock();
+        if (backend) {
+            backend->releaseBuffer(_id, _size);
+        }
+    }
+}
+
+GLBuffer::GLBuffer(const std::weak_ptr<GLBackend>& backend, const Buffer& buffer, GLuint id) :
+    GLObject(backend, buffer, id),
+    _size((GLuint)buffer._renderSysmem.getSize()),
+    _stamp(buffer._renderSysmem.getStamp())
+{
+    Backend::bufferCount.increment();
+    Backend::bufferGPUMemSize.update(0, _size);
+}
+
diff --git a/libraries/gpu-gles/src/gpu/gl/GLBuffer.h b/libraries/gpu-gles/src/gpu/gl/GLBuffer.h
new file mode 100644
index 0000000000..182014e764
--- /dev/null
+++ b/libraries/gpu-gles/src/gpu/gl/GLBuffer.h
@@ -0,0 +1,66 @@
+//
+//  Created by Bradley Austin Davis on 2016/05/15
+//  Copyright 2013-2016 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_gpu_gl_GLBuffer_h
+#define hifi_gpu_gl_GLBuffer_h
+
+#include "GLShared.h"
+#include "GLBackend.h"
+
+namespace gpu { namespace gl {
+
+class GLBuffer : public GLObject<Buffer> {
+public:
+    template <typename GLBufferType>
+    static GLBufferType* sync(GLBackend& backend, const Buffer& buffer) {
+        if (buffer.getSysmem().getSize() != 0) {
+            if (buffer._getUpdateCount == 0) {
+                qWarning() << "Unsynced buffer";
+            }
+            if (buffer._getUpdateCount < buffer._applyUpdateCount) {
+                qWarning() << "Unsynced buffer " << buffer._getUpdateCount << " " << buffer._applyUpdateCount;
+            }
+        }
+        GLBufferType* object = Backend::getGPUObject<GLBufferType>(buffer);
+
+        // Has the storage size changed?
+        if (!object || object->_stamp != buffer._renderSysmem.getStamp()) {
+            object = new GLBufferType(backend.shared_from_this(), buffer, object);
+        }
+
+        if (0 != (buffer._renderPages._flags & PageManager::DIRTY)) {
+            object->transfer();
+        }
+
+        return object;
+    }
+
+    template <typename GLBufferType>
+    static GLuint getId(GLBackend& backend, const Buffer& buffer) {
+        GLBuffer* bo = sync<GLBufferType>(backend, buffer);
+        if (bo) {
+            return bo->_buffer;
+        } else {
+            return 0;
+        }
+    }
+
+    const GLuint& _buffer { _id };
+    const GLuint _size;
+    const Stamp _stamp;
+
+    ~GLBuffer();
+
+    virtual void transfer() = 0;
+
+protected:
+    GLBuffer(const std::weak_ptr<GLBackend>& backend, const Buffer& buffer, GLuint id);
+};
+
+} }
+
+#endif
diff --git a/libraries/gpu-gles/src/gpu/gl/GLFramebuffer.cpp b/libraries/gpu-gles/src/gpu/gl/GLFramebuffer.cpp
new file mode 100644
index 0000000000..150bb2be70
--- /dev/null
+++ b/libraries/gpu-gles/src/gpu/gl/GLFramebuffer.cpp
@@ -0,0 +1,48 @@
+//
+//  Created by Gabriel Calero & Cristian Duarte on 09/27/2016
+//  Copyright 2016 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 "GLFramebuffer.h"
+#include "GLBackend.h"
+
+using namespace gpu;
+using namespace gpu::gl;
+
+GLFramebuffer::~GLFramebuffer() { 
+    if (_id) { 
+        auto backend = _backend.lock();
+        if (backend) {
+            backend->releaseFramebuffer(_id);
+        }
+    } 
+}
+
+bool GLFramebuffer::checkStatus(GLenum target) const {
+    bool result = false;
+    switch (_status) {
+    case GL_FRAMEBUFFER_COMPLETE:
+        // Success !
+        result = true;
+        break;
+    case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT:
+        qCDebug(gpugllogging) << "GLFramebuffer::syncGPUObject : Framebuffer not valid, GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT.";
+        break;
+    case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT:
+        qCDebug(gpugllogging) << "GLFramebuffer::syncGPUObject : Framebuffer not valid, GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT.";
+        break;
+/* TODO:     case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER:
+        qCDebug(gpugllogging) << "GLFramebuffer::syncGPUObject : Framebuffer not valid, GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER.";
+        break;
+    case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER:
+        qCDebug(gpugllogging) << "GLFramebuffer::syncGPUObject : Framebuffer not valid, GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER.";
+        break; */
+    case GL_FRAMEBUFFER_UNSUPPORTED:
+        qCDebug(gpugllogging) << "GLFramebuffer::syncGPUObject : Framebuffer not valid, GL_FRAMEBUFFER_UNSUPPORTED.";
+        break;
+    }
+    return result;
+}
diff --git a/libraries/gpu-gles/src/gpu/gl/GLFramebuffer.h b/libraries/gpu-gles/src/gpu/gl/GLFramebuffer.h
new file mode 100644
index 0000000000..a2fd0999f3
--- /dev/null
+++ b/libraries/gpu-gles/src/gpu/gl/GLFramebuffer.h
@@ -0,0 +1,77 @@
+//
+//  Created by Gabriel Calero & Cristian Duarte on 09/27/2016
+//  Copyright 2016 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_gpu_gl_GLFramebuffer_h
+#define hifi_gpu_gl_GLFramebuffer_h
+
+#include "GLShared.h"
+#include "GLBackend.h"
+
+namespace gpu { namespace gl {
+
+class GLFramebuffer : public GLObject<Framebuffer> {
+public:
+    template <typename GLFramebufferType>
+    static GLFramebufferType* sync(GLBackend& backend, const Framebuffer& framebuffer) {
+        GLFramebufferType* object = Backend::getGPUObject<GLFramebufferType>(framebuffer);
+
+        bool needsUpate { false };
+        if (!object ||
+            framebuffer.getDepthStamp() != object->_depthStamp ||
+            framebuffer.getColorStamps() != object->_colorStamps) {
+            needsUpate = true;
+        }
+
+        // If GPU object already created and in sync
+        if (!needsUpate) {
+            return object;
+        } else if (framebuffer.isEmpty()) {
+            // NO framebuffer definition yet so let's avoid thinking
+            return nullptr;
+        }
+
+        // need to have a gpu object?
+        if (!object) {
+            // All is green, assign the gpuobject to the Framebuffer
+            object = new GLFramebufferType(backend.shared_from_this(), framebuffer);
+            Backend::setGPUObject(framebuffer, object);
+            (void)CHECK_GL_ERROR();
+        }
+
+        object->update();
+        return object;
+    }
+
+    template <typename GLFramebufferType>
+    static GLuint getId(GLBackend& backend, const Framebuffer& framebuffer) {
+        GLFramebufferType* fbo = sync<GLFramebufferType>(backend, framebuffer);
+        if (fbo) {
+            return fbo->_id;
+        } else {
+            return 0;
+        }
+    }
+
+    const GLuint& _fbo { _id };
+    std::vector<GLenum> _colorBuffers;
+    Stamp _depthStamp { 0 };
+    std::vector<Stamp> _colorStamps;
+
+protected:
+    GLenum _status { GL_FRAMEBUFFER_COMPLETE };
+    virtual void update() = 0;
+    bool checkStatus(GLenum target) const;
+
+    GLFramebuffer(const std::weak_ptr<GLBackend>& backend, const Framebuffer& framebuffer, GLuint id) : GLObject(backend, framebuffer, id) {}
+    ~GLFramebuffer();
+
+};
+
+} }
+
+
+#endif
diff --git a/libraries/gpu-gles/src/gpu/gl/GLInputFormat.cpp b/libraries/gpu-gles/src/gpu/gl/GLInputFormat.cpp
new file mode 100644
index 0000000000..7f42350c3b
--- /dev/null
+++ b/libraries/gpu-gles/src/gpu/gl/GLInputFormat.cpp
@@ -0,0 +1,33 @@
+//
+//  Created by Sam Gateau on 2016/07/21
+//  Copyright 2013-2016 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 "GLInputFormat.h"
+#include "GLBackend.h"
+
+using namespace gpu;
+using namespace gpu::gl;
+
+
+GLInputFormat::GLInputFormat() {
+}
+
+GLInputFormat:: ~GLInputFormat() {
+
+}
+
+GLInputFormat* GLInputFormat::sync(const Stream::Format& inputFormat) {
+    GLInputFormat* object = Backend::getGPUObject<GLInputFormat>(inputFormat);
+
+    if (!object) {
+        object = new GLInputFormat();
+        object->key = inputFormat.getKey();
+        Backend::setGPUObject(inputFormat, object);
+    }
+
+    return object;
+}
diff --git a/libraries/gpu-gles/src/gpu/gl/GLInputFormat.h b/libraries/gpu-gles/src/gpu/gl/GLInputFormat.h
new file mode 100644
index 0000000000..a14e3d4d91
--- /dev/null
+++ b/libraries/gpu-gles/src/gpu/gl/GLInputFormat.h
@@ -0,0 +1,29 @@
+//
+//  Created by Sam Gateau on 2016/07/21
+//  Copyright 2013-2016 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_gpu_gl_GLInputFormat_h
+#define hifi_gpu_gl_GLInputFormat_h
+
+#include "GLShared.h"
+
+namespace gpu {
+namespace gl {
+
+class GLInputFormat : public GPUObject {
+    public:
+        static GLInputFormat* sync(const Stream::Format& inputFormat);
+
+    GLInputFormat();
+    ~GLInputFormat();
+
+    std::string key;
+};
+
+}
+}
+
+#endif
diff --git a/libraries/gpu-gles/src/gpu/gl/GLPipeline.cpp b/libraries/gpu-gles/src/gpu/gl/GLPipeline.cpp
new file mode 100644
index 0000000000..09c09de353
--- /dev/null
+++ b/libraries/gpu-gles/src/gpu/gl/GLPipeline.cpp
@@ -0,0 +1,62 @@
+//
+//  Created by Bradley Austin Davis on 2016/05/15
+//  Copyright 2013-2016 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 "GLPipeline.h"
+
+#include "GLShader.h"
+#include "GLState.h"
+
+using namespace gpu;
+using namespace gpu::gl;
+
+GLPipeline* GLPipeline::sync(GLBackend& backend, const Pipeline& pipeline) {
+    GLPipeline* object = Backend::getGPUObject<GLPipeline>(pipeline);
+
+    // If GPU object already created then good
+    if (object) {
+        return object;
+    }
+
+    // No object allocated yet, let's see if it's worth it...
+    ShaderPointer shader = pipeline.getProgram();
+
+    // If this pipeline's shader has already failed to compile, don't try again
+    if (shader->compilationHasFailed()) {
+        return nullptr;
+    }
+
+    GLShader* programObject = GLShader::sync(backend, *shader);
+    if (programObject == nullptr) {
+        shader->setCompilationHasFailed(true);
+        return nullptr;
+    }
+
+    StatePointer state = pipeline.getState();
+    GLState* stateObject = GLState::sync(*state);
+    if (stateObject == nullptr) {
+        return nullptr;
+    }
+
+    // Program and state are valid, we can create the pipeline object
+    if (!object) {
+        object = new GLPipeline();
+        Backend::setGPUObject(pipeline, object);
+    }
+
+    // Special case for view correction matrices, any pipeline that declares the correction buffer
+    // uniform will automatically have it provided without any client code necessary.
+    // Required for stable lighting in the HMD.
+    //CLIMAX_MERGE_START
+    //getbuffers() doesnt exist anymore.. use get uniformbuffers()?
+    object->_cameraCorrection = shader->getUniformBuffers().findLocation("cameraCorrectionBuffer");
+    //CLIMAX_MERGE_END
+    object->_program = programObject;
+    object->_state = stateObject;
+
+    return object;
+}
diff --git a/libraries/gpu-gles/src/gpu/gl/GLPipeline.h b/libraries/gpu-gles/src/gpu/gl/GLPipeline.h
new file mode 100644
index 0000000000..a298f149d9
--- /dev/null
+++ b/libraries/gpu-gles/src/gpu/gl/GLPipeline.h
@@ -0,0 +1,29 @@
+//
+//  Created by Bradley Austin Davis on 2016/05/15
+//  Copyright 2013-2016 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_gpu_gl_GLPipeline_h
+#define hifi_gpu_gl_GLPipeline_h
+
+#include "GLShared.h"
+
+namespace gpu { namespace gl {
+
+class GLPipeline : public GPUObject {
+public:
+    static GLPipeline* sync(GLBackend& backend, const Pipeline& pipeline);
+
+    GLShader* _program { nullptr };
+    GLState* _state { nullptr };
+    // Bit of a hack, any pipeline can need the camera correction buffer at execution time, so 
+    // we store whether a given pipeline has declared the uniform buffer for it.
+    int32 _cameraCorrection { -1 };
+};
+
+} }
+
+
+#endif
diff --git a/libraries/gpu-gles/src/gpu/gl/GLQuery.h b/libraries/gpu-gles/src/gpu/gl/GLQuery.h
new file mode 100644
index 0000000000..23b1f38621
--- /dev/null
+++ b/libraries/gpu-gles/src/gpu/gl/GLQuery.h
@@ -0,0 +1,67 @@
+//
+//  Created by Bradley Austin Davis on 2016/05/15
+//  Copyright 2013-2016 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_gpu_gl_GLQuery_h
+#define hifi_gpu_gl_GLQuery_h
+
+#include "GLShared.h"
+#include "GLBackend.h"
+
+namespace gpu { namespace gl {
+
+class GLQuery : public GLObject<Query> {
+    using Parent = gpu::gl::GLObject<Query>;
+public:
+    template <typename GLQueryType>
+    static GLQueryType* sync(GLBackend& backend, const Query& query) {
+        GLQueryType* object = Backend::getGPUObject<GLQueryType>(query);
+
+        // need to have a gpu object?
+        if (!object) {
+            // All is green, assign the gpuobject to the Query
+            object = new GLQueryType(backend.shared_from_this(), query);
+            (void)CHECK_GL_ERROR();
+            Backend::setGPUObject(query, object);
+        }
+
+        return object;
+    }
+
+    template <typename GLQueryType>
+    static GLuint getId(GLBackend& backend, const QueryPointer& query) {
+        if (!query) {
+            return 0;
+        }
+
+        GLQuery* object = sync<GLQueryType>(backend, *query);
+        if (!object) {
+            return 0;
+        } 
+
+        return object->_endqo;
+    }
+
+    const GLuint& _endqo = { _id };
+    const GLuint _beginqo = { 0 };
+    GLuint64 _result { (GLuint64)-1 };
+    GLuint64 _batchElapsedTime { (GLuint64) 0 };
+    uint64_t _profileRangeId { 0 };
+    uint32_t _rangeQueryDepth { 0 };
+
+protected:
+    GLQuery(const std::weak_ptr<GLBackend>& backend, const Query& query, GLuint endId, GLuint beginId) : Parent(backend, query, endId), _beginqo(beginId) {}
+    ~GLQuery() {
+        if (_id) {
+            GLuint ids[2] = { _endqo, _beginqo };
+            glDeleteQueries(2, ids);
+        }
+    }
+};
+
+} }
+
+#endif
diff --git a/libraries/gpu-gles/src/gpu/gl/GLShader.cpp b/libraries/gpu-gles/src/gpu/gl/GLShader.cpp
new file mode 100644
index 0000000000..b728010470
--- /dev/null
+++ b/libraries/gpu-gles/src/gpu/gl/GLShader.cpp
@@ -0,0 +1,224 @@
+//
+//  Created by Bradley Austin Davis on 2016/05/15
+//  Copyright 2013-2016 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 "GLShader.h"
+#include <gl/GLShaders.h>
+
+#include "GLBackend.h"
+
+using namespace gpu;
+using namespace gpu::gl;
+
+GLShader::GLShader(const std::weak_ptr<GLBackend>& backend) : _backend(backend) {
+}
+
+GLShader::~GLShader() {
+    for (auto& so : _shaderObjects) {
+        auto backend = _backend.lock();
+        if (backend) {
+            if (so.glshader != 0) {
+                backend->releaseShader(so.glshader);
+            }
+            if (so.glprogram != 0) {
+                backend->releaseProgram(so.glprogram);
+            }
+        }
+    }
+}
+
+// GLSL version
+static const std::string glslVersion {
+    "#version 310 es"
+};
+
+// Shader domain
+static const size_t NUM_SHADER_DOMAINS = 3;
+
+// GL Shader type enums
+// Must match the order of type specified in gpu::Shader::Type
+static const std::array<GLenum, NUM_SHADER_DOMAINS> SHADER_DOMAINS { {
+    GL_VERTEX_SHADER,
+    GL_FRAGMENT_SHADER,
+    //GL_GEOMETRY_SHADER,
+} };
+
+// Domain specific defines
+// Must match the order of type specified in gpu::Shader::Type
+static const std::array<std::string, NUM_SHADER_DOMAINS> DOMAIN_DEFINES { {
+    "#define GPU_VERTEX_SHADER",
+    "#define GPU_PIXEL_SHADER",
+    "#define GPU_GEOMETRY_SHADER",
+} };
+
+// Stereo specific defines
+static const std::string stereoVersion {
+#ifdef GPU_STEREO_DRAWCALL_INSTANCED
+    "#define GPU_TRANSFORM_IS_STEREO\n#define GPU_TRANSFORM_STEREO_CAMERA\n#define GPU_TRANSFORM_STEREO_CAMERA_INSTANCED\n#define GPU_TRANSFORM_STEREO_SPLIT_SCREEN"
+#endif
+#ifdef GPU_STEREO_DRAWCALL_DOUBLED
+#ifdef GPU_STEREO_CAMERA_BUFFER
+    "#define GPU_TRANSFORM_IS_STEREO\n#define GPU_TRANSFORM_STEREO_CAMERA\n#define GPU_TRANSFORM_STEREO_CAMERA_ATTRIBUTED"
+#else
+    "#define GPU_TRANSFORM_IS_STEREO"
+#endif
+#endif
+};
+
+// Versions specific of the shader
+static const std::array<std::string, GLShader::NumVersions> VERSION_DEFINES { {
+    "",
+    stereoVersion
+} };
+
+GLShader* compileBackendShader(GLBackend& backend, const Shader& shader) {
+    // Any GLSLprogram ? normally yes...
+    const std::string& shaderSource = shader.getSource().getCode();
+    GLenum shaderDomain = SHADER_DOMAINS[shader.getType()];
+    GLShader::ShaderObjects shaderObjects;
+    
+    for (int version = 0; version < GLShader::NumVersions; version++) {
+        auto& shaderObject = shaderObjects[version];
+        std::string shaderDefines = glslVersion + "\n" + DOMAIN_DEFINES[shader.getType()] + "\n" + VERSION_DEFINES[version] 
+        + "\n" + "#extension GL_EXT_texture_buffer : enable"
+        + "\nprecision lowp float; // check precision 2"
+        + "\nprecision lowp samplerBuffer;"
+        + "\nprecision lowp sampler2DShadow;";
+        // TODO Delete bool result = compileShader(shaderDomain, shaderSource, shaderDefines, shaderObject.glshader, shaderObject.glprogram);
+        std::string error;
+
+
+#ifdef SEPARATE_PROGRAM
+        bool result = ::gl::compileShader(shaderDomain, shaderSource.c_str(), shaderDefines.c_str(), shaderObject.glshader, shaderObject.glprogram, error);
+#else
+        bool result = ::gl::compileShader(shaderDomain, shaderSource, shaderDefines, shaderObject.glshader, error);
+#endif
+        if (!result) {
+            qCWarning(gpugllogging) << "GLBackend::compileBackendProgram - Shader didn't compile:\n" << error.c_str();
+            return nullptr;
+        }
+    }
+
+    // So far so good, the shader is created successfully
+    GLShader* object = new GLShader(backend.shared_from_this());
+    object->_shaderObjects = shaderObjects;
+
+    return object;
+}
+
+GLShader* compileBackendProgram(GLBackend& backend, const Shader& program) {
+    if (!program.isProgram()) {
+        return nullptr;
+    }
+
+    GLShader::ShaderObjects programObjects;
+
+    for (int version = 0; version < GLShader::NumVersions; version++) {
+        auto& programObject = programObjects[version];
+
+        // Let's go through every shaders and make sure they are ready to go
+        std::vector< GLuint > shaderGLObjects;
+        for (auto subShader : program.getShaders()) {
+            auto object = GLShader::sync(backend, *subShader);
+            if (object) {
+                shaderGLObjects.push_back(object->_shaderObjects[version].glshader);
+            } else {
+                qCDebug(gpugllogging) << "GLShader::compileBackendProgram - One of the shaders of the program is not compiled?";
+                return nullptr;
+            }
+        }
+
+        std::string error;
+        GLuint glprogram = ::gl::compileProgram(shaderGLObjects, error);
+        if (glprogram == 0) {
+            qCWarning(gpugllogging) << error.c_str();
+            return nullptr;
+        }
+
+        programObject.glprogram = glprogram;
+
+        makeProgramBindings(programObject);
+    }
+
+    // So far so good, the program versions have all been created successfully
+    GLShader* object = new GLShader(backend.shared_from_this());
+    object->_shaderObjects = programObjects;
+
+    return object;
+}
+
+GLShader* GLShader::sync(GLBackend& backend, const Shader& shader) {
+    GLShader* object = Backend::getGPUObject<GLShader>(shader);
+
+    // If GPU object already created then good
+    if (object) {
+        return object;
+    }
+    // need to have a gpu object?
+    if (shader.isProgram()) {
+        GLShader* tempObject = compileBackendProgram(backend, shader);
+        if (tempObject) {
+            object = tempObject;
+            Backend::setGPUObject(shader, object);
+        }
+    } else if (shader.isDomain()) {
+        GLShader* tempObject = compileBackendShader(backend, shader);
+        if (tempObject) {
+            object = tempObject;
+            Backend::setGPUObject(shader, object);
+        }
+    }
+
+    glFinish();
+    return object;
+}
+
+bool GLShader::makeProgram(GLBackend& backend, Shader& shader, const Shader::BindingSet& slotBindings) {
+
+    // First make sure the Shader has been compiled
+    GLShader* object = sync(backend, shader);
+    if (!object) {
+        return false;
+    }
+
+    // Apply bindings to all program versions and generate list of slots from default version
+    for (int version = 0; version < GLShader::NumVersions; version++) {
+        auto& shaderObject = object->_shaderObjects[version];
+        if (shaderObject.glprogram) {
+            Shader::SlotSet buffers;
+            makeUniformBlockSlots(shaderObject.glprogram, slotBindings, buffers);
+
+            Shader::SlotSet uniforms;
+            Shader::SlotSet textures;
+            Shader::SlotSet samplers;
+            makeUniformSlots(shaderObject.glprogram, slotBindings, uniforms, textures, samplers);
+
+            Shader::SlotSet resourceBuffers;
+            makeResourceBufferSlots(shaderObject.glprogram, slotBindings, resourceBuffers);
+
+            Shader::SlotSet inputs;
+            makeInputSlots(shaderObject.glprogram, slotBindings, inputs);
+
+            Shader::SlotSet outputs;
+            makeOutputSlots(shaderObject.glprogram, slotBindings, outputs);
+
+            // Define the public slots only from the default version
+            if (version == 0) {
+                shader.defineSlots(uniforms, buffers, resourceBuffers, textures, samplers, inputs, outputs);
+            } // else
+            {
+                GLShader::UniformMapping mapping;
+                for (auto srcUniform : shader.getUniforms()) {
+                    mapping[srcUniform._location] = uniforms.findLocation(srcUniform._name);
+                }
+                object->_uniformMappings.push_back(mapping);
+            }
+        }
+    }
+
+    return true;
+}
+
diff --git a/libraries/gpu-gles/src/gpu/gl/GLShader.h b/libraries/gpu-gles/src/gpu/gl/GLShader.h
new file mode 100644
index 0000000000..e03b487a60
--- /dev/null
+++ b/libraries/gpu-gles/src/gpu/gl/GLShader.h
@@ -0,0 +1,59 @@
+//
+//  Created by Bradley Austin Davis on 2016/05/15
+//  Copyright 2013-2016 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_gpu_gl_GLShader_h
+#define hifi_gpu_gl_GLShader_h
+
+#include "GLShared.h"
+
+namespace gpu { namespace gl {
+
+class GLShader : public GPUObject {
+public:
+    static GLShader* sync(GLBackend& backend, const Shader& shader);
+    static bool makeProgram(GLBackend& backend, Shader& shader, const Shader::BindingSet& slotBindings);
+
+    enum Version {
+        Mono = 0,
+        Stereo,
+
+        NumVersions
+    };
+
+    using ShaderObject = gpu::gl::ShaderObject;
+    using ShaderObjects = std::array< ShaderObject, NumVersions >;
+
+    using UniformMapping = std::map<GLint, GLint>;
+    using UniformMappingVersions = std::vector<UniformMapping>;
+
+    GLShader(const std::weak_ptr<GLBackend>& backend);
+    ~GLShader();
+
+    ShaderObjects _shaderObjects;
+    UniformMappingVersions _uniformMappings;
+
+    GLuint getProgram(Version version = Mono) const {
+        return _shaderObjects[version].glprogram;
+    }
+
+    GLint getUniformLocation(GLint srcLoc, Version version = Mono) const {
+        // This check protect against potential invalid src location for this shader, if unknown then return -1.
+        const auto& mapping = _uniformMappings[version];
+        auto found = mapping.find(srcLoc);
+        if (found == mapping.end()) {
+            return -1;
+        }
+        return found->second;
+    }
+
+    const std::weak_ptr<GLBackend> _backend;
+};
+
+} }
+
+
+#endif
diff --git a/libraries/gpu-gles/src/gpu/gl/GLShared.cpp b/libraries/gpu-gles/src/gpu/gl/GLShared.cpp
new file mode 100644
index 0000000000..5d340889a6
--- /dev/null
+++ b/libraries/gpu-gles/src/gpu/gl/GLShared.cpp
@@ -0,0 +1,879 @@
+//
+//  Created by Bradley Austin Davis on 2016/05/14
+//  Copyright 2013-2016 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 "GLShared.h"
+
+#include <mutex>
+
+#include <QtCore/QThread>
+
+#include <GPUIdent.h>
+#include <NumericalConstants.h>
+#include <fstream>
+
+Q_LOGGING_CATEGORY(gpugllogging, "hifi.gpu.gl")
+Q_LOGGING_CATEGORY(trace_render_gpu_gl, "trace.render.gpu.gl")
+
+namespace gpu { namespace gl {
+
+bool checkGLError(const char* name) {
+    GLenum error = glGetError();
+    if (!error) {
+        return false;
+    } else {
+        switch (error) {
+        case GL_INVALID_ENUM:
+            qCDebug(gpugllogging) << "GLBackend::" << name << ": An unacceptable value is specified for an enumerated argument.The offending command is ignored and has no other side effect than to set the error flag.";
+            break;
+        case GL_INVALID_VALUE:
+            qCDebug(gpugllogging) << "GLBackend" << name << ": A numeric argument is out of range.The offending command is ignored and has no other side effect than to set the error flag";
+            break;
+        case GL_INVALID_OPERATION:
+            qCDebug(gpugllogging) << "GLBackend" << name << ": The specified operation is not allowed in the current state.The offending command is ignored and has no other side effect than to set the error flag..";
+            break;
+        case GL_INVALID_FRAMEBUFFER_OPERATION:
+            qCDebug(gpugllogging) << "GLBackend" << name << ": The framebuffer object is not complete.The offending command is ignored and has no other side effect than to set the error flag.";
+            break;
+        case GL_OUT_OF_MEMORY:
+            qCDebug(gpugllogging) << "GLBackend" << name << ": There is not enough memory left to execute the command.The state of the GL is undefined, except for the state of the error flags, after this error is recorded.";
+            break;
+        default:
+            qCDebug(gpugllogging) << "GLBackend" << name << ": Unknown error: " << error;
+            break;
+        }
+        return true;
+    }
+}
+
+bool checkGLErrorDebug(const char* name) {
+#ifdef DEBUG
+    return checkGLError(name);
+#else
+  Q_UNUSED(name);
+    return false;
+#endif
+}
+
+gpu::Size getFreeDedicatedMemory() {
+    Size result { 0 };
+    static bool nvidiaMemorySupported { false };
+    static bool atiMemorySupported { false };
+    if (nvidiaMemorySupported) {
+        
+        GLint nvGpuMemory { 0 };
+        qDebug() << "TODO: GLShared.cpp getFreeDedicatedMemory GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX";
+        //glGetIntegerv(GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX, &nvGpuMemory);
+        if (GL_NO_ERROR == glGetError()) {
+            result = KB_TO_BYTES(nvGpuMemory);
+        } else {
+            nvidiaMemorySupported = false;
+        }
+    } else if (atiMemorySupported) {
+        GLint atiGpuMemory[4];
+        qDebug() << "TODO: GLShared.cpp getFreeDedicatedMemory GL_TEXTURE_FREE_MEMORY_ATI";
+        // not really total memory, but close enough if called early enough in the application lifecycle
+        //glGetIntegerv(GL_TEXTURE_FREE_MEMORY_ATI, atiGpuMemory);
+        if (GL_NO_ERROR == glGetError()) {
+            result = KB_TO_BYTES(atiGpuMemory[0]);
+        } else {
+            atiMemorySupported = false;
+        }
+    }
+    return result;
+}
+
+gpu::Size getDedicatedMemory() {
+    static Size dedicatedMemory { 0 };
+    static std::once_flag once;
+    std::call_once(once, [&] {
+        if (!dedicatedMemory) {
+            GLint atiGpuMemory[4];
+            // not really total memory, but close enough if called early enough in the application lifecycle
+            //glGetIntegerv(GL_TEXTURE_FREE_MEMORY_ATI, atiGpuMemory);
+            qDebug() << "TODO: GLShared.cpp.cpp:initInput GL_TEXTURE_FREE_MEMORY_ATI";
+            if (GL_NO_ERROR == glGetError()) {
+                dedicatedMemory = KB_TO_BYTES(atiGpuMemory[0]);
+            }
+        }
+
+        if (!dedicatedMemory) {
+            GLint nvGpuMemory { 0 };
+            qDebug() << "TODO: GLShared.cpp.cpp:initInput GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX";
+            //glGetIntegerv(GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX, &nvGpuMemory);
+            if (GL_NO_ERROR == glGetError()) {
+                dedicatedMemory = KB_TO_BYTES(nvGpuMemory);
+            }
+        }
+
+        if (!dedicatedMemory) {
+            auto gpuIdent = GPUIdent::getInstance();
+            if (gpuIdent && gpuIdent->isValid()) {
+                dedicatedMemory = MB_TO_BYTES(gpuIdent->getMemory());
+            }
+        }
+    });
+
+    return dedicatedMemory;
+}
+
+
+
+
+ComparisonFunction comparisonFuncFromGL(GLenum func) {
+    if (func == GL_NEVER) {
+        return NEVER;
+    } else if (func == GL_LESS) {
+        return LESS;
+    } else if (func == GL_EQUAL) {
+        return EQUAL;
+    } else if (func == GL_LEQUAL) {
+        return LESS_EQUAL;
+    } else if (func == GL_GREATER) {
+        return GREATER;
+    } else if (func == GL_NOTEQUAL) {
+        return NOT_EQUAL;
+    } else if (func == GL_GEQUAL) {
+        return GREATER_EQUAL;
+    } else if (func == GL_ALWAYS) {
+        return ALWAYS;
+    }
+
+    return ALWAYS;
+}
+
+State::StencilOp stencilOpFromGL(GLenum stencilOp) {
+    if (stencilOp == GL_KEEP) {
+        return State::STENCIL_OP_KEEP;
+    } else if (stencilOp == GL_ZERO) {
+        return State::STENCIL_OP_ZERO;
+    } else if (stencilOp == GL_REPLACE) {
+        return State::STENCIL_OP_REPLACE;
+    } else if (stencilOp == GL_INCR_WRAP) {
+        return State::STENCIL_OP_INCR_SAT;
+    } else if (stencilOp == GL_DECR_WRAP) {
+        return State::STENCIL_OP_DECR_SAT;
+    } else if (stencilOp == GL_INVERT) {
+        return State::STENCIL_OP_INVERT;
+    } else if (stencilOp == GL_INCR) {
+        return State::STENCIL_OP_INCR;
+    } else if (stencilOp == GL_DECR) {
+        return State::STENCIL_OP_DECR;
+    }
+
+    return State::STENCIL_OP_KEEP;
+}
+
+State::BlendOp blendOpFromGL(GLenum blendOp) {
+    if (blendOp == GL_FUNC_ADD) {
+        return State::BLEND_OP_ADD;
+    } else if (blendOp == GL_FUNC_SUBTRACT) {
+        return State::BLEND_OP_SUBTRACT;
+    } else if (blendOp == GL_FUNC_REVERSE_SUBTRACT) {
+        return State::BLEND_OP_REV_SUBTRACT;
+    } else if (blendOp == GL_MIN) {
+        return State::BLEND_OP_MIN;
+    } else if (blendOp == GL_MAX) {
+        return State::BLEND_OP_MAX;
+    }
+
+    return State::BLEND_OP_ADD;
+}
+
+State::BlendArg blendArgFromGL(GLenum blendArg) {
+    if (blendArg == GL_ZERO) {
+        return State::ZERO;
+    } else if (blendArg == GL_ONE) {
+        return State::ONE;
+    } else if (blendArg == GL_SRC_COLOR) {
+        return State::SRC_COLOR;
+    } else if (blendArg == GL_ONE_MINUS_SRC_COLOR) {
+        return State::INV_SRC_COLOR;
+    } else if (blendArg == GL_DST_COLOR) {
+        return State::DEST_COLOR;
+    } else if (blendArg == GL_ONE_MINUS_DST_COLOR) {
+        return State::INV_DEST_COLOR;
+    } else if (blendArg == GL_SRC_ALPHA) {
+        return State::SRC_ALPHA;
+    } else if (blendArg == GL_ONE_MINUS_SRC_ALPHA) {
+        return State::INV_SRC_ALPHA;
+    } else if (blendArg == GL_DST_ALPHA) {
+        return State::DEST_ALPHA;
+    } else if (blendArg == GL_ONE_MINUS_DST_ALPHA) {
+        return State::INV_DEST_ALPHA;
+    } else if (blendArg == GL_CONSTANT_COLOR) {
+        return State::FACTOR_COLOR;
+    } else if (blendArg == GL_ONE_MINUS_CONSTANT_COLOR) {
+        return State::INV_FACTOR_COLOR;
+    } else if (blendArg == GL_CONSTANT_ALPHA) {
+        return State::FACTOR_ALPHA;
+    } else if (blendArg == GL_ONE_MINUS_CONSTANT_ALPHA) {
+        return State::INV_FACTOR_ALPHA;
+    }
+
+    return State::ONE;
+}
+
+void getCurrentGLState(State::Data& state) {
+    {
+        GLint modes[2];
+        //glGetIntegerv(GL_POLYGON_MODE, modes);
+        qDebug() << "TODO: GLShared.cpp:getCurrentGLState GL_POLYGON_MODE";
+        qDebug() << "TODO: GLShared.cpp:getCurrentGLState GL_FILL";
+        qDebug() << "TODO: GLShared.cpp:getCurrentGLState GL_LINE";
+
+        if (modes[0] == 0 /*GL_FILL*/) {
+            state.fillMode = State::FILL_FACE;
+        } else {
+            if (modes[0] == 0 /*GL_LINE*/) {
+                state.fillMode = State::FILL_LINE;
+            } else {
+                state.fillMode = State::FILL_POINT;
+            }
+        }
+    }
+    {
+        if (glIsEnabled(GL_CULL_FACE)) {
+            GLint mode;
+            glGetIntegerv(GL_CULL_FACE_MODE, &mode);
+            state.cullMode = (mode == GL_FRONT ? State::CULL_FRONT : State::CULL_BACK);
+        } else {
+            state.cullMode = State::CULL_NONE;
+        }
+    }
+    {
+        GLint winding;
+        glGetIntegerv(GL_FRONT_FACE, &winding);
+        state.frontFaceClockwise = (winding == GL_CW);
+        //state.depthClampEnable = glIsEnabled(GL_DEPTH_CLAMP);
+        qDebug() << "TODO: GLShared.cpp.cpp:getCurrentGLState GL_DEPTH_CLAMP";
+        state.scissorEnable = glIsEnabled(GL_SCISSOR_TEST);
+        //state.multisampleEnable = glIsEnabled(GL_MULTISAMPLE);
+        qDebug() << "TODO: GLShared.cpp.cpp:getCurrentGLState GL_MULTISAMPLE";
+
+        //state.antialisedLineEnable = glIsEnabled(GL_LINE_SMOOTH);
+        qDebug() << "TODO: GLShared.cpp.cpp:getCurrentGLState GL_LINE_SMOOTH";
+
+    }
+    {
+        if (glIsEnabled(GL_POLYGON_OFFSET_FILL)) {
+            glGetFloatv(GL_POLYGON_OFFSET_FACTOR, &state.depthBiasSlopeScale);
+            glGetFloatv(GL_POLYGON_OFFSET_UNITS, &state.depthBias);
+        }
+    }
+    {
+        GLboolean isEnabled = glIsEnabled(GL_DEPTH_TEST);
+        GLboolean writeMask;
+        glGetBooleanv(GL_DEPTH_WRITEMASK, &writeMask);
+        GLint func;
+        glGetIntegerv(GL_DEPTH_FUNC, &func);
+
+        state.depthTest = State::DepthTest(isEnabled, writeMask, comparisonFuncFromGL(func));
+    }
+    {
+        GLboolean isEnabled = glIsEnabled(GL_STENCIL_TEST);
+
+        GLint frontWriteMask;
+        GLint frontReadMask;
+        GLint frontRef;
+        GLint frontFail;
+        GLint frontDepthFail;
+        GLint frontPass;
+        GLint frontFunc;
+        glGetIntegerv(GL_STENCIL_WRITEMASK, &frontWriteMask);
+        glGetIntegerv(GL_STENCIL_VALUE_MASK, &frontReadMask);
+        glGetIntegerv(GL_STENCIL_REF, &frontRef);
+        glGetIntegerv(GL_STENCIL_FAIL, &frontFail);
+        glGetIntegerv(GL_STENCIL_PASS_DEPTH_FAIL, &frontDepthFail);
+        glGetIntegerv(GL_STENCIL_PASS_DEPTH_PASS, &frontPass);
+        glGetIntegerv(GL_STENCIL_FUNC, &frontFunc);
+
+        GLint backWriteMask;
+        GLint backReadMask;
+        GLint backRef;
+        GLint backFail;
+        GLint backDepthFail;
+        GLint backPass;
+        GLint backFunc;
+        glGetIntegerv(GL_STENCIL_BACK_WRITEMASK, &backWriteMask);
+        glGetIntegerv(GL_STENCIL_BACK_VALUE_MASK, &backReadMask);
+        glGetIntegerv(GL_STENCIL_BACK_REF, &backRef);
+        glGetIntegerv(GL_STENCIL_BACK_FAIL, &backFail);
+        glGetIntegerv(GL_STENCIL_BACK_PASS_DEPTH_FAIL, &backDepthFail);
+        glGetIntegerv(GL_STENCIL_BACK_PASS_DEPTH_PASS, &backPass);
+        glGetIntegerv(GL_STENCIL_BACK_FUNC, &backFunc);
+
+        state.stencilActivation = State::StencilActivation(isEnabled, frontWriteMask, backWriteMask);
+        state.stencilTestFront = State::StencilTest(frontRef, frontReadMask, comparisonFuncFromGL(frontFunc), stencilOpFromGL(frontFail), stencilOpFromGL(frontDepthFail), stencilOpFromGL(frontPass));
+        state.stencilTestBack = State::StencilTest(backRef, backReadMask, comparisonFuncFromGL(backFunc), stencilOpFromGL(backFail), stencilOpFromGL(backDepthFail), stencilOpFromGL(backPass));
+    }
+    {
+        GLint mask = 0xFFFFFFFF;
+        if (glIsEnabled(GL_SAMPLE_MASK)) {
+            glGetIntegerv(GL_SAMPLE_MASK, &mask);
+            state.sampleMask = mask;
+        }
+        state.sampleMask = mask;
+    }
+    {
+        state.alphaToCoverageEnable = glIsEnabled(GL_SAMPLE_ALPHA_TO_COVERAGE);
+    }
+    {
+        GLboolean isEnabled = glIsEnabled(GL_BLEND);
+        GLint srcRGB;
+        GLint srcA;
+        GLint dstRGB;
+        GLint dstA;
+        glGetIntegerv(GL_BLEND_SRC_RGB, &srcRGB);
+        glGetIntegerv(GL_BLEND_SRC_ALPHA, &srcA);
+        glGetIntegerv(GL_BLEND_DST_RGB, &dstRGB);
+        glGetIntegerv(GL_BLEND_DST_ALPHA, &dstA);
+
+        GLint opRGB;
+        GLint opA;
+        glGetIntegerv(GL_BLEND_EQUATION_RGB, &opRGB);
+        glGetIntegerv(GL_BLEND_EQUATION_ALPHA, &opA);
+
+        state.blendFunction = State::BlendFunction(isEnabled,
+            blendArgFromGL(srcRGB), blendOpFromGL(opRGB), blendArgFromGL(dstRGB),
+            blendArgFromGL(srcA), blendOpFromGL(opA), blendArgFromGL(dstA));
+    }
+    {
+        GLboolean mask[4];
+        glGetBooleanv(GL_COLOR_WRITEMASK, mask);
+        state.colorWriteMask = (mask[0] ? State::WRITE_RED : 0)
+            | (mask[1] ? State::WRITE_GREEN : 0)
+            | (mask[2] ? State::WRITE_BLUE : 0)
+            | (mask[3] ? State::WRITE_ALPHA : 0);
+    }
+
+    (void)CHECK_GL_ERROR();
+}
+
+
+class ElementResource {
+public:
+    gpu::Element _element;
+    uint16 _resource;
+
+    ElementResource(Element&& elem, uint16 resource) : _element(elem), _resource(resource) {}
+};
+
+ElementResource getFormatFromGLUniform(GLenum gltype) {
+    switch (gltype) {
+    case GL_FLOAT: return ElementResource(Element(SCALAR, gpu::FLOAT, UNIFORM), Resource::BUFFER);
+    case GL_FLOAT_VEC2: return ElementResource(Element(VEC2, gpu::FLOAT, UNIFORM), Resource::BUFFER);
+    case GL_FLOAT_VEC3: return ElementResource(Element(VEC3, gpu::FLOAT, UNIFORM), Resource::BUFFER);
+    case GL_FLOAT_VEC4: return ElementResource(Element(VEC4, gpu::FLOAT, UNIFORM), Resource::BUFFER);
+        /*
+        case GL_DOUBLE: return ElementResource(Element(SCALAR, gpu::FLOAT, UNIFORM), Resource::BUFFER);
+        case GL_DOUBLE_VEC2: return ElementResource(Element(VEC2, gpu::FLOAT, UNIFORM), Resource::BUFFER);
+        case GL_DOUBLE_VEC3: return ElementResource(Element(VEC3, gpu::FLOAT, UNIFORM), Resource::BUFFER);
+        case GL_DOUBLE_VEC4: return ElementResource(Element(VEC4, gpu::FLOAT, UNIFORM), Resource::BUFFER);
+        */
+    case GL_INT: return ElementResource(Element(SCALAR, gpu::INT32, UNIFORM), Resource::BUFFER);
+    case GL_INT_VEC2: return ElementResource(Element(VEC2, gpu::INT32, UNIFORM), Resource::BUFFER);
+    case GL_INT_VEC3: return ElementResource(Element(VEC3, gpu::INT32, UNIFORM), Resource::BUFFER);
+    case GL_INT_VEC4: return ElementResource(Element(VEC4, gpu::INT32, UNIFORM), Resource::BUFFER);
+
+    case GL_UNSIGNED_INT: return ElementResource(Element(SCALAR, gpu::UINT32, UNIFORM), Resource::BUFFER);
+#if defined(Q_OS_WIN)
+    case GL_UNSIGNED_INT_VEC2: return ElementResource(Element(VEC2, gpu::UINT32, UNIFORM), Resource::BUFFER);
+    case GL_UNSIGNED_INT_VEC3: return ElementResource(Element(VEC3, gpu::UINT32, UNIFORM), Resource::BUFFER);
+    case GL_UNSIGNED_INT_VEC4: return ElementResource(Element(VEC4, gpu::UINT32, UNIFORM), Resource::BUFFER);
+#endif
+
+    case GL_BOOL: return ElementResource(Element(SCALAR, gpu::BOOL, UNIFORM), Resource::BUFFER);
+    case GL_BOOL_VEC2: return ElementResource(Element(VEC2, gpu::BOOL, UNIFORM), Resource::BUFFER);
+    case GL_BOOL_VEC3: return ElementResource(Element(VEC3, gpu::BOOL, UNIFORM), Resource::BUFFER);
+    case GL_BOOL_VEC4: return ElementResource(Element(VEC4, gpu::BOOL, UNIFORM), Resource::BUFFER);
+
+
+    case GL_FLOAT_MAT2: return ElementResource(Element(gpu::MAT2, gpu::FLOAT, UNIFORM), Resource::BUFFER);
+    case GL_FLOAT_MAT3: return ElementResource(Element(MAT3, gpu::FLOAT, UNIFORM), Resource::BUFFER);
+    case GL_FLOAT_MAT4: return ElementResource(Element(MAT4, gpu::FLOAT, UNIFORM), Resource::BUFFER);
+
+        /*    {GL_FLOAT_MAT2x3    mat2x3},
+        {GL_FLOAT_MAT2x4    mat2x4},
+        {GL_FLOAT_MAT3x2    mat3x2},
+        {GL_FLOAT_MAT3x4    mat3x4},
+        {GL_FLOAT_MAT4x2    mat4x2},
+        {GL_FLOAT_MAT4x3    mat4x3},
+        {GL_DOUBLE_MAT2    dmat2},
+        {GL_DOUBLE_MAT3    dmat3},
+        {GL_DOUBLE_MAT4    dmat4},
+        {GL_DOUBLE_MAT2x3    dmat2x3},
+        {GL_DOUBLE_MAT2x4    dmat2x4},
+        {GL_DOUBLE_MAT3x2    dmat3x2},
+        {GL_DOUBLE_MAT3x4    dmat3x4},
+        {GL_DOUBLE_MAT4x2    dmat4x2},
+        {GL_DOUBLE_MAT4x3    dmat4x3},
+        */
+
+        //qDebug() << "TODO: GLShared.cpp.cpp:ElementResource GL_SAMPLER_1D";
+    //case GL_SAMPLER_1D: return ElementResource(Element(SCALAR, gpu::FLOAT, SAMPLER), Resource::TEXTURE_1D);
+    case GL_SAMPLER_2D: return ElementResource(Element(SCALAR, gpu::FLOAT, SAMPLER), Resource::TEXTURE_2D);
+
+    case GL_SAMPLER_3D: return ElementResource(Element(SCALAR, gpu::FLOAT, SAMPLER), Resource::TEXTURE_3D);
+    case GL_SAMPLER_CUBE: return ElementResource(Element(SCALAR, gpu::FLOAT, SAMPLER), Resource::TEXTURE_CUBE);
+
+#if defined(Q_OS_WIN)
+    case GL_SAMPLER_2D_MULTISAMPLE: return ElementResource(Element(SCALAR, gpu::FLOAT, SAMPLER_MULTISAMPLE), Resource::TEXTURE_2D);
+    case GL_SAMPLER_1D_ARRAY: return ElementResource(Element(SCALAR, gpu::FLOAT, SAMPLER), Resource::TEXTURE_1D_ARRAY);
+    case GL_SAMPLER_2D_ARRAY: return ElementResource(Element(SCALAR, gpu::FLOAT, SAMPLER), Resource::TEXTURE_2D_ARRAY);
+    case GL_SAMPLER_2D_MULTISAMPLE_ARRAY: return ElementResource(Element(SCALAR, gpu::FLOAT, SAMPLER_MULTISAMPLE), Resource::TEXTURE_2D_ARRAY);
+#endif
+
+    case GL_SAMPLER_2D_SHADOW: return ElementResource(Element(SCALAR, gpu::FLOAT, SAMPLER_SHADOW), Resource::TEXTURE_2D);
+#if defined(Q_OS_WIN)
+    case GL_SAMPLER_CUBE_SHADOW: return ElementResource(Element(SCALAR, gpu::FLOAT, SAMPLER_SHADOW), Resource::TEXTURE_CUBE);
+
+    case GL_SAMPLER_2D_ARRAY_SHADOW: return ElementResource(Element(SCALAR, gpu::FLOAT, SAMPLER_SHADOW), Resource::TEXTURE_2D_ARRAY);
+#endif
+
+        //    {GL_SAMPLER_1D_SHADOW    sampler1DShadow},
+        //   {GL_SAMPLER_1D_ARRAY_SHADOW    sampler1DArrayShadow},
+
+        //    {GL_SAMPLER_BUFFER    samplerBuffer},
+        //    {GL_SAMPLER_2D_RECT    sampler2DRect},
+        //   {GL_SAMPLER_2D_RECT_SHADOW    sampler2DRectShadow},
+
+#if defined(Q_OS_WIN)
+    case GL_INT_SAMPLER_1D: return ElementResource(Element(SCALAR, gpu::INT32, SAMPLER), Resource::TEXTURE_1D);
+    case GL_INT_SAMPLER_2D: return ElementResource(Element(SCALAR, gpu::INT32, SAMPLER), Resource::TEXTURE_2D);
+    case GL_INT_SAMPLER_2D_MULTISAMPLE: return ElementResource(Element(SCALAR, gpu::INT32, SAMPLER_MULTISAMPLE), Resource::TEXTURE_2D);
+    case GL_INT_SAMPLER_3D: return ElementResource(Element(SCALAR, gpu::INT32, SAMPLER), Resource::TEXTURE_3D);
+    case GL_INT_SAMPLER_CUBE: return ElementResource(Element(SCALAR, gpu::INT32, SAMPLER), Resource::TEXTURE_CUBE);
+
+    case GL_INT_SAMPLER_1D_ARRAY: return ElementResource(Element(SCALAR, gpu::INT32, SAMPLER), Resource::TEXTURE_1D_ARRAY);
+    case GL_INT_SAMPLER_2D_ARRAY: return ElementResource(Element(SCALAR, gpu::INT32, SAMPLER), Resource::TEXTURE_2D_ARRAY);
+    case GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY: return ElementResource(Element(SCALAR, gpu::INT32, SAMPLER_MULTISAMPLE), Resource::TEXTURE_2D_ARRAY);
+
+        //   {GL_INT_SAMPLER_BUFFER    isamplerBuffer},
+        //   {GL_INT_SAMPLER_2D_RECT    isampler2DRect},
+
+    case GL_UNSIGNED_INT_SAMPLER_1D: return ElementResource(Element(SCALAR, gpu::UINT32, SAMPLER), Resource::TEXTURE_1D);
+    case GL_UNSIGNED_INT_SAMPLER_2D: return ElementResource(Element(SCALAR, gpu::UINT32, SAMPLER), Resource::TEXTURE_2D);
+    case GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE: return ElementResource(Element(SCALAR, gpu::UINT32, SAMPLER_MULTISAMPLE), Resource::TEXTURE_2D);
+    case GL_UNSIGNED_INT_SAMPLER_3D: return ElementResource(Element(SCALAR, gpu::UINT32, SAMPLER), Resource::TEXTURE_3D);
+    case GL_UNSIGNED_INT_SAMPLER_CUBE: return ElementResource(Element(SCALAR, gpu::UINT32, SAMPLER), Resource::TEXTURE_CUBE);
+
+    case GL_UNSIGNED_INT_SAMPLER_1D_ARRAY: return ElementResource(Element(SCALAR, gpu::UINT32, SAMPLER), Resource::TEXTURE_1D_ARRAY);
+    case GL_UNSIGNED_INT_SAMPLER_2D_ARRAY: return ElementResource(Element(SCALAR, gpu::UINT32, SAMPLER), Resource::TEXTURE_2D_ARRAY);
+    case GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY: return ElementResource(Element(SCALAR, gpu::UINT32, SAMPLER_MULTISAMPLE), Resource::TEXTURE_2D_ARRAY);
+#endif
+        //    {GL_UNSIGNED_INT_SAMPLER_BUFFER    usamplerBuffer},
+        //    {GL_UNSIGNED_INT_SAMPLER_2D_RECT    usampler2DRect},
+        /*
+        {GL_IMAGE_1D    image1D},
+        {GL_IMAGE_2D    image2D},
+        {GL_IMAGE_3D    image3D},
+        {GL_IMAGE_2D_RECT    image2DRect},
+        {GL_IMAGE_CUBE    imageCube},
+        {GL_IMAGE_BUFFER    imageBuffer},
+        {GL_IMAGE_1D_ARRAY    image1DArray},
+        {GL_IMAGE_2D_ARRAY    image2DArray},
+        {GL_IMAGE_2D_MULTISAMPLE    image2DMS},
+        {GL_IMAGE_2D_MULTISAMPLE_ARRAY    image2DMSArray},
+        {GL_INT_IMAGE_1D    iimage1D},
+        {GL_INT_IMAGE_2D    iimage2D},
+        {GL_INT_IMAGE_3D    iimage3D},
+        {GL_INT_IMAGE_2D_RECT    iimage2DRect},
+        {GL_INT_IMAGE_CUBE    iimageCube},
+        {GL_INT_IMAGE_BUFFER    iimageBuffer},
+        {GL_INT_IMAGE_1D_ARRAY    iimage1DArray},
+        {GL_INT_IMAGE_2D_ARRAY    iimage2DArray},
+        {GL_INT_IMAGE_2D_MULTISAMPLE    iimage2DMS},
+        {GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY    iimage2DMSArray},
+        {GL_UNSIGNED_INT_IMAGE_1D    uimage1D},
+        {GL_UNSIGNED_INT_IMAGE_2D    uimage2D},
+        {GL_UNSIGNED_INT_IMAGE_3D    uimage3D},
+        {GL_UNSIGNED_INT_IMAGE_2D_RECT    uimage2DRect},
+        {GL_UNSIGNED_INT_IMAGE_CUBE    uimageCube},+        [0]    {_name="fInnerRadius" _location=0 _element={_semantic=15 '\xf' _dimension=0 '\0' _type=0 '\0' } }    gpu::Shader::Slot
+
+        {GL_UNSIGNED_INT_IMAGE_BUFFER    uimageBuffer},
+        {GL_UNSIGNED_INT_IMAGE_1D_ARRAY    uimage1DArray},
+        {GL_UNSIGNED_INT_IMAGE_2D_ARRAY    uimage2DArray},
+        {GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE    uimage2DMS},
+        {GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY    uimage2DMSArray},
+        {GL_UNSIGNED_INT_ATOMIC_COUNTER    atomic_uint}
+        */
+    default:
+        return ElementResource(Element(), Resource::BUFFER);
+    }
+
+};
+
+int makeUniformSlots(GLuint glprogram, const Shader::BindingSet& slotBindings,
+    Shader::SlotSet& uniforms, Shader::SlotSet& textures, Shader::SlotSet& samplers) {
+    GLint uniformsCount = 0;
+
+    glGetProgramiv(glprogram, GL_ACTIVE_UNIFORMS, &uniformsCount);
+
+    for (int i = 0; i < uniformsCount; i++) {
+        const GLint NAME_LENGTH = 256;
+        GLchar name[NAME_LENGTH];
+        GLint length = 0;
+        GLint size = 0;
+        GLenum type = 0;
+        glGetActiveUniform(glprogram, i, NAME_LENGTH, &length, &size, &type, name);
+        GLint location = glGetUniformLocation(glprogram, name);
+        const GLint INVALID_UNIFORM_LOCATION = -1;
+
+        // Try to make sense of the gltype
+        auto elementResource = getFormatFromGLUniform(type);
+
+        // The uniform as a standard var type
+        if (location != INVALID_UNIFORM_LOCATION) {
+            // Let's make sure the name doesn't contains an array element
+            std::string sname(name);
+            auto foundBracket = sname.find_first_of('[');
+            if (foundBracket != std::string::npos) {
+                //  std::string arrayname = sname.substr(0, foundBracket);
+
+                if (sname[foundBracket + 1] == '0') {
+                    sname = sname.substr(0, foundBracket);
+                } else {
+                    // skip this uniform since it's not the first element of an array
+                    continue;
+                }
+            }
+
+            if (elementResource._resource == Resource::BUFFER) {
+                uniforms.insert(Shader::Slot(sname, location, elementResource._element, elementResource._resource));
+            } else {
+                // For texture/Sampler, the location is the actual binding value
+                GLint binding = -1;
+                glGetUniformiv(glprogram, location, &binding);
+
+                auto requestedBinding = slotBindings.find(std::string(sname));
+                if (requestedBinding != slotBindings.end()) {
+                    if (binding != (*requestedBinding)._location) {
+                        binding = (*requestedBinding)._location;
+                        glProgramUniform1i(glprogram, location, binding);
+                    }
+                }
+
+                textures.insert(Shader::Slot(name, binding, elementResource._element, elementResource._resource));
+                samplers.insert(Shader::Slot(name, binding, elementResource._element, elementResource._resource));
+            }
+        }
+    }
+
+    return uniformsCount;
+}
+
+const GLint UNUSED_SLOT = -1;
+bool isUnusedSlot(GLint binding) {
+    return (binding == UNUSED_SLOT);
+}
+
+int makeUniformBlockSlots(GLuint glprogram, const Shader::BindingSet& slotBindings, Shader::SlotSet& buffers) {
+    GLint buffersCount = 0;
+
+    glGetProgramiv(glprogram, GL_ACTIVE_UNIFORM_BLOCKS, &buffersCount);
+
+    // fast exit
+    if (buffersCount == 0) {
+        return 0;
+    }
+
+    GLint maxNumUniformBufferSlots = 0;
+    glGetIntegerv(GL_MAX_UNIFORM_BUFFER_BINDINGS, &maxNumUniformBufferSlots);
+    std::vector<GLint> uniformBufferSlotMap(maxNumUniformBufferSlots, -1);
+
+    struct UniformBlockInfo {
+        using Vector = std::vector<UniformBlockInfo>;
+        const GLuint index{ 0 };
+        const std::string name;
+        GLint binding{ -1 };
+        GLint size{ 0 };
+
+        static std::string getName(GLuint glprogram, GLuint i) {
+            static const GLint NAME_LENGTH = 256;
+            GLint length = 0;
+            GLchar nameBuffer[NAME_LENGTH];
+            glGetActiveUniformBlockiv(glprogram, i, GL_UNIFORM_BLOCK_NAME_LENGTH, &length);
+            glGetActiveUniformBlockName(glprogram, i, NAME_LENGTH, &length, nameBuffer);
+            return std::string(nameBuffer);
+        }
+
+        UniformBlockInfo(GLuint glprogram, GLuint i) : index(i), name(getName(glprogram, i)) {
+            glGetActiveUniformBlockiv(glprogram, index, GL_UNIFORM_BLOCK_BINDING, &binding);
+            glGetActiveUniformBlockiv(glprogram, index, GL_UNIFORM_BLOCK_DATA_SIZE, &size);
+        }
+    };
+
+    UniformBlockInfo::Vector uniformBlocks;
+    uniformBlocks.reserve(buffersCount);
+    for (int i = 0; i < buffersCount; i++) {
+        uniformBlocks.push_back(UniformBlockInfo(glprogram, i));
+    }
+
+    for (auto& info : uniformBlocks) {
+        auto requestedBinding = slotBindings.find(info.name);
+        if (requestedBinding != slotBindings.end()) {
+            info.binding = (*requestedBinding)._location;
+            glUniformBlockBinding(glprogram, info.index, info.binding);
+            uniformBufferSlotMap[info.binding] = info.index;
+        }
+    }
+
+    for (auto& info : uniformBlocks) {
+        if (slotBindings.count(info.name)) {
+            continue;
+        }
+
+        // If the binding is 0, or the binding maps to an already used binding
+        if (info.binding == 0 || uniformBufferSlotMap[info.binding] != UNUSED_SLOT) {
+            // If no binding was assigned then just do it finding a free slot
+            auto slotIt = std::find_if(uniformBufferSlotMap.begin(), uniformBufferSlotMap.end(), isUnusedSlot);
+            if (slotIt != uniformBufferSlotMap.end()) {
+                info.binding = slotIt - uniformBufferSlotMap.begin();
+                glUniformBlockBinding(glprogram, info.index, info.binding);
+            } else {
+                // This should neve happen, an active ubo cannot find an available slot among the max available?!
+                info.binding = -1;
+            }
+        }
+
+        uniformBufferSlotMap[info.binding] = info.index;
+    }
+
+    for (auto& info : uniformBlocks) {
+        static const Element element(SCALAR, gpu::UINT32, gpu::UNIFORM_BUFFER);
+        buffers.insert(Shader::Slot(info.name, info.binding, element, Resource::BUFFER, info.size));
+    }
+    return buffersCount;
+}
+//CLIMAX_MERGE_START
+//This has been copied over from gl45backendshader.cpp
+int makeResourceBufferSlots(GLuint glprogram, const Shader::BindingSet& slotBindings,Shader::SlotSet& resourceBuffers) {
+    GLint buffersCount = 0;
+    glGetProgramInterfaceiv(glprogram, GL_SHADER_STORAGE_BLOCK, GL_ACTIVE_RESOURCES, &buffersCount);
+
+    // fast exit
+    if (buffersCount == 0) {
+        return 0;
+    }
+
+    GLint maxNumResourceBufferSlots = 0;
+    glGetIntegerv(GL_MAX_SHADER_STORAGE_BUFFER_BINDINGS, &maxNumResourceBufferSlots);
+    std::vector<GLint> resourceBufferSlotMap(maxNumResourceBufferSlots, -1);
+
+    struct ResourceBlockInfo {
+        using Vector = std::vector<ResourceBlockInfo>;
+        const GLuint index{ 0 };
+        const std::string name;
+        GLint binding{ -1 };
+        GLint size{ 0 };
+
+        static std::string getName(GLuint glprogram, GLuint i) {
+            static const GLint NAME_LENGTH = 256;
+            GLint length = 0;
+            GLchar nameBuffer[NAME_LENGTH];
+            glGetProgramResourceName(glprogram, GL_SHADER_STORAGE_BLOCK, i, NAME_LENGTH, &length, nameBuffer);
+            return std::string(nameBuffer);
+        }
+
+        ResourceBlockInfo(GLuint glprogram, GLuint i) : index(i), name(getName(glprogram, i)) {
+            GLenum props[2] = { GL_BUFFER_BINDING, GL_BUFFER_DATA_SIZE};
+            glGetProgramResourceiv(glprogram, GL_SHADER_STORAGE_BLOCK, i, 2, props, 2, nullptr, &binding); 
+        }
+    };
+
+    ResourceBlockInfo::Vector resourceBlocks;
+    resourceBlocks.reserve(buffersCount);
+    for (int i = 0; i < buffersCount; i++) {
+        resourceBlocks.push_back(ResourceBlockInfo(glprogram, i));
+    }
+
+    for (auto& info : resourceBlocks) {
+        auto requestedBinding = slotBindings.find(info.name);
+        if (requestedBinding != slotBindings.end()) {
+            info.binding = (*requestedBinding)._location;
+            glUniformBlockBinding(glprogram, info.index, info.binding);
+            resourceBufferSlotMap[info.binding] = info.index;
+        }
+    }
+
+    for (auto& info : resourceBlocks) {
+        if (slotBindings.count(info.name)) {
+            continue;
+        }
+
+        // If the binding is -1, or the binding maps to an already used binding
+        if (info.binding == -1 || !isUnusedSlot(resourceBufferSlotMap[info.binding])) {
+            // If no binding was assigned then just do it finding a free slot
+            auto slotIt = std::find_if(resourceBufferSlotMap.begin(), resourceBufferSlotMap.end(), isUnusedSlot);
+            if (slotIt != resourceBufferSlotMap.end()) {
+                info.binding = slotIt - resourceBufferSlotMap.begin();
+                glUniformBlockBinding(glprogram, info.index, info.binding);
+            } else {
+                // This should never happen, an active ssbo cannot find an available slot among the max available?!
+                info.binding = -1;
+            }
+        }
+
+        resourceBufferSlotMap[info.binding] = info.index;
+    }
+
+    for (auto& info : resourceBlocks) {
+        static const Element element(SCALAR, gpu::UINT32, gpu::RESOURCE_BUFFER);
+        resourceBuffers.insert(Shader::Slot(info.name, info.binding, element, Resource::BUFFER, info.size));
+    }
+    return buffersCount;
+}
+//CLIMAX_MERGE_END
+
+int makeInputSlots(GLuint glprogram, const Shader::BindingSet& slotBindings, Shader::SlotSet& inputs) {
+    GLint inputsCount = 0;
+
+    glGetProgramiv(glprogram, GL_ACTIVE_ATTRIBUTES, &inputsCount);
+
+    for (int i = 0; i < inputsCount; i++) {
+        const GLint NAME_LENGTH = 256;
+        GLchar name[NAME_LENGTH];
+        GLint length = 0;
+        GLint size = 0;
+        GLenum type = 0;
+        glGetActiveAttrib(glprogram, i, NAME_LENGTH, &length, &size, &type, name);
+
+        GLint binding = glGetAttribLocation(glprogram, name);
+
+        auto elementResource = getFormatFromGLUniform(type);
+        inputs.insert(Shader::Slot(name, binding, elementResource._element, -1));
+    }
+
+    return inputsCount;
+}
+
+int makeOutputSlots(GLuint glprogram, const Shader::BindingSet& slotBindings, Shader::SlotSet& outputs) {
+    /*   GLint outputsCount = 0;
+
+    glGetProgramiv(glprogram, GL_ACTIVE_, &outputsCount);
+
+    for (int i = 0; i < inputsCount; i++) {
+    const GLint NAME_LENGTH = 256;
+    GLchar name[NAME_LENGTH];
+    GLint length = 0;
+    GLint size = 0;
+    GLenum type = 0;
+    glGetActiveAttrib(glprogram, i, NAME_LENGTH, &length, &size, &type, name);
+
+    auto element = getFormatFromGLUniform(type);
+    outputs.insert(Shader::Slot(name, i, element));
+    }
+    */
+    return 0; //inputsCount;
+}
+
+void makeProgramBindings(ShaderObject& shaderObject) {
+    if (!shaderObject.glprogram) {
+        return;
+    }
+    GLuint glprogram = shaderObject.glprogram;
+    GLint loc = -1;
+
+    //Check for gpu specific attribute slotBindings
+    loc = glGetAttribLocation(glprogram, "inPosition");
+    if (loc >= 0 && loc != gpu::Stream::POSITION) {
+        glBindAttribLocation(glprogram, gpu::Stream::POSITION, "inPosition");
+    }
+
+    loc = glGetAttribLocation(glprogram, "inNormal");
+    if (loc >= 0 && loc != gpu::Stream::NORMAL) {
+        glBindAttribLocation(glprogram, gpu::Stream::NORMAL, "inNormal");
+    }
+
+    loc = glGetAttribLocation(glprogram, "inColor");
+    if (loc >= 0 && loc != gpu::Stream::COLOR) {
+        glBindAttribLocation(glprogram, gpu::Stream::COLOR, "inColor");
+    }
+
+    loc = glGetAttribLocation(glprogram, "inTexCoord0");
+    if (loc >= 0 && loc != gpu::Stream::TEXCOORD) {
+        glBindAttribLocation(glprogram, gpu::Stream::TEXCOORD, "inTexCoord0");
+    }
+
+    loc = glGetAttribLocation(glprogram, "inTangent");
+    if (loc >= 0 && loc != gpu::Stream::TANGENT) {
+        glBindAttribLocation(glprogram, gpu::Stream::TANGENT, "inTangent");
+    }
+
+    loc = glGetAttribLocation(glprogram, "inTexCoord1");
+    if (loc >= 0 && loc != gpu::Stream::TEXCOORD1) {
+        glBindAttribLocation(glprogram, gpu::Stream::TEXCOORD1, "inTexCoord1");
+    }
+
+    loc = glGetAttribLocation(glprogram, "inSkinClusterIndex");
+    if (loc >= 0 && loc != gpu::Stream::SKIN_CLUSTER_INDEX) {
+        glBindAttribLocation(glprogram, gpu::Stream::SKIN_CLUSTER_INDEX, "inSkinClusterIndex");
+    }
+
+    loc = glGetAttribLocation(glprogram, "inSkinClusterWeight");
+    if (loc >= 0 && loc != gpu::Stream::SKIN_CLUSTER_WEIGHT) {
+        glBindAttribLocation(glprogram, gpu::Stream::SKIN_CLUSTER_WEIGHT, "inSkinClusterWeight");
+    }
+
+    loc = glGetAttribLocation(glprogram, "_drawCallInfo");
+    if (loc >= 0 && loc != gpu::Stream::DRAW_CALL_INFO) {
+        glBindAttribLocation(glprogram, gpu::Stream::DRAW_CALL_INFO, "_drawCallInfo");
+    }
+
+    // Link again to take into account the assigned attrib location
+    glLinkProgram(glprogram);
+
+    GLint linked = 0;
+    glGetProgramiv(glprogram, GL_LINK_STATUS, &linked);
+    if (!linked) {
+        qCWarning(gpugllogging) << "GLShader::makeBindings - failed to link after assigning slotBindings?";
+    }
+
+    // now assign the ubo binding, then DON't relink!
+
+    //Check for gpu specific uniform slotBindings
+    loc = glGetProgramResourceIndex(glprogram, GL_SHADER_STORAGE_BLOCK, "transformObjectBuffer");
+    if (loc >= 0) {
+        // FIXME GLES
+        // glShaderStorageBlockBinding(glprogram, loc, TRANSFORM_OBJECT_SLOT);
+        shaderObject.transformObjectSlot = TRANSFORM_OBJECT_SLOT;
+    }
+
+    loc = glGetUniformBlockIndex(glprogram, "transformCameraBuffer");
+    if (loc >= 0) {
+        glUniformBlockBinding(glprogram, loc, TRANSFORM_CAMERA_SLOT);
+        shaderObject.transformCameraSlot = TRANSFORM_CAMERA_SLOT;
+    }
+
+    (void)CHECK_GL_ERROR();
+}
+
+void serverWait() {
+    auto fence = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
+    assert(fence);
+    glWaitSync(fence, 0, GL_TIMEOUT_IGNORED);
+    glDeleteSync(fence);
+}
+
+void clientWait() {
+    auto fence = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
+    assert(fence);
+    auto result = glClientWaitSync(fence, GL_SYNC_FLUSH_COMMANDS_BIT, 0);
+    while (GL_TIMEOUT_EXPIRED == result || GL_WAIT_FAILED == result) {
+        // Minimum sleep
+        QThread::usleep(1);
+        result = glClientWaitSync(fence, 0, 0);
+    }
+    glDeleteSync(fence);
+}
+
+} }
+
+
+using namespace gpu;
+
+
diff --git a/libraries/gpu-gles/src/gpu/gl/GLShared.h b/libraries/gpu-gles/src/gpu/gl/GLShared.h
new file mode 100644
index 0000000000..54209b106d
--- /dev/null
+++ b/libraries/gpu-gles/src/gpu/gl/GLShared.h
@@ -0,0 +1,167 @@
+//
+//  Created by Bradley Austin Davis on 2016/05/15
+//  Copyright 2013-2016 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_gpu_GLShared_h
+#define hifi_gpu_GLShared_h
+
+#include <gl/Config.h>
+#include <gpu/Forward.h>
+#include <gpu/Format.h>
+#include <gpu/Context.h>
+#include <QLoggingCategory>
+
+Q_DECLARE_LOGGING_CATEGORY(gpugllogging)
+Q_DECLARE_LOGGING_CATEGORY(trace_render_gpu_gl)
+
+namespace gpu { namespace gl { 
+
+    static const GLint TRANSFORM_OBJECT_SLOT  { 14 }; // SSBO binding slot
+
+// Create a fence and inject a GPU wait on the fence
+void serverWait();
+
+// Create a fence and synchronously wait on the fence
+void clientWait();
+
+gpu::Size getDedicatedMemory();
+gpu::Size getFreeDedicatedMemory();
+ComparisonFunction comparisonFuncFromGL(GLenum func);
+State::StencilOp stencilOpFromGL(GLenum stencilOp);
+State::BlendOp blendOpFromGL(GLenum blendOp);
+State::BlendArg blendArgFromGL(GLenum blendArg);
+void getCurrentGLState(State::Data& state);
+
+struct ShaderObject {
+    GLuint glshader { 0 };
+    GLuint glprogram { 0 };
+    GLint transformCameraSlot { -1 };
+    GLint transformObjectSlot { -1 };
+};
+
+int makeUniformSlots(GLuint glprogram, const Shader::BindingSet& slotBindings,
+    Shader::SlotSet& uniforms, Shader::SlotSet& textures, Shader::SlotSet& samplers);
+int makeUniformBlockSlots(GLuint glprogram, const Shader::BindingSet& slotBindings, Shader::SlotSet& buffers);
+int makeInputSlots(GLuint glprogram, const Shader::BindingSet& slotBindings, Shader::SlotSet& inputs);
+int makeOutputSlots(GLuint glprogram, const Shader::BindingSet& slotBindings, Shader::SlotSet& outputs);
+//CLIMAX_MERGE_START
+//makeResourceBufferSlots has been added to glbacked as a virtual function and is being used in gl42 and gl45 overrides.
+//Since these files dont exist in the andoid version create a stub here.
+int makeResourceBufferSlots(GLuint glprogram, const Shader::BindingSet& slotBindings, Shader::SlotSet& resourceBuffers);
+//CLIMAX_MERGE_END
+void makeProgramBindings(ShaderObject& shaderObject);
+
+enum GLSyncState {
+    // The object is currently undergoing no processing, although it's content
+    // may be out of date, or it's storage may be invalid relative to the 
+    // owning GPU object
+    Idle,
+    // The object has been queued for transfer to the GPU
+    Pending,
+    // The object has been transferred to the GPU, but is awaiting
+    // any post transfer operations that may need to occur on the 
+    // primary rendering thread
+    Transferred,
+};
+
+static const GLenum BLEND_OPS_TO_GL[State::NUM_BLEND_OPS] = {
+    GL_FUNC_ADD,
+    GL_FUNC_SUBTRACT,
+    GL_FUNC_REVERSE_SUBTRACT,
+    GL_MIN,
+    GL_MAX 
+};
+
+static const GLenum BLEND_ARGS_TO_GL[State::NUM_BLEND_ARGS] = {
+    GL_ZERO,
+    GL_ONE,
+    GL_SRC_COLOR,
+    GL_ONE_MINUS_SRC_COLOR,
+    GL_SRC_ALPHA,
+    GL_ONE_MINUS_SRC_ALPHA,
+    GL_DST_ALPHA,
+    GL_ONE_MINUS_DST_ALPHA,
+    GL_DST_COLOR,
+    GL_ONE_MINUS_DST_COLOR,
+    GL_SRC_ALPHA_SATURATE,
+    GL_CONSTANT_COLOR,
+    GL_ONE_MINUS_CONSTANT_COLOR,
+    GL_CONSTANT_ALPHA,
+    GL_ONE_MINUS_CONSTANT_ALPHA,
+};
+
+static const GLenum COMPARISON_TO_GL[gpu::NUM_COMPARISON_FUNCS] = {
+    GL_NEVER,
+    GL_LESS,
+    GL_EQUAL,
+    GL_LEQUAL,
+    GL_GREATER,
+    GL_NOTEQUAL,
+    GL_GEQUAL,
+    GL_ALWAYS 
+};
+
+static const GLenum PRIMITIVE_TO_GL[gpu::NUM_PRIMITIVES] = {
+    GL_POINTS,
+    GL_LINES,
+    GL_LINE_STRIP,
+    GL_TRIANGLES,
+    GL_TRIANGLE_STRIP,
+    GL_TRIANGLE_FAN,
+};
+
+static const GLenum ELEMENT_TYPE_TO_GL[gpu::NUM_TYPES] = {
+    GL_FLOAT,
+    GL_INT,
+    GL_UNSIGNED_INT,
+    GL_HALF_FLOAT,
+    GL_SHORT,
+    GL_UNSIGNED_SHORT,
+    GL_BYTE,
+    GL_UNSIGNED_BYTE,
+    // Normalized values
+    GL_INT,
+    GL_UNSIGNED_INT,
+    GL_SHORT,
+    GL_UNSIGNED_SHORT,
+    GL_BYTE,
+    GL_UNSIGNED_BYTE
+};
+
+bool checkGLError(const char* name = nullptr);
+bool checkGLErrorDebug(const char* name = nullptr);
+
+class GLBackend;
+
+template <typename GPUType>
+struct GLObject : public GPUObject {
+public:
+    GLObject(const std::weak_ptr<GLBackend>& backend, const GPUType& gpuObject, GLuint id) : _gpuObject(gpuObject), _id(id), _backend(backend) {}
+
+    virtual ~GLObject() { }
+
+    const GPUType& _gpuObject;
+    const GLuint _id;
+protected:
+    const std::weak_ptr<GLBackend> _backend;
+};
+
+class GlBuffer;
+class GLFramebuffer;
+class GLPipeline;
+class GLQuery;
+class GLState;
+class GLShader;
+class GLTexture;
+
+} } // namespace gpu::gl 
+
+#define CHECK_GL_ERROR() gpu::gl::checkGLErrorDebug(__FUNCTION__)
+
+#endif
+
+
+
diff --git a/libraries/gpu-gles/src/gpu/gl/GLState.cpp b/libraries/gpu-gles/src/gpu/gl/GLState.cpp
new file mode 100644
index 0000000000..b6d917b928
--- /dev/null
+++ b/libraries/gpu-gles/src/gpu/gl/GLState.cpp
@@ -0,0 +1,248 @@
+//
+//  Created by Bradley Austin Davis on 2016/05/15
+//  Copyright 2013-2016 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
+//
+
+#if defined(__GNUC__) && !defined(__clang__)
+#pragma GCC diagnostic push
+#if __GNUC__ >= 5 && __GNUC_MINOR__ >= 1
+#pragma GCC diagnostic ignored "-Wsuggest-override"
+#endif
+#endif
+
+
+#include "GLState.h"
+
+#if defined(__GNUC__) && !defined(__clang__)
+#pragma GCC diagnostic pop
+#endif
+
+
+#include "GLBackend.h"
+
+using namespace gpu;
+using namespace gpu::gl;
+
+typedef GLState::Command Command;
+typedef GLState::CommandPointer CommandPointer;
+typedef GLState::Command1<uint32> Command1U;
+typedef GLState::Command1<int32> Command1I;
+typedef GLState::Command1<bool> Command1B;
+typedef GLState::Command1<Vec2> CommandDepthBias;
+typedef GLState::Command1<State::DepthTest> CommandDepthTest;
+typedef GLState::Command3<State::StencilActivation, State::StencilTest, State::StencilTest> CommandStencil;
+typedef GLState::Command1<State::BlendFunction> CommandBlend;
+
+const GLState::Commands makeResetStateCommands();
+
+// NOTE: This must stay in sync with the ordering of the State::Field enum
+const GLState::Commands makeResetStateCommands() {
+    // Since State::DEFAULT is a static defined in another .cpp the initialisation order is random
+    // and we have a 50/50 chance that State::DEFAULT is not yet initialized.
+    // Since State::DEFAULT = State::Data() it is much easier to not use the actual State::DEFAULT
+    // but another State::Data object with a default initialization.
+    const State::Data DEFAULT = State::Data();
+
+    auto depthBiasCommand = std::make_shared<CommandDepthBias>(&GLBackend::do_setStateDepthBias,
+        Vec2(DEFAULT.depthBias, DEFAULT.depthBiasSlopeScale));
+    auto stencilCommand = std::make_shared<CommandStencil>(&GLBackend::do_setStateStencil, DEFAULT.stencilActivation,
+        DEFAULT.stencilTestFront, DEFAULT.stencilTestBack);
+
+    // The state commands to reset to default,
+    // WARNING depending on the order of the State::Field enum
+    return {
+        std::make_shared<Command1I>(&GLBackend::do_setStateFillMode, DEFAULT.fillMode),
+        std::make_shared<Command1I>(&GLBackend::do_setStateCullMode, DEFAULT.cullMode),
+        std::make_shared<Command1B>(&GLBackend::do_setStateFrontFaceClockwise, DEFAULT.frontFaceClockwise),
+        std::make_shared<Command1B>(&GLBackend::do_setStateDepthClampEnable, DEFAULT.depthClampEnable),
+        std::make_shared<Command1B>(&GLBackend::do_setStateScissorEnable, DEFAULT.scissorEnable),
+        std::make_shared<Command1B>(&GLBackend::do_setStateMultisampleEnable, DEFAULT.multisampleEnable),
+        std::make_shared<Command1B>(&GLBackend::do_setStateAntialiasedLineEnable, DEFAULT.antialisedLineEnable),
+
+        // Depth bias has 2 fields in State but really one call in GLBackend
+        CommandPointer(depthBiasCommand),
+        CommandPointer(depthBiasCommand),
+
+        std::make_shared<CommandDepthTest>(&GLBackend::do_setStateDepthTest, DEFAULT.depthTest),
+
+        // Depth bias has 3 fields in State but really one call in GLBackend
+        CommandPointer(stencilCommand),
+        CommandPointer(stencilCommand),
+        CommandPointer(stencilCommand),
+
+        std::make_shared<Command1U>(&GLBackend::do_setStateSampleMask, DEFAULT.sampleMask),
+
+        std::make_shared<Command1B>(&GLBackend::do_setStateAlphaToCoverageEnable, DEFAULT.alphaToCoverageEnable),
+
+        std::make_shared<CommandBlend>(&GLBackend::do_setStateBlend, DEFAULT.blendFunction),
+
+        std::make_shared<Command1U>(&GLBackend::do_setStateColorWriteMask, DEFAULT.colorWriteMask)
+    };
+}
+
+const GLState::Commands GLState::_resetStateCommands = makeResetStateCommands();
+
+
+void generateFillMode(GLState::Commands& commands, State::FillMode fillMode) {
+    commands.push_back(std::make_shared<Command1I>(&GLBackend::do_setStateFillMode, int32(fillMode)));
+}
+
+void generateCullMode(GLState::Commands& commands, State::CullMode cullMode) {
+    commands.push_back(std::make_shared<Command1I>(&GLBackend::do_setStateCullMode, int32(cullMode)));
+}
+
+void generateFrontFaceClockwise(GLState::Commands& commands, bool isClockwise) {
+    commands.push_back(std::make_shared<Command1B>(&GLBackend::do_setStateFrontFaceClockwise, isClockwise));
+}
+
+void generateDepthClampEnable(GLState::Commands& commands, bool enable) {
+    commands.push_back(std::make_shared<Command1B>(&GLBackend::do_setStateDepthClampEnable, enable));
+}
+
+void generateScissorEnable(GLState::Commands& commands, bool enable) {
+    commands.push_back(std::make_shared<Command1B>(&GLBackend::do_setStateScissorEnable, enable));
+}
+
+void generateMultisampleEnable(GLState::Commands& commands, bool enable) {
+    commands.push_back(std::make_shared<Command1B>(&GLBackend::do_setStateMultisampleEnable, enable));
+}
+
+void generateAntialiasedLineEnable(GLState::Commands& commands, bool enable) {
+    commands.push_back(std::make_shared<Command1B>(&GLBackend::do_setStateAntialiasedLineEnable, enable));
+}
+
+void generateDepthBias(GLState::Commands& commands, const State& state) {
+    commands.push_back(std::make_shared<CommandDepthBias>(&GLBackend::do_setStateDepthBias, Vec2(state.getDepthBias(), state.getDepthBiasSlopeScale())));
+}
+
+void generateDepthTest(GLState::Commands& commands, const State::DepthTest& test) {
+    commands.push_back(std::make_shared<CommandDepthTest>(&GLBackend::do_setStateDepthTest, int32(test.getRaw())));
+}
+
+void generateStencil(GLState::Commands& commands, const State& state) {
+    commands.push_back(std::make_shared<CommandStencil>(&GLBackend::do_setStateStencil, state.getStencilActivation(), state.getStencilTestFront(), state.getStencilTestBack()));
+}
+
+void generateAlphaToCoverageEnable(GLState::Commands& commands, bool enable) {
+    commands.push_back(std::make_shared<Command1B>(&GLBackend::do_setStateAlphaToCoverageEnable, enable));
+}
+
+void generateSampleMask(GLState::Commands& commands, uint32 mask) {
+    commands.push_back(std::make_shared<Command1U>(&GLBackend::do_setStateSampleMask, mask));
+}
+
+void generateBlend(GLState::Commands& commands, const State& state) {
+    commands.push_back(std::make_shared<CommandBlend>(&GLBackend::do_setStateBlend, state.getBlendFunction()));
+}
+
+void generateColorWriteMask(GLState::Commands& commands, uint32 mask) {
+    commands.push_back(std::make_shared<Command1U>(&GLBackend::do_setStateColorWriteMask, mask));
+}
+
+GLState* GLState::sync(const State& state) {
+    GLState* object = Backend::getGPUObject<GLState>(state);
+
+    // If GPU object already created then good
+    if (object) {
+        return object;
+    }
+
+    // Else allocate and create the GLState
+    if (!object) {
+        object = new GLState();
+        Backend::setGPUObject(state, object);
+    }
+
+    // here, we need to regenerate something so let's do it all
+    object->_commands.clear();
+    object->_stamp = state.getStamp();
+    object->_signature = state.getSignature();
+
+    bool depthBias = false;
+    bool stencilState = false;
+
+    // go thorugh the list of state fields in the State and record the corresponding gl command
+    for (int i = 0; i < State::NUM_FIELDS; i++) {
+        if (state.getSignature()[i]) {
+            switch (i) {
+            case State::FILL_MODE: {
+                generateFillMode(object->_commands, state.getFillMode());
+                break;
+            }
+            case State::CULL_MODE: {
+                generateCullMode(object->_commands, state.getCullMode());
+                break;
+            }
+            case State::DEPTH_BIAS:
+            case State::DEPTH_BIAS_SLOPE_SCALE: {
+                depthBias = true;
+                break;
+            }
+            case State::FRONT_FACE_CLOCKWISE: {
+                generateFrontFaceClockwise(object->_commands, state.isFrontFaceClockwise());
+                break;
+            }
+            case State::DEPTH_CLAMP_ENABLE: {
+                generateDepthClampEnable(object->_commands, state.isDepthClampEnable());
+                break;
+            }
+            case State::SCISSOR_ENABLE: {
+                generateScissorEnable(object->_commands, state.isScissorEnable());
+                break;
+            }
+            case State::MULTISAMPLE_ENABLE: {
+                generateMultisampleEnable(object->_commands, state.isMultisampleEnable());
+                break;
+            }
+            case State::ANTIALISED_LINE_ENABLE: {
+                generateAntialiasedLineEnable(object->_commands, state.isAntialiasedLineEnable());
+                break;
+            }
+            case State::DEPTH_TEST: {
+                generateDepthTest(object->_commands, state.getDepthTest());
+                break;
+            }
+
+            case State::STENCIL_ACTIVATION:
+            case State::STENCIL_TEST_FRONT:
+            case State::STENCIL_TEST_BACK: {
+                stencilState = true;
+                break;
+            }
+
+            case State::SAMPLE_MASK: {
+                generateSampleMask(object->_commands, state.getSampleMask());
+                break;
+            }
+            case State::ALPHA_TO_COVERAGE_ENABLE: {
+                generateAlphaToCoverageEnable(object->_commands, state.isAlphaToCoverageEnabled());
+                break;
+            }
+
+            case State::BLEND_FUNCTION: {
+                generateBlend(object->_commands, state);
+                break;
+            }
+
+            case State::COLOR_WRITE_MASK: {
+                generateColorWriteMask(object->_commands, state.getColorWriteMask());
+                break;
+            }
+            }
+        }
+    }
+
+    if (depthBias) {
+        generateDepthBias(object->_commands, state);
+    }
+
+    if (stencilState) {
+        generateStencil(object->_commands, state);
+    }
+
+    return object;
+}
+
diff --git a/libraries/gpu-gles/src/gpu/gl/GLState.h b/libraries/gpu-gles/src/gpu/gl/GLState.h
new file mode 100644
index 0000000000..82635db893
--- /dev/null
+++ b/libraries/gpu-gles/src/gpu/gl/GLState.h
@@ -0,0 +1,73 @@
+//
+//  Created by Bradley Austin Davis on 2016/05/15
+//  Copyright 2013-2016 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_gpu_gl_GLState_h
+#define hifi_gpu_gl_GLState_h
+
+#include "GLShared.h"
+
+#include <gpu/State.h>
+
+namespace gpu { namespace gl {
+    
+class GLBackend;
+class GLState : public GPUObject {
+public:
+    static GLState* sync(const State& state);
+
+    class Command {
+    public:
+        virtual void run(GLBackend* backend) = 0;
+        Command() {}
+        virtual ~Command() {};
+    };
+
+    template <class T> class Command1 : public Command {
+    public:
+        typedef void (GLBackend::*GLFunction)(T);
+        void run(GLBackend* backend) { (backend->*(_func))(_param); }
+        Command1(GLFunction func, T param) : _func(func), _param(param) {};
+        GLFunction _func;
+        T _param;
+    };
+    template <class T, class U> class Command2 : public Command {
+    public:
+        typedef void (GLBackend::*GLFunction)(T, U);
+        void run(GLBackend* backend) { (backend->*(_func))(_param0, _param1); }
+        Command2(GLFunction func, T param0, U param1) : _func(func), _param0(param0), _param1(param1) {};
+        GLFunction _func;
+        T _param0;
+        U _param1;
+    };
+
+    template <class T, class U, class V> class Command3 : public Command {
+    public:
+        typedef void (GLBackend::*GLFunction)(T, U, V);
+        void run(GLBackend* backend) { (backend->*(_func))(_param0, _param1, _param2); }
+        Command3(GLFunction func, T param0, U param1, V param2) : _func(func), _param0(param0), _param1(param1), _param2(param2) {};
+        GLFunction _func;
+        T _param0;
+        U _param1;
+        V _param2;
+    };
+
+    typedef std::shared_ptr< Command > CommandPointer;
+    typedef std::vector< CommandPointer > Commands;
+
+    Commands _commands;
+    Stamp _stamp;
+    State::Signature _signature;
+
+    // The state commands to reset to default,
+    static const Commands _resetStateCommands;
+
+    friend class GLBackend;
+};
+
+} }
+
+#endif
diff --git a/libraries/gpu-gles/src/gpu/gl/GLTexelFormat.cpp b/libraries/gpu-gles/src/gpu/gl/GLTexelFormat.cpp
new file mode 100644
index 0000000000..6eec4b5292
--- /dev/null
+++ b/libraries/gpu-gles/src/gpu/gl/GLTexelFormat.cpp
@@ -0,0 +1,648 @@
+//
+//  Created by Bradley Austin Davis on 2016/05/15
+//  Copyright 2013-2016 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 "GLTexelFormat.h"
+
+using namespace gpu;
+using namespace gpu::gl;
+
+
+GLenum GLTexelFormat::evalGLTexelFormatInternal(const gpu::Element& dstFormat) {
+//    qDebug() << "GLTexelFormat::evalGLTexelFormatInternal " << dstFormat.getDimension() << ", " << dstFormat.getSemantic() << ", " << dstFormat.getType();
+    GLenum result = GL_RGBA8;
+    switch (dstFormat.getDimension()) {
+        case gpu::SCALAR: {
+            switch (dstFormat.getSemantic()) {
+                case gpu::RGB:
+                case gpu::RGBA:
+                case gpu::SRGB:
+                case gpu::SRGBA:
+                    switch (dstFormat.getType()) {
+                        case gpu::UINT32:
+                            result = GL_R32UI;
+                            break;
+                        case gpu::INT32:
+                            result = GL_R32I;
+                            break;
+                        case gpu::NUINT32:
+                            result = GL_R8;
+                            break;
+                        case gpu::NINT32:
+                            result = GL_R8_SNORM;
+                            break;
+                        case gpu::FLOAT:
+                            result = GL_R32F;
+                            break;
+                        case gpu::UINT16:
+                            result = GL_R16UI;
+                            break;
+                        case gpu::INT16:
+                            result = GL_R16I;
+                            break;
+                        case gpu::HALF:
+                            result = GL_R16F;
+                            break;
+                        case gpu::UINT8:
+                            result = GL_R8UI;
+                            break;
+                        case gpu::INT8:
+                            result = GL_R8I;
+                            break;
+                        case gpu::NUINT8:
+                            if ((dstFormat.getSemantic() == gpu::SRGB || dstFormat.getSemantic() == gpu::SRGBA)) {
+                                //result = GL_SLUMINANCE8;
+                                qDebug() << "TODO: GLTexelFormat.cpp:evalGLTexelFormatInternal GL_SLUMINANCE8";
+                            } else {
+                                result = GL_R8;
+                            }
+                            break;
+                        case gpu::NINT8:
+                            result = GL_R8_SNORM;
+                            break;
+                        default:
+                            qDebug() << "TODO: GLTexelFormat.cpp:evalGLTexelFormatInternal " << dstFormat.getType();
+                            Q_UNREACHABLE();
+                            break;
+                    }
+                    break;
+                case gpu::R11G11B10:
+                    // the type should be float
+                    result = GL_R11F_G11F_B10F;
+                    break;
+
+                case gpu::DEPTH:
+                    result = GL_DEPTH_COMPONENT16;
+                    switch (dstFormat.getType()) {
+                        case gpu::FLOAT:
+                            result = GL_DEPTH_COMPONENT32F;
+                            break;
+                        case gpu::UINT16:
+                        case gpu::INT16:
+                        case gpu::NUINT16:
+                        case gpu::NINT16:
+                        case gpu::HALF:
+                            result = GL_DEPTH_COMPONENT16;
+                            break;
+                        case gpu::UINT8:
+                        case gpu::INT8:
+                        case gpu::NUINT8:
+                        case gpu::NINT8:
+                            result = GL_DEPTH_COMPONENT24;
+                            break;
+                        default:
+                            Q_UNREACHABLE();
+                            break;
+                    }
+                    break;
+
+                 case gpu::DEPTH_STENCIL:
+                    result = GL_DEPTH24_STENCIL8;
+                    break;
+
+                default:
+                    qCDebug(gpugllogging) << "Unknown combination of texel format";
+            }
+            break;
+        }
+
+        case gpu::VEC2: {
+            switch (dstFormat.getSemantic()) {
+                case gpu::RGB:
+                case gpu::RGBA:
+                    result = GL_RG8;
+                    break;
+                default:
+                    qCDebug(gpugllogging) << "Unknown combination of texel format";
+            }
+
+            break;
+        }
+
+        case gpu::VEC3: {
+            switch (dstFormat.getSemantic()) {
+                case gpu::RGB:
+                case gpu::RGBA:
+                    result = GL_RGB8;
+                    break;
+                case gpu::SRGB:
+                case gpu::SRGBA:
+                    //result = GL_SRGB8; // standard 2.2 gamma correction color
+                    result = GL_RGB8; // standard 2.2 gamma correction color
+                    break;
+                default:
+                    qCDebug(gpugllogging) << "Unknown combination of texel format";
+            }
+
+            break;
+        }
+
+        case gpu::VEC4: {
+            switch (dstFormat.getSemantic()) {
+                case gpu::RGB:
+                    result = GL_RGB8;
+                    break;
+                case gpu::RGBA:
+                    switch (dstFormat.getType()) {
+                        case gpu::UINT32:
+                            result = GL_RGBA32UI;
+                            break;
+                        case gpu::INT32:
+                            result = GL_RGBA32I;
+                            break;
+                        case gpu::FLOAT:
+                            result = GL_RGBA32F;
+                            break;
+                        case gpu::UINT16:
+                            result = GL_RGBA16UI;
+                            break;
+                        case gpu::INT16:
+                            result = GL_RGBA16I;
+                            break;
+                        case gpu::HALF:
+                            result = GL_RGBA16F;
+                            break;
+                        case gpu::UINT8:
+                            result = GL_RGBA8UI;
+                            break;
+                        case gpu::INT8:
+                            result = GL_RGBA8I;
+                            break;
+                        case gpu::NUINT8:
+                            result = GL_RGBA8;
+                            break;
+                        case gpu::NINT8:
+                            result = GL_RGBA8_SNORM;
+                            break;
+                        case gpu::NUINT32:
+                        case gpu::NINT32:
+                        case gpu::NUM_TYPES: // quiet compiler
+                            Q_UNREACHABLE();
+                    }
+                    break;
+                case gpu::SRGB:
+                    //result = GL_SRGB8;
+                    result = GL_RGB8;
+                    qDebug() << "SRGBA Here 2";
+                    break;
+                case gpu::SRGBA:
+                    result = GL_SRGB8_ALPHA8; // standard 2.2 gamma correction color
+                    break;
+                default:
+                    qCDebug(gpugllogging) << "Unknown combination of texel format";
+            }
+            break;
+        }
+
+        default:
+            qCDebug(gpugllogging) << "Unknown combination of texel format";
+    }
+    
+    //qDebug() << "GLTexelFormat::evalGLTexelFormatInternal result " << result;
+
+    return result;
+}
+
+GLTexelFormat GLTexelFormat::evalGLTexelFormat(const Element& dstFormat, const Element& srcFormat) {
+//    qDebug() << "GLTexelFormat::evalGLTexelFormat dst.getDimension=" << dstFormat.getDimension() << " dst.getType=" << dstFormat.getType() << " dst.getSemantic=" << dstFormat.getSemantic();
+//    qDebug() << "GLTexelFormat::evalGLTexelFormat src.getDimension=" << srcFormat.getDimension() << " src.getType=" << srcFormat.getType() << " src.getSemantic=" << srcFormat.getSemantic();
+
+    if (dstFormat != srcFormat) {
+        GLTexelFormat texel = { GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE };
+
+        switch (dstFormat.getDimension()) {
+        case gpu::SCALAR: {
+            texel.format = GL_RED;
+            texel.type = ELEMENT_TYPE_TO_GL[dstFormat.getType()];
+
+            switch (dstFormat.getSemantic()) {
+            case gpu::RGB:
+            case gpu::RGBA:
+                texel.internalFormat = GL_R8;
+                break;
+
+                //CLIMAX_MERGE_START
+            // case gpu::COMPRESSED_R:
+                // qDebug() << "TODO: GLTexelFormat.cpp:evalGLTexelFormat GL_COMPRESSED_RED_RGTC1";
+                // //texel.internalFormat = GL_COMPRESSED_RED_RGTC1;
+                // break;
+                //CLIMAX_MERGE_END
+                
+            case gpu::DEPTH:
+                texel.internalFormat = GL_DEPTH_COMPONENT32_OES;
+                break;
+            case gpu::DEPTH_STENCIL:
+                texel.type = GL_UNSIGNED_INT_24_8;
+                texel.format = GL_DEPTH_STENCIL;
+                texel.internalFormat = GL_DEPTH24_STENCIL8;
+                break;
+            default:
+                qCDebug(gpugllogging) << "Unknown combination of texel format";
+            }
+            break;
+        }
+
+        case gpu::VEC2: {
+            texel.format = GL_RG;
+            texel.type = ELEMENT_TYPE_TO_GL[dstFormat.getType()];
+
+            switch (dstFormat.getSemantic()) {
+            case gpu::RGB:
+            case gpu::RGBA:
+                texel.internalFormat = GL_RG8;
+                break;
+            default:
+                qCDebug(gpugllogging) << "Unknown combination of texel format";
+            }
+
+            break;
+        }
+
+        case gpu::VEC3: {
+            texel.format = GL_RGB;
+
+            texel.type = ELEMENT_TYPE_TO_GL[dstFormat.getType()];
+
+            switch (dstFormat.getSemantic()) {
+            case gpu::RGB:
+            case gpu::RGBA:
+                texel.internalFormat = GL_RGB8;
+                break;
+                //CLIMAX_MERGE_START
+                //not needed?
+            // case gpu::COMPRESSED_RGB:
+                // qDebug() << "TODO: GLTexelFormat.cpp:evalGLTexelFormat GL_COMPRESSED_RGB";
+                // //texel.internalFormat = GL_COMPRESSED_RGB;
+                // break;
+            // case gpu::COMPRESSED_SRGB:
+                // qDebug() << "TODO: GLTexelFormat.cpp:evalGLTexelFormat GL_COMPRESSED_SRGB";
+                // //texel.internalFormat = GL_COMPRESSED_SRGB;
+                // break;
+                //CLIMAX_MERGE_END
+            default:
+                qCDebug(gpugllogging) << "Unknown combination of texel format";
+            }
+
+            break;
+        }
+
+        case gpu::VEC4: {
+            texel.format = GL_RGBA;
+            texel.type = ELEMENT_TYPE_TO_GL[dstFormat.getType()];
+
+            switch (srcFormat.getSemantic()) {
+            case gpu::BGRA:
+            case gpu::SBGRA:
+                qDebug() << "TODO: GLTexelFormat.cpp:evalGLTexelFormat GL_BGRA";
+                //texel.format = GL_BGRA;
+                break;
+            case gpu::RGB:
+            case gpu::RGBA:
+            case gpu::SRGB:
+            case gpu::SRGBA:
+            default:
+                break;
+            };
+
+            switch (dstFormat.getSemantic()) {
+            case gpu::RGB:
+                texel.internalFormat = GL_RGB8;
+                break;
+            case gpu::RGBA:
+                texel.internalFormat = GL_RGBA8;
+                break;
+            case gpu::SRGB:
+                //texel.internalFormat = GL_SRGB8;
+                texel.internalFormat = GL_RGB8;
+                qDebug() << "SRGBA Here 3";
+                break;
+            case gpu::SRGBA:
+                texel.internalFormat = GL_SRGB8_ALPHA8;
+                break;
+
+                //CLIMAX_MERGE_START
+            // case gpu::COMPRESSED_RGBA:
+                // //texel.internalFormat = GL_COMPRESSED_RGBA;
+                // qDebug() << "TODO: GLTexelFormat.cpp:evalGLTexelFormat GL_COMPRESSED_RGBA";
+                // break;
+            // case gpu::COMPRESSED_SRGBA:
+                // //texel.internalFormat = GL_COMPRESSED_SRGB_ALPHA;
+                // qDebug() << "TODO: GLTexelFormat.cpp:evalGLTexelFormat GL_COMPRESSED_SRGB_ALPHA";
+                // break;
+                //CLIMAX_MERGE_END
+                // FIXME: WE will want to support this later
+                /*
+                case gpu::COMPRESSED_BC3_RGBA:
+                texel.internalFormat = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
+                break;
+                case gpu::COMPRESSED_BC3_SRGBA:
+                texel.internalFormat = GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT;
+                break;
+
+                case gpu::COMPRESSED_BC7_RGBA:
+                texel.internalFormat = GL_COMPRESSED_RGBA_BPTC_UNORM_ARB;
+                break;
+                case gpu::COMPRESSED_BC7_SRGBA:
+                texel.internalFormat = GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM;
+                break;
+                */
+
+            default:
+                qCDebug(gpugllogging) << "Unknown combination of texel format";
+            }
+            break;
+        }
+
+        default:
+            qCDebug(gpugllogging) << "Unknown combination of texel format";
+        }
+        return texel;
+    } else {
+        GLTexelFormat texel = { GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE };
+
+        switch (dstFormat.getDimension()) {
+        case gpu::SCALAR: {
+            texel.format = GL_RED;
+            texel.type = ELEMENT_TYPE_TO_GL[dstFormat.getType()];
+
+            switch (dstFormat.getSemantic()) {
+                //CLIMAX_MERGE_START
+            // case gpu::COMPRESSED_R: {
+                // qDebug() << "TODO: GLTexelFormat.cpp:evalGLTexelFormat GL_COMPRESSED_RED_RGTC1";
+                // //texel.internalFormat = GL_COMPRESSED_RED_RGTC1;
+                // break;
+            // }
+            case gpu::RGB:
+            case gpu::RGBA:
+            case gpu::SRGB:
+            case gpu::SRGBA:
+                texel.internalFormat = GL_RED;
+                switch (dstFormat.getType()) {
+                case gpu::UINT32: {
+                    texel.internalFormat = GL_R32UI;
+                    break;
+                }
+                case gpu::INT32: {
+                    texel.internalFormat = GL_R32I;
+                    break;
+                }
+                case gpu::NUINT32: {
+                    texel.internalFormat = GL_R8;
+                    break;
+                }
+                case gpu::NINT32: {
+                    texel.internalFormat = GL_R8_SNORM;
+                    break;
+                }
+                case gpu::FLOAT: {
+                    texel.internalFormat = GL_R32F;
+                    break;
+                }
+                case gpu::UINT16: {
+                    texel.internalFormat = GL_R16UI;
+                    break;
+                }
+                case gpu::INT16: {
+                    texel.internalFormat = GL_R16I;
+                    break;
+                }
+                case gpu::NUINT16: {
+                    //texel.internalFormat = GL_R16;
+                    qDebug() << "TODO: GLTexelFormat.cpp:evalGLTexelFormat GL_R16";
+                    break;
+                }
+                case gpu::NINT16: {
+                    //texel.internalFormat = GL_R16_SNORM;
+                    qDebug() << "TODO: GLTexelFormat.cpp:evalGLTexelFormat GL_R16_SNORM";
+                    break;
+                }
+                case gpu::HALF: {
+                    texel.internalFormat = GL_R16F;
+                    break;
+                }
+                case gpu::UINT8: {
+                    texel.internalFormat = GL_R8UI;
+                    break;
+                }
+                case gpu::INT8: {
+                    texel.internalFormat = GL_R8I;
+                    break;
+                }
+                case gpu::NUINT8: {
+                    if ((dstFormat.getSemantic() == gpu::SRGB || dstFormat.getSemantic() == gpu::SRGBA)) {
+//                        texel.internalFormat = GL_SLUMINANCE8;
+                        qDebug() << "TODO: GLTexelFormat.cpp:evalGLTexelFormat GL_SLUMINANCE8";
+
+                    } else {
+                        texel.internalFormat = GL_R8;
+                    }
+                    break;
+                }
+                case gpu::NINT8: {
+                    texel.internalFormat = GL_R8_SNORM;
+                    break;
+                }
+                case gpu::NUM_TYPES: { // quiet compiler
+                    Q_UNREACHABLE();
+                }
+
+                }
+                break;
+
+            case gpu::R11G11B10:
+                texel.format = GL_RGB;
+                // the type should be float
+                texel.internalFormat = GL_R11F_G11F_B10F;
+                break;
+
+            case gpu::DEPTH:
+                texel.format = GL_DEPTH_COMPONENT; // It's depth component to load it
+                texel.internalFormat = GL_DEPTH_COMPONENT32_OES;
+                switch (dstFormat.getType()) {
+                case gpu::UINT32:
+                case gpu::INT32:
+                case gpu::NUINT32:
+                case gpu::NINT32: {
+                    texel.internalFormat = GL_DEPTH_COMPONENT32_OES;
+                    break;
+                }
+                case gpu::FLOAT: {
+                    texel.internalFormat = GL_DEPTH_COMPONENT32F;
+                    break;
+                }
+                case gpu::UINT16:
+                case gpu::INT16:
+                case gpu::NUINT16:
+                case gpu::NINT16:
+                case gpu::HALF: {
+                    texel.internalFormat = GL_DEPTH_COMPONENT16;
+                    break;
+                }
+                case gpu::UINT8:
+                case gpu::INT8:
+                case gpu::NUINT8:
+                case gpu::NINT8: {
+                    texel.internalFormat = GL_DEPTH_COMPONENT24;
+                    break;
+                }
+                case gpu::NUM_TYPES: { // quiet compiler
+                    Q_UNREACHABLE();
+                }
+                }
+                break;
+            case gpu::DEPTH_STENCIL:
+                texel.type = GL_UNSIGNED_INT_24_8;
+                texel.format = GL_DEPTH_STENCIL;
+                texel.internalFormat = GL_DEPTH24_STENCIL8;
+                break;
+            default:
+                qCDebug(gpugllogging) << "Unknown combination of texel format";
+            }
+
+            break;
+        }
+
+        case gpu::VEC2: {
+            texel.format = GL_RG;
+            texel.type = ELEMENT_TYPE_TO_GL[dstFormat.getType()];
+
+            switch (dstFormat.getSemantic()) {
+            case gpu::RGB:
+            case gpu::RGBA:
+                texel.internalFormat = GL_RG8;
+                break;
+            default:
+                qCDebug(gpugllogging) << "Unknown combination of texel format";
+            }
+
+            break;
+        }
+
+        case gpu::VEC3: {
+            texel.format = GL_RGB;
+
+            texel.type = ELEMENT_TYPE_TO_GL[dstFormat.getType()];
+
+            switch (dstFormat.getSemantic()) {
+            case gpu::RGB:
+            case gpu::RGBA:
+                texel.internalFormat = GL_RGB8;
+                break;
+            case gpu::SRGB:
+            case gpu::SRGBA:
+                //texel.internalFormat = GL_SRGB8; // standard 2.2 gamma correction color
+                texel.internalFormat = GL_RGB8; // standard 2.2 gamma correction color
+                break;
+                //CLIMAX_MERGE_START
+            // case gpu::COMPRESSED_RGB:
+                // //texel.internalFormat = GL_COMPRESSED_RGB;
+                // qDebug() << "TODO: GLTexelFormat.cpp:evalGLTexelFormat GL_COMPRESSED_RGB";
+                // break;
+            // case gpu::COMPRESSED_SRGB:
+                // //texel.internalFormat = GL_COMPRESSED_SRGB;
+                // qDebug() << "TODO: GLTexelFormat.cpp:evalGLTexelFormat GL_COMPRESSED_SRGB";
+                // break;
+            default:
+                qCDebug(gpugllogging) << "Unknown combination of texel format";
+            }
+            break;
+        }
+
+        case gpu::VEC4: {
+            texel.format = GL_RGBA;
+            texel.type = ELEMENT_TYPE_TO_GL[dstFormat.getType()];
+
+            switch (dstFormat.getSemantic()) {
+            case gpu::RGB:
+                texel.internalFormat = GL_RGB8;
+                break;
+            case gpu::RGBA:
+                texel.internalFormat = GL_RGBA8;
+                switch (dstFormat.getType()) {
+                case gpu::UINT32:
+                    texel.format = GL_RGBA_INTEGER;
+                    texel.internalFormat = GL_RGBA32UI;
+                    break;
+                case gpu::INT32:
+                    texel.format = GL_RGBA_INTEGER;
+                    texel.internalFormat = GL_RGBA32I;
+                    break;
+                case gpu::FLOAT:
+                    texel.internalFormat = GL_RGBA32F;
+                    break;
+                case gpu::UINT16:
+                    texel.format = GL_RGBA_INTEGER;
+                    texel.internalFormat = GL_RGBA16UI;
+                    break;
+                case gpu::INT16:
+                    texel.format = GL_RGBA_INTEGER;
+                    texel.internalFormat = GL_RGBA16I;
+                    break;
+                case gpu::NUINT16:
+                    texel.format = GL_RGBA;
+                    //texel.internalFormat = GL_RGBA16;
+                    qDebug() << "TODO: GLTexelFormat.cpp:evalGLTexelFormat GL_RGBA16";
+                    break;
+                case gpu::NINT16:
+                    texel.format = GL_RGBA;
+                    qDebug() << "TODO: GLTexelFormat.cpp:evalGLTexelFormat GL_RGBA16_SNORM";
+                    //texel.internalFormat = GL_RGBA16_SNORM;
+                    break;
+                case gpu::HALF:
+                    texel.format = GL_RGBA;
+                    texel.internalFormat = GL_RGBA16F;
+                    break;
+                case gpu::UINT8:
+                    texel.format = GL_RGBA_INTEGER;
+                    texel.internalFormat = GL_RGBA8UI;
+                    break;
+                case gpu::INT8:
+                    texel.format = GL_RGBA_INTEGER;
+                    texel.internalFormat = GL_RGBA8I;
+                    break;
+                case gpu::NUINT8:
+                    texel.format = GL_RGBA;
+                    texel.internalFormat = GL_RGBA8;
+                    break;
+                case gpu::NINT8:
+                    texel.format = GL_RGBA;
+                    texel.internalFormat = GL_RGBA8_SNORM;
+                    break;
+                case gpu::NUINT32:
+                case gpu::NINT32:
+                case gpu::NUM_TYPES: // quiet compiler
+                    Q_UNREACHABLE();
+                }
+                break;
+            case gpu::SRGB:
+                //texel.internalFormat = GL_SRGB8;
+                texel.internalFormat = GL_RGB8; // standard 2.2 gamma correction color
+                break;
+            case gpu::SRGBA:
+                texel.internalFormat = GL_SRGB8_ALPHA8; // standard 2.2 gamma correction color
+                break;
+                //CLIMAX_MERGE_START
+            // case gpu::COMPRESSED_RGBA:
+                // //texel.internalFormat = GL_COMPRESSED_RGBA;
+                // qDebug() << "TODO: GLTexelFormat.cpp:evalGLTexelFormat GL_COMPRESSED_RGBA";
+                // break;
+            // case gpu::COMPRESSED_SRGBA:
+                // qDebug() << "TODO: GLTexelFormat.cpp:evalGLTexelFormat GL_COMPRESSED_SRGB_ALPHA";
+                // //texel.internalFormat = GL_COMPRESSED_SRGB_ALPHA;
+                // break;
+            default:
+                qCDebug(gpugllogging) << "Unknown combination of texel format";
+            }
+            break;
+        }
+        default:
+            qCDebug(gpugllogging) << "Unknown combination of texel format";
+        }
+        //qDebug() << "GLTexelFormat::evalGLTexelFormat Texel.type " << texel.type << " - texel.format=" << texel.format << " texel.internalFormat=" << texel.internalFormat;
+        return texel;
+    }
+}
diff --git a/libraries/gpu-gles/src/gpu/gl/GLTexelFormat.h b/libraries/gpu-gles/src/gpu/gl/GLTexelFormat.h
new file mode 100644
index 0000000000..94ded3dc23
--- /dev/null
+++ b/libraries/gpu-gles/src/gpu/gl/GLTexelFormat.h
@@ -0,0 +1,32 @@
+//
+//  Created by Bradley Austin Davis on 2016/05/15
+//  Copyright 2013-2016 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_gpu_gl_GLTexelFormat_h
+#define hifi_gpu_gl_GLTexelFormat_h
+
+#include "GLShared.h"
+
+namespace gpu { namespace gl {
+
+class GLTexelFormat {
+public:
+    GLenum internalFormat;
+    GLenum format;
+    GLenum type;
+
+    static GLTexelFormat evalGLTexelFormat(const Element& dstFormat) {
+        return evalGLTexelFormat(dstFormat, dstFormat);
+    }
+    static GLenum evalGLTexelFormatInternal(const Element& dstFormat);
+
+    static GLTexelFormat evalGLTexelFormat(const Element& dstFormat, const Element& srcFormat);
+};
+
+} }
+
+
+#endif
diff --git a/libraries/gpu-gles/src/gpu/gl/GLTexture.cpp b/libraries/gpu-gles/src/gpu/gl/GLTexture.cpp
new file mode 100644
index 0000000000..5f5e3a9be1
--- /dev/null
+++ b/libraries/gpu-gles/src/gpu/gl/GLTexture.cpp
@@ -0,0 +1,323 @@
+//
+//  Created by Bradley Austin Davis on 2016/05/15
+//  Copyright 2013-2016 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 "GLTexture.h"
+
+#include <NumericalConstants.h>
+
+#include "GLTextureTransfer.h"
+#include "GLBackend.h"
+
+using namespace gpu;
+using namespace gpu::gl;
+
+std::shared_ptr<GLTextureTransferHelper> GLTexture::_textureTransferHelper;
+
+// FIXME placeholder for texture memory over-use
+#define DEFAULT_MAX_MEMORY_MB 256
+#define MIN_FREE_GPU_MEMORY_PERCENTAGE 0.25f
+#define OVER_MEMORY_PRESSURE 2.0f
+
+const GLenum GLTexture::CUBE_FACE_LAYOUT[6] = {
+    GL_TEXTURE_CUBE_MAP_POSITIVE_X, GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
+    GL_TEXTURE_CUBE_MAP_POSITIVE_Y, GL_TEXTURE_CUBE_MAP_NEGATIVE_Y,
+    GL_TEXTURE_CUBE_MAP_POSITIVE_Z, GL_TEXTURE_CUBE_MAP_NEGATIVE_Z
+};
+
+const GLenum GLTexture::WRAP_MODES[Sampler::NUM_WRAP_MODES] = {
+    GL_REPEAT,                         // WRAP_REPEAT,
+    GL_MIRRORED_REPEAT,                // WRAP_MIRROR,
+    GL_CLAMP_TO_EDGE,                  // WRAP_CLAMP,
+    GL_CLAMP_TO_BORDER_EXT,            // WRAP_BORDER,
+
+    //GL_MIRROR_CLAMP_TO_EDGE_EXT        // WRAP_MIRROR_ONCE,
+//    qDebug() << "TODO: GLTexture.cpp:WRAP_MODES GL_MIRROR_CLAMP_TO_EDGE_EXT";    
+};     
+
+const GLFilterMode GLTexture::FILTER_MODES[Sampler::NUM_FILTERS] = {
+    { GL_NEAREST, GL_NEAREST },  //FILTER_MIN_MAG_POINT,
+    { GL_NEAREST, GL_LINEAR },  //FILTER_MIN_POINT_MAG_LINEAR,
+    { GL_LINEAR, GL_NEAREST },  //FILTER_MIN_LINEAR_MAG_POINT,
+    { GL_LINEAR, GL_LINEAR },  //FILTER_MIN_MAG_LINEAR,
+
+    { GL_NEAREST_MIPMAP_NEAREST, GL_NEAREST },  //FILTER_MIN_MAG_MIP_POINT,
+    { GL_NEAREST_MIPMAP_LINEAR, GL_NEAREST },  //FILTER_MIN_MAG_POINT_MIP_LINEAR,
+    { GL_NEAREST_MIPMAP_NEAREST, GL_LINEAR },  //FILTER_MIN_POINT_MAG_LINEAR_MIP_POINT,
+    { GL_NEAREST_MIPMAP_LINEAR, GL_LINEAR },  //FILTER_MIN_POINT_MAG_MIP_LINEAR,
+    { GL_LINEAR_MIPMAP_NEAREST, GL_NEAREST },  //FILTER_MIN_LINEAR_MAG_MIP_POINT,
+    { GL_LINEAR_MIPMAP_LINEAR, GL_NEAREST },  //FILTER_MIN_LINEAR_MAG_POINT_MIP_LINEAR,
+    { GL_LINEAR_MIPMAP_NEAREST, GL_LINEAR },  //FILTER_MIN_MAG_LINEAR_MIP_POINT,
+    { GL_LINEAR_MIPMAP_LINEAR, GL_LINEAR },  //FILTER_MIN_MAG_MIP_LINEAR,
+    { GL_LINEAR_MIPMAP_LINEAR, GL_LINEAR }  //FILTER_ANISOTROPIC,
+};
+
+GLenum GLTexture::getGLTextureType(const Texture& texture) {
+    switch (texture.getType()) {
+    case Texture::TEX_2D:
+        return GL_TEXTURE_2D;
+        break;
+
+    case Texture::TEX_CUBE:
+        return GL_TEXTURE_CUBE_MAP;
+        break;
+
+    default:
+        qFatal("Unsupported texture type");
+    }
+    Q_UNREACHABLE();
+    return GL_TEXTURE_2D;
+}
+
+
+const std::vector<GLenum>& GLTexture::getFaceTargets(GLenum target) {
+    static std::vector<GLenum> cubeFaceTargets {
+        GL_TEXTURE_CUBE_MAP_POSITIVE_X, GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
+        GL_TEXTURE_CUBE_MAP_POSITIVE_Y, GL_TEXTURE_CUBE_MAP_NEGATIVE_Y,
+        GL_TEXTURE_CUBE_MAP_POSITIVE_Z, GL_TEXTURE_CUBE_MAP_NEGATIVE_Z
+    };
+    static std::vector<GLenum> faceTargets {
+        GL_TEXTURE_2D
+    };
+    switch (target) {
+    case GL_TEXTURE_2D:
+        return faceTargets;
+    case GL_TEXTURE_CUBE_MAP:
+        return cubeFaceTargets;
+    default:
+        Q_UNREACHABLE();
+        break;
+    }
+    Q_UNREACHABLE();
+    return faceTargets;
+}
+
+// Default texture memory = GPU total memory - 2GB
+#define GPU_MEMORY_RESERVE_BYTES MB_TO_BYTES(2048)
+// Minimum texture memory = 1GB
+#define TEXTURE_MEMORY_MIN_BYTES MB_TO_BYTES(1024)
+
+
+float GLTexture::getMemoryPressure() {
+    // Check for an explicit memory limit
+    auto availableTextureMemory = Texture::getAllowedGPUMemoryUsage();
+    
+
+    // If no memory limit has been set, use a percentage of the total dedicated memory
+    if (!availableTextureMemory) {
+#if 0
+        auto totalMemory = getDedicatedMemory();
+        if ((GPU_MEMORY_RESERVE_BYTES + TEXTURE_MEMORY_MIN_BYTES) > totalMemory) {
+            availableTextureMemory = TEXTURE_MEMORY_MIN_BYTES;
+        } else {
+            availableTextureMemory = totalMemory - GPU_MEMORY_RESERVE_BYTES;
+        }
+#else 
+        // Hardcode texture limit for sparse textures at 1 GB for now
+        availableTextureMemory = TEXTURE_MEMORY_MIN_BYTES;
+#endif
+    }
+
+    // Return the consumed texture memory divided by the available texture memory.
+    //CLIMAX_MERGE_START
+    //auto consumedGpuMemory = Context::getTextureGPUMemoryUsage() - Context::getTextureGPUFramebufferMemoryUsage();
+    //float memoryPressure = (float)consumedGpuMemory / (float)availableTextureMemory;
+    //static Context::Size lastConsumedGpuMemory = 0;
+    //if (memoryPressure > 1.0f && lastConsumedGpuMemory != consumedGpuMemory) {
+    //    lastConsumedGpuMemory = consumedGpuMemory;
+    //    qCDebug(gpugllogging) << "Exceeded max allowed texture memory: " << consumedGpuMemory << " / " << availableTextureMemory;
+    //}
+    //return memoryPressure;
+    return 0;
+
+}
+
+
+// Create the texture and allocate storage
+GLTexture::GLTexture(const std::weak_ptr<GLBackend>& backend, const Texture& texture, GLuint id, bool transferrable) :
+    GLObject(backend, texture, id),
+    _external(false),
+    _source(texture.source()),
+    _storageStamp(texture.getStamp()),
+    _target(getGLTextureType(texture)),
+    _internalFormat(gl::GLTexelFormat::evalGLTexelFormatInternal(texture.getTexelFormat())),
+    _maxMip(texture.getMaxMip()),
+    _minMip(texture.getMinMip()),
+    _virtualSize(texture.evalTotalSize()),
+    _transferrable(transferrable)
+{
+    //qDebug() << "GLTexture::GLTexture building GLTexture with _internalFormat" << _internalFormat;
+    auto strongBackend = _backend.lock();
+    strongBackend->recycle();
+    //CLIMAX_MERGE_START
+    //Backend::incrementTextureGPUCount();
+    //Backend::updateTextureGPUVirtualMemoryUsage(0, _virtualSize);
+    //CLIMAX_MERGE_END
+    Backend::setGPUObject(texture, this);
+}
+
+GLTexture::GLTexture(const std::weak_ptr<GLBackend>& backend, const Texture& texture, GLuint id) :
+    GLObject(backend, texture, id),
+    _external(true),
+    _source(texture.source()),
+    _storageStamp(0),
+    _target(getGLTextureType(texture)),
+    _internalFormat(GL_RGBA8),
+    // FIXME force mips to 0?
+    _maxMip(texture.getMaxMip()),
+    _minMip(texture.getMinMip()),
+    _virtualSize(0),
+    _transferrable(false) 
+{
+    Backend::setGPUObject(texture, this);
+
+    // FIXME Is this necessary?
+    //withPreservedTexture([this] {
+    //    syncSampler();
+    //    if (_gpuObject.isAutogenerateMips()) {
+    //        generateMips();
+    //    }
+    //});
+}
+
+GLTexture::~GLTexture() {
+    auto backend = _backend.lock();
+    if (backend) {
+        if (_external) {
+            auto recycler = _gpuObject.getExternalRecycler();
+            if (recycler) {
+                backend->releaseExternalTexture(_id, recycler);
+            } else {
+                qWarning() << "No recycler available for texture " << _id << " possible leak";
+            }
+        } else if (_id) {
+            // WARNING!  Sparse textures do not use this code path.  See GL45BackendTexture for 
+            // the GL45Texture destructor for doing any required work tracking GPU stats
+            backend->releaseTexture(_id, _size);
+        }
+
+        ////CLIMAX_MERGE_START
+        //if (!_external && !_transferrable) {
+        //    Backend::updateTextureGPUFramebufferMemoryUsage(_size, 0);
+        //}
+    }
+    //Backend::updateTextureGPUVirtualMemoryUsage(_virtualSize, 0);
+    //CLIMAX_MERGE_END
+}
+
+void GLTexture::createTexture() {
+    withPreservedTexture([&] {
+        allocateStorage();
+        (void)CHECK_GL_ERROR();
+        syncSampler();
+        (void)CHECK_GL_ERROR();
+    });
+}
+
+void GLTexture::withPreservedTexture(std::function<void()> f) const {
+    GLint boundTex = -1;
+    switch (_target) {
+        case GL_TEXTURE_2D:
+            glGetIntegerv(GL_TEXTURE_BINDING_2D, &boundTex);
+            break;
+
+        case GL_TEXTURE_CUBE_MAP:
+            glGetIntegerv(GL_TEXTURE_BINDING_CUBE_MAP, &boundTex);
+            break;
+
+        default:
+            qFatal("Unsupported texture type");
+    }
+    (void)CHECK_GL_ERROR();
+
+    glBindTexture(_target, _texture);
+    f();
+    glBindTexture(_target, boundTex);
+    (void)CHECK_GL_ERROR();
+}
+
+void GLTexture::setSize(GLuint size) const {
+    ////CLIMAX_MERGE_START
+    //if (!_external && !_transferrable) {
+    //    Backend::updateTextureGPUFramebufferMemoryUsage(_size, 0);
+    //}
+    //Backend::updateTextureGPUMemoryUsage(_size, size);
+    const_cast<GLuint&>(_size) = size;
+}
+
+bool GLTexture::isInvalid() const {
+    return _storageStamp < _gpuObject.getStamp();
+}
+
+bool GLTexture::isOutdated() const {
+    return GLSyncState::Idle == _syncState && _contentStamp < _gpuObject.getDataStamp();
+}
+
+bool GLTexture::isReady() const {
+    // If we have an invalid texture, we're never ready
+    if (isInvalid()) {
+        return false;
+    }
+
+    auto syncState = _syncState.load();
+    if (isOutdated() || Idle != syncState) {
+        return false;
+    }
+
+    return true;
+}
+
+
+// Do any post-transfer operations that might be required on the main context / rendering thread
+void GLTexture::postTransfer() {
+    //CLIMAX_MERGE_START
+    
+    // setSyncState(GLSyncState::Idle);
+    // ++_transferCount;
+
+    // // At this point the mip pixels have been loaded, we can notify the gpu texture to abandon it's memory
+    // switch (_gpuObject.getType()) {
+        // case Texture::TEX_2D:
+            // for (uint16_t i = 0; i < Sampler::MAX_MIP_LEVEL; ++i) {
+                // if (_gpuObject.isStoredMipFaceAvailable(i)) {
+                    // _gpuObject.notifyMipFaceGPULoaded(i);
+                // }
+            // }
+            // break;
+
+        // case Texture::TEX_CUBE:
+            // // transfer pixels from each faces
+            // for (uint8_t f = 0; f < CUBE_NUM_FACES; f++) {
+                // for (uint16_t i = 0; i < Sampler::MAX_MIP_LEVEL; ++i) {
+                    // if (_gpuObject.isStoredMipFaceAvailable(i, f)) {
+                        // _gpuObject.notifyMipFaceGPULoaded(i, f);
+                    // }
+                    // }
+                // }
+            // break;
+
+        // default:
+            // qCWarning(gpugllogging) << __FUNCTION__ << " case for Texture Type " << _gpuObject.getType() << " not supported";
+            // break;
+    // }
+    //CLIMAX_MERGE_END
+}
+
+void GLTexture::initTextureTransferHelper() {
+    _textureTransferHelper = std::make_shared<GLTextureTransferHelper>();
+}
+
+void GLTexture::startTransfer() {
+    createTexture();
+}
+
+void GLTexture::finishTransfer() {
+    if (_gpuObject.isAutogenerateMips()) {
+        generateMips();
+    }
+}
+
diff --git a/libraries/gpu-gles/src/gpu/gl/GLTexture.h b/libraries/gpu-gles/src/gpu/gl/GLTexture.h
new file mode 100644
index 0000000000..03353ae67d
--- /dev/null
+++ b/libraries/gpu-gles/src/gpu/gl/GLTexture.h
@@ -0,0 +1,233 @@
+//
+//  Created by Bradley Austin Davis on 2016/05/15
+//  Copyright 2013-2016 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_gpu_gl_GLTexture_h
+#define hifi_gpu_gl_GLTexture_h
+
+#include "GLShared.h"
+#include "GLTextureTransfer.h"
+#include "GLBackend.h"
+#include "GLTexelFormat.h"
+
+namespace gpu { namespace gl {
+
+struct GLFilterMode {
+    GLint minFilter;
+    GLint magFilter;
+};
+
+
+class GLTexture : public GLObject<Texture> {
+public:
+    static const uint16_t INVALID_MIP { (uint16_t)-1 };
+    static const uint8_t INVALID_FACE { (uint8_t)-1 };
+
+    static void initTextureTransferHelper();
+    static std::shared_ptr<GLTextureTransferHelper> _textureTransferHelper;
+
+    template <typename GLTextureType>
+    static GLTexture* sync(GLBackend& backend, const TexturePointer& texturePointer, bool needTransfer) {
+        const Texture& texture = *texturePointer;
+
+        // Special case external textures
+        //CLIMAX_MERGE_START 
+        //Z:/HiFi_Android/HiFi_GIT/libraries/gpu-gl-android/src/gpu/gl/../gles/../gl/GLTexture.h:37:32: error: no member named 'isExternal' in 'gpu::Texture::Usage'
+        // The only instance of this being used again. replace.
+        // if (texture.getUsage().isExternal()) {
+            // Texture::ExternalUpdates updates = texture.getUpdates();
+            // if (!updates.empty()) {
+                // Texture::ExternalRecycler recycler = texture.getExternalRecycler();
+                // Q_ASSERT(recycler);
+                // // Discard any superfluous updates
+                // while (updates.size() > 1) {
+                    // const auto& update = updates.front();
+                    // // Superfluous updates will never have been read, but we want to ensure the previous 
+                    // // writes to them are complete before they're written again, so return them with the 
+                    // // same fences they arrived with.  This can happen on any thread because no GL context 
+                    // // work is involved
+                    // recycler(update.first, update.second);
+                    // updates.pop_front();
+                // }
+
+                // // The last texture remaining is the one we'll use to create the GLTexture
+                // const auto& update = updates.front();
+                // // Check for a fence, and if it exists, inject a wait into the command stream, then destroy the fence
+                // if (update.second) {
+                    // GLsync fence = static_cast<GLsync>(update.second);
+                    // glWaitSync(fence, 0, GL_TIMEOUT_IGNORED);
+                    // glDeleteSync(fence);
+                // }
+
+                // // Create the new texture object (replaces any previous texture object)
+                // new GLTextureType(backend.shared_from_this(), texture, update.first);
+            // }
+            
+            
+            // Return the texture object (if any) associated with the texture, without extensive logic
+            // (external textures are 
+            //return Backend::getGPUObject<GLTextureType>(texture);
+        //}
+        //CLIMAX_MERGE_END
+        if (!texture.isDefined()) {
+            // NO texture definition yet so let's avoid thinking
+            return nullptr;
+        }
+
+        // If the object hasn't been created, or the object definition is out of date, drop and re-create
+        GLTexture* object = Backend::getGPUObject<GLTextureType>(texture);
+
+        // Create the texture if need be (force re-creation if the storage stamp changes
+        // for easier use of immutable storage)
+        if (!object || object->isInvalid()) {
+            // This automatically any previous texture
+            object = new GLTextureType(backend.shared_from_this(), texture, needTransfer);
+            if (!object->_transferrable) {
+                object->createTexture();
+                object->_contentStamp = texture.getDataStamp();
+                object->updateSize();
+                object->postTransfer();
+            }
+        }
+
+        // Object maybe doens't neet to be tranasferred after creation
+        if (!object->_transferrable) {
+            return object;
+        }
+
+        // If we just did a transfer, return the object after doing post-transfer work
+        if (GLSyncState::Transferred == object->getSyncState()) {
+            object->postTransfer();
+        }
+
+        if (object->isOutdated()) {
+            // Object might be outdated, if so, start the transfer
+            // (outdated objects that are already in transfer will have reported 'true' for ready()
+            _textureTransferHelper->transferTexture(texturePointer);
+            return nullptr;
+        }
+
+        if (!object->isReady()) {
+            return nullptr;
+        }
+
+        ((GLTexture*)object)->updateMips();
+
+        return object;
+    }
+
+    template <typename GLTextureType> 
+    static GLuint getId(GLBackend& backend, const TexturePointer& texture, bool shouldSync) {
+        if (!texture) {
+            return 0;
+        }
+        GLTexture* object { nullptr };
+        if (shouldSync) {
+            object = sync<GLTextureType>(backend, texture, shouldSync);
+        } else {
+            object = Backend::getGPUObject<GLTextureType>(*texture);
+        }
+
+        if (!object) {
+            return 0;
+        }
+
+        if (!shouldSync) {
+            return object->_id;
+        }
+
+        // Don't return textures that are in transfer state
+        if ((object->getSyncState() != GLSyncState::Idle) ||
+            // Don't return transferrable textures that have never completed transfer
+            (!object->_transferrable || 0 != object->_transferCount)) {
+            return 0;
+        }
+        
+        return object->_id;
+    }
+
+    ~GLTexture();
+
+    // Is this texture generated outside the GPU library?
+    const bool _external;
+    const GLuint& _texture { _id };
+    const std::string _source;
+    const Stamp _storageStamp;
+    const GLenum _target;
+    const GLenum _internalFormat;
+    const uint16 _maxMip;
+    uint16 _minMip;
+    const GLuint _virtualSize; // theoretical size as expected
+    Stamp _contentStamp { 0 };
+    const bool _transferrable;
+    Size _transferCount { 0 };
+    GLuint size() const { return _size; }
+    GLSyncState getSyncState() const { return _syncState; }
+
+    // Is the storage out of date relative to the gpu texture?
+    bool isInvalid() const;
+
+    // Is the content out of date relative to the gpu texture?
+    bool isOutdated() const;
+
+    // Is the texture in a state where it can be rendered with no work?
+    bool isReady() const;
+
+    // Execute any post-move operations that must occur only on the main thread
+    virtual void postTransfer();
+
+    uint16 usedMipLevels() const { return (_maxMip - _minMip) + 1; }
+
+    static const size_t CUBE_NUM_FACES = 6;
+    static const GLenum CUBE_FACE_LAYOUT[6];
+    static const GLFilterMode FILTER_MODES[Sampler::NUM_FILTERS];
+    static const GLenum WRAP_MODES[Sampler::NUM_WRAP_MODES];
+
+    // Return a floating point value indicating how much of the allowed 
+    // texture memory we are currently consuming.  A value of 0 indicates 
+    // no texture memory usage, while a value of 1 indicates all available / allowed memory
+    // is consumed.  A value above 1 indicates that there is a problem.
+    static float getMemoryPressure();
+protected:
+
+    static const std::vector<GLenum>& getFaceTargets(GLenum textureType);
+
+    static GLenum getGLTextureType(const Texture& texture);
+
+
+    const GLuint _size { 0 }; // true size as reported by the gl api
+    std::atomic<GLSyncState> _syncState { GLSyncState::Idle };
+
+    GLTexture(const std::weak_ptr<gl::GLBackend>& backend, const Texture& texture, GLuint id, bool transferrable);
+    GLTexture(const std::weak_ptr<gl::GLBackend>& backend, const Texture& texture, GLuint id);
+
+    void setSyncState(GLSyncState syncState) { _syncState = syncState; }
+
+    void createTexture();
+
+    virtual void updateMips() {}
+    virtual void allocateStorage() const = 0;
+    virtual void updateSize() const = 0;
+    virtual void syncSampler() const = 0;
+    virtual void generateMips() const = 0;
+    virtual void withPreservedTexture(std::function<void()> f) const;
+
+protected:
+    void setSize(GLuint size) const;
+
+    virtual void startTransfer();
+    // Returns true if this is the last block required to complete transfer
+    virtual bool continueTransfer() { return false; }
+    virtual void finishTransfer();
+
+private:
+    friend class GLTextureTransferHelper;
+    friend class GLBackend;
+};
+
+} }
+
+#endif
diff --git a/libraries/gpu-gles/src/gpu/gl/GLTextureTransfer.cpp b/libraries/gpu-gles/src/gpu/gl/GLTextureTransfer.cpp
new file mode 100644
index 0000000000..cec46cb90d
--- /dev/null
+++ b/libraries/gpu-gles/src/gpu/gl/GLTextureTransfer.cpp
@@ -0,0 +1,207 @@
+//
+//  Created by Bradley Austin Davis on 2016/04/03
+//  Copyright 2013-2016 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 "GLTextureTransfer.h"
+
+#include <gl/GLHelpers.h>
+#include <gl/Context.h>
+
+#include "GLShared.h"
+#include "GLTexture.h"
+
+#ifdef HAVE_NSIGHT
+#include "nvToolsExt.h"
+std::unordered_map<TexturePointer, nvtxRangeId_t> _map;
+#endif
+
+
+#ifdef TEXTURE_TRANSFER_PBOS
+#define TEXTURE_TRANSFER_BLOCK_SIZE (64 * 1024)
+#define TEXTURE_TRANSFER_PBO_COUNT 128
+#endif
+
+using namespace gpu;
+using namespace gpu::gl;
+
+GLTextureTransferHelper::GLTextureTransferHelper() {
+#ifdef THREADED_TEXTURE_TRANSFER
+    setObjectName("TextureTransferThread");
+    _context.create();
+    initialize(true, QThread::LowPriority);
+    // Clean shutdown on UNIX, otherwise _canvas is freed early
+    connect(qApp, &QCoreApplication::aboutToQuit, [&] { terminate(); });
+#else
+    initialize(false, QThread::LowPriority);
+#endif
+}
+
+GLTextureTransferHelper::~GLTextureTransferHelper() {
+#ifdef THREADED_TEXTURE_TRANSFER
+    if (isStillRunning()) {
+        terminate();
+    }
+#else
+    terminate();
+#endif
+}
+
+void GLTextureTransferHelper::transferTexture(const gpu::TexturePointer& texturePointer) {
+    GLTexture* object = Backend::getGPUObject<GLTexture>(*texturePointer);
+
+    //CLIMAX_MERGE_START
+    //Backend::incrementTextureGPUTransferCount();
+    object->setSyncState(GLSyncState::Pending);
+    Lock lock(_mutex);
+    _pendingTextures.push_back(texturePointer);
+}
+
+void GLTextureTransferHelper::setup() {
+#ifdef THREADED_TEXTURE_TRANSFER
+    _context.makeCurrent();
+
+#ifdef TEXTURE_TRANSFER_FORCE_DRAW
+    // FIXME don't use opengl 4.5 DSA functionality without verifying it's present
+    glCreateRenderbuffers(1, &_drawRenderbuffer);
+    glNamedRenderbufferStorage(_drawRenderbuffer, GL_RGBA8, 128, 128);
+    glCreateFramebuffers(1, &_drawFramebuffer);
+    glNamedFramebufferRenderbuffer(_drawFramebuffer, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, _drawRenderbuffer);
+    glCreateFramebuffers(1, &_readFramebuffer);
+#endif
+
+#ifdef TEXTURE_TRANSFER_PBOS
+    std::array<GLuint, TEXTURE_TRANSFER_PBO_COUNT> pbos;
+    glCreateBuffers(TEXTURE_TRANSFER_PBO_COUNT, &pbos[0]);
+    for (uint32_t i = 0; i < TEXTURE_TRANSFER_PBO_COUNT; ++i) {
+        TextureTransferBlock newBlock;
+        newBlock._pbo = pbos[i];
+        glNamedBufferStorage(newBlock._pbo, TEXTURE_TRANSFER_BLOCK_SIZE, 0, GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT);
+        newBlock._mapped = glMapNamedBufferRange(newBlock._pbo, 0, TEXTURE_TRANSFER_BLOCK_SIZE, GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT);
+        _readyQueue.push(newBlock);
+    }
+#endif
+#endif
+}
+
+void GLTextureTransferHelper::shutdown() {
+#ifdef THREADED_TEXTURE_TRANSFER
+    _context.makeCurrent();
+#endif
+
+#ifdef TEXTURE_TRANSFER_FORCE_DRAW
+    glNamedFramebufferRenderbuffer(_drawFramebuffer, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, 0);
+    glDeleteFramebuffers(1, &_drawFramebuffer);
+    _drawFramebuffer = 0;
+    glDeleteFramebuffers(1, &_readFramebuffer);
+    _readFramebuffer = 0;
+
+    glNamedFramebufferTexture(_readFramebuffer, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, 0);
+    glDeleteRenderbuffers(1, &_drawRenderbuffer);
+    _drawRenderbuffer = 0;
+#endif
+}
+
+void GLTextureTransferHelper::queueExecution(VoidLambda lambda) {
+    Lock lock(_mutex);
+    _pendingCommands.push_back(lambda);
+}
+
+#define MAX_TRANSFERS_PER_PASS 2
+
+bool GLTextureTransferHelper::process() {
+    // Take any new textures or commands off the queue
+    VoidLambdaList pendingCommands;
+    TextureList newTransferTextures;
+    {
+        Lock lock(_mutex);
+        newTransferTextures.swap(_pendingTextures);
+        pendingCommands.swap(_pendingCommands);
+    }
+
+    if (!pendingCommands.empty()) {
+        for (auto command : pendingCommands) {
+            command();
+        }
+        glFlush();
+    }
+
+    if (!newTransferTextures.empty()) {
+        for (auto& texturePointer : newTransferTextures) {
+#ifdef HAVE_NSIGHT
+            _map[texturePointer] = nvtxRangeStart("TextureTansfer");
+#endif
+            GLTexture* object = Backend::getGPUObject<GLTexture>(*texturePointer);
+            object->startTransfer();
+            _transferringTextures.push_back(texturePointer);
+            _textureIterator = _transferringTextures.begin();
+        }
+        _transferringTextures.sort([](const gpu::TexturePointer& a, const gpu::TexturePointer& b)->bool {
+            return a->getSize() < b->getSize();
+        });
+    }
+
+    // No transfers in progress, sleep
+    if (_transferringTextures.empty()) {
+#ifdef THREADED_TEXTURE_TRANSFER
+        QThread::usleep(1);
+#endif
+        return true;
+    }
+
+    static auto lastReport = usecTimestampNow();
+    auto now = usecTimestampNow();
+    auto lastReportInterval = now - lastReport;
+    if (lastReportInterval > USECS_PER_SECOND * 4) {
+        lastReport = now;
+        qDebug() << "Texture list " << _transferringTextures.size();
+    }
+
+    size_t transferCount = 0;
+    for (_textureIterator = _transferringTextures.begin(); _textureIterator != _transferringTextures.end();) {
+        if (++transferCount > MAX_TRANSFERS_PER_PASS) {
+            break;
+        }
+        auto texture = *_textureIterator;
+        GLTexture* gltexture = Backend::getGPUObject<GLTexture>(*texture);
+        if (gltexture->continueTransfer()) {
+            ++_textureIterator;
+            continue;
+        }
+
+        gltexture->finishTransfer();
+
+#ifdef TEXTURE_TRANSFER_FORCE_DRAW
+        // FIXME force a draw on the texture transfer thread before passing the texture to the main thread for use
+#endif
+
+#ifdef THREADED_TEXTURE_TRANSFER
+        clientWait();
+#endif
+        gltexture->_contentStamp = gltexture->_gpuObject.getDataStamp();
+        gltexture->updateSize();
+        gltexture->setSyncState(gpu::gl::GLSyncState::Transferred);
+        //CLIMAX_MERGE_START
+        //Backend::decrementTextureGPUTransferCount();
+#ifdef HAVE_NSIGHT
+        // Mark the texture as transferred
+        nvtxRangeEnd(_map[texture]);
+        _map.erase(texture);
+#endif
+        _textureIterator = _transferringTextures.erase(_textureIterator);
+    }
+
+#ifdef THREADED_TEXTURE_TRANSFER
+    if (!_transferringTextures.empty()) {
+        // Don't saturate the GPU
+        clientWait();
+    } else {
+        // Don't saturate the CPU
+        QThread::msleep(1);
+    }
+#endif
+
+    return true;
+}
diff --git a/libraries/gpu-gles/src/gpu/gl/GLTextureTransfer.h b/libraries/gpu-gles/src/gpu/gl/GLTextureTransfer.h
new file mode 100644
index 0000000000..a23c282fd4
--- /dev/null
+++ b/libraries/gpu-gles/src/gpu/gl/GLTextureTransfer.h
@@ -0,0 +1,78 @@
+//
+//  Created by Bradley Austin Davis on 2016/04/03
+//  Copyright 2013-2016 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_gpu_gl_GLTextureTransfer_h
+#define hifi_gpu_gl_GLTextureTransfer_h
+
+#include <QtGlobal>
+#include <QtCore/QSharedPointer>
+
+#include <GenericQueueThread.h>
+
+#include <gl/Context.h>
+
+#include "GLShared.h"
+
+#ifdef Q_OS_WIN
+#define THREADED_TEXTURE_TRANSFER
+#endif
+
+#ifdef THREADED_TEXTURE_TRANSFER
+// FIXME when sparse textures are enabled, it's harder to force a draw on the transfer thread
+// also, the current draw code is implicitly using OpenGL 4.5 functionality
+//#define TEXTURE_TRANSFER_FORCE_DRAW
+// FIXME PBO's increase the complexity and don't seem to work reliably
+//#define TEXTURE_TRANSFER_PBOS
+#endif
+
+namespace gpu { namespace gl {
+
+using TextureList = std::list<TexturePointer>;
+using TextureListIterator = TextureList::iterator;
+
+class GLTextureTransferHelper : public GenericThread {
+public:
+    using VoidLambda = std::function<void()>;
+    using VoidLambdaList = std::list<VoidLambda>;
+    using Pointer = std::shared_ptr<GLTextureTransferHelper>;
+    GLTextureTransferHelper();
+    ~GLTextureTransferHelper();
+    void transferTexture(const gpu::TexturePointer& texturePointer);
+    void queueExecution(VoidLambda lambda);
+
+    void setup() override;
+    void shutdown() override;
+    bool process() override;
+
+private:
+#ifdef THREADED_TEXTURE_TRANSFER
+    ::gl::OffscreenContext _context;
+#endif
+
+#ifdef TEXTURE_TRANSFER_FORCE_DRAW
+    // Framebuffers / renderbuffers for forcing access to the texture on the transfer thread
+    GLuint _drawRenderbuffer { 0 };
+    GLuint _drawFramebuffer { 0 };
+    GLuint _readFramebuffer { 0 };
+#endif
+
+    // A mutex for protecting items access on the render and transfer threads
+    Mutex _mutex;
+    // Commands that have been submitted for execution on the texture transfer thread
+    VoidLambdaList _pendingCommands;
+    // Textures that have been submitted for transfer
+    TextureList _pendingTextures;
+    // Textures currently in the transfer process
+    // Only used on the transfer thread
+    TextureList _transferringTextures;
+    TextureListIterator _textureIterator;
+
+};
+
+} }
+
+#endif
\ No newline at end of file
diff --git a/libraries/gpu-gles/src/gpu/gles/GLESBackend.cpp b/libraries/gpu-gles/src/gpu/gles/GLESBackend.cpp
new file mode 100644
index 0000000000..8c843c1ce3
--- /dev/null
+++ b/libraries/gpu-gles/src/gpu/gles/GLESBackend.cpp
@@ -0,0 +1,197 @@
+//
+//  Created by Gabriel Calero & Cristian Duarte on 9/27/2016.
+//  Copyright 2016 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 "GLESBackend.h"
+
+#include <mutex>
+#include <queue>
+#include <list>
+#include <functional>
+#include <glm/gtc/type_ptr.hpp>
+
+Q_LOGGING_CATEGORY(gpugleslogging, "hifi.gpu.gles")
+
+using namespace gpu;
+using namespace gpu::gles;
+
+const std::string GLESBackend::GLES_VERSION { "GLES" };
+
+void GLESBackend::do_draw(const Batch& batch, size_t paramOffset) {
+    Primitive primitiveType = (Primitive)batch._params[paramOffset + 2]._uint;
+    GLenum mode = gl::PRIMITIVE_TO_GL[primitiveType];
+    uint32 numVertices = batch._params[paramOffset + 1]._uint;
+    uint32 startVertex = batch._params[paramOffset + 0]._uint;
+
+    if (isStereo()) {
+#ifdef GPU_STEREO_DRAWCALL_INSTANCED
+        glDrawArraysInstanced(mode, startVertex, numVertices, 2);
+#else
+
+        setupStereoSide(0);
+        glDrawArrays(mode, startVertex, numVertices);
+        setupStereoSide(1);
+        glDrawArrays(mode, startVertex, numVertices);
+
+#endif
+        _stats._DSNumTriangles += 2 * numVertices / 3;
+        _stats._DSNumDrawcalls += 2;
+
+    } else {
+        glDrawArrays(mode, startVertex, numVertices);
+        _stats._DSNumTriangles += numVertices / 3;
+        _stats._DSNumDrawcalls++;
+    }
+    _stats._DSNumAPIDrawcalls++;
+
+    (void) CHECK_GL_ERROR();
+}
+
+void GLESBackend::do_drawIndexed(const Batch& batch, size_t paramOffset) {
+    Primitive primitiveType = (Primitive)batch._params[paramOffset + 2]._uint;
+    GLenum mode = gl::PRIMITIVE_TO_GL[primitiveType];
+    uint32 numIndices = batch._params[paramOffset + 1]._uint;
+    uint32 startIndex = batch._params[paramOffset + 0]._uint;
+
+    GLenum glType = gl::ELEMENT_TYPE_TO_GL[_input._indexBufferType];
+    
+    auto typeByteSize = TYPE_SIZE[_input._indexBufferType];
+    GLvoid* indexBufferByteOffset = reinterpret_cast<GLvoid*>(startIndex * typeByteSize + _input._indexBufferOffset);
+
+    if (isStereo()) {
+#ifdef GPU_STEREO_DRAWCALL_INSTANCED
+        glDrawElementsInstanced(mode, numIndices, glType, indexBufferByteOffset, 2);
+#else
+        setupStereoSide(0);
+        glDrawElements(mode, numIndices, glType, indexBufferByteOffset);
+        setupStereoSide(1);
+        glDrawElements(mode, numIndices, glType, indexBufferByteOffset);
+#endif
+        _stats._DSNumTriangles += 2 * numIndices / 3;
+        _stats._DSNumDrawcalls += 2;
+    } else {
+        //qDebug() << "GLESBackend::do_drawIndexed glDrawElements " << numIndices;
+        glDrawElements(mode, numIndices, glType, indexBufferByteOffset);
+        _stats._DSNumTriangles += numIndices / 3;
+        _stats._DSNumDrawcalls++;
+    }
+    _stats._DSNumAPIDrawcalls++;
+
+    (void) CHECK_GL_ERROR();
+}
+
+void GLESBackend::do_drawInstanced(const Batch& batch, size_t paramOffset) {
+    GLint numInstances = batch._params[paramOffset + 4]._uint;
+    Primitive primitiveType = (Primitive)batch._params[paramOffset + 3]._uint;
+    GLenum mode = gl::PRIMITIVE_TO_GL[primitiveType];
+    uint32 numVertices = batch._params[paramOffset + 2]._uint;
+    uint32 startVertex = batch._params[paramOffset + 1]._uint;
+
+
+    if (isStereo()) {
+        GLint trueNumInstances = 2 * numInstances;
+
+#ifdef GPU_STEREO_DRAWCALL_INSTANCED
+        glDrawArraysInstanced(mode, startVertex, numVertices, trueNumInstances);
+#else
+        setupStereoSide(0);
+        glDrawArraysInstanced(mode, startVertex, numVertices, numInstances);
+        setupStereoSide(1);
+        glDrawArraysInstanced(mode, startVertex, numVertices, numInstances);
+#endif
+        _stats._DSNumTriangles += (trueNumInstances * numVertices) / 3;
+        _stats._DSNumDrawcalls += trueNumInstances;
+    } else {
+        //qDebug() << "GLESBackend::do_drawInstanced glDrawArraysInstancedEXT " << numVertices << "," << numInstances;
+        glDrawArraysInstanced(mode, startVertex, numVertices, numInstances);
+        _stats._DSNumTriangles += (numInstances * numVertices) / 3;
+        _stats._DSNumDrawcalls += numInstances;
+    }
+    _stats._DSNumAPIDrawcalls++;
+
+    (void) CHECK_GL_ERROR();
+}
+
+void glbackend_glDrawElementsInstancedBaseVertexBaseInstance(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount, GLint basevertex, GLuint baseinstance) {
+//#if (GPU_INPUT_PROFILE == GPU_CORE_43)
+    //glDrawElementsInstancedBaseVertexBaseInstance(mode, count, type, indices, primcount, basevertex, baseinstance);
+//#else
+    glDrawElementsInstanced(mode, count, type, indices, primcount);
+//#endif
+}
+
+void GLESBackend::do_drawIndexedInstanced(const Batch& batch, size_t paramOffset) {
+    GLint numInstances = batch._params[paramOffset + 4]._uint;
+    GLenum mode = gl::PRIMITIVE_TO_GL[(Primitive)batch._params[paramOffset + 3]._uint];
+    uint32 numIndices = batch._params[paramOffset + 2]._uint;
+    uint32 startIndex = batch._params[paramOffset + 1]._uint;
+    // FIXME glDrawElementsInstancedBaseVertexBaseInstance is only available in GL 4.3 
+    // and higher, so currently we ignore this field
+    uint32 startInstance = batch._params[paramOffset + 0]._uint;
+    GLenum glType = gl::ELEMENT_TYPE_TO_GL[_input._indexBufferType];
+
+    auto typeByteSize = TYPE_SIZE[_input._indexBufferType];
+    GLvoid* indexBufferByteOffset = reinterpret_cast<GLvoid*>(startIndex * typeByteSize + _input._indexBufferOffset);
+ 
+    if (isStereo()) {
+        GLint trueNumInstances = 2 * numInstances;
+
+#ifdef GPU_STEREO_DRAWCALL_INSTANCED
+        glbackend_glDrawElementsInstancedBaseVertexBaseInstance(mode, numIndices, glType, indexBufferByteOffset, trueNumInstances, 0, startInstance);
+#else
+        setupStereoSide(0);
+        glbackend_glDrawElementsInstancedBaseVertexBaseInstance(mode, numIndices, glType, indexBufferByteOffset, numInstances, 0, startInstance);
+        setupStereoSide(1);
+        glbackend_glDrawElementsInstancedBaseVertexBaseInstance(mode, numIndices, glType, indexBufferByteOffset, numInstances, 0, startInstance);
+#endif
+
+        _stats._DSNumTriangles += (trueNumInstances * numIndices) / 3;
+        _stats._DSNumDrawcalls += trueNumInstances;
+    } else {
+        //qDebug() << "GLESBackend::do_drawIndexedInstanced glbackend_glDrawElementsInstancedBaseVertexBaseInstance " << numInstances;
+        glbackend_glDrawElementsInstancedBaseVertexBaseInstance(mode, numIndices, glType, indexBufferByteOffset, numInstances, 0, startInstance);
+        _stats._DSNumTriangles += (numInstances * numIndices) / 3;
+        _stats._DSNumDrawcalls += numInstances;
+    }
+
+    _stats._DSNumAPIDrawcalls++;
+
+    (void)CHECK_GL_ERROR();
+}
+
+
+void GLESBackend::do_multiDrawIndirect(const Batch& batch, size_t paramOffset) {
+#if (GPU_INPUT_PROFILE == GPU_CORE_43)
+    uint commandCount = batch._params[paramOffset + 0]._uint;
+    GLenum mode = gl::PRIMITIVE_TO_GL[(Primitive)batch._params[paramOffset + 1]._uint];
+
+    //glMultiDrawArraysIndirect(mode, reinterpret_cast<GLvoid*>(_input._indirectBufferOffset), commandCount, (GLsizei)_input._indirectBufferStride);
+    qDebug() << "TODO: GLESBackend.cpp:do_multiDrawIndirect do_multiDrawIndirect";
+    _stats._DSNumDrawcalls += commandCount;
+    _stats._DSNumAPIDrawcalls++;
+
+#else
+    // FIXME implement the slow path
+#endif
+    (void)CHECK_GL_ERROR();
+
+}
+
+void GLESBackend::do_multiDrawIndexedIndirect(const Batch& batch, size_t paramOffset) {
+//#if (GPU_INPUT_PROFILE == GPU_CORE_43)
+    uint commandCount = batch._params[paramOffset + 0]._uint;
+    GLenum mode = gl::PRIMITIVE_TO_GL[(Primitive)batch._params[paramOffset + 1]._uint];
+    GLenum indexType = gl::ELEMENT_TYPE_TO_GL[_input._indexBufferType];
+  
+    //glMultiDrawElementsIndirect(mode, indexType, reinterpret_cast<GLvoid*>(_input._indirectBufferOffset), commandCount, (GLsizei)_input._indirectBufferStride);
+    qDebug() << "TODO: GLESBackend.cpp:do_multiDrawIndexedIndirect glMultiDrawElementsIndirect";
+    _stats._DSNumDrawcalls += commandCount;
+    _stats._DSNumAPIDrawcalls++;
+//#else
+    // FIXME implement the slow path
+//#endif
+    (void)CHECK_GL_ERROR();
+}
diff --git a/libraries/gpu-gles/src/gpu/gles/GLESBackend.h b/libraries/gpu-gles/src/gpu/gles/GLESBackend.h
new file mode 100644
index 0000000000..69a417d952
--- /dev/null
+++ b/libraries/gpu-gles/src/gpu/gles/GLESBackend.h
@@ -0,0 +1,99 @@
+//
+//  GLESBackend.h
+//  libraries/gpu-gl-android/src/gpu/gles
+//
+//  Created by Gabriel Calero & Cristian Duarte on 9/27/2016.
+//  Copyright 2016 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_gpu_gles_GLESBackend_h
+#define hifi_gpu_gles_GLESBackend_h
+
+#include <gl/Config.h>
+
+#include "../gl/GLBackend.h"
+#include "../gl/GLTexture.h"
+
+
+namespace gpu { namespace gles {
+
+using namespace gpu::gl;
+
+class GLESBackend : public GLBackend {
+    using Parent = GLBackend;
+    // Context Backend static interface required
+    friend class Context;
+
+public:
+    explicit GLESBackend(bool syncCache) : Parent(syncCache) {}
+    GLESBackend() : Parent() {}
+    virtual ~GLESBackend() {
+        // call resetStages here rather than in ~GLBackend dtor because it will call releaseResourceBuffer
+        // which is pure virtual from GLBackend's dtor.
+        resetStages();
+    }
+    
+    static const std::string GLES_VERSION;
+    const std::string& getVersion() const override { return GLES_VERSION; }
+
+    
+    class GLESTexture : public GLTexture {
+        using Parent = GLTexture;
+        GLuint allocate();
+    public:
+        GLESTexture(const std::weak_ptr<GLBackend>& backend, const Texture& buffer, GLuint externalId);
+        GLESTexture(const std::weak_ptr<GLBackend>& backend, const Texture& buffer, bool transferrable);
+
+    protected:
+        void transferMip(uint16_t mipLevel, uint8_t face) const;
+        void startTransfer() override;
+        void allocateStorage() const override;
+        void updateSize() const override;
+        void syncSampler() const override;
+        void generateMips() const override;
+    };
+
+
+protected:
+    GLuint getFramebufferID(const FramebufferPointer& framebuffer) override;
+    GLFramebuffer* syncGPUObject(const Framebuffer& framebuffer) override;
+
+    GLuint getBufferID(const Buffer& buffer) override;
+    GLBuffer* syncGPUObject(const Buffer& buffer) override;
+
+    GLuint getTextureID(const TexturePointer& texture, bool needTransfer = true) override;
+    GLTexture* syncGPUObject(const TexturePointer& texture, bool sync = true) override;
+
+    GLuint getQueryID(const QueryPointer& query) override;
+    GLQuery* syncGPUObject(const Query& query) override;
+
+    // Draw Stage
+    void do_draw(const Batch& batch, size_t paramOffset) override;
+    void do_drawIndexed(const Batch& batch, size_t paramOffset) override;
+    void do_drawInstanced(const Batch& batch, size_t paramOffset) override;
+    void do_drawIndexedInstanced(const Batch& batch, size_t paramOffset) override;
+    void do_multiDrawIndirect(const Batch& batch, size_t paramOffset) override;
+    void do_multiDrawIndexedIndirect(const Batch& batch, size_t paramOffset) override;
+
+    // Input Stage
+    void updateInput() override;
+    void resetInputStage() override;
+
+    // Synchronize the state cache of this Backend with the actual real state of the GL Context
+    void transferTransformState(const Batch& batch) const override;
+    void initTransform() override;
+    void updateTransform(const Batch& batch);
+    void resetTransformStage();
+
+    // Output stage
+    void do_blit(const Batch& batch, size_t paramOffset) override;
+};
+
+} }
+
+Q_DECLARE_LOGGING_CATEGORY(gpugleslogging)
+
+
+#endif
\ No newline at end of file
diff --git a/libraries/gpu-gles/src/gpu/gles/GLESBackendBuffer.cpp b/libraries/gpu-gles/src/gpu/gles/GLESBackendBuffer.cpp
new file mode 100644
index 0000000000..f6bdea45af
--- /dev/null
+++ b/libraries/gpu-gles/src/gpu/gles/GLESBackendBuffer.cpp
@@ -0,0 +1,69 @@
+//
+//  Created by Gabriel Calero & Cristian Duarte on 09/27/2016
+//  Copyright 2013-2016 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 "GLESBackend.h"
+#include "../gl/GLBuffer.h"
+
+namespace gpu {
+    namespace gles {
+
+        class GLESBuffer : public gpu::gl::GLBuffer {
+            using Parent = gpu::gl::GLBuffer;
+            static GLuint allocate() {
+                GLuint result;
+                glGenBuffers(1, &result);
+                return result;
+            }
+
+        public:
+            GLESBuffer(const std::weak_ptr<gl::GLBackend>& backend, const Buffer& buffer, GLESBuffer* original) : Parent(backend, buffer, allocate()) {
+                glBindBuffer(GL_ARRAY_BUFFER, _buffer);
+                glBufferData(GL_ARRAY_BUFFER, _size, nullptr, GL_DYNAMIC_DRAW);
+                glBindBuffer(GL_ARRAY_BUFFER, 0);
+
+                if (original && original->_size) {
+                    glBindBuffer(GL_COPY_WRITE_BUFFER, _buffer);
+                    glBindBuffer(GL_COPY_READ_BUFFER, original->_buffer);
+                    glCopyBufferSubData(GL_COPY_READ_BUFFER, GL_COPY_WRITE_BUFFER, 0, 0, original->_size);
+                    glBindBuffer(GL_COPY_WRITE_BUFFER, 0);
+                    glBindBuffer(GL_COPY_READ_BUFFER, 0);
+                    (void)CHECK_GL_ERROR();
+                }
+                Backend::setGPUObject(buffer, this);
+            }
+
+            void transfer() override {
+                glBindBuffer(GL_ARRAY_BUFFER, _buffer);
+                (void)CHECK_GL_ERROR();
+                Size offset;
+                Size size;
+                Size currentPage { 0 };
+                auto data = _gpuObject._renderSysmem.readData();
+                while (_gpuObject._renderPages.getNextTransferBlock(offset, size, currentPage)) {
+                    glBufferSubData(GL_ARRAY_BUFFER, offset, size, data + offset);
+                    (void)CHECK_GL_ERROR();
+                }
+                glBindBuffer(GL_ARRAY_BUFFER, 0);
+                (void)CHECK_GL_ERROR();
+                _gpuObject._renderPages._flags &= ~PageManager::DIRTY;
+            }
+        };
+    }
+}
+
+using namespace gpu;
+using namespace gpu::gl;
+using namespace gpu::gles;
+
+
+GLuint GLESBackend::getBufferID(const Buffer& buffer) {
+    return GLESBuffer::getId<GLESBuffer>(*this, buffer);
+}
+
+GLBuffer* GLESBackend::syncGPUObject(const Buffer& buffer) {
+    return GLESBuffer::sync<GLESBuffer>(*this, buffer);
+}
diff --git a/libraries/gpu-gles/src/gpu/gles/GLESBackendInput.cpp b/libraries/gpu-gles/src/gpu/gles/GLESBackendInput.cpp
new file mode 100644
index 0000000000..d37a01eb90
--- /dev/null
+++ b/libraries/gpu-gles/src/gpu/gles/GLESBackendInput.cpp
@@ -0,0 +1,29 @@
+//
+//  GLESBackendInput.cpp
+//  libraries/gpu-gl-android/src/gpu/gles
+//
+//  Created by Cristian Duarte & Gabriel Calero on 10/7/2016.
+//  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 "GLESBackend.h"
+
+using namespace gpu;
+using namespace gpu::gles;
+
+void GLESBackend::updateInput() {
+    Parent::updateInput();
+}
+
+
+void GLESBackend::resetInputStage() {
+    Parent::resetInputStage();
+
+    glBindBuffer(GL_ARRAY_BUFFER, 0);
+    for (uint32_t i = 0; i < _input._attributeActivation.size(); i++) {
+        glDisableVertexAttribArray(i);
+        glVertexAttribPointer(i, 4, GL_FLOAT, GL_FALSE, 0, 0);
+    }
+}
\ No newline at end of file
diff --git a/libraries/gpu-gles/src/gpu/gles/GLESBackendOutput.cpp b/libraries/gpu-gles/src/gpu/gles/GLESBackendOutput.cpp
new file mode 100644
index 0000000000..8bf9267fde
--- /dev/null
+++ b/libraries/gpu-gles/src/gpu/gles/GLESBackendOutput.cpp
@@ -0,0 +1,169 @@
+//
+//  GLESBackendOutput.cpp
+//  libraries/gpu-gl-android/src/gpu/gles
+//
+//  Created by Gabriel Calero & Cristian Duarte on 9/27/2016.
+//  Copyright 2016 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 "GLESBackend.h"
+
+#include <QtGui/QImage>
+
+#include "../gl/GLFramebuffer.h"
+#include "../gl/GLTexture.h"
+
+namespace gpu { namespace gles { 
+
+class GLESFramebuffer : public gl::GLFramebuffer {
+    using Parent = gl::GLFramebuffer;
+    static GLuint allocate() {
+        GLuint result;
+        glGenFramebuffers(1, &result);
+        return result;
+    }
+public:
+    void update() override {
+        GLint currentFBO = -1;
+        glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &currentFBO);
+        glBindFramebuffer(GL_FRAMEBUFFER, _fbo);
+        gl::GLTexture* gltexture = nullptr;
+        TexturePointer surface;
+        if (_gpuObject.getColorStamps() != _colorStamps) {
+            if (_gpuObject.hasColor()) {
+                _colorBuffers.clear();
+                static const GLenum colorAttachments[] = {
+                    GL_COLOR_ATTACHMENT0,
+                    GL_COLOR_ATTACHMENT1,
+                    GL_COLOR_ATTACHMENT2,
+                    GL_COLOR_ATTACHMENT3,
+                    GL_COLOR_ATTACHMENT4,
+                    GL_COLOR_ATTACHMENT5,
+                    GL_COLOR_ATTACHMENT6,
+                    GL_COLOR_ATTACHMENT7,
+                    GL_COLOR_ATTACHMENT8,
+                    GL_COLOR_ATTACHMENT9,
+                    GL_COLOR_ATTACHMENT10,
+                    GL_COLOR_ATTACHMENT11,
+                    GL_COLOR_ATTACHMENT12,
+                    GL_COLOR_ATTACHMENT13,
+                    GL_COLOR_ATTACHMENT14,
+                    GL_COLOR_ATTACHMENT15 };
+
+                int unit = 0;
+                for (auto& b : _gpuObject.getRenderBuffers()) {
+                    surface = b._texture;
+                    if (surface) {
+                        gltexture = gl::GLTexture::sync<GLESBackend::GLESTexture>(*_backend.lock().get(), surface, false); // Grab the gltexture and don't transfer
+                    } else {
+                        gltexture = nullptr;
+                    }
+
+                    if (gltexture) {
+                        glFramebufferTexture2D(GL_FRAMEBUFFER, colorAttachments[unit], GL_TEXTURE_2D, gltexture->_texture, 0);
+                        _colorBuffers.push_back(colorAttachments[unit]);
+                    } else {
+                        glFramebufferTexture2D(GL_FRAMEBUFFER, colorAttachments[unit], GL_TEXTURE_2D, 0, 0);
+                    }
+                    unit++;
+                }
+            }
+            _colorStamps = _gpuObject.getColorStamps();
+        }
+
+        GLenum attachement = GL_DEPTH_STENCIL_ATTACHMENT;
+        if (!_gpuObject.hasStencil()) {
+            attachement = GL_DEPTH_ATTACHMENT;
+        } else if (!_gpuObject.hasDepth()) {
+            attachement = GL_STENCIL_ATTACHMENT;
+        }
+
+        if (_gpuObject.getDepthStamp() != _depthStamp) {
+            auto surface = _gpuObject.getDepthStencilBuffer();
+            if (_gpuObject.hasDepthStencil() && surface) {
+                gltexture = gl::GLTexture::sync<GLESBackend::GLESTexture>(*_backend.lock().get(), surface, false); // Grab the gltexture and don't transfer
+            }
+
+            if (gltexture) {
+                glFramebufferTexture2D(GL_FRAMEBUFFER, attachement, GL_TEXTURE_2D, gltexture->_texture, 0);
+            } else {
+                glFramebufferTexture2D(GL_FRAMEBUFFER, attachement, GL_TEXTURE_2D, 0, 0);
+            }
+            _depthStamp = _gpuObject.getDepthStamp();
+        }
+
+
+        // Last but not least, define where we draw
+        if (!_colorBuffers.empty()) {
+            glDrawBuffers((GLsizei)_colorBuffers.size(), _colorBuffers.data());
+        } else {
+            glDrawBuffers(1, {GL_NONE});
+        }
+
+        // Now check for completness
+        _status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
+
+        // restore the current framebuffer
+        if (currentFBO != -1) {
+            glBindFramebuffer(GL_DRAW_FRAMEBUFFER, currentFBO);
+        }
+
+        checkStatus(GL_DRAW_FRAMEBUFFER);
+    }
+
+
+public:
+    GLESFramebuffer(const std::weak_ptr<gl::GLBackend>& backend, const gpu::Framebuffer& framebuffer)
+        : Parent(backend, framebuffer, allocate()) { }
+};
+
+gl::GLFramebuffer* gpu::gles::GLESBackend::syncGPUObject(const Framebuffer& framebuffer) {
+    return GLESFramebuffer::sync<GLESFramebuffer>(*this, framebuffer);
+}
+
+GLuint GLESBackend::getFramebufferID(const FramebufferPointer& framebuffer) {
+    return framebuffer ? GLESFramebuffer::getId<GLESFramebuffer>(*this, *framebuffer) : 0;
+}
+
+void GLESBackend::do_blit(const Batch& batch, size_t paramOffset) {
+    auto srcframebuffer = batch._framebuffers.get(batch._params[paramOffset]._uint);
+    Vec4i srcvp;
+    for (auto i = 0; i < 4; ++i) {
+        srcvp[i] = batch._params[paramOffset + 1 + i]._int;
+    }
+
+    auto dstframebuffer = batch._framebuffers.get(batch._params[paramOffset + 5]._uint);
+    Vec4i dstvp;
+    for (auto i = 0; i < 4; ++i) {
+        dstvp[i] = batch._params[paramOffset + 6 + i]._int;
+    }
+
+    // Assign dest framebuffer if not bound already
+    auto newDrawFBO = getFramebufferID(dstframebuffer);
+    if (_output._drawFBO != newDrawFBO) {
+        glBindFramebuffer(GL_DRAW_FRAMEBUFFER, newDrawFBO);
+    }
+
+    // always bind the read fbo
+    glBindFramebuffer(GL_READ_FRAMEBUFFER, getFramebufferID(srcframebuffer));
+
+    // Blit!
+    glBlitFramebuffer(srcvp.x, srcvp.y, srcvp.z, srcvp.w, 
+        dstvp.x, dstvp.y, dstvp.z, dstvp.w,
+        GL_COLOR_BUFFER_BIT, GL_LINEAR);
+
+    // Always clean the read fbo to 0
+    glBindFramebuffer(GL_READ_FRAMEBUFFER, 0);
+
+    // Restore draw fbo if changed
+    if (_output._drawFBO != newDrawFBO) {
+        glBindFramebuffer(GL_DRAW_FRAMEBUFFER, _output._drawFBO);
+    }
+
+    (void) CHECK_GL_ERROR();
+}
+
+
+} }
diff --git a/libraries/gpu-gles/src/gpu/gles/GLESBackendQuery.cpp b/libraries/gpu-gles/src/gpu/gles/GLESBackendQuery.cpp
new file mode 100644
index 0000000000..db541b07bc
--- /dev/null
+++ b/libraries/gpu-gles/src/gpu/gles/GLESBackendQuery.cpp
@@ -0,0 +1,38 @@
+//
+//  GLESBackendQuery.cpp
+//  libraries/gpu-gl-android/src/gpu/gles
+//
+//  Created by Gabriel Calero & Cristian Duarte on 9/27/2016
+//  Copyright 2016 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 "GLESBackend.h"
+
+#include "../gl/GLQuery.h"
+
+using namespace gpu;
+using namespace gpu::gl;
+using namespace gpu::gles; 
+
+class GLESQuery : public GLQuery {
+    using Parent = GLQuery;
+public:
+    static GLuint allocateQuery() {
+        GLuint result;
+        glGenQueries(1, &result);
+        return result;
+    }
+
+    GLESQuery(const std::weak_ptr<GLBackend>& backend, const Query& query)
+        : Parent(backend, query, allocateQuery(), allocateQuery()) { }
+};
+
+GLQuery* GLESBackend::syncGPUObject(const Query& query) {
+    return GLESQuery::sync<GLESQuery>(*this, query);
+}
+
+GLuint GLESBackend::getQueryID(const QueryPointer& query) {
+    return GLESQuery::getId<GLESQuery>(*this, query);
+}
diff --git a/libraries/gpu-gles/src/gpu/gles/GLESBackendTexture.cpp b/libraries/gpu-gles/src/gpu/gles/GLESBackendTexture.cpp
new file mode 100644
index 0000000000..31a98edd12
--- /dev/null
+++ b/libraries/gpu-gles/src/gpu/gles/GLESBackendTexture.cpp
@@ -0,0 +1,176 @@
+//
+//  GLESBackendTexture.cpp
+//  libraries/gpu-gl-android/src/gpu/gles
+//
+//  Created by Gabriel Calero & Cristian Duarte on 9/27/2016.
+//  Copyright 2016 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 "GLESBackend.h"
+
+#include <unordered_set>
+#include <unordered_map>
+#include <QtCore/QThread>
+
+// #include "../gl/GLTexelFormat.h"
+
+using namespace gpu;
+using namespace gpu::gl;
+using namespace gpu::gles;
+
+//using GL41TexelFormat = GLTexelFormat;
+using GLESTexture = GLESBackend::GLESTexture;
+
+GLuint GLESTexture::allocate() {
+    //CLIMAX_MERGE_START
+    //Backend::incrementTextureGPUCount();
+    //CLIMAX_MERGE_END
+    GLuint result;
+    glGenTextures(1, &result);
+    return result;
+}
+
+GLuint GLESBackend::getTextureID(const TexturePointer& texture, bool transfer) {
+    return GLESTexture::getId<GLESTexture>(*this, texture, transfer);
+}
+
+GLTexture* GLESBackend::syncGPUObject(const TexturePointer& texture, bool transfer) {
+    return GLESTexture::sync<GLESTexture>(*this, texture, transfer);
+}
+
+GLESTexture::GLESTexture(const std::weak_ptr<GLBackend>& backend, const Texture& texture, GLuint externalId) 
+    : GLTexture(backend, texture, externalId) {
+}
+
+GLESTexture::GLESTexture(const std::weak_ptr<GLBackend>& backend, const Texture& texture, bool transferrable) 
+    : GLTexture(backend, texture, allocate(), transferrable) {
+}
+
+void GLESTexture::generateMips() const {
+    withPreservedTexture([&] {
+        glGenerateMipmap(_target);
+    });
+    (void)CHECK_GL_ERROR();
+}
+
+void GLESTexture::allocateStorage() const {
+    GLTexelFormat texelFormat = GLTexelFormat::evalGLTexelFormat(_gpuObject.getTexelFormat());
+    glTexParameteri(_target, GL_TEXTURE_BASE_LEVEL, 0);
+    (void)CHECK_GL_ERROR();
+    glTexParameteri(_target, GL_TEXTURE_MAX_LEVEL, _maxMip - _minMip);
+    (void)CHECK_GL_ERROR();
+/*    if (GLEW_VERSION_4_2 && !_gpuObject.getTexelFormat().isCompressed()) {
+        // Get the dimensions, accounting for the downgrade level
+        Vec3u dimensions = _gpuObject.evalMipDimensions(_minMip);
+        glTexStorage2D(_target, usedMipLevels(), texelFormat.internalFormat, dimensions.x, dimensions.y);
+        (void)CHECK_GL_ERROR();
+    } else {*/
+        for (uint16_t l = _minMip; l <= _maxMip; l++) {
+            // Get the mip level dimensions, accounting for the downgrade level
+            Vec3u dimensions = _gpuObject.evalMipDimensions(l);
+            for (GLenum target : getFaceTargets(_target)) {
+                glTexImage2D(target, l - _minMip, texelFormat.internalFormat, dimensions.x, dimensions.y, 0, texelFormat.format, texelFormat.type, NULL);
+                (void)CHECK_GL_ERROR();
+            }
+        }
+    //}
+}
+
+void GLESTexture::updateSize() const {
+    setSize(_virtualSize);
+    if (!_id) {
+        return;
+    }
+
+    if (_gpuObject.getTexelFormat().isCompressed()) {
+        GLenum proxyType = GL_TEXTURE_2D;
+        GLuint numFaces = 1;
+        if (_gpuObject.getType() == gpu::Texture::TEX_CUBE) {
+            proxyType = CUBE_FACE_LAYOUT[0];
+            numFaces = (GLuint)CUBE_NUM_FACES;
+        }
+        GLint gpuSize{ 0 };
+        glGetTexLevelParameteriv(proxyType, 0, GL_TEXTURE_COMPRESSED, &gpuSize);
+        (void)CHECK_GL_ERROR();
+
+        if (gpuSize) {
+            for (GLuint level = _minMip; level < _maxMip; level++) {
+                GLint levelSize{ 0 };
+                //glGetTexLevelParameteriv(proxyType, level, GL_TEXTURE_COMPRESSED_IMAGE_SIZE, &levelSize);
+                //qDebug() << "TODO: GLBackendTexture.cpp:updateSize GL_TEXTURE_COMPRESSED_IMAGE_SIZE";
+                levelSize *= numFaces;
+                
+                if (levelSize <= 0) {
+                    break;
+                }
+                gpuSize += levelSize;
+            }
+            (void)CHECK_GL_ERROR();
+            setSize(gpuSize);
+            return;
+        } 
+    } 
+}
+
+// Move content bits from the CPU to the GPU for a given mip / face
+void GLESTexture::transferMip(uint16_t mipLevel, uint8_t face) const {
+    auto mip = _gpuObject.accessStoredMipFace(mipLevel, face);
+    GLTexelFormat texelFormat = GLTexelFormat::evalGLTexelFormat(_gpuObject.getTexelFormat(), _gpuObject.getStoredMipFormat());
+    //GLenum target = getFaceTargets()[face];
+    GLenum target = _target == GL_TEXTURE_2D ? GL_TEXTURE_2D : CUBE_FACE_LAYOUT[face];
+    auto size = _gpuObject.evalMipDimensions(mipLevel);
+    glTexSubImage2D(target, mipLevel, 0, 0, size.x, size.y, texelFormat.format, texelFormat.type, mip->readData());
+    (void)CHECK_GL_ERROR();
+}
+
+void GLESTexture::startTransfer() {
+    PROFILE_RANGE(render_gpu_gl, __FUNCTION__);
+    Parent::startTransfer();
+
+    glBindTexture(_target, _id);
+    (void)CHECK_GL_ERROR();
+
+    // transfer pixels from each faces
+    uint8_t numFaces = (Texture::TEX_CUBE == _gpuObject.getType()) ? CUBE_NUM_FACES : 1;
+    for (uint8_t f = 0; f < numFaces; f++) {
+        for (uint16_t i = 0; i < Sampler::MAX_MIP_LEVEL; ++i) {
+            if (_gpuObject.isStoredMipFaceAvailable(i, f)) {
+                transferMip(i, f);
+            }
+        }
+    }
+}
+
+void GLESBackend::GLESTexture::syncSampler() const {
+    const Sampler& sampler = _gpuObject.getSampler();
+    const auto& fm = FILTER_MODES[sampler.getFilter()];
+    glTexParameteri(_target, GL_TEXTURE_MIN_FILTER, fm.minFilter);
+    glTexParameteri(_target, GL_TEXTURE_MAG_FILTER, fm.magFilter);
+
+    if (sampler.doComparison()) {
+        glTexParameteri(_target, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_REF_TO_TEXTURE);
+        glTexParameteri(_target, GL_TEXTURE_COMPARE_FUNC, COMPARISON_TO_GL[sampler.getComparisonFunction()]);
+    } else {
+        glTexParameteri(_target, GL_TEXTURE_COMPARE_MODE, GL_NONE);
+    }
+
+    glTexParameteri(_target, GL_TEXTURE_WRAP_S, WRAP_MODES[sampler.getWrapModeU()]);
+    glTexParameteri(_target, GL_TEXTURE_WRAP_T, WRAP_MODES[sampler.getWrapModeV()]);
+    glTexParameteri(_target, GL_TEXTURE_WRAP_R, WRAP_MODES[sampler.getWrapModeW()]);
+
+    glTexParameterfv(_target, GL_TEXTURE_BORDER_COLOR_EXT, (const float*)&sampler.getBorderColor());
+    
+
+    glTexParameteri(_target, GL_TEXTURE_BASE_LEVEL, (uint16)sampler.getMipOffset());
+    glTexParameterf(_target, GL_TEXTURE_MIN_LOD, (float)sampler.getMinMip());
+    glTexParameterf(_target, GL_TEXTURE_MAX_LOD, (sampler.getMaxMip() == Sampler::MAX_MIP_LEVEL ? 1000.f : sampler.getMaxMip()));
+    (void)CHECK_GL_ERROR();
+    //qDebug() << "[GPU-GL-GLBackend] syncSampler 12 " << _target << "," << sampler.getMaxAnisotropy();
+    //glTexParameterf(_target, GL_TEXTURE_MAX_ANISOTROPY_EXT, sampler.getMaxAnisotropy());
+    //(void)CHECK_GL_ERROR();
+    //qDebug() << "[GPU-GL-GLBackend] syncSampler end";
+
+}
+
diff --git a/libraries/gpu-gles/src/gpu/gles/GLESBackendTransform.cpp b/libraries/gpu-gles/src/gpu/gles/GLESBackendTransform.cpp
new file mode 100644
index 0000000000..5050db6edd
--- /dev/null
+++ b/libraries/gpu-gles/src/gpu/gles/GLESBackendTransform.cpp
@@ -0,0 +1,67 @@
+//
+//  GLESBackendTransform.cpp
+//  libraries/gpu-gl-android/src/gpu/gles
+//
+//  Created by Gabriel Calero & Cristian Duarte on 9/28/2016.
+//  Copyright 2016 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 "GLESBackend.h"
+
+using namespace gpu;
+using namespace gpu::gles;
+
+void GLESBackend::initTransform() {
+    glGenBuffers(1, &_transform._objectBuffer);
+    glGenBuffers(1, &_transform._cameraBuffer);
+    glGenBuffers(1, &_transform._drawCallInfoBuffer);
+    glGenTextures(1, &_transform._objectBufferTexture);
+    size_t cameraSize = sizeof(TransformStageState::CameraBufferElement);
+    while (_transform._cameraUboSize < cameraSize) {
+        _transform._cameraUboSize += _uboAlignment;
+    }
+}
+
+void GLESBackend::transferTransformState(const Batch& batch) const {
+    // FIXME not thread safe
+    static std::vector<uint8_t> bufferData;
+    if (!_transform._cameras.empty()) {
+        bufferData.resize(_transform._cameraUboSize * _transform._cameras.size());
+        for (size_t i = 0; i < _transform._cameras.size(); ++i) {
+            memcpy(bufferData.data() + (_transform._cameraUboSize * i), &_transform._cameras[i], sizeof(TransformStageState::CameraBufferElement));
+        }
+        glBindBuffer(GL_UNIFORM_BUFFER, _transform._cameraBuffer);
+        glBufferData(GL_UNIFORM_BUFFER, bufferData.size(), bufferData.data(), GL_DYNAMIC_DRAW);
+        glBindBuffer(GL_UNIFORM_BUFFER, 0);
+    }
+
+    if (!batch._objects.empty()) {
+        glBindBuffer(GL_SHADER_STORAGE_BUFFER, _transform._objectBuffer);
+        glBufferData(GL_SHADER_STORAGE_BUFFER, batch._objects.size() * sizeof(Batch::TransformObject), batch._objects.data(), GL_STREAM_DRAW);
+        glBindBuffer(GL_SHADER_STORAGE_BUFFER, 0);
+    }
+
+    if (!batch._namedData.empty()) {
+        bufferData.clear();
+        for (auto& data : batch._namedData) {
+            auto currentSize = bufferData.size();
+            auto bytesToCopy = data.second.drawCallInfos.size() * sizeof(Batch::DrawCallInfo);
+            bufferData.resize(currentSize + bytesToCopy);
+            memcpy(bufferData.data() + currentSize, data.second.drawCallInfos.data(), bytesToCopy);
+            _transform._drawCallInfoOffsets[data.first] = (GLvoid*)currentSize;
+        }
+
+        glBindBuffer(GL_ARRAY_BUFFER, _transform._drawCallInfoBuffer);
+        glBufferData(GL_ARRAY_BUFFER, bufferData.size(), bufferData.data(), GL_DYNAMIC_DRAW);
+        glBindBuffer(GL_ARRAY_BUFFER, 0);
+    }
+
+    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, TRANSFORM_OBJECT_SLOT, _transform._objectBuffer);
+
+    CHECK_GL_ERROR();
+
+    // Make sure the current Camera offset is unknown before render Draw
+    _transform._currentCameraOffset = INVALID_OFFSET;
+}
diff --git a/libraries/gpu/src/gpu/Batch.cpp b/libraries/gpu/src/gpu/Batch.cpp
index 15c0dfce49..c432e19368 100644
--- a/libraries/gpu/src/gpu/Batch.cpp
+++ b/libraries/gpu/src/gpu/Batch.cpp
@@ -390,6 +390,13 @@ void Batch::resetStages() {
     ADD_COMMAND(resetStages);
 }
 
+void Batch::disableContextViewCorrection() {
+    ADD_COMMAND(disableContextViewCorrection);
+}
+
+void Batch::restoreContextViewCorrection() {
+    ADD_COMMAND(restoreContextViewCorrection);
+}
 
 void Batch::disableContextStereo() {
     ADD_COMMAND(disableContextStereo);
diff --git a/libraries/gpu/src/gpu/Batch.h b/libraries/gpu/src/gpu/Batch.h
index 27c9402131..fca220c224 100644
--- a/libraries/gpu/src/gpu/Batch.h
+++ b/libraries/gpu/src/gpu/Batch.h
@@ -92,7 +92,7 @@ public:
     void captureNamedDrawCallInfo(std::string name);
 
     Batch();
-    explicit Batch(const Batch& batch);
+    Batch(const Batch& batch);
     ~Batch();
 
     void clear();
@@ -217,6 +217,9 @@ public:
     // Reset the stage caches and states
     void resetStages();
 
+    void disableContextViewCorrection();
+    void restoreContextViewCorrection();
+
     void disableContextStereo();
     void restoreContextStereo();
 
@@ -304,6 +307,9 @@ public:
 
         COMMAND_resetStages,
 
+        COMMAND_disableContextViewCorrection,
+        COMMAND_restoreContextViewCorrection,
+
         COMMAND_disableContextStereo,
         COMMAND_restoreContextStereo,
 
diff --git a/libraries/gpu/src/gpu/Buffer.h b/libraries/gpu/src/gpu/Buffer.h
index 2eb2267f0d..01cc652fd1 100644
--- a/libraries/gpu/src/gpu/Buffer.h
+++ b/libraries/gpu/src/gpu/Buffer.h
@@ -159,6 +159,7 @@ protected:
     friend class gl::GLBuffer;
     friend class gl41::GL41Buffer;
     friend class gl45::GL45Buffer;
+    friend class gles::GLESBuffer;
 };
 
 using BufferUpdates = std::vector<Buffer::Update>;
@@ -192,7 +193,7 @@ public:
     BufferView(const BufferPointer& buffer, Size offset, Size size, const Element& element = DEFAULT_ELEMENT);
     BufferView(const BufferPointer& buffer, Size offset, Size size, uint16 stride, const Element& element = DEFAULT_ELEMENT);
 
-    Size getNumElements() const { return (_size - _offset) / _stride; }
+    Size getNumElements() const { return _size / _stride; }
 
     //Template iterator with random access on the buffer sysmem
     template<typename T>
diff --git a/libraries/entities-renderer/src/untextured_particle.slf b/libraries/gpu/src/gpu/DrawColor.slf
similarity index 63%
rename from libraries/entities-renderer/src/untextured_particle.slf
rename to libraries/gpu/src/gpu/DrawColor.slf
index 11f25bb693..c24d69d29f 100644
--- a/libraries/entities-renderer/src/untextured_particle.slf
+++ b/libraries/gpu/src/gpu/DrawColor.slf
@@ -1,18 +1,19 @@
 <@include gpu/Config.slh@>
 <$VERSION_HEADER$>
 //  Generated on <$_SCRIBE_DATE$>
-//  fragment shader
 //
-//  Copyright 2015 High Fidelity, Inc.
+//  Draw with color uniform
+//
+//  Created by Olivier Prat on 25/10/2017
+//  Copyright 2017 High Fidelity, Inc.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
-
-in vec4 _color;
+uniform vec4 color;
 
 out vec4 outFragColor;
 
 void main(void) {
-    outFragColor = _color;
+    outFragColor = color;
 }
diff --git a/libraries/gpu/src/gpu/DrawTexcoordRectTransformUnitQuad.slv b/libraries/gpu/src/gpu/DrawTexcoordRectTransformUnitQuad.slv
index c9cc9e9dfa..1f788051bc 100755
--- a/libraries/gpu/src/gpu/DrawTexcoordRectTransformUnitQuad.slv
+++ b/libraries/gpu/src/gpu/DrawTexcoordRectTransformUnitQuad.slv
@@ -35,5 +35,5 @@ void main(void) {
     TransformObject obj = getTransformObject();
     <$transformModelToClipPos(cam, obj, pos, gl_Position)$>
 
-    varTexCoord0 = ((pos.xy + 1) * 0.5) * texcoordRect.zw + texcoordRect.xy;
+    varTexCoord0 = ((pos.xy + 1.0) * 0.5) * texcoordRect.zw + texcoordRect.xy;
 }
diff --git a/libraries/gpu/src/gpu/DrawTextureMirroredX.slf b/libraries/gpu/src/gpu/DrawTextureMirroredX.slf
new file mode 100644
index 0000000000..aef4033496
--- /dev/null
+++ b/libraries/gpu/src/gpu/DrawTextureMirroredX.slf
@@ -0,0 +1,22 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  Draw texture 0 fetched at (1.0 - texcoord.x, texcoord.y)
+//
+//  Created by Sam Gondelman on 10/24/2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+
+uniform sampler2D colorMap;
+
+in vec2 varTexCoord0;
+out vec4 outFragColor;
+
+void main(void) {
+    outFragColor = texture(colorMap, vec2(1.0 - varTexCoord0.x, varTexCoord0.y));
+}
diff --git a/libraries/gpu/src/gpu/DrawTransformUnitQuad.slv b/libraries/gpu/src/gpu/DrawTransformUnitQuad.slv
index f55abf1089..845cf0326d 100755
--- a/libraries/gpu/src/gpu/DrawTransformUnitQuad.slv
+++ b/libraries/gpu/src/gpu/DrawTransformUnitQuad.slv
@@ -32,5 +32,5 @@ void main(void) {
     TransformObject obj = getTransformObject();
     <$transformModelToClipPos(cam, obj, pos, gl_Position)$>
 
-    varTexCoord0 = (pos.xy + 1) * 0.5;
+    varTexCoord0 = (pos.xy + 1.0) * 0.5;
 }
diff --git a/libraries/gpu/src/gpu/DrawUnitQuadTexcoord.slv b/libraries/gpu/src/gpu/DrawUnitQuadTexcoord.slv
index 1426ae48fd..289d8f96b1 100644
--- a/libraries/gpu/src/gpu/DrawUnitQuadTexcoord.slv
+++ b/libraries/gpu/src/gpu/DrawUnitQuadTexcoord.slv
@@ -23,7 +23,7 @@ void main(void) {
     );
     vec4 pos = UNIT_QUAD[gl_VertexID];
 
-    varTexCoord0 = (pos.xy + 1) * 0.5;
+    varTexCoord0 = (pos.xy + 1.0) * 0.5;
 
     gl_Position = pos;
 }
diff --git a/libraries/gpu/src/gpu/DrawViewportQuadTransformTexcoord.slv b/libraries/gpu/src/gpu/DrawViewportQuadTransformTexcoord.slv
index 1f9bc13700..554728417b 100755
--- a/libraries/gpu/src/gpu/DrawViewportQuadTransformTexcoord.slv
+++ b/libraries/gpu/src/gpu/DrawViewportQuadTransformTexcoord.slv
@@ -28,7 +28,7 @@ void main(void) {
     vec4 pos = UNIT_QUAD[gl_VertexID];
 
     // standard transform but applied to the Texcoord
-    vec4 tc = vec4((pos.xy + 1) * 0.5, pos.zw);
+    vec4 tc = vec4((pos.xy + 1.0) * 0.5, pos.zw);
 
     TransformObject obj = getTransformObject();
     <$transformModelToWorldPos(obj, tc, tc)$>
diff --git a/libraries/gpu/src/gpu/Format.cpp b/libraries/gpu/src/gpu/Format.cpp
index b15f8d929f..3b153097cf 100644
--- a/libraries/gpu/src/gpu/Format.cpp
+++ b/libraries/gpu/src/gpu/Format.cpp
@@ -19,16 +19,20 @@ const Element Element::COLOR_SRGBA_32{ VEC4, NUINT8, SRGBA };
 const Element Element::COLOR_BGRA_32{ VEC4, NUINT8, BGRA };
 const Element Element::COLOR_SBGRA_32{ VEC4, NUINT8, SBGRA };
 
+const Element Element::COLOR_RGBA_2{ VEC4, NUINT2, RGBA };
+
 const Element Element::COLOR_COMPRESSED_RED{ TILE4x4, COMPRESSED, COMPRESSED_BC4_RED };
 const Element Element::COLOR_COMPRESSED_SRGB { TILE4x4, COMPRESSED, COMPRESSED_BC1_SRGB };
 const Element Element::COLOR_COMPRESSED_SRGBA_MASK { TILE4x4, COMPRESSED, COMPRESSED_BC1_SRGBA };
 const Element Element::COLOR_COMPRESSED_SRGBA { TILE4x4, COMPRESSED, COMPRESSED_BC3_SRGBA };
 const Element Element::COLOR_COMPRESSED_XY { TILE4x4, COMPRESSED, COMPRESSED_BC5_XY };
-const Element Element::COLOR_COMPRESSED_SRGBA_HIGH { TILE4x4, COMPRESSED, COMPRESSED_BC7_SRGBA };
+const Element Element::COLOR_COMPRESSED_SRGBA_HIGH{ TILE4x4, COMPRESSED, COMPRESSED_BC7_SRGBA };
+const Element Element::COLOR_COMPRESSED_HDR_RGB{ TILE4x4, COMPRESSED, COMPRESSED_BC6_RGB };
 
 const Element Element::VEC2NU8_XY{ VEC2, NUINT8, XY };
 
 const Element Element::COLOR_R11G11B10{ SCALAR, FLOAT, R11G11B10 };
+const Element Element::COLOR_RGB9E5{ SCALAR, FLOAT, RGB9E5 };
 const Element Element::VEC4F_COLOR_RGBA{ VEC4, FLOAT, RGBA };
 const Element Element::VEC2F_UV{ VEC2, FLOAT, UV };
 const Element Element::VEC2F_XY{ VEC2, FLOAT, XY };
diff --git a/libraries/gpu/src/gpu/Format.h b/libraries/gpu/src/gpu/Format.h
index c4d88236da..9d5d2fc49d 100644
--- a/libraries/gpu/src/gpu/Format.h
+++ b/libraries/gpu/src/gpu/Format.h
@@ -38,6 +38,7 @@ enum Type : uint8_t {
     NUINT16,
     NINT8,
     NUINT8,
+    NUINT2,
 
     COMPRESSED,
 
@@ -187,11 +188,13 @@ enum Semantic : uint8_t {
     COMPRESSED_BC3_SRGBA,
     COMPRESSED_BC4_RED,
     COMPRESSED_BC5_XY,
+    COMPRESSED_BC6_RGB,
     COMPRESSED_BC7_SRGBA,
 
     _LAST_COMPRESSED,
 
     R11G11B10,
+    RGB9E5,
 
     UNIFORM,
     UNIFORM_BUFFER,
@@ -240,11 +243,13 @@ static const int SEMANTIC_SIZE_FACTOR[NUM_SEMANTICS] = {
     16, //COMPRESSED_BC3_SRGBA, 1 byte/pixel * 4x4 pixels = 16 bytes
     8, //COMPRESSED_BC4_RED, 1/2 byte/pixel * 4x4 pixels = 8 bytes
     16, //COMPRESSED_BC5_XY, 1 byte/pixel * 4x4 pixels = 16 bytes
+    16, //COMPRESSED_BC6_RGB, 1 byte/pixel * 4x4 pixels = 16 bytes
     16, //COMPRESSED_BC7_SRGBA, 1 byte/pixel * 4x4 pixels = 16 bytes
 
     1, //_LAST_COMPRESSED,
 
     1, //R11G11B10,
+    1, //RGB9E5
 
     1, //UNIFORM,
     1, //UNIFORM_BUFFER,
@@ -305,13 +310,16 @@ public:
     static const Element COLOR_SRGBA_32;
     static const Element COLOR_BGRA_32;
     static const Element COLOR_SBGRA_32;
+    static const Element COLOR_RGBA_2;
     static const Element COLOR_R11G11B10;
+    static const Element COLOR_RGB9E5;
     static const Element COLOR_COMPRESSED_RED;
     static const Element COLOR_COMPRESSED_SRGB;
     static const Element COLOR_COMPRESSED_SRGBA_MASK;
     static const Element COLOR_COMPRESSED_SRGBA;
     static const Element COLOR_COMPRESSED_XY;
     static const Element COLOR_COMPRESSED_SRGBA_HIGH;
+    static const Element COLOR_COMPRESSED_HDR_RGB;
     static const Element VEC2NU8_XY;
     static const Element VEC4F_COLOR_RGBA;
     static const Element VEC2F_UV;
diff --git a/libraries/gpu/src/gpu/Forward.h b/libraries/gpu/src/gpu/Forward.h
index 88800652a5..8100efafaf 100644
--- a/libraries/gpu/src/gpu/Forward.h
+++ b/libraries/gpu/src/gpu/Forward.h
@@ -137,6 +137,11 @@ namespace gpu {
         class GL45Backend;
         class GL45Buffer;
     }
+
+    namespace gles {
+        class GLESBackend;
+        class GLESBuffer;
+    }
 }
 
 #endif
diff --git a/libraries/gpu/src/gpu/Frame.cpp b/libraries/gpu/src/gpu/Frame.cpp
index 4854559d61..58ab7257f7 100644
--- a/libraries/gpu/src/gpu/Frame.cpp
+++ b/libraries/gpu/src/gpu/Frame.cpp
@@ -11,6 +11,10 @@
 
 using namespace gpu;
 
+Frame::Frame() {
+    batches.reserve(16);
+}
+
 Frame::~Frame() {
     if (framebuffer && framebufferRecycler) {
         framebufferRecycler(framebuffer);
diff --git a/libraries/gpu/src/gpu/Frame.h b/libraries/gpu/src/gpu/Frame.h
index 3c6fed9393..1ed77a26b7 100644
--- a/libraries/gpu/src/gpu/Frame.h
+++ b/libraries/gpu/src/gpu/Frame.h
@@ -20,8 +20,8 @@ namespace gpu {
         friend class Context;
 
     public:
+        Frame();
         virtual ~Frame();
-
         using Batches = std::vector<Batch>;
         using FramebufferRecycler = std::function<void(const FramebufferPointer&)>;
         using OverlayRecycler = std::function<void(const TexturePointer&)>;
@@ -36,8 +36,6 @@ namespace gpu {
         BufferUpdates bufferUpdates;
         /// The destination framebuffer in which the results will be placed
         FramebufferPointer framebuffer;
-        /// The destination texture containing the 2D overlay
-        TexturePointer overlay;
         /// How to process the framebuffer when the frame dies.  MUST BE THREAD SAFE
         FramebufferRecycler framebufferRecycler;
 
diff --git a/libraries/gpu/src/gpu/Framebuffer.cpp b/libraries/gpu/src/gpu/Framebuffer.cpp
index b49c681889..4fcc9ab0f9 100755
--- a/libraries/gpu/src/gpu/Framebuffer.cpp
+++ b/libraries/gpu/src/gpu/Framebuffer.cpp
@@ -13,6 +13,7 @@
 #include <math.h>
 #include <QDebug>
 
+#include <shared/PlatformHacks.h>
 #include <Transform.h>
 
 using namespace gpu;
@@ -219,7 +220,7 @@ uint32 Framebuffer::getRenderBufferSubresource(uint32 slot) const {
     }
 }
 
-bool Framebuffer::setDepthStencilBuffer(const TexturePointer& texture, const Format& format, uint32 subresource) {
+bool Framebuffer::assignDepthStencilBuffer(const TexturePointer& texture, const Format& format, uint32 subresource) {
     if (isSwapchain()) {
         return false;
     }
@@ -243,20 +244,59 @@ bool Framebuffer::setDepthStencilBuffer(const TexturePointer& texture, const For
     // assign the new one
     _depthStencilBuffer = TextureView(texture, subresource, format);
 
-    _bufferMask = ( _bufferMask & ~BUFFER_DEPTHSTENCIL);
-    if (texture) {
-        if (format.getSemantic() == gpu::DEPTH) {
-            _bufferMask |= BUFFER_DEPTH;
-        } else if (format.getSemantic() == gpu::STENCIL) {
-            _bufferMask |= BUFFER_STENCIL;
-        } else if (format.getSemantic() == gpu::DEPTH_STENCIL) {
-            _bufferMask |= BUFFER_DEPTHSTENCIL;
-        }
-    }
-
     return true;
 }
 
+bool Framebuffer::setDepthBuffer(const TexturePointer& texture, const Format& format, uint32 subresource) {
+    if (assignDepthStencilBuffer(texture, format, subresource)) {
+        _bufferMask = (_bufferMask & ~BUFFER_DEPTHSTENCIL);
+        if (texture) {
+            if (format.getSemantic() == gpu::DEPTH || format.getSemantic() == gpu::DEPTH_STENCIL) {
+                _bufferMask |= BUFFER_DEPTH;
+            } else {
+                return false;
+            }
+        }
+
+        return true;
+    }
+    return false;
+}
+
+bool Framebuffer::setStencilBuffer(const TexturePointer& texture, const Format& format, uint32 subresource) {
+    if (assignDepthStencilBuffer(texture, format, subresource)) {
+        _bufferMask = (_bufferMask & ~BUFFER_DEPTHSTENCIL);
+        if (texture) {
+            if (format.getSemantic() == gpu::STENCIL || format.getSemantic() == gpu::DEPTH_STENCIL) {
+                _bufferMask |= BUFFER_STENCIL;
+            } else  {
+                return false;
+            }
+        }
+
+        return true;
+    }
+    return false;
+}
+
+bool Framebuffer::setDepthStencilBuffer(const TexturePointer& texture, const Format& format, uint32 subresource) {
+    if (assignDepthStencilBuffer(texture, format, subresource)) {
+        _bufferMask = (_bufferMask & ~BUFFER_DEPTHSTENCIL);
+        if (texture) {
+            if (format.getSemantic() == gpu::DEPTH) {
+                _bufferMask |= BUFFER_DEPTH;
+            } else if (format.getSemantic() == gpu::STENCIL) {
+                _bufferMask |= BUFFER_STENCIL;
+            } else if (format.getSemantic() == gpu::DEPTH_STENCIL) {
+                _bufferMask |= BUFFER_DEPTHSTENCIL;
+            }
+        }
+
+        return true;
+    }
+    return false;
+}
+
 TexturePointer Framebuffer::getDepthStencilBuffer() const {
     if (isSwapchain()) {
         return TexturePointer();
diff --git a/libraries/gpu/src/gpu/Framebuffer.h b/libraries/gpu/src/gpu/Framebuffer.h
index a65aaf765b..b3cf0fbba3 100755
--- a/libraries/gpu/src/gpu/Framebuffer.h
+++ b/libraries/gpu/src/gpu/Framebuffer.h
@@ -107,6 +107,8 @@ public:
     TexturePointer getRenderBuffer(uint32 slot) const;
     uint32 getRenderBufferSubresource(uint32 slot) const;
 
+    bool setDepthBuffer(const TexturePointer& texture, const Format& format, uint32 subresource = 0);
+    bool setStencilBuffer(const TexturePointer& texture, const Format& format, uint32 subresource = 0);
     bool setDepthStencilBuffer(const TexturePointer& texture, const Format& format, uint32 subresource = 0);
     TexturePointer getDepthStencilBuffer() const;
     uint32 getDepthStencilBufferSubresource() const;
@@ -132,7 +134,11 @@ public:
 
     float getAspectRatio() const { return getWidth() / (float) getHeight() ; }
 
+#ifndef ANDROID
     static const uint32 MAX_NUM_RENDER_BUFFERS = 8; 
+#else    
+    static const uint32 MAX_NUM_RENDER_BUFFERS = 4;
+#endif
     static uint32 getMaxNumRenderBuffers() { return MAX_NUM_RENDER_BUFFERS; }
 
     const GPUObjectPointer gpuObject {};
@@ -164,6 +170,7 @@ protected:
     uint16 _numSamples = 0;
 
     void updateSize(const TexturePointer& texture);
+    bool assignDepthStencilBuffer(const TexturePointer& texture, const Format& format, uint32 subresource);
 
     // Non exposed
     Framebuffer(const Framebuffer& framebuffer) = delete;
diff --git a/libraries/gpu/src/gpu/Inputs.slh b/libraries/gpu/src/gpu/Inputs.slh
index 843d1059f2..109762136e 100644
--- a/libraries/gpu/src/gpu/Inputs.slh
+++ b/libraries/gpu/src/gpu/Inputs.slh
@@ -18,4 +18,7 @@ layout(location = 4) in vec4 inTangent;
 layout(location = 5) in ivec4 inSkinClusterIndex;
 layout(location = 6) in vec4 inSkinClusterWeight;
 layout(location = 7) in vec4 inTexCoord1;
+layout(location = 8) in vec4 inTexCoord2;
+layout(location = 9) in vec4 inTexCoord3;
+layout(location = 10) in vec4 inTexCoord4;
 <@endif@>
diff --git a/libraries/gpu/src/gpu/Query.cpp b/libraries/gpu/src/gpu/Query.cpp
index 38a9d6db8c..03312e0db9 100644
--- a/libraries/gpu/src/gpu/Query.cpp
+++ b/libraries/gpu/src/gpu/Query.cpp
@@ -45,8 +45,8 @@ void Query::triggerReturnHandler(uint64_t queryResult, uint64_t batchElapsedTime
 RangeTimer::RangeTimer(const std::string& name) :
     _name(name) {
     for (int i = 0; i < QUERY_QUEUE_SIZE; i++) {
-        _timerQueries.push_back(std::make_shared<gpu::Query>([&, i] (const Query& query) {
-            _tailIndex ++;
+        _timerQueries.push_back(std::make_shared<gpu::Query>([this] (const Query& query) {
+            _tailIndex++;
 
             _movingAverageGPU.addSample(query.getGPUElapsedTime());
             _movingAverageBatch.addSample(query.getBatchElapsedTime());
diff --git a/libraries/gpu/src/gpu/StandardShaderLib.cpp b/libraries/gpu/src/gpu/StandardShaderLib.cpp
index 756070ff68..0d8d131e0b 100755
--- a/libraries/gpu/src/gpu/StandardShaderLib.cpp
+++ b/libraries/gpu/src/gpu/StandardShaderLib.cpp
@@ -22,7 +22,9 @@
 const char DrawNada_frag[] = "void main(void) {}"; // DrawNada is really simple...
 
 #include "DrawWhite_frag.h"
+#include "DrawColor_frag.h"
 #include "DrawTexture_frag.h"
+#include "DrawTextureMirroredX_frag.h"
 #include "DrawTextureOpaque_frag.h"
 #include "DrawColoredTexture_frag.h"
 
@@ -36,7 +38,9 @@ ShaderPointer StandardShaderLib::_drawVertexPositionVS;
 ShaderPointer StandardShaderLib::_drawTransformVertexPositionVS;
 ShaderPointer StandardShaderLib::_drawNadaPS;
 ShaderPointer StandardShaderLib::_drawWhitePS;
+ShaderPointer StandardShaderLib::_drawColorPS;
 ShaderPointer StandardShaderLib::_drawTexturePS;
+ShaderPointer StandardShaderLib::_drawTextureMirroredXPS;
 ShaderPointer StandardShaderLib::_drawTextureOpaquePS;
 ShaderPointer StandardShaderLib::_drawColoredTexturePS;
 StandardShaderLib::ProgramMap StandardShaderLib::_programs;
@@ -123,6 +127,13 @@ ShaderPointer StandardShaderLib::getDrawWhitePS() {
     return _drawWhitePS;
 }
 
+ShaderPointer StandardShaderLib::getDrawColorPS() {
+    if (!_drawColorPS) {
+        _drawColorPS = gpu::Shader::createPixel(std::string(DrawColor_frag));
+    }
+    return _drawColorPS;
+}
+
 ShaderPointer StandardShaderLib::getDrawTexturePS() {
     if (!_drawTexturePS) {
         _drawTexturePS = gpu::Shader::createPixel(std::string(DrawTexture_frag));
@@ -130,6 +141,13 @@ ShaderPointer StandardShaderLib::getDrawTexturePS() {
     return _drawTexturePS;
 }
 
+ShaderPointer StandardShaderLib::getDrawTextureMirroredXPS() {
+    if (!_drawTextureMirroredXPS) {
+        _drawTextureMirroredXPS = gpu::Shader::createPixel(std::string(DrawTextureMirroredX_frag));
+    }
+    return _drawTextureMirroredXPS;
+}
+
 ShaderPointer StandardShaderLib::getDrawTextureOpaquePS() {
     if (!_drawTextureOpaquePS) {
         _drawTextureOpaquePS = gpu::Shader::createPixel(std::string(DrawTextureOpaque_frag));
diff --git a/libraries/gpu/src/gpu/StandardShaderLib.h b/libraries/gpu/src/gpu/StandardShaderLib.h
index a21d4dea9a..9c11f6cc3a 100755
--- a/libraries/gpu/src/gpu/StandardShaderLib.h
+++ b/libraries/gpu/src/gpu/StandardShaderLib.h
@@ -46,7 +46,9 @@ public:
     static ShaderPointer getDrawNadaPS();
 
     static ShaderPointer getDrawWhitePS();
+    static ShaderPointer getDrawColorPS();
     static ShaderPointer getDrawTexturePS();
+    static ShaderPointer getDrawTextureMirroredXPS();
     static ShaderPointer getDrawTextureOpaquePS();
     static ShaderPointer getDrawColoredTexturePS();
 
@@ -66,7 +68,9 @@ protected:
 
     static ShaderPointer _drawNadaPS;
     static ShaderPointer _drawWhitePS;
+    static ShaderPointer _drawColorPS;
     static ShaderPointer _drawTexturePS;
+    static ShaderPointer _drawTextureMirroredXPS;
     static ShaderPointer _drawTextureOpaquePS;
     static ShaderPointer _drawColoredTexturePS;
 
diff --git a/libraries/gpu/src/gpu/Stream.cpp b/libraries/gpu/src/gpu/Stream.cpp
index cdb972d8bf..427af1e78d 100644
--- a/libraries/gpu/src/gpu/Stream.cpp
+++ b/libraries/gpu/src/gpu/Stream.cpp
@@ -36,8 +36,14 @@ const ElementArray& getDefaultElements() {
         //SKIN_CLUSTER_WEIGHT = 6,
         Element::VEC4F_XYZW,
         //TEXCOORD1 = 7,
-        Element::VEC2F_UV
-    }};
+        Element::VEC2F_UV,
+        //TEXCOORD2 = 7,
+        Element::VEC4F_XYZW,
+        //TEXCOORD3 = 7,
+        Element::VEC4F_XYZW,
+        //TEXCOORD4 = 7,
+        Element::VEC4F_XYZW
+        }};
     return defaultElements;
 }
 
diff --git a/libraries/gpu/src/gpu/Stream.h b/libraries/gpu/src/gpu/Stream.h
index 0642131edf..336e34ecb4 100644
--- a/libraries/gpu/src/gpu/Stream.h
+++ b/libraries/gpu/src/gpu/Stream.h
@@ -38,8 +38,11 @@ public:
         SKIN_CLUSTER_INDEX = 5,
         SKIN_CLUSTER_WEIGHT = 6,
         TEXCOORD1 = 7,
-        NUM_INPUT_SLOTS = TEXCOORD1 + 1,
+        TEXCOORD2 = 8,
+        TEXCOORD3 = 9,
+        TEXCOORD4 = 10,
 
+        NUM_INPUT_SLOTS,
 
         DRAW_CALL_INFO = 15, // Reserve last input slot for draw call infos
     };
diff --git a/libraries/gpu/src/gpu/Texture.cpp b/libraries/gpu/src/gpu/Texture.cpp
index 4b836512c4..4a588c3c84 100755
--- a/libraries/gpu/src/gpu/Texture.cpp
+++ b/libraries/gpu/src/gpu/Texture.cpp
@@ -14,6 +14,7 @@
 
 #include <glm/gtc/constants.hpp>
 #include <glm/gtx/component_wise.hpp>
+#include <glm/gtc/packing.hpp>
 
 #include <QtCore/QDebug>
 #include <QtCore/QThread>
@@ -683,6 +684,21 @@ bool sphericalHarmonicsFromTexture(const gpu::Texture& cubeTexture, std::vector<
 
     PROFILE_RANGE(render_gpu, "sphericalHarmonicsFromTexture");
 
+    auto mipFormat = cubeTexture.getStoredMipFormat();
+    std::function<glm::vec3(uint32)> unpackFunc;
+
+    switch (mipFormat.getSemantic()) {
+        case gpu::R11G11B10:
+            unpackFunc = glm::unpackF2x11_1x10;
+            break;
+        case gpu::RGB9E5:
+            unpackFunc = glm::unpackF3x9_E1x5;
+            break;
+        default:
+            assert(false);
+            break;
+    }
+
     const uint sqOrder = order*order;
 
     // allocate memory for calculations
@@ -716,17 +732,7 @@ bool sphericalHarmonicsFromTexture(const gpu::Texture& cubeTexture, std::vector<
     for(int face=0; face < gpu::Texture::NUM_CUBE_FACES; face++) {
         PROFILE_RANGE(render_gpu, "ProcessFace");
 
-        auto mipFormat = cubeTexture.getStoredMipFormat();
-        auto numComponents = mipFormat.getScalarCount();
-        int roffset { 0 };
-        int goffset { 1 };
-        int boffset { 2 };
-        if ((mipFormat.getSemantic() == gpu::BGRA) || (mipFormat.getSemantic() == gpu::SBGRA)) {
-            roffset = 2;
-            boffset = 0;
-        }
-
-        auto data = cubeTexture.accessStoredMipFace(0, face)->readData();
+        auto data = reinterpret_cast<const uint32*>( cubeTexture.accessStoredMipFace(0, face)->readData() );
         if (data == nullptr) {
             continue;
         }
@@ -806,29 +812,24 @@ bool sphericalHarmonicsFromTexture(const gpu::Texture& cubeTexture, std::vector<
 
                 // index of texel in texture
 
-                // get color from texture and map to range [0, 1]
-                float red { 0.0f };
-                float green { 0.0f };
-                float blue { 0.0f };
+                // get color from texture
+                glm::vec3 color{ 0.0f, 0.0f, 0.0f };
                 for (int i = 0; i < stride; ++i) {
                     for (int j = 0; j < stride; ++j) {
-                        int k = (int)(x + i - halfStride + (y + j - halfStride) * width) * numComponents;
-                        red += ColorUtils::sRGB8ToLinearFloat(data[k + roffset]);
-                        green += ColorUtils::sRGB8ToLinearFloat(data[k + goffset]);
-                        blue += ColorUtils::sRGB8ToLinearFloat(data[k + boffset]);
+                        int k = (int)(x + i - halfStride + (y + j - halfStride) * width);
+                        color += unpackFunc(data[k]);
                     }
                 }
-                glm::vec3 clr(red, green, blue);
 
                 // scale color and add to previously accumulated coefficients
                 // red
-                sphericalHarmonicsScale(shBuffB.data(), order, shBuff.data(), clr.r * fDiffSolid);
+                sphericalHarmonicsScale(shBuffB.data(), order, shBuff.data(), color.r * fDiffSolid);
                 sphericalHarmonicsAdd(resultR.data(), order, resultR.data(), shBuffB.data());
                 // green
-                sphericalHarmonicsScale(shBuffB.data(), order, shBuff.data(), clr.g * fDiffSolid);
+                sphericalHarmonicsScale(shBuffB.data(), order, shBuff.data(), color.g * fDiffSolid);
                 sphericalHarmonicsAdd(resultG.data(), order, resultG.data(), shBuffB.data());
                 // blue
-                sphericalHarmonicsScale(shBuffB.data(), order, shBuff.data(), clr.b * fDiffSolid);
+                sphericalHarmonicsScale(shBuffB.data(), order, shBuff.data(), color.b * fDiffSolid);
                 sphericalHarmonicsAdd(resultB.data(), order, resultB.data(), shBuffB.data());
             }
         }
diff --git a/libraries/gpu/src/gpu/Texture_ktx.cpp b/libraries/gpu/src/gpu/Texture_ktx.cpp
index 14fd983ec2..08fc4ec101 100644
--- a/libraries/gpu/src/gpu/Texture_ktx.cpp
+++ b/libraries/gpu/src/gpu/Texture_ktx.cpp
@@ -515,8 +515,6 @@ TexturePointer Texture::build(const ktx::KTXDescriptor& descriptor) {
     return texture;
 }
 
-
-
 TexturePointer Texture::unserialize(const cache::FilePointer& cacheEntry) {
     std::unique_ptr<ktx::KTX> ktxPointer = ktx::KTX::create(std::make_shared<storage::FileStorage>(cacheEntry->getFilepath().c_str()));
     if (!ktxPointer) {
@@ -536,7 +534,7 @@ TexturePointer Texture::unserialize(const std::string& ktxfile) {
     if (!ktxPointer) {
         return nullptr;
     }
-    
+
     auto texture = build(ktxPointer->toDescriptor());
     if (texture) {
         texture->setKtxBacking(ktxfile);
@@ -570,6 +568,12 @@ bool Texture::evalKTXFormat(const Element& mipFormat, const Element& texelFormat
         header.setCompressed(ktx::GLInternalFormat::COMPRESSED_RG_RGTC2, ktx::GLBaseInternalFormat::RG);
     } else if (texelFormat == Format::COLOR_COMPRESSED_SRGBA_HIGH && mipFormat == Format::COLOR_COMPRESSED_SRGBA_HIGH) {
         header.setCompressed(ktx::GLInternalFormat::COMPRESSED_SRGB_ALPHA_BPTC_UNORM, ktx::GLBaseInternalFormat::RGBA);
+    } else if (texelFormat == Format::COLOR_COMPRESSED_HDR_RGB && mipFormat == Format::COLOR_COMPRESSED_HDR_RGB) {
+        header.setCompressed(ktx::GLInternalFormat::COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT, ktx::GLBaseInternalFormat::RGB);
+    } else if (texelFormat == Format::COLOR_RGB9E5 && mipFormat == Format::COLOR_RGB9E5) {
+        header.setUncompressed(ktx::GLType::UNSIGNED_INT_5_9_9_9_REV, 1, ktx::GLFormat::RGB, ktx::GLInternalFormat::RGB9_E5, ktx::GLBaseInternalFormat::RGB);
+    } else if (texelFormat == Format::COLOR_R11G11B10 && mipFormat == Format::COLOR_R11G11B10) {
+        header.setUncompressed(ktx::GLType::UNSIGNED_INT_10F_11F_11F_REV, 1, ktx::GLFormat::RGB, ktx::GLInternalFormat::R11F_G11F_B10F, ktx::GLBaseInternalFormat::RGB);
     } else {
         return false;
     }
@@ -612,6 +616,12 @@ bool Texture::evalTextureFormat(const ktx::Header& header, Element& mipFormat, E
         } else {
             return false;
         }
+    } else if (header.getGLFormat() == ktx::GLFormat::RGB && header.getGLType() == ktx::GLType::UNSIGNED_INT_10F_11F_11F_REV) {
+        mipFormat = Format::COLOR_R11G11B10;
+        texelFormat = Format::COLOR_R11G11B10;
+    } else if (header.getGLFormat() == ktx::GLFormat::RGB && header.getGLType() == ktx::GLType::UNSIGNED_INT_5_9_9_9_REV) {
+        mipFormat = Format::COLOR_RGB9E5;
+        texelFormat = Format::COLOR_RGB9E5;
     } else if (header.isCompressed()) {
         if (header.getGLInternaFormat() == ktx::GLInternalFormat::COMPRESSED_SRGB_S3TC_DXT1_EXT) {
             mipFormat = Format::COLOR_COMPRESSED_SRGB;
@@ -631,6 +641,9 @@ bool Texture::evalTextureFormat(const ktx::Header& header, Element& mipFormat, E
         } else if (header.getGLInternaFormat() == ktx::GLInternalFormat::COMPRESSED_SRGB_ALPHA_BPTC_UNORM) {
             mipFormat = Format::COLOR_COMPRESSED_SRGBA_HIGH;
             texelFormat = Format::COLOR_COMPRESSED_SRGBA_HIGH;
+        } else if (header.getGLInternaFormat() == ktx::GLInternalFormat::COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT) {
+            mipFormat = Format::COLOR_COMPRESSED_HDR_RGB;
+            texelFormat = Format::COLOR_COMPRESSED_HDR_RGB;
         } else {
             return false;
         }
diff --git a/libraries/gpu/src/gpu/Transform.slh b/libraries/gpu/src/gpu/Transform.slh
index b786222198..b9b8544601 100644
--- a/libraries/gpu/src/gpu/Transform.slh
+++ b/libraries/gpu/src/gpu/Transform.slh
@@ -43,16 +43,21 @@ layout(location=14) in int _inStereoSide;
 flat out int _stereoSide;
 
 // In stereo drawcall mode Instances are drawn twice (left then right) hence the true InstanceID is the gl_InstanceID / 2
-int gpu_InstanceID = gl_InstanceID >> 1;
+int gpu_InstanceID() {
+    return gl_InstanceID >> 1;
+}
 
 #else
 
-int gpu_InstanceID = gl_InstanceID;
-
+int gpu_InstanceID() {
+    return gl_InstanceID;
+}
 #endif
 #else
 
-int gpu_InstanceID = gl_InstanceID;
+int gpu_InstanceID() {
+    return gl_InstanceID;
+}
 
 #endif
 
@@ -166,7 +171,7 @@ TransformObject getTransformObject() {
 #ifdef GPU_TRANSFORM_STEREO_SPLIT_SCREEN
         vec4 eyeClipEdge[2]= vec4[2](vec4(-1,0,0,1), vec4(1,0,0,1));
         vec2 eyeOffsetScale = vec2(-0.5, +0.5);
-        uint eyeIndex = _stereoSide;
+        uint eyeIndex = uint(_stereoSide);
         gl_ClipDistance[0] = dot(<$clipPos$>, eyeClipEdge[eyeIndex]);
         float newClipPosX = <$clipPos$>.x * 0.5 + eyeOffsetScale[eyeIndex] * <$clipPos$>.w;
         <$clipPos$>.x = newClipPosX;
@@ -188,13 +193,17 @@ TransformObject getTransformObject() {
     }
 <@endfunc@>
 
-<@func transformModelToClipPos(cameraTransform, objectTransform, modelPos, clipPos)@>
-    { // transformModelToClipPos
+<@func transformModelToMonoClipPos(cameraTransform, objectTransform, modelPos, clipPos)@>
+    { // transformModelToMonoClipPos
         vec4 eyeWAPos;
         <$transformModelToEyeWorldAlignedPos($cameraTransform$, $objectTransform$, $modelPos$, eyeWAPos)$>
-
         <$clipPos$> = <$cameraTransform$>._projectionViewUntranslated * eyeWAPos;
-        
+    }
+<@endfunc@>
+
+<@func transformModelToClipPos(cameraTransform, objectTransform, modelPos, clipPos)@>
+    { // transformModelToClipPos
+        <$transformModelToMonoClipPos($cameraTransform$, $objectTransform$, $modelPos$, $clipPos$)$>
         <$transformStereoClipsSpace($cameraTransform$, $clipPos$)$>
     }
 <@endfunc@>
diff --git a/libraries/image/CMakeLists.txt b/libraries/image/CMakeLists.txt
index 85d3d8f1ae..442fa714b3 100644
--- a/libraries/image/CMakeLists.txt
+++ b/libraries/image/CMakeLists.txt
@@ -2,10 +2,10 @@ set(TARGET_NAME image)
 setup_hifi_library()
 link_hifi_libraries(shared gpu)
 
-target_glm()
-
-add_dependency_external_projects(nvtt)
-find_package(NVTT REQUIRED)
-target_include_directories(${TARGET_NAME} PRIVATE ${NVTT_INCLUDE_DIRS})
-target_link_libraries(${TARGET_NAME} ${NVTT_LIBRARIES})
-add_paths_to_fixup_libs(${NVTT_DLL_PATH})
+if (NOT ANDROID)
+    add_dependency_external_projects(nvtt)
+    find_package(NVTT REQUIRED)
+    target_include_directories(${TARGET_NAME} PRIVATE ${NVTT_INCLUDE_DIRS})
+    target_link_libraries(${TARGET_NAME} ${NVTT_LIBRARIES})
+    add_paths_to_fixup_libs(${NVTT_DLL_PATH})
+endif()
\ No newline at end of file
diff --git a/libraries/image/src/image/Image.cpp b/libraries/image/src/image/Image.cpp
index f274dc54f8..5959714cd8 100644
--- a/libraries/image/src/image/Image.cpp
+++ b/libraries/image/src/image/Image.cpp
@@ -12,7 +12,9 @@
 #include "Image.h"
 
 #include <nvtt/nvtt.h>
+#include <glm/gtc/packing.hpp>
 
+#include <QtCore/QtGlobal>
 #include <QUrl>
 #include <QImage>
 #include <QBuffer>
@@ -22,19 +24,18 @@
 #include <Profile.h>
 #include <StatTracker.h>
 #include <GLMHelpers.h>
-#include <SettingHandle.h>
 
 #include "ImageLogging.h"
 
 using namespace gpu;
 
+#if defined(Q_OS_ANDROID)
+#define CPU_MIPMAPS 0
+#else
 #define CPU_MIPMAPS 1
+#include <nvtt/nvtt.h>
+#endif
 
-static std::mutex settingsMutex;
-static Setting::Handle<bool> compressColorTextures("hifi.graphics.compressColorTextures", false);
-static Setting::Handle<bool> compressNormalTextures("hifi.graphics.compressNormalTextures", false);
-static Setting::Handle<bool> compressGrayscaleTextures("hifi.graphics.compressGrayscaleTextures", false);
-static Setting::Handle<bool> compressCubeTextures("hifi.graphics.compressCubeTextures", false);
 
 static const glm::uvec2 SPARSE_PAGE_SIZE(128);
 static const glm::uvec2 MAX_TEXTURE_SIZE(4096);
@@ -42,6 +43,13 @@ bool DEV_DECIMATE_TEXTURES = false;
 std::atomic<size_t> DECIMATED_TEXTURE_COUNT{ 0 };
 std::atomic<size_t> RECTIFIED_TEXTURE_COUNT{ 0 };
 
+static const auto HDR_FORMAT = gpu::Element::COLOR_R11G11B10;
+
+static std::atomic<bool> compressColorTextures { false };
+static std::atomic<bool> compressNormalTextures { false };
+static std::atomic<bool> compressGrayscaleTextures { false };
+static std::atomic<bool> compressCubeTextures { false };
+
 bool needsSparseRectification(const glm::uvec2& size) {
     // Don't attempt to rectify small textures (textures less than the sparse page size in any dimension)
     if (glm::any(glm::lessThan(size, SPARSE_PAGE_SIZE))) {
@@ -66,6 +74,8 @@ glm::uvec2 rectifyToSparseSize(const glm::uvec2& size) {
 
 namespace image {
 
+QImage::Format QIMAGE_HDR_FORMAT = QImage::Format_RGB30;
+
 TextureUsage::TextureLoader TextureUsage::getTextureLoaderForType(Type type, const QVariantMap& options) {
     switch (type) {
         case ALBEDO_TEXTURE:
@@ -99,59 +109,70 @@ TextureUsage::TextureLoader TextureUsage::getTextureLoaderForType(Type type, con
     }
 }
 
-gpu::TexturePointer TextureUsage::createStrict2DTextureFromImage(const QImage& srcImage, const std::string& srcImageName) {
-    return process2DTextureColorFromImage(srcImage, srcImageName, true);
+gpu::TexturePointer TextureUsage::createStrict2DTextureFromImage(const QImage& srcImage, const std::string& srcImageName,
+                                                                 const std::atomic<bool>& abortProcessing) {
+    return process2DTextureColorFromImage(srcImage, srcImageName, true, abortProcessing);
 }
 
-gpu::TexturePointer TextureUsage::create2DTextureFromImage(const QImage& srcImage, const std::string& srcImageName) {
-    return process2DTextureColorFromImage(srcImage, srcImageName, false);
+gpu::TexturePointer TextureUsage::create2DTextureFromImage(const QImage& srcImage, const std::string& srcImageName,
+                                                           const std::atomic<bool>& abortProcessing) {
+    return process2DTextureColorFromImage(srcImage, srcImageName, false, abortProcessing);
 }
 
-gpu::TexturePointer TextureUsage::createAlbedoTextureFromImage(const QImage& srcImage, const std::string& srcImageName) {
-    return process2DTextureColorFromImage(srcImage, srcImageName, false);
+gpu::TexturePointer TextureUsage::createAlbedoTextureFromImage(const QImage& srcImage, const std::string& srcImageName,
+                                                               const std::atomic<bool>& abortProcessing) {
+    return process2DTextureColorFromImage(srcImage, srcImageName, false, abortProcessing);
 }
 
-gpu::TexturePointer TextureUsage::createEmissiveTextureFromImage(const QImage& srcImage, const std::string& srcImageName) {
-    return process2DTextureColorFromImage(srcImage, srcImageName, false);
+gpu::TexturePointer TextureUsage::createEmissiveTextureFromImage(const QImage& srcImage, const std::string& srcImageName,
+                                                                 const std::atomic<bool>& abortProcessing) {
+    return process2DTextureColorFromImage(srcImage, srcImageName, false, abortProcessing);
 }
 
-gpu::TexturePointer TextureUsage::createLightmapTextureFromImage(const QImage& srcImage, const std::string& srcImageName) {
-    return process2DTextureColorFromImage(srcImage, srcImageName, false);
+gpu::TexturePointer TextureUsage::createLightmapTextureFromImage(const QImage& srcImage, const std::string& srcImageName,
+                                                                 const std::atomic<bool>& abortProcessing) {
+    return process2DTextureColorFromImage(srcImage, srcImageName, false, abortProcessing);
 }
 
-gpu::TexturePointer TextureUsage::createNormalTextureFromNormalImage(const QImage& srcImage, const std::string& srcImageName) {
-    return process2DTextureNormalMapFromImage(srcImage, srcImageName, false);
+gpu::TexturePointer TextureUsage::createNormalTextureFromNormalImage(const QImage& srcImage, const std::string& srcImageName,
+                                                                     const std::atomic<bool>& abortProcessing) {
+    return process2DTextureNormalMapFromImage(srcImage, srcImageName, false, abortProcessing);
 }
 
-gpu::TexturePointer TextureUsage::createNormalTextureFromBumpImage(const QImage& srcImage, const std::string& srcImageName) {
-    return process2DTextureNormalMapFromImage(srcImage, srcImageName, true);
+gpu::TexturePointer TextureUsage::createNormalTextureFromBumpImage(const QImage& srcImage, const std::string& srcImageName,
+                                                                   const std::atomic<bool>& abortProcessing) {
+    return process2DTextureNormalMapFromImage(srcImage, srcImageName, true, abortProcessing);
 }
 
-gpu::TexturePointer TextureUsage::createRoughnessTextureFromImage(const QImage& srcImage, const std::string& srcImageName) {
-    return process2DTextureGrayscaleFromImage(srcImage, srcImageName, false);
+gpu::TexturePointer TextureUsage::createRoughnessTextureFromImage(const QImage& srcImage, const std::string& srcImageName,
+                                                                  const std::atomic<bool>& abortProcessing) {
+    return process2DTextureGrayscaleFromImage(srcImage, srcImageName, false, abortProcessing);
 }
 
-gpu::TexturePointer TextureUsage::createRoughnessTextureFromGlossImage(const QImage& srcImage, const std::string& srcImageName) {
-    return process2DTextureGrayscaleFromImage(srcImage, srcImageName, true);
+gpu::TexturePointer TextureUsage::createRoughnessTextureFromGlossImage(const QImage& srcImage, const std::string& srcImageName,
+                                                                       const std::atomic<bool>& abortProcessing) {
+    return process2DTextureGrayscaleFromImage(srcImage, srcImageName, true, abortProcessing);
 }
 
-gpu::TexturePointer TextureUsage::createMetallicTextureFromImage(const QImage& srcImage, const std::string& srcImageName) {
-    return process2DTextureGrayscaleFromImage(srcImage, srcImageName, false);
+gpu::TexturePointer TextureUsage::createMetallicTextureFromImage(const QImage& srcImage, const std::string& srcImageName,
+                                                                 const std::atomic<bool>& abortProcessing) {
+    return process2DTextureGrayscaleFromImage(srcImage, srcImageName, false, abortProcessing);
 }
 
-gpu::TexturePointer TextureUsage::createCubeTextureFromImage(const QImage& srcImage, const std::string& srcImageName) {
-    return processCubeTextureColorFromImage(srcImage, srcImageName, true);
+gpu::TexturePointer TextureUsage::createCubeTextureFromImage(const QImage& srcImage, const std::string& srcImageName,
+                                                             const std::atomic<bool>& abortProcessing) {
+    return processCubeTextureColorFromImage(srcImage, srcImageName, true, abortProcessing);
 }
 
-gpu::TexturePointer TextureUsage::createCubeTextureFromImageWithoutIrradiance(const QImage& srcImage, const std::string& srcImageName) {
-    return processCubeTextureColorFromImage(srcImage, srcImageName, false);
+gpu::TexturePointer TextureUsage::createCubeTextureFromImageWithoutIrradiance(const QImage& srcImage, const std::string& srcImageName,
+                                                                              const std::atomic<bool>& abortProcessing) {
+    return processCubeTextureColorFromImage(srcImage, srcImageName, false, abortProcessing);
 }
 
 
 bool isColorTexturesCompressionEnabled() {
 #if CPU_MIPMAPS
-    std::lock_guard<std::mutex> guard(settingsMutex);
-    return compressColorTextures.get();
+    return compressColorTextures.load();
 #else
     return false;
 #endif
@@ -159,8 +180,7 @@ bool isColorTexturesCompressionEnabled() {
 
 bool isNormalTexturesCompressionEnabled() {
 #if CPU_MIPMAPS
-    std::lock_guard<std::mutex> guard(settingsMutex);
-    return compressNormalTextures.get();
+    return compressNormalTextures.load();
 #else
     return false;
 #endif
@@ -168,8 +188,7 @@ bool isNormalTexturesCompressionEnabled() {
 
 bool isGrayscaleTexturesCompressionEnabled() {
 #if CPU_MIPMAPS
-    std::lock_guard<std::mutex> guard(settingsMutex);
-    return compressGrayscaleTextures.get();
+    return compressGrayscaleTextures.load();
 #else
     return false;
 #endif
@@ -177,35 +196,50 @@ bool isGrayscaleTexturesCompressionEnabled() {
 
 bool isCubeTexturesCompressionEnabled() {
 #if CPU_MIPMAPS
-    std::lock_guard<std::mutex> guard(settingsMutex);
-    return compressCubeTextures.get();
+    return compressCubeTextures.load();
 #else
     return false;
 #endif
 }
 
 void setColorTexturesCompressionEnabled(bool enabled) {
-    std::lock_guard<std::mutex> guard(settingsMutex);
-    compressColorTextures.set(enabled);
+    compressColorTextures.store(enabled);
 }
 
 void setNormalTexturesCompressionEnabled(bool enabled) {
-    std::lock_guard<std::mutex> guard(settingsMutex);
-    compressNormalTextures.set(enabled);
+    compressNormalTextures.store(enabled);
 }
 
 void setGrayscaleTexturesCompressionEnabled(bool enabled) {
-    std::lock_guard<std::mutex> guard(settingsMutex);
-    compressGrayscaleTextures.set(enabled);
+    compressGrayscaleTextures.store(enabled);
 }
 
 void setCubeTexturesCompressionEnabled(bool enabled) {
-    std::lock_guard<std::mutex> guard(settingsMutex);
-    compressCubeTextures.set(enabled);
+    compressCubeTextures.store(enabled);
 }
 
+static float denormalize(float value, const float minValue) {
+    return value < minValue ? 0.0f : value;
+}
 
-gpu::TexturePointer processImage(const QByteArray& content, const std::string& filename, int maxNumPixels, TextureUsage::Type textureType) {
+uint32 packR11G11B10F(const glm::vec3& color) {
+    // Denormalize else unpacking gives high and incorrect values
+    // See https://www.khronos.org/opengl/wiki/Small_Float_Formats for this min value
+    static const auto minValue = 6.10e-5f;
+    static const auto maxValue = 6.50e4f;
+    glm::vec3 ucolor;
+    ucolor.r = denormalize(color.r, minValue);
+    ucolor.g = denormalize(color.g, minValue);
+    ucolor.b = denormalize(color.b, minValue);
+    ucolor.r = std::min(ucolor.r, maxValue);
+    ucolor.g = std::min(ucolor.g, maxValue);
+    ucolor.b = std::min(ucolor.b, maxValue);
+    return glm::packF2x11_1x10(ucolor);
+}
+
+gpu::TexturePointer processImage(const QByteArray& content, const std::string& filename,
+                                 int maxNumPixels, TextureUsage::Type textureType,
+                                 const std::atomic<bool>& abortProcessing) {
     // Help the QImage loader by extracting the image file format from the url filename ext.
     // Some tga are not created properly without it.
     auto filenameExtension = filename.substr(filename.find_last_of('.') + 1);
@@ -255,13 +289,11 @@ gpu::TexturePointer processImage(const QByteArray& content, const std::string& f
     }
     
     auto loader = TextureUsage::getTextureLoaderForType(textureType);
-    auto texture = loader(image, filename);
+    auto texture = loader(image, filename, abortProcessing);
 
     return texture;
 }
 
-
-
 QImage processSourceImage(const QImage& srcImage, bool cubemap) {
     PROFILE_RANGE(resource_parse, "processSourceImage");
     const glm::uvec2 srcImageSize = toGlm(srcImage.size());
@@ -292,8 +324,9 @@ QImage processSourceImage(const QImage& srcImage, bool cubemap) {
     return srcImage;
 }
 
-struct MyOutputHandler : public nvtt::OutputHandler {
-    MyOutputHandler(gpu::Texture* texture, int face) : _texture(texture), _face(face) {}
+#if defined(NVTT_API)
+struct OutputHandler : public nvtt::OutputHandler {
+    OutputHandler(gpu::Texture* texture, int face) : _texture(texture), _face(face) {}
 
     virtual void beginImage(int size, int width, int height, int depth, int face, int miplevel) override {
         _size = size;
@@ -302,12 +335,14 @@ struct MyOutputHandler : public nvtt::OutputHandler {
         _data = static_cast<gpu::Byte*>(malloc(size));
         _current = _data;
     }
+
     virtual bool writeData(const void* data, int size) override {
         assert(_current + size <= _data + _size);
         memcpy(_current, data, size);
         _current += size;
         return true;
     }
+
     virtual void endImage() override {
         if (_face >= 0) {
             _texture->assignStoredMipFace(_miplevel, _face, _size, static_cast<const gpu::Byte*>(_data));
@@ -325,16 +360,165 @@ struct MyOutputHandler : public nvtt::OutputHandler {
     int _size = 0;
     int _face = -1;
 };
+
+struct PackedFloatOutputHandler : public OutputHandler {
+    PackedFloatOutputHandler(gpu::Texture* texture, int face, gpu::Element format) : OutputHandler(texture, face) {
+        if (format == gpu::Element::COLOR_RGB9E5) {
+            _packFunc = glm::packF3x9_E1x5;
+        } else if (format == gpu::Element::COLOR_R11G11B10) {
+            _packFunc = packR11G11B10F;
+        } else {
+            qCWarning(imagelogging) << "Unknown handler format";
+            Q_UNREACHABLE();
+        }
+    }
+
+    virtual void beginImage(int size, int width, int height, int depth, int face, int miplevel) override {
+        // Divide by 3 because we will compress from 3*floats to 1 uint32
+        OutputHandler::beginImage(size / 3, width, height, depth, face, miplevel);
+    }
+    virtual bool writeData(const void* data, int size) override {
+        // Expecting to write multiple of floats
+        if (_packFunc) {
+            assert((size % sizeof(float)) == 0);
+            auto floatCount = size / sizeof(float);
+            const float* floatBegin = (const float*)data;
+            const float* floatEnd = floatBegin + floatCount;
+
+            while (floatBegin < floatEnd) {
+                _pixel[_coordIndex] = *floatBegin;
+                floatBegin++;
+                _coordIndex++;
+                if (_coordIndex == 3) {
+                    uint32 packedRGB = _packFunc(_pixel);
+                    _coordIndex = 0;
+                    OutputHandler::writeData(&packedRGB, sizeof(packedRGB));
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+
+    std::function<uint32(const glm::vec3&)> _packFunc;
+    glm::vec3 _pixel;
+    int _coordIndex{ 0 };
+};
+
 struct MyErrorHandler : public nvtt::ErrorHandler {
     virtual void error(nvtt::Error e) override {
         qCWarning(imagelogging) << "Texture compression error:" << nvtt::errorString(e);
     }
 };
+#endif
 
-void generateMips(gpu::Texture* texture, QImage& image, int face = -1) {
-#if CPU_MIPMAPS
-    PROFILE_RANGE(resource_parse, "generateMips");
+class SequentialTaskDispatcher : public nvtt::TaskDispatcher {
+public:
+    SequentialTaskDispatcher(const std::atomic<bool>& abortProcessing) : _abortProcessing(abortProcessing) {};
 
+    const std::atomic<bool>& _abortProcessing;
+
+    virtual void dispatch(nvtt::Task* task, void* context, int count) override {
+        for (int i = 0; i < count; i++) {
+            if (!_abortProcessing.load()) {
+                task(context, i);
+            } else {
+                break;
+            }
+        }
+    }
+};
+
+void generateHDRMips(gpu::Texture* texture, const QImage& image, const std::atomic<bool>& abortProcessing, int face) {
+    assert(image.format() == QIMAGE_HDR_FORMAT);
+
+    const int width = image.width(), height = image.height();
+    std::vector<glm::vec4> data;
+    std::vector<glm::vec4>::iterator dataIt;
+    auto mipFormat = texture->getStoredMipFormat();
+    std::function<glm::vec3(uint32)> unpackFunc;
+
+    nvtt::InputFormat inputFormat = nvtt::InputFormat_RGBA_32F;
+    nvtt::WrapMode wrapMode = nvtt::WrapMode_Mirror;
+    nvtt::AlphaMode alphaMode = nvtt::AlphaMode_None;
+
+    nvtt::CompressionOptions compressionOptions;
+    compressionOptions.setQuality(nvtt::Quality_Production);
+
+    if (mipFormat == gpu::Element::COLOR_COMPRESSED_HDR_RGB) {
+        compressionOptions.setFormat(nvtt::Format_BC6);
+    } else if (mipFormat == gpu::Element::COLOR_RGB9E5) {
+        compressionOptions.setFormat(nvtt::Format_RGB);
+        compressionOptions.setPixelType(nvtt::PixelType_Float);
+        compressionOptions.setPixelFormat(32, 32, 32, 0);
+    } else if (mipFormat == gpu::Element::COLOR_R11G11B10) {
+        compressionOptions.setFormat(nvtt::Format_RGB);
+        compressionOptions.setPixelType(nvtt::PixelType_Float);
+        compressionOptions.setPixelFormat(32, 32, 32, 0);
+    } else {
+        qCWarning(imagelogging) << "Unknown mip format";
+        Q_UNREACHABLE();
+        return;
+    }
+
+    if (HDR_FORMAT == gpu::Element::COLOR_RGB9E5) {
+        unpackFunc = glm::unpackF3x9_E1x5;
+    } else if (HDR_FORMAT == gpu::Element::COLOR_R11G11B10) {
+        unpackFunc = glm::unpackF2x11_1x10;
+    } else {
+        qCWarning(imagelogging) << "Unknown HDR encoding format in QImage";
+        Q_UNREACHABLE();
+        return;
+    }
+
+    data.resize(width*height);
+    dataIt = data.begin();
+    for (auto lineNb = 0; lineNb < height; lineNb++) {
+        const uint32* srcPixelIt = reinterpret_cast<const uint32*>( image.constScanLine(lineNb) );
+        const uint32* srcPixelEnd = srcPixelIt + width;
+
+        while (srcPixelIt < srcPixelEnd) {
+            *dataIt = glm::vec4(unpackFunc(*srcPixelIt), 1.0f);
+            ++srcPixelIt;
+            ++dataIt;
+        }
+    }
+    assert(dataIt == data.end());
+
+    nvtt::OutputOptions outputOptions;
+    outputOptions.setOutputHeader(false);
+    std::unique_ptr<nvtt::OutputHandler> outputHandler;
+    MyErrorHandler errorHandler;
+    outputOptions.setErrorHandler(&errorHandler);
+    nvtt::Context context;
+    int mipLevel = 0;
+
+    if (mipFormat == gpu::Element::COLOR_RGB9E5 || mipFormat == gpu::Element::COLOR_R11G11B10) {
+        // Don't use NVTT (at least version 2.1) as it outputs wrong RGB9E5 and R11G11B10F values from floats
+        outputHandler.reset(new PackedFloatOutputHandler(texture, face, mipFormat));
+    } else {
+        outputHandler.reset( new OutputHandler(texture, face) );
+    }
+
+    outputOptions.setOutputHandler(outputHandler.get());
+
+    nvtt::Surface surface;
+    surface.setImage(inputFormat, width, height, 1, &(*data.begin()));
+    surface.setAlphaMode(alphaMode);
+    surface.setWrapMode(wrapMode);
+
+    SequentialTaskDispatcher dispatcher(abortProcessing);
+    nvtt::Compressor compressor;
+    context.setTaskDispatcher(&dispatcher);
+
+    context.compress(surface, face, mipLevel++, compressionOptions, outputOptions);
+    while (surface.canMakeNextMipmap() && !abortProcessing.load()) {
+        surface.buildNextMipmap(nvtt::MipmapFilter_Box);
+        context.compress(surface, face, mipLevel++, compressionOptions, outputOptions);
+    }
+}
+
+void generateLDRMips(gpu::Texture* texture, QImage& image, const std::atomic<bool>& abortProcessing, int face) {
     if (image.format() != QImage::Format_ARGB32) {
         image = image.convertToFormat(QImage::Format_ARGB32);
     }
@@ -388,10 +572,10 @@ void generateMips(gpu::Texture* texture, QImage& image, int face = -1) {
         compressionOptions.setPixelType(nvtt::PixelType_UnsignedNorm);
         compressionOptions.setPitchAlignment(4);
         compressionOptions.setPixelFormat(32,
-                                          0x000000FF,
-                                          0x0000FF00,
-                                          0x00FF0000,
-                                          0xFF000000);
+            0x000000FF,
+            0x0000FF00,
+            0x00FF0000,
+            0xFF000000);
         inputGamma = 1.0f;
         outputGamma = 1.0f;
     } else if (mipFormat == gpu::Element::COLOR_BGRA_32) {
@@ -399,10 +583,10 @@ void generateMips(gpu::Texture* texture, QImage& image, int face = -1) {
         compressionOptions.setPixelType(nvtt::PixelType_UnsignedNorm);
         compressionOptions.setPitchAlignment(4);
         compressionOptions.setPixelFormat(32,
-                                          0x00FF0000,
-                                          0x0000FF00,
-                                          0x000000FF,
-                                          0xFF000000);
+            0x00FF0000,
+            0x0000FF00,
+            0x000000FF,
+            0xFF000000);
         inputGamma = 1.0f;
         outputGamma = 1.0f;
     } else if (mipFormat == gpu::Element::COLOR_SRGBA_32) {
@@ -410,19 +594,19 @@ void generateMips(gpu::Texture* texture, QImage& image, int face = -1) {
         compressionOptions.setPixelType(nvtt::PixelType_UnsignedNorm);
         compressionOptions.setPitchAlignment(4);
         compressionOptions.setPixelFormat(32,
-                                          0x000000FF,
-                                          0x0000FF00,
-                                          0x00FF0000,
-                                          0xFF000000);
+            0x000000FF,
+            0x0000FF00,
+            0x00FF0000,
+            0xFF000000);
     } else if (mipFormat == gpu::Element::COLOR_SBGRA_32) {
         compressionOptions.setFormat(nvtt::Format_RGBA);
         compressionOptions.setPixelType(nvtt::PixelType_UnsignedNorm);
         compressionOptions.setPitchAlignment(4);
         compressionOptions.setPixelFormat(32,
-                                          0x00FF0000,
-                                          0x0000FF00,
-                                          0x000000FF,
-                                          0xFF000000);
+            0x00FF0000,
+            0x0000FF00,
+            0x000000FF,
+            0xFF000000);
     } else if (mipFormat == gpu::Element::COLOR_R_8) {
         compressionOptions.setFormat(nvtt::Format_RGB);
         compressionOptions.setPixelType(nvtt::PixelType_UnsignedNorm);
@@ -442,15 +626,28 @@ void generateMips(gpu::Texture* texture, QImage& image, int face = -1) {
 
     nvtt::OutputOptions outputOptions;
     outputOptions.setOutputHeader(false);
-    MyOutputHandler outputHandler(texture, face);
+    OutputHandler outputHandler(texture, face);
     outputOptions.setOutputHandler(&outputHandler);
     MyErrorHandler errorHandler;
     outputOptions.setErrorHandler(&errorHandler);
 
+    SequentialTaskDispatcher dispatcher(abortProcessing);
     nvtt::Compressor compressor;
+    compressor.setTaskDispatcher(&dispatcher);
     compressor.process(inputOptions, compressionOptions, outputOptions);
+}
+
+void generateMips(gpu::Texture* texture, QImage& image, const std::atomic<bool>& abortProcessing = false, int face = -1) {
+#if CPU_MIPMAPS
+    PROFILE_RANGE(resource_parse, "generateMips");
+
+    if (image.format() == QIMAGE_HDR_FORMAT) {
+        generateHDRMips(texture, image, abortProcessing, face);
+    } else  {
+        generateLDRMips(texture, image, abortProcessing, face);
+    }
 #else
-    texture->autoGenerateMips(-1);
+    texture->setAutoGenerateMips(true);
 #endif
 }
 
@@ -481,7 +678,8 @@ void processTextureAlpha(const QImage& srcImage, bool& validAlpha, bool& alphaAs
     validAlpha = (numOpaques != NUM_PIXELS);
 }
 
-gpu::TexturePointer TextureUsage::process2DTextureColorFromImage(const QImage& srcImage, const std::string& srcImageName, bool isStrict) {
+gpu::TexturePointer TextureUsage::process2DTextureColorFromImage(const QImage& srcImage, const std::string& srcImageName,
+                                                                 bool isStrict, const std::atomic<bool>& abortProcessing) {
     PROFILE_RANGE(resource_parse, "process2DTextureColorFromImage");
     QImage image = processSourceImage(srcImage, false);
     bool validAlpha = image.hasAlphaChannel();
@@ -529,7 +727,7 @@ gpu::TexturePointer TextureUsage::process2DTextureColorFromImage(const QImage& s
         }
         theTexture->setUsage(usage.build());
         theTexture->setStoredMipFormat(formatMip);
-        generateMips(theTexture.get(), image);
+        generateMips(theTexture.get(), image, abortProcessing);
     }
 
     return theTexture;
@@ -605,7 +803,8 @@ QImage processBumpMap(QImage& image) {
 
     return result;
 }
-gpu::TexturePointer TextureUsage::process2DTextureNormalMapFromImage(const QImage& srcImage, const std::string& srcImageName, bool isBumpMap) {
+gpu::TexturePointer TextureUsage::process2DTextureNormalMapFromImage(const QImage& srcImage, const std::string& srcImageName,
+                                                                     bool isBumpMap, const std::atomic<bool>& abortProcessing) {
     PROFILE_RANGE(resource_parse, "process2DTextureNormalMapFromImage");
     QImage image = processSourceImage(srcImage, false);
 
@@ -630,13 +829,15 @@ gpu::TexturePointer TextureUsage::process2DTextureNormalMapFromImage(const QImag
         theTexture = gpu::Texture::create2D(formatGPU, image.width(), image.height(), gpu::Texture::MAX_NUM_MIPS, gpu::Sampler(gpu::Sampler::FILTER_MIN_MAG_MIP_LINEAR));
         theTexture->setSource(srcImageName);
         theTexture->setStoredMipFormat(formatMip);
-        generateMips(theTexture.get(), image);
+        generateMips(theTexture.get(), image, abortProcessing);
     }
 
     return theTexture;
 }
 
-gpu::TexturePointer TextureUsage::process2DTextureGrayscaleFromImage(const QImage& srcImage, const std::string& srcImageName, bool isInvertedPixels) {
+gpu::TexturePointer TextureUsage::process2DTextureGrayscaleFromImage(const QImage& srcImage, const std::string& srcImageName,
+                                                                     bool isInvertedPixels,
+                                                                     const std::atomic<bool>& abortProcessing) {
     PROFILE_RANGE(resource_parse, "process2DTextureGrayscaleFromImage");
     QImage image = processSourceImage(srcImage, false);
 
@@ -664,7 +865,7 @@ gpu::TexturePointer TextureUsage::process2DTextureGrayscaleFromImage(const QImag
         theTexture = gpu::Texture::create2D(formatGPU, image.width(), image.height(), gpu::Texture::MAX_NUM_MIPS, gpu::Sampler(gpu::Sampler::FILTER_MIN_MAG_MIP_LINEAR));
         theTexture->setSource(srcImageName);
         theTexture->setStoredMipFormat(formatMip);
-        generateMips(theTexture.get(), image);
+        generateMips(theTexture.get(), image, abortProcessing);
     }
 
     return theTexture;  
@@ -782,6 +983,9 @@ public:
         glm::vec2 dstCoord;
         glm::ivec2 srcPixel;
         for (int y = 0; y < faceWidth; ++y) {
+            QRgb* destScanLineBegin = reinterpret_cast<QRgb*>( image.scanLine(y) );
+            QRgb* destPixelIterator = destScanLineBegin;
+
             dstCoord.y = 1.0f - (y + 0.5f) * dstInvSize.y; // Fill cube face images from top to bottom
             for (int x = 0; x < faceWidth; ++x) {
                 dstCoord.x = (x + 0.5f) * dstInvSize.x;
@@ -794,13 +998,19 @@ public:
                 srcPixel.y = floor((1.0f - srcCoord.y) * srcFaceHeight);
 
                 if (((uint32)srcPixel.x < (uint32)source.width()) && ((uint32)srcPixel.y < (uint32)source.height())) {
-                    image.setPixel(x, y, source.pixel(QPoint(srcPixel.x, srcPixel.y)));
+                    // We can't directly use the pixel() method because that launches a pixel color conversion to output
+                    // a correct RGBA8 color. But in our case we may have stored HDR values encoded in a RGB30 format which
+                    // are not convertible by Qt. The same goes with the setPixel method, by the way.
+                    const QRgb* sourcePixelIterator = reinterpret_cast<const QRgb*>(source.scanLine(srcPixel.y));
+                    sourcePixelIterator += srcPixel.x;
+                    *destPixelIterator = *sourcePixelIterator;
 
                     // Keep for debug, this is showing the dir as a color
                     //  glm::u8vec4 rgba((xyzDir.x + 1.0)*0.5 * 256, (xyzDir.y + 1.0)*0.5 * 256, (xyzDir.z + 1.0)*0.5 * 256, 256);
                     //  unsigned int val = 0xff000000 | (rgba.r) | (rgba.g << 8) | (rgba.b << 16);
-                    //  image.setPixel(x, y, val);
+                    //  *destPixelIterator = val;
                 }
+                ++destPixelIterator;
             }
         }
         return image;
@@ -926,24 +1136,83 @@ const CubeLayout CubeLayout::CUBEMAP_LAYOUTS[] = {
 };
 const int CubeLayout::NUM_CUBEMAP_LAYOUTS = sizeof(CubeLayout::CUBEMAP_LAYOUTS) / sizeof(CubeLayout);
 
-gpu::TexturePointer TextureUsage::processCubeTextureColorFromImage(const QImage& srcImage, const std::string& srcImageName, bool generateIrradiance) {
+//#define DEBUG_COLOR_PACKING
+
+QImage convertToHDRFormat(QImage srcImage, gpu::Element format) {
+    QImage hdrImage(srcImage.width(), srcImage.height(), (QImage::Format)QIMAGE_HDR_FORMAT);
+    std::function<uint32(const glm::vec3&)> packFunc;
+#ifdef DEBUG_COLOR_PACKING
+    std::function<glm::vec3(uint32)> unpackFunc;
+#endif
+
+    switch (format.getSemantic()) {
+        case gpu::R11G11B10:
+            packFunc = packR11G11B10F;
+#ifdef DEBUG_COLOR_PACKING
+            unpackFunc = glm::unpackF2x11_1x10;
+#endif
+            break;
+        case gpu::RGB9E5:
+            packFunc = glm::packF3x9_E1x5;
+#ifdef DEBUG_COLOR_PACKING
+            unpackFunc = glm::unpackF3x9_E1x5;
+#endif
+            break;
+        default:
+            qCWarning(imagelogging) << "Unsupported HDR format";
+            Q_UNREACHABLE();
+            return srcImage;
+    }
+
+    srcImage = srcImage.convertToFormat(QImage::Format_ARGB32);
+    for (auto y = 0; y < srcImage.height(); y++) {
+        const QRgb* srcLineIt = reinterpret_cast<const QRgb*>( srcImage.constScanLine(y) );
+        const QRgb* srcLineEnd = srcLineIt + srcImage.width();
+        uint32* hdrLineIt = reinterpret_cast<uint32*>( hdrImage.scanLine(y) );
+        glm::vec3 color;
+
+        while (srcLineIt < srcLineEnd) {
+            color.r = qRed(*srcLineIt);
+            color.g = qGreen(*srcLineIt);
+            color.b = qBlue(*srcLineIt);
+            // Normalize and apply gamma
+            color /= 255.0f;
+            color.r = powf(color.r, 2.2f);
+            color.g = powf(color.g, 2.2f);
+            color.b = powf(color.b, 2.2f);
+            *hdrLineIt = packFunc(color);
+#ifdef DEBUG_COLOR_PACKING
+            glm::vec3 ucolor = unpackFunc(*hdrLineIt);
+            assert(glm::distance(color, ucolor) <= 5e-2);
+#endif
+            ++srcLineIt;
+            ++hdrLineIt;
+        }
+    }
+    return hdrImage;
+}
+
+gpu::TexturePointer TextureUsage::processCubeTextureColorFromImage(const QImage& srcImage, const std::string& srcImageName,
+                                                                   bool generateIrradiance,
+                                                                   const std::atomic<bool>& abortProcessing) {
     PROFILE_RANGE(resource_parse, "processCubeTextureColorFromImage");
 
     gpu::TexturePointer theTexture = nullptr;
     if ((srcImage.width() > 0) && (srcImage.height() > 0)) {
         QImage image = processSourceImage(srcImage, true);
-        if (image.format() != QImage::Format_ARGB32) {
-            image = image.convertToFormat(QImage::Format_ARGB32);
+
+        if (image.format() != QIMAGE_HDR_FORMAT) {
+            image = convertToHDRFormat(image, HDR_FORMAT);
         }
 
         gpu::Element formatMip;
         gpu::Element formatGPU;
         if (isCubeTexturesCompressionEnabled()) {
-            formatMip = gpu::Element::COLOR_COMPRESSED_SRGBA_HIGH;
-            formatGPU = gpu::Element::COLOR_COMPRESSED_SRGBA_HIGH;
+            formatMip = gpu::Element::COLOR_COMPRESSED_HDR_RGB;
+            formatGPU = gpu::Element::COLOR_COMPRESSED_HDR_RGB;
         } else {
-            formatMip = gpu::Element::COLOR_SRGBA_32;
-            formatGPU = gpu::Element::COLOR_SRGBA_32;
+            formatMip = HDR_FORMAT;
+            formatGPU = HDR_FORMAT;
         }
 
         // Find the layout of the cubemap in the 2D image
@@ -985,15 +1254,15 @@ gpu::TexturePointer TextureUsage::processCubeTextureColorFromImage(const QImage&
             theTexture->setStoredMipFormat(formatMip);
 
             for (uint8 face = 0; face < faces.size(); ++face) {
-                generateMips(theTexture.get(), faces[face], face);
+                generateMips(theTexture.get(), faces[face], abortProcessing, face);
             }
 
             // Generate irradiance while we are at it
             if (generateIrradiance) {
                 PROFILE_RANGE(resource_parse, "generateIrradiance");
-                auto irradianceTexture = gpu::Texture::createCube(gpu::Element::COLOR_SRGBA_32, faces[0].width(), gpu::Texture::MAX_NUM_MIPS, gpu::Sampler(gpu::Sampler::FILTER_MIN_MAG_MIP_LINEAR, gpu::Sampler::WRAP_CLAMP));
+                auto irradianceTexture = gpu::Texture::createCube(HDR_FORMAT, faces[0].width(), gpu::Texture::MAX_NUM_MIPS, gpu::Sampler(gpu::Sampler::FILTER_MIN_MAG_MIP_LINEAR, gpu::Sampler::WRAP_CLAMP));
                 irradianceTexture->setSource(srcImageName);
-                irradianceTexture->setStoredMipFormat(gpu::Element::COLOR_SBGRA_32);
+                irradianceTexture->setStoredMipFormat(HDR_FORMAT);
                 for (uint8 face = 0; face < faces.size(); ++face) {
                     irradianceTexture->assignStoredMipFace(0, face, faces[face].byteCount(), faces[face].constBits());
                 }
diff --git a/libraries/image/src/image/Image.h b/libraries/image/src/image/Image.h
index 3bf45ace98..856dc009cf 100644
--- a/libraries/image/src/image/Image.h
+++ b/libraries/image/src/image/Image.h
@@ -41,26 +41,42 @@ enum Type {
     UNUSED_TEXTURE
 };
 
-using TextureLoader = std::function<gpu::TexturePointer(const QImage&, const std::string&)>;
+using TextureLoader = std::function<gpu::TexturePointer(const QImage&, const std::string&, const std::atomic<bool>&)>;
 TextureLoader getTextureLoaderForType(Type type, const QVariantMap& options = QVariantMap());
 
-gpu::TexturePointer create2DTextureFromImage(const QImage& image, const std::string& srcImageName);
-gpu::TexturePointer createStrict2DTextureFromImage(const QImage& image, const std::string& srcImageName);
-gpu::TexturePointer createAlbedoTextureFromImage(const QImage& image, const std::string& srcImageName);
-gpu::TexturePointer createEmissiveTextureFromImage(const QImage& image, const std::string& srcImageName);
-gpu::TexturePointer createNormalTextureFromNormalImage(const QImage& image, const std::string& srcImageName);
-gpu::TexturePointer createNormalTextureFromBumpImage(const QImage& image, const std::string& srcImageName);
-gpu::TexturePointer createRoughnessTextureFromImage(const QImage& image, const std::string& srcImageName);
-gpu::TexturePointer createRoughnessTextureFromGlossImage(const QImage& image, const std::string& srcImageName);
-gpu::TexturePointer createMetallicTextureFromImage(const QImage& image, const std::string& srcImageName);
-gpu::TexturePointer createCubeTextureFromImage(const QImage& image, const std::string& srcImageName);
-gpu::TexturePointer createCubeTextureFromImageWithoutIrradiance(const QImage& image, const std::string& srcImageName);
-gpu::TexturePointer createLightmapTextureFromImage(const QImage& image, const std::string& srcImageName);
+gpu::TexturePointer create2DTextureFromImage(const QImage& image, const std::string& srcImageName,
+                                             const std::atomic<bool>& abortProcessing);
+gpu::TexturePointer createStrict2DTextureFromImage(const QImage& image, const std::string& srcImageName,
+                                                   const std::atomic<bool>& abortProcessing);
+gpu::TexturePointer createAlbedoTextureFromImage(const QImage& image, const std::string& srcImageName,
+                                                 const std::atomic<bool>& abortProcessing);
+gpu::TexturePointer createEmissiveTextureFromImage(const QImage& image, const std::string& srcImageName,
+                                                   const std::atomic<bool>& abortProcessing);
+gpu::TexturePointer createNormalTextureFromNormalImage(const QImage& image, const std::string& srcImageName,
+                                                       const std::atomic<bool>& abortProcessing);
+gpu::TexturePointer createNormalTextureFromBumpImage(const QImage& image, const std::string& srcImageName,
+                                                     const std::atomic<bool>& abortProcessing);
+gpu::TexturePointer createRoughnessTextureFromImage(const QImage& image, const std::string& srcImageName,
+                                                    const std::atomic<bool>& abortProcessing);
+gpu::TexturePointer createRoughnessTextureFromGlossImage(const QImage& image, const std::string& srcImageName,
+                                                         const std::atomic<bool>& abortProcessing);
+gpu::TexturePointer createMetallicTextureFromImage(const QImage& image, const std::string& srcImageName,
+                                                   const std::atomic<bool>& abortProcessing);
+gpu::TexturePointer createCubeTextureFromImage(const QImage& image, const std::string& srcImageName,
+                                               const std::atomic<bool>& abortProcessing);
+gpu::TexturePointer createCubeTextureFromImageWithoutIrradiance(const QImage& image, const std::string& srcImageName,
+                                                                const std::atomic<bool>& abortProcessing);
+gpu::TexturePointer createLightmapTextureFromImage(const QImage& image, const std::string& srcImageName,
+                                                   const std::atomic<bool>& abortProcessing);
 
-gpu::TexturePointer process2DTextureColorFromImage(const QImage& srcImage, const std::string& srcImageName, bool isStrict);
-gpu::TexturePointer process2DTextureNormalMapFromImage(const QImage& srcImage, const std::string& srcImageName, bool isBumpMap);
-gpu::TexturePointer process2DTextureGrayscaleFromImage(const QImage& srcImage, const std::string& srcImageName, bool isInvertedPixels);
-gpu::TexturePointer processCubeTextureColorFromImage(const QImage& srcImage, const std::string& srcImageName, bool generateIrradiance);
+gpu::TexturePointer process2DTextureColorFromImage(const QImage& srcImage, const std::string& srcImageName, bool isStrict,
+                                                   const std::atomic<bool>& abortProcessing);
+gpu::TexturePointer process2DTextureNormalMapFromImage(const QImage& srcImage, const std::string& srcImageName, bool isBumpMap,
+                                                       const std::atomic<bool>& abortProcessing);
+gpu::TexturePointer process2DTextureGrayscaleFromImage(const QImage& srcImage, const std::string& srcImageName, bool isInvertedPixels,
+                                                       const std::atomic<bool>& abortProcessing);
+gpu::TexturePointer processCubeTextureColorFromImage(const QImage& srcImage, const std::string& srcImageName, bool generateIrradiance,
+                                                     const std::atomic<bool>& abortProcessing);
 
 } // namespace TextureUsage
 
@@ -74,7 +90,9 @@ void setNormalTexturesCompressionEnabled(bool enabled);
 void setGrayscaleTexturesCompressionEnabled(bool enabled);
 void setCubeTexturesCompressionEnabled(bool enabled);
 
-gpu::TexturePointer processImage(const QByteArray& content, const std::string& url, int maxNumPixels, TextureUsage::Type textureType);
+gpu::TexturePointer processImage(const QByteArray& content, const std::string& url,
+                                 int maxNumPixels, TextureUsage::Type textureType,
+                                 const std::atomic<bool>& abortProcessing = false);
 
 } // namespace image
 
diff --git a/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp b/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp
index b5a2fc6b3c..e9ec6d8910 100755
--- a/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp
+++ b/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp
@@ -236,6 +236,7 @@ controller::Input::NamedVector KeyboardMouseDevice::InputDevice::getAvailableInp
         availableInputs.append(Input::NamedPair(makeInput(Qt::Key_Shift), "Shift"));
         availableInputs.append(Input::NamedPair(makeInput(Qt::Key_PageUp), QKeySequence(Qt::Key_PageUp).toString()));
         availableInputs.append(Input::NamedPair(makeInput(Qt::Key_PageDown), QKeySequence(Qt::Key_PageDown).toString()));
+        availableInputs.append(Input::NamedPair(makeInput(Qt::Key_Tab), QKeySequence(Qt::Key_Tab).toString()));
 
         availableInputs.append(Input::NamedPair(makeInput(Qt::LeftButton), "LeftMouseButton"));
         availableInputs.append(Input::NamedPair(makeInput(Qt::MiddleButton), "MiddleMouseButton"));
diff --git a/libraries/input-plugins/src/input-plugins/TouchscreenDevice.h b/libraries/input-plugins/src/input-plugins/TouchscreenDevice.h
index 02dcbe4664..c0cca200d7 100644
--- a/libraries/input-plugins/src/input-plugins/TouchscreenDevice.h
+++ b/libraries/input-plugins/src/input-plugins/TouchscreenDevice.h
@@ -30,7 +30,7 @@ public:
         TOUCH_AXIS_Y_NEG,
     };
 
-	enum TouchGestureAxisChannel {
+    enum TouchGestureAxisChannel {
         TOUCH_GESTURE_PINCH_POS = TOUCH_AXIS_Y_NEG + 1,
         TOUCH_GESTURE_PINCH_NEG,
     };
diff --git a/libraries/ktx/CMakeLists.txt b/libraries/ktx/CMakeLists.txt
index 967ea71eb6..efd8b76567 100644
--- a/libraries/ktx/CMakeLists.txt
+++ b/libraries/ktx/CMakeLists.txt
@@ -1,3 +1,3 @@
 set(TARGET_NAME ktx)
 setup_hifi_library()
-include_hifi_library_headers(shared)
\ No newline at end of file
+link_hifi_libraries(shared)
diff --git a/libraries/ktx/src/khronos/KHR.h b/libraries/ktx/src/khronos/KHR.h
index 98cc1a4736..cda22513ee 100644
--- a/libraries/ktx/src/khronos/KHR.h
+++ b/libraries/ktx/src/khronos/KHR.h
@@ -209,6 +209,137 @@ namespace khronos {
                 COMPRESSED_SIGNED_RG11_EAC = 0x9273,
             };
 
+            inline uint8_t evalUncompressedBlockBitSize(InternalFormat format) {
+                switch (format) {
+                    case InternalFormat::R8:
+                    case InternalFormat::R8_SNORM:
+                        return 8;
+                    case InternalFormat::R16:
+                    case InternalFormat::R16_SNORM:
+                    case InternalFormat::RG8:
+                    case InternalFormat::RG8_SNORM:
+                        return 16;
+                    case InternalFormat::RG16:
+                    case InternalFormat::RG16_SNORM:
+                        return 16;
+                    case InternalFormat::R3_G3_B2:
+                        return 8;
+                    case InternalFormat::RGB4:
+                        return 12;
+                    case InternalFormat::RGB5:
+                    case InternalFormat::RGB565:
+                        return 16;
+                    case InternalFormat::RGB8:
+                    case InternalFormat::RGB8_SNORM:
+                        return 24;
+                    case InternalFormat::RGB10:
+                        // TODO: check if this is really the case
+                        return 32;
+                    case InternalFormat::RGB12:
+                        // TODO: check if this is really the case
+                        return 48;
+                    case InternalFormat::RGB16:
+                    case InternalFormat::RGB16_SNORM:
+                        return 48;
+                    case InternalFormat::RGBA2:
+                        return 8;
+                    case InternalFormat::RGBA4:
+                    case InternalFormat::RGB5_A1:
+                        return 16;
+                    case InternalFormat::RGBA8:
+                    case InternalFormat::RGBA8_SNORM:
+                    case InternalFormat::RGB10_A2:
+                    case InternalFormat::RGB10_A2UI:
+                        return 32;
+                    case InternalFormat::RGBA12:
+                        return 48;
+                    case InternalFormat::RGBA16:
+                    case InternalFormat::RGBA16_SNORM:
+                        return 64;
+                    case InternalFormat::SRGB8:
+                        return 24;
+                    case InternalFormat::SRGB8_ALPHA8:
+                        return 32;
+                    case InternalFormat::R16F:
+                        return 16;
+                    case InternalFormat::RG16F:
+                        return 32;
+                    case InternalFormat::RGB16F:
+                        return 48;
+                    case InternalFormat::RGBA16F:
+                        return 64;
+                    case InternalFormat::R32F:
+                        return 32;
+                    case InternalFormat::RG32F:
+                        return 64;
+                    case InternalFormat::RGB32F:
+                        return 96;
+                    case InternalFormat::RGBA32F:
+                        return 128;
+                    case InternalFormat::R11F_G11F_B10F:
+                    case InternalFormat::RGB9_E5:
+                        return 32;
+                    case InternalFormat::R8I:
+                    case InternalFormat::R8UI:
+                        return 8;
+                    case InternalFormat::R16I:
+                    case InternalFormat::R16UI:
+                        return 16;
+                    case InternalFormat::R32I:
+                    case InternalFormat::R32UI:
+                        return 32;
+                    case InternalFormat::RG8I:
+                    case InternalFormat::RG8UI:
+                        return 16;
+                    case InternalFormat::RG16I:
+                    case InternalFormat::RG16UI:
+                        return 32;
+                    case InternalFormat::RG32I:
+                    case InternalFormat::RG32UI:
+                        return 64;
+                    case InternalFormat::RGB8I:
+                    case InternalFormat::RGB8UI:
+                        return 24;
+                    case InternalFormat::RGB16I:
+                    case InternalFormat::RGB16UI:
+                        return 48;
+                    case InternalFormat::RGB32I:
+                    case InternalFormat::RGB32UI:
+                        return 96;
+                    case InternalFormat::RGBA8I:
+                    case InternalFormat::RGBA8UI:
+                        return 32;
+                    case InternalFormat::RGBA16I:
+                    case InternalFormat::RGBA16UI:
+                        return 64;
+                    case InternalFormat::RGBA32I:
+                    case InternalFormat::RGBA32UI:
+                        return 128;
+                    case InternalFormat::DEPTH_COMPONENT16:
+                        return 16;
+                    case InternalFormat::DEPTH_COMPONENT24:
+                        return 24;
+                    case InternalFormat::DEPTH_COMPONENT32:
+                    case InternalFormat::DEPTH_COMPONENT32F:
+                    case InternalFormat::DEPTH24_STENCIL8:
+                        return 32;
+                    case InternalFormat::DEPTH32F_STENCIL8:
+                        // TODO : check if this true
+                        return 40;
+                    case InternalFormat::STENCIL_INDEX1:
+                        return 1;
+                    case InternalFormat::STENCIL_INDEX4:
+                        return 4;
+                    case InternalFormat::STENCIL_INDEX8:
+                        return 8;
+                    case InternalFormat::STENCIL_INDEX16:
+                        return 16;
+
+                    default:
+                        return 0;
+                }
+            }
+
             template <uint32_t ALIGNMENT> 
             inline uint32_t evalAlignedCompressedBlockCount(uint32_t value) {
                 enum { val = ALIGNMENT && !(ALIGNMENT & (ALIGNMENT - 1)) };
@@ -225,6 +356,7 @@ namespace khronos {
                     case InternalFormat::COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT: // BC3
                     case InternalFormat::COMPRESSED_RED_RGTC1: // BC4
                     case InternalFormat::COMPRESSED_RG_RGTC2: // BC5
+                    case InternalFormat::COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT: // BC6
                     case InternalFormat::COMPRESSED_SRGB_ALPHA_BPTC_UNORM: // BC7
                         return evalAlignedCompressedBlockCount<4>(value);
 
@@ -241,6 +373,7 @@ namespace khronos {
                         return 8;
 
                     case InternalFormat::COMPRESSED_SRGB_ALPHA_BPTC_UNORM:
+                    case InternalFormat::COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT:
                     case InternalFormat::COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:
                     case InternalFormat::COMPRESSED_RG_RGTC2:
                         return 16;
@@ -250,6 +383,10 @@ namespace khronos {
                 }
             }
 
+            inline uint8_t evalCompressedBlockBitSize(InternalFormat format) {
+                return evalCompressedBlockSize(format) * 8;
+            }
+
             enum class BaseInternalFormat : uint32_t {
                 // GL 4.4 Table 8.11
                 DEPTH_COMPONENT = 0x1902,
diff --git a/libraries/ktx/src/ktx/KTX.cpp b/libraries/ktx/src/ktx/KTX.cpp
index 3b1a12cba7..5bd45549c1 100644
--- a/libraries/ktx/src/ktx/KTX.cpp
+++ b/libraries/ktx/src/ktx/KTX.cpp
@@ -54,15 +54,13 @@ uint32_t Header::evalPixelOrBlockDepth(uint32_t level) const {
     return evalMipDimension(level, getPixelDepth());
 }
 
-size_t Header::evalPixelOrBlockSize() const {
+size_t Header::evalPixelOrBlockBitSize() const {
     size_t result = 0;
+    auto format = getGLInternaFormat();
     if (isCompressed()) {
-        auto format = getGLInternaFormat();
-        result = khronos::gl::texture::evalCompressedBlockSize(format);
+        result = khronos::gl::texture::evalCompressedBlockBitSize(format);
     } else {
-        // FIXME should really be using the internal format, not the base internal format
-        auto baseFormat = getGLBaseInternalFormat();
-        result = khronos::gl::texture::evalComponentCount(baseFormat);
+        result = khronos::gl::texture::evalUncompressedBlockBitSize(format);
     }
 
     if (0 == result) {
@@ -73,11 +71,14 @@ size_t Header::evalPixelOrBlockSize() const {
 
 size_t Header::evalRowSize(uint32_t level) const {
     auto pixWidth = evalPixelOrBlockWidth(level);
-    auto pixSize = evalPixelOrBlockSize();
+    auto pixSize = evalPixelOrBlockBitSize();
     if (pixSize == 0) {
         return 0;
     }
-    return evalPaddedSize(pixWidth * pixSize);
+    auto totalByteSize = pixWidth * pixSize;
+    // Round to the nearest upper byte size
+    totalByteSize = (totalByteSize / 8) + (((totalByteSize % 8) != 0) & 1);
+    return evalPaddedSize(totalByteSize);
 }
 
 size_t Header::evalFaceSize(uint32_t level) const {
diff --git a/libraries/ktx/src/ktx/KTX.h b/libraries/ktx/src/ktx/KTX.h
index 8dc4ec7a47..54a8188a42 100644
--- a/libraries/ktx/src/ktx/KTX.h
+++ b/libraries/ktx/src/ktx/KTX.h
@@ -170,7 +170,7 @@ namespace ktx {
         uint32_t evalPixelOrBlockHeight(uint32_t level) const;
         uint32_t evalPixelOrBlockDepth(uint32_t level) const;
 
-        size_t evalPixelOrBlockSize() const;
+        size_t evalPixelOrBlockBitSize() const;
         size_t evalRowSize(uint32_t level) const;
         size_t evalFaceSize(uint32_t level) const;
         size_t evalImageSize(uint32_t level) const;
diff --git a/libraries/midi/CMakeLists.txt b/libraries/midi/CMakeLists.txt
new file mode 100644
index 0000000000..dc54819c2b
--- /dev/null
+++ b/libraries/midi/CMakeLists.txt
@@ -0,0 +1,3 @@
+set(TARGET_NAME midi)
+setup_hifi_library(Network)
+link_hifi_libraries(shared networking)
diff --git a/libraries/midi/src/Midi.cpp b/libraries/midi/src/Midi.cpp
new file mode 100644
index 0000000000..ad650cf067
--- /dev/null
+++ b/libraries/midi/src/Midi.cpp
@@ -0,0 +1,275 @@
+//
+//  Midi.cpp
+//  libraries/midi/src
+//
+//  Created by Burt Sloane
+//  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 "Midi.h"
+
+
+#include <QtCore/QLoggingCategory>
+
+
+#if defined Q_OS_WIN32
+#include "Windows.h"
+#endif
+
+
+#if defined Q_OS_WIN32
+const int MIDI_BYTE_MASK = 0x0FF;
+const int MIDI_SHIFT_NOTE = 8;
+const int MIDI_SHIFT_VELOCITY = 16;
+#endif
+const int MIDI_STATUS_MASK = 0x0F0;
+const int MIDI_NOTE_OFF = 0x080;
+const int MIDI_NOTE_ON = 0x090;
+const int MIDI_CONTROL_CHANGE = 0x0b0;
+const int MIDI_CHANNEL_MODE_ALL_NOTES_OFF = 0x07b;
+
+
+static Midi* instance = NULL;            // communicate this to non-class callbacks
+static bool thruModeEnabled = false;
+
+std::vector<QString> Midi::midiinexclude;
+std::vector<QString> Midi::midioutexclude;
+
+
+#if defined Q_OS_WIN32
+
+#pragma comment(lib, "Winmm.lib")
+
+//
+std::vector<HMIDIIN> midihin;
+std::vector<HMIDIOUT> midihout;
+
+
+void CALLBACK MidiInProc(HMIDIIN hMidiIn, UINT wMsg, DWORD_PTR dwInstance, DWORD_PTR dwParam1, DWORD_PTR dwParam2) {
+    switch (wMsg) {
+        case MIM_OPEN:
+            // message not used
+            break;
+        case MIM_CLOSE:
+            for (int i = 0; i < midihin.size(); i++) {
+                if (midihin[i] == hMidiIn) {
+                    midihin[i] = NULL;
+                    instance->allNotesOff();
+                }
+            }
+            break;
+        case MIM_DATA: {
+            int status = MIDI_BYTE_MASK & dwParam1;
+            int note = MIDI_BYTE_MASK & (dwParam1 >> MIDI_SHIFT_NOTE);
+            int vel = MIDI_BYTE_MASK & (dwParam1 >> MIDI_SHIFT_VELOCITY);
+            if (thruModeEnabled) {
+                instance->sendNote(status, note, vel);          // relay the note on to all other midi devices
+            }
+            instance->noteReceived(status, note, vel);          // notify the javascript
+            break;
+        }
+    }
+}
+
+
+void CALLBACK MidiOutProc(HMIDIOUT hmo, UINT wMsg, DWORD_PTR dwInstance, DWORD_PTR dwParam1, DWORD_PTR dwParam2) {
+    switch (wMsg) {
+        case MOM_OPEN:
+            // message not used
+            break;
+        case MOM_CLOSE:
+            for (int i = 0; i < midihout.size(); i++) {
+                if (midihout[i] == hmo) {
+                    midihout[i] = NULL;
+                    instance->allNotesOff();
+                }
+            }
+            break;
+    }
+}
+
+
+void Midi::sendNote(int status, int note, int vel) {
+    for (int i = 0; i < midihout.size(); i++) {
+        if (midihout[i] != NULL) {
+            midiOutShortMsg(midihout[i], status + (note << MIDI_SHIFT_NOTE) + (vel << MIDI_SHIFT_VELOCITY));
+        }
+    }
+}
+
+
+void Midi::MidiSetup() {
+    midihin.clear();
+    midihout.clear();
+
+    MIDIINCAPS incaps;
+    for (unsigned int i = 0; i < midiInGetNumDevs(); i++) {
+        midiInGetDevCaps(i, &incaps, sizeof(MIDIINCAPS));
+
+        bool found = false;
+        for (int j = 0; j < midiinexclude.size(); j++) {
+            if (midiinexclude[j].toStdString().compare(incaps.szPname) == 0) {
+                found = true;
+                break;
+            }
+        }
+        if (!found) {        // EXCLUDE AN INPUT BY NAME
+            HMIDIIN tmphin;
+            midiInOpen(&tmphin, i, (DWORD_PTR)MidiInProc, NULL, CALLBACK_FUNCTION);
+            midiInStart(tmphin);
+            midihin.push_back(tmphin);
+        }
+
+    }
+
+    MIDIOUTCAPS outcaps;
+    for (unsigned int i = 0; i < midiOutGetNumDevs(); i++) {
+        midiOutGetDevCaps(i, &outcaps, sizeof(MIDIINCAPS));
+
+        bool found = false;
+        for (int j = 0; j < midioutexclude.size(); j++) {
+            if (midioutexclude[j].toStdString().compare(outcaps.szPname) == 0) {
+                found = true;
+                break;
+            }
+        }
+        if (!found) {        // EXCLUDE AN OUTPUT BY NAME
+            HMIDIOUT tmphout;
+            midiOutOpen(&tmphout, i, (DWORD_PTR)MidiOutProc, NULL, CALLBACK_FUNCTION);
+            midihout.push_back(tmphout);
+        }
+    }
+
+    allNotesOff();
+}
+
+void Midi::MidiCleanup() {
+    allNotesOff();
+
+    for (int i = 0; i < midihin.size(); i++) {
+        if (midihin[i] != NULL) {
+            midiInStop(midihin[i]);
+            midiInClose(midihin[i]);
+        }
+    }
+    for (int i = 0; i < midihout.size(); i++) {
+        if (midihout[i] != NULL) {
+            midiOutClose(midihout[i]);
+        }
+    }
+    midihin.clear();
+    midihout.clear();
+}
+#else
+void Midi::sendNote(int status, int note, int vel) {
+}
+
+void Midi::MidiSetup() {
+    allNotesOff();
+}
+
+void Midi::MidiCleanup() {
+    allNotesOff();
+}
+#endif
+
+void Midi::noteReceived(int status, int note, int velocity) {
+    if (((status & MIDI_STATUS_MASK) != MIDI_NOTE_OFF) &&
+        ((status & MIDI_STATUS_MASK) != MIDI_NOTE_ON)) {
+        return;            // NOTE: only sending note-on and note-off to Javascript
+    }
+
+    QVariantMap eventData;
+    eventData["status"] = status;
+    eventData["note"] = note;
+    eventData["velocity"] = velocity;
+    emit midiNote(eventData);
+}
+
+//
+
+Midi::Midi() {
+    instance = this;
+#if defined Q_OS_WIN32
+    midioutexclude.push_back("Microsoft GS Wavetable Synth");        // we don't want to hear this thing
+#endif
+    MidiSetup();
+}
+
+Midi::~Midi() {
+}
+
+void Midi::playMidiNote(int status, int note, int velocity) {
+    sendNote(status, note, velocity);
+}
+
+void Midi::allNotesOff() {
+    sendNote(MIDI_CONTROL_CHANGE, MIDI_CHANNEL_MODE_ALL_NOTES_OFF, 0);        // all notes off
+}
+
+void Midi::resetDevices() {
+    MidiCleanup();
+    MidiSetup();
+}
+
+void Midi::USBchanged() {
+    instance->MidiCleanup();
+    instance->MidiSetup();
+}
+
+//
+
+QStringList Midi::listMidiDevices(bool output) {
+    QStringList rv;
+#if defined Q_OS_WIN32
+    if (output) {
+        MIDIOUTCAPS outcaps;
+        for (unsigned int i = 0; i < midiOutGetNumDevs(); i++) {
+            midiOutGetDevCaps(i, &outcaps, sizeof(MIDIINCAPS));
+            rv.append(outcaps.szPname);
+        }
+    } else {
+        MIDIINCAPS incaps;
+        for (unsigned int i = 0; i < midiInGetNumDevs(); i++) {
+            midiInGetDevCaps(i, &incaps, sizeof(MIDIINCAPS));
+            rv.append(incaps.szPname);
+        }
+    }
+#endif
+    return rv;
+}
+
+void Midi::unblockMidiDevice(QString name, bool output) {
+    if (output) {
+        for (unsigned long i = 0; i < midioutexclude.size(); i++) {
+            if (midioutexclude[i].toStdString().compare(name.toStdString()) == 0) {
+                midioutexclude.erase(midioutexclude.begin() + i);
+                break;
+            }
+        }
+    } else {
+        for (unsigned long i = 0; i < midiinexclude.size(); i++) {
+            if (midiinexclude[i].toStdString().compare(name.toStdString()) == 0) {
+                midiinexclude.erase(midiinexclude.begin() + i);
+                break;
+            }
+        }
+    }
+}
+
+void Midi::blockMidiDevice(QString name, bool output) {
+    unblockMidiDevice(name, output);        // make sure it's only in there once
+    if (output) {
+        midioutexclude.push_back(name);
+    } else {
+        midiinexclude.push_back(name);
+    }
+}
+
+void Midi::thruModeEnable(bool enable) {
+    thruModeEnabled = enable;
+}
+
diff --git a/libraries/midi/src/Midi.h b/libraries/midi/src/Midi.h
new file mode 100644
index 0000000000..013ec056e3
--- /dev/null
+++ b/libraries/midi/src/Midi.h
@@ -0,0 +1,72 @@
+//
+//  Midi.h
+//  libraries/midi/src
+//
+//  Created by Burt Sloane
+//  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_Midi_h
+#define hifi_Midi_h
+
+#include <QtCore/QObject>
+#include <QAbstractNativeEventFilter>
+#include <DependencyManager.h>
+
+#include <vector>
+#include <string>
+
+class Midi : public QObject, public Dependency {
+    Q_OBJECT
+    SINGLETON_DEPENDENCY
+
+public:
+    void noteReceived(int status, int note, int velocity);    // relay a note to Javascript
+    void sendNote(int status, int note, int vel);            // relay a note to MIDI outputs
+    static void USBchanged();
+
+private:
+    static std::vector<QString> midiinexclude;
+    static std::vector<QString> midioutexclude;
+
+private:
+    void MidiSetup();
+    void MidiCleanup();
+
+signals:
+    void midiNote(QVariantMap eventData);
+
+public slots:
+/// play a note on all connected devices
+/// @param {int} status: 0x80 is noteoff, 0x90 is noteon (if velocity=0, noteoff), etc
+/// @param {int} note: midi note number
+/// @param {int} velocity: note velocity (0 means noteoff)
+Q_INVOKABLE void playMidiNote(int status, int note, int velocity);
+
+/// turn off all notes on all connected devices
+Q_INVOKABLE void allNotesOff();
+
+/// clean up and re-discover attached devices
+Q_INVOKABLE void resetDevices();
+
+/// ask for a list of inputs/outputs
+Q_INVOKABLE QStringList listMidiDevices(bool output);
+
+/// block an input/output by name
+Q_INVOKABLE void blockMidiDevice(QString name, bool output);
+
+/// unblock an input/output by name
+Q_INVOKABLE void unblockMidiDevice(QString name, bool output);
+
+/// repeat all incoming notes to all outputs (default disabled)
+Q_INVOKABLE void thruModeEnable(bool enable);
+
+public:
+    Midi();
+    virtual ~Midi();
+};
+
+#endif // hifi_Midi_h
diff --git a/libraries/model-networking/src/model-networking/ModelCache.cpp b/libraries/model-networking/src/model-networking/ModelCache.cpp
index 704455c981..b62ad7b366 100644
--- a/libraries/model-networking/src/model-networking/ModelCache.cpp
+++ b/libraries/model-networking/src/model-networking/ModelCache.cpp
@@ -71,12 +71,14 @@ void GeometryMappingResource::downloadFinished(const QByteArray& data) {
     } else {
         QUrl url = _url.resolved(filename);
 
-        QString texdir = mapping.value("texdir").toString();
+        QString texdir = mapping.value(TEXDIR_FIELD).toString();
         if (!texdir.isNull()) {
             if (!texdir.endsWith('/')) {
                 texdir += '/';
             }
             _textureBaseUrl = resolveTextureBaseUrl(url, _url.resolved(texdir));
+        } else {
+            _textureBaseUrl = url.resolved(QUrl("."));
         }
 
         auto animGraphVariant = mapping.value("animGraphUrl");
@@ -173,9 +175,9 @@ void GeometryReader::run() {
 
         QString urlname = _url.path().toLower();
         if (!urlname.isEmpty() && !_url.path().isEmpty() &&
-			(_url.path().toLower().endsWith(".fbx") || 
-			_url.path().toLower().endsWith(".obj") || 
-			_url.path().toLower().endsWith(".obj.gz"))) {
+            (_url.path().toLower().endsWith(".fbx") || 
+            _url.path().toLower().endsWith(".obj") || 
+            _url.path().toLower().endsWith(".obj.gz"))) {
             FBXGeometry::Pointer fbxGeometry;
 
             if (_url.path().toLower().endsWith(".fbx")) {
@@ -185,15 +187,15 @@ void GeometryReader::run() {
                 }
             } else if (_url.path().toLower().endsWith(".obj")) {
                 fbxGeometry.reset(OBJReader().readOBJ(_data, _mapping, _combineParts, _url));
-			} else if (_url.path().toLower().endsWith(".obj.gz")) {
-				QByteArray uncompressedData;
-				if (gunzip(_data, uncompressedData)){
-					fbxGeometry.reset(OBJReader().readOBJ(uncompressedData, _mapping, _combineParts, _url));
-				} else {
-					throw QString("failed to decompress .obj.gz" );
-				}
+            } else if (_url.path().toLower().endsWith(".obj.gz")) {
+                QByteArray uncompressedData;
+                if (gunzip(_data, uncompressedData)){
+                    fbxGeometry.reset(OBJReader().readOBJ(uncompressedData, _mapping, _combineParts, _url));
+                } else {
+                    throw QString("failed to decompress .obj.gz" );
+                }
 
-			} else {
+            } else {
                 throw QString("unsupported format");
             }
 
@@ -239,7 +241,11 @@ private:
 };
 
 void GeometryDefinitionResource::downloadFinished(const QByteArray& data) {
-    QThreadPool::globalInstance()->start(new GeometryReader(_self, _url, _mapping, data, _combineParts));
+    if (_url != _effectiveBaseURL) {
+        _url = _effectiveBaseURL;
+        _textureBaseUrl = _effectiveBaseURL;
+    }
+    QThreadPool::globalInstance()->start(new GeometryReader(_self, _effectiveBaseURL, _mapping, data, _combineParts));
 }
 
 void GeometryDefinitionResource::setGeometryDefinition(FBXGeometry::Pointer fbxGeometry) {
@@ -456,7 +462,7 @@ void GeometryResourceWatcher::setResource(GeometryResource::Pointer resource) {
     _resource = resource;
     if (_resource) {
         if (_resource->isLoaded()) {
-            _geometryRef = std::make_shared<Geometry>(*_resource);
+            resourceFinished(true);
         } else {
             startWatching();
         }
diff --git a/libraries/model-networking/src/model-networking/ModelCache.h b/libraries/model-networking/src/model-networking/ModelCache.h
index 6a1cc4c466..a122e03eb9 100644
--- a/libraries/model-networking/src/model-networking/ModelCache.h
+++ b/libraries/model-networking/src/model-networking/ModelCache.h
@@ -131,6 +131,7 @@ private:
     Geometry::Pointer& _geometryRef;
 };
 
+
 /// Stores cached model geometries.
 class ModelCache : public ResourceCache, public Dependency {
     Q_OBJECT
diff --git a/libraries/model-networking/src/model-networking/TextureCache.cpp b/libraries/model-networking/src/model-networking/TextureCache.cpp
index 5c8f59f20f..4184351c2d 100644
--- a/libraries/model-networking/src/model-networking/TextureCache.cpp
+++ b/libraries/model-networking/src/model-networking/TextureCache.cpp
@@ -21,6 +21,7 @@
 #include <QThreadPool>
 #include <QNetworkReply>
 #include <QPainter>
+#include <QUrlQuery>
 
 #if DEBUG_DUMP_TEXTURE_LOADS
 #include <QtCore/QFile>
@@ -54,6 +55,7 @@ const std::string TextureCache::KTX_EXT { "ktx" };
 
 static const QString RESOURCE_SCHEME = "resource";
 static const QUrl SPECTATOR_CAMERA_FRAME_URL("resource://spectatorCameraFrame");
+static const QUrl HMD_PREVIEW_FRAME_URL("resource://hmdPreviewFrame");
 
 static const float SKYBOX_LOAD_PRIORITY { 10.0f }; // Make sure skybox loads first
 static const float HIGH_MIPS_LOAD_PRIORITY { 9.0f }; // Make sure high mips loads after skybox but before models
@@ -188,8 +190,14 @@ NetworkTexturePointer TextureCache::getTexture(const QUrl& url, image::TextureUs
     if (url.scheme() == RESOURCE_SCHEME) {
         return getResourceTexture(url);
     }
+    auto modifiedUrl = url;
+    if (type == image::TextureUsage::CUBE_TEXTURE) {
+        QUrlQuery query { url.query() };
+        query.addQueryItem("skybox", "");
+        modifiedUrl.setQuery(query.toString());
+    }
     TextureExtra extra = { type, content, maxNumPixels };
-    return ResourceCache::getResource(url, QUrl(), &extra).staticCast<NetworkTexture>();
+    return ResourceCache::getResource(modifiedUrl, QUrl(), &extra).staticCast<NetworkTexture>();
 }
 
 gpu::TexturePointer TextureCache::getTextureByHash(const std::string& hash) {
@@ -198,11 +206,7 @@ gpu::TexturePointer TextureCache::getTextureByHash(const std::string& hash) {
         std::unique_lock<std::mutex> lock(_texturesByHashesMutex);
         weakPointer = _texturesByHashes[hash];
     }
-    auto result = weakPointer.lock();
-    if (result) {
-        qCWarning(modelnetworking) << "QQQ Returning live texture for hash " << hash.c_str();
-    }
-    return result;
+    return weakPointer.lock();
 }
 
 gpu::TexturePointer TextureCache::cacheTextureByHash(const std::string& hash, const gpu::TexturePointer& texture) {
@@ -223,7 +227,7 @@ gpu::TexturePointer TextureCache::cacheTextureByHash(const std::string& hash, co
 gpu::TexturePointer getFallbackTextureForType(image::TextureUsage::Type type) {
     gpu::TexturePointer result;
     auto textureCache = DependencyManager::get<TextureCache>();
-    // Since this can be called on a background thread, there's a chance that the cache 
+    // Since this can be called on a background thread, there's a chance that the cache
     // will be destroyed by the time we request it
     if (!textureCache) {
         return result;
@@ -260,7 +264,7 @@ gpu::TexturePointer getFallbackTextureForType(image::TextureUsage::Type type) {
 gpu::TexturePointer TextureCache::getImageTexture(const QString& path, image::TextureUsage::Type type, QVariantMap options) {
     QImage image = QImage(path);
     auto loader = image::TextureUsage::getTextureLoaderForType(type, options);
-    return gpu::TexturePointer(loader(image, QUrl::fromLocalFile(path).fileName().toStdString()));
+    return gpu::TexturePointer(loader(image, QUrl::fromLocalFile(path).fileName().toStdString(), false));
 }
 
 QSharedPointer<Resource> TextureCache::createResource(const QUrl& url, const QSharedPointer<Resource>& fallback,
@@ -294,6 +298,8 @@ NetworkTexture::NetworkTexture(const QUrl& url, image::TextureUsage::Type type,
     _textureSource = std::make_shared<gpu::TextureSource>();
     _lowestRequestedMipLevel = 0;
 
+    _shouldFailOnRedirect = !_sourceIsKTX;
+
     if (type == image::TextureUsage::CUBE_TEXTURE) {
         setLoadPriority(this, SKYBOX_LOAD_PRIORITY);
     } else if (_sourceIsKTX) {
@@ -373,7 +379,7 @@ void NetworkTexture::makeRequest() {
     if (!_sourceIsKTX) {
         Resource::makeRequest();
         return;
-    } 
+    }
 
     // We special-handle ktx requests to run 2 concurrent requests right off the bat
     PROFILE_ASYNC_BEGIN(resource, "Resource:" + getType(), QString::number(_requestID), { { "url", _url.toString() }, { "activeURL", _activeUrl.toString() } });
@@ -423,6 +429,21 @@ void NetworkTexture::makeRequest() {
 
 }
 
+bool NetworkTexture::handleFailedRequest(ResourceRequest::Result result) {
+    if (!_sourceIsKTX && result == ResourceRequest::Result::RedirectFail) {
+        auto newPath = _request->getRelativePathUrl();
+        if (newPath.fileName().endsWith(".ktx")) {
+            qDebug() << "Redirecting to" << newPath << "from" << _url;
+            _sourceIsKTX = true;
+            _activeUrl = newPath;
+            _shouldFailOnRedirect = false;
+            makeRequest();
+            return true;
+        }
+    }
+    return Resource::handleFailedRequest(result);
+}
+
 void NetworkTexture::startRequestForNextMipLevel() {
     auto self = _self.lock();
     if (!self) {
@@ -522,7 +543,7 @@ void NetworkTexture::ktxInitialDataRequestFinished() {
         _ktxHighMipData = _ktxMipRequest->getData();
         handleFinishedInitialLoad();
     } else {
-        if (handleFailedRequest(result)) {
+        if (Resource::handleFailedRequest(result)) {
             _ktxResourceState = PENDING_INITIAL_LOAD;
         } else {
             _ktxResourceState = FAILED_TO_LOAD;
@@ -599,6 +620,12 @@ void NetworkTexture::ktxMipRequestFinished() {
 
                 texture->assignStoredMip(mipLevel, data.size(), reinterpret_cast<const uint8_t*>(data.data()));
 
+                // If mip level assigned above is still unavailable, then we assume future requests will also fail.
+                auto minMipLevel = texture->minAvailableMipLevel();
+                if (minMipLevel > mipLevel) {
+                    return;
+                }
+
                 QMetaObject::invokeMethod(resource.data(), "setImage",
                     Q_ARG(gpu::TexturePointer, texture),
                     Q_ARG(int, texture->getWidth()),
@@ -611,7 +638,7 @@ void NetworkTexture::ktxMipRequestFinished() {
             finishedLoading(false);
         }
     } else {
-        if (handleFailedRequest(result)) {
+        if (Resource::handleFailedRequest(result)) {
             _ktxResourceState = PENDING_MIP_REQUEST;
         } else {
             _ktxResourceState = FAILED_TO_LOAD;
@@ -912,7 +939,7 @@ void ImageReader::read() {
             }
         }
 
-        // If we found the texture either because it's in use or via KTX deserialization, 
+        // If we found the texture either because it's in use or via KTX deserialization,
         // set the image and return immediately.
         if (texture) {
             QMetaObject::invokeMethod(resource.data(), "setImage",
@@ -961,7 +988,7 @@ void ImageReader::read() {
             qCWarning(modelnetworking) << "Unable to serialize texture to KTX " << _url;
         }
 
-        // We replace the texture with the one stored in the cache.  This deals with the possible race condition of two different 
+        // We replace the texture with the one stored in the cache.  This deals with the possible race condition of two different
         // images with the same hash being loaded concurrently.  Only one of them will make it into the cache by hash first and will
         // be the winner
         texture = textureCache->cacheTextureByHash(hash, texture);
@@ -973,31 +1000,59 @@ void ImageReader::read() {
                                 Q_ARG(int, texture->getHeight()));
 }
 
-
 NetworkTexturePointer TextureCache::getResourceTexture(QUrl resourceTextureUrl) {
     gpu::TexturePointer texture;
     if (resourceTextureUrl == SPECTATOR_CAMERA_FRAME_URL) {
         if (!_spectatorCameraNetworkTexture) {
             _spectatorCameraNetworkTexture.reset(new NetworkTexture(resourceTextureUrl));
         }
-        texture = _spectatorCameraFramebuffer->getRenderBuffer(0);
-        if (texture) {
-            _spectatorCameraNetworkTexture->setImage(texture, texture->getWidth(), texture->getHeight());
-            return _spectatorCameraNetworkTexture;
+        if (_spectatorCameraFramebuffer) {
+            texture = _spectatorCameraFramebuffer->getRenderBuffer(0);
+            if (texture) {
+                texture->setSource(SPECTATOR_CAMERA_FRAME_URL.toString().toStdString());
+                _spectatorCameraNetworkTexture->setImage(texture, texture->getWidth(), texture->getHeight());
+                return _spectatorCameraNetworkTexture;
+            }
+        }
+    }
+    // FIXME: Generalize this, DRY up this code
+    if (resourceTextureUrl == HMD_PREVIEW_FRAME_URL) {
+        if (!_hmdPreviewNetworkTexture) {
+            _hmdPreviewNetworkTexture.reset(new NetworkTexture(resourceTextureUrl));
+        }
+        if (_hmdPreviewFramebuffer) {
+            texture = _hmdPreviewFramebuffer->getRenderBuffer(0);
+            if (texture) {
+                texture->setSource(HMD_PREVIEW_FRAME_URL.toString().toStdString());
+                _hmdPreviewNetworkTexture->setImage(texture, texture->getWidth(), texture->getHeight());
+                return _hmdPreviewNetworkTexture;
+            }
         }
     }
 
     return NetworkTexturePointer();
 }
 
+const gpu::FramebufferPointer& TextureCache::getHmdPreviewFramebuffer(int width, int height) {
+    if (!_hmdPreviewFramebuffer || _hmdPreviewFramebuffer->getWidth() != width || _hmdPreviewFramebuffer->getHeight() != height) {
+        _hmdPreviewFramebuffer.reset(gpu::Framebuffer::create("hmdPreview",gpu::Element::COLOR_SRGBA_32, width, height));
+    }
+    return _hmdPreviewFramebuffer;
+}
+
 const gpu::FramebufferPointer& TextureCache::getSpectatorCameraFramebuffer() {
+    // If we're taking a screenshot and the spectator cam buffer hasn't been created yet, reset to the default size
     if (!_spectatorCameraFramebuffer) {
-        resetSpectatorCameraFramebuffer(2048, 1024);
+        return getSpectatorCameraFramebuffer(DEFAULT_SPECTATOR_CAM_WIDTH, DEFAULT_SPECTATOR_CAM_HEIGHT);
     }
     return _spectatorCameraFramebuffer;
 }
 
-void TextureCache::resetSpectatorCameraFramebuffer(int width, int height) {
-    _spectatorCameraFramebuffer.reset(gpu::Framebuffer::create("spectatorCamera", gpu::Element::COLOR_SRGBA_32, width, height));
-    _spectatorCameraNetworkTexture.reset();
+const gpu::FramebufferPointer& TextureCache::getSpectatorCameraFramebuffer(int width, int height) {
+    // If we aren't taking a screenshot, we might need to resize or create the camera buffer
+    if (!_spectatorCameraFramebuffer || _spectatorCameraFramebuffer->getWidth() != width || _spectatorCameraFramebuffer->getHeight() != height) {
+        _spectatorCameraFramebuffer.reset(gpu::Framebuffer::create("spectatorCamera", gpu::Element::COLOR_SRGBA_32, width, height));
+        emit spectatorCameraFramebufferReset();
+    }
+    return _spectatorCameraFramebuffer;
 }
diff --git a/libraries/model-networking/src/model-networking/TextureCache.h b/libraries/model-networking/src/model-networking/TextureCache.h
index 43edc3593d..1102694f86 100644
--- a/libraries/model-networking/src/model-networking/TextureCache.h
+++ b/libraries/model-networking/src/model-networking/TextureCache.h
@@ -74,7 +74,9 @@ protected:
     virtual bool isCacheable() const override { return _loaded; }
 
     virtual void downloadFinished(const QByteArray& data) override;
-    
+
+    bool handleFailedRequest(ResourceRequest::Result result) override;
+
     Q_INVOKABLE void loadContent(const QByteArray& content);
     Q_INVOKABLE void setImage(gpu::TexturePointer texture, int originalWidth, int originalHeight);
 
@@ -165,11 +167,16 @@ public:
     gpu::TexturePointer getTextureByHash(const std::string& hash);
     gpu::TexturePointer cacheTextureByHash(const std::string& hash, const gpu::TexturePointer& texture);
 
-
-    /// SpectatorCamera rendering targets.
     NetworkTexturePointer getResourceTexture(QUrl resourceTextureUrl);
+    const gpu::FramebufferPointer& getHmdPreviewFramebuffer(int width, int height);
     const gpu::FramebufferPointer& getSpectatorCameraFramebuffer();
-    void resetSpectatorCameraFramebuffer(int width, int height);
+    const gpu::FramebufferPointer& getSpectatorCameraFramebuffer(int width, int height);
+
+    static const int DEFAULT_SPECTATOR_CAM_WIDTH { 2048 };
+    static const int DEFAULT_SPECTATOR_CAM_HEIGHT { 1024 };
+
+signals:
+    void spectatorCameraFramebufferReset();
 
 protected:
     // Overload ResourceCache::prefetch to allow specifying texture type for loads
@@ -202,6 +209,9 @@ private:
 
     NetworkTexturePointer _spectatorCameraNetworkTexture;
     gpu::FramebufferPointer _spectatorCameraFramebuffer;
+
+    NetworkTexturePointer _hmdPreviewNetworkTexture;
+    gpu::FramebufferPointer _hmdPreviewFramebuffer;
 };
 
 #endif // hifi_TextureCache_h
diff --git a/libraries/model/src/model/Geometry.cpp b/libraries/model/src/model/Geometry.cpp
index f88c8233ea..5627746c43 100755
--- a/libraries/model/src/model/Geometry.cpp
+++ b/libraries/model/src/model/Geometry.cpp
@@ -11,8 +11,6 @@
 
 #include "Geometry.h"
 
-#include <QDebug>
-
 using namespace model;
 
 Mesh::Mesh() :
@@ -136,11 +134,13 @@ Box Mesh::evalPartsBound(int partStart, int partEnd) const {
 
 
 model::MeshPointer Mesh::map(std::function<glm::vec3(glm::vec3)> vertexFunc,
+                             std::function<glm::vec3(glm::vec3)> colorFunc,
                              std::function<glm::vec3(glm::vec3)> normalFunc,
-                             std::function<uint32_t(uint32_t)> indexFunc) {
+                             std::function<uint32_t(uint32_t)> indexFunc) const {
     // vertex data
     const gpu::BufferView& vertexBufferView = getVertexBuffer();
     gpu::BufferView::Index numVertices = (gpu::BufferView::Index)getNumVertices();
+
     gpu::Resource::Size vertexSize = numVertices * sizeof(glm::vec3);
     unsigned char* resultVertexData = new unsigned char[vertexSize];
     unsigned char* vertexDataCursor = resultVertexData;
@@ -151,6 +151,21 @@ model::MeshPointer Mesh::map(std::function<glm::vec3(glm::vec3)> vertexFunc,
         vertexDataCursor += sizeof(pos);
     }
 
+    // color data
+    int attributeTypeColor = gpu::Stream::COLOR;
+    const gpu::BufferView& colorsBufferView = getAttributeBuffer(attributeTypeColor);
+    gpu::BufferView::Index numColors = (gpu::BufferView::Index)colorsBufferView.getNumElements();
+
+    gpu::Resource::Size colorSize = numColors * sizeof(glm::vec3);
+    unsigned char* resultColorData = new unsigned char[colorSize];
+    unsigned char* colorDataCursor = resultColorData;
+
+    for (gpu::BufferView::Index i = 0; i < numColors; i++) {
+        glm::vec3 color = colorFunc(colorsBufferView.get<glm::vec3>(i));
+        memcpy(colorDataCursor, &color, sizeof(color));
+        colorDataCursor += sizeof(color);
+    }
+
     // normal data
     int attributeTypeNormal = gpu::Stream::InputSlot::NORMAL; // libraries/gpu/src/gpu/Stream.h
     const gpu::BufferView& normalsBufferView = getAttributeBuffer(attributeTypeNormal);
@@ -187,6 +202,12 @@ model::MeshPointer Mesh::map(std::function<glm::vec3(glm::vec3)> vertexFunc,
     gpu::BufferView resultVertexBufferView(resultVertexBufferPointer, vertexElement);
     result->setVertexBuffer(resultVertexBufferView);
 
+    gpu::Element colorElement = gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ);
+    gpu::Buffer* resultColorsBuffer = new gpu::Buffer(colorSize, resultColorData);
+    gpu::BufferPointer resultColorsBufferPointer(resultColorsBuffer);
+    gpu::BufferView resultColorsBufferView(resultColorsBufferPointer, colorElement);
+    result->addAttribute(attributeTypeColor, resultColorsBufferView);
+
     gpu::Element normalElement = gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ);
     gpu::Buffer* resultNormalsBuffer = new gpu::Buffer(normalSize, resultNormalData);
     gpu::BufferPointer resultNormalsBufferPointer(resultNormalsBuffer);
@@ -215,6 +236,7 @@ model::MeshPointer Mesh::map(std::function<glm::vec3(glm::vec3)> vertexFunc,
 
 
 void Mesh::forEach(std::function<void(glm::vec3)> vertexFunc,
+                   std::function<void(glm::vec3)> colorFunc,
                    std::function<void(glm::vec3)> normalFunc,
                    std::function<void(uint32_t)> indexFunc) {
     // vertex data
@@ -224,6 +246,14 @@ void Mesh::forEach(std::function<void(glm::vec3)> vertexFunc,
         vertexFunc(vertexBufferView.get<glm::vec3>(i));
     }
 
+    // color data
+    int attributeTypeColor = gpu::Stream::InputSlot::COLOR; // libraries/gpu/src/gpu/Stream.h
+    const gpu::BufferView& colorsBufferView = getAttributeBuffer(attributeTypeColor);
+    gpu::BufferView::Index numColors =  (gpu::BufferView::Index)colorsBufferView.getNumElements();
+    for (gpu::BufferView::Index i = 0; i < numColors; i++) {
+        colorFunc(colorsBufferView.get<glm::vec3>(i));
+    }
+
     // normal data
     int attributeTypeNormal = gpu::Stream::InputSlot::NORMAL; // libraries/gpu/src/gpu/Stream.h
     const gpu::BufferView& normalsBufferView = getAttributeBuffer(attributeTypeNormal);
diff --git a/libraries/model/src/model/Geometry.h b/libraries/model/src/model/Geometry.h
index a3198eed26..260de313ab 100755
--- a/libraries/model/src/model/Geometry.h
+++ b/libraries/model/src/model/Geometry.h
@@ -123,10 +123,12 @@ public:
 
     // create a copy of this mesh after passing its vertices, normals, and indexes though the provided functions
     MeshPointer map(std::function<glm::vec3(glm::vec3)> vertexFunc,
+                    std::function<glm::vec3(glm::vec3)> colorFunc,
                     std::function<glm::vec3(glm::vec3)> normalFunc,
-                    std::function<uint32_t(uint32_t)> indexFunc);
+                    std::function<uint32_t(uint32_t)> indexFunc) const;
 
     void forEach(std::function<void(glm::vec3)> vertexFunc,
+                 std::function<void(glm::vec3)> colorFunc,
                  std::function<void(glm::vec3)> normalFunc,
                  std::function<void(uint32_t)> indexFunc);
 
diff --git a/libraries/model/src/model/Haze.cpp b/libraries/model/src/model/Haze.cpp
new file mode 100644
index 0000000000..b56932e131
--- /dev/null
+++ b/libraries/model/src/model/Haze.cpp
@@ -0,0 +1,192 @@
+//
+//  Haze.cpp
+//  libraries/model/src/model
+//
+//  Created by Nissim Hadar on 9/13/2017.
+//  Copyright 2014 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 <memory>
+#include "Haze.h"
+
+using namespace model;
+
+const float Haze::INITIAL_HAZE_RANGE{ 1000.0f };
+const float Haze::INITIAL_HAZE_HEIGHT{ 200.0f };
+
+const float Haze::INITIAL_KEY_LIGHT_RANGE{ 1000.0f };
+const float Haze::INITIAL_KEY_LIGHT_ALTITUDE{ 200.0f };
+
+const float Haze::INITIAL_HAZE_BACKGROUND_BLEND{ 0.0f };
+
+const glm::vec3 Haze::INITIAL_HAZE_COLOR{ 0.5f, 0.6f, 0.7f }; // Bluish
+
+const float Haze::INITIAL_HAZE_GLARE_ANGLE{ 20.0f };
+
+const glm::vec3 Haze::INITIAL_HAZE_GLARE_COLOR{ 1.0f, 0.9f, 0.7f };
+
+const float Haze::INITIAL_HAZE_BASE_REFERENCE{ 0.0f };
+
+const float Haze::LOG_P_005{ logf(0.05f)};
+const float Haze::LOG_P_05{ logf(0.5f) };
+
+Haze::Haze() {
+    Parameters parameters;
+    _hazeParametersBuffer = gpu::BufferView(std::make_shared<gpu::Buffer>(sizeof(Parameters), (const gpu::Byte*) &parameters));
+}
+
+enum HazeModes {
+    HAZE_MODE_IS_ACTIVE                        = 1 << 0,
+    HAZE_MODE_IS_ALTITUDE_BASED                = 1 << 1,
+    HAZE_MODE_IS_KEYLIGHT_ATTENUATED           = 1 << 2,
+    HAZE_MODE_IS_MODULATE_COLOR                = 1 << 3,
+    HAZE_MODE_IS_ENABLE_LIGHT_BLEND            = 1 << 4
+};
+
+// For color modulated mode, the colour values are used as range values, which are then converted to range factors
+// This is separate for each colour.
+// The colour value is converted from [0.0 .. 1.0] to [5.0 .. 3000.0]
+const float OFFSET = 5.0f;
+const float BIAS = (3000.0f - 5.0f) / (1.0f - 0.0f);
+void Haze::setHazeColor(const glm::vec3 hazeColor) {
+    auto& params = _hazeParametersBuffer.get<Parameters>();
+
+    if (params.hazeColor != hazeColor) {
+        _hazeParametersBuffer.edit<Parameters>().hazeColor = hazeColor;
+
+        glm::vec3 range = hazeColor * BIAS + OFFSET;
+        glm::vec3 factor = convertHazeRangeToHazeRangeFactor(range);
+        _hazeParametersBuffer.edit<Parameters>().colorModulationFactor = factor;
+    }
+ }
+
+void Haze::setHazeEnableGlare(const bool isHazeEnableGlare) {
+    auto& params = _hazeParametersBuffer.get<Parameters>();
+
+    if (((params.hazeMode & HAZE_MODE_IS_ENABLE_LIGHT_BLEND) == HAZE_MODE_IS_ENABLE_LIGHT_BLEND) && !isHazeEnableGlare) {
+        _hazeParametersBuffer.edit<Parameters>().hazeMode &= ~HAZE_MODE_IS_ENABLE_LIGHT_BLEND;
+    } else if (((params.hazeMode & HAZE_MODE_IS_ENABLE_LIGHT_BLEND) != HAZE_MODE_IS_ENABLE_LIGHT_BLEND) && isHazeEnableGlare) {
+        _hazeParametersBuffer.edit<Parameters>().hazeMode |= HAZE_MODE_IS_ENABLE_LIGHT_BLEND;
+    }
+}
+
+void Haze::setHazeGlareBlend(const float hazeGlareBlend) {
+    auto& params = _hazeParametersBuffer.get<Parameters>();
+
+    if (params.hazeGlareBlend != hazeGlareBlend) {
+        _hazeParametersBuffer.edit<Parameters>().hazeGlareBlend = hazeGlareBlend;
+    }
+}
+
+void Haze::setHazeGlareColor(const glm::vec3 hazeGlareColor) {
+    auto& params = _hazeParametersBuffer.get<Parameters>();
+
+    if (params.hazeGlareColor.r != hazeGlareColor.r) {
+        _hazeParametersBuffer.edit<Parameters>().hazeGlareColor.r = hazeGlareColor.r;
+    }
+    if (params.hazeGlareColor.g != hazeGlareColor.g) {
+        _hazeParametersBuffer.edit<Parameters>().hazeGlareColor.g = hazeGlareColor.g;
+    }
+    if (params.hazeGlareColor.b != hazeGlareColor.b) {
+        _hazeParametersBuffer.edit<Parameters>().hazeGlareColor.b = hazeGlareColor.b;
+    }
+}
+void Haze::setHazeActive(const bool isHazeActive) {
+    auto& params = _hazeParametersBuffer.get<Parameters>();
+
+    if (((params.hazeMode & HAZE_MODE_IS_ACTIVE) == HAZE_MODE_IS_ACTIVE )&& !isHazeActive) {
+        _hazeParametersBuffer.edit<Parameters>().hazeMode &= ~HAZE_MODE_IS_ACTIVE;
+    } else if (((params.hazeMode & HAZE_MODE_IS_ACTIVE) != HAZE_MODE_IS_ACTIVE) && isHazeActive) {
+        _hazeParametersBuffer.edit<Parameters>().hazeMode |= HAZE_MODE_IS_ACTIVE;
+    }
+}
+
+void Haze::setAltitudeBased(const bool isAltitudeBased) {
+    auto& params = _hazeParametersBuffer.get<Parameters>();
+
+    if (((params.hazeMode & HAZE_MODE_IS_ALTITUDE_BASED) == HAZE_MODE_IS_ALTITUDE_BASED )&& !isAltitudeBased) {
+        _hazeParametersBuffer.edit<Parameters>().hazeMode &= ~HAZE_MODE_IS_ALTITUDE_BASED;
+    } else if (((params.hazeMode & HAZE_MODE_IS_ALTITUDE_BASED) != HAZE_MODE_IS_ALTITUDE_BASED) && isAltitudeBased) {
+        _hazeParametersBuffer.edit<Parameters>().hazeMode |= HAZE_MODE_IS_ALTITUDE_BASED;
+    }
+}
+
+void Haze::setHazeAttenuateKeyLight(const bool isHazeAttenuateKeyLight) {
+    auto& params = _hazeParametersBuffer.get<Parameters>();
+
+    if (((params.hazeMode & HAZE_MODE_IS_KEYLIGHT_ATTENUATED) == HAZE_MODE_IS_KEYLIGHT_ATTENUATED) && !isHazeAttenuateKeyLight) {
+        _hazeParametersBuffer.edit<Parameters>().hazeMode &= ~HAZE_MODE_IS_KEYLIGHT_ATTENUATED;
+    } else if (((params.hazeMode & HAZE_MODE_IS_KEYLIGHT_ATTENUATED) != HAZE_MODE_IS_KEYLIGHT_ATTENUATED) && isHazeAttenuateKeyLight) {
+        _hazeParametersBuffer.edit<Parameters>().hazeMode |= HAZE_MODE_IS_KEYLIGHT_ATTENUATED;
+    }
+}
+
+void Haze::setModulateColorActive(const bool isModulateColorActive) {
+    auto& params = _hazeParametersBuffer.get<Parameters>();
+
+    if (((params.hazeMode & HAZE_MODE_IS_MODULATE_COLOR) == HAZE_MODE_IS_MODULATE_COLOR ) && !isModulateColorActive) {
+        _hazeParametersBuffer.edit<Parameters>().hazeMode &= ~HAZE_MODE_IS_MODULATE_COLOR;
+    } else if (((params.hazeMode & HAZE_MODE_IS_MODULATE_COLOR) != HAZE_MODE_IS_MODULATE_COLOR) && isModulateColorActive) {
+        _hazeParametersBuffer.edit<Parameters>().hazeMode |= HAZE_MODE_IS_MODULATE_COLOR;
+    }
+}
+
+void Haze::setHazeRangeFactor(const float hazeRangeFactor) {
+    auto& params = _hazeParametersBuffer.get<Parameters>();
+
+    if (params.hazeRangeFactor != hazeRangeFactor) {
+        _hazeParametersBuffer.edit<Parameters>().hazeRangeFactor = hazeRangeFactor;
+    }
+}
+
+void Haze::setHazeAltitudeFactor(const float hazeHeightFactor) {
+    auto& params = _hazeParametersBuffer.get<Parameters>();
+
+    if (params.hazeHeightFactor != hazeHeightFactor) {
+        _hazeParametersBuffer.edit<Parameters>().hazeHeightFactor = hazeHeightFactor;
+    }
+}
+
+void Haze::setHazeKeyLightRangeFactor(const float hazeKeyLightRangeFactor) {
+    auto& params = _hazeParametersBuffer.get<Parameters>();
+
+    if (params.hazeKeyLightRangeFactor != hazeKeyLightRangeFactor) {
+        _hazeParametersBuffer.edit<Parameters>().hazeKeyLightRangeFactor = hazeKeyLightRangeFactor;
+    }
+}
+
+void Haze::setHazeKeyLightAltitudeFactor(const float hazeKeyLightAltitudeFactor) {
+    auto& params = _hazeParametersBuffer.get<Parameters>();
+
+    if (params.hazeKeyLightAltitudeFactor != hazeKeyLightAltitudeFactor) {
+        _hazeParametersBuffer.edit<Parameters>().hazeKeyLightAltitudeFactor = hazeKeyLightAltitudeFactor;
+    }
+}
+
+void Haze::setHazeBaseReference(const float hazeBaseReference) {
+    auto& params = _hazeParametersBuffer.get<Parameters>();
+
+    if (params.hazeBaseReference != hazeBaseReference) {
+        _hazeParametersBuffer.edit<Parameters>().hazeBaseReference = hazeBaseReference;
+    }
+}
+
+void Haze::setHazeBackgroundBlend(const float hazeBackgroundBlend) {
+    auto& params = _hazeParametersBuffer.get<Parameters>();
+
+    if (params.hazeBackgroundBlend != hazeBackgroundBlend) {
+        _hazeParametersBuffer.edit<Parameters>().hazeBackgroundBlend = hazeBackgroundBlend;
+    }
+}
+
+void Haze::setZoneTransform(const glm::mat4& zoneTransform) {
+    auto& params = _hazeParametersBuffer.get<Parameters>();
+
+    if (params.zoneTransform == zoneTransform) {
+        _hazeParametersBuffer.edit<Parameters>().zoneTransform = zoneTransform;
+    }
+}
+
diff --git a/libraries/model/src/model/Haze.h b/libraries/model/src/model/Haze.h
new file mode 100644
index 0000000000..a0cc7c3bc7
--- /dev/null
+++ b/libraries/model/src/model/Haze.h
@@ -0,0 +1,136 @@
+//
+//  MakeHaze.h
+//  libraries/model/src/model
+//
+//  Created by Nissim Hadar on 9/13/2017.
+//  Copyright 2014 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#ifndef hifi_model_Haze_h
+#define hifi_model_Haze_h
+
+#include <glm/glm.hpp>
+#include <gpu/Resource.h>
+
+#include "Transform.h"
+#include "NumericalConstants.h"
+
+namespace model {
+    // Haze range is defined here as the range the visibility is reduced by 95%
+    // Haze altitude is defined here as the altitude (above 0) that the haze is reduced by 95%
+
+    class Haze {
+    public:
+        // Initial values
+        static const float INITIAL_HAZE_RANGE;
+        static const float INITIAL_HAZE_HEIGHT;
+
+        static const float INITIAL_KEY_LIGHT_RANGE;
+        static const float INITIAL_KEY_LIGHT_ALTITUDE;
+
+        static const float INITIAL_HAZE_BACKGROUND_BLEND;
+
+        static const glm::vec3 INITIAL_HAZE_COLOR;
+
+        static const float INITIAL_HAZE_GLARE_ANGLE;
+
+        static const glm::vec3 INITIAL_HAZE_GLARE_COLOR;
+
+        static const float INITIAL_HAZE_BASE_REFERENCE;
+
+        static const float LOG_P_005;
+        static const float LOG_P_05;
+
+        // Derivation (d is distance, b is haze coefficient, f is attenuation, solve for f = 0.05
+        //  f = exp(-d * b)
+        //  ln(f) = -d * b
+        //  b = -ln(f)/d
+        static inline glm::vec3 convertHazeRangeToHazeRangeFactor(const glm::vec3 hazeRange) {
+            return glm::vec3(
+                -LOG_P_005 / hazeRange.x,
+                -LOG_P_005 / hazeRange.y,
+                -LOG_P_005 / hazeRange.z);
+        }
+
+        // limit range and altitude to no less than 1.0 metres
+        static inline float convertHazeRangeToHazeRangeFactor(const float hazeRange) { return -LOG_P_005 / glm::max(hazeRange, 1.0f); }
+
+        static inline float convertHazeAltitudeToHazeAltitudeFactor(const float hazeHeight) { return -LOG_P_005 / glm::max(hazeHeight, 1.0f); }
+
+        // Derivation (s is the proportion of sun blend, a is the angle at which the blend is 50%, solve for m = 0.5
+        //  s = dot(lookAngle, sunAngle) = cos(a)
+        //  m = pow(s, p)
+        //  log(m) = p * log(s)
+        //  p = log(m) / log(s)
+        // limit to 0.1 degrees
+        static inline float convertGlareAngleToPower(const float hazeGlareAngle) {
+            const float GLARE_ANGLE_LIMIT = 0.1f;
+            return LOG_P_05 / logf(cosf(RADIANS_PER_DEGREE * glm::max(GLARE_ANGLE_LIMIT, hazeGlareAngle)));
+        }
+
+        Haze();
+
+        void setHazeColor(const glm::vec3 hazeColor);
+        void setHazeGlareBlend(const float hazeGlareBlend);
+
+        void setHazeGlareColor(const glm::vec3 hazeGlareColor);
+        void setHazeBaseReference(const float hazeBaseReference);
+
+        void setHazeActive(const bool isHazeActive);
+        void setAltitudeBased(const bool isAltitudeBased);
+        void setHazeAttenuateKeyLight(const bool isHazeAttenuateKeyLight);
+        void setModulateColorActive(const bool isModulateColorActive);
+        void setHazeEnableGlare(const bool isHazeEnableGlare);
+
+        void setHazeRangeFactor(const float hazeRange);
+        void setHazeAltitudeFactor(const float hazeAltitude);
+
+        void setHazeKeyLightRangeFactor(const float hazeKeyLightRange);
+        void setHazeKeyLightAltitudeFactor(const float hazeKeyLightAltitude);
+
+        void setHazeBackgroundBlend(const float hazeBackgroundBlend);
+
+        void setZoneTransform(const glm::mat4& zoneTransform);
+
+        using UniformBufferView = gpu::BufferView;
+        UniformBufferView getHazeParametersBuffer() const { return _hazeParametersBuffer; }
+
+    protected:
+        class Parameters {
+        public:
+            // DO NOT CHANGE ORDER HERE WITHOUT UNDERSTANDING THE std140 LAYOUT
+            glm::vec3 hazeColor{ INITIAL_HAZE_COLOR };
+            float hazeGlareBlend{ convertGlareAngleToPower(INITIAL_HAZE_GLARE_ANGLE) };
+
+            glm::vec3 hazeGlareColor{ INITIAL_HAZE_GLARE_COLOR };
+            float hazeBaseReference{ INITIAL_HAZE_BASE_REFERENCE };
+
+            glm::vec3 colorModulationFactor;
+            int hazeMode{ 0 };    // bit 0 - set to activate haze attenuation of fragment color
+                                  // bit 1 - set to add the effect of altitude to the haze attenuation
+                                  // bit 2 - set to activate directional light attenuation mode
+                                  // bit 3 - set to blend between blend-in and blend-out colours
+
+            glm::mat4 zoneTransform;
+
+            // Amount of background (skybox) to display, overriding the haze effect for the background
+            float hazeBackgroundBlend{ INITIAL_HAZE_BACKGROUND_BLEND };
+
+            // The haze attenuation exponents used by both fragment and directional light attenuation
+            float hazeRangeFactor{ convertHazeRangeToHazeRangeFactor(INITIAL_HAZE_RANGE) };
+            float hazeHeightFactor{ convertHazeAltitudeToHazeAltitudeFactor(INITIAL_HAZE_HEIGHT) };
+
+            float hazeKeyLightRangeFactor{ convertHazeRangeToHazeRangeFactor(INITIAL_KEY_LIGHT_RANGE) };
+            float hazeKeyLightAltitudeFactor{ convertHazeAltitudeToHazeAltitudeFactor(INITIAL_KEY_LIGHT_ALTITUDE) };
+
+            Parameters() {}
+        };
+
+        UniformBufferView _hazeParametersBuffer;
+    };
+
+    using HazePointer = std::shared_ptr<Haze>;
+}
+#endif // hifi_model_Haze_h
diff --git a/libraries/model/src/model/Light.slh b/libraries/model/src/model/Light.slh
index 67946abea0..093a87adc8 100644
--- a/libraries/model/src/model/Light.slh
+++ b/libraries/model/src/model/Light.slh
@@ -41,7 +41,7 @@ SphericalHarmonics getLightAmbientSphere(LightAmbient l) { return l._ambientSphe
 
 
 float getLightAmbientIntensity(LightAmbient l) { return l._ambient.x; }
-bool getLightHasAmbientMap(LightAmbient l) { return l._ambient.y > 0; }
+bool getLightHasAmbientMap(LightAmbient l) { return l._ambient.y > 0.0; }
 float getLightAmbientMapNumMips(LightAmbient l) { return l._ambient.y; }
 
 <@func declareLightBuffer(N)@>
diff --git a/libraries/model/src/model/LightIrradiance.shared.slh b/libraries/model/src/model/LightIrradiance.shared.slh
index 4a2ee40c9d..13d6cf4b93 100644
--- a/libraries/model/src/model/LightIrradiance.shared.slh
+++ b/libraries/model/src/model/LightIrradiance.shared.slh
@@ -37,7 +37,7 @@ float lightIrradiance_evalLightAttenuation(LightIrradiance li, float d) {
 
     // "Fade" the edges of light sources to make things look a bit more attractive.
     // Note: this tends to look a bit odd at lower exponents.
-    attenuation *= min(1, max(0, -(d - cutoff)));
+    attenuation *= min(1.0, max(0.0, -(d - cutoff)));
 
     return attenuation;
 }
diff --git a/libraries/model/src/model/Skybox.cpp b/libraries/model/src/model/Skybox.cpp
index d327593573..fd3061afa5 100755
--- a/libraries/model/src/model/Skybox.cpp
+++ b/libraries/model/src/model/Skybox.cpp
@@ -97,7 +97,10 @@ void Skybox::render(gpu::Batch& batch, const ViewFrustum& viewFrustum, const Sky
             }
 
             auto skyState = std::make_shared<gpu::State>();
-            skyState->setStencilTest(true, 0xFF, gpu::State::StencilTest(1, 0xFF, gpu::EQUAL, gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_KEEP));
+            // Must match PrepareStencil::STENCIL_BACKGROUND
+            const int8_t STENCIL_BACKGROUND = 0;
+            skyState->setStencilTest(true, 0xFF, gpu::State::StencilTest(STENCIL_BACKGROUND, 0xFF, gpu::EQUAL,
+                gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_KEEP));
 
             thePipeline = gpu::Pipeline::create(skyShader, skyState);
         }
diff --git a/libraries/model/src/model/Stage.cpp b/libraries/model/src/model/Stage.cpp
index 6cfb77f2b2..5854162cfa 100644
--- a/libraries/model/src/model/Stage.cpp
+++ b/libraries/model/src/model/Stage.cpp
@@ -13,6 +13,7 @@
 #include <glm/gtx/transform.hpp> 
 #include <math.h>
 #include <qcompilerdetection.h>
+#include <ComponentMode.h>
 
 using namespace model;
 
diff --git a/libraries/networking/CMakeLists.txt b/libraries/networking/CMakeLists.txt
index 288e98d5a5..c3592c5da2 100644
--- a/libraries/networking/CMakeLists.txt
+++ b/libraries/networking/CMakeLists.txt
@@ -2,44 +2,18 @@ set(TARGET_NAME networking)
 setup_hifi_library(Network)
 link_hifi_libraries(shared)
 
-target_include_directories(${TARGET_NAME} PRIVATE "${CMAKE_BINARY_DIR}/includes")
+target_openssl()
+target_tbb()
 
 if (WIN32)
-  # we need ws2_32.lib on windows, but it's static so we don't bubble it up
-  target_link_libraries(${TARGET_NAME} ws2_32.lib)
-endif ()
-
-add_dependency_external_projects(tbb)
-
-# find required dependencies
-find_package(OpenSSL REQUIRED)
-find_package(TBB REQUIRED)
-
-if (APPLE)
+    # we need ws2_32.lib on windows, but it's static so we don't bubble it up
+    target_link_libraries(${TARGET_NAME} ws2_32.lib)
+elseif(APPLE)
+    # IOKit is needed for getting machine fingerprint
     find_library(FRAMEWORK_IOKIT IOKit)
     find_library(CORE_FOUNDATION CoreFoundation)
-endif ()
-
-if (APPLE AND ${OPENSSL_INCLUDE_DIR} STREQUAL "/usr/include")
-  # this is a user on OS X using system OpenSSL, which is going to throw warnings since they're deprecating for their common crypto
-  message(WARNING "The found version of OpenSSL is the OS X system version. This will produce deprecation warnings."
-   "\nWe recommend you install a newer version (at least 1.0.1h) in a different directory and set OPENSSL_ROOT_DIR in your env so Cmake can find it.")
-endif ()
-
-include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}")
-
-# append OpenSSL to our list of libraries to link
-target_link_libraries(${TARGET_NAME} ${OPENSSL_LIBRARIES} ${TBB_LIBRARIES})
-
-# IOKit is needed for getting machine fingerprint
-if (APPLE)
     target_link_libraries(${TARGET_NAME} ${FRAMEWORK_IOKIT} ${CORE_FOUNDATION})
-endif (APPLE)
-
-# libcrypto uses dlopen in libdl
-if (UNIX)
-  target_link_libraries(${TARGET_NAME} ${CMAKE_DL_LIBS})
-endif (UNIX)
-
-# append tbb includes to our list of includes to bubble
-target_include_directories(${TARGET_NAME} SYSTEM PUBLIC ${TBB_INCLUDE_DIRS})
+elseif(UNIX)
+    # libcrypto uses dlopen in libdl
+    target_link_libraries(${TARGET_NAME} ${CMAKE_DL_LIBS})
+endif ()
diff --git a/libraries/networking/src/AccountManager.cpp b/libraries/networking/src/AccountManager.cpp
index fa6b49597d..f6264a19c4 100644
--- a/libraries/networking/src/AccountManager.cpp
+++ b/libraries/networking/src/AccountManager.cpp
@@ -28,7 +28,6 @@
 
 #include <SettingHandle.h>
 
-#include "NetworkingConstants.h"
 #include "NetworkLogging.h"
 #include "NodeList.h"
 #include "udt/PacketHeaders.h"
@@ -240,7 +239,7 @@ void AccountManager::sendRequest(const QString& path,
     QUrl requestURL = _authURL;
     
     if (requestURL.isEmpty()) {  // Assignment client doesn't set _authURL.
-        requestURL = NetworkingConstants::METAVERSE_SERVER_URL;
+        requestURL = getMetaverseServerURL();
     }
 
     if (path.startsWith("/")) {
diff --git a/libraries/networking/src/AccountManager.h b/libraries/networking/src/AccountManager.h
index b37846ec1b..7d97687d0b 100644
--- a/libraries/networking/src/AccountManager.h
+++ b/libraries/networking/src/AccountManager.h
@@ -18,6 +18,7 @@
 #include <QtNetwork/QNetworkReply>
 #include <QUrlQuery>
 
+#include "NetworkingConstants.h"
 #include "NetworkAccessManager.h"
 
 #include "DataServerAccountInfo.h"
@@ -96,6 +97,8 @@ public:
     void setTemporaryDomain(const QUuid& domainID, const QString& key);
     const QString& getTemporaryDomainKey(const QUuid& domainID) { return _accountInfo.getTemporaryDomainKey(domainID); }
 
+    QUrl getMetaverseServerURL() { return NetworkingConstants::METAVERSE_SERVER_URL; }
+
 public slots:
     void requestAccessToken(const QString& login, const QString& password);
     void requestAccessTokenWithSteam(QByteArray authSessionTicket);
diff --git a/libraries/networking/src/AddressManager.cpp b/libraries/networking/src/AddressManager.cpp
index 99e1962387..b884dcba17 100644
--- a/libraries/networking/src/AddressManager.cpp
+++ b/libraries/networking/src/AddressManager.cpp
@@ -24,16 +24,19 @@
 
 #include "AddressManager.h"
 #include "NodeList.h"
-#include "NetworkingConstants.h"
 #include "NetworkLogging.h"
 #include "UserActivityLogger.h"
 #include "udt/PacketHeaders.h"
 
+#ifdef Q_OS_ANDROID
+const QString DEFAULT_HIFI_ADDRESS = "hifi://android/0.0,0.0,-200";
+#else
 #if USE_STABLE_GLOBAL_SERVICES
 const QString DEFAULT_HIFI_ADDRESS = "hifi://welcome/hello";
 #else
 const QString DEFAULT_HIFI_ADDRESS = "hifi://dev-welcome/hello";
 #endif
+#endif
 
 const QString ADDRESS_MANAGER_SETTINGS_GROUP = "AddressManager";
 const QString SETTINGS_CURRENT_ADDRESS_KEY = "address";
@@ -664,8 +667,11 @@ bool AddressManager::handleViewpoint(const QString& viewpointString, bool should
                     qCDebug(networking) << "Orientation parsed from lookup string is invalid. Will not use for location change.";
                 }
             }
-
-            emit locationChangeRequired(newPosition, orientationChanged, newOrientation, shouldFace);
+            
+            emit locationChangeRequired(newPosition, orientationChanged, 
+                LookupTrigger::VisitUserFromPAL ? cancelOutRollAndPitch(newOrientation): newOrientation,
+                shouldFace
+            );
 
         } else {
             qCDebug(networking) << "Could not jump to position from lookup string because it has an invalid value.";
@@ -729,13 +735,14 @@ bool AddressManager::setDomainInfo(const QString& hostname, quint16 port, Lookup
     return hostChanged;
 }
 
-void AddressManager::goToUser(const QString& username) {
+void AddressManager::goToUser(const QString& username, bool shouldMatchOrientation) {
     QString formattedUsername = QUrl::toPercentEncoding(username);
 
-    // for history storage handling we remember how this lookup was trigged - for a username it's always user input
+    // for history storage handling we remember how this lookup was triggered - for a username it's always user input
     QVariantMap requestParams;
-    requestParams.insert(LOOKUP_TRIGGER_KEY, static_cast<int>(LookupTrigger::UserInput));
-
+    requestParams.insert(LOOKUP_TRIGGER_KEY, static_cast<int>(
+        shouldMatchOrientation ? LookupTrigger::UserInput : LookupTrigger::VisitUserFromPAL
+    ));
     // this is a username - pull the captured name and lookup that user's location
     DependencyManager::get<AccountManager>()->sendRequest(GET_USER_LOCATION.arg(formattedUsername),
                                               AccountManagerAuth::Optional,
@@ -766,10 +773,6 @@ QString AddressManager::getDomainId() const {
     return DependencyManager::get<NodeList>()->getDomainHandler().getUUID().toString();
 }
 
-const QUrl AddressManager::getMetaverseServerUrl() const {
-    return NetworkingConstants::METAVERSE_SERVER_URL;
-}
-
 void AddressManager::handleShareableNameAPIResponse(QNetworkReply& requestReply) {
     // make sure that this response is for the domain we're currently connected to
     auto domainID = DependencyManager::get<NodeList>()->getDomainHandler().getUUID();
@@ -841,8 +844,8 @@ void AddressManager::addCurrentAddressToHistory(LookupTrigger trigger) {
             // and do not but it into the back stack
             _forwardStack.push(currentAddress());
         } else {
-            if (trigger == LookupTrigger::UserInput) {
-                // anyime the user has manually looked up an address we know we should clear the forward stack
+            if (trigger == LookupTrigger::UserInput || trigger == LookupTrigger::VisitUserFromPAL) {
+                // anyime the user has actively triggered an address we know we should clear the forward stack
                 _forwardStack.clear();
 
                 emit goForwardPossible(false);
diff --git a/libraries/networking/src/AddressManager.h b/libraries/networking/src/AddressManager.h
index 83eedfc82f..2f3d896509 100644
--- a/libraries/networking/src/AddressManager.h
+++ b/libraries/networking/src/AddressManager.h
@@ -41,7 +41,6 @@ class AddressManager : public QObject, public Dependency {
     Q_PROPERTY(QString pathname READ currentPath)
     Q_PROPERTY(QString placename READ getPlaceName)
     Q_PROPERTY(QString domainId READ getDomainId)
-    Q_PROPERTY(QUrl metaverseServerUrl READ getMetaverseServerUrl NOTIFY metaverseServerUrlChanged)
 public:
     Q_INVOKABLE QString protocolVersion();
     using PositionGetter = std::function<glm::vec3()>;
@@ -55,7 +54,8 @@ public:
         DomainPathResponse,
         Internal,
         AttemptedRefresh,
-        Suggestions
+        Suggestions,
+        VisitUserFromPAL
     };
 
     bool isConnected();
@@ -71,7 +71,6 @@ public:
     const QUuid& getRootPlaceID() const { return _rootPlaceID; }
     const QString& getPlaceName() const { return _shareablePlaceName.isEmpty() ? _placeName : _shareablePlaceName; }
     QString getDomainId() const;
-    const QUrl getMetaverseServerUrl() const;
 
     const QString& getHost() const { return _host; }
 
@@ -95,7 +94,7 @@ public slots:
     void goToLocalSandbox(QString path = "", LookupTrigger trigger = LookupTrigger::StartupFromSettings) { handleUrl(SANDBOX_HIFI_ADDRESS + path, trigger); }
     void goToEntry(LookupTrigger trigger = LookupTrigger::StartupFromSettings) { handleUrl(DEFAULT_HIFI_ADDRESS, trigger); }
 
-    void goToUser(const QString& username);
+    void goToUser(const QString& username, bool shouldMatchOrientation = true);
 
     void refreshPreviousLookup();
 
@@ -123,8 +122,6 @@ signals:
     void goBackPossible(bool isPossible);
     void goForwardPossible(bool isPossible);
 
-    void metaverseServerUrlChanged();
-
 protected:
     AddressManager();
 private slots:
diff --git a/libraries/networking/src/AssetClient.cpp b/libraries/networking/src/AssetClient.cpp
index e97660da4c..6fdfc5a42b 100644
--- a/libraries/networking/src/AssetClient.cpp
+++ b/libraries/networking/src/AssetClient.cpp
@@ -19,6 +19,8 @@
 #include <QtScript/QScriptEngine>
 #include <QtNetwork/QNetworkDiskCache>
 
+#include <shared/GlobalAppProperties.h>
+
 #include "AssetRequest.h"
 #include "AssetUpload.h"
 #include "AssetUtils.h"
@@ -31,11 +33,12 @@
 
 MessageID AssetClient::_currentID = 0;
 
-AssetClient::AssetClient(const QString& cacheDir) : _cacheDir(cacheDir) {
+AssetClient::AssetClient() {
+    _cacheDir = qApp->property(hifi::properties::APP_LOCAL_DATA_PATH).toString();
     setCustomDeleter([](Dependency* dependency){
         static_cast<AssetClient*>(dependency)->deleteLater();
     });
-    
+
     auto nodeList = DependencyManager::get<NodeList>();
     auto& packetReceiver = nodeList->getPacketReceiver();
 
@@ -56,7 +59,11 @@ void AssetClient::init() {
     auto& networkAccessManager = NetworkAccessManager::getInstance();
     if (!networkAccessManager.cache()) {
         if (_cacheDir.isEmpty()) {
+#ifdef Q_OS_ANDROID
+            QString cachePath = QStandardPaths::writableLocation(QStandardPaths::CacheLocation);
+#else
             QString cachePath = QStandardPaths::writableLocation(QStandardPaths::DataLocation);
+#endif
             _cacheDir = !cachePath.isEmpty() ? cachePath : "interfaceCache";
         }
         QNetworkDiskCache* cache = new QNetworkDiskCache();
@@ -105,7 +112,7 @@ void AssetClient::handleAssetMappingOperationReply(QSharedPointer<ReceivedMessag
 
     MessageID messageID;
     message->readPrimitive(&messageID);
-    
+
     AssetServerError error;
     message->readPrimitive(&error);
 
@@ -132,13 +139,13 @@ void AssetClient::handleAssetMappingOperationReply(QSharedPointer<ReceivedMessag
 bool haveAssetServer() {
     auto nodeList = DependencyManager::get<NodeList>();
     SharedNodePointer assetServer = nodeList->soloNodeOfType(NodeType::AssetServer);
-    
+
     if (!assetServer) {
         qCWarning(asset_client) << "Could not complete AssetClient operation "
             << "since you are not currently connected to an asset-server.";
         return false;
     }
-    
+
     return true;
 }
 
@@ -182,6 +189,14 @@ RenameMappingRequest* AssetClient::createRenameMappingRequest(const AssetPath& o
     return request;
 }
 
+SetBakingEnabledRequest* AssetClient::createSetBakingEnabledRequest(const AssetPathList& path, bool enabled) {
+    auto bakingEnabledRequest = new SetBakingEnabledRequest(path, enabled);
+
+    bakingEnabledRequest->moveToThread(thread());
+
+    return bakingEnabledRequest;
+}
+
 AssetRequest* AssetClient::createRequest(const AssetHash& hash, const ByteRange& byteRange) {
     auto request = new AssetRequest(hash, byteRange);
 
@@ -220,14 +235,14 @@ MessageID AssetClient::getAsset(const QString& hash, DataOffset start, DataOffse
     SharedNodePointer assetServer = nodeList->soloNodeOfType(NodeType::AssetServer);
 
     if (assetServer) {
-        
+
         auto messageID = ++_currentID;
-        
+
         auto payloadSize = sizeof(messageID) + SHA256_HASH_LENGTH + sizeof(start) + sizeof(end);
         auto packet = NLPacket::create(PacketType::AssetGet, payloadSize, true);
-        
+
         qCDebug(asset_client) << "Requesting data from" << start << "to" << end << "of" << hash << "from asset-server.";
-        
+
         packet->writePrimitive(messageID);
 
         packet->write(QByteArray::fromHex(hash.toLatin1()));
@@ -254,10 +269,10 @@ MessageID AssetClient::getAssetInfo(const QString& hash, GetInfoCallback callbac
 
     if (assetServer) {
         auto messageID = ++_currentID;
-        
+
         auto payloadSize = sizeof(messageID) + SHA256_HASH_LENGTH;
         auto packet = NLPacket::create(PacketType::AssetGetInfo, payloadSize, true);
-        
+
         packet->writePrimitive(messageID);
         packet->write(QByteArray::fromHex(hash.toLatin1()));
 
@@ -278,7 +293,7 @@ void AssetClient::handleAssetGetInfoReply(QSharedPointer<ReceivedMessage> messag
     MessageID messageID;
     message->readPrimitive(&messageID);
     auto assetHash = message->read(SHA256_HASH_LENGTH);
-    
+
     AssetServerError error;
     message->readPrimitive(&error);
 
@@ -367,7 +382,7 @@ void AssetClient::handleAssetGetReply(QSharedPointer<ReceivedMessage> message, S
             callbacks.completeCallback(true, error, message->readAll());
         }
 
-        
+
         messageCallbackMap.erase(requestIt);
     }
 }
@@ -478,7 +493,7 @@ MessageID AssetClient::getAllAssetMappings(MappingOperationCallback callback) {
 
     auto nodeList = DependencyManager::get<NodeList>();
     SharedNodePointer assetServer = nodeList->soloNodeOfType(NodeType::AssetServer);
-    
+
     if (assetServer) {
         auto packetList = NLPacketList::create(PacketType::AssetMappingOperation, QByteArray(), true, true);
 
@@ -501,7 +516,7 @@ MessageID AssetClient::getAllAssetMappings(MappingOperationCallback callback) {
 MessageID AssetClient::deleteAssetMappings(const AssetPathList& paths, MappingOperationCallback callback) {
     auto nodeList = DependencyManager::get<NodeList>();
     SharedNodePointer assetServer = nodeList->soloNodeOfType(NodeType::AssetServer);
-    
+
     if (assetServer) {
         auto packetList = NLPacketList::create(PacketType::AssetMappingOperation, QByteArray(), true, true);
 
@@ -532,7 +547,7 @@ MessageID AssetClient::setAssetMapping(const QString& path, const AssetHash& has
 
     auto nodeList = DependencyManager::get<NodeList>();
     SharedNodePointer assetServer = nodeList->soloNodeOfType(NodeType::AssetServer);
-    
+
     if (assetServer) {
         auto packetList = NLPacketList::create(PacketType::AssetMappingOperation, QByteArray(), true, true);
 
@@ -582,6 +597,37 @@ MessageID AssetClient::renameAssetMapping(const AssetPath& oldPath, const AssetP
     return INVALID_MESSAGE_ID;
 }
 
+MessageID AssetClient::setBakingEnabled(const AssetPathList& paths, bool enabled, MappingOperationCallback callback) {
+    auto nodeList = DependencyManager::get<NodeList>();
+    SharedNodePointer assetServer = nodeList->soloNodeOfType(NodeType::AssetServer);
+
+    if (assetServer) {
+        auto packetList = NLPacketList::create(PacketType::AssetMappingOperation, QByteArray(), true, true);
+
+        auto messageID = ++_currentID;
+        packetList->writePrimitive(messageID);
+
+        packetList->writePrimitive(AssetMappingOperationType::SetBakingEnabled);
+
+        packetList->writePrimitive(enabled);
+
+        packetList->writePrimitive(int(paths.size()));
+
+        for (auto& path : paths) {
+            packetList->writeString(path);
+        }
+
+        if (nodeList->sendPacketList(std::move(packetList), *assetServer) != -1) {
+            _pendingMappingRequests[assetServer][messageID] = callback;
+
+            return messageID;
+        }
+    }
+
+    callback(false, AssetServerError::NoError, QSharedPointer<ReceivedMessage>());
+    return INVALID_MESSAGE_ID;
+}
+
 bool AssetClient::cancelMappingRequest(MessageID id) {
     Q_ASSERT(QThread::currentThread() == thread());
 
@@ -644,7 +690,7 @@ MessageID AssetClient::uploadAsset(const QByteArray& data, UploadResultCallback
 
     auto nodeList = DependencyManager::get<NodeList>();
     SharedNodePointer assetServer = nodeList->soloNodeOfType(NodeType::AssetServer);
-    
+
     if (assetServer) {
         auto packetList = NLPacketList::create(PacketType::AssetUpload, QByteArray(), true, true);
 
@@ -682,7 +728,7 @@ void AssetClient::handleAssetUploadReply(QSharedPointer<ReceivedMessage> message
     } else {
         auto hash = message->read(SHA256_HASH_LENGTH);
         hashString = hash.toHex();
-        
+
         qCDebug(asset_client) << "Successfully uploaded asset to asset-server - SHA256 hash is " << hashString;
     }
 
diff --git a/libraries/networking/src/AssetClient.h b/libraries/networking/src/AssetClient.h
index 2bc694f367..8035aa886e 100644
--- a/libraries/networking/src/AssetClient.h
+++ b/libraries/networking/src/AssetClient.h
@@ -32,6 +32,7 @@ class SetMappingRequest;
 class GetAllMappingsRequest;
 class DeleteMappingsRequest;
 class RenameMappingRequest;
+class SetBakingEnabledRequest;
 class AssetRequest;
 class AssetUpload;
 
@@ -49,13 +50,14 @@ using ProgressCallback = std::function<void(qint64 totalReceived, qint64 total)>
 class AssetClient : public QObject, public Dependency {
     Q_OBJECT
 public:
-    AssetClient(const QString& cacheDir="");
+    AssetClient();
 
     Q_INVOKABLE GetMappingRequest* createGetMappingRequest(const AssetPath& path);
     Q_INVOKABLE GetAllMappingsRequest* createGetAllMappingsRequest();
     Q_INVOKABLE DeleteMappingsRequest* createDeleteMappingsRequest(const AssetPathList& paths);
     Q_INVOKABLE SetMappingRequest* createSetMappingRequest(const AssetPath& path, const AssetHash& hash);
     Q_INVOKABLE RenameMappingRequest* createRenameMappingRequest(const AssetPath& oldPath, const AssetPath& newPath);
+    Q_INVOKABLE SetBakingEnabledRequest* createSetBakingEnabledRequest(const AssetPathList& path, bool enabled);
     Q_INVOKABLE AssetRequest* createRequest(const AssetHash& hash, const ByteRange& byteRange = ByteRange());
     Q_INVOKABLE AssetUpload* createUpload(const QString& filename);
     Q_INVOKABLE AssetUpload* createUpload(const QByteArray& data);
@@ -81,6 +83,7 @@ private:
     MessageID setAssetMapping(const QString& path, const AssetHash& hash, MappingOperationCallback callback);
     MessageID deleteAssetMappings(const AssetPathList& paths, MappingOperationCallback callback);
     MessageID renameAssetMapping(const AssetPath& oldPath, const AssetPath& newPath, MappingOperationCallback callback);
+    MessageID setBakingEnabled(const AssetPathList& paths, bool enabled, MappingOperationCallback callback);
 
     MessageID getAssetInfo(const QString& hash, GetInfoCallback callback);
     MessageID getAsset(const QString& hash, DataOffset start, DataOffset end,
@@ -119,6 +122,7 @@ private:
     friend class SetMappingRequest;
     friend class DeleteMappingsRequest;
     friend class RenameMappingRequest;
+    friend class SetBakingEnabledRequest;
 };
 
 #endif
diff --git a/libraries/networking/src/AssetRequest.h b/libraries/networking/src/AssetRequest.h
index df5cf80ecd..a7213a90d7 100644
--- a/libraries/networking/src/AssetRequest.h
+++ b/libraries/networking/src/AssetRequest.h
@@ -21,6 +21,8 @@
 
 #include "ByteRange.h"
 
+const QString ATP_SCHEME { "atp:" };
+
 class AssetRequest : public QObject {
    Q_OBJECT
 public:
diff --git a/libraries/networking/src/AssetResourceRequest.cpp b/libraries/networking/src/AssetResourceRequest.cpp
index f4a3b20fd5..55d0ad4f75 100644
--- a/libraries/networking/src/AssetResourceRequest.cpp
+++ b/libraries/networking/src/AssetResourceRequest.cpp
@@ -63,7 +63,7 @@ void AssetResourceRequest::doSend() {
         // This is an ATP path, we'll need to figure out what the mapping is.
         // This may incur a roundtrip to the asset-server, or it may return immediately from the cache in AssetClient.
 
-        auto path = _url.path();
+        auto path = _url.path() + (_url.hasQuery() ? "?" + _url.query() : "");
         requestMappingForPath(path);
     }
 }
@@ -82,15 +82,27 @@ void AssetResourceRequest::requestMappingForPath(const AssetPath& path) {
         Q_ASSERT(_state == InProgress);
         Q_ASSERT(request == _assetMappingRequest);
 
+        bool failed = false;
+
         switch (request->getError()) {
             case MappingRequest::NoError:
                 // we have no error, we should have a resulting hash - use that to send of a request for that asset
                 qCDebug(networking) << "Got mapping for:" << path << "=>" << request->getHash();
 
-                requestHash(request->getHash());
-
                 statTracker->incrementStat(STAT_ATP_MAPPING_REQUEST_SUCCESS);
 
+                // if we got a redirected path we need to store that with the resource request as relative path URL
+                if (request->wasRedirected()) {
+                    _relativePathURL = ATP_SCHEME + request->getRedirectedPath();
+                }
+
+                if (request->wasRedirected() && _failOnRedirect) {
+                    _result = RedirectFail;
+                    failed = true;
+                } else {
+                    requestHash(request->getHash());
+                }
+
                 break;
             default: {
                 switch (request->getError()) {
@@ -107,17 +119,20 @@ void AssetResourceRequest::requestMappingForPath(const AssetPath& path) {
                         break;
                 }
 
-                // since we've failed we know we are finished
-                _state = Finished;
-                emit finished();
-
-                statTracker->incrementStat(STAT_ATP_MAPPING_REQUEST_FAILED);
-                statTracker->incrementStat(STAT_ATP_REQUEST_FAILED);
+                failed = true;
 
                 break;
             }
         }
 
+        if (failed) {
+            _state = Finished;
+            emit finished();
+
+            statTracker->incrementStat(STAT_ATP_MAPPING_REQUEST_FAILED);
+            statTracker->incrementStat(STAT_ATP_REQUEST_FAILED);
+        }
+
         _assetMappingRequest->deleteLater();
         _assetMappingRequest = nullptr;
     });
@@ -140,6 +155,7 @@ void AssetResourceRequest::requestHash(const AssetHash& hash) {
             case AssetRequest::Error::NoError:
                 _data = req->getData();
                 _result = Success;
+                recordBytesDownloadedInStats(STAT_ATP_RESOURCE_TOTAL_BYTES, _data.size());
                 break;
             case AssetRequest::InvalidHash:
                 _result = InvalidURL;
@@ -188,6 +204,8 @@ void AssetResourceRequest::onDownloadProgress(qint64 bytesReceived, qint64 bytes
 
     auto now = p_high_resolution_clock::now();
 
+    recordBytesDownloadedInStats(STAT_ATP_RESOURCE_TOTAL_BYTES, bytesReceived);
+
     // if we haven't received the full asset check if it is time to output progress to log
     // we do so every X seconds to assist with ATP download tracking
 
@@ -201,6 +219,5 @@ void AssetResourceRequest::onDownloadProgress(qint64 bytesReceived, qint64 bytes
 
         _lastProgressDebug = now;
     }
-
 }
 
diff --git a/libraries/networking/src/AssetResourceRequest.h b/libraries/networking/src/AssetResourceRequest.h
index 18b82f2573..ac36c83985 100644
--- a/libraries/networking/src/AssetResourceRequest.h
+++ b/libraries/networking/src/AssetResourceRequest.h
@@ -41,6 +41,8 @@ private:
     AssetRequest* _assetRequest { nullptr };
 
     p_high_resolution_clock::time_point _lastProgressDebug;
+
+    int64_t _lastRecordedBytesDownloaded { 0 };
 };
 
 #endif
diff --git a/libraries/networking/src/AssetUtils.cpp b/libraries/networking/src/AssetUtils.cpp
index 7818c8e5ce..3af0b1df47 100644
--- a/libraries/networking/src/AssetUtils.cpp
+++ b/libraries/networking/src/AssetUtils.cpp
@@ -84,3 +84,20 @@ bool isValidHash(const AssetHash& hash) {
     QRegExp hashRegex { ASSET_HASH_REGEX_STRING };
     return hashRegex.exactMatch(hash);
 }
+
+QString bakingStatusToString(BakingStatus status) {
+    switch (status) {
+        case NotBaked:
+            return "Not Baked";
+        case Pending:
+            return "Pending";
+        case Baking:
+            return "Baking";
+        case Baked:
+            return "Baked";
+        case Error:
+            return "Error";
+        default:
+            return "--";
+    }
+}
diff --git a/libraries/networking/src/AssetUtils.h b/libraries/networking/src/AssetUtils.h
index 4137193274..a7c053c3d6 100644
--- a/libraries/networking/src/AssetUtils.h
+++ b/libraries/networking/src/AssetUtils.h
@@ -23,7 +23,6 @@ using DataOffset = int64_t;
 
 using AssetPath = QString;
 using AssetHash = QString;
-using AssetMapping = std::map<AssetPath, AssetHash>;
 using AssetPathList = QStringList;
 
 const size_t SHA256_HASH_LENGTH = 32;
@@ -34,6 +33,8 @@ const QString ASSET_FILE_PATH_REGEX_STRING = "^(\\/[^\\/\\0]+)+$";
 const QString ASSET_PATH_REGEX_STRING = "^\\/([^\\/\\0]+(\\/)?)+$";
 const QString ASSET_HASH_REGEX_STRING = QString("^[a-fA-F0-9]{%1}$").arg(SHA256_HASH_HEX_LENGTH);
 
+const QString HIDDEN_BAKED_CONTENT_FOLDER = "/.baked/";
+
 enum AssetServerError : uint8_t {
     NoError = 0,
     AssetNotFound,
@@ -49,9 +50,27 @@ enum AssetMappingOperationType : uint8_t {
     GetAll,
     Set,
     Delete,
-    Rename
+    Rename,
+    SetBakingEnabled
 };
 
+enum BakingStatus {
+    Irrelevant,
+    NotBaked,
+    Pending,
+    Baking,
+    Baked,
+    Error
+};
+
+struct MappingInfo {
+    AssetHash hash;
+    BakingStatus status;
+    QString bakingErrors;
+};
+
+using AssetMapping = std::map<AssetPath, MappingInfo>;
+
 QUrl getATPUrl(const QString& hash);
 
 QByteArray hashData(const QByteArray& data);
@@ -63,4 +82,6 @@ bool isValidFilePath(const AssetPath& path);
 bool isValidPath(const AssetPath& path);
 bool isValidHash(const QString& hashString);
 
+QString bakingStatusToString(BakingStatus status);
+
 #endif // hifi_AssetUtils_h
diff --git a/libraries/networking/src/EntityScriptClient.cpp b/libraries/networking/src/EntityScriptClient.cpp
index ef59ec99b8..75ae7369fb 100644
--- a/libraries/networking/src/EntityScriptClient.cpp
+++ b/libraries/networking/src/EntityScriptClient.cpp
@@ -69,6 +69,52 @@ bool EntityScriptClient::reloadServerScript(QUuid entityID) {
     return false;
 }
 
+void EntityScriptClient::callEntityServerMethod(QUuid entityID, const QString& method, const QStringList& params) {
+    // Send packet to entity script server
+    auto nodeList = DependencyManager::get<NodeList>();
+    SharedNodePointer entityScriptServer = nodeList->soloNodeOfType(NodeType::EntityScriptServer);
+
+    if (entityScriptServer) {
+        auto packetList = NLPacketList::create(PacketType::EntityScriptCallMethod, QByteArray(), true, true);
+
+        packetList->write(entityID.toRfc4122());
+
+        packetList->writeString(method);
+
+        quint16 paramCount = params.length();
+        packetList->writePrimitive(paramCount);
+
+        foreach(const QString& param, params) {
+            packetList->writeString(param);
+        }
+
+        nodeList->sendPacketList(std::move(packetList), *entityScriptServer);
+    }
+}
+
+void EntityScriptServerServices::callEntityClientMethod(QUuid clientSessionID, QUuid entityID, const QString& method, const QStringList& params) {
+    // only valid to call this function if you are the entity script server
+    auto nodeList = DependencyManager::get<NodeList>();
+    SharedNodePointer targetClient = nodeList->nodeWithUUID(clientSessionID);
+
+    if (nodeList->getOwnerType() == NodeType::EntityScriptServer && targetClient) {
+        auto packetList = NLPacketList::create(PacketType::EntityScriptCallMethod, QByteArray(), true, true);
+
+        packetList->write(entityID.toRfc4122());
+
+        packetList->writeString(method);
+
+        quint16 paramCount = params.length();
+        packetList->writePrimitive(paramCount);
+
+        foreach(const QString& param, params) {
+            packetList->writeString(param);
+        }
+
+        nodeList->sendPacketList(std::move(packetList), *targetClient);
+    }
+}
+
 MessageID EntityScriptClient::getEntityServerScriptStatus(QUuid entityID, GetScriptStatusCallback callback) {
     auto nodeList = DependencyManager::get<NodeList>();
     SharedNodePointer entityScriptServer = nodeList->soloNodeOfType(NodeType::EntityScriptServer);
diff --git a/libraries/networking/src/EntityScriptClient.h b/libraries/networking/src/EntityScriptClient.h
index 926521d9b8..4cfb03dca7 100644
--- a/libraries/networking/src/EntityScriptClient.h
+++ b/libraries/networking/src/EntityScriptClient.h
@@ -58,6 +58,8 @@ public:
 
     bool reloadServerScript(QUuid entityID);
     MessageID getEntityServerScriptStatus(QUuid entityID, GetScriptStatusCallback callback);
+    void callEntityServerMethod(QUuid id, const QString& method, const QStringList& params);
+
 
 private slots:
     void handleNodeKilled(SharedNodePointer node);
@@ -72,4 +74,11 @@ private:
     void forceFailureOfPendingRequests(SharedNodePointer node);
 };
 
+
+class EntityScriptServerServices : public QObject, public Dependency {
+    Q_OBJECT
+public:
+    void callEntityClientMethod(QUuid clientSessionID, QUuid entityID, const QString& method, const QStringList& params);
+};
+
 #endif
diff --git a/libraries/networking/src/FileResourceRequest.cpp b/libraries/networking/src/FileResourceRequest.cpp
index d0e2721679..dfff21dae6 100644
--- a/libraries/networking/src/FileResourceRequest.cpp
+++ b/libraries/networking/src/FileResourceRequest.cpp
@@ -20,7 +20,7 @@
 void FileResourceRequest::doSend() {
     auto statTracker = DependencyManager::get<StatTracker>();
     statTracker->incrementStat(STAT_FILE_REQUEST_STARTED);
-
+    int fileSize = 0;
     QString filename = _url.toLocalFile();
     
     // sometimes on windows, we see the toLocalFile() return null,
@@ -53,6 +53,7 @@ void FileResourceRequest::doSend() {
                     }
 
                     _result = ResourceRequest::Success;
+                    fileSize = file.size();
                 }
 
             } else {
@@ -68,6 +69,7 @@ void FileResourceRequest::doSend() {
 
     if (_result == ResourceRequest::Success) {
         statTracker->incrementStat(STAT_FILE_REQUEST_SUCCESS);
+        statTracker->updateStat(STAT_FILE_RESOURCE_TOTAL_BYTES, fileSize);
     } else {
         statTracker->incrementStat(STAT_FILE_REQUEST_FAILED);
     }
diff --git a/libraries/networking/src/HTTPResourceRequest.cpp b/libraries/networking/src/HTTPResourceRequest.cpp
index 266ea429a0..a34f92aaa6 100644
--- a/libraries/networking/src/HTTPResourceRequest.cpp
+++ b/libraries/networking/src/HTTPResourceRequest.cpp
@@ -141,6 +141,8 @@ void HTTPResourceRequest::onRequestFinished() {
                 }
             }
 
+            recordBytesDownloadedInStats(STAT_HTTP_RESOURCE_TOTAL_BYTES, _data.size());
+
             break;
 
         case QNetworkReply::TimeoutError:
@@ -201,6 +203,8 @@ void HTTPResourceRequest::onDownloadProgress(qint64 bytesReceived, qint64 bytesT
     _sendTimer->start();
 
     emit progress(bytesReceived, bytesTotal);
+
+    recordBytesDownloadedInStats(STAT_HTTP_RESOURCE_TOTAL_BYTES, bytesReceived);
 }
 
 void HTTPResourceRequest::onTimeout() {
diff --git a/libraries/networking/src/HifiSockAddr.cpp b/libraries/networking/src/HifiSockAddr.cpp
index 217d3096f5..e2a3e79c79 100644
--- a/libraries/networking/src/HifiSockAddr.cpp
+++ b/libraries/networking/src/HifiSockAddr.cpp
@@ -113,6 +113,18 @@ QString HifiSockAddr::toString() const {
     return _address.toString() + ":" + QString::number(_port);
 }
 
+bool HifiSockAddr::hasPrivateAddress() const {
+    // an address is private if it is loopback or falls in any of the RFC1918 address spaces
+    const QPair<QHostAddress, int> TWENTY_FOUR_BIT_BLOCK = { QHostAddress("10.0.0.0"), 8 };
+    const QPair<QHostAddress, int> TWENTY_BIT_BLOCK = { QHostAddress("172.16.0.0") , 12 };
+    const QPair<QHostAddress, int> SIXTEEN_BIT_BLOCK = { QHostAddress("192.168.0.0"), 16 };
+
+    return _address.isLoopback()
+        || _address.isInSubnet(TWENTY_FOUR_BIT_BLOCK)
+        || _address.isInSubnet(TWENTY_BIT_BLOCK)
+        || _address.isInSubnet(SIXTEEN_BIT_BLOCK);
+}
+
 QDebug operator<<(QDebug debug, const HifiSockAddr& sockAddr) {
     debug.nospace() << sockAddr._address.toString().toLocal8Bit().constData() << ":" << sockAddr._port;
     return debug.space();
diff --git a/libraries/networking/src/HifiSockAddr.h b/libraries/networking/src/HifiSockAddr.h
index af939de736..3c753f0434 100644
--- a/libraries/networking/src/HifiSockAddr.h
+++ b/libraries/networking/src/HifiSockAddr.h
@@ -34,7 +34,7 @@ public:
     HifiSockAddr(const sockaddr* sockaddr);
 
     bool isNull() const { return _address.isNull() && _port == 0; }
-    void clear() { _address = QHostAddress::Null; _port = 0;}
+    void clear() { _address.clear(); _port = 0;}
 
     HifiSockAddr& operator=(const HifiSockAddr& rhsSockAddr);
     void swap(HifiSockAddr& otherSockAddr);
@@ -55,6 +55,8 @@ public:
 
     QString toString() const;
 
+    bool hasPrivateAddress() const; // checks if the address behind this sock addr is private per RFC 1918
+
     friend QDebug operator<<(QDebug debug, const HifiSockAddr& sockAddr);
     friend QDataStream& operator<<(QDataStream& dataStream, const HifiSockAddr& sockAddr);
     friend QDataStream& operator>>(QDataStream& dataStream, HifiSockAddr& sockAddr);
diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp
index eab0e5e41f..a9ebc5481d 100644
--- a/libraries/networking/src/LimitedNodeList.cpp
+++ b/libraries/networking/src/LimitedNodeList.cpp
@@ -27,7 +27,6 @@
 #include <NumericalConstants.h>
 #include <SettingHandle.h>
 #include <SharedUtil.h>
-#include <StatTracker.h>
 #include <UUID.h>
 
 #include "AccountManager.h"
@@ -159,6 +158,14 @@ void LimitedNodeList::setPermissions(const NodePermissions& newPermissions) {
         newPermissions.can(NodePermissions::Permission::canRezTemporaryEntities)) {
         emit canRezTmpChanged(_permissions.can(NodePermissions::Permission::canRezTemporaryEntities));
     }
+    if (originalPermissions.can(NodePermissions::Permission::canRezPermanentCertifiedEntities) !=
+        newPermissions.can(NodePermissions::Permission::canRezPermanentCertifiedEntities)) {
+        emit canRezCertifiedChanged(_permissions.can(NodePermissions::Permission::canRezPermanentCertifiedEntities));
+    }
+    if (originalPermissions.can(NodePermissions::Permission::canRezTemporaryCertifiedEntities) !=
+        newPermissions.can(NodePermissions::Permission::canRezTemporaryCertifiedEntities)) {
+        emit canRezTmpCertifiedChanged(_permissions.can(NodePermissions::Permission::canRezTemporaryCertifiedEntities));
+    }
     if (originalPermissions.can(NodePermissions::Permission::canWriteToAssetServer) !=
         newPermissions.can(NodePermissions::Permission::canWriteToAssetServer)) {
         emit canWriteAssetsChanged(_permissions.can(NodePermissions::Permission::canWriteToAssetServer));
@@ -167,6 +174,10 @@ void LimitedNodeList::setPermissions(const NodePermissions& newPermissions) {
         newPermissions.can(NodePermissions::Permission::canKick)) {
         emit canKickChanged(_permissions.can(NodePermissions::Permission::canKick));
     }
+    if (originalPermissions.can(NodePermissions::Permission::canReplaceDomainContent) !=
+        newPermissions.can(NodePermissions::Permission::canReplaceDomainContent)) {
+        emit canReplaceContentChanged(_permissions.can(NodePermissions::Permission::canReplaceDomainContent));
+    }
 }
 
 void LimitedNodeList::setSocketLocalPort(quint16 socketLocalPort) {
@@ -198,12 +209,12 @@ QUdpSocket& LimitedNodeList::getDTLSSocket() {
     return *_dtlsSocket;
 }
 
-bool LimitedNodeList::isPacketVerified(const udt::Packet& packet) {
+bool LimitedNodeList::isPacketVerifiedWithSource(const udt::Packet& packet, Node* sourceNode) {
     // We track bandwidth when doing packet verification to avoid needing to do a node lookup
     // later when we already do it in packetSourceAndHashMatchAndTrackBandwidth. A node lookup
     // incurs a lock, so it is ideal to avoid needing to do it 2+ times for each packet
     // received.
-    return packetVersionMatch(packet) && packetSourceAndHashMatchAndTrackBandwidth(packet);
+    return packetVersionMatch(packet) && packetSourceAndHashMatchAndTrackBandwidth(packet, sourceNode);
 }
 
 bool LimitedNodeList::packetVersionMatch(const udt::Packet& packet) {
@@ -220,7 +231,7 @@ bool LimitedNodeList::packetVersionMatch(const udt::Packet& packet) {
         const HifiSockAddr& senderSockAddr = packet.getSenderSockAddr();
         QUuid sourceID;
 
-        if (NON_SOURCED_PACKETS.contains(headerType)) {
+        if (PacketTypeEnum::getNonSourcedPackets().contains(headerType)) {
             hasBeenOutput = versionDebugSuppressMap.contains(senderSockAddr, headerType);
 
             if (!hasBeenOutput) {
@@ -252,12 +263,12 @@ bool LimitedNodeList::packetVersionMatch(const udt::Packet& packet) {
     }
 }
 
-bool LimitedNodeList::packetSourceAndHashMatchAndTrackBandwidth(const udt::Packet& packet) {
+bool LimitedNodeList::packetSourceAndHashMatchAndTrackBandwidth(const udt::Packet& packet, Node* sourceNode) {
 
     PacketType headerType = NLPacket::typeInHeader(packet);
 
-    if (NON_SOURCED_PACKETS.contains(headerType)) {
-        if (REPLICATED_PACKET_MAPPING.key(headerType) != PacketType::Unknown) {
+    if (PacketTypeEnum::getNonSourcedPackets().contains(headerType)) {
+        if (PacketTypeEnum::getReplicatedPacketMapping().key(headerType) != PacketType::Unknown) {
             // this is a replicated packet type - make sure the socket that sent it to us matches
             // one from one of our current upstream nodes
 
@@ -294,14 +305,18 @@ bool LimitedNodeList::packetSourceAndHashMatchAndTrackBandwidth(const udt::Packe
     } else {
         QUuid sourceID = NLPacket::sourceIDInHeader(packet);
 
-        // figure out which node this is from
-        SharedNodePointer matchingNode = nodeWithUUID(sourceID);
+        // check if we were passed a sourceNode hint or if we need to look it up
+        if (!sourceNode) {
+            // figure out which node this is from
+            SharedNodePointer matchingNode = nodeWithUUID(sourceID);
+            sourceNode = matchingNode.data();
+        }
 
-        if (matchingNode) {
-            if (!NON_VERIFIED_PACKETS.contains(headerType)) {
+        if (sourceNode) {
+            if (!PacketTypeEnum::getNonVerifiedPackets().contains(headerType)) {
 
                 QByteArray packetHeaderHash = NLPacket::verificationHashInHeader(packet);
-                QByteArray expectedHash = NLPacket::hashForPacketAndSecret(packet, matchingNode->getConnectionSecret());
+                QByteArray expectedHash = NLPacket::hashForPacketAndSecret(packet, sourceNode->getConnectionSecret());
 
                 // check if the md5 hash in the header matches the hash we would expect
                 if (packetHeaderHash != expectedHash) {
@@ -319,9 +334,9 @@ bool LimitedNodeList::packetSourceAndHashMatchAndTrackBandwidth(const udt::Packe
 
             // No matter if this packet is handled or not, we update the timestamp for the last time we heard
             // from this sending node
-            matchingNode->setLastHeardMicrostamp(usecTimestampNow());
+            sourceNode->setLastHeardMicrostamp(usecTimestampNow());
 
-            emit dataReceived(matchingNode->getType(), packet.getPayloadSize());
+            emit dataReceived(sourceNode->getType(), packet.getPayloadSize());
 
             return true;
 
@@ -345,13 +360,13 @@ void LimitedNodeList::collectPacketStats(const NLPacket& packet) {
 }
 
 void LimitedNodeList::fillPacketHeader(const NLPacket& packet, const QUuid& connectionSecret) {
-    if (!NON_SOURCED_PACKETS.contains(packet.getType())) {
+    if (!PacketTypeEnum::getNonSourcedPackets().contains(packet.getType())) {
         packet.writeSourceID(getSessionUUID());
     }
 
     if (!connectionSecret.isNull()
-        && !NON_SOURCED_PACKETS.contains(packet.getType())
-        && !NON_VERIFIED_PACKETS.contains(packet.getType())) {
+        && !PacketTypeEnum::getNonSourcedPackets().contains(packet.getType())
+        && !PacketTypeEnum::getNonVerifiedPackets().contains(packet.getType())) {
         packet.writeVerificationHashGivenSecret(connectionSecret);
     }
 }
@@ -660,7 +675,11 @@ SharedNodePointer LimitedNodeList::addOrUpdateNode(const QUuid& uuid, NodeType_t
         }
 
         // insert the new node and release our read lock
+#if defined(Q_OS_ANDROID) || (defined(__clang__) && defined(Q_OS_LINUX))
+        _nodeHash.insert(UUIDNodePair(newNode->getUUID(), newNodePointer));
+#else
         _nodeHash.emplace(newNode->getUUID(), newNodePointer);
+#endif
         readLocker.unlock();
 
         qCDebug(networking) << "Added" << *newNode;
@@ -1090,7 +1109,6 @@ void LimitedNodeList::setLocalSocket(const HifiSockAddr& sockAddr) {
             qCInfo(networking) << "Local socket is" << sockAddr;
         } else {
             qCInfo(networking) << "Local socket has changed from" << _localSockAddr << "to" << sockAddr;
-            DependencyManager::get<StatTracker>()->incrementStat(LOCAL_SOCKET_CHANGE_STAT);
         }
 
         _localSockAddr = sockAddr;
diff --git a/libraries/networking/src/LimitedNodeList.h b/libraries/networking/src/LimitedNodeList.h
index ab61c71952..868e36f160 100644
--- a/libraries/networking/src/LimitedNodeList.h
+++ b/libraries/networking/src/LimitedNodeList.h
@@ -66,8 +66,6 @@ const QHostAddress DEFAULT_ASSIGNMENT_CLIENT_MONITOR_HOSTNAME = QHostAddress::Lo
 
 const QString USERNAME_UUID_REPLACEMENT_STATS_KEY = "$username";
 
-const QString LOCAL_SOCKET_CHANGE_STAT = "LocalSocketChanges";
-
 typedef std::pair<QUuid, SharedNodePointer> UUIDNodePair;
 typedef tbb::concurrent_unordered_map<QUuid, SharedNodePointer, UUIDHasher> NodeHash;
 
@@ -113,9 +111,12 @@ public:
     bool isAllowedEditor() const { return _permissions.can(NodePermissions::Permission::canAdjustLocks); }
     bool getThisNodeCanRez() const { return _permissions.can(NodePermissions::Permission::canRezPermanentEntities); }
     bool getThisNodeCanRezTmp() const { return _permissions.can(NodePermissions::Permission::canRezTemporaryEntities); }
+    bool getThisNodeCanRezCertified() const { return _permissions.can(NodePermissions::Permission::canRezPermanentCertifiedEntities); }
+    bool getThisNodeCanRezTmpCertified() const { return _permissions.can(NodePermissions::Permission::canRezTemporaryCertifiedEntities); }
     bool getThisNodeCanWriteAssets() const { return _permissions.can(NodePermissions::Permission::canWriteToAssetServer); }
     bool getThisNodeCanKick() const { return _permissions.can(NodePermissions::Permission::canKick); }
-
+    bool getThisNodeCanReplaceContent() const { return _permissions.can(NodePermissions::Permission::canReplaceDomainContent); }
+    
     quint16 getSocketLocalPort() const { return _nodeSocket.localPort(); }
     Q_INVOKABLE void setSocketLocalPort(quint16 socketLocalPort);
 
@@ -197,8 +198,12 @@ public:
                 *lockWaitOut = (endLock - start);
             }
 
-            std::vector<SharedNodePointer> nodes(_nodeHash.size());
-            std::transform(_nodeHash.cbegin(), _nodeHash.cend(), nodes.begin(), [](const NodeHash::value_type& it) {
+            // Size of _nodeHash could change at any time,
+            // so reserve enough memory for the current size
+            // and then back insert all the nodes found
+            std::vector<SharedNodePointer> nodes;
+            nodes.reserve(_nodeHash.size());
+            std::transform(_nodeHash.cbegin(), _nodeHash.cend(), std::back_inserter(nodes), [&](const NodeHash::value_type& it) {
                 return it.second;
             });
             auto endTransform = usecTimestampNow();
@@ -281,7 +286,9 @@ public:
 
     void setPacketFilterOperator(udt::PacketFilterOperator filterOperator) { _nodeSocket.setPacketFilterOperator(filterOperator); }
     bool packetVersionMatch(const udt::Packet& packet);
-    bool isPacketVerified(const udt::Packet& packet);
+
+    bool isPacketVerifiedWithSource(const udt::Packet& packet, Node* sourceNode = nullptr);
+    bool isPacketVerified(const udt::Packet& packet) { return isPacketVerifiedWithSource(packet); }
 
     static void makeSTUNRequestPacket(char* stunRequestPacket);
 
@@ -323,8 +330,11 @@ signals:
     void isAllowedEditorChanged(bool isAllowedEditor);
     void canRezChanged(bool canRez);
     void canRezTmpChanged(bool canRezTmp);
+    void canRezCertifiedChanged(bool canRez);
+    void canRezTmpCertifiedChanged(bool canRezTmp);
     void canWriteAssetsChanged(bool canWriteAssets);
     void canKickChanged(bool canKick);
+    void canReplaceContentChanged(bool canReplaceContent);
 
 protected slots:
     void connectedForLocalSocketTest();
@@ -346,7 +356,7 @@ protected:
 
     void setLocalSocket(const HifiSockAddr& sockAddr);
 
-    bool packetSourceAndHashMatchAndTrackBandwidth(const udt::Packet& packet);
+    bool packetSourceAndHashMatchAndTrackBandwidth(const udt::Packet& packet, Node* sourceNode = nullptr);
     void processSTUNResponse(std::unique_ptr<udt::BasePacket> packet);
 
     void handleNodeKill(const SharedNodePointer& node);
diff --git a/libraries/networking/src/MappingRequest.cpp b/libraries/networking/src/MappingRequest.cpp
index 810b5b376d..a79105e3ab 100644
--- a/libraries/networking/src/MappingRequest.cpp
+++ b/libraries/networking/src/MappingRequest.cpp
@@ -87,6 +87,20 @@ void GetMappingRequest::doStart() {
 
         if (!_error) {
             _hash = message->read(SHA256_HASH_LENGTH).toHex();
+
+            // check the boolean to see if this request got re-directed
+            quint8 wasRedirected;
+            message->readPrimitive(&wasRedirected);
+            _wasRedirected = wasRedirected;
+
+            // if it did grab that re-directed path
+            if (_wasRedirected) {
+                _redirectedPath = message->readString();
+                qDebug() << "Got redirected from " << _path << " to " << _redirectedPath;
+            } else {
+                qDebug() << "Not redirected: " << _path;
+            }
+
         }
         emit finished(this);
     });
@@ -117,12 +131,18 @@ void GetAllMappingsRequest::doStart() {
 
 
         if (!_error) {
-            int numberOfMappings;
+            uint32_t numberOfMappings;
             message->readPrimitive(&numberOfMappings);
-            for (auto i = 0; i < numberOfMappings; ++i) {
+            for (uint32_t i = 0; i < numberOfMappings; ++i) {
                 auto path = message->readString();
                 auto hash = message->read(SHA256_HASH_LENGTH).toHex();
-                _mappings[path] = hash;
+                BakingStatus status;
+                QString lastBakeErrors;
+                message->readPrimitive(&status);
+                if (status == BakingStatus::Error) {
+                    lastBakeErrors = message->readString();
+                }
+                _mappings[path] = { hash, status, lastBakeErrors };
             }
         }
         emit finished(this);
@@ -257,3 +277,46 @@ void RenameMappingRequest::doStart() {
         emit finished(this);
     });
 }
+
+SetBakingEnabledRequest::SetBakingEnabledRequest(const AssetPathList& paths, bool enabled) : _paths(paths), _enabled(enabled) {
+    for (auto& path : _paths) {
+        path = path.trimmed();
+    }
+};
+
+void SetBakingEnabledRequest::doStart() {
+
+    // short circuit the request if any of the paths are invalid
+    for (auto& path : _paths) {
+        if (!isValidPath(path)) {
+            _error = MappingRequest::InvalidPath;
+            emit finished(this);
+            return;
+        }
+    }
+
+    auto assetClient = DependencyManager::get<AssetClient>();
+
+    _mappingRequestID = assetClient->setBakingEnabled(_paths, _enabled,
+        [this, assetClient](bool responseReceived, AssetServerError error, QSharedPointer<ReceivedMessage> message) {
+
+        _mappingRequestID = INVALID_MESSAGE_ID;
+        if (!responseReceived) {
+            _error = NetworkError;
+        } else {
+            switch (error) {
+            case AssetServerError::NoError:
+                _error = NoError;
+                break;
+            case AssetServerError::PermissionDenied:
+                _error = PermissionDenied;
+                break;
+            default:
+                _error = UnknownError;
+                break;
+            }
+        }
+
+        emit finished(this);
+    });
+};
\ No newline at end of file
diff --git a/libraries/networking/src/MappingRequest.h b/libraries/networking/src/MappingRequest.h
index 85b68e2427..fc43375469 100644
--- a/libraries/networking/src/MappingRequest.h
+++ b/libraries/networking/src/MappingRequest.h
@@ -53,6 +53,8 @@ public:
     GetMappingRequest(const AssetPath& path);
 
     AssetHash getHash() const { return _hash;  }
+    AssetPath getRedirectedPath() const { return _redirectedPath; }
+    bool wasRedirected() const { return _wasRedirected; }
 
 signals:
     void finished(GetMappingRequest* thisRequest);
@@ -62,6 +64,10 @@ private:
 
     AssetPath _path;
     AssetHash _hash;
+
+
+    AssetPath _redirectedPath;
+    bool _wasRedirected { false };
 };
 
 class SetMappingRequest : public MappingRequest {
@@ -124,7 +130,22 @@ signals:
 private:
     virtual void doStart() override;
     
-    std::map<AssetPath, AssetHash> _mappings;
+    AssetMapping _mappings;
+};
+
+class SetBakingEnabledRequest : public MappingRequest {
+    Q_OBJECT
+public:
+    SetBakingEnabledRequest(const AssetPathList& path, bool enabled);
+
+signals:
+    void finished(SetBakingEnabledRequest* thisRequest);
+
+private:
+    virtual void doStart() override;
+
+    AssetPathList _paths;
+    bool _enabled;
 };
 
 
diff --git a/libraries/networking/src/NLPacket.cpp b/libraries/networking/src/NLPacket.cpp
index a11dd69753..5c5077691b 100644
--- a/libraries/networking/src/NLPacket.cpp
+++ b/libraries/networking/src/NLPacket.cpp
@@ -12,8 +12,8 @@
 #include "NLPacket.h"
 
 int NLPacket::localHeaderSize(PacketType type) {
-    bool nonSourced = NON_SOURCED_PACKETS.contains(type);
-    bool nonVerified = NON_VERIFIED_PACKETS.contains(type);
+    bool nonSourced = PacketTypeEnum::getNonSourcedPackets().contains(type);
+    bool nonVerified = PacketTypeEnum::getNonVerifiedPackets().contains(type);
     qint64 optionalSize = (nonSourced ? 0 : NUM_BYTES_RFC4122_UUID) + ((nonSourced || nonVerified) ? 0 : NUM_BYTES_MD5_HASH);
     return sizeof(PacketType) + sizeof(PacketVersion) + optionalSize;
 }
@@ -198,13 +198,13 @@ void NLPacket::readVersion() {
 }
 
 void NLPacket::readSourceID() {
-    if (!NON_SOURCED_PACKETS.contains(_type)) {
+    if (!PacketTypeEnum::getNonSourcedPackets().contains(_type)) {
         _sourceID = sourceIDInHeader(*this);
     }
 }
 
 void NLPacket::writeSourceID(const QUuid& sourceID) const {
-    Q_ASSERT(!NON_SOURCED_PACKETS.contains(_type));
+    Q_ASSERT(!PacketTypeEnum::getNonSourcedPackets().contains(_type));
     
     auto offset = Packet::totalHeaderSize(isPartOfMessage()) + sizeof(PacketType) + sizeof(PacketVersion);
     memcpy(_packet.get() + offset, sourceID.toRfc4122().constData(), NUM_BYTES_RFC4122_UUID);
@@ -213,7 +213,8 @@ void NLPacket::writeSourceID(const QUuid& sourceID) const {
 }
 
 void NLPacket::writeVerificationHashGivenSecret(const QUuid& connectionSecret) const {
-    Q_ASSERT(!NON_SOURCED_PACKETS.contains(_type) && !NON_VERIFIED_PACKETS.contains(_type));
+    Q_ASSERT(!PacketTypeEnum::getNonSourcedPackets().contains(_type) &&
+             !PacketTypeEnum::getNonVerifiedPackets().contains(_type));
     
     auto offset = Packet::totalHeaderSize(isPartOfMessage()) + sizeof(PacketType) + sizeof(PacketVersion)
                 + NUM_BYTES_RFC4122_UUID;
diff --git a/libraries/networking/src/NetworkingConstants.h b/libraries/networking/src/NetworkingConstants.h
index a512ae8887..0c210e4360 100644
--- a/libraries/networking/src/NetworkingConstants.h
+++ b/libraries/networking/src/NetworkingConstants.h
@@ -15,7 +15,12 @@
 #include <QtCore/QUrl>
 
 namespace NetworkingConstants {
-    const QUrl METAVERSE_SERVER_URL = QUrl("https://metaverse.highfidelity.com");
+    // If you want to use STAGING instead of STABLE,
+    //     don't forget to ALSO change the Domain Server Metaverse Server URL inside of:
+    // <hifi repo>\domain-server\resources\web\js\shared.js
+    const QUrl METAVERSE_SERVER_URL_STABLE("https://metaverse.highfidelity.com");
+    const QUrl METAVERSE_SERVER_URL_STAGING("https://staging.highfidelity.com");
+    const QUrl METAVERSE_SERVER_URL = METAVERSE_SERVER_URL_STABLE;
 }
 
 #endif // hifi_NetworkingConstants_h
diff --git a/libraries/networking/src/Node.cpp b/libraries/networking/src/Node.cpp
index d7f8f404e6..25eef38dbd 100644
--- a/libraries/networking/src/Node.cpp
+++ b/libraries/networking/src/Node.cpp
@@ -29,11 +29,9 @@ int NodePtrMetaTypeId = qRegisterMetaType<Node*>("Node*");
 int sharedPtrNodeMetaTypeId = qRegisterMetaType<QSharedPointer<Node>>("QSharedPointer<Node>");
 int sharedNodePtrMetaTypeId = qRegisterMetaType<SharedNodePointer>("SharedNodePointer");
 
-namespace NodeType {
-    QHash<NodeType_t, QString> TypeNameHash;
-}
-
 void NodeType::init() {
+    QHash<NodeType_t, QString>& TypeNameHash = Node::getTypeNameHash();
+
     TypeNameHash.insert(NodeType::DomainServer, "Domain Server");
     TypeNameHash.insert(NodeType::EntityServer, "Entity Server");
     TypeNameHash.insert(NodeType::Agent, "Agent");
@@ -50,6 +48,7 @@ void NodeType::init() {
 }
 
 const QString& NodeType::getNodeTypeName(NodeType_t nodeType) {
+    QHash<NodeType_t, QString>& TypeNameHash = Node::getTypeNameHash();
     QHash<NodeType_t, QString>::iterator matchedTypeName = TypeNameHash.find(nodeType);
     return matchedTypeName != TypeNameHash.end() ? matchedTypeName.value() : UNKNOWN_NodeType_t_NAME;
 }
@@ -85,6 +84,7 @@ NodeType_t NodeType::downstreamType(NodeType_t primaryType) {
 }
 
 NodeType_t NodeType::fromString(QString type) {
+    QHash<NodeType_t, QString>& TypeNameHash = Node::getTypeNameHash();
     return TypeNameHash.key(type, NodeType::Unassigned);
 }
 
diff --git a/libraries/networking/src/Node.h b/libraries/networking/src/Node.h
index c20ff5a395..00d3c61fd0 100644
--- a/libraries/networking/src/Node.h
+++ b/libraries/networking/src/Node.h
@@ -72,8 +72,11 @@ public:
     bool isAllowedEditor() const { return _permissions.can(NodePermissions::Permission::canAdjustLocks); }
     bool getCanRez() const { return _permissions.can(NodePermissions::Permission::canRezPermanentEntities); }
     bool getCanRezTmp() const { return _permissions.can(NodePermissions::Permission::canRezTemporaryEntities); }
+    bool getCanRezCertified() const { return _permissions.can(NodePermissions::Permission::canRezPermanentCertifiedEntities); }
+    bool getCanRezTmpCertified() const { return _permissions.can(NodePermissions::Permission::canRezTemporaryCertifiedEntities); }
     bool getCanWriteToAssetServer() const { return _permissions.can(NodePermissions::Permission::canWriteToAssetServer); }
     bool getCanKick() const { return _permissions.can(NodePermissions::Permission::canKick); }
+    bool getCanReplaceContent() const { return _permissions.can(NodePermissions::Permission::canReplaceDomainContent); }
 
     void parseIgnoreRequestMessage(QSharedPointer<ReceivedMessage> message);
     void addIgnoredNode(const QUuid& otherNodeID);
@@ -86,6 +89,11 @@ public:
 
     bool isIgnoreRadiusEnabled() const { return _ignoreRadiusEnabled; }
 
+    static QHash<NodeType_t, QString>& getTypeNameHash() {
+        static QHash<NodeType_t, QString> TypeNameHash;
+        return TypeNameHash;
+    }
+
 private:
     // privatize copy and assignment operator to disallow Node copying
     Node(const Node &otherNode);
diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp
index e8506e5263..71128c5ff0 100644
--- a/libraries/networking/src/NodeList.cpp
+++ b/libraries/networking/src/NodeList.cpp
@@ -20,6 +20,7 @@
 #include <QtNetwork/QHostInfo>
 #include <QtNetwork/QNetworkInterface>
 
+#include <shared/QtHelpers.h>
 #include <ThreadHelpers.h>
 #include <LogHandler.h>
 #include <UUID.h>
@@ -232,7 +233,7 @@ void NodeList::processICEPingPacket(QSharedPointer<ReceivedMessage> message) {
 
 void NodeList::reset() {
     if (thread() != QThread::currentThread()) {
-        QMetaObject::invokeMethod(this, "reset", Qt::BlockingQueuedConnection);
+        QMetaObject::invokeMethod(this, "reset");
         return;
     }
 
@@ -240,10 +241,6 @@ void NodeList::reset() {
 
     _numNoReplyDomainCheckIns = 0;
 
-    // lock and clear our set of radius ignored IDs
-    _radiusIgnoredSetLock.lockForWrite();
-    _radiusIgnoredNodeIDs.clear();
-    _radiusIgnoredSetLock.unlock();
     // lock and clear our set of ignored IDs
     _ignoredSetLock.lockForWrite();
     _ignoredNodeIDs.clear();
@@ -330,7 +327,7 @@ void NodeList::sendDomainServerCheckIn() {
                 << "but no keypair is present. Waiting for keypair generation to complete.";
             accountManager->generateNewUserKeypair();
 
-            // don't send the check in packet - wait for the keypair first
+            // don't send the check in packet - wait for the new public key to be available to the domain-server first
             return;
         }
 
@@ -560,10 +557,10 @@ void NodeList::pingPunchForDomainServer() {
         flagTimeForConnectionStep(LimitedNodeList::ConnectionStep::SendPingsToDS);
 
         // send the ping packet to the local and public sockets for this node
-        auto localPingPacket = constructICEPingPacket(PingType::Local, _sessionUUID);
+        auto localPingPacket = constructICEPingPacket(PingType::Local, _domainHandler.getICEClientID());
         sendPacket(std::move(localPingPacket), _domainHandler.getICEPeer().getLocalSocket());
 
-        auto publicPingPacket = constructICEPingPacket(PingType::Public, _sessionUUID);
+        auto publicPingPacket = constructICEPingPacket(PingType::Public, _domainHandler.getICEClientID());
         sendPacket(std::move(publicPingPacket), _domainHandler.getICEPeer().getPublicSocket());
 
         _domainHandler.getICEPeer().incrementConnectionAttempts();
@@ -809,26 +806,10 @@ void NodeList::sendIgnoreRadiusStateToNode(const SharedNodePointer& destinationN
     sendPacket(std::move(ignorePacket), *destinationNode);
 }
 
-void NodeList::radiusIgnoreNodeBySessionID(const QUuid& nodeID, bool radiusIgnoreEnabled) {
-    if (radiusIgnoreEnabled) {
-        QReadLocker radiusIgnoredSetLocker{ &_radiusIgnoredSetLock }; // read lock for insert
-        // add this nodeID to our set of ignored IDs
-        _radiusIgnoredNodeIDs.insert(nodeID);
-    } else {
-        QWriteLocker radiusIgnoredSetLocker{ &_radiusIgnoredSetLock }; // write lock for unsafe_erase
-        _radiusIgnoredNodeIDs.unsafe_erase(nodeID);
-    }
-}
-
-bool NodeList::isRadiusIgnoringNode(const QUuid& nodeID) const {
-    QReadLocker radiusIgnoredSetLocker{ &_radiusIgnoredSetLock }; // read lock for reading
-    return _radiusIgnoredNodeIDs.find(nodeID) != _radiusIgnoredNodeIDs.cend();
-}
-
 void NodeList::ignoreNodeBySessionID(const QUuid& nodeID, bool ignoreEnabled) {
     // enumerate the nodes to send a reliable ignore packet to each that can leverage it
     if (!nodeID.isNull() && _sessionUUID != nodeID) {
-        eachMatchingNode([&nodeID](const SharedNodePointer& node)->bool {
+        eachMatchingNode([](const SharedNodePointer& node)->bool {
             if (node->getType() == NodeType::AudioMixer || node->getType() == NodeType::AvatarMixer) {
                 return true;
             } else {
@@ -949,7 +930,7 @@ void NodeList::maybeSendIgnoreSetToNode(SharedNodePointer newNode) {
 
         if (_personalMutedNodeIDs.size() > 0) {
             // setup a packet list so we can send the stream of ignore IDs
-            auto personalMutePacketList = NLPacketList::create(PacketType::NodeIgnoreRequest, QByteArray(), true);
+            auto personalMutePacketList = NLPacketList::create(PacketType::NodeIgnoreRequest, QByteArray(), true, true);
 
             // Force the "enabled" flag in this packet to true
             personalMutePacketList->writePrimitive(true);
@@ -976,7 +957,7 @@ void NodeList::maybeSendIgnoreSetToNode(SharedNodePointer newNode) {
 
         if (_ignoredNodeIDs.size() > 0) {
             // setup a packet list so we can send the stream of ignore IDs
-            auto ignorePacketList = NLPacketList::create(PacketType::NodeIgnoreRequest, QByteArray(), true);
+            auto ignorePacketList = NLPacketList::create(PacketType::NodeIgnoreRequest, QByteArray(), true, true);
 
             // Force the "enabled" flag in this packet to true
             ignorePacketList->writePrimitive(true);
diff --git a/libraries/networking/src/NodeList.h b/libraries/networking/src/NodeList.h
index 6db760b3ca..b3a12153e5 100644
--- a/libraries/networking/src/NodeList.h
+++ b/libraries/networking/src/NodeList.h
@@ -77,8 +77,6 @@ public:
     void toggleIgnoreRadius() { ignoreNodesInRadius(!getIgnoreRadiusEnabled()); }
     void enableIgnoreRadius() { ignoreNodesInRadius(true); }
     void disableIgnoreRadius() { ignoreNodesInRadius(false); }
-    void radiusIgnoreNodeBySessionID(const QUuid& nodeID, bool radiusIgnoreEnabled);
-    bool isRadiusIgnoringNode(const QUuid& other) const;
     void ignoreNodeBySessionID(const QUuid& nodeID, bool ignoreEnabled);
     bool isIgnoringNode(const QUuid& nodeID) const;
     void personalMuteNodeBySessionID(const QUuid& nodeID, bool muteEnabled);
@@ -166,8 +164,6 @@ private:
     QTimer _keepAlivePingTimer;
     bool _requestsDomainListData;
 
-    mutable QReadWriteLock _radiusIgnoredSetLock;
-    tbb::concurrent_unordered_set<QUuid, UUIDHasher> _radiusIgnoredNodeIDs;
     mutable QReadWriteLock _ignoredSetLock;
     tbb::concurrent_unordered_set<QUuid, UUIDHasher> _ignoredNodeIDs;
     mutable QReadWriteLock _personalMutedSetLock;
diff --git a/libraries/networking/src/NodePermissions.cpp b/libraries/networking/src/NodePermissions.cpp
index a1d4fc182e..92ebf1d01e 100644
--- a/libraries/networking/src/NodePermissions.cpp
+++ b/libraries/networking/src/NodePermissions.cpp
@@ -9,9 +9,28 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "NodePermissions.h"
+
+#include <QtCore/QtGlobal>
 #include <QDataStream>
 #include <QtCore/QDebug>
-#include "NodePermissions.h"
+
+
+
+size_t std::hash<NodePermissionsKey>::operator()(const NodePermissionsKey& key) const {
+    size_t result = qHash(key.first);
+    result <<= sizeof(size_t) / 2;
+
+#if (QT_POINTER_SIZE == 8)
+    const uint MASK = 0x00FF;
+#else
+    const uint MASK = 0xFFFF;
+#endif
+
+    result |= (qHash(key.second) & MASK);
+    return result;
+}
+
 
 NodePermissionsKey NodePermissions::standardNameLocalhost = NodePermissionsKey("localhost", 0);
 NodePermissionsKey NodePermissions::standardNameLoggedIn = NodePermissionsKey("logged-in", 0);
@@ -41,10 +60,13 @@ NodePermissions::NodePermissions(QMap<QString, QVariant> perms) {
     permissions |= perms["id_can_adjust_locks"].toBool() ? Permission::canAdjustLocks : Permission::none;
     permissions |= perms["id_can_rez"].toBool() ? Permission::canRezPermanentEntities : Permission::none;
     permissions |= perms["id_can_rez_tmp"].toBool() ? Permission::canRezTemporaryEntities : Permission::none;
+    permissions |= perms["id_can_rez_certified"].toBool() ? Permission::canRezPermanentCertifiedEntities : Permission::none;
+    permissions |= perms["id_can_rez_tmp_certified"].toBool() ? Permission::canRezTemporaryCertifiedEntities : Permission::none;
     permissions |= perms["id_can_write_to_asset_server"].toBool() ? Permission::canWriteToAssetServer : Permission::none;
     permissions |= perms["id_can_connect_past_max_capacity"].toBool() ?
         Permission::canConnectPastMaxCapacity : Permission::none;
     permissions |= perms["id_can_kick"].toBool() ? Permission::canKick : Permission::none;
+    permissions |= perms["id_can_replace_content"].toBool() ? Permission::canReplaceDomainContent : Permission::none;
 }
 
 QVariant NodePermissions::toVariant(QHash<QUuid, GroupRank> groupRanks) {
@@ -52,8 +74,12 @@ QVariant NodePermissions::toVariant(QHash<QUuid, GroupRank> groupRanks) {
     values["permissions_id"] = _id;
     if (_groupIDSet) {
         values["group_id"] = _groupID;
-        if (groupRanks.contains(_rankID)) {
+
+        if (!_rankID.isNull()) {
             values["rank_id"] = _rankID;
+        }
+
+        if (groupRanks.contains(_rankID)) {
             values["rank_name"] = groupRanks[_rankID].name;
             values["rank_order"] = groupRanks[_rankID].order;
         }
@@ -62,9 +88,12 @@ QVariant NodePermissions::toVariant(QHash<QUuid, GroupRank> groupRanks) {
     values["id_can_adjust_locks"] = can(Permission::canAdjustLocks);
     values["id_can_rez"] = can(Permission::canRezPermanentEntities);
     values["id_can_rez_tmp"] = can(Permission::canRezTemporaryEntities);
+    values["id_can_rez_certified"] = can(Permission::canRezPermanentCertifiedEntities);
+    values["id_can_rez_tmp_certified"] = can(Permission::canRezTemporaryCertifiedEntities);
     values["id_can_write_to_asset_server"] = can(Permission::canWriteToAssetServer);
     values["id_can_connect_past_max_capacity"] = can(Permission::canConnectPastMaxCapacity);
     values["id_can_kick"] = can(Permission::canKick);
+    values["id_can_replace_content"] = can(Permission::canReplaceDomainContent);
     return QVariant(values);
 }
 
@@ -119,6 +148,12 @@ QDebug operator<<(QDebug debug, const NodePermissions& perms) {
     if (perms.can(NodePermissions::Permission::canRezTemporaryEntities)) {
         debug << " rez-tmp";
     }
+    if (perms.can(NodePermissions::Permission::canRezPermanentCertifiedEntities)) {
+        debug << " rez-certified";
+    }
+    if (perms.can(NodePermissions::Permission::canRezTemporaryCertifiedEntities)) {
+        debug << " rez-tmp-certified";
+    }
     if (perms.can(NodePermissions::Permission::canWriteToAssetServer)) {
         debug << " asset-server";
     }
@@ -128,6 +163,9 @@ QDebug operator<<(QDebug debug, const NodePermissions& perms) {
     if (perms.can(NodePermissions::Permission::canKick)) {
         debug << " kick";
     }
+    if (perms.can(NodePermissions::Permission::canReplaceDomainContent)) {
+        debug << " can_replace_content";
+    }
     debug.nospace() << "]";
     return debug.nospace();
 }
diff --git a/libraries/networking/src/NodePermissions.h b/libraries/networking/src/NodePermissions.h
index 6fa005e360..d0e421a438 100644
--- a/libraries/networking/src/NodePermissions.h
+++ b/libraries/networking/src/NodePermissions.h
@@ -29,13 +29,8 @@ using NodePermissionsKeyList = QList<QPair<QString, QUuid>>;
 
 namespace std {
     template<>
-    struct hash<NodePermissionsKey> {	
-        size_t operator()(const NodePermissionsKey& key) const {	
-            size_t result = qHash(key.first);
-            result <<= 32;
-            result |= qHash(key.second);
-            return result;
-	    }
+    struct hash<NodePermissionsKey> {    
+        size_t operator()(const NodePermissionsKey& key) const;
     };
 }
 
@@ -77,7 +72,10 @@ public:
         canRezTemporaryEntities = 8,
         canWriteToAssetServer = 16,
         canConnectPastMaxCapacity = 32,
-        canKick = 64
+        canKick = 64,
+        canReplaceDomainContent = 128,
+        canRezPermanentCertifiedEntities = 256,
+        canRezTemporaryCertifiedEntities = 512
     };
     Q_DECLARE_FLAGS(Permissions, Permission)
     Permissions permissions;
diff --git a/libraries/networking/src/PacketReceiver.cpp b/libraries/networking/src/PacketReceiver.cpp
index 21db207375..556e55beb2 100644
--- a/libraries/networking/src/PacketReceiver.cpp
+++ b/libraries/networking/src/PacketReceiver.cpp
@@ -32,7 +32,7 @@ bool PacketReceiver::registerListenerForTypes(PacketTypeList types, QObject* lis
     
     // Partition types based on whether they are sourced or not (non sourced in front)
     auto middle = std::partition(std::begin(types), std::end(types), [](PacketType type) {
-        return NON_SOURCED_PACKETS.contains(type);
+        return PacketTypeEnum::getNonSourcedPackets().contains(type);
     });
     
     QMetaMethod nonSourcedMethod, sourcedMethod;
@@ -123,7 +123,7 @@ QMetaMethod PacketReceiver::matchingMethodForListener(PacketType type, QObject*
         SIGNATURE_TEMPLATE.arg(slot, NON_SOURCED_MESSAGE_LISTENER_PARAMETERS)
     };
 
-    if (!NON_SOURCED_PACKETS.contains(type)) {
+    if (!PacketTypeEnum::getNonSourcedPackets().contains(type)) {
         static const QString SOURCED_MESSAGE_LISTENER_PARAMETERS = "QSharedPointer<ReceivedMessage>,QSharedPointer<Node>";
         static const QString TYPEDEF_SOURCED_MESSAGE_LISTENER_PARAMETERS = "QSharedPointer<ReceivedMessage>,SharedNodePointer";
 
diff --git a/libraries/networking/src/ResourceCache.cpp b/libraries/networking/src/ResourceCache.cpp
index f07514cd85..a3ac995bcf 100644
--- a/libraries/networking/src/ResourceCache.cpp
+++ b/libraries/networking/src/ResourceCache.cpp
@@ -9,22 +9,24 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "ResourceCache.h"
+
 #include <cfloat>
 #include <cmath>
+#include <assert.h>
 
 #include <QThread>
 #include <QTimer>
 
 #include <SharedUtil.h>
-#include <assert.h>
+#include <shared/QtHelpers.h>
+#include <Trace.h>
+#include <Profile.h>
 
 #include "NetworkAccessManager.h"
 #include "NetworkLogging.h"
 #include "NodeList.h"
 
-#include "ResourceCache.h"
-#include <Trace.h>
-#include <Profile.h>
 
 #define clamp(x, min, max) (((x) < (min)) ? (min) :\
                            (((x) > (max)) ? (max) :\
@@ -100,6 +102,8 @@ QSharedPointer<Resource> ResourceCacheSharedItems::getHighestPendingRequest() {
     QSharedPointer<Resource> highestResource;
     Lock lock(_mutex);
 
+    bool currentHighestIsFile = false;
+
     for (int i = 0; i < _pendingRequests.size();) {
         // Clear any freed resources
         auto resource = _pendingRequests.at(i).lock();
@@ -110,10 +114,12 @@ QSharedPointer<Resource> ResourceCacheSharedItems::getHighestPendingRequest() {
 
         // Check load priority
         float priority = resource->getLoadPriority();
-        if (priority >= highestPriority) {
+        bool isFile = resource->getURL().scheme() == URL_SCHEME_FILE;
+        if (priority >= highestPriority && (isFile || !currentHighestIsFile)) {
             highestPriority = priority;
             highestIndex = i;
             highestResource = resource;
+            currentHighestIsFile = isFile;
         }
         i++;
     }
@@ -178,7 +184,7 @@ ScriptableResource* ResourceCache::prefetch(const QUrl& url, void* extra) {
 
     if (QThread::currentThread() != thread()) {
         // Must be called in thread to ensure getResource returns a valid pointer
-        QMetaObject::invokeMethod(this, "prefetch", Qt::BlockingQueuedConnection,
+        BLOCKING_INVOKE_METHOD(this, "prefetch",
             Q_RETURN_ARG(ScriptableResource*, result),
             Q_ARG(QUrl, url), Q_ARG(void*, extra));
         return result;
@@ -301,7 +307,7 @@ QVariantList ResourceCache::getResourceList() {
     QVariantList list;
     if (QThread::currentThread() != thread()) {
         // NOTE: invokeMethod does not allow a const QObject*
-        QMetaObject::invokeMethod(this, "getResourceList", Qt::BlockingQueuedConnection,
+        BLOCKING_INVOKE_METHOD(this, "getResourceList",
             Q_RETURN_ARG(QVariantList, list));
     } else {
         auto resources = _resources.uniqueKeys();
@@ -681,8 +687,9 @@ void Resource::makeRequest() {
         PROFILE_ASYNC_END(resource, "Resource:" + getType(), QString::number(_requestID));
         return;
     }
-    
+
     _request->setByteRange(_requestByteRange);
+    _request->setFailOnRedirect(_shouldFailOnRedirect);
 
     qCDebug(resourceLog).noquote() << "Starting request for:" << _url.toDisplayString();
     emit loading();
@@ -725,6 +732,11 @@ void Resource::handleReplyFinished() {
     if (result == ResourceRequest::Success) {
         auto extraInfo = _url == _activeUrl ? "" : QString(", %1").arg(_activeUrl.toDisplayString());
         qCDebug(networking).noquote() << QString("Request finished for %1%2").arg(_url.toDisplayString(), extraInfo);
+
+        auto relativePathURL = _request->getRelativePathUrl();
+        if (!relativePathURL.isEmpty()) {
+            _effectiveBaseURL = relativePathURL;
+        }
         
         auto data = _request->getData();
         emit loaded(data);
diff --git a/libraries/networking/src/ResourceCache.h b/libraries/networking/src/ResourceCache.h
index f94e1e26d2..17531f45b0 100644
--- a/libraries/networking/src/ResourceCache.h
+++ b/libraries/networking/src/ResourceCache.h
@@ -449,11 +449,13 @@ protected:
     Q_INVOKABLE void allReferencesCleared();
 
     /// Return true if the resource will be retried
-    bool handleFailedRequest(ResourceRequest::Result result);
+    virtual bool handleFailedRequest(ResourceRequest::Result result);
 
     QUrl _url;
+    QUrl _effectiveBaseURL{ _url };
     QUrl _activeUrl;
     ByteRange _requestByteRange;
+    bool _shouldFailOnRedirect { false };
 
     // _loaded == true means we are in a loaded and usable state. It is possible that there may still be
     // active requests/loading while in this state. Example: Progressive KTX downloads, where higher resolution
diff --git a/libraries/networking/src/ResourceManager.cpp b/libraries/networking/src/ResourceManager.cpp
index e9fe2f1ec1..3ee66f89c1 100644
--- a/libraries/networking/src/ResourceManager.cpp
+++ b/libraries/networking/src/ResourceManager.cpp
@@ -28,7 +28,7 @@
 ResourceManager::ResourceManager() {
     _thread.setObjectName("Resource Manager Thread");
 
-    auto assetClient = DependencyManager::set<AssetClient>(_cacheDir);
+    auto assetClient = DependencyManager::set<AssetClient>();
     assetClient->moveToThread(&_thread);
     QObject::connect(&_thread, &QThread::started, assetClient.data(), &AssetClient::init);
 
@@ -160,7 +160,3 @@ bool ResourceManager::resourceExists(const QUrl& url) {
     return false;
 }
 
-void ResourceManager::setCacheDir(const QString& cacheDir) {
-    // TODO: check for existence?  
-    _cacheDir = cacheDir;
-}
diff --git a/libraries/networking/src/ResourceManager.h b/libraries/networking/src/ResourceManager.h
index 4e7cd3d92d..fdfd05736e 100644
--- a/libraries/networking/src/ResourceManager.h
+++ b/libraries/networking/src/ResourceManager.h
@@ -59,7 +59,6 @@ private:
     PrefixMap _prefixMap;
     QMutex _prefixMapLock;
 
-    QString _cacheDir;
 };
 
 #endif
diff --git a/libraries/networking/src/ResourceRequest.cpp b/libraries/networking/src/ResourceRequest.cpp
index aeeab2232a..5d39583c9e 100644
--- a/libraries/networking/src/ResourceRequest.cpp
+++ b/libraries/networking/src/ResourceRequest.cpp
@@ -11,6 +11,9 @@
 
 #include "ResourceRequest.h"
 
+#include <DependencyManager.h>
+#include <StatTracker.h>
+
 #include <QtCore/QThread>
 
 ResourceRequest::ResourceRequest(const QUrl& url) : _url(url) { }
@@ -36,6 +39,15 @@ QString ResourceRequest::getResultString() const {
         case AccessDenied: return "Access Denied";
         case InvalidURL: return "Invalid URL";
         case NotFound: return "Not Found";
+        case RedirectFail: return "Redirect Fail";
         default: return "Unspecified Error";
     }
 }
+
+void ResourceRequest::recordBytesDownloadedInStats(const QString& statName, int64_t bytesReceived) {
+    auto dBytes = bytesReceived - _lastRecordedBytesDownloaded;
+    if (dBytes > 0) {
+        _lastRecordedBytesDownloaded = bytesReceived;
+        DependencyManager::get<StatTracker>()->updateStat(statName, dBytes);
+    }
+}
diff --git a/libraries/networking/src/ResourceRequest.h b/libraries/networking/src/ResourceRequest.h
index 39bcb3fe93..8dd09ccc49 100644
--- a/libraries/networking/src/ResourceRequest.h
+++ b/libraries/networking/src/ResourceRequest.h
@@ -33,6 +33,9 @@ const QString STAT_HTTP_REQUEST_CACHE = "CacheHTTPRequest";
 const QString STAT_ATP_MAPPING_REQUEST_STARTED = "StartedATPMappingRequest";
 const QString STAT_ATP_MAPPING_REQUEST_FAILED = "FailedATPMappingRequest";
 const QString STAT_ATP_MAPPING_REQUEST_SUCCESS = "SuccessfulATPMappingRequest";
+const QString STAT_HTTP_RESOURCE_TOTAL_BYTES = "HTTPBytesDownloaded";
+const QString STAT_ATP_RESOURCE_TOTAL_BYTES = "ATPBytesDownloaded";
+const QString STAT_FILE_RESOURCE_TOTAL_BYTES = "FILEBytesDownloaded";
 
 class ResourceRequest : public QObject {
     Q_OBJECT
@@ -54,7 +57,8 @@ public:
         AccessDenied,
         InvalidByteRange,
         InvalidURL,
-        NotFound
+        NotFound,
+        RedirectFail
     };
     Q_ENUM(Result)
 
@@ -63,9 +67,11 @@ public:
     Result getResult() const { return _result; }
     QString getResultString() const;
     QUrl getUrl() const { return _url; }
+    QUrl getRelativePathUrl() const { return _relativePathURL; }
     bool loadedFromCache() const { return _loadedFromCache; }
     bool getRangeRequestSuccessful() const { return _rangeRequestSuccessful; }
     bool getTotalSizeOfResource() const { return _totalSizeOfResource; }
+    void setFailOnRedirect(bool failOnRedirect) { _failOnRedirect = failOnRedirect; }
 
     void setCacheEnabled(bool value) { _cacheEnabled = value; }
     void setByteRange(ByteRange byteRange) { _byteRange = byteRange; }
@@ -79,16 +85,20 @@ signals:
 
 protected:
     virtual void doSend() = 0;
+    void recordBytesDownloadedInStats(const QString& statName, int64_t bytesReceived);
 
     QUrl _url;
+    QUrl _relativePathURL;
     State _state { NotStarted };
     Result _result;
     QByteArray _data;
+    bool _failOnRedirect { false };
     bool _cacheEnabled { true };
     bool _loadedFromCache { false };
     ByteRange _byteRange;
     bool _rangeRequestSuccessful { false };
     uint64_t _totalSizeOfResource { 0 };
+    int64_t _lastRecordedBytesDownloaded { 0 };
 };
 
 #endif
diff --git a/libraries/networking/src/UserActivityLogger.h b/libraries/networking/src/UserActivityLogger.h
index 179e8e6e66..b44c60eba7 100644
--- a/libraries/networking/src/UserActivityLogger.h
+++ b/libraries/networking/src/UserActivityLogger.h
@@ -33,6 +33,7 @@ public:
     
 public slots:
     bool isEnabled() { return !_disabled.get(); }
+    bool isDisabledSettingSet() const { return _disabled.isSet(); }
 
     void disable(bool disable);
     void logAction(QString action, QJsonObject details = QJsonObject(), JSONCallbackParameters params = JSONCallbackParameters());
@@ -53,7 +54,7 @@ private slots:
     
 private:
     UserActivityLogger();
-    Setting::Handle<bool> _disabled { "UserActivityLoggerDisabled", false };
+    Setting::Handle<bool> _disabled { "UserActivityLoggerDisabled", true };
 
     QElapsedTimer _timer;
 };
diff --git a/libraries/networking/src/udt/CongestionControl.h b/libraries/networking/src/udt/CongestionControl.h
index 3a93134a5e..e6a462651e 100644
--- a/libraries/networking/src/udt/CongestionControl.h
+++ b/libraries/networking/src/udt/CongestionControl.h
@@ -123,9 +123,9 @@ private:
     
     p_high_resolution_clock::time_point _lastRCTime = p_high_resolution_clock::now(); // last rate increase time
     
-    bool _slowStart { true };	// if in slow start phase
+    bool _slowStart { true };    // if in slow start phase
     SequenceNumber _lastACK; // last ACKed sequence number from previous
-    bool _loss { false };	// if loss happened since last rate increase
+    bool _loss { false };    // if loss happened since last rate increase
     SequenceNumber _lastDecreaseMaxSeq; // max pkt seq num sent out when last decrease happened
     double _lastDecreasePeriod { 1 }; // value of _packetSendPeriod when last decrease happened
     int _nakCount { 0 }; // number of NAKs in congestion epoch
diff --git a/libraries/networking/src/udt/ControlPacket.cpp b/libraries/networking/src/udt/ControlPacket.cpp
index 0d5d3e8c25..6fdefd36f6 100644
--- a/libraries/networking/src/udt/ControlPacket.cpp
+++ b/libraries/networking/src/udt/ControlPacket.cpp
@@ -68,7 +68,7 @@ ControlPacket::ControlPacket(std::unique_ptr<char[]> data, qint64 size, const Hi
 }
 
 ControlPacket::ControlPacket(ControlPacket&& other) :
-	BasePacket(std::move(other))
+    BasePacket(std::move(other))
 {
     _type = other._type;
 }
diff --git a/libraries/networking/src/udt/PacketHeaders.cpp b/libraries/networking/src/udt/PacketHeaders.cpp
index 240697d890..9a98393fa1 100644
--- a/libraries/networking/src/udt/PacketHeaders.cpp
+++ b/libraries/networking/src/udt/PacketHeaders.cpp
@@ -22,38 +22,6 @@
 Q_DECLARE_METATYPE(PacketType);
 int packetTypeMetaTypeId = qRegisterMetaType<PacketType>();
 
-const QSet<PacketType> NON_VERIFIED_PACKETS = QSet<PacketType>()
-    << PacketType::NodeJsonStats << PacketType::EntityQuery
-    << PacketType::OctreeDataNack << PacketType::EntityEditNack
-    << PacketType::DomainListRequest << PacketType::StopNode
-    << PacketType::DomainDisconnectRequest << PacketType::UsernameFromIDRequest
-    << PacketType::NodeKickRequest << PacketType::NodeMuteRequest;
-
-const QSet<PacketType> NON_SOURCED_PACKETS = QSet<PacketType>()
-    << PacketType::StunResponse << PacketType::CreateAssignment << PacketType::RequestAssignment
-    << PacketType::DomainServerRequireDTLS << PacketType::DomainConnectRequest
-    << PacketType::DomainList << PacketType::DomainConnectionDenied
-    << PacketType::DomainServerPathQuery << PacketType::DomainServerPathResponse
-    << PacketType::DomainServerAddedNode << PacketType::DomainServerConnectionToken
-    << PacketType::DomainSettingsRequest << PacketType::DomainSettings
-    << PacketType::ICEServerPeerInformation << PacketType::ICEServerQuery << PacketType::ICEServerHeartbeat
-    << PacketType::ICEServerHeartbeatACK << PacketType::ICEPing << PacketType::ICEPingReply
-    << PacketType::ICEServerHeartbeatDenied << PacketType::AssignmentClientStatus << PacketType::StopNode
-    << PacketType::DomainServerRemovedNode << PacketType::UsernameFromIDReply << PacketType::OctreeFileReplacement
-    << PacketType::ReplicatedMicrophoneAudioNoEcho << PacketType::ReplicatedMicrophoneAudioWithEcho
-    << PacketType::ReplicatedInjectAudio << PacketType::ReplicatedSilentAudioFrame
-    << PacketType::ReplicatedAvatarIdentity << PacketType::ReplicatedKillAvatar << PacketType::ReplicatedBulkAvatarData;
-
-const QHash<PacketType, PacketType> REPLICATED_PACKET_MAPPING {
-    { PacketType::MicrophoneAudioNoEcho, PacketType::ReplicatedMicrophoneAudioNoEcho },
-    { PacketType::MicrophoneAudioWithEcho, PacketType::ReplicatedMicrophoneAudioWithEcho },
-    { PacketType::InjectAudio, PacketType::ReplicatedInjectAudio },
-    { PacketType::SilentAudioFrame, PacketType::ReplicatedSilentAudioFrame },
-    { PacketType::AvatarIdentity, PacketType::ReplicatedAvatarIdentity },
-    { PacketType::KillAvatar, PacketType::ReplicatedKillAvatar },
-    { PacketType::BulkAvatarData, PacketType::ReplicatedBulkAvatarData }
-};
-
 PacketVersion versionForPacketType(PacketType packetType) {
     switch (packetType) {
         case PacketType::DomainList:
@@ -62,18 +30,22 @@ PacketVersion versionForPacketType(PacketType packetType) {
         case PacketType::EntityEdit:
         case PacketType::EntityData:
         case PacketType::EntityPhysics:
-            return VERSION_ENTITIES_BULLET_DYNAMICS;
+            return static_cast<PacketVersion>(EntityVersion::HazeEffect);
+
         case PacketType::EntityQuery:
             return static_cast<PacketVersion>(EntityQueryPacketVersion::JSONFilterWithFamilyTree);
         case PacketType::AvatarIdentity:
         case PacketType::AvatarData:
         case PacketType::BulkAvatarData:
         case PacketType::KillAvatar:
-            return static_cast<PacketVersion>(AvatarMixerPacketVersion::IsReplicatedInAvatarIdentity);
+            return static_cast<PacketVersion>(AvatarMixerPacketVersion::UpdatedMannequinDefaultAvatar);
         case PacketType::MessagesData:
             return static_cast<PacketVersion>(MessageDataVersion::TextOrBinaryData);
         case PacketType::ICEServerHeartbeat:
             return 18; // ICE Server Heartbeat signing
+        case PacketType::AssetMappingOperation:
+        case PacketType::AssetMappingOperationReply:
+            return static_cast<PacketVersion>(AssetServerPacketVersion::RedirectedMappings);
         case PacketType::AssetGetInfo:
         case PacketType::AssetGet:
         case PacketType::AssetUpload:
@@ -90,6 +62,9 @@ PacketVersion versionForPacketType(PacketType packetType) {
         case PacketType::DomainServerAddedNode:
             return static_cast<PacketVersion>(DomainServerAddedNodeVersion::PermissionsGrid);
 
+        case PacketType::EntityScriptCallMethod:
+            return static_cast<PacketVersion>(EntityScriptCallMethodVersion::ClientCallable);
+
         case PacketType::MixedAudio:
         case PacketType::SilentAudioFrame:
         case PacketType::InjectAudio:
@@ -97,7 +72,8 @@ PacketVersion versionForPacketType(PacketType packetType) {
         case PacketType::MicrophoneAudioWithEcho:
         case PacketType::AudioStreamStats:
             return static_cast<PacketVersion>(AudioVersion::HighDynamicRangeVolume);
-
+        case PacketType::ICEPing:
+            return static_cast<PacketVersion>(IcePingVersion::SendICEPeerID);
         default:
             return 17;
     }
diff --git a/libraries/networking/src/udt/PacketHeaders.h b/libraries/networking/src/udt/PacketHeaders.h
index 6c42193e11..21b4ae8878 100644
--- a/libraries/networking/src/udt/PacketHeaders.h
+++ b/libraries/networking/src/udt/PacketHeaders.h
@@ -105,7 +105,6 @@ public:
         UsernameFromIDReply,
         ViewFrustum,
         RequestsDomainListData,
-        ExitingSpaceBubble,
         PerAvatarGainSet,
         EntityScriptGetStatus,
         EntityScriptGetStatusReply,
@@ -122,21 +121,70 @@ public:
         ReplicatedAvatarIdentity,
         ReplicatedKillAvatar,
         ReplicatedBulkAvatarData,
+        OctreeFileReplacementFromUrl,
+        ChallengeOwnership,
+        EntityScriptCallMethod,
+        ChallengeOwnershipRequest,
+        ChallengeOwnershipReply,
         NUM_PACKET_TYPE
     };
+
+    const static QHash<PacketTypeEnum::Value, PacketTypeEnum::Value> getReplicatedPacketMapping() {
+        const static QHash<PacketTypeEnum::Value, PacketTypeEnum::Value> REPLICATED_PACKET_MAPPING {
+            { PacketTypeEnum::Value::MicrophoneAudioNoEcho, PacketTypeEnum::Value::ReplicatedMicrophoneAudioNoEcho },
+            { PacketTypeEnum::Value::MicrophoneAudioWithEcho, PacketTypeEnum::Value::ReplicatedMicrophoneAudioWithEcho },
+            { PacketTypeEnum::Value::InjectAudio, PacketTypeEnum::Value::ReplicatedInjectAudio },
+            { PacketTypeEnum::Value::SilentAudioFrame, PacketTypeEnum::Value::ReplicatedSilentAudioFrame },
+            { PacketTypeEnum::Value::AvatarIdentity, PacketTypeEnum::Value::ReplicatedAvatarIdentity },
+            { PacketTypeEnum::Value::KillAvatar, PacketTypeEnum::Value::ReplicatedKillAvatar },
+            { PacketTypeEnum::Value::BulkAvatarData, PacketTypeEnum::Value::ReplicatedBulkAvatarData }
+        };
+        return REPLICATED_PACKET_MAPPING;
+    }
+
+    const static QSet<PacketTypeEnum::Value> getNonVerifiedPackets() {
+        const static QSet<PacketTypeEnum::Value> NON_VERIFIED_PACKETS = QSet<PacketTypeEnum::Value>()
+            << PacketTypeEnum::Value::NodeJsonStats
+            << PacketTypeEnum::Value::EntityQuery
+            << PacketTypeEnum::Value::OctreeDataNack
+            << PacketTypeEnum::Value::EntityEditNack
+            << PacketTypeEnum::Value::DomainListRequest
+            << PacketTypeEnum::Value::StopNode
+            << PacketTypeEnum::Value::DomainDisconnectRequest
+            << PacketTypeEnum::Value::UsernameFromIDRequest
+            << PacketTypeEnum::Value::NodeKickRequest
+            << PacketTypeEnum::Value::NodeMuteRequest;
+        return NON_VERIFIED_PACKETS;
+    }
+
+    const static QSet<PacketTypeEnum::Value> getNonSourcedPackets() {
+        const static QSet<PacketTypeEnum::Value> NON_SOURCED_PACKETS = QSet<PacketTypeEnum::Value>()
+            << PacketTypeEnum::Value::StunResponse << PacketTypeEnum::Value::CreateAssignment
+            << PacketTypeEnum::Value::RequestAssignment << PacketTypeEnum::Value::DomainServerRequireDTLS
+            << PacketTypeEnum::Value::DomainConnectRequest << PacketTypeEnum::Value::DomainList
+            << PacketTypeEnum::Value::DomainConnectionDenied << PacketTypeEnum::Value::DomainServerPathQuery
+            << PacketTypeEnum::Value::DomainServerPathResponse << PacketTypeEnum::Value::DomainServerAddedNode
+            << PacketTypeEnum::Value::DomainServerConnectionToken << PacketTypeEnum::Value::DomainSettingsRequest
+            << PacketTypeEnum::Value::DomainSettings << PacketTypeEnum::Value::ICEServerPeerInformation
+            << PacketTypeEnum::Value::ICEServerQuery << PacketTypeEnum::Value::ICEServerHeartbeat
+            << PacketTypeEnum::Value::ICEServerHeartbeatACK << PacketTypeEnum::Value::ICEPing
+            << PacketTypeEnum::Value::ICEPingReply << PacketTypeEnum::Value::ICEServerHeartbeatDenied
+            << PacketTypeEnum::Value::AssignmentClientStatus << PacketTypeEnum::Value::StopNode
+            << PacketTypeEnum::Value::DomainServerRemovedNode << PacketTypeEnum::Value::UsernameFromIDReply
+            << PacketTypeEnum::Value::OctreeFileReplacement << PacketTypeEnum::Value::ReplicatedMicrophoneAudioNoEcho
+            << PacketTypeEnum::Value::ReplicatedMicrophoneAudioWithEcho << PacketTypeEnum::Value::ReplicatedInjectAudio
+            << PacketTypeEnum::Value::ReplicatedSilentAudioFrame << PacketTypeEnum::Value::ReplicatedAvatarIdentity
+            << PacketTypeEnum::Value::ReplicatedKillAvatar << PacketTypeEnum::Value::ReplicatedBulkAvatarData;
+        return NON_SOURCED_PACKETS;
+    }
 };
 
 using PacketType = PacketTypeEnum::Value;
 
-extern const QHash<PacketType, PacketType> REPLICATED_PACKET_MAPPING;
-
 const int NUM_BYTES_MD5_HASH = 16;
 
 typedef char PacketVersion;
 
-extern const QSet<PacketType> NON_VERIFIED_PACKETS;
-extern const QSet<PacketType> NON_SOURCED_PACKETS;
-
 PacketVersion versionForPacketType(PacketType packetType);
 QByteArray protocolVersionsSignature(); /// returns a unqiue signature for all the current protocols
 QString protocolVersionsSignatureBase64();
@@ -148,77 +196,16 @@ void sendWrongProtocolVersionsSignature(bool sendWrongVersion); /// for debuggin
 uint qHash(const PacketType& key, uint seed);
 QDebug operator<<(QDebug debug, const PacketType& type);
 
-const PacketVersion VERSION_OCTREE_HAS_FILE_BREAKS = 1;
-const PacketVersion VERSION_ENTITIES_HAVE_ANIMATION = 1;
-const PacketVersion VERSION_ROOT_ELEMENT_HAS_DATA = 2;
-const PacketVersion VERSION_ENTITIES_SUPPORT_SPLIT_MTU = 3;
-const PacketVersion VERSION_ENTITIES_HAS_FILE_BREAKS = VERSION_ENTITIES_SUPPORT_SPLIT_MTU;
-const PacketVersion VERSION_ENTITIES_SUPPORT_DIMENSIONS = 4;
-const PacketVersion VERSION_ENTITIES_MODELS_HAVE_ANIMATION_SETTINGS = 5;
-const PacketVersion VERSION_ENTITIES_HAVE_USER_DATA = 6;
-const PacketVersion VERSION_ENTITIES_HAS_LAST_SIMULATED_TIME = 7;
-const PacketVersion VERSION_MODEL_ENTITIES_SUPPORT_SHAPE_TYPE = 8;
-const PacketVersion VERSION_ENTITIES_LIGHT_HAS_INTENSITY_AND_COLOR_PROPERTIES = 9;
-const PacketVersion VERSION_ENTITIES_HAS_PARTICLES = 10;
-const PacketVersion VERSION_ENTITIES_USE_METERS_AND_RADIANS = 11;
-const PacketVersion VERSION_ENTITIES_HAS_COLLISION_MODEL = 12;
-const PacketVersion VERSION_ENTITIES_HAS_MARKETPLACE_ID_DAMAGED = 13;
-const PacketVersion VERSION_ENTITIES_HAS_MARKETPLACE_ID = 14;
-const PacketVersion VERSION_ENTITIES_HAVE_ACCELERATION = 15;
-const PacketVersion VERSION_ENTITIES_HAVE_UUIDS = 16;
-const PacketVersion VERSION_ENTITIES_ZONE_ENTITIES_EXIST = 17;
-const PacketVersion VERSION_ENTITIES_ZONE_ENTITIES_HAVE_DYNAMIC_SHAPE = 18;
-const PacketVersion VERSION_ENTITIES_HAVE_NAMES = 19;
-const PacketVersion VERSION_ENTITIES_ZONE_ENTITIES_HAVE_ATMOSPHERE = 20;
-const PacketVersion VERSION_ENTITIES_ZONE_ENTITIES_HAVE_SKYBOX = 21;
-const PacketVersion VERSION_ENTITIES_ZONE_ENTITIES_STAGE_HAS_AUTOMATIC_HOURDAY = 22;
-const PacketVersion VERSION_ENTITIES_PARTICLE_ENTITIES_HAVE_TEXTURES = 23;
-const PacketVersion VERSION_ENTITIES_HAVE_LINE_TYPE = 24;
-const PacketVersion VERSION_ENTITIES_HAVE_COLLISION_SOUND_URL = 25;
-const PacketVersion VERSION_ENTITIES_HAVE_FRICTION = 26;
-const PacketVersion VERSION_NO_ENTITY_ID_SWAP = 27;
-const PacketVersion VERSION_ENTITIES_PARTICLE_FIX = 28;
-const PacketVersion VERSION_ENTITIES_LINE_POINTS = 29;
-const PacketVersion VERSION_ENTITIES_FACE_CAMERA = 30;
-const PacketVersion VERSION_ENTITIES_SCRIPT_TIMESTAMP = 31;
-const PacketVersion VERSION_ENTITIES_SCRIPT_TIMESTAMP_FIX = 32;
-const PacketVersion VERSION_ENTITIES_HAVE_SIMULATION_OWNER_AND_ACTIONS_OVER_WIRE = 33;
-const PacketVersion VERSION_ENTITIES_NEW_PROTOCOL_LAYER = 35;
-const PacketVersion VERSION_POLYVOX_TEXTURES = 36;
-const PacketVersion VERSION_ENTITIES_POLYLINE = 37;
-const PacketVersion VERSION_OCTREE_CENTERED_ORIGIN = 38;
-const PacketVersion VERSION_ENTITIES_PARTICLE_MODIFICATIONS = 39;
-const PacketVersion VERSION_ENTITIES_POLYVOX_NEIGHBORS = 40;
-const PacketVersion VERSION_ENTITIES_PARTICLE_RADIUS_PROPERTIES = 41;
-const PacketVersion VERSION_ENTITIES_PARTICLE_COLOR_PROPERTIES = 42;
-const PacketVersion VERSION_ENTITIES_PROTOCOL_HEADER_SWAP = 43;
-const PacketVersion VERSION_ENTITIES_PARTICLE_ELLIPSOID_EMITTER = 44;
-const PacketVersion VERSION_ENTITIES_PROTOCOL_CHANNELS = 45;
-const PacketVersion VERSION_ENTITIES_ANIMATION_PROPERTIES_GROUP = 46;
-const PacketVersion VERSION_ENTITIES_KEYLIGHT_PROPERTIES_GROUP = 47;
-const PacketVersion VERSION_ENTITIES_KEYLIGHT_PROPERTIES_GROUP_BIS = 48;
-const PacketVersion VERSION_ENTITIES_PARTICLES_ADDITIVE_BLENDING = 49;
-const PacketVersion VERSION_ENTITIES_POLYLINE_TEXTURE = 50;
-const PacketVersion VERSION_ENTITIES_HAVE_PARENTS = 51;
-const PacketVersion VERSION_ENTITIES_REMOVED_START_AUTOMATICALLY_FROM_ANIMATION_PROPERTY_GROUP = 52;
-const PacketVersion VERSION_MODEL_ENTITIES_JOINTS_ON_WIRE = 53;
-const PacketVersion VERSION_ENTITITES_HAVE_QUERY_BOX = 54;
-const PacketVersion VERSION_ENTITITES_HAVE_COLLISION_MASK = 55;
-const PacketVersion VERSION_ATMOSPHERE_REMOVED = 56;
-const PacketVersion VERSION_LIGHT_HAS_FALLOFF_RADIUS = 57;
-const PacketVersion VERSION_ENTITIES_NO_FLY_ZONES = 58;
-const PacketVersion VERSION_ENTITIES_MORE_SHAPES = 59;
-const PacketVersion VERSION_ENTITIES_PROPERLY_ENCODE_SHAPE_EDITS = 60;
-const PacketVersion VERSION_MODEL_ENTITIES_SUPPORT_STATIC_MESH = 61;
-const PacketVersion VERSION_MODEL_ENTITIES_SUPPORT_SIMPLE_HULLS = 62;
-const PacketVersion VERSION_WEB_ENTITIES_SUPPORT_DPI = 63;
-const PacketVersion VERSION_ENTITIES_ARROW_ACTION = 64;
-const PacketVersion VERSION_ENTITIES_LAST_EDITED_BY = 65;
-const PacketVersion VERSION_ENTITIES_SERVER_SCRIPTS = 66;
-const PacketVersion VERSION_ENTITIES_PHYSICS_PACKET = 67;
-const PacketVersion VERSION_ENTITIES_ZONE_FILTERS = 68;
-const PacketVersion VERSION_ENTITIES_HINGE_CONSTRAINT = 69;
-const PacketVersion VERSION_ENTITIES_BULLET_DYNAMICS = 70;
+enum class EntityVersion : PacketVersion {
+    StrokeColorProperty = 77,
+    HasDynamicOwnershipTests,
+    HazeEffect
+};
+
+enum class EntityScriptCallMethodVersion : PacketVersion {
+    ServerCallable = 18,
+    ClientCallable = 19
+};
 
 enum class EntityQueryPacketVersion: PacketVersion {
     JSONFilter = 18,
@@ -227,7 +214,8 @@ enum class EntityQueryPacketVersion: PacketVersion {
 
 enum class AssetServerPacketVersion: PacketVersion {
     VegasCongestionControl = 19,
-    RangeRequestSupport
+    RangeRequestSupport,
+    RedirectedMappings
 };
 
 enum class AvatarMixerPacketVersion : PacketVersion {
@@ -248,7 +236,9 @@ enum class AvatarMixerPacketVersion : PacketVersion {
     AvatarIdentitySequenceId,
     MannequinDefaultAvatar,
     AvatarIdentitySequenceFront,
-    IsReplicatedInAvatarIdentity
+    IsReplicatedInAvatarIdentity,
+    AvatarIdentityLookAtSnapping,
+    UpdatedMannequinDefaultAvatar
 };
 
 enum class DomainConnectRequestVersion : PacketVersion {
@@ -291,4 +281,8 @@ enum class MessageDataVersion : PacketVersion {
     TextOrBinaryData = 18
 };
 
+enum class IcePingVersion : PacketVersion {
+    SendICEPeerID = 18
+};
+
 #endif // hifi_PacketHeaders_h
diff --git a/libraries/networking/src/udt/Socket.cpp b/libraries/networking/src/udt/Socket.cpp
index 357f8a64d8..a3374a0f47 100644
--- a/libraries/networking/src/udt/Socket.cpp
+++ b/libraries/networking/src/udt/Socket.cpp
@@ -17,6 +17,7 @@
 
 #include <QtCore/QThread>
 
+#include <shared/QtHelpers.h>
 #include <LogHandler.h>
 
 #include "../NetworkLogging.h"
@@ -276,7 +277,7 @@ Connection* Socket::findOrCreateConnection(const HifiSockAddr& sockAddr) {
 
 void Socket::clearConnections() {
     if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "clearConnections", Qt::BlockingQueuedConnection);
+        BLOCKING_INVOKE_METHOD(this, "clearConnections");
         return;
     }
 
diff --git a/libraries/octree/src/Octree.cpp b/libraries/octree/src/Octree.cpp
index 2e93f3515f..7563122290 100644
--- a/libraries/octree/src/Octree.cpp
+++ b/libraries/octree/src/Octree.cpp
@@ -29,8 +29,12 @@
 #include <QVector>
 #include <QFile>
 #include <QJsonDocument>
+#include <QJsonObject>
+#include <QJsonArray>
 #include <QFileInfo>
 #include <QString>
+#include <QRegularExpression>
+#include <QRegularExpressionMatch>
 
 #include <GeometryUtil.h>
 #include <Gzip.h>
@@ -427,7 +431,7 @@ int Octree::readElementData(const OctreeElementPointer& destinationElement, cons
     return bytesRead;
 }
 
-void Octree::readBitstreamToTree(const unsigned char * bitstream, unsigned long int bufferSizeBytes,
+void Octree::readBitstreamToTree(const unsigned char * bitstream, uint64_t bufferSizeBytes,
                                  ReadBitstreamToTreeParams& args) {
     int bytesRead = 0;
     const unsigned char* bitstreamAt = bitstream;
@@ -921,8 +925,8 @@ int Octree::encodeTreeBitstream(const OctreeElementPointer& element,
         roomForOctalCode = packetData->startSubTree(newCode);
 
         if (newCode) {
-            delete[] newCode;
             codeLength = numberOfThreeBitSectionsInCode(newCode);
+            delete[] newCode;
         } else {
             codeLength = 1;
         }
@@ -1148,7 +1152,6 @@ int Octree::encodeTreeBitstreamRecursion(const OctreeElementPointer& element,
     OctreeElementPointer sortedChildren[NUMBER_OF_CHILDREN] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL };
     float distancesToChildren[NUMBER_OF_CHILDREN] = { 0, 0, 0, 0, 0, 0, 0, 0 };
     int indexOfChildren[NUMBER_OF_CHILDREN] = { 0, 0, 0, 0, 0, 0, 0, 0 };
-    int currentCount = 0;
 
     for (int i = 0; i < NUMBER_OF_CHILDREN; i++) {
         OctreeElementPointer childElement = element->getChildAtIndex(i);
@@ -1170,7 +1173,6 @@ int Octree::encodeTreeBitstreamRecursion(const OctreeElementPointer& element,
         sortedChildren[i] = childElement;
         indexOfChildren[i] = i;
         distancesToChildren[i] = 0.0f;
-        currentCount++;
 
         // track stats
         // must check childElement here, because it could be we got here with no childElement
@@ -1181,7 +1183,7 @@ int Octree::encodeTreeBitstreamRecursion(const OctreeElementPointer& element,
 
     // for each child element in Distance sorted order..., check to see if they exist, are colored, and in view, and if so
     // add them to our distance ordered array of children
-    for (int i = 0; i < currentCount; i++) {
+    for (int i = 0; i < NUMBER_OF_CHILDREN; i++) {
         OctreeElementPointer childElement = sortedChildren[i];
         int originalIndex = indexOfChildren[i];
 
@@ -1272,7 +1274,7 @@ int Octree::encodeTreeBitstreamRecursion(const OctreeElementPointer& element,
     }
 
     // NOTE: the childrenDataBits indicates that there is an array of child element data included in this packet.
-    // We wil write this bit mask but we may come back later and update the bits that are actually included
+    // We will write this bit mask but we may come back later and update the bits that are actually included
     packetData->releaseReservedBytes(sizeof(childrenDataBits));
     continueThisLevel = packetData->appendBitMask(childrenDataBits);
 
@@ -1437,7 +1439,7 @@ int Octree::encodeTreeBitstreamRecursion(const OctreeElementPointer& element,
 
         // for each child element in Distance sorted order..., check to see if they exist, are colored, and in view, and if so
         // add them to our distance ordered array of children
-        for (int indexByDistance = 0; indexByDistance < currentCount; indexByDistance++) {
+        for (int indexByDistance = 0; indexByDistance < NUMBER_OF_CHILDREN; indexByDistance++) {
             OctreeElementPointer childElement = sortedChildren[indexByDistance];
             int originalIndex = indexOfChildren[indexByDistance];
 
@@ -1634,7 +1636,7 @@ bool Octree::readFromFile(const char* fileName) {
 
     QDataStream fileInputStream(&file);
     QFileInfo fileInfo(qFileName);
-    unsigned long fileLength = fileInfo.size();
+    uint64_t fileLength = fileInfo.size();
 
     emit importSize(1.0f, 1.0f, 1.0f);
     emit importProgress(0);
@@ -1667,7 +1669,28 @@ bool Octree::readJSONFromGzippedFile(QString qFileName) {
     return readJSONFromStream(-1, jsonStream);
 }
 
+// hack to get the marketplace id into the entities.  We will create a way to get this from a hash of
+// the entity later, but this helps us move things along for now
+QString getMarketplaceID(const QString& urlString) {
+    // the url should be http://mpassets.highfidelity.com/<uuid>-v1/<item name>.extension
+    // a regex for the this is a PITA as there are several valid versions of uuids, and so
+    // lets strip out the uuid (if any) and try to create a UUID from the string, relying on
+    // QT to parse it
+    static const QRegularExpression re("^http:\\/\\/mpassets.highfidelity.com\\/([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})-v[\\d]+\\/.*");
+    QRegularExpressionMatch match = re.match(urlString);
+    if (match.hasMatch()) {
+        QString matched = match.captured(1);
+        if (QUuid(matched).isNull()) {
+            qDebug() << "invalid uuid for marketplaceID";
+        } else {
+            return matched;
+        }
+    }
+    return QString();
+}
+
 bool Octree::readFromURL(const QString& urlString) {
+    QString marketplaceID = getMarketplaceID(urlString);
     auto request =
         std::unique_ptr<ResourceRequest>(DependencyManager::get<ResourceManager>()->createResourceRequest(this, urlString));
 
@@ -1686,11 +1709,11 @@ bool Octree::readFromURL(const QString& urlString) {
 
     auto data = request->getData();
     QDataStream inputStream(data);
-    return readFromStream(data.size(), inputStream);
+    return readFromStream(data.size(), inputStream, marketplaceID);
 }
 
 
-bool Octree::readFromStream(unsigned long streamLength, QDataStream& inputStream) {
+bool Octree::readFromStream(uint64_t streamLength, QDataStream& inputStream, const QString& marketplaceID) {
     // decide if this is binary SVO or JSON-formatted SVO
     QIODevice *device = inputStream.device();
     char firstChar;
@@ -1698,149 +1721,40 @@ bool Octree::readFromStream(unsigned long streamLength, QDataStream& inputStream
     device->ungetChar(firstChar);
 
     if (firstChar == (char) PacketType::EntityData) {
-        qCDebug(octree) << "Reading from binary SVO Stream length:" << streamLength;
-        return readSVOFromStream(streamLength, inputStream);
+        qCWarning(octree) << "Reading from binary SVO no longer supported";
+        return false;
     } else {
         qCDebug(octree) << "Reading from JSON SVO Stream length:" << streamLength;
-        return readJSONFromStream(streamLength, inputStream);
+        return readJSONFromStream(streamLength, inputStream, marketplaceID);
     }
 }
 
 
-bool Octree::readSVOFromStream(unsigned long streamLength, QDataStream& inputStream) {
-    qWarning() << "SVO file format depricated. Support for reading SVO files is no longer support and will be removed soon.";
+// hack to get the marketplace id into the entities.  We will create a way to get this from a hash of
+// the entity later, but this helps us move things along for now
+QJsonDocument addMarketplaceIDToDocumentEntities(QJsonDocument& doc, const QString& marketplaceID) {
+    if (!marketplaceID.isEmpty()) {
+        QJsonDocument newDoc;
+        QJsonObject rootObj = doc.object();
+        QJsonArray newEntitiesArray;
 
-    bool fileOk = false;
-
-    PacketVersion gotVersion = 0;
-
-    unsigned long headerLength = 0; // bytes in the header
-
-    bool wantImportProgress = true;
-
-    PacketType expectedType = expectedDataPacketType();
-    PacketVersion expectedVersion = versionForPacketType(expectedType);
-    bool hasBufferBreaks = versionHasSVOfileBreaks(expectedVersion);
-
-    // before reading the file, check to see if this version of the Octree supports file versions
-    if (getWantSVOfileVersions()) {
-
-        // read just enough of the file to parse the header...
-        const unsigned long HEADER_LENGTH = sizeof(int) + sizeof(PacketVersion);
-        unsigned char fileHeader[HEADER_LENGTH];
-        inputStream.readRawData((char*)&fileHeader, HEADER_LENGTH);
-
-        headerLength = HEADER_LENGTH; // we need this later to skip to the data
-
-        unsigned char* dataAt = (unsigned char*)&fileHeader;
-        unsigned long  dataLength = HEADER_LENGTH;
-
-        // if so, read the first byte of the file and see if it matches the expected version code
-        int intPacketType;
-        memcpy(&intPacketType, dataAt, sizeof(intPacketType));
-        PacketType gotType = (PacketType) intPacketType;
-
-        dataAt += sizeof(expectedType);
-        dataLength -= sizeof(expectedType);
-        gotVersion = *dataAt;
-
-        if (gotType == expectedType) {
-            if (canProcessVersion(gotVersion)) {
-                dataAt += sizeof(gotVersion);
-                dataLength -= sizeof(gotVersion);
-                fileOk = true;
-                qCDebug(octree, "SVO file version match. Expected: %d Got: %d",
-                            versionForPacketType(expectedDataPacketType()), gotVersion);
-
-                hasBufferBreaks = versionHasSVOfileBreaks(gotVersion);
-            } else {
-                qCDebug(octree, "SVO file version mismatch. Expected: %d Got: %d",
-                            versionForPacketType(expectedDataPacketType()), gotVersion);
-            }
-        } else {
-            qCDebug(octree) << "SVO file type mismatch. Expected: " << expectedType
-                        << " Got: " << gotType;
+        // build a new entities array
+        auto entitiesArray = rootObj["Entities"].toArray();
+        for(auto it = entitiesArray.begin(); it != entitiesArray.end(); it++) {
+            auto entity = (*it).toObject();
+            entity["marketplaceID"] = marketplaceID;
+            newEntitiesArray.append(entity);
         }
-
-    } else {
-        qCDebug(octree) << "   NOTE: this file type does not include type and version information.";
-        fileOk = true; // assume the file is ok
+        rootObj["Entities"] = newEntitiesArray;
+        newDoc.setObject(rootObj);
+        return newDoc;
     }
-
-    if (hasBufferBreaks) {
-        qCDebug(octree) << "    this version includes buffer breaks";
-    } else {
-        qCDebug(octree) << "    this version does not include buffer breaks";
-    }
-
-    if (fileOk) {
-
-        // if this version of the file does not include buffer breaks, then we need to load the entire file at once
-        if (!hasBufferBreaks) {
-
-            // read the entire file into a buffer, WHAT!? Why not.
-            unsigned long dataLength = streamLength - headerLength;
-            unsigned char* entireFileDataSection = new unsigned char[dataLength];
-            inputStream.readRawData((char*)entireFileDataSection, dataLength);
-
-            unsigned char* dataAt = entireFileDataSection;
-
-            ReadBitstreamToTreeParams args(NO_EXISTS_BITS, NULL, 0,
-                                                SharedNodePointer(), wantImportProgress, gotVersion);
-
-            readBitstreamToTree(dataAt, dataLength, args);
-            delete[] entireFileDataSection;
-
-        } else {
-
-
-            unsigned long dataLength = streamLength - headerLength;
-            unsigned long remainingLength = dataLength;
-            const unsigned long MAX_CHUNK_LENGTH = MAX_OCTREE_PACKET_SIZE * 2;
-            unsigned char* fileChunk = new unsigned char[MAX_CHUNK_LENGTH];
-
-            while (remainingLength > 0) {
-                quint16 chunkLength = 0;
-
-                inputStream.readRawData((char*)&chunkLength, sizeof(chunkLength));
-                remainingLength -= sizeof(chunkLength);
-
-                if (chunkLength > remainingLength) {
-                    qCDebug(octree) << "UNEXPECTED chunk size of:" << chunkLength
-                                << "greater than remaining length:" << remainingLength;
-                    break;
-                }
-
-                if (chunkLength > MAX_CHUNK_LENGTH) {
-                    qCDebug(octree) << "UNEXPECTED chunk size of:" << chunkLength
-                                << "greater than MAX_CHUNK_LENGTH:" << MAX_CHUNK_LENGTH;
-                    break;
-                }
-
-                inputStream.readRawData((char*)fileChunk, chunkLength);
-
-                remainingLength -= chunkLength;
-
-                unsigned char* dataAt = fileChunk;
-                unsigned long  dataLength = chunkLength;
-
-                ReadBitstreamToTreeParams args(NO_EXISTS_BITS, NULL, 0,
-                                                    SharedNodePointer(), wantImportProgress, gotVersion);
-
-                readBitstreamToTree(dataAt, dataLength, args);
-            }
-
-            delete[] fileChunk;
-        }
-    }
-
-
-    return fileOk;
+    return doc;
 }
 
 const int READ_JSON_BUFFER_SIZE = 2048;
 
-bool Octree::readJSONFromStream(unsigned long streamLength, QDataStream& inputStream) {
+bool Octree::readJSONFromStream(uint64_t streamLength, QDataStream& inputStream, const QString& marketplaceID /*=""*/) {
     // if the data is gzipped we may not have a useful bytesAvailable() result, so just keep reading until
     // we get an eof.  Leave streamLength parameter for consistency.
 
@@ -1860,6 +1774,9 @@ bool Octree::readJSONFromStream(unsigned long streamLength, QDataStream& inputSt
     }
 
     QJsonDocument asDocument = QJsonDocument::fromJson(jsonBuffer);
+    if (!marketplaceID.isEmpty()) {
+        asDocument = addMarketplaceIDToDocumentEntities(asDocument, marketplaceID);
+    }
     QVariant asVariant = asDocument.toVariant();
     QVariantMap asMap = asVariant.toMap();
     bool success = readFromMap(asMap);
@@ -1932,14 +1849,14 @@ bool Octree::writeToJSONFile(const char* fileName, const OctreeElementPointer& e
     return success;
 }
 
-unsigned long Octree::getOctreeElementsCount() {
-    unsigned long nodeCount = 0;
+uint64_t Octree::getOctreeElementsCount() {
+    uint64_t nodeCount = 0;
     recurseTreeWithOperation(countOctreeElementsOperation, &nodeCount);
     return nodeCount;
 }
 
 bool Octree::countOctreeElementsOperation(const OctreeElementPointer& element, void* extraData) {
-    (*(unsigned long*)extraData)++;
+    (*(uint64_t*)extraData)++;
     return true; // keep going
 }
 
diff --git a/libraries/octree/src/Octree.h b/libraries/octree/src/Octree.h
index 512a0ab64e..ec6a0e810d 100644
--- a/libraries/octree/src/Octree.h
+++ b/libraries/octree/src/Octree.h
@@ -14,6 +14,7 @@
 
 #include <memory>
 #include <set>
+#include <stdint.h>
 
 #include <QHash>
 #include <QObject>
@@ -91,7 +92,8 @@ public:
         OUT_OF_VIEW,
         WAS_IN_VIEW,
         NO_CHANGE,
-        OCCLUDED
+        OCCLUDED,
+        FINISHED
     } reason;
     reason stopReason;
 
@@ -206,24 +208,20 @@ public:
     // own definition. Implement these to allow your octree based server to support editing
     virtual bool getWantSVOfileVersions() const { return false; }
     virtual PacketType expectedDataPacketType() const { return PacketType::Unknown; }
-    virtual bool canProcessVersion(PacketVersion thisVersion) const {
-                    return thisVersion == versionForPacketType(expectedDataPacketType()); }
     virtual PacketVersion expectedVersion() const { return versionForPacketType(expectedDataPacketType()); }
     virtual bool handlesEditPacketType(PacketType packetType) const { return false; }
     virtual int processEditPacketData(ReceivedMessage& message, const unsigned char* editData, int maxLength,
                                       const SharedNodePointer& sourceNode) { return 0; }
-                    
+    virtual void processChallengeOwnershipRequestPacket(ReceivedMessage& message, const SharedNodePointer& sourceNode) { return; }
+    virtual void processChallengeOwnershipReplyPacket(ReceivedMessage& message, const SharedNodePointer& sourceNode) { return; }
+    virtual void processChallengeOwnershipPacket(ReceivedMessage& message, const SharedNodePointer& sourceNode) { return; }
+
     virtual bool recurseChildrenWithData() const { return true; }
     virtual bool rootElementHasData() const { return false; }
     virtual int minimumRequiredRootDataBytes() const { return 0; }
     virtual bool suppressEmptySubtrees() const { return true; }
     virtual void releaseSceneEncodeData(OctreeElementExtraEncodeData* extraEncodeData) const { }
     virtual bool mustIncludeAllChildData() const { return true; }
-    
-    /// some versions of the SVO file will include breaks with buffer lengths between each buffer chunk in the SVO
-    /// file. If the Octree subclass expects this for this particular version of the file, it should override this
-    /// method and return true.
-    virtual bool versionHasSVOfileBreaks(PacketVersion thisVersion) const { return false; }
 
     virtual void update() { } // nothing to do by default
 
@@ -231,20 +229,20 @@ public:
 
     virtual void eraseAllOctreeElements(bool createNewRoot = true);
 
-    void readBitstreamToTree(const unsigned char* bitstream,  unsigned long int bufferSizeBytes, ReadBitstreamToTreeParams& args);
+    virtual void readBitstreamToTree(const unsigned char* bitstream,  uint64_t bufferSizeBytes, ReadBitstreamToTreeParams& args);
     void deleteOctalCodeFromTree(const unsigned char* codeBuffer, bool collapseEmptyTrees = DONT_COLLAPSE);
     void reaverageOctreeElements(OctreeElementPointer startElement = OctreeElementPointer());
 
     void deleteOctreeElementAt(float x, float y, float z, float s);
-    
+
     /// Find the voxel at position x,y,z,s
     /// \return pointer to the OctreeElement or NULL if none at x,y,z,s.
     OctreeElementPointer getOctreeElementAt(float x, float y, float z, float s) const;
-    
+
     /// Find the voxel at position x,y,z,s
     /// \return pointer to the OctreeElement or to the smallest enclosing parent if none at x,y,z,s.
     OctreeElementPointer getOctreeEnclosingElementAt(float x, float y, float z, float s) const;
-    
+
     OctreeElementPointer getOrCreateChildElementAt(float x, float y, float z, float s);
     OctreeElementPointer getOrCreateChildElementContaining(const AACube& box);
 
@@ -261,7 +259,7 @@ public:
 
     int encodeTreeBitstream(const OctreeElementPointer& element, OctreePacketData* packetData, OctreeElementBag& bag,
                             EncodeBitstreamParams& params) ;
-                            
+
     bool isDirty() const { return _isDirty; }
     void clearDirtyBit() { _isDirty = false; }
     void setDirtyBit() { _isDirty = true; }
@@ -301,13 +299,13 @@ public:
     // Octree importers
     bool readFromFile(const char* filename);
     bool readFromURL(const QString& url); // will support file urls as well...
-    bool readFromStream(unsigned long streamLength, QDataStream& inputStream);
-    bool readSVOFromStream(unsigned long streamLength, QDataStream& inputStream);
-    bool readJSONFromStream(unsigned long streamLength, QDataStream& inputStream);
+    bool readFromStream(uint64_t streamLength, QDataStream& inputStream, const QString& marketplaceID="");
+    bool readSVOFromStream(uint64_t streamLength, QDataStream& inputStream);
+    bool readJSONFromStream(uint64_t streamLength, QDataStream& inputStream, const QString& marketplaceID="");
     bool readJSONFromGzippedFile(QString qFileName);
     virtual bool readFromMap(QVariantMap& entityDescription) = 0;
 
-    unsigned long getOctreeElementsCount();
+    uint64_t getOctreeElementsCount();
 
     bool getShouldReaverage() const { return _shouldReaverage; }
 
diff --git a/libraries/octree/src/OctreeConstants.h b/libraries/octree/src/OctreeConstants.h
index 53442f52d6..062d4e1ef2 100644
--- a/libraries/octree/src/OctreeConstants.h
+++ b/libraries/octree/src/OctreeConstants.h
@@ -21,7 +21,8 @@ const int TREE_SCALE = 32768; // ~20 miles.. This is the number of meters of the
 const int HALF_TREE_SCALE = TREE_SCALE / 2;
 
 // This controls the LOD. Larger number will make smaller voxels visible at greater distance.
-const float DEFAULT_OCTREE_SIZE_SCALE = TREE_SCALE * 400.0f; 
+const float MAX_VISIBILITY_DISTANCE_FOR_UNIT_ELEMENT = 400.0f; // max distance where a 1x1x1 cube is visible for 20:20 vision
+const float DEFAULT_OCTREE_SIZE_SCALE = TREE_SCALE * MAX_VISIBILITY_DISTANCE_FOR_UNIT_ELEMENT;
 
 // Since entities like models live inside of octree cells, and they themselves can have very small mesh parts,
 // we want to have some constant that controls have big a mesh part must be to render even if the octree cell itself
@@ -36,7 +37,10 @@ const int NUMBER_OF_CHILDREN = 8;
 
 const int MAX_TREE_SLICE_BYTES = 26;
 
-const float VIEW_FRUSTUM_FOV_OVERSEND = 60.0f;
+// The oversend below is 20 degrees because that is the minimum oversend necessary to prevent missing entities
+// near the edge of the view.  The value here is determined by hard-coded values in ViewFrsutum::isVerySimilar().
+// TODO: move this parameter to the OctreeQueryNode context.
+const float VIEW_FRUSTUM_FOV_OVERSEND = 20.0f;
 
 // These are guards to prevent our voxel tree recursive routines from spinning out of control
 const int UNREASONABLY_DEEP_RECURSION = 29; // use this for something that you want to be shallow, but not spin out
diff --git a/libraries/octree/src/OctreePacketData.cpp b/libraries/octree/src/OctreePacketData.cpp
index 5fd7e4dba3..b5b4a161ef 100644
--- a/libraries/octree/src/OctreePacketData.cpp
+++ b/libraries/octree/src/OctreePacketData.cpp
@@ -68,8 +68,8 @@ bool OctreePacketData::append(const unsigned char* data, int length) {
         _dirty = true;
     } 
     
-    const bool wantDebug = false;
-    if (wantDebug && !success) {
+    #ifdef WANT_DEBUG
+    if (!success) {
         qCDebug(octree) << "OctreePacketData::append(const unsigned char* data, int length) FAILING....";
         qCDebug(octree) << "    length=" << length;
         qCDebug(octree) << "    _bytesAvailable=" << _bytesAvailable;
@@ -77,6 +77,7 @@ bool OctreePacketData::append(const unsigned char* data, int length) {
         qCDebug(octree) << "    _targetSize=" << _targetSize;
         qCDebug(octree) << "    _bytesReserved=" << _bytesReserved;
     }
+    #endif
     return success;
 }
 
@@ -582,9 +583,7 @@ bool OctreePacketData::compressContent() {
 
     if (compressedData.size() < (int)MAX_OCTREE_PACKET_DATA_SIZE) {
         _compressedBytes = compressedData.size();
-        for (int i = 0; i < _compressedBytes; i++) {
-            _compressed[i] = compressedData[i];
-        }
+        memcpy(_compressed, compressedData.constData(), _compressedBytes);
         _dirty = false;
         success = true;
     }
@@ -598,25 +597,22 @@ void OctreePacketData::loadFinalizedContent(const unsigned char* data, int lengt
     if (data && length > 0) {
 
         if (_enableCompression) {
-            QByteArray compressedData;
-            for (int i = 0; i < length; i++) {
-                compressedData[i] = data[i];
-                _compressed[i] = compressedData[i];
-            }
             _compressedBytes = length;
+            memcpy(_compressed, data, _compressedBytes);
+
+            QByteArray compressedData;
+            compressedData.resize(_compressedBytes);
+            memcpy(compressedData.data(), data, _compressedBytes);
+
             QByteArray uncompressedData = qUncompress(compressedData);
             if (uncompressedData.size() <= _bytesAvailable) {
                 _bytesInUse = uncompressedData.size();
                 _bytesAvailable -= uncompressedData.size();
-
-                for (int i = 0; i < _bytesInUse; i++) {
-                    _uncompressed[i] = uncompressedData[i];
-                }
+                memcpy(_uncompressed, uncompressedData.constData(), _bytesInUse);
             }
         } else {
-            for (int i = 0; i < length; i++) {
-                _uncompressed[i] = _compressed[i] = data[i];
-            }
+            memcpy(_uncompressed, data, length);
+            memcpy(_compressed, data, length);
             _bytesInUse = _compressedBytes = length;
         }
     } else {
@@ -652,6 +648,13 @@ void OctreePacketData::debugContent() {
     printf("\n");
 }
 
+void OctreePacketData::debugBytes() {
+    qCDebug(octree) << "    _bytesAvailable=" << _bytesAvailable;
+    qCDebug(octree) << "    _bytesInUse=" << _bytesInUse;
+    qCDebug(octree) << "    _targetSize=" << _targetSize;
+    qCDebug(octree) << "    _bytesReserved=" << _bytesReserved;
+}
+
 int OctreePacketData::unpackDataFromBytes(const unsigned char* dataBytes, QString& result) { 
     uint16_t length;
     memcpy(&length, dataBytes, sizeof(length));
diff --git a/libraries/octree/src/OctreePacketData.h b/libraries/octree/src/OctreePacketData.h
index ed6a49941b..37c171504b 100644
--- a/libraries/octree/src/OctreePacketData.h
+++ b/libraries/octree/src/OctreePacketData.h
@@ -240,6 +240,7 @@ public:
 
     /// displays contents for debugging
     void debugContent();
+    void debugBytes();
     
     static quint64 getCompressContentTime() { return _compressContentTime; } /// total time spent compressing content
     static quint64 getCompressContentCalls() { return _compressContentCalls; } /// total calls to compress content
diff --git a/libraries/octree/src/OctreeQuery.cpp b/libraries/octree/src/OctreeQuery.cpp
index 7d9fc7d08c..a88f730a50 100644
--- a/libraries/octree/src/OctreeQuery.cpp
+++ b/libraries/octree/src/OctreeQuery.cpp
@@ -17,7 +17,18 @@
 #include "OctreeConstants.h"
 #include "OctreeQuery.h"
 
-OctreeQuery::OctreeQuery() {
+const float DEFAULT_FOV = 45.0f; // degrees
+const float DEFAULT_ASPECT_RATIO = 1.0f;
+const float DEFAULT_NEAR_CLIP = 0.1f;
+const float DEFAULT_FAR_CLIP = 3.0f;
+
+OctreeQuery::OctreeQuery() :
+    _cameraFov(DEFAULT_FOV),
+    _cameraAspectRatio(DEFAULT_ASPECT_RATIO),
+    _cameraNearClip(DEFAULT_NEAR_CLIP),
+    _cameraFarClip(DEFAULT_FAR_CLIP),
+    _cameraCenterRadius(DEFAULT_FAR_CLIP)
+{
     _maxQueryPPS = DEFAULT_MAX_OCTREE_PPS;
 }
 
diff --git a/libraries/octree/src/OctreeQuery.h b/libraries/octree/src/OctreeQuery.h
index 058c1dc585..bbd0350baf 100644
--- a/libraries/octree/src/OctreeQuery.h
+++ b/libraries/octree/src/OctreeQuery.h
@@ -12,21 +12,7 @@
 #ifndef hifi_OctreeQuery_h
 #define hifi_OctreeQuery_h
 
-/* VS2010 defines stdint.h, but not inttypes.h */
-#if defined(_MSC_VER)
-typedef signed char  int8_t;
-typedef signed short int16_t;
-typedef signed int   int32_t;
-typedef unsigned char  uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned int   uint32_t;
-typedef signed long long   int64_t;
-typedef unsigned long long quint64;
-#define PRId64 "I64d"
-#else
 #include <inttypes.h>
-#endif
-
 
 #include <glm/glm.hpp>
 #include <glm/gtc/quaternion.hpp>
@@ -45,7 +31,7 @@ public:
     virtual ~OctreeQuery() {}
 
     int getBroadcastData(unsigned char* destinationBuffer);
-    int parseData(ReceivedMessage& message) override;
+    virtual int parseData(ReceivedMessage& message) override;
 
     // getters for camera details
     const glm::vec3& getCameraPosition() const { return _cameraPosition; }
@@ -89,14 +75,14 @@ public slots:
 
 protected:
     // camera details for the avatar
-    glm::vec3 _cameraPosition = glm::vec3(0.0f);
-    glm::quat _cameraOrientation = glm::quat();
-    float _cameraFov = 0.0f;
-    float _cameraAspectRatio = 1.0f;
-    float _cameraNearClip = 0.0f;
-    float _cameraFarClip = 0.0f;
-    float _cameraCenterRadius { 0.0f };
-    glm::vec3 _cameraEyeOffsetPosition = glm::vec3(0.0f);
+    glm::vec3 _cameraPosition { glm::vec3(0.0f) };
+    glm::quat _cameraOrientation { glm::quat() };
+    float _cameraFov;
+    float _cameraAspectRatio;
+    float _cameraNearClip;
+    float _cameraFarClip;
+    float _cameraCenterRadius;
+    glm::vec3 _cameraEyeOffsetPosition { glm::vec3(0.0f) };
 
     // octree server sending items
     int _maxQueryPPS = DEFAULT_MAX_OCTREE_PPS;
diff --git a/libraries/octree/src/OctreeQueryNode.cpp b/libraries/octree/src/OctreeQueryNode.cpp
index 4ebe650f6a..941bb6b536 100644
--- a/libraries/octree/src/OctreeQueryNode.cpp
+++ b/libraries/octree/src/OctreeQueryNode.cpp
@@ -18,6 +18,12 @@
 #include <SharedUtil.h>
 #include <UUID.h>
 
+int OctreeQueryNode::parseData(ReceivedMessage& message) {
+    // set our flag to indicate that we've parsed for this query at least once
+    _hasReceivedFirstQuery = true;
+
+    return OctreeQuery::parseData(message);
+}
 
 void OctreeQueryNode::nodeKilled() {
     _isShuttingDown = true;
@@ -182,6 +188,7 @@ bool OctreeQueryNode::updateCurrentViewFrustum() {
                                                              getCameraAspectRatio(),
                                                              getCameraNearClip(),
                                                              getCameraFarClip()));
+            newestViewFrustum.calculate();
         }
         
         
@@ -189,7 +196,6 @@ bool OctreeQueryNode::updateCurrentViewFrustum() {
             QMutexLocker viewLocker(&_viewMutex);
             if (!newestViewFrustum.isVerySimilar(_currentViewFrustum)) {
                 _currentViewFrustum = newestViewFrustum;
-                _currentViewFrustum.calculate();
                 currentViewFrustumChanged = true;
             }
         }
diff --git a/libraries/octree/src/OctreeQueryNode.h b/libraries/octree/src/OctreeQueryNode.h
index fd89a89949..fac118c628 100644
--- a/libraries/octree/src/OctreeQueryNode.h
+++ b/libraries/octree/src/OctreeQueryNode.h
@@ -35,6 +35,8 @@ public:
     void init(); // called after creation to set up some virtual items
     virtual PacketType getMyPacketType() const = 0;
 
+    virtual int parseData(ReceivedMessage& message) override;
+
     void resetOctreePacket();  // resets octree packet to after "V" header
 
     void writeToPacket(const unsigned char* buffer, unsigned int bytes); // writes to end of packet
@@ -106,6 +108,8 @@ public:
     bool shouldForceFullScene() const { return _shouldForceFullScene; }
     void setShouldForceFullScene(bool shouldForceFullScene) { _shouldForceFullScene = shouldForceFullScene; }
 
+    bool hasReceivedFirstQuery() const  { return _hasReceivedFirstQuery; }
+
 private:
     OctreeQueryNode(const OctreeQueryNode &);
     OctreeQueryNode& operator= (const OctreeQueryNode&);
@@ -153,6 +157,8 @@ private:
     QJsonObject _lastCheckJSONParameters;
 
     bool _shouldForceFullScene { false };
+
+    bool _hasReceivedFirstQuery { false };
 };
 
 #endif // hifi_OctreeQueryNode_h
diff --git a/libraries/octree/src/OctreeUtils.h b/libraries/octree/src/OctreeUtils.h
index 279eb51509..c257bcd5f1 100644
--- a/libraries/octree/src/OctreeUtils.h
+++ b/libraries/octree/src/OctreeUtils.h
@@ -27,4 +27,11 @@ float boundaryDistanceForRenderLevel(unsigned int renderLevel, float voxelSizeSc
 
 float getAccuracyAngle(float octreeSizeScale, int boundaryLevelAdjust);
 
+// MIN_ELEMENT_ANGULAR_DIAMETER = angular diameter of 1x1x1m cube at 400m = sqrt(3) / 400 = 0.0043301 radians ~= 0.25 degrees
+const float MIN_ELEMENT_ANGULAR_DIAMETER = 0.0043301f; // radians
+// NOTE: the entity bounding cube is larger than the smallest possible containing octree element by sqrt(3)
+const float SQRT_THREE = 1.73205080f;
+const float MIN_ENTITY_ANGULAR_DIAMETER = MIN_ELEMENT_ANGULAR_DIAMETER * SQRT_THREE;
+const float MIN_VISIBLE_DISTANCE = 0.0001f; // helps avoid divide-by-zero check
+
 #endif // hifi_OctreeUtils_h
diff --git a/libraries/physics/src/CharacterController.cpp b/libraries/physics/src/CharacterController.cpp
index bd4d1201c7..32e764bd10 100755
--- a/libraries/physics/src/CharacterController.cpp
+++ b/libraries/physics/src/CharacterController.cpp
@@ -12,14 +12,13 @@
 #include "CharacterController.h"
 
 #include <NumericalConstants.h>
+#include <AvatarConstants.h>
 
 #include "ObjectMotionState.h"
 #include "PhysicsHelpers.h"
 #include "PhysicsLogging.h"
 
 const btVector3 LOCAL_UP_AXIS(0.0f, 1.0f, 0.0f);
-const float JUMP_SPEED = 3.5f;
-const float MAX_FALL_HEIGHT = 20.0f;
 
 #ifdef DEBUG_STATE_CHANGE
 #define SET_STATE(desiredState, reason) setState(desiredState, reason)
@@ -62,12 +61,11 @@ CharacterController::CharacterMotor::CharacterMotor(const glm::vec3& vel, const
 }
 
 CharacterController::CharacterController() {
-    _floorDistance = MAX_FALL_HEIGHT;
+    _floorDistance = _scaleFactor * DEFAULT_AVATAR_FALL_HEIGHT;
 
     _targetVelocity.setValue(0.0f, 0.0f, 0.0f);
     _followDesiredBodyTransform.setIdentity();
     _followTimeRemaining = 0.0f;
-    _jumpSpeed = JUMP_SPEED;
     _state = State::Hover;
     _isPushingUp = false;
     _rayHitStartTime = 0;
@@ -122,7 +120,7 @@ void CharacterController::setDynamicsWorld(btDynamicsWorld* world) {
             _dynamicsWorld->addRigidBody(_rigidBody, collisionGroup, BULLET_COLLISION_MASK_MY_AVATAR);
             _dynamicsWorld->addAction(this);
             // restore gravity settings because adding an object to the world overwrites its gravity setting
-            _rigidBody->setGravity(_gravity * _currentUp);
+            _rigidBody->setGravity(_currentGravity * _currentUp);
             btCollisionShape* shape = _rigidBody->getCollisionShape();
             assert(shape && shape->getShapeType() == CONVEX_HULL_SHAPE_PROXYTYPE);
             _ghost.setCharacterShape(static_cast<btConvexHullShape*>(shape));
@@ -265,13 +263,13 @@ void CharacterController::playerStep(btCollisionWorld* collisionWorld, btScalar
         btVector3 endPos = startPos + linearDisplacement;
 
         btQuaternion startRot = bodyTransform.getRotation();
-        glm::vec2 currentFacing = getFacingDir2D(bulletToGLM(startRot));
-        glm::vec2 currentRight(currentFacing.y, -currentFacing.x);
-        glm::vec2 desiredFacing = getFacingDir2D(bulletToGLM(_followDesiredBodyTransform.getRotation()));
-        float deltaAngle = acosf(glm::clamp(glm::dot(currentFacing, desiredFacing), -1.0f, 1.0f));
-        float angularSpeed = deltaAngle / _followTimeRemaining;
-        float sign = copysignf(1.0f, glm::dot(desiredFacing, currentRight));
-        btQuaternion angularDisplacement = btQuaternion(btVector3(0.0f, 1.0f, 0.0f), sign * angularSpeed * dt);
+        btQuaternion desiredRot = _followDesiredBodyTransform.getRotation();
+        if (desiredRot.dot(startRot) < 0.0f) {
+            desiredRot = -desiredRot;
+        }
+        btQuaternion deltaRot = desiredRot * startRot.inverse();
+        float angularSpeed = deltaRot.getAngle() / _followTimeRemaining;
+        btQuaternion angularDisplacement = btQuaternion(deltaRot.getAxis(), angularSpeed * dt);
         btQuaternion endRot = angularDisplacement * startRot;
 
         // in order to accumulate displacement of avatar position, we need to take _shapeLocalOffset into account.
@@ -304,7 +302,7 @@ void CharacterController::playerStep(btCollisionWorld* collisionWorld, btScalar
             // add minimum velocity to counteract gravity's displacement during one step
             // Note: the 0.5 factor comes from the fact that we really want the
             // average velocity contribution from gravity during the step
-            stepUpSpeed -= 0.5f * _gravity * timeToStep; // remember: _gravity is negative scalar
+            stepUpSpeed -= 0.5f * _currentGravity * timeToStep; // remember: _gravity is negative scalar
 
             btScalar vDotUp = velocity.dot(_currentUp);
             if (vDotUp < stepUpSpeed) {
@@ -353,6 +351,28 @@ static const char* stateToStr(CharacterController::State state) {
 }
 #endif // #ifdef DEBUG_STATE_CHANGE
 
+void CharacterController::updateCurrentGravity() {
+    int16_t collisionGroup = computeCollisionGroup();
+    if (_state == State::Hover || collisionGroup == BULLET_COLLISION_GROUP_COLLISIONLESS) {
+        _currentGravity = 0.0f;
+    } else {
+        _currentGravity = _gravity;
+    }
+    if (_rigidBody) {
+        _rigidBody->setGravity(_currentGravity * _currentUp);
+    }
+}
+
+
+void CharacterController::setGravity(float gravity) {
+    _gravity = gravity;
+    updateCurrentGravity();
+}
+
+float CharacterController::getGravity() {
+    return _gravity;
+}
+
 #ifdef DEBUG_STATE_CHANGE
 void CharacterController::setState(State desiredState, const char* reason) {
 #else
@@ -367,20 +387,7 @@ void CharacterController::setState(State desiredState) {
         qCDebug(physics) << "CharacterController::setState" << stateToStr(desiredState) << "from" << stateToStr(_state) << "," << reason;
 #endif
         _state = desiredState;
-        updateGravity();
-    }
-}
-
-void CharacterController::updateGravity() {
-    int16_t collisionGroup = computeCollisionGroup();
-    if (_state == State::Hover || collisionGroup == BULLET_COLLISION_GROUP_COLLISIONLESS) {
-        _gravity = 0.0f;
-    } else {
-        const float DEFAULT_CHARACTER_GRAVITY = -5.0f;
-        _gravity = DEFAULT_CHARACTER_GRAVITY;
-    }
-    if (_rigidBody) {
-        _rigidBody->setGravity(_gravity * _currentUp);
+        updateCurrentGravity();
     }
 }
 
@@ -439,14 +446,14 @@ void CharacterController::handleChangedCollisionGroup() {
             _dynamicsWorld->addRigidBody(_rigidBody, collisionGroup, BULLET_COLLISION_MASK_MY_AVATAR);
         }
         _pendingFlags &= ~PENDING_FLAG_UPDATE_COLLISION_GROUP;
-        updateGravity();
+        updateCurrentGravity();
     }
 }
 
 void CharacterController::updateUpAxis(const glm::quat& rotation) {
     _currentUp = quatRotate(glmToBullet(rotation), LOCAL_UP_AXIS);
-    if (_state != State::Hover && _rigidBody) {
-        _rigidBody->setGravity(_gravity * _currentUp);
+    if (_rigidBody) {
+        _rigidBody->setGravity(_currentGravity * _currentUp);
     }
 }
 
@@ -653,7 +660,7 @@ void CharacterController::updateState() {
     const btScalar FLY_TO_GROUND_THRESHOLD = 0.1f * _radius;
     const btScalar GROUND_TO_FLY_THRESHOLD = 0.8f * _radius + _halfHeight;
     const quint64 TAKE_OFF_TO_IN_AIR_PERIOD = 250 * MSECS_PER_SECOND;
-    const btScalar MIN_HOVER_HEIGHT = 2.5f;
+    const btScalar MIN_HOVER_HEIGHT = _scaleFactor * DEFAULT_AVATAR_MIN_HOVER_HEIGHT;
     const quint64 JUMP_TO_HOVER_PERIOD = 1100 * MSECS_PER_SECOND;
 
     // scan for distant floor
@@ -663,7 +670,7 @@ void CharacterController::updateState() {
     btScalar rayLength = _radius;
     int16_t collisionGroup = computeCollisionGroup();
     if (collisionGroup == BULLET_COLLISION_GROUP_MY_AVATAR) {
-        rayLength += MAX_FALL_HEIGHT;
+        rayLength += _scaleFactor * DEFAULT_AVATAR_FALL_HEIGHT;
     } else {
         rayLength += MIN_HOVER_HEIGHT;
     }
@@ -717,11 +724,15 @@ void CharacterController::updateState() {
                 SET_STATE(State::Hover, "no ground");
             } else if ((now - _takeoffToInAirStartTime) > TAKE_OFF_TO_IN_AIR_PERIOD) {
                 SET_STATE(State::InAir, "takeoff done");
-                velocity += _jumpSpeed * _currentUp;
+
+                // compute jumpSpeed based on the scaled jump height for the default avatar in default gravity.
+                float jumpSpeed = sqrtf(2.0f * DEFAULT_AVATAR_GRAVITY * _scaleFactor * DEFAULT_AVATAR_JUMP_HEIGHT);
+                velocity += jumpSpeed * _currentUp;
                 _rigidBody->setLinearVelocity(velocity);
             }
             break;
         case State::InAir: {
+            const float JUMP_SPEED = _scaleFactor * DEFAULT_AVATAR_JUMP_SPEED;
             if ((velocity.dot(_currentUp) <= (JUMP_SPEED / 2.0f)) && ((_floorDistance < FLY_TO_GROUND_THRESHOLD) || _hasSupport)) {
                 SET_STATE(State::Ground, "hit ground");
             } else {
diff --git a/libraries/physics/src/CharacterController.h b/libraries/physics/src/CharacterController.h
index bf84d318d4..0f97cc7c16 100644
--- a/libraries/physics/src/CharacterController.h
+++ b/libraries/physics/src/CharacterController.h
@@ -24,6 +24,7 @@
 
 #include "BulletUtil.h"
 #include "CharacterGhostObject.h"
+#include "AvatarConstants.h" 
 
 const uint32_t PENDING_FLAG_ADD_TO_SIMULATION = 1U << 0;
 const uint32_t PENDING_FLAG_REMOVE_FROM_SIMULATION = 1U << 1;
@@ -42,15 +43,18 @@ const btScalar MAX_CHARACTER_MOTOR_TIMESCALE = 60.0f; // one minute
 const btScalar MIN_CHARACTER_MOTOR_TIMESCALE = 0.05f;
 
 class CharacterController : public btCharacterControllerInterface {
+
 public:
     CharacterController();
     virtual ~CharacterController();
-
     bool needsRemoval() const;
     bool needsAddition() const;
     virtual void setDynamicsWorld(btDynamicsWorld* world);
     btCollisionObject* getCollisionObject() { return _rigidBody; }
 
+    void setGravity(float gravity);
+    float getGravity();
+
     virtual void updateShapeIfNecessary() = 0;
 
     // overrides from btCharacterControllerInterface
@@ -73,6 +77,7 @@ public:
     void setStepUpEnabled(bool enabled) { _stepUpEnabled = enabled; }
     void computeNewVelocity(btScalar dt, btVector3& velocity);
     void computeNewVelocity(btScalar dt, glm::vec3& velocity);
+    void setScaleFactor(btScalar scaleFactor) { _scaleFactor = scaleFactor; }
 
     // HACK for legacy 'thrust' feature
     void setLinearAcceleration(const glm::vec3& acceleration) { _linearAcceleration = glmToBullet(acceleration); }
@@ -130,7 +135,7 @@ protected:
 #endif
 
     virtual void updateMassProperties() = 0;
-    void updateGravity();
+    void updateCurrentGravity();
     void updateUpAxis(const glm::quat& rotation);
     bool checkForSupport(btCollisionWorld* collisionWorld);
 
@@ -183,9 +188,9 @@ protected:
     bool _stepUpEnabled { true };
     bool _hasSupport;
 
-    btScalar _gravity { 0.0f };
+    btScalar _currentGravity { 0.0f };
+    btScalar _gravity { DEFAULT_AVATAR_GRAVITY };
 
-    btScalar _jumpSpeed;
     btScalar _followTime;
     btVector3 _followLinearDisplacement;
     btQuaternion _followAngularDisplacement;
@@ -203,6 +208,8 @@ protected:
     bool _flyingAllowed { true };
     bool _collisionlessAllowed { true };
     bool _collisionless { false };
+
+    btScalar _scaleFactor { 1.0f };
 };
 
 #endif // hifi_CharacterController_h
diff --git a/libraries/physics/src/CharacterRayResult.h b/libraries/physics/src/CharacterRayResult.h
index e8b0bb7f99..239ab9570a 100644
--- a/libraries/physics/src/CharacterRayResult.h
+++ b/libraries/physics/src/CharacterRayResult.h
@@ -26,19 +26,19 @@ public:
 protected:
     const CharacterGhostObject* _character;
 
-	// Note: Public data members inherited from ClosestRayResultCallback
-	//
-	//   btVector3 m_rayFromWorld;//used to calculate hitPointWorld from hitFraction
-	//   btVector3 m_rayToWorld;
-	//   btVector3 m_hitNormalWorld;
-	//   btVector3 m_hitPointWorld;
-	//
-	// Note: Public data members inherited from RayResultCallback
-	//
-	//   btScalar m_closestHitFraction;
-	//   const btCollisionObject* m_collisionObject;
-	//   short int m_collisionFilterGroup;
-	//   short int m_collisionFilterMask;
+    // Note: Public data members inherited from ClosestRayResultCallback
+    //
+    //   btVector3 m_rayFromWorld;//used to calculate hitPointWorld from hitFraction
+    //   btVector3 m_rayToWorld;
+    //   btVector3 m_hitNormalWorld;
+    //   btVector3 m_hitPointWorld;
+    //
+    // Note: Public data members inherited from RayResultCallback
+    //
+    //   btScalar m_closestHitFraction;
+    //   const btCollisionObject* m_collisionObject;
+    //   short int m_collisionFilterGroup;
+    //   short int m_collisionFilterMask;
 };
 
 #endif // hifi_CharacterRayResult_h
diff --git a/libraries/physics/src/CharacterSweepResult.cpp b/libraries/physics/src/CharacterSweepResult.cpp
index a5c4092b1d..36e36185d3 100755
--- a/libraries/physics/src/CharacterSweepResult.cpp
+++ b/libraries/physics/src/CharacterSweepResult.cpp
@@ -25,7 +25,7 @@ CharacterSweepResult::CharacterSweepResult(const CharacterGhostObject* character
 }
 
 btScalar CharacterSweepResult::addSingleResult(btCollisionWorld::LocalConvexResult& convexResult, bool useWorldFrame) {
-	// skip objects that we shouldn't collide with
+    // skip objects that we shouldn't collide with
     if (!convexResult.m_hitCollisionObject->hasContactResponse()) {
         return btScalar(1.0);
     }
@@ -37,6 +37,6 @@ btScalar CharacterSweepResult::addSingleResult(btCollisionWorld::LocalConvexResu
 }
 
 void CharacterSweepResult::resetHitHistory() {
-	m_hitCollisionObject = nullptr;
-	m_closestHitFraction = btScalar(1.0f);
+    m_hitCollisionObject = nullptr;
+    m_closestHitFraction = btScalar(1.0f);
 }
diff --git a/libraries/physics/src/CharacterSweepResult.h b/libraries/physics/src/CharacterSweepResult.h
index 1e2898a3cf..3c7bb66282 100644
--- a/libraries/physics/src/CharacterSweepResult.h
+++ b/libraries/physics/src/CharacterSweepResult.h
@@ -22,13 +22,13 @@ class CharacterSweepResult : public btCollisionWorld::ClosestConvexResultCallbac
 public:
     CharacterSweepResult(const CharacterGhostObject* character);
     virtual btScalar addSingleResult(btCollisionWorld::LocalConvexResult& convexResult, bool useWorldFrame) override;
-	void resetHitHistory();
+    void resetHitHistory();
 protected:
     const CharacterGhostObject* _character;
 
     // NOTE: Public data members inherited from ClosestConvexResultCallback:
     //
-    //	btVector3   m_convexFromWorld; // unused except by btClosestNotMeConvexResultCallback
+    //    btVector3   m_convexFromWorld; // unused except by btClosestNotMeConvexResultCallback
     //  btVector3   m_convexToWorld;   // unused except by btClosestNotMeConvexResultCallback
     //  btVector3   m_hitNormalWorld;
     //  btVector3   m_hitPointWorld;
diff --git a/libraries/physics/src/CollisionRenderMeshCache.h b/libraries/physics/src/CollisionRenderMeshCache.h
index 6a6857a5ae..10b2440db2 100644
--- a/libraries/physics/src/CollisionRenderMeshCache.h
+++ b/libraries/physics/src/CollisionRenderMeshCache.h
@@ -21,7 +21,7 @@
 
 class CollisionRenderMeshCache {
 public:
-	using Key = const void*; // must actually be a const btCollisionShape*
+    using Key = const void*; // must actually be a const btCollisionShape*
 
     CollisionRenderMeshCache();
     ~CollisionRenderMeshCache();
diff --git a/libraries/physics/src/EntityMotionState.cpp b/libraries/physics/src/EntityMotionState.cpp
index ecfb2b55e4..6884482074 100644
--- a/libraries/physics/src/EntityMotionState.cpp
+++ b/libraries/physics/src/EntityMotionState.cpp
@@ -92,6 +92,7 @@ void EntityMotionState::updateServerPhysicsVariables() {
 
     Transform localTransform;
     _entity->getLocalTransformAndVelocities(localTransform, _serverVelocity, _serverAngularVelocity);
+    _serverVariablesSet = true;
     _serverPosition = localTransform.getTranslation();
     _serverRotation = localTransform.getRotation();
     _serverAcceleration = _entity->getAcceleration();
@@ -99,18 +100,19 @@ void EntityMotionState::updateServerPhysicsVariables() {
 }
 
 void EntityMotionState::handleDeactivation() {
-    // copy _server data to entity
-    bool success;
-    _entity->setPosition(_serverPosition, success, false);
-    _entity->setOrientation(_serverRotation, success, false);
-    _entity->setVelocity(ENTITY_ITEM_ZERO_VEC3);
-    _entity->setAngularVelocity(ENTITY_ITEM_ZERO_VEC3);
-    // and also to RigidBody
-    btTransform worldTrans;
-    worldTrans.setOrigin(glmToBullet(_serverPosition));
-    worldTrans.setRotation(glmToBullet(_serverRotation));
-    _body->setWorldTransform(worldTrans);
-    // no need to update velocities... should already be zero
+    if (_serverVariablesSet) {
+        // 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->getPosition()));
+        worldTrans.setRotation(glmToBullet(_entity->getRotation()));
+        _body->setWorldTransform(worldTrans);
+        // no need to update velocities... should already be zero
+    }
 }
 
 // virtual
@@ -339,6 +341,7 @@ bool EntityMotionState::remoteSimulationOutOfSync(uint32_t simulationStep) {
     // if we've never checked before, our _lastStep will be 0, and we need to initialize our state
     if (_lastStep == 0) {
         btTransform xform = _body->getWorldTransform();
+        _serverVariablesSet = true;
         _serverPosition = worldToLocal.transform(bulletToGLM(xform.getOrigin()));
         _serverRotation = worldToLocal.getRotation() * bulletToGLM(xform.getRotation());
         _serverVelocity = worldVelocityToLocal.transform(getBodyLinearVelocityGTSigma());
@@ -484,12 +487,12 @@ bool EntityMotionState::shouldSendUpdate(uint32_t simulationStep) {
         return false;
     }
 
-    if (_entity->dynamicDataNeedsTransmit()) {
+    if (_entity->dynamicDataNeedsTransmit() || _entity->queryAACubeNeedsUpdate()) {
         return true;
     }
 
-    if (_entity->queryAABoxNeedsUpdate()) {
-        return true;
+    if (_entity->shouldSuppressLocationEdits()) {
+        return false;
     }
 
     if (!isLocallyOwned()) {
@@ -577,9 +580,11 @@ void EntityMotionState::sendUpdate(OctreeEditPacketSender* packetSender, uint32_
         properties.setActionData(_serverActionData);
     }
 
-    if (properties.parentRelatedPropertyChanged() && _entity->computePuffedQueryAACube()) {
-        // due to parenting, the server may not know where something is in world-space, so include the bounding cube.
-        properties.setQueryAACube(_entity->getQueryAACube());
+    if (properties.transformChanged()) {
+        if (_entity->updateQueryAACube()) {
+            // due to parenting, the server may not know where something is in world-space, so include the bounding cube.
+            properties.setQueryAACube(_entity->getQueryAACube());
+        }
     }
 
     // set the LastEdited of the properties but NOT the entity itself
@@ -643,7 +648,7 @@ void EntityMotionState::sendUpdate(OctreeEditPacketSender* packetSender, uint32_
     _entity->forEachDescendant([&](SpatiallyNestablePointer descendant) {
         if (descendant->getNestableType() == NestableType::Entity) {
             EntityItemPointer entityDescendant = std::static_pointer_cast<EntityItem>(descendant);
-            if (descendant->computePuffedQueryAACube()) {
+            if (descendant->updateQueryAACube()) {
                 EntityItemProperties newQueryCubeProperties;
                 newQueryCubeProperties.setQueryAACube(descendant->getQueryAACube());
                 newQueryCubeProperties.setLastEdited(properties.getLastEdited());
diff --git a/libraries/physics/src/EntityMotionState.h b/libraries/physics/src/EntityMotionState.h
index 541ad7c93c..968f53700c 100644
--- a/libraries/physics/src/EntityMotionState.h
+++ b/libraries/physics/src/EntityMotionState.h
@@ -107,6 +107,7 @@ protected:
     // Meanwhile we also keep a raw EntityItem* for internal stuff where the pointer is guaranteed valid.
     EntityItem* _entity;
 
+    bool _serverVariablesSet { false };
     glm::vec3 _serverPosition;    // in simulation-frame (not world-frame)
     glm::quat _serverRotation;
     glm::vec3 _serverVelocity;
diff --git a/libraries/physics/src/ObjectMotionState.h b/libraries/physics/src/ObjectMotionState.h
index 81bfbc72b4..0b91ede574 100644
--- a/libraries/physics/src/ObjectMotionState.h
+++ b/libraries/physics/src/ObjectMotionState.h
@@ -66,7 +66,7 @@ class PhysicsEngine;
 
 class ObjectMotionState : public btMotionState {
 public:
-    // These poroperties of the PhysicsEngine are "global" within the context of all ObjectMotionStates
+    // These properties of the PhysicsEngine are "global" within the context of all ObjectMotionStates
     // (assuming just one PhysicsEngine).  They are cached as statics for fast calculations in the
     // ObjectMotionState context.
     static void setWorldOffset(const glm::vec3& offset);
diff --git a/libraries/physics/src/PhysicalEntitySimulation.cpp b/libraries/physics/src/PhysicalEntitySimulation.cpp
index fe507ed1ee..b6f460cf39 100644
--- a/libraries/physics/src/PhysicalEntitySimulation.cpp
+++ b/libraries/physics/src/PhysicalEntitySimulation.cpp
@@ -348,8 +348,7 @@ void PhysicalEntitySimulation::addDynamic(EntityDynamicPointer dynamic) {
 void PhysicalEntitySimulation::applyDynamicChanges() {
     QList<EntityDynamicPointer> dynamicsFailedToAdd;
     if (_physicsEngine) {
-        // FIXME put fine grain locking into _physicsEngine
-        QMutexLocker lock(&_mutex);
+        QMutexLocker lock(&_dynamicsMutex);
         foreach(QUuid dynamicToRemove, _dynamicsToRemove) {
             _physicsEngine->removeDynamic(dynamicToRemove);
         }
@@ -360,9 +359,10 @@ void PhysicalEntitySimulation::applyDynamicChanges() {
                 }
             }
         }
+        // applyDynamicChanges will clear _dynamicsToRemove and _dynamicsToAdd
+        EntitySimulation::applyDynamicChanges();
     }
-    // applyDynamicChanges will clear _dynamicsToRemove and _dynamicsToAdd
-    EntitySimulation::applyDynamicChanges();
+
     // put back the ones that couldn't yet be added
     foreach (EntityDynamicPointer dynamicFailedToAdd, dynamicsFailedToAdd) {
         addDynamic(dynamicFailedToAdd);
diff --git a/libraries/physics/src/ShapeFactory.cpp b/libraries/physics/src/ShapeFactory.cpp
index d209667966..f484f32fdf 100644
--- a/libraries/physics/src/ShapeFactory.cpp
+++ b/libraries/physics/src/ShapeFactory.cpp
@@ -16,8 +16,42 @@
 #include "ShapeFactory.h"
 #include "BulletUtil.h"
 
+
+class StaticMeshShape : public btBvhTriangleMeshShape {
+public:
+    StaticMeshShape() = delete;
+
+    StaticMeshShape(btTriangleIndexVertexArray* dataArray)
+    :   btBvhTriangleMeshShape(dataArray, true), _dataArray(dataArray) {
+        assert(_dataArray);
+    }
+
+    ~StaticMeshShape() {
+        assert(_dataArray);
+        IndexedMeshArray& meshes = _dataArray->getIndexedMeshArray();
+        for (int32_t i = 0; i < meshes.size(); ++i) {
+            btIndexedMesh mesh = meshes[i];
+            mesh.m_numTriangles = 0;
+            delete [] mesh.m_triangleIndexBase;
+            mesh.m_triangleIndexBase = nullptr;
+            mesh.m_numVertices = 0;
+            delete [] mesh.m_vertexBase;
+            mesh.m_vertexBase = nullptr;
+        }
+        meshes.clear();
+        delete _dataArray;
+        _dataArray = nullptr;
+    }
+
+private:
+    // the StaticMeshShape owns its vertex/index data
+    btTriangleIndexVertexArray* _dataArray;
+};
+
+// the dataArray must be created before we create the StaticMeshShape
+
 // These are the same normalized directions used by the btShapeHull class.
-// 12 points for the face centers of a duodecohedron plus another 30 points
+// 12 points for the face centers of a dodecahedron plus another 30 points
 // for the midpoints the edges, for a total of 42.
 const uint32_t NUM_UNIT_SPHERE_DIRECTIONS = 42;
 static const btVector3 _unitSphereDirections[NUM_UNIT_SPHERE_DIRECTIONS] = {
@@ -230,23 +264,6 @@ btTriangleIndexVertexArray* createStaticMeshArray(const ShapeInfo& info) {
     return dataArray;
 }
 
-// util method
-void deleteStaticMeshArray(btTriangleIndexVertexArray* dataArray) {
-    assert(dataArray);
-    IndexedMeshArray& meshes = dataArray->getIndexedMeshArray();
-    for (int32_t i = 0; i < meshes.size(); ++i) {
-        btIndexedMesh mesh = meshes[i];
-        mesh.m_numTriangles = 0;
-        delete [] mesh.m_triangleIndexBase;
-        mesh.m_triangleIndexBase = nullptr;
-        mesh.m_numVertices = 0;
-        delete [] mesh.m_vertexBase;
-        mesh.m_vertexBase = nullptr;
-    }
-    meshes.clear();
-    delete dataArray;
-}
-
 const btCollisionShape* ShapeFactory::createShapeFromInfo(const ShapeInfo& info) {
     btCollisionShape* shape = NULL;
     int type = info.getType();
@@ -288,12 +305,47 @@ const btCollisionShape* ShapeFactory::createShapeFromInfo(const ShapeInfo& info)
             shape = new btCapsuleShape(radius, height);
         }
         break;
+        case SHAPE_TYPE_CAPSULE_X: {
+            glm::vec3 halfExtents = info.getHalfExtents();
+            float radius = halfExtents.y;
+            float height = 2.0f * halfExtents.x;
+            shape = new btCapsuleShapeX(radius, height);
+        }
+        break;
+        case SHAPE_TYPE_CAPSULE_Z: {
+            glm::vec3 halfExtents = info.getHalfExtents();
+            float radius = halfExtents.x;
+            float height = 2.0f * halfExtents.z;
+            shape = new btCapsuleShapeZ(radius, height);
+        }
+        break;
+        case SHAPE_TYPE_CYLINDER_X: {
+            const glm::vec3 halfExtents = info.getHalfExtents();
+            const btVector3 btHalfExtents(halfExtents.x, halfExtents.y, halfExtents.z);
+            shape = new btCylinderShapeX(btHalfExtents);
+        }
+        break;
+        case SHAPE_TYPE_CYLINDER_Z: {
+            const glm::vec3 halfExtents = info.getHalfExtents();
+            const btVector3 btHalfExtents(halfExtents.x, halfExtents.y, halfExtents.z);
+            shape = new btCylinderShapeZ(btHalfExtents);
+        }
+        break;
+        case SHAPE_TYPE_CIRCLE:
+        case SHAPE_TYPE_CYLINDER_Y: {
+            const glm::vec3 halfExtents = info.getHalfExtents();
+            const btVector3 btHalfExtents(halfExtents.x, halfExtents.y, halfExtents.z);
+            shape = new btCylinderShape(btHalfExtents);
+        }
+        break;
         case SHAPE_TYPE_COMPOUND:
         case SHAPE_TYPE_SIMPLE_HULL: {
             const ShapeInfo::PointCollection& pointCollection = info.getPointCollection();
             uint32_t numSubShapes = info.getNumSubShapes();
             if (numSubShapes == 1) {
-                shape = createConvexHull(pointCollection[0]);
+                if (!pointCollection.isEmpty()) {
+                    shape = createConvexHull(pointCollection[0]);
+                }
             } else {
                 auto compound = new btCompoundShape();
                 btTransform trans;
@@ -396,7 +448,6 @@ void ShapeFactory::deleteShape(const btCollisionShape* shape) {
     assert(shape);
     // ShapeFactory is responsible for deleting all shapes, even the const ones that are stored
     // in the ShapeManager, so we must cast to non-const here when deleting.
-    // so we cast to non-const here when deleting memory.
     btCollisionShape* nonConstShape = const_cast<btCollisionShape*>(shape);
     if (nonConstShape->getShapeType() == (int)COMPOUND_SHAPE_PROXYTYPE) {
         btCompoundShape* compoundShape = static_cast<btCompoundShape*>(nonConstShape);
@@ -413,14 +464,3 @@ void ShapeFactory::deleteShape(const btCollisionShape* shape) {
     }
     delete nonConstShape;
 }
-
-// the dataArray must be created before we create the StaticMeshShape
-ShapeFactory::StaticMeshShape::StaticMeshShape(btTriangleIndexVertexArray* dataArray)
-:   btBvhTriangleMeshShape(dataArray, true), _dataArray(dataArray) {
-    assert(dataArray);
-}
-
-ShapeFactory::StaticMeshShape::~StaticMeshShape() {
-    deleteStaticMeshArray(_dataArray);
-    _dataArray = nullptr;
-}
diff --git a/libraries/physics/src/ShapeFactory.h b/libraries/physics/src/ShapeFactory.h
index 2bf79f390c..704a7804b3 100644
--- a/libraries/physics/src/ShapeFactory.h
+++ b/libraries/physics/src/ShapeFactory.h
@@ -17,25 +17,11 @@
 
 #include <ShapeInfo.h>
 
-// translates between ShapeInfo and btShape
+// The ShapeFactory assembles and correctly disassembles btCollisionShapes.
 
 namespace ShapeFactory {
     const btCollisionShape* createShapeFromInfo(const ShapeInfo& info);
     void deleteShape(const btCollisionShape* shape);
-
-    //btTriangleIndexVertexArray* createStaticMeshArray(const ShapeInfo& info);
-    //void deleteStaticMeshArray(btTriangleIndexVertexArray* dataArray);
-
-    class StaticMeshShape : public btBvhTriangleMeshShape {
-    public:
-        StaticMeshShape() = delete;
-        StaticMeshShape(btTriangleIndexVertexArray* dataArray);
-        ~StaticMeshShape();
-
-    private:
-        // the StaticMeshShape owns its vertex/index data
-        btTriangleIndexVertexArray* _dataArray;
-    };
 };
 
 #endif // hifi_ShapeFactory_h
diff --git a/libraries/physics/src/ShapeManager.cpp b/libraries/physics/src/ShapeManager.cpp
index fd3e35d28a..97b9e5dab1 100644
--- a/libraries/physics/src/ShapeManager.cpp
+++ b/libraries/physics/src/ShapeManager.cpp
@@ -32,14 +32,7 @@ const btCollisionShape* ShapeManager::getShape(const ShapeInfo& info) {
     if (info.getType() == SHAPE_TYPE_NONE) {
         return nullptr;
     }
-    const float MIN_SHAPE_DIAGONAL_SQUARED = 3.0e-4f; // 1 cm cube
-    if (4.0f * glm::length2(info.getHalfExtents()) < MIN_SHAPE_DIAGONAL_SQUARED) {
-        // tiny shapes are not supported
-        // qCDebug(physics) << "ShapeManager::getShape -- not making shape due to size" << diagonal;
-        return nullptr;
-    }
-
-    DoubleHashKey key = info.getHash();
+    HashKey key = info.getHash();
     ShapeReference* shapeRef = _shapeMap.find(key);
     if (shapeRef) {
         shapeRef->refCount++;
@@ -57,7 +50,7 @@ const btCollisionShape* ShapeManager::getShape(const ShapeInfo& info) {
 }
 
 // private helper method
-bool ShapeManager::releaseShapeByKey(const DoubleHashKey& key) {
+bool ShapeManager::releaseShapeByKey(const HashKey& key) {
     ShapeReference* shapeRef = _shapeMap.find(key);
     if (shapeRef) {
         if (shapeRef->refCount > 0) {
@@ -95,7 +88,7 @@ bool ShapeManager::releaseShape(const btCollisionShape* shape) {
 void ShapeManager::collectGarbage() {
     int numShapes = _pendingGarbage.size();
     for (int i = 0; i < numShapes; ++i) {
-        DoubleHashKey& key = _pendingGarbage[i];
+        HashKey& key = _pendingGarbage[i];
         ShapeReference* shapeRef = _shapeMap.find(key);
         if (shapeRef && shapeRef->refCount == 0) {
             ShapeFactory::deleteShape(shapeRef->shape);
@@ -106,7 +99,7 @@ void ShapeManager::collectGarbage() {
 }
 
 int ShapeManager::getNumReferences(const ShapeInfo& info) const {
-    DoubleHashKey key = info.getHash();
+    HashKey key = info.getHash();
     const ShapeReference* shapeRef = _shapeMap.find(key);
     if (shapeRef) {
         return shapeRef->refCount;
diff --git a/libraries/physics/src/ShapeManager.h b/libraries/physics/src/ShapeManager.h
index ed81b5e8f8..d75bb1dc4a 100644
--- a/libraries/physics/src/ShapeManager.h
+++ b/libraries/physics/src/ShapeManager.h
@@ -17,7 +17,29 @@
 
 #include <ShapeInfo.h>
 
-#include "DoubleHashKey.h"
+#include "HashKey.h"
+
+// The ShapeManager handles the ref-counting on shared shapes:
+//
+// Each object added to the physics simulation gets a corresponding btRigidBody.
+// The body has a btCollisionShape that represents the contours of its collision
+// surface.  Multiple bodies may have the same shape.  Rather than create a unique
+// btCollisionShape instance for every body with a particular shape we can instead
+// use a single shape instance for all of the bodies.  This is called "shape
+// sharing".
+//
+// When body needs a new shape a description of ths shape (ShapeInfo) is assembled
+// and a request is sent to the ShapeManager for a corresponding btCollisionShape
+// pointer.  The ShapeManager will compute a hash of the ShapeInfo's data and use
+// that to find the shape in its map.  If it finds one it increments the ref-count
+// and returns the pointer.  If not it asks the ShapeFactory to create it, adds an
+// entry in the map with a ref-count of 1, and returns the pointer.
+//
+// When a body stops using a shape the ShapeManager must be informed so it can
+// decrement its ref-count.  When a ref-count drops to zero the ShapeManager
+// doesn't delete it right away.  Instead it puts the shape's key on a list delete
+// later.  When that list grows big enough the ShapeManager will remove any matching
+// entries that still have zero ref-count.
 
 class ShapeManager {
 public:
@@ -41,18 +63,19 @@ public:
     bool hasShape(const btCollisionShape* shape) const;
 
 private:
-    bool releaseShapeByKey(const DoubleHashKey& key);
+    bool releaseShapeByKey(const HashKey& key);
 
     class ShapeReference {
     public:
         int refCount;
         const btCollisionShape* shape;
-        DoubleHashKey key;
+        HashKey key;
         ShapeReference() : refCount(0), shape(nullptr) {}
     };
 
-    btHashMap<DoubleHashKey, ShapeReference> _shapeMap;
-    btAlignedObjectArray<DoubleHashKey> _pendingGarbage;
+    // btHashMap is required because it supports memory alignment of the btCollisionShapes
+    btHashMap<HashKey, ShapeReference> _shapeMap;
+    btAlignedObjectArray<HashKey> _pendingGarbage;
 };
 
 #endif // hifi_ShapeManager_h
diff --git a/libraries/plugins/src/plugins/DisplayPlugin.cpp b/libraries/plugins/src/plugins/DisplayPlugin.cpp
index 747c72c08e..2a8a72f594 100644
--- a/libraries/plugins/src/plugins/DisplayPlugin.cpp
+++ b/libraries/plugins/src/plugins/DisplayPlugin.cpp
@@ -18,6 +18,28 @@ void DisplayPlugin::incrementPresentCount() {
 
     ++_presentedFrameIndex;
 
-    // Alert the app that it needs to paint a new presentation frame
-    qApp->postEvent(qApp, new QEvent(static_cast<QEvent::Type>(Present)), Qt::HighEventPriority);
+    {
+        QMutexLocker locker(&_presentMutex);
+        _presentCondition.wakeAll();
+    }
+
+    emit presented(_presentedFrameIndex);
 }
+
+void DisplayPlugin::waitForPresent() {
+    QMutexLocker locker(&_presentMutex);
+    while (isActive()) {
+        if (_presentCondition.wait(&_presentMutex, MSECS_PER_SECOND)) {
+            break;
+        }
+    }
+}
+
+std::function<void(gpu::Batch&, const gpu::TexturePointer&, bool mirror)> DisplayPlugin::getHUDOperator() {
+    std::function<void(gpu::Batch&, const gpu::TexturePointer&, bool mirror)> hudOperator;
+    {
+        QMutexLocker locker(&_presentMutex);
+        hudOperator = _hudOperator;
+    }
+    return hudOperator;
+}
\ No newline at end of file
diff --git a/libraries/plugins/src/plugins/DisplayPlugin.h b/libraries/plugins/src/plugins/DisplayPlugin.h
index 7bfdbddbc5..efce158864 100644
--- a/libraries/plugins/src/plugins/DisplayPlugin.h
+++ b/libraries/plugins/src/plugins/DisplayPlugin.h
@@ -17,14 +17,17 @@
 #include <QtCore/QPoint>
 #include <QtCore/QElapsedTimer>
 #include <QtCore/QJsonObject>
+#include <QtCore/QMutex>
+#include <QtCore/QWaitCondition>
 
 #include <GLMHelpers.h>
 #include <RegisteredMetaTypes.h>
 #include <shared/Bilateral.h>
 #include <gpu/Forward.h>
-
 #include "Plugin.h"
 
+class QOpenGLFramebufferObject;
+
 class QImage;
 
 enum Eye {
@@ -60,8 +63,12 @@ namespace gpu {
     using TexturePointer = std::shared_ptr<Texture>;
 }
 
+class NetworkTexture;
+using NetworkTexturePointer = QSharedPointer<NetworkTexture>;
+typedef struct __GLsync *GLsync;
+
 // Stereo display functionality
-// TODO move out of this file don't derive DisplayPlugin from this.  Instead use dynamic casting when 
+// TODO move out of this file don't derive DisplayPlugin from this.  Instead use dynamic casting when
 // displayPlugin->isStereo returns true
 class StereoDisplay {
 public:
@@ -78,7 +85,7 @@ public:
 };
 
 // HMD display functionality
-// TODO move out of this file don't derive DisplayPlugin from this.  Instead use dynamic casting when 
+// TODO move out of this file don't derive DisplayPlugin from this.  Instead use dynamic casting when
 // displayPlugin->isHmd returns true
 class HmdDisplay : public StereoDisplay {
 public:
@@ -102,24 +109,6 @@ public:
         RightHand = 0x02,
     };
 
-    enum class HandLaserMode {
-        None, // Render no hand lasers
-        Overlay, // Render hand lasers only if they intersect with the UI layer, and stop at the UI layer
-    };
-
-    virtual bool setHandLaser(
-        uint32_t hands, // Bits from the Hand enum
-        HandLaserMode mode, // Mode in which to render
-        const vec4& color = vec4(1), // The color of the rendered laser
-        const vec3& direction = vec3(0, 0, -1) // The direction in which to render the hand lasers
-        ) {
-        return false;
-    }
-
-    virtual bool setExtraLaser(HandLaserMode mode, const vec4& color, const glm::vec3& sensorSpaceStart, const vec3& sensorSpaceDirection) {
-        return false;
-    }
-
     virtual bool suppressKeyboard() { return false;  }
     virtual void unsuppressKeyboard() {};
     virtual bool isKeyboardVisible() { return false; }
@@ -129,10 +118,6 @@ class DisplayPlugin : public Plugin, public HmdDisplay {
     Q_OBJECT
     using Parent = Plugin;
 public:
-    enum Event {
-        Present = QEvent::User + 1
-    };
-
     virtual int getRequiredThreadCount() const { return 0; }
     virtual bool isHmd() const { return false; }
     virtual int getHmdScreen() const { return -1; }
@@ -142,7 +127,7 @@ public:
     virtual float getTargetFrameRate() const { return 1.0f; }
     virtual bool hasAsyncReprojection() const { return false; }
 
-    /// Returns a boolean value indicating whether the display is currently visible 
+    /// Returns a boolean value indicating whether the display is currently visible
     /// to the user.  For monitor displays, false might indicate that a screensaver,
     /// or power-save mode is active.  For HMDs it may reflect a sensor indicating
     /// whether the HMD is being worn
@@ -171,8 +156,8 @@ public:
         return aspect(getRecommendedRenderSize());
     }
 
-    // The recommended bounds for primary overlay placement
-    virtual QRect getRecommendedOverlayRect() const {
+    // The recommended bounds for primary HUD placement
+    virtual QRect getRecommendedHUDRect() const {
         const int DESKTOP_SCREEN_PADDING = 50;
         auto recommendedSize = getRecommendedUiSize() - glm::uvec2(DESKTOP_SCREEN_PADDING);
         return QRect(0, 0, recommendedSize.x, recommendedSize.y);
@@ -180,6 +165,7 @@ public:
 
     // Fetch the most recently displayed image as a QImage
     virtual QImage getScreenshot(float aspectRatio = 0.0f) const = 0;
+    virtual QImage getSecondaryCameraScreenshot() const = 0;
 
     // will query the underlying hmd api to compute the most recent head pose
     virtual bool beginFrameRender(uint32_t frameIndex) { return true; }
@@ -204,29 +190,39 @@ public:
     // Rate at which rendered frames are being skipped
     virtual float droppedFrameRate() const { return -1.0f; }
     virtual bool getSupportsAutoSwitch() { return false; }
-    
+
     // Hardware specific stats
     virtual QJsonObject getHardwareStats() const { return QJsonObject(); }
 
+    virtual void copyTextureToQuickFramebuffer(NetworkTexturePointer source, QOpenGLFramebufferObject* target, GLsync* fenceSync) = 0;
+
     uint32_t presentCount() const { return _presentedFrameIndex; }
     // Time since last call to incrementPresentCount (only valid if DEBUG_PAINT_DELAY is defined)
     int64_t getPaintDelayUsecs() const;
 
     virtual void cycleDebugOutput() {}
 
-    static const QString& MENU_PATH();
+    void waitForPresent();
 
+    std::function<void(gpu::Batch&, const gpu::TexturePointer&, bool mirror)> getHUDOperator();
+
+    static const QString& MENU_PATH();
 
 signals:
     void recommendedFramebufferSizeChanged(const QSize& size);
     void resetSensorsRequested();
+    void presented(quint32 frame);
 
 protected:
     void incrementPresentCount();
 
     gpu::ContextPointer _gpuContext;
 
+    std::function<void(gpu::Batch&, const gpu::TexturePointer&, bool mirror)> _hudOperator { std::function<void(gpu::Batch&, const gpu::TexturePointer&, bool mirror)>() };
+
 private:
+    QMutex _presentMutex;
+    QWaitCondition _presentCondition;
     std::atomic<uint32_t> _presentedFrameIndex;
     mutable std::mutex _paintDelayMutex;
     QElapsedTimer _paintDelayTimer;
diff --git a/libraries/plugins/src/plugins/InputConfiguration.cpp b/libraries/plugins/src/plugins/InputConfiguration.cpp
index 04b1e3b370..9234ac6585 100644
--- a/libraries/plugins/src/plugins/InputConfiguration.cpp
+++ b/libraries/plugins/src/plugins/InputConfiguration.cpp
@@ -11,6 +11,8 @@
 
 #include <QThread>
 
+#include <shared/QtHelpers.h>
+
 #include "DisplayPlugin.h"
 #include "InputPlugin.h"
 #include "PluginManager.h"
@@ -21,7 +23,7 @@ InputConfiguration::InputConfiguration() {
 QStringList InputConfiguration::inputPlugins() {
     if (QThread::currentThread() != thread()) {
         QStringList result;
-        QMetaObject::invokeMethod(this, "inputPlugins", Qt::BlockingQueuedConnection,
+        BLOCKING_INVOKE_METHOD(this, "inputPlugins",
                                   Q_RETURN_ARG(QStringList, result));
         return result;
     }
@@ -42,7 +44,7 @@ QStringList InputConfiguration::inputPlugins() {
 QStringList InputConfiguration::activeInputPlugins() {
     if (QThread::currentThread() != thread()) {
         QStringList result;
-        QMetaObject::invokeMethod(this, "activeInputPlugins", Qt::BlockingQueuedConnection,
+        BLOCKING_INVOKE_METHOD(this, "activeInputPlugins",
                                    Q_RETURN_ARG(QStringList, result));
         return result;
     }
@@ -64,7 +66,7 @@ QStringList InputConfiguration::activeInputPlugins() {
 QString InputConfiguration::configurationLayout(QString pluginName) {
     if (QThread::currentThread() != thread()) {
         QString result;
-        QMetaObject::invokeMethod(this, "configurationLayout", Qt::BlockingQueuedConnection,
+        BLOCKING_INVOKE_METHOD(this, "configurationLayout",
                                   Q_RETURN_ARG(QString, result),
                                   Q_ARG(QString, pluginName));
         return result;
@@ -81,7 +83,7 @@ QString InputConfiguration::configurationLayout(QString pluginName) {
 
 void InputConfiguration::setConfigurationSettings(QJsonObject configurationSettings, QString pluginName) {
     if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "setConfigurationSettings", Qt::BlockingQueuedConnection,
+        BLOCKING_INVOKE_METHOD(this, "setConfigurationSettings",
                                   Q_ARG(QJsonObject, configurationSettings),
                                   Q_ARG(QString, pluginName));
         return;
@@ -97,7 +99,7 @@ void InputConfiguration::setConfigurationSettings(QJsonObject configurationSetti
 QJsonObject InputConfiguration::configurationSettings(QString pluginName) {
     if (QThread::currentThread() != thread()) {
         QJsonObject result;
-        QMetaObject::invokeMethod(this, "configurationSettings", Qt::BlockingQueuedConnection,
+        BLOCKING_INVOKE_METHOD(this, "configurationSettings",
                                   Q_RETURN_ARG(QJsonObject, result),
                                   Q_ARG(QString, pluginName));
         return result;
@@ -113,7 +115,7 @@ QJsonObject InputConfiguration::configurationSettings(QString pluginName) {
 
 void InputConfiguration::calibratePlugin(QString pluginName) {
     if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "calibratePlugin", Qt::BlockingQueuedConnection);
+        BLOCKING_INVOKE_METHOD(this, "calibratePlugin");
         return;
     }
 
@@ -128,7 +130,7 @@ void InputConfiguration::calibratePlugin(QString pluginName) {
 bool InputConfiguration::uncalibratePlugin(QString pluginName) {
     if (QThread::currentThread() != thread()) {
         bool result;
-        QMetaObject::invokeMethod(this, "uncalibratePlugin", Qt::BlockingQueuedConnection,
+        BLOCKING_INVOKE_METHOD(this, "uncalibratePlugin",
                                   Q_ARG(bool, result));
         return result;
     }
diff --git a/libraries/pointers/CMakeLists.txt b/libraries/pointers/CMakeLists.txt
new file mode 100644
index 0000000000..504484574c
--- /dev/null
+++ b/libraries/pointers/CMakeLists.txt
@@ -0,0 +1,5 @@
+set(TARGET_NAME pointers)
+setup_hifi_library()
+GroupSources(src)
+link_hifi_libraries(shared)
+
diff --git a/libraries/pointers/src/pointers/PointerManager.cpp b/libraries/pointers/src/pointers/PointerManager.cpp
new file mode 100644
index 0000000000..63bd983420
--- /dev/null
+++ b/libraries/pointers/src/pointers/PointerManager.cpp
@@ -0,0 +1,6 @@
+#include "PointerManager.h"
+
+PointerManager::PointerManager() {
+
+}
+
diff --git a/libraries/pointers/src/pointers/PointerManager.h b/libraries/pointers/src/pointers/PointerManager.h
new file mode 100644
index 0000000000..16f854bff5
--- /dev/null
+++ b/libraries/pointers/src/pointers/PointerManager.h
@@ -0,0 +1,30 @@
+//
+//  Created by Bradley Austin Davis on 2017/10/16
+//  Copyright 2013-2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#ifndef hifi_pointers_PointerManager_h
+#define hifi_pointers_PointerManager_h
+
+#include <DependencyManager.h>
+#include <PointerEvent.h>
+
+class PointerManager : public QObject, public Dependency {
+    Q_OBJECT
+    SINGLETON_DEPENDENCY
+public:
+    PointerManager();
+
+signals:
+    void triggerBegin(const QUuid& id, const PointerEvent& pointerEvent);
+    void triggerContinue(const QUuid& id, const PointerEvent& pointerEvent);
+    void triggerEnd(const QUuid& id, const PointerEvent& pointerEvent);
+
+    void hoverEnter(const QUuid& id, const PointerEvent& pointerEvent);
+    void hoverOver(const QUuid& id, const PointerEvent& pointerEvent);
+    void hoverLeave(const QUuid& id, const PointerEvent& pointerEvent);
+};
+
+#endif // hifi_pointers_PointerManager_h
diff --git a/libraries/pointers/src/pointers/rays/RayPick.cpp b/libraries/pointers/src/pointers/rays/RayPick.cpp
new file mode 100644
index 0000000000..bc3a05cd7a
--- /dev/null
+++ b/libraries/pointers/src/pointers/rays/RayPick.cpp
@@ -0,0 +1,81 @@
+//
+//  Created by Sam Gondelman 7/11/2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#include "RayPick.h"
+
+const RayPickFilter RayPickFilter::NOTHING;
+
+RayPick::RayPick(const RayPickFilter& filter, const float maxDistance, const bool enabled) :
+    _filter(filter),
+    _maxDistance(maxDistance),
+    _enabled(enabled)
+{
+}
+
+void RayPick::enable(bool enabled) {
+    withWriteLock([&] {
+        _enabled = enabled;
+    });
+}
+
+RayPickFilter RayPick::getFilter() const { 
+    return resultWithReadLock<RayPickFilter>([&] {
+        return _filter;
+    });
+}
+
+float RayPick::getMaxDistance() const { 
+    return _maxDistance; 
+}
+
+bool RayPick::isEnabled() const {
+    return resultWithReadLock<bool>([&] {
+        return _enabled;
+    });
+}
+
+void RayPick::setPrecisionPicking(bool precisionPicking) { 
+    withWriteLock([&]{
+        _filter.setFlag(RayPickFilter::PICK_COARSE, !precisionPicking);
+    });
+}
+
+void RayPick::setRayPickResult(const RayPickResult& rayPickResult) {
+    withWriteLock([&] {
+        _prevResult = rayPickResult;
+    });
+}
+
+QVector<QUuid> RayPick::getIgnoreItems() const {
+    return resultWithReadLock<QVector<QUuid>>([&] {
+        return _ignoreItems;
+    });
+}
+
+QVector<QUuid> RayPick::getIncludeItems() const {
+    return resultWithReadLock<QVector<QUuid>>([&] {
+        return _includeItems;
+    });
+}
+
+RayPickResult RayPick::getPrevRayPickResult() const {
+    return resultWithReadLock<RayPickResult>([&] {
+        return _prevResult;
+    });
+}
+
+void RayPick::setIgnoreItems(const QVector<QUuid>& ignoreItems) {
+    withWriteLock([&] {
+        _ignoreItems = ignoreItems;
+    });
+}
+
+void RayPick::setIncludeItems(const QVector<QUuid>& includeItems) {
+    withWriteLock([&] {
+        _includeItems = includeItems;
+    });
+}
diff --git a/libraries/pointers/src/pointers/rays/RayPick.h b/libraries/pointers/src/pointers/rays/RayPick.h
new file mode 100644
index 0000000000..5a53891dc6
--- /dev/null
+++ b/libraries/pointers/src/pointers/rays/RayPick.h
@@ -0,0 +1,156 @@
+//
+//  Created by Sam Gondelman 7/11/2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#ifndef hifi_RayPick_h
+#define hifi_RayPick_h
+
+#include <stdint.h>
+#include <bitset>
+
+#include <QtCore/QUuid>
+
+#include <RegisteredMetaTypes.h>
+#include <shared/ReadWriteLockable.h>
+
+class RayPickFilter {
+public:
+    enum FlagBit {
+        PICK_ENTITIES = 0,
+        PICK_OVERLAYS,
+        PICK_AVATARS,
+        PICK_HUD,
+
+        PICK_COARSE, // if not set, does precise intersection, otherwise, doesn't
+
+        PICK_INCLUDE_INVISIBLE, // if not set, will not intersect invisible elements, otherwise, intersects both visible and invisible elements
+        PICK_INCLUDE_NONCOLLIDABLE, // if not set, will not intersect noncollidable elements, otherwise, intersects both collidable and noncollidable elements
+
+        // NOT YET IMPLEMENTED
+        PICK_ALL_INTERSECTIONS, // if not set, returns closest intersection, otherwise, returns list of all intersections
+
+        NUM_FLAGS, // Not a valid flag
+    };
+    typedef std::bitset<NUM_FLAGS> Flags;
+
+    // The key is the Flags
+    Flags _flags;
+
+    RayPickFilter() {}
+    RayPickFilter(const Flags& flags) : _flags(flags) {}
+
+    bool operator== (const RayPickFilter& rhs) const { return _flags == rhs._flags; }
+    bool operator!= (const RayPickFilter& rhs) const { return _flags != rhs._flags; }
+
+    void setFlag(FlagBit flag, bool value) { _flags[flag] = value; }
+
+    bool doesPickNothing() const { return _flags == NOTHING._flags; }
+    bool doesPickEntities() const { return _flags[PICK_ENTITIES]; }
+    bool doesPickOverlays() const { return _flags[PICK_OVERLAYS]; }
+    bool doesPickAvatars() const { return _flags[PICK_AVATARS]; }
+    bool doesPickHUD() const { return _flags[PICK_HUD]; }
+
+    bool doesPickCoarse() const { return _flags[PICK_COARSE]; }
+    bool doesPickInvisible() const { return _flags[PICK_INCLUDE_INVISIBLE]; }
+    bool doesPickNonCollidable() const { return _flags[PICK_INCLUDE_NONCOLLIDABLE]; }
+
+    bool doesWantAllIntersections() const { return _flags[PICK_ALL_INTERSECTIONS]; }
+
+    // Helpers for RayPickManager
+    Flags getEntityFlags() const {
+        unsigned int toReturn = getBitMask(PICK_ENTITIES);
+        if (doesPickInvisible()) {
+            toReturn |= getBitMask(PICK_INCLUDE_INVISIBLE);
+        }
+        if (doesPickNonCollidable()) {
+            toReturn |= getBitMask(PICK_INCLUDE_NONCOLLIDABLE);
+        }
+        if (doesPickCoarse()) {
+            toReturn |= getBitMask(PICK_COARSE);
+        }
+        return Flags(toReturn);
+    }
+    Flags getOverlayFlags() const {
+        unsigned int toReturn = getBitMask(PICK_OVERLAYS);
+        if (doesPickInvisible()) {
+            toReturn |= getBitMask(PICK_INCLUDE_INVISIBLE);
+        }
+        if (doesPickNonCollidable()) {
+            toReturn |= getBitMask(PICK_INCLUDE_NONCOLLIDABLE);
+        }
+        if (doesPickCoarse()) {
+            toReturn |= getBitMask(PICK_COARSE);
+        }
+        return Flags(toReturn);
+    }
+    Flags getAvatarFlags() const { return Flags(getBitMask(PICK_AVATARS)); }
+    Flags getHUDFlags() const { return Flags(getBitMask(PICK_HUD)); }
+
+    static constexpr unsigned int getBitMask(FlagBit bit) { return 1 << bit; }
+
+    static const RayPickFilter NOTHING;
+};
+
+class RayPick : protected ReadWriteLockable {
+
+public:
+    using Pointer = std::shared_ptr<RayPick>;
+
+    RayPick(const RayPickFilter& filter, const float maxDistance, const bool enabled);
+
+    virtual const PickRay getPickRay(bool& valid) const = 0;
+
+    void enable(bool enabled = true);
+    void disable() { enable(false); }
+
+    RayPickFilter getFilter() const;
+    float getMaxDistance() const;
+    bool isEnabled() const;
+    RayPickResult getPrevRayPickResult() const;
+
+    void setPrecisionPicking(bool precisionPicking);
+
+    void setRayPickResult(const RayPickResult& rayPickResult);
+
+    QVector<QUuid> getIgnoreItems() const;
+    QVector<QUuid> getIncludeItems() const;
+
+    template <typename T> 
+    QVector<T> getIgnoreItemsAs() const {
+        QVector<T> result;
+        withReadLock([&] {
+            for (const auto& uid : _ignoreItems) {
+                result.push_back(uid);
+            }
+        });
+        return result;
+    }
+
+    template <typename T>
+    QVector<T> getIncludeItemsAs() const {
+        QVector<T> result;
+        withReadLock([&] {
+            for (const auto& uid : _includeItems) {
+                result.push_back(uid);
+            }
+        });
+        return result;
+    }
+
+    void setIgnoreItems(const QVector<QUuid>& items);
+    void setIncludeItems(const QVector<QUuid>& items);
+
+private:
+    RayPickFilter _filter;
+    const float _maxDistance;
+    bool _enabled;
+    RayPickResult _prevResult;
+
+    QVector<QUuid> _ignoreItems;
+    QVector<QUuid> _includeItems;
+};
+
+#endif // hifi_RayPick_h
diff --git a/libraries/pointers/src/pointers/rays/StaticRayPick.cpp b/libraries/pointers/src/pointers/rays/StaticRayPick.cpp
new file mode 100644
index 0000000000..e507341021
--- /dev/null
+++ b/libraries/pointers/src/pointers/rays/StaticRayPick.cpp
@@ -0,0 +1,19 @@
+//
+//  Created by Sam Gondelman 7/11/2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#include "StaticRayPick.h"
+
+StaticRayPick::StaticRayPick(const glm::vec3& position, const glm::vec3& direction, const RayPickFilter& filter, const float maxDistance, const bool enabled) :
+    RayPick(filter, maxDistance, enabled),
+    _pickRay(position, direction)
+{
+}
+
+const PickRay StaticRayPick::getPickRay(bool& valid) const {
+    valid = true;
+    return _pickRay;
+}
\ No newline at end of file
diff --git a/libraries/pointers/src/pointers/rays/StaticRayPick.h b/libraries/pointers/src/pointers/rays/StaticRayPick.h
new file mode 100644
index 0000000000..de5ec234a5
--- /dev/null
+++ b/libraries/pointers/src/pointers/rays/StaticRayPick.h
@@ -0,0 +1,25 @@
+//
+//  Created by Sam Gondelman 7/11/2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#ifndef hifi_StaticRayPick_h
+#define hifi_StaticRayPick_h
+
+#include "RayPick.h"
+
+class StaticRayPick : public RayPick {
+
+public:
+    StaticRayPick(const glm::vec3& position, const glm::vec3& direction, const RayPickFilter& filter, const float maxDistance = 0.0f, const bool enabled = false);
+
+    const PickRay getPickRay(bool& valid) const override;
+
+private:
+    PickRay _pickRay;
+
+};
+
+#endif // hifi_StaticRayPick_h
diff --git a/libraries/procedural/CMakeLists.txt b/libraries/procedural/CMakeLists.txt
index 3ebd0f3d14..daf6fefccc 100644
--- a/libraries/procedural/CMakeLists.txt
+++ b/libraries/procedural/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(TARGET_NAME procedural)
 AUTOSCRIBE_SHADER_LIB(gpu model)
 setup_hifi_library()
-link_hifi_libraries(shared gpu gpu-gl networking model model-networking ktx image)
+link_hifi_libraries(shared gpu networking model model-networking ktx image)
 
diff --git a/libraries/procedural/src/procedural/Procedural.cpp b/libraries/procedural/src/procedural/Procedural.cpp
index c38e562672..69e9768ccd 100644
--- a/libraries/procedural/src/procedural/Procedural.cpp
+++ b/libraries/procedural/src/procedural/Procedural.cpp
@@ -23,6 +23,9 @@
 
 #include "Logging.h"
 
+Q_LOGGING_CATEGORY(procedural, "hifi.gpu.procedural")
+
+
 // Userdata parsing constants
 static const QString PROCEDURAL_USER_DATA_KEY = "ProceduralEntity";
 static const QString URL_KEY = "shaderUrl";
@@ -45,13 +48,16 @@ static const std::string STANDARD_UNIFORM_NAMES[Procedural::NUM_STANDARD_UNIFORM
     "iChannelResolution"
 };
 
-// Example
-//{
-//    "ProceduralEntity": {
-//        "shaderUrl": "file:///C:/Users/bdavis/Git/hifi/examples/shaders/test.fs",
-//    }
-//}
-QJsonValue Procedural::getProceduralData(const QString& proceduralJson) {
+bool operator ==(const ProceduralData& a, const ProceduralData& b) {
+    return (
+        (a.version == b.version) &&
+        (a.shaderUrl == b.shaderUrl) &&
+        (a.uniforms == b.uniforms) &&
+        (a.channels == b.channels));
+}
+
+
+QJsonValue ProceduralData::getProceduralData(const QString& proceduralJson) {
     if (proceduralJson.isEmpty()) {
         return QJsonValue();
     }
@@ -65,6 +71,50 @@ QJsonValue Procedural::getProceduralData(const QString& proceduralJson) {
     return doc.object()[PROCEDURAL_USER_DATA_KEY];
 }
 
+ProceduralData ProceduralData::parse(const QString& userDataJson) {
+    ProceduralData result;
+    result.parse(getProceduralData(userDataJson).toObject());
+    return result;
+}
+
+void ProceduralData::parse(const QJsonObject& proceduralData) {
+    if (proceduralData.isEmpty()) {
+        return;
+    }
+
+    {
+        auto versionJson = proceduralData[VERSION_KEY];
+        if (versionJson.isDouble()) {
+            version = (uint8_t)(floor(versionJson.toDouble()));
+            // invalid version
+            if (!(version == 1 || version == 2)) {
+                return;
+            }
+        } else {
+            // All unversioned shaders default to V1
+            version = 1;
+        }
+    }
+
+    auto rawShaderUrl = proceduralData[URL_KEY].toString();
+    shaderUrl = DependencyManager::get<ResourceManager>()->normalizeURL(rawShaderUrl);
+    
+    // Empty shader URL isn't valid
+    if (shaderUrl.isEmpty()) {
+        return;
+    }
+
+    uniforms = proceduralData[UNIFORMS_KEY].toObject();
+    channels = proceduralData[CHANNELS_KEY].toArray();
+}
+
+// Example
+//{
+//    "ProceduralEntity": {
+//        "shaderUrl": "file:///C:/Users/bdavis/Git/hifi/examples/shaders/test.fs",
+//    }
+//}
+
 Procedural::Procedural() {
     _transparentState->setCullMode(gpu::State::CULL_NONE);
     _transparentState->setDepthTest(true, true, gpu::LESS_EQUAL);
@@ -72,146 +122,78 @@ Procedural::Procedural() {
         gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::INV_SRC_ALPHA,
         gpu::State::FACTOR_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::ONE);
 
-    _proceduralDataDirty = false;
 }
 
-Procedural::Procedural(const QString& userDataJson) : Procedural() {
-    parse(userDataJson);
-    _proceduralDataDirty = true;
-}
-
-void Procedural::parse(const QString& userDataJson) {
-    auto proceduralData = getProceduralData(userDataJson);
-    // Instead of parsing, prep for a parse on the rendering thread
-    // This will be called by Procedural::ready
-    std::lock_guard<std::mutex> lock(_proceduralDataMutex);
-    _proceduralData = proceduralData.toObject();
-
-    // Mark as dirty after modifying _proceduralData, but before releasing lock
-    // to avoid setting it after parsing has begun
-    _proceduralDataDirty = true;
-}
-
-bool Procedural::parseVersion(const QJsonValue& version) {
-    if (version.isDouble()) {
-        _version = (uint8_t)(floor(version.toDouble()));
-    } else {
-        // All unversioned shaders default to V1
-        _version = 1;
-    }
-    return (_version == 1 || _version == 2);
-}
-
-bool Procedural::parseShader(const QUrl& shaderPath) {
-    auto shaderUrl = DependencyManager::get<ResourceManager>()->normalizeURL(shaderPath);
-
-    if (!shaderUrl.isValid()) {
-        if (!shaderUrl.isEmpty()) {
-            qWarning() << "Invalid shader URL: " << shaderUrl;
-        }
-        _networkShader.reset();
-        return false;
+void Procedural::setProceduralData(const ProceduralData& proceduralData) {
+    if (proceduralData == _data) {
+        return;
     }
 
-    // If the URL hasn't changed, don't mark the shader as dirty
-    if (_shaderUrl == shaderUrl) {
-        return true;
-    }
+    _dirty = true;
+    _enabled = false;
 
-    _shaderUrl = shaderUrl;
-    _shaderDirty = true;
-
-    if (_shaderUrl.isLocalFile()) {
-        _shaderPath = _shaderUrl.toLocalFile();
-#if WANT_DEBUG
-        qCDebug(procedural) << "Shader path: " << _shaderPath;
-#endif
-        if (!QFile(_shaderPath).exists()) {
-            _networkShader.reset();
-            return false;;
-        }
-    } else {
-#if WANT_DEBUG
-        qCDebug(procedural) << "Shader url: " << _shaderUrl;
-#endif
-        _networkShader = ShaderCache::instance().getShader(_shaderUrl);
-    }
-
-    return true;
-}
-
-bool Procedural::parseUniforms(const QJsonObject& uniforms) {
-    if (_parsedUniforms != uniforms) {
-        _parsedUniforms = uniforms;
+    if (proceduralData.uniforms != _data.uniforms) {
+        _data.uniforms = proceduralData.uniforms;
         _uniformsDirty = true;
     }
 
-    return true;
-}
-
-bool Procedural::parseTextures(const QJsonArray& channels) {
-    if (_parsedChannels != channels) {
-        _parsedChannels = channels;
-
+    if (proceduralData.channels != _data.channels) {
+        _data.channels = proceduralData.channels;
+        // Must happen on the main thread
         auto textureCache = DependencyManager::get<TextureCache>();
-        size_t channelCount = std::min(MAX_PROCEDURAL_TEXTURE_CHANNELS, (size_t)_parsedChannels.size());
-        size_t channel = 0;
-        for (; channel < channelCount; ++channel) {
-            QString url = _parsedChannels.at((int)channel).toString();
-            _channels[channel] = textureCache->getTexture(QUrl(url));
+        size_t channelCount = std::min(MAX_PROCEDURAL_TEXTURE_CHANNELS, (size_t)proceduralData.channels.size());
+        size_t channel;
+        for (channel = 0; channel < MAX_PROCEDURAL_TEXTURE_CHANNELS; ++channel) {
+            if (channel < channelCount) {
+                QString url = proceduralData.channels.at((int)channel).toString();
+                _channels[channel] = textureCache->getTexture(QUrl(url));
+            } else {
+                // Release those textures no longer in use
+                _channels[channel] = textureCache->getTexture(QUrl());
+            }
         }
-        for (; channel < MAX_PROCEDURAL_TEXTURE_CHANNELS; ++channel) {
-            // Release those textures no longer in use
-            _channels[channel] = textureCache->getTexture(QUrl());
-        }
-
         _channelsDirty = true;
     }
 
-    return true;
+    if (proceduralData.shaderUrl != _data.shaderUrl) {
+        _data.shaderUrl = proceduralData.shaderUrl;
+        _shaderDirty = true;
+        const auto& shaderUrl = _data.shaderUrl;
+        _networkShader.reset();
+        _shaderPath.clear();
+
+        if (shaderUrl.isEmpty()) {
+            return;
+        }
+
+        if (!shaderUrl.isValid()) {
+            qCWarning(procedural) << "Invalid shader URL: " << shaderUrl;
+            return;
+        }
+
+        if (shaderUrl.isLocalFile()) {
+            if (!QFileInfo(shaderUrl.toLocalFile()).exists()) {
+                qCWarning(procedural) << "Invalid shader URL, missing local file: " << shaderUrl;
+                return;
+            }
+            _shaderPath = shaderUrl.toLocalFile();
+        } else {
+            _networkShader = ShaderCache::instance().getShader(shaderUrl);
+        }
+    }
+
+    _enabled = true;
 }
 
-void Procedural::parse(const QJsonObject& proceduralData) {
-    _enabled = false;
-
-    auto version = proceduralData[VERSION_KEY];
-    auto shaderUrl = proceduralData[URL_KEY].toString();
-    auto uniforms = proceduralData[UNIFORMS_KEY].toObject();
-    auto channels = proceduralData[CHANNELS_KEY].toArray();
-
-    bool isValid = true;
-
-    // Run through parsing regardless of validity to clear old cached resources
-    isValid = parseVersion(version) && isValid;
-    isValid = parseShader(shaderUrl) && isValid;
-    isValid = parseUniforms(uniforms) && isValid;
-    isValid = parseTextures(channels) && isValid;
-
-    if (!proceduralData.isEmpty() && isValid) {
-        _enabled = true;
-    }
-}
-
-bool Procedural::ready() {
-    if (!_hasStartedFade) {
-        _fadeStartTime = usecTimestampNow();
-    }
-
-    // Load any changes to the procedural
-    // Check for changes atomically, in case they are currently being made
-    if (_proceduralDataDirty) {
-        std::lock_guard<std::mutex> lock(_proceduralDataMutex);
-        parse(_proceduralData);
-
-        // Reset dirty flag after reading _proceduralData, but before releasing lock
-        // to avoid resetting it after more data is set
-        _proceduralDataDirty = false;
-    }
-
+bool Procedural::isReady() const {
     if (!_enabled) {
         return false;
     }
 
+    if (!_hasStartedFade) {
+        _fadeStartTime = usecTimestampNow();
+    }
+
     // Do we have a network or local shader, and if so, is it loaded?
     if (_shaderPath.isEmpty() && (!_networkShader || !_networkShader->isLoaded())) {
         return false;
@@ -236,7 +218,7 @@ void Procedural::prepare(gpu::Batch& batch, const glm::vec3& position, const glm
     _entityDimensions = size;
     _entityPosition = position;
     _entityOrientation = glm::mat3_cast(orientation);
-    if (_shaderUrl.isLocalFile()) {
+    if (!_shaderPath.isEmpty()) {
         auto lastModified = (quint64)QFileInfo(_shaderPath).lastModified().toMSecsSinceEpoch();
         if (lastModified > _shaderModified) {
             QFile file(_shaderPath);
@@ -263,9 +245,9 @@ void Procedural::prepare(gpu::Batch& batch, const glm::vec3& position, const glm
 
         replaceIndex = fragmentShaderSource.find(PROCEDURAL_VERSION);
         if (replaceIndex != std::string::npos) {
-            if (_version == 1) {
+            if (_data.version == 1) {
                 fragmentShaderSource.replace(replaceIndex, PROCEDURAL_VERSION.size(), "#define PROCEDURAL_V1 1");
-            } else if (_version == 2) {
+            } else if (_data.version == 2) {
                 fragmentShaderSource.replace(replaceIndex, PROCEDURAL_VERSION.size(), "#define PROCEDURAL_V2 1");
             }
         }
@@ -319,7 +301,7 @@ void Procedural::prepare(gpu::Batch& batch, const glm::vec3& position, const glm
         gpu::Sampler::Desc desc;
         desc._filter = gpu::Sampler::FILTER_MIN_MAG_MIP_LINEAR;
     });
-    
+
     for (size_t i = 0; i < MAX_PROCEDURAL_TEXTURE_CHANNELS; ++i) {
         if (_channels[i] && _channels[i]->isLoaded()) {
             auto gpuTexture = _channels[i]->getGPUTexture();
@@ -335,13 +317,13 @@ void Procedural::prepare(gpu::Batch& batch, const glm::vec3& position, const glm
 void Procedural::setupUniforms() {
     _uniforms.clear();
     // Set any userdata specified uniforms 
-    foreach(QString key, _parsedUniforms.keys()) {
+    foreach(QString key, _data.uniforms.keys()) {
         std::string uniformName = key.toLocal8Bit().data();
         int32_t slot = _shader->getUniforms().findLocation(uniformName);
         if (gpu::Shader::INVALID_LOCATION == slot) {
             continue;
         }
-        QJsonValue value = _parsedUniforms[key];
+        QJsonValue value = _data.uniforms[key];
         if (value.isDouble()) {
             float v = value.toDouble();
             _uniforms.push_back([=](gpu::Batch& batch) {
@@ -470,7 +452,7 @@ void Procedural::setupChannels(bool shouldCreate) {
 }
 
 glm::vec4 Procedural::getColor(const glm::vec4& entityColor) {
-    if (_version == 1) {
+    if (_data.version == 1) {
         return glm::vec4(1);
     }
     return entityColor;
diff --git a/libraries/procedural/src/procedural/Procedural.h b/libraries/procedural/src/procedural/Procedural.h
index ac71174727..9c29a681f0 100644
--- a/libraries/procedural/src/procedural/Procedural.h
+++ b/libraries/procedural/src/procedural/Procedural.h
@@ -27,29 +27,43 @@
 using UniformLambdas = std::list<std::function<void(gpu::Batch& batch)>>;
 const size_t MAX_PROCEDURAL_TEXTURE_CHANNELS{ 4 };
 
+
+
+struct ProceduralData {
+    static QJsonValue getProceduralData(const QString& proceduralJson);
+    static ProceduralData parse(const QString& userDataJson);
+    // This should only be called from the render thread, as it shares data with Procedural::prepare
+    void parse(const QJsonObject&);
+
+    // Rendering object descriptions, from userData
+    uint8_t version { 0 };
+    QUrl shaderUrl;
+    QJsonObject uniforms;
+    QJsonArray channels;
+};
+
+
+// WARNING with threaded rendering it is the RESPONSIBILITY OF THE CALLER to ensure that 
+// calls to `setProceduralData` happen on the main thread and that calls to `ready` and `prepare` 
+// are treated atomically, and that they cannot happen concurrently with calls to `setProceduralData`
 // FIXME better encapsulation
 // FIXME better mechanism for extending to things rendered using shaders other than simple.slv
 struct Procedural {
 public:
-    static QJsonValue getProceduralData(const QString& proceduralJson);
-
     Procedural();
-    Procedural(const QString& userDataJson);
-    void parse(const QString& userDataJson);
+    void setProceduralData(const ProceduralData& proceduralData);
 
-    bool ready();
-    bool enabled() { return _enabled; }
+    bool isReady() const;
+    bool isEnabled() const { return _enabled; }
     void prepare(gpu::Batch& batch, const glm::vec3& position, const glm::vec3& size, const glm::quat& orientation);
     const gpu::ShaderPointer& getShader() const { return _shader; }
 
     glm::vec4 getColor(const glm::vec4& entityColor);
-    quint64 getFadeStartTime() { return _fadeStartTime; }
-    bool isFading() { return _doesFade && _isFading; }
+    quint64 getFadeStartTime() const { return _fadeStartTime; }
+    bool isFading() const { return _doesFade && _isFading; }
     void setIsFading(bool isFading) { _isFading = isFading; }
     void setDoesFade(bool doesFade) { _doesFade = doesFade; }
 
-    uint8_t _version { 1 };
-
     std::string _vertexSource;
     std::string _fragmentSource;
 
@@ -69,21 +83,18 @@ public:
 
 protected:
     // Procedural metadata
+    ProceduralData _data;
+
     bool _enabled { false };
     uint64_t _start { 0 };
     int32_t _frameCount { 0 };
 
     // Rendering object descriptions, from userData
-    QJsonObject _proceduralData;
-    std::mutex _proceduralDataMutex;
     QString _shaderSource;
     QString _shaderPath;
-    QUrl _shaderUrl;
     quint64 _shaderModified { 0 };
     NetworkShaderPointer _networkShader;
-    QJsonObject _parsedUniforms;
-    QJsonArray _parsedChannels;
-    std::atomic_bool _proceduralDataDirty;
+    bool _dirty { false };
     bool _shaderDirty { true };
     bool _uniformsDirty { true };
     bool _channelsDirty { true };
@@ -105,18 +116,12 @@ protected:
 
 private:
     // This should only be called from the render thread, as it shares data with Procedural::prepare
-    void parse(const QJsonObject&);
-    bool parseVersion(const QJsonValue& version);
-    bool parseShader(const QUrl& shaderPath);
-    bool parseUniforms(const QJsonObject& uniforms);
-    bool parseTextures(const QJsonArray& channels);
-
     void setupUniforms();
     void setupChannels(bool shouldCreate);
 
-    quint64 _fadeStartTime;
-    bool _hasStartedFade { false };
-    bool _isFading { false };
+    mutable quint64 _fadeStartTime { 0 };
+    mutable bool _hasStartedFade { false };
+    mutable bool _isFading { false };
     bool _doesFade { true };
 };
 
diff --git a/libraries/procedural/src/procedural/ProceduralSkybox.cpp b/libraries/procedural/src/procedural/ProceduralSkybox.cpp
index f5feb434fa..9544759037 100644
--- a/libraries/procedural/src/procedural/ProceduralSkybox.cpp
+++ b/libraries/procedural/src/procedural/ProceduralSkybox.cpp
@@ -23,23 +23,26 @@ ProceduralSkybox::ProceduralSkybox() : model::Skybox() {
     _procedural._fragmentSource = skybox_frag;
     // Adjust the pipeline state for background using the stencil test
     _procedural.setDoesFade(false);
-    _procedural._opaqueState->setStencilTest(true, 0xFF, gpu::State::StencilTest(1, 0xFF, gpu::EQUAL, gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_KEEP));
+    // Must match PrepareStencil::STENCIL_BACKGROUND
+    const int8_t STENCIL_BACKGROUND = 0;
+    _procedural._opaqueState->setStencilTest(true, 0xFF, gpu::State::StencilTest(STENCIL_BACKGROUND, 0xFF, gpu::EQUAL,
+        gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_KEEP));
 }
 
 bool ProceduralSkybox::empty() {
-    return !_procedural.enabled() && Skybox::empty();
+    return !_procedural.isEnabled() && Skybox::empty();
 }
 
 void ProceduralSkybox::clear() {
     // Parse and prepare a procedural with no shaders to release textures
     parse(QString());
-    _procedural.ready();
+    _procedural.isReady();
 
     Skybox::clear();
 }
 
 void ProceduralSkybox::render(gpu::Batch& batch, const ViewFrustum& frustum) const {
-    if (_procedural.ready()) {
+    if (_procedural.isReady()) {
         ProceduralSkybox::render(batch, frustum, (*this));
     } else {
         Skybox::render(batch, frustum);
diff --git a/libraries/procedural/src/procedural/ProceduralSkybox.h b/libraries/procedural/src/procedural/ProceduralSkybox.h
index 30412d559c..5a1133a766 100644
--- a/libraries/procedural/src/procedural/ProceduralSkybox.h
+++ b/libraries/procedural/src/procedural/ProceduralSkybox.h
@@ -20,9 +20,8 @@
 class ProceduralSkybox: public model::Skybox {
 public:
     ProceduralSkybox();
-    ~ProceduralSkybox() override {};
-
-    void parse(const QString& userData) { _procedural.parse(userData); }
+    
+    void parse(const QString& userData) { _procedural.setProceduralData(ProceduralData::parse(userData)); }
 
     bool empty() override;
     void clear() override;
diff --git a/libraries/recording/src/recording/ClipCache.cpp b/libraries/recording/src/recording/ClipCache.cpp
index 5c55c6bb1c..0fbbf1bc8e 100644
--- a/libraries/recording/src/recording/ClipCache.cpp
+++ b/libraries/recording/src/recording/ClipCache.cpp
@@ -8,6 +8,8 @@
 
 #include <QThread>
 
+#include <shared/QtHelpers.h>
+
 #include "ClipCache.h"
 #include "impl/PointerClip.h"
 #include "Logging.h"
@@ -37,7 +39,7 @@ ClipCache::ClipCache(QObject* parent) :
 NetworkClipLoaderPointer ClipCache::getClipLoader(const QUrl& url) {
     if (QThread::currentThread() != thread()) {
         NetworkClipLoaderPointer result;
-        QMetaObject::invokeMethod(this, "getClipLoader", Qt::BlockingQueuedConnection,
+        BLOCKING_INVOKE_METHOD(this, "getClipLoader",
                                   Q_RETURN_ARG(NetworkClipLoaderPointer, result), Q_ARG(const QUrl&, url));
         return result;
     }
diff --git a/libraries/render-utils/CMakeLists.txt b/libraries/render-utils/CMakeLists.txt
index 0079ffae66..94232c81b2 100644
--- a/libraries/render-utils/CMakeLists.txt
+++ b/libraries/render-utils/CMakeLists.txt
@@ -3,7 +3,7 @@ AUTOSCRIBE_SHADER_LIB(gpu model render)
 # pull in the resources.qrc file
 qt5_add_resources(QT_RESOURCES_FILE "${CMAKE_CURRENT_SOURCE_DIR}/res/fonts/fonts.qrc")
 setup_hifi_library(Widgets OpenGL Network Qml Quick Script)
-link_hifi_libraries(shared ktx gpu model model-networking render animation fbx entities image procedural)
+link_hifi_libraries(shared ktx gpu model model-networking render animation fbx image procedural)
 include_hifi_library_headers(networking)
 include_hifi_library_headers(octree)
 include_hifi_library_headers(audio)
diff --git a/libraries/render-utils/src/AbstractViewStateInterface.h b/libraries/render-utils/src/AbstractViewStateInterface.h
index 4570ead9e1..96e9f4d222 100644
--- a/libraries/render-utils/src/AbstractViewStateInterface.h
+++ b/libraries/render-utils/src/AbstractViewStateInterface.h
@@ -31,9 +31,6 @@ public:
     /// copies the current view frustum for rendering the view state
     virtual void copyCurrentViewFrustum(ViewFrustum& viewOut) const = 0;
 
-    /// copies the shadow view frustum for rendering the view state
-    virtual void copyShadowViewFrustum(ViewFrustum& viewOut) const = 0;
-
     virtual QThread* getMainThread() = 0;
 
     virtual PickRay computePickRay(float x, float y) const = 0;
diff --git a/libraries/render-utils/src/AnimDebugDraw.cpp b/libraries/render-utils/src/AnimDebugDraw.cpp
index 4f7f9ef5c4..c22e99cbbc 100644
--- a/libraries/render-utils/src/AnimDebugDraw.cpp
+++ b/libraries/render-utils/src/AnimDebugDraw.cpp
@@ -144,6 +144,7 @@ void AnimDebugDraw::shutdown() {
     if (scene && _itemID) {
         render::Transaction transaction;
         transaction.removeItem(_itemID);
+        render::Item::clearID(_itemID);
         scene->enqueueTransaction(transaction);
     }
 }
@@ -316,7 +317,9 @@ void AnimDebugDraw::update() {
     if (!scene) {
         return;
     }
-
+    if (!render::Item::isValidID(_itemID)) {
+        return;
+    }
     render::Transaction transaction;
     transaction.updateItem<AnimDebugDrawData>(_itemID, [&](AnimDebugDrawData& data) {
 
diff --git a/libraries/render-utils/src/AntialiasingEffect.cpp b/libraries/render-utils/src/AntialiasingEffect.cpp
index 55a46a526f..70c2e3b5ce 100644
--- a/libraries/render-utils/src/AntialiasingEffect.cpp
+++ b/libraries/render-utils/src/AntialiasingEffect.cpp
@@ -70,9 +70,8 @@ const gpu::PipelinePointer& Antialiasing::getAntialiasingPipeline(RenderArgs* ar
 
         gpu::StatePointer state = gpu::StatePointer(new gpu::State());
 
-        PrepareStencil::testMask(*state);
-
         state->setDepthTest(false, false, gpu::LESS_EQUAL);
+        PrepareStencil::testNoAA(*state);
 
         // Good to go add the brand new pipeline
         _antialiasingPipeline = gpu::Pipeline::create(program, state);
@@ -95,7 +94,7 @@ const gpu::PipelinePointer& Antialiasing::getBlendPipeline() {
         gpu::StatePointer state = gpu::StatePointer(new gpu::State());
 
         state->setDepthTest(false, false, gpu::LESS_EQUAL);
-        PrepareStencil::testMask(*state);
+        PrepareStencil::testNoAA(*state);
 
         // Good to go add the brand new pipeline
         _blendPipeline = gpu::Pipeline::create(program, state);
@@ -159,7 +158,6 @@ void Antialiasing::run(const render::RenderContextPointer& renderContext, const
 
 
         // Blend step
-        getBlendPipeline();
         batch.setResourceTexture(0, _antialiasingTexture);
         batch.setFramebuffer(sourceBuffer);
         batch.setPipeline(getBlendPipeline());
diff --git a/libraries/render-utils/src/BackgroundStage.cpp b/libraries/render-utils/src/BackgroundStage.cpp
index 5d04f188f1..2d2c0ed150 100644
--- a/libraries/render-utils/src/BackgroundStage.cpp
+++ b/libraries/render-utils/src/BackgroundStage.cpp
@@ -14,6 +14,7 @@
 #include <gpu/Context.h>
 
 std::string BackgroundStage::_stageName { "BACKGROUND_STAGE"};
+const BackgroundStage::Index BackgroundStage::INVALID_INDEX { render::indexed_container::INVALID_INDEX };
 
 BackgroundStage::Index BackgroundStage::findBackground(const BackgroundPointer& background) const {
     auto found = _backgroundMap.find(background);
@@ -61,6 +62,8 @@ void DrawBackgroundStage::run(const render::RenderContextPointer& renderContext,
 
     // Background rendering decision
     auto backgroundStage = renderContext->_scene->getStage<BackgroundStage>();
+    assert(backgroundStage);
+
     model::SunSkyStagePointer background;
     model::SkyboxPointer skybox;
     if (backgroundStage->_currentFrame._backgrounds.size()) {
diff --git a/libraries/render-utils/src/BackgroundStage.h b/libraries/render-utils/src/BackgroundStage.h
index eab7c94f0d..4e0e09db5b 100644
--- a/libraries/render-utils/src/BackgroundStage.h
+++ b/libraries/render-utils/src/BackgroundStage.h
@@ -27,7 +27,7 @@ public:
     static const std::string& getName() { return _stageName; }
 
     using Index = render::indexed_container::Index;
-    static const Index INVALID_INDEX { render::indexed_container::INVALID_INDEX };
+    static const Index INVALID_INDEX;
     static bool isIndexInvalid(Index index) { return index == INVALID_INDEX; }
     
     using BackgroundPointer = model::SunSkyStagePointer;
diff --git a/libraries/render-utils/src/BloomApply.slf b/libraries/render-utils/src/BloomApply.slf
new file mode 100644
index 0000000000..953258e8ab
--- /dev/null
+++ b/libraries/render-utils/src/BloomApply.slf
@@ -0,0 +1,27 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  BloomApply.slf
+//  Mix the three gaussian blur textures.
+//
+//  Created by Olivier Prat on 10/09/2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+uniform sampler2D blurMap0;
+uniform sampler2D blurMap1;
+uniform sampler2D blurMap2;
+uniform float intensity;
+
+in vec2 varTexCoord0;
+out vec4 outFragColor;
+
+void main(void) {
+    vec4 blur0 = texture(blurMap0, varTexCoord0);
+    vec4 blur1 = texture(blurMap1, varTexCoord0);
+    vec4 blur2 = texture(blurMap2, varTexCoord0);
+
+    outFragColor = vec4((blur0.rgb+blur1.rgb+blur2.rgb)*intensity, 1.0f);
+}
diff --git a/libraries/render-utils/src/BloomEffect.cpp b/libraries/render-utils/src/BloomEffect.cpp
new file mode 100644
index 0000000000..9d9367a6d5
--- /dev/null
+++ b/libraries/render-utils/src/BloomEffect.cpp
@@ -0,0 +1,359 @@
+//
+//  BloomEffect.cpp
+//  render-utils/src/
+//
+//  Created by Olivier Prat on 09/25/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#include "BloomEffect.h"
+
+#include "gpu/Context.h"
+#include "gpu/StandardShaderLib.h"
+
+#include <render/BlurTask.h>
+#include <render/ResampleTask.h>
+
+#include "BloomThreshold_frag.h"
+#include "BloomApply_frag.h"
+
+#define BLOOM_BLUR_LEVEL_COUNT  3
+
+BloomThreshold::BloomThreshold(unsigned int downsamplingFactor) :
+    _downsamplingFactor(downsamplingFactor) {
+    assert(downsamplingFactor > 0);
+}
+
+void BloomThreshold::configure(const Config& config) {
+    _threshold = config.threshold;
+}
+
+void BloomThreshold::run(const render::RenderContextPointer& renderContext, const Inputs& inputs, Outputs& outputs) {
+    assert(renderContext->args);
+    assert(renderContext->args->hasViewFrustum());
+
+    RenderArgs* args = renderContext->args;
+
+    const auto frameTransform = inputs.get0();
+    const auto inputFrameBuffer = inputs.get1();
+
+    assert(inputFrameBuffer->hasColor());
+
+    auto inputBuffer = inputFrameBuffer->getRenderBuffer(0);
+    auto bufferSize = gpu::Vec2u(inputBuffer->getDimensions());
+
+    // Downsample resolution
+    bufferSize.x /= _downsamplingFactor;
+    bufferSize.y /= _downsamplingFactor;
+
+    if (!_outputBuffer || _outputBuffer->getSize() != bufferSize) {
+        auto colorTexture = gpu::TexturePointer(gpu::Texture::createRenderBuffer(inputBuffer->getTexelFormat(), bufferSize.x, bufferSize.y,
+                                                gpu::Texture::SINGLE_MIP, gpu::Sampler(gpu::Sampler::FILTER_MIN_MAG_LINEAR_MIP_POINT)));
+
+        _outputBuffer = gpu::FramebufferPointer(gpu::Framebuffer::create("BloomThreshold"));
+        _outputBuffer->setRenderBuffer(0, colorTexture);
+    }
+
+    static const int COLOR_MAP_SLOT = 0;
+    static const int THRESHOLD_SLOT = 1;
+
+    if (!_pipeline) {
+        auto vs = gpu::StandardShaderLib::getDrawTransformUnitQuadVS();
+        auto ps = gpu::Shader::createPixel(std::string(BloomThreshold_frag));
+        gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
+
+        gpu::Shader::BindingSet slotBindings;
+        slotBindings.insert(gpu::Shader::Binding("colorMap", COLOR_MAP_SLOT));
+        slotBindings.insert(gpu::Shader::Binding("threshold", THRESHOLD_SLOT));
+        gpu::Shader::makeProgram(*program, slotBindings);
+
+        gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+        _pipeline = gpu::Pipeline::create(program, state);
+    }
+
+    glm::ivec4 viewport{ 0, 0, bufferSize.x, bufferSize.y };
+
+    gpu::doInBatch(args->_context, [&](gpu::Batch& batch) {
+        batch.enableStereo(false);
+
+        batch.setViewportTransform(viewport);
+        batch.setProjectionTransform(glm::mat4());
+        batch.resetViewTransform();
+        batch.setModelTransform(gpu::Framebuffer::evalSubregionTexcoordTransform(bufferSize, viewport));
+        batch.setPipeline(_pipeline);
+
+        batch.setFramebuffer(_outputBuffer);
+        batch.setResourceTexture(COLOR_MAP_SLOT, inputBuffer);
+        batch._glUniform1f(THRESHOLD_SLOT, _threshold);
+        batch.draw(gpu::TRIANGLE_STRIP, 4);
+    });
+
+    outputs = _outputBuffer;
+}
+
+BloomApply::BloomApply() {
+
+}
+
+void BloomApply::configure(const Config& config) {
+    _intensity = config.intensity;
+}
+
+void BloomApply::run(const render::RenderContextPointer& renderContext, const Inputs& inputs) {
+    assert(renderContext->args);
+    assert(renderContext->args->hasViewFrustum());
+    RenderArgs* args = renderContext->args;
+
+    static auto BLUR0_SLOT = 0;
+    static auto BLUR1_SLOT = 1;
+    static auto BLUR2_SLOT = 2;
+    static auto INTENSITY_SLOT = 3;
+
+    if (!_pipeline) {
+        auto vs = gpu::StandardShaderLib::getDrawTransformUnitQuadVS();
+        auto ps = gpu::Shader::createPixel(std::string(BloomApply_frag));
+        gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
+
+        gpu::Shader::BindingSet slotBindings;
+        slotBindings.insert(gpu::Shader::Binding("blurMap0", BLUR0_SLOT));
+        slotBindings.insert(gpu::Shader::Binding("blurMap1", BLUR1_SLOT));
+        slotBindings.insert(gpu::Shader::Binding("blurMap2", BLUR2_SLOT));
+        slotBindings.insert(gpu::Shader::Binding("intensity", INTENSITY_SLOT));
+        gpu::Shader::makeProgram(*program, slotBindings);
+
+        gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+        state->setDepthTest(gpu::State::DepthTest(false, false));
+        _pipeline = gpu::Pipeline::create(program, state);
+    }
+
+    const auto frameBuffer = inputs.get0();
+    const auto framebufferSize = frameBuffer->getSize();
+    const auto blur0FB = inputs.get1();
+    const auto blur1FB = inputs.get2();
+    const auto blur2FB = inputs.get3();
+    const glm::ivec4 viewport{ 0, 0, framebufferSize.x, framebufferSize.y };
+
+    gpu::doInBatch(args->_context, [&](gpu::Batch& batch) {
+        batch.enableStereo(false);
+
+        batch.setFramebuffer(frameBuffer);
+
+        batch.setViewportTransform(viewport);
+        batch.setProjectionTransform(glm::mat4());
+        batch.resetViewTransform();
+        batch.setPipeline(_pipeline);
+
+        batch.setModelTransform(gpu::Framebuffer::evalSubregionTexcoordTransform(framebufferSize, viewport));
+        batch.setResourceTexture(BLUR0_SLOT, blur0FB->getRenderBuffer(0));
+        batch.setResourceTexture(BLUR1_SLOT, blur1FB->getRenderBuffer(0));
+        batch.setResourceTexture(BLUR2_SLOT, blur2FB->getRenderBuffer(0));
+        batch._glUniform1f(INTENSITY_SLOT, _intensity / 3.0f);
+        batch.draw(gpu::TRIANGLE_STRIP, 4);
+    });
+}
+
+void BloomDraw::run(const render::RenderContextPointer& renderContext, const Inputs& inputs) {
+    assert(renderContext->args);
+    assert(renderContext->args->hasViewFrustum());
+    RenderArgs* args = renderContext->args;
+
+    const auto frameBuffer = inputs.get0();
+    const auto bloomFrameBuffer = inputs.get1();
+
+    if (frameBuffer && bloomFrameBuffer) {
+        const auto framebufferSize = frameBuffer->getSize();
+
+        if (!_pipeline) {
+            auto vs = gpu::StandardShaderLib::getDrawTransformUnitQuadVS();
+            auto ps = gpu::StandardShaderLib::getDrawTextureOpaquePS();
+            gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
+
+            gpu::Shader::BindingSet slotBindings;
+            gpu::Shader::makeProgram(*program, slotBindings);
+
+            gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+            state->setDepthTest(gpu::State::DepthTest(false, false));
+            state->setBlendFunction(true, gpu::State::ONE, gpu::State::BLEND_OP_ADD, gpu::State::ONE,
+                                    gpu::State::ZERO, gpu::State::BLEND_OP_ADD, gpu::State::ONE);
+            _pipeline = gpu::Pipeline::create(program, state);
+        }
+
+        gpu::doInBatch(args->_context, [&](gpu::Batch& batch) {
+            batch.enableStereo(false);
+
+            batch.setFramebuffer(frameBuffer);
+
+            batch.setViewportTransform(args->_viewport);
+            batch.setProjectionTransform(glm::mat4());
+            batch.resetViewTransform();
+            batch.setPipeline(_pipeline);
+
+            batch.setModelTransform(gpu::Framebuffer::evalSubregionTexcoordTransform(framebufferSize, args->_viewport));
+            batch.setResourceTexture(0, bloomFrameBuffer->getRenderBuffer(0));
+            batch.draw(gpu::TRIANGLE_STRIP, 4);
+        });
+    }
+}
+
+DebugBloom::DebugBloom() {
+}
+
+void DebugBloom::configure(const Config& config) {
+    _mode = static_cast<DebugBloomConfig::Mode>(config.mode);
+    assert(_mode < DebugBloomConfig::MODE_COUNT);
+}
+
+void DebugBloom::run(const render::RenderContextPointer& renderContext, const Inputs& inputs) {
+    assert(renderContext->args);
+    assert(renderContext->args->hasViewFrustum());
+    RenderArgs* args = renderContext->args;
+
+    const auto frameBuffer = inputs.get0();
+    const auto combinedBlurBuffer = inputs.get4();
+    const auto framebufferSize = frameBuffer->getSize();
+    const auto level0FB = inputs.get1();
+    const auto level1FB = inputs.get2();
+    const auto level2FB = inputs.get3();
+    const gpu::TexturePointer levelTextures[BLOOM_BLUR_LEVEL_COUNT] = {
+        level0FB->getRenderBuffer(0),
+        level1FB->getRenderBuffer(0),
+        level2FB->getRenderBuffer(0)
+    };
+
+    static auto TEXCOORD_RECT_SLOT = 1;
+
+    if (!_pipeline) {
+        auto vs = gpu::StandardShaderLib::getDrawTexcoordRectTransformUnitQuadVS();
+        auto ps = gpu::StandardShaderLib::getDrawTextureOpaquePS();
+        gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
+
+        gpu::Shader::BindingSet slotBindings;
+        slotBindings.insert(gpu::Shader::Binding(std::string("texcoordRect"), TEXCOORD_RECT_SLOT));
+        gpu::Shader::makeProgram(*program, slotBindings);
+
+        gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+        state->setDepthTest(gpu::State::DepthTest(false));
+        _pipeline = gpu::Pipeline::create(program, state);
+    }
+
+    gpu::doInBatch(args->_context, [&](gpu::Batch& batch) {
+        batch.enableStereo(false);
+
+        batch.setFramebuffer(frameBuffer);
+
+        batch.setViewportTransform(args->_viewport);
+        batch.setProjectionTransform(glm::mat4());
+        batch.resetViewTransform();
+        batch.setPipeline(_pipeline);
+
+        Transform modelTransform;
+        if (_mode == DebugBloomConfig::MODE_ALL_LEVELS) {
+            batch._glUniform4f(TEXCOORD_RECT_SLOT, 0.0f, 0.0f, 1.f, 1.f);
+
+            modelTransform = gpu::Framebuffer::evalSubregionTexcoordTransform(framebufferSize, args->_viewport / 2);
+            modelTransform.postTranslate(glm::vec3(-1.0f, 1.0f, 0.0f));
+            batch.setModelTransform(modelTransform);
+            batch.setResourceTexture(0, levelTextures[0]);
+            batch.draw(gpu::TRIANGLE_STRIP, 4);
+
+            modelTransform.postTranslate(glm::vec3(2.0f, 0.0f, 0.0f));
+            batch.setModelTransform(modelTransform);
+            batch.setResourceTexture(0, levelTextures[1]);
+            batch.draw(gpu::TRIANGLE_STRIP, 4);
+
+            modelTransform.postTranslate(glm::vec3(-2.0f, -2.0f, 0.0f));
+            batch.setModelTransform(modelTransform);
+            batch.setResourceTexture(0, levelTextures[2]);
+            batch.draw(gpu::TRIANGLE_STRIP, 4);
+
+            modelTransform.postTranslate(glm::vec3(2.0f, 0.0f, 0.0f));
+            batch.setModelTransform(modelTransform);
+            batch.setResourceTexture(0, combinedBlurBuffer->getRenderBuffer(0));
+            batch.draw(gpu::TRIANGLE_STRIP, 4);
+        } else {
+            auto viewport = args->_viewport;
+            auto blurLevel = _mode - DebugBloomConfig::MODE_LEVEL0;
+
+            viewport.z /= 2;
+
+            batch._glUniform4f(TEXCOORD_RECT_SLOT, 0.5f, 0.0f, 0.5f, 1.f);
+
+            modelTransform = gpu::Framebuffer::evalSubregionTexcoordTransform(framebufferSize, viewport);
+            modelTransform.postTranslate(glm::vec3(-1.0f, 0.0f, 0.0f));
+            batch.setModelTransform(modelTransform);
+            batch.setResourceTexture(0, levelTextures[blurLevel]);
+            batch.draw(gpu::TRIANGLE_STRIP, 4);
+        }
+    });
+}
+
+void BloomConfig::setIntensity(float value) {
+    auto task = static_cast<render::Task::TaskConcept*>(_task);
+    auto blurJobIt = task->editJob("BloomApply");
+    assert(blurJobIt != task->_jobs.end());
+    blurJobIt->getConfiguration()->setProperty("intensity", value);
+}
+
+float BloomConfig::getIntensity() const {
+    auto task = static_cast<render::Task::TaskConcept*>(_task);
+    auto blurJobIt = task->getJob("BloomApply");
+    assert(blurJobIt != task->_jobs.end());
+    return blurJobIt->getConfiguration()->property("intensity").toFloat();
+}
+
+void BloomConfig::setSize(float value) {
+    std::string blurName{ "BloomBlurN" };
+    auto sigma = 0.5f+value*3.5f;
+
+    for (auto i = 0; i < BLOOM_BLUR_LEVEL_COUNT; i++) {
+        blurName.back() = '0' + i;
+        auto task = static_cast<render::Task::TaskConcept*>(_task);
+        auto blurJobIt = task->editJob(blurName);
+        assert(blurJobIt != task->_jobs.end());
+        auto& gaussianBlur = blurJobIt->edit<render::BlurGaussian>();
+        auto gaussianBlurParams = gaussianBlur.getParameters();
+        gaussianBlurParams->setFilterGaussianTaps(5, sigma);
+        // Gaussian blur increases at each level to have a slower rolloff on the edge
+        // of the response
+        sigma *= 1.5f;
+    }
+}
+
+Bloom::Bloom() {
+
+}
+
+void Bloom::configure(const Config& config) {
+    std::string blurName{ "BloomBlurN" };
+
+    for (auto i = 0; i < BLOOM_BLUR_LEVEL_COUNT; i++) {
+        blurName.back() = '0' + i;
+        auto blurConfig = config.getConfig<render::BlurGaussian>(blurName);
+        blurConfig->setProperty("filterScale", 1.0f);
+    }
+}
+
+void Bloom::build(JobModel& task, const render::Varying& inputs, render::Varying& outputs) {
+    // Start by computing threshold of color buffer input at quarter resolution
+    const auto bloomInputBuffer = task.addJob<BloomThreshold>("BloomThreshold", inputs, 4U);
+
+    // Multi-scale blur, each new blur is half resolution of the previous pass
+    const auto blurFB0 = task.addJob<render::BlurGaussian>("BloomBlur0", bloomInputBuffer, true);
+    const auto blurFB1 = task.addJob<render::BlurGaussian>("BloomBlur1", blurFB0, true, 2U);
+    const auto blurFB2 = task.addJob<render::BlurGaussian>("BloomBlur2", blurFB1, true, 2U);
+
+    const auto& input = inputs.get<Inputs>();
+    const auto& frameBuffer = input[1];
+
+    // Mix all blur levels at quarter resolution
+    const auto applyInput = BloomApply::Inputs(bloomInputBuffer, blurFB0, blurFB1, blurFB2).asVarying();
+    task.addJob<BloomApply>("BloomApply", applyInput);
+    // And them blend result in additive manner on top of final color buffer
+    const auto drawInput = BloomDraw::Inputs(frameBuffer, bloomInputBuffer).asVarying();
+    task.addJob<BloomDraw>("BloomDraw", drawInput);
+
+    const auto debugInput = DebugBloom::Inputs(frameBuffer, blurFB0, blurFB1, blurFB2, bloomInputBuffer).asVarying();
+    task.addJob<DebugBloom>("DebugBloom", debugInput);
+}
diff --git a/libraries/render-utils/src/BloomEffect.h b/libraries/render-utils/src/BloomEffect.h
new file mode 100644
index 0000000000..5352c65e4d
--- /dev/null
+++ b/libraries/render-utils/src/BloomEffect.h
@@ -0,0 +1,166 @@
+//
+//  BloomEffect.h
+//  render-utils/src/
+//
+//  Created by Olivier Prat on 09/25/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_render_utils_BloomEffect_h
+#define hifi_render_utils_BloomEffect_h
+
+#include <render/Engine.h>
+
+#include "DeferredFrameTransform.h"
+
+class BloomConfig : public render::Task::Config {
+    Q_OBJECT
+        Q_PROPERTY(float intensity READ getIntensity WRITE setIntensity NOTIFY dirty)
+        Q_PROPERTY(float size MEMBER size WRITE setSize NOTIFY dirty)
+
+public:
+
+    BloomConfig() : render::Task::Config(false) {}
+
+    float size{ 0.8f };
+
+    void setIntensity(float value);
+    float getIntensity() const;
+    void setSize(float value);
+
+signals:
+    void dirty();
+};
+
+class BloomThresholdConfig : public render::Job::Config {
+    Q_OBJECT
+        Q_PROPERTY(float threshold MEMBER threshold NOTIFY dirty)
+
+public:
+
+    float threshold{ 1.25f };
+
+signals:
+    void dirty();
+};
+
+class BloomThreshold {
+public:
+    using Inputs = render::VaryingSet2<DeferredFrameTransformPointer, gpu::FramebufferPointer>;
+    using Outputs = gpu::FramebufferPointer;
+    using Config = BloomThresholdConfig;
+    using JobModel = render::Job::ModelIO<BloomThreshold, Inputs, Outputs, Config>;
+
+    BloomThreshold(unsigned int downsamplingFactor);
+
+    void configure(const Config& config);
+    void run(const render::RenderContextPointer& renderContext, const Inputs& inputs, Outputs& outputs);
+
+private:
+
+    gpu::FramebufferPointer _outputBuffer;
+    gpu::PipelinePointer _pipeline;
+    float _threshold;
+    unsigned int _downsamplingFactor;
+};
+
+
+class BloomApplyConfig : public render::Job::Config {
+    Q_OBJECT
+        Q_PROPERTY(float intensity MEMBER intensity NOTIFY dirty)
+
+public:
+
+    float intensity{ 0.8f };
+
+signals:
+    void dirty();
+};
+
+class BloomApply {
+public:
+    using Inputs = render::VaryingSet4<gpu::FramebufferPointer, gpu::FramebufferPointer, gpu::FramebufferPointer, gpu::FramebufferPointer>;
+    using Config = BloomApplyConfig;
+    using JobModel = render::Job::ModelI<BloomApply, Inputs, Config>;
+
+    BloomApply();
+
+    void configure(const Config& config);
+    void run(const render::RenderContextPointer& renderContext, const Inputs& inputs);
+
+private:
+
+    gpu::PipelinePointer _pipeline;
+    float _intensity{ 1.0f };
+};
+
+class BloomDraw {
+public:
+    using Inputs = render::VaryingSet2<gpu::FramebufferPointer, gpu::FramebufferPointer>;
+    using JobModel = render::Job::ModelI<BloomDraw, Inputs>;
+
+    BloomDraw() {}
+
+    void run(const render::RenderContextPointer& renderContext, const Inputs& inputs);
+
+private:
+
+    gpu::PipelinePointer _pipeline;
+};
+
+class DebugBloomConfig : public render::Job::Config {
+    Q_OBJECT
+        Q_PROPERTY(int mode MEMBER mode NOTIFY dirty)
+
+public:
+
+    enum Mode {
+        MODE_LEVEL0 = 0,
+        MODE_LEVEL1,
+        MODE_LEVEL2,
+        MODE_ALL_LEVELS,
+
+        MODE_COUNT
+    };
+
+    DebugBloomConfig() : render::Job::Config(false) {}
+
+    int mode{ MODE_ALL_LEVELS };
+
+signals:
+    void dirty();
+};
+
+class DebugBloom {
+public:
+    using Inputs = render::VaryingSet5<gpu::FramebufferPointer, gpu::FramebufferPointer, gpu::FramebufferPointer, gpu::FramebufferPointer, gpu::FramebufferPointer>;
+    using Config = DebugBloomConfig;
+    using JobModel = render::Job::ModelI<DebugBloom, Inputs, Config>;
+
+    DebugBloom();
+
+    void configure(const Config& config);
+    void run(const render::RenderContextPointer& renderContext, const Inputs& inputs);
+
+private:
+    gpu::PipelinePointer _pipeline;
+    DebugBloomConfig::Mode _mode;
+};
+
+class Bloom {
+public:
+    using Inputs = render::VaryingSet2<DeferredFrameTransformPointer, gpu::FramebufferPointer>;
+    using Config = BloomConfig;
+	using JobModel = render::Task::ModelI<Bloom, Inputs, Config>;
+
+	Bloom();
+
+	void configure(const Config& config);
+	void build(JobModel& task, const render::Varying& inputs, render::Varying& outputs);
+
+};
+
+#endif // hifi_render_utils_BloomEffect_h
diff --git a/libraries/render-utils/src/BloomThreshold.slf b/libraries/render-utils/src/BloomThreshold.slf
new file mode 100644
index 0000000000..e4b96618df
--- /dev/null
+++ b/libraries/render-utils/src/BloomThreshold.slf
@@ -0,0 +1,45 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  BloomThreshold.slf
+//  Perform a soft threshold on an input texture and downsample to half size in one go.
+//
+//  Created by Olivier Prat on 09/26/2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+uniform sampler2D colorMap;
+uniform float threshold;
+
+in vec2 varTexCoord0;
+out vec4 outFragColor;
+
+#define DOWNSAMPLING_FACTOR     4
+#define SAMPLE_COUNT            (DOWNSAMPLING_FACTOR/2)
+
+void main(void) {
+    vec2 deltaX = dFdx(varTexCoord0) / SAMPLE_COUNT;
+    vec2 deltaY = dFdy(varTexCoord0) / SAMPLE_COUNT;
+    vec2 startUv = varTexCoord0;
+    vec4 maskedColor = vec4(0,0,0,0);
+
+    for (int y=0 ; y<SAMPLE_COUNT ; y++) {
+        vec2 uv = startUv;
+
+        for (int x=0 ; x<SAMPLE_COUNT ; x++) {
+            vec4 color = texture(colorMap, uv);
+            float luminance = (color.r+color.g+color.b) / 3.0;
+            float mask = clamp((luminance-threshold)*0.25, 0, 1);
+
+            color *= mask;
+            maskedColor += color;
+            uv += deltaX;
+        }
+
+        startUv += deltaY;
+    }
+    maskedColor /= SAMPLE_COUNT*SAMPLE_COUNT;
+    outFragColor = vec4(maskedColor.rgb, 1.0);
+}
diff --git a/libraries/render-utils/src/CauterizedMeshPartPayload.cpp b/libraries/render-utils/src/CauterizedMeshPartPayload.cpp
index 07628904f1..3bb2aa2ef9 100644
--- a/libraries/render-utils/src/CauterizedMeshPartPayload.cpp
+++ b/libraries/render-utils/src/CauterizedMeshPartPayload.cpp
@@ -20,11 +20,22 @@ using namespace render;
 CauterizedMeshPartPayload::CauterizedMeshPartPayload(ModelPointer model, int meshIndex, int partIndex, int shapeIndex, const Transform& transform, const Transform& offsetTransform)
     : ModelMeshPartPayload(model, meshIndex, partIndex, shapeIndex, transform, offsetTransform) {}
 
-void CauterizedMeshPartPayload::updateTransformForCauterizedMesh(
-        const Transform& renderTransform,
-        const gpu::BufferPointer& buffer) {
+void CauterizedMeshPartPayload::updateClusterBuffer(const std::vector<glm::mat4>& clusterMatrices, const std::vector<glm::mat4>& cauterizedClusterMatrices) {
+    ModelMeshPartPayload::updateClusterBuffer(clusterMatrices);
+
+    if (cauterizedClusterMatrices.size() > 1) {
+        if (!_cauterizedClusterBuffer) {
+            _cauterizedClusterBuffer = std::make_shared<gpu::Buffer>(cauterizedClusterMatrices.size() * sizeof(glm::mat4),
+                (const gpu::Byte*) cauterizedClusterMatrices.data());
+        } else {
+            _cauterizedClusterBuffer->setSubData(0, cauterizedClusterMatrices.size() * sizeof(glm::mat4),
+                (const gpu::Byte*) cauterizedClusterMatrices.data());
+        }
+    }
+}
+
+void CauterizedMeshPartPayload::updateTransformForCauterizedMesh(const Transform& renderTransform) {
     _cauterizedTransform = renderTransform;
-    _cauterizedClusterBuffer = buffer;
 }
 
 void CauterizedMeshPartPayload::bindTransform(gpu::Batch& batch, const render::ShapePipeline::LocationsPointer locations, RenderArgs::RenderMode renderMode) const {
diff --git a/libraries/render-utils/src/CauterizedMeshPartPayload.h b/libraries/render-utils/src/CauterizedMeshPartPayload.h
index 5e3135ea84..1c98f5abf3 100644
--- a/libraries/render-utils/src/CauterizedMeshPartPayload.h
+++ b/libraries/render-utils/src/CauterizedMeshPartPayload.h
@@ -15,7 +15,9 @@ class CauterizedMeshPartPayload : public ModelMeshPartPayload {
 public:
     CauterizedMeshPartPayload(ModelPointer model, int meshIndex, int partIndex, int shapeIndex, const Transform& transform, const Transform& offsetTransform);
 
-    void updateTransformForCauterizedMesh(const Transform& renderTransform, const gpu::BufferPointer& buffer);
+    void updateClusterBuffer(const std::vector<glm::mat4>& clusterMatrices, const std::vector<glm::mat4>& cauterizedClusterMatrices);
+
+    void updateTransformForCauterizedMesh(const Transform& renderTransform);
 
     void bindTransform(gpu::Batch& batch, const render::ShapePipeline::LocationsPointer locations, RenderArgs::RenderMode renderMode) const override;
 
diff --git a/libraries/render-utils/src/CauterizedModel.cpp b/libraries/render-utils/src/CauterizedModel.cpp
index 47ada457a0..30121a232d 100644
--- a/libraries/render-utils/src/CauterizedModel.cpp
+++ b/libraries/render-utils/src/CauterizedModel.cpp
@@ -48,7 +48,7 @@ void CauterizedModel::createVisibleRenderItemSet() {
         const auto& meshes = _renderGeometry->getMeshes();
 
         // all of our mesh vectors must match in size
-        if ((int)meshes.size() != _meshStates.size()) {
+        if (meshes.size() != _meshStates.size()) {
             qCDebug(renderutils) << "WARNING!!!! Mesh Sizes don't match! We will not segregate mesh groups yet.";
             return;
         }
@@ -57,6 +57,7 @@ void CauterizedModel::createVisibleRenderItemSet() {
         Q_ASSERT(_modelMeshRenderItems.isEmpty());
 
         _modelMeshRenderItems.clear();
+        _modelMeshRenderItemShapes.clear();
 
         Transform transform;
         transform.setTranslation(_translation);
@@ -80,6 +81,7 @@ void CauterizedModel::createVisibleRenderItemSet() {
             for (int partIndex = 0; partIndex < numParts; partIndex++) {
                 auto ptr = std::make_shared<CauterizedMeshPartPayload>(shared_from_this(), i, partIndex, shapeID, transform, offset);
                 _modelMeshRenderItems << std::static_pointer_cast<ModelMeshPartPayload>(ptr);
+                _modelMeshRenderItemShapes.emplace_back(ShapeInfo{ (int)i });
                 shapeID++;
             }
         }
@@ -102,7 +104,7 @@ void CauterizedModel::updateClusterMatrices() {
     _needsUpdateClusterMatrices = false;
     const FBXGeometry& geometry = getFBXGeometry();
 
-    for (int i = 0; i < _meshStates.size(); i++) {
+    for (int i = 0; i < (int)_meshStates.size(); i++) {
         Model::MeshState& state = _meshStates[i];
         const FBXMesh& mesh = geometry.meshes.at(i);
         for (int j = 0; j < mesh.clusters.size(); j++) {
@@ -110,17 +112,6 @@ void CauterizedModel::updateClusterMatrices() {
             auto jointMatrix = _rig.getJointTransform(cluster.jointIndex);
             glm_mat4u_mul(jointMatrix, cluster.inverseBindMatrix, state.clusterMatrices[j]);
         }
-
-        // Once computed the cluster matrices, update the buffer(s)
-        if (mesh.clusters.size() > 1) {
-            if (!state.clusterBuffer) {
-                state.clusterBuffer = std::make_shared<gpu::Buffer>(state.clusterMatrices.size() * sizeof(glm::mat4),
-                                                                    (const gpu::Byte*) state.clusterMatrices.constData());
-            } else {
-                state.clusterBuffer->setSubData(0, state.clusterMatrices.size() * sizeof(glm::mat4),
-                                                (const gpu::Byte*) state.clusterMatrices.constData());
-            }
-        }
     }
 
     // as an optimization, don't build cautrizedClusterMatrices if the boneSet is empty.
@@ -143,17 +134,6 @@ void CauterizedModel::updateClusterMatrices() {
                 }
                 glm_mat4u_mul(jointMatrix, cluster.inverseBindMatrix, state.clusterMatrices[j]);
             }
-
-            if (!_cauterizeBoneSet.empty() && (state.clusterMatrices.size() > 1)) {
-                if (!state.clusterBuffer) {
-                    state.clusterBuffer =
-                        std::make_shared<gpu::Buffer>(state.clusterMatrices.size() * sizeof(glm::mat4),
-                                                      (const gpu::Byte*) state.clusterMatrices.constData());
-                } else {
-                    state.clusterBuffer->setSubData(0, state.clusterMatrices.size() * sizeof(glm::mat4),
-                                                              (const gpu::Byte*) state.clusterMatrices.constData());
-                }
-            }
         }
     }
 
@@ -181,11 +161,11 @@ void CauterizedModel::updateRenderItems() {
         // queue up this work for later processing, at the end of update and just before rendering.
         // the application will ensure only the last lambda is actually invoked.
         void* key = (void*)this;
-        std::weak_ptr<Model> weakSelf = shared_from_this();
-        AbstractViewStateInterface::instance()->pushPostUpdateLambda(key, [weakSelf, scale]() {
+        std::weak_ptr<CauterizedModel> weakSelf = std::dynamic_pointer_cast<CauterizedModel>(shared_from_this());
+        AbstractViewStateInterface::instance()->pushPostUpdateLambda(key, [weakSelf]() {
             // do nothing, if the model has already been destroyed.
             auto self = weakSelf.lock();
-            if (!self) {
+            if (!self || !self->isLoaded()) {
                 return;
             }
 
@@ -198,37 +178,28 @@ void CauterizedModel::updateRenderItems() {
             modelTransform.setTranslation(self->getTranslation());
             modelTransform.setRotation(self->getRotation());
 
-            Transform scaledModelTransform(modelTransform);
-            scaledModelTransform.setScale(scale);
-
-            uint32_t deleteGeometryCounter = self->getGeometryCounter();
-
             render::Transaction transaction;
-            QList<render::ItemID> keys = self->getRenderItems().keys();
-            foreach (auto itemID, keys) {
-                transaction.updateItem<CauterizedMeshPartPayload>(itemID, [modelTransform, deleteGeometryCounter](CauterizedMeshPartPayload& data) {
-                    ModelPointer model = data._model.lock();
-                    if (model && model->isLoaded()) {
-                        // Ensure the model geometry was not reset between frames
-                        if (deleteGeometryCounter == model->getGeometryCounter()) {
-                            // this stuff identical to what happens in regular Model
-                            const Model::MeshState& state = model->getMeshState(data._meshIndex);
-                            Transform renderTransform = modelTransform;
-                            if (state.clusterMatrices.size() == 1) {
-                                renderTransform = modelTransform.worldTransform(Transform(state.clusterMatrices[0]));
-                            }
-                            data.updateTransformForSkinnedMesh(renderTransform, modelTransform, state.clusterBuffer);
+            for (int i = 0; i < (int)self->_modelMeshRenderItemIDs.size(); i++) {
 
-                            // this stuff for cauterized mesh
-                            CauterizedModel* cModel = static_cast<CauterizedModel*>(model.get());
-                            const Model::MeshState& cState = cModel->getCauterizeMeshState(data._meshIndex);
-                            renderTransform = modelTransform;
-                            if (cState.clusterMatrices.size() == 1) {
-                                renderTransform = modelTransform.worldTransform(Transform(cState.clusterMatrices[0]));
-                            }
-                            data.updateTransformForCauterizedMesh(renderTransform, cState.clusterBuffer);
-                        }
+                auto itemID = self->_modelMeshRenderItemIDs[i];
+                auto meshIndex = self->_modelMeshRenderItemShapes[i].meshIndex;
+                auto clusterMatrices(self->getMeshState(meshIndex).clusterMatrices);
+                auto clusterMatricesCauterized(self->getCauterizeMeshState(meshIndex).clusterMatrices);
+
+                transaction.updateItem<CauterizedMeshPartPayload>(itemID, [modelTransform, clusterMatrices, clusterMatricesCauterized](CauterizedMeshPartPayload& data) {
+                    data.updateClusterBuffer(clusterMatrices, clusterMatricesCauterized);
+
+                    Transform renderTransform = modelTransform;
+                    if (clusterMatrices.size() == 1) {
+                        renderTransform = modelTransform.worldTransform(Transform(clusterMatrices[0]));
                     }
+                    data.updateTransformForSkinnedMesh(renderTransform, modelTransform);
+
+                    renderTransform = modelTransform;
+                    if (clusterMatricesCauterized.size() == 1) {
+                        renderTransform = modelTransform.worldTransform(Transform(clusterMatricesCauterized[0]));
+                    }
+                    data.updateTransformForCauterizedMesh(renderTransform);
                 });
             }
 
diff --git a/libraries/render-utils/src/DebugDeferredBuffer.cpp b/libraries/render-utils/src/DebugDeferredBuffer.cpp
index 8887de81ef..d334a53fa1 100644
--- a/libraries/render-utils/src/DebugDeferredBuffer.cpp
+++ b/libraries/render-utils/src/DebugDeferredBuffer.cpp
@@ -433,8 +433,9 @@ void DebugDeferredBuffer::run(const RenderContextPointer& renderContext, const I
         }
 
         auto lightStage = renderContext->_scene->getStage<LightStage>();
+        assert(lightStage);
         assert(lightStage->getNumLights() > 0);
-        auto lightAndShadow = lightStage->getLightAndShadow(0);
+        auto lightAndShadow = lightStage->getCurrentKeyLightAndShadow();
         const auto& globalShadow = lightAndShadow.second;
         if (globalShadow) {
             batch.setResourceTexture(Shadow, globalShadow->map);
diff --git a/libraries/render-utils/src/DeferredBufferRead.slh b/libraries/render-utils/src/DeferredBufferRead.slh
index 315de30fea..fbca241bb9 100644
--- a/libraries/render-utils/src/DeferredBufferRead.slh
+++ b/libraries/render-utils/src/DeferredBufferRead.slh
@@ -90,7 +90,7 @@ DeferredFragment unpackDeferredFragmentNoPositionNoAmbient(vec2 texcoord) {
     vec4 diffuseVal;
 
     DeferredFragment frag;
-    frag.depthVal = -1;
+    frag.depthVal = -1.0;
     normalVal = texture(normalMap, texcoord);
     diffuseVal = texture(albedoMap, texcoord);
 
diff --git a/libraries/render-utils/src/DeferredFrameTransform.cpp b/libraries/render-utils/src/DeferredFrameTransform.cpp
index b1166437db..baf523312c 100644
--- a/libraries/render-utils/src/DeferredFrameTransform.cpp
+++ b/libraries/render-utils/src/DeferredFrameTransform.cpp
@@ -39,7 +39,7 @@ void DeferredFrameTransform::update(RenderArgs* args) {
     args->getViewFrustum().evalProjectionMatrix(frameTransformBuffer.projectionMono);
 
     // Running in stero ?
-    bool isStereo = args->_context->isStereo();
+    bool isStereo = args->isStereo();
     if (!isStereo) {
         frameTransformBuffer.projection[0] = frameTransformBuffer.projectionMono;
         frameTransformBuffer.stereoInfo = glm::vec4(0.0f, (float)args->_viewport.z, 0.0f, 0.0f);
diff --git a/libraries/render-utils/src/DeferredFramebuffer.cpp b/libraries/render-utils/src/DeferredFramebuffer.cpp
index 64ea8f0342..2df89b8808 100644
--- a/libraries/render-utils/src/DeferredFramebuffer.cpp
+++ b/libraries/render-utils/src/DeferredFramebuffer.cpp
@@ -73,9 +73,9 @@ void DeferredFramebuffer::allocate() {
     _deferredFramebufferDepthColor->setDepthStencilBuffer(_primaryDepthTexture, depthFormat);
 
 
-    auto smoothSampler = gpu::Sampler(gpu::Sampler::FILTER_MIN_MAG_MIP_LINEAR);
+    auto smoothSampler = gpu::Sampler(gpu::Sampler::FILTER_MIN_MAG_LINEAR_MIP_POINT);
 
-    _lightingTexture = gpu::Texture::createRenderBuffer(gpu::Element(gpu::SCALAR, gpu::FLOAT, gpu::R11G11B10), width, height, gpu::Texture::SINGLE_MIP, defaultSampler);
+    _lightingTexture = gpu::Texture::createRenderBuffer(gpu::Element(gpu::SCALAR, gpu::FLOAT, gpu::R11G11B10), width, height, gpu::Texture::SINGLE_MIP, smoothSampler);
     _lightingFramebuffer = gpu::FramebufferPointer(gpu::Framebuffer::create("lighting"));
     _lightingFramebuffer->setRenderBuffer(0, _lightingTexture);
     _lightingFramebuffer->setDepthStencilBuffer(_primaryDepthTexture, depthFormat);
diff --git a/libraries/render-utils/src/DeferredGlobalLight.slh b/libraries/render-utils/src/DeferredGlobalLight.slh
index 57ca33eaca..f70daf1e77 100644
--- a/libraries/render-utils/src/DeferredGlobalLight.slh
+++ b/libraries/render-utils/src/DeferredGlobalLight.slh
@@ -101,6 +101,8 @@ vec3 albedo, vec3 fresnel, float metallic, float roughness
 <$declareDeferredCurvature()$>
 <@endif@>
 
+<@include Haze.slh@>
+
 vec3 evalSkyboxGlobalColor(mat4 invViewMat, float shadowAttenuation, float obscurance, vec3 position, vec3 normal,
     vec3 albedo, vec3 fresnel, float metallic, float roughness
 <@if supportScattering@>
@@ -120,7 +122,6 @@ vec3 evalSkyboxGlobalColor(mat4 invViewMat, float shadowAttenuation, float obscu
     color += ambientDiffuse;
     color += ambientSpecular;
 
-
     // Directional
     vec3 directionalDiffuse;
     vec3 directionalSpecular;
@@ -132,6 +133,56 @@ vec3 evalSkyboxGlobalColor(mat4 invViewMat, float shadowAttenuation, float obscu
     color += directionalDiffuse;
     color += directionalSpecular;
 
+    // Attenuate the light if haze effect selected
+    if ((hazeParams.hazeMode & HAZE_MODE_IS_KEYLIGHT_ATTENUATED) == HAZE_MODE_IS_KEYLIGHT_ATTENUATED) {
+        // Directional light attenuation is simulated by assuming the light source is at a fixed height above the
+        // fragment.  This height is where the haze density is reduced by 95% from the haze at the fragment's height
+        //
+        // The distance is computed from the height and the directional light orientation
+        // The distance is limited to height * 1,000, which gives an angle of ~0.057 degrees
+
+        // Get directional light
+        Light light = getLight();
+        vec3 lightDirection = getLightDirection(light);
+
+        // Height at which haze density is reduced by 95% (default set to 2000.0 for safety ,this should never happen)
+        float height_95p = 2000.0;
+        if (hazeParams.hazeKeyLightAltitudeFactor > 0.0f) {
+            height_95p = -log(0.05) / hazeParams.hazeKeyLightAltitudeFactor;
+        }
+
+        // Note that the sine will always be positive
+        float sin_pitch = sqrt(1.0 - lightDirection.y * lightDirection.y);
+            
+        float distance;
+        const float minimumSinPitch = 0.001;
+        if (sin_pitch < minimumSinPitch) {
+            distance = height_95p / minimumSinPitch;
+        } else {
+            distance = height_95p / sin_pitch;
+        }
+
+        // Position of fragment in world coordinates
+        vec4 worldFragPos = invViewMat * vec4(position, 0.0);
+
+        // Integration is from the fragment towards the light source
+        // Note that the haze base reference affects only the haze density as function of altitude
+        float hazeDensityDistribution =  
+            hazeParams.hazeKeyLightRangeFactor * 
+            exp(-hazeParams.hazeKeyLightAltitudeFactor * (worldFragPos.y - hazeParams.hazeBaseReference));
+
+        float hazeIntegral =  hazeDensityDistribution * distance;
+
+        // Note that t is constant and equal to -log(0.05)
+        //      float t = hazeParams.hazeAltitudeFactor * height_95p;
+        //      hazeIntegral *= (1.0 - exp (-t)) / t;
+        hazeIntegral *= 0.3171178;
+
+        float hazeAmount = 1.0 - exp(-hazeIntegral);
+
+        color = mix(color, vec3(0.0, 0.0, 0.0), hazeAmount);
+    }
+
     return color;
 }
 
diff --git a/libraries/render-utils/src/DeferredLightingEffect.cpp b/libraries/render-utils/src/DeferredLightingEffect.cpp
index 5f18916a92..646b19198b 100644
--- a/libraries/render-utils/src/DeferredLightingEffect.cpp
+++ b/libraries/render-utils/src/DeferredLightingEffect.cpp
@@ -76,7 +76,7 @@ enum DeferredShader_BufferSlot {
     LIGHT_CLUSTER_GRID_FRUSTUM_GRID_SLOT,
     LIGHT_CLUSTER_GRID_CLUSTER_GRID_SLOT,
     LIGHT_CLUSTER_GRID_CLUSTER_CONTENT_SLOT,
-
+    HAZE_MODEL_BUFFER_SLOT
 };
 
 static void loadLightProgram(const char* vertSource, const char* fragSource, bool lightVolume, gpu::PipelinePointer& program, LightLocationsPtr& locations);
@@ -105,13 +105,13 @@ void DeferredLightingEffect::setupKeyLightBatch(const RenderArgs* args, gpu::Bat
     PerformanceTimer perfTimer("DLE->setupBatch()");
     model::LightPointer keySunLight;
     auto lightStage = args->_scene->getStage<LightStage>();
-    if (lightStage && lightStage->_currentFrame._sunLights.size()) {
-        keySunLight = lightStage->getLight(lightStage->_currentFrame._sunLights.front());
+    if (lightStage) {
+        keySunLight = lightStage->getCurrentKeyLight();
     }
 
     model::LightPointer keyAmbiLight;
-    if (lightStage && lightStage->_currentFrame._ambientLights.size()) {
-        keyAmbiLight = lightStage->getLight(lightStage->_currentFrame._ambientLights.front());
+    if (lightStage) {
+        keyAmbiLight = lightStage->getCurrentAmbientLight();
     }
 
     if (keySunLight) {
@@ -169,6 +169,7 @@ static gpu::ShaderPointer makeLightProgram(const char* vertSource, const char* f
     slotBindings.insert(gpu::Shader::Binding(std::string("cameraCorrectionBuffer"), CAMERA_CORRECTION_BUFFER_SLOT));
     slotBindings.insert(gpu::Shader::Binding(std::string("deferredFrameTransformBuffer"), DEFERRED_FRAME_TRANSFORM_BUFFER_SLOT));
     slotBindings.insert(gpu::Shader::Binding(std::string("lightingModelBuffer"), LIGHTING_MODEL_BUFFER_SLOT));
+    slotBindings.insert(gpu::Shader::Binding(std::string("hazeBuffer"), HAZE_MODEL_BUFFER_SLOT));
     slotBindings.insert(gpu::Shader::Binding(std::string("subsurfaceScatteringParametersBuffer"), SCATTERING_PARAMETERS_BUFFER_SLOT));
     slotBindings.insert(gpu::Shader::Binding(std::string("lightBuffer"), LIGHT_GPU_SLOT));
     slotBindings.insert(gpu::Shader::Binding(std::string("lightAmbientBuffer"), LIGHT_AMBIENT_SLOT));
@@ -420,7 +421,7 @@ void PrepareDeferred::run(const RenderContextPointer& renderContext, const Input
             gpu::Framebuffer::BUFFER_COLOR0 | gpu::Framebuffer::BUFFER_COLOR1 | gpu::Framebuffer::BUFFER_COLOR2 | gpu::Framebuffer::BUFFER_COLOR3 |
             gpu::Framebuffer::BUFFER_DEPTH |
             gpu::Framebuffer::BUFFER_STENCIL,
-            vec4(vec3(0), 0), 1.0, 1, true);
+            vec4(vec3(0), 0), 1.0, 0, true);
 
         // For the rest of the rendering, bind the lighting model
         batch.setUniformBuffer(LIGHTING_MODEL_BUFFER_SLOT, lightingModel->getParametersBuffer());
@@ -429,6 +430,7 @@ void PrepareDeferred::run(const RenderContextPointer& renderContext, const Input
     
     // Prepare a fresh Light Frame
     auto lightStage = renderContext->_scene->getStage<LightStage>();
+    assert(lightStage);
     lightStage->_currentFrame.clear();
 }
 
@@ -437,6 +439,7 @@ void RenderDeferredSetup::run(const render::RenderContextPointer& renderContext,
     const DeferredFrameTransformPointer& frameTransform,
     const DeferredFramebufferPointer& deferredFramebuffer,
     const LightingModelPointer& lightingModel,
+    const model::HazePointer& haze,
     const SurfaceGeometryFramebufferPointer& surfaceGeometryFramebuffer,
     const AmbientOcclusionFramebufferPointer& ambientOcclusionFramebuffer,
     const SubsurfaceScatteringResourcePointer& subsurfaceScatteringResource) {
@@ -493,8 +496,9 @@ void RenderDeferredSetup::run(const render::RenderContextPointer& renderContext,
         // Global directional light and ambient pass
 
         auto lightStage = renderContext->_scene->getStage<LightStage>();
+        assert(lightStage);
         assert(lightStage->getNumLights() > 0);
-        auto lightAndShadow = lightStage->getLightAndShadow(0);
+        auto lightAndShadow = lightStage->getCurrentKeyLightAndShadow();
         const auto& globalShadow = lightAndShadow.second;
 
         // Bind the shadow buffer
@@ -505,14 +509,21 @@ void RenderDeferredSetup::run(const render::RenderContextPointer& renderContext,
         auto& program = deferredLightingEffect->_directionalSkyboxLight;
         LightLocationsPtr locations = deferredLightingEffect->_directionalSkyboxLightLocations;
 
-        auto keyLight = lightStage->getLight(0);
+        auto keyLight = lightAndShadow.first;
+
+        model::LightPointer keyAmbientLight;
+        if (lightStage && lightStage->_currentFrame._ambientLights.size()) {
+            keyAmbientLight = lightStage->getLight(lightStage->_currentFrame._ambientLights.front());
+        }
+        bool hasAmbientMap = (keyAmbientLight != nullptr);
 
         // Setup the global directional pass pipeline
         {
             if (deferredLightingEffect->_shadowMapEnabled) {
+
                 // If the keylight has an ambient Map then use the Skybox version of the pass
                 // otherwise use the ambient sphere version
-                if (keyLight->getAmbientMap()) {
+                if (hasAmbientMap) {
                     program = deferredLightingEffect->_directionalSkyboxLightShadow;
                     locations = deferredLightingEffect->_directionalSkyboxLightShadowLocations;
                 } else {
@@ -522,7 +533,7 @@ void RenderDeferredSetup::run(const render::RenderContextPointer& renderContext,
             } else {
                 // If the keylight has an ambient Map then use the Skybox version of the pass
                 // otherwise use the ambient sphere version
-                if (keyLight->getAmbientMap()) {
+                if (hasAmbientMap) {
                     program = deferredLightingEffect->_directionalSkyboxLight;
                     locations = deferredLightingEffect->_directionalSkyboxLightLocations;
                 } else {
@@ -536,6 +547,7 @@ void RenderDeferredSetup::run(const render::RenderContextPointer& renderContext,
                     batch.setUniformBuffer(locations->shadowTransformBuffer, globalShadow->getBuffer());
                 }
             }
+
             batch.setPipeline(program);
         }
 
@@ -545,7 +557,12 @@ void RenderDeferredSetup::run(const render::RenderContextPointer& renderContext,
 
         // Setup the global lighting
         deferredLightingEffect->setupKeyLightBatch(args, batch, locations->lightBufferUnit, locations->ambientBufferUnit, SKYBOX_MAP_UNIT);
-        
+
+        // Haze
+        if (haze) {
+	        batch.setUniformBuffer(HAZE_MODEL_BUFFER_SLOT, haze->getHazeParametersBuffer());
+        }
+		
         batch.draw(gpu::TRIANGLE_STRIP, 4);
 
         deferredLightingEffect->unsetKeyLightBatch(batch, locations->lightBufferUnit, locations->ambientBufferUnit, SKYBOX_MAP_UNIT);
@@ -564,7 +581,8 @@ void RenderDeferredLocals::run(const render::RenderContextPointer& renderContext
     const DeferredFrameTransformPointer& frameTransform,
     const DeferredFramebufferPointer& deferredFramebuffer,
     const LightingModelPointer& lightingModel,
-    const SurfaceGeometryFramebufferPointer& surfaceGeometryFramebuffer, const LightClustersPointer& lightClusters) {
+    const SurfaceGeometryFramebufferPointer& surfaceGeometryFramebuffer, 
+    const LightClustersPointer& lightClusters) {
 
     bool points = lightingModel->isPointLightEnabled();
     bool spots = lightingModel->isSpotLightEnabled();
@@ -602,7 +620,7 @@ void RenderDeferredLocals::run(const render::RenderContextPointer& renderContext
         auto& lightIndices = lightClusters->_visibleLightIndices;
         if (!lightIndices.empty() && lightIndices[0] > 0) {
             // Bind the global list of lights and the visible lights this frame
-            batch.setUniformBuffer(deferredLightingEffect->_localLightLocations->lightBufferUnit, lightClusters->_lightStage->_lightArrayBuffer);
+            batch.setUniformBuffer(deferredLightingEffect->_localLightLocations->lightBufferUnit, lightClusters->_lightStage->getLightArrayBuffer());
 
             batch.setUniformBuffer(LIGHT_CLUSTER_GRID_FRUSTUM_GRID_SLOT, lightClusters->_frustumGridBuffer);
             batch.setUniformBuffer(LIGHT_CLUSTER_GRID_CLUSTER_GRID_SLOT, lightClusters->_clusterGridBuffer);
@@ -673,6 +691,8 @@ void RenderDeferred::run(const RenderContextPointer& renderContext, const Inputs
     auto lightClusters = inputs.get6();
     auto args = renderContext->args;
 
+    const auto haze = inputs.get7();
+
     if (!_gpuTimer) {
         _gpuTimer = std::make_shared < gpu::RangeTimer>(__FUNCTION__);
     }
@@ -682,7 +702,7 @@ void RenderDeferred::run(const RenderContextPointer& renderContext, const Inputs
     args->_batch = &batch;
      _gpuTimer->begin(batch);
 
-    setupJob.run(renderContext, deferredTransform, deferredFramebuffer, lightingModel, surfaceGeometryFramebuffer, ssaoFramebuffer, subsurfaceScatteringResource);
+    setupJob.run(renderContext, deferredTransform, deferredFramebuffer, lightingModel, haze, surfaceGeometryFramebuffer, ssaoFramebuffer, subsurfaceScatteringResource);
     
     lightsJob.run(renderContext, deferredTransform, deferredFramebuffer, lightingModel, surfaceGeometryFramebuffer, lightClusters);
 
@@ -740,8 +760,8 @@ void DefaultLightingSetup::run(const RenderContextPointer& renderContext) {
             _defaultLight = lp;
 
             // Add the global light to the light stage (for later shadow rendering)
-            auto defaultLightID = lightStage->addLight(lp);
-            lightStage->addShadow(defaultLightID);
+            _defaultLightID = lightStage->addLight(lp);
+            lightStage->addShadow(_defaultLightID);
         }
 
         auto backgroundStage = renderContext->_scene->getStage<BackgroundStage>();
@@ -754,7 +774,18 @@ void DefaultLightingSetup::run(const RenderContextPointer& renderContext) {
             _defaultBackground = background;
 
             // Add the global light to the light stage (for later shadow rendering)
-            auto defaultBackgroundID = backgroundStage->addBackground(_defaultBackground);
+            _defaultBackgroundID = backgroundStage->addBackground(_defaultBackground);
+        }
+    }
+
+    if (!_defaultHaze) {
+        auto hazeStage = renderContext->_scene->getStage<HazeStage>();
+        if (hazeStage) {
+
+            auto haze = std::make_shared<model::Haze>();
+
+            _defaultHaze = haze;
+            _defaultHazeID = hazeStage->addHaze(_defaultHaze);
         }
     }
 }
diff --git a/libraries/render-utils/src/DeferredLightingEffect.h b/libraries/render-utils/src/DeferredLightingEffect.h
index 7fc9600d18..212d17db12 100644
--- a/libraries/render-utils/src/DeferredLightingEffect.h
+++ b/libraries/render-utils/src/DeferredLightingEffect.h
@@ -31,6 +31,7 @@
 #include "LightStage.h"
 #include "LightClusters.h"
 #include "BackgroundStage.h"
+#include "HazeStage.h"
 
 #include "SurfaceGeometryPass.h"
 #include "SubsurfaceScattering.h"
@@ -120,6 +121,7 @@ public:
         const DeferredFrameTransformPointer& frameTransform,
         const DeferredFramebufferPointer& deferredFramebuffer,
         const LightingModelPointer& lightingModel,
+        const model::HazePointer& haze,
         const SurfaceGeometryFramebufferPointer& surfaceGeometryFramebuffer,
         const AmbientOcclusionFramebufferPointer& ambientOcclusionFramebuffer,
         const SubsurfaceScatteringResourcePointer& subsurfaceScatteringResource);
@@ -154,7 +156,10 @@ using RenderDeferredConfig = render::GPUJobConfig;
 
 class RenderDeferred {
 public:
-    using Inputs = render::VaryingSet7 < DeferredFrameTransformPointer, DeferredFramebufferPointer, LightingModelPointer, SurfaceGeometryFramebufferPointer, AmbientOcclusionFramebufferPointer, SubsurfaceScatteringResourcePointer, LightClustersPointer>;
+    using Inputs = render::VaryingSet8 < 
+        DeferredFrameTransformPointer, DeferredFramebufferPointer, LightingModelPointer, SurfaceGeometryFramebufferPointer, 
+        AmbientOcclusionFramebufferPointer, SubsurfaceScatteringResourcePointer, LightClustersPointer, model::HazePointer>;
+
     using Config = RenderDeferredConfig;
     using JobModel = render::Job::ModelI<RenderDeferred, Inputs, Config>;
 
@@ -180,7 +185,11 @@ public:
 
 protected:
     model::LightPointer _defaultLight;
+    LightStage::Index _defaultLightID{ LightStage::INVALID_INDEX };
     model::SunSkyStagePointer _defaultBackground;
+    BackgroundStage::Index _defaultBackgroundID{ BackgroundStage::INVALID_INDEX };
+    model::HazePointer _defaultHaze{ nullptr };
+    HazeStage::Index _defaultHazeID{ HazeStage::INVALID_INDEX };
     model::SkyboxPointer _defaultSkybox { new ProceduralSkybox() };
     gpu::TexturePointer _defaultSkyboxTexture;
     gpu::TexturePointer _defaultSkyboxAmbientTexture;
diff --git a/libraries/render-utils/src/DrawHaze.cpp b/libraries/render-utils/src/DrawHaze.cpp
new file mode 100644
index 0000000000..4431c1bbc3
--- /dev/null
+++ b/libraries/render-utils/src/DrawHaze.cpp
@@ -0,0 +1,191 @@
+//
+//  DrawHaze.cpp
+//  libraries/render-utils/src
+//
+//  Created by Nissim Hadar on 9/1/2017.
+//  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 "DrawHaze.h"
+
+#include <gpu/Context.h>
+#include <gpu/StandardShaderLib.h>
+
+#include "StencilMaskPass.h"
+#include "FramebufferCache.h"
+#include "HazeStage.h"
+#include "LightStage.h"
+
+#include "Haze_frag.h"
+
+void HazeConfig::setHazeColor(const glm::vec3 value) { 
+    hazeColor = value; 
+}
+
+void HazeConfig::setHazeGlareAngle(const float value) {
+    hazeGlareAngle = value; 
+}
+
+void HazeConfig::setHazeGlareColor(const glm::vec3 value) {
+    hazeGlareColor = value; 
+}
+
+void HazeConfig::setHazeBaseReference(const float value) { 
+    hazeBaseReference = value; 
+}
+
+void HazeConfig::setHazeActive(const bool active) { 
+    isHazeActive = active; 
+}
+
+void HazeConfig::setAltitudeBased(const bool active) { 
+    isAltitudeBased = active; 
+}
+
+void HazeConfig::setHazeAttenuateKeyLight(const bool active) { 
+    isHazeAttenuateKeyLight = active;
+}
+
+void HazeConfig::setModulateColorActive(const bool active) { 
+    isModulateColorActive = active; 
+}
+
+void HazeConfig::setHazeEnableGlare(const bool active) {
+    isHazeEnableGlare = active;
+}
+
+void HazeConfig::setHazeRange(const float value) { 
+    hazeRange = value;
+}
+
+void HazeConfig::setHazeAltitude(const float value) {
+    hazeHeight = value; 
+}
+
+void HazeConfig::setHazeKeyLightRange(const float value) { 
+    hazeKeyLightRange = value;
+}
+
+void HazeConfig::setHazeKeyLightAltitude(const float value) {
+    hazeKeyLightAltitude = value;
+}
+
+void HazeConfig::setHazeBackgroundBlend(const float value) {
+    hazeBackgroundBlend = value;
+}
+
+MakeHaze::MakeHaze() {
+    _haze = std::make_shared<model::Haze>();
+}
+
+void MakeHaze::configure(const Config& config) {
+    _haze->setHazeColor(config.hazeColor);
+    _haze->setHazeGlareBlend(model::Haze::convertGlareAngleToPower(config.hazeGlareAngle));
+
+    _haze->setHazeGlareColor(config.hazeGlareColor);
+    _haze->setHazeBaseReference(config.hazeBaseReference);
+
+    _haze->setHazeActive(config.isHazeActive);
+    _haze->setAltitudeBased(config.isAltitudeBased);
+    _haze->setHazeAttenuateKeyLight(config.isHazeAttenuateKeyLight);
+    _haze->setModulateColorActive(config.isModulateColorActive);
+    _haze->setHazeEnableGlare(config.isHazeEnableGlare);
+
+    _haze->setHazeRangeFactor(model::Haze::convertHazeRangeToHazeRangeFactor(config.hazeRange));
+    _haze->setHazeAltitudeFactor(model::Haze::convertHazeAltitudeToHazeAltitudeFactor(config.hazeHeight));
+
+    _haze->setHazeKeyLightRangeFactor(model::Haze::convertHazeRangeToHazeRangeFactor(config.hazeKeyLightRange));
+    _haze->setHazeKeyLightAltitudeFactor(model::Haze::convertHazeAltitudeToHazeAltitudeFactor(config.hazeKeyLightAltitude));
+
+    _haze->setHazeBackgroundBlend(config.hazeBackgroundBlend);
+}
+
+void MakeHaze::run(const render::RenderContextPointer& renderContext, model::HazePointer& haze) {
+    haze = _haze;
+}
+
+const int HazeEffect_ParamsSlot = 0;
+const int HazeEffect_TransformBufferSlot = 1;
+const int HazeEffect_ColorMapSlot = 2;
+const int HazeEffect_LinearDepthMapSlot = 3;
+const int HazeEffect_LightingMapSlot = 4;
+
+void DrawHaze::configure(const Config& config) {
+}
+
+void DrawHaze::run(const render::RenderContextPointer& renderContext, const Inputs& inputs) {
+    const auto haze = inputs.get0();
+    if (haze == nullptr) {
+        return;
+    }
+
+    const auto inputBuffer = inputs.get1()->getRenderBuffer(0);
+    const auto framebuffer = inputs.get2();
+    const auto transformBuffer = inputs.get3();
+
+    auto outputBuffer = inputs.get4();
+
+    auto depthBuffer = framebuffer->getLinearDepthTexture();
+
+    RenderArgs* args = renderContext->args;
+
+    if (!_hazePipeline) {
+        gpu::ShaderPointer ps = gpu::Shader::createPixel(std::string(Haze_frag));
+        gpu::ShaderPointer vs = gpu::StandardShaderLib::getDrawViewportQuadTransformTexcoordVS();
+
+        gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
+        gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+
+        // Mask out haze on the tablet
+        PrepareStencil::testMask(*state);
+
+        gpu::Shader::BindingSet slotBindings;
+        slotBindings.insert(gpu::Shader::Binding(std::string("hazeBuffer"), HazeEffect_ParamsSlot));
+        slotBindings.insert(gpu::Shader::Binding(std::string("deferredFrameTransformBuffer"), HazeEffect_TransformBufferSlot));
+        slotBindings.insert(gpu::Shader::Binding(std::string("colorMap"), HazeEffect_ColorMapSlot));
+        slotBindings.insert(gpu::Shader::Binding(std::string("linearDepthMap"), HazeEffect_LinearDepthMapSlot));
+        slotBindings.insert(gpu::Shader::Binding(std::string("lightBuffer"), HazeEffect_LightingMapSlot));
+        gpu::Shader::makeProgram(*program, slotBindings);
+
+        _hazePipeline = gpu::PipelinePointer(gpu::Pipeline::create(program, state));
+    }
+
+    auto sourceFramebufferSize = glm::ivec2(inputBuffer->getDimensions());
+
+    gpu::doInBatch(args->_context, [&](gpu::Batch& batch) {
+        batch.enableStereo(false);
+        batch.setFramebuffer(outputBuffer);
+
+        batch.setViewportTransform(args->_viewport);
+        batch.setProjectionTransform(glm::mat4());
+        batch.resetViewTransform();
+        batch.setModelTransform(gpu::Framebuffer::evalSubregionTexcoordTransform(sourceFramebufferSize, args->_viewport));
+
+        batch.setPipeline(_hazePipeline);
+
+        auto hazeStage = args->_scene->getStage<HazeStage>();
+        if (hazeStage && hazeStage->_currentFrame._hazes.size() > 0) {
+            model::HazePointer hazePointer = hazeStage->getHaze(hazeStage->_currentFrame._hazes.front());
+            batch.setUniformBuffer(HazeEffect_ParamsSlot, hazePointer->getHazeParametersBuffer());
+        }
+
+        batch.setUniformBuffer(HazeEffect_TransformBufferSlot, transformBuffer->getFrameTransformBuffer());
+
+	    auto lightStage = args->_scene->getStage<LightStage>();
+	    if (lightStage) {
+	        model::LightPointer keyLight;
+	        keyLight = lightStage->getCurrentKeyLight();
+	        if (keyLight != nullptr) {
+	            batch.setUniformBuffer(HazeEffect_LightingMapSlot, keyLight->getLightSchemaBuffer());
+	        }
+	    }
+
+        batch.setResourceTexture(HazeEffect_ColorMapSlot, inputBuffer);
+        batch.setResourceTexture(HazeEffect_LinearDepthMapSlot, depthBuffer);
+
+        batch.draw(gpu::TRIANGLE_STRIP, 4);
+    });
+}
diff --git a/libraries/render-utils/src/DrawHaze.h b/libraries/render-utils/src/DrawHaze.h
new file mode 100644
index 0000000000..f158daa0c6
--- /dev/null
+++ b/libraries/render-utils/src/DrawHaze.h
@@ -0,0 +1,173 @@
+//
+//  DrawHaze.h
+//  libraries/render-utils/src
+//
+//  Created by Nissim Hadar on 9/1/2017.
+//  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_render_utils_DrawHaze_h
+#define hifi_render_utils_DrawHaze_h
+
+#include <DependencyManager.h>
+#include <NumericalConstants.h>
+
+#include <gpu/Resource.h>
+#include <gpu/Pipeline.h>
+#include <render/Forward.h>
+#include <render/DrawTask.h>
+#include <model/Haze.h>
+
+#include "SurfaceGeometryPass.h"
+
+using LinearDepthFramebufferPointer = std::shared_ptr<LinearDepthFramebuffer>;
+
+class MakeHazeConfig : public render::Job::Config {
+    Q_OBJECT
+
+    Q_PROPERTY(glm::vec3 hazeColor MEMBER hazeColor WRITE setHazeColor NOTIFY dirty);
+    Q_PROPERTY(float hazeGlareAngle MEMBER hazeGlareAngle WRITE setHazeGlareAngle NOTIFY dirty);
+
+    Q_PROPERTY(glm::vec3 hazeGlareColor MEMBER hazeGlareColor WRITE setHazeGlareColor NOTIFY dirty);
+    Q_PROPERTY(float hazeBaseReference MEMBER hazeBaseReference WRITE setHazeBaseReference NOTIFY dirty);
+
+    Q_PROPERTY(bool isHazeActive MEMBER isHazeActive WRITE setHazeActive NOTIFY dirty);
+    Q_PROPERTY(bool isAltitudeBased MEMBER isAltitudeBased WRITE setAltitudeBased NOTIFY dirty);
+    Q_PROPERTY(bool isHazeAttenuateKeyLight MEMBER isHazeAttenuateKeyLight WRITE setHazeAttenuateKeyLight NOTIFY dirty);
+    Q_PROPERTY(bool isModulateColorActive MEMBER isModulateColorActive WRITE setModulateColorActive NOTIFY dirty);
+    Q_PROPERTY(bool isHazeEnableGlare MEMBER isHazeEnableGlare WRITE setHazeEnableGlare NOTIFY dirty);
+
+    Q_PROPERTY(float hazeRange MEMBER hazeRange WRITE setHazeRange NOTIFY dirty);
+    Q_PROPERTY(float hazeHeight MEMBER hazeHeight WRITE setHazeAltitude NOTIFY dirty);
+
+    Q_PROPERTY(float hazeKeyLightRange MEMBER hazeKeyLightRange WRITE setHazeKeyLightRange NOTIFY dirty);
+    Q_PROPERTY(float hazeKeyLightAltitude MEMBER hazeKeyLightAltitude WRITE setHazeKeyLightAltitude NOTIFY dirty);
+
+    Q_PROPERTY(float hazeBackgroundBlend MEMBER hazeBackgroundBlend WRITE setHazeBackgroundBlend NOTIFY dirty);
+
+public:
+    MakeHazeConfig() : render::Job::Config() {}
+
+    glm::vec3 hazeColor{ model::Haze::INITIAL_HAZE_COLOR };
+    float hazeGlareAngle{ model::Haze::INITIAL_HAZE_GLARE_ANGLE };
+
+    glm::vec3 hazeGlareColor{ model::Haze::INITIAL_HAZE_GLARE_COLOR };
+    float hazeBaseReference{ model::Haze::INITIAL_HAZE_BASE_REFERENCE };
+
+    bool isHazeActive{ false };
+    bool isAltitudeBased{ false };
+    bool isHazeAttenuateKeyLight{ false };
+    bool isModulateColorActive{ false };
+    bool isHazeEnableGlare{ false };
+
+    float hazeRange{ model::Haze::INITIAL_HAZE_RANGE };
+    float hazeHeight{ model::Haze::INITIAL_HAZE_HEIGHT };
+
+    float hazeKeyLightRange{ model::Haze::INITIAL_KEY_LIGHT_RANGE };
+    float hazeKeyLightAltitude{ model::Haze::INITIAL_KEY_LIGHT_ALTITUDE };
+
+    float hazeBackgroundBlend{ model::Haze::INITIAL_HAZE_BACKGROUND_BLEND };
+
+public slots:
+    void setHazeColor(const glm::vec3 value) { hazeColor = value; emit dirty(); }
+    void setHazeGlareAngle(const float value) { hazeGlareAngle = value; emit dirty(); }
+
+    void setHazeGlareColor(const glm::vec3 value) { hazeGlareColor = value; emit dirty(); }
+    void setHazeBaseReference(const float value) { hazeBaseReference = value; ; emit dirty(); }
+
+    void setHazeActive(const bool active) { isHazeActive = active; emit dirty(); }
+    void setAltitudeBased(const bool active) { isAltitudeBased = active; emit dirty(); }
+    void setHazeAttenuateKeyLight(const bool active) { isHazeAttenuateKeyLight = active; emit dirty(); }
+    void setModulateColorActive(const bool active) { isModulateColorActive = active; emit dirty(); }
+    void setHazeEnableGlare(const bool active) { isHazeEnableGlare = active; emit dirty(); }
+
+    void setHazeRange(const float value) { hazeRange = value; emit dirty(); }
+    void setHazeAltitude(const float value) { hazeHeight = value; emit dirty(); }
+
+    void setHazeKeyLightRange(const float value) { hazeKeyLightRange = value; emit dirty(); }
+    void setHazeKeyLightAltitude(const float value) { hazeKeyLightAltitude = value; emit dirty(); }
+
+    void setHazeBackgroundBlend(const float value) { hazeBackgroundBlend = value; ; emit dirty(); }
+
+signals:
+    void dirty();
+};
+
+class MakeHaze {
+public:
+    using Config = MakeHazeConfig;
+    using JobModel = render::Job::ModelO<MakeHaze, model::HazePointer, Config>;
+
+    MakeHaze();
+
+    void configure(const Config& config);
+    void run(const render::RenderContextPointer& renderContext, model::HazePointer& haze);
+
+private:
+    model::HazePointer _haze;
+};
+
+class HazeConfig : public render::Job::Config {
+public:
+    HazeConfig() : render::Job::Config(true) {}
+
+    // attributes
+    glm::vec3 hazeColor{ model::Haze::INITIAL_HAZE_COLOR };
+    float hazeGlareAngle{ model::Haze::INITIAL_HAZE_GLARE_ANGLE };
+
+    glm::vec3 hazeGlareColor{ model::Haze::INITIAL_HAZE_GLARE_COLOR };
+    float hazeBaseReference{ model::Haze::INITIAL_HAZE_BASE_REFERENCE };
+
+    bool isHazeActive{ false };   // Setting this to true will set haze to on
+    bool isAltitudeBased{ false };
+    bool isHazeAttenuateKeyLight{ false };
+    bool isModulateColorActive{ false };
+    bool isHazeEnableGlare{ false };
+
+    float hazeRange{ model::Haze::INITIAL_HAZE_RANGE };
+    float hazeHeight{ model::Haze::INITIAL_HAZE_HEIGHT };
+
+    float hazeKeyLightRange{ model::Haze::INITIAL_KEY_LIGHT_RANGE };
+    float hazeKeyLightAltitude{ model::Haze::INITIAL_KEY_LIGHT_ALTITUDE };
+
+    float hazeBackgroundBlend{ model::Haze::INITIAL_HAZE_BACKGROUND_BLEND };
+
+    // methods
+    void setHazeColor(const glm::vec3 value);
+    void setHazeGlareAngle(const float value);
+
+    void setHazeGlareColor(const glm::vec3 value);
+    void setHazeBaseReference(const float value);
+
+    void setHazeActive(const bool active);
+    void setAltitudeBased(const bool active);
+    void setHazeAttenuateKeyLight(const bool active);
+    void setModulateColorActive(const bool active);
+    void setHazeEnableGlare(const bool active);
+
+    void setHazeRange(const float value);
+    void setHazeAltitude(const float value);
+
+    void setHazeKeyLightRange(const float value);
+    void setHazeKeyLightAltitude(const float value);
+
+    void setHazeBackgroundBlend(const float value);
+};
+
+class DrawHaze {
+public:
+    using Inputs = render::VaryingSet5<model::HazePointer, gpu::FramebufferPointer, LinearDepthFramebufferPointer, DeferredFrameTransformPointer, gpu::FramebufferPointer>;
+    using Config = HazeConfig;
+    using JobModel = render::Job::ModelI<DrawHaze, Inputs, Config>;
+
+    void configure(const Config& config);
+    void run(const render::RenderContextPointer& renderContext, const Inputs& inputs);
+
+private:
+    gpu::PipelinePointer _hazePipeline;
+};
+
+#endif // hifi_render_utils_DrawHaze_h
diff --git a/libraries/render-utils/src/Fade.slh b/libraries/render-utils/src/Fade.slh
new file mode 100644
index 0000000000..b85a824ca3
--- /dev/null
+++ b/libraries/render-utils/src/Fade.slh
@@ -0,0 +1,169 @@
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  Created by Olivier Prat on 04/12/17.
+//  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
+//
+<@if not FADE_SLH@>
+<@def FADE_SLH@>
+
+<@func declareFadeFragmentCommon()@>
+
+
+#define CATEGORY_COUNT    5
+
+<@include Fade_shared.slh@>
+
+layout(std140) uniform fadeParametersBuffer {
+    FadeParameters fadeParameters[CATEGORY_COUNT];
+};
+uniform sampler2D fadeMaskMap;
+
+struct FadeObjectParams {
+    int category;
+    float threshold;
+    vec3 noiseOffset;
+    vec3 baseOffset;
+    vec3 baseInvSize;
+};
+
+vec2 hash2D(vec3 position) {
+    return position.xy* vec2(0.1677,  0.221765) + position.z*0.561;
+}
+
+float noise3D(vec3 position) {
+    float n = textureLod(fadeMaskMap, hash2D(position), 0).r;
+    return pow(n, 1.0/2.2); // Remove sRGB. Need to fix this later directly in the texture
+}
+
+float evalFadeNoiseGradient(FadeObjectParams params, vec3 position) {
+    // Do tri-linear interpolation
+    vec3    noisePosition = position * fadeParameters[params.category]._noiseInvSizeAndLevel.xyz + params.noiseOffset;
+    vec3    noisePositionFloored = floor(noisePosition);
+    vec3    noisePositionFraction = fract(noisePosition);
+
+    noisePositionFraction = noisePositionFraction*noisePositionFraction*(3 - 2*noisePositionFraction);
+
+    float   noiseLowXLowYLowZ = noise3D(noisePositionFloored);
+    float   noiseLowXHighYLowZ = noise3D(noisePositionFloored+vec3(0,1,0));
+    float   noiseHighXLowYLowZ = noise3D(noisePositionFloored+vec3(1,0,0));
+    float   noiseHighXHighYLowZ = noise3D(noisePositionFloored+vec3(1,1,0));
+    float   noiseLowXLowYHighZ = noise3D(noisePositionFloored+vec3(0,0,1));
+    float   noiseLowXHighYHighZ = noise3D(noisePositionFloored+vec3(0,1,1));
+    float   noiseHighXLowYHighZ = noise3D(noisePositionFloored+vec3(1,0,1));
+    float   noiseHighXHighYHighZ = noise3D(noisePositionFloored+vec3(1,1,1));
+    vec4    maskLowZ = vec4(noiseLowXLowYLowZ, noiseLowXHighYLowZ, noiseHighXLowYLowZ, noiseHighXHighYLowZ);
+    vec4    maskHighZ = vec4(noiseLowXLowYHighZ, noiseLowXHighYHighZ, noiseHighXLowYHighZ, noiseHighXHighYHighZ);
+    vec4    maskXY = mix(maskLowZ, maskHighZ, noisePositionFraction.z);
+    vec2    maskY = mix(maskXY.xy, maskXY.zw, noisePositionFraction.x);
+
+    float noise = mix(maskY.x, maskY.y, noisePositionFraction.y);
+    noise -= 0.5;   // Center on value 0
+    return noise * fadeParameters[params.category]._noiseInvSizeAndLevel.w;
+}
+
+float evalFadeBaseGradient(FadeObjectParams params, vec3 position) {
+    float gradient = length((position - params.baseOffset) * params.baseInvSize.xyz);
+    gradient = gradient-0.5;  // Center on value 0.5
+    gradient *= fadeParameters[params.category]._baseLevel;
+    return gradient;
+}
+
+float evalFadeGradient(FadeObjectParams params, vec3 position) {
+    float baseGradient = evalFadeBaseGradient(params, position);
+    float noiseGradient = evalFadeNoiseGradient(params, position);
+    float gradient = noiseGradient+baseGradient+0.5;
+
+    return gradient;
+}
+
+float evalFadeAlpha(FadeObjectParams params, vec3 position) {
+    return evalFadeGradient(params, position)-params.threshold;
+}
+
+void applyFadeClip(FadeObjectParams params, vec3 position) {
+    if (evalFadeAlpha(params, position) < 0) {
+        discard;
+    }
+}
+
+void applyFade(FadeObjectParams params, vec3 position, out vec3 emissive) {
+    float alpha = evalFadeAlpha(params, position);
+    if (fadeParameters[params.category]._isInverted!=0) {
+        alpha = -alpha;
+    }
+
+    if (alpha < 0) {
+        discard;
+    }
+    
+    float edgeMask = alpha * fadeParameters[params.category]._edgeWidthInvWidth.y;
+    float edgeAlpha = 1.0-clamp(edgeMask, 0, 1);
+
+    edgeMask = step(edgeMask, 1.f);
+    edgeAlpha *= edgeAlpha; // Square to have a nice ease out
+    vec4 color = mix(fadeParameters[params.category]._innerEdgeColor, fadeParameters[params.category]._outerEdgeColor, edgeAlpha);
+    emissive = color.rgb * edgeMask * color.a;
+}
+
+<@endfunc@>
+
+<@func declareFadeFragmentUniform()@>
+
+uniform int fadeCategory;
+uniform vec3 fadeNoiseOffset;
+uniform vec3 fadeBaseOffset;
+uniform vec3 fadeBaseInvSize;
+uniform float fadeThreshold;
+
+<@endfunc@>
+
+<@func fetchFadeObjectParams(fadeParams)@>
+    <$fadeParams$>.category = fadeCategory;
+    <$fadeParams$>.threshold = fadeThreshold;
+    <$fadeParams$>.noiseOffset = fadeNoiseOffset;
+    <$fadeParams$>.baseOffset = fadeBaseOffset;
+    <$fadeParams$>.baseInvSize = fadeBaseInvSize;
+<@endfunc@>
+
+<@func declareFadeFragmentVertexInput()@>
+
+in vec4 _fadeData1;
+in vec4 _fadeData2;
+in vec4 _fadeData3;
+
+<@endfunc@>
+
+<@func fetchFadeObjectParamsInstanced(fadeParams)@>
+    <$fadeParams$>.category = int(_fadeData1.w);
+    <$fadeParams$>.threshold = _fadeData2.w;
+    <$fadeParams$>.noiseOffset = _fadeData1.xyz;
+    <$fadeParams$>.baseOffset = _fadeData2.xyz;
+    <$fadeParams$>.baseInvSize = _fadeData3.xyz;
+<@endfunc@>
+
+<@func declareFadeFragment()@>
+<$declareFadeFragmentCommon()$>
+<$declareFadeFragmentUniform()$>
+<@endfunc@>
+
+<@func declareFadeFragmentInstanced()@>
+<$declareFadeFragmentCommon()$>
+<$declareFadeFragmentVertexInput()$>
+<@endfunc@>
+
+<@func declareFadeVertexInstanced()@>
+out vec4 _fadeData1;
+out vec4 _fadeData2;
+out vec4 _fadeData3;
+<@endfunc@>
+
+<@func passThroughFadeObjectParams()@>
+    _fadeData1 = inTexCoord2;
+    _fadeData2 = inTexCoord3;
+    _fadeData3 = inTexCoord4;    
+<@endfunc@>
+
+<@endif@>
\ No newline at end of file
diff --git a/libraries/render-utils/src/FadeEffect.cpp b/libraries/render-utils/src/FadeEffect.cpp
new file mode 100644
index 0000000000..c94fe717f1
--- /dev/null
+++ b/libraries/render-utils/src/FadeEffect.cpp
@@ -0,0 +1,104 @@
+//
+//  FadeEffect.cpp
+
+//  Created by Olivier Prat on 17/07/2017.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#include "FadeEffect.h"
+#include "FadeEffectJobs.h"
+#include "TextureCache.h"
+
+#include "render/TransitionStage.h"
+
+#include <PathUtils.h>
+
+FadeEffect::FadeEffect() {
+    auto texturePath = PathUtils::resourcesPath() + "images/fadeMask.png";
+    _maskMap = DependencyManager::get<TextureCache>()->getImageTexture(texturePath, image::TextureUsage::STRICT_TEXTURE);
+}
+
+void FadeEffect::build(render::Task::TaskConcept& task, const task::Varying& editableItems) {
+    auto editedFadeCategory = task.addJob<FadeJob>("Fade");
+    auto& fadeJob = task._jobs.back();
+    _configurations = fadeJob.get<FadeJob>().getConfigurationBuffer();
+
+    const auto fadeEditInput = FadeEditJob::Input(editableItems, editedFadeCategory).asVarying();
+    task.addJob<FadeEditJob>("FadeEdit", fadeEditInput);
+}
+
+render::ShapePipeline::BatchSetter FadeEffect::getBatchSetter() const {
+    return [this](const render::ShapePipeline& shapePipeline, gpu::Batch& batch, render::Args*) {
+        auto program = shapePipeline.pipeline->getProgram();
+        auto maskMapLocation = program->getTextures().findLocation("fadeMaskMap");
+        auto bufferLocation = program->getUniformBuffers().findLocation("fadeParametersBuffer");
+        batch.setResourceTexture(maskMapLocation, _maskMap);
+        batch.setUniformBuffer(bufferLocation, _configurations);
+    };
+}
+
+render::ShapePipeline::ItemSetter FadeEffect::getItemUniformSetter() const {
+    return [](const render::ShapePipeline& shapePipeline, render::Args* args, const render::Item& item) {
+        if (!render::TransitionStage::isIndexInvalid(item.getTransitionId())) {
+            auto scene = args->_scene;
+            auto batch = args->_batch;
+            auto transitionStage = scene->getStage<render::TransitionStage>(render::TransitionStage::getName());
+            auto& transitionState = transitionStage->getTransition(item.getTransitionId());
+            auto program = shapePipeline.pipeline->getProgram();
+            auto& uniforms = program->getUniforms();
+            auto fadeNoiseOffsetLocation = uniforms.findLocation("fadeNoiseOffset");
+            auto fadeBaseOffsetLocation = uniforms.findLocation("fadeBaseOffset");
+            auto fadeBaseInvSizeLocation = uniforms.findLocation("fadeBaseInvSize");
+            auto fadeThresholdLocation = uniforms.findLocation("fadeThreshold");
+            auto fadeCategoryLocation = uniforms.findLocation("fadeCategory");
+
+            if (fadeNoiseOffsetLocation >= 0 || fadeBaseInvSizeLocation >= 0 || fadeBaseOffsetLocation >= 0 || fadeThresholdLocation >= 0 || fadeCategoryLocation >= 0) {
+                const auto fadeCategory = FadeJob::transitionToCategory[transitionState.eventType];
+
+                batch->_glUniform1i(fadeCategoryLocation, fadeCategory);
+                batch->_glUniform1f(fadeThresholdLocation, transitionState.threshold);
+                batch->_glUniform3f(fadeNoiseOffsetLocation, transitionState.noiseOffset.x, transitionState.noiseOffset.y, transitionState.noiseOffset.z);
+                batch->_glUniform3f(fadeBaseOffsetLocation, transitionState.baseOffset.x, transitionState.baseOffset.y, transitionState.baseOffset.z);
+                batch->_glUniform3f(fadeBaseInvSizeLocation, transitionState.baseInvSize.x, transitionState.baseInvSize.y, transitionState.baseInvSize.z);
+            }
+        }
+    };
+}
+
+render::ShapePipeline::ItemSetter FadeEffect::getItemStoredSetter() {
+    return [this](const render::ShapePipeline& shapePipeline, render::Args* args, const render::Item& item) {
+        if (!render::TransitionStage::isIndexInvalid(item.getTransitionId())) {
+            auto scene = args->_scene;
+            auto transitionStage = scene->getStage<render::TransitionStage>(render::TransitionStage::getName());
+            auto& transitionState = transitionStage->getTransition(item.getTransitionId());
+            const auto fadeCategory = FadeJob::transitionToCategory[transitionState.eventType];
+
+            _lastCategory = fadeCategory;
+            _lastThreshold = transitionState.threshold;
+            _lastNoiseOffset = transitionState.noiseOffset;
+            _lastBaseOffset = transitionState.baseOffset;
+            _lastBaseInvSize = transitionState.baseInvSize;
+        }
+    };
+}
+
+void FadeEffect::packToAttributes(const int category, const float threshold, const glm::vec3& noiseOffset,
+    const glm::vec3& baseOffset, const glm::vec3& baseInvSize,
+    glm::vec4& packedData1, glm::vec4& packedData2, glm::vec4& packedData3) {
+    packedData1.x = noiseOffset.x;
+    packedData1.y = noiseOffset.y;
+    packedData1.z = noiseOffset.z;
+    packedData1.w = (float)(category+0.1f); // GLSL hack so that casting back from float to int in fragment shader returns the correct value.
+
+    packedData2.x = baseOffset.x;
+    packedData2.y = baseOffset.y;
+    packedData2.z = baseOffset.z;
+    packedData2.w = threshold;
+
+    packedData3.x = baseInvSize.x;
+    packedData3.y = baseInvSize.y;
+    packedData3.z = baseInvSize.z;
+    packedData3.w = 0.f;
+}
diff --git a/libraries/render-utils/src/FadeEffect.h b/libraries/render-utils/src/FadeEffect.h
new file mode 100644
index 0000000000..e4a7debd1e
--- /dev/null
+++ b/libraries/render-utils/src/FadeEffect.h
@@ -0,0 +1,54 @@
+//
+//  FadeEffect.h
+
+//  Created by Olivier Prat on 17/07/2017.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_render_utils_FadeEffect_h
+#define hifi_render_utils_FadeEffect_h
+
+#include <DependencyManager.h>
+#include <render/Engine.h>
+
+class FadeEffect : public Dependency {
+    SINGLETON_DEPENDENCY;
+
+public:
+
+    void build(render::Task::TaskConcept& task, const task::Varying& editableItems);
+
+    render::ShapePipeline::BatchSetter getBatchSetter() const;
+    render::ShapePipeline::ItemSetter getItemUniformSetter() const;
+    render::ShapePipeline::ItemSetter getItemStoredSetter();
+
+    int getLastCategory() const { return _lastCategory; }
+    float getLastThreshold() const { return _lastThreshold; }
+    const glm::vec3& getLastNoiseOffset() const { return _lastNoiseOffset; }
+    const glm::vec3& getLastBaseOffset() const { return _lastBaseOffset; }
+    const glm::vec3& getLastBaseInvSize() const { return _lastBaseInvSize; }
+
+    static void packToAttributes(const int category, const float threshold, const glm::vec3& noiseOffset,
+        const glm::vec3& baseOffset, const glm::vec3& baseInvSize,
+        glm::vec4& packedData1, glm::vec4& packedData2, glm::vec4& packedData3);
+
+private:
+
+    gpu::BufferView _configurations;
+    gpu::TexturePointer _maskMap;
+
+    // The last fade set through the stored item setter
+    int _lastCategory { 0 };
+    float _lastThreshold { 0.f };
+    glm::vec3 _lastNoiseOffset { 0.f, 0.f, 0.f };
+    glm::vec3 _lastBaseOffset { 0.f, 0.f, 0.f };
+    glm::vec3 _lastBaseInvSize { 1.f, 1.f, 1.f };
+
+    explicit FadeEffect();
+    virtual ~FadeEffect() { }
+
+};
+#endif // hifi_render_utils_FadeEffect_h
diff --git a/libraries/render-utils/src/FadeEffectJobs.cpp b/libraries/render-utils/src/FadeEffectJobs.cpp
new file mode 100644
index 0000000000..d00632c017
--- /dev/null
+++ b/libraries/render-utils/src/FadeEffectJobs.cpp
@@ -0,0 +1,730 @@
+//
+//  FadeEffectJobs.cpp
+
+//  Created by Olivier Prat on 07/07/2017.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#include "FadeEffectJobs.h"
+#include "render/Logging.h"
+#include "render/TransitionStage.h"
+
+#include <NumericalConstants.h>
+#include <Interpolate.h>
+#include <gpu/Context.h>
+
+#include <QJsonArray>
+
+#include <PathUtils.h>
+
+#define FADE_MIN_SCALE  0.001
+#define FADE_MAX_SCALE  10000.0
+#define FADE_MAX_SPEED  50.f
+
+inline float parameterToValuePow(float parameter, const double minValue, const double maxOverMinValue) {
+    return (float)(minValue * pow(maxOverMinValue, double(parameter)));
+}
+
+inline float valueToParameterPow(float value, const double minValue, const double maxOverMinValue) {
+    return (float)(log(double(value) / minValue) / log(maxOverMinValue));
+}
+
+void FadeEditJob::configure(const Config& config) {
+    _isEditEnabled = config.editFade;
+}
+
+void FadeEditJob::run(const render::RenderContextPointer& renderContext, const FadeEditJob::Input& inputs) {
+    auto scene = renderContext->_scene;
+
+    if (_isEditEnabled) {
+        float minIsectDistance = std::numeric_limits<float>::max();
+        auto& itemBounds = inputs.get0();
+        auto editedItem = findNearestItem(renderContext, itemBounds, minIsectDistance);
+        render::Transaction transaction;
+        bool hasTransaction{ false };
+
+        if (editedItem != _editedItem && render::Item::isValidID(_editedItem)) {
+            // Remove transition from previously edited item as we've changed edited item
+            hasTransaction = true;
+            transaction.removeTransitionFromItem(_editedItem);
+        }
+        _editedItem = editedItem;
+
+        if (render::Item::isValidID(_editedItem)) {
+            static const render::Transition::Type categoryToTransition[FADE_CATEGORY_COUNT] = {
+                render::Transition::ELEMENT_ENTER_DOMAIN,
+                render::Transition::BUBBLE_ISECT_OWNER,
+                render::Transition::BUBBLE_ISECT_TRESPASSER,
+                render::Transition::USER_ENTER_DOMAIN,
+                render::Transition::AVATAR_CHANGE
+            };
+
+            auto transitionType = categoryToTransition[inputs.get1()];
+
+            transaction.queryTransitionOnItem(_editedItem, [transitionType, scene](render::ItemID id, const render::Transition* transition) {
+                if (transition == nullptr || transition->isFinished || transition->eventType!=transitionType) {
+                    // Relaunch transition
+                    render::Transaction transaction;
+                    transaction.addTransitionToItem(id, transitionType);
+                    scene->enqueueTransaction(transaction);
+                }
+            });
+            hasTransaction = true;
+        }
+
+        if (hasTransaction) {
+            scene->enqueueTransaction(transaction);
+        }
+    }
+    else if (render::Item::isValidID(_editedItem)) {
+        // Remove transition from previously edited item as we've disabled fade edition
+        render::Transaction transaction;
+        transaction.removeTransitionFromItem(_editedItem);
+        scene->enqueueTransaction(transaction);
+        _editedItem = render::Item::INVALID_ITEM_ID;
+    }
+}
+
+render::ItemID FadeEditJob::findNearestItem(const render::RenderContextPointer& renderContext, const render::ItemBounds& inputs, float& minIsectDistance) const {
+    const glm::vec3 rayOrigin = renderContext->args->getViewFrustum().getPosition();
+    const glm::vec3 rayDirection = renderContext->args->getViewFrustum().getDirection();
+    BoxFace face;
+    glm::vec3 normal;
+    float isectDistance;
+    render::ItemID nearestItem = render::Item::INVALID_ITEM_ID;
+    const float minDistance = 1.f;
+    const float maxDistance = 50.f;
+
+    for (const auto& itemBound : inputs) {
+        if (!itemBound.bound.contains(rayOrigin) && itemBound.bound.findRayIntersection(rayOrigin, rayDirection, isectDistance, face, normal)) {
+            auto& item = renderContext->_scene->getItem(itemBound.id);
+            if (item.getKey().isWorldSpace() && isectDistance>minDistance && isectDistance < minIsectDistance && isectDistance<maxDistance) {
+                nearestItem = itemBound.id;
+                minIsectDistance = isectDistance;
+            }
+        }
+    }
+    return nearestItem;
+}
+
+FadeConfig::FadeConfig() 
+{
+    events[FADE_ELEMENT_ENTER_LEAVE_DOMAIN].noiseSize = glm::vec3{ 0.75f, 0.75f, 0.75f };
+    events[FADE_ELEMENT_ENTER_LEAVE_DOMAIN].noiseLevel = 1.f;
+    events[FADE_ELEMENT_ENTER_LEAVE_DOMAIN].noiseSpeed = glm::vec3{ 0.0f, 0.0f, 0.0f };
+    events[FADE_ELEMENT_ENTER_LEAVE_DOMAIN].timing = FadeConfig::LINEAR;
+    events[FADE_ELEMENT_ENTER_LEAVE_DOMAIN].baseSize = glm::vec3{ 1.0f, 1.0f, 1.0f };
+    events[FADE_ELEMENT_ENTER_LEAVE_DOMAIN].baseLevel = 0.f;
+    events[FADE_ELEMENT_ENTER_LEAVE_DOMAIN].isInverted = false;
+    events[FADE_ELEMENT_ENTER_LEAVE_DOMAIN].duration = 4.f;
+    events[FADE_ELEMENT_ENTER_LEAVE_DOMAIN].edgeWidth = 0.1f;
+    events[FADE_ELEMENT_ENTER_LEAVE_DOMAIN].edgeInnerColor = glm::vec4{ 78.f / 255.f, 215.f / 255.f, 255.f / 255.f, 0.0f };
+    events[FADE_ELEMENT_ENTER_LEAVE_DOMAIN].edgeOuterColor = glm::vec4{ 78.f / 255.f, 215.f / 255.f, 255.f / 255.f, 1.0f };
+
+    events[FADE_BUBBLE_ISECT_OWNER].noiseSize = glm::vec3{ 1.5f, 1.0f / 25.f, 0.5f };
+    events[FADE_BUBBLE_ISECT_OWNER].noiseLevel = 0.37f;
+    events[FADE_BUBBLE_ISECT_OWNER].noiseSpeed = glm::vec3{ 1.0f, 0.2f, 1.0f };
+    events[FADE_BUBBLE_ISECT_OWNER].timing = FadeConfig::LINEAR;
+    events[FADE_BUBBLE_ISECT_OWNER].baseSize = glm::vec3{ 2.0f, 2.0f, 2.0f };
+    events[FADE_BUBBLE_ISECT_OWNER].baseLevel = 1.f;
+    events[FADE_BUBBLE_ISECT_OWNER].isInverted = false;
+    events[FADE_BUBBLE_ISECT_OWNER].duration = 4.f;
+    events[FADE_BUBBLE_ISECT_OWNER].edgeWidth = 0.02f;
+    events[FADE_BUBBLE_ISECT_OWNER].edgeInnerColor = glm::vec4{ 31.f / 255.f, 198.f / 255.f, 166.f / 255.f, 1.0f };
+    events[FADE_BUBBLE_ISECT_OWNER].edgeOuterColor = glm::vec4{ 31.f / 255.f, 198.f / 255.f, 166.f / 255.f, 2.0f };
+
+    events[FADE_BUBBLE_ISECT_TRESPASSER].noiseSize = glm::vec3{ 0.5f, 1.0f / 25.f, 0.5f };
+    events[FADE_BUBBLE_ISECT_TRESPASSER].noiseLevel = 1.f;
+    events[FADE_BUBBLE_ISECT_TRESPASSER].noiseSpeed = glm::vec3{ 1.0f, -5.f, 1.0f };
+    events[FADE_BUBBLE_ISECT_TRESPASSER].timing = FadeConfig::LINEAR;
+    events[FADE_BUBBLE_ISECT_TRESPASSER].baseSize = glm::vec3{ 2.0f, 2.0f, 2.0f };
+    events[FADE_BUBBLE_ISECT_TRESPASSER].baseLevel = 0.f;
+    events[FADE_BUBBLE_ISECT_TRESPASSER].isInverted = false;
+    events[FADE_BUBBLE_ISECT_TRESPASSER].duration = 4.f;
+    events[FADE_BUBBLE_ISECT_TRESPASSER].edgeWidth = 0.025f;
+    events[FADE_BUBBLE_ISECT_TRESPASSER].edgeInnerColor = glm::vec4{ 31.f / 255.f, 198.f / 255.f, 166.f / 255.f, 1.0f };
+    events[FADE_BUBBLE_ISECT_TRESPASSER].edgeOuterColor = glm::vec4{ 31.f / 255.f, 198.f / 255.f, 166.f / 255.f, 2.0f };
+
+    events[FADE_USER_ENTER_LEAVE_DOMAIN].noiseSize = glm::vec3{ 10.f, 0.01f, 10.0f };
+    events[FADE_USER_ENTER_LEAVE_DOMAIN].noiseLevel = 0.3f;
+    events[FADE_USER_ENTER_LEAVE_DOMAIN].noiseSpeed = glm::vec3{ 0.0f, -5.0f, 0.0f };
+    events[FADE_USER_ENTER_LEAVE_DOMAIN].timing = FadeConfig::LINEAR;
+    events[FADE_USER_ENTER_LEAVE_DOMAIN].baseSize = glm::vec3{ 10000.f, 1.0f, 10000.0f };
+    events[FADE_USER_ENTER_LEAVE_DOMAIN].baseLevel = 1.f;
+    events[FADE_USER_ENTER_LEAVE_DOMAIN].isInverted = true;
+    events[FADE_USER_ENTER_LEAVE_DOMAIN].duration = 2.f;
+    events[FADE_USER_ENTER_LEAVE_DOMAIN].edgeWidth = 0.229f;
+    events[FADE_USER_ENTER_LEAVE_DOMAIN].edgeInnerColor = glm::vec4{ 1.f, 0.63f, 0.13f, 0.5f };
+    events[FADE_USER_ENTER_LEAVE_DOMAIN].edgeOuterColor = glm::vec4{ 1.f, 1.f, 1.f, 1.0f };
+
+    events[FADE_AVATAR_CHANGE].noiseSize = glm::vec3{ 0.4f, 0.4f, 0.4f };
+    events[FADE_AVATAR_CHANGE].noiseLevel = 1.f;
+    events[FADE_AVATAR_CHANGE].noiseSpeed = glm::vec3{ 0.0f, 0.0f, 0.0f };
+    events[FADE_AVATAR_CHANGE].timing = FadeConfig::LINEAR;
+    events[FADE_AVATAR_CHANGE].baseSize = glm::vec3{ 0.4f, 0.4f, 0.4f };
+    events[FADE_AVATAR_CHANGE].baseLevel = 1.f;
+    events[FADE_AVATAR_CHANGE].isInverted = false;
+    events[FADE_AVATAR_CHANGE].duration = 3.f;
+    events[FADE_AVATAR_CHANGE].edgeWidth = 0.05f;
+    events[FADE_AVATAR_CHANGE].edgeInnerColor = glm::vec4{ 1.0f, 1.0f, 1.0f, 1.0f };
+    events[FADE_AVATAR_CHANGE].edgeOuterColor = glm::vec4{ 1.0f, 1.0f, 1.0f, 1.0f };
+}
+
+void FadeConfig::setEditedCategory(int value) {
+    assert(value < FADE_CATEGORY_COUNT);
+    editedCategory = std::min<int>(FADE_CATEGORY_COUNT, value);
+    emit dirtyCategory();
+    emit dirty();
+}
+
+void FadeConfig::setDuration(float value) {
+    events[editedCategory].duration = value;
+    emit dirty();
+}
+
+float FadeConfig::getDuration() const { 
+    return events[editedCategory].duration;
+}
+
+void FadeConfig::setBaseSizeX(float value) {
+    events[editedCategory].baseSize.x = parameterToValuePow(value, FADE_MIN_SCALE, FADE_MAX_SCALE/ FADE_MIN_SCALE);
+    emit dirty();
+}
+
+float FadeConfig::getBaseSizeX() const { 
+    return valueToParameterPow(events[editedCategory].baseSize.x, FADE_MIN_SCALE, FADE_MAX_SCALE / FADE_MIN_SCALE);
+}
+
+void FadeConfig::setBaseSizeY(float value) {
+    events[editedCategory].baseSize.y = parameterToValuePow(value, FADE_MIN_SCALE, FADE_MAX_SCALE / FADE_MIN_SCALE);
+    emit dirty();
+}
+
+float FadeConfig::getBaseSizeY() const {
+    return valueToParameterPow(events[editedCategory].baseSize.y, FADE_MIN_SCALE, FADE_MAX_SCALE / FADE_MIN_SCALE);
+}
+
+void FadeConfig::setBaseSizeZ(float value) {
+    events[editedCategory].baseSize.z = parameterToValuePow(value, FADE_MIN_SCALE, FADE_MAX_SCALE / FADE_MIN_SCALE);
+    emit dirty();
+}
+
+float FadeConfig::getBaseSizeZ() const {
+    return valueToParameterPow(events[editedCategory].baseSize.z, FADE_MIN_SCALE, FADE_MAX_SCALE / FADE_MIN_SCALE);
+}
+
+void FadeConfig::setBaseLevel(float value) {
+    events[editedCategory].baseLevel = value;
+    emit dirty();
+}
+
+void FadeConfig::setInverted(bool value) {
+    events[editedCategory].isInverted = value;
+    emit dirty();
+}
+
+bool FadeConfig::isInverted() const { 
+    return events[editedCategory].isInverted;
+}
+
+void FadeConfig::setNoiseSizeX(float value) {
+    events[editedCategory].noiseSize.x = parameterToValuePow(value, FADE_MIN_SCALE, FADE_MAX_SCALE / FADE_MIN_SCALE);
+    emit dirty();
+}
+
+float FadeConfig::getNoiseSizeX() const {
+    return valueToParameterPow(events[editedCategory].noiseSize.x, FADE_MIN_SCALE, FADE_MAX_SCALE / FADE_MIN_SCALE);
+}
+
+void FadeConfig::setNoiseSizeY(float value) {
+    events[editedCategory].noiseSize.y = parameterToValuePow(value, FADE_MIN_SCALE, FADE_MAX_SCALE / FADE_MIN_SCALE);
+    emit dirty();
+}
+
+float FadeConfig::getNoiseSizeY() const {
+    return valueToParameterPow(events[editedCategory].noiseSize.y, FADE_MIN_SCALE, FADE_MAX_SCALE / FADE_MIN_SCALE);
+}
+
+void FadeConfig::setNoiseSizeZ(float value) {
+    events[editedCategory].noiseSize.z = parameterToValuePow(value, FADE_MIN_SCALE, FADE_MAX_SCALE / FADE_MIN_SCALE);
+    emit dirty();
+}
+
+float FadeConfig::getNoiseSizeZ() const {
+    return valueToParameterPow(events[editedCategory].noiseSize.z, FADE_MIN_SCALE, FADE_MAX_SCALE / FADE_MIN_SCALE);
+}
+
+void FadeConfig::setNoiseLevel(float value) {
+    events[editedCategory].noiseLevel = value;
+    emit dirty();
+}
+
+void FadeConfig::setNoiseSpeedX(float value) {
+    events[editedCategory].noiseSpeed.x = powf(value, 3.f)*FADE_MAX_SPEED;
+    emit dirty();
+}
+
+float FadeConfig::getNoiseSpeedX() const {
+    return powf(events[editedCategory].noiseSpeed.x / FADE_MAX_SPEED, 1.f / 3.f);
+}
+
+void FadeConfig::setNoiseSpeedY(float value) {
+    events[editedCategory].noiseSpeed.y = powf(value, 3.f)*FADE_MAX_SPEED;
+    emit dirty();
+}
+
+float FadeConfig::getNoiseSpeedY() const {
+    return powf(events[editedCategory].noiseSpeed.y / FADE_MAX_SPEED, 1.f / 3.f);
+}
+
+void FadeConfig::setNoiseSpeedZ(float value) {
+    events[editedCategory].noiseSpeed.z = powf(value, 3.f)*FADE_MAX_SPEED;
+    emit dirty();
+}
+
+float FadeConfig::getNoiseSpeedZ() const {
+    return powf(events[editedCategory].noiseSpeed.z / FADE_MAX_SPEED, 1.f / 3.f);
+}
+
+void FadeConfig::setEdgeWidth(float value) {
+    events[editedCategory].edgeWidth = value * value;
+    emit dirty();
+}
+
+float FadeConfig::getEdgeWidth() const { 
+    return sqrtf(events[editedCategory].edgeWidth);
+}
+
+void FadeConfig::setEdgeInnerColorR(float value) {
+    events[editedCategory].edgeInnerColor.r = value;
+    emit dirty();
+}
+
+void FadeConfig::setEdgeInnerColorG(float value) {
+    events[editedCategory].edgeInnerColor.g = value;
+    emit dirty();
+}
+
+void FadeConfig::setEdgeInnerColorB(float value) {
+    events[editedCategory].edgeInnerColor.b = value;
+    emit dirty();
+}
+
+void FadeConfig::setEdgeInnerIntensity(float value) {
+    events[editedCategory].edgeInnerColor.a = value;
+    emit dirty();
+}
+
+void FadeConfig::setEdgeOuterColorR(float value) {
+    events[editedCategory].edgeOuterColor.r = value;
+    emit dirty();
+}
+
+void FadeConfig::setEdgeOuterColorG(float value) {
+    events[editedCategory].edgeOuterColor.g = value;
+    emit dirty();
+}
+
+void FadeConfig::setEdgeOuterColorB(float value) {
+    events[editedCategory].edgeOuterColor.b = value;
+    emit dirty();
+}
+
+void FadeConfig::setEdgeOuterIntensity(float value) {
+    events[editedCategory].edgeOuterColor.a = value;
+    emit dirty();
+}
+
+void FadeConfig::setTiming(int value) {
+    assert(value < TIMING_COUNT);
+    events[editedCategory].timing = value;
+    emit dirty();
+}
+
+QString FadeConfig::eventNames[FADE_CATEGORY_COUNT] = {
+    "element_enter_leave_domain",
+    "bubble_isect_owner",
+    "bubble_isect_trespasser",
+    "user_enter_leave_domain",
+    "avatar_change",
+};
+
+void FadeConfig::save() const {
+    assert(editedCategory < FADE_CATEGORY_COUNT);
+    QJsonObject lProperties;
+    const QString configFile = "config/" + eventNames[editedCategory] + ".json";
+    QUrl path(PathUtils::resourcesPath() + configFile);
+    QFile file(path.toString());
+    if (!file.open(QFile::WriteOnly | QFile::Text)) {
+        qWarning() << "Fade event configuration file " << path << " cannot be opened";
+    }
+    else {
+        const auto& event = events[editedCategory];
+
+        lProperties["edgeInnerColor"] = QJsonArray{ event.edgeInnerColor.r, event.edgeInnerColor.g, event.edgeInnerColor.b, event.edgeInnerColor.a };
+        lProperties["edgeOuterColor"] = QJsonArray{ event.edgeOuterColor.r, event.edgeOuterColor.g, event.edgeOuterColor.b, event.edgeOuterColor.a };
+        lProperties["noiseSize"] = QJsonArray{ event.noiseSize.x, event.noiseSize.y, event.noiseSize.z };
+        lProperties["noiseSpeed"] = QJsonArray{ event.noiseSpeed.x, event.noiseSpeed.y, event.noiseSpeed.z };
+        lProperties["baseSize"] = QJsonArray{ event.baseSize.x, event.baseSize.y, event.baseSize.z };
+        lProperties["noiseLevel"] = event.noiseLevel;
+        lProperties["baseLevel"] = event.baseLevel;
+        lProperties["duration"] = event.duration;
+        lProperties["edgeWidth"] = event.edgeWidth;
+        lProperties["timing"] = event.timing;
+        lProperties["isInverted"] = event.isInverted;
+
+        file.write( QJsonDocument(lProperties).toJson() );
+        file.close();
+    }
+}
+
+void FadeConfig::load() {
+    const QString configFile = "config/" + eventNames[editedCategory] + ".json";
+
+    QUrl path(PathUtils::resourcesPath() + configFile);
+    QFile file(path.toString());
+    if (!file.exists()) {
+        qWarning() << "Fade event configuration file " << path << " does not exist";
+    }
+    else if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        qWarning() << "Fade event configuration file " << path << " cannot be opened";
+    }
+    else {
+        QString fileData = file.readAll();
+        file.close();
+        QJsonParseError error;
+        QJsonDocument doc = QJsonDocument::fromJson(fileData.toUtf8(), &error);
+        if (error.error == error.NoError) {
+            QJsonObject jsonObject = doc.object();
+            QJsonValue value;
+            auto& event = events[editedCategory];
+
+            qCDebug(renderlogging) << "Fade event configuration file" << path << "loaded";
+
+            value = jsonObject["edgeInnerColor"];
+            if (value.isArray()) {
+                QJsonArray data = value.toArray();
+
+                if (data.size() < 4) {
+                    qWarning() << "Fade event configuration file " << path << " contains an invalid 'edgeInnerColor' field. Expected array of size 4";
+                }
+                else {
+                    event.edgeInnerColor.r = (float)data.at(0).toDouble();
+                    event.edgeInnerColor.g = (float)data.at(1).toDouble();
+                    event.edgeInnerColor.b = (float)data.at(2).toDouble();
+                    event.edgeInnerColor.a = (float)data.at(3).toDouble();
+                }
+            }
+            else {
+                qWarning() << "Fade event configuration file " << path << " contains an invalid 'edgeInnerColor' field. Expected array of size 4";
+            }
+
+            value = jsonObject["edgeOuterColor"];
+            if (value.isArray()) {
+                QJsonArray data = value.toArray();
+
+                if (data.size() < 4) {
+                    qWarning() << "Fade event configuration file " << path << " contains an invalid 'edgeOuterColor' field. Expected array of size 4";
+                }
+                else {
+                    event.edgeOuterColor.r = (float)data.at(0).toDouble();
+                    event.edgeOuterColor.g = (float)data.at(1).toDouble();
+                    event.edgeOuterColor.b = (float)data.at(2).toDouble();
+                    event.edgeOuterColor.a = (float)data.at(3).toDouble();
+                }
+            }
+            else {
+                qWarning() << "Fade event configuration file " << path << " contains an invalid 'edgeOuterColor' field. Expected array of size 4";
+            }
+
+            value = jsonObject["noiseSize"];
+            if (value.isArray()) {
+                QJsonArray data = value.toArray();
+
+                if (data.size() < 3) {
+                    qWarning() << "Fade event configuration file " << path << " contains an invalid 'noiseSize' field. Expected array of size 3";
+                }
+                else {
+                    event.noiseSize.x = (float)data.at(0).toDouble();
+                    event.noiseSize.y = (float)data.at(1).toDouble();
+                    event.noiseSize.z = (float)data.at(2).toDouble();
+                }
+            }
+            else {
+                qWarning() << "Fade event configuration file " << path << " contains an invalid 'noiseSize' field. Expected array of size 3";
+            }
+
+            value = jsonObject["noiseSpeed"];
+            if (value.isArray()) {
+                QJsonArray data = value.toArray();
+
+                if (data.size() < 3) {
+                    qWarning() << "Fade event configuration file " << path << " contains an invalid 'noiseSpeed' field. Expected array of size 3";
+                }
+                else {
+                    event.noiseSpeed.x = (float)data.at(0).toDouble();
+                    event.noiseSpeed.y = (float)data.at(1).toDouble();
+                    event.noiseSpeed.z = (float)data.at(2).toDouble();
+                }
+            }
+            else {
+                qWarning() << "Fade event configuration file " << path << " contains an invalid 'noiseSpeed' field. Expected array of size 3";
+            }
+
+            value = jsonObject["baseSize"];
+            if (value.isArray()) {
+                QJsonArray data = value.toArray();
+
+                if (data.size() < 3) {
+                    qWarning() << "Fade event configuration file " << path << " contains an invalid 'baseSize' field. Expected array of size 3";
+                }
+                else {
+                    event.baseSize.x = (float)data.at(0).toDouble();
+                    event.baseSize.y = (float)data.at(1).toDouble();
+                    event.baseSize.z = (float)data.at(2).toDouble();
+                }
+            }
+            else {
+                qWarning() << "Fade event configuration file " << path << " contains an invalid 'baseSize' field. Expected array of size 3";
+            }
+
+            value = jsonObject["noiseLevel"];
+            if (value.isDouble()) {
+                event.noiseLevel = (float)value.toDouble();
+            }
+            else {
+                qWarning() << "Fade event configuration file " << path << " contains an invalid 'noiseLevel' field. Expected float value";
+            }
+
+            value = jsonObject["baseLevel"];
+            if (value.isDouble()) {
+                event.baseLevel = (float)value.toDouble();
+            }
+            else {
+                qWarning() << "Fade event configuration file " << path << " contains an invalid 'baseLevel' field. Expected float value";
+            }
+
+            value = jsonObject["duration"];
+            if (value.isDouble()) {
+                event.duration = (float)value.toDouble();
+            }
+            else {
+                qWarning() << "Fade event configuration file " << path << " contains an invalid 'duration' field. Expected float value";
+            }
+
+            value = jsonObject["edgeWidth"];
+            if (value.isDouble()) {
+                event.edgeWidth = std::min(1.f, std::max(0.f, (float)value.toDouble()));
+            }
+            else {
+                qWarning() << "Fade event configuration file " << path << " contains an invalid 'edgeWidth' field. Expected float value";
+            }
+
+            value = jsonObject["timing"];
+            if (value.isDouble()) {
+                event.timing = std::max(0, std::min(TIMING_COUNT - 1, value.toInt()));
+            }
+            else {
+                qWarning() << "Fade event configuration file " << path << " contains an invalid 'timing' field. Expected integer value";
+            }
+
+            value = jsonObject["isInverted"];
+            if (value.isBool()) {
+                event.isInverted = value.toBool();
+            }
+            else {
+                qWarning() << "Fade event configuration file " << path << " contains an invalid 'isInverted' field. Expected boolean value";
+            }
+
+            emit dirty();
+        }
+        else {
+            qWarning() << "Fade event configuration file" << path << "failed to load:" <<
+                error.errorString() << "at offset" << error.offset;
+        }
+    }
+}
+
+FadeJob::FadeJob() {
+    _previousTime = usecTimestampNow();
+}
+
+void FadeJob::configure(const Config& config) {
+    auto& configurations = _configurations.edit();
+
+    for (auto i = 0; i < FADE_CATEGORY_COUNT; i++) {
+        auto& eventParameters = configurations.parameters[i];
+        const auto& eventConfig = config.events[i];
+
+        eventParameters._baseLevel = eventConfig.baseLevel;
+        eventParameters._noiseInvSizeAndLevel.x = 1.f / eventConfig.noiseSize.x;
+        eventParameters._noiseInvSizeAndLevel.y = 1.f / eventConfig.noiseSize.y;
+        eventParameters._noiseInvSizeAndLevel.z = 1.f / eventConfig.noiseSize.z;
+        eventParameters._noiseInvSizeAndLevel.w = eventConfig.noiseLevel;
+        eventParameters._isInverted = eventConfig.isInverted & 1;
+        eventParameters._edgeWidthInvWidth.x = eventConfig.edgeWidth;
+        eventParameters._edgeWidthInvWidth.y = 1.f / eventParameters._edgeWidthInvWidth.x;
+        eventParameters._innerEdgeColor = eventConfig.edgeInnerColor;
+        eventParameters._outerEdgeColor = eventConfig.edgeOuterColor;
+        _thresholdScale[i] = 1.f + (eventParameters._edgeWidthInvWidth.x + std::max(0.f, (eventConfig.noiseLevel + eventConfig.baseLevel)*0.5f - 0.5f));
+    }
+}
+
+void FadeJob::run(const render::RenderContextPointer& renderContext, FadeJob::Output& output) {
+    Config* jobConfig = static_cast<Config*>(renderContext->jobConfig.get());
+    auto scene = renderContext->args->_scene;
+    auto transitionStage = scene->getStage<render::TransitionStage>(render::TransitionStage::getName());
+    uint64_t now = usecTimestampNow();
+    const double deltaTime = (int64_t(now) - int64_t(_previousTime)) / double(USECS_PER_SECOND);
+    render::Transaction transaction;
+    bool isFirstItem = true;
+    bool hasTransaction = false;
+    
+    output = (FadeCategory) jobConfig->editedCategory;
+
+    // And now update fade effect
+    for (auto transitionId : *transitionStage) {
+        auto& state = transitionStage->editTransition(transitionId);
+#ifdef DEBUG
+        auto& item = scene->getItem(state.itemId);
+        assert(item.getTransitionId() == transitionId);
+#endif
+        if (update(*jobConfig, scene, transaction, state, deltaTime)) {
+            hasTransaction = true;
+        }
+        if (isFirstItem && jobConfig->manualFade && (state.threshold != jobConfig->threshold)) {
+            jobConfig->setProperty("threshold", state.threshold);
+            isFirstItem = false;
+        }
+    }
+    _previousTime = now;
+    if (hasTransaction) {
+        scene->enqueueTransaction(transaction);
+    }
+}
+
+const FadeCategory FadeJob::transitionToCategory[render::Transition::TYPE_COUNT] = {
+    FADE_ELEMENT_ENTER_LEAVE_DOMAIN,
+    FADE_ELEMENT_ENTER_LEAVE_DOMAIN,
+    FADE_BUBBLE_ISECT_OWNER,
+    FADE_BUBBLE_ISECT_TRESPASSER,
+    FADE_USER_ENTER_LEAVE_DOMAIN,
+    FADE_USER_ENTER_LEAVE_DOMAIN,
+    FADE_AVATAR_CHANGE
+};
+
+bool FadeJob::update(const Config& config, const render::ScenePointer& scene, render::Transaction& transaction, render::Transition& transition, const double deltaTime) const {
+    const auto fadeCategory = transitionToCategory[transition.eventType];
+    auto& eventConfig = config.events[fadeCategory];
+    auto item = scene->getItemSafe(transition.itemId);
+    const double eventDuration = (double)eventConfig.duration;
+    const FadeConfig::Timing timing = (FadeConfig::Timing) eventConfig.timing;
+
+    if (item.exist()) {
+        auto aabb = item.getBound();
+        if (render::Item::isValidID(transition.boundItemId)) {
+            auto boundItem = scene->getItemSafe(transition.boundItemId);
+            if (boundItem.exist()) {
+                aabb = boundItem.getBound();
+            }
+        }
+        auto& dimensions = aabb.getDimensions();
+
+        assert(timing < FadeConfig::TIMING_COUNT);
+
+        transition.noiseOffset = aabb.calcCenter();
+        transition.baseInvSize.x = 1.f / eventConfig.baseSize.x;
+        transition.baseInvSize.y = 1.f / eventConfig.baseSize.y;
+        transition.baseInvSize.z = 1.f / eventConfig.baseSize.z;
+
+        switch (transition.eventType) {
+        case render::Transition::ELEMENT_ENTER_DOMAIN:
+        case render::Transition::ELEMENT_LEAVE_DOMAIN:
+        {
+            transition.threshold = computeElementEnterRatio(transition.time, eventDuration, timing);
+            transition.baseOffset = transition.noiseOffset;
+            transition.isFinished += (transition.threshold >= 1.f) & 1;
+            if (transition.eventType == render::Transition::ELEMENT_ENTER_DOMAIN) {
+                transition.threshold = 1.f - transition.threshold;
+            }
+        }
+        break;
+
+        case render::Transition::BUBBLE_ISECT_OWNER:
+        {
+            transition.threshold = 0.5f;
+            transition.baseOffset = transition.noiseOffset;
+        }
+        break;
+
+        case render::Transition::BUBBLE_ISECT_TRESPASSER:
+        {
+            transition.threshold = 0.5f;
+            transition.baseOffset = transition.noiseOffset;
+        }
+        break;
+
+        case render::Transition::USER_ENTER_DOMAIN:
+        case render::Transition::USER_LEAVE_DOMAIN:
+        {
+            transition.threshold = computeElementEnterRatio(transition.time, eventDuration, timing);
+            transition.baseOffset = transition.noiseOffset - dimensions.y / 2.f;
+            transition.baseInvSize.y = 1.f / dimensions.y;
+            transition.isFinished += (transition.threshold >= 1.f) & 1;
+            if (transition.eventType == render::Transition::USER_LEAVE_DOMAIN) {
+                transition.threshold = 1.f - transition.threshold;
+            }
+        }
+        break;
+
+        case render::Transition::AVATAR_CHANGE:
+            break;
+
+        default:
+            assert(false);
+        }
+    }
+
+    transition.noiseOffset += eventConfig.noiseSpeed * (float)transition.time;
+    if (config.manualFade) {
+        transition.threshold = config.manualThreshold;
+    }
+    transition.threshold = std::max(0.f, std::min(1.f, transition.threshold));
+    transition.threshold = (transition.threshold - 0.5f)*_thresholdScale[fadeCategory] + 0.5f;
+    transition.time += deltaTime;
+
+    // If the transition is finished for more than a number of frames (here 1), garbage collect it.
+    if (transition.isFinished > 1) {
+        transaction.removeTransitionFromItem(transition.itemId);
+        return true;
+    }
+    return false;
+}
+
+float FadeJob::computeElementEnterRatio(double time, const double period, FadeConfig::Timing timing) {
+    assert(period > 0.0);
+    float fadeAlpha = 1.0f;
+    const double INV_FADE_PERIOD = 1.0 / period;
+    double fraction = time * INV_FADE_PERIOD;
+    fraction = std::max(fraction, 0.0);
+    if (fraction < 1.0) {
+        switch (timing) {
+        default:
+            fadeAlpha = (float)fraction;
+            break;
+        case FadeConfig::EASE_IN:
+            fadeAlpha = (float)(fraction*fraction*fraction);
+            break;
+        case FadeConfig::EASE_OUT:
+            fadeAlpha = 1.f - (float)fraction;
+            fadeAlpha = 1.f- fadeAlpha*fadeAlpha*fadeAlpha;
+            break;
+        case FadeConfig::EASE_IN_OUT:
+            fadeAlpha = (float)(fraction*fraction*fraction*(fraction*(fraction * 6 - 15) + 10));
+            break;
+        }
+    }
+    return fadeAlpha;
+}
diff --git a/libraries/render-utils/src/FadeEffectJobs.h b/libraries/render-utils/src/FadeEffectJobs.h
new file mode 100644
index 0000000000..a585d5b98a
--- /dev/null
+++ b/libraries/render-utils/src/FadeEffectJobs.h
@@ -0,0 +1,248 @@
+//
+//  FadeEffectJobs.h
+
+//  Created by Olivier Prat on 07/07/2017.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_render_utils_FadeEffectJobs_h
+#define hifi_render_utils_FadeEffectJobs_h
+
+#include "FadeEffect.h"
+
+#include <gpu/Pipeline.h>
+#include <render/ShapePipeline.h>
+#include <render/RenderFetchCullSortTask.h>
+#include <render/Transition.h>
+
+enum FadeCategory {
+    FADE_ELEMENT_ENTER_LEAVE_DOMAIN = 0,
+    FADE_BUBBLE_ISECT_OWNER,
+    FADE_BUBBLE_ISECT_TRESPASSER,
+    FADE_USER_ENTER_LEAVE_DOMAIN,
+    FADE_AVATAR_CHANGE,
+
+    // Don't forget to modify Fade.slh to reflect the change in number of categories
+    FADE_CATEGORY_COUNT,
+};
+
+class FadeEditConfig : public render::Job::Config {
+    Q_OBJECT
+        Q_PROPERTY(bool editFade MEMBER editFade NOTIFY dirty)
+
+public:
+
+    bool editFade{ false };
+
+signals:
+
+    void dirty();
+};
+
+class FadeConfig : public render::Job::Config {
+    Q_OBJECT
+        Q_PROPERTY(int editedCategory MEMBER editedCategory WRITE setEditedCategory NOTIFY dirtyCategory)
+        Q_PROPERTY(float duration READ getDuration WRITE setDuration NOTIFY dirty)
+        Q_PROPERTY(float baseSizeX READ getBaseSizeX WRITE setBaseSizeX NOTIFY dirty)
+        Q_PROPERTY(float baseSizeY READ getBaseSizeY WRITE setBaseSizeY NOTIFY dirty)
+        Q_PROPERTY(float baseSizeZ READ getBaseSizeZ WRITE setBaseSizeZ NOTIFY dirty)
+        Q_PROPERTY(float baseLevel READ getBaseLevel WRITE setBaseLevel NOTIFY dirty)
+        Q_PROPERTY(bool isInverted READ isInverted WRITE setInverted NOTIFY dirty)
+        Q_PROPERTY(float noiseSizeX READ getNoiseSizeX WRITE setNoiseSizeX NOTIFY dirty)
+        Q_PROPERTY(float noiseSizeY READ getNoiseSizeY WRITE setNoiseSizeY NOTIFY dirty)
+        Q_PROPERTY(float noiseSizeZ READ getNoiseSizeZ WRITE setNoiseSizeZ NOTIFY dirty)
+        Q_PROPERTY(float noiseLevel READ getNoiseLevel WRITE setNoiseLevel NOTIFY dirty)
+        Q_PROPERTY(float edgeWidth READ getEdgeWidth WRITE setEdgeWidth NOTIFY dirty)
+        Q_PROPERTY(float edgeInnerColorR READ getEdgeInnerColorR WRITE setEdgeInnerColorR NOTIFY dirty)
+        Q_PROPERTY(float edgeInnerColorG READ getEdgeInnerColorG WRITE setEdgeInnerColorG NOTIFY dirty)
+        Q_PROPERTY(float edgeInnerColorB READ getEdgeInnerColorB WRITE setEdgeInnerColorB NOTIFY dirty)
+        Q_PROPERTY(float edgeInnerIntensity READ getEdgeInnerIntensity WRITE setEdgeInnerIntensity NOTIFY dirty)
+        Q_PROPERTY(float edgeOuterColorR READ getEdgeOuterColorR WRITE setEdgeOuterColorR NOTIFY dirty)
+        Q_PROPERTY(float edgeOuterColorG READ getEdgeOuterColorG WRITE setEdgeOuterColorG NOTIFY dirty)
+        Q_PROPERTY(float edgeOuterColorB READ getEdgeOuterColorB WRITE setEdgeOuterColorB NOTIFY dirty)
+        Q_PROPERTY(float edgeOuterIntensity READ getEdgeOuterIntensity WRITE setEdgeOuterIntensity NOTIFY dirty)
+        Q_PROPERTY(int timing READ getTiming WRITE setTiming NOTIFY dirty)
+        Q_PROPERTY(float noiseSpeedX READ getNoiseSpeedX WRITE setNoiseSpeedX NOTIFY dirty)
+        Q_PROPERTY(float noiseSpeedY READ getNoiseSpeedY WRITE setNoiseSpeedY NOTIFY dirty)
+        Q_PROPERTY(float noiseSpeedZ READ getNoiseSpeedZ WRITE setNoiseSpeedZ NOTIFY dirty)
+        Q_PROPERTY(float threshold MEMBER threshold NOTIFY dirty)
+        Q_PROPERTY(bool manualFade MEMBER manualFade NOTIFY dirty)
+        Q_PROPERTY(float manualThreshold MEMBER manualThreshold NOTIFY dirty)
+
+public:
+
+    enum Timing {
+        LINEAR,
+        EASE_IN,
+        EASE_OUT,
+        EASE_IN_OUT,
+
+        TIMING_COUNT
+    };
+
+    FadeConfig();
+
+    void setEditedCategory(int value);
+
+    void setDuration(float value);
+    float getDuration() const;
+
+    void setBaseSizeX(float value);
+    float getBaseSizeX() const;
+
+    void setBaseSizeY(float value);
+    float getBaseSizeY() const;
+
+    void setBaseSizeZ(float value);
+    float getBaseSizeZ() const;
+
+    void setBaseLevel(float value);
+    float getBaseLevel() const { return events[editedCategory].baseLevel; }
+
+    void setInverted(bool value);
+    bool isInverted() const;
+
+    void setNoiseSizeX(float value);
+    float getNoiseSizeX() const;
+
+    void setNoiseSizeY(float value);
+    float getNoiseSizeY() const;
+
+    void setNoiseSizeZ(float value);
+    float getNoiseSizeZ() const;
+
+    void setNoiseLevel(float value);
+    float getNoiseLevel() const { return events[editedCategory].noiseLevel; }
+
+    void setNoiseSpeedX(float value);
+    float getNoiseSpeedX() const;
+
+    void setNoiseSpeedY(float value);
+    float getNoiseSpeedY() const;
+
+    void setNoiseSpeedZ(float value);
+    float getNoiseSpeedZ() const;
+
+    void setEdgeWidth(float value);
+    float getEdgeWidth() const;
+
+    void setEdgeInnerColorR(float value);
+    float getEdgeInnerColorR() const { return events[editedCategory].edgeInnerColor.r; }
+
+    void setEdgeInnerColorG(float value);
+    float getEdgeInnerColorG() const { return events[editedCategory].edgeInnerColor.g; }
+
+    void setEdgeInnerColorB(float value);
+    float getEdgeInnerColorB() const { return events[editedCategory].edgeInnerColor.b; }
+
+    void setEdgeInnerIntensity(float value);
+    float getEdgeInnerIntensity() const { return events[editedCategory].edgeInnerColor.a; }
+
+    void setEdgeOuterColorR(float value);
+    float getEdgeOuterColorR() const { return events[editedCategory].edgeOuterColor.r; }
+
+    void setEdgeOuterColorG(float value);
+    float getEdgeOuterColorG() const { return events[editedCategory].edgeOuterColor.g; }
+
+    void setEdgeOuterColorB(float value);
+    float getEdgeOuterColorB() const { return events[editedCategory].edgeOuterColor.b; }
+
+    void setEdgeOuterIntensity(float value);
+    float getEdgeOuterIntensity() const { return events[editedCategory].edgeOuterColor.a; }
+
+    void setTiming(int value);
+    int getTiming() const { return events[editedCategory].timing; }
+
+    struct Event {
+        glm::vec4 edgeInnerColor;
+        glm::vec4 edgeOuterColor;
+        glm::vec3 noiseSize;
+        glm::vec3 noiseSpeed;
+        glm::vec3 baseSize;
+        float noiseLevel;
+        float baseLevel;
+        float duration;
+        float edgeWidth;
+        int timing;
+        bool isInverted;
+    };
+
+    Event events[FADE_CATEGORY_COUNT];
+    int editedCategory{ FADE_ELEMENT_ENTER_LEAVE_DOMAIN };
+    float threshold{ 0.f };
+    float manualThreshold{ 0.f };
+    bool manualFade{ false };
+
+    Q_INVOKABLE void save() const;
+    Q_INVOKABLE void load();
+
+    static QString eventNames[FADE_CATEGORY_COUNT];
+
+signals:
+
+    void dirty();
+    void dirtyCategory();
+
+};
+
+class FadeEditJob {
+
+public:
+
+    using Config = FadeEditConfig;
+    using Input = render::VaryingSet2<render::ItemBounds, FadeCategory>;
+    using JobModel = render::Job::ModelI<FadeEditJob, Input, Config>;
+
+    FadeEditJob() {}
+
+    void configure(const Config& config);
+    void run(const render::RenderContextPointer& renderContext, const FadeEditJob::Input& inputs);
+
+private:
+
+    bool _isEditEnabled{ false };
+    render::ItemID _editedItem{ render::Item::INVALID_ITEM_ID };
+
+    render::ItemID findNearestItem(const render::RenderContextPointer& renderContext, const render::ItemBounds& inputs, float& minIsectDistance) const;
+};
+
+class FadeJob {
+
+public:
+
+    static const FadeCategory transitionToCategory[render::Transition::TYPE_COUNT];
+
+    using Config = FadeConfig;
+    using Output = FadeCategory;
+    using JobModel = render::Job::ModelO<FadeJob, Output, Config>;
+
+    FadeJob();
+
+    void configure(const Config& config);
+    void run(const render::RenderContextPointer& renderContext, FadeJob::Output& output);
+
+    gpu::BufferView getConfigurationBuffer() const { return _configurations; }
+
+private:
+
+#include "Fade_shared.slh"
+
+    struct FadeConfiguration
+    {
+        FadeParameters  parameters[FADE_CATEGORY_COUNT];
+    };
+    using FadeConfigurationBuffer = gpu::StructBuffer<FadeConfiguration>;
+
+    FadeConfigurationBuffer _configurations;
+    float _thresholdScale[FADE_CATEGORY_COUNT];
+    uint64_t _previousTime{ 0 };
+
+    bool update(const Config& config, const render::ScenePointer& scene, render::Transaction& transaction, render::Transition& transition, const double deltaTime) const;
+    static float computeElementEnterRatio(double time, const double period, FadeConfig::Timing timing);
+
+};
+
+#endif // hifi_render_utils_FadeEffectJobs_h
diff --git a/libraries/render-utils/src/Fade_shared.slh b/libraries/render-utils/src/Fade_shared.slh
new file mode 100644
index 0000000000..7d1c0fb8bc
--- /dev/null
+++ b/libraries/render-utils/src/Fade_shared.slh
@@ -0,0 +1,27 @@
+// glsl / C++ compatible source as interface for FadeEffect
+#ifdef __cplusplus
+#   define VEC4 glm::vec4
+#   define VEC2 glm::vec2
+#   define FLOAT32 glm::float32
+#   define INT32 glm::int32
+#else
+#   define VEC4 vec4
+#   define VEC2 vec2
+#   define FLOAT32 float
+#   define INT32 int
+#endif
+
+struct FadeParameters
+{
+	VEC4    _noiseInvSizeAndLevel;
+	VEC4    _innerEdgeColor;
+	VEC4    _outerEdgeColor;
+	VEC2    _edgeWidthInvWidth;
+	FLOAT32   _baseLevel;
+	INT32     _isInverted;
+};
+
+    // <@if 1@>
+    // Trigger Scribe include 
+    // <@endif@> <!def that !> 
+//
diff --git a/libraries/render-utils/src/ForwardBuffer.slh b/libraries/render-utils/src/ForwardBuffer.slh
new file mode 100644
index 0000000000..4d1dc89aa4
--- /dev/null
+++ b/libraries/render-utils/src/ForwardBuffer.slh
@@ -0,0 +1,68 @@
+<!
+//  ForwardBuffer.slh
+//  libraries/render-utils/src
+//
+//  Created by Gabriel Calero & Cristian Duarte on 31/07/17.
+//  Copyright 2013 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
+!>
+<@if not FORWARD_BUFFER_SLH@>
+<@def FORWARD_BUFFER_SLH@>
+
+<@include gpu/PackedNormal.slh@>
+
+// Unpack the metallic-mode value
+const float FRAG_PACK_SHADED_NON_METALLIC = 0.0;
+const float FRAG_PACK_SHADED_METALLIC = 0.1;
+const float FRAG_PACK_SHADED_RANGE_INV = 1.0 / (FRAG_PACK_SHADED_METALLIC - FRAG_PACK_SHADED_NON_METALLIC);
+
+const float FRAG_PACK_LIGHTMAPPED_NON_METALLIC = 0.2;
+const float FRAG_PACK_LIGHTMAPPED_METALLIC = 0.3;
+const float FRAG_PACK_LIGHTMAPPED_RANGE_INV = 1.0 / (FRAG_PACK_LIGHTMAPPED_METALLIC - FRAG_PACK_LIGHTMAPPED_NON_METALLIC);
+
+const float FRAG_PACK_SCATTERING_NON_METALLIC = 0.4;
+const float FRAG_PACK_SCATTERING_METALLIC = 0.5;
+const float FRAG_PACK_SCATTERING_RANGE_INV = 1.0 / (FRAG_PACK_SCATTERING_METALLIC - FRAG_PACK_SCATTERING_NON_METALLIC);
+
+const float FRAG_PACK_UNLIT = 0.6;
+
+const int FRAG_MODE_UNLIT = 0;
+const int FRAG_MODE_SHADED = 1;
+const int FRAG_MODE_LIGHTMAPPED = 2;
+const int FRAG_MODE_SCATTERING = 3;
+
+void unpackModeMetallic(float rawValue, out int mode, out float metallic) {
+    if (rawValue <= FRAG_PACK_SHADED_METALLIC) {
+        mode = FRAG_MODE_SHADED;
+        metallic = clamp((rawValue - FRAG_PACK_SHADED_NON_METALLIC) * FRAG_PACK_SHADED_RANGE_INV, 0.0, 1.0);
+    } else if (rawValue <= FRAG_PACK_LIGHTMAPPED_METALLIC) {
+        mode = FRAG_MODE_LIGHTMAPPED;
+        metallic = clamp((rawValue - FRAG_PACK_LIGHTMAPPED_NON_METALLIC) * FRAG_PACK_LIGHTMAPPED_RANGE_INV, 0.0, 1.0);
+    } else if (rawValue <= FRAG_PACK_SCATTERING_METALLIC) {
+        mode = FRAG_MODE_SCATTERING;
+        metallic = clamp((rawValue - FRAG_PACK_SCATTERING_NON_METALLIC) * FRAG_PACK_SCATTERING_RANGE_INV, 0.0, 1.0);
+    } else if (rawValue >= FRAG_PACK_UNLIT) {
+        mode = FRAG_MODE_UNLIT;
+        metallic = 0.0;
+    }
+}
+
+float packShadedMetallic(float metallic) {
+    return mix(FRAG_PACK_SHADED_NON_METALLIC, FRAG_PACK_SHADED_METALLIC, metallic);
+}
+
+float packLightmappedMetallic(float metallic) {
+    return mix(FRAG_PACK_LIGHTMAPPED_NON_METALLIC, FRAG_PACK_LIGHTMAPPED_METALLIC, metallic);
+}
+
+float packScatteringMetallic(float metallic) {
+    return mix(FRAG_PACK_SCATTERING_NON_METALLIC, FRAG_PACK_SCATTERING_METALLIC, metallic);
+}
+
+float packUnlit() {
+    return FRAG_PACK_UNLIT;
+}
+
+<@endif@>
diff --git a/libraries/render-utils/src/ForwardBufferWrite.slh b/libraries/render-utils/src/ForwardBufferWrite.slh
new file mode 100644
index 0000000000..873514d51f
--- /dev/null
+++ b/libraries/render-utils/src/ForwardBufferWrite.slh
@@ -0,0 +1,63 @@
+<!
+//  ForwardBufferWrite.slh
+//  libraries/render-utils/src
+//
+//  Created by Gabriel Calero & Cristian Duarte on 31/07/17.
+//  Copyright 2013 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
+!>
+<@if not FORWARD_BUFFER_WRITE_SLH@>
+<@def FORWARD_BUFFER_WRITE_SLH@>
+
+<@include ForwardBuffer.slh@>
+
+
+layout(location = 0) out vec4 _fragColor0;
+
+// the alpha threshold
+const float alphaThreshold = 0.5;
+float evalOpaqueFinalAlpha(float alpha, float mapAlpha) {
+    return mix(alpha, 1.0 - alpha, step(mapAlpha, alphaThreshold));
+}
+
+const float DEFAULT_ROUGHNESS = 0.9;
+const float DEFAULT_SHININESS = 10.0;
+const float DEFAULT_METALLIC = 0.0;
+const vec3 DEFAULT_SPECULAR = vec3(0.1);
+const vec3 DEFAULT_EMISSIVE = vec3(0.0);
+const float DEFAULT_OCCLUSION = 1.0;
+const float DEFAULT_SCATTERING = 0.0;
+const vec3 DEFAULT_FRESNEL = DEFAULT_EMISSIVE;
+
+void packForwardFragment(vec3 normal, float alpha, vec3 albedo, float roughness, float metallic, vec3 emissive, float occlusion, float scattering) {
+    if (alpha != 1.0) {
+        discard;
+    }
+    _fragColor0 = vec4(albedo, ((scattering > 0.0) ? packScatteringMetallic(metallic) : packShadedMetallic(metallic)));
+}
+
+void packForwardFragmentLightmap(vec3 normal, float alpha, vec3 albedo, float roughness, float metallic, vec3 fresnel, vec3 lightmap) {
+    if (alpha != 1.0) {
+        discard;
+    }
+
+    _fragColor0 = vec4(albedo, packLightmappedMetallic(metallic));
+}
+
+void packForwardFragmentUnlit(vec3 normal, float alpha, vec3 color) {
+    if (alpha != 1.0) {
+        discard;
+    }
+    _fragColor0 = vec4(color, packUnlit());
+}
+
+void packForwardFragmentTranslucent(vec3 normal, float alpha, vec3 albedo, vec3 fresnel, float roughness) {
+    if (alpha <= 0.0) {
+        discard;
+    }
+    _fragColor0 = vec4(albedo.rgb, alpha);
+}
+
+<@endif@>
diff --git a/libraries/render-utils/src/ForwardGlobalLight.slh b/libraries/render-utils/src/ForwardGlobalLight.slh
new file mode 100644
index 0000000000..aba0498ef5
--- /dev/null
+++ b/libraries/render-utils/src/ForwardGlobalLight.slh
@@ -0,0 +1,198 @@
+<!
+//  ForwardGlobalLight.slh
+//  libraries/render-utils/src
+//
+//  Created by Gabriel Calero & Cristian Duarte on 4/7/17.
+//  Copyright 2013 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
+!>
+<@if not DEFERRED_GLOBAL_LIGHT_SLH@>
+<@def DEFERRED_GLOBAL_LIGHT_SLH@>
+
+<@include model/Light.slh@>
+
+<@include LightingModel.slh@>
+<$declareLightBuffer()$>
+<$declareLightAmbientBuffer()$>
+
+<@include LightAmbient.slh@>
+<@include LightDirectional.slh@>
+
+
+<@func prepareGlobalLight(isScattering)@>
+    // prepareGlobalLight
+    // Transform directions to worldspace
+    vec3 fragNormal = vec3((normal));
+    vec3 fragEyeVector = vec3(invViewMat * vec4(-1.0*position, 0.0));
+    vec3 fragEyeDir = normalize(fragEyeVector);
+
+    // Get light
+    Light light = getLight();
+    LightAmbient lightAmbient = getLightAmbient();
+    
+    vec3 lightDirection = getLightDirection(light);
+    vec3 lightIrradiance = getLightIrradiance(light);
+
+    vec3 color = vec3(0.0);
+
+<@endfunc@>
+
+
+<@func declareEvalAmbientGlobalColor()@>
+vec3 evalAmbientGlobalColor(mat4 invViewMat, float shadowAttenuation, float obscurance, vec3 position, vec3 normal, vec3 albedo, vec3 fresnel, float metallic, float roughness) {
+    <$prepareGlobalLight()$>
+    color += albedo * getLightColor(light) * obscurance * getLightAmbientIntensity(lightAmbient);
+    return color;
+}
+<@endfunc@>
+
+<@func declareEvalAmbientSphereGlobalColor(supportScattering)@>
+
+<$declareLightingAmbient(1, _SCRIBE_NULL, _SCRIBE_NULL, $supportScattering$)$>
+<$declareLightingDirectional($supportScattering$)$>
+
+<@if supportScattering@>
+<$declareDeferredCurvature()$>
+<@endif@>
+
+vec3 evalAmbientSphereGlobalColor(mat4 invViewMat, float shadowAttenuation, float obscurance, vec3 position, vec3 normal,
+vec3 albedo, vec3 fresnel, float metallic, float roughness
+<@if supportScattering@>
+    , float scattering, vec4 midNormalCurvature, vec4 lowNormalCurvature
+<@endif@> ) {
+
+    <$prepareGlobalLight($supportScattering$)$>
+
+    // Ambient
+    vec3 ambientDiffuse;
+    vec3 ambientSpecular;
+    evalLightingAmbient(ambientDiffuse, ambientSpecular, lightAmbient, fragEyeDir, fragNormal, roughness, metallic, fresnel, albedo, obscurance
+<@if supportScattering@>
+    ,scattering, midNormalCurvature, lowNormalCurvature
+<@endif@> );
+    color += ambientDiffuse;
+    color += ambientSpecular;
+
+
+    // Directional
+    vec3 directionalDiffuse;
+    vec3 directionalSpecular;
+    evalLightingDirectional(directionalDiffuse, directionalSpecular, lightDirection, lightIrradiance, fragEyeDir, fragNormal, roughness, metallic, fresnel, albedo, shadowAttenuation
+<@if supportScattering@>
+    ,scattering, midNormalCurvature, lowNormalCurvature
+<@endif@> );
+    color += directionalDiffuse;
+    color += directionalSpecular;
+
+    return color;
+}
+
+<@endfunc@>
+
+
+<@func declareEvalSkyboxGlobalColor(supportScattering)@>
+
+<$declareLightingAmbient(_SCRIBE_NULL, 1, _SCRIBE_NULL, $supportScattering$)$>
+<$declareLightingDirectional($supportScattering$)$>
+
+<@if supportScattering@>
+<$declareDeferredCurvature()$>
+<@endif@>
+
+vec3 evalSkyboxGlobalColor(mat4 invViewMat, float shadowAttenuation, float obscurance, vec3 position, vec3 normal,
+    vec3 albedo, vec3 fresnel, float metallic, float roughness
+<@if supportScattering@>
+    , float scattering, vec4 midNormalCurvature, vec4 lowNormalCurvature
+<@endif@>
+    ) {
+    <$prepareGlobalLight($supportScattering$)$>
+
+    // Ambient
+    vec3 ambientDiffuse;
+    vec3 ambientSpecular;
+    evalLightingAmbient(ambientDiffuse, ambientSpecular, lightAmbient, fragEyeDir, fragNormal, roughness, metallic, fresnel, albedo, obscurance
+<@if supportScattering@>
+    ,scattering, midNormalCurvature, lowNormalCurvature 
+<@endif@>
+    );
+    color += ambientDiffuse;
+    color += ambientSpecular;
+
+
+    // Directional
+    vec3 directionalDiffuse;
+    vec3 directionalSpecular;
+    evalLightingDirectional(directionalDiffuse, directionalSpecular, lightDirection, lightIrradiance, fragEyeDir, fragNormal, roughness, metallic, fresnel, albedo, shadowAttenuation
+<@if supportScattering@>
+    ,scattering, midNormalCurvature, lowNormalCurvature
+<@endif@>
+    );
+    color += directionalDiffuse;
+    color += directionalSpecular;
+
+    return color;
+}
+
+<@endfunc@>
+
+<@func declareEvalLightmappedColor()@>
+vec3 evalLightmappedColor(mat4 invViewMat, float shadowAttenuation, float obscurance, vec3 normal, vec3 albedo, vec3 lightmap) {
+    Light light = getLight();
+    LightAmbient ambient = getLightAmbient();
+
+    // Catch normals perpendicular to the projection plane, hence the magic number for the threshold
+    // It should be just 0, but we have inaccuracy so we overshoot
+    const float PERPENDICULAR_THRESHOLD = -0.005;
+    vec3 fragNormal = vec3(invViewMat * vec4(normal, 0.0)); // transform to worldspace
+    float diffuseDot = dot(fragNormal, -getLightDirection(light));
+    float facingLight = step(PERPENDICULAR_THRESHOLD, diffuseDot); 
+
+    // Reevaluate the shadow attenuation for light facing fragments
+    float lightAttenuation = (1.0 - facingLight) + facingLight * shadowAttenuation;
+
+    // Diffuse light is the lightmap dimmed by shadow
+    vec3 diffuseLight = lightAttenuation * lightmap;
+
+    // Ambient light is the lightmap when in shadow
+    vec3 ambientLight = (1.0 - lightAttenuation) * lightmap * getLightAmbientIntensity(ambient);
+
+    return  isLightmapEnabled() * obscurance * albedo * (diffuseLight + ambientLight);
+}
+<@endfunc@>
+
+
+
+
+<@func declareEvalGlobalLightingAlphaBlended()@>
+
+<$declareLightingAmbient(1, 1, 1)$>
+<$declareLightingDirectional()$>
+
+vec3 evalGlobalLightingAlphaBlended(mat4 invViewMat, float shadowAttenuation, float obscurance, vec3 position, vec3 normal, vec3 albedo, vec3 fresnel, float metallic, vec3 emissive, float roughness, float opacity) {
+    <$prepareGlobalLight()$>
+    
+    color += emissive * isEmissiveEnabled();
+
+    // Ambient
+    vec3 ambientDiffuse;
+    vec3 ambientSpecular;
+    evalLightingAmbient(ambientDiffuse, ambientSpecular, lightAmbient, fragEyeDir, fragNormal, roughness, metallic, fresnel, albedo, obscurance);
+    color += ambientDiffuse;
+    color += ambientSpecular / opacity;
+
+    // Directional
+    vec3 directionalDiffuse;
+    vec3 directionalSpecular;
+    evalLightingDirectional(directionalDiffuse, directionalSpecular, lightDirection, lightIrradiance, fragEyeDir, fragNormal, roughness, metallic, fresnel, albedo, shadowAttenuation);
+    color += directionalDiffuse;
+    color += directionalSpecular / opacity;
+
+    return color;
+}
+
+<@endfunc@>
+
+
+<@endif@>
diff --git a/libraries/render-utils/src/GeometryCache.cpp b/libraries/render-utils/src/GeometryCache.cpp
index 49b844efb0..ebf0f13d97 100644
--- a/libraries/render-utils/src/GeometryCache.cpp
+++ b/libraries/render-utils/src/GeometryCache.cpp
@@ -18,17 +18,21 @@
 #include <QtCore/QFileInfo>
 #include <QtNetwork/QNetworkReply>
 
+#include <shared/Shapes.h>
+#include <shared/PlatformHacks.h>
+
 #include <FSTReader.h>
 #include <NumericalConstants.h>
-#include <shared/Shapes.h>
 
 #include "TextureCache.h"
 #include "RenderUtilsLogging.h"
 #include "StencilMaskPass.h"
+#include "FadeEffect.h"
 
 #include "gpu/StandardShaderLib.h"
 
 #include "model/TextureMap.h"
+#include "render/Args.h"
 
 #include "standardTransformPNTC_vert.h"
 #include "standardDrawTexture_frag.h"
@@ -36,10 +40,11 @@
 #include "simple_vert.h"
 #include "simple_textured_frag.h"
 #include "simple_textured_unlit_frag.h"
+#include "simple_fade_vert.h"
+#include "simple_textured_fade_frag.h"
+#include "simple_textured_unlit_fade_frag.h"
 #include "simple_opaque_web_browser_frag.h"
-#include "simple_opaque_web_browser_overlay_frag.h"
 #include "simple_transparent_web_browser_frag.h"
-#include "simple_transparent_web_browser_overlay_frag.h"
 #include "glowLine_vert.h"
 #include "glowLine_frag.h"
 
@@ -47,6 +52,46 @@
 
 //#define WANT_DEBUG
 
+// @note: Originally size entity::NUM_SHAPES
+//        As of Commit b93e91b9, render-utils no longer retains knowledge of
+//        entity lib, and thus doesn't know about entity::NUM_SHAPES.  Should
+//        the enumerations be altered, this will need to be updated.
+// @see ShapeEntityItem.h
+static std::array<GeometryCache::Shape, (GeometryCache::NUM_SHAPES - 1)> MAPPING{ {
+        GeometryCache::Triangle,
+        GeometryCache::Quad,
+        GeometryCache::Hexagon,
+        GeometryCache::Octagon,
+        GeometryCache::Circle,
+        GeometryCache::Cube,
+        GeometryCache::Sphere,
+        GeometryCache::Tetrahedron,
+        GeometryCache::Octahedron,
+        GeometryCache::Dodecahedron,
+        GeometryCache::Icosahedron,
+        GeometryCache::Torus,
+        GeometryCache::Cone,
+        GeometryCache::Cylinder,
+} };
+
+static const std::array<const char * const, GeometryCache::NUM_SHAPES> GEOCACHE_SHAPE_STRINGS{ {
+        "Line",
+        "Triangle",
+        "Quad",
+        "Hexagon",
+        "Octagon",
+        "Circle",
+        "Cube",
+        "Sphere",
+        "Tetrahedron",
+        "Octahedron",
+        "Dodecahedron",
+        "Icosahedron",
+        "Torus",
+        "Cone",
+        "Cylinder"
+    } };
+
 const int GeometryCache::UNKNOWN_ID = -1;
 
 
@@ -55,14 +100,59 @@ static const int VERTICES_PER_TRIANGLE = 3;
 static const gpu::Element POSITION_ELEMENT { gpu::VEC3, gpu::FLOAT, gpu::XYZ };
 static const gpu::Element NORMAL_ELEMENT { gpu::VEC3, gpu::FLOAT, gpu::XYZ };
 static const gpu::Element COLOR_ELEMENT { gpu::VEC4, gpu::NUINT8, gpu::RGBA };
+static const gpu::Element TEXCOORD4_ELEMENT { gpu::VEC4, gpu::FLOAT, gpu::XYZW };
 
 static gpu::Stream::FormatPointer SOLID_STREAM_FORMAT;
 static gpu::Stream::FormatPointer INSTANCED_SOLID_STREAM_FORMAT;
+static gpu::Stream::FormatPointer INSTANCED_SOLID_FADE_STREAM_FORMAT;
 
 static const uint SHAPE_VERTEX_STRIDE = sizeof(glm::vec3) * 2; // vertices and normals
 static const uint SHAPE_NORMALS_OFFSET = sizeof(glm::vec3);
-static const gpu::Type SHAPE_INDEX_TYPE = gpu::UINT32;
-static const uint SHAPE_INDEX_SIZE = sizeof(gpu::uint32);
+
+void GeometryCache::computeSimpleHullPointListForShape(const int entityShape, const glm::vec3 &entityExtents, QVector<glm::vec3> &outPointList) {
+
+    auto geometryCache = DependencyManager::get<GeometryCache>();
+    const GeometryCache::Shape geometryShape = GeometryCache::getShapeForEntityShape( entityShape );
+    const GeometryCache::ShapeData * shapeData = geometryCache->getShapeData( geometryShape );
+    if (!shapeData){
+        //--EARLY EXIT--( data isn't ready for some reason... )
+        return;
+    }
+
+    const gpu::BufferView & shapeVerts = shapeData->_positionView;
+    const gpu::BufferView::Size numItems = shapeVerts.getNumElements();
+
+    outPointList.reserve((int)numItems);
+    QVector<glm::vec3> uniqueVerts;
+    uniqueVerts.reserve((int)numItems);
+
+    const float MAX_INCLUSIVE_FILTER_DISTANCE_SQUARED = 1.0e-6f; //< 1mm^2
+    for (gpu::BufferView::Index i = 0; i < (gpu::BufferView::Index)numItems; ++i) {
+        const int numUniquePoints = (int)uniqueVerts.size();
+        const geometry::Vec &curVert = shapeVerts.get<geometry::Vec>(i);
+        bool isUniquePoint = true;
+
+        for (int uniqueIndex = 0; uniqueIndex < numUniquePoints; ++uniqueIndex) {
+            const geometry::Vec knownVert = uniqueVerts[uniqueIndex];
+            const float distToKnownPoint = glm::length2(knownVert - curVert);
+
+            if (distToKnownPoint <= MAX_INCLUSIVE_FILTER_DISTANCE_SQUARED) {
+                isUniquePoint = false;
+                break;
+            }
+        }
+
+        if (!isUniquePoint) {
+
+            //--EARLY ITERATION EXIT--
+            continue;
+        }
+
+
+        uniqueVerts.push_back(curVert);
+        outPointList.push_back(curVert * entityExtents);
+    }
+}
 
 template <size_t SIDES>
 std::vector<vec3> polygon() {
@@ -77,67 +167,83 @@ std::vector<vec3> polygon() {
 }
 
 void GeometryCache::ShapeData::setupVertices(gpu::BufferPointer& vertexBuffer, const geometry::VertexVector& vertices) {
+    gpu::Buffer::Size offset = vertexBuffer->getSize();
     vertexBuffer->append(vertices);
 
-    _positionView = gpu::BufferView(vertexBuffer, 0,
-        vertexBuffer->getSize(), SHAPE_VERTEX_STRIDE, POSITION_ELEMENT);
-    _normalView = gpu::BufferView(vertexBuffer, SHAPE_NORMALS_OFFSET,
-        vertexBuffer->getSize(), SHAPE_VERTEX_STRIDE, NORMAL_ELEMENT);
+    gpu::Buffer::Size viewSize = vertices.size() * sizeof(glm::vec3);
+
+    _positionView = gpu::BufferView(vertexBuffer, offset,
+        viewSize, SHAPE_VERTEX_STRIDE, POSITION_ELEMENT);
+    _normalView = gpu::BufferView(vertexBuffer, offset + SHAPE_NORMALS_OFFSET,
+        viewSize, SHAPE_VERTEX_STRIDE, NORMAL_ELEMENT);
 }
 
 void GeometryCache::ShapeData::setupIndices(gpu::BufferPointer& indexBuffer, const geometry::IndexVector& indices, const geometry::IndexVector& wireIndices) {
-    _indices = indexBuffer;
+    gpu::Buffer::Size offset = indexBuffer->getSize();
     if (!indices.empty()) {
-        _indexOffset = indexBuffer->getSize() / SHAPE_INDEX_SIZE;
-        _indexCount = indices.size();
-        indexBuffer->append(indices);
+        for (uint32_t i = 0; i < indices.size(); ++i) {
+            indexBuffer->append((uint16_t)indices[i]);
+        }
     }
+    gpu::Size viewSize = indices.size() * sizeof(uint16_t);
+    _indicesView = gpu::BufferView(indexBuffer, offset, viewSize, gpu::Element::INDEX_UINT16);
 
+    offset = indexBuffer->getSize();
     if (!wireIndices.empty()) {
-        _wireIndexOffset = indexBuffer->getSize() / SHAPE_INDEX_SIZE;
-        _wireIndexCount = wireIndices.size();
-        indexBuffer->append(wireIndices);
+        for (uint32_t i = 0; i < wireIndices.size(); ++i) {
+            indexBuffer->append((uint16_t)wireIndices[i]);
+        }
     }
+    viewSize = wireIndices.size() * sizeof(uint16_t);
+    _wireIndicesView = gpu::BufferView(indexBuffer, offset, viewSize, gpu::Element::INDEX_UINT16);
 }
 
 void GeometryCache::ShapeData::setupBatch(gpu::Batch& batch) const {
     batch.setInputBuffer(gpu::Stream::POSITION, _positionView);
     batch.setInputBuffer(gpu::Stream::NORMAL, _normalView);
-    batch.setIndexBuffer(SHAPE_INDEX_TYPE, _indices, 0);
+    batch.setIndexBuffer(_indicesView);
 }
 
 void GeometryCache::ShapeData::draw(gpu::Batch& batch) const {
-    if (_indexCount) {
+    uint32_t numIndices = (uint32_t)_indicesView.getNumElements();
+    if (numIndices > 0) {
         setupBatch(batch);
-        batch.drawIndexed(gpu::TRIANGLES, (gpu::uint32)_indexCount, (gpu::uint32)_indexOffset);
+        batch.drawIndexed(gpu::TRIANGLES, numIndices, 0);
     }
 }
 
 void GeometryCache::ShapeData::drawWire(gpu::Batch& batch) const {
-    if (_wireIndexCount) {
-        setupBatch(batch);
-        batch.drawIndexed(gpu::LINES, (gpu::uint32)_wireIndexCount, (gpu::uint32)_wireIndexOffset);
+    uint32_t numIndices = (uint32_t)_wireIndicesView.getNumElements();
+    if (numIndices > 0) {
+        batch.setInputBuffer(gpu::Stream::POSITION, _positionView);
+        batch.setInputBuffer(gpu::Stream::NORMAL, _normalView);
+        batch.setIndexBuffer(_wireIndicesView);
+        batch.drawIndexed(gpu::LINES, numIndices, 0);
     }
 }
 
 void GeometryCache::ShapeData::drawInstances(gpu::Batch& batch, size_t count) const {
-    if (_indexCount) {
+    uint32_t numIndices = (uint32_t)_indicesView.getNumElements();
+    if (numIndices > 0) {
         setupBatch(batch);
-        batch.drawIndexedInstanced((gpu::uint32)count, gpu::TRIANGLES, (gpu::uint32)_indexCount, (gpu::uint32)_indexOffset);
+        batch.drawIndexedInstanced((gpu::uint32)count, gpu::TRIANGLES, numIndices, 0);
     }
 }
 
 void GeometryCache::ShapeData::drawWireInstances(gpu::Batch& batch, size_t count) const {
-    if (_wireIndexCount) {
-        setupBatch(batch);
-        batch.drawIndexedInstanced((gpu::uint32)count, gpu::LINES, (gpu::uint32)_wireIndexCount, (gpu::uint32)_wireIndexOffset);
+    uint32_t numIndices = (uint32_t)_wireIndicesView.getNumElements();
+    if (numIndices > 0) {
+        batch.setInputBuffer(gpu::Stream::POSITION, _positionView);
+        batch.setInputBuffer(gpu::Stream::NORMAL, _normalView);
+        batch.setIndexBuffer(_wireIndicesView);
+        batch.drawIndexedInstanced((gpu::uint32)count, gpu::LINES, numIndices, 0);
     }
 }
 
 static const size_t ICOSAHEDRON_TO_SPHERE_TESSELATION_COUNT = 3;
 
 size_t GeometryCache::getShapeTriangleCount(Shape shape) {
-    return _shapes[shape]._indexCount / VERTICES_PER_TRIANGLE;
+    return _shapes[shape]._indicesView.getNumElements() / VERTICES_PER_TRIANGLE;
 }
 
 size_t GeometryCache::getSphereTriangleCount() {
@@ -161,7 +267,6 @@ static IndexPair indexToken(geometry::Index a, geometry::Index b) {
 template <size_t N>
 void setupFlatShape(GeometryCache::ShapeData& shapeData, const geometry::Solid<N>& shape, gpu::BufferPointer& vertexBuffer, gpu::BufferPointer& indexBuffer) {
     using namespace geometry;
-    Index baseVertex = (Index)(vertexBuffer->getSize() / SHAPE_VERTEX_STRIDE);
     VertexVector vertices;
     IndexVector solidIndices, wireIndices;
     IndexPairs wireSeenIndices;
@@ -172,6 +277,7 @@ void setupFlatShape(GeometryCache::ShapeData& shapeData, const geometry::Solid<N
     vertices.reserve(N * faceCount * 2);
     solidIndices.reserve(faceIndexCount * faceCount);
 
+    Index baseVertex = 0;
     for (size_t f = 0; f < faceCount; f++) {
         const Face<N>& face = shape.faces[f];
         // Compute the face normal
@@ -212,7 +318,6 @@ void setupFlatShape(GeometryCache::ShapeData& shapeData, const geometry::Solid<N
 template <size_t N>
 void setupSmoothShape(GeometryCache::ShapeData& shapeData, const geometry::Solid<N>& shape, gpu::BufferPointer& vertexBuffer, gpu::BufferPointer& indexBuffer) {
     using namespace geometry;
-    Index baseVertex = (Index)(vertexBuffer->getSize() / SHAPE_VERTEX_STRIDE);
 
     VertexVector vertices;
     vertices.reserve(shape.vertices.size() * 2);
@@ -229,6 +334,7 @@ void setupSmoothShape(GeometryCache::ShapeData& shapeData, const geometry::Solid
 
     solidIndices.reserve(faceIndexCount * faceCount);
 
+    Index baseVertex = 0;
     for (size_t f = 0; f < faceCount; f++) {
         const Face<N>& face = shape.faces[f];
         // Create the wire indices for unseen edges
@@ -258,7 +364,6 @@ void setupSmoothShape(GeometryCache::ShapeData& shapeData, const geometry::Solid
 template <uint32_t N>
 void extrudePolygon(GeometryCache::ShapeData& shapeData, gpu::BufferPointer& vertexBuffer, gpu::BufferPointer& indexBuffer, bool isConical = false) {
     using namespace geometry;
-    Index baseVertex = (Index)(vertexBuffer->getSize() / SHAPE_VERTEX_STRIDE);
     VertexVector vertices;
     IndexVector solidIndices, wireIndices;
 
@@ -279,6 +384,7 @@ void extrudePolygon(GeometryCache::ShapeData& shapeData, gpu::BufferPointer& ver
         vertices.push_back(vec3(v.x, -0.5f, v.z));
         vertices.push_back(vec3(0.0f, -1.0f, 0.0f));
     }
+    Index baseVertex = 0;
     for (uint32_t i = 2; i < N; i++) {
         solidIndices.push_back(baseVertex + 0);
         solidIndices.push_back(baseVertex + i);
@@ -336,7 +442,6 @@ void drawCircle(GeometryCache::ShapeData& shapeData, gpu::BufferPointer& vertexB
     // Draw a circle with radius 1/4th the size of the bounding box
     using namespace geometry;
 
-    Index baseVertex = (Index)(vertexBuffer->getSize() / SHAPE_VERTEX_STRIDE);
     VertexVector vertices;
     IndexVector solidIndices, wireIndices;
     const int NUM_CIRCLE_VERTICES = 64;
@@ -347,6 +452,7 @@ void drawCircle(GeometryCache::ShapeData& shapeData, gpu::BufferPointer& vertexB
         vertices.push_back(vec3(0.0f, 0.0f, 0.0f));
     }
 
+    Index baseVertex = 0;
     for (uint32_t i = 2; i < NUM_CIRCLE_VERTICES; i++) {
         solidIndices.push_back(baseVertex + 0);
         solidIndices.push_back(baseVertex + i);
@@ -376,8 +482,10 @@ void GeometryCache::buildShapes() {
     using namespace geometry;
     auto vertexBuffer = std::make_shared<gpu::Buffer>();
     auto indexBuffer = std::make_shared<gpu::Buffer>();
-    // Cube 
+    // Cube
     setupFlatShape(_shapes[Cube], geometry::cube(), _shapeVertices, _shapeIndices);
+    //Quad renders as flat Cube
+    setupFlatShape(_shapes[Quad], geometry::cube(), _shapeVertices, _shapeIndices);
     // Tetrahedron
     setupFlatShape(_shapes[Tetrahedron], geometry::tetrahedron(), _shapeVertices, _shapeIndices);
     // Icosahedron
@@ -396,7 +504,6 @@ void GeometryCache::buildShapes() {
 
     // Line
     {
-        Index baseVertex = (Index)(_shapeVertices->getSize() / SHAPE_VERTEX_STRIDE);
         ShapeData& shapeData = _shapes[Line];
         shapeData.setupVertices(_shapeVertices, VertexVector {
             vec3(-0.5f, 0.0f, 0.0f), vec3(-0.5f, 0.0f, 0.0f),
@@ -404,8 +511,8 @@ void GeometryCache::buildShapes() {
         });
         IndexVector wireIndices;
         // Only two indices
-        wireIndices.push_back(0 + baseVertex);
-        wireIndices.push_back(1 + baseVertex);
+        wireIndices.push_back(0);
+        wireIndices.push_back(1);
         shapeData.setupIndices(_shapeIndices, IndexVector(), wireIndices);
     }
 
@@ -419,12 +526,44 @@ void GeometryCache::buildShapes() {
     extrudePolygon<64>(_shapes[Cylinder], _shapeVertices, _shapeIndices);
     //Cone,
     extrudePolygon<64>(_shapes[Cone], _shapeVertices, _shapeIndices, true);
-    //Circle
-    drawCircle(_shapes[Circle], _shapeVertices, _shapeIndices);
-    // Not implememented yet:
-    //Quad,
-    //Torus, 
- 
+    // Circle renders as flat Cylinder
+    extrudePolygon<64>(_shapes[Circle], _shapeVertices, _shapeIndices);
+    // Not implemented yet:
+    //Torus,
+}
+
+const GeometryCache::ShapeData * GeometryCache::getShapeData(const Shape shape) const {
+    if (((int)shape < 0) || ((int)shape >= (int)_shapes.size())) {
+        qCWarning(renderutils) << "GeometryCache::getShapeData - Invalid shape " << shape << " specified. Returning default fallback.";
+
+        //--EARLY EXIT--( No valid shape data for shape )
+        return nullptr;
+    }
+
+    return &_shapes[shape];
+}
+
+GeometryCache::Shape GeometryCache::getShapeForEntityShape(int entityShape) {
+    if ((entityShape < 0) || (entityShape >= (int)MAPPING.size())) {
+        qCWarning(renderutils) << "GeometryCache::getShapeForEntityShape - Invalid shape " << entityShape << " specified. Returning default fallback.";
+
+        //--EARLY EXIT--( fall back to default assumption )
+        return GeometryCache::Sphere;
+    }
+
+    return MAPPING[entityShape];
+}
+
+QString GeometryCache::stringFromShape(GeometryCache::Shape geoShape)
+{
+    if (((int)geoShape < 0) || ((int)geoShape >= (int)GeometryCache::NUM_SHAPES)) {
+        qCWarning(renderutils) << "GeometryCache::stringFromShape - Invalid shape " << geoShape << " specified.";
+
+        //--EARLY EXIT--
+        return "INVALID_GEOCACHE_SHAPE";
+    }
+
+    return GEOCACHE_SHAPE_STRINGS[geoShape];
 }
 
 gpu::Stream::FormatPointer& getSolidStreamFormat() {
@@ -446,32 +585,64 @@ gpu::Stream::FormatPointer& getInstancedSolidStreamFormat() {
     return INSTANCED_SOLID_STREAM_FORMAT;
 }
 
+gpu::Stream::FormatPointer& getInstancedSolidFadeStreamFormat() {
+    if (!INSTANCED_SOLID_FADE_STREAM_FORMAT) {
+        INSTANCED_SOLID_FADE_STREAM_FORMAT = std::make_shared<gpu::Stream::Format>(); // 1 for everyone
+        INSTANCED_SOLID_FADE_STREAM_FORMAT->setAttribute(gpu::Stream::POSITION, gpu::Stream::POSITION, POSITION_ELEMENT);
+        INSTANCED_SOLID_FADE_STREAM_FORMAT->setAttribute(gpu::Stream::NORMAL, gpu::Stream::NORMAL, NORMAL_ELEMENT);
+        INSTANCED_SOLID_FADE_STREAM_FORMAT->setAttribute(gpu::Stream::COLOR, gpu::Stream::COLOR, COLOR_ELEMENT, 0, gpu::Stream::PER_INSTANCE);
+        INSTANCED_SOLID_FADE_STREAM_FORMAT->setAttribute(gpu::Stream::TEXCOORD2, gpu::Stream::TEXCOORD2, TEXCOORD4_ELEMENT, 0, gpu::Stream::PER_INSTANCE);
+        INSTANCED_SOLID_FADE_STREAM_FORMAT->setAttribute(gpu::Stream::TEXCOORD3, gpu::Stream::TEXCOORD3, TEXCOORD4_ELEMENT, 0, gpu::Stream::PER_INSTANCE);
+        INSTANCED_SOLID_FADE_STREAM_FORMAT->setAttribute(gpu::Stream::TEXCOORD4, gpu::Stream::TEXCOORD4, TEXCOORD4_ELEMENT, 0, gpu::Stream::PER_INSTANCE);
+    }
+    return INSTANCED_SOLID_FADE_STREAM_FORMAT;
+}
+
+QHash<SimpleProgramKey, gpu::PipelinePointer> GeometryCache::_simplePrograms;
+
+gpu::ShaderPointer GeometryCache::_simpleShader;
+gpu::ShaderPointer GeometryCache::_unlitShader;
+gpu::ShaderPointer GeometryCache::_simpleFadeShader;
+gpu::ShaderPointer GeometryCache::_unlitFadeShader;
+
 render::ShapePipelinePointer GeometryCache::_simpleOpaquePipeline;
 render::ShapePipelinePointer GeometryCache::_simpleTransparentPipeline;
+render::ShapePipelinePointer GeometryCache::_simpleOpaqueFadePipeline;
+render::ShapePipelinePointer GeometryCache::_simpleTransparentFadePipeline;
 render::ShapePipelinePointer GeometryCache::_simpleWirePipeline;
 
+uint8_t GeometryCache::CUSTOM_PIPELINE_NUMBER = 0;
+
+render::ShapePipelinePointer GeometryCache::shapePipelineFactory(const render::ShapePlumber& plumber, const render::ShapeKey& key) {
+    initializeShapePipelines();
+
+    if (key.isWireframe()) {
+        return _simpleWirePipeline;
+    }
+
+    if (key.isFaded()) {
+        if (key.isTranslucent()) {
+            return _simpleTransparentFadePipeline;
+        }
+        else {
+            return _simpleOpaqueFadePipeline;
+        }
+    }
+    else {
+        if (key.isTranslucent()) {
+            return _simpleTransparentPipeline;
+        }
+        else {
+            return _simpleOpaquePipeline;
+        }
+    }
+}
+
 GeometryCache::GeometryCache() :
 _nextID(0) {
+    // Let's register its special shapePipeline factory:
+    registerShapePipeline();
     buildShapes();
-    GeometryCache::_simpleOpaquePipeline =
-        std::make_shared<render::ShapePipeline>(getSimplePipeline(false, false, true, false), nullptr,
-            [](const render::ShapePipeline&, gpu::Batch& batch, RenderArgs* args) {
-                // Set the defaults needed for a simple program
-                batch.setResourceTexture(render::ShapePipeline::Slot::MAP::ALBEDO,
-                    DependencyManager::get<TextureCache>()->getWhiteTexture());
-            }
-        );
-    GeometryCache::_simpleTransparentPipeline =
-        std::make_shared<render::ShapePipeline>(getSimplePipeline(false, true, true, false), nullptr,
-        [](const render::ShapePipeline&, gpu::Batch& batch, RenderArgs* args) {
-                // Set the defaults needed for a simple program
-                batch.setResourceTexture(render::ShapePipeline::Slot::MAP::ALBEDO,
-                    DependencyManager::get<TextureCache>()->getWhiteTexture());
-            }
-        );
-    GeometryCache::_simpleWirePipeline =
-        std::make_shared<render::ShapePipeline>(getSimplePipeline(false, false, true, true), nullptr,
-        [](const render::ShapePipeline&, gpu::Batch& batch, RenderArgs* args) {});
 }
 
 GeometryCache::~GeometryCache() {
@@ -511,9 +682,46 @@ void GeometryCache::releaseID(int id) {
     _registeredGridBuffers.remove(id);
 }
 
-void setupBatchInstance(gpu::Batch& batch, gpu::BufferPointer colorBuffer) {
-    gpu::BufferView colorView(colorBuffer, COLOR_ELEMENT);
-    batch.setInputBuffer(gpu::Stream::COLOR, colorView);
+void GeometryCache::initializeShapePipelines() {
+    if (!_simpleOpaquePipeline) {
+        _simpleOpaquePipeline = getShapePipeline(false, false, true, false);
+        _simpleTransparentPipeline = getShapePipeline(false, true, true, false);
+        _simpleOpaqueFadePipeline = getFadingShapePipeline(false, false, false, false, false);
+        _simpleTransparentFadePipeline = getFadingShapePipeline(false, true, false, false, false);
+        _simpleWirePipeline = getShapePipeline(false, false, true, true);
+    }
+}
+
+render::ShapePipelinePointer GeometryCache::getShapePipeline(bool textured, bool transparent, bool culled,
+    bool unlit, bool depthBias) {
+
+    return std::make_shared<render::ShapePipeline>(getSimplePipeline(textured, transparent, culled, unlit, depthBias, false, true), nullptr,
+        [](const render::ShapePipeline& , gpu::Batch& batch, render::Args*) {
+        batch.setResourceTexture(render::ShapePipeline::Slot::MAP::ALBEDO, DependencyManager::get<TextureCache>()->getWhiteTexture());
+    }
+    );
+}
+
+render::ShapePipelinePointer GeometryCache::getFadingShapePipeline(bool textured, bool transparent, bool culled,
+    bool unlit, bool depthBias) {
+    auto fadeEffect = DependencyManager::get<FadeEffect>();
+    auto fadeBatchSetter = fadeEffect->getBatchSetter();
+    auto fadeItemSetter = fadeEffect->getItemStoredSetter();
+    return std::make_shared<render::ShapePipeline>(getSimplePipeline(textured, transparent, culled, unlit, depthBias, true), nullptr,
+        [fadeBatchSetter, fadeItemSetter](const render::ShapePipeline& shapePipeline, gpu::Batch& batch, render::Args* args) {
+            batch.setResourceTexture(render::ShapePipeline::Slot::MAP::ALBEDO, DependencyManager::get<TextureCache>()->getWhiteTexture());
+            fadeBatchSetter(shapePipeline, batch, args);
+        },
+        fadeItemSetter
+    );
+}
+
+render::ShapePipelinePointer GeometryCache::getOpaqueShapePipeline(bool isFading) {
+    return isFading ? _simpleOpaqueFadePipeline : _simpleOpaquePipeline;
+}
+
+render::ShapePipelinePointer GeometryCache::getTransparentShapePipeline(bool isFading) { 
+    return isFading ? _simpleTransparentFadePipeline : _simpleTransparentPipeline;
 }
 
 void GeometryCache::renderShape(gpu::Batch& batch, Shape shape) {
@@ -526,6 +734,11 @@ void GeometryCache::renderWireShape(gpu::Batch& batch, Shape shape) {
     _shapes[shape].drawWire(batch);
 }
 
+void setupBatchInstance(gpu::Batch& batch, gpu::BufferPointer colorBuffer) {
+    gpu::BufferView colorView(colorBuffer, COLOR_ELEMENT);
+    batch.setInputBuffer(gpu::Stream::COLOR, colorView);
+}
+
 void GeometryCache::renderShapeInstances(gpu::Batch& batch, Shape shape, size_t count, gpu::BufferPointer& colorBuffer) {
     batch.setInputFormat(getInstancedSolidStreamFormat());
     setupBatchInstance(batch, colorBuffer);
@@ -538,6 +751,32 @@ void GeometryCache::renderWireShapeInstances(gpu::Batch& batch, Shape shape, siz
     _shapes[shape].drawWireInstances(batch, count);
 }
 
+void setupBatchFadeInstance(gpu::Batch& batch, gpu::BufferPointer colorBuffer, 
+    gpu::BufferPointer fadeBuffer1, gpu::BufferPointer fadeBuffer2, gpu::BufferPointer fadeBuffer3) {
+    gpu::BufferView colorView(colorBuffer, COLOR_ELEMENT);
+    gpu::BufferView texCoord2View(fadeBuffer1, TEXCOORD4_ELEMENT);
+    gpu::BufferView texCoord3View(fadeBuffer2, TEXCOORD4_ELEMENT);
+    gpu::BufferView texCoord4View(fadeBuffer3, TEXCOORD4_ELEMENT);
+    batch.setInputBuffer(gpu::Stream::COLOR, colorView);
+    batch.setInputBuffer(gpu::Stream::TEXCOORD2, texCoord2View);
+    batch.setInputBuffer(gpu::Stream::TEXCOORD3, texCoord3View);
+    batch.setInputBuffer(gpu::Stream::TEXCOORD4, texCoord4View);
+}
+
+void GeometryCache::renderFadeShapeInstances(gpu::Batch& batch, Shape shape, size_t count, gpu::BufferPointer& colorBuffer,
+    gpu::BufferPointer& fadeBuffer1, gpu::BufferPointer& fadeBuffer2, gpu::BufferPointer& fadeBuffer3) {
+    batch.setInputFormat(getInstancedSolidFadeStreamFormat());
+    setupBatchFadeInstance(batch, colorBuffer, fadeBuffer1, fadeBuffer2, fadeBuffer3);
+    _shapes[shape].drawInstances(batch, count);
+}
+
+void GeometryCache::renderWireFadeShapeInstances(gpu::Batch& batch, Shape shape, size_t count, gpu::BufferPointer& colorBuffer,
+    gpu::BufferPointer& fadeBuffer1, gpu::BufferPointer& fadeBuffer2, gpu::BufferPointer& fadeBuffer3) {
+    batch.setInputFormat(getInstancedSolidFadeStreamFormat());
+    setupBatchFadeInstance(batch, colorBuffer, fadeBuffer1, fadeBuffer2, fadeBuffer3);
+    _shapes[shape].drawWireInstances(batch, count);
+}
+
 void GeometryCache::renderCube(gpu::Batch& batch) {
     renderShape(batch, Cube);
 }
@@ -1636,8 +1875,12 @@ void GeometryCache::renderGlowLine(gpu::Batch& batch, const glm::vec3& p1, const
     glowIntensity = 0.0f;
 #endif
 
-    if (glowIntensity <= 0) {
-        bindSimpleProgram(batch, false, false, false, true, false);
+    if (glowIntensity <= 0.0f) {
+        if (color.a >= 1.0f) {
+            bindSimpleProgram(batch, false, false, false, true, true);
+        } else {
+            bindSimpleProgram(batch, false, true, false, true, true);
+        }
         renderLine(batch, p1, p2, color, id);
         return;
     }
@@ -1688,9 +1931,10 @@ void GeometryCache::renderGlowLine(gpu::Batch& batch, const glm::vec3& p1, const
             vec4 p1;
             vec4 p2;
             vec4 color;
+            float width;
         };
 
-        LineData lineData { vec4(p1, 1.0f), vec4(p2, 1.0f), color };
+        LineData lineData { vec4(p1, 1.0f), vec4(p2, 1.0f), color, glowWidth };
         details.uniformBuffer->resize(sizeof(LineData));
         details.uniformBuffer->setSubData(0, lineData);
     }
@@ -1717,7 +1961,7 @@ void GeometryCache::useSimpleDrawPipeline(gpu::Batch& batch, bool noBlend) {
 
 
         auto stateNoBlend = std::make_shared<gpu::State>();
-        PrepareStencil::testMaskDrawShape(*state);
+        PrepareStencil::testMaskDrawShape(*stateNoBlend);
 
         auto noBlendPS = gpu::StandardShaderLib::getDrawTextureOpaquePS();
         auto programNoBlend = gpu::Shader::createProgram(vs, noBlendPS);
@@ -1767,6 +2011,8 @@ public:
         IS_CULLED_FLAG,
         IS_UNLIT_FLAG,
         HAS_DEPTH_BIAS_FLAG,
+        IS_FADING_FLAG,
+        IS_ANTIALIASED_FLAG,
 
         NUM_FLAGS,
     };
@@ -1777,6 +2023,8 @@ public:
         IS_CULLED = (1 << IS_CULLED_FLAG),
         IS_UNLIT = (1 << IS_UNLIT_FLAG),
         HAS_DEPTH_BIAS = (1 << HAS_DEPTH_BIAS_FLAG),
+        IS_FADING = (1 << IS_FADING_FLAG),
+        IS_ANTIALIASED = (1 << IS_ANTIALIASED_FLAG),
     };
     typedef unsigned short Flags;
 
@@ -1787,6 +2035,8 @@ public:
     bool isCulled() const { return isFlag(IS_CULLED); }
     bool isUnlit() const { return isFlag(IS_UNLIT); }
     bool hasDepthBias() const { return isFlag(HAS_DEPTH_BIAS); }
+    bool isFading() const { return isFlag(IS_FADING); }
+    bool isAntiAliased() const { return isFlag(IS_ANTIALIASED); }
 
     Flags _flags = 0;
     short _spare = 0;
@@ -1795,9 +2045,9 @@ public:
 
 
     SimpleProgramKey(bool textured = false, bool transparent = false, bool culled = true,
-        bool unlit = false, bool depthBias = false) {
+        bool unlit = false, bool depthBias = false, bool fading = false, bool isAntiAliased = true) {
         _flags = (textured ? IS_TEXTURED : 0) | (transparent ? IS_TRANSPARENT : 0) | (culled ? IS_CULLED : 0) |
-            (unlit ? IS_UNLIT : 0) | (depthBias ? HAS_DEPTH_BIAS : 0);
+            (unlit ? IS_UNLIT : 0) | (depthBias ? HAS_DEPTH_BIAS : 0) | (fading ? IS_FADING : 0) | (isAntiAliased ? IS_ANTIALIASED : 0);
     }
 
     SimpleProgramKey(int bitmask) : _flags(bitmask) {}
@@ -1826,48 +2076,28 @@ static void buildWebShader(const std::string& vertShaderText, const std::string&
     state->setBlendFunction(blendEnable,
                             gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::INV_SRC_ALPHA,
                             gpu::State::FACTOR_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::ONE);
-    if (blendEnable) {
-        PrepareStencil::testMask(*state);
-    } else {
-        PrepareStencil::testMaskDrawShape(*state);
-    }
+
+    PrepareStencil::testMaskDrawShapeNoAA(*state);
 
     pipelinePointerOut = gpu::Pipeline::create(shaderPointerOut, state);
 }
 
-void GeometryCache::bindOpaqueWebBrowserProgram(gpu::Batch& batch, bool isAA) {
-    batch.setPipeline(getOpaqueWebBrowserProgram(isAA));
+void GeometryCache::bindWebBrowserProgram(gpu::Batch& batch, bool transparent) {
+    batch.setPipeline(getWebBrowserProgram(transparent));
 }
 
-gpu::PipelinePointer GeometryCache::getOpaqueWebBrowserProgram(bool isAA) {
+gpu::PipelinePointer GeometryCache::getWebBrowserProgram(bool transparent) {
     static std::once_flag once;
     std::call_once(once, [&]() {
-        const bool BLEND_ENABLE = false;
-        buildWebShader(simple_vert, simple_opaque_web_browser_frag, BLEND_ENABLE, _simpleOpaqueWebBrowserShader, _simpleOpaqueWebBrowserPipeline);
-        buildWebShader(simple_vert, simple_opaque_web_browser_overlay_frag, BLEND_ENABLE, _simpleOpaqueWebBrowserOverlayShader, _simpleOpaqueWebBrowserOverlayPipeline);
+        buildWebShader(simple_vert, simple_opaque_web_browser_frag, false, _simpleOpaqueWebBrowserShader, _simpleOpaqueWebBrowserPipelineNoAA);
+        buildWebShader(simple_vert, simple_transparent_web_browser_frag, true, _simpleTransparentWebBrowserShader, _simpleTransparentWebBrowserPipelineNoAA);
     });
 
-    return isAA ? _simpleOpaqueWebBrowserPipeline : _simpleOpaqueWebBrowserOverlayPipeline;
+    return transparent ? _simpleTransparentWebBrowserPipelineNoAA : _simpleOpaqueWebBrowserPipelineNoAA;
 }
 
-void GeometryCache::bindTransparentWebBrowserProgram(gpu::Batch& batch, bool isAA) {
-    batch.setPipeline(getTransparentWebBrowserProgram(isAA));
-}
-
-gpu::PipelinePointer GeometryCache::getTransparentWebBrowserProgram(bool isAA) {
-    static std::once_flag once;
-    std::call_once(once, [&]() {
-
-        const bool BLEND_ENABLE = true;
-        buildWebShader(simple_vert, simple_transparent_web_browser_frag, BLEND_ENABLE, _simpleTransparentWebBrowserShader, _simpleTransparentWebBrowserPipeline);
-        buildWebShader(simple_vert, simple_transparent_web_browser_overlay_frag, BLEND_ENABLE, _simpleTransparentWebBrowserOverlayShader, _simpleTransparentWebBrowserOverlayPipeline);
-    });
-
-    return isAA ? _simpleTransparentWebBrowserPipeline : _simpleTransparentWebBrowserOverlayPipeline;
-}
-
-void GeometryCache::bindSimpleProgram(gpu::Batch& batch, bool textured, bool transparent, bool culled, bool unlit, bool depthBiased) {
-    batch.setPipeline(getSimplePipeline(textured, transparent, culled, unlit, depthBiased));
+void GeometryCache::bindSimpleProgram(gpu::Batch& batch, bool textured, bool transparent, bool culled, bool unlit, bool depthBiased, bool isAntiAliased) {
+    batch.setPipeline(getSimplePipeline(textured, transparent, culled, unlit, depthBiased, false, isAntiAliased));
 
     // If not textured, set a default albedo map
     if (!textured) {
@@ -1876,23 +2106,8 @@ void GeometryCache::bindSimpleProgram(gpu::Batch& batch, bool textured, bool tra
     }
 }
 
-gpu::PipelinePointer GeometryCache::getSimplePipeline(bool textured, bool transparent, bool culled, bool unlit, bool depthBiased) {
-    SimpleProgramKey config { textured, transparent, culled, unlit, depthBiased };
-
-    // Compile the shaders
-    static std::once_flag once;
-    std::call_once(once, [&]() {
-        auto VS = gpu::Shader::createVertex(std::string(simple_vert));
-        auto PS = gpu::Shader::createPixel(std::string(simple_textured_frag));
-        auto PSUnlit = gpu::Shader::createPixel(std::string(simple_textured_unlit_frag));
-
-        _simpleShader = gpu::Shader::createProgram(VS, PS);
-        _unlitShader = gpu::Shader::createProgram(VS, PSUnlit);
-
-        gpu::Shader::BindingSet slotBindings;
-        gpu::Shader::makeProgram(*_simpleShader, slotBindings);
-        gpu::Shader::makeProgram(*_unlitShader, slotBindings);
-    });
+gpu::PipelinePointer GeometryCache::getSimplePipeline(bool textured, bool transparent, bool culled, bool unlit, bool depthBiased, bool fading, bool isAntiAliased) {
+    SimpleProgramKey config { textured, transparent, culled, unlit, depthBiased, fading, isAntiAliased };
 
     // If the pipeline already exists, return it
     auto it = _simplePrograms.find(config);
@@ -1900,6 +2115,40 @@ gpu::PipelinePointer GeometryCache::getSimplePipeline(bool textured, bool transp
         return it.value();
     }
 
+    // Compile the shaders
+    if (!fading) {
+        static std::once_flag once;
+        std::call_once(once, [&]() {
+            auto VS = gpu::Shader::createVertex(std::string(simple_vert));
+            auto PS = gpu::Shader::createPixel(std::string(simple_textured_frag));
+            auto PSUnlit = gpu::Shader::createPixel(std::string(simple_textured_unlit_frag));
+
+            _simpleShader = gpu::Shader::createProgram(VS, PS);
+            _unlitShader = gpu::Shader::createProgram(VS, PSUnlit);
+
+            gpu::Shader::BindingSet slotBindings;
+            slotBindings.insert(gpu::Shader::Binding(std::string("originalTexture"), render::ShapePipeline::Slot::MAP::ALBEDO));
+            gpu::Shader::makeProgram(*_simpleShader, slotBindings);
+            gpu::Shader::makeProgram(*_unlitShader, slotBindings);
+        });
+    } else {
+        static std::once_flag once;
+        std::call_once(once, [&]() {
+            auto VS = gpu::Shader::createVertex(std::string(simple_fade_vert));
+            auto PS = gpu::Shader::createPixel(std::string(simple_textured_fade_frag));
+            auto PSUnlit = gpu::Shader::createPixel(std::string(simple_textured_unlit_fade_frag));
+
+            _simpleFadeShader = gpu::Shader::createProgram(VS, PS);
+            _unlitFadeShader = gpu::Shader::createProgram(VS, PSUnlit);
+
+            gpu::Shader::BindingSet slotBindings;
+            slotBindings.insert(gpu::Shader::Binding(std::string("originalTexture"), render::ShapePipeline::Slot::MAP::ALBEDO));
+            slotBindings.insert(gpu::Shader::Binding(std::string("fadeMaskMap"), render::ShapePipeline::Slot::MAP::FADE_MASK));
+            gpu::Shader::makeProgram(*_simpleFadeShader, slotBindings);
+            gpu::Shader::makeProgram(*_unlitFadeShader, slotBindings);
+        });
+    }
+
     // If the pipeline did not exist, make it
     auto state = std::make_shared<gpu::State>();
     if (config.isCulled()) {
@@ -1916,13 +2165,13 @@ gpu::PipelinePointer GeometryCache::getSimplePipeline(bool textured, bool transp
         gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::INV_SRC_ALPHA,
         gpu::State::FACTOR_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::ONE);
 
-    if (config.isTransparent()) {
-        PrepareStencil::testMask(*state);
+    if (config.isAntiAliased()) {
+        config.isTransparent() ? PrepareStencil::testMask(*state) : PrepareStencil::testMaskDrawShape(*state);
     } else {
-        PrepareStencil::testMaskDrawShape(*state);
+        PrepareStencil::testMaskDrawShapeNoAA(*state);
     }
 
-    gpu::ShaderPointer program = (config.isUnlit()) ? _unlitShader : _simpleShader;
+    gpu::ShaderPointer program = (config.isUnlit()) ? (config.isFading() ? _unlitFadeShader : _unlitShader) : (config.isFading() ? _simpleFadeShader : _simpleShader);
     gpu::PipelinePointer pipeline = gpu::Pipeline::create(program, state);
     _simplePrograms.insert(config, pipeline);
     return pipeline;
@@ -1957,26 +2206,93 @@ void renderInstances(RenderArgs* args, gpu::Batch& batch, const glm::vec4& color
 
         if (isWire) {
             DependencyManager::get<GeometryCache>()->renderWireShapeInstances(batch, shape, data.count(), data.buffers[INSTANCE_COLOR_BUFFER]);
-        } else {
+        }
+        else {
             DependencyManager::get<GeometryCache>()->renderShapeInstances(batch, shape, data.count(), data.buffers[INSTANCE_COLOR_BUFFER]);
         }
     });
 }
 
+static const size_t INSTANCE_FADE_BUFFER1 = 1;
+static const size_t INSTANCE_FADE_BUFFER2 = 2;
+static const size_t INSTANCE_FADE_BUFFER3 = 3;
+
+void renderFadeInstances(RenderArgs* args, gpu::Batch& batch, const glm::vec4& color, int fadeCategory, float fadeThreshold,
+    const glm::vec3& fadeNoiseOffset, const glm::vec3& fadeBaseOffset, const glm::vec3& fadeBaseInvSize, bool isWire,
+    const render::ShapePipelinePointer& pipeline, GeometryCache::Shape shape) {
+    // Add pipeline to name
+    std::string instanceName = (isWire ? "wire_shapes_" : "solid_shapes_") + std::to_string(shape) + "_" + std::to_string(std::hash<render::ShapePipelinePointer>()(pipeline));
+
+    // Add color to named buffer
+    {
+        gpu::BufferPointer instanceColorBuffer = batch.getNamedBuffer(instanceName, INSTANCE_COLOR_BUFFER);
+        auto compactColor = toCompactColor(color);
+        instanceColorBuffer->append(compactColor);
+    }
+    // Add fade parameters to named buffers
+    {
+        gpu::BufferPointer fadeBuffer1 = batch.getNamedBuffer(instanceName, INSTANCE_FADE_BUFFER1);
+        gpu::BufferPointer fadeBuffer2 = batch.getNamedBuffer(instanceName, INSTANCE_FADE_BUFFER2);
+        gpu::BufferPointer fadeBuffer3 = batch.getNamedBuffer(instanceName, INSTANCE_FADE_BUFFER3);
+        // Pack parameters in 3 vec4s
+        glm::vec4 fadeData1;
+        glm::vec4 fadeData2;
+        glm::vec4 fadeData3;
+        FadeEffect::packToAttributes(fadeCategory, fadeThreshold, fadeNoiseOffset, fadeBaseOffset, fadeBaseInvSize,
+            fadeData1, fadeData2, fadeData3);
+        fadeBuffer1->append(fadeData1);
+        fadeBuffer2->append(fadeData2);
+        fadeBuffer3->append(fadeData3);
+    }
+
+    // Add call to named buffer
+    batch.setupNamedCalls(instanceName, [args, isWire, pipeline, shape](gpu::Batch& batch, gpu::Batch::NamedBatchData& data) {
+        auto& buffers = data.buffers;
+        batch.setPipeline(pipeline->pipeline);
+        pipeline->prepare(batch, args);
+
+        if (isWire) {
+            DependencyManager::get<GeometryCache>()->renderWireFadeShapeInstances(batch, shape, data.count(), 
+                buffers[INSTANCE_COLOR_BUFFER], buffers[INSTANCE_FADE_BUFFER1], buffers[INSTANCE_FADE_BUFFER2], buffers[INSTANCE_FADE_BUFFER3]);
+        }
+        else {
+            DependencyManager::get<GeometryCache>()->renderFadeShapeInstances(batch, shape, data.count(), 
+                buffers[INSTANCE_COLOR_BUFFER], buffers[INSTANCE_FADE_BUFFER1], buffers[INSTANCE_FADE_BUFFER2], buffers[INSTANCE_FADE_BUFFER3]);
+        }
+    });
+}
+
 void GeometryCache::renderSolidShapeInstance(RenderArgs* args, gpu::Batch& batch, GeometryCache::Shape shape, const glm::vec4& color, const render::ShapePipelinePointer& pipeline) {
+    assert(pipeline != nullptr);
     renderInstances(args, batch, color, false, pipeline, shape);
 }
 
 void GeometryCache::renderWireShapeInstance(RenderArgs* args, gpu::Batch& batch, GeometryCache::Shape shape, const glm::vec4& color, const render::ShapePipelinePointer& pipeline) {
+    assert(pipeline != nullptr);
     renderInstances(args, batch, color, true, pipeline, shape);
 }
 
+void GeometryCache::renderSolidFadeShapeInstance(RenderArgs* args, gpu::Batch& batch, GeometryCache::Shape shape, const glm::vec4& color, 
+    int fadeCategory, float fadeThreshold, const glm::vec3& fadeNoiseOffset, const glm::vec3& fadeBaseOffset, const glm::vec3& fadeBaseInvSize, 
+    const render::ShapePipelinePointer& pipeline) {
+    assert(pipeline != nullptr);
+    renderFadeInstances(args, batch, color, fadeCategory, fadeThreshold, fadeNoiseOffset, fadeBaseOffset, fadeBaseInvSize, false, pipeline, shape);
+}
+
+void GeometryCache::renderWireFadeShapeInstance(RenderArgs* args, gpu::Batch& batch, GeometryCache::Shape shape, const glm::vec4& color, 
+    int fadeCategory, float fadeThreshold, const glm::vec3& fadeNoiseOffset, const glm::vec3& fadeBaseOffset, const glm::vec3& fadeBaseInvSize, 
+    const render::ShapePipelinePointer& pipeline) {
+    assert(pipeline != nullptr);
+    renderFadeInstances(args, batch, color, fadeCategory, fadeThreshold, fadeNoiseOffset, fadeBaseOffset, fadeBaseInvSize, true, pipeline, shape);
+}
 
 void GeometryCache::renderSolidSphereInstance(RenderArgs* args, gpu::Batch& batch, const glm::vec4& color, const render::ShapePipelinePointer& pipeline) {
+    assert(pipeline != nullptr);
     renderInstances(args, batch, color, false, pipeline, GeometryCache::Sphere);
 }
 
 void GeometryCache::renderWireSphereInstance(RenderArgs* args, gpu::Batch& batch, const glm::vec4& color, const render::ShapePipelinePointer& pipeline) {
+    assert(pipeline != nullptr);
     renderInstances(args, batch, color, true, pipeline, GeometryCache::Sphere);
 }
 
@@ -1984,7 +2300,9 @@ void GeometryCache::renderWireSphereInstance(RenderArgs* args, gpu::Batch& batch
 // available shape types, both solid and wireframes
 //#define DEBUG_SHAPES
 
+
 void GeometryCache::renderSolidCubeInstance(RenderArgs* args, gpu::Batch& batch, const glm::vec4& color, const render::ShapePipelinePointer& pipeline) {
+    assert(pipeline != nullptr);
 #ifdef DEBUG_SHAPES
     static auto startTime = usecTimestampNow();
     renderInstances(INSTANCE_NAME, batch, color, pipeline, [](gpu::Batch& batch, gpu::Batch::NamedBatchData& data) {
@@ -2024,5 +2342,6 @@ void GeometryCache::renderSolidCubeInstance(RenderArgs* args, gpu::Batch& batch,
 
 void GeometryCache::renderWireCubeInstance(RenderArgs* args, gpu::Batch& batch, const glm::vec4& color, const render::ShapePipelinePointer& pipeline) {
     static const std::string INSTANCE_NAME = __FUNCTION__;
+    assert(pipeline != nullptr);
     renderInstances(args, batch, color, true, pipeline, GeometryCache::Cube);
 }
diff --git a/libraries/render-utils/src/GeometryCache.h b/libraries/render-utils/src/GeometryCache.h
index fa558a1151..cd8c43f1df 100644
--- a/libraries/render-utils/src/GeometryCache.h
+++ b/libraries/render-utils/src/GeometryCache.h
@@ -147,31 +147,58 @@ public:
         NUM_SHAPES,
     };
 
+    /// @param entityShapeEnum:  The entity::Shape enumeration for the shape
+    ///           whose GeometryCache::Shape is desired.
+    /// @return GeometryCache::NUM_SHAPES in the event of an error; otherwise,
+    ///         the GeometryCache::Shape enum which aligns with the 
+    ///         specified entityShapeEnum
+    static GeometryCache::Shape getShapeForEntityShape(int entityShapeEnum);
+    static QString stringFromShape(GeometryCache::Shape geoShape);
+
+    static void computeSimpleHullPointListForShape(int entityShape, const glm::vec3 &entityExtents, QVector<glm::vec3> &outPointList);
+
+    static uint8_t CUSTOM_PIPELINE_NUMBER;
+    static render::ShapePipelinePointer shapePipelineFactory(const render::ShapePlumber& plumber, const render::ShapeKey& key);
+    static void registerShapePipeline() {
+        if (!CUSTOM_PIPELINE_NUMBER) {
+            CUSTOM_PIPELINE_NUMBER = render::ShapePipeline::registerCustomShapePipelineFactory(shapePipelineFactory);
+        }
+    }
+
     int allocateID() { return _nextID++; }
     void releaseID(int id);
     static const int UNKNOWN_ID;
 
     // Bind the pipeline and get the state to render static geometry
     void bindSimpleProgram(gpu::Batch& batch, bool textured = false, bool transparent = false, bool culled = true,
-                                          bool unlit = false, bool depthBias = false);
+                                          bool unlit = false, bool depthBias = false, bool isAntiAliased = true);
     // Get the pipeline to render static geometry
-    gpu::PipelinePointer getSimplePipeline(bool textured = false, bool transparent = false, bool culled = true,
-                                          bool unlit = false, bool depthBias = false);
+    static gpu::PipelinePointer getSimplePipeline(bool textured = false, bool transparent = false, bool culled = true,
+                                          bool unlit = false, bool depthBias = false, bool fading = false, bool isAntiAliased = true);
 
-    void bindOpaqueWebBrowserProgram(gpu::Batch& batch, bool isAA);
-    gpu::PipelinePointer getOpaqueWebBrowserProgram(bool isAA);
+    void bindWebBrowserProgram(gpu::Batch& batch, bool transparent = false);
+    gpu::PipelinePointer getWebBrowserProgram(bool transparent);
 
-    void bindTransparentWebBrowserProgram(gpu::Batch& batch, bool isAA);
-    gpu::PipelinePointer getTransparentWebBrowserProgram(bool isAA);
+    static void initializeShapePipelines();
+
+    render::ShapePipelinePointer getOpaqueShapePipeline() { assert(_simpleOpaquePipeline != nullptr); return _simpleOpaquePipeline; }
+    render::ShapePipelinePointer getTransparentShapePipeline() { assert(_simpleTransparentPipeline != nullptr); return _simpleTransparentPipeline; }
+    render::ShapePipelinePointer getOpaqueFadeShapePipeline() { assert(_simpleOpaqueFadePipeline != nullptr); return _simpleOpaqueFadePipeline; }
+    render::ShapePipelinePointer getTransparentFadeShapePipeline() { assert(_simpleTransparentFadePipeline != nullptr); return _simpleTransparentFadePipeline; }
+    render::ShapePipelinePointer getOpaqueShapePipeline(bool isFading);
+    render::ShapePipelinePointer getTransparentShapePipeline(bool isFading);
+    render::ShapePipelinePointer getWireShapePipeline() { assert(_simpleWirePipeline != nullptr); return GeometryCache::_simpleWirePipeline; }
 
-    render::ShapePipelinePointer getOpaqueShapePipeline() { return GeometryCache::_simpleOpaquePipeline; }
-    render::ShapePipelinePointer getTransparentShapePipeline() { return GeometryCache::_simpleTransparentPipeline; }
-    render::ShapePipelinePointer getWireShapePipeline() { return GeometryCache::_simpleWirePipeline; }
 
     // Static (instanced) geometry
     void renderShapeInstances(gpu::Batch& batch, Shape shape, size_t count, gpu::BufferPointer& colorBuffer);
     void renderWireShapeInstances(gpu::Batch& batch, Shape shape, size_t count, gpu::BufferPointer& colorBuffer);
 
+    void renderFadeShapeInstances(gpu::Batch& batch, Shape shape, size_t count, gpu::BufferPointer& colorBuffer,
+        gpu::BufferPointer& fadeBuffer1, gpu::BufferPointer& fadeBuffer2, gpu::BufferPointer& fadeBuffer3);
+    void renderWireFadeShapeInstances(gpu::Batch& batch, Shape shape, size_t count, gpu::BufferPointer& colorBuffer,
+        gpu::BufferPointer& fadeBuffer1, gpu::BufferPointer& fadeBuffer2, gpu::BufferPointer& fadeBuffer3);
+
     void renderSolidShapeInstance(RenderArgs* args, gpu::Batch& batch, Shape shape, const glm::vec4& color = glm::vec4(1),
                                     const render::ShapePipelinePointer& pipeline = _simpleOpaquePipeline);
     void renderSolidShapeInstance(RenderArgs* args, gpu::Batch& batch, Shape shape, const glm::vec3& color,
@@ -186,6 +213,13 @@ public:
         renderWireShapeInstance(args, batch, shape, glm::vec4(color, 1.0f), pipeline);
     }
 
+    void renderSolidFadeShapeInstance(RenderArgs* args, gpu::Batch& batch, Shape shape, const glm::vec4& color, int fadeCategory, float fadeThreshold,
+        const glm::vec3& fadeNoiseOffset, const glm::vec3& fadeBaseOffset, const glm::vec3& fadeBaseInvSize,
+        const render::ShapePipelinePointer& pipeline);
+    void renderWireFadeShapeInstance(RenderArgs* args, gpu::Batch& batch, Shape shape, const glm::vec4& color, int fadeCategory, float fadeThreshold,
+        const glm::vec3& fadeNoiseOffset, const glm::vec3& fadeBaseOffset, const glm::vec3& fadeBaseInvSize,
+        const render::ShapePipelinePointer& pipeline);
+
     void renderSolidSphereInstance(RenderArgs* args, gpu::Batch& batch, const glm::vec4& color,
                                     const render::ShapePipelinePointer& pipeline = _simpleOpaquePipeline);
     void renderSolidSphereInstance(RenderArgs* args, gpu::Batch& batch, const glm::vec3& color,
@@ -315,14 +349,10 @@ public:
     void useSimpleDrawPipeline(gpu::Batch& batch, bool noBlend = false);
 
     struct ShapeData {
-        size_t _indexOffset{ 0 };
-        size_t _indexCount{ 0 };
-        size_t _wireIndexOffset{ 0 };
-        size_t _wireIndexCount{ 0 };
-
         gpu::BufferView _positionView;
         gpu::BufferView _normalView;
-        gpu::BufferPointer _indices;
+        gpu::BufferView _indicesView;
+        gpu::BufferView _wireIndicesView;
 
         void setupVertices(gpu::BufferPointer& vertexBuffer, const geometry::VertexVector& vertices);
         void setupIndices(gpu::BufferPointer& indexBuffer, const geometry::IndexVector& indices, const geometry::IndexVector& wireIndices);
@@ -335,15 +365,21 @@ public:
 
     using VShape = std::array<ShapeData, NUM_SHAPES>;
 
-    VShape _shapes;
+    /// returns ShapeData associated with the specified shape,
+    /// otherwise nullptr in the event of an error.
+    const ShapeData * getShapeData(Shape shape) const;
 
 private:
+
     GeometryCache();
     virtual ~GeometryCache();
     void buildShapes();
 
     typedef QPair<int, int> IntPair;
     typedef QPair<unsigned int, unsigned int> VerticesIndices;
+    
+    
+    VShape _shapes;
 
     gpu::PipelinePointer _standardDrawPipeline;
     gpu::PipelinePointer _standardDrawPipelineNoBlend;
@@ -416,25 +452,30 @@ private:
     QHash<int, Vec2FloatPairPair> _lastRegisteredGridBuffer;
     QHash<int, GridBuffer> _registeredGridBuffers;
 
-    gpu::ShaderPointer _simpleShader;
-    gpu::ShaderPointer _unlitShader;
+    static gpu::ShaderPointer _simpleShader;
+    static gpu::ShaderPointer _unlitShader;
+    static gpu::ShaderPointer _simpleFadeShader;
+    static gpu::ShaderPointer _unlitFadeShader;
     static render::ShapePipelinePointer _simpleOpaquePipeline;
     static render::ShapePipelinePointer _simpleTransparentPipeline;
+    static render::ShapePipelinePointer _simpleOpaqueFadePipeline;
+    static render::ShapePipelinePointer _simpleTransparentFadePipeline;
     static render::ShapePipelinePointer _simpleOpaqueOverlayPipeline;
     static render::ShapePipelinePointer _simpleTransparentOverlayPipeline;
     static render::ShapePipelinePointer _simpleWirePipeline;
     gpu::PipelinePointer _glowLinePipeline;
-    QHash<SimpleProgramKey, gpu::PipelinePointer> _simplePrograms;
+
+    static QHash<SimpleProgramKey, gpu::PipelinePointer> _simplePrograms;
 
     gpu::ShaderPointer _simpleOpaqueWebBrowserShader;
-    gpu::PipelinePointer _simpleOpaqueWebBrowserPipeline;
+    gpu::PipelinePointer _simpleOpaqueWebBrowserPipelineNoAA;
     gpu::ShaderPointer _simpleTransparentWebBrowserShader;
-    gpu::PipelinePointer _simpleTransparentWebBrowserPipeline;
+    gpu::PipelinePointer _simpleTransparentWebBrowserPipelineNoAA;
 
-    gpu::ShaderPointer _simpleOpaqueWebBrowserOverlayShader;
-    gpu::PipelinePointer _simpleOpaqueWebBrowserOverlayPipeline;
-    gpu::ShaderPointer _simpleTransparentWebBrowserOverlayShader;
-    gpu::PipelinePointer _simpleTransparentWebBrowserOverlayPipeline;
+    static render::ShapePipelinePointer getShapePipeline(bool textured = false, bool transparent = false, bool culled = true,
+        bool unlit = false, bool depthBias = false);
+    static render::ShapePipelinePointer getFadingShapePipeline(bool textured = false, bool transparent = false, bool culled = true,
+        bool unlit = false, bool depthBias = false);
 };
 
 #endif // hifi_GeometryCache_h
diff --git a/libraries/render-utils/src/Haze.slf b/libraries/render-utils/src/Haze.slf
new file mode 100644
index 0000000000..b366e6d639
--- /dev/null
+++ b/libraries/render-utils/src/Haze.slf
@@ -0,0 +1,148 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  Created by Nissim Hadar on 9/5/2107.
+//  Copyright 2016 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 DeferredTransform.slh@>
+<$declareDeferredFrameTransform()$>
+
+<@include model/Light.slh@>
+
+<@include LightingModel.slh@>
+<$declareLightBuffer()$>
+
+<@include LightDirectional.slh@>
+<$declareLightingDirectional(_SCRIBE_NULL)$>
+
+<@include Haze.slh@>
+
+uniform sampler2D colorMap;
+
+vec4 unpackPositionFromZeye(vec2 texcoord) {
+    float Zeye = -texture(linearDepthMap, texcoord).x;
+    int side = 0;
+    if (isStereo()) {
+        if (texcoord.x > 0.5) {
+            texcoord.x -= 0.5;
+            side = 1;
+        }
+        texcoord.x *= 2.0;
+    }
+    return vec4(evalEyePositionFromZeye(side, Zeye, texcoord), 1.0);
+}
+
+in vec2 varTexCoord0;
+out vec4 outFragColor;
+
+void main(void) {
+    if ((hazeParams.hazeMode & HAZE_MODE_IS_ACTIVE) != HAZE_MODE_IS_ACTIVE) {
+        discard;
+    }
+
+    // Distance to fragment 
+    vec4 eyeFragPos = unpackPositionFromZeye(varTexCoord0);
+    float distance = length(eyeFragPos.xyz);
+
+    vec4 fragColor = texture(colorMap, varTexCoord0);
+    vec4 hazeColor  = vec4(hazeParams.hazeColor, 1.0);
+
+    // Directional light component is a function of the angle from the eye, between the fragment and the sun
+    DeferredFrameTransform deferredTransform = getDeferredFrameTransform();
+    vec4 worldFragPos = getViewInverse() * eyeFragPos;
+    vec3 eyeFragDir = normalize(worldFragPos.xyz);
+
+    Light light = getLight();
+    vec3 lightDirection = getLightDirection(light);
+
+    float glareComponent = max(0.0, dot(eyeFragDir, -lightDirection));
+    float power = min(1.0, pow(glareComponent, hazeParams.hazeGlareBlend));
+
+    vec4 glareColor = vec4(hazeParams.hazeGlareColor, 1.0);
+
+    // Use the haze colour for the glare colour, if blend is not enabled
+    vec4 blendedHazeColor;
+    if ((hazeParams.hazeMode & HAZE_MODE_IS_ENABLE_LIGHT_BLEND) == HAZE_MODE_IS_ENABLE_LIGHT_BLEND) {
+        blendedHazeColor = mix(hazeColor, glareColor, power);
+    } else {
+        blendedHazeColor = hazeColor;
+    }
+
+    vec4 potentialFragColor;
+
+    if ((hazeParams.hazeMode & HAZE_MODE_IS_MODULATE_COLOR) == HAZE_MODE_IS_MODULATE_COLOR) {
+        // Compute separately for each colour
+        // Haze is based on both range and altitude
+        // Taken from www.crytek.com/download/GDC2007_RealtimeAtmoFxInGamesRev.ppt
+
+        // The eyepoint position is in the last column of the matrix
+        vec3 worldEyePos = getViewInverse()[3].xyz;
+
+        // Note that the haze base reference affects only the haze density as function of altitude
+        vec3 hazeDensityDistribution =  
+            hazeParams.colorModulationFactor * 
+            exp(-hazeParams.hazeHeightFactor * (worldEyePos.y - hazeParams.hazeBaseReference));
+
+        vec3 hazeIntegral =  hazeDensityDistribution * distance;
+
+        const float slopeThreshold = 0.01;
+        float deltaHeight = worldFragPos.y - worldEyePos.y;
+        if (abs(deltaHeight) > slopeThreshold) {
+            float t = hazeParams.hazeHeightFactor * deltaHeight;
+            hazeIntegral *= (1.0 - exp (-t)) / t;
+        }
+
+        vec3 hazeAmount = 1.0 - exp(-hazeIntegral);
+
+        // Compute color after haze effect
+        potentialFragColor = mix(fragColor, vec4(1.0, 1.0, 1.0, 1.0), vec4(hazeAmount, 1.0));
+    } else if ((hazeParams.hazeMode & HAZE_MODE_IS_ALTITUDE_BASED) != HAZE_MODE_IS_ALTITUDE_BASED) {
+        // Haze is based only on range
+        float hazeAmount = 1.0 - exp(-distance * hazeParams.hazeRangeFactor);
+
+        // Compute color after haze effect
+        potentialFragColor = mix(fragColor, blendedHazeColor, hazeAmount);
+    } else {
+        // Haze is based on both range and altitude
+        // Taken from www.crytek.com/download/GDC2007_RealtimeAtmoFxInGamesRev.ppt
+
+        // The eyepoint position is in the last column of the matrix
+        vec3 worldEyePos = getViewInverse()[3].xyz;
+
+        // Note that the haze base reference affects only the haze density as function of altitude
+        float hazeDensityDistribution =  
+            hazeParams.hazeRangeFactor * 
+            exp(-hazeParams.hazeHeightFactor * (worldEyePos.y - hazeParams.hazeBaseReference));
+
+        float hazeIntegral =  hazeDensityDistribution * distance;
+
+        const float slopeThreshold = 0.01;
+        float deltaHeight = worldFragPos.y - worldEyePos.y;
+        if (abs(deltaHeight) > slopeThreshold) {
+            float t = hazeParams.hazeHeightFactor * deltaHeight;
+            // Protect from wild values
+            if (abs(t) > 0.0000001) {
+                hazeIntegral *= (1.0 - exp (-t)) / t;
+            }
+        }
+
+        float hazeAmount = 1.0 - exp(-hazeIntegral);
+
+        // Compute color after haze effect
+        potentialFragColor = mix(fragColor, blendedHazeColor, hazeAmount);
+    }
+
+    // Mix with background at far range
+    const float BLEND_DISTANCE = 27000.0;
+    if (distance > BLEND_DISTANCE) {
+        outFragColor = mix(potentialFragColor, fragColor, hazeParams.backgroundBlend);
+    } else {
+        outFragColor = potentialFragColor;
+    }
+}
+
diff --git a/libraries/render-utils/src/Haze.slh b/libraries/render-utils/src/Haze.slh
new file mode 100644
index 0000000000..de7f0ac246
--- /dev/null
+++ b/libraries/render-utils/src/Haze.slh
@@ -0,0 +1,46 @@
+<!
+//  Haze.slh
+//
+//  Created by Nissim Hadar on 9/13/2017
+//  Copyright 2013 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
+!>
+<@if not HAZE_SLH@>
+<@def HAZE_SLH@>
+
+const int HAZE_MODE_IS_ACTIVE = 1 << 0;
+const int HAZE_MODE_IS_ALTITUDE_BASED = 1 << 1;
+const int HAZE_MODE_IS_KEYLIGHT_ATTENUATED = 1 << 2;
+const int HAZE_MODE_IS_MODULATE_COLOR = 1 << 3;
+const int HAZE_MODE_IS_ENABLE_LIGHT_BLEND = 1 << 4;
+
+struct HazeParams {
+    vec3 hazeColor;
+    float hazeGlareBlend;
+
+    vec3 hazeGlareColor;
+    float hazeBaseReference;
+
+    vec3 colorModulationFactor;
+    int hazeMode;
+
+    mat4 zoneTransform;
+    float backgroundBlend;
+
+    float hazeRangeFactor;
+    float hazeHeightFactor;
+
+    float hazeKeyLightRangeFactor;
+    float hazeKeyLightAltitudeFactor;
+};
+
+layout(std140) uniform hazeBuffer {
+    HazeParams hazeParams;
+};
+
+uniform sampler2D linearDepthMap;
+
+<@endif@>
+
diff --git a/libraries/render-utils/src/HazeStage.cpp b/libraries/render-utils/src/HazeStage.cpp
new file mode 100644
index 0000000000..016282d16f
--- /dev/null
+++ b/libraries/render-utils/src/HazeStage.cpp
@@ -0,0 +1,98 @@
+//
+//  HazeStage.cpp
+//
+//  Created by Nissim Hadar on 9/26/2017.
+//  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 "HazeStage.h"
+
+#include "DeferredLightingEffect.h"
+
+#include <gpu/Context.h>
+
+std::string HazeStage::_stageName { "HAZE_STAGE"};
+const HazeStage::Index HazeStage::INVALID_INDEX { render::indexed_container::INVALID_INDEX };
+
+FetchHazeStage::FetchHazeStage() {
+    _haze = std::make_shared<model::Haze>();
+}
+
+void FetchHazeStage::configure(const Config& config) {
+    _haze->setHazeColor(config.hazeColor);
+    _haze->setHazeGlareBlend(model::Haze::convertGlareAngleToPower(config.hazeGlareAngle));
+
+    _haze->setHazeGlareColor(config.hazeGlareColor);
+    _haze->setHazeBaseReference(config.hazeBaseReference);
+
+    _haze->setHazeActive(config.isHazeActive);
+    _haze->setAltitudeBased(config.isAltitudeBased);
+    _haze->setHazeAttenuateKeyLight(config.isHazeAttenuateKeyLight);
+    _haze->setModulateColorActive(config.isModulateColorActive);
+    _haze->setHazeEnableGlare(config.isHazeEnableGlare);
+
+    _haze->setHazeRangeFactor(model::Haze::convertHazeRangeToHazeRangeFactor(config.hazeRange));
+    _haze->setHazeAltitudeFactor(model::Haze::convertHazeAltitudeToHazeAltitudeFactor(config.hazeHeight));
+
+    _haze->setHazeKeyLightRangeFactor(model::Haze::convertHazeRangeToHazeRangeFactor(config.hazeKeyLightRange));
+    _haze->setHazeKeyLightAltitudeFactor(model::Haze::convertHazeAltitudeToHazeAltitudeFactor(config.hazeKeyLightAltitude));
+
+    _haze->setHazeBackgroundBlend(config.hazeBackgroundBlend);
+}
+
+HazeStage::Index HazeStage::findHaze(const HazePointer& haze) const {
+    auto found = _hazeMap.find(haze);
+    if (found != _hazeMap.end()) {
+        return INVALID_INDEX;
+    } else {
+        return (*found).second;
+    }
+}
+
+HazeStage::Index HazeStage::addHaze(const HazePointer& haze) {
+    auto found = _hazeMap.find(haze);
+    if (found == _hazeMap.end()) {
+        auto hazeId = _hazes.newElement(haze);
+        // Avoid failing to allocate a haze, just pass
+        if (hazeId != INVALID_INDEX) {
+
+            // Insert the haze and its index in the reverse map
+            _hazeMap.insert(HazeMap::value_type(haze, hazeId));
+        }
+        return hazeId;
+    } else {
+        return (*found).second;
+    }
+}
+
+HazeStage::HazePointer HazeStage::removeHaze(Index index) {
+    HazePointer removed = _hazes.freeElement(index);
+    
+    if (removed) {
+        _hazeMap.erase(removed);
+    }
+    return removed;
+}
+
+HazeStageSetup::HazeStageSetup() {
+}
+
+void HazeStageSetup::run(const render::RenderContextPointer& renderContext) {
+    auto stage = renderContext->_scene->getStage(HazeStage::getName());
+    if (!stage) {
+        renderContext->_scene->resetStage(HazeStage::getName(), std::make_shared<HazeStage>());
+    }
+}
+
+void FetchHazeStage::run(const render::RenderContextPointer& renderContext, model::HazePointer& haze) {
+    auto hazeStage = renderContext->_scene->getStage<HazeStage>();
+    assert(hazeStage);
+
+    haze = nullptr;
+    if (hazeStage->_currentFrame._hazes.size() != 0) {
+        auto hazeId = hazeStage->_currentFrame._hazes.front();
+        haze = hazeStage->getHaze(hazeId);
+    }
+}
diff --git a/libraries/render-utils/src/HazeStage.h b/libraries/render-utils/src/HazeStage.h
new file mode 100644
index 0000000000..c355f06644
--- /dev/null
+++ b/libraries/render-utils/src/HazeStage.h
@@ -0,0 +1,168 @@
+//
+//  HazeStage.h
+
+//  Created by Nissim Hadar on 9/26/2017.
+//  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_render_utils_HazeStage_h
+#define hifi_render_utils_HazeStage_h
+
+#include <model/Stage.h>
+#include <set>
+#include <unordered_map>
+#include <render/IndexedContainer.h>
+#include <render/Stage.h>
+
+#include <render/Forward.h>
+#include <render/DrawTask.h>
+#include <model/Haze.h>
+
+// Haze stage to set up haze-related rendering tasks
+class HazeStage : public render::Stage {
+public:
+    static std::string _stageName;
+    static const std::string& getName() { return _stageName; }
+
+    using Index = render::indexed_container::Index;
+    static const Index INVALID_INDEX;
+    static bool isIndexInvalid(Index index) { return index == INVALID_INDEX; }
+    
+    using HazePointer = model::HazePointer;
+    using Hazes = render::indexed_container::IndexedPointerVector<model::Haze>;
+    using HazeMap = std::unordered_map<HazePointer, Index>;
+
+    using HazeIndices = std::vector<Index>;
+
+    Index findHaze(const HazePointer& haze) const;
+    Index addHaze(const HazePointer& haze);
+
+    HazePointer removeHaze(Index index);
+    
+    bool checkHazeId(Index index) const { return _hazes.checkIndex(index); }
+
+    Index getNumHazes() const { return _hazes.getNumElements(); }
+    Index getNumFreeHazes() const { return _hazes.getNumFreeIndices(); }
+    Index getNumAllocatedHazes() const { return _hazes.getNumAllocatedIndices(); }
+
+    HazePointer getHaze(Index hazeId) const {
+        return _hazes.get(hazeId);
+    }
+
+    Hazes _hazes;
+    HazeMap _hazeMap;
+
+    class Frame {
+    public:
+        Frame() {}
+        
+        void clear() { _hazes.clear(); }
+
+        void pushHaze(HazeStage::Index index) { _hazes.emplace_back(index); }
+
+        HazeStage::HazeIndices _hazes;
+    };
+    
+    Frame _currentFrame;
+};
+using HazeStagePointer = std::shared_ptr<HazeStage>;
+
+class HazeStageSetup {
+public:
+    using JobModel = render::Job::Model<HazeStageSetup>;
+
+    HazeStageSetup();
+    void run(const render::RenderContextPointer& renderContext);
+
+protected:
+};
+
+class FetchHazeConfig : public render::Job::Config {
+    Q_OBJECT
+
+    Q_PROPERTY(glm::vec3 hazeColor MEMBER hazeColor WRITE setHazeColor NOTIFY dirty);
+    Q_PROPERTY(float hazeGlareAngle MEMBER hazeGlareAngle WRITE setHazeGlareAngle NOTIFY dirty);
+
+    Q_PROPERTY(glm::vec3 hazeGlareColor MEMBER hazeGlareColor WRITE setHazeGlareColor NOTIFY dirty);
+    Q_PROPERTY(float hazeBaseReference MEMBER hazeBaseReference WRITE setHazeBaseReference NOTIFY dirty);
+
+    Q_PROPERTY(bool isHazeActive MEMBER isHazeActive WRITE setHazeActive NOTIFY dirty);
+    Q_PROPERTY(bool isAltitudeBased MEMBER isAltitudeBased WRITE setAltitudeBased NOTIFY dirty);
+    Q_PROPERTY(bool isHazeAttenuateKeyLight MEMBER isHazeAttenuateKeyLight WRITE setHazeAttenuateKeyLight NOTIFY dirty);
+    Q_PROPERTY(bool isModulateColorActive MEMBER isModulateColorActive WRITE setModulateColorActive NOTIFY dirty);
+    Q_PROPERTY(bool isHazeEnableGlare MEMBER isHazeEnableGlare WRITE setHazeEnableGlare NOTIFY dirty);
+
+    Q_PROPERTY(float hazeRange MEMBER hazeRange WRITE setHazeRange NOTIFY dirty);
+    Q_PROPERTY(float hazeHeight MEMBER hazeHeight WRITE setHazeAltitude NOTIFY dirty);
+
+    Q_PROPERTY(float hazeKeyLightRange MEMBER hazeKeyLightRange WRITE setHazeKeyLightRange NOTIFY dirty);
+    Q_PROPERTY(float hazeKeyLightAltitude MEMBER hazeKeyLightAltitude WRITE setHazeKeyLightAltitude NOTIFY dirty);
+
+    Q_PROPERTY(float hazeBackgroundBlend MEMBER hazeBackgroundBlend WRITE setHazeBackgroundBlend NOTIFY dirty);
+
+public:
+    FetchHazeConfig() : render::Job::Config() {}
+
+    glm::vec3 hazeColor{ model::Haze::INITIAL_HAZE_COLOR };
+    float hazeGlareAngle{ model::Haze::INITIAL_HAZE_GLARE_ANGLE };
+
+    glm::vec3 hazeGlareColor{ model::Haze::INITIAL_HAZE_GLARE_COLOR };
+    float hazeBaseReference{ model::Haze::INITIAL_HAZE_BASE_REFERENCE };
+
+    bool isHazeActive{ false };
+    bool isAltitudeBased{ false };
+    bool isHazeAttenuateKeyLight{ false };
+    bool isModulateColorActive{ false };
+    bool isHazeEnableGlare{ false };
+
+    float hazeRange{ model::Haze::INITIAL_HAZE_RANGE };
+    float hazeHeight{ model::Haze::INITIAL_HAZE_HEIGHT };
+
+    float hazeKeyLightRange{ model::Haze::INITIAL_KEY_LIGHT_RANGE };
+    float hazeKeyLightAltitude{ model::Haze::INITIAL_KEY_LIGHT_ALTITUDE };
+
+    float hazeBackgroundBlend{ model::Haze::INITIAL_HAZE_BACKGROUND_BLEND };
+
+public slots:
+    void setHazeColor(const glm::vec3 value) { hazeColor = value; emit dirty(); }
+    void setHazeGlareAngle(const float value) { hazeGlareAngle = value; emit dirty(); }
+
+    void setHazeGlareColor(const glm::vec3 value) { hazeGlareColor = value; emit dirty(); }
+    void setHazeBaseReference(const float value) { hazeBaseReference = value; ; emit dirty(); }
+
+    void setHazeActive(const bool active) { isHazeActive = active; emit dirty(); }
+    void setAltitudeBased(const bool active) { isAltitudeBased = active; emit dirty(); }
+    void setHazeAttenuateKeyLight(const bool active) { isHazeAttenuateKeyLight = active; emit dirty(); }
+    void setModulateColorActive(const bool active) { isModulateColorActive = active; emit dirty(); }
+    void setHazeEnableGlare(const bool active) { isHazeEnableGlare = active; emit dirty(); }
+
+    void setHazeRange(const float value) { hazeRange = value; emit dirty(); }
+    void setHazeAltitude(const float value) { hazeHeight = value; emit dirty(); }
+
+    void setHazeKeyLightRange(const float value) { hazeKeyLightRange = value; emit dirty(); }
+    void setHazeKeyLightAltitude(const float value) { hazeKeyLightAltitude = value; emit dirty(); }
+
+    void setHazeBackgroundBlend(const float value) { hazeBackgroundBlend = value; ; emit dirty(); }
+
+signals:
+    void dirty();
+};
+
+class FetchHazeStage {
+public:
+    using Config = FetchHazeConfig;
+    using JobModel = render::Job::ModelO<FetchHazeStage, model::HazePointer, Config>;
+
+    FetchHazeStage();
+
+    void configure(const Config& config);
+    void run(const render::RenderContextPointer& renderContext, model::HazePointer& haze);
+
+private:
+    model::HazePointer _haze;
+    gpu::PipelinePointer _hazePipeline;
+};
+#endif
diff --git a/libraries/render-utils/src/Highlight.slf b/libraries/render-utils/src/Highlight.slf
new file mode 100644
index 0000000000..bf65f92613
--- /dev/null
+++ b/libraries/render-utils/src/Highlight.slf
@@ -0,0 +1,13 @@
+//  Highlight.slf
+//  Add highlight effect based on two zbuffers : one containing the total scene z and another 
+//  with the z of only the objects to be outlined.
+//  This is the version without the fill effect inside the silhouette.
+//
+//  Created by Olivier Prat on 08/09/2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+<@include Highlight.slh@>
+<$main(0)$>
diff --git a/libraries/render-utils/src/Highlight.slh b/libraries/render-utils/src/Highlight.slh
new file mode 100644
index 0000000000..2faa10682e
--- /dev/null
+++ b/libraries/render-utils/src/Highlight.slh
@@ -0,0 +1,93 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+<!
+//  Highlight.slh
+//  fragment shader
+//
+//  Created by Olivier Prat on 9/7/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+!>
+<@include DeferredTransform.slh@>
+<$declareDeferredFrameTransform()$>
+
+<@include Highlight_shared.slh@>
+
+uniform highlightParamsBuffer {
+	HighlightParameters params;
+};
+
+uniform sampler2D sceneDepthMap;
+uniform sampler2D highlightedDepthMap;
+
+in vec2 varTexCoord0;
+out vec4 outFragColor;
+
+const float FAR_Z = 1.0;
+const float LINEAR_DEPTH_BIAS = 5e-3;
+const float OPACITY_EPSILON = 5e-3;
+
+<@func main(IS_FILLED)@>
+
+void main(void) {
+    // We offset by half a texel to be centered on the depth sample. If we don't do this
+    // the blur will have a different width between the left / right sides and top / bottom
+    // sides of the silhouette
+	float highlightedDepth = texture(highlightedDepthMap, varTexCoord0).x;
+    float intensity = 0.0;
+
+    if (highlightedDepth < FAR_Z) {
+        // We're not on the far plane so we are on the highlighted object, thus no outline to do!
+<@if IS_FILLED@>
+        // But we need to fill the interior
+        float sceneDepth = texture(sceneDepthMap, varTexCoord0).x;
+        // Transform to linear depth for better precision
+        highlightedDepth = -evalZeyeFromZdb(highlightedDepth);
+        sceneDepth = -evalZeyeFromZdb(sceneDepth);
+
+        // Are we occluded?
+        intensity = sceneDepth < (highlightedDepth-LINEAR_DEPTH_BIAS) ? params._occludedFillOpacity : params._unoccludedFillOpacity;
+<@else@>
+		discard;
+<@endif@>
+    } else {
+        vec2 halfTexel = getInvWidthHeight() / 2;
+        vec2 texCoord0 = varTexCoord0+halfTexel;
+        float weight = 0.0;
+        vec2 deltaUv = params._size / params._blurKernelSize;
+        vec2 lineStartUv = texCoord0 - params._size / 2.0; 
+        vec2 uv;
+        int x;
+        int y;
+
+        for (y=0 ; y<params._blurKernelSize ; y++) {
+            uv = lineStartUv;
+            lineStartUv.y += deltaUv.y;
+
+            if (uv.y>=0.0 && uv.y<=1.0) {
+                for (x=0 ; x<params._blurKernelSize ; x++) {
+                    if (uv.x>=0.0 && uv.x<=1.0)
+                    {
+                        highlightedDepth = texture(highlightedDepthMap, uv).x;
+                        intensity += (highlightedDepth < FAR_Z) ? 1.0 : 0.0;
+                        weight += 1.0;
+                    }
+                    uv.x += deltaUv.x;
+                }
+            }
+        }
+
+        intensity /= weight;
+        if (intensity < OPACITY_EPSILON) {
+            discard;
+        }
+
+        intensity = min(1.0, intensity / params._threshold) * params._intensity;
+    }
+
+	outFragColor = vec4(params._color.rgb, intensity);
+}
+
+<@endfunc@>
diff --git a/libraries/render-utils/src/HighlightEffect.cpp b/libraries/render-utils/src/HighlightEffect.cpp
new file mode 100644
index 0000000000..7c58e5ba66
--- /dev/null
+++ b/libraries/render-utils/src/HighlightEffect.cpp
@@ -0,0 +1,562 @@
+//
+//  HighlightEffect.cpp
+//  render-utils/src/
+//
+//  Created by Olivier Prat on 08/08/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#include "HighlightEffect.h"
+
+#include "GeometryCache.h"
+
+#include "CubeProjectedPolygon.h"
+
+#include <render/FilterTask.h>
+#include <render/SortTask.h>
+
+#include "gpu/Context.h"
+#include "gpu/StandardShaderLib.h"
+
+#include <sstream>
+
+#include "surfaceGeometry_copyDepth_frag.h"
+#include "debug_deferred_buffer_vert.h"
+#include "debug_deferred_buffer_frag.h"
+#include "Highlight_frag.h"
+#include "Highlight_filled_frag.h"
+#include "Highlight_aabox_vert.h"
+#include "nop_frag.h"
+
+using namespace render;
+
+#define OUTLINE_STENCIL_MASK    1
+
+HighlightRessources::HighlightRessources() {
+}
+
+void HighlightRessources::update(const gpu::FramebufferPointer& primaryFrameBuffer) {
+    auto newFrameSize = glm::ivec2(primaryFrameBuffer->getSize());
+
+    // If the buffer size changed, we need to delete our FBOs and recreate them at the
+    // new correct dimensions.
+    if (_frameSize != newFrameSize) {
+        _frameSize = newFrameSize;
+        allocateDepthBuffer(primaryFrameBuffer);
+        allocateColorBuffer(primaryFrameBuffer);
+    } else {
+        if (!_depthFrameBuffer) {
+            allocateDepthBuffer(primaryFrameBuffer);
+        }
+        if (!_colorFrameBuffer) {
+            allocateColorBuffer(primaryFrameBuffer);
+        }
+    }
+}
+
+void HighlightRessources::allocateColorBuffer(const gpu::FramebufferPointer& primaryFrameBuffer) {
+    _colorFrameBuffer = gpu::FramebufferPointer(gpu::Framebuffer::create("primaryWithStencil"));
+    _colorFrameBuffer->setRenderBuffer(0, primaryFrameBuffer->getRenderBuffer(0));
+    _colorFrameBuffer->setStencilBuffer(_depthStencilTexture, _depthStencilTexture->getTexelFormat());
+}
+
+void HighlightRessources::allocateDepthBuffer(const gpu::FramebufferPointer& primaryFrameBuffer) {
+    auto depthFormat = gpu::Element(gpu::SCALAR, gpu::UINT32, gpu::DEPTH_STENCIL);
+    _depthStencilTexture = gpu::TexturePointer(gpu::Texture::createRenderBuffer(depthFormat, _frameSize.x, _frameSize.y));
+    _depthFrameBuffer = gpu::FramebufferPointer(gpu::Framebuffer::create("highlightDepth"));
+    _depthFrameBuffer->setDepthStencilBuffer(_depthStencilTexture, depthFormat);
+}
+
+gpu::FramebufferPointer HighlightRessources::getDepthFramebuffer() {
+    assert(_depthFrameBuffer);
+    return _depthFrameBuffer;
+}
+
+gpu::TexturePointer HighlightRessources::getDepthTexture() {
+    return _depthStencilTexture;
+}
+
+gpu::FramebufferPointer HighlightRessources::getColorFramebuffer() {
+    assert(_colorFrameBuffer);
+    return _colorFrameBuffer;
+}
+
+HighlightSharedParameters::HighlightSharedParameters() {
+    _highlightIds.fill(render::HighlightStage::INVALID_INDEX);
+}
+
+float HighlightSharedParameters::getBlurPixelWidth(const render::HighlightStyle& style, int frameBufferHeight) {
+    return ceilf(style.outlineWidth * frameBufferHeight / 400.0f);
+}
+
+PrepareDrawHighlight::PrepareDrawHighlight() {
+    _ressources = std::make_shared<HighlightRessources>();
+}
+
+void PrepareDrawHighlight::run(const render::RenderContextPointer& renderContext, const Inputs& inputs, Outputs& outputs) {
+    auto destinationFrameBuffer = inputs;
+
+    _ressources->update(destinationFrameBuffer);
+    outputs = _ressources;
+}
+
+gpu::PipelinePointer DrawHighlightMask::_stencilMaskPipeline;
+gpu::PipelinePointer DrawHighlightMask::_stencilMaskFillPipeline;
+
+DrawHighlightMask::DrawHighlightMask(unsigned int highlightIndex, 
+                                 render::ShapePlumberPointer shapePlumber, HighlightSharedParametersPointer parameters) :
+    _highlightPassIndex{ highlightIndex },
+    _shapePlumber { shapePlumber },
+    _sharedParameters{ parameters } {
+}
+
+void DrawHighlightMask::run(const render::RenderContextPointer& renderContext, const Inputs& inputs, Outputs& outputs) {
+    assert(renderContext->args);
+    assert(renderContext->args->hasViewFrustum());
+    auto& inShapes = inputs.get0();
+
+    if (!_stencilMaskPipeline || !_stencilMaskFillPipeline) {
+        gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+        state->setDepthTest(true, false, gpu::LESS_EQUAL);
+        state->setStencilTest(true, 0xFF, gpu::State::StencilTest(OUTLINE_STENCIL_MASK, 0xFF, gpu::NOT_EQUAL, gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_ZERO, gpu::State::STENCIL_OP_REPLACE));
+        state->setColorWriteMask(false, false, false, false);
+        state->setCullMode(gpu::State::CULL_FRONT);
+
+        gpu::StatePointer fillState = gpu::StatePointer(new gpu::State());
+        fillState->setDepthTest(false, false, gpu::LESS_EQUAL);
+        fillState->setStencilTest(true, 0xFF, gpu::State::StencilTest(OUTLINE_STENCIL_MASK, 0xFF, gpu::NOT_EQUAL, gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_REPLACE));
+        fillState->setColorWriteMask(false, false, false, false);
+        fillState->setCullMode(gpu::State::CULL_FRONT);
+
+        auto vs = gpu::Shader::createVertex(std::string(Highlight_aabox_vert));
+        auto ps = gpu::Shader::createPixel(std::string(nop_frag));
+        gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
+
+        gpu::Shader::BindingSet slotBindings;
+        gpu::Shader::makeProgram(*program, slotBindings);
+
+        _stencilMaskPipeline = gpu::Pipeline::create(program, state);
+        _stencilMaskFillPipeline = gpu::Pipeline::create(program, fillState);
+    }
+
+    if (!_boundsBuffer) {
+        _boundsBuffer = std::make_shared<gpu::Buffer>(sizeof(render::ItemBound));
+    }
+
+    auto highlightStage = renderContext->_scene->getStage<render::HighlightStage>(render::HighlightStage::getName());
+    auto highlightId = _sharedParameters->_highlightIds[_highlightPassIndex];
+
+    if (!inShapes.empty() && !render::HighlightStage::isIndexInvalid(highlightId)) {
+        auto ressources = inputs.get1();
+        auto& highlight = highlightStage->getHighlight(highlightId);
+
+        RenderArgs* args = renderContext->args;
+        ShapeKey::Builder defaultKeyBuilder;
+
+        // Render full screen
+        outputs = args->_viewport;
+
+        // Clear the framebuffer without stereo
+        // Needs to be distinct from the other batch because using the clear call 
+        // while stereo is enabled triggers a warning
+        gpu::doInBatch(args->_context, [&](gpu::Batch& batch) {
+            batch.enableStereo(false);
+            batch.setFramebuffer(ressources->getDepthFramebuffer());
+            batch.clearDepthStencilFramebuffer(1.0f, 0);
+        });
+
+        glm::mat4 projMat;
+        Transform viewMat;
+        args->getViewFrustum().evalProjectionMatrix(projMat);
+        args->getViewFrustum().evalViewTransform(viewMat);
+
+        render::ItemBounds itemBounds;
+
+        gpu::doInBatch(args->_context, [&](gpu::Batch& batch) {
+            args->_batch = &batch;
+
+            auto maskPipeline = _shapePlumber->pickPipeline(args, defaultKeyBuilder);
+            auto maskSkinnedPipeline = _shapePlumber->pickPipeline(args, defaultKeyBuilder.withSkinned());
+
+            // Setup camera, projection and viewport for all items
+            batch.setViewportTransform(args->_viewport);
+            batch.setProjectionTransform(projMat);
+            batch.setViewTransform(viewMat);
+
+            std::vector<ShapeKey> skinnedShapeKeys{};
+
+            // Iterate through all inShapes and render the unskinned
+            args->_shapePipeline = maskPipeline;
+            batch.setPipeline(maskPipeline->pipeline);
+            for (const auto& items : inShapes) {
+                itemBounds.insert(itemBounds.end(), items.second.begin(), items.second.end());
+                if (items.first.isSkinned()) {
+                    skinnedShapeKeys.push_back(items.first);
+                } else {
+                    renderItems(renderContext, items.second);
+                }
+            }
+
+            // Reiterate to render the skinned
+            args->_shapePipeline = maskSkinnedPipeline;
+            batch.setPipeline(maskSkinnedPipeline->pipeline);
+            for (const auto& key : skinnedShapeKeys) {
+                renderItems(renderContext, inShapes.at(key));
+            }
+
+            args->_shapePipeline = nullptr;
+            args->_batch = nullptr;
+        });
+
+        _boundsBuffer->setData(itemBounds.size() * sizeof(render::ItemBound), (const gpu::Byte*) itemBounds.data());
+
+        gpu::doInBatch(args->_context, [&](gpu::Batch& batch) {
+            // Setup camera, projection and viewport for all items
+            batch.setViewportTransform(args->_viewport);
+            batch.setProjectionTransform(projMat);
+            batch.setViewTransform(viewMat);
+
+            // Draw stencil mask with object bounding boxes
+            const auto highlightWidthLoc = _stencilMaskPipeline->getProgram()->getUniforms().findLocation("outlineWidth");
+            const auto securityMargin = 2.0f;
+            const float blurPixelWidth = 2.0f * securityMargin * HighlightSharedParameters::getBlurPixelWidth(highlight._style, args->_viewport.w);
+            const auto framebufferSize = ressources->getSourceFrameSize();
+
+            auto stencilPipeline = highlight._style.isFilled() ? _stencilMaskFillPipeline : _stencilMaskPipeline;
+            batch.setPipeline(stencilPipeline);
+            batch.setResourceBuffer(0, _boundsBuffer);
+            batch._glUniform2f(highlightWidthLoc, blurPixelWidth / framebufferSize.x, blurPixelWidth / framebufferSize.y);
+            static const int NUM_VERTICES_PER_CUBE = 36;
+            batch.draw(gpu::TRIANGLES, NUM_VERTICES_PER_CUBE * (gpu::uint32) itemBounds.size(), 0);
+        });
+    } else {
+        // Highlight rect should be null as there are no highlighted shapes
+        outputs = glm::ivec4(0, 0, 0, 0);
+    }
+}
+
+gpu::PipelinePointer DrawHighlight::_pipeline;
+gpu::PipelinePointer DrawHighlight::_pipelineFilled;
+
+DrawHighlight::DrawHighlight(unsigned int highlightIndex, HighlightSharedParametersPointer parameters) :
+    _highlightPassIndex{ highlightIndex },
+    _sharedParameters{ parameters } {
+}
+
+void DrawHighlight::run(const render::RenderContextPointer& renderContext, const Inputs& inputs) {
+    auto highlightFrameBuffer = inputs.get1();
+    auto highlightRect = inputs.get3();
+
+    if (highlightFrameBuffer && highlightRect.z>0 && highlightRect.w>0) {
+        auto sceneDepthBuffer = inputs.get2();
+        const auto frameTransform = inputs.get0();
+        auto highlightedDepthTexture = highlightFrameBuffer->getDepthTexture();
+        auto destinationFrameBuffer = highlightFrameBuffer->getColorFramebuffer();
+        auto framebufferSize = glm::ivec2(highlightedDepthTexture->getDimensions());
+
+        if (sceneDepthBuffer) {
+            auto args = renderContext->args;
+
+            auto highlightStage = renderContext->_scene->getStage<render::HighlightStage>(render::HighlightStage::getName());
+            auto highlightId = _sharedParameters->_highlightIds[_highlightPassIndex];
+            if (!render::HighlightStage::isIndexInvalid(highlightId)) {
+                auto& highlight = highlightStage->getHighlight(highlightId);
+                auto pipeline = getPipeline(highlight._style);
+                {
+                    auto& shaderParameters = _configuration.edit();
+
+                    shaderParameters._color = highlight._style.color;
+                    shaderParameters._intensity = highlight._style.outlineIntensity * (highlight._style.isOutlineSmooth ? 2.0f : 1.0f);
+                    shaderParameters._unoccludedFillOpacity = highlight._style.unoccludedFillOpacity;
+                    shaderParameters._occludedFillOpacity = highlight._style.occludedFillOpacity;
+                    shaderParameters._threshold = highlight._style.isOutlineSmooth ? 1.0f : 1e-3f;
+                    shaderParameters._blurKernelSize = std::min(7, std::max(2, (int)floorf(highlight._style.outlineWidth * 3 + 0.5f)));
+                    // Size is in normalized screen height. We decide that for highlight width = 1, this is equal to 1/400.
+                    auto size = highlight._style.outlineWidth / 400.0f;
+                    shaderParameters._size.x = (size * framebufferSize.y) / framebufferSize.x;
+                    shaderParameters._size.y = size;
+                }
+
+                gpu::doInBatch(args->_context, [&](gpu::Batch& batch) {
+                    batch.enableStereo(false);
+                    batch.setFramebuffer(destinationFrameBuffer);
+
+                    batch.setViewportTransform(args->_viewport);
+                    batch.setProjectionTransform(glm::mat4());
+                    batch.resetViewTransform();
+                    batch.setModelTransform(gpu::Framebuffer::evalSubregionTexcoordTransform(framebufferSize, args->_viewport));
+                    batch.setPipeline(pipeline);
+
+                    batch.setUniformBuffer(HIGHLIGHT_PARAMS_SLOT, _configuration);
+                    batch.setUniformBuffer(FRAME_TRANSFORM_SLOT, frameTransform->getFrameTransformBuffer());
+                    batch.setResourceTexture(SCENE_DEPTH_MAP_SLOT, sceneDepthBuffer->getPrimaryDepthTexture());
+                    batch.setResourceTexture(HIGHLIGHTED_DEPTH_MAP_SLOT, highlightedDepthTexture);
+                    batch.draw(gpu::TRIANGLE_STRIP, 4);
+                });
+            }
+        }
+    }
+}
+
+const gpu::PipelinePointer& DrawHighlight::getPipeline(const render::HighlightStyle& style) {
+    if (!_pipeline) {
+        gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+        state->setDepthTest(gpu::State::DepthTest(false, false));
+        state->setBlendFunction(true, gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::INV_SRC_ALPHA);
+        state->setStencilTest(true, 0, gpu::State::StencilTest(OUTLINE_STENCIL_MASK, 0xFF, gpu::EQUAL));
+
+        auto vs = gpu::StandardShaderLib::getDrawViewportQuadTransformTexcoordVS();
+        auto ps = gpu::Shader::createPixel(std::string(Highlight_frag));
+        gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
+
+        gpu::Shader::BindingSet slotBindings;
+        slotBindings.insert(gpu::Shader::Binding("highlightParamsBuffer", HIGHLIGHT_PARAMS_SLOT));
+        slotBindings.insert(gpu::Shader::Binding("deferredFrameTransformBuffer", FRAME_TRANSFORM_SLOT));
+        slotBindings.insert(gpu::Shader::Binding("sceneDepthMap", SCENE_DEPTH_MAP_SLOT));
+        slotBindings.insert(gpu::Shader::Binding("highlightedDepthMap", HIGHLIGHTED_DEPTH_MAP_SLOT));
+        gpu::Shader::makeProgram(*program, slotBindings);
+
+        _pipeline = gpu::Pipeline::create(program, state);
+
+        ps = gpu::Shader::createPixel(std::string(Highlight_filled_frag));
+        program = gpu::Shader::createProgram(vs, ps);
+        gpu::Shader::makeProgram(*program, slotBindings);
+        _pipelineFilled = gpu::Pipeline::create(program, state);
+    }
+    return style.isFilled() ? _pipelineFilled : _pipeline;
+}
+
+DebugHighlight::DebugHighlight() {
+    _geometryDepthId = DependencyManager::get<GeometryCache>()->allocateID();
+}
+
+DebugHighlight::~DebugHighlight() {
+    auto geometryCache = DependencyManager::get<GeometryCache>();
+    if (geometryCache) {
+        geometryCache->releaseID(_geometryDepthId);
+    }
+}
+
+void DebugHighlight::configure(const Config& config) {
+    _isDisplayEnabled = config.viewMask;
+}
+
+void DebugHighlight::run(const render::RenderContextPointer& renderContext, const Inputs& input) {
+    const auto highlightRessources = input.get0();
+    const auto highlightRect = input.get1();
+
+    if (_isDisplayEnabled && highlightRessources && highlightRect.z>0 && highlightRect.w>0) {
+        assert(renderContext->args);
+        assert(renderContext->args->hasViewFrustum());
+        RenderArgs* args = renderContext->args;
+
+        gpu::doInBatch(args->_context, [&](gpu::Batch& batch) {
+            batch.setViewportTransform(args->_viewport);
+            batch.setFramebuffer(highlightRessources->getColorFramebuffer());
+
+            const auto geometryBuffer = DependencyManager::get<GeometryCache>();
+
+            glm::mat4 projMat;
+            Transform viewMat;
+            args->getViewFrustum().evalProjectionMatrix(projMat);
+            args->getViewFrustum().evalViewTransform(viewMat);
+            batch.setProjectionTransform(projMat);
+            batch.setViewTransform(viewMat, true);
+            batch.setModelTransform(Transform());
+
+            const glm::vec4 color(1.0f, 1.0f, 1.0f, 1.0f);
+
+            batch.setPipeline(getDepthPipeline());
+            batch.setResourceTexture(0, highlightRessources->getDepthTexture());
+            const glm::vec2 bottomLeft(-1.0f, -1.0f);
+            const glm::vec2 topRight(1.0f, 1.0f);
+            geometryBuffer->renderQuad(batch, bottomLeft, topRight, color, _geometryDepthId);
+
+            batch.setResourceTexture(0, nullptr);
+        });
+    }
+}
+
+void DebugHighlight::initializePipelines() {
+    static const std::string VERTEX_SHADER{ debug_deferred_buffer_vert };
+    static const std::string FRAGMENT_SHADER{ debug_deferred_buffer_frag };
+    static const std::string SOURCE_PLACEHOLDER{ "//SOURCE_PLACEHOLDER" };
+    static const auto SOURCE_PLACEHOLDER_INDEX = FRAGMENT_SHADER.find(SOURCE_PLACEHOLDER);
+    Q_ASSERT_X(SOURCE_PLACEHOLDER_INDEX != std::string::npos, Q_FUNC_INFO,
+               "Could not find source placeholder");
+
+    auto state = std::make_shared<gpu::State>();
+    state->setDepthTest(gpu::State::DepthTest(false, false));
+    state->setStencilTest(true, 0, gpu::State::StencilTest(OUTLINE_STENCIL_MASK, 0xFF, gpu::EQUAL));
+
+    const auto vs = gpu::Shader::createVertex(VERTEX_SHADER);
+
+    // Depth shader
+    {
+        static const std::string DEPTH_SHADER{
+            "vec4 getFragmentColor() {"
+            "   float Zdb = texelFetch(depthMap, ivec2(gl_FragCoord.xy), 0).x;"
+            "   Zdb = 1.0-(1.0-Zdb)*100;"
+            "   return vec4(Zdb, Zdb, Zdb, 1.0); "
+            "}"
+        };
+
+        auto fragmentShader = FRAGMENT_SHADER;
+        fragmentShader.replace(SOURCE_PLACEHOLDER_INDEX, SOURCE_PLACEHOLDER.size(), DEPTH_SHADER);
+
+        const auto ps = gpu::Shader::createPixel(fragmentShader);
+        const auto program = gpu::Shader::createProgram(vs, ps);
+
+        gpu::Shader::BindingSet slotBindings;
+        slotBindings.insert(gpu::Shader::Binding("depthMap", 0));
+        gpu::Shader::makeProgram(*program, slotBindings);
+
+        _depthPipeline = gpu::Pipeline::create(program, state);
+    }
+}
+
+const gpu::PipelinePointer& DebugHighlight::getDepthPipeline() {
+    if (!_depthPipeline) {
+        initializePipelines();
+    }
+
+    return _depthPipeline;
+}
+
+void SelectionToHighlight::run(const render::RenderContextPointer& renderContext, Outputs& outputs) {
+    auto scene = renderContext->_scene;
+    auto highlightStage = scene->getStage<render::HighlightStage>(render::HighlightStage::getName());
+
+    outputs.clear();
+    _sharedParameters->_highlightIds.fill(render::HighlightStage::INVALID_INDEX);
+
+    for (auto i = 0; i < HighlightSharedParameters::MAX_PASS_COUNT; i++) {
+        std::ostringstream stream;
+        if (i > 0) {
+            stream << "highlightList" << i;
+        } else {
+            stream << "contextOverlayHighlightList";
+        }
+        auto selectionName = stream.str();
+        if (!scene->isSelectionEmpty(selectionName)) {
+            auto highlightId = highlightStage->getHighlightIdBySelection(selectionName);
+            if (!render::HighlightStage::isIndexInvalid(highlightId)) {
+                _sharedParameters->_highlightIds[outputs.size()] = highlightId;
+                outputs.emplace_back(selectionName);
+            }
+        }
+    }
+}
+
+void ExtractSelectionName::run(const render::RenderContextPointer& renderContext, const Inputs& inputs, Outputs& outputs) {
+    if (_highlightPassIndex < inputs.size()) {
+        outputs = inputs[_highlightPassIndex];
+    } else {
+        outputs.clear();
+    }
+}
+
+DrawHighlightTask::DrawHighlightTask() {
+
+}
+
+void DrawHighlightTask::configure(const Config& config) {
+
+}
+
+void DrawHighlightTask::build(JobModel& task, const render::Varying& inputs, render::Varying& outputs) {
+    const auto items = inputs.getN<Inputs>(0).get<RenderFetchCullSortTask::BucketList>();
+    const auto sceneFrameBuffer = inputs.getN<Inputs>(1);
+    const auto primaryFramebuffer = inputs.getN<Inputs>(2);
+    const auto deferredFrameTransform = inputs.getN<Inputs>(3);
+
+    // Prepare the ShapePipeline
+    auto shapePlumber = std::make_shared<ShapePlumber>();
+    {
+        auto state = std::make_shared<gpu::State>();
+        state->setDepthTest(true, true, gpu::LESS_EQUAL);
+        state->setColorWriteMask(false, false, false, false);
+
+        initMaskPipelines(*shapePlumber, state);
+    }
+    auto sharedParameters = std::make_shared<HighlightSharedParameters>();
+
+    const auto highlightSelectionNames = task.addJob<SelectionToHighlight>("SelectionToHighlight", sharedParameters);
+
+    // Prepare for highlight group rendering.
+    const auto highlightRessources = task.addJob<PrepareDrawHighlight>("PrepareHighlight", primaryFramebuffer);
+    render::Varying highlight0Rect;
+
+    for (auto i = 0; i < HighlightSharedParameters::MAX_PASS_COUNT; i++) {
+        const auto selectionName = task.addJob<ExtractSelectionName>("ExtractSelectionName", highlightSelectionNames, i);
+        const auto groupItems = addSelectItemJobs(task, selectionName, items);
+        const auto highlightedItemIDs = task.addJob<render::MetaToSubItems>("HighlightMetaToSubItemIDs", groupItems);
+        const auto highlightedItems = task.addJob<render::IDsToBounds>("HighlightMetaToSubItems", highlightedItemIDs);
+
+        // Sort
+        const auto sortedPipelines = task.addJob<render::PipelineSortShapes>("HighlightPipelineSort", highlightedItems);
+        const auto sortedBounds = task.addJob<render::DepthSortShapes>("HighlightDepthSort", sortedPipelines);
+
+        // Draw depth of highlighted objects in separate buffer
+        std::string name;
+        {
+            std::ostringstream stream;
+            stream << "HighlightMask" << i;
+            name = stream.str();
+        }
+        const auto drawMaskInputs = DrawHighlightMask::Inputs(sortedBounds, highlightRessources).asVarying();
+        const auto highlightedRect = task.addJob<DrawHighlightMask>(name, drawMaskInputs, i, shapePlumber, sharedParameters);
+        if (i == 0) {
+            highlight0Rect = highlightedRect;
+        }
+
+        // Draw highlight
+        {
+            std::ostringstream stream;
+            stream << "HighlightEffect" << i;
+            name = stream.str();
+        }
+        const auto drawHighlightInputs = DrawHighlight::Inputs(deferredFrameTransform, highlightRessources, sceneFrameBuffer, highlightedRect).asVarying();
+        task.addJob<DrawHighlight>(name, drawHighlightInputs, i, sharedParameters);
+    }
+
+    // Debug highlight
+    const auto debugInputs = DebugHighlight::Inputs(highlightRessources, const_cast<const render::Varying&>(highlight0Rect)).asVarying();
+    task.addJob<DebugHighlight>("HighlightDebug", debugInputs);
+}
+
+const render::Varying DrawHighlightTask::addSelectItemJobs(JobModel& task, const render::Varying& selectionName,
+                                                         const RenderFetchCullSortTask::BucketList& items) {
+    const auto& opaques = items[RenderFetchCullSortTask::OPAQUE_SHAPE];
+    const auto& transparents = items[RenderFetchCullSortTask::TRANSPARENT_SHAPE];
+    const auto& metas = items[RenderFetchCullSortTask::META];
+
+    const auto selectMetaInput = SelectItems::Inputs(metas, Varying(), selectionName).asVarying();
+    const auto selectedMetas = task.addJob<SelectItems>("MetaSelection", selectMetaInput);
+    const auto selectMetaAndOpaqueInput = SelectItems::Inputs(opaques, selectedMetas, selectionName).asVarying();
+    const auto selectedMetasAndOpaques = task.addJob<SelectItems>("OpaqueSelection", selectMetaAndOpaqueInput);
+    const auto selectItemInput = SelectItems::Inputs(transparents, selectedMetasAndOpaques, selectionName).asVarying();
+    return task.addJob<SelectItems>("TransparentSelection", selectItemInput);
+}
+
+#include "model_shadow_vert.h"
+#include "skin_model_shadow_vert.h"
+
+#include "model_shadow_frag.h"
+
+void DrawHighlightTask::initMaskPipelines(render::ShapePlumber& shapePlumber, gpu::StatePointer state) {
+    auto modelVertex = gpu::Shader::createVertex(std::string(model_shadow_vert));
+    auto modelPixel = gpu::Shader::createPixel(std::string(model_shadow_frag));
+    gpu::ShaderPointer modelProgram = gpu::Shader::createProgram(modelVertex, modelPixel);
+    shapePlumber.addPipeline(
+        ShapeKey::Filter::Builder().withoutSkinned(),
+        modelProgram, state);
+
+    auto skinVertex = gpu::Shader::createVertex(std::string(skin_model_shadow_vert));
+    gpu::ShaderPointer skinProgram = gpu::Shader::createProgram(skinVertex, modelPixel);
+    shapePlumber.addPipeline(
+        ShapeKey::Filter::Builder().withSkinned(),
+        skinProgram, state);
+}
diff --git a/libraries/render-utils/src/HighlightEffect.h b/libraries/render-utils/src/HighlightEffect.h
new file mode 100644
index 0000000000..90a8e730ce
--- /dev/null
+++ b/libraries/render-utils/src/HighlightEffect.h
@@ -0,0 +1,226 @@
+//
+//  HighlightEffect.h
+//  render-utils/src/
+//
+//  Created by Olivier Prat on 08/08/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_render_utils_HighlightEffect_h
+#define hifi_render_utils_HighlightEffect_h
+
+#include <render/Engine.h>
+#include <render/HighlightStage.h>
+#include <render/RenderFetchCullSortTask.h>
+
+#include "DeferredFramebuffer.h"
+#include "DeferredFrameTransform.h"
+
+class HighlightRessources {
+public:
+    HighlightRessources();
+
+    gpu::FramebufferPointer getDepthFramebuffer();
+    gpu::TexturePointer getDepthTexture();
+
+    gpu::FramebufferPointer getColorFramebuffer();
+
+    // Update the source framebuffer size which will drive the allocation of all the other resources.
+    void update(const gpu::FramebufferPointer& primaryFrameBuffer);
+    const glm::ivec2& getSourceFrameSize() const { return _frameSize; }
+
+protected:
+
+    gpu::FramebufferPointer _depthFrameBuffer;
+    gpu::FramebufferPointer _colorFrameBuffer;
+    gpu::TexturePointer _depthStencilTexture;
+
+    glm::ivec2 _frameSize;
+
+    void allocateColorBuffer(const gpu::FramebufferPointer& primaryFrameBuffer);
+    void allocateDepthBuffer(const gpu::FramebufferPointer& primaryFrameBuffer);
+};
+
+using HighlightRessourcesPointer = std::shared_ptr<HighlightRessources>;
+
+class HighlightSharedParameters {
+public:
+
+    enum {
+        MAX_PASS_COUNT = 8
+    };
+
+    HighlightSharedParameters();
+
+    std::array<render::HighlightStage::Index, MAX_PASS_COUNT> _highlightIds;
+
+    static float getBlurPixelWidth(const render::HighlightStyle& style, int frameBufferHeight);
+};
+
+using HighlightSharedParametersPointer = std::shared_ptr<HighlightSharedParameters>;
+
+class PrepareDrawHighlight {
+public:
+    using Inputs = gpu::FramebufferPointer;
+    using Outputs = HighlightRessourcesPointer;
+    using JobModel = render::Job::ModelIO<PrepareDrawHighlight, Inputs, Outputs>;
+
+    PrepareDrawHighlight();
+
+    void run(const render::RenderContextPointer& renderContext, const Inputs& inputs, Outputs& outputs);
+
+private:
+
+    HighlightRessourcesPointer _ressources;
+
+};
+
+class SelectionToHighlight {
+public:
+
+    using Outputs = std::vector<std::string>;
+    using JobModel = render::Job::ModelO<SelectionToHighlight, Outputs>;
+
+    SelectionToHighlight(HighlightSharedParametersPointer parameters) : _sharedParameters{ parameters } {}
+
+    void run(const render::RenderContextPointer& renderContext, Outputs& outputs);
+
+private:
+
+    HighlightSharedParametersPointer _sharedParameters;
+};
+
+class ExtractSelectionName {
+public:
+
+    using Inputs = SelectionToHighlight::Outputs;
+    using Outputs = std::string;
+    using JobModel = render::Job::ModelIO<ExtractSelectionName, Inputs, Outputs>;
+
+    ExtractSelectionName(unsigned int highlightIndex) : _highlightPassIndex{ highlightIndex } {}
+
+    void run(const render::RenderContextPointer& renderContext, const Inputs& inputs, Outputs& outputs);
+
+private:
+
+    unsigned int _highlightPassIndex;
+
+};
+
+class DrawHighlightMask {
+public:
+
+    using Inputs = render::VaryingSet2<render::ShapeBounds, HighlightRessourcesPointer>;
+    using Outputs = glm::ivec4;
+    using JobModel = render::Job::ModelIO<DrawHighlightMask, Inputs, Outputs>;
+
+    DrawHighlightMask(unsigned int highlightIndex, render::ShapePlumberPointer shapePlumber, HighlightSharedParametersPointer parameters);
+
+    void run(const render::RenderContextPointer& renderContext, const Inputs& inputs, Outputs& outputs);
+
+protected:
+
+    unsigned int _highlightPassIndex;
+    render::ShapePlumberPointer _shapePlumber;
+    HighlightSharedParametersPointer _sharedParameters;
+    gpu::BufferPointer _boundsBuffer;
+
+    static gpu::PipelinePointer _stencilMaskPipeline;
+    static gpu::PipelinePointer _stencilMaskFillPipeline;
+};
+
+class DrawHighlight {
+public:
+
+    using Inputs = render::VaryingSet4<DeferredFrameTransformPointer, HighlightRessourcesPointer, DeferredFramebufferPointer, glm::ivec4>;
+    using Config = render::Job::Config;
+    using JobModel = render::Job::ModelI<DrawHighlight, Inputs, Config>;
+
+    DrawHighlight(unsigned int highlightIndex, HighlightSharedParametersPointer parameters);
+
+    void run(const render::RenderContextPointer& renderContext, const Inputs& inputs);
+
+private:
+
+#include "Highlight_shared.slh"
+
+    enum {
+        SCENE_DEPTH_MAP_SLOT = 0,
+        HIGHLIGHTED_DEPTH_MAP_SLOT,
+
+        HIGHLIGHT_PARAMS_SLOT = 0,
+        FRAME_TRANSFORM_SLOT,
+    };
+
+    using HighlightConfigurationBuffer = gpu::StructBuffer<HighlightParameters>;
+
+    static const gpu::PipelinePointer& getPipeline(const render::HighlightStyle& style);
+
+    static gpu::PipelinePointer _pipeline;
+    static gpu::PipelinePointer _pipelineFilled;
+
+    unsigned int _highlightPassIndex;
+    HighlightParameters _parameters;
+    HighlightSharedParametersPointer _sharedParameters;
+    HighlightConfigurationBuffer _configuration;
+};
+
+class DebugHighlightConfig : public render::Job::Config {
+    Q_OBJECT
+        Q_PROPERTY(bool viewMask MEMBER viewMask NOTIFY dirty)
+
+public:
+
+    bool viewMask{ false };
+
+signals:
+    void dirty();
+};
+
+class DebugHighlight {
+public:
+    using Inputs = render::VaryingSet2<HighlightRessourcesPointer, glm::ivec4>;
+    using Config = DebugHighlightConfig;
+    using JobModel = render::Job::ModelI<DebugHighlight, Inputs, Config>;
+
+    DebugHighlight();
+    ~DebugHighlight();
+
+    void configure(const Config& config);
+    void run(const render::RenderContextPointer& renderContext, const Inputs& inputs);
+
+private:
+
+    gpu::PipelinePointer _depthPipeline;
+    int _geometryDepthId{ 0 };
+    bool _isDisplayEnabled{ false };
+
+    const gpu::PipelinePointer& getDepthPipeline();
+    void initializePipelines();
+};
+
+class DrawHighlightTask {
+public:
+
+    using Inputs = render::VaryingSet4<RenderFetchCullSortTask::BucketList, DeferredFramebufferPointer, gpu::FramebufferPointer, DeferredFrameTransformPointer>;
+    using Config = render::Task::Config;
+    using JobModel = render::Task::ModelI<DrawHighlightTask, Inputs, Config>;
+
+    DrawHighlightTask();
+
+    void configure(const Config& config);
+    void build(JobModel& task, const render::Varying& inputs, render::Varying& outputs);
+
+private:
+
+    static void initMaskPipelines(render::ShapePlumber& plumber, gpu::StatePointer state);
+    static const render::Varying addSelectItemJobs(JobModel& task, const render::Varying& selectionName, const RenderFetchCullSortTask::BucketList& items);
+
+};
+
+#endif // hifi_render_utils_HighlightEffect_h
+
+
diff --git a/libraries/render-utils/src/Highlight_aabox.slv b/libraries/render-utils/src/Highlight_aabox.slv
new file mode 100644
index 0000000000..4927db9610
--- /dev/null
+++ b/libraries/render-utils/src/Highlight_aabox.slv
@@ -0,0 +1,104 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  Draw and transform the fed vertex position with the standard MVP stack
+//  and offset the vertices by a certain amount in the vertex direction
+//
+//  Created by Olivier Prat on 11/02/2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+<@include gpu/Transform.slh@>
+
+<$declareStandardTransform()$>
+
+struct ItemBound {
+    vec4 id_boundPos;
+    vec4 boundDim_s;
+};
+
+#if defined(GPU_GL410)
+uniform samplerBuffer ssbo0Buffer;
+ItemBound getItemBound(int i) {
+    int offset = 2 * i;
+    ItemBound bound;
+    bound.id_boundPos = texelFetch(ssbo0Buffer, offset);
+    bound.boundDim_s = texelFetch(ssbo0Buffer, offset + 1);
+    return bound;
+}
+#else
+layout(std140) buffer ssbo0Buffer {
+    ItemBound bounds[];
+};
+ItemBound getItemBound(int i) {
+    ItemBound bound = bounds[i];
+    return bound;
+}
+#endif
+
+uniform vec2 outlineWidth;
+
+void main(void) {
+    const vec3 UNIT_BOX_VERTICES[8] = vec3[8](
+        vec3(0.0, 1.0, 0.0),
+        vec3(1.0, 1.0, 0.0),
+        vec3(1.0, 0.0, 0.0),
+        vec3(0.0, 0.0, 0.0),
+        vec3(0.0, 1.0, 1.0),
+        vec3(1.0, 1.0, 1.0),
+        vec3(1.0, 0.0, 1.0),
+        vec3(0.0, 0.0, 1.0)
+    );
+    const vec3 UNIT_BOX_NORMALS[8] = vec3[8](
+        vec3(-1.0, 1.0, -1.0),
+        vec3(1.0, 1.0, -1.0),
+        vec3(1.0, -1.0, -1.0),
+        vec3(-1.0, -1.0, -1.0),
+        vec3(-1.0, 1.0, 1.0),
+        vec3(1.0, 1.0, 1.0),
+        vec3(1.0, -1.0, 1.0),
+        vec3(-1.0, -1.0, 1.0)
+    );
+    const int NUM_VERTICES_PER_CUBE = 36;
+    const int UNIT_BOX_TRIANGLE_INDICES[NUM_VERTICES_PER_CUBE] = int[NUM_VERTICES_PER_CUBE](
+        0, 1, 2, 
+        0, 2, 3,
+        3, 2, 6, 
+        3, 6, 7,
+        7, 6, 5, 
+        7, 5, 4,
+        4, 5, 1, 
+        4, 1, 0,
+        1, 5, 6, 
+        1, 6, 2,
+        4, 0, 3, 
+        4, 3, 7
+    );
+
+    int boundID = gl_VertexID / NUM_VERTICES_PER_CUBE;
+    int vertexID = gl_VertexID - boundID * NUM_VERTICES_PER_CUBE;
+    int triangleIndex = UNIT_BOX_TRIANGLE_INDICES[vertexID];
+    vec3 cubeVec = UNIT_BOX_VERTICES[triangleIndex];
+
+    ItemBound bound = getItemBound(boundID);
+    vec3 boundPos = bound.id_boundPos.yzw;
+    vec3 boundDim = bound.boundDim_s.xyz;
+
+    vec4 pos = vec4(boundPos + boundDim * cubeVec.xyz, 1.0);
+
+    // standard transform
+    TransformCamera cam = getTransformCamera();
+    TransformObject obj = getTransformObject();
+    <$transformModelToMonoClipPos(cam, obj, pos, gl_Position)$>
+
+    // Offset the vertex to take into account the outline width
+    pos.xyz += UNIT_BOX_NORMALS[triangleIndex];
+    vec4 offsetPosition;
+    <$transformModelToMonoClipPos(cam, obj, pos, offsetPosition)$>
+    gl_Position.xy += normalize(offsetPosition.xy-gl_Position.xy) * outlineWidth * gl_Position.w;
+    <$transformStereoClipsSpace(cam, gl_Position)$>
+}
diff --git a/libraries/render-utils/src/Highlight_filled.slf b/libraries/render-utils/src/Highlight_filled.slf
new file mode 100644
index 0000000000..53530746f0
--- /dev/null
+++ b/libraries/render-utils/src/Highlight_filled.slf
@@ -0,0 +1,13 @@
+//  Highlight_filled.slf
+//  Add highlight effect based on two zbuffers : one containing the total scene z and another 
+//  with the z of only the objects to be outlined.
+//  This is the version with the fill effect inside the silhouette.
+//
+//  Created by Olivier Prat on 09/07/2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+<@include Highlight.slh@>
+<$main(1)$>
diff --git a/libraries/render-utils/src/Highlight_shared.slh b/libraries/render-utils/src/Highlight_shared.slh
new file mode 100644
index 0000000000..5efbde4d52
--- /dev/null
+++ b/libraries/render-utils/src/Highlight_shared.slh
@@ -0,0 +1,30 @@
+// glsl / C++ compatible source as interface for highlight
+#ifdef __cplusplus
+#   define TVEC2 glm::vec2
+#   define TVEC3 glm::vec3
+#   define TVEC4 glm::vec4
+#else
+#   define TVEC2 vec2
+#   define TVEC3 vec3
+#   define TVEC4 vec4
+#endif
+
+struct HighlightParameters
+{
+	TVEC3 _color;
+    float _intensity;
+
+    TVEC2 _size;
+    float _unoccludedFillOpacity;
+    float _occludedFillOpacity;
+
+    float _threshold;
+    int _blurKernelSize;
+    float padding2;
+    float padding3;
+};
+
+// <@if 1@>
+// Trigger Scribe include 
+// <@endif@> <!def that !> 
+//
diff --git a/libraries/render-utils/src/LightClusterGrid_shared.slh b/libraries/render-utils/src/LightClusterGrid_shared.slh
index 50499cf31a..6d43e71920 100644
--- a/libraries/render-utils/src/LightClusterGrid_shared.slh
+++ b/libraries/render-utils/src/LightClusterGrid_shared.slh
@@ -36,7 +36,7 @@ vec3 frustumGrid_volumeToGrid(vec3 vpos, ivec3 dims) {
 
 vec4 frustumGrid_volumeToClip(vec3 vpos, float rangeNear, float rangeFar) {
     vec3 ndcPos = vec3(-1.0f + 2.0f * vpos.x, -1.0f + 2.0f * vpos.y, vpos.z);
-    float depth = rangeNear * (1 - ndcPos.z) + rangeFar * (ndcPos.z);
+    float depth = rangeNear * (1.0f - ndcPos.z) + rangeFar * (ndcPos.z);
     vec4 clipPos = vec4(ndcPos.x * depth, ndcPos.y * depth, 1.0f, depth);
     return clipPos;
 }
@@ -114,14 +114,14 @@ int frustumGrid_eyeDepthToClusterLayer(float eyeZ) {
 
     float volumeZ = frustumGrid_eyeToVolumeDepth(eyeZ, frustumGrid.rangeNear, frustumGrid.rangeFar);
 
-    float gridZ = frustumGrid_volumeToGridDepth(volumeZ, frustumGrid.dims);
+    int gridZ = int(frustumGrid_volumeToGridDepth(volumeZ, frustumGrid.dims));
 
     if (gridZ >= frustumGrid.dims.z) {
         gridZ = frustumGrid.dims.z;
     }
 
 
-    return int(gridZ);
+    return gridZ;
 }
 
 ivec3 frustumGrid_eyeToClusterPos(vec3 eyePos) {
@@ -134,8 +134,8 @@ ivec3 frustumGrid_eyeToClusterPos(vec3 eyePos) {
 
     vec3 gridPos = frustumGrid_volumeToGrid(volumePos, frustumGrid.dims);
     
-    if (gridPos.z >= frustumGrid.dims.z) {
-        gridPos.z = frustumGrid.dims.z;
+    if (gridPos.z >= float(frustumGrid.dims.z)) {
+        gridPos.z = float(frustumGrid.dims.z);
     }
 
     ivec3 igridPos = ivec3(floor(gridPos));
@@ -154,7 +154,7 @@ ivec3 frustumGrid_eyeToClusterPos(vec3 eyePos) {
 
 int frustumGrid_eyeToClusterDirH(vec3 eyeDir) {
     if (eyeDir.z >= 0.0f) {
-        return (eyeDir.x > 0 ? frustumGrid.dims.x : -1);
+        return (eyeDir.x > 0.0f ? frustumGrid.dims.x : -1);
     }
 
     float eyeDepth = -eyeDir.z;
@@ -168,7 +168,7 @@ int frustumGrid_eyeToClusterDirH(vec3 eyeDir) {
 
 int frustumGrid_eyeToClusterDirV(vec3 eyeDir) {
     if (eyeDir.z >= 0.0f) {
-        return (eyeDir.y > 0 ? frustumGrid.dims.y : -1);
+        return (eyeDir.y > 0.0f ? frustumGrid.dims.y : -1);
     }
 
     float eyeDepth = -eyeDir.z;
diff --git a/libraries/render-utils/src/LightClusters.cpp b/libraries/render-utils/src/LightClusters.cpp
index 74209ce951..eedb9053c7 100644
--- a/libraries/render-utils/src/LightClusters.cpp
+++ b/libraries/render-utils/src/LightClusters.cpp
@@ -575,6 +575,7 @@ void LightClusteringPass::run(const render::RenderContextPointer& renderContext,
     
     // From the LightStage and the current frame, update the light cluster Grid
     auto lightStage = renderContext->_scene->getStage<LightStage>();
+    assert(lightStage);
     _lightClusters->updateLightStage(lightStage);
     _lightClusters->updateLightFrame(lightStage->_currentFrame, lightingModel->isPointLightEnabled(), lightingModel->isSpotLightEnabled());
     
@@ -726,7 +727,7 @@ void DebugLightClusters::run(const render::RenderContextPointer& renderContext,
     batch.setModelTransform(Transform());
 
     // Bind the Light CLuster data strucutre
-    batch.setUniformBuffer(LIGHT_GPU_SLOT, lightClusters->_lightStage->_lightArrayBuffer);
+    batch.setUniformBuffer(LIGHT_GPU_SLOT, lightClusters->_lightStage->getLightArrayBuffer());
     batch.setUniformBuffer(LIGHT_CLUSTER_GRID_FRUSTUM_GRID_SLOT, lightClusters->_frustumGridBuffer);
     batch.setUniformBuffer(LIGHT_CLUSTER_GRID_CLUSTER_GRID_SLOT, lightClusters->_clusterGridBuffer);
     batch.setUniformBuffer(LIGHT_CLUSTER_GRID_CLUSTER_CONTENT_SLOT, lightClusters->_clusterContentBuffer);
diff --git a/libraries/render-utils/src/LightPayload.cpp b/libraries/render-utils/src/LightPayload.cpp
index 5f7f7236f2..afa17bee19 100644
--- a/libraries/render-utils/src/LightPayload.cpp
+++ b/libraries/render-utils/src/LightPayload.cpp
@@ -56,6 +56,7 @@ LightPayload::~LightPayload() {
 void LightPayload::render(RenderArgs* args) {
     if (!_stage) {
         _stage = args->_scene->getStage<LightStage>();
+        assert(_stage);
     }
     // Do we need to allocate the light in the stage ?
     if (LightStage::isIndexInvalid(_index)) {
@@ -124,6 +125,7 @@ KeyLightPayload::~KeyLightPayload() {
 void KeyLightPayload::render(RenderArgs* args) {
     if (!_stage) {
         _stage = args->_scene->getStage<LightStage>();
+        assert(_stage);
     }
     // Do we need to allocate the light in the stage ?
     if (LightStage::isIndexInvalid(_index)) {
diff --git a/libraries/render-utils/src/LightPoint.slh b/libraries/render-utils/src/LightPoint.slh
index ac1e415d9d..7e389e11f6 100644
--- a/libraries/render-utils/src/LightPoint.slh
+++ b/libraries/render-utils/src/LightPoint.slh
@@ -59,12 +59,12 @@ bool evalLightPointEdge(out vec3 color, Light light, vec4 fragLightDirLen, vec3
 
     // Show edges
     float edge = abs(2.0 * ((lightVolume_getRadius(light.volume) - fragLightDistance) / (0.1)) - 1.0);
-    if (edge < 1) {
+    if (edge < 1.0) {
         float edgeCoord = exp2(-8.0*edge*edge);
         color = vec3(edgeCoord * edgeCoord * getLightColor(light));
     }
 
-    return (edge < 1);
+    return (edge < 1.0);
 }
 
 <@endfunc@>
diff --git a/libraries/render-utils/src/LightSpot.slh b/libraries/render-utils/src/LightSpot.slh
index a38851b039..8627dae0eb 100644
--- a/libraries/render-utils/src/LightSpot.slh
+++ b/libraries/render-utils/src/LightSpot.slh
@@ -66,12 +66,12 @@ bool evalLightSpotEdge(out vec3 color, Light light, vec4 fragLightDirLen, float
     float edgeDistS = dot(fragLightDistance * vec2(cosSpotAngle, sqrt(1.0 - cosSpotAngle * cosSpotAngle)), -lightVolume_getSpotOutsideNormal2(light.volume));
     float edgeDist = min(edgeDistR, edgeDistS);
     float edge = abs(2.0 * (edgeDist / (0.1)) - 1.0);
-    if (edge < 1) {
+    if (edge < 1.0) {
         float edgeCoord = exp2(-8.0*edge*edge);
         color = vec3(edgeCoord * edgeCoord * getLightColor(light));
     }
 
-    return (edge < 1);
+    return (edge < 1.0);
 }
 
 <@endfunc@>
diff --git a/libraries/render-utils/src/LightStage.cpp b/libraries/render-utils/src/LightStage.cpp
index d0e9f2467e..ba705e56cb 100644
--- a/libraries/render-utils/src/LightStage.cpp
+++ b/libraries/render-utils/src/LightStage.cpp
@@ -14,18 +14,34 @@
 #include "LightStage.h"
 
 std::string LightStage::_stageName { "LIGHT_STAGE"};
+const LightStage::Index LightStage::INVALID_INDEX { render::indexed_container::INVALID_INDEX };
 
 LightStage::LightStage() {
 }
 
-LightStage::Shadow::Shadow(model::LightPointer light) : _light{ light}, _frustum{ std::make_shared<ViewFrustum>() } {
-    framebuffer = gpu::FramebufferPointer(gpu::Framebuffer::createShadowmap(MAP_SIZE));
-    map = framebuffer->getDepthStencilBuffer();
-    Schema schema;
-    _schemaBuffer = std::make_shared<gpu::Buffer>(sizeof(Schema), (const gpu::Byte*) &schema);
+LightStage::Shadow::Schema::Schema() :
+    bias{ 0.005f },
+    scale{ 1.0f / MAP_SIZE } {
+
 }
 
-void LightStage::Shadow::setKeylightFrustum(const ViewFrustum& viewFrustum, float nearDepth, float farDepth) {
+gpu::FramebufferPointer LightStage::Shadow::framebuffer;
+gpu::TexturePointer LightStage::Shadow::map;
+
+LightStage::Shadow::Shadow(model::LightPointer light) : _light{ light}, _frustum{ std::make_shared<ViewFrustum>() } {
+    Schema schema;
+    _schemaBuffer = std::make_shared<gpu::Buffer>(sizeof(Schema), (const gpu::Byte*) &schema);
+
+    if (!framebuffer) {
+        framebuffer = gpu::FramebufferPointer(gpu::Framebuffer::createShadowmap(MAP_SIZE));
+        map = framebuffer->getDepthStencilBuffer();
+    }
+}
+
+void LightStage::Shadow::setKeylightFrustum(const ViewFrustum& viewFrustum, 
+                                            float viewMinShadowDistance, float viewMaxShadowDistance, 
+                                            float nearDepth, float farDepth) {
+    assert(viewMinShadowDistance < viewMaxShadowDistance);
     assert(nearDepth < farDepth);
 
     // Orient the keylight frustum
@@ -48,8 +64,8 @@ void LightStage::Shadow::setKeylightFrustum(const ViewFrustum& viewFrustum, floa
     const Transform view{ _frustum->getView()};
     const Transform viewInverse{ view.getInverseMatrix() };
 
-    auto nearCorners = viewFrustum.getCorners(nearDepth);
-    auto farCorners = viewFrustum.getCorners(farDepth);
+    auto nearCorners = viewFrustum.getCorners(viewMinShadowDistance);
+    auto farCorners = viewFrustum.getCorners(viewMaxShadowDistance);
 
     vec3 min{ viewInverse.transform(nearCorners.bottomLeft) };
     vec3 max{ min };
@@ -73,7 +89,10 @@ void LightStage::Shadow::setKeylightFrustum(const ViewFrustum& viewFrustum, floa
     fitFrustum(farCorners.topLeft);
     fitFrustum(farCorners.topRight);
 
-    glm::mat4 ortho = glm::ortho<float>(min.x, max.x, min.y, max.y, -max.z, -min.z);
+    // Re-adjust near shadow distance
+    auto near = glm::max(max.z, -nearDepth);
+    auto far = -min.z;
+    glm::mat4 ortho = glm::ortho<float>(min.x, max.x, min.y, max.y, near, far);
     _frustum->setProjection(ortho);
 
     // Calculate the frustum's internal state
@@ -84,6 +103,16 @@ void LightStage::Shadow::setKeylightFrustum(const ViewFrustum& viewFrustum, floa
     _schemaBuffer.edit<Schema>().viewInverse = viewInverse.getMatrix();
 }
 
+void LightStage::Shadow::setFrustum(const ViewFrustum& shadowFrustum) {
+    const Transform view{ shadowFrustum.getView() };
+    const Transform viewInverse{ view.getInverseMatrix() };
+
+    *_frustum = shadowFrustum;
+    // Update the buffer
+    _schemaBuffer.edit<Schema>().projection = shadowFrustum.getProjection();
+    _schemaBuffer.edit<Schema>().viewInverse = viewInverse.getMatrix();
+}
+
 const glm::mat4& LightStage::Shadow::getView() const {
     return _frustum->getView();
 }
@@ -99,11 +128,9 @@ LightStage::Index LightStage::findLight(const LightPointer& light) const {
     } else {
         return (*found).second;
     }
-
 }
 
 LightStage::Index LightStage::addLight(const LightPointer& light) {
-
     auto found = _lightMap.find(light);
     if (found == _lightMap.end()) {
         auto lightId = _lights.newElement(light);
@@ -114,6 +141,7 @@ LightStage::Index LightStage::addLight(const LightPointer& light) {
             if (lightId >= (Index) _descs.size()) {
                 _descs.emplace_back(Desc());
             } else {
+                assert(_descs[lightId].shadowId == INVALID_INDEX);
                 _descs.emplace(_descs.begin() + lightId, Desc());
             }
 
@@ -132,6 +160,7 @@ LightStage::Index LightStage::addShadow(Index lightIndex) {
     auto light = getLight(lightIndex);
     Index shadowId = INVALID_INDEX;
     if (light) {
+        assert(_descs[lightIndex].shadowId == INVALID_INDEX);
         shadowId = _shadows.newElement(std::make_shared<Shadow>(light));
         _descs[lightIndex].shadowId = shadowId;
     }
@@ -139,13 +168,65 @@ LightStage::Index LightStage::addShadow(Index lightIndex) {
 }
 
 LightStage::LightPointer LightStage::removeLight(Index index) {
-    LightPointer removed = _lights.freeElement(index);
-    
-    if (removed) {
-        _lightMap.erase(removed);
+    LightPointer removedLight = _lights.freeElement(index);
+    if (removedLight) {
+        auto shadowId = _descs[index].shadowId;
+        // Remove shadow if one exists for this light
+        if (shadowId != INVALID_INDEX) {
+            auto removedShadow = _shadows.freeElement(shadowId);
+            assert(removedShadow);
+            assert(removedShadow->getLight() == removedLight);
+        }
+        _lightMap.erase(removedLight);
         _descs[index] = Desc();
     }
-    return removed;
+    assert(_descs.size() <= index || _descs[index].shadowId == INVALID_INDEX);
+    return removedLight;
+}
+
+LightStage::LightPointer LightStage::getCurrentKeyLight() const {
+    Index keyLightId{ 0 };
+    if (!_currentFrame._sunLights.empty()) {
+        keyLightId = _currentFrame._sunLights.front();
+    }
+    return _lights.get(keyLightId);
+}
+
+LightStage::LightPointer LightStage::getCurrentAmbientLight() const {
+    Index keyLightId{ 0 };
+    if (!_currentFrame._ambientLights.empty()) {
+        keyLightId = _currentFrame._ambientLights.front();
+    }
+    return _lights.get(keyLightId);
+}
+
+LightStage::ShadowPointer LightStage::getCurrentKeyShadow() const {
+    Index keyLightId{ 0 };
+    if (!_currentFrame._sunLights.empty()) {
+        keyLightId = _currentFrame._sunLights.front();
+    }
+    auto shadow = getShadow(keyLightId);
+    assert(shadow == nullptr || shadow->getLight() == getLight(keyLightId));
+    return shadow;
+}
+
+LightStage::LightAndShadow LightStage::getCurrentKeyLightAndShadow() const {
+    Index keyLightId{ 0 };
+    if (!_currentFrame._sunLights.empty()) {
+        keyLightId = _currentFrame._sunLights.front();
+    }
+    auto shadow = getShadow(keyLightId);
+    auto light = getLight(keyLightId);
+    assert(shadow == nullptr || shadow->getLight() == light);
+    return LightAndShadow(light, shadow);
+}
+
+LightStage::Index LightStage::getShadowId(Index lightId) const {
+    if (checkLightId(lightId)) {
+        return _descs[lightId].shadowId;
+    } else {
+        return INVALID_INDEX;
+    }
 }
 
 void LightStage::updateLightArrayBuffer(Index lightId) {
diff --git a/libraries/render-utils/src/LightStage.h b/libraries/render-utils/src/LightStage.h
index f946cf699e..fa581c8315 100644
--- a/libraries/render-utils/src/LightStage.h
+++ b/libraries/render-utils/src/LightStage.h
@@ -32,7 +32,7 @@ public:
     static const std::string& getName() { return _stageName; }
 
     using Index = render::indexed_container::Index;
-    static const Index INVALID_INDEX { render::indexed_container::INVALID_INDEX };
+    static const Index INVALID_INDEX;
     static bool isIndexInvalid(Index index) { return index == INVALID_INDEX; }
     
     using LightPointer = model::LightPointer;
@@ -48,8 +48,9 @@ public:
 
         Shadow(model::LightPointer light);
 
-        void setKeylightFrustum(const ViewFrustum& viewFrustum, float nearDepth, float farDepth);
+        void setKeylightFrustum(const ViewFrustum& viewFrustum, float viewMinShadowDistance, float viewMaxShadowDistance, float nearDepth = 1.0f, float farDepth = 1000.0f);
 
+        void setFrustum(const ViewFrustum& shadowFrustum);
         const std::shared_ptr<ViewFrustum> getFrustum() const { return _frustum; }
 
         const glm::mat4& getView() const;
@@ -57,32 +58,36 @@ public:
 
         const UniformBufferView& getBuffer() const { return _schemaBuffer; }
 
-        gpu::FramebufferPointer framebuffer;
-        gpu::TexturePointer map;
+        // Shadow maps are shared among all lights for the moment as only one key light
+        // is used.
+        static gpu::FramebufferPointer framebuffer;
+        static gpu::TexturePointer map;
+
+        const model::LightPointer& getLight() const { return _light; }
+
     protected:
+
         model::LightPointer _light;
         std::shared_ptr<ViewFrustum> _frustum;
 
         class Schema {
         public:
+
+            Schema();
+
             glm::mat4 projection;
             glm::mat4 viewInverse;
 
-            glm::float32 bias = 0.005f;
-            glm::float32 scale = 1 / MAP_SIZE;
+            glm::float32 bias;
+            glm::float32 scale;
         };
         UniformBufferView _schemaBuffer = nullptr;
         
-        friend class Light;
     };
+
     using ShadowPointer = std::shared_ptr<Shadow>;
     using Shadows = render::indexed_container::IndexedPointerVector<Shadow>;
 
-    struct Desc {
-        Index shadowId { INVALID_INDEX };
-    };
-    using Descs = std::vector<Desc>;
-
     Index findLight(const LightPointer& light) const;
     Index addLight(const LightPointer& light);
 
@@ -100,26 +105,29 @@ public:
         return _lights.get(lightId);
     }
 
-    Index getShadowId(Index lightId) const {
-        if (checkLightId(lightId)) {
-            return _descs[lightId].shadowId;
-        } else {
-            return INVALID_INDEX;
-        }
-    }
+    Index getShadowId(Index lightId) const;
+
     ShadowPointer getShadow(Index lightId) const {
         return _shadows.get(getShadowId(lightId));
     }
 
     using LightAndShadow = std::pair<LightPointer, ShadowPointer>;
     LightAndShadow getLightAndShadow(Index lightId) const {
-        return LightAndShadow(getLight(lightId), getShadow(lightId));
+        auto light = getLight(lightId);
+        auto shadow = getShadow(lightId);
+        assert(shadow == nullptr || shadow->getLight() == light);
+        return LightAndShadow(light, shadow);
     }
 
+    LightPointer getCurrentKeyLight() const;
+    LightPointer getCurrentAmbientLight() const;
+    ShadowPointer getCurrentKeyShadow() const;
+    LightAndShadow getCurrentKeyLightAndShadow() const;
+
     LightStage();
-    Lights _lights;
-    LightMap _lightMap;
-    Descs _descs;
+
+    gpu::BufferPointer getLightArrayBuffer() const { return _lightArrayBuffer; }
+    void updateLightArrayBuffer(Index lightId);
 
     class Frame {
     public:
@@ -148,15 +156,24 @@ public:
     
     Frame _currentFrame;
     
-    gpu::BufferPointer _lightArrayBuffer;
-    void updateLightArrayBuffer(Index lightId);
+protected:
 
+    struct Desc {
+        Index shadowId{ INVALID_INDEX };
+    };
+    using Descs = std::vector<Desc>;
+
+    gpu::BufferPointer _lightArrayBuffer;
+
+    Lights _lights;
     Shadows _shadows;
+    Descs _descs;
+    LightMap _lightMap;
+
 };
 using LightStagePointer = std::shared_ptr<LightStage>;
 
 
-
 class LightStageSetup {
 public:
     using JobModel = render::Job::Model<LightStageSetup>;
diff --git a/libraries/render-utils/src/LightingModel.slh b/libraries/render-utils/src/LightingModel.slh
index 209a1f38d6..521c4894dc 100644
--- a/libraries/render-utils/src/LightingModel.slh
+++ b/libraries/render-utils/src/LightingModel.slh
@@ -157,7 +157,7 @@ vec4 evalPBRShading(vec3 fragNormal, vec3 fragLightDir, vec3 fragEyeDir, float m
     float power = specularDistribution(roughness, fragNormal, halfDir);
     vec3 specular = fresnelColor * power * diffuse;
 
-    return vec4(specular, (1.0 - metallic) * diffuse * (1 - fresnelColor.x));
+    return vec4(specular, (1.0 - metallic) * diffuse * (1.0 - fresnelColor.x));
 }
 
 // Frag Shading returns the diffuse amount as W and the specular rgb as xyz
@@ -171,7 +171,7 @@ vec4 evalPBRShadingDielectric(vec3 fragNormal, vec3 fragLightDir, vec3 fragEyeDi
     float power = specularDistribution(roughness, fragNormal, halfDir);
     vec3 specular = vec3(fresnelScalar) * power * diffuse;
 
-    return vec4(specular,  diffuse * (1 - fresnelScalar));
+    return vec4(specular,  diffuse * (1.0 - fresnelScalar));
 }
 
 vec4 evalPBRShadingMetallic(vec3 fragNormal, vec3 fragLightDir, vec3 fragEyeDir, float roughness, vec3 fresnel) {
diff --git a/libraries/render-utils/src/MaterialTextures.slh b/libraries/render-utils/src/MaterialTextures.slh
index e694935361..6c77fc4a91 100644
--- a/libraries/render-utils/src/MaterialTextures.slh
+++ b/libraries/render-utils/src/MaterialTextures.slh
@@ -66,7 +66,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).rg - vec2(0.5, 0.5));
     vec2 t2 = t*t;
-    return vec3(t.x, sqrt(1 - t2.x - t2.y), t.y);
+    return vec3(t.x, sqrt(1.0 - t2.x - t2.y), t.y);
 }
 <@endif@>
 
@@ -163,7 +163,7 @@ vec3 fetchLightmapMap(vec2 uv) {
     vec3 normalizedBitangent = normalize(cross(normalizedNormal, normalizedTangent));
     // attenuate the normal map divergence from the mesh normal based on distance
     // THe attenuation range [20,100] meters from the eye is arbitrary for now
-    vec3 localNormal = mix(<$fetchedNormal$>, vec3(0.0, 1.0, 0.0), smoothstep(20, 100, (-<$fragPos$>).z));
+    vec3 localNormal = mix(<$fetchedNormal$>, vec3(0.0, 1.0, 0.0), smoothstep(20.0, 100.0, (-<$fragPos$>).z));
     <$normal$> = vec3(normalizedTangent * localNormal.x + normalizedNormal * localNormal.y + normalizedBitangent * localNormal.z);
 }
 <@endfunc@>
diff --git a/libraries/render-utils/src/MeshPartPayload.cpp b/libraries/render-utils/src/MeshPartPayload.cpp
index b16134db5f..1ea3e1a705 100644
--- a/libraries/render-utils/src/MeshPartPayload.cpp
+++ b/libraries/render-utils/src/MeshPartPayload.cpp
@@ -14,7 +14,6 @@
 #include <PerfStat.h>
 
 #include "DeferredLightingEffect.h"
-#include "EntityItem.h"
 
 using namespace render;
 
@@ -259,7 +258,7 @@ void MeshPartPayload::render(RenderArgs* args) {
 
     gpu::Batch& batch = *(args->_batch);
 
-    auto locations = args->_pipeline->locations;
+    auto locations = args->_shapePipeline->locations;
     assert(locations);
 
     // Bind the model transform and the skinCLusterMatrices if needed
@@ -318,18 +317,28 @@ template <> const ShapeKey shapeGetShapeKey(const ModelMeshPartPayload::Pointer&
 template <> void payloadRender(const ModelMeshPartPayload::Pointer& payload, RenderArgs* args) {
     return payload->render(args);
 }
+
 }
 
-ModelMeshPartPayload::ModelMeshPartPayload(ModelPointer model, int _meshIndex, int partIndex, int shapeIndex, const Transform& transform, const Transform& offsetTransform) :
-    _meshIndex(_meshIndex),
+ModelMeshPartPayload::ModelMeshPartPayload(ModelPointer model, int meshIndex, int partIndex, int shapeIndex, const Transform& transform, const Transform& offsetTransform) :
+    _meshIndex(meshIndex),
     _shapeID(shapeIndex) {
 
     assert(model && model->isLoaded());
     _model = model;
     auto& modelMesh = model->getGeometry()->getMeshes().at(_meshIndex);
+    const Model::MeshState& state = model->getMeshState(_meshIndex);
+
     updateMeshPart(modelMesh, partIndex);
+    computeAdjustedLocalBound(state.clusterMatrices);
 
     updateTransform(transform, offsetTransform);
+    Transform renderTransform = transform;
+    if (state.clusterMatrices.size() == 1) {
+        renderTransform = transform.worldTransform(Transform(state.clusterMatrices[0]));
+    }
+    updateTransformForSkinnedMesh(renderTransform, transform);
+
     initCache();
 }
 
@@ -358,12 +367,25 @@ void ModelMeshPartPayload::notifyLocationChanged() {
 
 }
 
-void ModelMeshPartPayload::updateTransformForSkinnedMesh(const Transform& renderTransform, const Transform& boundTransform,
-        const gpu::BufferPointer& buffer) {
+
+void ModelMeshPartPayload::updateClusterBuffer(const std::vector<glm::mat4>& clusterMatrices) {
+    // Once computed the cluster matrices, update the buffer(s)
+    if (clusterMatrices.size() > 1) {
+        if (!_clusterBuffer) {
+            _clusterBuffer = std::make_shared<gpu::Buffer>(clusterMatrices.size() * sizeof(glm::mat4),
+                (const gpu::Byte*) clusterMatrices.data());
+        }
+        else {
+            _clusterBuffer->setSubData(0, clusterMatrices.size() * sizeof(glm::mat4),
+                (const gpu::Byte*) clusterMatrices.data());
+        }
+    }
+}
+
+void ModelMeshPartPayload::updateTransformForSkinnedMesh(const Transform& renderTransform, const Transform& boundTransform) {
     _transform = renderTransform;
     _worldBound = _adjustedLocalBound;
     _worldBound.transform(boundTransform);
-    _clusterBuffer = buffer;
 }
 
 ItemKey ModelMeshPartPayload::getKey() const {
@@ -376,7 +398,7 @@ ItemKey ModelMeshPartPayload::getKey() const {
             builder.withInvisible();
         }
 
-        if (model->isLayeredInFront()) {
+        if (model->isLayeredInFront() || model->isLayeredInHUD()) {
             builder.withLayered();
         }
 
@@ -390,28 +412,23 @@ ItemKey ModelMeshPartPayload::getKey() const {
                 builder.withTransparent();
             }
         }
-
-        if (_fadeState != FADE_COMPLETE) {
-            builder.withTransparent();
-        }
     }
     return builder.build();
 }
 
 int ModelMeshPartPayload::getLayer() const {
-    // MAgic number while we are defining the layering mechanism:
-    const int LAYER_3D_FRONT = 1;
-    const int LAYER_3D = 0;
     ModelPointer model = _model.lock();
-    if (model && model->isLayeredInFront()) {
-        return LAYER_3D_FRONT;
-    } else {
-        return LAYER_3D;
+    if (model) {
+        if (model->isLayeredInFront()) {
+            return Item::LAYER_3D_FRONT;
+        } else if (model->isLayeredInHUD()) {
+            return Item::LAYER_3D_HUD;
+        }
     }
+    return Item::LAYER_3D;
 }
 
 ShapeKey ModelMeshPartPayload::getShapeKey() const {
-
     // guard against partially loaded meshes
     ModelPointer model = _model.lock();
     if (!model || !model->isLoaded() || !model->getGeometry()) {
@@ -465,7 +482,7 @@ ShapeKey ModelMeshPartPayload::getShapeKey() const {
     ShapeKey::Builder builder;
     builder.withMaterial();
 
-    if (isTranslucent || _fadeState != FADE_COMPLETE) {
+    if (isTranslucent) {
         builder.withTranslucent();
     }
     if (hasTangents) {
@@ -510,9 +527,8 @@ void ModelMeshPartPayload::bindMesh(gpu::Batch& batch) {
         }
     }
 
-    if (_fadeState != FADE_COMPLETE) {
-        batch._glColor4f(1.0f, 1.0f, 1.0f, computeFadeAlpha());
-    } else if (!_hasColorAttrib) {
+    // TODO: Get rid of that extra call
+    if (!_hasColorAttrib) {
         batch._glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
     }
 }
@@ -525,45 +541,17 @@ void ModelMeshPartPayload::bindTransform(gpu::Batch& batch, const ShapePipeline:
     batch.setModelTransform(_transform);
 }
 
-float ModelMeshPartPayload::computeFadeAlpha() {
-    if (_fadeState == FADE_WAITING_TO_START) {
-        return 0.0f;
-    }
-    float fadeAlpha = 1.0f;
-    const float INV_FADE_PERIOD = 1.0f / (float)(1 * USECS_PER_SECOND);
-    float fraction = (float)(usecTimestampNow() - _fadeStartTime) * INV_FADE_PERIOD;
-    if (fraction < 1.0f) {
-        fadeAlpha = Interpolate::simpleNonLinearBlend(fraction);
-    }
-    if (fadeAlpha >= 1.0f) {
-        _fadeState = FADE_COMPLETE;
-        // when fade-in completes we flag model for one last "render item update"
-        ModelPointer model = _model.lock();
-        if (model) {
-            model->setRenderItemsNeedUpdate();
-        }
-        return 1.0f;
-    }
-    return Interpolate::simpleNonLinearBlend(fadeAlpha);
-}
-
 void ModelMeshPartPayload::render(RenderArgs* args) {
     PerformanceTimer perfTimer("ModelMeshPartPayload::render");
 
     ModelPointer model = _model.lock();
-    if (!model || !model->addedToScene() || !model->isVisible()) {
+    if (!model || !model->isAddedToScene() || !model->isVisible()) {
         return; // bail asap
     }
 
-    if (_fadeState == FADE_WAITING_TO_START) {
+    if (_state == WAITING_TO_START) {
         if (model->isLoaded()) {
-            // FIXME as far as I can tell this is the ONLY reason render-util depends on entities.
-            if (EntityItem::getEntitiesShouldFadeFunction()()) {
-                _fadeStartTime = usecTimestampNow();
-                _fadeState = FADE_IN_PROGRESS;
-            } else {
-                _fadeState = FADE_COMPLETE;
-            }
+            _state = STARTED;
             model->setRenderItemsNeedUpdate();
         } else {
             return;
@@ -583,7 +571,7 @@ void ModelMeshPartPayload::render(RenderArgs* args) {
     }
 
     gpu::Batch& batch = *(args->_batch);
-    auto locations =  args->_pipeline->locations;
+    auto locations =  args->_shapePipeline->locations;
     assert(locations);
 
     bindTransform(batch, locations, args->_renderMode);
@@ -606,11 +594,11 @@ void ModelMeshPartPayload::render(RenderArgs* args) {
     args->_details._trianglesRendered += _drawPart._numIndices / INDICES_PER_TRIANGLE;
 }
 
-void ModelMeshPartPayload::computeAdjustedLocalBound(const QVector<glm::mat4>& clusterMatrices) {
+void ModelMeshPartPayload::computeAdjustedLocalBound(const std::vector<glm::mat4>& clusterMatrices) {
     _adjustedLocalBound = _localBound;
     if (clusterMatrices.size() > 0) {
         _adjustedLocalBound.transform(clusterMatrices[0]);
-        for (int i = 1; i < clusterMatrices.size(); ++i) {
+        for (int i = 1; i < (int)clusterMatrices.size(); ++i) {
             AABox clusterBound = _localBound;
             clusterBound.transform(clusterMatrices[i]);
             _adjustedLocalBound += clusterBound;
diff --git a/libraries/render-utils/src/MeshPartPayload.h b/libraries/render-utils/src/MeshPartPayload.h
index 5d12e60ce3..971c6fe90b 100644
--- a/libraries/render-utils/src/MeshPartPayload.h
+++ b/libraries/render-utils/src/MeshPartPayload.h
@@ -23,10 +23,6 @@
 
 #include "Model.h"
 
-const uint8_t FADE_WAITING_TO_START = 0;
-const uint8_t FADE_IN_PROGRESS = 1;
-const uint8_t FADE_COMPLETE = 2;
-
 class Model;
 
 class MeshPartPayload {
@@ -91,11 +87,8 @@ public:
     typedef Payload::DataPointer Pointer;
 
     void notifyLocationChanged() override;
-    void updateTransformForSkinnedMesh(const Transform& renderTransform,
-            const Transform& boundTransform,
-            const gpu::BufferPointer& buffer);
-
-    float computeFadeAlpha();
+    void updateClusterBuffer(const std::vector<glm::mat4>& clusterMatrices);
+    void updateTransformForSkinnedMesh(const Transform& renderTransform, const Transform& boundTransform);
 
     // Render Item interface
     render::ItemKey getKey() const override;
@@ -109,7 +102,7 @@ public:
 
     void initCache();
 
-    void computeAdjustedLocalBound(const QVector<glm::mat4>& clusterMatrices);
+    void computeAdjustedLocalBound(const std::vector<glm::mat4>& clusterMatrices);
 
     gpu::BufferPointer _clusterBuffer;
     ModelWeakPointer _model;
@@ -122,8 +115,13 @@ public:
     bool _materialNeedsUpdate { true };
 
 private:
-    quint64 _fadeStartTime { 0 };
-    uint8_t _fadeState { FADE_WAITING_TO_START };
+
+    enum State : uint8_t {
+        WAITING_TO_START = 0,
+        STARTED = 1,
+    };
+
+    mutable State _state { WAITING_TO_START } ;
 };
 
 namespace render {
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index 67452c5d33..428fcc7a54 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -18,11 +18,13 @@
 #include <glm/gtx/transform.hpp>
 #include <glm/gtx/norm.hpp>
 
+#include <shared/QtHelpers.h>
 #include <GeometryUtil.h>
 #include <PathUtils.h>
 #include <PerfStat.h>
 #include <ViewFrustum.h>
 #include <GLMHelpers.h>
+#include <model-networking/SimpleMeshProxy.h>
 
 #include "AbstractViewStateInterface.h"
 #include "MeshPartPayload.h"
@@ -119,8 +121,6 @@ bool Model::needsFixupInScene() const {
     return (_needsFixupInScene || !_addedToScene) && !_needsReload && isLoaded();
 }
 
-// TODO?: should we combine translation and rotation into single method to avoid double-work?
-// (figure out where we call these)
 void Model::setTranslation(const glm::vec3& translation) {
     _translation = translation;
     updateRenderItems();
@@ -131,6 +131,14 @@ void Model::setRotation(const glm::quat& rotation) {
     updateRenderItems();
 }
 
+// temporary HACK: set transform while avoiding implicit calls to updateRenderItems()
+// TODO: make setRotation() and friends set flag to be used later to decide to updateRenderItems()
+void Model::setTransformNoUpdateRenderItems(const Transform& transform) {
+    _translation = transform.getTranslation();
+    _rotation = transform.getRotation();
+    // DO NOT call updateRenderItems() here!
+}
+
 Transform Model::getTransform() const {
     if (_spatiallyNestableOverride) {
         bool success;
@@ -207,11 +215,6 @@ void Model::updateRenderItems() {
         return;
     }
 
-    glm::vec3 scale = getScale();
-    if (_collisionGeometry) {
-        // _collisionGeometry is already scaled
-        scale = glm::vec3(1.0f);
-    }
     _needsUpdateClusterMatrices = true;
     _renderItemsNeedUpdate = false;
 
@@ -219,11 +222,11 @@ void Model::updateRenderItems() {
     // the application will ensure only the last lambda is actually invoked.
     void* key = (void*)this;
     std::weak_ptr<Model> weakSelf = shared_from_this();
-    AbstractViewStateInterface::instance()->pushPostUpdateLambda(key, [weakSelf, scale]() {
+    AbstractViewStateInterface::instance()->pushPostUpdateLambda(key, [weakSelf]() {
 
         // do nothing, if the model has already been destroyed.
         auto self = weakSelf.lock();
-        if (!self) {
+        if (!self || !self->isLoaded()) {
             return;
         }
 
@@ -231,33 +234,28 @@ void Model::updateRenderItems() {
         // We need to update them here so we can correctly update the bounding box.
         self->updateClusterMatrices();
 
-        uint32_t deleteGeometryCounter = self->_deleteGeometryCounter;
+        Transform modelTransform = self->getTransform();
+        modelTransform.setScale(glm::vec3(1.0f));
 
         render::Transaction transaction;
-        foreach (auto itemID, self->_modelMeshRenderItemsMap.keys()) {
-            transaction.updateItem<ModelMeshPartPayload>(itemID, [deleteGeometryCounter](ModelMeshPartPayload& data) {
-                ModelPointer model = data._model.lock();
-                if (model && model->isLoaded()) {
-                    // Ensure the model geometry was not reset between frames
-                    if (deleteGeometryCounter == model->_deleteGeometryCounter) {
-                        Transform modelTransform = model->getTransform();
-                        modelTransform.setScale(glm::vec3(1.0f));
+        for (int i = 0; i < (int) self->_modelMeshRenderItemIDs.size(); i++) {
 
-                        const Model::MeshState& state = model->getMeshState(data._meshIndex);
-                        Transform renderTransform = modelTransform;
-                        if (state.clusterMatrices.size() == 1) {
-                            renderTransform = modelTransform.worldTransform(Transform(state.clusterMatrices[0]));
-                        }
-                        data.updateTransformForSkinnedMesh(renderTransform, modelTransform, state.clusterBuffer);
-                    }
+            auto itemID = self->_modelMeshRenderItemIDs[i];
+            auto meshIndex = self->_modelMeshRenderItemShapes[i].meshIndex;
+            auto clusterMatrices(self->getMeshState(meshIndex).clusterMatrices);
+
+            transaction.updateItem<ModelMeshPartPayload>(itemID, [modelTransform, clusterMatrices](ModelMeshPartPayload& data) {
+                data.updateClusterBuffer(clusterMatrices);
+                Transform renderTransform = modelTransform;
+                if (clusterMatrices.size() == 1) {
+                    renderTransform = modelTransform.worldTransform(Transform(clusterMatrices[0]));
                 }
+                data.updateTransformForSkinnedMesh(renderTransform, modelTransform);
             });
         }
 
-        // collision mesh does not share the same unit scale as the FBX file's mesh: only apply offset
         Transform collisionMeshOffset;
         collisionMeshOffset.setIdentity();
-        Transform modelTransform = self->getTransform();
         foreach(auto itemID, self->_collisionRenderItemsMap.keys()) {
             transaction.updateItem<MeshPartPayload>(itemID, [modelTransform, collisionMeshOffset](MeshPartPayload& data) {
                 // update the model transform for this render item.
@@ -269,6 +267,11 @@ void Model::updateRenderItems() {
     });
 }
 
+void Model::setRenderItemsNeedUpdate() {
+    _renderItemsNeedUpdate = true;
+    emit requestRenderUpdate();
+}
+
 void Model::initJointTransforms() {
     if (isLoaded()) {
         glm::mat4 modelOffset = glm::scale(_scale) * glm::translate(_offset);
@@ -304,7 +307,7 @@ bool Model::updateGeometry() {
         foreach (const FBXMesh& mesh, fbxGeometry.meshes) {
             MeshState state;
             state.clusterMatrices.resize(mesh.clusters.size());
-            _meshStates.append(state);
+            _meshStates.push_back(state);
 
             // Note: we add empty buffers for meshes that lack blendshapes so we can access the buffers by index
             // later in ModelMeshPayload, however the vast majority of meshes will not have them.
@@ -461,6 +464,41 @@ bool Model::convexHullContains(glm::vec3 point) {
     return false;
 }
 
+MeshProxyList Model::getMeshes() const {
+    MeshProxyList result;
+    const Geometry::Pointer& renderGeometry = getGeometry();
+    const Geometry::GeometryMeshes& meshes = renderGeometry->getMeshes();
+
+    if (!isLoaded()) {
+        return result;
+    }
+
+    Transform offset;
+    offset.setScale(_scale);
+    offset.postTranslate(_offset);
+    glm::mat4 offsetMat = offset.getMatrix();
+
+    for (std::shared_ptr<const model::Mesh> mesh : meshes) {
+        if (!mesh) {
+            continue;
+        }
+
+        MeshProxy* meshProxy = new SimpleMeshProxy(
+            mesh->map(
+                [=](glm::vec3 position) {
+                    return glm::vec3(offsetMat * glm::vec4(position, 1.0f));
+                },
+                [=](glm::vec3 color) { return color; },
+                [=](glm::vec3 normal) {
+                    return glm::normalize(glm::vec3(offsetMat * glm::vec4(normal, 0.0f)));
+                },
+                [&](uint32_t index) { return index; }));
+        result << meshProxy;
+    }
+
+    return result;
+}
+
 void Model::calculateTriangleSets() {
     PROFILE_RANGE(render, __FUNCTION__);
 
@@ -565,6 +603,21 @@ void Model::setLayeredInFront(bool layered, const render::ScenePointer& scene) {
     }
 }
 
+void Model::setLayeredInHUD(bool layered, const render::ScenePointer& scene) {
+    if (_isLayeredInHUD != layered) {
+        _isLayeredInHUD = layered;
+
+        render::Transaction transaction;
+        foreach(auto item, _modelMeshRenderItemsMap.keys()) {
+            transaction.resetItem(item, _modelMeshRenderItemsMap[item]);
+        }
+        foreach(auto item, _collisionRenderItemsMap.keys()) {
+            transaction.resetItem(item, _collisionRenderItemsMap[item]);
+        }
+        scene->enqueueTransaction(transaction);
+    }
+}
+
 bool Model::addToScene(const render::ScenePointer& scene,
                        render::Transaction& transaction,
                        render::Item::Status::Getters& statusGetters) {
@@ -629,6 +682,7 @@ void Model::removeFromScene(const render::ScenePointer& scene, render::Transacti
     _modelMeshRenderItemIDs.clear();
     _modelMeshRenderItemsMap.clear();
     _modelMeshRenderItems.clear();
+    _modelMeshRenderItemShapes.clear();
 
     foreach(auto item, _collisionRenderItemsMap.keys()) {
         transaction.removeItem(item);
@@ -870,7 +924,7 @@ bool Model::getRelativeDefaultJointTranslation(int jointIndex, glm::vec3& transl
 QStringList Model::getJointNames() const {
     if (QThread::currentThread() != thread()) {
         QStringList result;
-        QMetaObject::invokeMethod(const_cast<Model*>(this), "getJointNames", Qt::BlockingQueuedConnection,
+        BLOCKING_INVOKE_METHOD(const_cast<Model*>(this), "getJointNames",
             Q_RETURN_ARG(QStringList, result));
         return result;
     }
@@ -904,7 +958,7 @@ Blender::Blender(ModelPointer model, int blendNumber, const Geometry::WeakPointe
 }
 
 void Blender::run() {
-    PROFILE_RANGE_EX(simulation_animation, __FUNCTION__, 0xFFFF0000, 0, { { "url", _model->getURL().toString() } });
+    DETAILED_PROFILE_RANGE_EX(simulation_animation, __FUNCTION__, 0xFFFF0000, 0, { { "url", _model->getURL().toString() } });
     QVector<glm::vec3> vertices, normals;
     if (_model) {
         int offset = 0;
@@ -1025,8 +1079,7 @@ void Model::snapToRegistrationPoint() {
 }
 
 void Model::simulate(float deltaTime, bool fullUpdate) {
-    PROFILE_RANGE(simulation_detail, __FUNCTION__);
-    PerformanceTimer perfTimer("Model::simulate");
+    DETAILED_PROFILE_RANGE(simulation_detail, __FUNCTION__);
     fullUpdate = updateGeometry() || fullUpdate || (_scaleToFit && !_scaledToFit)
                     || (_snapModelToRegistrationPoint && !_snappedToRegistrationPoint);
 
@@ -1064,14 +1117,14 @@ void Model::computeMeshPartLocalBounds() {
 
 // virtual
 void Model::updateClusterMatrices() {
-    PerformanceTimer perfTimer("Model::updateClusterMatrices");
+    DETAILED_PERFORMANCE_TIMER("Model::updateClusterMatrices");
 
     if (!_needsUpdateClusterMatrices || !isLoaded()) {
         return;
     }
     _needsUpdateClusterMatrices = false;
     const FBXGeometry& geometry = getFBXGeometry();
-    for (int i = 0; i < _meshStates.size(); i++) {
+    for (int i = 0; i < (int) _meshStates.size(); i++) {
         MeshState& state = _meshStates[i];
         const FBXMesh& mesh = geometry.meshes.at(i);
         for (int j = 0; j < mesh.clusters.size(); j++) {
@@ -1079,17 +1132,6 @@ void Model::updateClusterMatrices() {
             auto jointMatrix = _rig.getJointTransform(cluster.jointIndex);
             glm_mat4u_mul(jointMatrix, cluster.inverseBindMatrix, state.clusterMatrices[j]);
         }
-
-        // Once computed the cluster matrices, update the buffer(s)
-        if (mesh.clusters.size() > 1) {
-            if (!state.clusterBuffer) {
-                state.clusterBuffer = std::make_shared<gpu::Buffer>(state.clusterMatrices.size() * sizeof(glm::mat4),
-                                                                    (const gpu::Byte*) state.clusterMatrices.constData());
-            } else {
-                state.clusterBuffer->setSubData(0, state.clusterMatrices.size() * sizeof(glm::mat4),
-                                                (const gpu::Byte*) state.clusterMatrices.constData());
-            }
-        }
     }
 
     // post the blender if we're not currently waiting for one to finish
@@ -1182,6 +1224,7 @@ const render::ItemIDs& Model::fetchRenderItemIDs() const {
 }
 
 void Model::createRenderItemSet() {
+    updateClusterMatrices();
     if (_collisionGeometry) {
         if (_collisionRenderItems.empty()) {
             createCollisionRenderItemSet();
@@ -1198,7 +1241,7 @@ void Model::createVisibleRenderItemSet() {
     const auto& meshes = _renderGeometry->getMeshes();
 
     // all of our mesh vectors must match in size
-    if ((int)meshes.size() != _meshStates.size()) {
+    if (meshes.size() != _meshStates.size()) {
         qCDebug(renderutils) << "WARNING!!!! Mesh Sizes don't match! We will not segregate mesh groups yet.";
         return;
     }
@@ -1207,6 +1250,7 @@ void Model::createVisibleRenderItemSet() {
     Q_ASSERT(_modelMeshRenderItems.isEmpty());
 
     _modelMeshRenderItems.clear();
+    _modelMeshRenderItemShapes.clear();
 
     Transform transform;
     transform.setTranslation(_translation);
@@ -1229,10 +1273,10 @@ void Model::createVisibleRenderItemSet() {
         int numParts = (int)mesh->getNumParts();
         for (int partIndex = 0; partIndex < numParts; partIndex++) {
             _modelMeshRenderItems << std::make_shared<ModelMeshPartPayload>(shared_from_this(), i, partIndex, shapeID, transform, offset);
+            _modelMeshRenderItemShapes.emplace_back(ShapeInfo{ (int)i });
             shapeID++;
         }
     }
-    computeMeshPartLocalBounds();
 }
 
 void Model::createCollisionRenderItemSet() {
@@ -1271,56 +1315,7 @@ void Model::createCollisionRenderItemSet() {
 }
 
 bool Model::isRenderable() const {
-    return !_meshStates.isEmpty() || (isLoaded() && _renderGeometry->getMeshes().empty());
-}
-
-bool Model::initWhenReady(const render::ScenePointer& scene) {
-    // NOTE: this only called by SkeletonModel
-    if (_addedToScene || !isRenderable()) {
-        return false;
-    }
-
-    createRenderItemSet();
-
-    render::Transaction transaction;
-
-    bool addedTransaction = false;
-    if (_collisionGeometry) {
-        foreach (auto renderItem, _collisionRenderItems) {
-            auto item = scene->allocateID();
-            auto renderPayload = std::make_shared<MeshPartPayload::Payload>(renderItem);
-            _collisionRenderItemsMap.insert(item, renderPayload);
-            transaction.resetItem(item, renderPayload);
-        }
-        addedTransaction = !_collisionRenderItems.empty();
-    } else {
-        bool hasTransparent = false;
-        size_t verticesCount = 0;
-        foreach (auto renderItem, _modelMeshRenderItems) {
-            auto item = scene->allocateID();
-            auto renderPayload = std::make_shared<ModelMeshPartPayload::Payload>(renderItem);
-
-            hasTransparent = hasTransparent || renderItem.get()->getShapeKey().isTranslucent();
-            verticesCount += renderItem.get()->getVerticesCount();
-            _modelMeshRenderItemsMap.insert(item, renderPayload);
-            transaction.resetItem(item, renderPayload);
-        }
-        addedTransaction = !_modelMeshRenderItemsMap.empty();
-        _renderInfoVertexCount = verticesCount;
-        _renderInfoDrawCalls = _modelMeshRenderItemsMap.count();
-        _renderInfoHasTransparent = hasTransparent;
-    }
-    _addedToScene = addedTransaction;
-    if (addedTransaction) {
-        scene->enqueueTransaction(transaction);
-        // NOTE: updateRender items enqueues identical transaction (using a lambda)
-        // so it looks like we're doing double work here, but I don't want to remove the call
-        // for fear there is some side effect we'll miss. -- Andrew 2016.07.21
-        // TODO: figure out if we really need this call to updateRenderItems() or not.
-        updateRenderItems();
-    }
-
-    return true;
+    return !_meshStates.empty() || (isLoaded() && _renderGeometry->getMeshes().empty());
 }
 
 class CollisionRenderGeometry : public Geometry {
diff --git a/libraries/render-utils/src/Model.h b/libraries/render-utils/src/Model.h
index 3eb796b763..c537a928b3 100644
--- a/libraries/render-utils/src/Model.h
+++ b/libraries/render-utils/src/Model.h
@@ -84,10 +84,10 @@ public:
     // new Scene/Engine rendering support
     void setVisibleInScene(bool newValue, const render::ScenePointer& scene);
     void setLayeredInFront(bool layered, const render::ScenePointer& scene);
+    void setLayeredInHUD(bool layered, const render::ScenePointer& scene);
     bool needsFixupInScene() const;
 
     bool needsReload() const { return _needsReload; }
-    bool initWhenReady(const render::ScenePointer& scene);
     bool addToScene(const render::ScenePointer& scene,
                     render::Transaction& transaction) {
         auto getters = render::Item::Status::Getters(0);
@@ -102,9 +102,10 @@ public:
     bool isVisible() const { return _isVisible; }
 
     bool isLayeredInFront() const { return _isLayeredInFront; }
+    bool isLayeredInHUD() const { return _isLayeredInHUD; }
 
     virtual void updateRenderItems();
-    void setRenderItemsNeedUpdate() { _renderItemsNeedUpdate = true; }
+    void setRenderItemsNeedUpdate();
     bool getRenderItemsNeedUpdate() { return _renderItemsNeedUpdate; }
     AABox getRenderableMeshBound() const;
     const render::ItemIDs& fetchRenderItemIDs() const;
@@ -116,6 +117,7 @@ public:
         const QVector<glm::vec3>& vertices, const QVector<glm::vec3>& normals);
 
     bool isLoaded() const { return (bool)_renderGeometry && _renderGeometry->isGeometryLoaded(); }
+    bool isAddedToScene() const { return _addedToScene; }
 
     void setIsWireframe(bool isWireframe) { _isWireframe = isWireframe; }
     bool isWireframe() const { return _isWireframe; }
@@ -204,6 +206,7 @@ public:
 
     void setTranslation(const glm::vec3& translation);
     void setRotation(const glm::quat& rotation);
+    void setTransformNoUpdateRenderItems(const Transform& transform); // temporary HACK
 
     const glm::vec3& getTranslation() const { return _translation; }
     const glm::quat& getRotation() const { return _rotation; }
@@ -243,8 +246,7 @@ public:
 
     class MeshState {
     public:
-        QVector<glm::mat4> clusterMatrices;
-        gpu::BufferPointer clusterBuffer;
+        std::vector<glm::mat4> clusterMatrices;
     };
 
     const MeshState& getMeshState(int index) { return _meshStates.at(index); }
@@ -257,15 +259,19 @@ public:
     int getResourceDownloadAttempts() { return _renderWatcher.getResourceDownloadAttempts(); }
     int getResourceDownloadAttemptsRemaining() { return _renderWatcher.getResourceDownloadAttemptsRemaining(); }
 
+    Q_INVOKABLE MeshProxyList getMeshes() const;
+
+    void scaleToFit();
+
 public slots:
     void loadURLFinished(bool success);
 
 signals:
     void setURLFinished(bool success);
     void setCollisionModelURLFinished(bool success);
+    void requestRenderUpdate();
 
 protected:
-    bool addedToScene() const { return _addedToScene; }
 
     void setBlendshapeCoefficients(const QVector<float>& coefficients) { _blendshapeCoefficients = coefficients; }
     const QVector<float>& getBlendshapeCoefficients() const { return _blendshapeCoefficients; }
@@ -310,12 +316,11 @@ protected:
     bool _snappedToRegistrationPoint; /// are we currently snapped to a registration point
     glm::vec3 _registrationPoint = glm::vec3(0.5f); /// the point in model space our center is snapped to
 
-    QVector<MeshState> _meshStates;
+    std::vector<MeshState> _meshStates;
 
     virtual void initJointStates();
 
     void setScaleInternal(const glm::vec3& scale);
-    void scaleToFit();
     void snapToRegistrationPoint();
 
     void computeMeshPartLocalBounds();
@@ -380,10 +385,11 @@ protected:
     QVector<std::shared_ptr<MeshPartPayload>> _collisionRenderItems;
     QMap<render::ItemID, render::PayloadPointer> _collisionRenderItemsMap;
 
-	QVector<std::shared_ptr<ModelMeshPartPayload>> _modelMeshRenderItems;
-	QMap<render::ItemID, render::PayloadPointer> _modelMeshRenderItemsMap;
-
+    QVector<std::shared_ptr<ModelMeshPartPayload>> _modelMeshRenderItems;
+    QMap<render::ItemID, render::PayloadPointer> _modelMeshRenderItemsMap;
     render::ItemIDs _modelMeshRenderItemIDs;
+    using ShapeInfo = struct { int meshIndex; };
+    std::vector<ShapeInfo> _modelMeshRenderItemShapes;
 
     bool _addedToScene { false }; // has been added to scene
     bool _needsFixupInScene { true }; // needs to be removed/re-added to scene
@@ -409,6 +415,7 @@ protected:
     int _renderInfoHasTransparent { false };
 
     bool _isLayeredInFront { false };
+    bool _isLayeredInHUD { false };
 
 private:
     float _loadingPriority { 0.0f };
diff --git a/libraries/render-utils/src/PickItemsJob.cpp b/libraries/render-utils/src/PickItemsJob.cpp
new file mode 100644
index 0000000000..860262a969
--- /dev/null
+++ b/libraries/render-utils/src/PickItemsJob.cpp
@@ -0,0 +1,56 @@
+//
+//  PickItemsJob.cpp
+//  render-utils/src/
+//
+//  Created by Olivier Prat on 08/08/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#include "PickItemsJob.h"
+
+PickItemsJob::PickItemsJob(render::ItemKey::Flags validKeys, render::ItemKey::Flags excludeKeys) : _validKeys{ validKeys }, _excludeKeys{ excludeKeys } {
+}
+
+void PickItemsJob::configure(const Config& config) {
+    _isEnabled = config.pick;
+}
+
+void PickItemsJob::run(const render::RenderContextPointer& renderContext, const PickItemsJob::Input& input, PickItemsJob::Output& output) {
+    output.clear();
+    if (_isEnabled) {
+        float minIsectDistance = std::numeric_limits<float>::max();
+        auto& itemBounds = input;
+        auto item = findNearestItem(renderContext, itemBounds, minIsectDistance);
+
+        if (render::Item::isValidID(item.id)) {
+            output.push_back(item);
+        }
+    }
+}
+
+render::ItemBound PickItemsJob::findNearestItem(const render::RenderContextPointer& renderContext, const render::ItemBounds& inputs, float& minIsectDistance) const {
+    const glm::vec3 rayOrigin = renderContext->args->getViewFrustum().getPosition();
+    const glm::vec3 rayDirection = renderContext->args->getViewFrustum().getDirection();
+    BoxFace face;
+    glm::vec3 normal;
+    float isectDistance;
+    render::ItemBound nearestItem( render::Item::INVALID_ITEM_ID );
+    const float minDistance = 0.2f;
+    const float maxDistance = 50.f;
+    render::ItemKey itemKey;
+
+    for (const auto& itemBound : inputs) {
+        if (!itemBound.bound.contains(rayOrigin) && itemBound.bound.findRayIntersection(rayOrigin, rayDirection, isectDistance, face, normal)) {
+            auto& item = renderContext->_scene->getItem(itemBound.id);
+            itemKey = item.getKey();
+            if (itemKey.isWorldSpace() && isectDistance>minDistance && isectDistance < minIsectDistance && isectDistance<maxDistance
+                && (itemKey._flags & _validKeys)!=0 && (itemKey._flags & _excludeKeys)==0) {
+                nearestItem = itemBound;
+                minIsectDistance = isectDistance;
+            }
+        }
+    }
+    return nearestItem;
+}
\ No newline at end of file
diff --git a/libraries/render-utils/src/PickItemsJob.h b/libraries/render-utils/src/PickItemsJob.h
new file mode 100644
index 0000000000..c462ffa129
--- /dev/null
+++ b/libraries/render-utils/src/PickItemsJob.h
@@ -0,0 +1,55 @@
+//
+//  PickItemsJob.h
+//  render-utils/src/
+//
+//  Created by Olivier Prat on 08/08/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_render_utils_PickItemsJob_h
+#define hifi_render_utils_PickItemsJob_h
+
+#include <render/Engine.h>
+#include <render/Item.h>
+
+class PickItemsConfig : public render::Job::Config {
+    Q_OBJECT
+        Q_PROPERTY(bool pick MEMBER pick NOTIFY dirty)
+
+public:
+
+    bool pick{ false };
+
+signals:
+    void dirty();
+};
+
+class PickItemsJob {
+
+public:
+
+    using Config = PickItemsConfig;
+    using Input = render::ItemBounds;
+    using Output = render::ItemBounds;
+    using JobModel = render::Job::ModelIO<PickItemsJob, Input, Output, Config>;
+
+    PickItemsJob(render::ItemKey::Flags validKeys = render::ItemKey::Builder().withTypeMeta().withTypeShape().build()._flags, render::ItemKey::Flags excludeKeys = 0);
+
+    void configure(const Config& config);
+    void run(const render::RenderContextPointer& renderContext, const PickItemsJob::Input& input, PickItemsJob::Output& output);
+
+private:
+
+    render::ItemKey::Flags _validKeys;
+    render::ItemKey::Flags _excludeKeys;
+    bool _isEnabled{ false };
+
+    render::ItemBound findNearestItem(const render::RenderContextPointer& renderContext, const render::ItemBounds& inputs, float& minIsectDistance) const;
+};
+
+#endif // hifi_render_utils_PickItemsJob_h
+
+
diff --git a/libraries/render-utils/src/RenderDeferredTask.cpp b/libraries/render-utils/src/RenderDeferredTask.cpp
index b49a066bf7..a395136978 100644
--- a/libraries/render-utils/src/RenderDeferredTask.cpp
+++ b/libraries/render-utils/src/RenderDeferredTask.cpp
@@ -34,39 +34,62 @@
 #include "FramebufferCache.h"
 #include "TextureCache.h"
 #include "ZoneRenderer.h"
+#include "FadeEffect.h"
+#include "RenderUtilsLogging.h"
 
 #include "AmbientOcclusionEffect.h"
 #include "AntialiasingEffect.h"
 #include "ToneMappingEffect.h"
 #include "SubsurfaceScattering.h"
+#include "DrawHaze.h"
+#include "BloomEffect.h"
+#include "HighlightEffect.h"
 
-#include <gpu/StandardShaderLib.h>
-
+#include <sstream>
 
 using namespace render;
-extern void initOverlay3DPipelines(render::ShapePlumber& plumber);
-extern void initDeferredPipelines(render::ShapePlumber& plumber);
+extern void initOverlay3DPipelines(render::ShapePlumber& plumber, bool depthTest = false);
+extern void initDeferredPipelines(render::ShapePlumber& plumber, const render::ShapePipeline::BatchSetter& batchSetter, const render::ShapePipeline::ItemSetter& itemSetter);
+
+RenderDeferredTask::RenderDeferredTask()
+{
+}
+
+void RenderDeferredTask::configure(const Config& config)
+{
+}
+
+const render::Varying RenderDeferredTask::addSelectItemJobs(JobModel& task, const char* selectionName,
+                                                            const render::Varying& metas, 
+                                                            const render::Varying& opaques, 
+                                                            const render::Varying& transparents) {
+    const auto selectMetaInput = SelectItems::Inputs(metas, Varying(), std::string()).asVarying();
+    const auto selectedMetas = task.addJob<SelectItems>("MetaSelection", selectMetaInput, selectionName);
+    const auto selectMetaAndOpaqueInput = SelectItems::Inputs(opaques, selectedMetas, std::string()).asVarying();
+    const auto selectedMetasAndOpaques = task.addJob<SelectItems>("OpaqueSelection", selectMetaAndOpaqueInput, selectionName);
+    const auto selectItemInput = SelectItems::Inputs(transparents, selectedMetasAndOpaques, std::string()).asVarying();
+    return task.addJob<SelectItems>("TransparentSelection", selectItemInput, selectionName);
+}
 
 void RenderDeferredTask::build(JobModel& task, const render::Varying& input, render::Varying& output) {
-    auto items = input.get<Input>();
+    const auto& items = input.get<Input>();
+    auto fadeEffect = DependencyManager::get<FadeEffect>();
 
     // Prepare the ShapePipelines
     ShapePlumberPointer shapePlumber = std::make_shared<ShapePlumber>();
-    initDeferredPipelines(*shapePlumber);
+    initDeferredPipelines(*shapePlumber, fadeEffect->getBatchSetter(), fadeEffect->getItemUniformSetter());
 
     // Extract opaques / transparents / lights / metas / overlays / background
-    const auto opaques = items[RenderFetchCullSortTask::OPAQUE_SHAPE];
-    const auto transparents = items[RenderFetchCullSortTask::TRANSPARENT_SHAPE];
-    const auto lights = items[RenderFetchCullSortTask::LIGHT];
-    const auto metas = items[RenderFetchCullSortTask::META];
-    const auto overlayOpaques = items[RenderFetchCullSortTask::OVERLAY_OPAQUE_SHAPE];
-    const auto overlayTransparents = items[RenderFetchCullSortTask::OVERLAY_TRANSPARENT_SHAPE];
-    const auto background = items[RenderFetchCullSortTask::BACKGROUND];
-    const auto spatialSelection = items[RenderFetchCullSortTask::SPATIAL_SELECTION];
+    const auto& opaques = items.get0()[RenderFetchCullSortTask::OPAQUE_SHAPE];
+    const auto& transparents = items.get0()[RenderFetchCullSortTask::TRANSPARENT_SHAPE];
+    const auto& lights = items.get0()[RenderFetchCullSortTask::LIGHT];
+    const auto& metas = items.get0()[RenderFetchCullSortTask::META];
+    const auto& overlayOpaques = items.get0()[RenderFetchCullSortTask::OVERLAY_OPAQUE_SHAPE];
+    const auto& overlayTransparents = items.get0()[RenderFetchCullSortTask::OVERLAY_TRANSPARENT_SHAPE];
+    //const auto& background = items.get0()[RenderFetchCullSortTask::BACKGROUND];
+    const auto& spatialSelection = items[1];
 
-    // Filter the non antialiaased overlays
-    const int LAYER_NO_AA = 3;
-    const auto nonAAOverlays = task.addJob<FilterLayeredItems>("Filter2DWebOverlays", overlayOpaques, LAYER_NO_AA);
+    fadeEffect->build(task, opaques);
 
     // Prepare deferred, generate the shared Deferred Frame Transform
     const auto deferredFrameTransform = task.addJob<GenerateDeferredFrameTransform>("DeferredFrameTransform");
@@ -77,7 +100,7 @@ void RenderDeferredTask::build(JobModel& task, const render::Varying& input, ren
 
     const auto opaqueRangeTimer = task.addJob<BeginGPURangeTimer>("BeginOpaqueRangeTimer", "DrawOpaques");
 
-    const auto prepareDeferredInputs = PrepareDeferred::Inputs(primaryFramebuffer, lightingModel).hasVarying();
+    const auto prepareDeferredInputs = PrepareDeferred::Inputs(primaryFramebuffer, lightingModel).asVarying();
     const auto prepareDeferredOutputs = task.addJob<PrepareDeferred>("PrepareDeferred", prepareDeferredInputs);
     const auto deferredFramebuffer = prepareDeferredOutputs.getN<PrepareDeferred::Outputs>(0);
     const auto lightingFramebuffer = prepareDeferredOutputs.getN<PrepareDeferred::Outputs>(1);
@@ -86,7 +109,7 @@ void RenderDeferredTask::build(JobModel& task, const render::Varying& input, ren
     task.addJob<PrepareStencil>("PrepareStencil", primaryFramebuffer);
 
     // Render opaque objects in DeferredBuffer
-    const auto opaqueInputs = DrawStateSortDeferred::Inputs(opaques, lightingModel).hasVarying();
+    const auto opaqueInputs = DrawStateSortDeferred::Inputs(opaques, lightingModel).asVarying();
     task.addJob<DrawStateSortDeferred>("DrawOpaqueDeferred", opaqueInputs, shapePlumber);
 
     task.addJob<EndGPURangeTimer>("OpaqueRangeTimer", opaqueRangeTimer);
@@ -95,12 +118,12 @@ void RenderDeferredTask::build(JobModel& task, const render::Varying& input, ren
     // Opaque all rendered
 
     // Linear Depth Pass
-    const auto linearDepthPassInputs = LinearDepthPass::Inputs(deferredFrameTransform, deferredFramebuffer).hasVarying();
+    const auto linearDepthPassInputs = LinearDepthPass::Inputs(deferredFrameTransform, deferredFramebuffer).asVarying();
     const auto linearDepthPassOutputs = task.addJob<LinearDepthPass>("LinearDepth", linearDepthPassInputs);
     const auto linearDepthTarget = linearDepthPassOutputs.getN<LinearDepthPass::Outputs>(0);
     
     // Curvature pass
-    const auto surfaceGeometryPassInputs = SurfaceGeometryPass::Inputs(deferredFrameTransform, deferredFramebuffer, linearDepthTarget).hasVarying();
+    const auto surfaceGeometryPassInputs = SurfaceGeometryPass::Inputs(deferredFrameTransform, deferredFramebuffer, linearDepthTarget).asVarying();
     const auto surfaceGeometryPassOutputs = task.addJob<SurfaceGeometryPass>("SurfaceGeometry", surfaceGeometryPassInputs);
     const auto surfaceGeometryFramebuffer = surfaceGeometryPassOutputs.getN<SurfaceGeometryPass::Outputs>(0);
     const auto curvatureFramebuffer = surfaceGeometryPassOutputs.getN<SurfaceGeometryPass::Outputs>(1);
@@ -111,7 +134,7 @@ void RenderDeferredTask::build(JobModel& task, const render::Varying& input, ren
     const auto scatteringResource = task.addJob<SubsurfaceScattering>("Scattering");
 
     // AO job
-    const auto ambientOcclusionInputs = AmbientOcclusionEffect::Inputs(deferredFrameTransform, deferredFramebuffer, linearDepthTarget).hasVarying();
+    const auto ambientOcclusionInputs = AmbientOcclusionEffect::Inputs(deferredFrameTransform, deferredFramebuffer, linearDepthTarget).asVarying();
     const auto ambientOcclusionOutputs = task.addJob<AmbientOcclusionEffect>("AmbientOcclusion", ambientOcclusionInputs);
     const auto ambientOcclusionFramebuffer = ambientOcclusionOutputs.getN<AmbientOcclusionEffect::Outputs>(0);
     const auto ambientOcclusionUniforms = ambientOcclusionOutputs.getN<AmbientOcclusionEffect::Outputs>(1);
@@ -125,13 +148,15 @@ void RenderDeferredTask::build(JobModel& task, const render::Varying& input, ren
 
     // Light Clustering
     // Create the cluster grid of lights, cpu job for now
-    const auto lightClusteringPassInputs = LightClusteringPass::Inputs(deferredFrameTransform, lightingModel, linearDepthTarget).hasVarying();
+    const auto lightClusteringPassInputs = LightClusteringPass::Inputs(deferredFrameTransform, lightingModel, linearDepthTarget).asVarying();
     const auto lightClusters = task.addJob<LightClusteringPass>("LightClustering", lightClusteringPassInputs);
-    
-    
+ 
+    // Add haze model
+    const auto hazeModel = task.addJob<FetchHazeStage>("HazeModel");
+
     // DeferredBuffer is complete, now let's shade it into the LightingBuffer
     const auto deferredLightingInputs = RenderDeferred::Inputs(deferredFrameTransform, deferredFramebuffer, lightingModel,
-        surfaceGeometryFramebuffer, ambientOcclusionFramebuffer, scatteringResource, lightClusters).hasVarying();
+        surfaceGeometryFramebuffer, ambientOcclusionFramebuffer, scatteringResource, lightClusters, hazeModel).asVarying();
     
     task.addJob<RenderDeferred>("RenderDeferred", deferredLightingInputs);
 
@@ -139,41 +164,71 @@ void RenderDeferredTask::build(JobModel& task, const render::Varying& input, ren
     task.addJob<DrawBackgroundStage>("DrawBackgroundDeferred", lightingModel);
 
     // Render transparent objects forward in LightingBuffer
-    const auto transparentsInputs = DrawDeferred::Inputs(transparents, lightingModel).hasVarying();
+    const auto transparentsInputs = DrawDeferred::Inputs(transparents, lightingModel).asVarying();
     task.addJob<DrawDeferred>("DrawTransparentDeferred", transparentsInputs, shapePlumber);
 
-    // LIght Cluster Grid Debuging job
+    // Light Cluster Grid Debuging job
     {
-        const auto debugLightClustersInputs = DebugLightClusters::Inputs(deferredFrameTransform, deferredFramebuffer, lightingModel, linearDepthTarget, lightClusters).hasVarying();
+        const auto debugLightClustersInputs = DebugLightClusters::Inputs(deferredFrameTransform, deferredFramebuffer, lightingModel, linearDepthTarget, lightClusters).asVarying();
         task.addJob<DebugLightClusters>("DebugLightClusters", debugLightClustersInputs);
     }
-    
+
+    const auto drawHazeInputs = render::Varying(DrawHaze::Inputs(hazeModel, lightingFramebuffer, linearDepthTarget, deferredFrameTransform, lightingFramebuffer));
+    task.addJob<DrawHaze>("DrawHaze", drawHazeInputs);
+
     const auto toneAndPostRangeTimer = task.addJob<BeginGPURangeTimer>("BeginToneAndPostRangeTimer", "PostToneOverlaysAntialiasing");
 
+    // Add bloom
+    const auto bloomInputs = Bloom::Inputs(deferredFrameTransform, lightingFramebuffer).asVarying();
+    task.addJob<Bloom>("Bloom", bloomInputs);
+
     // Lighting Buffer ready for tone mapping
-    const auto toneMappingInputs = render::Varying(ToneMappingDeferred::Inputs(lightingFramebuffer, primaryFramebuffer));
+    const auto toneMappingInputs = ToneMappingDeferred::Inputs(lightingFramebuffer, primaryFramebuffer).asVarying();
     task.addJob<ToneMappingDeferred>("ToneMapping", toneMappingInputs);
 
-    { // DEbug the bounds of the rendered items, still look at the zbuffer
+    const auto outlineRangeTimer = task.addJob<BeginGPURangeTimer>("BeginHighlightRangeTimer", "Highlight");
+    // Select items that need to be outlined
+    const auto selectionBaseName = "contextOverlayHighlightList";
+    const auto selectedItems = addSelectItemJobs(task, selectionBaseName, metas, opaques, transparents);
+
+    const auto outlineInputs = DrawHighlightTask::Inputs(items.get0(), deferredFramebuffer, primaryFramebuffer, deferredFrameTransform).asVarying();
+    task.addJob<DrawHighlightTask>("DrawHighlight", outlineInputs);
+
+    task.addJob<EndGPURangeTimer>("HighlightRangeTimer", outlineRangeTimer);
+
+    { // Debug the bounds of the rendered items, still look at the zbuffer
         task.addJob<DrawBounds>("DrawMetaBounds", metas);
         task.addJob<DrawBounds>("DrawOpaqueBounds", opaques);
         task.addJob<DrawBounds>("DrawTransparentBounds", transparents);
     
         task.addJob<DrawBounds>("DrawLightBounds", lights);
         task.addJob<DrawBounds>("DrawZones", zones);
+        const auto frustums = task.addJob<ExtractFrustums>("ExtractFrustums");
+        const auto viewFrustum = frustums.getN<ExtractFrustums::Output>(ExtractFrustums::VIEW_FRUSTUM);
+        const auto shadowFrustum = frustums.getN<ExtractFrustums::Output>(ExtractFrustums::SHADOW_FRUSTUM);
+        task.addJob<DrawFrustum>("DrawViewFrustum", viewFrustum, glm::vec3(1.0f, 1.0f, 0.0f));
+        task.addJob<DrawFrustum>("DrawShadowFrustum", shadowFrustum, glm::vec3(0.0f, 0.0f, 1.0f));
+
+        // Render.getConfig("RenderMainView.DrawSelectionBounds").enabled = true
+        task.addJob<DrawBounds>("DrawSelectionBounds", selectedItems);
     }
 
-    // Overlays
-    const auto overlayOpaquesInputs = DrawOverlay3D::Inputs(overlayOpaques, lightingModel).hasVarying();
-    const auto overlayTransparentsInputs = DrawOverlay3D::Inputs(overlayTransparents, lightingModel).hasVarying();
-    task.addJob<DrawOverlay3D>("DrawOverlay3DOpaque", overlayOpaquesInputs, true);
-    task.addJob<DrawOverlay3D>("DrawOverlay3DTransparent", overlayTransparentsInputs, false);
+    // Layered Overlays
+    const auto filteredOverlaysOpaque = task.addJob<FilterLayeredItems>("FilterOverlaysLayeredOpaque", overlayOpaques, Item::LAYER_3D_FRONT);
+    const auto filteredOverlaysTransparent = task.addJob<FilterLayeredItems>("FilterOverlaysLayeredTransparent", overlayTransparents, Item::LAYER_3D_FRONT);
+    const auto overlaysInFrontOpaque =  filteredOverlaysOpaque.getN<FilterLayeredItems::Outputs>(0);
+    const auto overlaysInFrontTransparent = filteredOverlaysTransparent.getN<FilterLayeredItems::Outputs>(0);
 
-    { // DEbug the bounds of the rendered OVERLAY items, still look at the zbuffer
-        task.addJob<DrawBounds>("DrawOverlayOpaqueBounds", overlayOpaques);
-        task.addJob<DrawBounds>("DrawOverlayTransparentBounds", overlayTransparents);
+    const auto overlayInFrontOpaquesInputs = DrawOverlay3D::Inputs(overlaysInFrontOpaque, lightingModel).asVarying();
+    const auto overlayInFrontTransparentsInputs = DrawOverlay3D::Inputs(overlaysInFrontTransparent, lightingModel).asVarying();
+    task.addJob<DrawOverlay3D>("DrawOverlayInFrontOpaque", overlayInFrontOpaquesInputs, true);
+    task.addJob<DrawOverlay3D>("DrawOverlayInFrontTransparent", overlayInFrontTransparentsInputs, false);
+
+    { // Debug the bounds of the rendered Overlay items that are marked drawInFront, still look at the zbuffer
+        task.addJob<DrawBounds>("DrawOverlayInFrontOpaqueBounds", overlaysInFrontOpaque);
+        task.addJob<DrawBounds>("DrawOverlayInFrontTransparentBounds", overlaysInFrontTransparent);
     }
-    
+
      // Debugging stages
     {
         // Debugging Deferred buffer job
@@ -181,10 +236,10 @@ void RenderDeferredTask::build(JobModel& task, const render::Varying& input, ren
         task.addJob<DebugDeferredBuffer>("DebugDeferredBuffer", debugFramebuffers);
 
         const auto debugSubsurfaceScatteringInputs = DebugSubsurfaceScattering::Inputs(deferredFrameTransform, deferredFramebuffer, lightingModel,
-            surfaceGeometryFramebuffer, ambientOcclusionFramebuffer, scatteringResource).hasVarying();
+            surfaceGeometryFramebuffer, ambientOcclusionFramebuffer, scatteringResource).asVarying();
         task.addJob<DebugSubsurfaceScattering>("DebugScattering", debugSubsurfaceScatteringInputs);
 
-        const auto debugAmbientOcclusionInputs = DebugAmbientOcclusion::Inputs(deferredFrameTransform, deferredFramebuffer, linearDepthTarget, ambientOcclusionUniforms).hasVarying();
+        const auto debugAmbientOcclusionInputs = DebugAmbientOcclusion::Inputs(deferredFrameTransform, deferredFramebuffer, linearDepthTarget, ambientOcclusionUniforms).asVarying();
         task.addJob<DebugAmbientOcclusion>("DebugAmbientOcclusion", debugAmbientOcclusionInputs);
 
         // Scene Octree Debugging job
@@ -204,13 +259,24 @@ void RenderDeferredTask::build(JobModel& task, const render::Varying& input, ren
         task.addJob<DebugZoneLighting>("DrawZoneStack", deferredFrameTransform);
     }
 
-
     // AA job to be revisited
     task.addJob<Antialiasing>("Antialiasing", primaryFramebuffer);
 
-    // Draw 2DWeb non AA
-    const auto nonAAOverlaysInputs = DrawOverlay3D::Inputs(nonAAOverlays, lightingModel).hasVarying();
-    task.addJob<DrawOverlay3D>("Draw2DWebSurfaces", nonAAOverlaysInputs, false);
+    // Composite the HUD and HUD overlays
+    task.addJob<CompositeHUD>("HUD");
+
+    const auto overlaysHUDOpaque = filteredOverlaysOpaque.getN<FilterLayeredItems::Outputs>(1);
+    const auto overlaysHUDTransparent = filteredOverlaysTransparent.getN<FilterLayeredItems::Outputs>(1);
+
+    const auto overlayHUDOpaquesInputs = DrawOverlay3D::Inputs(overlaysHUDOpaque, lightingModel).asVarying();
+    const auto overlayHUDTransparentsInputs = DrawOverlay3D::Inputs(overlaysHUDTransparent, lightingModel).asVarying();
+    task.addJob<DrawOverlay3D>("DrawOverlayHUDOpaque", overlayHUDOpaquesInputs, true);
+    task.addJob<DrawOverlay3D>("DrawOverlayHUDTransparent", overlayHUDTransparentsInputs, false);
+
+    { // Debug the bounds of the rendered Overlay items that are marked drawHUDLayer, still look at the zbuffer
+        task.addJob<DrawBounds>("DrawOverlayHUDOpaqueBounds", overlaysHUDOpaque);
+        task.addJob<DrawBounds>("DrawOverlayHUDTransparentBounds", overlaysHUDTransparent);
+    }
 
     task.addJob<EndGPURangeTimer>("ToneAndPostRangeTimer", toneAndPostRangeTimer);
 
@@ -269,6 +335,7 @@ void DrawDeferred::run(const RenderContextPointer& renderContext, const Inputs&
         if (lightingModel->isWireframeEnabled()) {
             keyBuilder.withWireframe();
         }
+
         ShapeKey globalKey = keyBuilder.build();
         args->_globalShapeKey = globalKey._flags.to_ulong();
 
@@ -310,11 +377,12 @@ void DrawStateSortDeferred::run(const RenderContextPointer& renderContext, const
         // Setup lighting model for all items;
         batch.setUniformBuffer(render::ShapePipeline::Slot::LIGHTING_MODEL, lightingModel->getParametersBuffer());
 
-        // From the lighting model define a global shapKey ORED with individiual keys
+        // From the lighting model define a global shapeKey ORED with individiual keys
         ShapeKey::Builder keyBuilder;
         if (lightingModel->isWireframeEnabled()) {
             keyBuilder.withWireframe();
         }
+
         ShapeKey globalKey = keyBuilder.build();
         args->_globalShapeKey = globalKey._flags.to_ulong();
 
@@ -357,7 +425,7 @@ void DrawOverlay3D::run(const RenderContextPointer& renderContext, const Inputs&
         if (_opaquePass) {
             gpu::doInBatch(args->_context, [&](gpu::Batch& batch){
                 batch.enableStereo(false);
-                batch.clearFramebuffer(gpu::Framebuffer::BUFFER_DEPTH, glm::vec4(), 1.f, 0, true);
+                batch.clearFramebuffer(gpu::Framebuffer::BUFFER_DEPTH, glm::vec4(), 1.f, 0, false);
             });
         }
 
@@ -384,6 +452,23 @@ void DrawOverlay3D::run(const RenderContextPointer& renderContext, const Inputs&
     }
 }
 
+void CompositeHUD::run(const RenderContextPointer& renderContext) {
+    assert(renderContext->args);
+    assert(renderContext->args->_context);
+
+    // We do not want to render HUD elements in secondary camera
+    if (renderContext->args->_renderMode == RenderArgs::RenderMode::SECONDARY_CAMERA_RENDER_MODE) {
+        return;
+    }
+
+    // Grab the HUD texture
+    gpu::doInBatch(renderContext->args->_context, [&](gpu::Batch& batch) {
+        if (renderContext->args->_hudOperator) {
+            renderContext->args->_hudOperator(batch, renderContext->args->_hudTexture, renderContext->args->_renderMode == RenderArgs::RenderMode::MIRROR_RENDER_MODE);
+        }
+    });
+}
+
 void Blit::run(const RenderContextPointer& renderContext, const gpu::FramebufferPointer& srcFramebuffer) {
     assert(renderContext->args);
     assert(renderContext->args->_context);
@@ -392,6 +477,7 @@ void Blit::run(const RenderContextPointer& renderContext, const gpu::Framebuffer
     auto blitFbo = renderArgs->_blitFramebuffer;
 
     if (!blitFbo) {
+        qCWarning(renderutils) << "Blit::run - no blit frame buffer.";
         return;
     }
 
@@ -406,7 +492,7 @@ void Blit::run(const RenderContextPointer& renderContext, const gpu::Framebuffer
         batch.setFramebuffer(blitFbo);
 
         if (renderArgs->_renderMode == RenderArgs::MIRROR_RENDER_MODE) {
-            if (renderArgs->_context->isStereo()) {
+            if (renderArgs->isStereo()) {
                 gpu::Vec4i srcRectLeft;
                 srcRectLeft.z = width / 2;
                 srcRectLeft.w = height;
@@ -454,3 +540,32 @@ void Blit::run(const RenderContextPointer& renderContext, const gpu::Framebuffer
     });
 }
 
+void ExtractFrustums::run(const render::RenderContextPointer& renderContext, Output& output) {
+    assert(renderContext->args);
+    assert(renderContext->args->_context);
+
+    RenderArgs* args = renderContext->args;
+
+    // Return view frustum
+    auto& viewFrustum = output[VIEW_FRUSTUM].edit<ViewFrustumPointer>();
+    if (!viewFrustum) {
+        viewFrustum = std::make_shared<ViewFrustum>(args->getViewFrustum());
+    } else {
+        *viewFrustum = args->getViewFrustum();
+    }
+
+    // Return shadow frustum
+    auto& shadowFrustum = output[SHADOW_FRUSTUM].edit<ViewFrustumPointer>();
+    auto lightStage = args->_scene->getStage<LightStage>(LightStage::getName());
+    if (lightStage) {
+        auto globalShadow = lightStage->getCurrentKeyShadow();
+
+        if (globalShadow) {
+            shadowFrustum = globalShadow->getFrustum();
+        } else {
+            shadowFrustum.reset();
+        }
+    } else {
+        shadowFrustum.reset();
+    }
+}
diff --git a/libraries/render-utils/src/RenderDeferredTask.h b/libraries/render-utils/src/RenderDeferredTask.h
index fd7c5eb23b..40ae503fb7 100644
--- a/libraries/render-utils/src/RenderDeferredTask.h
+++ b/libraries/render-utils/src/RenderDeferredTask.h
@@ -44,12 +44,11 @@ public:
 protected:
 };
 
-
 class DrawConfig : public render::Job::Config {
     Q_OBJECT
     Q_PROPERTY(int numDrawn READ getNumDrawn NOTIFY newStats)
-
     Q_PROPERTY(int maxDrawn MEMBER maxDrawn NOTIFY dirty)
+
 public:
 
     int getNumDrawn() { return _numDrawn; }
@@ -153,7 +152,15 @@ public:
 protected:
     render::ShapePlumberPointer _shapePlumber;
     int _maxDrawn; // initialized by Config
-    bool _opaquePass{ true };
+    bool _opaquePass { true };
+};
+
+class CompositeHUD {
+public:
+    using JobModel = render::Job::Model<CompositeHUD>;
+
+    CompositeHUD() {}
+    void run(const render::RenderContextPointer& renderContext);
 };
 
 class Blit {
@@ -163,14 +170,54 @@ public:
     void run(const render::RenderContextPointer& renderContext, const gpu::FramebufferPointer& srcFramebuffer);
 };
 
+class ExtractFrustums {
+public:
+
+    enum Frustum {
+        VIEW_FRUSTUM,
+        SHADOW_FRUSTUM,
+
+        FRUSTUM_COUNT
+    };
+
+    using Output = render::VaryingArray<ViewFrustumPointer, FRUSTUM_COUNT>;
+    using JobModel = render::Job::ModelO<ExtractFrustums, Output>;
+
+    void run(const render::RenderContextPointer& renderContext, Output& output);
+};
+
+class RenderDeferredTaskConfig : public render::Task::Config {
+    Q_OBJECT
+        Q_PROPERTY(float fadeScale MEMBER fadeScale NOTIFY dirty)
+        Q_PROPERTY(float fadeDuration MEMBER fadeDuration NOTIFY dirty)
+        Q_PROPERTY(bool debugFade MEMBER debugFade NOTIFY dirty)
+        Q_PROPERTY(float debugFadePercent MEMBER debugFadePercent NOTIFY dirty)
+public:
+    float fadeScale{ 0.5f };
+    float fadeDuration{ 3.0f };
+    float debugFadePercent{ 0.f };
+    bool debugFade{ false };
+
+signals:
+    void dirty();
+
+};
+
 class RenderDeferredTask {
 public:
     using Input = RenderFetchCullSortTask::Output;
-    using JobModel = render::Task::ModelI<RenderDeferredTask, Input>;
+    using Config = RenderDeferredTaskConfig;
+    using JobModel = render::Task::ModelI<RenderDeferredTask, Input, Config>;
 
-    RenderDeferredTask() {}
+    RenderDeferredTask();
 
+    void configure(const Config& config);
     void build(JobModel& task, const render::Varying& inputs, render::Varying& outputs);
+
+private:
+
+    static const render::Varying addSelectItemJobs(JobModel& task, const char* selectionName, 
+                                                   const render::Varying& metas, const render::Varying& opaques, const render::Varying& transparents);
 };
 
 #endif // hifi_RenderDeferredTask_h
diff --git a/libraries/render-utils/src/RenderForwardTask.cpp b/libraries/render-utils/src/RenderForwardTask.cpp
index a77d741aa5..c83251c605 100755
--- a/libraries/render-utils/src/RenderForwardTask.cpp
+++ b/libraries/render-utils/src/RenderForwardTask.cpp
@@ -17,6 +17,7 @@
 #include <PathUtils.h>
 #include <ViewFrustum.h>
 #include <gpu/Context.h>
+#include "StencilMaskPass.h"
 
 #include "FramebufferCache.h"
 #include "TextureCache.h"
@@ -36,14 +37,14 @@ void RenderForwardTask::build(JobModel& task, const render::Varying& input, rend
     initForwardPipelines(*shapePlumber);
 
     // Extract opaques / transparents / lights / metas / overlays / background
-    const auto opaques = items[RenderFetchCullSortTask::OPAQUE_SHAPE];
-    const auto transparents = items[RenderFetchCullSortTask::TRANSPARENT_SHAPE];
-    const auto lights = items[RenderFetchCullSortTask::LIGHT];
-    const auto metas = items[RenderFetchCullSortTask::META];
-    const auto overlayOpaques = items[RenderFetchCullSortTask::OVERLAY_OPAQUE_SHAPE];
-    const auto overlayTransparents = items[RenderFetchCullSortTask::OVERLAY_TRANSPARENT_SHAPE];
-    const auto background = items[RenderFetchCullSortTask::BACKGROUND];
-    const auto spatialSelection = items[RenderFetchCullSortTask::SPATIAL_SELECTION];
+    const auto& opaques = items.get0()[RenderFetchCullSortTask::OPAQUE_SHAPE];
+//    const auto& transparents = items.get0()[RenderFetchCullSortTask::TRANSPARENT_SHAPE];
+//    const auto& lights = items.get0()[RenderFetchCullSortTask::LIGHT];
+//    const auto& metas = items.get0()[RenderFetchCullSortTask::META];
+//    const auto& overlayOpaques = items.get0()[RenderFetchCullSortTask::OVERLAY_OPAQUE_SHAPE];
+//    const auto& overlayTransparents = items.get0()[RenderFetchCullSortTask::OVERLAY_TRANSPARENT_SHAPE];
+    const auto& background = items.get0()[RenderFetchCullSortTask::BACKGROUND];
+//    const auto& spatialSelection = items[1];
 
     const auto framebuffer = task.addJob<PrepareFramebuffer>("PrepareFramebuffer");
 
@@ -93,7 +94,7 @@ void PrepareFramebuffer::run(const RenderContextPointer& renderContext,
             gpu::Framebuffer::BUFFER_COLOR0 |
             gpu::Framebuffer::BUFFER_DEPTH |
             gpu::Framebuffer::BUFFER_STENCIL,
-            vec4(vec3(0), 1), 1.0, 0.0, true);
+            vec4(vec3(0), 1), 1.0, 0, true);
     });
 
     framebuffer = _framebuffer;
@@ -130,11 +131,7 @@ const gpu::PipelinePointer Stencil::getPipeline() {
 
         auto state = std::make_shared<gpu::State>();
         state->setDepthTest(true, false, gpu::LESS_EQUAL);
-        const gpu::int8 STENCIL_OPAQUE = 1;
-        state->setStencilTest(true, 0xFF, gpu::State::StencilTest(STENCIL_OPAQUE, 0xFF, gpu::ALWAYS,
-                    gpu::State::STENCIL_OP_REPLACE,
-                    gpu::State::STENCIL_OP_REPLACE,
-                    gpu::State::STENCIL_OP_KEEP));
+        PrepareStencil::drawBackground(*state);
 
         _stencilPipeline = gpu::Pipeline::create(program, state);
     }
diff --git a/libraries/render-utils/src/RenderPipelines.cpp b/libraries/render-utils/src/RenderPipelines.cpp
index 6c3a58b7e5..7f644add72 100644
--- a/libraries/render-utils/src/RenderPipelines.cpp
+++ b/libraries/render-utils/src/RenderPipelines.cpp
@@ -21,27 +21,44 @@
 #include "render/DrawTask.h"
 
 #include "model_vert.h"
-#include "model_shadow_vert.h"
 #include "model_normal_map_vert.h"
 #include "model_lightmap_vert.h"
 #include "model_lightmap_normal_map_vert.h"
 #include "skin_model_vert.h"
-#include "skin_model_shadow_vert.h"
 #include "skin_model_normal_map_vert.h"
 
+#include "model_lightmap_fade_vert.h"
+#include "model_lightmap_normal_map_fade_vert.h"
+#include "skin_model_fade_vert.h"
+#include "skin_model_normal_map_fade_vert.h"
+
 #include "simple_vert.h"
 #include "simple_textured_frag.h"
 #include "simple_textured_unlit_frag.h"
 #include "simple_transparent_textured_frag.h"
 #include "simple_transparent_textured_unlit_frag.h"
 
+#include "simple_fade_vert.h"
+#include "simple_textured_fade_frag.h"
+#include "simple_textured_unlit_fade_frag.h"
+#include "simple_transparent_textured_fade_frag.h"
+#include "simple_transparent_textured_unlit_fade_frag.h"
+
 #include "model_frag.h"
 #include "model_unlit_frag.h"
-#include "model_shadow_frag.h"
 #include "model_normal_map_frag.h"
 #include "model_normal_specular_map_frag.h"
 #include "model_specular_map_frag.h"
 
+#include "model_fade_vert.h"
+#include "model_normal_map_fade_vert.h"
+
+#include "model_fade_frag.h"
+#include "model_unlit_fade_frag.h"
+#include "model_normal_map_fade_frag.h"
+#include "model_normal_specular_map_fade_frag.h"
+#include "model_specular_map_fade_frag.h"
+
 #include "forward_model_frag.h"
 #include "forward_model_unlit_frag.h"
 #include "forward_model_normal_map_frag.h"
@@ -55,6 +72,13 @@
 #include "model_translucent_frag.h"
 #include "model_translucent_unlit_frag.h"
 
+#include "model_lightmap_fade_frag.h"
+#include "model_lightmap_normal_map_fade_frag.h"
+#include "model_lightmap_normal_specular_map_fade_frag.h"
+#include "model_lightmap_specular_map_fade_frag.h"
+#include "model_translucent_fade_frag.h"
+#include "model_translucent_unlit_fade_frag.h"
+
 #include "overlay3D_vert.h"
 #include "overlay3D_frag.h"
 #include "overlay3D_model_frag.h"
@@ -65,21 +89,34 @@
 #include "overlay3D_model_unlit_frag.h"
 #include "overlay3D_model_translucent_unlit_frag.h"
 
+#include "model_shadow_vert.h"
+#include "skin_model_shadow_vert.h"
+
+#include "model_shadow_frag.h"
+#include "skin_model_shadow_frag.h"
+
+#include "model_shadow_fade_vert.h"
+#include "skin_model_shadow_fade_vert.h"
+
+#include "model_shadow_fade_frag.h"
+#include "skin_model_shadow_fade_frag.h"
 
 using namespace render;
 using namespace std::placeholders;
 
-void initOverlay3DPipelines(ShapePlumber& plumber);
-void initDeferredPipelines(ShapePlumber& plumber);
+void initOverlay3DPipelines(ShapePlumber& plumber, bool depthTest = false);
+void initDeferredPipelines(ShapePlumber& plumber, const render::ShapePipeline::BatchSetter& batchSetter, const render::ShapePipeline::ItemSetter& itemSetter);
 void initForwardPipelines(ShapePlumber& plumber);
+void initZPassPipelines(ShapePlumber& plumber, gpu::StatePointer state);
 
 void addPlumberPipeline(ShapePlumber& plumber,
-        const ShapeKey& key, const gpu::ShaderPointer& vertex, const gpu::ShaderPointer& pixel);
+        const ShapeKey& key, const gpu::ShaderPointer& vertex, const gpu::ShaderPointer& pixel,
+        const render::ShapePipeline::BatchSetter& batchSetter, const render::ShapePipeline::ItemSetter& itemSetter);
 
 void batchSetter(const ShapePipeline& pipeline, gpu::Batch& batch, RenderArgs* args);
 void lightBatchSetter(const ShapePipeline& pipeline, gpu::Batch& batch, RenderArgs* args);
 
-void initOverlay3DPipelines(ShapePlumber& plumber) {
+void initOverlay3DPipelines(ShapePlumber& plumber, bool depthTest) {
     auto vertex = gpu::Shader::createVertex(std::string(overlay3D_vert));
     auto vertexModel = gpu::Shader::createVertex(std::string(model_vert));
     auto pixel = gpu::Shader::createPixel(std::string(overlay3D_frag));
@@ -106,7 +143,11 @@ void initOverlay3DPipelines(ShapePlumber& plumber) {
         bool isOpaque = (i & 4);
 
         auto state = std::make_shared<gpu::State>();
-        state->setDepthTest(false);
+        if (depthTest) {
+            state->setDepthTest(true, true, gpu::LESS_EQUAL);
+        } else {
+            state->setDepthTest(false);
+        }
         state->setCullMode(isCulled ? gpu::State::CULL_BACK : gpu::State::CULL_NONE);
         if (isBiased) {
             state->setDepthBias(1.0f);
@@ -140,7 +181,7 @@ void initOverlay3DPipelines(ShapePlumber& plumber) {
     }
 }
 
-void initDeferredPipelines(render::ShapePlumber& plumber) {
+void initDeferredPipelines(render::ShapePlumber& plumber, const render::ShapePipeline::BatchSetter& batchSetter, const render::ShapePipeline::ItemSetter& itemSetter) {
     // Vertex shaders
     auto simpleVertex = gpu::Shader::createVertex(std::string(simple_vert));
     auto modelVertex = gpu::Shader::createVertex(std::string(model_vert));
@@ -151,6 +192,16 @@ void initDeferredPipelines(render::ShapePlumber& plumber) {
     auto skinModelVertex = gpu::Shader::createVertex(std::string(skin_model_vert));
     auto skinModelNormalMapVertex = gpu::Shader::createVertex(std::string(skin_model_normal_map_vert));
     auto skinModelShadowVertex = gpu::Shader::createVertex(std::string(skin_model_shadow_vert));
+    auto modelLightmapFadeVertex = gpu::Shader::createVertex(std::string(model_lightmap_fade_vert));
+    auto modelLightmapNormalMapFadeVertex = gpu::Shader::createVertex(std::string(model_lightmap_normal_map_fade_vert));
+    auto skinModelFadeVertex = gpu::Shader::createVertex(std::string(skin_model_fade_vert));
+    auto skinModelNormalMapFadeVertex = gpu::Shader::createVertex(std::string(skin_model_normal_map_fade_vert));
+
+    auto modelFadeVertex = gpu::Shader::createVertex(std::string(model_fade_vert));
+    auto modelNormalMapFadeVertex = gpu::Shader::createVertex(std::string(model_normal_map_fade_vert));
+    auto simpleFadeVertex = gpu::Shader::createVertex(std::string(simple_fade_vert));
+    auto modelShadowFadeVertex = gpu::Shader::createVertex(std::string(model_shadow_fade_vert));
+    auto skinModelShadowFadeVertex = gpu::Shader::createVertex(std::string(skin_model_shadow_fade_vert));
 
     // Pixel shaders
     auto simplePixel = gpu::Shader::createPixel(std::string(simple_textured_frag));
@@ -169,104 +220,220 @@ void initDeferredPipelines(render::ShapePlumber& plumber) {
     auto modelLightmapNormalMapPixel = gpu::Shader::createPixel(std::string(model_lightmap_normal_map_frag));
     auto modelLightmapSpecularMapPixel = gpu::Shader::createPixel(std::string(model_lightmap_specular_map_frag));
     auto modelLightmapNormalSpecularMapPixel = gpu::Shader::createPixel(std::string(model_lightmap_normal_specular_map_frag));
+    auto modelLightmapFadePixel = gpu::Shader::createPixel(std::string(model_lightmap_fade_frag));
+    auto modelLightmapNormalMapFadePixel = gpu::Shader::createPixel(std::string(model_lightmap_normal_map_fade_frag));
+    auto modelLightmapSpecularMapFadePixel = gpu::Shader::createPixel(std::string(model_lightmap_specular_map_fade_frag));
+    auto modelLightmapNormalSpecularMapFadePixel = gpu::Shader::createPixel(std::string(model_lightmap_normal_specular_map_fade_frag));
+
+    auto modelFadePixel = gpu::Shader::createPixel(std::string(model_fade_frag));
+    auto modelUnlitFadePixel = gpu::Shader::createPixel(std::string(model_unlit_fade_frag));
+    auto modelNormalMapFadePixel = gpu::Shader::createPixel(std::string(model_normal_map_fade_frag));
+    auto modelSpecularMapFadePixel = gpu::Shader::createPixel(std::string(model_specular_map_fade_frag));
+    auto modelNormalSpecularMapFadePixel = gpu::Shader::createPixel(std::string(model_normal_specular_map_fade_frag));
+    auto modelShadowFadePixel = gpu::Shader::createPixel(std::string(model_shadow_fade_frag));
+    auto modelTranslucentFadePixel = gpu::Shader::createPixel(std::string(model_translucent_fade_frag));
+    auto modelTranslucentUnlitFadePixel = gpu::Shader::createPixel(std::string(model_translucent_unlit_fade_frag));
+    auto simpleFadePixel = gpu::Shader::createPixel(std::string(simple_textured_fade_frag));
+    auto simpleUnlitFadePixel = gpu::Shader::createPixel(std::string(simple_textured_unlit_fade_frag));
+    auto simpleTranslucentFadePixel = gpu::Shader::createPixel(std::string(simple_transparent_textured_fade_frag));
+    auto simpleTranslucentUnlitFadePixel = gpu::Shader::createPixel(std::string(simple_transparent_textured_unlit_fade_frag));
 
     using Key = render::ShapeKey;
-    auto addPipeline = std::bind(&addPlumberPipeline, std::ref(plumber), _1, _2, _3);
+    auto addPipeline = std::bind(&addPlumberPipeline, std::ref(plumber), _1, _2, _3, _4, _5);
     // TODO: Refactor this to use a filter
     // Opaques
     addPipeline(
         Key::Builder().withMaterial(),
-        modelVertex, modelPixel);
+        modelVertex, modelPixel, nullptr, nullptr);
     addPipeline(
         Key::Builder(),
-        simpleVertex, simplePixel);
+        simpleVertex, simplePixel, nullptr, nullptr);
     addPipeline(
         Key::Builder().withMaterial().withUnlit(),
-        modelVertex, modelUnlitPixel);
+        modelVertex, modelUnlitPixel, nullptr, nullptr);
     addPipeline(
         Key::Builder().withUnlit(),
-        simpleVertex, simpleUnlitPixel);
+        simpleVertex, simpleUnlitPixel, nullptr, nullptr);
     addPipeline(
         Key::Builder().withMaterial().withTangents(),
-        modelNormalMapVertex, modelNormalMapPixel);
+        modelNormalMapVertex, modelNormalMapPixel, nullptr, nullptr);
     addPipeline(
         Key::Builder().withMaterial().withSpecular(),
-        modelVertex, modelSpecularMapPixel);
+        modelVertex, modelSpecularMapPixel, nullptr, nullptr);
     addPipeline(
         Key::Builder().withMaterial().withTangents().withSpecular(),
-        modelNormalMapVertex, modelNormalSpecularMapPixel);
+        modelNormalMapVertex, modelNormalSpecularMapPixel, nullptr, nullptr);
+    // Same thing but with Fade on
+    addPipeline(
+        Key::Builder().withMaterial().withFade(),
+        modelFadeVertex, modelFadePixel, batchSetter, itemSetter);
+    addPipeline(
+        Key::Builder().withFade(),
+        simpleFadeVertex, simpleFadePixel, batchSetter, itemSetter);
+    addPipeline(
+        Key::Builder().withMaterial().withUnlit().withFade(),
+        modelFadeVertex, modelUnlitFadePixel, batchSetter, itemSetter);
+    addPipeline(
+        Key::Builder().withUnlit().withFade(),
+        simpleFadeVertex, simpleUnlitFadePixel, batchSetter, itemSetter);
+    addPipeline(
+        Key::Builder().withMaterial().withTangents().withFade(),
+        modelNormalMapFadeVertex, modelNormalMapFadePixel, batchSetter, itemSetter);
+    addPipeline(
+        Key::Builder().withMaterial().withSpecular().withFade(),
+        modelFadeVertex, modelSpecularMapFadePixel, batchSetter, itemSetter);
+    addPipeline(
+        Key::Builder().withMaterial().withTangents().withSpecular().withFade(),
+        modelNormalMapFadeVertex, modelNormalSpecularMapFadePixel, batchSetter, itemSetter);
+
     // Translucents
     addPipeline(
         Key::Builder().withMaterial().withTranslucent(),
-        modelVertex, modelTranslucentPixel);
+        modelVertex, modelTranslucentPixel, nullptr, nullptr);
     addPipeline(
         Key::Builder().withTranslucent(),
-        simpleVertex, simpleTranslucentPixel);
+        simpleVertex, simpleTranslucentPixel, nullptr, nullptr);
     addPipeline(
         Key::Builder().withMaterial().withTranslucent().withUnlit(),
-        modelVertex, modelTranslucentUnlitPixel);
+        modelVertex, modelTranslucentUnlitPixel, nullptr, nullptr);
     addPipeline(
         Key::Builder().withTranslucent().withUnlit(),
-        simpleVertex, simpleTranslucentUnlitPixel);
+        simpleVertex, simpleTranslucentUnlitPixel, nullptr, nullptr);
     addPipeline(
         Key::Builder().withMaterial().withTranslucent().withTangents(),
-        modelNormalMapVertex, modelTranslucentPixel);
+        modelNormalMapVertex, modelTranslucentPixel, nullptr, nullptr);
     addPipeline(
         Key::Builder().withMaterial().withTranslucent().withSpecular(),
-        modelVertex, modelTranslucentPixel);
+        modelVertex, modelTranslucentPixel, nullptr, nullptr);
     addPipeline(
         Key::Builder().withMaterial().withTranslucent().withTangents().withSpecular(),
-        modelNormalMapVertex, modelTranslucentPixel);
+        modelNormalMapVertex, modelTranslucentPixel, nullptr, nullptr);
     addPipeline(
         // FIXME: Ignore lightmap for translucents meshpart
         Key::Builder().withMaterial().withTranslucent().withLightmap(),
-        modelVertex, modelTranslucentPixel);
+        modelVertex, modelTranslucentPixel, nullptr, nullptr);
+    // Same thing but with Fade on
+    addPipeline(
+        Key::Builder().withMaterial().withTranslucent().withFade(),
+        modelFadeVertex, modelTranslucentFadePixel, batchSetter, itemSetter);
+    addPipeline(
+        Key::Builder().withTranslucent().withFade(),
+        simpleFadeVertex, simpleTranslucentFadePixel, batchSetter, itemSetter);
+    addPipeline(
+        Key::Builder().withMaterial().withTranslucent().withUnlit().withFade(),
+        modelFadeVertex, modelTranslucentUnlitFadePixel, batchSetter, itemSetter);
+    addPipeline(
+        Key::Builder().withTranslucent().withUnlit().withFade(),
+        simpleFadeVertex, simpleTranslucentUnlitFadePixel, batchSetter, itemSetter);
+    addPipeline(
+        Key::Builder().withMaterial().withTranslucent().withTangents().withFade(),
+        modelNormalMapFadeVertex, modelTranslucentFadePixel, batchSetter, itemSetter);
+    addPipeline(
+        Key::Builder().withMaterial().withTranslucent().withSpecular().withFade(),
+        modelFadeVertex, modelTranslucentFadePixel, batchSetter, itemSetter);
+    addPipeline(
+        Key::Builder().withMaterial().withTranslucent().withTangents().withSpecular().withFade(),
+        modelNormalMapFadeVertex, modelTranslucentFadePixel, batchSetter, itemSetter);
+    addPipeline(
+        // FIXME: Ignore lightmap for translucents meshpart
+        Key::Builder().withMaterial().withTranslucent().withLightmap().withFade(),
+        modelFadeVertex, modelTranslucentFadePixel, batchSetter, itemSetter);
+
     // Lightmapped
     addPipeline(
         Key::Builder().withMaterial().withLightmap(),
-        modelLightmapVertex, modelLightmapPixel);
+        modelLightmapVertex, modelLightmapPixel, nullptr, nullptr);
     addPipeline(
         Key::Builder().withMaterial().withLightmap().withTangents(),
-        modelLightmapNormalMapVertex, modelLightmapNormalMapPixel);
+        modelLightmapNormalMapVertex, modelLightmapNormalMapPixel, nullptr, nullptr);
     addPipeline(
         Key::Builder().withMaterial().withLightmap().withSpecular(),
-        modelLightmapVertex, modelLightmapSpecularMapPixel);
+        modelLightmapVertex, modelLightmapSpecularMapPixel, nullptr, nullptr);
     addPipeline(
         Key::Builder().withMaterial().withLightmap().withTangents().withSpecular(),
-        modelLightmapNormalMapVertex, modelLightmapNormalSpecularMapPixel);
+        modelLightmapNormalMapVertex, modelLightmapNormalSpecularMapPixel, nullptr, nullptr);
+    // Same thing but with Fade on
+    addPipeline(
+        Key::Builder().withMaterial().withLightmap().withFade(),
+        modelLightmapFadeVertex, modelLightmapFadePixel, batchSetter, itemSetter);
+    addPipeline(
+        Key::Builder().withMaterial().withLightmap().withTangents().withFade(),
+        modelLightmapNormalMapFadeVertex, modelLightmapNormalMapFadePixel, batchSetter, itemSetter);
+    addPipeline(
+        Key::Builder().withMaterial().withLightmap().withSpecular().withFade(),
+        modelLightmapFadeVertex, modelLightmapSpecularMapFadePixel, batchSetter, itemSetter);
+    addPipeline(
+        Key::Builder().withMaterial().withLightmap().withTangents().withSpecular().withFade(),
+        modelLightmapNormalMapFadeVertex, modelLightmapNormalSpecularMapFadePixel, batchSetter, itemSetter);
+
     // Skinned
     addPipeline(
         Key::Builder().withMaterial().withSkinned(),
-        skinModelVertex, modelPixel);
+        skinModelVertex, modelPixel, nullptr, nullptr);
     addPipeline(
         Key::Builder().withMaterial().withSkinned().withTangents(),
-        skinModelNormalMapVertex, modelNormalMapPixel);
+        skinModelNormalMapVertex, modelNormalMapPixel, nullptr, nullptr);
     addPipeline(
         Key::Builder().withMaterial().withSkinned().withSpecular(),
-        skinModelVertex, modelSpecularMapPixel);
+        skinModelVertex, modelSpecularMapPixel, nullptr, nullptr);
     addPipeline(
         Key::Builder().withMaterial().withSkinned().withTangents().withSpecular(),
-        skinModelNormalMapVertex, modelNormalSpecularMapPixel);
+        skinModelNormalMapVertex, modelNormalSpecularMapPixel, nullptr, nullptr);
+    // Same thing but with Fade on
+    addPipeline(
+        Key::Builder().withMaterial().withSkinned().withFade(),
+        skinModelFadeVertex, modelFadePixel, batchSetter, itemSetter);
+    addPipeline(
+        Key::Builder().withMaterial().withSkinned().withTangents().withFade(),
+        skinModelNormalMapFadeVertex, modelNormalMapFadePixel, batchSetter, itemSetter);
+    addPipeline(
+        Key::Builder().withMaterial().withSkinned().withSpecular().withFade(),
+        skinModelFadeVertex, modelSpecularMapFadePixel, batchSetter, itemSetter);
+    addPipeline(
+        Key::Builder().withMaterial().withSkinned().withTangents().withSpecular().withFade(),
+        skinModelNormalMapFadeVertex, modelNormalSpecularMapFadePixel, batchSetter, itemSetter);
+
     // Skinned and Translucent
     addPipeline(
         Key::Builder().withMaterial().withSkinned().withTranslucent(),
-        skinModelVertex, modelTranslucentPixel);
+        skinModelVertex, modelTranslucentPixel, nullptr, nullptr);
     addPipeline(
         Key::Builder().withMaterial().withSkinned().withTranslucent().withTangents(),
-        skinModelNormalMapVertex, modelTranslucentPixel);
+        skinModelNormalMapVertex, modelTranslucentPixel, nullptr, nullptr);
     addPipeline(
         Key::Builder().withMaterial().withSkinned().withTranslucent().withSpecular(),
-        skinModelVertex, modelTranslucentPixel);
+        skinModelVertex, modelTranslucentPixel, nullptr, nullptr);
     addPipeline(
         Key::Builder().withMaterial().withSkinned().withTranslucent().withTangents().withSpecular(),
-        skinModelNormalMapVertex, modelTranslucentPixel);
+        skinModelNormalMapVertex, modelTranslucentPixel, nullptr, nullptr);
+    // Same thing but with Fade on
+    addPipeline(
+        Key::Builder().withMaterial().withSkinned().withTranslucent().withFade(),
+        skinModelFadeVertex, modelTranslucentFadePixel, batchSetter, itemSetter);
+    addPipeline(
+        Key::Builder().withMaterial().withSkinned().withTranslucent().withTangents().withFade(),
+        skinModelNormalMapFadeVertex, modelTranslucentFadePixel, batchSetter, itemSetter);
+    addPipeline(
+        Key::Builder().withMaterial().withSkinned().withTranslucent().withSpecular().withFade(),
+        skinModelFadeVertex, modelTranslucentFadePixel, batchSetter, itemSetter);
+    addPipeline(
+        Key::Builder().withMaterial().withSkinned().withTranslucent().withTangents().withSpecular().withFade(),
+        skinModelNormalMapFadeVertex, modelTranslucentFadePixel, batchSetter, itemSetter);
+
     // Depth-only
     addPipeline(
         Key::Builder().withDepthOnly(),
-        modelShadowVertex, modelShadowPixel);
+        modelShadowVertex, modelShadowPixel, nullptr, nullptr);
     addPipeline(
         Key::Builder().withSkinned().withDepthOnly(),
-        skinModelShadowVertex, modelShadowPixel);
+        skinModelShadowVertex, modelShadowPixel, nullptr, nullptr);
+    // Same thing but with Fade on
+    addPipeline(
+        Key::Builder().withDepthOnly().withFade(),
+        modelShadowFadeVertex, modelShadowFadePixel, batchSetter, itemSetter);
+    addPipeline(
+        Key::Builder().withSkinned().withDepthOnly().withFade(),
+        skinModelShadowFadeVertex, modelShadowFadePixel, batchSetter, itemSetter);
 }
 
 void initForwardPipelines(render::ShapePlumber& plumber) {
@@ -284,7 +451,7 @@ void initForwardPipelines(render::ShapePlumber& plumber) {
     auto modelNormalSpecularMapPixel = gpu::Shader::createPixel(std::string(forward_model_normal_specular_map_frag));
 
     using Key = render::ShapeKey;
-    auto addPipeline = std::bind(&addPlumberPipeline, std::ref(plumber), _1, _2, _3);
+    auto addPipeline = std::bind(&addPlumberPipeline, std::ref(plumber), _1, _2, _3, nullptr, nullptr);
     // Opaques
     addPipeline(
         Key::Builder().withMaterial(),
@@ -317,7 +484,8 @@ void initForwardPipelines(render::ShapePlumber& plumber) {
 }
 
 void addPlumberPipeline(ShapePlumber& plumber,
-        const ShapeKey& key, const gpu::ShaderPointer& vertex, const gpu::ShaderPointer& pixel) {
+        const ShapeKey& key, const gpu::ShaderPointer& vertex, const gpu::ShaderPointer& pixel,
+        const render::ShapePipeline::BatchSetter& extraBatchSetter, const render::ShapePipeline::ItemSetter& itemSetter) {
     // These key-values' pipelines are added by this functor in addition to the key passed
     assert(!key.isWireframe());
     assert(!key.isDepthBiased());
@@ -354,8 +522,18 @@ void addPlumberPipeline(ShapePlumber& plumber,
             state->setDepthBiasSlopeScale(1.0f);
         }
 
-        plumber.addPipeline(builder.build(), program, state,
-                key.isTranslucent() ? &lightBatchSetter : &batchSetter);
+        auto baseBatchSetter = key.isTranslucent() ? &lightBatchSetter : &batchSetter;
+        render::ShapePipeline::BatchSetter finalBatchSetter;
+        if (extraBatchSetter) {
+            finalBatchSetter = [baseBatchSetter, extraBatchSetter](const ShapePipeline& pipeline, gpu::Batch& batch, render::Args* args) {
+                baseBatchSetter(pipeline, batch, args);
+                extraBatchSetter(pipeline, batch, args);
+            };
+        }
+        else {
+            finalBatchSetter = baseBatchSetter;
+        }
+        plumber.addPipeline(builder.build(), program, state, finalBatchSetter, itemSetter);
     }
 }
 
@@ -394,3 +572,33 @@ void lightBatchSetter(const ShapePipeline& pipeline, gpu::Batch& batch, RenderAr
             pipeline.locations->lightAmbientMapUnit);
     }
 }
+
+void initZPassPipelines(ShapePlumber& shapePlumber, gpu::StatePointer state) {
+    auto modelVertex = gpu::Shader::createVertex(std::string(model_shadow_vert));
+    auto modelPixel = gpu::Shader::createPixel(std::string(model_shadow_frag));
+    gpu::ShaderPointer modelProgram = gpu::Shader::createProgram(modelVertex, modelPixel);
+    shapePlumber.addPipeline(
+        ShapeKey::Filter::Builder().withoutSkinned().withoutFade(),
+        modelProgram, state);
+
+    auto skinVertex = gpu::Shader::createVertex(std::string(skin_model_shadow_vert));
+    auto skinPixel = gpu::Shader::createPixel(std::string(skin_model_shadow_frag));
+    gpu::ShaderPointer skinProgram = gpu::Shader::createProgram(skinVertex, skinPixel);
+    shapePlumber.addPipeline(
+        ShapeKey::Filter::Builder().withSkinned().withoutFade(),
+        skinProgram, state);
+
+    auto modelFadeVertex = gpu::Shader::createVertex(std::string(model_shadow_fade_vert));
+    auto modelFadePixel = gpu::Shader::createPixel(std::string(model_shadow_fade_frag));
+    gpu::ShaderPointer modelFadeProgram = gpu::Shader::createProgram(modelFadeVertex, modelFadePixel);
+    shapePlumber.addPipeline(
+        ShapeKey::Filter::Builder().withoutSkinned().withFade(),
+        modelFadeProgram, state);
+
+    auto skinFadeVertex = gpu::Shader::createVertex(std::string(skin_model_shadow_fade_vert));
+    auto skinFadePixel = gpu::Shader::createPixel(std::string(skin_model_shadow_fade_frag));
+    gpu::ShaderPointer skinFadeProgram = gpu::Shader::createProgram(skinFadeVertex, skinFadePixel);
+    shapePlumber.addPipeline(
+        ShapeKey::Filter::Builder().withSkinned().withFade(),
+        skinFadeProgram, state);
+}
diff --git a/libraries/render-utils/src/RenderShadowTask.cpp b/libraries/render-utils/src/RenderShadowTask.cpp
index a817a6abff..7a6e3dc74f 100644
--- a/libraries/render-utils/src/RenderShadowTask.cpp
+++ b/libraries/render-utils/src/RenderShadowTask.cpp
@@ -22,30 +22,137 @@
 #include "DeferredLightingEffect.h"
 #include "FramebufferCache.h"
 
-#include "model_shadow_vert.h"
-#include "skin_model_shadow_vert.h"
-
-#include "model_shadow_frag.h"
-#include "skin_model_shadow_frag.h"
+// These values are used for culling the objects rendered in the shadow map
+// but are readjusted afterwards
+#define SHADOW_FRUSTUM_NEAR 1.0f
+#define SHADOW_FRUSTUM_FAR  500.0f
 
 using namespace render;
 
-void RenderShadowMap::run(const render::RenderContextPointer& renderContext,
-                          const render::ShapeBounds& inShapes) {
+extern void initZPassPipelines(ShapePlumber& plumber, gpu::StatePointer state);
+
+static void computeNearFar(const Triangle& triangle, const Plane shadowClipPlanes[4], float& near, float& far) {
+    static const int MAX_TRIANGLE_COUNT = 16;
+    Triangle clippedTriangles[MAX_TRIANGLE_COUNT];
+    auto clippedTriangleCount = clipTriangleWithPlanes(triangle, shadowClipPlanes, 4, clippedTriangles, MAX_TRIANGLE_COUNT);
+
+    for (auto i = 0; i < clippedTriangleCount; i++) {
+        const auto& clippedTriangle = clippedTriangles[i];
+
+        near = glm::min(near, -clippedTriangle.v0.z);
+        near = glm::min(near, -clippedTriangle.v1.z);
+        near = glm::min(near, -clippedTriangle.v2.z);
+
+        far = glm::max(far, -clippedTriangle.v0.z);
+        far = glm::max(far, -clippedTriangle.v1.z);
+        far = glm::max(far, -clippedTriangle.v2.z);
+    }
+}
+
+static void computeNearFar(const glm::vec3 sceneBoundVertices[8], const Plane shadowClipPlanes[4], float& near, float& far) {
+    // This code is inspired from Microsoft's CascadedShadowMaps11 sample which is under MIT licence.
+    // See https://code.msdn.microsoft.com/windowsdesktop/Direct3D-Shadow-Win32-2d72a4f2/sourcecode?fileId=121915&pathId=1645833187
+    // Basically it decomposes the object bounding box in triangles and clips each triangle with the shadow
+    // frustum planes. Finally it computes the minimum and maximum depth of the clipped triangle vertices 
+    // in shadow space to extract the near and far distances of the shadow frustum.
+    static const std::array<int[4], 6> boxQuadVertexIndices = { {
+        { TOP_LEFT_FAR, BOTTOM_LEFT_FAR, BOTTOM_RIGHT_FAR, TOP_RIGHT_FAR },
+        { TOP_LEFT_NEAR, BOTTOM_LEFT_NEAR, BOTTOM_RIGHT_NEAR, TOP_RIGHT_NEAR },
+        { TOP_RIGHT_FAR, BOTTOM_RIGHT_FAR, BOTTOM_RIGHT_NEAR, TOP_RIGHT_NEAR },
+        { TOP_LEFT_FAR, BOTTOM_LEFT_FAR, BOTTOM_LEFT_NEAR, TOP_LEFT_NEAR },
+        { BOTTOM_LEFT_FAR, BOTTOM_RIGHT_FAR, BOTTOM_RIGHT_NEAR, BOTTOM_LEFT_NEAR },
+        { TOP_LEFT_FAR, TOP_RIGHT_FAR, TOP_RIGHT_NEAR, TOP_LEFT_NEAR }
+    }  };
+    Triangle triangle;
+
+    for (auto quadVertexIndices : boxQuadVertexIndices) {
+        triangle.v0 = sceneBoundVertices[quadVertexIndices[0]];
+        triangle.v1 = sceneBoundVertices[quadVertexIndices[1]];
+        triangle.v2 = sceneBoundVertices[quadVertexIndices[2]];
+        computeNearFar(triangle, shadowClipPlanes, near, far);
+        triangle.v1 = sceneBoundVertices[quadVertexIndices[3]];
+        computeNearFar(triangle, shadowClipPlanes, near, far);
+    }
+}
+
+static void adjustNearFar(const AABox& inShapeBounds, ViewFrustum& shadowFrustum) {
+    const Transform shadowView{ shadowFrustum.getView() };
+    const Transform shadowViewInverse{ shadowView.getInverseMatrix() };
+
+    glm::vec3 sceneBoundVertices[8];
+    // Keep only the left, right, top and bottom shadow frustum planes as we wish to determine
+    // the near and far
+    Plane shadowClipPlanes[4];
+    int i;
+
+    // The vertices of the scene bounding box are expressed in the shadow frustum's local space
+    for (i = 0; i < 8; i++) {
+        sceneBoundVertices[i] = shadowViewInverse.transform(inShapeBounds.getVertex(static_cast<BoxVertex>(i)));
+    }
+    // This indirection array is just a protection in case the ViewFrustum::PlaneIndex enum
+    // changes order especially as we don't need to test the NEAR and FAR planes.
+    static const ViewFrustum::PlaneIndex planeIndices[4] = {
+        ViewFrustum::TOP_PLANE,
+        ViewFrustum::BOTTOM_PLANE,
+        ViewFrustum::LEFT_PLANE,
+        ViewFrustum::RIGHT_PLANE
+    };
+    // Same goes for the shadow frustum planes.
+    for (i = 0; i < 4; i++) {
+        const auto& worldPlane = shadowFrustum.getPlanes()[planeIndices[i]];
+        // We assume the transform doesn't have a non uniform scale component to apply the 
+        // transform to the normal without using the correct transpose of inverse, which should be the
+        // case for a view matrix.
+        auto planeNormal = shadowViewInverse.transformDirection(worldPlane.getNormal());
+        auto planePoint = shadowViewInverse.transform(worldPlane.getPoint());
+        shadowClipPlanes[i].setNormalAndPoint(planeNormal, planePoint);
+    }
+
+    float near = std::numeric_limits<float>::max();
+    float far = 0.0f;
+
+    computeNearFar(sceneBoundVertices, shadowClipPlanes, near, far);
+    // Limit the far range to the one used originally. There's no point in rendering objects
+    // that are not in the view frustum.
+    far = glm::min(far, shadowFrustum.getFarClip());
+
+    const auto depthEpsilon = 0.1f;
+    auto projMatrix = glm::ortho(-1.0f, 1.0f, -1.0f, 1.0f, near - depthEpsilon, far + depthEpsilon);
+    auto shadowProjection = shadowFrustum.getProjection();
+
+    shadowProjection[2][2] = projMatrix[2][2];
+    shadowProjection[3][2] = projMatrix[3][2];
+    shadowFrustum.setProjection(shadowProjection);
+    shadowFrustum.calculate();
+}
+
+void RenderShadowMap::run(const render::RenderContextPointer& renderContext, const Inputs& inputs) {
     assert(renderContext->args);
     assert(renderContext->args->hasViewFrustum());
 
+    const auto& inShapes = inputs.get0();
+    const auto& inShapeBounds = inputs.get1();
+
     auto lightStage = renderContext->_scene->getStage<LightStage>();
+    assert(lightStage);
 
-    LightStage::Index globalLightIndex { 0 };
-
-    const auto globalLight = lightStage->getLight(globalLightIndex);
-    const auto shadow = lightStage->getShadow(globalLightIndex);
+    auto shadow = lightStage->getCurrentKeyShadow();
     if (!shadow) return;
 
     const auto& fbo = shadow->framebuffer;
 
     RenderArgs* args = renderContext->args;
+    ShapeKey::Builder defaultKeyBuilder;
+    auto adjustedShadowFrustum = args->getViewFrustum();
+
+    // Adjust the frustum near and far depths based on the rendered items bounding box to have
+    // the minimal Z range.
+    adjustNearFar(inShapeBounds, adjustedShadowFrustum);
+    // Reapply the frustum as it has been adjusted
+    shadow->setFrustum(adjustedShadowFrustum);
+    args->popViewFrustum();
+    args->pushViewFrustum(adjustedShadowFrustum);
+
     gpu::doInBatch(args->_context, [&](gpu::Batch& batch) {
         args->_batch = &batch;
         batch.enableStereo(false);
@@ -59,16 +166,21 @@ void RenderShadowMap::run(const render::RenderContextPointer& renderContext,
             gpu::Framebuffer::BUFFER_COLOR0 | gpu::Framebuffer::BUFFER_DEPTH,
             vec4(vec3(1.0, 1.0, 1.0), 0.0), 1.0, 0, true);
 
-        batch.setProjectionTransform(shadow->getProjection());
-        batch.setViewTransform(shadow->getView(), false);
+        glm::mat4 projMat;
+        Transform viewMat;
+        args->getViewFrustum().evalProjectionMatrix(projMat);
+        args->getViewFrustum().evalViewTransform(viewMat);
 
-        auto shadowPipeline = _shapePlumber->pickPipeline(args, ShapeKey());
-        auto shadowSkinnedPipeline = _shapePlumber->pickPipeline(args, ShapeKey::Builder().withSkinned());
+        batch.setProjectionTransform(projMat);
+        batch.setViewTransform(viewMat, false);
+
+        auto shadowPipeline = _shapePlumber->pickPipeline(args, defaultKeyBuilder);
+        auto shadowSkinnedPipeline = _shapePlumber->pickPipeline(args, defaultKeyBuilder.withSkinned());
 
         std::vector<ShapeKey> skinnedShapeKeys{};
 
         // Iterate through all inShapes and render the unskinned
-        args->_pipeline = shadowPipeline;
+        args->_shapePipeline = shadowPipeline;
         batch.setPipeline(shadowPipeline->pipeline);
         for (auto items : inShapes) {
             if (items.first.isSkinned()) {
@@ -79,19 +191,19 @@ void RenderShadowMap::run(const render::RenderContextPointer& renderContext,
         }
 
         // Reiterate to render the skinned
-        args->_pipeline = shadowSkinnedPipeline;
+        args->_shapePipeline = shadowSkinnedPipeline;
         batch.setPipeline(shadowSkinnedPipeline->pipeline);
         for (const auto& key : skinnedShapeKeys) {
             renderItems(renderContext, inShapes.at(key));
         }
 
-        args->_pipeline = nullptr;
+        args->_shapePipeline = nullptr;
         args->_batch = nullptr;
     });
 }
 
 void RenderShadowTask::build(JobModel& task, const render::Varying& input, render::Varying& output, CullFunctor cullFunctor) {
-    cullFunctor = cullFunctor ? cullFunctor : [](const RenderArgs*, const AABox&){ return true; };
+    cullFunctor = cullFunctor ? cullFunctor : [](const RenderArgs*, const AABox&) { return true; };
 
     // Prepare the ShapePipeline
     ShapePlumberPointer shapePlumber = std::make_shared<ShapePlumber>();
@@ -100,19 +212,7 @@ void RenderShadowTask::build(JobModel& task, const render::Varying& input, rende
         state->setCullMode(gpu::State::CULL_BACK);
         state->setDepthTest(true, true, gpu::LESS_EQUAL);
 
-        auto modelVertex = gpu::Shader::createVertex(std::string(model_shadow_vert));
-        auto modelPixel = gpu::Shader::createPixel(std::string(model_shadow_frag));
-        gpu::ShaderPointer modelProgram = gpu::Shader::createProgram(modelVertex, modelPixel);
-        shapePlumber->addPipeline(
-            ShapeKey::Filter::Builder().withoutSkinned(),
-            modelProgram, state);
-
-        auto skinVertex = gpu::Shader::createVertex(std::string(skin_model_shadow_vert));
-        auto skinPixel = gpu::Shader::createPixel(std::string(skin_model_shadow_frag));
-        gpu::ShaderPointer skinProgram = gpu::Shader::createProgram(skinVertex, skinPixel);
-        shapePlumber->addPipeline(
-            ShapeKey::Filter::Builder().withSkinned(),
-            skinProgram, state);
+        initZPassPipelines(*shapePlumber, state);
     }
 
     const auto cachedMode = task.addJob<RenderShadowSetup>("ShadowSetup");
@@ -125,10 +225,10 @@ void RenderShadowTask::build(JobModel& task, const render::Varying& input, rende
 
     // Sort
     const auto sortedPipelines = task.addJob<PipelineSortShapes>("PipelineSortShadowSort", culledShadowSelection);
-    const auto sortedShapes = task.addJob<DepthSortShapes>("DepthSortShadowMap", sortedPipelines);
+    const auto sortedShapesAndBounds = task.addJob<DepthSortShapesAndComputeBounds>("DepthSortShadowMap", sortedPipelines, true);
 
     // GPU jobs: Render to shadow map
-    task.addJob<RenderShadowMap>("RenderShadowMap", sortedShapes, shapePlumber);
+    task.addJob<RenderShadowMap>("RenderShadowMap", sortedShapesAndBounds, shapePlumber);
 
     task.addJob<RenderShadowTeardown>("ShadowTeardown", cachedMode);
 }
@@ -141,20 +241,23 @@ void RenderShadowTask::configure(const Config& configuration) {
 
 void RenderShadowSetup::run(const render::RenderContextPointer& renderContext, Output& output) {
     auto lightStage = renderContext->_scene->getStage<LightStage>();
-    const auto globalShadow = lightStage->getShadow(0);
+    assert(lightStage);
 
-    // Cache old render args
-    RenderArgs* args = renderContext->args;
-    output = args->_renderMode;
+    const auto globalShadow = lightStage->getCurrentKeyShadow();
+    if (globalShadow) {
+        // Cache old render args
+        RenderArgs* args = renderContext->args;
+        output = args->_renderMode;
 
-    auto nearClip = args->getViewFrustum().getNearClip();
-    float nearDepth = -args->_boomOffset.z;
-    const int SHADOW_FAR_DEPTH = 20;
-    globalShadow->setKeylightFrustum(args->getViewFrustum(), nearDepth, nearClip + SHADOW_FAR_DEPTH);
+        auto nearClip = args->getViewFrustum().getNearClip();
+        float nearDepth = -args->_boomOffset.z;
+        const float SHADOW_MAX_DISTANCE = 20.0f;
+        globalShadow->setKeylightFrustum(args->getViewFrustum(), nearDepth, nearClip + SHADOW_MAX_DISTANCE, SHADOW_FRUSTUM_NEAR, SHADOW_FRUSTUM_FAR);
 
-    // Set the keylight render args
-    args->pushViewFrustum(*(globalShadow->getFrustum()));
-    args->_renderMode = RenderArgs::SHADOW_RENDER_MODE;
+        // Set the keylight render args
+        args->pushViewFrustum(*(globalShadow->getFrustum()));
+        args->_renderMode = RenderArgs::SHADOW_RENDER_MODE;
+    }
 }
 
 void RenderShadowTeardown::run(const render::RenderContextPointer& renderContext, const Input& input) {
diff --git a/libraries/render-utils/src/RenderShadowTask.h b/libraries/render-utils/src/RenderShadowTask.h
index 031f44a42d..7b2bbeb306 100644
--- a/libraries/render-utils/src/RenderShadowTask.h
+++ b/libraries/render-utils/src/RenderShadowTask.h
@@ -21,11 +21,11 @@ class ViewFrustum;
 
 class RenderShadowMap {
 public:
-    using JobModel = render::Job::ModelI<RenderShadowMap, render::ShapeBounds>;
+    using Inputs = render::VaryingSet2<render::ShapeBounds, AABox>;
+    using JobModel = render::Job::ModelI<RenderShadowMap, Inputs>;
 
     RenderShadowMap(render::ShapePlumberPointer shapePlumber) : _shapePlumber{ shapePlumber } {}
-    void run(const render::RenderContextPointer& renderContext,
-             const render::ShapeBounds& inShapes);
+    void run(const render::RenderContextPointer& renderContext, const Inputs& inputs);
 
 protected:
     render::ShapePlumberPointer _shapePlumber;
diff --git a/libraries/render-utils/src/RenderViewTask.cpp b/libraries/render-utils/src/RenderViewTask.cpp
index fceaf7b5b9..1085a1148c 100644
--- a/libraries/render-utils/src/RenderViewTask.cpp
+++ b/libraries/render-utils/src/RenderViewTask.cpp
@@ -19,7 +19,10 @@
 void RenderViewTask::build(JobModel& task, const render::Varying& input, render::Varying& output, render::CullFunctor cullFunctor, bool isDeferred) {
    // auto items = input.get<Input>();
 
-    task.addJob<RenderShadowTask>("RenderShadowTask", cullFunctor);
+    // Shadows use an orthographic projection because they are linked to sunlights
+    // but the cullFunctor passed is probably tailored for perspective projection and culls too much.
+    // TODO : create a special cull functor for this. 
+    task.addJob<RenderShadowTask>("RenderShadowTask", nullptr);
 
     const auto items = task.addJob<RenderFetchCullSortTask>("FetchCullSort", cullFunctor);
     assert(items.canCast<RenderFetchCullSortTask::Output>());
diff --git a/libraries/render-utils/src/Shadow.slh b/libraries/render-utils/src/Shadow.slh
index 7b86b9b660..e844db43dd 100644
--- a/libraries/render-utils/src/Shadow.slh
+++ b/libraries/render-utils/src/Shadow.slh
@@ -68,6 +68,8 @@ vec2 PCFkernel[4] = vec2[4](
 );
 
 float evalShadowAttenuationPCF(vec4 position, vec4 shadowTexcoord) {
+    // PCF is buggy so disable it for the time being
+#if 0
     float pcfRadius = 3.0;
 	float shadowScale = getShadowScale();
 
@@ -80,6 +82,9 @@ float evalShadowAttenuationPCF(vec4 position, vec4 shadowTexcoord) {
         fetchShadow(shadowTexcoord.xyz + shadowScale * vec3(offset + PCFkernel[2], 0.0)) +
         fetchShadow(shadowTexcoord.xyz + shadowScale * vec3(offset + PCFkernel[3], 0.0))
     ));
+#else
+    float shadowAttenuation = fetchShadow(shadowTexcoord.xyz);
+#endif
 
     return shadowAttenuation;
 }
diff --git a/libraries/render-utils/src/SoftAttachmentModel.cpp b/libraries/render-utils/src/SoftAttachmentModel.cpp
index f15b696006..63991f9422 100644
--- a/libraries/render-utils/src/SoftAttachmentModel.cpp
+++ b/libraries/render-utils/src/SoftAttachmentModel.cpp
@@ -35,11 +35,15 @@ void SoftAttachmentModel::updateClusterMatrices() {
     if (!_needsUpdateClusterMatrices) {
         return;
     }
+    if (!isLoaded()) {
+        return;
+    }
+
     _needsUpdateClusterMatrices = false;
 
     const FBXGeometry& geometry = getFBXGeometry();
 
-    for (int i = 0; i < _meshStates.size(); i++) {
+    for (int i = 0; i < (int) _meshStates.size(); i++) {
         MeshState& state = _meshStates[i];
         const FBXMesh& mesh = geometry.meshes.at(i);
 
@@ -56,17 +60,6 @@ void SoftAttachmentModel::updateClusterMatrices() {
             }
             glm_mat4u_mul(jointMatrix, cluster.inverseBindMatrix, state.clusterMatrices[j]);
         }
-
-        // Once computed the cluster matrices, update the buffer(s)
-        if (mesh.clusters.size() > 1) {
-            if (!state.clusterBuffer) {
-                state.clusterBuffer = std::make_shared<gpu::Buffer>(state.clusterMatrices.size() * sizeof(glm::mat4),
-                                                                    (const gpu::Byte*) state.clusterMatrices.constData());
-            } else {
-                state.clusterBuffer->setSubData(0, state.clusterMatrices.size() * sizeof(glm::mat4),
-                                                (const gpu::Byte*) state.clusterMatrices.constData());
-            }
-        }
     }
 
     // post the blender if we're not currently waiting for one to finish
diff --git a/libraries/render-utils/src/StencilMaskPass.cpp b/libraries/render-utils/src/StencilMaskPass.cpp
index 2d4efc0573..f71111b64e 100644
--- a/libraries/render-utils/src/StencilMaskPass.cpp
+++ b/libraries/render-utils/src/StencilMaskPass.cpp
@@ -104,22 +104,51 @@ void PrepareStencil::run(const RenderContextPointer& renderContext, const gpu::F
     });
 }
 
+// Always draw MASK to the stencil buffer (used to always prevent drawing in certain areas later)
 void PrepareStencil::drawMask(gpu::State& state) {
-    state.setStencilTest(true, 0xFF, gpu::State::StencilTest(PrepareStencil::STENCIL_MASK, 0xFF, gpu::ALWAYS, gpu::State::STENCIL_OP_REPLACE, gpu::State::STENCIL_OP_REPLACE, gpu::State::STENCIL_OP_REPLACE));
+    state.setStencilTest(true, 0xFF, gpu::State::StencilTest(STENCIL_MASK, 0xFF, gpu::ALWAYS,
+        gpu::State::STENCIL_OP_REPLACE, gpu::State::STENCIL_OP_REPLACE, gpu::State::STENCIL_OP_REPLACE));
 }
 
+// Draw BACKGROUND to the stencil buffer behind everything else
+void PrepareStencil::drawBackground(gpu::State& state) {
+    state.setStencilTest(true, 0xFF, gpu::State::StencilTest(STENCIL_BACKGROUND, 0xFF, gpu::ALWAYS,
+        gpu::State::STENCIL_OP_REPLACE, gpu::State::STENCIL_OP_REPLACE, gpu::State::STENCIL_OP_KEEP));
+}
+
+// Pass if this area has NOT been marked as MASK or anything containing MASK
 void PrepareStencil::testMask(gpu::State& state) {
-    state.setStencilTest(true, 0x00, gpu::State::StencilTest(PrepareStencil::STENCIL_MASK, 0xFF, gpu::NOT_EQUAL, gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_KEEP));
+    state.setStencilTest(true, 0x00, gpu::State::StencilTest(STENCIL_MASK, STENCIL_MASK, gpu::NOT_EQUAL,
+        gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_KEEP));
 }
 
+// Pass if this area has NOT been marked as NO_AA or anything containing NO_AA
+void PrepareStencil::testNoAA(gpu::State& state) {
+    state.setStencilTest(true, 0x00, gpu::State::StencilTest(STENCIL_NO_AA, STENCIL_NO_AA, gpu::NOT_EQUAL,
+        gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_KEEP));
+}
+
+// Pass if this area WAS marked as BACKGROUND
+// (see: model/src/Skybox.cpp, procedural/src/ProceduralSkybox.cpp)
 void PrepareStencil::testBackground(gpu::State& state) {
-    state.setStencilTest(true, 0x00, gpu::State::StencilTest(PrepareStencil::STENCIL_BACKGROUND, 0xFF, gpu::EQUAL, gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_KEEP));
-}
-
-void PrepareStencil::testMaskDrawShape(gpu::State& state) {
-    state.setStencilTest(true, 0xFF, gpu::State::StencilTest(PrepareStencil::STENCIL_MASK, 0xFF, gpu::NOT_EQUAL, gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_ZERO));
+    state.setStencilTest(true, 0x00, gpu::State::StencilTest(STENCIL_BACKGROUND, 0xFF, gpu::EQUAL,
+        gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_KEEP));
 }
 
+// Pass if this area WAS marked as SHAPE or anything containing SHAPE
 void PrepareStencil::testShape(gpu::State& state) {
-    state.setStencilTest(true, 0x00, gpu::State::StencilTest(PrepareStencil::STENCIL_SHAPE, 0xFF, gpu::EQUAL, gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_KEEP));
+    state.setStencilTest(true, 0x00, gpu::State::StencilTest(STENCIL_SHAPE, STENCIL_SHAPE, gpu::EQUAL,
+        gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_KEEP));
+}
+
+// Pass if this area was NOT marked as MASK, write to SHAPE if it passes
+void PrepareStencil::testMaskDrawShape(gpu::State& state) {
+    state.setStencilTest(true, STENCIL_SHAPE, gpu::State::StencilTest(STENCIL_MASK | STENCIL_SHAPE, STENCIL_MASK, gpu::NOT_EQUAL,
+        gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_REPLACE));
+}
+
+// Pass if this area was NOT marked as MASK, write to SHAPE and NO_AA if it passes
+void PrepareStencil::testMaskDrawShapeNoAA(gpu::State& state) {
+    state.setStencilTest(true, STENCIL_SHAPE | STENCIL_NO_AA, gpu::State::StencilTest(STENCIL_MASK | STENCIL_SHAPE | STENCIL_NO_AA, STENCIL_MASK, gpu::NOT_EQUAL,
+        gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_REPLACE));
 }
\ No newline at end of file
diff --git a/libraries/render-utils/src/StencilMaskPass.h b/libraries/render-utils/src/StencilMaskPass.h
index 01601d1ae6..fc258b607a 100644
--- a/libraries/render-utils/src/StencilMaskPass.h
+++ b/libraries/render-utils/src/StencilMaskPass.h
@@ -41,17 +41,20 @@ public:
 
     void run(const render::RenderContextPointer& renderContext, const gpu::FramebufferPointer& dstFramebuffer);
 
-    static const gpu::int8 STENCIL_MASK = 2;
-    static const gpu::int8 STENCIL_BACKGROUND = 1;
-    static const gpu::int8 STENCIL_SHAPE = 0;
-
+    // Always use 0 to clear the stencil buffer to set it to background
+    static const gpu::int8 STENCIL_BACKGROUND = 0; // must match values in Skybox.cpp and ProceduralSkybox.cpp
+    static const gpu::int8 STENCIL_MASK =       1 << 0;
+    static const gpu::int8 STENCIL_SHAPE =      1 << 1;
+    static const gpu::int8 STENCIL_NO_AA =      1 << 2;
 
     static void drawMask(gpu::State& state);
+    static void drawBackground(gpu::State& state);
     static void testMask(gpu::State& state);
+    static void testNoAA(gpu::State& state);
     static void testBackground(gpu::State& state);
-    static void testMaskDrawShape(gpu::State& state);
     static void testShape(gpu::State& state);
-
+    static void testMaskDrawShape(gpu::State& state);
+    static void testMaskDrawShapeNoAA(gpu::State& state);
 
 private:
     gpu::PipelinePointer _meshStencilPipeline;
diff --git a/libraries/render-utils/src/SubsurfaceScattering.cpp b/libraries/render-utils/src/SubsurfaceScattering.cpp
index d67369774c..1786898e57 100644
--- a/libraries/render-utils/src/SubsurfaceScattering.cpp
+++ b/libraries/render-utils/src/SubsurfaceScattering.cpp
@@ -532,7 +532,8 @@ void DebugSubsurfaceScattering::run(const render::RenderContextPointer& renderCo
 
 
 
-    auto lightStage = renderContext->_scene->getStage<LightStage>("LIGHT_STAGE");
+    auto lightStage = renderContext->_scene->getStage<LightStage>();
+    assert(lightStage);
    // const auto light = DependencyManager::get<DeferredLightingEffect>()->getLightStage()->getLight(0);
     const auto light = lightStage->getLight(0);
     
diff --git a/libraries/render-utils/src/SubsurfaceScattering.slh b/libraries/render-utils/src/SubsurfaceScattering.slh
index 42ffafd9ff..201ec2291a 100644
--- a/libraries/render-utils/src/SubsurfaceScattering.slh
+++ b/libraries/render-utils/src/SubsurfaceScattering.slh
@@ -105,7 +105,7 @@ vec3 integrate(float cosTheta, float skinRadius) {
     vec3 totalLight = vec3(0.0);
 
     const float _PI = 3.14159265358979523846;
-    const float step = 2.0 * _PI / <$NumIntegrationSteps$>;
+    const float step = 2.0 * _PI / float(<$NumIntegrationSteps$>);
     float a = -(_PI);
 
 
diff --git a/libraries/render-utils/src/SurfaceGeometryPass.cpp b/libraries/render-utils/src/SurfaceGeometryPass.cpp
index 1941766353..c4eea7ce7f 100644
--- a/libraries/render-utils/src/SurfaceGeometryPass.cpp
+++ b/libraries/render-utils/src/SurfaceGeometryPass.cpp
@@ -459,7 +459,7 @@ void SurfaceGeometryPass::run(const render::RenderContextPointer& renderContext,
     auto diffuseVPipeline = _diffusePass.getBlurVPipeline();
     auto diffuseHPipeline = _diffusePass.getBlurHPipeline();
 
-    _diffusePass.getParameters()->setWidthHeight(curvatureViewport.z, curvatureViewport.w, args->_context->isStereo());
+    _diffusePass.getParameters()->setWidthHeight(curvatureViewport.z, curvatureViewport.w, args->isStereo());
     glm::ivec2 textureSize(curvatureTexture->getDimensions());
     _diffusePass.getParameters()->setTexcoordTransform(gpu::Framebuffer::evalSubregionTexcoordTransformCoefficients(textureSize, curvatureViewport));
     _diffusePass.getParameters()->setDepthPerspective(args->getViewFrustum().getProjection()[1][1]);
diff --git a/libraries/render-utils/src/UpdateSceneTask.cpp b/libraries/render-utils/src/UpdateSceneTask.cpp
index 2daee5fb5a..e05f28ef0d 100644
--- a/libraries/render-utils/src/UpdateSceneTask.cpp
+++ b/libraries/render-utils/src/UpdateSceneTask.cpp
@@ -13,11 +13,17 @@
 #include <render/SceneTask.h>
 #include "LightStage.h"
 #include "BackgroundStage.h"
+#include "HazeStage.h"
+#include <render/TransitionStage.h>
+#include <render/HighlightStage.h>
 #include "DeferredLightingEffect.h"
 
 void UpdateSceneTask::build(JobModel& task, const render::Varying& input, render::Varying& output) {
     task.addJob<LightStageSetup>("LightStageSetup");
     task.addJob<BackgroundStageSetup>("BackgroundStageSetup");
+    task.addJob<HazeStageSetup>("HazeStageSetup");
+    task.addJob<render::TransitionStageSetup>("TransitionStageSetup");
+    task.addJob<render::HighlightStageSetup>("HighlightStageSetup");
 
     task.addJob<DefaultLightingSetup>("DefaultLightingSetup");
 
diff --git a/libraries/render-utils/src/ZoneRenderer.cpp b/libraries/render-utils/src/ZoneRenderer.cpp
index 80be123f0f..3d1fe33267 100644
--- a/libraries/render-utils/src/ZoneRenderer.cpp
+++ b/libraries/render-utils/src/ZoneRenderer.cpp
@@ -52,19 +52,26 @@ void ZoneRendererTask::build(JobModel& task, const Varying& input, Varying& oupu
 }
 
 void SetupZones::run(const RenderContextPointer& context, const Inputs& inputs) {
-    auto backgroundStage = context->_scene->getStage<BackgroundStage>("BACKGROUND_STAGE");
+    auto backgroundStage = context->_scene->getStage<BackgroundStage>();
+    assert(backgroundStage);
     backgroundStage->_currentFrame.clear();
 
+    // Haze
+    auto hazeStage = context->_scene->getStage<HazeStage>();
+    assert(hazeStage);
+    hazeStage->_currentFrame.clear();
+
     // call render in the correct order first...
     render::renderItems(context, inputs);
 
     // Finally add the default lights and background:
-    auto lightStage = context->_scene->getStage<LightStage>("LIGHT_STAGE");
+    auto lightStage = context->_scene->getStage<LightStage>();
+    assert(lightStage);
+    
     lightStage->_currentFrame.pushSunLight(0);
     lightStage->_currentFrame.pushAmbientLight(0);
 
     backgroundStage->_currentFrame.pushBackground(0);
-
 }
 
 const gpu::PipelinePointer& DebugZoneLighting::getKeyLightPipeline() {
@@ -136,14 +143,13 @@ void DebugZoneLighting::run(const render::RenderContextPointer& context, const I
 
     auto deferredTransform = inputs;
 
-    auto lightStage = context->_scene->getStage<LightStage>("LIGHT_STAGE");
+    auto lightStage = context->_scene->getStage<LightStage>(LightStage::getName());
     std::vector<model::LightPointer> keyLightStack;
     if (lightStage && lightStage->_currentFrame._sunLights.size()) {
         for (auto index : lightStage->_currentFrame._sunLights) {
             keyLightStack.push_back(lightStage->getLight(index));
         }
     }
-   // keyLightStack.push_back(lightStage->getLight(0));
 
     std::vector<model::LightPointer> ambientLightStack;
     if (lightStage && lightStage->_currentFrame._ambientLights.size()) {
@@ -151,9 +157,8 @@ void DebugZoneLighting::run(const render::RenderContextPointer& context, const I
             ambientLightStack.push_back(lightStage->getLight(index));
         }
     }
-  //  ambientLightStack.push_back(lightStage->getLight(0));
 
-    auto backgroundStage = context->_scene->getStage<BackgroundStage>("BACKGROUND_STAGE");
+    auto backgroundStage = context->_scene->getStage<BackgroundStage>(BackgroundStage::getName());
     std::vector<model::SkyboxPointer> skyboxStack;
     if (backgroundStage && backgroundStage->_currentFrame._backgrounds.size()) {
         for (auto index : backgroundStage->_currentFrame._backgrounds) {
@@ -162,8 +167,7 @@ void DebugZoneLighting::run(const render::RenderContextPointer& context, const I
                 skyboxStack.push_back(background->getSkybox());
             }
         }
-    } 
-  //  skyboxStack.push_back(backgroundStage->getBackground(0)->getSkybox());
+    }
 
 
     gpu::doInBatch(args->_context, [=](gpu::Batch& batch) {
diff --git a/libraries/render-utils/src/directional_skybox_light.slf b/libraries/render-utils/src/directional_skybox_light.slf
index d8a2f44042..d609dd2300 100644
--- a/libraries/render-utils/src/directional_skybox_light.slf
+++ b/libraries/render-utils/src/directional_skybox_light.slf
@@ -51,7 +51,7 @@ void main(void) {
                         frag.scattering,
                         midNormalCurvature,
                         lowNormalCurvature);
-        _fragColor = vec4(color, 1.0);
 
+        _fragColor = vec4(color, 1.0);
     }
 }
diff --git a/libraries/render-utils/src/forward_model.slf b/libraries/render-utils/src/forward_model.slf
index daeead65ec..7b708a1d24 100644
--- a/libraries/render-utils/src/forward_model.slf
+++ b/libraries/render-utils/src/forward_model.slf
@@ -1,7 +1,7 @@
 <@include gpu/Config.slh@>
 <$VERSION_HEADER$>
 //  Generated on <$_SCRIBE_DATE$>
-//  model.frag
+//  forward_model.frag
 //  fragment shader
 //
 //  Created by Andrzej Kapolka on 10/14/13.
@@ -11,12 +11,18 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-<@include DeferredBufferWrite.slh@>
+<! <@include ForwardBufferWrite.slh@> !>
+
+<@include ForwardGlobalLight.slh@>
+<$declareEvalSkyboxGlobalColor()$>
 
 <@include model/Material.slh@>
 
+<@include gpu/Transform.slh@>
+<$declareStandardCameraTransform()$>
+
 <@include MaterialTextures.slh@>
-<$declareMaterialTextures(ALBEDO, ROUGHNESS, _SCRIBE_NULL, _SCRIBE_NULL, EMISSIVE, OCCLUSION)$>
+<$declareMaterialTextures(ALBEDO, ROUGHNESS, _SCRIBE_NULL, _SCRIBE_NULL, EMISSIVE, _SCRIBE_NULL)$>
 
 in vec4 _position;
 in vec3 _normal;
@@ -24,12 +30,13 @@ in vec3 _color;
 in vec2 _texCoord0;
 in vec2 _texCoord1;
 
+out vec4 _fragColor;
 
 void main(void) {
     Material mat = getMaterial();
     int matKey = getMaterialKey(mat);
     <$fetchMaterialTexturesCoord0(matKey, _texCoord0, albedoTex, roughnessTex, _SCRIBE_NULL, _SCRIBE_NULL, emissiveTex)$>
-    <$fetchMaterialTexturesCoord1(matKey, _texCoord1, occlusionTex)$>
+<!   <$fetchMaterialTexturesCoord1(matKey, _texCoord1, occlusionTex)$> !>
 
     float opacity = 1.0;
     <$evalMaterialOpacity(albedoTex.a, opacity, matKey, opacity)$>;
@@ -39,21 +46,43 @@ void main(void) {
     <$evalMaterialAlbedo(albedoTex, albedo, matKey, albedo)$>;
     albedo *= _color;
 
+    float metallic = getMaterialMetallic(mat);
+    vec3 fresnel = vec3(0.03); // Default Di-electric fresnel value
+    if (metallic <= 0.5) {
+        metallic = 0.0;
+    } else {
+        fresnel = albedo;
+        metallic = 1.0;
+    }
+
     float roughness = getMaterialRoughness(mat);
     <$evalMaterialRoughness(roughnessTex, roughness, matKey, roughness)$>;
 
     vec3 emissive = getMaterialEmissive(mat);
     <$evalMaterialEmissive(emissiveTex, emissive, matKey, emissive)$>;
 
-    float scattering = getMaterialScattering(mat);
 
-    packDeferredFragment(
-        normalize(_normal.xyz), 
-        opacity,
+    vec3 fragPosition = _position.xyz;
+
+    TransformCamera cam = getTransformCamera();
+    vec3 fragNormal;
+    <$transformEyeToWorldDir(cam, _normal, fragNormal)$>
+
+    /* vec4 color = vec4(evalSkyboxGlobalColor(
+        cam._viewInverse,
+        1.0,
+        1.0,
+        fragPosition,
+        fragNormal,
         albedo,
-        roughness,
-        getMaterialMetallic(mat),
-        emissive,
-        occlusionTex,
-        scattering);
+        fresnel,
+        metallic,
+        roughness),
+        opacity); 
+        color.rgb += emissive * isEmissiveEnabled();
+
+    */
+
+    _fragColor = vec4(albedo, opacity);
+    
 }
diff --git a/libraries/render-utils/src/forward_model_normal_map.slf b/libraries/render-utils/src/forward_model_normal_map.slf
index 5cc1a1859f..a199483b9f 100644
--- a/libraries/render-utils/src/forward_model_normal_map.slf
+++ b/libraries/render-utils/src/forward_model_normal_map.slf
@@ -2,7 +2,7 @@
 <$VERSION_HEADER$>
 //  Generated on <$_SCRIBE_DATE$>
 //
-//  model_normal_map.frag
+//  forward_model_normal_map.frag
 //  fragment shader
 //
 //  Created by Andrzej Kapolka on 10/29/13.
@@ -12,7 +12,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-<@include DeferredBufferWrite.slh@>
+<@include ForwardBufferWrite.slh@>
 
 <@include model/Material.slh@>
 
@@ -47,12 +47,12 @@ void main(void) {
     <$evalMaterialEmissive(emissiveTex, emissive, matKey, emissive)$>;
 
     vec3 viewNormal;
-    <$tangentToViewSpaceLOD(_position, normalTex, _normal, _tangent, viewNormal)$>
+    <$tangentToViewSpace(normalTex, _normal, _tangent, viewNormal)$>
 
     float scattering = getMaterialScattering(mat);
     <$evalMaterialScattering(scatteringTex, scattering, matKey, scattering)$>;
 
-    packDeferredFragment(
+    packForwardFragment(
         viewNormal, 
         opacity,
         albedo,
diff --git a/libraries/render-utils/src/forward_model_normal_specular_map.slf b/libraries/render-utils/src/forward_model_normal_specular_map.slf
index 9e079b33a0..ca6bbec3da 100644
--- a/libraries/render-utils/src/forward_model_normal_specular_map.slf
+++ b/libraries/render-utils/src/forward_model_normal_specular_map.slf
@@ -2,7 +2,7 @@
 <$VERSION_HEADER$>
 //  Generated on <$_SCRIBE_DATE$>
 //
-//  model_normal_specular_map.frag
+//  forward_model_normal_specular_map.frag
 //  fragment shader
 //
 //  Created by Andrzej Kapolka on 5/6/14.
@@ -12,7 +12,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-<@include DeferredBufferWrite.slh@>
+<@include ForwardBufferWrite.slh@>
 
 <@include model/Material.slh@>
 
@@ -47,14 +47,14 @@ void main(void) {
     <$evalMaterialEmissive(emissiveTex, emissive, matKey, emissive)$>;
 
     vec3 viewNormal;
-    <$tangentToViewSpaceLOD(_position, normalTex, _normal, _tangent, viewNormal)$>
+    <$tangentToViewSpace(normalTex, _normal, _tangent, viewNormal)$>
 
     float metallic = getMaterialMetallic(mat);
     <$evalMaterialMetallic(metallicTex, metallic, matKey, metallic)$>;
 
     float scattering = getMaterialScattering(mat);
 
-    packDeferredFragment(
+    packForwardFragment(
         normalize(viewNormal.xyz), 
         opacity,
         albedo,
diff --git a/libraries/render-utils/src/forward_model_specular_map.slf b/libraries/render-utils/src/forward_model_specular_map.slf
index 47b5e3389d..d2fdd18794 100644
--- a/libraries/render-utils/src/forward_model_specular_map.slf
+++ b/libraries/render-utils/src/forward_model_specular_map.slf
@@ -2,7 +2,7 @@
 <$VERSION_HEADER$>
 //  Generated on <$_SCRIBE_DATE$>
 //
-//  model_specular_map.frag
+//  forward_model_specular_map.frag
 //  fragment shader
 //
 //  Created by Andrzej Kapolka on 5/6/14.
@@ -12,7 +12,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-<@include DeferredBufferWrite.slh@>
+<@include ForwardBufferWrite.slh@>
 
 <@include model/Material.slh@>
 
@@ -51,7 +51,7 @@ void main(void) {
 
     float scattering = getMaterialScattering(mat);
 
-    packDeferredFragment(
+    packForwardFragment(
         normalize(_normal), 
         opacity,
         albedo,
diff --git a/libraries/render-utils/src/forward_model_translucent.slf b/libraries/render-utils/src/forward_model_translucent.slf
new file mode 100644
index 0000000000..52e8ce50e7
--- /dev/null
+++ b/libraries/render-utils/src/forward_model_translucent.slf
@@ -0,0 +1,81 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  forward_model_translucent.frag
+//  fragment shader
+//
+//  Created by Sam Gateau on 2/15/2016.
+//  Copyright 2014 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 model/Material.slh@>
+
+<@include ForwardGlobalLight.slh@>
+
+<$declareEvalGlobalLightingAlphaBlended()$>
+
+<@include gpu/Transform.slh@>
+<$declareStandardCameraTransform()$>
+
+<@include MaterialTextures.slh@>
+<$declareMaterialTextures(ALBEDO, ROUGHNESS, _SCRIBE_NULL, _SCRIBE_NULL, EMISSIVE, OCCLUSION)$>
+
+in vec2 _texCoord0;
+in vec2 _texCoord1;
+in vec4 _position;
+in vec3 _normal;
+in vec3 _color;
+in float _alpha;
+
+out vec4 _fragColor;
+
+void main(void) {
+    Material mat = getMaterial();
+    int matKey = getMaterialKey(mat);
+    <$fetchMaterialTexturesCoord0(matKey, _texCoord0, albedoTex, roughnessTex, _SCRIBE_NULL, _SCRIBE_NULL, emissiveTex)$>
+    <$fetchMaterialTexturesCoord1(matKey, _texCoord1, occlusionTex)$>
+
+    float opacity = getMaterialOpacity(mat) * _alpha;
+    <$evalMaterialOpacity(albedoTex.a, opacity, matKey, opacity)$>;
+
+    vec3 albedo = getMaterialAlbedo(mat);
+    <$evalMaterialAlbedo(albedoTex, albedo, matKey, albedo)$>;
+    albedo *= _color;
+
+    float roughness = getMaterialRoughness(mat);
+    <$evalMaterialRoughness(roughnessTex, roughness, matKey, roughness)$>;
+
+    float metallic = getMaterialMetallic(mat);
+    vec3 fresnel = vec3(0.03); // Default Di-electric fresnel value
+    if (metallic <= 0.5) {
+        metallic = 0.0;
+    } else {
+        fresnel = albedo;
+        metallic = 1.0;
+    }
+
+    vec3 emissive = getMaterialEmissive(mat);
+    <$evalMaterialEmissive(emissiveTex, emissive, matKey, emissive)$>;
+
+    vec3 fragPosition = _position.xyz;
+    vec3 fragNormal = normalize(_normal);
+
+    TransformCamera cam = getTransformCamera();
+
+    _fragColor =  vec4(evalGlobalLightingAlphaBlended(
+        cam._viewInverse,
+        1.0,
+        occlusionTex,
+        fragPosition,
+        fragNormal,
+        albedo,
+        fresnel,
+        metallic,
+        emissive,
+        roughness, opacity),
+        opacity);
+}
diff --git a/libraries/render-utils/src/forward_model_unlit.slf b/libraries/render-utils/src/forward_model_unlit.slf
index 750b51fe8c..fb760467c9 100644
--- a/libraries/render-utils/src/forward_model_unlit.slf
+++ b/libraries/render-utils/src/forward_model_unlit.slf
@@ -2,7 +2,7 @@
 <$VERSION_HEADER$>
 //  Generated on <$_SCRIBE_DATE$>
 //
-//  material_opaque_unlit.frag
+//  forward_model_unlit.frag
 //  fragment shader
 //
 //  Created by Sam Gateau on 5/5/2016.
@@ -12,7 +12,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-<@include DeferredBufferWrite.slh@>
+<@include ForwardBufferWrite.slh@>
 <@include LightingModel.slh@>
 <@include model/Material.slh@>
 
@@ -38,7 +38,7 @@ void main(void) {
     <$evalMaterialAlbedo(albedoTex, albedo, matKey, albedo)$>;
     albedo *= _color;
 
-    packDeferredFragmentUnlit(
+    packForwardFragmentUnlit(
         normalize(_normal), 
         opacity,
         albedo * isUnlitEnabled());
diff --git a/libraries/render-utils/src/glowLine.slf b/libraries/render-utils/src/glowLine.slf
index c0af97930a..6a7a6157a4 100644
--- a/libraries/render-utils/src/glowLine.slf
+++ b/libraries/render-utils/src/glowLine.slf
@@ -9,18 +9,19 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-layout(location = 0) in vec4 inColor;
+in vec4 _color;
 
+in float distanceFromCenter;
 out vec4 _fragColor;
 
 void main(void) {
     // The incoming value actually ranges from -1 to 1, so modify it 
     // so that it goes from 0 -> 1 -> 0 with the solid alpha being at 
     // the center of the line
-    float alpha = 1.0 - abs(inColor.a);
+    float alpha = 1.0 - abs(distanceFromCenter);
     
     // Convert from a linear alpha curve to a sharp peaked one
-	alpha = pow(alpha, 10); 
+	alpha = _color.a * pow(alpha, 10.0);
 	
 	// Drop everything where the curve falls off to nearly nothing
     if (alpha <= 0.05) {
@@ -28,6 +29,5 @@ void main(void) {
     }
     
     // Emit the color
-    _fragColor = vec4(inColor.rgb, alpha);
-    return;
+    _fragColor = vec4(_color.rgb, alpha);
 }
diff --git a/libraries/render-utils/src/glowLine.slv b/libraries/render-utils/src/glowLine.slv
index e856edc787..4532ed7b9f 100644
--- a/libraries/render-utils/src/glowLine.slv
+++ b/libraries/render-utils/src/glowLine.slv
@@ -16,9 +16,12 @@ layout(std140) uniform lineData {
     vec4 p1;
     vec4 p2;
     vec4 color;
+    float width;
 };
 
-layout(location = 0) out vec4 _color;
+out vec4 _color;
+// the distance from the center in 'quad space'
+out float distanceFromCenter;
 
 void main(void) {
     _color = color;
@@ -37,7 +40,7 @@ void main(void) {
     // Find the vector from the eye to one of the points
     vec3 v2 = normalize(p1eye.xyz);
     // The orthogonal vector is the cross product of these two
-    vec3 orthogonal = cross(v1, v2) * 0.02;
+    vec3 orthogonal = cross(v1, v2) * width;
     
     // Deteremine which end to emit based on the vertex id (even / odd)
     vec4 eye = (0 == gl_VertexID % 2) ? p1eye : p2eye;
@@ -45,11 +48,10 @@ void main(void) {
     // Add or subtract the orthogonal vector based on a different vertex ID 
     // calculation
     if (gl_VertexID < 2) {
-        // Use the alpha channel to store the distance from the center in 'quad space'
-        _color.a = -1.0;
+        distanceFromCenter = -1.0;
         eye.xyz -= orthogonal;
     } else {
-        _color.a = 1.0;
+        distanceFromCenter = 1.0;
         eye.xyz += orthogonal;
     }
 
diff --git a/libraries/render-utils/src/hmd_ui.slf b/libraries/render-utils/src/hmd_ui.slf
new file mode 100644
index 0000000000..959e8d733c
--- /dev/null
+++ b/libraries/render-utils/src/hmd_ui.slf
@@ -0,0 +1,37 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  hmd_ui.frag
+//  fragment shader
+//
+//  Created by Sam Gondelman on 9/28/17.
+//  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
+//
+
+uniform sampler2D hudTexture;
+
+struct HUDData {
+    float alpha;
+};
+
+layout(std140) uniform hudBuffer {
+    HUDData hud;
+};
+
+in vec2 _texCoord0;
+
+out vec4 fragColor0;
+
+void main() {
+    vec4 color = texture(hudTexture, _texCoord0);
+    color.a *= hud.alpha;
+    if (color.a <= 0.0) {
+        discard;
+    }
+
+    fragColor0 = color;
+}
\ No newline at end of file
diff --git a/libraries/render-utils/src/hmd_ui.slv b/libraries/render-utils/src/hmd_ui.slv
new file mode 100644
index 0000000000..d6e02ff4cb
--- /dev/null
+++ b/libraries/render-utils/src/hmd_ui.slv
@@ -0,0 +1,36 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  hmd_ui.vert
+//  vertex shader
+//
+//  Created by Sam Gondelman on 9/28/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+<@include gpu/Inputs.slh@>
+<@include gpu/Transform.slh@>
+<$declareStandardTransform()$>
+
+struct HUDData {
+    float alpha;
+};
+
+layout(std140) uniform hudBuffer {
+    HUDData hud;
+};
+
+out vec2 _texCoord0;
+
+void main() {
+  _texCoord0 = inTexCoord0.st;
+
+  // standard transform
+  TransformCamera cam = getTransformCamera();
+  TransformObject obj = getTransformObject();
+  <$transformModelToClipPos(cam, obj, inPosition, gl_Position)$>
+}
diff --git a/libraries/render-utils/src/lightClusters_drawClusterContent.slv b/libraries/render-utils/src/lightClusters_drawClusterContent.slv
index c570957dfb..b88e2e9ee2 100644
--- a/libraries/render-utils/src/lightClusters_drawClusterContent.slv
+++ b/libraries/render-utils/src/lightClusters_drawClusterContent.slv
@@ -53,12 +53,12 @@ void main(void) {
 
  
 
-    ivec3 cluster = clusterGrid_getCluster(gpu_InstanceID);
+    ivec3 cluster = clusterGrid_getCluster(gpu_InstanceID());
     int numLights = cluster.x + cluster.y;
 
     float numLightsScale = clamp(numLights * 0.1, 0.0, 1.0);
 
-    ivec3 clusterPos = frustumGrid_indexToCluster(gpu_InstanceID);
+    ivec3 clusterPos = frustumGrid_indexToCluster(gpu_InstanceID());
 
     float boxScale = 0.99;
     vec3 eyePos = frustumGrid_clusterPosToEye(clusterPos, vec3((1.0 - boxScale) * 0.5 + (1.0 - numLightsScale) * boxScale  * 0.5) + numLightsScale * boxScale * pos.xyz);
@@ -69,5 +69,5 @@ void main(void) {
     TransformCamera cam = getTransformCamera();
     <$transformWorldToClipPos(cam, worldPos, gl_Position)$>
 
-        varColor = vec4(colorWheel(fract(float(gpu_InstanceID) / float(frustumGrid_numClusters()))), (numLights >0 ? 0.9 : 0.1));
+        varColor = vec4(colorWheel(fract(float(gpu_InstanceID()) / float(frustumGrid_numClusters()))), (numLights >0 ? 0.9 : 0.1));
 }
\ No newline at end of file
diff --git a/libraries/render-utils/src/lightClusters_drawClusterFromDepth.slv b/libraries/render-utils/src/lightClusters_drawClusterFromDepth.slv
index 5840f11d0a..912c39f93c 100644
--- a/libraries/render-utils/src/lightClusters_drawClusterFromDepth.slv
+++ b/libraries/render-utils/src/lightClusters_drawClusterFromDepth.slv
@@ -53,7 +53,7 @@ void main(void) {
     );
     vec4 pos = UNIT_BOX[UNIT_BOX_LINE_INDICES[gl_VertexID]];
 
-    ivec3 clusterPos = frustumGrid_indexToCluster(gpu_InstanceID);
+    ivec3 clusterPos = frustumGrid_indexToCluster(gpu_InstanceID());
     vec3 eyePos = frustumGrid_clusterPosToEye(clusterPos, vec3(0.05) + 0.9 * pos.xyz);
     vec4 worldPos = frustumGrid_eyeToWorld(vec4(eyePos.xyz, 1.0));
 
@@ -62,5 +62,5 @@ void main(void) {
     TransformCamera cam = getTransformCamera();
     <$transformWorldToClipPos(cam, worldPos, gl_Position)$>
 
-        varColor = vec4(colorWheel(fract(float(gpu_InstanceID) / float(frustumGrid_numClusters()))), 0.9);
+        varColor = vec4(colorWheel(fract(float(gpu_InstanceID()) / float(frustumGrid_numClusters()))), 0.9);
 }
\ No newline at end of file
diff --git a/libraries/render-utils/src/lightClusters_drawGrid.slv b/libraries/render-utils/src/lightClusters_drawGrid.slv
index 1475666ec6..aac7fe59a5 100644
--- a/libraries/render-utils/src/lightClusters_drawGrid.slv
+++ b/libraries/render-utils/src/lightClusters_drawGrid.slv
@@ -54,10 +54,10 @@ void main(void) {
     vec4 pos = UNIT_BOX[UNIT_BOX_LINE_INDICES[gl_VertexID]];
 
 
-    ivec3 cluster = clusterGrid_getCluster(gpu_InstanceID);
+    ivec3 cluster = clusterGrid_getCluster(gpu_InstanceID());
     int numLights = cluster.x + cluster.y;
 
-    ivec3 clusterPos = frustumGrid_indexToCluster(gpu_InstanceID);
+    ivec3 clusterPos = frustumGrid_indexToCluster(gpu_InstanceID());
 
 
     float boxScale = 1.0;
@@ -69,5 +69,5 @@ void main(void) {
     TransformCamera cam = getTransformCamera();
     <$transformWorldToClipPos(cam, worldPos, gl_Position)$>
 
-    varColor = vec4(colorWheel(fract(float(gpu_InstanceID) / float(frustumGrid_numClusters()))), (numLights > 0 ? 0.9 : 0.0));
+    varColor = vec4(colorWheel(fract(float(gpu_InstanceID()) / float(frustumGrid_numClusters()))), (numLights > 0 ? 0.9 : 0.0));
 }
\ No newline at end of file
diff --git a/libraries/render-utils/src/local_lights_shading.slf b/libraries/render-utils/src/local_lights_shading.slf
index a4e28a9757..c6310cb079 100644
--- a/libraries/render-utils/src/local_lights_shading.slf
+++ b/libraries/render-utils/src/local_lights_shading.slf
@@ -34,6 +34,8 @@ in vec2 _texCoord0;
 out vec4 _fragColor;
 
 void main(void) {
+    _fragColor = vec4(0.0);
+
     // Grab the fragment data from the uv
     vec2 texCoord = _texCoord0.st;
 
diff --git a/libraries/render-utils/src/model_fade.slf b/libraries/render-utils/src/model_fade.slf
new file mode 100644
index 0000000000..d232667660
--- /dev/null
+++ b/libraries/render-utils/src/model_fade.slf
@@ -0,0 +1,70 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//  model_fade.frag
+//  fragment shader
+//
+//  Created by Olivier Prat on 04/19/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+<@include DeferredBufferWrite.slh@>
+
+<@include model/Material.slh@>
+
+<@include MaterialTextures.slh@>
+<$declareMaterialTextures(ALBEDO, ROUGHNESS, _SCRIBE_NULL, _SCRIBE_NULL, EMISSIVE, OCCLUSION)$>
+
+<@include Fade.slh@>
+<$declareFadeFragment()$>
+
+in vec4 _position;
+in vec4 _worldPosition;
+in vec3 _normal;
+in vec3 _color;
+in vec2 _texCoord0;
+in vec2 _texCoord1;
+
+
+void main(void) {
+    vec3 fadeEmissive;
+    FadeObjectParams fadeParams;
+
+    <$fetchFadeObjectParams(fadeParams)$>
+    applyFade(fadeParams, _worldPosition.xyz, fadeEmissive);
+
+    Material mat = getMaterial();
+    int matKey = getMaterialKey(mat);
+    <$fetchMaterialTexturesCoord0(matKey, _texCoord0, albedoTex, roughnessTex, _SCRIBE_NULL, _SCRIBE_NULL, emissiveTex)$>
+    <$fetchMaterialTexturesCoord1(matKey, _texCoord1, occlusionTex)$>
+
+    float opacity = 1.0;
+    <$evalMaterialOpacity(albedoTex.a, opacity, matKey, opacity)$>;
+    <$discardTransparent(opacity)$>;
+
+    vec3 albedo = getMaterialAlbedo(mat);
+    <$evalMaterialAlbedo(albedoTex, albedo, matKey, albedo)$>;
+    albedo *= _color;
+
+    float roughness = getMaterialRoughness(mat);
+    <$evalMaterialRoughness(roughnessTex, roughness, matKey, roughness)$>;
+
+    vec3 emissive = getMaterialEmissive(mat);
+    <$evalMaterialEmissive(emissiveTex, emissive, matKey, emissive)$>;
+    emissive += fadeEmissive;
+
+    float scattering = getMaterialScattering(mat);
+
+    packDeferredFragment(
+        normalize(_normal.xyz), 
+        opacity,
+        albedo,
+        roughness,
+        getMaterialMetallic(mat),
+        emissive,
+        occlusionTex,
+        scattering);
+}
diff --git a/libraries/render-utils/src/model_fade.slv b/libraries/render-utils/src/model_fade.slv
new file mode 100644
index 0000000000..4c6bc534a9
--- /dev/null
+++ b/libraries/render-utils/src/model_fade.slv
@@ -0,0 +1,44 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//  model_fade.slv
+//  vertex shader
+//
+//  Created by Olivier Prat on 04/24/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+<@include gpu/Inputs.slh@>
+<@include gpu/Color.slh@>
+<@include gpu/Transform.slh@>
+<$declareStandardTransform()$>
+
+<@include MaterialTextures.slh@>
+<$declareMaterialTexMapArrayBuffer()$>
+
+out float _alpha;
+out vec2 _texCoord0;
+out vec2 _texCoord1;
+out vec4 _position;
+out vec4 _worldPosition;
+out vec3 _normal;
+out vec3 _color;
+
+void main(void) {
+    _color = colorToLinearRGB(inColor.xyz);
+    _alpha = inColor.w;
+
+    TexMapArray texMapArray = getTexMapArray();
+    <$evalTexMapArrayTexcoord0(texMapArray, inTexCoord0, _texCoord0)$>
+    <$evalTexMapArrayTexcoord1(texMapArray, inTexCoord0, _texCoord1)$>
+
+    // standard transform
+    TransformCamera cam = getTransformCamera();
+    TransformObject obj = getTransformObject();
+    <$transformModelToEyeAndClipPos(cam, obj, inPosition, _position, gl_Position)$>
+    <$transformModelToWorldPos(obj, inPosition, _worldPosition)$>
+    <$transformModelToWorldDir(cam, obj, inNormal.xyz, _normal)$>
+}
diff --git a/libraries/render-utils/src/model_lightmap_fade.slf b/libraries/render-utils/src/model_lightmap_fade.slf
new file mode 100644
index 0000000000..92d00a2046
--- /dev/null
+++ b/libraries/render-utils/src/model_lightmap_fade.slf
@@ -0,0 +1,54 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  model_lightmap_fade.frag
+//  fragment shader
+//
+//  Created by Olivier Prat on 06/05/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+<@include DeferredBufferWrite.slh@>
+
+<@include model/Material.slh@>
+
+<@include MaterialTextures.slh@>
+<$declareMaterialTextures(ALBEDO, ROUGHNESS)$>
+<$declareMaterialLightmap()$>
+
+<@include Fade.slh@>
+<$declareFadeFragment()$>
+
+in vec4 _position;
+in vec2 _texCoord0;
+in vec2 _texCoord1;
+in vec3 _normal;
+in vec3 _color;
+in vec4 _worldPosition;
+
+void main(void) {
+    vec3 fadeEmissive;
+    FadeObjectParams fadeParams;
+
+    <$fetchFadeObjectParams(fadeParams)$>
+    applyFade(fadeParams, _worldPosition.xyz, fadeEmissive);
+
+    Material mat = getMaterial();
+    int matKey = getMaterialKey(mat);
+    <$fetchMaterialTexturesCoord0(matKey, _texCoord0, albedo, roughness)$>
+    <$fetchMaterialTexturesCoord1(matKey, _texCoord1, _SCRIBE_NULL, lightmapVal)$>
+
+
+    packDeferredFragmentLightmap(
+        normalize(_normal), 
+        evalOpaqueFinalAlpha(getMaterialOpacity(mat), albedo.a),
+        getMaterialAlbedo(mat) * albedo.rgb * _color,
+        getMaterialRoughness(mat) * roughness,
+        getMaterialMetallic(mat),
+        getMaterialFresnel(mat),
+        lightmapVal+fadeEmissive);
+}
diff --git a/libraries/render-utils/src/model_lightmap_fade.slv b/libraries/render-utils/src/model_lightmap_fade.slv
new file mode 100644
index 0000000000..561049d614
--- /dev/null
+++ b/libraries/render-utils/src/model_lightmap_fade.slv
@@ -0,0 +1,46 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  model_lightmap_fade.vert
+//  vertex shader
+//
+//  Created by Olivier Prat on 06/05/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+<@include gpu/Inputs.slh@>
+<@include gpu/Color.slh@>
+<@include gpu/Transform.slh@>
+<$declareStandardTransform()$>
+
+<@include MaterialTextures.slh@>
+<$declareMaterialTexMapArrayBuffer()$>
+
+out vec4 _position;
+out vec2 _texCoord0;
+out vec2 _texCoord1;
+out vec3 _normal;
+out vec3 _color;
+out vec4 _worldPosition;
+
+void main(void) {
+    // pass along the color in linear space
+    _color = colorToLinearRGB(inColor.xyz);
+
+    // and the texture coordinates
+    TexMapArray texMapArray = getTexMapArray();
+    <$evalTexMapArrayTexcoord0(texMapArray, inTexCoord0, _texCoord0)$>
+    <$evalTexMapArrayTexcoord1(texMapArray, inTexCoord1, _texCoord1)$>
+
+    // standard transform
+    TransformCamera cam = getTransformCamera();
+    TransformObject obj = getTransformObject();
+    <$transformModelToEyeAndClipPos(cam, obj, inPosition, _position, gl_Position)$>
+    <$transformModelToWorldPos(obj, inPosition, _worldPosition)$>
+    <$transformModelToWorldDir(cam, obj, inNormal.xyz, _normal)$>
+}
+
diff --git a/libraries/render-utils/src/model_lightmap_normal_map_fade.slf b/libraries/render-utils/src/model_lightmap_normal_map_fade.slf
new file mode 100644
index 0000000000..825e84d666
--- /dev/null
+++ b/libraries/render-utils/src/model_lightmap_normal_map_fade.slf
@@ -0,0 +1,57 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  model_lightmap_normal_map_fade.frag
+//  fragment shader
+//
+//  Created by Olivier Prat on 06/05/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+<@include DeferredBufferWrite.slh@>
+
+<@include model/Material.slh@>
+
+<@include MaterialTextures.slh@>
+<$declareMaterialTextures(ALBEDO, ROUGHNESS, NORMAL)$>
+<$declareMaterialLightmap()$>
+
+<@include Fade.slh@>
+<$declareFadeFragment()$>
+
+in vec4 _position;
+in vec2 _texCoord0;
+in vec2 _texCoord1;
+in vec3 _normal;
+in vec3 _tangent;
+in vec3 _color;
+in vec4 _worldPosition;
+
+void main(void) {
+    vec3 fadeEmissive;
+    FadeObjectParams fadeParams;
+
+    <$fetchFadeObjectParams(fadeParams)$>
+    applyFade(fadeParams, _worldPosition.xyz, fadeEmissive);
+
+    Material mat = getMaterial();
+    int matKey = getMaterialKey(mat);
+    <$fetchMaterialTexturesCoord0(matKey, _texCoord0, albedo, roughness, normalTexel)$>
+    <$fetchMaterialTexturesCoord1(matKey, _texCoord1, _SCRIBE_NULL, lightmapVal)$>
+
+    vec3 viewNormal;
+    <$tangentToViewSpaceLOD(_position, normalTexel, _normal, _tangent, viewNormal)$>
+
+    packDeferredFragmentLightmap(
+        normalize(viewNormal.xyz), 
+        evalOpaqueFinalAlpha(getMaterialOpacity(mat), albedo.a),
+        getMaterialAlbedo(mat) * albedo.rgb * _color,
+        getMaterialRoughness(mat),
+        getMaterialMetallic(mat),
+        getMaterialFresnel(mat),
+        lightmapVal+fadeEmissive);
+}
diff --git a/libraries/render-utils/src/model_lightmap_normal_map_fade.slv b/libraries/render-utils/src/model_lightmap_normal_map_fade.slv
new file mode 100644
index 0000000000..4049fb0077
--- /dev/null
+++ b/libraries/render-utils/src/model_lightmap_normal_map_fade.slv
@@ -0,0 +1,46 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  model_lightmap_normal_map_fade.vert
+//  vertex shader
+//
+//  Created by Olivier Prat on 06/05/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+<@include gpu/Inputs.slh@>
+<@include gpu/Color.slh@>
+<@include gpu/Transform.slh@>
+<$declareStandardTransform()$>
+
+<@include MaterialTextures.slh@>
+<$declareMaterialTexMapArrayBuffer()$>
+
+out vec4 _position;
+out vec2 _texCoord0;
+out vec2 _texCoord1;
+out vec3 _normal;
+out vec3 _tangent;
+out vec3 _color;
+out vec4 _worldPosition;
+
+void main(void) {
+    // pass along the color in linear space
+    _color = colorToLinearRGB(inColor.xyz);
+
+    TexMapArray texMapArray = getTexMapArray();
+    <$evalTexMapArrayTexcoord0(texMapArray, inTexCoord0, _texCoord0)$>
+    <$evalTexMapArrayTexcoord1(texMapArray, inTexCoord1, _texCoord1)$>
+
+    // standard transform
+    TransformCamera cam = getTransformCamera();
+    TransformObject obj = getTransformObject();
+    <$transformModelToEyeAndClipPos(cam, obj, inPosition, _position, gl_Position)$>
+    <$transformModelToWorldPos(obj, inPosition, _worldPosition)$>
+    <$transformModelToWorldDir(cam, obj, inNormal.xyz, _normal)$>
+    <$transformModelToWorldDir(cam, obj, inTangent.xyz, _tangent)$>
+}
diff --git a/libraries/render-utils/src/model_lightmap_normal_specular_map_fade.slf b/libraries/render-utils/src/model_lightmap_normal_specular_map_fade.slf
new file mode 100644
index 0000000000..791d5bf552
--- /dev/null
+++ b/libraries/render-utils/src/model_lightmap_normal_specular_map_fade.slf
@@ -0,0 +1,57 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  model_lightmap_normal_specular_map_fade.frag
+//  fragment shader
+//
+//  Created by Olivier Prat on 06/05/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+<@include DeferredBufferWrite.slh@>
+
+<@include model/Material.slh@>
+
+<@include MaterialTextures.slh@>
+<$declareMaterialTextures(ALBEDO, ROUGHNESS, NORMAL, METALLIC)$>
+<$declareMaterialLightmap()$>
+
+<@include Fade.slh@>
+<$declareFadeFragment()$>
+
+in vec4 _position;
+in vec2 _texCoord0;
+in vec2 _texCoord1;
+in vec3 _normal;
+in vec3 _tangent;
+in vec3 _color;
+in vec4 _worldPosition;
+
+void main(void) {
+    vec3 fadeEmissive;
+    FadeObjectParams fadeParams;
+
+    <$fetchFadeObjectParams(fadeParams)$>
+    applyFade(fadeParams, _worldPosition.xyz, fadeEmissive);
+
+    Material mat = getMaterial();
+    int matKey = getMaterialKey(mat);
+    <$fetchMaterialTexturesCoord0(matKey, _texCoord0, albedo, roughness, normalTexel, metallicTex)$>
+    <$fetchMaterialTexturesCoord1(matKey, _texCoord1, _SCRIBE_NULL, lightmapVal)$>
+    
+    vec3 viewNormal;
+    <$tangentToViewSpaceLOD(_position, normalTexel, _normal, _tangent, viewNormal)$>
+
+    packDeferredFragmentLightmap(
+        normalize(viewNormal.xyz), 
+        evalOpaqueFinalAlpha(getMaterialOpacity(mat), albedo.a),
+        getMaterialAlbedo(mat) * albedo.rgb * _color,
+        getMaterialRoughness(mat) * roughness,
+        getMaterialMetallic(mat) * metallicTex,
+        /*specular, // no use of */ getMaterialFresnel(mat),
+        lightmapVal+fadeEmissive);
+}
diff --git a/libraries/render-utils/src/model_lightmap_specular_map_fade.slf b/libraries/render-utils/src/model_lightmap_specular_map_fade.slf
new file mode 100644
index 0000000000..e82018eefb
--- /dev/null
+++ b/libraries/render-utils/src/model_lightmap_specular_map_fade.slf
@@ -0,0 +1,53 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  model_lightmap_specular_map_fade.frag
+//  fragment shader
+//
+//  Created by Olivier Prat on 06/05/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+<@include DeferredBufferWrite.slh@>
+
+<@include model/Material.slh@>
+
+<@include MaterialTextures.slh@>
+<$declareMaterialTextures(ALBEDO, ROUGHNESS, _SCRIBE_NULL, METALLIC)$>
+<$declareMaterialLightmap()$>
+
+<@include Fade.slh@>
+<$declareFadeFragment()$>
+
+in vec4 _position;
+in vec2 _texCoord0;
+in vec2 _texCoord1;
+in vec3 _normal;
+in vec3 _color;
+in vec4 _worldPosition;
+
+void main(void) {
+    vec3 fadeEmissive;
+    FadeObjectParams fadeParams;
+
+    <$fetchFadeObjectParams(fadeParams)$>
+    applyFade(fadeParams, _worldPosition.xyz, fadeEmissive);
+
+    Material mat = getMaterial();
+    int matKey = getMaterialKey(mat);
+    <$fetchMaterialTexturesCoord0(matKey, _texCoord0, albedo, roughness, _SCRIBE_NULL, metallicTex)$>
+    <$fetchMaterialTexturesCoord1(matKey, _texCoord1, _SCRIBE_NULL, lightmapVal)$>
+
+    packDeferredFragmentLightmap(
+        normalize(_normal), 
+        evalOpaqueFinalAlpha(getMaterialOpacity(mat), albedo.a),
+        getMaterialAlbedo(mat) * albedo.rgb * _color,
+        getMaterialRoughness(mat) * roughness,
+        getMaterialMetallic(mat) * metallicTex,
+        /*metallicTex, // no use of */getMaterialFresnel(mat),
+        lightmapVal+fadeEmissive);
+}
diff --git a/libraries/render-utils/src/model_normal_map_fade.slf b/libraries/render-utils/src/model_normal_map_fade.slf
new file mode 100644
index 0000000000..d8b864260c
--- /dev/null
+++ b/libraries/render-utils/src/model_normal_map_fade.slf
@@ -0,0 +1,74 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  model_normal_map_fade.frag
+//  fragment shader
+//
+//  Created by Olivier Prat on 04/19/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+<@include DeferredBufferWrite.slh@>
+
+<@include model/Material.slh@>
+
+<@include MaterialTextures.slh@>
+<$declareMaterialTextures(ALBEDO, ROUGHNESS, NORMAL, _SCRIBE_NULL, EMISSIVE, OCCLUSION, SCATTERING)$>
+
+<@include Fade.slh@>
+<$declareFadeFragment()$>
+
+in vec4 _position;
+in vec4 _worldPosition;
+in vec2 _texCoord0;
+in vec2 _texCoord1;
+in vec3 _normal;
+in vec3 _tangent;
+in vec3 _color;
+
+void main(void) {
+    vec3 fadeEmissive;
+    FadeObjectParams fadeParams;
+
+    <$fetchFadeObjectParams(fadeParams)$>
+    applyFade(fadeParams, _worldPosition.xyz, fadeEmissive);
+
+    Material mat = getMaterial();
+    int matKey = getMaterialKey(mat);
+    <$fetchMaterialTexturesCoord0(matKey, _texCoord0, albedoTex, roughnessTex, normalTex, _SCRIBE_NULL, emissiveTex, scatteringTex)$>
+    <$fetchMaterialTexturesCoord1(matKey, _texCoord1, occlusionTex)$>
+
+    float opacity = 1.0;
+    <$evalMaterialOpacity(albedoTex.a, opacity, matKey, opacity)$>;
+    <$discardTransparent(opacity)$>;
+
+    vec3 albedo = getMaterialAlbedo(mat);
+    <$evalMaterialAlbedo(albedoTex, albedo, matKey, albedo)$>;
+    albedo *= _color;
+
+    float roughness = getMaterialRoughness(mat);
+    <$evalMaterialRoughness(roughnessTex, roughness, matKey, roughness)$>;
+
+    vec3 emissive = getMaterialEmissive(mat);
+    <$evalMaterialEmissive(emissiveTex, emissive, matKey, emissive)$>;
+
+    vec3 viewNormal;
+   <$tangentToViewSpaceLOD(_position, normalTex, _normal, _tangent, viewNormal)$>
+
+    float scattering = getMaterialScattering(mat);
+    <$evalMaterialScattering(scatteringTex, scattering, matKey, scattering)$>;
+
+    packDeferredFragment(
+        viewNormal, 
+        opacity,
+        albedo,
+        roughness,
+        getMaterialMetallic(mat),
+        emissive+fadeEmissive,
+        occlusionTex,
+        scattering);
+}
diff --git a/libraries/render-utils/src/model_normal_map_fade.slv b/libraries/render-utils/src/model_normal_map_fade.slv
new file mode 100644
index 0000000000..a71900d5c3
--- /dev/null
+++ b/libraries/render-utils/src/model_normal_map_fade.slv
@@ -0,0 +1,48 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  model_normal_map_fade.vert
+//  vertex shader
+//
+//  Created by Olivier Prat on 04/24/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+<@include gpu/Inputs.slh@>
+<@include gpu/Color.slh@>
+<@include gpu/Transform.slh@>
+<$declareStandardTransform()$>
+
+<@include MaterialTextures.slh@>
+<$declareMaterialTexMapArrayBuffer()$>
+
+out vec4 _position;
+out vec4 _worldPosition;
+out vec2 _texCoord0;
+out vec2 _texCoord1;
+out vec3 _normal;
+out vec3 _tangent;
+out vec3 _color;
+out float _alpha;
+
+void main(void) {
+    // pass along the color
+    _color = colorToLinearRGB(inColor.rgb);
+    _alpha = inColor.a;
+
+    TexMapArray texMapArray = getTexMapArray();
+    <$evalTexMapArrayTexcoord0(texMapArray, inTexCoord0, _texCoord0)$>
+    <$evalTexMapArrayTexcoord1(texMapArray, inTexCoord0, _texCoord1)$>
+
+    // standard transform
+    TransformCamera cam = getTransformCamera();
+    TransformObject obj = getTransformObject();
+    <$transformModelToEyeAndClipPos(cam, obj, inPosition, _position, gl_Position)$>
+    <$transformModelToWorldPos(obj, inPosition, _worldPosition)$>
+    <$transformModelToWorldDir(cam, obj, inNormal.xyz, _normal)$>
+    <$transformModelToWorldDir(cam, obj, inTangent.xyz, _tangent)$>
+}
diff --git a/libraries/render-utils/src/model_normal_specular_map_fade.slf b/libraries/render-utils/src/model_normal_specular_map_fade.slf
new file mode 100644
index 0000000000..5492b24763
--- /dev/null
+++ b/libraries/render-utils/src/model_normal_specular_map_fade.slf
@@ -0,0 +1,76 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  model_normal_specular_map_fade.frag
+//  fragment shader
+//
+//  Created by Olivier Prat on 06/05/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+<@include DeferredBufferWrite.slh@>
+
+<@include model/Material.slh@>
+
+<@include MaterialTextures.slh@>
+<$declareMaterialTextures(ALBEDO, ROUGHNESS, NORMAL, METALLIC, EMISSIVE, OCCLUSION)$>
+
+<@include Fade.slh@>
+<$declareFadeFragment()$>
+
+in vec4 _position;
+in vec2 _texCoord0;
+in vec2 _texCoord1;
+in vec3 _normal;
+in vec3 _tangent;
+in vec3 _color;
+in vec4 _worldPosition;
+
+void main(void) {
+    vec3 fadeEmissive;
+    FadeObjectParams fadeParams;
+
+    <$fetchFadeObjectParams(fadeParams)$>
+    applyFade(fadeParams, _worldPosition.xyz, fadeEmissive);
+
+    Material mat = getMaterial();
+    int matKey = getMaterialKey(mat);
+    <$fetchMaterialTexturesCoord0(matKey, _texCoord0, albedoTex, roughnessTex, normalTex, metallicTex, emissiveTex)$>
+    <$fetchMaterialTexturesCoord1(matKey, _texCoord1, occlusionTex)$>
+
+    float opacity = 1.0;
+    <$evalMaterialOpacity(albedoTex.a, opacity, matKey, opacity)&>;
+    <$discardTransparent(opacity)$>;
+
+    vec3 albedo = getMaterialAlbedo(mat);
+    <$evalMaterialAlbedo(albedoTex, albedo, matKey, albedo)$>;
+    albedo *= _color;
+
+    float roughness = getMaterialRoughness(mat);
+    <$evalMaterialRoughness(roughnessTex, roughness, matKey, roughness)$>;
+
+    vec3 emissive = getMaterialEmissive(mat);
+    <$evalMaterialEmissive(emissiveTex, emissive, matKey, emissive)$>;
+
+    vec3 viewNormal;
+    <$tangentToViewSpaceLOD(_position, normalTex, _normal, _tangent, viewNormal)$>
+
+    float metallic = getMaterialMetallic(mat);
+    <$evalMaterialMetallic(metallicTex, metallic, matKey, metallic)$>;
+
+    float scattering = getMaterialScattering(mat);
+
+    packDeferredFragment(
+        normalize(viewNormal.xyz), 
+        opacity,
+        albedo,
+        roughness,
+        metallic,
+        emissive+fadeEmissive,
+        occlusionTex,
+        scattering);
+}
diff --git a/libraries/render-utils/src/model_shadow_fade.slf b/libraries/render-utils/src/model_shadow_fade.slf
new file mode 100644
index 0000000000..c00eed622c
--- /dev/null
+++ b/libraries/render-utils/src/model_shadow_fade.slf
@@ -0,0 +1,30 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  model_shadow_fade.frag
+//  fragment shader
+//
+//  Created by Olivier Prat on 06/05/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+<@include Fade.slh@>
+<$declareFadeFragment()$>
+
+layout(location = 0) out vec4 _fragColor;
+
+in vec4 _worldPosition;
+
+void main(void) {
+    FadeObjectParams fadeParams;
+
+    <$fetchFadeObjectParams(fadeParams)$>
+    applyFadeClip(fadeParams, _worldPosition.xyz);
+
+    // pass-through to set z-buffer
+    _fragColor = vec4(1.0, 1.0, 1.0, 0.0);
+}
diff --git a/libraries/entities-renderer/src/untextured_particle.slv b/libraries/render-utils/src/model_shadow_fade.slv
similarity index 67%
rename from libraries/entities-renderer/src/untextured_particle.slv
rename to libraries/render-utils/src/model_shadow_fade.slv
index 85f9d438bf..8762f1dd90 100644
--- a/libraries/entities-renderer/src/untextured_particle.slv
+++ b/libraries/render-utils/src/model_shadow_fade.slv
@@ -2,24 +2,28 @@
 <$VERSION_HEADER$>
 //  Generated on <$_SCRIBE_DATE$>
 //
-//  particle vertex shader
+//  model_shadow_fade.vert
+//  vertex shader
+//
+//  Created by Olivier Prat on 06/045/17.
+//  Copyright 2017 High Fidelity, Inc.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
 <@include gpu/Inputs.slh@>
-<@include gpu/Color.slh@>
+
 <@include gpu/Transform.slh@>
+
 <$declareStandardTransform()$>
 
-out vec4 _color;
+out vec4 _worldPosition;
 
 void main(void) {
-    // pass along the color
-    _color = colorToLinearRGBA(inColor);
-
+    // standard transform
     TransformCamera cam = getTransformCamera();
     TransformObject obj = getTransformObject();
     <$transformModelToClipPos(cam, obj, inPosition, gl_Position)$>
-}
\ No newline at end of file
+    <$transformModelToWorldPos(obj, inPosition, _worldPosition)$>
+}
diff --git a/libraries/render-utils/src/model_specular_map_fade.slf b/libraries/render-utils/src/model_specular_map_fade.slf
new file mode 100644
index 0000000000..6eb56c0929
--- /dev/null
+++ b/libraries/render-utils/src/model_specular_map_fade.slf
@@ -0,0 +1,72 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  model_specular_map_fade.frag
+//  fragment shader
+//
+//  Created by Olivier Prat on 06/05/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+<@include DeferredBufferWrite.slh@>
+
+<@include model/Material.slh@>
+
+<@include MaterialTextures.slh@>
+<$declareMaterialTextures(ALBEDO, ROUGHNESS, _SCRIBE_NULL, METALLIC, EMISSIVE, OCCLUSION)$>
+
+<@include Fade.slh@>
+<$declareFadeFragment()$>
+
+in vec4 _position;
+in vec2 _texCoord0;
+in vec2 _texCoord1;
+in vec3 _normal;
+in vec3 _color;
+in vec4 _worldPosition;
+
+void main(void) {
+    vec3 fadeEmissive;
+    FadeObjectParams fadeParams;
+
+    <$fetchFadeObjectParams(fadeParams)$>
+    applyFade(fadeParams, _worldPosition.xyz, fadeEmissive);
+
+    Material mat = getMaterial();
+    int matKey = getMaterialKey(mat);
+    <$fetchMaterialTexturesCoord0(matKey, _texCoord0, albedoTex, roughnessTex, _SCRIBE_NULL, metallicTex, emissiveTex)$>
+    <$fetchMaterialTexturesCoord1(matKey, _texCoord1, occlusionTex)$>
+
+    float opacity = 1.0;
+    <$evalMaterialOpacity(albedoTex.a, opacity, matKey, opacity)$>;
+    <$discardTransparent(opacity)$>;
+
+    vec3 albedo = getMaterialAlbedo(mat);
+    <$evalMaterialAlbedo(albedoTex, albedo, matKey, albedo)$>;
+    albedo *= _color;
+
+    float roughness = getMaterialRoughness(mat);
+    <$evalMaterialRoughness(roughnessTex, roughness, matKey, roughness)$>;
+
+    vec3 emissive = getMaterialEmissive(mat);
+    <$evalMaterialEmissive(emissiveTex, emissive, matKey, emissive)$>;
+
+    float metallic = getMaterialMetallic(mat);
+    <$evalMaterialMetallic(metallicTex, metallic, matKey, metallic)$>;
+
+    float scattering = getMaterialScattering(mat);
+
+    packDeferredFragment(
+        normalize(_normal), 
+        opacity,
+        albedo,
+        roughness,
+        metallic,
+        emissive+fadeEmissive,
+        occlusionTex,
+        scattering);
+}
diff --git a/libraries/render-utils/src/model_translucent_fade.slf b/libraries/render-utils/src/model_translucent_fade.slf
new file mode 100644
index 0000000000..c46b396ebc
--- /dev/null
+++ b/libraries/render-utils/src/model_translucent_fade.slf
@@ -0,0 +1,91 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  model_translucent_fade.frag
+//  fragment shader
+//
+//  Created by Olivier Prat on 06/05/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+<@include model/Material.slh@>
+
+<@include DeferredGlobalLight.slh@>
+
+<$declareEvalGlobalLightingAlphaBlended()$>
+
+<@include gpu/Transform.slh@>
+<$declareStandardCameraTransform()$>
+
+<@include MaterialTextures.slh@>
+<$declareMaterialTextures(ALBEDO, ROUGHNESS, _SCRIBE_NULL, _SCRIBE_NULL, EMISSIVE, OCCLUSION)$>
+
+<@include Fade.slh@>
+<$declareFadeFragment()$>
+
+in vec2 _texCoord0;
+in vec2 _texCoord1;
+in vec4 _position;
+in vec3 _normal;
+in vec3 _color;
+in float _alpha;
+in vec4 _worldPosition;
+
+out vec4 _fragColor;
+
+void main(void) {
+    vec3 fadeEmissive;
+    FadeObjectParams fadeParams;
+
+    <$fetchFadeObjectParams(fadeParams)$>
+    applyFade(fadeParams, _worldPosition.xyz, fadeEmissive);
+
+    Material mat = getMaterial();
+    int matKey = getMaterialKey(mat);
+    <$fetchMaterialTexturesCoord0(matKey, _texCoord0, albedoTex, roughnessTex, _SCRIBE_NULL, _SCRIBE_NULL, emissiveTex)$>
+    <$fetchMaterialTexturesCoord1(matKey, _texCoord1, occlusionTex)$>
+
+    float opacity = getMaterialOpacity(mat) * _alpha;
+    <$evalMaterialOpacity(albedoTex.a, opacity, matKey, opacity)$>;
+
+    vec3 albedo = getMaterialAlbedo(mat);
+    <$evalMaterialAlbedo(albedoTex, albedo, matKey, albedo)$>;
+    albedo *= _color;
+
+    float roughness = getMaterialRoughness(mat);
+    <$evalMaterialRoughness(roughnessTex, roughness, matKey, roughness)$>;
+
+    float metallic = getMaterialMetallic(mat);
+    vec3 fresnel = vec3(0.03); // Default Di-electric fresnel value
+    if (metallic <= 0.5) {
+        metallic = 0.0;
+    } else {
+        fresnel = albedo;
+        metallic = 1.0;
+    }
+
+    vec3 emissive = getMaterialEmissive(mat);
+    <$evalMaterialEmissive(emissiveTex, emissive, matKey, emissive)$>;
+
+    vec3 fragPosition = _position.xyz;
+    vec3 fragNormal = normalize(_normal);
+
+    TransformCamera cam = getTransformCamera();
+
+    _fragColor =  vec4(evalGlobalLightingAlphaBlended(
+        cam._viewInverse,
+        1.0,
+        occlusionTex,
+        fragPosition,
+        fragNormal,
+        albedo,
+        fresnel,
+        metallic,
+        emissive+fadeEmissive,
+        roughness, opacity),
+        opacity);
+}
diff --git a/libraries/render-utils/src/model_translucent_unlit_fade.slf b/libraries/render-utils/src/model_translucent_unlit_fade.slf
new file mode 100644
index 0000000000..6a77efe4ca
--- /dev/null
+++ b/libraries/render-utils/src/model_translucent_unlit_fade.slf
@@ -0,0 +1,50 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  model_translucent_unlit_fade.frag
+//  fragment shader
+//
+//  Created by Olivier Prat on 06/05/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+<@include model/Material.slh@>
+
+<@include MaterialTextures.slh@>
+<$declareMaterialTextures(ALBEDO, ROUGHNESS, _SCRIBE_NULL, _SCRIBE_NULL, EMISSIVE, OCCLUSION)$>
+<@include LightingModel.slh@>
+
+<@include Fade.slh@>
+<$declareFadeFragment()$>
+
+in vec2 _texCoord0;
+in vec3 _color;
+in float _alpha;
+in vec4 _worldPosition;
+
+out vec4 _fragColor;
+
+void main(void) {
+    vec3 fadeEmissive;
+    FadeObjectParams fadeParams;
+
+    <$fetchFadeObjectParams(fadeParams)$>
+    applyFade(fadeParams, _worldPosition.xyz, fadeEmissive);
+
+    Material mat = getMaterial();
+    int matKey = getMaterialKey(mat);
+    <$fetchMaterialTexturesCoord0(matKey, _texCoord0, albedoTex)$>
+
+    float opacity = getMaterialOpacity(mat) * _alpha;
+    <$evalMaterialOpacity(albedoTex.a, opacity, matKey, opacity)$>;
+
+    vec3 albedo = getMaterialAlbedo(mat);
+    <$evalMaterialAlbedo(albedoTex, albedo, matKey, albedo)$>;
+    albedo *= _color;
+    albedo += fadeEmissive;
+    _fragColor = vec4(albedo * isUnlitEnabled(), opacity);
+}
diff --git a/libraries/render-utils/src/model_unlit_fade.slf b/libraries/render-utils/src/model_unlit_fade.slf
new file mode 100644
index 0000000000..0fe9f2ebac
--- /dev/null
+++ b/libraries/render-utils/src/model_unlit_fade.slf
@@ -0,0 +1,54 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  model_unlit_fade.frag
+//  fragment shader
+//
+//  Created by Olivier Prat on 06/05/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+<@include DeferredBufferWrite.slh@>
+<@include LightingModel.slh@>
+<@include model/Material.slh@>
+
+<@include Fade.slh@>
+<$declareFadeFragment()$>
+
+<@include MaterialTextures.slh@>
+<$declareMaterialTextures(ALBEDO)$>
+
+in vec2 _texCoord0;
+in vec3 _normal;
+in vec3 _color;
+in float _alpha;
+in vec4 _worldPosition;
+
+void main(void) {
+    vec3 fadeEmissive;
+    FadeObjectParams fadeParams;
+
+    <$fetchFadeObjectParams(fadeParams)$>
+    applyFade(fadeParams, _worldPosition.xyz, fadeEmissive);
+
+    Material mat = getMaterial();
+    int matKey = getMaterialKey(mat);
+    <$fetchMaterialTexturesCoord0(matKey, _texCoord0, albedoTex)$>
+
+    float opacity = 1.0;
+    <$evalMaterialOpacity(albedoTex.a, opacity, matKey, opacity)$>;
+    <$discardTransparent(opacity)$>;
+
+    vec3 albedo = getMaterialAlbedo(mat);
+    <$evalMaterialAlbedo(albedoTex, albedo, matKey, albedo)$>;
+    albedo *= _color;
+    albedo += fadeEmissive;
+    packDeferredFragmentUnlit(
+        normalize(_normal), 
+        opacity,
+        albedo * isUnlitEnabled());
+}
diff --git a/libraries/render-utils/src/sdf_text3D.slf b/libraries/render-utils/src/sdf_text3D.slf
index f578895c85..8863e15b00 100644
--- a/libraries/render-utils/src/sdf_text3D.slf
+++ b/libraries/render-utils/src/sdf_text3D.slf
@@ -1,7 +1,7 @@
 <@include gpu/Config.slh@>
 <$VERSION_HEADER$>
 //  Generated on <$_SCRIBE_DATE$>
-//  sdf_text.frag
+//  sdf_text3D.frag
 //  fragment shader
 //
 //  Created by Bradley Austin Davis on 2015-02-04
@@ -38,18 +38,21 @@ void main() {
     // perform adaptive anti-aliasing of the edges
     // The larger we're rendering, the less anti-aliasing we need
     float s = smoothing * length(fwidth(_texCoord0));
-    float w = clamp( s, 0.0, 0.5);
+    float w = clamp(s, 0.0, 0.5);
     float a = smoothstep(0.5 - w, 0.5 + w, sdf);
     
-    // discard if unvisible
+    // discard if invisible
     if (a < 0.01) {
         discard;
     }
-    
-    packDeferredFragmentTranslucent(
+
+    packDeferredFragment(
         normalize(_normal),
         a * Color.a,
         Color.rgb,
-        DEFAULT_FRESNEL,
-        DEFAULT_ROUGHNESS);
+        DEFAULT_ROUGHNESS,
+        DEFAULT_METALLIC,
+        DEFAULT_EMISSIVE,
+        DEFAULT_OCCLUSION,
+        DEFAULT_SCATTERING);
 }
\ No newline at end of file
diff --git a/libraries/render-utils/src/sdf_text3D.slv b/libraries/render-utils/src/sdf_text3D.slv
index 29bc1a9e85..d9f6e0cdda 100644
--- a/libraries/render-utils/src/sdf_text3D.slv
+++ b/libraries/render-utils/src/sdf_text3D.slv
@@ -1,7 +1,7 @@
 <@include gpu/Config.slh@>
 <$VERSION_HEADER$>
 //  Generated on <$_SCRIBE_DATE$>
-//  sdf_text.vert
+//  sdf_text3D.vert
 //  vertex shader
 //
 //  Created by Brad Davis on 10/14/13.
@@ -27,5 +27,6 @@ void main() {
     TransformCamera cam = getTransformCamera();
     TransformObject obj = getTransformObject();
     <$transformModelToClipPos(cam, obj, inPosition, gl_Position)$>
-    <$transformModelToWorldDir(cam, obj, inNormal.xyz, _normal.xyz)$>
+    const vec3 normal = vec3(0, 0, 1);
+    <$transformModelToWorldDir(cam, obj, normal, _normal)$>
 }
\ No newline at end of file
diff --git a/libraries/render-utils/src/sdf_text3D_overlay.slf b/libraries/render-utils/src/sdf_text3D_transparent.slf
similarity index 80%
rename from libraries/render-utils/src/sdf_text3D_overlay.slf
rename to libraries/render-utils/src/sdf_text3D_transparent.slf
index d357b05e14..fc78ab3a37 100644
--- a/libraries/render-utils/src/sdf_text3D_overlay.slf
+++ b/libraries/render-utils/src/sdf_text3D_transparent.slf
@@ -1,7 +1,7 @@
 <@include gpu/Config.slh@>
 <$VERSION_HEADER$>
 //  Generated on <$_SCRIBE_DATE$>
-//  sdf_text.frag
+//  sdf_text3D_transparent.frag
 //  fragment shader
 //
 //  Created by Bradley Austin Davis on 2015-02-04
@@ -10,6 +10,8 @@
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 
+<@include DeferredBufferWrite.slh@>
+
 uniform sampler2D Font;
 uniform bool Outline;
 uniform vec4 Color;
@@ -18,8 +20,6 @@ uniform vec4 Color;
 in vec3 _normal;
 in vec2 _texCoord0;
 
-layout(location = 0) out vec4 _fragColor0;
-
 const float gamma = 2.2;
 const float smoothing = 32.0;
 const float interiorCutoff = 0.8;
@@ -38,15 +38,18 @@ void main() {
     // perform adaptive anti-aliasing of the edges
     // The larger we're rendering, the less anti-aliasing we need
     float s = smoothing * length(fwidth(_texCoord0));
-    float w = clamp( s, 0.0, 0.5);
+    float w = clamp(s, 0.0, 0.5);
     float a = smoothstep(0.5 - w, 0.5 + w, sdf);
     
-    // gamma correction for linear attenuation
-    a = pow(a, 1.0 / gamma);
-    
-    // discard if unvisible
+    // discard if invisible
     if (a < 0.01) {
         discard;
     }
-    _fragColor0 = vec4(Color.rgb, a);
+
+    packDeferredFragmentTranslucent(
+        normalize(_normal),
+        a * Color.a,
+        Color.rgb,
+        DEFAULT_FRESNEL,
+        DEFAULT_ROUGHNESS);
 }
\ No newline at end of file
diff --git a/libraries/render-utils/src/simple.slf b/libraries/render-utils/src/simple.slf
index 228560f394..fd45c6c134 100644
--- a/libraries/render-utils/src/simple.slf
+++ b/libraries/render-utils/src/simple.slf
@@ -72,16 +72,16 @@ void main(void) {
                 normal,
                 1.0,
                 diffuse,
-                max(0, 1.0 - shininess / 128.0),
+                max(0.0, 1.0 - shininess / 128.0),
                 DEFAULT_METALLIC,
                 specular,
-                specular);
+                vec3(clamp(emissiveAmount, 0.0, 1.0)));
         } else {
             packDeferredFragment(
                 normal,
                 1.0,
                 diffuse,
-                max(0, 1.0 - shininess / 128.0),
+                max(0.0, 1.0 - shininess / 128.0),
                 length(specular),
                 DEFAULT_EMISSIVE,
                 DEFAULT_OCCLUSION,
diff --git a/libraries/render-utils/src/simple_fade.slf b/libraries/render-utils/src/simple_fade.slf
new file mode 100644
index 0000000000..245d32e81e
--- /dev/null
+++ b/libraries/render-utils/src/simple_fade.slf
@@ -0,0 +1,101 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  simple_fade.frag
+//  fragment shader
+//
+//  Created by Olivier Prat on 06/05/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+<@include DeferredBufferWrite.slh@>
+<@include model/Material.slh@>
+
+<@include Fade.slh@>
+<$declareFadeFragmentInstanced()$>
+
+// the interpolated normal
+in vec3 _normal;
+in vec3 _modelNormal;
+in vec4 _color;
+in vec2 _texCoord0;
+in vec4 _position;
+in vec4 _worldPosition;
+
+//PROCEDURAL_COMMON_BLOCK
+
+#line 1001
+//PROCEDURAL_BLOCK
+
+#line 2030
+void main(void) {
+    vec3 fadeEmissive;
+    FadeObjectParams fadeParams;
+
+    <$fetchFadeObjectParamsInstanced(fadeParams)$>
+    applyFade(fadeParams, _worldPosition.xyz, fadeEmissive);
+
+    Material material = getMaterial();
+    vec3 normal = normalize(_normal.xyz); 
+    vec3 diffuse = _color.rgb; 
+    vec3 specular = DEFAULT_SPECULAR;
+    float shininess = DEFAULT_SHININESS;
+    float emissiveAmount = 0.0;
+
+#ifdef PROCEDURAL
+
+#ifdef PROCEDURAL_V1
+    specular = getProceduralColor().rgb;
+    // Procedural Shaders are expected to be Gamma corrected so let's bring back the RGB in linear space for the rest of the pipeline
+    //specular = pow(specular, vec3(2.2));
+    emissiveAmount = 1.0;
+#else 
+    emissiveAmount = getProceduralColors(diffuse, specular, shininess);
+#endif
+
+#endif
+
+    const float ALPHA_THRESHOLD = 0.999;
+    if (_color.a < ALPHA_THRESHOLD) {
+        if (emissiveAmount > 0.0) {
+            packDeferredFragmentTranslucent(
+                normal,
+                _color.a,
+                specular+fadeEmissive,
+                DEFAULT_FRESNEL,
+                DEFAULT_ROUGHNESS);
+        } else {
+            packDeferredFragmentTranslucent(
+                normal,
+                _color.a,
+                diffuse+fadeEmissive,
+                DEFAULT_FRESNEL,
+                DEFAULT_ROUGHNESS);
+        }
+    } else {
+        if (emissiveAmount > 0.0) {
+            packDeferredFragmentLightmap(
+                normal,
+                1.0,
+                diffuse+fadeEmissive,
+                max(0, 1.0 - shininess / 128.0),
+                DEFAULT_METALLIC,
+                specular,
+                specular);
+        } else {
+            packDeferredFragment(
+                normal,
+                1.0,
+                diffuse,
+                max(0, 1.0 - shininess / 128.0),
+                length(specular),
+                DEFAULT_EMISSIVE+fadeEmissive,
+                DEFAULT_OCCLUSION,
+                DEFAULT_SCATTERING);
+        }
+    }
+}
diff --git a/libraries/render-utils/src/simple_fade.slv b/libraries/render-utils/src/simple_fade.slv
new file mode 100644
index 0000000000..3d9eb2c812
--- /dev/null
+++ b/libraries/render-utils/src/simple_fade.slv
@@ -0,0 +1,44 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  simple_fade.vert
+//  vertex shader
+//
+//  Created by Olivier Prat on 06/04/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+<@include gpu/Inputs.slh@>
+<@include gpu/Color.slh@>
+<@include gpu/Transform.slh@>
+<$declareStandardTransform()$>
+
+<@include Fade.slh@>
+<$declareFadeVertexInstanced()$>
+
+// the interpolated normal
+out vec3 _normal;
+out vec3 _modelNormal;
+out vec4 _color;
+out vec2 _texCoord0;
+out vec4 _position;
+out vec4 _worldPosition;
+
+void main(void) {
+    _color = colorToLinearRGBA(inColor);
+    _texCoord0 = inTexCoord0.st;
+    _position = inPosition;
+    _modelNormal = inNormal.xyz;
+
+    // standard transform
+    TransformCamera cam = getTransformCamera();
+    TransformObject obj = getTransformObject();
+    <$transformModelToClipPos(cam, obj, inPosition, gl_Position)$>
+    <$transformModelToWorldPos(obj, inPosition, _worldPosition)$>
+    <$transformModelToWorldDir(cam, obj, inNormal.xyz, _normal)$>
+    <$passThroughFadeObjectParams()$>
+}
\ No newline at end of file
diff --git a/libraries/render-utils/src/simple_opaque_web_browser_overlay.slf b/libraries/render-utils/src/simple_opaque_web_browser_overlay.slf
deleted file mode 100644
index 6d4d35591f..0000000000
--- a/libraries/render-utils/src/simple_opaque_web_browser_overlay.slf
+++ /dev/null
@@ -1,30 +0,0 @@
-<@include gpu/Config.slh@>
-<$VERSION_HEADER$>
-//  Generated on <$_SCRIBE_DATE$>
-//
-//  simple_opaque_web_browser_overlay.slf
-//  fragment shader
-//
-//  Created by Anthony Thibault on 1/30/17.
-//  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
-//
-//  Same as simple_opaque_web_browser.slf except frame buffer is sRGB, so colorToLinearRGBA is not necessary.
-
-<@include gpu/Color.slh@>
-<@include DeferredBufferWrite.slh@>
-
-// the albedo texture
-uniform sampler2D originalTexture;
-
-// the interpolated normal
-in vec3 _normal;
-in vec4 _color;
-in vec2 _texCoord0;
-
-void main(void) {
-    vec4 texel = texture(originalTexture, _texCoord0.st);
-    _fragColor0 = vec4(_color.rgb * texel.rgb, 1.0);
-}
diff --git a/libraries/render-utils/src/simple_textured_fade.slf b/libraries/render-utils/src/simple_textured_fade.slf
new file mode 100644
index 0000000000..025fe5fca6
--- /dev/null
+++ b/libraries/render-utils/src/simple_textured_fade.slf
@@ -0,0 +1,66 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  simple_textured_fade.slf
+//  fragment shader
+//
+//  Created by Olivier Prat on 06/05/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+<@include gpu/Color.slh@>
+<@include DeferredBufferWrite.slh@>
+<@include model/Material.slh@>
+
+<@include Fade.slh@>
+
+// the albedo texture
+uniform sampler2D originalTexture;
+
+// the interpolated normal
+in vec3 _normal;
+in vec4 _color;
+in vec2 _texCoord0;
+in vec4 _worldPosition;
+
+// Declare after all samplers to prevent sampler location mix up with originalTexture
+<$declareFadeFragmentInstanced()$>
+
+void main(void) {
+    vec3 fadeEmissive;
+    FadeObjectParams fadeParams;
+
+    <$fetchFadeObjectParamsInstanced(fadeParams)$>
+    applyFade(fadeParams, _worldPosition.xyz, fadeEmissive);
+
+    vec4 texel = texture(originalTexture, _texCoord0);
+    float colorAlpha = _color.a;
+    if (_color.a <= 0.0) {
+        texel = colorToLinearRGBA(texel);
+        colorAlpha = -_color.a;
+    }
+
+    const float ALPHA_THRESHOLD = 0.999;
+    if (colorAlpha * texel.a < ALPHA_THRESHOLD) {
+        packDeferredFragmentTranslucent(
+            normalize(_normal),
+            colorAlpha * texel.a,
+            _color.rgb * texel.rgb + fadeEmissive,
+            DEFAULT_FRESNEL,
+            DEFAULT_ROUGHNESS);
+    } else {
+        packDeferredFragment(
+            normalize(_normal),
+            1.0,
+            _color.rgb * texel.rgb,
+            DEFAULT_ROUGHNESS,
+            DEFAULT_METALLIC,
+            DEFAULT_EMISSIVE + fadeEmissive,
+            DEFAULT_OCCLUSION,
+            DEFAULT_SCATTERING);
+    }
+}
\ No newline at end of file
diff --git a/libraries/render-utils/src/simple_textured_unlit_fade.slf b/libraries/render-utils/src/simple_textured_unlit_fade.slf
new file mode 100644
index 0000000000..6f03c6746f
--- /dev/null
+++ b/libraries/render-utils/src/simple_textured_unlit_fade.slf
@@ -0,0 +1,60 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  simple_textured_unlit_fade.frag
+//  fragment shader
+//
+//  Created by Olivier Prat on 06/05/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+<@include gpu/Color.slh@>
+<@include DeferredBufferWrite.slh@>
+
+<@include Fade.slh@>
+
+// the albedo texture
+uniform sampler2D originalTexture;
+
+// the interpolated normal
+in vec3 _normal;
+in vec4 _color;
+in vec2 _texCoord0;
+in vec4 _worldPosition;
+
+// Declare after all samplers to prevent sampler location mix up with originalTexture
+<$declareFadeFragmentInstanced()$>
+
+void main(void) {
+    vec3 fadeEmissive;
+    FadeObjectParams fadeParams;
+
+    <$fetchFadeObjectParamsInstanced(fadeParams)$>
+    applyFade(fadeParams, _worldPosition.xyz, fadeEmissive);
+
+    vec4 texel = texture(originalTexture, _texCoord0.st);
+    float colorAlpha = _color.a;
+    if (_color.a <= 0.0) {
+        texel = colorToLinearRGBA(texel);
+        colorAlpha = -_color.a;
+    }
+
+    const float ALPHA_THRESHOLD = 0.999;
+    if (colorAlpha * texel.a < ALPHA_THRESHOLD) {
+       packDeferredFragmentTranslucent(
+            normalize(_normal),
+            colorAlpha * texel.a,
+            _color.rgb * texel.rgb+fadeEmissive,
+            DEFAULT_FRESNEL,
+            DEFAULT_ROUGHNESS);
+    } else {
+        packDeferredFragmentUnlit(
+            normalize(_normal),
+            1.0,
+            _color.rgb * texel.rgb+fadeEmissive);
+    }
+}
\ No newline at end of file
diff --git a/libraries/render-utils/src/simple_transparent_textured_fade.slf b/libraries/render-utils/src/simple_transparent_textured_fade.slf
new file mode 100644
index 0000000000..20c7907bbe
--- /dev/null
+++ b/libraries/render-utils/src/simple_transparent_textured_fade.slf
@@ -0,0 +1,74 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  simple_transparent_textured_fade.slf
+//  fragment shader
+//
+//  Created by Olivier Prat on 06/05/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+<@include gpu/Color.slh@>
+
+<@include DeferredBufferWrite.slh@>
+<@include DeferredGlobalLight.slh@>
+<$declareEvalGlobalLightingAlphaBlended()$>
+
+<@include gpu/Transform.slh@>
+<$declareStandardCameraTransform()$>
+
+<@include Fade.slh@>
+
+// the albedo texture
+uniform sampler2D originalTexture;
+
+// the interpolated normal
+in vec4 _position;
+in vec3 _normal;
+in vec4 _color;
+in vec2 _texCoord0;
+in vec4 _worldPosition;
+
+// Declare after all samplers to prevent sampler location mix up with originalTexture
+<$declareFadeFragmentInstanced()$>
+
+void main(void) {
+    vec3 fadeEmissive;
+    FadeObjectParams fadeParams;
+
+    <$fetchFadeObjectParamsInstanced(fadeParams)$>
+    applyFade(fadeParams, _worldPosition.xyz, fadeEmissive);
+
+    vec4 texel = texture(originalTexture, _texCoord0.st);
+    float opacity = _color.a;
+    if (_color.a <= 0.0) {
+        texel = colorToLinearRGBA(texel);
+        opacity = -_color.a;
+    }
+    opacity *= texel.a;
+    vec3 albedo = _color.rgb * texel.rgb;
+
+    vec3 fragPosition = _position.xyz;
+    vec3 fragNormal = normalize(_normal);
+
+    TransformCamera cam = getTransformCamera();
+
+    _fragColor0 = vec4(evalGlobalLightingAlphaBlended(
+        cam._viewInverse,
+        1.0,
+        1.0,
+        fragPosition,
+        fragNormal,
+        albedo,
+        DEFAULT_FRESNEL,
+        0.0f,
+        fadeEmissive,
+        DEFAULT_ROUGHNESS,
+        opacity),
+        opacity);
+
+}
\ No newline at end of file
diff --git a/libraries/render-utils/src/simple_transparent_textured_unlit_fade.slf b/libraries/render-utils/src/simple_transparent_textured_unlit_fade.slf
new file mode 100644
index 0000000000..1c42a1f724
--- /dev/null
+++ b/libraries/render-utils/src/simple_transparent_textured_unlit_fade.slf
@@ -0,0 +1,47 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  simple_transparent_textured_unlit_fade.slf
+//  fragment shader
+//
+//  Created by Olivier Prat on 06/05/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+<@include gpu/Color.slh@>
+
+<@include Fade.slh@>
+
+// the albedo texture
+uniform sampler2D originalTexture;
+
+// the interpolated normal
+in vec3 _normal;
+in vec4 _color;
+in vec2 _texCoord0;
+in vec4 _worldPosition;
+
+layout(location = 0) out vec4 _fragColor0;
+
+// Declare after all samplers to prevent sampler location mix up with originalTexture
+<$declareFadeFragmentInstanced()$>
+
+void main(void) {
+    vec3 fadeEmissive;
+    FadeObjectParams fadeParams;
+
+    <$fetchFadeObjectParamsInstanced(fadeParams)$>
+    applyFade(fadeParams, _worldPosition.xyz, fadeEmissive);
+
+    vec4 texel = texture(originalTexture, _texCoord0.st);
+    float colorAlpha = _color.a;
+    if (_color.a <= 0.0) {
+        texel = colorToLinearRGBA(texel);
+        colorAlpha = -_color.a;
+    }
+    _fragColor0 = vec4(_color.rgb * texel.rgb+fadeEmissive, colorAlpha * texel.a);
+}
\ No newline at end of file
diff --git a/libraries/render-utils/src/simple_transparent_web_browser_overlay.slf b/libraries/render-utils/src/simple_transparent_web_browser_overlay.slf
deleted file mode 100644
index af52389d5b..0000000000
--- a/libraries/render-utils/src/simple_transparent_web_browser_overlay.slf
+++ /dev/null
@@ -1,31 +0,0 @@
-<@include gpu/Config.slh@>
-<$VERSION_HEADER$>
-//  Generated on <$_SCRIBE_DATE$>
-//
-//  simple_transparent_web_browser_overlay.slf
-//  fragment shader
-//
-//  Created by Anthony Thibault on 1/30/17.
-//  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
-//
-//  Same as simple_transparent_web_browser.slf except frame buffer is sRGB, So colorToLinearRGBA is not necessary.
-//
-
-<@include gpu/Color.slh@>
-<@include DeferredBufferWrite.slh@>
-
-// the albedo texture
-uniform sampler2D originalTexture;
-
-// the interpolated normal
-in vec3 _normal;
-in vec4 _color;
-in vec2 _texCoord0;
-
-void main(void) {
-    vec4 texel = texture(originalTexture, _texCoord0.st);
-    _fragColor0 = vec4(_color.rgb * texel.rgb, _color.a);
-}
diff --git a/libraries/render-utils/src/skin_model_fade.slv b/libraries/render-utils/src/skin_model_fade.slv
new file mode 100644
index 0000000000..fa8e1f8991
--- /dev/null
+++ b/libraries/render-utils/src/skin_model_fade.slv
@@ -0,0 +1,53 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  skin_model_fade.vert
+//  vertex shader
+//
+//  Created by Olivier Prat on 06/045/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+<@include gpu/Inputs.slh@>
+<@include gpu/Color.slh@>
+<@include gpu/Transform.slh@>
+<$declareStandardTransform()$>
+
+<@include Skinning.slh@>
+
+<@include MaterialTextures.slh@>
+<$declareMaterialTexMapArrayBuffer()$>
+
+out vec4 _position;
+out vec2 _texCoord0;
+out vec2 _texCoord1;
+out vec3 _normal;
+out vec3 _color;
+out float _alpha;
+out vec4 _worldPosition;
+
+void main(void) {
+    vec4 position = vec4(0.0, 0.0, 0.0, 0.0);
+    vec3 interpolatedNormal = vec3(0.0, 0.0, 0.0);
+
+    skinPositionNormal(inSkinClusterIndex, inSkinClusterWeight, inPosition, inNormal.xyz, position, interpolatedNormal);
+
+    // pass along the color
+    _color = colorToLinearRGB(inColor.rgb);
+    _alpha = inColor.a;
+
+    TexMapArray texMapArray = getTexMapArray();
+    <$evalTexMapArrayTexcoord0(texMapArray, inTexCoord0, _texCoord0)$>
+    <$evalTexMapArrayTexcoord1(texMapArray, inTexCoord0, _texCoord1)$>
+
+    // standard transform
+    TransformCamera cam = getTransformCamera();
+    TransformObject obj = getTransformObject();
+    <$transformModelToEyeAndClipPos(cam, obj, position, _position, gl_Position)$>
+    <$transformModelToWorldPos(obj, position, _worldPosition)$>
+    <$transformModelToWorldDir(cam, obj, interpolatedNormal.xyz, _normal.xyz)$>
+}
diff --git a/libraries/render-utils/src/skin_model_normal_map_fade.slv b/libraries/render-utils/src/skin_model_normal_map_fade.slv
new file mode 100644
index 0000000000..4e638866fc
--- /dev/null
+++ b/libraries/render-utils/src/skin_model_normal_map_fade.slv
@@ -0,0 +1,62 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  skin_model_normal_map_fade.vert
+//  vertex shader
+//
+//  Created by Olivier Prat on 06/045/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+<@include gpu/Inputs.slh@>
+<@include gpu/Color.slh@>
+<@include gpu/Transform.slh@>
+<$declareStandardTransform()$>
+
+<@include Skinning.slh@>
+
+<@include MaterialTextures.slh@>
+<$declareMaterialTexMapArrayBuffer()$>
+
+out vec4 _position;
+out vec2 _texCoord0;
+out vec2 _texCoord1;
+out vec3 _normal;
+out vec3 _tangent;
+out vec3 _color;
+out float _alpha;
+out vec4 _worldPosition;
+
+void main(void) {
+    vec4 position = vec4(0.0, 0.0, 0.0, 0.0);
+    vec4 interpolatedNormal = vec4(0.0, 0.0, 0.0, 0.0);
+    vec4 interpolatedTangent = vec4(0.0, 0.0, 0.0, 0.0);
+
+    skinPositionNormalTangent(inSkinClusterIndex, inSkinClusterWeight, inPosition, inNormal.xyz, inTangent.xyz, position, interpolatedNormal.xyz, interpolatedTangent.xyz);
+
+    // pass along the color
+    _color = colorToLinearRGB(inColor.rgb);
+    _alpha = inColor.a;
+
+    TexMapArray texMapArray = getTexMapArray();
+    <$evalTexMapArrayTexcoord0(texMapArray, inTexCoord0, _texCoord0)$>
+    <$evalTexMapArrayTexcoord1(texMapArray, inTexCoord0, _texCoord1)$>
+
+    interpolatedNormal = vec4(normalize(interpolatedNormal.xyz), 0.0);
+    interpolatedTangent = vec4(normalize(interpolatedTangent.xyz), 0.0);
+
+    // standard transform
+    TransformCamera cam = getTransformCamera();
+    TransformObject obj = getTransformObject();
+    <$transformModelToEyeAndClipPos(cam, obj, position, _position, gl_Position)$>
+    <$transformModelToWorldPos(obj, position, _worldPosition)$>
+    <$transformModelToWorldDir(cam, obj, interpolatedNormal.xyz, interpolatedNormal.xyz)$>
+    <$transformModelToWorldDir(cam, obj, interpolatedTangent.xyz, interpolatedTangent.xyz)$>
+
+    _normal = interpolatedNormal.xyz;
+    _tangent = interpolatedTangent.xyz;
+}
diff --git a/libraries/render-utils/src/skin_model_shadow.slf b/libraries/render-utils/src/skin_model_shadow.slf
index 178ea7b387..e464d6e6c8 100644
--- a/libraries/render-utils/src/skin_model_shadow.slf
+++ b/libraries/render-utils/src/skin_model_shadow.slf
@@ -2,7 +2,7 @@
 <$VERSION_HEADER$>
 //  Generated on <$_SCRIBE_DATE$>
 //
-//  model_shadow.frag
+//  skin_model_shadow.frag
 //  fragment shader
 //
 //  Created by Andrzej Kapolka on 3/24/14.
diff --git a/libraries/render-utils/src/skin_model_shadow_fade.slf b/libraries/render-utils/src/skin_model_shadow_fade.slf
new file mode 100644
index 0000000000..aaf29076b8
--- /dev/null
+++ b/libraries/render-utils/src/skin_model_shadow_fade.slf
@@ -0,0 +1,30 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  skin_model_shadow_fade.frag
+//  fragment shader
+//
+//  Created by Olivier Prat on 06/08/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+<@include Fade.slh@>
+<$declareFadeFragment()$>
+
+in vec4 _worldPosition;
+
+layout(location = 0) out vec4 _fragColor;
+
+void main(void) {
+    FadeObjectParams fadeParams;
+
+    <$fetchFadeObjectParams(fadeParams)$>
+    applyFadeClip(fadeParams, _worldPosition.xyz);
+
+    // pass-through to set z-buffer
+    _fragColor = vec4(1.0, 1.0, 1.0, 0.0);
+}
diff --git a/libraries/render-utils/src/skin_model_shadow_fade.slv b/libraries/render-utils/src/skin_model_shadow_fade.slv
new file mode 100644
index 0000000000..7b27263569
--- /dev/null
+++ b/libraries/render-utils/src/skin_model_shadow_fade.slv
@@ -0,0 +1,32 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  skin_model_shadow_fade.vert
+//  vertex shader
+//
+//  Created by Olivier Prat on 06/045/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+<@include gpu/Inputs.slh@>
+<@include gpu/Transform.slh@>
+<$declareStandardTransform()$>
+
+<@include Skinning.slh@>
+
+out vec4 _worldPosition;
+
+void main(void) {
+    vec4 position = vec4(0.0, 0.0, 0.0, 0.0);
+    skinPosition(inSkinClusterIndex, inSkinClusterWeight, inPosition, position);
+
+    // standard transform
+    TransformCamera cam = getTransformCamera();
+    TransformObject obj = getTransformObject();
+    <$transformModelToClipPos(cam, obj, position, gl_Position)$>
+    <$transformModelToWorldPos(obj, position, _worldPosition)$>
+}
diff --git a/libraries/render-utils/src/surfaceGeometry_copyDepth.slf b/libraries/render-utils/src/surfaceGeometry_copyDepth.slf
new file mode 100644
index 0000000000..9db8cdbb01
--- /dev/null
+++ b/libraries/render-utils/src/surfaceGeometry_copyDepth.slf
@@ -0,0 +1,20 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  Created by Olivier Prat on 08/08/17.
+//  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
+//
+
+uniform sampler2D depthMap;
+
+out vec4 outFragColor;
+
+void main(void) {
+	float Zdb = texelFetch(depthMap, ivec2(gl_FragCoord.xy), 0).x;
+	outFragColor = vec4(Zdb, 0.0, 0.0, 1.0);
+}
+
diff --git a/libraries/render-utils/src/surfaceGeometry_makeCurvature.slf b/libraries/render-utils/src/surfaceGeometry_makeCurvature.slf
index e96ac60b45..ecbc60b648 100644
--- a/libraries/render-utils/src/surfaceGeometry_makeCurvature.slf
+++ b/libraries/render-utils/src/surfaceGeometry_makeCurvature.slf
@@ -123,7 +123,7 @@ void main(void) {
 
     // Calculate dF/du and dF/dv
     vec2 viewportScale = perspectiveScale * getInvWidthHeight();
-    vec2 du = vec2( viewportScale.x * (stereoSide.w > 0.0 ? 0.5 : 1.0), 0.0f );
+    vec2 du = vec2( viewportScale.x * (float(stereoSide.w) > 0.0 ? 0.5 : 1.0), 0.0f );
     vec2 dv = vec2( 0.0f, viewportScale.y );
 
     vec4 dFdu = vec4(getWorldNormalDiff(frameTexcoordPos, du), getEyeDepthDiff(frameTexcoordPos, du));
diff --git a/libraries/render-utils/src/text/Font.cpp b/libraries/render-utils/src/text/Font.cpp
index f51a779066..8449c58c7c 100644
--- a/libraries/render-utils/src/text/Font.cpp
+++ b/libraries/render-utils/src/text/Font.cpp
@@ -9,10 +9,11 @@
 
 #include "sdf_text3D_vert.h"
 #include "sdf_text3D_frag.h"
-#include "sdf_text3D_overlay_frag.h"
+#include "sdf_text3D_transparent_frag.h"
 
 #include "../RenderUtilsLogging.h"
 #include "FontFamilies.h"
+#include "../StencilMaskPass.h"
 
 static std::mutex fontMutex;
 
@@ -224,13 +225,13 @@ void Font::setupGPU() {
         {
             auto vertexShader = gpu::Shader::createVertex(std::string(sdf_text3D_vert));
             auto pixelShader = gpu::Shader::createPixel(std::string(sdf_text3D_frag));
-            auto pixelShaderOverlay = gpu::Shader::createPixel(std::string(sdf_text3D_overlay_frag));
+            auto pixelShaderTransparent = gpu::Shader::createPixel(std::string(sdf_text3D_transparent_frag));
             gpu::ShaderPointer program = gpu::Shader::createProgram(vertexShader, pixelShader);
-            gpu::ShaderPointer programOverlay = gpu::Shader::createProgram(vertexShader, pixelShaderOverlay);
+            gpu::ShaderPointer programTransparent = gpu::Shader::createProgram(vertexShader, pixelShaderTransparent);
 
             gpu::Shader::BindingSet slotBindings;
             gpu::Shader::makeProgram(*program, slotBindings);
-            gpu::Shader::makeProgram(*programOverlay, slotBindings);
+            gpu::Shader::makeProgram(*programTransparent, slotBindings);
 
             _fontLoc = program->getTextures().findLocation("Font");
             _outlineLoc = program->getUniforms().findLocation("Outline");
@@ -239,15 +240,20 @@ void Font::setupGPU() {
             auto state = std::make_shared<gpu::State>();
             state->setCullMode(gpu::State::CULL_BACK);
             state->setDepthTest(true, true, gpu::LESS_EQUAL);
-            state->setBlendFunction(true,
+            state->setBlendFunction(false,
                 gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::INV_SRC_ALPHA,
                 gpu::State::FACTOR_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::ONE);
+            PrepareStencil::testMaskDrawShapeNoAA(*state);
             _pipeline = gpu::Pipeline::create(program, state);
 
-            auto layeredState = std::make_shared<gpu::State>();
-            layeredState->setCullMode(gpu::State::CULL_BACK);
-            layeredState->setDepthTest(true, true, gpu::LESS_EQUAL);
-            _layeredPipeline = gpu::Pipeline::create(programOverlay, layeredState);
+            auto transparentState = std::make_shared<gpu::State>();
+            transparentState->setCullMode(gpu::State::CULL_BACK);
+            transparentState->setDepthTest(true, true, gpu::LESS_EQUAL);
+            transparentState->setBlendFunction(true,
+                gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::INV_SRC_ALPHA,
+                gpu::State::FACTOR_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::ONE);
+            PrepareStencil::testMaskDrawShapeNoAA(*transparentState);
+            _transparentPipeline = gpu::Pipeline::create(programTransparent, transparentState);
         }
 
         // Sanity checks
@@ -361,7 +367,7 @@ void Font::drawString(gpu::Batch& batch, float x, float y, const QString& str, c
 
     setupGPU();
 
-    batch.setPipeline(layered ? _layeredPipeline : _pipeline);
+    batch.setPipeline(((*color).a < 1.0f || layered) ? _transparentPipeline : _pipeline);
     batch.setResourceTexture(_fontLoc, _texture);
     batch._glUniform1i(_outlineLoc, (effectType == OUTLINE_EFFECT));
     
diff --git a/libraries/render-utils/src/text/Font.h b/libraries/render-utils/src/text/Font.h
index 2b61f19492..a41f720f15 100644
--- a/libraries/render-utils/src/text/Font.h
+++ b/libraries/render-utils/src/text/Font.h
@@ -63,7 +63,7 @@ private:
 
     // gpu structures
     gpu::PipelinePointer _pipeline;
-    gpu::PipelinePointer _layeredPipeline;
+    gpu::PipelinePointer _transparentPipeline;
     gpu::TexturePointer _texture;
     gpu::Stream::FormatPointer _format;
     gpu::BufferPointer _verticesBuffer;
diff --git a/libraries/render/CMakeLists.txt b/libraries/render/CMakeLists.txt
index 561dff4290..8fd05bd320 100644
--- a/libraries/render/CMakeLists.txt
+++ b/libraries/render/CMakeLists.txt
@@ -2,8 +2,7 @@ set(TARGET_NAME render)
 AUTOSCRIBE_SHADER_LIB(gpu model)
 setup_hifi_library()
 
-link_hifi_libraries(shared ktx gpu model)
 # render needs octree only for getAccuracyAngle(float, int)
-include_hifi_library_headers(octree)
+link_hifi_libraries(shared ktx gpu model octree)
 
 target_nsight()
diff --git a/libraries/render/src/render/Args.h b/libraries/render/src/render/Args.h
index a75488ce7a..627d4f17b2 100644
--- a/libraries/render/src/render/Args.h
+++ b/libraries/render/src/render/Args.h
@@ -71,7 +71,6 @@ namespace render {
         Args() {}
 
         Args(const gpu::ContextPointer& context,
-            QSharedPointer<QObject> renderData = QSharedPointer<QObject>(nullptr),
             float sizeScale = 1.0f,
             int boundaryLevelAdjust = 0,
             RenderMode renderMode = DEFAULT_RENDER_MODE,
@@ -79,7 +78,6 @@ namespace render {
             DebugFlags debugFlags = RENDER_DEBUG_NONE,
             gpu::Batch* batch = nullptr) :
             _context(context),
-            _renderData(renderData),
             _sizeScale(sizeScale),
             _boundaryLevelAdjust(boundaryLevelAdjust),
             _renderMode(renderMode),
@@ -99,10 +97,11 @@ namespace render {
         void pushViewFrustum(const ViewFrustum& viewFrustum) { _viewFrustums.push(viewFrustum); }
         void popViewFrustum() { _viewFrustums.pop(); }
 
+        bool isStereo() const { return _displayMode != MONO; }
+
         std::shared_ptr<gpu::Context> _context;
         std::shared_ptr<gpu::Framebuffer> _blitFramebuffer;
-        std::shared_ptr<render::ShapePipeline> _pipeline;
-        QSharedPointer<QObject> _renderData;
+        std::shared_ptr<render::ShapePipeline> _shapePipeline;
         std::stack<ViewFrustum> _viewFrustums;
         glm::ivec4 _viewport { 0.0f, 0.0f, 1.0f, 1.0f };
         glm::vec3 _boomOffset { 0.0f, 0.0f, 1.0f };
@@ -113,12 +112,18 @@ namespace render {
         DebugFlags _debugFlags { RENDER_DEBUG_NONE };
         gpu::Batch* _batch = nullptr;
 
-        uint32_t _globalShapeKey { 0 };
+        uint32_t _globalShapeKey{ 0 };
+        uint32_t _itemShapeKey{ 0 };
         bool _enableTexturing { true };
 
+        bool _enableFade{ false };
+
         RenderDetails _details;
         render::ScenePointer _scene;
         int8_t _cameraMode { -1 };
+
+        std::function<void(gpu::Batch&, const gpu::TexturePointer&, bool mirror)> _hudOperator;
+        gpu::TexturePointer _hudTexture;
     };
 
 }
diff --git a/libraries/render/src/render/BlurTask.cpp b/libraries/render/src/render/BlurTask.cpp
index 0a6b3d16fc..2be6f8fad2 100644
--- a/libraries/render/src/render/BlurTask.cpp
+++ b/libraries/render/src/render/BlurTask.cpp
@@ -29,11 +29,10 @@ enum BlurShaderMapSlots {
     BlurTask_DepthSlot,
 };
 
-const float BLUR_NUM_SAMPLES = 7.0f;
-
 BlurParams::BlurParams() {
     Params params;
     _parametersBuffer = gpu::BufferView(std::make_shared<gpu::Buffer>(sizeof(Params), (const gpu::Byte*) &params));
+    setFilterGaussianTaps(3);
 }
 
 void BlurParams::setWidthHeight(int width, int height, bool isStereo) {
@@ -49,10 +48,10 @@ void BlurParams::setWidthHeight(int width, int height, bool isStereo) {
     }
 }
 
-void BlurParams::setTexcoordTransform(const glm::vec4 texcoordTransformViewport) {
-    auto texcoordTransform = _parametersBuffer.get<Params>().texcoordTransform;
-    if (texcoordTransformViewport != texcoordTransform) {
-        _parametersBuffer.edit<Params>().texcoordTransform = texcoordTransform;
+void BlurParams::setTexcoordTransform(glm::vec4 texcoordTransformViewport) {
+    auto& params = _parametersBuffer.get<Params>();
+    if (texcoordTransformViewport != params.texcoordTransform) {
+        _parametersBuffer.edit<Params>().texcoordTransform = texcoordTransformViewport;
     }
 }
 
@@ -60,7 +59,58 @@ void BlurParams::setFilterRadiusScale(float scale) {
     auto filterInfo = _parametersBuffer.get<Params>().filterInfo;
     if (scale != filterInfo.x) {
         _parametersBuffer.edit<Params>().filterInfo.x = scale;
-        _parametersBuffer.edit<Params>().filterInfo.y = scale / BLUR_NUM_SAMPLES;
+    }
+}
+
+void BlurParams::setFilterNumTaps(int count) {
+    assert(count <= BLUR_MAX_NUM_TAPS);
+    auto filterInfo = _parametersBuffer.get<Params>().filterInfo;
+    if (count != (int)filterInfo.y) {
+        _parametersBuffer.edit<Params>().filterInfo.y = count;
+    }
+}
+
+void BlurParams::setFilterTap(int index, float offset, float value) {
+    auto filterTaps = _parametersBuffer.edit<Params>().filterTaps;
+    assert(index < BLUR_MAX_NUM_TAPS);
+    filterTaps[index].x = offset;
+    filterTaps[index].y = value;
+}
+
+void BlurParams::setFilterGaussianTaps(int numHalfTaps, float sigma) {
+    auto& params = _parametersBuffer.edit<Params>();
+    const int numTaps = 2 * numHalfTaps + 1;
+    assert(numTaps <= BLUR_MAX_NUM_TAPS);
+    assert(sigma > 0.0f);
+    const float inverseTwoSigmaSquared = float(0.5 / double(sigma*sigma));
+    float totalWeight = 1.0f;
+    float weight;
+    float offset;
+    int i;
+
+    params.filterInfo.y = numTaps;
+    params.filterTaps[0].x = 0.0f;
+    params.filterTaps[0].y = 1.0f;
+
+    for (i = 0; i < numHalfTaps; i++) {
+        offset = i + 1;
+        weight = (float)exp(-offset*offset * inverseTwoSigmaSquared);
+        params.filterTaps[i + 1].x = offset;
+        params.filterTaps[i + 1].y = weight;
+        params.filterTaps[i + 1 + numHalfTaps].x = -offset;
+        params.filterTaps[i + 1 + numHalfTaps].y = weight;
+        totalWeight += 2 * weight;
+    }
+
+    // Tap weights will be normalized in shader because side cases on edges of screen
+    // won't have the same number of taps as in the center.
+}
+
+void BlurParams::setOutputAlpha(float value) {
+    value = glm::clamp(value, 0.0f, 1.0f);
+    auto filterInfo = _parametersBuffer.get<Params>().filterInfo;
+    if (value != filterInfo.z) {
+        _parametersBuffer.edit<Params>().filterInfo.z = value;
     }
 }
 
@@ -86,17 +136,23 @@ void BlurParams::setLinearDepthPosFar(float farPosDepth) {
 }
 
 
-BlurInOutResource::BlurInOutResource(bool generateOutputFramebuffer) :
-_generateOutputFramebuffer(generateOutputFramebuffer)
-{
-
+BlurInOutResource::BlurInOutResource(bool generateOutputFramebuffer, unsigned int downsampleFactor) :
+    _downsampleFactor(downsampleFactor),
+    _generateOutputFramebuffer(generateOutputFramebuffer) {
+    assert(downsampleFactor > 0);
 }
 
 bool BlurInOutResource::updateResources(const gpu::FramebufferPointer& sourceFramebuffer, Resources& blurringResources) {
     if (!sourceFramebuffer) {
         return false;
     }
-    if (_blurredFramebuffer && _blurredFramebuffer->getSize() != sourceFramebuffer->getSize()) {
+
+    auto blurBufferSize = sourceFramebuffer->getSize();
+    
+    blurBufferSize.x /= _downsampleFactor;
+    blurBufferSize.y /= _downsampleFactor;
+
+    if (_blurredFramebuffer && _blurredFramebuffer->getSize() != blurBufferSize) {
         _blurredFramebuffer.reset();
     }
 
@@ -108,7 +164,7 @@ bool BlurInOutResource::updateResources(const gpu::FramebufferPointer& sourceFra
         //    _blurredFramebuffer->setDepthStencilBuffer(sourceFramebuffer->getDepthStencilBuffer(), sourceFramebuffer->getDepthStencilBufferFormat());
         //}
         auto blurringSampler = gpu::Sampler(gpu::Sampler::FILTER_MIN_MAG_LINEAR_MIP_POINT);
-        auto blurringTarget = gpu::Texture::create2D(sourceFramebuffer->getRenderBuffer(0)->getTexelFormat(), sourceFramebuffer->getWidth(), sourceFramebuffer->getHeight(), gpu::Texture::SINGLE_MIP, blurringSampler);
+        auto blurringTarget = gpu::Texture::createRenderBuffer(sourceFramebuffer->getRenderBuffer(0)->getTexelFormat(), blurBufferSize.x, blurBufferSize.y, gpu::Texture::SINGLE_MIP, blurringSampler);
         _blurredFramebuffer->setRenderBuffer(0, blurringTarget);
     } 
 
@@ -117,7 +173,7 @@ bool BlurInOutResource::updateResources(const gpu::FramebufferPointer& sourceFra
     blurringResources.blurringTexture = _blurredFramebuffer->getRenderBuffer(0);
 
     if (_generateOutputFramebuffer) {
-        if (_outputFramebuffer && _outputFramebuffer->getSize() != sourceFramebuffer->getSize()) {
+        if (_outputFramebuffer && _outputFramebuffer->getSize() != blurBufferSize) {
             _outputFramebuffer.reset();
         }
 
@@ -131,7 +187,7 @@ bool BlurInOutResource::updateResources(const gpu::FramebufferPointer& sourceFra
                 _outputFramebuffer->setDepthStencilBuffer(sourceFramebuffer->getDepthStencilBuffer(), sourceFramebuffer->getDepthStencilBufferFormat());
             }*/
             auto blurringSampler = gpu::Sampler(gpu::Sampler::FILTER_MIN_MAG_LINEAR_MIP_POINT);
-            auto blurringTarget = gpu::Texture::create2D(sourceFramebuffer->getRenderBuffer(0)->getTexelFormat(), sourceFramebuffer->getWidth(), sourceFramebuffer->getHeight(), gpu::Texture::SINGLE_MIP, blurringSampler);
+            auto blurringTarget = gpu::Texture::createRenderBuffer(sourceFramebuffer->getRenderBuffer(0)->getTexelFormat(), blurBufferSize.x, blurBufferSize.y, gpu::Texture::SINGLE_MIP, blurringSampler);
             _outputFramebuffer->setRenderBuffer(0, blurringTarget);
         }
 
@@ -145,8 +201,8 @@ bool BlurInOutResource::updateResources(const gpu::FramebufferPointer& sourceFra
     return true;
 }
 
-BlurGaussian::BlurGaussian(bool generateOutputFramebuffer) :
-    _inOutResources(generateOutputFramebuffer)
+BlurGaussian::BlurGaussian(bool generateOutputFramebuffer, unsigned int downsampleFactor) :
+    _inOutResources(generateOutputFramebuffer, downsampleFactor)
 {
     _parameters = std::make_shared<BlurParams>();
 }
@@ -196,7 +252,16 @@ gpu::PipelinePointer BlurGaussian::getBlurHPipeline() {
 }
 
 void BlurGaussian::configure(const Config& config) {
+    auto state = getBlurHPipeline()->getState();
+
     _parameters->setFilterRadiusScale(config.filterScale);
+    _parameters->setOutputAlpha(config.mix);
+    if (config.mix < 1.0f) {
+        state->setBlendFunction(config.mix < 1.0f, gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::INV_SRC_ALPHA,
+                                gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::INV_SRC_ALPHA);
+    } else {
+        state->setBlendFunction(false);
+    }
 }
 
 
@@ -206,7 +271,6 @@ void BlurGaussian::run(const RenderContextPointer& renderContext, const gpu::Fra
 
     RenderArgs* args = renderContext->args;
 
-
     BlurInOutResource::Resources blurringResources;
     if (!_inOutResources.updateResources(sourceFramebuffer, blurringResources)) {
         // early exit if no valid blurring resources
@@ -216,14 +280,15 @@ void BlurGaussian::run(const RenderContextPointer& renderContext, const gpu::Fra
 
     auto blurVPipeline = getBlurVPipeline();
     auto blurHPipeline = getBlurHPipeline();
+    glm::ivec4 viewport { 0, 0, blurredFramebuffer->getWidth(), blurredFramebuffer->getHeight() };
 
-    _parameters->setWidthHeight(args->_viewport.z, args->_viewport.w, args->_context->isStereo());
-    glm::ivec2 textureSize(blurringResources.sourceTexture->getDimensions());
-    _parameters->setTexcoordTransform(gpu::Framebuffer::evalSubregionTexcoordTransformCoefficients(textureSize, args->_viewport));
+    glm::ivec2 textureSize = blurredFramebuffer->getSize();
+    _parameters->setWidthHeight(blurredFramebuffer->getWidth(), blurredFramebuffer->getHeight(), args->isStereo());
+    _parameters->setTexcoordTransform(gpu::Framebuffer::evalSubregionTexcoordTransformCoefficients(textureSize, viewport));
 
     gpu::doInBatch(args->_context, [=](gpu::Batch& batch) {
         batch.enableStereo(false);
-        batch.setViewportTransform(args->_viewport);
+        batch.setViewportTransform(viewport);
 
         batch.setUniformBuffer(BlurTask_ParamsSlot, _parameters->_parametersBuffer);
 
@@ -251,7 +316,7 @@ void BlurGaussian::run(const RenderContextPointer& renderContext, const gpu::Fra
 
 
 BlurGaussianDepthAware::BlurGaussianDepthAware(bool generateOutputFramebuffer, const BlurParamsPointer& params) :
-    _inOutResources(generateOutputFramebuffer),
+    _inOutResources(generateOutputFramebuffer, 1U),
     _parameters((params ? params : std::make_shared<BlurParams>()))
 {
 }
@@ -330,7 +395,7 @@ void BlurGaussianDepthAware::run(const RenderContextPointer& renderContext, cons
 
     auto sourceViewport = args->_viewport;
 
-    _parameters->setWidthHeight(sourceViewport.z, sourceViewport.w, args->_context->isStereo());
+    _parameters->setWidthHeight(sourceViewport.z, sourceViewport.w, args->isStereo());
     glm::ivec2 textureSize(blurringResources.sourceTexture->getDimensions());
     _parameters->setTexcoordTransform(gpu::Framebuffer::evalSubregionTexcoordTransformCoefficients(textureSize, sourceViewport));
     _parameters->setDepthPerspective(args->getViewFrustum().getProjection()[1][1]);
diff --git a/libraries/render/src/render/BlurTask.h b/libraries/render/src/render/BlurTask.h
index f023aabfe7..e8d268dc63 100644
--- a/libraries/render/src/render/BlurTask.h
+++ b/libraries/render/src/render/BlurTask.h
@@ -14,6 +14,8 @@
 
 #include "Engine.h"
 
+#include "BlurTask_shared.slh"
+
 namespace render {
 
 
@@ -25,6 +27,11 @@ public:
     void setTexcoordTransform(const glm::vec4 texcoordTransformViewport);
 
     void setFilterRadiusScale(float scale);
+    void setFilterNumTaps(int count);
+    // Tap 0 is considered the center of the kernel
+    void setFilterTap(int index, float offset, float value);
+    void setFilterGaussianTaps(int numHalfTaps, float sigma = 1.47f);
+    void setOutputAlpha(float value);
 
     void setDepthPerspective(float oneOverTan2FOV);
     void setDepthThreshold(float threshold);
@@ -40,7 +47,7 @@ public:
         // Viewport to Texcoord info, if the region of the blur (viewport) is smaller than the full frame
         glm::vec4 texcoordTransform{ 0.0f, 0.0f, 1.0f, 1.0f };
 
-        // Filter info (radius scale
+        // Filter info (radius scale, number of taps, output alpha)
         glm::vec4 filterInfo{ 1.0f, 0.0f, 0.0f, 0.0f };
 
         // Depth info (radius scale
@@ -52,6 +59,9 @@ public:
         // LinearDepth info is { f }
         glm::vec4 linearDepthInfo{ 0.0f };
 
+        // Taps (offset, weight)
+        glm::vec2 filterTaps[BLUR_MAX_NUM_TAPS];
+
         Params() {}
     };
     gpu::BufferView _parametersBuffer;
@@ -62,7 +72,7 @@ using BlurParamsPointer = std::shared_ptr<BlurParams>;
 
 class BlurInOutResource {
 public:
-    BlurInOutResource(bool generateOutputFramebuffer = false);
+    BlurInOutResource(bool generateOutputFramebuffer, unsigned int downsampleFactor);
 
     struct Resources {
         gpu::TexturePointer sourceTexture;
@@ -75,8 +85,9 @@ public:
 
     gpu::FramebufferPointer _blurredFramebuffer;
 
-    // the output framebuffer defined if the job needs to output the result in a new framebuffer and not in place in th einput buffer
+    // the output framebuffer defined if the job needs to output the result in a new framebuffer and not in place in the input buffer
     gpu::FramebufferPointer _outputFramebuffer;
+    unsigned int _downsampleFactor{ 1U };
     bool _generateOutputFramebuffer{ false };
 };
 
@@ -84,12 +95,15 @@ public:
 class BlurGaussianConfig : public Job::Config {
     Q_OBJECT
     Q_PROPERTY(bool enabled WRITE setEnabled READ isEnabled NOTIFY dirty) // expose enabled flag
-    Q_PROPERTY(float filterScale MEMBER filterScale NOTIFY dirty) // expose enabled flag
+    Q_PROPERTY(float filterScale MEMBER filterScale NOTIFY dirty)
+    Q_PROPERTY(float mix MEMBER mix NOTIFY dirty)
 public:
 
     BlurGaussianConfig() : Job::Config(true) {}
 
     float filterScale{ 0.2f };
+    float mix{ 1.0f };
+
 signals :
     void dirty();
 
@@ -102,11 +116,13 @@ public:
     using Config = BlurGaussianConfig;
     using JobModel = Job::ModelIO<BlurGaussian, gpu::FramebufferPointer, gpu::FramebufferPointer, Config>;
 
-    BlurGaussian(bool generateOutputFramebuffer = false);
+    BlurGaussian(bool generateOutputFramebuffer = false, unsigned int downsampleFactor = 1U);
 
     void configure(const Config& config);
     void run(const RenderContextPointer& renderContext, const gpu::FramebufferPointer& sourceFramebuffer, gpu::FramebufferPointer& blurredFramebuffer);
 
+    BlurParamsPointer getParameters() const { return _parameters; }
+
 protected:
 
     BlurParamsPointer _parameters;
diff --git a/libraries/render/src/render/BlurTask.slh b/libraries/render/src/render/BlurTask.slh
index de2614eb51..37f29496bd 100644
--- a/libraries/render/src/render/BlurTask.slh
+++ b/libraries/render/src/render/BlurTask.slh
@@ -9,17 +9,7 @@
 
 <@func declareBlurUniforms()@>
 
-#define NUM_TAPS 7
-#define NUM_TAPS_OFFSET 3.0f
-
-float uniformFilterWidth = 0.05f;
-
-const float gaussianDistributionCurve[NUM_TAPS] = float[](
-    0.383f, 0.006f, 0.061f, 0.242f, 0.242f, 0.061f, 0.006f
-);
-const float gaussianDistributionOffset[NUM_TAPS] = float[](
-    0.0f,  -3.0f,  -2.0f,  -1.0f,   1.0f,   2.0f,   3.0f
-);
+<@include BlurTask_shared.slh@>
 
 struct BlurParameters {
     vec4 resolutionInfo;
@@ -28,6 +18,7 @@ struct BlurParameters {
     vec4 depthInfo;
     vec4 stereoInfo;
     vec4 linearDepthInfo;
+    vec2 taps[BLUR_MAX_NUM_TAPS];
 };
 
 uniform blurParamsBuffer {
@@ -46,6 +37,25 @@ float getFilterScale() {
     return parameters.filterInfo.x;
 }
 
+int getFilterNumTaps() {
+    return int(parameters.filterInfo.y);
+}
+
+float getOutputAlpha() {
+    return parameters.filterInfo.z;
+}
+
+vec2 getFilterTap(int index) {
+    return parameters.taps[index];
+}
+
+float getFilterTapOffset(vec2 tap) {
+    return tap.x;
+}
+
+float getFilterTapWeight(vec2 tap) {
+    return tap.y;
+}
 
 float getDepthThreshold() {
     return parameters.depthInfo.x;
@@ -70,19 +80,29 @@ uniform sampler2D sourceMap;
 
 vec4 pixelShaderGaussian(vec2 texcoord, vec2 direction, vec2 pixelStep) {
     texcoord = evalTexcoordTransformed(texcoord);
-    vec4 sampleCenter = texture(sourceMap, texcoord);
 
     vec2 finalStep = getFilterScale() * direction * pixelStep;
     vec4 srcBlurred = vec4(0.0);
+    float totalWeight = 0.f;
+    int numTaps = getFilterNumTaps();
     
-    for(int i = 0; i < NUM_TAPS; i++) {
-        // Fetch color and depth for current sample.
-        vec2 sampleCoord = texcoord + (gaussianDistributionOffset[i] * finalStep);
-        vec4 srcSample = texture(sourceMap, sampleCoord);
-        // Accumulate.
-        srcBlurred += gaussianDistributionCurve[i] * srcSample;
+    for(int i = 0; i < numTaps; i++) {
+        vec2 tapInfo = getFilterTap(i);
+        // Fetch color for current sample.
+        vec2 sampleCoord = texcoord + (getFilterTapOffset(tapInfo) * finalStep);
+        if (all(greaterThanEqual(sampleCoord, vec2(0,0))) && all(lessThanEqual(sampleCoord, vec2(1.0,1.0)))) {
+            vec4 srcSample = texture(sourceMap, sampleCoord);
+            float weight = getFilterTapWeight(tapInfo);
+            // Accumulate.
+            srcBlurred += srcSample * weight;
+            totalWeight += weight;
+        }
     }
     
+    if (totalWeight>0.0) {
+        srcBlurred /= totalWeight;
+    }
+    srcBlurred.a = getOutputAlpha();
     return srcBlurred;
 }
 
@@ -95,15 +115,6 @@ vec4 pixelShaderGaussian(vec2 texcoord, vec2 direction, vec2 pixelStep) {
 uniform sampler2D sourceMap;
 uniform sampler2D depthMap;
 
-#define NUM_HALF_TAPS 4
-
-const float gaussianDistributionCurveHalf[NUM_HALF_TAPS] = float[](
-    0.383f, 0.242f, 0.061f, 0.006f
-);
-const float gaussianDistributionOffsetHalf[NUM_HALF_TAPS] = float[](
-    0.0f,  1.0f,   2.0f,   3.0f
-);
-
 vec4 pixelShaderGaussianDepthAware(vec2 texcoord, vec2 direction, vec2 pixelStep) {
     texcoord = evalTexcoordTransformed(texcoord);
     float sampleDepth = texture(depthMap, texcoord).x;
@@ -122,45 +133,36 @@ vec4 pixelShaderGaussianDepthAware(vec2 texcoord, vec2 direction, vec2 pixelStep
     float scale = distanceToProjectionWindow / sampleDepth;
 
     vec2 finalStep = filterScale * scale * direction * pixelStep;
+    int numTaps = getFilterNumTaps();
 
     // Accumulate the center sample
-    vec4 srcBlurred = gaussianDistributionCurve[0] * sampleCenter;
+    vec2 tapInfo = getFilterTap(0);
+    float totalWeight = getFilterTapWeight(tapInfo);
+    vec4 srcBlurred = sampleCenter * totalWeight;
+
+     for(int i = 1; i < numTaps; i++) {
+        tapInfo = getFilterTap(i);
 
-     for(int i = 1; i < NUM_TAPS; i++) {
         // Fetch color and depth for current sample.
-        vec2 sampleCoord = texcoord + (gaussianDistributionOffset[i] * finalStep);
-        float srcDepth = texture(depthMap, sampleCoord).x;
-        vec4 srcSample = texture(sourceMap, sampleCoord);
+        vec2 sampleCoord = texcoord + (getFilterTapOffset(tapInfo) * finalStep);
+        if (all(greaterThanEqual(sampleCoord, vec2(0,0))) && all(lessThanEqual(sampleCoord, vec2(1.0,1.0)))) {
+            float srcDepth = texture(depthMap, sampleCoord).x;
+            vec4 srcSample = texture(sourceMap, sampleCoord);
+            float weight = getFilterTapWeight(tapInfo);
        
-        // If the difference in depth is huge, we lerp color back.
-        float s = clamp(depthThreshold * distanceToProjectionWindow  * filterScale * abs(srcDepth - sampleDepth), 0.0, 1.0);
-        srcSample = mix(srcSample, sampleCenter, s);
+            // If the difference in depth is huge, we lerp color back.
+            float s = clamp(depthThreshold * distanceToProjectionWindow  * filterScale * abs(srcDepth - sampleDepth), 0.0, 1.0);
+            srcSample = mix(srcSample, sampleCenter, s);
 
-        // Accumulate.
-        srcBlurred += gaussianDistributionCurve[i] * srcSample;
+            // Accumulate.
+            srcBlurred += srcSample * weight;
+            totalWeight += weight;
+        }
     }   
-
-     /*
-    for(int i = 1; i < NUM_HALF_TAPS; i++) {
-        // Fetch color and depth for current sample.
-        vec2 texcoordOffset = (gaussianDistributionOffsetHalf[i] * finalStep);
-        
-        float srcDepthN = texture(depthMap, texcoord - texcoordOffset).x;
-        float srcDepthP = texture(depthMap, texcoord + texcoordOffset).x;
-        vec4 srcSampleN = texture(sourceMap, texcoord - texcoordOffset);
-        vec4 srcSampleP = texture(sourceMap, texcoord + texcoordOffset);
-       
-        // If the difference in depth is huge, we lerp color back.
-        float sN = clamp(depthThreshold * distanceToProjectionWindow  * filterScale * abs(srcDepthN - sampleDepth), 0.0, 1.0);
-        float sP = clamp(depthThreshold * distanceToProjectionWindow  * filterScale * abs(srcDepthP - sampleDepth), 0.0, 1.0);
-
-        srcSampleN = mix(srcSampleN, sampleCenter, sN);
-        srcSampleP = mix(srcSampleP, sampleCenter, sP);
-
-        // Accumulate.
-        srcBlurred += gaussianDistributionCurveHalf[i] * (srcSampleP + srcSampleN);
-    }*/
     
+    if (totalWeight>0.0) {
+        srcBlurred /= totalWeight;
+    }
     return srcBlurred;
 }
 
diff --git a/libraries/render/src/render/BlurTask_shared.slh b/libraries/render/src/render/BlurTask_shared.slh
new file mode 100644
index 0000000000..beca32c1be
--- /dev/null
+++ b/libraries/render/src/render/BlurTask_shared.slh
@@ -0,0 +1,10 @@
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  Created by Olivier Prat on 09/25/17.
+//  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
+//
+
+#define BLUR_MAX_NUM_TAPS 33
diff --git a/libraries/render/src/render/DrawSceneOctree.cpp b/libraries/render/src/render/DrawSceneOctree.cpp
index de5ff1f74c..36663a454a 100644
--- a/libraries/render/src/render/DrawSceneOctree.cpp
+++ b/libraries/render/src/render/DrawSceneOctree.cpp
@@ -151,7 +151,7 @@ void DrawSceneOctree::run(const RenderContextPointer& renderContext, const ItemS
             float angle = glm::degrees(getAccuracyAngle(args->_sizeScale, args->_boundaryLevelAdjust));
             Transform crosshairModel;
             crosshairModel.setTranslation(glm::vec3(0.0, 0.0, -1000.0));
-            crosshairModel.setScale(1000.0 * tan(glm::radians(angle))); // Scaling at the actual tan of the lod angle => Multiplied by TWO
+            crosshairModel.setScale(1000.0f * tanf(glm::radians(angle))); // Scaling at the actual tan of the lod angle => Multiplied by TWO
             batch.resetViewTransform();
             batch.setModelTransform(crosshairModel);
             batch.setPipeline(getDrawLODReticlePipeline());
diff --git a/libraries/render/src/render/DrawTask.cpp b/libraries/render/src/render/DrawTask.cpp
index b6f3440d5c..0f4137e38d 100755
--- a/libraries/render/src/render/DrawTask.cpp
+++ b/libraries/render/src/render/DrawTask.cpp
@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include <LogHandler.h>
+
 #include "DrawTask.h"
 #include "Logging.h"
 
@@ -18,7 +20,7 @@
 #include <PerfStat.h>
 #include <ViewFrustum.h>
 #include <gpu/Context.h>
-
+#include <gpu/StandardShaderLib.h>
 
 #include <drawItemBounds_vert.h>
 #include <drawItemBounds_frag.h>
@@ -42,24 +44,29 @@ void render::renderItems(const RenderContextPointer& renderContext, const ItemBo
 void renderShape(RenderArgs* args, const ShapePlumberPointer& shapeContext, const Item& item, const ShapeKey& globalKey) {
     assert(item.getKey().isShape());
     auto key = item.getShapeKey() | globalKey;
+    args->_itemShapeKey = key._flags.to_ulong();
     if (key.isValid() && !key.hasOwnPipeline()) {
-        args->_pipeline = shapeContext->pickPipeline(args, key);
-        if (args->_pipeline) {
+        args->_shapePipeline = shapeContext->pickPipeline(args, key);
+        if (args->_shapePipeline) {
+            args->_shapePipeline->prepareShapeItem(args, key, item);
             item.render(args);
         }
-        args->_pipeline = nullptr;
+        args->_shapePipeline = nullptr;
     } else if (key.hasOwnPipeline()) {
         item.render(args);
     } else {
         qCDebug(renderlogging) << "Item could not be rendered with invalid key" << key;
+        static QString repeatedCouldNotBeRendered = LogHandler::getInstance().addRepeatedMessageRegex(
+            "Item could not be rendered with invalid key.*");
     }
+    args->_itemShapeKey = 0;
 }
 
 void render::renderShapes(const RenderContextPointer& renderContext,
     const ShapePlumberPointer& shapeContext, const ItemBounds& inItems, int maxDrawnItems, const ShapeKey& globalKey) {
     auto& scene = renderContext->_scene;
     RenderArgs* args = renderContext->args;
-    
+
     int numItemsToDraw = (int)inItems.size();
     if (maxDrawnItems != -1) {
         numItemsToDraw = glm::min(numItemsToDraw, maxDrawnItems);
@@ -84,10 +91,10 @@ void render::renderStateSortShapes(const RenderContextPointer& renderContext,
     using SortedShapes = std::unordered_map<render::ShapeKey, std::vector<Item>, render::ShapeKey::Hash, render::ShapeKey::KeyEqual>;
     SortedPipelines sortedPipelines;
     SortedShapes sortedShapes;
-    std::vector<Item> ownPipelineBucket;
+    std::vector< std::tuple<Item,ShapeKey> > ownPipelineBucket;
 
     for (auto i = 0; i < numItemsToDraw; ++i) {
-        auto item = scene->getItem(inItems[i].id);
+        auto& item = scene->getItem(inItems[i].id);
 
         {
             assert(item.getKey().isShape());
@@ -99,8 +106,10 @@ void render::renderStateSortShapes(const RenderContextPointer& renderContext,
                 }
                 bucket.push_back(item);
             } else if (key.hasOwnPipeline()) {
-                ownPipelineBucket.push_back(item);
+                ownPipelineBucket.push_back( std::make_tuple(item, key) );
             } else {
+                static QString repeatedCouldNotBeRendered = LogHandler::getInstance().addRepeatedMessageRegex(
+                    "Item could not be rendered with invalid key.*");
                 qCDebug(renderlogging) << "Item could not be rendered with invalid key" << key;
             }
         }
@@ -109,18 +118,23 @@ void render::renderStateSortShapes(const RenderContextPointer& renderContext,
     // Then render
     for (auto& pipelineKey : sortedPipelines) {
         auto& bucket = sortedShapes[pipelineKey];
-        args->_pipeline = shapeContext->pickPipeline(args, pipelineKey);
-        if (!args->_pipeline) {
+        args->_shapePipeline = shapeContext->pickPipeline(args, pipelineKey);
+        if (!args->_shapePipeline) {
             continue;
         }
+        args->_itemShapeKey = pipelineKey._flags.to_ulong();
         for (auto& item : bucket) {
+            args->_shapePipeline->prepareShapeItem(args, pipelineKey, item);
             item.render(args);
         }
     }
-    args->_pipeline = nullptr;
-    for (auto& item : ownPipelineBucket) {
+    args->_shapePipeline = nullptr;
+    for (auto& itemAndKey : ownPipelineBucket) {
+        auto& item = std::get<0>(itemAndKey);
+        args->_itemShapeKey = std::get<1>(itemAndKey)._flags.to_ulong();
         item.render(args);
     }
+    args->_itemShapeKey = 0;
 }
 
 void DrawLight::run(const RenderContextPointer& renderContext, const ItemBounds& inLights) {
@@ -174,7 +188,7 @@ void DrawBounds::run(const RenderContextPointer& renderContext,
     if (!_drawBuffer) {
         _drawBuffer = std::make_shared<gpu::Buffer>(sizeOfItemBound);
     }
-    
+
     _drawBuffer->setData(numItems * sizeOfItemBound, (const gpu::Byte*) items.data());
 
     gpu::doInBatch(args->_context, [&](gpu::Batch& batch) {
@@ -201,3 +215,85 @@ void DrawBounds::run(const RenderContextPointer& renderContext,
     });
 }
 
+gpu::PipelinePointer DrawFrustum::_pipeline;
+gpu::BufferView DrawFrustum::_frustumMeshIndices;
+
+DrawFrustum::DrawFrustum(const glm::vec3& color) :
+    _color{ color } {
+    _frustumMeshVertices = gpu::BufferView(std::make_shared<gpu::Buffer>(sizeof(glm::vec3) * 8, nullptr), gpu::Element::VEC3F_XYZ);
+    _frustumMeshStream.addBuffer(_frustumMeshVertices._buffer, _frustumMeshVertices._offset, _frustumMeshVertices._stride);
+}
+
+void DrawFrustum::configure(const Config& configuration) {
+    _updateFrustum = !configuration.isFrozen;
+}
+
+void DrawFrustum::run(const render::RenderContextPointer& renderContext, const Input& input) {
+    assert(renderContext->args);
+    assert(renderContext->args->_context);
+
+    RenderArgs* args = renderContext->args;
+    if (input) {
+        const auto& frustum = *input;
+
+        static uint8_t indexData[] = { 0, 1, 2, 3, 0, 4, 5, 6, 7, 4, 5, 1, 2, 6, 7, 3 };
+
+        if (!_frustumMeshIndices._buffer) {
+            auto indices = std::make_shared<gpu::Buffer>(sizeof(indexData), indexData);
+            _frustumMeshIndices = gpu::BufferView(indices, gpu::Element(gpu::SCALAR, gpu::UINT8, gpu::INDEX));
+        }
+
+        if (!_pipeline) {
+            auto vs = gpu::StandardShaderLib::getDrawTransformVertexPositionVS();
+            auto ps = gpu::StandardShaderLib::getDrawColorPS();
+            gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
+
+            gpu::Shader::BindingSet slotBindings;
+            slotBindings.insert(gpu::Shader::Binding("color", 0));
+            gpu::Shader::makeProgram(*program, slotBindings);
+
+            gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+            state->setDepthTest(gpu::State::DepthTest(true, false));
+            _pipeline = gpu::Pipeline::create(program, state);
+        }
+
+        if (_updateFrustum) {
+            updateFrustum(frustum);
+        }
+
+        // Render the frustums in wireframe
+        gpu::doInBatch(args->_context, [&](gpu::Batch& batch) {
+            args->_batch = &batch;
+            batch.setViewportTransform(args->_viewport);
+            batch.setStateScissorRect(args->_viewport);
+
+            glm::mat4 projMat;
+            Transform viewMat;
+            args->getViewFrustum().evalProjectionMatrix(projMat);
+            args->getViewFrustum().evalViewTransform(viewMat);
+
+            batch.setProjectionTransform(projMat);
+            batch.setViewTransform(viewMat);
+            batch.setPipeline(_pipeline);
+            batch.setIndexBuffer(_frustumMeshIndices);
+
+            batch._glUniform4f(0, _color.x, _color.y, _color.z, 1.0f);
+            batch.setInputStream(0, _frustumMeshStream);
+            batch.drawIndexed(gpu::LINE_STRIP, sizeof(indexData) / sizeof(indexData[0]), 0U);
+
+            args->_batch = nullptr;
+        });
+    }
+}
+
+void DrawFrustum::updateFrustum(const ViewFrustum& frustum) {
+    auto& vertices = _frustumMeshVertices.edit<std::array<glm::vec3, 8U> >();
+    vertices[0] = frustum.getNearTopLeft();
+    vertices[1] = frustum.getNearTopRight();
+    vertices[2] = frustum.getNearBottomRight();
+    vertices[3] = frustum.getNearBottomLeft();
+    vertices[4] = frustum.getFarTopLeft();
+    vertices[5] = frustum.getFarTopRight();
+    vertices[6] = frustum.getFarBottomRight();
+    vertices[7] = frustum.getFarBottomLeft();
+}
diff --git a/libraries/render/src/render/DrawTask.h b/libraries/render/src/render/DrawTask.h
index 896ccef842..5d98c37c21 100755
--- a/libraries/render/src/render/DrawTask.h
+++ b/libraries/render/src/render/DrawTask.h
@@ -70,6 +70,43 @@ private:
     int _colorLocation { -1 };
 };
 
+class DrawFrustumConfig : public render::JobConfig {
+    Q_OBJECT
+        Q_PROPERTY(bool isFrozen MEMBER isFrozen NOTIFY dirty)
+public:
+
+    DrawFrustumConfig(bool enabled = false) : JobConfig(enabled) {}
+
+    bool isFrozen{ false };
+signals:
+    void dirty();
+
+};
+
+class DrawFrustum {
+public:
+    using Config = DrawFrustumConfig;
+    using Input = ViewFrustumPointer;
+    using JobModel = render::Job::ModelI<DrawFrustum, Input, Config>;
+
+    DrawFrustum(const glm::vec3& color = glm::vec3(1.0f, 1.0f, 1.0f));
+
+    void configure(const Config& configuration);
+    void run(const render::RenderContextPointer& renderContext, const Input& input);
+
+private:
+
+    static gpu::PipelinePointer _pipeline;
+    static gpu::BufferView _frustumMeshIndices;
+
+    bool _updateFrustum{ true };
+    gpu::BufferView _frustumMeshVertices;
+    gpu::BufferStream _frustumMeshStream;
+    glm::vec3 _color;
+
+    void updateFrustum(const ViewFrustum& frustum);
+};
+
 }
 
 #endif // hifi_render_DrawTask_h
diff --git a/libraries/render/src/render/Engine.h b/libraries/render/src/render/Engine.h
index 240693b422..1650d09c5d 100644
--- a/libraries/render/src/render/Engine.h
+++ b/libraries/render/src/render/Engine.h
@@ -16,7 +16,7 @@
 
 #include "Scene.h"
 #include "../task/Task.h"
-#include "gpu/Batch.h"
+#include <gpu/Batch.h>
 
 namespace render {
 
diff --git a/libraries/render/src/render/FilterTask.cpp b/libraries/render/src/render/FilterTask.cpp
index f6b765cd9d..20d29f3e5d 100644
--- a/libraries/render/src/render/FilterTask.cpp
+++ b/libraries/render/src/render/FilterTask.cpp
@@ -21,19 +21,24 @@
 
 using namespace render;
 
-void FilterLayeredItems::run(const RenderContextPointer& renderContext, const ItemBounds& inItems, ItemBounds& outItems) {
+void FilterLayeredItems::run(const RenderContextPointer& renderContext, const ItemBounds& inItems, Outputs& outputs) {
     auto& scene = renderContext->_scene;
 
-    // Clear previous values
-    outItems.clear();
+    ItemBounds matchedItems;
+    ItemBounds nonMatchItems;
 
     // For each item, filter it into one bucket
-    for (auto itemBound : inItems) {
+    for (auto& itemBound : inItems) {
         auto& item = scene->getItem(itemBound.id);
         if (item.getLayer() == _keepLayer) {
-            outItems.emplace_back(itemBound);
+            matchedItems.emplace_back(itemBound);
+        } else {
+            nonMatchItems.emplace_back(itemBound);
         }
     }
+
+    outputs.edit0() = matchedItems;
+    outputs.edit1() = nonMatchItems;
 }
 
 void SliceItems::run(const RenderContextPointer& renderContext, const ItemBounds& inItems, ItemBounds& outItems) {
@@ -51,13 +56,25 @@ void SliceItems::run(const RenderContextPointer& renderContext, const ItemBounds
 
 }
 
-void SelectItems::run(const RenderContextPointer& renderContext, const ItemBounds& inItems, ItemBounds& outItems) {
-    auto selection = renderContext->_scene->getSelection(_name);
+void SelectItems::run(const RenderContextPointer& renderContext, const Inputs& inputs, ItemBounds& outItems) {
+    auto selectionName{ _name };
+    if (!inputs.get2().empty()) {
+        selectionName = inputs.get2();
+    }
+
+    auto selection = renderContext->_scene->getSelection(selectionName);
     const auto& selectedItems = selection.getItems();
-    outItems.clear();
+    const auto& inItems = inputs.get0();
+    const auto itemsToAppend = inputs[1];
+
+    if (itemsToAppend.isNull()) {
+        outItems.clear();
+    } else {
+        outItems = itemsToAppend.get<ItemBounds>();
+    }
 
     if (!selectedItems.empty()) {
-        outItems.reserve(selectedItems.size());
+        outItems.reserve(outItems.size()+selectedItems.size());
 
         for (auto src : inItems) {
             if (selection.contains(src.id)) {
@@ -106,8 +123,28 @@ void MetaToSubItems::run(const RenderContextPointer& renderContext, const ItemBo
 
     for (auto idBound : inItems) {
         auto& item = scene->getItem(idBound.id);
-
-        item.fetchMetaSubItems(outItems);
+        if (item.exist()) {
+            item.fetchMetaSubItems(outItems);
+        }
     }
 }
 
+void IDsToBounds::run(const RenderContextPointer& renderContext, const ItemIDs& inItems, ItemBounds& outItems) {
+    auto& scene = renderContext->_scene;
+
+    // Now we have a selection of items to render
+    outItems.clear();
+
+    if (!_disableAABBs) {
+        for (auto id : inItems) {
+            auto& item = scene->getItem(id);
+            if (item.exist()) {
+                outItems.emplace_back(ItemBound{ id, item.getBound() });
+            }
+        }
+    } else {
+        for (auto id : inItems) {
+            outItems.emplace_back(ItemBound{ id });
+        }
+    }
+}
diff --git a/libraries/render/src/render/FilterTask.h b/libraries/render/src/render/FilterTask.h
index 1c4611ee9f..9b40728b00 100644
--- a/libraries/render/src/render/FilterTask.h
+++ b/libraries/render/src/render/FilterTask.h
@@ -65,15 +65,15 @@ namespace render {
     // Filter the items belonging to the job's keep layer
     class FilterLayeredItems {
     public:
-        using JobModel = Job::ModelIO<FilterLayeredItems, ItemBounds, ItemBounds>;
+        using Outputs = render::VaryingSet2<ItemBounds, ItemBounds>;
+        using JobModel = Job::ModelIO<FilterLayeredItems, ItemBounds, Outputs>;
 
-        FilterLayeredItems() {}
         FilterLayeredItems(int keepLayer) :
             _keepLayer(keepLayer) {}
 
-        int _keepLayer { 0 };
+        int _keepLayer;
 
-        void run(const RenderContextPointer& renderContext, const ItemBounds& inItems, ItemBounds& outItems);
+        void run(const RenderContextPointer& renderContext, const ItemBounds& inItems, Outputs& outputs);
     };
 
     // SliceItems job config defining the slice range
@@ -113,22 +113,24 @@ namespace render {
     // Keep items belonging to the job selection
     class SelectItems {
     public:
-        using JobModel = Job::ModelIO<SelectItems, ItemBounds, ItemBounds>;
+        using Inputs = VaryingSet3<ItemBounds, ItemBounds, std::string>;
+        using JobModel = Job::ModelIO<SelectItems, Inputs, ItemBounds>;
         
         std::string _name;
+        SelectItems() {}
         SelectItems(const Selection::Name& name) : _name(name) {}
-        
-        void run(const RenderContextPointer& renderContext, const ItemBounds& inItems, ItemBounds& outItems);
+
+        void run(const RenderContextPointer& renderContext, const Inputs& inputs, ItemBounds& outItems);
     };
 
     // Same as SelectItems but reorder the output to match the selection order
     class SelectSortItems {
     public:
         using JobModel = Job::ModelIO<SelectSortItems, ItemBounds, ItemBounds>;
-        
+
         std::string _name;
         SelectSortItems(const Selection::Name& name) : _name(name) {}
-        
+
         void run(const RenderContextPointer& renderContext, const ItemBounds& inItems, ItemBounds& outItems);
     };
 
@@ -142,6 +144,19 @@ namespace render {
         void run(const RenderContextPointer& renderContext, const ItemBounds& inItems, ItemIDs& outItems);
     };
 
+    // From item IDs build item bounds
+    class IDsToBounds {
+    public:
+        using JobModel = Job::ModelIO<IDsToBounds, ItemIDs, ItemBounds>;
+
+        IDsToBounds(bool disableAABBs = false) : _disableAABBs(disableAABBs) {}
+
+        void run(const RenderContextPointer& renderContext, const ItemIDs& inItems, ItemBounds& outItems);
+
+    private:
+        bool _disableAABBs{ false };
+    };
+
 }
 
 #endif // hifi_render_FilterTask_h;
\ No newline at end of file
diff --git a/libraries/render/src/render/Forward.h b/libraries/render/src/render/Forward.h
index 4aba074d1e..4fb9251247 100644
--- a/libraries/render/src/render/Forward.h
+++ b/libraries/render/src/render/Forward.h
@@ -11,12 +11,24 @@
 #define hifi_render_Forward_h
 
 #include <memory>
+#include <vector>
+#include <set>
+#include <cstdint>
 
 namespace render {
+    class Args;
+
+    using ItemID = uint32_t;
+    using ItemCell = int32_t;
+
+    // A few typedefs for standard containers of ItemIDs
+    using ItemIDs = std::vector<ItemID>;
+    using ItemIDSet = std::set<ItemID>;
+
     class Scene;
     using ScenePointer = std::shared_ptr<Scene>;
     class ShapePipeline;
-    class Args;
+    class Transaction;
 }
 
 using RenderArgs = render::Args;
diff --git a/libraries/render/src/render/HighlightStage.cpp b/libraries/render/src/render/HighlightStage.cpp
new file mode 100644
index 0000000000..ade3844321
--- /dev/null
+++ b/libraries/render/src/render/HighlightStage.cpp
@@ -0,0 +1,130 @@
+#include "HighlightStage.h"
+
+using namespace render;
+
+std::string HighlightStage::_name("Highlight");
+const HighlightStage::Index HighlightStage::INVALID_INDEX{ render::indexed_container::INVALID_INDEX };
+
+HighlightStage::Index HighlightStage::addHighlight(const std::string& selectionName, const HighlightStyle& style) {
+    Highlight outline{ selectionName, style };
+    Index id;
+
+    id = _highlights.newElement(outline);
+    _activeHighlightIds.push_back(id);
+
+    return id;
+}
+
+void HighlightStage::removeHighlight(Index index) {
+    HighlightIdList::iterator  idIterator = std::find(_activeHighlightIds.begin(), _activeHighlightIds.end(), index);
+    if (idIterator != _activeHighlightIds.end()) {
+        _activeHighlightIds.erase(idIterator);
+    }
+    if (!_highlights.isElementFreed(index)) {
+        _highlights.freeElement(index);
+    }
+}
+
+Index HighlightStage::getHighlightIdBySelection(const std::string& selectionName) const {
+    for (auto outlineId : _activeHighlightIds) {
+        const auto& outline = _highlights.get(outlineId);
+        if (outline._selectionName == selectionName) {
+            return outlineId;
+        }
+    }
+    return INVALID_INDEX;
+}
+
+const HighlightStyle& HighlightStageConfig::getStyle() const {
+    auto styleIterator = _styles.find(_selectionName);
+    if (styleIterator != _styles.end()) {
+        return styleIterator->second;
+    } else {
+        auto insertion = _styles.insert(SelectionStyles::value_type{ _selectionName, HighlightStyle{} });
+        return insertion.first->second;
+    }
+}
+
+HighlightStyle& HighlightStageConfig::editStyle() {
+    auto styleIterator = _styles.find(_selectionName);
+    if (styleIterator != _styles.end()) {
+        return styleIterator->second;
+    } else {
+        auto insertion = _styles.insert(SelectionStyles::value_type{ _selectionName, HighlightStyle{} });
+        return insertion.first->second;
+    }
+}
+
+void HighlightStageConfig::setSelectionName(const QString& name) {
+    _selectionName = name.toStdString();
+    emit dirty();
+}
+
+void HighlightStageConfig::setOutlineSmooth(bool isSmooth) {
+    editStyle().isOutlineSmooth = isSmooth;
+    emit dirty();
+}
+
+void HighlightStageConfig::setColorRed(float value) {
+    editStyle().color.r = value;
+    emit dirty();
+}
+
+void HighlightStageConfig::setColorGreen(float value) {
+    editStyle().color.g = value;
+    emit dirty();
+}
+
+void HighlightStageConfig::setColorBlue(float value) {
+    editStyle().color.b = value;
+    emit dirty();
+}
+
+void HighlightStageConfig::setOutlineWidth(float value) {
+    editStyle().outlineWidth = value;
+    emit dirty();
+}
+
+void HighlightStageConfig::setOutlineIntensity(float value) {
+    editStyle().outlineIntensity = value;
+    emit dirty();
+}
+
+void HighlightStageConfig::setUnoccludedFillOpacity(float value) {
+    editStyle().unoccludedFillOpacity = value;
+    emit dirty();
+}
+
+void HighlightStageConfig::setOccludedFillOpacity(float value) {
+    editStyle().occludedFillOpacity = value;
+    emit dirty();
+}
+
+HighlightStageSetup::HighlightStageSetup() {
+}
+
+void HighlightStageSetup::configure(const Config& config) {
+    // Copy the styles here but update the stage with the new styles in run to be sure everything is
+    // thread safe...
+    _styles = config._styles;
+}
+
+void HighlightStageSetup::run(const render::RenderContextPointer& renderContext) {
+    auto stage = renderContext->_scene->getStage<HighlightStage>(HighlightStage::getName());
+    if (!stage) {
+        stage = std::make_shared<HighlightStage>();
+        renderContext->_scene->resetStage(HighlightStage::getName(), stage);
+    }
+
+    if (!_styles.empty()) {
+        render::Transaction transaction;
+        for (const auto& selection : _styles) {
+            auto& selectionName = selection.first;
+            auto& selectionStyle = selection.second;
+            transaction.resetSelectionHighlight(selectionName, selectionStyle);
+        }
+        renderContext->_scene->enqueueTransaction(transaction);
+        _styles.clear();
+    }
+}
+
diff --git a/libraries/render/src/render/HighlightStage.h b/libraries/render/src/render/HighlightStage.h
new file mode 100644
index 0000000000..b35fff654c
--- /dev/null
+++ b/libraries/render/src/render/HighlightStage.h
@@ -0,0 +1,135 @@
+//
+//  HighlightStage.h
+
+//  Created by Olivier Prat on 07/07/2017.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_render_utils_HighlightStage_h
+#define hifi_render_utils_HighlightStage_h
+
+#include "Stage.h"
+#include "Engine.h"
+#include "IndexedContainer.h"
+#include "HighlightStyle.h"
+
+namespace render {
+
+    // Highlight stage to set up HighlightStyle-related effects
+    class HighlightStage : public Stage {
+    public:
+
+        class Highlight {
+        public:
+
+            Highlight(const std::string& selectionName, const HighlightStyle& style) : _selectionName{ selectionName }, _style{ style } { }
+
+            std::string _selectionName;
+            HighlightStyle _style;
+
+        };
+
+        static const std::string& getName() { return _name; }
+
+        using Index = render::indexed_container::Index;
+        static const Index INVALID_INDEX;
+        using HighlightIdList = render::indexed_container::Indices;
+
+        static bool isIndexInvalid(Index index) { return index == INVALID_INDEX; }
+
+        bool checkHighlightId(Index index) const { return _highlights.checkIndex(index); }
+
+        const Highlight& getHighlight(Index index) const { return _highlights.get(index); }
+        Highlight& editHighlight(Index index) { return _highlights.edit(index); }
+
+        Index addHighlight(const std::string& selectionName, const HighlightStyle& style = HighlightStyle());
+        Index getHighlightIdBySelection(const std::string& selectionName) const;
+        void removeHighlight(Index index);
+
+        HighlightIdList::iterator begin() { return _activeHighlightIds.begin(); }
+        HighlightIdList::iterator end() { return _activeHighlightIds.end(); }
+
+    private:
+
+        using Highlights = render::indexed_container::IndexedVector<Highlight>;
+
+        static std::string _name;
+
+        Highlights _highlights;
+        HighlightIdList _activeHighlightIds;
+    };
+    using HighlightStagePointer = std::shared_ptr<HighlightStage>;
+
+    class HighlightStageConfig : public render::Job::Config {
+        Q_OBJECT
+            Q_PROPERTY(QString selectionName READ getSelectionName WRITE setSelectionName NOTIFY dirty)
+            Q_PROPERTY(bool isOutlineSmooth READ isOutlineSmooth WRITE setOutlineSmooth NOTIFY dirty)
+            Q_PROPERTY(float colorR READ getColorRed WRITE setColorRed NOTIFY dirty)
+            Q_PROPERTY(float colorG READ getColorGreen WRITE setColorGreen NOTIFY dirty)
+            Q_PROPERTY(float colorB READ getColorBlue WRITE setColorBlue NOTIFY dirty)
+            Q_PROPERTY(float outlineWidth READ getOutlineWidth WRITE setOutlineWidth NOTIFY dirty)
+            Q_PROPERTY(float outlineIntensity READ getOutlineIntensity WRITE setOutlineIntensity NOTIFY dirty)
+            Q_PROPERTY(float unoccludedFillOpacity READ getUnoccludedFillOpacity WRITE setUnoccludedFillOpacity NOTIFY dirty)
+            Q_PROPERTY(float occludedFillOpacity READ getOccludedFillOpacity WRITE setOccludedFillOpacity NOTIFY dirty)
+
+    public:
+
+        using SelectionStyles = std::map<std::string, HighlightStyle>;
+
+        QString getSelectionName() const { return QString(_selectionName.c_str()); }
+        void setSelectionName(const QString& name);
+
+        bool isOutlineSmooth() const { return getStyle().isOutlineSmooth; }
+        void setOutlineSmooth(bool isSmooth);
+
+        float getColorRed() const { return getStyle().color.r; }
+        void setColorRed(float value);
+
+        float getColorGreen() const { return getStyle().color.g; }
+        void setColorGreen(float value);
+
+        float getColorBlue() const { return getStyle().color.b; }
+        void setColorBlue(float value);
+
+        float getOutlineWidth() const { return getStyle().outlineWidth; }
+        void setOutlineWidth(float value);
+
+        float getOutlineIntensity() const { return getStyle().outlineIntensity; }
+        void setOutlineIntensity(float value);
+
+        float getUnoccludedFillOpacity() const { return getStyle().unoccludedFillOpacity; }
+        void setUnoccludedFillOpacity(float value);
+
+        float getOccludedFillOpacity() const { return getStyle().occludedFillOpacity; }
+        void setOccludedFillOpacity(float value);
+
+        std::string _selectionName{ "contextOverlayHighlightList" };
+        mutable SelectionStyles _styles;
+
+        const HighlightStyle& getStyle() const;
+        HighlightStyle& editStyle();
+
+    signals:
+        void dirty();
+    };
+
+    class HighlightStageSetup {
+    public:
+        using Config = HighlightStageConfig;
+        using JobModel = render::Job::Model<HighlightStageSetup, Config>;
+
+        HighlightStageSetup();
+
+        void configure(const Config& config);
+        void run(const RenderContextPointer& renderContext);
+
+    protected:
+
+        HighlightStageConfig::SelectionStyles _styles;
+    };
+
+}
+#endif // hifi_render_utils_HighlightStage_h
diff --git a/libraries/render/src/render/HighlightStyle.h b/libraries/render/src/render/HighlightStyle.h
new file mode 100644
index 0000000000..6e7373c78b
--- /dev/null
+++ b/libraries/render/src/render/HighlightStyle.h
@@ -0,0 +1,38 @@
+//
+//  HighlightStyle.h
+
+//  Created by Olivier Prat on 11/06/2017.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_render_utils_HighlightStyle_h
+#define hifi_render_utils_HighlightStyle_h
+
+#include <glm/vec3.hpp>
+
+#include <string>
+
+namespace render {
+
+    // This holds the configuration for a particular outline style
+    class HighlightStyle {
+    public:
+
+        bool isFilled() const {
+            return unoccludedFillOpacity > 5e-3f || occludedFillOpacity > 5e-3f;
+        }
+
+        glm::vec3 color{ 1.f, 0.7f, 0.2f };
+        float outlineWidth{ 2.0f };
+        float outlineIntensity{ 0.9f };
+        float unoccludedFillOpacity{ 0.0f };
+        float occludedFillOpacity{ 0.0f };
+        bool isOutlineSmooth{ false };
+    };
+
+}
+
+#endif // hifi_render_utils_HighlightStyle_h
\ No newline at end of file
diff --git a/libraries/render/src/render/IndexedContainer.h b/libraries/render/src/render/IndexedContainer.h
index bb1a9b72b7..4b51f8eb3c 100644
--- a/libraries/render/src/render/IndexedContainer.h
+++ b/libraries/render/src/render/IndexedContainer.h
@@ -12,7 +12,9 @@
 #ifndef hifi_render_IndexedContainer_h
 #define hifi_render_IndexedContainer_h
 
+#include <cassert>
 #include <vector>
+#include <algorithm>
 
 namespace render {
 namespace indexed_container {
@@ -97,6 +99,10 @@ namespace indexed_container {
             return _elements[index];
         }
 
+        bool isElementFreed(Index index) const {
+            return std::find(_allocator._freeIndices.begin(), _allocator._freeIndices.end(), index) != _allocator._freeIndices.end();
+        }
+
         const Element& get(Index index) const {
             return _elements[index];
         }
diff --git a/libraries/render/src/render/Item.cpp b/libraries/render/src/render/Item.cpp
index f80563bf73..036c7d3a99 100644
--- a/libraries/render/src/render/Item.cpp
+++ b/libraries/render/src/render/Item.cpp
@@ -13,8 +13,13 @@
 #include <numeric>
 #include "gpu/Batch.h"
 
+#include "TransitionStage.h"
+
 using namespace render;
 
+const Item::ID Item::INVALID_ITEM_ID = 0;
+const ItemCell Item::INVALID_CELL = -1;
+
 const Item::Status::Value Item::Status::Value::INVALID = Item::Status::Value();
 
 const float Item::Status::Value::RED = 0.0f;
@@ -24,6 +29,11 @@ const float Item::Status::Value::CYAN = 180.0f;
 const float Item::Status::Value::BLUE = 240.0f;
 const float Item::Status::Value::MAGENTA = 300.0f;
 
+const int Item::LAYER_2D = 0;
+const int Item::LAYER_3D = 1;
+const int Item::LAYER_3D_FRONT = 2;
+const int Item::LAYER_3D_HUD = 3;
+
 void Item::Status::Value::setScale(float scale) {
     _scale = (std::numeric_limits<unsigned short>::max() -1) * 0.5f * (1.0f + std::max(std::min(scale, 1.0f), 0.0f));
  }
@@ -78,3 +88,50 @@ void Item::resetPayload(const PayloadPointer& payload) {
         _key = _payload->getKey();
     }
 }
+
+const ShapeKey Item::getShapeKey() const {
+    auto shapeKey = _payload->getShapeKey();
+    if (!TransitionStage::isIndexInvalid(_transitionId)) {
+        // Objects that are fading are rendered double-sided to give a sense of volume
+        return ShapeKey::Builder(shapeKey).withFade().withoutCullFace();
+    }
+    return shapeKey;
+}
+
+namespace render {
+    template <> const ItemKey payloadGetKey(const PayloadProxyInterface::Pointer& payload) {
+        if (!payload) {
+            return ItemKey::Builder::opaqueShape().withTypeMeta();
+        }
+        return payload->getKey();
+    }
+
+    template <> const ShapeKey shapeGetShapeKey(const PayloadProxyInterface::Pointer& payload) {
+        if (!payload) {
+            return ShapeKey::Builder::ownPipeline();
+        }
+        return payload->getShapeKey();
+    }
+
+    template <> const Item::Bound payloadGetBound(const PayloadProxyInterface::Pointer& payload) {
+        if (!payload) {
+            return render::Item::Bound();
+        }
+        return payload->getBound();
+    }
+
+    template <> void payloadRender(const PayloadProxyInterface::Pointer& payload, RenderArgs* args) {
+        if (!args || !payload) {
+            return;
+        }
+        payload->render(args);
+    }
+
+    template <> uint32_t metaFetchMetaSubItems(const PayloadProxyInterface::Pointer& payload, ItemIDs& subItems) {
+        if (!payload) {
+            return 0;
+        }
+        return payload->metaFetchMetaSubItems(subItems);
+    }
+
+}
diff --git a/libraries/render/src/render/Item.h b/libraries/render/src/render/Item.h
index 007b34395d..2b02db81f9 100644
--- a/libraries/render/src/render/Item.h
+++ b/libraries/render/src/render/Item.h
@@ -25,12 +25,14 @@
 
 #include "Args.h"
 
-#include "model/Material.h"
+#include <model/Material.h>
 #include "ShapePipeline.h"
 
-
 namespace render {
 
+typedef int32_t Index;
+const Index INVALID_INDEX{ -1 };
+
 class Context;
 
 // Key is the KEY to filter Items and create specialized lists
@@ -69,6 +71,7 @@ public:
         Flags _flags{ 0 };
     public:
         Builder() {}
+        Builder(const ItemKey& key) : _flags{ key._flags } {}
 
         ItemKey build() const { return ItemKey(_flags); }
 
@@ -213,13 +216,6 @@ inline QDebug operator<<(QDebug debug, const ItemFilter& me) {
     return debug;
 }
 
-using ItemID = uint32_t;
-using ItemCell = int32_t;
-
-// A few typedefs for standard containers of ItemIDs
-using ItemIDs = std::vector<ItemID>;
-using ItemIDSet = std::set<ItemID>;
-
 // Handy type to just pass the ID and the bound of an item
 class ItemBound {
     public:
@@ -241,8 +237,8 @@ public:
     typedef std::vector<Item> Vector;
     typedef ItemID ID;
 
-    static const ID INVALID_ITEM_ID = 0;
-    static const ItemCell INVALID_CELL = -1;
+    static const ID INVALID_ITEM_ID;
+    static const ItemCell INVALID_CELL;
 
     // Convenient function to clear an ID or check it s valid
     static void clearID(ID& id) { id = INVALID_ITEM_ID; }
@@ -316,7 +312,6 @@ public:
         virtual const ItemKey getKey() const = 0;
         virtual const Bound getBound() const = 0;
         virtual int getLayer() const = 0;
-
         virtual void render(RenderArgs* args) = 0;
 
         virtual const ShapeKey getShapeKey() const = 0;
@@ -361,14 +356,19 @@ public:
     // Get the bound of the item expressed in world space (or eye space depending on the key.isWorldSpace())
     const Bound getBound() const { return _payload->getBound(); }
 
-    // Get the layer where the item belongs. 0 by default meaning NOT LAYERED
+    // Get the layer where the item belongs.
     int getLayer() const { return _payload->getLayer(); }
 
+    static const int LAYER_2D;
+    static const int LAYER_3D;
+    static const int LAYER_3D_FRONT;
+    static const int LAYER_3D_HUD;
+
     // Render call for the item
     void render(RenderArgs* args) const { _payload->render(args); }
 
     // Shape Type Interface
-    const ShapeKey getShapeKey() const { return _payload->getShapeKey(); }
+    const ShapeKey getShapeKey() const;
 
     // Meta Type Interface
     uint32_t fetchMetaSubItems(ItemIDs& subItems) const { return _payload->fetchMetaSubItems(subItems); }
@@ -376,10 +376,14 @@ public:
     // Access the status
     const StatusPointer& getStatus() const { return _payload->getStatus(); }
 
+    void setTransitionId(Index id) { _transitionId = id; }
+    Index getTransitionId() const { return _transitionId; }
+
 protected:
     PayloadPointer _payload;
     ItemKey _key;
     ItemCell _cell{ INVALID_CELL };
+    Index _transitionId{ INVALID_INDEX };
 
     friend class Scene;
 };
@@ -436,7 +440,6 @@ public:
     virtual const Item::Bound getBound() const override { return payloadGetBound<T>(_data); }
     virtual int getLayer() const override { return payloadGetLayer<T>(_data); }
 
-
     virtual void render(RenderArgs* args) override { payloadRender<T>(_data, args); }
 
     // Shape Type interface
@@ -489,6 +492,25 @@ template <> const Item::Bound payloadGetBound(const FooPointer& foo) {
 */
 // End of the example
 
+class PayloadProxyInterface {
+public:
+    using ProxyPayload = Payload<PayloadProxyInterface>;
+    using Pointer = ProxyPayload::DataPointer;
+
+    virtual ItemKey getKey() = 0;
+    virtual ShapeKey getShapeKey() = 0;
+    virtual Item::Bound getBound() = 0;
+    virtual void render(RenderArgs* args) = 0;
+    virtual uint32_t metaFetchMetaSubItems(ItemIDs& subItems) = 0;
+};
+
+template <> const ItemKey payloadGetKey(const PayloadProxyInterface::Pointer& payload);
+template <> const Item::Bound payloadGetBound(const PayloadProxyInterface::Pointer& payload);
+template <> void payloadRender(const PayloadProxyInterface::Pointer& payload, RenderArgs* args);
+template <> uint32_t metaFetchMetaSubItems(const PayloadProxyInterface::Pointer& payload, ItemIDs& subItems);
+template <> const ShapeKey shapeGetShapeKey(const PayloadProxyInterface::Pointer& payload);
+
+
 typedef Item::PayloadPointer PayloadPointer;
 typedef std::vector< PayloadPointer > Payloads;
 
diff --git a/libraries/render/src/render/RenderFetchCullSortTask.cpp b/libraries/render/src/render/RenderFetchCullSortTask.cpp
index d735afa52d..b9f65f48a0 100644
--- a/libraries/render/src/render/RenderFetchCullSortTask.cpp
+++ b/libraries/render/src/render/RenderFetchCullSortTask.cpp
@@ -65,6 +65,5 @@ void RenderFetchCullSortTask::build(JobModel& task, const Varying& input, Varyin
     const auto overlayTransparents = task.addJob<DepthSortItems>("DepthSortOverlayTransparent", filteredNonspatialBuckets[TRANSPARENT_SHAPE_BUCKET], DepthSortItems(false));
     const auto background = filteredNonspatialBuckets[BACKGROUND_BUCKET];
 
-    output = Varying(Output{{
-            opaques, transparents, lights, metas, overlayOpaques, overlayTransparents, background, spatialSelection }});
+    output = Output(BucketList{ opaques, transparents, lights, metas, overlayOpaques, overlayTransparents, background }, spatialSelection);
 }
diff --git a/libraries/render/src/render/RenderFetchCullSortTask.h b/libraries/render/src/render/RenderFetchCullSortTask.h
index f32293f001..b25480ae3a 100644
--- a/libraries/render/src/render/RenderFetchCullSortTask.h
+++ b/libraries/render/src/render/RenderFetchCullSortTask.h
@@ -26,12 +26,12 @@ public:
         OVERLAY_OPAQUE_SHAPE,
         OVERLAY_TRANSPARENT_SHAPE,
         BACKGROUND,
-        SPATIAL_SELECTION,
 
         NUM_BUCKETS
     };
 
-    using Output = std::array<render::Varying, Buckets::NUM_BUCKETS>;
+    using BucketList = render::VaryingArray<render::ItemBounds, Buckets::NUM_BUCKETS>;
+    using Output = render::VaryingSet2<BucketList, render::ItemSpatialTree::ItemSelection>;
     using JobModel = render::Task::ModelO<RenderFetchCullSortTask, Output>;
 
     RenderFetchCullSortTask() {}
diff --git a/libraries/render/src/render/ResampleTask.cpp b/libraries/render/src/render/ResampleTask.cpp
new file mode 100644
index 0000000000..65c0ff45b9
--- /dev/null
+++ b/libraries/render/src/render/ResampleTask.cpp
@@ -0,0 +1,83 @@
+//
+//  ResampleTask.cpp
+//  render/src/render
+//
+//  Various to upsample or downsample textures into framebuffers.
+//
+//  Created by Olivier Prat on 10/09/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#include "ResampleTask.h"
+
+#include "gpu/Context.h"
+#include "gpu/StandardShaderLib.h"
+
+using namespace render;
+
+gpu::PipelinePointer HalfDownsample::_pipeline;
+
+HalfDownsample::HalfDownsample() {
+
+}
+
+void HalfDownsample::configure(const Config& config) {
+
+}
+
+gpu::FramebufferPointer HalfDownsample::getResampledFrameBuffer(const gpu::FramebufferPointer& sourceFramebuffer) {
+    auto resampledFramebufferSize = sourceFramebuffer->getSize();
+
+    resampledFramebufferSize.x /= 2U;
+    resampledFramebufferSize.y /= 2U;
+
+    if (!_destinationFrameBuffer || resampledFramebufferSize != _destinationFrameBuffer->getSize()) {
+        _destinationFrameBuffer = gpu::FramebufferPointer(gpu::Framebuffer::create("HalfOutput"));
+
+        auto sampler = gpu::Sampler(gpu::Sampler::FILTER_MIN_MAG_LINEAR_MIP_POINT);
+        auto target = gpu::Texture::createRenderBuffer(sourceFramebuffer->getRenderBuffer(0)->getTexelFormat(), resampledFramebufferSize.x, resampledFramebufferSize.y, gpu::Texture::SINGLE_MIP, sampler);
+        _destinationFrameBuffer->setRenderBuffer(0, target);
+    }
+    return _destinationFrameBuffer;
+}
+
+void HalfDownsample::run(const RenderContextPointer& renderContext, const gpu::FramebufferPointer& sourceFramebuffer, gpu::FramebufferPointer& resampledFrameBuffer) {
+    assert(renderContext->args);
+    assert(renderContext->args->hasViewFrustum());
+    RenderArgs* args = renderContext->args;
+
+    resampledFrameBuffer = getResampledFrameBuffer(sourceFramebuffer);
+
+    if (!_pipeline) {
+        auto vs = gpu::StandardShaderLib::getDrawTransformUnitQuadVS();
+        auto ps = gpu::StandardShaderLib::getDrawTextureOpaquePS();
+        gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
+
+        gpu::Shader::BindingSet slotBindings;
+        gpu::Shader::makeProgram(*program, slotBindings);
+
+        gpu::StatePointer state = gpu::StatePointer(new gpu::State());
+        state->setDepthTest(gpu::State::DepthTest(false, false));
+        _pipeline = gpu::Pipeline::create(program, state);
+    }
+
+    const auto bufferSize = resampledFrameBuffer->getSize();
+    glm::ivec4 viewport{ 0, 0, bufferSize.x, bufferSize.y };
+
+    gpu::doInBatch(args->_context, [&](gpu::Batch& batch) {
+        batch.enableStereo(false);
+
+        batch.setFramebuffer(resampledFrameBuffer);
+
+        batch.setViewportTransform(viewport);
+        batch.setProjectionTransform(glm::mat4());
+        batch.resetViewTransform();
+        batch.setPipeline(_pipeline);
+
+        batch.setModelTransform(gpu::Framebuffer::evalSubregionTexcoordTransform(bufferSize, viewport));
+        batch.setResourceTexture(0, sourceFramebuffer->getRenderBuffer(0));
+        batch.draw(gpu::TRIANGLE_STRIP, 4);
+    });
+}
diff --git a/libraries/render/src/render/ResampleTask.h b/libraries/render/src/render/ResampleTask.h
new file mode 100644
index 0000000000..da2b7b3537
--- /dev/null
+++ b/libraries/render/src/render/ResampleTask.h
@@ -0,0 +1,41 @@
+//
+//  ResampleTask.h
+//  render/src/render
+//
+//  Various to upsample or downsample textures into framebuffers.
+//
+//  Created by Olivier Prat on 10/09/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_render_ResampleTask_h
+#define hifi_render_ResampleTask_h
+
+#include "Engine.h"
+
+namespace render {
+
+    class HalfDownsample {
+    public:
+        using Config = JobConfig;
+        using JobModel = Job::ModelIO<HalfDownsample, gpu::FramebufferPointer, gpu::FramebufferPointer, Config>;
+
+        HalfDownsample();
+
+        void configure(const Config& config);
+        void run(const RenderContextPointer& renderContext, const gpu::FramebufferPointer& sourceFramebuffer, gpu::FramebufferPointer& resampledFrameBuffer);
+
+    protected:
+
+        static gpu::PipelinePointer _pipeline;
+
+        gpu::FramebufferPointer _destinationFrameBuffer;
+
+        gpu::FramebufferPointer getResampledFrameBuffer(const gpu::FramebufferPointer& sourceFramebuffer);
+    };
+}
+
+#endif // hifi_render_ResampleTask_h
diff --git a/libraries/render/src/render/Scene.cpp b/libraries/render/src/render/Scene.cpp
index b8f93c52c3..88e25b6d27 100644
--- a/libraries/render/src/render/Scene.cpp
+++ b/libraries/render/src/render/Scene.cpp
@@ -13,13 +13,14 @@
 #include <numeric>
 #include <gpu/Batch.h>
 #include "Logging.h"
+#include "TransitionStage.h"
+#include "HighlightStage.h"
 
 using namespace render;
 
 void Transaction::resetItem(ItemID id, const PayloadPointer& payload) {
     if (payload) {
-        _resetItems.emplace_back(id);
-        _resetPayloads.emplace_back(payload);
+        _resetItems.emplace_back(Reset{ id, payload });
     } else {
         qCDebug(renderlogging) << "WARNING: Transaction::resetItem with a null payload!";
         removeItem(id);
@@ -30,22 +31,53 @@ void Transaction::removeItem(ItemID id) {
     _removedItems.emplace_back(id);
 }
 
+void Transaction::addTransitionToItem(ItemID id, Transition::Type transition, ItemID boundId) {
+    _addedTransitions.emplace_back(TransitionAdd{ id, transition, boundId });
+}
+
+void Transaction::removeTransitionFromItem(ItemID id) {
+    _addedTransitions.emplace_back(TransitionAdd{ id, Transition::NONE, render::Item::INVALID_ITEM_ID });
+}
+
+void Transaction::reApplyTransitionToItem(ItemID id) {
+    _reAppliedTransitions.emplace_back(TransitionReApply{ id });
+}
+
+void Transaction::queryTransitionOnItem(ItemID id, TransitionQueryFunc func) {
+    _queriedTransitions.emplace_back(TransitionQuery{ id, func });
+}
+
 void Transaction::updateItem(ItemID id, const UpdateFunctorPointer& functor) {
-    _updatedItems.emplace_back(id);
-    _updateFunctors.emplace_back(functor);
+    _updatedItems.emplace_back(Update{ id, functor });
 }
 
 void Transaction::resetSelection(const Selection& selection) {
     _resetSelections.emplace_back(selection);
 }
 
+void Transaction::resetSelectionHighlight(const std::string& selectionName, const HighlightStyle& style) {
+    _highlightResets.emplace_back(HighlightReset{ selectionName, style });
+}
+
+void Transaction::removeHighlightFromSelection(const std::string& selectionName) {
+    _highlightRemoves.emplace_back(selectionName);
+}
+
+void Transaction::querySelectionHighlight(const std::string& selectionName, SelectionHighlightQueryFunc func) {
+    _highlightQueries.emplace_back(HighlightQuery{ selectionName, func });
+}
+
 void Transaction::merge(const Transaction& transaction) {
     _resetItems.insert(_resetItems.end(), transaction._resetItems.begin(), transaction._resetItems.end());
-    _resetPayloads.insert(_resetPayloads.end(), transaction._resetPayloads.begin(), transaction._resetPayloads.end());
     _removedItems.insert(_removedItems.end(), transaction._removedItems.begin(), transaction._removedItems.end());
     _updatedItems.insert(_updatedItems.end(), transaction._updatedItems.begin(), transaction._updatedItems.end());
-    _updateFunctors.insert(_updateFunctors.end(), transaction._updateFunctors.begin(), transaction._updateFunctors.end());
     _resetSelections.insert(_resetSelections.end(), transaction._resetSelections.begin(), transaction._resetSelections.end());
+    _addedTransitions.insert(_addedTransitions.end(), transaction._addedTransitions.begin(), transaction._addedTransitions.end());
+    _queriedTransitions.insert(_queriedTransitions.end(), transaction._queriedTransitions.begin(), transaction._queriedTransitions.end());
+    _reAppliedTransitions.insert(_reAppliedTransitions.end(), transaction._reAppliedTransitions.begin(), transaction._reAppliedTransitions.end());
+    _highlightResets.insert(_highlightResets.end(), transaction._highlightResets.begin(), transaction._highlightResets.end());
+    _highlightRemoves.insert(_highlightRemoves.end(), transaction._highlightRemoves.begin(), transaction._highlightRemoves.end());
+    _highlightQueries.insert(_highlightQueries.end(), transaction._highlightQueries.begin(), transaction._highlightQueries.end());
 }
 
 
@@ -82,16 +114,46 @@ void consolidateTransaction(TransactionQueue& queue, Transaction& singleBatch) {
         queue.pop();
     };
 }
- 
-void Scene::processTransactionQueue() {
+
+uint32_t Scene::enqueueFrame() {
     PROFILE_RANGE(render, __FUNCTION__);
     Transaction consolidatedTransaction;
-
     {
         std::unique_lock<std::mutex> lock(_transactionQueueMutex);
         consolidateTransaction(_transactionQueue, consolidatedTransaction);
     }
-    
+
+    uint32_t frameNumber = 0;
+    {
+        std::unique_lock<std::mutex> lock(_transactionFramesMutex);
+        _transactionFrames.push_back(consolidatedTransaction);
+        _transactionFrameNumber++;
+        frameNumber = _transactionFrameNumber;
+    }
+
+    return frameNumber;
+}
+
+ 
+void Scene::processTransactionQueue() {
+    PROFILE_RANGE(render, __FUNCTION__);
+
+    TransactionFrames queuedFrames;
+    {
+        // capture the queued frames and clear the queue
+        std::unique_lock<std::mutex> lock(_transactionFramesMutex);
+        queuedFrames = _transactionFrames;
+        _transactionFrames.clear();
+    }
+
+    // go through the queue of frames and process them
+    for (auto& frame : queuedFrames) {
+        processTransactionFrame(frame);
+    }
+}
+
+void Scene::processTransactionFrame(const Transaction& transaction) {
+    PROFILE_RANGE(render, __FUNCTION__);
     {
         std::unique_lock<std::mutex> lock(_itemsMutex);
         // Here we should be able to check the value of last ItemID allocated 
@@ -104,57 +166,63 @@ void Scene::processTransactionQueue() {
         // capture anything coming from the transaction
 
         // resets and potential NEW items
-        resetItems(consolidatedTransaction._resetItems, consolidatedTransaction._resetPayloads);
+        resetItems(transaction._resetItems);
 
         // Update the numItemsAtomic counter AFTER the reset changes went through
         _numAllocatedItems.exchange(maxID);
 
         // updates
-        updateItems(consolidatedTransaction._updatedItems, consolidatedTransaction._updateFunctors);
+        updateItems(transaction._updatedItems);
 
         // removes
-        removeItems(consolidatedTransaction._removedItems);
+        removeItems(transaction._removedItems);
+
+        // add transitions
+        transitionItems(transaction._addedTransitions);
+        reApplyTransitions(transaction._reAppliedTransitions);
+        queryTransitionItems(transaction._queriedTransitions);
 
         // Update the numItemsAtomic counter AFTER the pending changes went through
         _numAllocatedItems.exchange(maxID);
     }
 
-    if (consolidatedTransaction.touchTransactions()) {
+    if (transaction.touchTransactions()) {
         std::unique_lock<std::mutex> lock(_selectionsMutex);
 
         // resets and potential NEW items
-        resetSelections(consolidatedTransaction._resetSelections);
+        resetSelections(transaction._resetSelections);
     }
+
+    resetHighlights(transaction._highlightResets);
+    removeHighlights(transaction._highlightRemoves);
+    queryHighlights(transaction._highlightQueries);
 }
 
-void Scene::resetItems(const ItemIDs& ids, Payloads& payloads) {
-    auto resetPayload = payloads.begin();
-    for (auto resetID : ids) {
+void Scene::resetItems(const Transaction::Resets& transactions) {
+    for (auto& reset : transactions) {
         // Access the true item
-        auto& item = _items[resetID];
+        auto itemId = std::get<0>(reset);
+        auto& item = _items[itemId];
         auto oldKey = item.getKey();
         auto oldCell = item.getCell();
 
         // Reset the item with a new payload
-        item.resetPayload(*resetPayload);
+        item.resetPayload(std::get<1>(reset));
         auto newKey = item.getKey();
 
         // Update the item's container
         assert((oldKey.isSpatial() == newKey.isSpatial()) || oldKey._flags.none());
         if (newKey.isSpatial()) {
-            auto newCell = _masterSpatialTree.resetItem(oldCell, oldKey, item.getBound(), resetID, newKey);
+            auto newCell = _masterSpatialTree.resetItem(oldCell, oldKey, item.getBound(), itemId, newKey);
             item.resetCell(newCell, newKey.isSmall());
         } else {
-            _masterNonspatialSet.insert(resetID);
+            _masterNonspatialSet.insert(itemId);
         }
-
-        // next loop
-        resetPayload++;
     }
 }
 
-void Scene::removeItems(const ItemIDs& ids) {
-    for (auto removedID :ids) {
+void Scene::removeItems(const Transaction::Removes& transactions) {
+    for (auto removedID : transactions) {
         // Access the true item
         auto& item = _items[removedID];
         auto oldCell = item.getCell();
@@ -167,17 +235,18 @@ void Scene::removeItems(const ItemIDs& ids) {
             _masterNonspatialSet.erase(removedID);
         }
 
+        // Remove the transition to prevent updating it for nothing
+        resetItemTransition(removedID);
+
         // Kill it
         item.kill();
     }
 }
 
-void Scene::updateItems(const ItemIDs& ids, UpdateFunctors& functors) {
-
-    auto updateFunctor = functors.begin();
-    for (auto updateID : ids) {
+void Scene::updateItems(const Transaction::Updates& transactions) {
+    for (auto& update : transactions) {
+        auto updateID = std::get<0>(update);
         if (updateID == Item::INVALID_ITEM_ID) {
-            updateFunctor++;
             continue;
         }
 
@@ -187,7 +256,7 @@ void Scene::updateItems(const ItemIDs& ids, UpdateFunctors& functors) {
         auto oldKey = item.getKey();
 
         // Update the item
-        item.update((*updateFunctor));
+        item.update(std::get<1>(update));
         auto newKey = item.getKey();
 
         // Update the item's container
@@ -209,14 +278,155 @@ void Scene::updateItems(const ItemIDs& ids, UpdateFunctors& functors) {
                 _masterNonspatialSet.insert(updateID);
             }
         }
-
-
-        // next loop
-        updateFunctor++;
     }
 }
 
-// THis fucntion is thread safe
+void Scene::transitionItems(const Transaction::TransitionAdds& transactions) {
+    auto transitionStage = getStage<TransitionStage>(TransitionStage::getName());
+
+    for (auto& add : transactions) {
+        auto itemId = std::get<0>(add);
+        // Access the true item
+        const auto& item = _items[itemId];
+        auto transitionId = item.getTransitionId();
+        auto transitionType = std::get<1>(add);
+        auto boundId = std::get<2>(add);
+
+        // Remove pre-existing transition, if need be
+        if (!TransitionStage::isIndexInvalid(transitionId)) {
+            transitionStage->removeTransition(transitionId);
+            transitionId = TransitionStage::INVALID_INDEX;
+        }
+        // Add a new one.
+        if (transitionType != Transition::NONE) {
+            transitionId = transitionStage->addTransition(itemId, transitionType, boundId);
+        }
+
+        setItemTransition(itemId, transitionId);
+    }
+}
+
+void Scene::reApplyTransitions(const Transaction::TransitionReApplies& transactions) {
+    for (auto itemId : transactions) {
+        // Access the true item
+        const auto& item = _items[itemId];
+        auto transitionId = item.getTransitionId();
+        setItemTransition(itemId, transitionId);
+    }
+}
+
+void Scene::queryTransitionItems(const Transaction::TransitionQueries& transactions) {
+    auto transitionStage = getStage<TransitionStage>(TransitionStage::getName());
+
+    for (auto& query : transactions) {
+        auto itemId = std::get<0>(query);
+        // Access the true item
+        const auto& item = _items[itemId];
+        auto func = std::get<1>(query);
+        if (item.exist() && func != nullptr) {
+            auto transitionId = item.getTransitionId();
+
+            if (!TransitionStage::isIndexInvalid(transitionId)) {
+                auto& transition = transitionStage->getTransition(transitionId);
+                func(itemId, &transition);
+            } else {
+                func(itemId, nullptr);
+            }
+        }
+    }
+}
+
+void Scene::resetHighlights(const Transaction::HighlightResets& transactions) {
+    auto outlineStage = getStage<HighlightStage>(HighlightStage::getName());
+
+    for (auto& transaction : transactions) {
+        const auto& selectionName = std::get<0>(transaction);
+        const auto& newStyle = std::get<1>(transaction);
+        auto outlineId = outlineStage->getHighlightIdBySelection(selectionName);
+
+        if (HighlightStage::isIndexInvalid(outlineId)) {
+            outlineStage->addHighlight(selectionName, newStyle);
+        } else {
+            outlineStage->editHighlight(outlineId)._style = newStyle;
+        }
+    }
+}
+
+void Scene::removeHighlights(const Transaction::HighlightRemoves& transactions) {
+    auto outlineStage = getStage<HighlightStage>(HighlightStage::getName());
+
+    for (auto& selectionName : transactions) {
+        auto outlineId = outlineStage->getHighlightIdBySelection(selectionName);
+
+        if (!HighlightStage::isIndexInvalid(outlineId)) {
+            outlineStage->removeHighlight(outlineId);
+        }
+    }
+}
+
+void Scene::queryHighlights(const Transaction::HighlightQueries& transactions) {
+    auto outlineStage = getStage<HighlightStage>(HighlightStage::getName());
+
+    for (auto& transaction : transactions) {
+        const auto& selectionName = std::get<0>(transaction);
+        const auto& func = std::get<1>(transaction);
+        auto outlineId = outlineStage->getHighlightIdBySelection(selectionName);
+
+        if (!HighlightStage::isIndexInvalid(outlineId)) {
+            func(&outlineStage->editHighlight(outlineId)._style);
+        } else {
+            func(nullptr);
+        }
+    }
+}
+
+void Scene::collectSubItems(ItemID parentId, ItemIDs& subItems) const {
+    // Access the true item
+    auto& item = _items[parentId];
+
+    if (item.exist()) {
+        // Recursivelly collect the subitems
+        auto subItemBeginIndex = subItems.size();
+        auto subItemCount = item.fetchMetaSubItems(subItems);
+        for (auto i = subItemBeginIndex; i < (subItemBeginIndex + subItemCount); i++) {
+            auto subItemId = subItems[i];
+            // Bizarrely, subItemId == parentId can happen for metas... See metaFetchMetaSubItems in RenderableEntityItem.cpp
+            if (subItemId != parentId) {
+                collectSubItems(subItemId, subItems);
+            }
+        }
+    }
+}
+
+void Scene::setItemTransition(ItemID itemId, Index transitionId) {
+    // Access the true item
+    auto& item = _items[itemId];
+
+    item.setTransitionId(transitionId);
+    if (item.exist()) {
+        ItemIDs subItems;
+
+        // Sub-items share the same transition Id
+        collectSubItems(itemId, subItems);
+        for (auto subItemId : subItems) {
+            // Curiously... this can happen
+            if (subItemId != itemId) {
+                setItemTransition(subItemId, transitionId);
+            }
+        }
+    }
+}
+
+void Scene::resetItemTransition(ItemID itemId) {
+    auto& item = _items[itemId];
+    if (!render::TransitionStage::isIndexInvalid(item.getTransitionId())) {
+        auto transitionStage = getStage<TransitionStage>(TransitionStage::getName());
+        transitionStage->removeTransition(item.getTransitionId());
+        setItemTransition(itemId, render::TransitionStage::INVALID_INDEX);
+    }
+}
+
+// This function is thread safe
 Selection Scene::getSelection(const Selection::Name& name) const {
     std::unique_lock<std::mutex> lock(_selectionsMutex);
     auto found = _selections.find(name);
@@ -227,8 +437,19 @@ Selection Scene::getSelection(const Selection::Name& name) const {
     }
 }
 
-void Scene::resetSelections(const Selections& selections) {
-    for (auto selection : selections) {
+// This function is thread safe
+bool Scene::isSelectionEmpty(const Selection::Name& name) const {
+    std::unique_lock<std::mutex> lock(_selectionsMutex);
+    auto found = _selections.find(name);
+    if (found == _selections.end()) {
+        return false;
+    } else {
+        return (*found).second.isEmpty();
+    }
+}
+
+void Scene::resetSelections(const Transaction::SelectionResets& transactions) {
+    for (auto selection : transactions) {
         auto found = _selections.find(selection.getName());
         if (found == _selections.end()) {
             _selections.insert(SelectionMap::value_type(selection.getName(), selection));
diff --git a/libraries/render/src/render/Scene.h b/libraries/render/src/render/Scene.h
index 199d9ce224..af6204acb4 100644
--- a/libraries/render/src/render/Scene.h
+++ b/libraries/render/src/render/Scene.h
@@ -16,10 +16,13 @@
 #include "SpatialTree.h"
 #include "Stage.h"
 #include "Selection.h"
+#include "Transition.h"
+#include "HighlightStyle.h"
 
 namespace render {
 
 class Engine;
+class Scene;
 
 // Transaction is the mechanism to make any change to the scene.
 // Whenever a new item need to be reset,
@@ -31,13 +34,24 @@ class Engine;
 // of updating the scene before it s rendered.
 // 
 class Transaction {
+    friend class Scene;
 public:
+
+    typedef std::function<void(ItemID, const Transition*)> TransitionQueryFunc;
+    typedef std::function<void(HighlightStyle const*)> SelectionHighlightQueryFunc;
+
     Transaction() {}
     ~Transaction() {}
 
     // Item transactions
     void resetItem(ItemID id, const PayloadPointer& payload);
     void removeItem(ItemID id);
+    bool hasRemovedItems() const { return !_removedItems.empty(); }
+
+    void addTransitionToItem(ItemID id, Transition::Type transition, ItemID boundId = render::Item::INVALID_ITEM_ID);
+    void removeTransitionFromItem(ItemID id);
+    void reApplyTransitionToItem(ItemID id);
+    void queryTransitionOnItem(ItemID id, TransitionQueryFunc func);
 
     template <class T> void updateItem(ItemID id, std::function<void(T&)> func) {
         updateItem(id, std::make_shared<UpdateFunctor<T>>(func));
@@ -49,20 +63,49 @@ public:
     // Selection transactions
     void resetSelection(const Selection& selection);
 
+    void resetSelectionHighlight(const std::string& selectionName, const HighlightStyle& style = HighlightStyle());
+    void removeHighlightFromSelection(const std::string& selectionName);
+    void querySelectionHighlight(const std::string& selectionName, SelectionHighlightQueryFunc func);
+
     void merge(const Transaction& transaction);
 
     // Checkers if there is work to do when processing the transaction
     bool touchTransactions() const { return !_resetSelections.empty(); }
 
-    ItemIDs _resetItems; 
-    Payloads _resetPayloads;
-    ItemIDs _removedItems;
-    ItemIDs _updatedItems;
-    UpdateFunctors _updateFunctors;
-
-    Selections _resetSelections;
-
 protected:
+
+    using Reset = std::tuple<ItemID, PayloadPointer>;
+    using Remove = ItemID;
+    using Update = std::tuple<ItemID, UpdateFunctorPointer>;
+    using TransitionAdd = std::tuple<ItemID, Transition::Type, ItemID>;
+    using TransitionQuery = std::tuple<ItemID, TransitionQueryFunc>;
+    using TransitionReApply = ItemID;
+    using SelectionReset = Selection;
+    using HighlightReset = std::tuple<std::string, HighlightStyle>;
+    using HighlightRemove = std::string;
+    using HighlightQuery = std::tuple<std::string, SelectionHighlightQueryFunc>;
+
+    using Resets = std::vector<Reset>;
+    using Removes = std::vector<Remove>;
+    using Updates = std::vector<Update>;
+    using TransitionAdds = std::vector<TransitionAdd>;
+    using TransitionQueries = std::vector<TransitionQuery>;
+    using TransitionReApplies = std::vector<TransitionReApply>;
+    using SelectionResets = std::vector<SelectionReset>;
+    using HighlightResets = std::vector<HighlightReset>;
+    using HighlightRemoves = std::vector<HighlightRemove>;
+    using HighlightQueries = std::vector<HighlightQuery>;
+
+    Resets _resetItems;
+    Removes _removedItems;
+    Updates _updatedItems;
+    TransitionAdds _addedTransitions;
+    TransitionQueries _queriedTransitions;
+    TransitionReApplies _reAppliedTransitions;
+    SelectionResets _resetSelections;
+    HighlightResets _highlightResets;
+    HighlightRemoves _highlightRemoves;
+    HighlightQueries _highlightQueries;
 };
 typedef std::queue<Transaction> TransactionQueue;
 
@@ -74,6 +117,7 @@ typedef std::queue<Transaction> TransactionQueue;
 // Items are notified accordingly on any update message happening
 class Scene {
 public:
+
     Scene(glm::vec3 origin, float size);
     ~Scene();
 
@@ -89,6 +133,9 @@ public:
     // Enqueue transaction to the scene
     void enqueueTransaction(const Transaction& transaction);
 
+    // Enqueue end of frame transactions boundary
+    uint32_t enqueueFrame();
+
     // Process the pending transactions queued
     void processTransactionQueue();
 
@@ -96,6 +143,10 @@ public:
     // Thread safe
     Selection getSelection(const Selection::Name& name) const;
 
+    // Check if a particular selection is empty (returns true if doesn't exist)
+    // Thread safe
+    bool isSelectionEmpty(const Selection::Name& name) const;
+
     // This next call are  NOT threadsafe, you have to call them from the correct thread to avoid any potential issues
 
     // Access a particular item form its ID
@@ -123,14 +174,26 @@ public:
     }
     void resetStage(const Stage::Name& name, const StagePointer& stage);
 
+    void setItemTransition(ItemID id, Index transitionId);
+    void resetItemTransition(ItemID id);
 
 protected:
+
     // Thread safe elements that can be accessed from anywhere
     std::atomic<unsigned int> _IDAllocator{ 1 }; // first valid itemID will be One
     std::atomic<unsigned int> _numAllocatedItems{ 1 }; // num of allocated items, matching the _items.size()
     std::mutex _transactionQueueMutex;
     TransactionQueue _transactionQueue;
 
+    
+    std::mutex _transactionFramesMutex;
+    using TransactionFrames = std::list<Transaction>;
+    TransactionFrames _transactionFrames;
+    uint32_t _transactionFrameNumber{ 0 };
+
+    // Process one transaction frame 
+    void processTransactionFrame(const Transaction& transaction);
+
     // The actual database
     // database of items is protected for editing by a mutex
     std::mutex _itemsMutex;
@@ -138,15 +201,23 @@ protected:
     ItemSpatialTree _masterSpatialTree;
     ItemIDSet _masterNonspatialSet;
 
-    void resetItems(const ItemIDs& ids, Payloads& payloads);
-    void removeItems(const ItemIDs& ids);
-    void updateItems(const ItemIDs& ids, UpdateFunctors& functors);
+    void resetItems(const Transaction::Resets& transactions);
+    void removeItems(const Transaction::Removes& transactions);
+    void updateItems(const Transaction::Updates& transactions);
+    void transitionItems(const Transaction::TransitionAdds& transactions);
+    void reApplyTransitions(const Transaction::TransitionReApplies& transactions);
+    void queryTransitionItems(const Transaction::TransitionQueries& transactions);
+    void resetHighlights(const Transaction::HighlightResets& transactions);
+    void removeHighlights(const Transaction::HighlightRemoves& transactions);
+    void queryHighlights(const Transaction::HighlightQueries& transactions);
+
+    void collectSubItems(ItemID parentId, ItemIDs& subItems) const;
 
     // The Selection map
     mutable std::mutex _selectionsMutex; // mutable so it can be used in the thread safe getSelection const method
     SelectionMap _selections;
 
-    void resetSelections(const Selections& selections);
+    void resetSelections(const Transaction::SelectionResets& transactions);
   // More actions coming to selections soon:
   //  void removeFromSelection(const Selection& selection);
   //  void appendToSelection(const Selection& selection);
diff --git a/libraries/render/src/render/ShapePipeline.cpp b/libraries/render/src/render/ShapePipeline.cpp
index 79ac5c0990..762b7712d7 100644
--- a/libraries/render/src/render/ShapePipeline.cpp
+++ b/libraries/render/src/render/ShapePipeline.cpp
@@ -17,18 +17,34 @@
 
 using namespace render;
 
+ShapePipeline::CustomFactoryMap ShapePipeline::_globalCustomFactoryMap;
+
+ShapePipeline::CustomKey ShapePipeline::registerCustomShapePipelineFactory(CustomFactory factory) {  
+    ShapePipeline::CustomKey custom = (ShapePipeline::CustomKey) _globalCustomFactoryMap.size() + 1;
+    _globalCustomFactoryMap[custom] = factory;
+    return custom;  
+}
+
+
 void ShapePipeline::prepare(gpu::Batch& batch, RenderArgs* args) {
-    if (batchSetter) {
-        batchSetter(*this, batch, args);
+    if (_batchSetter) {
+        _batchSetter(*this, batch, args);
     }
 }
 
+void ShapePipeline::prepareShapeItem(RenderArgs* args, const ShapeKey& key, const Item& shape) {
+    if (_itemSetter) {
+        _itemSetter(*this, args, shape);
+    }
+}
+
+
 ShapeKey::Filter::Builder::Builder() {
     _mask.set(OWN_PIPELINE);
     _mask.set(INVALID);
 }
 
-void ShapePlumber::addPipelineHelper(const Filter& filter, ShapeKey key, int bit, const PipelinePointer& pipeline) {
+void ShapePlumber::addPipelineHelper(const Filter& filter, ShapeKey key, int bit, const PipelinePointer& pipeline) const {
     // Iterate over all keys
     if (bit < (int)ShapeKey::FlagBit::NUM_FLAGS) {
         addPipelineHelper(filter, key, bit + 1, pipeline);
@@ -48,12 +64,12 @@ void ShapePlumber::addPipelineHelper(const Filter& filter, ShapeKey key, int bit
 }
 
 void ShapePlumber::addPipeline(const Key& key, const gpu::ShaderPointer& program, const gpu::StatePointer& state,
-        BatchSetter batchSetter) {
-    addPipeline(Filter{key}, program, state, batchSetter);
+        BatchSetter batchSetter, ItemSetter itemSetter) {
+    addPipeline(Filter{key}, program, state, batchSetter, itemSetter);
 }
 
 void ShapePlumber::addPipeline(const Filter& filter, const gpu::ShaderPointer& program, const gpu::StatePointer& state,
-        BatchSetter batchSetter) {
+        BatchSetter batchSetter, ItemSetter itemSetter) {
     gpu::Shader::BindingSet slotBindings;
     slotBindings.insert(gpu::Shader::Binding(std::string("lightingModelBuffer"), Slot::BUFFER::LIGHTING_MODEL));
     slotBindings.insert(gpu::Shader::Binding(std::string("skinClusterBuffer"), Slot::BUFFER::SKINNING));
@@ -69,6 +85,8 @@ void ShapePlumber::addPipeline(const Filter& filter, const gpu::ShaderPointer& p
     slotBindings.insert(gpu::Shader::Binding(std::string("lightBuffer"), Slot::BUFFER::LIGHT));
     slotBindings.insert(gpu::Shader::Binding(std::string("lightAmbientBuffer"), Slot::BUFFER::LIGHT_AMBIENT_BUFFER));
     slotBindings.insert(gpu::Shader::Binding(std::string("skyboxMap"), Slot::MAP::LIGHT_AMBIENT));
+    slotBindings.insert(gpu::Shader::Binding(std::string("fadeMaskMap"), Slot::MAP::FADE_MASK));
+    slotBindings.insert(gpu::Shader::Binding(std::string("fadeParametersBuffer"), Slot::BUFFER::FADE_PARAMETERS));
 
     gpu::Shader::makeProgram(*program, slotBindings);
 
@@ -87,10 +105,12 @@ void ShapePlumber::addPipeline(const Filter& filter, const gpu::ShaderPointer& p
     locations->lightBufferUnit = program->getUniformBuffers().findLocation("lightBuffer");
     locations->lightAmbientBufferUnit = program->getUniformBuffers().findLocation("lightAmbientBuffer");
     locations->lightAmbientMapUnit = program->getTextures().findLocation("skyboxMap");
-    
+    locations->fadeMaskTextureUnit = program->getTextures().findLocation("fadeMaskMap");
+    locations->fadeParameterBufferUnit = program->getUniformBuffers().findLocation("fadeParametersBuffer");
+
     ShapeKey key{filter._flags};
     auto gpuPipeline = gpu::Pipeline::create(program, state);
-    auto shapePipeline = std::make_shared<Pipeline>(gpuPipeline, locations, batchSetter);
+    auto shapePipeline = std::make_shared<Pipeline>(gpuPipeline, locations, batchSetter, itemSetter);
     addPipelineHelper(filter, key, 0, shapePipeline);
 }
 
@@ -101,25 +121,36 @@ const ShapePipelinePointer ShapePlumber::pickPipeline(RenderArgs* args, const Ke
 
     PerformanceTimer perfTimer("ShapePlumber::pickPipeline");
 
-    const auto& pipelineIterator = _pipelineMap.find(key);
+    auto pipelineIterator = _pipelineMap.find(key);
     if (pipelineIterator == _pipelineMap.end()) {
-        // The first time we can't find a pipeline, we should log it
+        // The first time we can't find a pipeline, we should try things to solve that
         if (_missingKeys.find(key) == _missingKeys.end()) {
-            _missingKeys.insert(key);
-            qCDebug(renderlogging) << "Couldn't find a pipeline for" << key;
+            if (key.isCustom()) {
+                auto factoryIt = ShapePipeline::_globalCustomFactoryMap.find(key.getCustom());
+                if ((factoryIt != ShapePipeline::_globalCustomFactoryMap.end()) && (factoryIt)->second) {
+                    // found a factory for the custom key, can now generate a shape pipeline for this case:
+                    addPipelineHelper(Filter(key), key, 0, (factoryIt)->second(*this, key));
+
+                    return pickPipeline(args, key);
+                } else {
+                    qCDebug(renderlogging) << "ShapePlumber::Couldn't find a custom pipeline factory for " << key.getCustom() << " key is: " << key;
+                }
+            }
+
+           _missingKeys.insert(key);
+            qCDebug(renderlogging) << "ShapePlumber::Couldn't find a pipeline for" << key;
         }
         return PipelinePointer(nullptr);
     }
 
     PipelinePointer shapePipeline(pipelineIterator->second);
-    auto& batch = args->_batch;
 
     // Setup the one pipeline (to rule them all)
-    batch->setPipeline(shapePipeline->pipeline);
+    args->_batch->setPipeline(shapePipeline->pipeline);
 
     // Run the pipeline's BatchSetter on the passed in batch
-    if (shapePipeline->batchSetter) {
-        shapePipeline->batchSetter(*shapePipeline, *batch, args);
+    if (shapePipeline->_batchSetter) {
+        shapePipeline->_batchSetter(*shapePipeline, *(args->_batch), args);
     }
 
     return shapePipeline;
diff --git a/libraries/render/src/render/ShapePipeline.h b/libraries/render/src/render/ShapePipeline.h
index 1b97baae7c..f0749504eb 100644
--- a/libraries/render/src/render/ShapePipeline.h
+++ b/libraries/render/src/render/ShapePipeline.h
@@ -19,6 +19,8 @@
 #include "Args.h"
 
 namespace render {
+class Item;
+class ShapePlumber;
 
 class ShapeKey {
 public:
@@ -34,11 +36,24 @@ public:
         DEPTH_BIAS,
         WIREFRAME,
         NO_CULL_FACE,
+        FADE,
 
         OWN_PIPELINE,
         INVALID,
 
+        CUSTOM_0,
+        CUSTOM_1,
+        CUSTOM_2,
+        CUSTOM_3,
+        CUSTOM_4,
+        CUSTOM_5,
+        CUSTOM_6,
+        CUSTOM_7,
+
         NUM_FLAGS, // Not a valid flag
+
+        CUSTOM_MASK = (0xFF << CUSTOM_0),
+
     };
     using Flags = std::bitset<NUM_FLAGS>;
 
@@ -69,10 +84,13 @@ public:
         Builder& withDepthBias() { _flags.set(DEPTH_BIAS); return (*this); }
         Builder& withWireframe() { _flags.set(WIREFRAME); return (*this); }
         Builder& withoutCullFace() { _flags.set(NO_CULL_FACE); return (*this); }
+        Builder& withFade() { _flags.set(FADE); return (*this); }
 
         Builder& withOwnPipeline() { _flags.set(OWN_PIPELINE); return (*this); }
         Builder& invalidate() { _flags.set(INVALID); return (*this); }
 
+        Builder& withCustom(uint8_t custom) {  _flags &= (~CUSTOM_MASK); _flags |= (custom << CUSTOM_0); return (*this); }
+        
         static const ShapeKey ownPipeline() { return Builder().withOwnPipeline(); }
         static const ShapeKey invalid() { return Builder().invalidate(); }
 
@@ -127,6 +145,12 @@ public:
             Builder& withCullFace() { _flags.reset(NO_CULL_FACE); _mask.set(NO_CULL_FACE); return (*this); }
             Builder& withoutCullFace() { _flags.set(NO_CULL_FACE); _mask.set(NO_CULL_FACE); return (*this); }
 
+            Builder& withFade() { _flags.set(FADE); _mask.set(FADE); return (*this); }
+            Builder& withoutFade() { _flags.reset(FADE); _mask.set(FADE); return (*this); }
+
+            Builder& withCustom(uint8_t custom) { _flags &= (~CUSTOM_MASK); _flags |= (custom << CUSTOM_0); _mask |= (CUSTOM_MASK); return (*this); }
+            Builder& withoutCustom() { _flags &= (~CUSTOM_MASK);  _mask |= (CUSTOM_MASK); return (*this); }
+
         protected:
             friend class Filter;
             Flags _flags{0};
@@ -151,10 +175,14 @@ public:
     bool isDepthBiased() const { return _flags[DEPTH_BIAS]; }
     bool isWireframe() const { return _flags[WIREFRAME]; }
     bool isCullFace() const { return !_flags[NO_CULL_FACE]; }
+    bool isFaded() const { return _flags[FADE]; }
 
     bool hasOwnPipeline() const { return _flags[OWN_PIPELINE]; }
     bool isValid() const { return !_flags[INVALID]; }
 
+    uint8_t getCustom() const { return (_flags.to_ulong() & CUSTOM_MASK) >> CUSTOM_0; }
+    bool isCustom() const { return (_flags.to_ulong() & CUSTOM_MASK); }
+
     // Comparator for use in stl containers
     class Hash {
     public:
@@ -187,6 +215,7 @@ inline QDebug operator<<(QDebug debug, const ShapeKey& key) {
                 << "isDepthBiased:" << key.isDepthBiased()
                 << "isWireframe:" << key.isWireframe()
                 << "isCullFace:" << key.isCullFace()
+                << "isFaded:" << key.isFaded()
                 << "]";
         }
     } else {
@@ -208,6 +237,7 @@ public:
             LIGHTING_MODEL,
             LIGHT,
             LIGHT_AMBIENT_BUFFER,
+            FADE_PARAMETERS,
         };
 
         enum MAP {
@@ -219,6 +249,7 @@ public:
             OCCLUSION,
             SCATTERING,
             LIGHT_AMBIENT,
+            FADE_MASK,
         };
     };
 
@@ -237,25 +268,44 @@ public:
         int lightBufferUnit;
         int lightAmbientBufferUnit;
         int lightAmbientMapUnit;
+        int fadeMaskTextureUnit;
+        int fadeParameterBufferUnit;
     };
     using LocationsPointer = std::shared_ptr<Locations>;
 
-    using BatchSetter = std::function<void(const ShapePipeline&, gpu::Batch&, RenderArgs* args)>;
+    using BatchSetter = std::function<void(const ShapePipeline&, gpu::Batch&, render::Args*)>;
 
-    ShapePipeline(gpu::PipelinePointer pipeline, LocationsPointer locations, BatchSetter batchSetter) :
-        pipeline(pipeline), locations(locations), batchSetter(batchSetter) {}
+    using ItemSetter = std::function<void(const ShapePipeline&, render::Args*, const render::Item&)>;
 
-    // Normally, a pipeline is accessed thorugh pickPipeline. If it needs to be set manually,
+    ShapePipeline(gpu::PipelinePointer pipeline, LocationsPointer locations, BatchSetter batchSetter = nullptr, ItemSetter itemSetter = nullptr) :
+        pipeline(pipeline),
+        locations(locations),
+        _batchSetter(batchSetter),
+        _itemSetter(itemSetter) {}
+
+    // Normally, a pipeline is accessed through pickPipeline. If it needs to be set manually,
     // after calling setPipeline this method should be called to prepare the pipeline with default buffers.
-    void prepare(gpu::Batch& batch, RenderArgs* args);
+    void prepare(gpu::Batch& batch, Args* args);
 
     gpu::PipelinePointer pipeline;
     std::shared_ptr<Locations> locations;
 
+    void prepareShapeItem(Args* args, const ShapeKey& key, const Item& shape);
+
 protected:
     friend class ShapePlumber;
 
-    BatchSetter batchSetter;
+    BatchSetter _batchSetter;
+    ItemSetter _itemSetter;
+public:
+    using CustomKey = uint8_t;
+    using CustomFactory = std::function<std::shared_ptr<ShapePipeline> (const ShapePlumber& plumber, const ShapeKey& key)>;
+    using CustomFactoryMap = std::map<CustomKey, CustomFactory>;
+
+    static CustomFactoryMap _globalCustomFactoryMap;
+
+    static CustomKey registerCustomShapePipelineFactory(CustomFactory factory);
+
 };
 using ShapePipelinePointer = std::shared_ptr<ShapePipeline>;
 
@@ -270,22 +320,24 @@ public:
     using Locations = Pipeline::Locations;
     using LocationsPointer = Pipeline::LocationsPointer;
     using BatchSetter = Pipeline::BatchSetter;
+    using ItemSetter = Pipeline::ItemSetter;
 
     void addPipeline(const Key& key, const gpu::ShaderPointer& program, const gpu::StatePointer& state,
-        BatchSetter batchSetter = nullptr);
+        BatchSetter batchSetter = nullptr, ItemSetter itemSetter = nullptr);
     void addPipeline(const Filter& filter, const gpu::ShaderPointer& program, const gpu::StatePointer& state,
-        BatchSetter batchSetter = nullptr);
+        BatchSetter batchSetter = nullptr, ItemSetter itemSetter = nullptr);
 
     const PipelinePointer pickPipeline(RenderArgs* args, const Key& key) const;
 
 protected:
-    void addPipelineHelper(const Filter& filter, Key key, int bit, const PipelinePointer& pipeline);
-    PipelineMap _pipelineMap;
+    void addPipelineHelper(const Filter& filter, Key key, int bit, const PipelinePointer& pipeline) const;
+    mutable PipelineMap _pipelineMap;
 
 private:
     mutable std::unordered_set<Key, Key::Hash, Key::KeyEqual> _missingKeys;
 };
 
+
 using ShapePlumberPointer = std::shared_ptr<ShapePlumber>;
 
 }
diff --git a/libraries/render/src/render/SortTask.cpp b/libraries/render/src/render/SortTask.cpp
index 5b7ead4b6a..63673a71a5 100644
--- a/libraries/render/src/render/SortTask.cpp
+++ b/libraries/render/src/render/SortTask.cpp
@@ -40,7 +40,8 @@ struct BackToFrontSort {
     }
 };
 
-void render::depthSortItems(const RenderContextPointer& renderContext, bool frontToBack, const ItemBounds& inItems, ItemBounds& outItems) {
+void render::depthSortItems(const RenderContextPointer& renderContext, bool frontToBack, 
+                            const ItemBounds& inItems, ItemBounds& outItems, AABox* bounds) {
     assert(renderContext->args);
     assert(renderContext->args->hasViewFrustum());
 
@@ -75,8 +76,26 @@ void render::depthSortItems(const RenderContextPointer& renderContext, bool fron
     }
 
     // Finally once sorted result to a list of itemID
-    for (auto& item : itemBoundSorts) {
-       outItems.emplace_back(ItemBound(item._id, item._bounds));
+    // Finally once sorted result to a list of itemID and keep uniques
+    render::ItemID previousID = Item::INVALID_ITEM_ID;
+    if (!bounds) {
+        for (auto& item : itemBoundSorts) {
+            if (item._id != previousID) {
+                outItems.emplace_back(ItemBound(item._id, item._bounds));
+                previousID = item._id;
+            }
+        }
+    } else if (!itemBoundSorts.empty()) {
+        if (bounds->isNull()) {
+            *bounds = itemBoundSorts.front()._bounds;
+        }
+        for (auto& item : itemBoundSorts) {
+            if (item._id != previousID) {
+                outItems.emplace_back(ItemBound(item._id, item._bounds));
+                previousID = item._id;
+                *bounds += item._bounds;
+            }
+        }
     }
 }
 
@@ -115,6 +134,27 @@ void DepthSortShapes::run(const RenderContextPointer& renderContext, const Shape
     }
 }
 
+void DepthSortShapesAndComputeBounds::run(const RenderContextPointer& renderContext, const ShapeBounds& inShapes, Outputs& outputs) {
+    auto& outShapes = outputs.edit0();
+    auto& outBounds = outputs.edit1();
+
+    outShapes.clear();
+    outShapes.reserve(inShapes.size());
+    outBounds = AABox();
+
+    for (auto& pipeline : inShapes) {
+        auto& inItems = pipeline.second;
+        auto outItems = outShapes.find(pipeline.first);
+        if (outItems == outShapes.end()) {
+            outItems = outShapes.insert(std::make_pair(pipeline.first, ItemBounds{})).first;
+        }
+        AABox bounds;
+
+        depthSortItems(renderContext, _frontToBack, inItems, outItems->second, &bounds);
+        outBounds += bounds;
+    }
+}
+
 void DepthSortItems::run(const RenderContextPointer& renderContext, const ItemBounds& inItems, ItemBounds& outItems) {
     depthSortItems(renderContext, _frontToBack, inItems, outItems);
 }
diff --git a/libraries/render/src/render/SortTask.h b/libraries/render/src/render/SortTask.h
index dfeb22d540..de670b1676 100644
--- a/libraries/render/src/render/SortTask.h
+++ b/libraries/render/src/render/SortTask.h
@@ -15,7 +15,7 @@
 #include "Engine.h"
 
 namespace render {
-    void depthSortItems(const RenderContextPointer& renderContext, bool frontToBack, const ItemBounds& inItems, ItemBounds& outItems);
+    void depthSortItems(const RenderContextPointer& renderContext, bool frontToBack, const ItemBounds& inItems, ItemBounds& outItems, AABox* bounds = nullptr);
 
     class PipelineSortShapes {
     public:
@@ -33,6 +33,17 @@ namespace render {
         void run(const RenderContextPointer& renderContext, const ShapeBounds& inShapes, ShapeBounds& outShapes);
     };
 
+    class DepthSortShapesAndComputeBounds {
+    public:
+        using Outputs = VaryingSet2<ShapeBounds, AABox>;
+        using JobModel = Job::ModelIO<DepthSortShapesAndComputeBounds, ShapeBounds, Outputs>;
+
+        bool _frontToBack;
+        DepthSortShapesAndComputeBounds(bool frontToBack = true) : _frontToBack(frontToBack) {}
+
+        void run(const RenderContextPointer& renderContext, const ShapeBounds& inShapes, Outputs& outputs);
+    };
+
     class DepthSortItems {
     public:
         using JobModel = Job::ModelIO<DepthSortItems, ItemBounds, ItemBounds>;
diff --git a/libraries/render/src/render/Transition.h b/libraries/render/src/render/Transition.h
new file mode 100644
index 0000000000..622e6f69ce
--- /dev/null
+++ b/libraries/render/src/render/Transition.h
@@ -0,0 +1,51 @@
+//
+//  Transition.h
+
+//  Created by Olivier Prat on 07/07/2017.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_render_Transition_h
+#define hifi_render_Transition_h
+
+#include "Item.h"
+
+namespace render {
+
+    // This holds the current state for all transition event types applied to a render item
+    class Transition {
+    public:
+
+        enum Type {
+            ELEMENT_ENTER_DOMAIN = 0,
+            ELEMENT_LEAVE_DOMAIN,
+            BUBBLE_ISECT_OWNER,
+            BUBBLE_ISECT_TRESPASSER,
+            USER_ENTER_DOMAIN,
+            USER_LEAVE_DOMAIN,
+            AVATAR_CHANGE,
+
+            // Don't forget to modify Fade.slh to reflect the change in number of categories
+            TYPE_COUNT,
+            NONE = TYPE_COUNT
+        };
+
+        Type eventType{ ELEMENT_ENTER_DOMAIN };
+        ItemID itemId{ Item::INVALID_ITEM_ID };
+        ItemID boundItemId{ Item::INVALID_ITEM_ID };
+        double time{ 0.0 };
+        glm::vec3 noiseOffset{ 0.f, 0.f, 0.f };
+        glm::vec3 baseOffset{ 0.f, 0.f, 0.f };
+        glm::vec3 baseInvSize{ 1.f, 1.f, 1.f };
+        float threshold{ 0.f };
+        uint8_t isFinished{ 0 };
+    };
+
+    typedef std::shared_ptr<Transition> TransitionPointer;
+    typedef std::vector<Transition::Type> TransitionTypes;
+}
+
+#endif // hifi_render_Transition_h
\ No newline at end of file
diff --git a/libraries/render/src/render/TransitionStage.cpp b/libraries/render/src/render/TransitionStage.cpp
new file mode 100644
index 0000000000..9ddc72f4db
--- /dev/null
+++ b/libraries/render/src/render/TransitionStage.cpp
@@ -0,0 +1,43 @@
+#include "TransitionStage.h"
+
+#include <algorithm>
+
+using namespace render;
+
+std::string TransitionStage::_name("Transition");
+const TransitionStage::Index TransitionStage::INVALID_INDEX{ indexed_container::INVALID_INDEX };
+
+TransitionStage::Index TransitionStage::addTransition(ItemID itemId, Transition::Type type, ItemID boundId) {
+    Transition transition;
+    Index id;
+    
+    transition.eventType = type;
+    transition.itemId = itemId;
+    transition.boundItemId = boundId;
+    id = _transitions.newElement(transition);
+    _activeTransitionIds.push_back(id);
+
+    return id;
+}
+
+void TransitionStage::removeTransition(Index index) {
+    TransitionIdList::iterator  idIterator = std::find(_activeTransitionIds.begin(), _activeTransitionIds.end(), index);
+    if (idIterator != _activeTransitionIds.end()) {
+        _activeTransitionIds.erase(idIterator);
+    }
+    if (!_transitions.isElementFreed(index)) {
+        _transitions.freeElement(index);
+    }
+}
+
+TransitionStageSetup::TransitionStageSetup() {
+}
+
+void TransitionStageSetup::run(const RenderContextPointer& renderContext) {
+    auto stage = renderContext->_scene->getStage(TransitionStage::getName());
+    if (!stage) {
+        stage = std::make_shared<TransitionStage>();
+        renderContext->_scene->resetStage(TransitionStage::getName(), stage);
+    }
+}
+
diff --git a/libraries/render/src/render/TransitionStage.h b/libraries/render/src/render/TransitionStage.h
new file mode 100644
index 0000000000..1d10a5dedb
--- /dev/null
+++ b/libraries/render/src/render/TransitionStage.h
@@ -0,0 +1,68 @@
+//
+//  TransitionStage.h
+
+//  Created by Olivier Prat on 07/07/2017.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_render_TransitionStage_h
+#define hifi_render_TransitionStage_h
+
+#include "Stage.h"
+#include "IndexedContainer.h"
+#include "Engine.h"
+#include "Transition.h"
+
+namespace render {
+
+    // Transition stage to set up Transition-related effects
+    class TransitionStage : public render::Stage {
+    public:
+
+        static const std::string& getName() { return _name; }
+
+        using Index = indexed_container::Index;
+        static const Index INVALID_INDEX;
+        using TransitionIdList = indexed_container::Indices;
+
+        static bool isIndexInvalid(Index index) { return index == INVALID_INDEX; }
+
+        bool checkTransitionId(Index index) const { return _transitions.checkIndex(index); }
+
+        const Transition& getTransition(Index TransitionId) const { return _transitions.get(TransitionId); }
+
+        Transition& editTransition(Index TransitionId) { return _transitions.edit(TransitionId); }
+
+        Index addTransition(ItemID itemId, Transition::Type type, ItemID boundId);
+        void removeTransition(Index index);
+
+        TransitionIdList::iterator begin() { return _activeTransitionIds.begin(); }
+        TransitionIdList::iterator end() { return _activeTransitionIds.end(); }
+
+    private:
+
+        using Transitions = indexed_container::IndexedVector<Transition>;
+
+        static std::string _name;
+
+        Transitions _transitions;
+        TransitionIdList _activeTransitionIds;
+    };
+    using TransitionStagePointer = std::shared_ptr<TransitionStage>;
+
+    class TransitionStageSetup {
+    public:
+        using JobModel = render::Job::Model<TransitionStageSetup>;
+
+        TransitionStageSetup();
+        void run(const RenderContextPointer& renderContext);
+
+    protected:
+    };
+
+}
+
+#endif // hifi_render_TransitionStage_h
diff --git a/libraries/render/src/render/drawItemBounds.slf b/libraries/render/src/render/drawItemBounds.slf
index 4fb23df8f6..e01d1607bd 100644
--- a/libraries/render/src/render/drawItemBounds.slf
+++ b/libraries/render/src/render/drawItemBounds.slf
@@ -19,7 +19,7 @@ out vec4 outFragColor;
 void main(void) {
     float var = step(fract(varTexcoord.x * varTexcoord.y * 1.0), 0.5);
 
-    if (varColor.a == 0) {
+    if (varColor.a == 0.0) {
         outFragColor = vec4(mix(vec3(0.0), varColor.xyz, var), mix(0.0, 1.0, var));
         
     } else {
diff --git a/libraries/render/src/task/Config.cpp b/libraries/render/src/task/Config.cpp
index 0e630311f6..b378237c9c 100644
--- a/libraries/render/src/task/Config.cpp
+++ b/libraries/render/src/task/Config.cpp
@@ -10,9 +10,12 @@
 //
 #include "Config.h"
 
-#include "Task.h"
 #include <QtCore/QThread>
 
+#include <shared/QtHelpers.h>
+
+#include "Task.h"
+
 using namespace task;
 
 void JobConfig::setPresetList(const QJsonObject& object) {
@@ -58,7 +61,7 @@ void TaskConfig::transferChildrenConfigs(QConfigPointer source) {
 
 void TaskConfig::refresh() {
     if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "refresh", Qt::BlockingQueuedConnection);
+        BLOCKING_INVOKE_METHOD(this, "refresh");
         return;
     }
 
diff --git a/libraries/render/src/task/Task.h b/libraries/render/src/task/Task.h
index f76ba92546..63bda7bafa 100644
--- a/libraries/render/src/task/Task.h
+++ b/libraries/render/src/task/Task.h
@@ -155,6 +155,12 @@ public:
         return concept->_data;
     }
 
+    template <class T> const T& get() const {
+        auto concept = std::static_pointer_cast<typename T::JobModel>(_concept);
+        assert(concept);
+        return concept->_data;
+    }
+
     virtual void run(const ContextPointer& renderContext) {
         PerformanceTimer perfTimer(_name.c_str());
         PROFILE_RANGE(render, _name.c_str());
@@ -165,6 +171,8 @@ public:
         _concept->setCPURunTime((double)(usecTimestampNow() - start) / 1000.0);
     }
 
+    const std::string& getName() const { return _name; }
+
 protected:
     ConceptPointer _concept;
     std::string _name = "";
@@ -200,6 +208,24 @@ public:
 
         const Varying getInput() const override { return _input; }
         const Varying getOutput() const override { return _output; }
+        typename Jobs::iterator editJob(std::string name) {
+            typename Jobs::iterator jobIt;
+            for (jobIt = _jobs.begin(); jobIt != _jobs.end(); ++jobIt) {
+                if (jobIt->getName() == name) {
+                    return jobIt;
+                }
+            }
+            return jobIt;
+        }
+        typename Jobs::const_iterator getJob(std::string name) const {
+            typename Jobs::const_iterator jobIt;
+            for (jobIt = _jobs.begin(); jobIt != _jobs.end(); ++jobIt) {
+                if (jobIt->getName() == name) {
+                    return jobIt;
+                }
+            }
+            return jobIt;
+        }
 
         TaskConcept(const Varying& input, QConfigPointer config) : Concept(config), _input(input) {}
 
@@ -319,6 +345,7 @@ protected:
     template < typename T0, typename T1, typename T2, typename T3, typename T4 > using VaryingSet5 = task::VaryingSet5<T0, T1, T2, T3, T4>; \
     template < typename T0, typename T1, typename T2, typename T3, typename T4, typename T5 > using VaryingSet6 = task::VaryingSet6<T0, T1, T2, T3, T4, T5>; \
     template < typename T0, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6 > using VaryingSet7 = task::VaryingSet7<T0, T1, T2, T3, T4, T5, T6>; \
+    template < typename T0, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7 > using VaryingSet8 = task::VaryingSet8<T0, T1, T2, T3, T4, T5, T6, T7>; \
     template < class T, int NUM > using VaryingArray = task::VaryingArray<T, NUM>;
 
 #endif // hifi_task_Task_h
diff --git a/libraries/render/src/task/Varying.h b/libraries/render/src/task/Varying.h
index 50f4acd414..7b7b9907fb 100644
--- a/libraries/render/src/task/Varying.h
+++ b/libraries/render/src/task/Varying.h
@@ -40,6 +40,8 @@ public:
     template <class T> Varying getN (uint8_t index) const { return get<T>()[index]; }
     template <class T> Varying editN (uint8_t index) { return edit<T>()[index]; }
 
+    bool isNull() const { return _concept == nullptr; }
+
 protected:
     class Concept {
     public:
@@ -93,7 +95,7 @@ public:
     }
     virtual uint8_t length() const { return 2; }
 
-    Varying hasVarying() const { return Varying((*this)); }
+    Varying asVarying() const { return Varying((*this)); }
 };
 
 
@@ -126,7 +128,7 @@ public:
     }
     virtual uint8_t length() const { return 3; }
 
-    Varying hasVarying() const { return Varying((*this)); }
+    Varying asVarying() const { return Varying((*this)); }
 };
 
 template <class T0, class T1, class T2, class T3>
@@ -163,7 +165,7 @@ public:
     }
     virtual uint8_t length() const { return 4; }
 
-    Varying hasVarying() const { return Varying((*this)); }
+    Varying asVarying() const { return Varying((*this)); }
 };
 
 
@@ -206,7 +208,7 @@ public:
     }
     virtual uint8_t length() const { return 5; }
 
-    Varying hasVarying() const { return Varying((*this)); }
+    Varying asVarying() const { return Varying((*this)); }
 };
 
 template <class T0, class T1, class T2, class T3, class T4, class T5>
@@ -236,7 +238,25 @@ public:
     const T5& get5() const { return std::get<5>((*this)).template get<T5>(); }
     T5& edit5() { return std::get<5>((*this)).template edit<T5>(); }
 
-    Varying hasVarying() const { return Varying((*this)); }
+    virtual Varying operator[] (uint8_t index) const {
+        switch (index) {
+        default:
+            return std::get<0>((*this));
+        case 1:
+            return std::get<1>((*this));
+        case 2:
+            return std::get<2>((*this));
+        case 3:
+            return std::get<3>((*this));
+        case 4:
+            return std::get<4>((*this));
+        case 5:
+            return std::get<5>((*this));
+        };
+    }
+    virtual uint8_t length() const { return 6; }
+
+    Varying asVarying() const { return Varying((*this)); }
 };
 
 template <class T0, class T1, class T2, class T3, class T4, class T5, class T6>
@@ -269,10 +289,45 @@ public:
     const T6& get6() const { return std::get<6>((*this)).template get<T6>(); }
     T6& edit6() { return std::get<6>((*this)).template edit<T6>(); }
     
-    Varying hasVarying() const { return Varying((*this)); }
+    Varying asVarying() const { return Varying((*this)); }
+};
+
+template <class T0, class T1, class T2, class T3, class T4, class T5, class T6, class T7>
+class VaryingSet8 : public std::tuple<Varying, Varying, Varying, Varying, Varying, Varying, Varying, Varying> {
+public:
+    using Parent = std::tuple<Varying, Varying, Varying, Varying, Varying, Varying, Varying, Varying>;
+
+    VaryingSet8() : Parent(Varying(T0()), Varying(T1()), Varying(T2()), Varying(T3()), Varying(T4()), Varying(T5()), Varying(T6()), Varying(T7())) {}
+    VaryingSet8(const VaryingSet8& src) : Parent(std::get<0>(src), std::get<1>(src), std::get<2>(src), std::get<3>(src), std::get<4>(src), std::get<5>(src), std::get<6>(src), std::get<7>(src)) {}
+    VaryingSet8(const Varying& first, const Varying& second, const Varying& third, const Varying& fourth, const Varying& fifth, const Varying& sixth, const Varying& seventh, const Varying& eighth) : Parent(first, second, third, fourth, fifth, sixth, seventh, eighth) {}
+
+    const T0& get0() const { return std::get<0>((*this)).template get<T0>(); }
+    T0& edit0() { return std::get<0>((*this)).template edit<T0>(); }
+
+    const T1& get1() const { return std::get<1>((*this)).template get<T1>(); }
+    T1& edit1() { return std::get<1>((*this)).template edit<T1>(); }
+
+    const T2& get2() const { return std::get<2>((*this)).template get<T2>(); }
+    T2& edit2() { return std::get<2>((*this)).template edit<T2>(); }
+
+    const T3& get3() const { return std::get<3>((*this)).template get<T3>(); }
+    T3& edit3() { return std::get<3>((*this)).template edit<T3>(); }
+
+    const T4& get4() const { return std::get<4>((*this)).template get<T4>(); }
+    T4& edit4() { return std::get<4>((*this)).template edit<T4>(); }
+
+    const T5& get5() const { return std::get<5>((*this)).template get<T5>(); }
+    T5& edit5() { return std::get<5>((*this)).template edit<T5>(); }
+
+    const T6& get6() const { return std::get<6>((*this)).template get<T6>(); }
+    T6& edit6() { return std::get<6>((*this)).template edit<T6>(); }
+
+    const T7& get7() const { return std::get<7>((*this)).template get<T7>(); }
+    T7& edit7() { return std::get<7>((*this)).template edit<T7>(); }
+
+    Varying asVarying() const { return Varying((*this)); }
 };
 
-    
 template < class T, int NUM >
 class VaryingArray : public std::array<Varying, NUM> {
 public:
@@ -281,6 +336,11 @@ public:
             (*this)[i] = Varying(T());
         }
     }
+
+    VaryingArray(std::initializer_list<Varying> list) {
+        assert(list.size() == NUM);
+        std::copy(list.begin(), list.end(), std::array<Varying, NUM>::begin());
+    }
 };
 }
 
diff --git a/libraries/script-engine/CMakeLists.txt b/libraries/script-engine/CMakeLists.txt
index 0c0004d132..87296b187f 100644
--- a/libraries/script-engine/CMakeLists.txt
+++ b/libraries/script-engine/CMakeLists.txt
@@ -16,6 +16,6 @@ if (NOT ANDROID)
 
 endif ()
 
-link_hifi_libraries(shared networking octree gpu procedural model model-networking ktx recording avatars fbx entities controllers animation audio physics image)
+link_hifi_libraries(shared networking octree gpu procedural model model-networking ktx recording avatars fbx entities controllers animation audio physics image midi)
 # ui includes gl, but link_hifi_libraries does not use transitive includes, so gl must be explicit
 include_hifi_library_headers(gl)
diff --git a/libraries/script-engine/src/AbstractScriptingServicesInterface.h b/libraries/script-engine/src/AbstractScriptingServicesInterface.h
index de18338fca..e7a8d11562 100644
--- a/libraries/script-engine/src/AbstractScriptingServicesInterface.h
+++ b/libraries/script-engine/src/AbstractScriptingServicesInterface.h
@@ -12,13 +12,13 @@
 #ifndef hifi_AbstractScriptingServicesInterface_h
 #define hifi_AbstractScriptingServicesInterface_h
 
-class ScriptEngine;
+#include <BaseScriptEngine.h>
 
 /// Interface provided by Application to other objects that need access to scripting services of the application
 class AbstractScriptingServicesInterface {
 public:
     /// Registers application specific services with a script engine.
-    virtual void registerScriptEngineWithApplicationServices(ScriptEngine* scriptEngine) = 0;
+    virtual void registerScriptEngineWithApplicationServices(ScriptEnginePointer scriptEngine) = 0;
 };
 
 
diff --git a/libraries/script-engine/src/AssetScriptingInterface.cpp b/libraries/script-engine/src/AssetScriptingInterface.cpp
index 65259987c4..25e8c0dcf3 100644
--- a/libraries/script-engine/src/AssetScriptingInterface.cpp
+++ b/libraries/script-engine/src/AssetScriptingInterface.cpp
@@ -55,7 +55,6 @@ void AssetScriptingInterface::setMapping(QString path, QString hash, QScriptValu
 
 
 void AssetScriptingInterface::downloadData(QString urlString, QScriptValue callback) {
-    const QString ATP_SCHEME { "atp:" };
 
     if (!urlString.startsWith(ATP_SCHEME)) {
         return;
@@ -89,6 +88,20 @@ void AssetScriptingInterface::downloadData(QString urlString, QScriptValue callb
     assetRequest->start();
 }
 
+void AssetScriptingInterface::setBakingEnabled(QString path, bool enabled, QScriptValue callback) {
+    auto setBakingEnabledRequest = DependencyManager::get<AssetClient>()->createSetBakingEnabledRequest({ path }, enabled);
+
+    QObject::connect(setBakingEnabledRequest, &SetBakingEnabledRequest::finished, this, [this, callback](SetBakingEnabledRequest* request) mutable {
+        if (callback.isFunction()) {
+            QString error = request->getErrorString();
+            QScriptValueList args{ error };
+            callback.call(_engine->currentContext()->thisObject(), args);
+        }
+        request->deleteLater();
+    });
+    setBakingEnabledRequest->start();
+}
+
 #if (PR_BUILD || DEV_BUILD)
 void AssetScriptingInterface::sendFakedHandshake() {
     auto nodeList = DependencyManager::get<NodeList>();
diff --git a/libraries/script-engine/src/AssetScriptingInterface.h b/libraries/script-engine/src/AssetScriptingInterface.h
index 0238329b73..2812be65f9 100644
--- a/libraries/script-engine/src/AssetScriptingInterface.h
+++ b/libraries/script-engine/src/AssetScriptingInterface.h
@@ -75,6 +75,8 @@ public:
      * @param {string} error
      */
     Q_INVOKABLE void setMapping(QString path, QString hash, QScriptValue callback);
+    
+    Q_INVOKABLE void setBakingEnabled(QString path, bool enabled, QScriptValue callback);
 
 #if (PR_BUILD || DEV_BUILD)
     Q_INVOKABLE void sendFakedHandshake();
diff --git a/libraries/script-engine/src/AudioScriptingInterface.cpp b/libraries/script-engine/src/AudioScriptingInterface.cpp
index ecaffaf35c..28bf5ed163 100644
--- a/libraries/script-engine/src/AudioScriptingInterface.cpp
+++ b/libraries/script-engine/src/AudioScriptingInterface.cpp
@@ -13,6 +13,8 @@
 
 #include <QVector3D>
 
+#include <shared/QtHelpers.h>
+
 #include "ScriptAudioInjector.h"
 #include "ScriptEngineLogging.h"
 
@@ -32,7 +34,7 @@ ScriptAudioInjector* AudioScriptingInterface::playSound(SharedSoundPointer sound
     if (QThread::currentThread() != thread()) {
         ScriptAudioInjector* injector = NULL;
 
-        QMetaObject::invokeMethod(this, "playSound", Qt::BlockingQueuedConnection,
+        BLOCKING_INVOKE_METHOD(this, "playSound",
                                   Q_RETURN_ARG(ScriptAudioInjector*, injector),
                                   Q_ARG(SharedSoundPointer, sound),
                                   Q_ARG(const AudioInjectorOptions&, injectorOptions));
diff --git a/libraries/script-engine/src/EventTypes.cpp b/libraries/script-engine/src/EventTypes.cpp
index 1bdf0f5034..abdd934e5a 100644
--- a/libraries/script-engine/src/EventTypes.cpp
+++ b/libraries/script-engine/src/EventTypes.cpp
@@ -9,7 +9,6 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include "HFActionEvent.h"
 #include "KeyEvent.h"
 #include "MouseEvent.h"
 #include "SpatialEvent.h"
@@ -20,7 +19,6 @@
 #include "EventTypes.h"
 
 void registerEventTypes(QScriptEngine* engine) {
-    qScriptRegisterMetaType(engine, HFActionEvent::toScriptValue, HFActionEvent::fromScriptValue);
     qScriptRegisterMetaType(engine, KeyEvent::toScriptValue, KeyEvent::fromScriptValue);
     qScriptRegisterMetaType(engine, MouseEvent::toScriptValue, MouseEvent::fromScriptValue);
     qScriptRegisterMetaType(engine, PointerEvent::toScriptValue, PointerEvent::fromScriptValue);
diff --git a/libraries/script-engine/src/FileScriptingInterface.cpp b/libraries/script-engine/src/FileScriptingInterface.cpp
index 30d0a3a201..68a141ad97 100644
--- a/libraries/script-engine/src/FileScriptingInterface.cpp
+++ b/libraries/script-engine/src/FileScriptingInterface.cpp
@@ -32,26 +32,58 @@ FileScriptingInterface::FileScriptingInterface(QObject* parent) : QObject(parent
     // nothing for now
 }
 
-void FileScriptingInterface::runUnzip(QString path, QUrl url, bool autoAdd) {
+void FileScriptingInterface::runUnzip(QString path, QUrl url, bool autoAdd, bool isZip, bool isBlocks) {
     qCDebug(scriptengine) << "Url that was downloaded: " + url.toString();
     qCDebug(scriptengine) << "Path where download is saved: " + path;
     QString fileName = "/" + path.section("/", -1);
+    qCDebug(scriptengine) << "Filename: " << fileName;
     QString tempDir = path;
-    tempDir.remove(fileName);
+    if (!isZip) {
+        tempDir.remove(fileName);
+    } else {
+        QTemporaryDir zipTemp;
+        tempDir = zipTemp.path();
+        path.remove("file:///");
+    }
+    
     qCDebug(scriptengine) << "Temporary directory at: " + tempDir;
     if (!isTempDir(tempDir)) {
         qCDebug(scriptengine) << "Temporary directory mismatch; risk of losing files";
         return;
     }
 
-    QString file = unzipFile(path, tempDir);
-    QString filename = QUrl::fromLocalFile(file).toString();
-    if (file != "") {
-        qCDebug(scriptengine) << "File to upload: " + filename;
+    QStringList fileList = unzipFile(path, tempDir);
+    
+    if (!fileList.isEmpty()) {
+        qCDebug(scriptengine) << "File to upload: " + fileList.first();
     } else {
         qCDebug(scriptengine) << "Unzip failed";
     }
-    emit unzipResult(path, filename, autoAdd);
+
+    if (path.contains("vr.google.com/downloads")) {
+        isZip = true;
+    }
+    emit unzipResult(path, fileList, autoAdd, isZip, isBlocks);
+
+}
+
+QStringList FileScriptingInterface::unzipFile(QString path, QString tempDir) {
+
+    QDir dir(path);
+    QString dirName = dir.path();
+    qCDebug(scriptengine) << "Directory to unzip: " << dirName;
+    QString target = tempDir + "/model_repo";
+    QStringList list = JlCompress::extractDir(dirName, target);
+
+    qCDebug(scriptengine) << list;
+
+    if (!list.isEmpty()) {
+        return list;
+    } else {
+        qCDebug(scriptengine) << "Extraction failed";
+        return list;
+    }
+
 }
 
 // fix to check that we are only referring to a temporary directory
@@ -92,24 +124,6 @@ void FileScriptingInterface::downloadZip(QString path, const QString link) {
     request->send();
 }
 
-QString FileScriptingInterface::unzipFile(QString path, QString tempDir) {
-
-    QDir dir(path);
-    QString dirName = dir.path();
-    QString target = tempDir + "/model_repo";
-    QStringList list = JlCompress::extractDir(dirName, target);
-
-    qCDebug(scriptengine) << list;
-
-    if (!list.isEmpty()) {
-        return list.front();
-    } else {
-        qCDebug(scriptengine) << "Extraction failed";
-        return "";
-    }
-
-}
-
 // this function is not in use
 void FileScriptingInterface::recursiveFileScan(QFileInfo file, QString* dirName) {
     /*if (!file.isDir()) {
diff --git a/libraries/script-engine/src/FileScriptingInterface.h b/libraries/script-engine/src/FileScriptingInterface.h
index 5e9a6029e8..e4c27dbf7f 100644
--- a/libraries/script-engine/src/FileScriptingInterface.h
+++ b/libraries/script-engine/src/FileScriptingInterface.h
@@ -24,15 +24,15 @@ public:
 
 public slots:
     QString convertUrlToPath(QUrl url);
-    void runUnzip(QString path, QUrl url, bool autoAdd);
+    void runUnzip(QString path, QUrl url, bool autoAdd, bool isZip, bool isBlocks);
     QString getTempDir();
 
 signals:
-    void unzipResult(QString zipFile, QString unzipFile, bool autoAdd);
+    void unzipResult(QString zipFile, QStringList unzipFile, bool autoAdd, bool isZip, bool isBlocks);
 
 private:
     bool isTempDir(QString tempDir);
-    QString unzipFile(QString path, QString tempDir);
+    QStringList unzipFile(QString path, QString tempDir);
     void recursiveFileScan(QFileInfo file, QString* dirName);
     void downloadZip(QString path, const QString link);
 
diff --git a/libraries/script-engine/src/HFActionEvent.cpp b/libraries/script-engine/src/HFActionEvent.cpp
deleted file mode 100644
index 3ed3bcb73c..0000000000
--- a/libraries/script-engine/src/HFActionEvent.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-//  HFActionEvent.cpp
-//  script-engine/src
-//
-//  Created by Stephen Birarda on 2014-10-27.
-//  Copyright 2014 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 "HFActionEvent.h"
-
-HFActionEvent::HFActionEvent(QEvent::Type type, const PickRay& actionRay) :
-    HFMetaEvent(type),
-    actionRay(actionRay)
-{
-    
-}
-
-QEvent::Type HFActionEvent::startType() {
-    static QEvent::Type startType = HFMetaEvent::newEventType();
-    return startType;
-}
-
-QEvent::Type HFActionEvent::endType() {
-    static QEvent::Type endType = HFMetaEvent::newEventType();
-    return endType;
-}
-
-QScriptValue HFActionEvent::toScriptValue(QScriptEngine* engine, const HFActionEvent& event) {
-    QScriptValue obj = engine->newObject();
-    obj.setProperty("actionRay", pickRayToScriptValue(engine, event.actionRay));
-    return obj;
-}
-
-void HFActionEvent::fromScriptValue(const QScriptValue& object, HFActionEvent& event) {
-    // not yet implemented
-}
-
diff --git a/libraries/script-engine/src/HFActionEvent.h b/libraries/script-engine/src/HFActionEvent.h
deleted file mode 100644
index c16b165ae3..0000000000
--- a/libraries/script-engine/src/HFActionEvent.h
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-//  HFActionEvent.h
-//  script-engine/src
-//
-//  Created by Stephen Birarda on 2014-10-27.
-//  Copyright 2014 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_HFActionEvent_h
-#define hifi_HFActionEvent_h
-
-
-#include <qscriptengine.h>
-
-#include <RegisteredMetaTypes.h>
-
-#include "HFMetaEvent.h"
-
-class HFActionEvent : public HFMetaEvent {
-public:
-    HFActionEvent() {};
-    HFActionEvent(QEvent::Type type, const PickRay& actionRay);
-    
-    static QEvent::Type startType();
-    static QEvent::Type endType();
-    
-    static QScriptValue toScriptValue(QScriptEngine* engine, const HFActionEvent& event);
-    static void fromScriptValue(const QScriptValue& object, HFActionEvent& event);
-    
-    PickRay actionRay;
-};
-
-Q_DECLARE_METATYPE(HFActionEvent)
-
-#endif // hifi_HFActionEvent_h
\ No newline at end of file
diff --git a/libraries/script-engine/src/HFBackEvent.cpp b/libraries/script-engine/src/HFBackEvent.cpp
deleted file mode 100644
index c67b2e3431..0000000000
--- a/libraries/script-engine/src/HFBackEvent.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-//
-//  HFBackEvent.cpp
-//  script-engine/src
-//
-//  Created by Stephen Birarda on 2014-10-27.
-//  Copyright 2014 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 "HFBackEvent.h"
-
-HFBackEvent::HFBackEvent(QEvent::Type type) :
-    HFMetaEvent(type)
-{
-    
-}
-
-QEvent::Type HFBackEvent::startType() {
-    static QEvent::Type startType = HFMetaEvent::newEventType();
-    return startType;
-}
-
-QEvent::Type HFBackEvent::endType() {
-    static QEvent::Type endType = HFMetaEvent::newEventType();
-    return endType;
-}
diff --git a/libraries/script-engine/src/HFBackEvent.h b/libraries/script-engine/src/HFBackEvent.h
deleted file mode 100644
index bb7b348ea7..0000000000
--- a/libraries/script-engine/src/HFBackEvent.h
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-//  HFBackEvent.h
-//  script-engine/src
-//
-//  Created by Stephen Birarda on 2014-10-27.
-//  Copyright 2014 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_HFBackEvent_h
-#define hifi_HFBackEvent_h
-
-#include <qevent.h>
-#include <qscriptengine.h>
-
-#include "HFMetaEvent.h"
-
-class HFBackEvent : public HFMetaEvent {
-public:
-    HFBackEvent() {};
-    HFBackEvent(QEvent::Type type);
-    
-    static QEvent::Type startType();
-    static QEvent::Type endType();
-};
-
-#endif // hifi_HFBackEvent_h
\ No newline at end of file
diff --git a/libraries/script-engine/src/HFMetaEvent.cpp b/libraries/script-engine/src/HFMetaEvent.cpp
deleted file mode 100644
index f06c349996..0000000000
--- a/libraries/script-engine/src/HFMetaEvent.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-//  HFMetaEvent.cpp
-//  script-engine/src
-//
-//  Created by Stephen Birarda on 2014-10-27.
-//  Copyright 2014 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 "HFMetaEvent.h"
-
-QSet<QEvent::Type> HFMetaEvent::_types = QSet<QEvent::Type>();
-
-QEvent::Type HFMetaEvent::newEventType() {
-    QEvent::Type newType = static_cast<QEvent::Type>(QEvent::registerEventType());
-    _types.insert(newType);
-    return newType;
-}
\ No newline at end of file
diff --git a/libraries/script-engine/src/HFMetaEvent.h b/libraries/script-engine/src/HFMetaEvent.h
deleted file mode 100644
index 2fd71b8a3b..0000000000
--- a/libraries/script-engine/src/HFMetaEvent.h
+++ /dev/null
@@ -1,28 +0,0 @@
-//
-//  HFMetaEvent.h
-//  script-engine/src
-//
-//  Created by Stephen Birarda on 2014-10-27.
-//  Copyright 2014 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_HFMetaEvent_h
-#define hifi_HFMetaEvent_h
-
-#include <qevent.h>
-
-class HFMetaEvent : public QEvent {
-public:
-    HFMetaEvent() : QEvent(HFMetaEvent::newEventType()) {};
-    HFMetaEvent(QEvent::Type type) : QEvent(type) {};
-    static const QSet<QEvent::Type>& types() { return HFMetaEvent::_types; }
-protected:
-    static QEvent::Type newEventType();
-    
-    static QSet<QEvent::Type> _types;
-};
-
-#endif // hifi_HFMetaEvent_h
\ No newline at end of file
diff --git a/libraries/script-engine/src/ModelScriptingInterface.cpp b/libraries/script-engine/src/ModelScriptingInterface.cpp
index 762d9ffb29..3234a079ec 100644
--- a/libraries/script-engine/src/ModelScriptingInterface.cpp
+++ b/libraries/script-engine/src/ModelScriptingInterface.cpp
@@ -38,16 +38,22 @@ QString ModelScriptingInterface::meshToOBJ(MeshProxyList in) {
 QScriptValue ModelScriptingInterface::appendMeshes(MeshProxyList in) {
     // figure out the size of the resulting mesh
     size_t totalVertexCount { 0 };
-    size_t totalAttributeCount { 0 };
+    size_t totalColorCount { 0 };
+    size_t totalNormalCount { 0 };
     size_t totalIndexCount { 0 };
     foreach (const MeshProxy* meshProxy, in) {
         MeshPointer mesh = meshProxy->getMeshPointer();
         totalVertexCount += mesh->getNumVertices();
 
+        int attributeTypeColor = gpu::Stream::InputSlot::COLOR; // libraries/gpu/src/gpu/Stream.h
+        const gpu::BufferView& colorsBufferView = mesh->getAttributeBuffer(attributeTypeColor);
+        gpu::BufferView::Index numColors = (gpu::BufferView::Index)colorsBufferView.getNumElements();
+        totalColorCount += numColors;
+
         int attributeTypeNormal = gpu::Stream::InputSlot::NORMAL; // libraries/gpu/src/gpu/Stream.h
         const gpu::BufferView& normalsBufferView = mesh->getAttributeBuffer(attributeTypeNormal);
         gpu::BufferView::Index numNormals = (gpu::BufferView::Index)normalsBufferView.getNumElements();
-        totalAttributeCount += numNormals;
+        totalNormalCount += numNormals;
 
         totalIndexCount += mesh->getNumIndices();
     }
@@ -57,7 +63,11 @@ QScriptValue ModelScriptingInterface::appendMeshes(MeshProxyList in) {
     unsigned char* combinedVertexData  = new unsigned char[combinedVertexSize];
     unsigned char* combinedVertexDataCursor = combinedVertexData;
 
-    gpu::Resource::Size combinedNormalSize = totalAttributeCount * sizeof(glm::vec3);
+    gpu::Resource::Size combinedColorSize = totalColorCount * sizeof(glm::vec3);
+    unsigned char* combinedColorData  = new unsigned char[combinedColorSize];
+    unsigned char* combinedColorDataCursor = combinedColorData;
+
+    gpu::Resource::Size combinedNormalSize = totalNormalCount * sizeof(glm::vec3);
     unsigned char* combinedNormalData  = new unsigned char[combinedNormalSize];
     unsigned char* combinedNormalDataCursor = combinedNormalData;
 
@@ -74,6 +84,10 @@ QScriptValue ModelScriptingInterface::appendMeshes(MeshProxyList in) {
                 memcpy(combinedVertexDataCursor, &position, sizeof(position));
                 combinedVertexDataCursor += sizeof(position);
             },
+            [&](glm::vec3 color){
+                memcpy(combinedColorDataCursor, &color, sizeof(color));
+                combinedColorDataCursor += sizeof(color);
+            },
             [&](glm::vec3 normal){
                 memcpy(combinedNormalDataCursor, &normal, sizeof(normal));
                 combinedNormalDataCursor += sizeof(normal);
@@ -96,6 +110,13 @@ QScriptValue ModelScriptingInterface::appendMeshes(MeshProxyList in) {
     gpu::BufferView combinedVertexBufferView(combinedVertexBufferPointer, vertexElement);
     result->setVertexBuffer(combinedVertexBufferView);
 
+    int attributeTypeColor = gpu::Stream::InputSlot::COLOR; // libraries/gpu/src/gpu/Stream.h
+    gpu::Element colorElement = gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ);
+    gpu::Buffer* combinedColorsBuffer = new gpu::Buffer(combinedColorSize, combinedColorData);
+    gpu::BufferPointer combinedColorsBufferPointer(combinedColorsBuffer);
+    gpu::BufferView combinedColorsBufferView(combinedColorsBufferPointer, colorElement);
+    result->addAttribute(attributeTypeColor, combinedColorsBufferView);
+
     int attributeTypeNormal = gpu::Stream::InputSlot::NORMAL; // libraries/gpu/src/gpu/Stream.h
     gpu::Element normalElement = gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ);
     gpu::Buffer* combinedNormalsBuffer = new gpu::Buffer(combinedNormalSize, combinedNormalData);
@@ -132,12 +153,48 @@ QScriptValue ModelScriptingInterface::transformMesh(glm::mat4 transform, MeshPro
     }
 
     model::MeshPointer result = mesh->map([&](glm::vec3 position){ return glm::vec3(transform * glm::vec4(position, 1.0f)); },
+                                          [&](glm::vec3 color){ return color; },
                                           [&](glm::vec3 normal){ return glm::vec3(transform * glm::vec4(normal, 0.0f)); },
                                           [&](uint32_t index){ return index; });
     MeshProxy* resultProxy = new SimpleMeshProxy(result);
     return meshToScriptValue(_modelScriptEngine, resultProxy);
 }
 
+QScriptValue ModelScriptingInterface::getVertexCount(MeshProxy* meshProxy) {
+    if (!meshProxy) {
+        return QScriptValue(false);
+    }
+    MeshPointer mesh = meshProxy->getMeshPointer();
+    if (!mesh) {
+        return QScriptValue(false);
+    }
+
+    gpu::BufferView::Index numVertices = (gpu::BufferView::Index)mesh->getNumVertices();
+
+    return numVertices;
+}
+
+QScriptValue ModelScriptingInterface::getVertex(MeshProxy* meshProxy, int vertexIndex) {
+    if (!meshProxy) {
+        return QScriptValue(false);
+    }
+    MeshPointer mesh = meshProxy->getMeshPointer();
+    if (!mesh) {
+        return QScriptValue(false);
+    }
+
+    const gpu::BufferView& vertexBufferView = mesh->getVertexBuffer();
+    gpu::BufferView::Index numVertices = (gpu::BufferView::Index)mesh->getNumVertices();
+
+    if (vertexIndex < 0 || vertexIndex >= numVertices) {
+        return QScriptValue(false);
+    }
+
+    glm::vec3 pos = vertexBufferView.get<glm::vec3>(vertexIndex);
+    return vec3toScriptValue(_modelScriptEngine, pos);
+}
+
+
 QScriptValue ModelScriptingInterface::newMesh(const QVector<glm::vec3>& vertices,
                                               const QVector<glm::vec3>& normals,
                                               const QVector<MeshFace>& faces) {
diff --git a/libraries/script-engine/src/ModelScriptingInterface.h b/libraries/script-engine/src/ModelScriptingInterface.h
index ba23623acf..3c239f006f 100644
--- a/libraries/script-engine/src/ModelScriptingInterface.h
+++ b/libraries/script-engine/src/ModelScriptingInterface.h
@@ -29,6 +29,8 @@ public:
     Q_INVOKABLE QScriptValue newMesh(const QVector<glm::vec3>& vertices,
                                      const QVector<glm::vec3>& normals,
                                      const QVector<MeshFace>& faces);
+    Q_INVOKABLE QScriptValue getVertexCount(MeshProxy* meshProxy);
+    Q_INVOKABLE QScriptValue getVertex(MeshProxy* meshProxy, int vertexIndex);
 
 private:
     QScriptEngine* _modelScriptEngine { nullptr };
diff --git a/libraries/script-engine/src/Quat.h b/libraries/script-engine/src/Quat.h
index 3b3a6fde7c..d3fb2ed5c2 100644
--- a/libraries/script-engine/src/Quat.h
+++ b/libraries/script-engine/src/Quat.h
@@ -33,6 +33,7 @@
 /// Scriptable interface a Quaternion helper class object. Used exclusively in the JavaScript API
 class Quat : public QObject, protected QScriptable {
     Q_OBJECT
+    Q_PROPERTY(glm::quat IDENTITY READ IDENTITY CONSTANT)
 
 public slots:
     glm::quat multiply(const glm::quat& q1, const glm::quat& q2);
@@ -63,6 +64,10 @@ public slots:
     bool equal(const glm::quat& q1, const glm::quat& q2);
     glm::quat cancelOutRollAndPitch(const glm::quat& q);
     glm::quat cancelOutRoll(const glm::quat& q);
+
+private:
+    const glm::quat& IDENTITY() const { return Quaternions::IDENTITY; }
+
 };
 
 #endif // hifi_Quat_h
diff --git a/libraries/script-engine/src/RecordingScriptingInterface.cpp b/libraries/script-engine/src/RecordingScriptingInterface.cpp
index 7583f562e6..55895e31a4 100644
--- a/libraries/script-engine/src/RecordingScriptingInterface.cpp
+++ b/libraries/script-engine/src/RecordingScriptingInterface.cpp
@@ -14,6 +14,7 @@
 #include <QtScript/QScriptValue>
 #include <QtWidgets/QFileDialog>
 
+#include <shared/QtHelpers.h>
 #include <AssetClient.h>
 #include <AssetUpload.h>
 #include <BuildInfo.h>
@@ -53,9 +54,24 @@ float RecordingScriptingInterface::playerLength() const {
     return _player->length();
 }
 
+void RecordingScriptingInterface::playClip(NetworkClipLoaderPointer clipLoader, const QString& url, QScriptValue callback) {
+    _player->queueClip(clipLoader->getClip());
+
+    if (callback.isFunction()) {
+        QScriptValueList args { true, url };
+        callback.call(_scriptEngine->globalObject(), args);
+    }
+}
+
 void RecordingScriptingInterface::loadRecording(const QString& url, QScriptValue callback) {
     auto clipLoader = DependencyManager::get<recording::ClipCache>()->getClipLoader(url);
 
+    if (clipLoader->isLoaded()) {
+        qCDebug(scriptengine) << "Recording already loaded from" << url;
+        playClip(clipLoader, url, callback);
+        return;
+    }
+
     // hold a strong pointer to the loading clip so that it has a chance to load
     _clipLoaders.insert(clipLoader);
 
@@ -68,12 +84,7 @@ void RecordingScriptingInterface::loadRecording(const QString& url, QScriptValue
         if (auto clipLoader = weakClipLoader.toStrongRef()) {
             qCDebug(scriptengine) << "Loaded recording from" << url;
 
-            _player->queueClip(clipLoader->getClip());
-
-            if (callback.isFunction()) {
-                QScriptValueList args { true, url };
-                callback.call(_scriptEngine->globalObject(), args);
-            }
+            playClip(clipLoader, url, callback);
 
             // drop our strong pointer to this clip so it is cleaned up
             _clipLoaders.remove(clipLoader);
@@ -98,7 +109,7 @@ void RecordingScriptingInterface::loadRecording(const QString& url, QScriptValue
 
 void RecordingScriptingInterface::startPlaying() {
     if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "startPlaying", Qt::BlockingQueuedConnection);
+        BLOCKING_INVOKE_METHOD(this, "startPlaying");
         return;
     }
 
@@ -115,7 +126,7 @@ void RecordingScriptingInterface::setPlayerAudioOffset(float audioOffset) {
 
 void RecordingScriptingInterface::setPlayerTime(float time) {
     if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "setPlayerTime", Qt::BlockingQueuedConnection, Q_ARG(float, time));
+        BLOCKING_INVOKE_METHOD(this, "setPlayerTime", Q_ARG(float, time));
         return;
     }
     _player->seek(time);
@@ -147,7 +158,7 @@ void RecordingScriptingInterface::setPlayerUseSkeletonModel(bool useSkeletonMode
 
 void RecordingScriptingInterface::pausePlayer() {
     if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "pausePlayer", Qt::BlockingQueuedConnection);
+        BLOCKING_INVOKE_METHOD(this, "pausePlayer");
         return;
     }
     _player->pause();
@@ -155,7 +166,7 @@ void RecordingScriptingInterface::pausePlayer() {
 
 void RecordingScriptingInterface::stopPlaying() {
     if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "stopPlaying", Qt::BlockingQueuedConnection);
+        BLOCKING_INVOKE_METHOD(this, "stopPlaying");
         return;
     }
     _player->stop();
@@ -176,7 +187,7 @@ void RecordingScriptingInterface::startRecording() {
     }
 
     if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "startRecording", Qt::BlockingQueuedConnection);
+        BLOCKING_INVOKE_METHOD(this, "startRecording");
         return;
     }
 
@@ -199,7 +210,7 @@ QString RecordingScriptingInterface::getDefaultRecordingSaveDirectory() {
 
 void RecordingScriptingInterface::saveRecording(const QString& filename) {
     if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "saveRecording", Qt::BlockingQueuedConnection,
+        BLOCKING_INVOKE_METHOD(this, "saveRecording",
             Q_ARG(QString, filename));
         return;
     }
@@ -220,7 +231,7 @@ bool RecordingScriptingInterface::saveRecordingToAsset(QScriptValue getClipAtpUr
 
     if (QThread::currentThread() != thread()) {
         bool result;
-        QMetaObject::invokeMethod(this, "saveRecordingToAsset", Qt::BlockingQueuedConnection,
+        BLOCKING_INVOKE_METHOD(this, "saveRecordingToAsset",
             Q_RETURN_ARG(bool, result),
             Q_ARG(QScriptValue, getClipAtpUrl));
         return result;
@@ -257,7 +268,7 @@ bool RecordingScriptingInterface::saveRecordingToAsset(QScriptValue getClipAtpUr
 
 void RecordingScriptingInterface::loadLastRecording() {
     if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "loadLastRecording", Qt::BlockingQueuedConnection);
+        BLOCKING_INVOKE_METHOD(this, "loadLastRecording");
         return;
     }
 
diff --git a/libraries/script-engine/src/RecordingScriptingInterface.h b/libraries/script-engine/src/RecordingScriptingInterface.h
index c4220958a2..22e4d30830 100644
--- a/libraries/script-engine/src/RecordingScriptingInterface.h
+++ b/libraries/script-engine/src/RecordingScriptingInterface.h
@@ -14,6 +14,7 @@
 
 #include <QtCore/QObject>
 
+#include <BaseScriptEngine.h>
 #include <DependencyManager.h>
 #include <recording/ClipCache.h>
 #include <recording/Forward.h>
@@ -28,7 +29,7 @@ class RecordingScriptingInterface : public QObject, public Dependency {
 public:
     RecordingScriptingInterface();
 
-    void setScriptEngine(QScriptEngine* scriptEngine) { _scriptEngine = scriptEngine; }
+    void setScriptEngine(QSharedPointer<BaseScriptEngine> scriptEngine) { _scriptEngine = scriptEngine; }
 
 public slots:
     void loadRecording(const QString& url, QScriptValue callback = QScriptValue());
@@ -85,8 +86,11 @@ protected:
     Flag _useSkeletonModel { false };
     recording::ClipPointer _lastClip;
 
-    QScriptEngine* _scriptEngine;
+    QSharedPointer<BaseScriptEngine> _scriptEngine;
     QSet<recording::NetworkClipLoaderPointer> _clipLoaders;
+
+private:
+    void playClip(recording::NetworkClipLoaderPointer clipLoader, const QString& url, QScriptValue callback);
 };
 
 #endif // hifi_RecordingScriptingInterface_h
diff --git a/libraries/script-engine/src/ScriptAudioInjector.cpp b/libraries/script-engine/src/ScriptAudioInjector.cpp
index c0ad2debd9..516f62401f 100644
--- a/libraries/script-engine/src/ScriptAudioInjector.cpp
+++ b/libraries/script-engine/src/ScriptAudioInjector.cpp
@@ -21,7 +21,7 @@ QScriptValue injectorToScriptValue(QScriptEngine* engine, ScriptAudioInjector* c
     // when the script goes down we want to cleanup the injector
     QObject::connect(engine, &QScriptEngine::destroyed, in, &ScriptAudioInjector::stopInjectorImmediately,
                      Qt::DirectConnection);
-    
+
     return engine->newQObject(in, QScriptEngine::ScriptOwnership);
 }
 
@@ -29,10 +29,10 @@ void injectorFromScriptValue(const QScriptValue& object, ScriptAudioInjector*& o
     out = qobject_cast<ScriptAudioInjector*>(object.toQObject());
 }
 
-ScriptAudioInjector::ScriptAudioInjector(AudioInjector* injector) :
+ScriptAudioInjector::ScriptAudioInjector(const AudioInjectorPointer& injector) :
     _injector(injector)
 {
-    QObject::connect(injector, &AudioInjector::finished, this, &ScriptAudioInjector::finished);
+    QObject::connect(injector.data(), &AudioInjector::finished, this, &ScriptAudioInjector::finished);
 }
 
 ScriptAudioInjector::~ScriptAudioInjector() {
@@ -44,5 +44,5 @@ ScriptAudioInjector::~ScriptAudioInjector() {
 
 void ScriptAudioInjector::stopInjectorImmediately() {
     qCDebug(scriptengine) << "ScriptAudioInjector::stopInjectorImmediately called to stop audio injector immediately.";
-    _injector->stopAndDeleteLater();
+    _injector->stop();
 }
diff --git a/libraries/script-engine/src/ScriptAudioInjector.h b/libraries/script-engine/src/ScriptAudioInjector.h
index 4de12af62c..4c2871dd34 100644
--- a/libraries/script-engine/src/ScriptAudioInjector.h
+++ b/libraries/script-engine/src/ScriptAudioInjector.h
@@ -18,31 +18,31 @@
 
 class ScriptAudioInjector : public QObject {
     Q_OBJECT
-    
+
     Q_PROPERTY(bool playing READ isPlaying)
     Q_PROPERTY(float loudness READ getLoudness)
     Q_PROPERTY(AudioInjectorOptions options WRITE setOptions READ getOptions)
 public:
-    ScriptAudioInjector(AudioInjector* injector);
+    ScriptAudioInjector(const AudioInjectorPointer& injector);
     ~ScriptAudioInjector();
 public slots:
     void restart() { _injector->restart(); }
     void stop() { _injector->stop(); }
-   
+
     const AudioInjectorOptions& getOptions() const { return _injector->getOptions(); }
     void setOptions(const AudioInjectorOptions& options) { _injector->setOptions(options); }
-    
+
     float getLoudness() const { return _injector->getLoudness(); }
     bool isPlaying() const { return _injector->isPlaying(); }
-    
+
 signals:
     void finished();
-    
+
 protected slots:
     void stopInjectorImmediately();
 private:
-    QPointer<AudioInjector> _injector;
-    
+    AudioInjectorPointer _injector;
+
     friend QScriptValue injectorToScriptValue(QScriptEngine* engine, ScriptAudioInjector* const& in);
 };
 
diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp
index 11bb044d72..6fbcd6a794 100644
--- a/libraries/script-engine/src/ScriptEngine.cpp
+++ b/libraries/script-engine/src/ScriptEngine.cpp
@@ -36,6 +36,7 @@
 
 #include <QtScriptTools/QScriptEngineDebugger>
 
+#include <shared/QtHelpers.h>
 #include <AudioConstants.h>
 #include <AudioEffectOptions.h>
 #include <AvatarData.h>
@@ -76,6 +77,7 @@
 
 #include <Profile.h>
 
+#include "../../midi/src/Midi.h"        // FIXME why won't a simpler include work?
 #include "MIDIEvent.h"
 
 const QString ScriptEngine::_SETTINGS_ENABLE_EXTENDED_EXCEPTIONS {
@@ -95,6 +97,8 @@ static const bool HIFI_AUTOREFRESH_FILE_SCRIPTS { true };
 Q_DECLARE_METATYPE(QScriptEngine::FunctionSignature)
 int functionSignatureMetaID = qRegisterMetaType<QScriptEngine::FunctionSignature>();
 
+int scriptEnginePointerMetaID = qRegisterMetaType<ScriptEnginePointer>();
+
 Q_LOGGING_CATEGORY(scriptengineScript, "hifi.scriptengine.script")
 
 static QScriptValue debugPrint(QScriptContext* context, QScriptEngine* engine) {
@@ -105,10 +109,13 @@ static QScriptValue debugPrint(QScriptContext* context, QScriptEngine* engine) {
         }
         message += context->argument(i).toString();
     }
-    qCDebug(scriptengineScript).noquote() << message;  // noquote() so that \n is treated as newline
 
     if (ScriptEngine *scriptEngine = qobject_cast<ScriptEngine*>(engine)) {
         scriptEngine->print(message);
+        // prefix the script engine name to help disambiguate messages in the main debug log
+        qCDebug(scriptengineScript, "[%s] %s", qUtf8Printable(scriptEngine->getFilename()), qUtf8Printable(message));
+    } else {
+        qCDebug(scriptengineScript, "%s", qUtf8Printable(message));
     }
 
     return QScriptValue();
@@ -151,6 +158,15 @@ QString ScriptEngine::logException(const QScriptValue& exception) {
     return message;
 }
 
+ScriptEnginePointer scriptEngineFactory(ScriptEngine::Context context,
+                                                 const QString& scriptContents,
+                                                 const QString& fileNameString) {
+    ScriptEngine* engine = new ScriptEngine(context, scriptContents, fileNameString);
+    ScriptEnginePointer engineSP = ScriptEnginePointer(engine);
+    DependencyManager::get<ScriptEngines>()->addScriptEngine(qSharedPointerCast<ScriptEngine>(engineSP));
+    return engineSP;
+}
+
 int ScriptEngine::processLevelMaxRetries { ScriptRequest::MAX_RETRIES };
 ScriptEngine::ScriptEngine(Context context, const QString& scriptContents, const QString& fileNameString) :
     BaseScriptEngine(),
@@ -158,10 +174,10 @@ ScriptEngine::ScriptEngine(Context context, const QString& scriptContents, const
     _scriptContents(scriptContents),
     _timerFunctionMap(),
     _fileNameString(fileNameString),
-    _arrayBufferClass(new ArrayBufferClass(this))
+    _arrayBufferClass(new ArrayBufferClass(this)),
+    // don't delete `ScriptEngines` until all `ScriptEngine`s are gone
+    _scriptEngines(DependencyManager::get<ScriptEngines>())
 {
-    DependencyManager::get<ScriptEngines>()->addScriptEngine(this);
-
     connect(this, &QScriptEngine::signalHandlerException, this, [this](const QScriptValue& exception) {
         if (hasUncaughtException()) {
             // the engine's uncaughtException() seems to produce much better stack traces here
@@ -206,22 +222,9 @@ QString ScriptEngine::getContext() const {
 }
 
 ScriptEngine::~ScriptEngine() {
-    // FIXME: are these scriptInfoMessage/scriptWarningMessage segfaulting anybody else at app shutdown?
-#if !defined(Q_OS_LINUX)
-    scriptInfoMessage("Script Engine shutting down:" + getFilename());
-#else
-    qCDebug(scriptengine) << "~ScriptEngine()" << this;
-#endif
-
     auto scriptEngines = DependencyManager::get<ScriptEngines>();
     if (scriptEngines) {
-        scriptEngines->removeScriptEngine(this);
-    } else {
-#if !defined(Q_OS_LINUX)
-        scriptWarningMessage("Script destroyed after ScriptEngines!");
-#else
-        qCWarning(scriptengine) << ("Script destroyed after ScriptEngines!");
-#endif
+        scriptEngines->removeScriptEngine(qSharedPointerCast<ScriptEngine>(sharedFromThis()));
     }
 }
 
@@ -292,7 +295,7 @@ void ScriptEngine::runDebuggable() {
             stopAllTimers(); // make sure all our timers are stopped if the script is ending
 
             emit scriptEnding();
-            emit finished(_fileNameString, this);
+            emit finished(_fileNameString, qSharedPointerCast<ScriptEngine>(sharedFromThis()));
             _isRunning = false;
 
             emit runningStateChanged();
@@ -436,12 +439,12 @@ void ScriptEngine::loadURL(const QUrl& scriptURL, bool reload) {
     _fileNameString = url.toString();
     _isReloading = reload;
 
-	// Check that script has a supported file extension
+    // Check that script has a supported file extension
     if (!hasValidScriptSuffix(_fileNameString)) {
         scriptErrorMessage("File extension of file: " + _fileNameString + " is not a currently supported script type");
         emit errorLoadingScript(_fileNameString);
         return;
-	}
+    }
 
     const auto maxRetries = 0; // for consistency with previous scriptCache->getScript() behavior
     auto scriptCache = DependencyManager::get<ScriptCache>();
@@ -467,22 +470,22 @@ void ScriptEngine::loadURL(const QUrl& scriptURL, bool reload) {
 }
 
 void ScriptEngine::scriptErrorMessage(const QString& message) {
-    qCCritical(scriptengine) << qPrintable(message);
+    qCCritical(scriptengine, "[%s] %s", qUtf8Printable(getFilename()), qUtf8Printable(message));
     emit errorMessage(message, getFilename());
 }
 
 void ScriptEngine::scriptWarningMessage(const QString& message) {
-    qCWarning(scriptengine) << qPrintable(message);
+    qCWarning(scriptengine, "[%s] %s", qUtf8Printable(getFilename()), qUtf8Printable(message));
     emit warningMessage(message, getFilename());
 }
 
 void ScriptEngine::scriptInfoMessage(const QString& message) {
-    qCInfo(scriptengine) << qPrintable(message);
+    qCInfo(scriptengine, "[%s] %s", qUtf8Printable(getFilename()), qUtf8Printable(message));
     emit infoMessage(message, getFilename());
 }
 
 void ScriptEngine::scriptPrintedMessage(const QString& message) {
-    qCDebug(scriptengine) << qPrintable(message);
+    qCDebug(scriptengine, "[%s] %s", qUtf8Printable(getFilename()), qUtf8Printable(message));
     emit printedMessage(message, getFilename());
 }
 
@@ -501,7 +504,8 @@ static void animVarMapFromScriptValue(const QScriptValue& value, AnimVariantMap&
     parameters.animVariantMapFromScriptValue(value);
 }
 // ... while these two are not. But none of the four are ever used.
-static QScriptValue resultHandlerToScriptValue(QScriptEngine* engine, const AnimVariantResultHandler& resultHandler) {
+static QScriptValue resultHandlerToScriptValue(QScriptEngine* engine,
+                                               const AnimVariantResultHandler& resultHandler) {
     qCCritical(scriptengine) << "Attempt to marshall result handler to javascript";
     assert(false);
     return QScriptValue();
@@ -514,7 +518,8 @@ static void resultHandlerFromScriptValue(const QScriptValue& value, AnimVariantR
 // Templated qScriptRegisterMetaType fails to compile with raw pointers
 using ScriptableResourceRawPtr = ScriptableResource*;
 
-static QScriptValue scriptableResourceToScriptValue(QScriptEngine* engine, const ScriptableResourceRawPtr& resource) {
+static QScriptValue scriptableResourceToScriptValue(QScriptEngine* engine,
+                                                    const ScriptableResourceRawPtr& resource) {
     // The first script to encounter this resource will track its memory.
     // In this way, it will be more likely to GC.
     // This fails in the case that the resource is used across many scripts, but
@@ -537,11 +542,11 @@ static void scriptableResourceFromScriptValue(const QScriptValue& value, Scripta
     resource = static_cast<ScriptableResourceRawPtr>(value.toQObject());
 }
 
-static QScriptValue createScriptableResourcePrototype(QScriptEngine* engine) {
+static QScriptValue createScriptableResourcePrototype(ScriptEnginePointer engine) {
     auto prototype = engine->newObject();
 
     // Expose enum State to JS/QML via properties
-    QObject* state = new QObject(engine);
+    QObject* state = new QObject(engine.data());
     state->setObjectName("ResourceState");
     auto metaEnum = QMetaEnum::fromType<ScriptableResource::State>();
     for (int i = 0; i < metaEnum.keyCount(); ++i) {
@@ -666,6 +671,8 @@ void ScriptEngine::init() {
 
     registerGlobalObject("Audio", DependencyManager::get<AudioScriptingInterface>().data());
 
+    registerGlobalObject("Midi", DependencyManager::get<Midi>().data());
+
     registerGlobalObject("Entities", entityScriptingInterface.data());
     registerGlobalObject("Quat", &_quatLibrary);
     registerGlobalObject("Vec3", &_vec3Library);
@@ -689,7 +696,7 @@ void ScriptEngine::init() {
     qScriptRegisterMetaType(this, resultHandlerToScriptValue, resultHandlerFromScriptValue);
 
     // Scriptable cache access
-    auto resourcePrototype = createScriptableResourcePrototype(this);
+    auto resourcePrototype = createScriptableResourcePrototype(qSharedPointerCast<ScriptEngine>(sharedFromThis()));
     globalObject().setProperty("Resource", resourcePrototype);
     setDefaultPrototype(qMetaTypeId<ScriptableResource*>(), resourcePrototype);
     qScriptRegisterMetaType(this, scriptableResourceToScriptValue, scriptableResourceFromScriptValue);
@@ -964,7 +971,7 @@ QScriptValue ScriptEngine::evaluate(const QString& sourceCode, const QString& fi
         qCDebug(scriptengine) << "*** WARNING *** ScriptEngine::evaluate() called on wrong thread [" << QThread::currentThread() << "], invoking on correct thread [" << thread() << "] "
             "sourceCode:" << sourceCode << " fileName:" << fileName << "lineNumber:" << lineNumber;
 #endif
-        QMetaObject::invokeMethod(this, "evaluate", Qt::BlockingQueuedConnection,
+        BLOCKING_INVOKE_METHOD(this, "evaluate",
                                   Q_RETURN_ARG(QScriptValue, result),
                                   Q_ARG(const QString&, sourceCode),
                                   Q_ARG(const QString&, fileName),
@@ -1174,7 +1181,7 @@ void ScriptEngine::run() {
         }
     }
 
-    emit finished(_fileNameString, this);
+    emit finished(_fileNameString, qSharedPointerCast<ScriptEngine>(sharedFromThis()));
 
     _isRunning = false;
     emit runningStateChanged();
@@ -1820,7 +1827,7 @@ void ScriptEngine::include(const QStringList& includeFiles, QScriptValue callbac
                         clearExceptions();
                     }
                 } else {
-                    scriptWarningMessage("Script.include() skipping evaluation of previously included url:" + url.toString());
+                    scriptPrintedMessage("Script.include() skipping evaluation of previously included url:" + url.toString());
                 }
             }
         }
@@ -2468,7 +2475,7 @@ void ScriptEngine::callWithEnvironment(const EntityItemID& entityID, const QUrl&
     doWithEnvironment(entityID, sandboxURL, operation);
 }
 
-void ScriptEngine::callEntityScriptMethod(const EntityItemID& entityID, const QString& methodName, const QStringList& params) {
+void ScriptEngine::callEntityScriptMethod(const EntityItemID& entityID, const QString& methodName, const QStringList& params, const QUuid& remoteCallerID) {
     if (QThread::currentThread() != thread()) {
 #ifdef THREAD_DEBUGGING
         qCDebug(scriptengine) << "*** WARNING *** ScriptEngine::callEntityScriptMethod() called on wrong thread [" << QThread::currentThread() << "], invoking on correct thread [" << thread() << "]  "
@@ -2478,7 +2485,8 @@ void ScriptEngine::callEntityScriptMethod(const EntityItemID& entityID, const QS
         QMetaObject::invokeMethod(this, "callEntityScriptMethod",
                                   Q_ARG(const EntityItemID&, entityID),
                                   Q_ARG(const QString&, methodName),
-                                  Q_ARG(const QStringList&, params));
+                                  Q_ARG(const QStringList&, params),
+                                  Q_ARG(const QUuid&, remoteCallerID));
         return;
     }
 #ifdef THREAD_DEBUGGING
@@ -2492,13 +2500,41 @@ void ScriptEngine::callEntityScriptMethod(const EntityItemID& entityID, const QS
     if (isEntityScriptRunning(entityID)) {
         EntityScriptDetails details = _entityScripts[entityID];
         QScriptValue entityScript = details.scriptObject; // previously loaded
-        if (entityScript.property(methodName).isFunction()) {
+
+        // If this is a remote call, we need to check to see if the function is remotely callable
+        // we do this by checking for the existance of the 'remotelyCallable' property on the
+        // entityScript. And we confirm that the method name is included. If this fails, the
+        // function will not be called.
+        bool callAllowed = false;
+        if (remoteCallerID == QUuid()) {
+            callAllowed = true;
+        } else {
+            if (entityScript.property("remotelyCallable").isArray()) {
+                auto callables = entityScript.property("remotelyCallable");
+                auto callableCount = callables.property("length").toInteger();
+                for (int i = 0; i < callableCount; i++) {
+                    auto callable = callables.property(i).toString();
+                    if (callable == methodName) {
+                        callAllowed = true;
+                        break;
+                    }
+                }
+            }
+            if (!callAllowed) {
+                qDebug() << "Method [" << methodName << "] not remotely callable.";
+            }
+        }
+
+        if (callAllowed && entityScript.property(methodName).isFunction()) {
             QScriptValueList args;
             args << entityID.toScriptValue(this);
             args << qScriptValueFromSequence(this, params);
-            callWithEnvironment(entityID, details.definingSandboxURL, entityScript.property(methodName), entityScript, args);
-        }
 
+            QScriptValue oldData = this->globalObject().property("Script").property("remoteCallerID");
+            this->globalObject().property("Script").setProperty("remoteCallerID", remoteCallerID.toString()); // Make the remoteCallerID available to javascript as a global.
+            callWithEnvironment(entityID, details.definingSandboxURL, entityScript.property(methodName), entityScript, args);
+            this->globalObject().property("Script").setProperty("remoteCallerID", oldData);
+        }
     }
 }
 
diff --git a/libraries/script-engine/src/ScriptEngine.h b/libraries/script-engine/src/ScriptEngine.h
index 7c473a305b..17c0e0713a 100644
--- a/libraries/script-engine/src/ScriptEngine.h
+++ b/libraries/script-engine/src/ScriptEngine.h
@@ -53,6 +53,10 @@ static const int SCRIPT_FPS = 60;
 static const int DEFAULT_MAX_ENTITY_PPS = 9000;
 static const int DEFAULT_ENTITY_PPS_PER_SCRIPT = 900;
 
+class ScriptEngines;
+
+Q_DECLARE_METATYPE(ScriptEnginePointer)
+
 class CallbackData {
 public:
     QScriptValue function;
@@ -196,7 +200,8 @@ public:
     Q_INVOKABLE void unloadEntityScript(const EntityItemID& entityID, bool shouldRemoveFromMap = false); // will call unload method
     Q_INVOKABLE void unloadAllEntityScripts();
     Q_INVOKABLE void callEntityScriptMethod(const EntityItemID& entityID, const QString& methodName,
-                                            const QStringList& params = QStringList()) override;
+                                            const QStringList& params = QStringList(),
+                                            const QUuid& remoteCallerID = QUuid()) override;
     Q_INVOKABLE void callEntityScriptMethod(const EntityItemID& entityID, const QString& methodName, const PointerEvent& event);
     Q_INVOKABLE void callEntityScriptMethod(const EntityItemID& entityID, const QString& methodName, const EntityItemID& otherID, const Collision& collision);
 
@@ -242,7 +247,7 @@ signals:
     void errorLoadingScript(const QString& scriptFilename);
     void update(float deltaTime);
     void scriptEnding();
-    void finished(const QString& fileNameString, ScriptEngine* engine);
+    void finished(const QString& fileNameString, ScriptEnginePointer);
     void cleanupMenuItem(const QString& menuItemString);
     void printedMessage(const QString& message, const QString& scriptName);
     void errorMessage(const QString& message, const QString& scriptName);
@@ -328,6 +333,12 @@ protected:
     static const QString _SETTINGS_ENABLE_EXTENDED_EXCEPTIONS;
 
     Setting::Handle<bool> _enableExtendedJSExceptions { _SETTINGS_ENABLE_EXTENDED_EXCEPTIONS, true };
+
+    QSharedPointer<ScriptEngines> _scriptEngines;
 };
 
+ScriptEnginePointer scriptEngineFactory(ScriptEngine::Context context,
+                                        const QString& scriptContents,
+                                        const QString& fileNameString);
+
 #endif // hifi_ScriptEngine_h
diff --git a/libraries/script-engine/src/ScriptEngines.cpp b/libraries/script-engine/src/ScriptEngines.cpp
index 72392ac376..6cfa678652 100644
--- a/libraries/script-engine/src/ScriptEngines.cpp
+++ b/libraries/script-engine/src/ScriptEngines.cpp
@@ -12,6 +12,7 @@
 
 #include <QtWidgets/QApplication>
 
+#include <shared/QtHelpers.h>
 #include <SettingHandle.h>
 #include <UserActivityLogger.h>
 #include <PathUtils.h>
@@ -136,16 +137,14 @@ void ScriptEngines::registerScriptInitializer(ScriptInitializer initializer) {
     _scriptInitializers.push_back(initializer);
 }
 
-void ScriptEngines::addScriptEngine(ScriptEngine* engine) {
-    if (_isStopped) {
-        engine->deleteLater();
-    } else {
+void ScriptEngines::addScriptEngine(ScriptEnginePointer engine) {
+    if (!_isStopped) {
         QMutexLocker locker(&_allScriptsMutex);
         _allKnownScriptEngines.insert(engine);
     }
 }
 
-void ScriptEngines::removeScriptEngine(ScriptEngine* engine) {
+void ScriptEngines::removeScriptEngine(ScriptEnginePointer engine) {
     // If we're not already in the middle of stopping all scripts, then we should remove ourselves
     // from the list of running scripts. We don't do this if we're in the process of stopping all scripts
     // because that method removes scripts from its list as it iterates them
@@ -160,9 +159,9 @@ void ScriptEngines::shutdownScripting() {
     QMutexLocker locker(&_allScriptsMutex);
     qCDebug(scriptengine) << "Stopping all scripts.... currently known scripts:" << _allKnownScriptEngines.size();
 
-    QMutableSetIterator<ScriptEngine*> i(_allKnownScriptEngines);
+    QMutableSetIterator<ScriptEnginePointer> i(_allKnownScriptEngines);
     while (i.hasNext()) {
-        ScriptEngine* scriptEngine = i.next();
+        ScriptEnginePointer scriptEngine = i.next();
         QString scriptName = scriptEngine->getFilename();
 
         // NOTE: typically all script engines are running. But there's at least one known exception to this, the
@@ -186,12 +185,9 @@ void ScriptEngines::shutdownScripting() {
             qCDebug(scriptengine) << "waiting on script:" << scriptName;
             scriptEngine->waitTillDoneRunning();
             qCDebug(scriptengine) << "done waiting on script:" << scriptName;
-
-            scriptEngine->deleteLater();
-
-            // Once the script is stopped, we can remove it from our set
-            i.remove();
         }
+        // Once the script is stopped, we can remove it from our set
+        i.remove();
     }
     qCDebug(scriptengine) << "DONE Stopping all scripts....";
 }
@@ -368,9 +364,9 @@ void ScriptEngines::stopAllScripts(bool restart) {
         _isReloading = true;
     }
 
-    for (QHash<QUrl, ScriptEngine*>::const_iterator it = _scriptEnginesHash.constBegin();
+    for (QHash<QUrl, ScriptEnginePointer>::const_iterator it = _scriptEnginesHash.constBegin();
         it != _scriptEnginesHash.constEnd(); it++) {
-        ScriptEngine *scriptEngine = it.value();
+        ScriptEnginePointer scriptEngine = it.value();
         // skip already stopped scripts
         if (scriptEngine->isFinished() || scriptEngine->isStopping()) {
             continue;
@@ -416,11 +412,12 @@ bool ScriptEngines::stopScript(const QString& rawScriptURL, bool restart) {
 
         QReadLocker lock(&_scriptEnginesHashLock);
         if (_scriptEnginesHash.contains(scriptURL)) {
-            ScriptEngine* scriptEngine = _scriptEnginesHash[scriptURL];
+            ScriptEnginePointer scriptEngine = _scriptEnginesHash[scriptURL];
             if (restart) {
                 auto scriptCache = DependencyManager::get<ScriptCache>();
                 scriptCache->deleteScript(scriptURL);
-                connect(scriptEngine, &ScriptEngine::finished, this, [this](QString scriptName, ScriptEngine* engine) {
+                connect(scriptEngine.data(), &ScriptEngine::finished,
+                        this, [this](QString scriptName, ScriptEnginePointer engine) {
                     reloadScript(scriptName);
                 });
             }
@@ -448,11 +445,11 @@ void ScriptEngines::reloadAllScripts() {
     stopAllScripts(true);
 }
 
-ScriptEngine* ScriptEngines::loadScript(const QUrl& scriptFilename, bool isUserLoaded, bool loadScriptFromEditor,
+ScriptEnginePointer ScriptEngines::loadScript(const QUrl& scriptFilename, bool isUserLoaded, bool loadScriptFromEditor,
                                         bool activateMainWindow, bool reload) {
     if (thread() != QThread::currentThread()) {
-        ScriptEngine* result { nullptr };
-        QMetaObject::invokeMethod(this, "loadScript", Qt::BlockingQueuedConnection, Q_RETURN_ARG(ScriptEngine*, result),
+        ScriptEnginePointer result { nullptr };
+        BLOCKING_INVOKE_METHOD(this, "loadScript", Q_RETURN_ARG(ScriptEnginePointer, result),
             Q_ARG(QUrl, scriptFilename),
             Q_ARG(bool, isUserLoaded),
             Q_ARG(bool, loadScriptFromEditor),
@@ -478,19 +475,16 @@ ScriptEngine* ScriptEngines::loadScript(const QUrl& scriptFilename, bool isUserL
         return scriptEngine;
     }
 
-    scriptEngine = new ScriptEngine(_context, NO_SCRIPT, "about:" + scriptFilename.fileName());
+    scriptEngine = ScriptEnginePointer(new ScriptEngine(_context, NO_SCRIPT, "about:" + scriptFilename.fileName()));
+    addScriptEngine(scriptEngine);
     scriptEngine->setUserLoaded(isUserLoaded);
-    connect(scriptEngine, &ScriptEngine::doneRunning, this, [scriptEngine] {
-        scriptEngine->deleteLater();
-    }, Qt::QueuedConnection);
-
 
     if (scriptFilename.isEmpty() || !scriptUrl.isValid()) {
         launchScriptEngine(scriptEngine);
     } else {
         // connect to the appropriate signals of this script engine
-        connect(scriptEngine, &ScriptEngine::scriptLoaded, this, &ScriptEngines::onScriptEngineLoaded);
-        connect(scriptEngine, &ScriptEngine::errorLoadingScript, this, &ScriptEngines::onScriptEngineError);
+        connect(scriptEngine.data(), &ScriptEngine::scriptLoaded, this, &ScriptEngines::onScriptEngineLoaded);
+        connect(scriptEngine.data(), &ScriptEngine::errorLoadingScript, this, &ScriptEngines::onScriptEngineError);
 
         // get the script engine object to load the script at the designated script URL
         scriptEngine->loadURL(scriptUrl, reload);
@@ -499,8 +493,8 @@ ScriptEngine* ScriptEngines::loadScript(const QUrl& scriptFilename, bool isUserL
     return scriptEngine;
 }
 
-ScriptEngine* ScriptEngines::getScriptEngine(const QUrl& rawScriptURL) {
-    ScriptEngine* result = nullptr;
+ScriptEnginePointer ScriptEngines::getScriptEngine(const QUrl& rawScriptURL) {
+    ScriptEnginePointer result;
     {
         QReadLocker lock(&_scriptEnginesHashLock);
         const QUrl scriptURL = normalizeScriptURL(rawScriptURL);
@@ -515,7 +509,8 @@ ScriptEngine* ScriptEngines::getScriptEngine(const QUrl& rawScriptURL) {
 // FIXME - change to new version of ScriptCache loading notification
 void ScriptEngines::onScriptEngineLoaded(const QString& rawScriptURL) {
     UserActivityLogger::getInstance().loadedScript(rawScriptURL);
-    ScriptEngine* scriptEngine = qobject_cast<ScriptEngine*>(sender());
+    QSharedPointer<BaseScriptEngine> baseScriptEngine = qobject_cast<ScriptEngine*>(sender())->sharedFromThis();
+    ScriptEnginePointer scriptEngine = qSharedPointerCast<ScriptEngine>(baseScriptEngine);
 
     launchScriptEngine(scriptEngine);
 
@@ -531,12 +526,12 @@ void ScriptEngines::onScriptEngineLoaded(const QString& rawScriptURL) {
     emit scriptCountChanged();
 }
 
-void ScriptEngines::launchScriptEngine(ScriptEngine* scriptEngine) {
-    connect(scriptEngine, &ScriptEngine::finished, this, &ScriptEngines::onScriptFinished, Qt::DirectConnection);
-    connect(scriptEngine, &ScriptEngine::loadScript, [&](const QString& scriptName, bool userLoaded) {
+void ScriptEngines::launchScriptEngine(ScriptEnginePointer scriptEngine) {
+    connect(scriptEngine.data(), &ScriptEngine::finished, this, &ScriptEngines::onScriptFinished, Qt::DirectConnection);
+    connect(scriptEngine.data(), &ScriptEngine::loadScript, [&](const QString& scriptName, bool userLoaded) {
         loadScript(scriptName, userLoaded);
     });
-    connect(scriptEngine, &ScriptEngine::reloadScript, [&](const QString& scriptName, bool userLoaded) {
+    connect(scriptEngine.data(), &ScriptEngine::reloadScript, [&](const QString& scriptName, bool userLoaded) {
         loadScript(scriptName, userLoaded, false, false, true);
     });
 
@@ -557,7 +552,7 @@ void ScriptEngines::launchScriptEngine(ScriptEngine* scriptEngine) {
     }
 }
 
-void ScriptEngines::onScriptFinished(const QString& rawScriptURL, ScriptEngine* engine) {
+void ScriptEngines::onScriptFinished(const QString& rawScriptURL, ScriptEnginePointer engine) {
     bool removed = false;
     {
         QWriteLocker lock(&_scriptEnginesHashLock);
diff --git a/libraries/script-engine/src/ScriptEngines.h b/libraries/script-engine/src/ScriptEngines.h
index 70634345eb..f2b0105be1 100644
--- a/libraries/script-engine/src/ScriptEngines.h
+++ b/libraries/script-engine/src/ScriptEngines.h
@@ -33,7 +33,7 @@ class ScriptEngines : public QObject, public Dependency {
     Q_PROPERTY(ScriptsModelFilter* scriptsModelFilter READ scriptsModelFilter CONSTANT)
 
 public:
-    using ScriptInitializer = std::function<void(ScriptEngine*)>;
+    using ScriptInitializer = std::function<void(ScriptEnginePointer)>;
 
     ScriptEngines(ScriptEngine::Context context);
     void registerScriptInitializer(ScriptInitializer initializer);
@@ -45,7 +45,7 @@ public:
     void loadDefaultScripts();
     void setScriptsLocation(const QString& scriptsLocation);
     QStringList getRunningScripts();
-    ScriptEngine* getScriptEngine(const QUrl& scriptHash);
+    ScriptEnginePointer getScriptEngine(const QUrl& scriptHash);
 
     ScriptsModel* scriptsModel() { return &_scriptsModel; };
     ScriptsModelFilter* scriptsModelFilter() { return &_scriptsModelFilter; };
@@ -53,7 +53,7 @@ public:
     QString getDefaultScriptsLocation() const;
 
     Q_INVOKABLE void loadOneScript(const QString& scriptFilename);
-    Q_INVOKABLE ScriptEngine* loadScript(const QUrl& scriptFilename = QString(),
+    Q_INVOKABLE ScriptEnginePointer loadScript(const QUrl& scriptFilename = QString(),
         bool isUserLoaded = true, bool loadScriptFromEditor = false, bool activateMainWindow = false, bool reload = false);
     Q_INVOKABLE bool stopScript(const QString& scriptHash, bool restart = false);
 
@@ -72,6 +72,8 @@ public:
     void shutdownScripting();
     bool isStopped() const { return _isStopped; }
 
+    void addScriptEngine(ScriptEnginePointer);
+
 signals:
     void scriptCountChanged();
     void scriptsReloading();
@@ -92,22 +94,21 @@ public slots:
     void onClearDebugWindow();
 
 protected slots:
-    void onScriptFinished(const QString& fileNameString, ScriptEngine* engine);
+    void onScriptFinished(const QString& fileNameString, ScriptEnginePointer engine);
 
 protected:
     friend class ScriptEngine;
 
     void reloadScript(const QString& scriptName) { loadScript(scriptName, true, false, false, true); }
-    void addScriptEngine(ScriptEngine* engine);
-    void removeScriptEngine(ScriptEngine* engine);
+    void removeScriptEngine(ScriptEnginePointer);
     void onScriptEngineLoaded(const QString& scriptFilename);
     void onScriptEngineError(const QString& scriptFilename);
-    void launchScriptEngine(ScriptEngine* engine);
+    void launchScriptEngine(ScriptEnginePointer);
 
     ScriptEngine::Context _context;
     QReadWriteLock _scriptEnginesHashLock;
-    QHash<QUrl, ScriptEngine*> _scriptEnginesHash;
-    QSet<ScriptEngine*> _allKnownScriptEngines;
+    QHash<QUrl, ScriptEnginePointer> _scriptEnginesHash;
+    QSet<ScriptEnginePointer> _allKnownScriptEngines;
     QMutex _allScriptsMutex;
     std::list<ScriptInitializer> _scriptInitializers;
     mutable Setting::Handle<QString> _scriptsLocationHandle;
diff --git a/libraries/script-engine/src/ScriptUUID.h b/libraries/script-engine/src/ScriptUUID.h
index 221f9c46f0..3f504c35ba 100644
--- a/libraries/script-engine/src/ScriptUUID.h
+++ b/libraries/script-engine/src/ScriptUUID.h
@@ -20,6 +20,7 @@
 /// Scriptable interface for a UUID helper class object. Used exclusively in the JavaScript API
 class ScriptUUID : public QObject, protected QScriptable {
     Q_OBJECT
+    Q_PROPERTY(QString NULL READ NULL_UUID CONSTANT) // String for use in scripts.
 
 public slots:
     QUuid fromString(const QString& string);
@@ -28,6 +29,10 @@ public slots:
     bool isEqual(const QUuid& idA, const QUuid& idB);
     bool isNull(const QUuid& id);
     void print(const QString& label, const QUuid& id);
+
+private:
+    const QString NULL_UUID() { return NULL_ID; }
+    const QString NULL_ID { "{00000000-0000-0000-0000-000000000000}" };
 };
 
 #endif // hifi_ScriptUUID_h
diff --git a/libraries/script-engine/src/UsersScriptingInterface.cpp b/libraries/script-engine/src/UsersScriptingInterface.cpp
index 6dc3188b3f..fef11c12e9 100644
--- a/libraries/script-engine/src/UsersScriptingInterface.cpp
+++ b/libraries/script-engine/src/UsersScriptingInterface.cpp
@@ -33,7 +33,7 @@ bool UsersScriptingInterface::getIgnoreStatus(const QUuid& nodeID) {
 
 void UsersScriptingInterface::personalMute(const QUuid& nodeID, bool muteEnabled) {
     // ask the NodeList to mute the user with the given session ID
-	// "Personal Mute" only applies one way and is not global
+    // "Personal Mute" only applies one way and is not global
     DependencyManager::get<NodeList>()->personalMuteNodeBySessionID(nodeID, muteEnabled);
 }
 
diff --git a/libraries/script-engine/src/Vec3.cpp b/libraries/script-engine/src/Vec3.cpp
index a156f56d96..c21f96cd47 100644
--- a/libraries/script-engine/src/Vec3.cpp
+++ b/libraries/script-engine/src/Vec3.cpp
@@ -90,6 +90,6 @@ glm::vec3 Vec3::fromPolar(float elevation, float azimuth) {
 }
 
 float Vec3::getAngle(const glm::vec3& v1, const glm::vec3& v2) {
-	return glm::acos(glm::dot(glm::normalize(v1), glm::normalize(v2)));
+    return glm::acos(glm::dot(glm::normalize(v1), glm::normalize(v2)));
 }
 
diff --git a/libraries/script-engine/src/WebSocketClass.cpp b/libraries/script-engine/src/WebSocketClass.cpp
index 19148b26e9..76faaab415 100644
--- a/libraries/script-engine/src/WebSocketClass.cpp
+++ b/libraries/script-engine/src/WebSocketClass.cpp
@@ -25,7 +25,7 @@ WebSocketClass::WebSocketClass(QScriptEngine* engine, QString url) :
 
 WebSocketClass::WebSocketClass(QScriptEngine* engine, QWebSocket* qWebSocket) :
     _webSocket(qWebSocket),
-	_engine(engine)
+    _engine(engine)
 {
     initialize();
 }
diff --git a/libraries/shared/CMakeLists.txt b/libraries/shared/CMakeLists.txt
index 1fefda06b3..f9b835df5c 100644
--- a/libraries/shared/CMakeLists.txt
+++ b/libraries/shared/CMakeLists.txt
@@ -3,8 +3,6 @@ set(TARGET_NAME shared)
 # TODO: there isn't really a good reason to have Script linked here - let's get what is requiring it out (RegisteredMetaTypes.cpp)
 setup_hifi_library(Gui Network Script Widgets)
 
-target_include_directories(${TARGET_NAME} PRIVATE "${CMAKE_BINARY_DIR}/includes")
-
 if (WIN32)
     target_link_libraries(${TARGET_NAME} Wbemuuid.lib)
 endif()
diff --git a/libraries/shared/src/AABox.h b/libraries/shared/src/AABox.h
index eef83974ea..24485eaad6 100644
--- a/libraries/shared/src/AABox.h
+++ b/libraries/shared/src/AABox.h
@@ -127,10 +127,11 @@ public:
 
     AABox getOctreeChild(OctreeChild child) const; // returns the AABox of the would be octree child of this AABox
 
+    glm::vec4 getPlane(BoxFace face) const;
+
 private:
     glm::vec3 getClosestPointOnFace(const glm::vec3& point, BoxFace face) const;
     glm::vec3 getClosestPointOnFace(const glm::vec4& origin, const glm::vec4& direction, BoxFace face) const;
-    glm::vec4 getPlane(BoxFace face) const;
 
     static BoxFace getOppositeFace(BoxFace face);
 
diff --git a/libraries/shared/src/AvatarConstants.h b/libraries/shared/src/AvatarConstants.h
new file mode 100644
index 0000000000..a7a80471be
--- /dev/null
+++ b/libraries/shared/src/AvatarConstants.h
@@ -0,0 +1,56 @@
+//
+//  AvatarConstants.h
+//  libraries/shared/src
+//
+//  Created by Anthony J. Thibault on Aug 16th 2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_AvatarConstants_h
+#define hifi_AvatarConstants_h
+
+// 50th Percentile Man
+const float DEFAULT_AVATAR_HEIGHT = 1.755f; // meters
+const float DEFAULT_AVATAR_EYE_TO_TOP_OF_HEAD = 0.11f; // meters
+const float DEFAULT_AVATAR_NECK_TO_TOP_OF_HEAD = 0.185f; // meters
+const float DEFAULT_AVATAR_NECK_HEIGHT = DEFAULT_AVATAR_HEIGHT - DEFAULT_AVATAR_NECK_TO_TOP_OF_HEAD;
+const float DEFAULT_AVATAR_EYE_HEIGHT = DEFAULT_AVATAR_HEIGHT - DEFAULT_AVATAR_EYE_TO_TOP_OF_HEAD;
+
+// Used when avatar is missing joints... (avatar space)
+const glm::quat DEFAULT_AVATAR_MIDDLE_EYE_ROT { Quaternions::Y_180 };
+const glm::vec3 DEFAULT_AVATAR_MIDDLE_EYE_POS { 0.0f, 0.6f, 0.0f };
+const glm::vec3 DEFAULT_AVATAR_HEAD_POS { 0.0f, 0.53f, 0.0f };
+const glm::quat DEFAULT_AVATAR_HEAD_ROT { Quaternions::Y_180 };
+const glm::vec3 DEFAULT_AVATAR_RIGHTARM_POS { -0.134824f, 0.396348f, -0.0515777f };
+const glm::quat DEFAULT_AVATAR_RIGHTARM_ROT { -0.536241f, 0.536241f, -0.460918f, -0.460918f };
+const glm::vec3 DEFAULT_AVATAR_LEFTARM_POS { 0.134795f, 0.396349f, -0.0515881f };
+const glm::quat DEFAULT_AVATAR_LEFTARM_ROT { 0.536257f, 0.536258f, -0.460899f, 0.4609f };
+const glm::vec3 DEFAULT_AVATAR_RIGHTHAND_POS { -0.72768f, 0.396349f, -0.0515779f };
+const glm::quat DEFAULT_AVATAR_RIGHTHAND_ROT { 0.479184f, -0.520013f, 0.522537f, 0.476365f};
+const glm::vec3 DEFAULT_AVATAR_LEFTHAND_POS { 0.727588f, 0.39635f, -0.0515878f };
+const glm::quat DEFAULT_AVATAR_LEFTHAND_ROT { -0.479181f, -0.52001f, 0.52254f, -0.476369f };
+const glm::vec3 DEFAULT_AVATAR_NECK_POS { 0.0f, 0.445f, 0.025f };
+const glm::vec3 DEFAULT_AVATAR_SPINE2_POS { 0.0f, 0.32f, 0.02f };
+const glm::quat DEFAULT_AVATAR_SPINE2_ROT { Quaternions::Y_180 };
+const glm::vec3 DEFAULT_AVATAR_HIPS_POS { 0.0f, 0.0f, 0.0f };
+const glm::quat DEFAULT_AVATAR_HIPS_ROT { Quaternions::Y_180 };
+const glm::vec3 DEFAULT_AVATAR_LEFTFOOT_POS { -0.08f, -0.96f, 0.029f};
+const glm::quat DEFAULT_AVATAR_LEFTFOOT_ROT { -0.40167322754859924f, 0.9154590368270874f, -0.005437685176730156f, -0.023744143545627594f };
+const glm::vec3 DEFAULT_AVATAR_RIGHTFOOT_POS { 0.08f, -0.96f, 0.029f };
+const glm::quat DEFAULT_AVATAR_RIGHTFOOT_ROT { -0.4016716778278351f, 0.9154615998268127f, 0.0053307069465518f, 0.023696165531873703f };
+
+const float DEFAULT_AVATAR_MAX_WALKING_SPEED = 2.6f; // meters / second
+const float DEFAULT_AVATAR_MAX_FLYING_SPEED = 30.0f; // meters / second
+
+const float DEFAULT_AVATAR_GRAVITY = -5.0f; // meters / second^2
+const float DEFAULT_AVATAR_JUMP_SPEED = 3.5f; // meters / second
+const float DEFAULT_AVATAR_JUMP_HEIGHT = (DEFAULT_AVATAR_JUMP_SPEED * DEFAULT_AVATAR_JUMP_SPEED) / (2.0f * DEFAULT_AVATAR_GRAVITY); // meters
+
+const float DEFAULT_AVATAR_FALL_HEIGHT = 20.0f; // meters
+const float DEFAULT_AVATAR_MIN_HOVER_HEIGHT = 2.5f; // meters
+
+
+#endif // hifi_AvatarConstants_h
diff --git a/libraries/shared/src/BaseScriptEngine.h b/libraries/shared/src/BaseScriptEngine.h
index 138e46fafa..8820a386bf 100644
--- a/libraries/shared/src/BaseScriptEngine.h
+++ b/libraries/shared/src/BaseScriptEngine.h
@@ -16,6 +16,9 @@
 #include <QtCore/QDebug>
 #include <QtScript/QScriptEngine>
 
+class ScriptEngine;
+using ScriptEnginePointer = QSharedPointer<ScriptEngine>;
+
 // common base class for extending QScriptEngine itself
 class BaseScriptEngine : public QScriptEngine, public QEnableSharedFromThis<BaseScriptEngine> {
     Q_OBJECT
diff --git a/libraries/shared/src/ComponentMode.h b/libraries/shared/src/ComponentMode.h
new file mode 100644
index 0000000000..03721c6a45
--- /dev/null
+++ b/libraries/shared/src/ComponentMode.h
@@ -0,0 +1,24 @@
+//
+//  ComponentMode.h
+//  libraries/entities/src
+//
+//  Created by Nissim Hadar on 9/21/17.
+//  Copyright 2013 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_ComponentMode_h
+#define hifi_ComponentMode_h
+
+enum ComponentMode {
+    COMPONENT_MODE_INHERIT,
+    COMPONENT_MODE_DISABLED,
+    COMPONENT_MODE_ENABLED,
+
+    COMPONENT_MODE_ITEM_COUNT
+};
+
+#endif // hifi_ComponentMode_h
+
diff --git a/libraries/shared/src/DependencyManager.h b/libraries/shared/src/DependencyManager.h
index 7a453e63c3..e6fc7ce96b 100644
--- a/libraries/shared/src/DependencyManager.h
+++ b/libraries/shared/src/DependencyManager.h
@@ -12,6 +12,7 @@
 #ifndef hifi_DependencyManager_h
 #define hifi_DependencyManager_h
 
+#include <QtGlobal>
 #include <QDebug>
 #include <QHash>
 #include <QSharedPointer>
@@ -64,6 +65,15 @@ public:
     template<typename Base, typename Derived>
     static void registerInheritance();
     
+    template <typename T>
+    static size_t typeHash() {
+#ifdef Q_OS_ANDROID
+        size_t hashCode = std::hash<std::string>{}( typeid(T).name() );
+#else
+        size_t hashCode = typeid(T).hash_code();
+#endif
+        return hashCode;
+    }
 private:
     static DependencyManager& manager();
 
@@ -134,14 +144,14 @@ void DependencyManager::destroy() {
 
 template<typename Base, typename Derived>
 void DependencyManager::registerInheritance() {
-    size_t baseHashCode = typeid(Base).hash_code();
-    size_t derivedHashCode = typeid(Derived).hash_code();
+    size_t baseHashCode = typeHash<Base>();
+    size_t derivedHashCode = typeHash<Derived>();
     manager()._inheritanceHash.insert(baseHashCode, derivedHashCode);
 }
 
 template<typename T>
 size_t DependencyManager::getHashCode() {
-    size_t hashCode = typeid(T).hash_code();
+    size_t hashCode = typeHash<T>();
     auto derivedHashCode = _inheritanceHash.find(hashCode);
     
     while (derivedHashCode != _inheritanceHash.end()) {
diff --git a/libraries/shared/src/DoubleHashKey.cpp b/libraries/shared/src/DoubleHashKey.cpp
deleted file mode 100644
index ded2f073eb..0000000000
--- a/libraries/shared/src/DoubleHashKey.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-//  DoubleHashKey.cpp
-//  libraries/shared/src
-//
-//  Created by Andrew Meadows 2014.11.02
-//  Copyright 2014 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 "DoubleHashKey.h"
-
-const uint32_t NUM_PRIMES = 64;
-const uint32_t PRIMES[] = {
-    4194301U, 4194287U, 4194277U, 4194271U, 4194247U, 4194217U, 4194199U, 4194191U,
-    4194187U, 4194181U, 4194173U, 4194167U, 4194143U, 4194137U, 4194131U, 4194107U,
-    4194103U, 4194023U, 4194011U, 4194007U, 4193977U, 4193971U, 4193963U, 4193957U,
-    4193939U, 4193929U, 4193909U, 4193869U, 4193807U, 4193803U, 4193801U, 4193789U,
-    4193759U, 4193753U, 4193743U, 4193701U, 4193663U, 4193633U, 4193573U, 4193569U,
-    4193551U, 4193549U, 4193531U, 4193513U, 4193507U, 4193459U, 4193447U, 4193443U,
-    4193417U, 4193411U, 4193393U, 4193389U, 4193381U, 4193377U, 4193369U, 4193359U,
-    4193353U, 4193327U, 4193309U, 4193303U, 4193297U, 4193279U, 4193269U, 4193263U
-};
-
-uint32_t DoubleHashKey::hashFunction(uint32_t value, uint32_t primeIndex) {
-    uint32_t hash = PRIMES[primeIndex % NUM_PRIMES] * (value + 1U);
-    hash += ~(hash << 15);
-    hash ^=  (hash >> 10);
-    hash +=  (hash << 3);
-    hash ^=  (hash >> 6);
-    hash += ~(hash << 11);
-    return hash ^ (hash >> 16);
-}
-
-uint32_t DoubleHashKey::hashFunction2(uint32_t value) {
-    uint32_t hash = 0x811c9dc5U;
-    for (uint32_t i = 0; i < 4; i++ ) {
-        uint32_t byte = (value << (i * 8)) >> (24 - i * 8);
-        hash = ( hash ^ byte ) * 0x01000193U;
-    }
-   return hash;
-}
-
-void DoubleHashKey::computeHash(uint32_t value, uint32_t primeIndex) {
-    _hash = DoubleHashKey::hashFunction(value, primeIndex);
-    _hash2 = DoubleHashKey::hashFunction2(value);
-}
diff --git a/libraries/shared/src/DoubleHashKey.h b/libraries/shared/src/DoubleHashKey.h
deleted file mode 100644
index ca92a7197f..0000000000
--- a/libraries/shared/src/DoubleHashKey.h
+++ /dev/null
@@ -1,49 +0,0 @@
-//
-//  DoubleHashKey.h
-//  libraries/shared/src
-//
-//  Created by Andrew Meadows 2014.11.02
-//  Copyright 2014 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_DoubleHashKey_h
-#define hifi_DoubleHashKey_h
-
-#include <stdint.h>
-
-// DoubleHashKey for use with btHashMap
-class DoubleHashKey {
-public:
-    static uint32_t hashFunction(uint32_t value, uint32_t primeIndex);
-    static uint32_t hashFunction2(uint32_t value);
-
-    DoubleHashKey() : _hash(0), _hash2(0) { }
-
-    DoubleHashKey(uint32_t value, uint32_t primeIndex = 0) :
-        _hash(hashFunction(value, primeIndex)),
-        _hash2(hashFunction2(value)) {
-    }
-
-    void clear() { _hash = 0; _hash2 = 0; }
-    bool isNull() const { return _hash == 0 && _hash2 == 0; }
-
-    bool equals(const DoubleHashKey& other) const {
-        return _hash == other._hash && _hash2 == other._hash2;
-    }
-
-    void computeHash(uint32_t value, uint32_t primeIndex = 0);
-    uint32_t getHash() const { return _hash; }
-    uint32_t getHash2() const { return _hash2; }
-
-    void setHash(uint32_t hash) { _hash = hash; }
-    void setHash2(uint32_t hash2) { _hash2 = hash2; }
-
-private:
-    uint32_t _hash;
-    uint32_t _hash2;
-};
-
-#endif // hifi_DoubleHashKey_h
diff --git a/libraries/shared/src/GLMHelpers.cpp b/libraries/shared/src/GLMHelpers.cpp
index 394517aac4..39fec45d90 100644
--- a/libraries/shared/src/GLMHelpers.cpp
+++ b/libraries/shared/src/GLMHelpers.cpp
@@ -473,6 +473,14 @@ glm::mat4 createMatFromScaleQuatAndPos(const glm::vec3& scale, const glm::quat&
                      glm::vec4(zAxis, 0.0f), glm::vec4(trans, 1.0f));
 }
 
+glm::mat4 createMatFromScale(const glm::vec3& scale) {
+    glm::vec3 xAxis = glm::vec3(scale.x, 0.0f, 0.0f);
+    glm::vec3 yAxis = glm::vec3(0.0f, scale.y, 0.0f);
+    glm::vec3 zAxis = glm::vec3(0.0f, 0.0f, scale.z);
+    return glm::mat4(glm::vec4(xAxis, 0.0f), glm::vec4(yAxis, 0.0f),
+                     glm::vec4(zAxis, 0.0f), glm::vec4(Vectors::ZERO, 1.0f));
+}
+
 // cancel out roll
 glm::quat cancelOutRoll(const glm::quat& q) {
     glm::vec3 forward = q * Vectors::FRONT;
diff --git a/libraries/shared/src/GLMHelpers.h b/libraries/shared/src/GLMHelpers.h
index 3386ea2c22..7248f4cb46 100644
--- a/libraries/shared/src/GLMHelpers.h
+++ b/libraries/shared/src/GLMHelpers.h
@@ -231,6 +231,7 @@ glm::tvec4<T, P> lerp(const glm::tvec4<T, P>& x, const glm::tvec4<T, P>& y, T a)
 
 glm::mat4 createMatFromQuatAndPos(const glm::quat& q, const glm::vec3& p);
 glm::mat4 createMatFromScaleQuatAndPos(const glm::vec3& scale, const glm::quat& rot, const glm::vec3& trans);
+glm::mat4 createMatFromScale(const glm::vec3& scale);
 glm::quat cancelOutRoll(const glm::quat& q);
 glm::quat cancelOutRollAndPitch(const glm::quat& q);
 glm::mat4 cancelOutRollAndPitch(const glm::mat4& m);
diff --git a/libraries/shared/src/GeometryUtil.cpp b/libraries/shared/src/GeometryUtil.cpp
index f853240fe3..e502d44a08 100644
--- a/libraries/shared/src/GeometryUtil.cpp
+++ b/libraries/shared/src/GeometryUtil.cpp
@@ -14,9 +14,12 @@
 #include <assert.h>
 #include <cstring>
 #include <cmath>
+#include <bitset>
 #include <glm/gtx/quaternion.hpp>
 
 #include "NumericalConstants.h"
+#include "GLMHelpers.h"
+#include "Plane.h"
 
 glm::vec3 computeVectorFromPointToSegment(const glm::vec3& point, const glm::vec3& start, const glm::vec3& end) {
     // compute the projection of the point vector onto the segment vector
@@ -313,6 +316,134 @@ bool findRayTriangleIntersection(const glm::vec3& origin, const glm::vec3& direc
     return false;
 }
 
+static void getTrianglePlaneIntersectionPoints(const glm::vec3 trianglePoints[3], const float pointPlaneDistances[3],
+                                               const int clippedPointIndex, const int keptPointIndices[2],
+                                               glm::vec3 points[2]) {
+    assert(clippedPointIndex >= 0 && clippedPointIndex < 3);
+    const auto& clippedPoint = trianglePoints[clippedPointIndex];
+    const float clippedPointPlaneDistance = pointPlaneDistances[clippedPointIndex];
+    for (auto i = 0; i < 2; i++) {
+        assert(keptPointIndices[i] >= 0 && keptPointIndices[i] < 3);
+        const auto& keptPoint = trianglePoints[keptPointIndices[i]];
+        const float keptPointPlaneDistance = pointPlaneDistances[keptPointIndices[i]];
+        auto intersectionEdgeRatio = clippedPointPlaneDistance / (clippedPointPlaneDistance - keptPointPlaneDistance);
+        points[i] = clippedPoint + (keptPoint - clippedPoint) * intersectionEdgeRatio;
+    }
+}
+
+int clipTriangleWithPlane(const Triangle& triangle, const Plane& plane, Triangle* clippedTriangles, int maxClippedTriangleCount) {
+    float pointDistanceToPlane[3];
+    std::bitset<3> arePointsClipped;
+    glm::vec3 triangleVertices[3] = { triangle.v0, triangle.v1, triangle.v2 };
+    int clippedTriangleCount = 0;
+    int i;
+
+    assert(clippedTriangleCount > 0);
+
+    for (i = 0; i < 3; i++) {
+        pointDistanceToPlane[i] = plane.distance(triangleVertices[i]);
+        arePointsClipped.set(i, pointDistanceToPlane[i] < 0.0f);
+    }
+
+    switch (arePointsClipped.count()) {
+        case 0:
+            // Easy, the entire triangle is kept as is.
+            *clippedTriangles = triangle;
+            clippedTriangleCount = 1;
+            break;
+
+        case 1:
+        {
+            int clippedPointIndex = 2;
+            int keptPointIndices[2] = { 0, 1 };
+            glm::vec3 newVertices[2];
+
+            // Determine which point was clipped.
+            if (arePointsClipped.test(0)) {
+                clippedPointIndex = 0;
+                keptPointIndices[0] = 2;
+            } else if (arePointsClipped.test(1)) {
+                clippedPointIndex = 1;
+                keptPointIndices[1] = 2;
+            }
+            // We have a quad now, so we need to create two triangles.
+            getTrianglePlaneIntersectionPoints(triangleVertices, pointDistanceToPlane, clippedPointIndex, keptPointIndices, newVertices);
+            clippedTriangles->v0 = triangleVertices[keptPointIndices[0]];
+            clippedTriangles->v1 = triangleVertices[keptPointIndices[1]];
+            clippedTriangles->v2 = newVertices[1];
+            clippedTriangles++;
+            clippedTriangleCount++;
+
+            if (clippedTriangleCount < maxClippedTriangleCount) {
+                clippedTriangles->v0 = triangleVertices[keptPointIndices[0]];
+                clippedTriangles->v1 = newVertices[0];
+                clippedTriangles->v2 = newVertices[1];
+                clippedTriangles++;
+                clippedTriangleCount++;
+            }
+        }
+        break;
+
+        case 2:
+        {
+            int keptPointIndex = 2;
+            int clippedPointIndices[2] = { 0, 1 };
+            glm::vec3 newVertices[2];
+
+            // Determine which point was NOT clipped.
+            if (!arePointsClipped.test(0)) {
+                keptPointIndex = 0;
+                clippedPointIndices[0] = 2;
+            } else if (!arePointsClipped.test(1)) {
+                keptPointIndex = 1;
+                clippedPointIndices[1] = 2;
+            }
+            // We have a single triangle
+            getTrianglePlaneIntersectionPoints(triangleVertices, pointDistanceToPlane, keptPointIndex, clippedPointIndices, newVertices);
+            clippedTriangles->v0 = triangleVertices[keptPointIndex];
+            clippedTriangles->v1 = newVertices[0];
+            clippedTriangles->v2 = newVertices[1];
+            clippedTriangleCount = 1;
+        }
+        break;
+
+        default:
+            // Entire triangle is clipped.
+           break;
+    }
+
+    return clippedTriangleCount;
+}
+
+int clipTriangleWithPlanes(const Triangle& triangle, const Plane* planes, int planeCount, Triangle* clippedTriangles, int maxClippedTriangleCount) {
+    auto planesEnd = planes + planeCount;
+    int triangleCount = 1;
+    std::vector<Triangle> trianglesToTest;
+
+    assert(maxClippedTriangleCount > 0);
+
+    *clippedTriangles = triangle;
+
+    while (planes < planesEnd) {
+        int clippedSubTriangleCount;
+
+        trianglesToTest.clear();
+        trianglesToTest.insert(trianglesToTest.begin(), clippedTriangles, clippedTriangles + triangleCount);
+        triangleCount = 0;
+
+        for (const auto& triangleToTest : trianglesToTest) {
+            clippedSubTriangleCount = clipTriangleWithPlane(triangleToTest, *planes,
+                                                            clippedTriangles + triangleCount, maxClippedTriangleCount - triangleCount);
+            triangleCount += clippedSubTriangleCount;
+            if (triangleCount >= maxClippedTriangleCount) {
+                return triangleCount;
+            }
+        }
+        ++planes;
+    }
+    return triangleCount;
+}
+
 // Do line segments (r1p1.x, r1p1.y)--(r1p2.x, r1p2.y) and (r2p1.x, r2p1.y)--(r2p2.x, r2p2.y) intersect?
 // from: http://ptspts.blogspot.com/2010/06/how-to-determine-if-two-line-segments.html
 bool doLineSegmentsIntersect(glm::vec2 r1p1, glm::vec2 r1p2, glm::vec2 r2p1, glm::vec2 r2p2) {
@@ -605,3 +736,202 @@ float coneSphereAngle(const glm::vec3& coneCenter, const glm::vec3& coneDirectio
 
     return glm::max(0.0f, theta - phi);
 }
+
+// given a set of points, compute a best fit plane that passes as close as possible through all the points.
+// http://www.ilikebigbits.com/blog/2015/3/2/plane-from-points
+bool findPlaneFromPoints(const glm::vec3* points, size_t numPoints, glm::vec3& planeNormalOut, glm::vec3& pointOnPlaneOut) {
+    if (numPoints < 3) {
+        return false;
+    }
+    glm::vec3 sum;
+    for (size_t i = 0; i < numPoints; i++) {
+        sum += points[i];
+    }
+    glm::vec3 centroid = sum * (1.0f / (float)numPoints);
+    float xx = 0.0f, xy = 0.0f, xz = 0.0f;
+    float yy = 0.0f, yz = 0.0f, zz = 0.0f;
+
+    for (size_t i = 0; i < numPoints; i++) {
+        glm::vec3 r = points[i] - centroid;
+        xx += r.x * r.x;
+        xy += r.x * r.y;
+        xz += r.x * r.z;
+        yy += r.y * r.y;
+        yz += r.y * r.z;
+        zz += r.z * r.z;
+    }
+
+    float det_x = yy * zz - yz * yz;
+    float det_y = xx * zz - xz * xz;
+    float det_z = xx * yy - xy * xy;
+    float det_max = std::max(std::max(det_x, det_y), det_z);
+
+    if (det_max == 0.0f) {
+        return false; // The points don't span a plane
+    }
+
+    glm::vec3 dir;
+    if (det_max == det_x) {
+        float a = (xz * yz - xy * zz) / det_x;
+        float b = (xy * yz - xz * yy) / det_x;
+        dir = glm::vec3(1.0f, a, b);
+    } else if (det_max == det_y) {
+        float a = (yz * xz - xy * zz) / det_y;
+        float b = (xy * xz - yz * xx) / det_y;
+        dir = glm::vec3(a, 1.0f, b);
+    } else {
+        float a = (yz * xy - xz * yy) / det_z;
+        float b = (xz * xy - yz * xx) / det_z;
+        dir = glm::vec3(a, b, 1.0f);
+    }
+    pointOnPlaneOut = centroid;
+    planeNormalOut = glm::normalize(dir);
+    return true;
+}
+
+bool findIntersectionOfThreePlanes(const glm::vec4& planeA, const glm::vec4& planeB, const glm::vec4& planeC, glm::vec3& intersectionPointOut) {
+    glm::vec3 normalA(planeA);
+    glm::vec3 normalB(planeB);
+    glm::vec3 normalC(planeC);
+    glm::vec3 u = glm::cross(normalB, normalC);
+    float denom = glm::dot(normalA, u);
+    if (fabsf(denom) < EPSILON) {
+        return false;  // planes do not intersect in a point.
+    } else {
+        intersectionPointOut = (planeA.w * u + glm::cross(normalA, planeC.w * normalB - planeB.w * normalC)) / denom;
+        return true;
+    }
+}
+
+const float INV_SQRT_3 = 1.0f / sqrtf(3.0f);
+const int DOP14_COUNT = 14;
+const glm::vec3 DOP14_NORMALS[DOP14_COUNT] = {
+    Vectors::UNIT_X,
+    -Vectors::UNIT_X,
+    Vectors::UNIT_Y,
+    -Vectors::UNIT_Y,
+    Vectors::UNIT_Z,
+    -Vectors::UNIT_Z,
+    glm::vec3(INV_SQRT_3, INV_SQRT_3, INV_SQRT_3),
+    -glm::vec3(INV_SQRT_3, INV_SQRT_3, INV_SQRT_3),
+    glm::vec3(INV_SQRT_3, -INV_SQRT_3, INV_SQRT_3),
+    -glm::vec3(INV_SQRT_3, -INV_SQRT_3, INV_SQRT_3),
+    glm::vec3(INV_SQRT_3, INV_SQRT_3, -INV_SQRT_3),
+    -glm::vec3(INV_SQRT_3, INV_SQRT_3, -INV_SQRT_3),
+    glm::vec3(INV_SQRT_3, -INV_SQRT_3, -INV_SQRT_3),
+    -glm::vec3(INV_SQRT_3, -INV_SQRT_3, -INV_SQRT_3)
+};
+
+typedef std::tuple<int, int, int> Int3Tuple;
+const std::tuple<int, int, int> DOP14_PLANE_COMBINATIONS[] = {
+    Int3Tuple(0, 2, 4),  Int3Tuple(0, 2, 5),  Int3Tuple(0, 2, 6),  Int3Tuple(0, 2, 7),  Int3Tuple(0, 2, 8),  Int3Tuple(0, 2, 9),  Int3Tuple(0, 2, 10),  Int3Tuple(0, 2, 11),  Int3Tuple(0, 2, 12),  Int3Tuple(0, 2, 13),
+    Int3Tuple(0, 3, 4),  Int3Tuple(0, 3, 5),  Int3Tuple(0, 3, 6),  Int3Tuple(0, 3, 7),  Int3Tuple(0, 3, 8),  Int3Tuple(0, 3, 9),  Int3Tuple(0, 3, 10),  Int3Tuple(0, 3, 11),  Int3Tuple(0, 3, 12),  Int3Tuple(0, 3, 13),
+    Int3Tuple(0, 4, 6),  Int3Tuple(0, 4, 7),  Int3Tuple(0, 4, 8),  Int3Tuple(0, 4, 9),  Int3Tuple(0, 4, 10),  Int3Tuple(0, 4, 11),  Int3Tuple(0, 4, 12),  Int3Tuple(0, 4, 13),
+    Int3Tuple(0, 5, 6),  Int3Tuple(0, 5, 7),  Int3Tuple(0, 5, 8),  Int3Tuple(0, 5, 9),  Int3Tuple(0, 5, 10),  Int3Tuple(0, 5, 11),  Int3Tuple(0, 5, 12),  Int3Tuple(0, 5, 13),
+    Int3Tuple(0, 6, 8),  Int3Tuple(0, 6, 9),  Int3Tuple(0, 6, 10),  Int3Tuple(0, 6, 11),  Int3Tuple(0, 6, 12),  Int3Tuple(0, 6, 13),
+    Int3Tuple(0, 7, 8),  Int3Tuple(0, 7, 9),  Int3Tuple(0, 7, 10),  Int3Tuple(0, 7, 11),  Int3Tuple(0, 7, 12),  Int3Tuple(0, 7, 13),
+    Int3Tuple(0, 8, 10),  Int3Tuple(0, 8, 11),  Int3Tuple(0, 8, 12),  Int3Tuple(0, 8, 13),  Int3Tuple(0, 9, 10),
+    Int3Tuple(0, 9, 11),  Int3Tuple(0, 9, 12),  Int3Tuple(0, 9, 13),
+    Int3Tuple(0, 10, 12),  Int3Tuple(0, 10, 13),
+    Int3Tuple(0, 11, 12),  Int3Tuple(0, 11, 13),
+    Int3Tuple(1, 2, 4),  Int3Tuple(1, 2, 5),  Int3Tuple(1, 2, 6),  Int3Tuple(1, 2, 7),  Int3Tuple(1, 2, 8),  Int3Tuple(1, 2, 9),  Int3Tuple(1, 2, 10),  Int3Tuple(1, 2, 11),  Int3Tuple(1, 2, 12),  Int3Tuple(1, 2, 13),
+    Int3Tuple(1, 3, 4),  Int3Tuple(1, 3, 5),  Int3Tuple(1, 3, 6),  Int3Tuple(1, 3, 7),  Int3Tuple(1, 3, 8),  Int3Tuple(1, 3, 9),  Int3Tuple(1, 3, 10),  Int3Tuple(1, 3, 11),  Int3Tuple(1, 3, 12),  Int3Tuple(1, 3, 13),
+    Int3Tuple(1, 4, 6),  Int3Tuple(1, 4, 7),  Int3Tuple(1, 4, 8),  Int3Tuple(1, 4, 9),  Int3Tuple(1, 4, 10),  Int3Tuple(1, 4, 11),  Int3Tuple(1, 4, 12),  Int3Tuple(1, 4, 13),
+    Int3Tuple(1, 5, 6),  Int3Tuple(1, 5, 7),  Int3Tuple(1, 5, 8),  Int3Tuple(1, 5, 9),  Int3Tuple(1, 5, 10),  Int3Tuple(1, 5, 11),  Int3Tuple(1, 5, 12),  Int3Tuple(1, 5, 13),
+    Int3Tuple(1, 6, 8),  Int3Tuple(1, 6, 9),  Int3Tuple(1, 6, 10),  Int3Tuple(1, 6, 11),  Int3Tuple(1, 6, 12),  Int3Tuple(1, 6, 13),
+    Int3Tuple(1, 7, 8),  Int3Tuple(1, 7, 9),  Int3Tuple(1, 7, 10),  Int3Tuple(1, 7, 11),  Int3Tuple(1, 7, 12),  Int3Tuple(1, 7, 13),
+    Int3Tuple(1, 8, 10),  Int3Tuple(1, 8, 11),  Int3Tuple(1, 8, 12),  Int3Tuple(1, 8, 13),
+    Int3Tuple(1, 9, 10),  Int3Tuple(1, 9, 11),  Int3Tuple(1, 9, 12),  Int3Tuple(1, 9, 13),
+    Int3Tuple(1, 10, 12),  Int3Tuple(1, 10, 13),
+    Int3Tuple(1, 11, 12),  Int3Tuple(1, 11, 13),
+    Int3Tuple(2, 4, 6),  Int3Tuple(2, 4, 7),  Int3Tuple(2, 4, 8),  Int3Tuple(2, 4, 9),  Int3Tuple(2, 4, 10),  Int3Tuple(2, 4, 11),  Int3Tuple(2, 4, 12),  Int3Tuple(2, 4, 13),
+    Int3Tuple(2, 5, 6),  Int3Tuple(2, 5, 7),  Int3Tuple(2, 5, 8),  Int3Tuple(2, 5, 9),  Int3Tuple(2, 5, 10),  Int3Tuple(2, 5, 11),  Int3Tuple(2, 5, 12),  Int3Tuple(2, 5, 13),
+    Int3Tuple(2, 6, 8),  Int3Tuple(2, 6, 9),  Int3Tuple(2, 6, 10),  Int3Tuple(2, 6, 11),  Int3Tuple(2, 6, 12),  Int3Tuple(2, 6, 13),
+    Int3Tuple(2, 7, 8),  Int3Tuple(2, 7, 9),  Int3Tuple(2, 7, 10),  Int3Tuple(2, 7, 11),  Int3Tuple(2, 7, 12),  Int3Tuple(2, 7, 13),
+    Int3Tuple(2, 8, 10),  Int3Tuple(2, 8, 11),  Int3Tuple(2, 8, 12),  Int3Tuple(2, 8, 13),
+    Int3Tuple(2, 9, 10),  Int3Tuple(2, 9, 11),  Int3Tuple(2, 9, 12),  Int3Tuple(2, 9, 13),
+    Int3Tuple(2, 10, 12),  Int3Tuple(2, 10, 13),
+    Int3Tuple(2, 11, 12),  Int3Tuple(2, 11, 13),
+    Int3Tuple(3, 4, 6),  Int3Tuple(3, 4, 7),  Int3Tuple(3, 4, 8),  Int3Tuple(3, 4, 9),  Int3Tuple(3, 4, 10),  Int3Tuple(3, 4, 11),  Int3Tuple(3, 4, 12),  Int3Tuple(3, 4, 13),
+    Int3Tuple(3, 5, 6),  Int3Tuple(3, 5, 7),  Int3Tuple(3, 5, 8),  Int3Tuple(3, 5, 9),  Int3Tuple(3, 5, 10),  Int3Tuple(3, 5, 11),  Int3Tuple(3, 5, 12),  Int3Tuple(3, 5, 13),
+    Int3Tuple(3, 6, 8),  Int3Tuple(3, 6, 9),  Int3Tuple(3, 6, 10),  Int3Tuple(3, 6, 11),  Int3Tuple(3, 6, 12),  Int3Tuple(3, 6, 13),
+    Int3Tuple(3, 7, 8),  Int3Tuple(3, 7, 9),  Int3Tuple(3, 7, 10),  Int3Tuple(3, 7, 11),  Int3Tuple(3, 7, 12),  Int3Tuple(3, 7, 13),
+    Int3Tuple(3, 8, 10),  Int3Tuple(3, 8, 11),  Int3Tuple(3, 8, 12),  Int3Tuple(3, 8, 13),
+    Int3Tuple(3, 9, 10),  Int3Tuple(3, 9, 11),  Int3Tuple(3, 9, 12),  Int3Tuple(3, 9, 13),
+    Int3Tuple(3, 10, 12),  Int3Tuple(3, 10, 13),
+    Int3Tuple(3, 11, 12),  Int3Tuple(3, 11, 13),
+    Int3Tuple(4, 6, 8),  Int3Tuple(4, 6, 9),  Int3Tuple(4, 6, 10),  Int3Tuple(4, 6, 11),  Int3Tuple(4, 6, 12),  Int3Tuple(4, 6, 13),
+    Int3Tuple(4, 7, 8),  Int3Tuple(4, 7, 9),  Int3Tuple(4, 7, 10),  Int3Tuple(4, 7, 11),  Int3Tuple(4, 7, 12),  Int3Tuple(4, 7, 13),
+    Int3Tuple(4, 8, 10),  Int3Tuple(4, 8, 11),  Int3Tuple(4, 8, 12),  Int3Tuple(4, 8, 13),
+    Int3Tuple(4, 9, 10),  Int3Tuple(4, 9, 11),  Int3Tuple(4, 9, 12),  Int3Tuple(4, 9, 13),
+    Int3Tuple(4, 10, 12),  Int3Tuple(4, 10, 13),
+    Int3Tuple(4, 11, 12),  Int3Tuple(4, 11, 13),
+    Int3Tuple(5, 6, 8),  Int3Tuple(5, 6, 9),  Int3Tuple(5, 6, 10),  Int3Tuple(5, 6, 11),  Int3Tuple(5, 6, 12),  Int3Tuple(5, 6, 13),
+    Int3Tuple(5, 7, 8),  Int3Tuple(5, 7, 9),  Int3Tuple(5, 7, 10),  Int3Tuple(5, 7, 11),  Int3Tuple(5, 7, 12),  Int3Tuple(5, 7, 13),
+    Int3Tuple(5, 8, 10),  Int3Tuple(5, 8, 11),  Int3Tuple(5, 8, 12),  Int3Tuple(5, 8, 13),
+    Int3Tuple(5, 9, 10),  Int3Tuple(5, 9, 11),  Int3Tuple(5, 9, 12),  Int3Tuple(5, 9, 13),
+    Int3Tuple(5, 10, 12),  Int3Tuple(5, 10, 13),
+    Int3Tuple(5, 11, 12),  Int3Tuple(5, 11, 13),
+    Int3Tuple(6, 8, 10),  Int3Tuple(6, 8, 11),  Int3Tuple(6, 8, 12),  Int3Tuple(6, 8, 13),
+    Int3Tuple(6, 9, 10),  Int3Tuple(6, 9, 11),  Int3Tuple(6, 9, 12),  Int3Tuple(6, 9, 13),
+    Int3Tuple(6, 10, 12),  Int3Tuple(6, 10, 13),
+    Int3Tuple(6, 11, 12),  Int3Tuple(6, 11, 13),
+    Int3Tuple(7, 8, 10),  Int3Tuple(7, 8, 11),  Int3Tuple(7, 8, 12),  Int3Tuple(7, 8, 13),
+    Int3Tuple(7, 9, 10),  Int3Tuple(7, 9, 11),  Int3Tuple(7, 9, 12),  Int3Tuple(7, 9, 13),
+    Int3Tuple(7, 10, 12),  Int3Tuple(7, 10, 13),
+    Int3Tuple(7, 11, 12),  Int3Tuple(7, 11, 13),
+    Int3Tuple(8, 10, 12),  Int3Tuple(8, 10, 13),
+    Int3Tuple(8, 11, 12),  Int3Tuple(8, 11, 13),
+    Int3Tuple(9, 10, 12),  Int3Tuple(9, 10, 13),
+    Int3Tuple(9, 11, 12),  Int3Tuple(9, 11, 13)
+};
+
+void generateBoundryLinesForDop14(const std::vector<float>& dots, const glm::vec3& center, std::vector<glm::vec3>& linesOut) {
+    if (dots.size() != DOP14_COUNT) {
+        return;
+    }
+
+    // iterate over all purmutations of non-parallel planes.
+    // find all the vertices that lie on the surface of the k-dop
+    std::vector<glm::vec3> vertices;
+    for (auto& tuple : DOP14_PLANE_COMBINATIONS) {
+        int i = std::get<0>(tuple);
+        int j = std::get<1>(tuple);
+        int k = std::get<2>(tuple);
+        glm::vec4 planeA(DOP14_NORMALS[i], dots[i]);
+        glm::vec4 planeB(DOP14_NORMALS[j], dots[j]);
+        glm::vec4 planeC(DOP14_NORMALS[k], dots[k]);
+        glm::vec3 intersectionPoint;
+        const float IN_FRONT_MARGIN = 0.01f;
+        if (findIntersectionOfThreePlanes(planeA, planeB, planeC, intersectionPoint)) {
+            bool inFront = false;
+            for (int p = 0; p < DOP14_COUNT; p++) {
+                if (glm::dot(DOP14_NORMALS[p], intersectionPoint) > dots[p] + IN_FRONT_MARGIN) {
+                    inFront = true;
+                }
+            }
+            if (!inFront) {
+                vertices.push_back(intersectionPoint);
+            }
+        }
+    }
+
+    // build a set of lines between these vertices, that also lie on the surface of the k-dop.
+    for (size_t i = 0; i < vertices.size(); i++) {
+        for (size_t j = i; j < vertices.size(); j++) {
+            glm::vec3 midPoint = (vertices[i] + vertices[j]) * 0.5f;
+            int onSurfaceCount = 0;
+            const float SURFACE_MARGIN = 0.01f;
+            for (int p = 0; p < DOP14_COUNT; p++) {
+                float d = glm::dot(DOP14_NORMALS[p], midPoint);
+                if (d > dots[p] - SURFACE_MARGIN && d < dots[p] + SURFACE_MARGIN) {
+                    onSurfaceCount++;
+                }
+            }
+            if (onSurfaceCount > 1) {
+                linesOut.push_back(vertices[i] + center);
+                linesOut.push_back(vertices[j] + center);
+            }
+        }
+    }
+}
diff --git a/libraries/shared/src/GeometryUtil.h b/libraries/shared/src/GeometryUtil.h
index 857d423896..dcb90643b6 100644
--- a/libraries/shared/src/GeometryUtil.h
+++ b/libraries/shared/src/GeometryUtil.h
@@ -13,6 +13,9 @@
 #define hifi_GeometryUtil_h
 
 #include <glm/glm.hpp>
+#include <vector>
+
+class Plane;
 
 glm::vec3 computeVectorFromPointToSegment(const glm::vec3& point, const glm::vec3& start, const glm::vec3& end);
 
@@ -108,6 +111,8 @@ inline bool findRayTriangleIntersection(const glm::vec3& origin, const glm::vec3
     return findRayTriangleIntersection(origin, direction, triangle.v0, triangle.v1, triangle.v2, distance, allowBackface);
 }
 
+int clipTriangleWithPlane(const Triangle& triangle, const Plane& plane, Triangle* clippedTriangles, int maxClippedTriangleCount);
+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 isOnSegment(float xi, float yi, float xj, float yj, float xk, float yk);
@@ -163,5 +168,13 @@ private:
     static void copyCleanArray(int& lengthA, glm::vec2* vertexArrayA, int& lengthB, glm::vec2* vertexArrayB);
 };
 
+// given a set of points, compute a best fit plane that passes as close as possible through all the points.
+bool findPlaneFromPoints(const glm::vec3* points, size_t numPoints, glm::vec3& planeNormalOut, glm::vec3& pointOnPlaneOut);
+
+// plane equation is specified by ax + by + cz + d = 0.
+// the coefficents are passed in as a vec4. (a, b, c, d)
+bool findIntersectionOfThreePlanes(const glm::vec4& planeA, const glm::vec4& planeB, const glm::vec4& planeC, glm::vec3& intersectionPointOut);
+
+void generateBoundryLinesForDop14(const std::vector<float>& dots, const glm::vec3& center, std::vector<glm::vec3>& linesOut);
 
 #endif // hifi_GeometryUtil_h
diff --git a/libraries/shared/src/HashKey.cpp b/libraries/shared/src/HashKey.cpp
new file mode 100644
index 0000000000..488eccb1bf
--- /dev/null
+++ b/libraries/shared/src/HashKey.cpp
@@ -0,0 +1,67 @@
+//
+//  HashKey.cpp
+//  libraries/shared/src
+//
+//  Created by Andrew Meadows 2017.10.25
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include "HashKey.h"
+
+#include "NumericalConstants.h"
+
+
+const uint8_t NUM_PRIMES = 64;
+const uint64_t PRIMES[] = {
+    4194301UL, 4194287UL, 4194277UL, 4194271UL, 4194247UL, 4194217UL, 4194199UL, 4194191UL,
+    4194187UL, 4194181UL, 4194173UL, 4194167UL, 4194143UL, 4194137UL, 4194131UL, 4194107UL,
+    4194103UL, 4194023UL, 4194011UL, 4194007UL, 4193977UL, 4193971UL, 4193963UL, 4193957UL,
+    4193939UL, 4193929UL, 4193909UL, 4193869UL, 4193807UL, 4193803UL, 4193801UL, 4193789UL,
+    4193759UL, 4193753UL, 4193743UL, 4193701UL, 4193663UL, 4193633UL, 4193573UL, 4193569UL,
+    4193551UL, 4193549UL, 4193531UL, 4193513UL, 4193507UL, 4193459UL, 4193447UL, 4193443UL,
+    4193417UL, 4193411UL, 4193393UL, 4193389UL, 4193381UL, 4193377UL, 4193369UL, 4193359UL,
+    4193353UL, 4193327UL, 4193309UL, 4193303UL, 4193297UL, 4193279UL, 4193269UL, 4193263UL
+};
+
+
+// this hash function inspired by Squirrel Eiserloh's GDC2017 talk: "Noise-Based RNG"
+uint64_t squirrel3_64(uint64_t data, uint8_t primeIndex) {
+    constexpr uint64_t BIT_NOISE1 = 2760725261486592643UL;
+    constexpr uint64_t BIT_NOISE2 = 6774464464027632833UL;
+    constexpr uint64_t BIT_NOISE3 = 5545331650366059883UL;
+
+    // blend prime numbers into the hash to prevent dupes
+    // when hashing the same set of numbers in a different order
+    uint64_t hash = PRIMES[primeIndex % NUM_PRIMES] * data;
+    hash *= BIT_NOISE1;
+    hash ^= (hash >> 16);
+    hash += BIT_NOISE2;
+    hash ^= (hash << 16);
+    hash *= BIT_NOISE3;
+    return hash ^ (hash >> 16);
+}
+
+constexpr float QUANTIZED_VALUES_PER_METER = 250.0f;
+
+// static
+float HashKey::getNumQuantizedValuesPerMeter() {
+    return QUANTIZED_VALUES_PER_METER;
+}
+
+void HashKey::hashUint64(uint64_t data) {
+    _hash += squirrel3_64(data, ++_hashCount);
+}
+
+void HashKey::hashFloat(float data) {
+    _hash += squirrel3_64((uint64_t)((int64_t)(data * QUANTIZED_VALUES_PER_METER)), ++_hashCount);
+}
+
+void HashKey::hashVec3(const glm::vec3& data) {
+    _hash += squirrel3_64((uint64_t)((int64_t)(data[0] * QUANTIZED_VALUES_PER_METER)), ++_hashCount);
+    _hash *= squirrel3_64((uint64_t)((int64_t)(data[1] * QUANTIZED_VALUES_PER_METER)), ++_hashCount);
+    _hash ^= squirrel3_64((uint64_t)((int64_t)(data[2] * QUANTIZED_VALUES_PER_METER)), ++_hashCount);
+}
+
diff --git a/libraries/shared/src/HashKey.h b/libraries/shared/src/HashKey.h
new file mode 100644
index 0000000000..5fce182084
--- /dev/null
+++ b/libraries/shared/src/HashKey.h
@@ -0,0 +1,52 @@
+//
+//  HashKey.h
+//  libraries/shared/src
+//
+//  Created by Andrew Meadows 2017.10.25
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_HashKey_h
+#define hifi_HashKey_h
+
+#include <cstddef>
+#include <stdint.h>
+
+#include <glm/glm.hpp>
+
+
+// HashKey for use with btHashMap which requires a particular API for its keys.  In particular it
+// requires its Key to implement these methods:
+//
+//      bool Key::equals()
+//      int32_t Key::getHash()
+//
+// The important thing about the HashKey implementation is that while getHash() returns 32-bits,
+// internally HashKey stores a 64-bit hash which is used for the equals() comparison.  This allows
+// btHashMap to insert "dupe" 32-bit keys to different "values".
+
+class HashKey {
+public:
+    static float getNumQuantizedValuesPerMeter();
+
+    // These two methods are required by btHashMap.
+    bool equals(const HashKey& other) const { return _hash == other._hash; }
+    int32_t getHash() const { return (int32_t)((uint32_t)_hash); }
+
+    void clear() { _hash = _hashCount = 0; }
+    bool isNull() const { return _hash == 0 && _hashCount == 0; }
+    void hashUint64(uint64_t data);
+    void hashFloat(float data);
+    void hashVec3(const glm::vec3& data);
+
+    uint64_t getHash64() const { return _hash; } // for debug/test purposes
+
+private:
+    uint64_t _hash { 0 };
+    uint8_t _hashCount { 0 };
+};
+
+#endif // hifi_HashKey_h
diff --git a/libraries/shared/src/HifiConfigVariantMap.cpp b/libraries/shared/src/HifiConfigVariantMap.cpp
index d0fb14e104..59f660feee 100644
--- a/libraries/shared/src/HifiConfigVariantMap.cpp
+++ b/libraries/shared/src/HifiConfigVariantMap.cpp
@@ -91,32 +91,6 @@ QVariantMap HifiConfigVariantMap::mergeCLParametersWithJSONConfig(const QStringL
     return mergedMap;
 }
 
-HifiConfigVariantMap::HifiConfigVariantMap() :
-    _userConfigFilename(),
-    _masterConfig(),
-    _userConfig(),
-    _mergedConfig()
-{
-
-}
-
-void HifiConfigVariantMap::loadMasterAndUserConfig(const QStringList& argumentList) {
-    // check if there is a master config file
-    const QString MASTER_CONFIG_FILE_OPTION = "--master-config";
-
-    int masterConfigIndex = argumentList.indexOf(MASTER_CONFIG_FILE_OPTION);
-    if (masterConfigIndex != -1) {
-        QString masterConfigFilepath = argumentList[masterConfigIndex + 1];
-
-        loadMapFromJSONFile(_masterConfig, masterConfigFilepath);
-    }
-
-    // load the user config - that method replace loadMasterAndUserConfig after the 1.7 migration
-    loadConfig(argumentList);
-
-    mergeMasterAndUserConfigs();
-}
-
 void HifiConfigVariantMap::loadConfig(const QStringList& argumentList) {
     // load the user config
     const QString USER_CONFIG_FILE_OPTION = "--user-config";
@@ -172,14 +146,6 @@ void HifiConfigVariantMap::loadConfig(const QStringList& argumentList) {
     loadMapFromJSONFile(_userConfig, _userConfigFilename);
 }
 
-void HifiConfigVariantMap::mergeMasterAndUserConfigs() {
-    // the merged config is initially matched to the master config
-    _mergedConfig = _masterConfig;
-
-    // then we merge in anything missing from the user config
-    addMissingValuesToExistingMap(_mergedConfig, _userConfig);
-}
-
 void HifiConfigVariantMap::loadMapFromJSONFile(QVariantMap& existingMap, const QString& filename) {
     QFile configFile(filename);
 
diff --git a/libraries/shared/src/HifiConfigVariantMap.h b/libraries/shared/src/HifiConfigVariantMap.h
index cb6e92df96..ee248ec3d2 100644
--- a/libraries/shared/src/HifiConfigVariantMap.h
+++ b/libraries/shared/src/HifiConfigVariantMap.h
@@ -21,26 +21,19 @@ class HifiConfigVariantMap {
 public:
     static QVariantMap mergeCLParametersWithJSONConfig(const QStringList& argumentList);
 
-    HifiConfigVariantMap();
-    void loadMasterAndUserConfig(const QStringList& argumentList);
     void loadConfig(const QStringList& argumentList);
 
     const QVariant value(const QString& key) const { return _userConfig.value(key); }
     QVariant* valueForKeyPath(const QString& keyPath, bool shouldCreateIfMissing = false)
         { return ::valueForKeyPath(_userConfig, keyPath, shouldCreateIfMissing); }
 
-    QVariantMap& getMergedConfig() { return _mergedConfig; }
     QVariantMap& getConfig() { return _userConfig; }
 
-    void mergeMasterAndUserConfigs();
-
     const QString& getUserConfigFilename() const { return _userConfigFilename; }
 private:
     QString _userConfigFilename;
 
-    QVariantMap _masterConfig;
     QVariantMap _userConfig;
-    QVariantMap _mergedConfig;
 
     void loadMapFromJSONFile(QVariantMap& existingMap, const QString& filename);
     void addMissingValuesToExistingMap(QVariantMap& existingMap, const QVariantMap& newMap);
diff --git a/libraries/shared/src/Interpolate.cpp b/libraries/shared/src/Interpolate.cpp
index 35c164f0f2..cd595ee1ed 100644
--- a/libraries/shared/src/Interpolate.cpp
+++ b/libraries/shared/src/Interpolate.cpp
@@ -69,7 +69,7 @@ float Interpolate::simpleNonLinearBlend(float fraction) {
 }
 
 float Interpolate::calculateFadeRatio(quint64 start) {
-    const float FADE_TIME = 1.0f;
+    const float FADE_TIME = 0.5f;
     float t = 2.0f * std::min(((float)(usecTimestampNow() - start)) / ((float)(FADE_TIME * USECS_PER_SECOND)), 1.0f);
     float fadeRatio = (t < 1.0f) ? 0.5f * powf(2.0f, 10.0f * (t - 1.0f)) : 0.5f * (-powf(2.0f, -10.0f * (t - 1.0f)) + 2.0f);
 
diff --git a/libraries/shared/src/LogHandler.cpp b/libraries/shared/src/LogHandler.cpp
index e40ef814ea..aa67c14c4b 100644
--- a/libraries/shared/src/LogHandler.cpp
+++ b/libraries/shared/src/LogHandler.cpp
@@ -177,6 +177,13 @@ QString LogHandler::printMessage(LogMsgType type, const QMessageLogContext& cont
         prefixString.append(QString(" [%1]").arg(_targetName));
     }
 
+    // for [qml] console.* messages include an abbreviated source filename
+    if (context.category && context.file && !strcmp("qml", context.category)) {
+        if (const char* basename = strrchr(context.file, '/')) {
+            prefixString.append(QString(" [%1]").arg(basename+1));
+        }
+    }
+
     QString logMessage = QString("%1 %2").arg(prefixString, message.split('\n').join('\n' + prefixString + " "));
     fprintf(stdout, "%s\n", qPrintable(logMessage));
     return logMessage;
diff --git a/libraries/shared/src/MovingMinMaxAvg.h b/libraries/shared/src/MovingMinMaxAvg.h
index 580baf7317..782b0dc523 100644
--- a/libraries/shared/src/MovingMinMaxAvg.h
+++ b/libraries/shared/src/MovingMinMaxAvg.h
@@ -59,8 +59,12 @@ public:
             _max = other._max;
         }
         double totalSamples = _samples + other._samples;
-        _average = _average * ((double)_samples / totalSamples)
-            + other._average * ((double)other._samples / totalSamples);
+        if (totalSamples > 0) {
+            _average = _average * ((double)_samples / totalSamples)
+                + other._average * ((double)other._samples / totalSamples);
+        } else {
+            _average = 0.0f;
+        }
         _samples += other._samples;
     }
 
diff --git a/libraries/shared/src/PathUtils.cpp b/libraries/shared/src/PathUtils.cpp
index 1fe9e2f83d..46613f1283 100644
--- a/libraries/shared/src/PathUtils.cpp
+++ b/libraries/shared/src/PathUtils.cpp
@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "PathUtils.h"
+
 #include <QCoreApplication>
 #include <QString>
 #include <QVector>
@@ -16,9 +18,9 @@
 #include <QFileInfo>
 #include <QDir>
 #include <QUrl>
-#include "PathUtils.h"
 #include <QtCore/QStandardPaths>
 #include <mutex> // std::once
+#include "shared/GlobalAppProperties.h"
 
 const QString& PathUtils::resourcesPath() {
 #ifdef Q_OS_MAC
@@ -34,12 +36,8 @@ QString PathUtils::getAppDataPath() {
     return QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + "/";
 }
 
-QString PathUtils::getAppLocalDataPath(const QString& overridePath /* = "" */) {
-    static QString overriddenPath = "";
-    // set the overridden path if one was passed in
-    if (!overridePath.isEmpty()) {
-        overriddenPath = overridePath;
-    }
+QString PathUtils::getAppLocalDataPath() {
+    QString overriddenPath = qApp->property(hifi::properties::APP_LOCAL_DATA_PATH).toString();
     // return overridden path if set
     if (!overriddenPath.isEmpty()) {
         return overriddenPath;
@@ -57,6 +55,19 @@ QString PathUtils::getAppLocalDataFilePath(const QString& filename) {
     return QDir(getAppLocalDataPath()).absoluteFilePath(filename);
 }
 
+QString PathUtils::generateTemporaryDir() {
+    QDir rootTempDir = QDir::tempPath();
+    QString appName = qApp->applicationName();
+    for (auto i = 0; i < 64; ++i) {
+        auto now = std::chrono::system_clock::now().time_since_epoch().count();
+        QDir tempDir = rootTempDir.filePath(appName + "-" + QString::number(now));
+        if (tempDir.mkpath(".")) {
+            return tempDir.absolutePath();
+        }
+    }
+    return "";
+}
+
 QString fileNameWithoutExtension(const QString& fileName, const QVector<QString> possibleExtensions) {
     QString fileNameLowered = fileName.toLower();
     foreach (const QString possibleExtension, possibleExtensions) {
@@ -95,18 +106,17 @@ QUrl PathUtils::defaultScriptsLocation(const QString& newDefaultPath) {
     if (!overriddenDefaultScriptsLocation.isEmpty()) {
         path = overriddenDefaultScriptsLocation;
     } else {
-#ifdef Q_OS_WIN
-        path = QCoreApplication::applicationDirPath() + "/scripts";
-#elif defined(Q_OS_OSX)
+#if defined(Q_OS_OSX)
         path = QCoreApplication::applicationDirPath() + "/../Resources/scripts";
+#elif defined(Q_OS_ANDROID)
+        path = QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + "/scripts";
 #else
         path = QCoreApplication::applicationDirPath() + "/scripts";
 #endif
     }
 
     // turn the string into a legit QUrl
-    QFileInfo fileInfo(path);
-    return QUrl::fromLocalFile(fileInfo.canonicalFilePath());
+    return QUrl::fromLocalFile(QFileInfo(path).canonicalFilePath());
 }
 
 QString PathUtils::stripFilename(const QUrl& url) {
diff --git a/libraries/shared/src/PathUtils.h b/libraries/shared/src/PathUtils.h
index 42dd09c8b0..8c4bcf2394 100644
--- a/libraries/shared/src/PathUtils.h
+++ b/libraries/shared/src/PathUtils.h
@@ -13,6 +13,9 @@
 #define hifi_PathUtils_h
 
 #include <QtCore/QObject>
+#include <QtCore/QUrl>
+#include <QtCore/QDir>
+
 #include "DependencyManager.h"
 
 /**jsdoc
@@ -23,16 +26,19 @@
 class PathUtils : public QObject, public Dependency {
     Q_OBJECT
     SINGLETON_DEPENDENCY
-    Q_PROPERTY(QString resources READ resourcesPath)
+    Q_PROPERTY(QString resources READ resourcesPath CONSTANT)
+    Q_PROPERTY(QUrl defaultScripts READ defaultScriptsLocation CONSTANT)
 public:
     static const QString& resourcesPath();
 
     static QString getAppDataPath();
-    static QString getAppLocalDataPath(const QString& overridePath = "");
+    static QString getAppLocalDataPath();
 
     static QString getAppDataFilePath(const QString& filename);
     static QString getAppLocalDataFilePath(const QString& filename);
 
+    static QString generateTemporaryDir();
+
     static Qt::CaseSensitivity getFSCaseSensitivity();
     static QString stripFilename(const QUrl& url);
     // note: this is FS-case-sensitive version of parentURL.isParentOf(childURL)
diff --git a/libraries/shared/src/PerfStat.h b/libraries/shared/src/PerfStat.h
index 785920779e..b09cb38808 100644
--- a/libraries/shared/src/PerfStat.h
+++ b/libraries/shared/src/PerfStat.h
@@ -97,5 +97,12 @@ private:
     static QMap<QString, PerformanceTimerRecord> _records;
 };
 
+// uncomment WANT_DETAILED_PERFORMANCE_TIMERS definition to enable performance timers in high-frequency contexts
+//#define WANT_DETAILED_PERFORMANCE_TIMERS
+#ifdef WANT_DETAILED_PERFORMANCE_TIMERS
+    #define DETAILED_PERFORMANCE_TIMER(name) PerformanceTimer detailedPerformanceTimer(name);
+#else // WANT_DETAILED_PERFORMANCE_TIMERS
+    #define DETAILED_PERFORMANCE_TIMER(name) ; // no-op
+#endif // WANT_DETAILED_PERFORMANCE_TIMERS
 
 #endif // hifi_PerfStat_h
diff --git a/libraries/shared/src/Plane.h b/libraries/shared/src/Plane.h
index c903ad9db7..cf17ca7201 100644
--- a/libraries/shared/src/Plane.h
+++ b/libraries/shared/src/Plane.h
@@ -19,7 +19,9 @@
 
 class Plane {
 public:
-    Plane(const glm::vec3 &v1, const glm::vec3 &v2, const glm::vec3 &v3) { set3Points(v1,v2,v3); }
+    Plane(const glm::vec3 &v1, const glm::vec3 &v2, const glm::vec3 &v3) { set3Points(v1, v2, v3); }
+    Plane(const glm::vec3 &normal, const glm::vec3 &point) { setNormalAndPoint(normal, point); }
+    Plane(float a, float b, float c, float d) { setCoefficients(a, b, c, d); }
     Plane() : _normal(0.0f), _point(0.0f), _dCoefficient(0.0f) {};
     ~Plane() {} ;
 
diff --git a/libraries/shared/src/PointerEvent.cpp b/libraries/shared/src/PointerEvent.cpp
index 7ec5e78b9f..e35832391d 100644
--- a/libraries/shared/src/PointerEvent.cpp
+++ b/libraries/shared/src/PointerEvent.cpp
@@ -77,13 +77,13 @@ QScriptValue PointerEvent::toScriptValue(QScriptEngine* engine, const PointerEve
     normal.setProperty("x", event._normal.x);
     normal.setProperty("y", event._normal.y);
     normal.setProperty("z", event._normal.z);
-    obj.setProperty("pos3D", normal);
+    obj.setProperty("normal", normal);
 
     QScriptValue direction = engine->newObject();
     direction.setProperty("x", event._direction.x);
     direction.setProperty("y", event._direction.y);
     direction.setProperty("z", event._direction.z);
-    obj.setProperty("pos3D", direction);
+    obj.setProperty("direction", direction);
 
     bool isPrimaryButton = false;
     bool isSecondaryButton = false;
diff --git a/libraries/shared/src/Preferences.h b/libraries/shared/src/Preferences.h
index f1915a9d6a..a243a6d58d 100644
--- a/libraries/shared/src/Preferences.h
+++ b/libraries/shared/src/Preferences.h
@@ -52,9 +52,11 @@ public:
         Browsable,
         Slider,
         Spinner,
+        SpinnerSlider,
         Checkbox,
         Button,
         ComboBox,
+        PrimaryHand,
         // Special casing for an unusual preference
         Avatar
     };
@@ -254,6 +256,15 @@ public:
     Type getType() override { return Spinner; }
 };
 
+class SpinnerSliderPreference : public FloatPreference {
+    Q_OBJECT
+public:
+    SpinnerSliderPreference(const QString& category, const QString& name, Getter getter, Setter setter)
+        : FloatPreference(category, name, getter, setter) { }
+
+    Type getType() override { return SpinnerSlider; }
+};
+
 class IntSpinnerPreference : public IntPreference {
     Q_OBJECT
 public:
@@ -329,6 +340,14 @@ public:
     Type getType() override { return Checkbox; }
 };
 
+class PrimaryHandPreference : public StringPreference {
+    Q_OBJECT
+public:
+    PrimaryHandPreference(const QString& category, const QString& name, Getter getter, Setter setter)
+        : StringPreference(category, name, getter, setter) { }
+    Type getType() override { return PrimaryHand; }
+};
+
 #endif
 
 
diff --git a/libraries/shared/src/Profile.h b/libraries/shared/src/Profile.h
index 5de4e8f41a..fc6a2a52cb 100644
--- a/libraries/shared/src/Profile.h
+++ b/libraries/shared/src/Profile.h
@@ -108,4 +108,14 @@ inline void metadata(const QString& metadataType, const QVariantMap& args) {
 #define SAMPLE_PROFILE_COUNTER(chance, category, name, ...) if (randFloat() <= chance) { PROFILE_COUNTER(category, name, ##__VA_ARGS__); }
 #define SAMPLE_PROFILE_INSTANT(chance, category, name, ...) if (randFloat() <= chance) { PROFILE_INSTANT(category, name, ##__VA_ARGS__); }
 
+// uncomment WANT_DETAILED_PROFILING definition to enable profiling in high-frequency contexts
+//#define WANT_DETAILED_PROFILING
+#ifdef WANT_DETAILED_PROFILING
+#define DETAILED_PROFILE_RANGE(category, name) Duration profileRangeThis(trace_##category(), name);
+#define DETAILED_PROFILE_RANGE_EX(category, name, argbColor, payload, ...) Duration profileRangeThis(trace_##category(), name, argbColor, (uint64_t)payload, ##__VA_ARGS__);
+#else // WANT_DETAILED_PROFILING
+#define DETAILED_PROFILE_RANGE(category, name) ; // no-op
+#define DETAILED_PROFILE_RANGE_EX(category, name, argbColor, payload, ...) ; // no-op
+#endif // WANT_DETAILED_PROFILING
+
 #endif
diff --git a/libraries/shared/src/RegisteredMetaTypes.cpp b/libraries/shared/src/RegisteredMetaTypes.cpp
index b30637c83f..7d0df3ac78 100644
--- a/libraries/shared/src/RegisteredMetaTypes.cpp
+++ b/libraries/shared/src/RegisteredMetaTypes.cpp
@@ -34,6 +34,7 @@ int vec2MetaTypeId = qRegisterMetaType<glm::vec2>();
 int quatMetaTypeId = qRegisterMetaType<glm::quat>();
 int xColorMetaTypeId = qRegisterMetaType<xColor>();
 int pickRayMetaTypeId = qRegisterMetaType<PickRay>();
+int rayPickResultMetaTypeId = qRegisterMetaType<RayPickResult>();
 int collisionMetaTypeId = qRegisterMetaType<Collision>();
 int qMapURLStringMetaTypeId = qRegisterMetaType<QMap<QUrl,QString>>();
 int socketErrorMetaTypeId = qRegisterMetaType<QAbstractSocket::SocketError>();
@@ -56,6 +57,7 @@ void registerMetaTypes(QScriptEngine* engine) {
     qScriptRegisterMetaType(engine, qColorToScriptValue, qColorFromScriptValue);
     qScriptRegisterMetaType(engine, qURLToScriptValue, qURLFromScriptValue);
     qScriptRegisterMetaType(engine, pickRayToScriptValue, pickRayFromScriptValue);
+    qScriptRegisterMetaType(engine, rayPickResultToScriptValue, rayPickResultFromScriptValue);
     qScriptRegisterMetaType(engine, collisionToScriptValue, collisionFromScriptValue);
     qScriptRegisterMetaType(engine, quuidToScriptValue, quuidFromScriptValue);
     qScriptRegisterMetaType(engine, qSizeFToScriptValue, qSizeFFromScriptValue);
@@ -751,6 +753,26 @@ void pickRayFromScriptValue(const QScriptValue& object, PickRay& pickRay) {
     }
 }
 
+QScriptValue rayPickResultToScriptValue(QScriptEngine* engine, const RayPickResult& rayPickResult) {
+    QScriptValue obj = engine->newObject();
+    obj.setProperty("type", rayPickResult.type);
+    QScriptValue objectID = quuidToScriptValue(engine, rayPickResult.objectID);
+    obj.setProperty("objectID", objectID);
+    obj.setProperty("distance", rayPickResult.distance);
+    QScriptValue intersection = vec3toScriptValue(engine, rayPickResult.intersection);
+    obj.setProperty("intersection", intersection);
+    obj.setProperty("intersects", rayPickResult.type != NONE);
+    QScriptValue searchRay = pickRayToScriptValue(engine, rayPickResult.searchRay);
+    obj.setProperty("searchRay", searchRay);
+    QScriptValue surfaceNormal = vec3toScriptValue(engine, rayPickResult.surfaceNormal);
+    obj.setProperty("surfaceNormal", surfaceNormal);
+    return obj;
+}
+
+void rayPickResultFromScriptValue(const QScriptValue& object, RayPickResult& rayPickResult) {
+    // TODO: cannot currently accept RayPickResults from JS
+}
+
 QScriptValue collisionToScriptValue(QScriptEngine* engine, const Collision& collision) {
     QScriptValue obj = engine->newObject();
     obj.setProperty("type", collision.type);
@@ -808,10 +830,10 @@ AnimationDetails::AnimationDetails() :
 }
 
 AnimationDetails::AnimationDetails(QString role, QUrl url, float fps, float priority, bool loop,
-    bool hold, bool startAutomatically, float firstFrame, float lastFrame, bool running, float currentFrame) :
+    bool hold, bool startAutomatically, float firstFrame, float lastFrame, bool running, float currentFrame, bool allowTranslation) :
     role(role), url(url), fps(fps), priority(priority), loop(loop), hold(hold),
     startAutomatically(startAutomatically), firstFrame(firstFrame), lastFrame(lastFrame),
-    running(running), currentFrame(currentFrame) {
+    running(running), currentFrame(currentFrame), allowTranslation(allowTranslation) {
 }
 
 
@@ -828,6 +850,7 @@ QScriptValue animationDetailsToScriptValue(QScriptEngine* engine, const Animatio
     obj.setProperty("lastFrame", details.lastFrame);
     obj.setProperty("running", details.running);
     obj.setProperty("currentFrame", details.currentFrame);
+    obj.setProperty("allowTranslation", details.allowTranslation);
     return obj;
 }
 
diff --git a/libraries/shared/src/RegisteredMetaTypes.h b/libraries/shared/src/RegisteredMetaTypes.h
index 123c769a96..7b7d8d8f47 100644
--- a/libraries/shared/src/RegisteredMetaTypes.h
+++ b/libraries/shared/src/RegisteredMetaTypes.h
@@ -136,6 +136,31 @@ Q_DECLARE_METATYPE(PickRay)
 QScriptValue pickRayToScriptValue(QScriptEngine* engine, const PickRay& pickRay);
 void pickRayFromScriptValue(const QScriptValue& object, PickRay& pickRay);
 
+enum IntersectionType {
+    NONE = 0,
+    ENTITY,
+    OVERLAY,
+    AVATAR,
+    HUD
+};
+
+class RayPickResult {
+public:
+    RayPickResult() {}
+    RayPickResult(const PickRay& searchRay) : searchRay(searchRay) {}
+    RayPickResult(const IntersectionType type, const QUuid& objectID, const float distance, const glm::vec3& intersection, const PickRay& searchRay, const glm::vec3& surfaceNormal = glm::vec3(NAN)) :
+        type(type), objectID(objectID), distance(distance), intersection(intersection), searchRay(searchRay), surfaceNormal(surfaceNormal) {}
+    IntersectionType type { NONE };
+    QUuid objectID;
+    float distance { FLT_MAX };
+    glm::vec3 intersection { NAN };
+    PickRay searchRay;
+    glm::vec3 surfaceNormal { NAN };
+};
+Q_DECLARE_METATYPE(RayPickResult)
+QScriptValue rayPickResultToScriptValue(QScriptEngine* engine, const RayPickResult& rayPickResult);
+void rayPickResultFromScriptValue(const QScriptValue& object, RayPickResult& rayPickResult);
+
 enum ContactEventType {
     CONTACT_EVENT_TYPE_START,
     CONTACT_EVENT_TYPE_CONTINUE,
@@ -174,7 +199,7 @@ class AnimationDetails {
 public:
     AnimationDetails();
     AnimationDetails(QString role, QUrl url, float fps, float priority, bool loop,
-        bool hold, bool startAutomatically, float firstFrame, float lastFrame, bool running, float currentFrame);
+        bool hold, bool startAutomatically, float firstFrame, float lastFrame, bool running, float currentFrame, bool allowTranslation);
 
     QString role;
     QUrl url;
@@ -187,6 +212,7 @@ public:
     float lastFrame;
     bool running;
     float currentFrame;
+    bool allowTranslation;
 };
 Q_DECLARE_METATYPE(AnimationDetails);
 QScriptValue animationDetailsToScriptValue(QScriptEngine* engine, const AnimationDetails& event);
diff --git a/libraries/shared/src/SettingHandle.h b/libraries/shared/src/SettingHandle.h
index 258d1f8491..e77ee00b05 100644
--- a/libraries/shared/src/SettingHandle.h
+++ b/libraries/shared/src/SettingHandle.h
@@ -39,7 +39,7 @@ public:
     QStringList childKeys() const;
     QStringList allKeys() const;
     bool contains(const QString& key) const;
-    int	beginReadArray(const QString & prefix);
+    int    beginReadArray(const QString & prefix);
     void beginWriteArray(const QString& prefix, int size = -1);
     void endArray();
     void setArrayIndex(int i);
@@ -107,6 +107,7 @@ namespace Setting {
         }
 
         bool isSet() const {
+            maybeInit();
             return _isSet;
         }
 
diff --git a/libraries/shared/src/SettingHelpers.cpp b/libraries/shared/src/SettingHelpers.cpp
index dd301aa5aa..c6b8ac8f83 100644
--- a/libraries/shared/src/SettingHelpers.cpp
+++ b/libraries/shared/src/SettingHelpers.cpp
@@ -23,9 +23,15 @@
 
 #include "SharedLogging.h"
 
+const QSettings::Format JSON_FORMAT = QSettings::registerFormat("json", readJSONFile, writeJSONFile);
+
 QSettings::SettingsMap jsonDocumentToVariantMap(const QJsonDocument& document);
 QJsonDocument variantMapToJsonDocument(const QSettings::SettingsMap& map);
 
+QString settingsFilename() {
+    return QSettings().fileName();
+}
+
 bool readJSONFile(QIODevice& device, QSettings::SettingsMap& map) {
     QJsonParseError jsonParseError;
 
diff --git a/libraries/shared/src/SettingHelpers.h b/libraries/shared/src/SettingHelpers.h
index 122e56957c..ad61897c65 100644
--- a/libraries/shared/src/SettingHelpers.h
+++ b/libraries/shared/src/SettingHelpers.h
@@ -14,12 +14,13 @@
 
 #include <QSettings>
 
+extern const QSettings::Format JSON_FORMAT;
+
+QString settingsFilename();
+
 bool readJSONFile(QIODevice& device, QSettings::SettingsMap& map);
 bool writeJSONFile(QIODevice& device, const QSettings::SettingsMap& map);
 
-static const auto JSON_FORMAT = QSettings::registerFormat("json", readJSONFile, writeJSONFile);
-
 void loadOldINIFile(QSettings& settings);
 
-
 #endif // hifi_SettingHelpers_h
diff --git a/libraries/shared/src/ShapeInfo.cpp b/libraries/shared/src/ShapeInfo.cpp
index 583bceeaf2..8cdc4bcf14 100644
--- a/libraries/shared/src/ShapeInfo.cpp
+++ b/libraries/shared/src/ShapeInfo.cpp
@@ -15,66 +15,113 @@
 
 #include "NumericalConstants.h" // for MILLIMETERS_PER_METER
 
+// Originally within EntityItemProperties.cpp
+const char* shapeTypeNames[] = {
+    "none",
+    "box",
+    "sphere",
+    "capsule-x",
+    "capsule-y",
+    "capsule-z",
+    "cylinder-x",
+    "cylinder-y",
+    "cylinder-z",
+    "hull",
+    "plane",
+    "compound",
+    "simple-hull",
+    "simple-compound",
+    "static-mesh"
+};
+
+static const size_t SHAPETYPE_NAME_COUNT = (sizeof(shapeTypeNames) / sizeof((shapeTypeNames)[0]));
+
+// Bullet doesn't support arbitrarily small shapes
+const float MIN_HALF_EXTENT = 0.005f; // 0.5 cm
+
+QString ShapeInfo::getNameForShapeType(ShapeType type) {
+    if (((int)type <= 0) || ((int)type >= (int)SHAPETYPE_NAME_COUNT)) {
+        type = (ShapeType)0;
+    }
+
+    return shapeTypeNames[(int)type];
+}
+
 void ShapeInfo::clear() {
     _url.clear();
     _pointCollection.clear();
     _triangleIndices.clear();
     _halfExtents = glm::vec3(0.0f);
     _offset = glm::vec3(0.0f);
-    _doubleHashKey.clear();
+    _hashKey.clear();
     _type = SHAPE_TYPE_NONE;
 }
 
 void ShapeInfo::setParams(ShapeType type, const glm::vec3& halfExtents, QString url) {
+    _url = "";
     _type = type;
-    _halfExtents = halfExtents;
+    setHalfExtents(halfExtents);
     switch(type) {
         case SHAPE_TYPE_NONE:
             _halfExtents = glm::vec3(0.0f);
             break;
         case SHAPE_TYPE_BOX:
-        case SHAPE_TYPE_SPHERE:
+        case SHAPE_TYPE_HULL:
             break;
+        case SHAPE_TYPE_SPHERE: {
+                float radius = glm::length(halfExtents) / SQUARE_ROOT_OF_3;
+                radius = glm::max(radius, MIN_HALF_EXTENT);
+                _halfExtents = glm::vec3(radius);
+            }
+            break;
+        case SHAPE_TYPE_CIRCLE: {
+            _halfExtents = glm::vec3(_halfExtents.x, MIN_HALF_EXTENT, _halfExtents.z);
+        }
+        break;
         case SHAPE_TYPE_COMPOUND:
+        case SHAPE_TYPE_SIMPLE_HULL:
+        case SHAPE_TYPE_SIMPLE_COMPOUND:
         case SHAPE_TYPE_STATIC_MESH:
             _url = QUrl(url);
             break;
         default:
             break;
     }
-    _doubleHashKey.clear();
+    _hashKey.clear();
 }
 
 void ShapeInfo::setBox(const glm::vec3& halfExtents) {
     _url = "";
     _type = SHAPE_TYPE_BOX;
-    _halfExtents = halfExtents;
-    _doubleHashKey.clear();
+    setHalfExtents(halfExtents);
+    _hashKey.clear();
 }
 
 void ShapeInfo::setSphere(float radius) {
     _url = "";
     _type = SHAPE_TYPE_SPHERE;
-    _halfExtents = glm::vec3(radius, radius, radius);
-    _doubleHashKey.clear();
+    radius = glm::max(radius, MIN_HALF_EXTENT);
+    _halfExtents = glm::vec3(radius);
+    _hashKey.clear();
 }
 
 void ShapeInfo::setPointCollection(const ShapeInfo::PointCollection& pointCollection) {
     _pointCollection = pointCollection;
-    _type = (_pointCollection.size() > 0) ? SHAPE_TYPE_COMPOUND : SHAPE_TYPE_NONE;
-    _doubleHashKey.clear();
+    _hashKey.clear();
 }
 
 void ShapeInfo::setCapsuleY(float radius, float halfHeight) {
     _url = "";
     _type = SHAPE_TYPE_CAPSULE_Y;
+    radius = glm::max(radius, MIN_HALF_EXTENT);
+    halfHeight = glm::max(halfHeight, 0.0f);
     _halfExtents = glm::vec3(radius, halfHeight, radius);
-    _doubleHashKey.clear();
+    _hashKey.clear();
 }
 
 void ShapeInfo::setOffset(const glm::vec3& offset) {
     _offset = offset;
-    _doubleHashKey.clear();
+    _hashKey.clear();
 }
 
 uint32_t ShapeInfo::getNumSubShapes() const {
@@ -104,6 +151,14 @@ int ShapeInfo::getLargestSubshapePointCount() const {
     return numPoints;
 }
 
+float computeCylinderVolume(const float radius, const float height) {
+    return PI * radius * radius * 2.0f * height;
+}
+
+float computeCapsuleVolume(const float radius, const float cylinderHeight) {
+    return PI * radius * radius * (cylinderHeight + 4.0f * radius / 3.0f);
+}
+
 float ShapeInfo::computeVolume() const {
     const float DEFAULT_VOLUME = 1.0f;
     float volume = DEFAULT_VOLUME;
@@ -117,14 +172,37 @@ float ShapeInfo::computeVolume() const {
             volume = 4.0f * PI * _halfExtents.x * _halfExtents.y * _halfExtents.z / 3.0f;
             break;
         }
+        case SHAPE_TYPE_CYLINDER_X: {
+            volume = computeCylinderVolume(_halfExtents.y, _halfExtents.x);
+            break;
+        }
         case SHAPE_TYPE_CYLINDER_Y: {
-            float radius = _halfExtents.x;
-            volume = PI * radius * radius * 2.0f * _halfExtents.y;
+            volume = computeCylinderVolume(_halfExtents.x, _halfExtents.y);
+            break;
+        }
+        case SHAPE_TYPE_CYLINDER_Z: {
+            volume = computeCylinderVolume(_halfExtents.x, _halfExtents.z);
+            break;
+        }
+        case SHAPE_TYPE_CAPSULE_X: {
+            // Need to offset halfExtents.x by y to account for the system treating
+            // the x extent of the capsule as the cylindrical height + spherical radius.
+            const float cylinderHeight = 2.0f * (_halfExtents.x - _halfExtents.y);
+            volume = computeCapsuleVolume(_halfExtents.y, cylinderHeight);
             break;
         }
         case SHAPE_TYPE_CAPSULE_Y: {
-            float radius = _halfExtents.x;
-            volume = PI * radius * radius * (2.0f * (_halfExtents.y - _halfExtents.x) + 4.0f * radius / 3.0f);
+            // Need to offset halfExtents.y by x to account for the system treating
+            // the y extent of the capsule as the cylindrical height + spherical radius.
+            const float cylinderHeight = 2.0f * (_halfExtents.y - _halfExtents.x);
+            volume = computeCapsuleVolume(_halfExtents.x, cylinderHeight);
+            break;
+        }
+        case SHAPE_TYPE_CAPSULE_Z: {
+            // Need to offset halfExtents.z by x to account for the system treating
+            // the z extent of the capsule as the cylindrical height + spherical radius.
+            const float cylinderHeight = 2.0f * (_halfExtents.z - _halfExtents.x);
+            volume = computeCapsuleVolume(_halfExtents.x, cylinderHeight);
             break;
         }
         default:
@@ -178,64 +256,46 @@ bool ShapeInfo::contains(const glm::vec3& point) const {
     }
 }
 
-const DoubleHashKey& ShapeInfo::getHash() const {
+const HashKey& ShapeInfo::getHash() const {
     // NOTE: we cache the key so we only ever need to compute it once for any valid ShapeInfo instance.
-    if (_doubleHashKey.isNull() && _type != SHAPE_TYPE_NONE) {
-        bool useOffset = glm::length2(_offset) > MIN_SHAPE_OFFSET * MIN_SHAPE_OFFSET;
+    if (_hashKey.isNull() && _type != SHAPE_TYPE_NONE) {
         // The key is not yet cached therefore we must compute it.
 
-        // compute hash1
-        // TODO?: provide lookup table for hash/hash2 of _type rather than recompute?
-        uint32_t primeIndex = 0;
-        _doubleHashKey.computeHash((uint32_t)_type, primeIndex++);
+        _hashKey.hashUint64((uint64_t)_type);
+        if (_type != SHAPE_TYPE_SIMPLE_HULL) {
+            _hashKey.hashVec3(_halfExtents);
+            _hashKey.hashVec3(_offset);
+        } else {
+            // TODO: we could avoid hashing all of these points if we were to supply the ShapeInfo with a unique
+            // descriptive string.  Shapes that are uniquely described by their type and URL could just put their
+            // url in the description.
+            assert(_pointCollection.size() == (size_t)1);
+            const PointList & points = _pointCollection.back();
+            const int numPoints = (int)points.size();
 
-        // compute hash1
-        uint32_t hash = _doubleHashKey.getHash();
-        for (int j = 0; j < 3; ++j) {
-            // NOTE: 0.49f is used to bump the float up almost half a millimeter
-            // so the cast to int produces a round() effect rather than a floor()
-            hash ^= DoubleHashKey::hashFunction(
-                    (uint32_t)(_halfExtents[j] * MILLIMETERS_PER_METER + copysignf(1.0f, _halfExtents[j]) * 0.49f),
-                    primeIndex++);
-            if (useOffset) {
-                hash ^= DoubleHashKey::hashFunction(
-                        (uint32_t)(_offset[j] * MILLIMETERS_PER_METER + copysignf(1.0f, _offset[j]) * 0.49f),
-                        primeIndex++);
+            for (int i = 0; i < numPoints; ++i) {
+                _hashKey.hashVec3(points[i]);
             }
         }
-        _doubleHashKey.setHash(hash);
 
-        // compute hash2
-        hash = _doubleHashKey.getHash2();
-        for (int j = 0; j < 3; ++j) {
-            // NOTE: 0.49f is used to bump the float up almost half a millimeter
-            // so the cast to int produces a round() effect rather than a floor()
-            uint32_t floatHash = DoubleHashKey::hashFunction2(
-                    (uint32_t)(_halfExtents[j] * MILLIMETERS_PER_METER + copysignf(1.0f, _halfExtents[j]) * 0.49f));
-            if (useOffset) {
-                floatHash ^= DoubleHashKey::hashFunction2(
-                        (uint32_t)(_offset[j] * MILLIMETERS_PER_METER + copysignf(1.0f, _offset[j]) * 0.49f));
-            }
-            hash += ~(floatHash << 17);
-            hash ^=  (floatHash >> 11);
-            hash +=  (floatHash << 4);
-            hash ^=  (floatHash >> 7);
-            hash += ~(floatHash << 10);
-            hash = (hash << 16) | (hash >> 16);
+        QString url = _url.toString();
+        if (!url.isEmpty()) {
+            QByteArray baUrl = url.toLocal8Bit();
+            uint32_t urlHash = qChecksum(baUrl.data(), baUrl.size());
+            _hashKey.hashUint64((uint64_t)urlHash);
         }
-        _doubleHashKey.setHash2(hash);
 
-        if (_type == SHAPE_TYPE_COMPOUND || _type == SHAPE_TYPE_STATIC_MESH) {
-            QString url = _url.toString();
-            if (!url.isEmpty()) {
-                // fold the urlHash into both parts
-                QByteArray baUrl = url.toLocal8Bit();
-                const char *cUrl = baUrl.data();
-                uint32_t urlHash = qChecksum(cUrl, baUrl.count());
-                _doubleHashKey.setHash(_doubleHashKey.getHash() ^ urlHash);
-                _doubleHashKey.setHash2(_doubleHashKey.getHash2() ^ urlHash);
-            }
+        if (_type == SHAPE_TYPE_COMPOUND || _type == SHAPE_TYPE_SIMPLE_COMPOUND) {
+            uint64_t numHulls = (uint64_t)_pointCollection.size();
+            _hashKey.hashUint64(numHulls);
+        } else if (_type == SHAPE_TYPE_SIMPLE_HULL) {
+            _hashKey.hashUint64(1);
         }
     }
-    return _doubleHashKey;
+    return _hashKey;
+}
+
+void ShapeInfo::setHalfExtents(const glm::vec3& halfExtents) {
+    _halfExtents = glm::max(halfExtents, glm::vec3(MIN_HALF_EXTENT));
+    _hashKey.clear();
 }
diff --git a/libraries/shared/src/ShapeInfo.h b/libraries/shared/src/ShapeInfo.h
index 17e4703fc2..069241e29d 100644
--- a/libraries/shared/src/ShapeInfo.h
+++ b/libraries/shared/src/ShapeInfo.h
@@ -18,7 +18,7 @@
 #include <glm/glm.hpp>
 #include <glm/gtx/norm.hpp>
 
-#include "DoubleHashKey.h"
+#include "HashKey.h"
 
 const float MIN_SHAPE_OFFSET = 0.001f; // offsets less than 1mm will be ignored
 
@@ -46,7 +46,8 @@ enum ShapeType {
     SHAPE_TYPE_SIMPLE_HULL,
     SHAPE_TYPE_SIMPLE_COMPOUND,
     SHAPE_TYPE_STATIC_MESH,
-    SHAPE_TYPE_ELLIPSOID
+    SHAPE_TYPE_ELLIPSOID,
+    SHAPE_TYPE_CIRCLE
 };
 
 class ShapeInfo {
@@ -57,6 +58,8 @@ public:
     using PointCollection = QVector<PointList>;
     using TriangleIndices = QVector<int32_t>;
 
+    static QString getNameForShapeType(ShapeType type);
+
     void clear();
 
     void setParams(ShapeType type, const glm::vec3& halfExtents, QString url="");
@@ -66,7 +69,7 @@ public:
     void setCapsuleY(float radius, float halfHeight);
     void setOffset(const glm::vec3& offset);
 
-    int getType() const { return _type; }
+    ShapeType getType() const { return _type; }
 
     const glm::vec3& getHalfExtents() const { return _halfExtents; }
     const glm::vec3& getOffset() const { return _offset; }
@@ -86,15 +89,17 @@ public:
     /// For compound shapes it will only return whether it is inside the bounding box
     bool contains(const glm::vec3& point) const;
 
-    const DoubleHashKey& getHash() const;
+    const HashKey& getHash() const;
 
 protected:
+    void setHalfExtents(const glm::vec3& halfExtents);
+
     QUrl _url; // url for model of convex collision hulls
     PointCollection _pointCollection;
     TriangleIndices _triangleIndices;
     glm::vec3 _halfExtents = glm::vec3(0.0f);
     glm::vec3 _offset = glm::vec3(0.0f);
-    mutable DoubleHashKey _doubleHashKey;
+    mutable HashKey _hashKey;
     ShapeType _type = SHAPE_TYPE_NONE;
 };
 
diff --git a/libraries/shared/src/SharedUtil.cpp b/libraries/shared/src/SharedUtil.cpp
index a68d27e620..38a7a3165f 100644
--- a/libraries/shared/src/SharedUtil.cpp
+++ b/libraries/shared/src/SharedUtil.cpp
@@ -47,6 +47,7 @@ extern "C" FILE * __cdecl __iob_func(void) {
 #include <QtCore/QDebug>
 #include <QDateTime>
 #include <QElapsedTimer>
+#include <QTimer>
 #include <QProcess>
 #include <QSysInfo>
 #include <QThread>
@@ -1076,3 +1077,93 @@ void setMaxCores(uint8_t maxCores) {
     SetProcessAffinityMask(process, newProcessAffinity);
 #endif
 }
+
+void quitWithParentProcess() {
+    if (qApp) {
+        qDebug() << "Parent process died, quitting";
+        exit(0);
+    }
+}
+
+#ifdef Q_OS_WIN
+VOID CALLBACK parentDiedCallback(PVOID lpParameter, BOOLEAN timerOrWaitFired) {
+    if (!timerOrWaitFired) {
+        quitWithParentProcess();
+    }
+}
+
+void watchParentProcess(int parentPID) {
+    DWORD processID = parentPID;
+    HANDLE procHandle = OpenProcess(PROCESS_ALL_ACCESS, FALSE, processID);
+
+    HANDLE newHandle;
+    RegisterWaitForSingleObject(&newHandle, procHandle, parentDiedCallback, NULL, INFINITE, WT_EXECUTEONLYONCE);
+}
+#elif defined(Q_OS_MAC) || defined(Q_OS_LINUX)
+void watchParentProcess(int parentPID) {
+    auto timer = new QTimer(qApp);
+    timer->setInterval(MSECS_PER_SECOND);
+    QObject::connect(timer, &QTimer::timeout, qApp, [parentPID]() {
+        auto ppid = getppid();
+        if (parentPID != ppid) {
+            // If the PPID changed, then that means our parent process died.
+            quitWithParentProcess();
+        }
+    });
+    timer->start();
+}
+#endif
+
+
+#ifdef Q_OS_WIN
+QString getLastErrorAsString() {
+    DWORD errorMessageID = ::GetLastError();
+    if (errorMessageID == 0) {
+        return QString();
+    }
+
+    LPSTR messageBuffer = nullptr;
+    size_t size = FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+        nullptr, errorMessageID, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)&messageBuffer, 0, nullptr);
+
+    auto message = QString::fromLocal8Bit(messageBuffer, (int)size);
+
+    //Free the buffer.
+    LocalFree(messageBuffer);
+
+    return message;
+}
+
+// All processes in the group will shut down with the process creating the group
+void* createProcessGroup() {
+    HANDLE jobObject = CreateJobObject(nullptr, nullptr);
+    if (jobObject == nullptr) {
+        qWarning() << "Could NOT create job object:" << getLastErrorAsString();
+        return nullptr;
+    }
+
+    JOBOBJECT_EXTENDED_LIMIT_INFORMATION JELI;
+    if (!QueryInformationJobObject(jobObject, JobObjectExtendedLimitInformation, &JELI, sizeof(JELI), nullptr)) {
+        qWarning() << "Could NOT query job object information" << getLastErrorAsString();
+        return nullptr;
+    }
+    JELI.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE;
+    if (!SetInformationJobObject(jobObject, JobObjectExtendedLimitInformation, &JELI, sizeof(JELI))) {
+        qWarning() << "Could NOT set job object information" << getLastErrorAsString();
+        return nullptr;
+    }
+
+    return jobObject;
+}
+
+void addProcessToGroup(void* processGroup, qint64 processId) {
+    HANDLE hProcess = OpenProcess(PROCESS_ALL_ACCESS, FALSE, processId);
+    if (hProcess == nullptr) {
+        qCritical() << "Could NOT open process" << getLastErrorAsString();
+    }
+    if (!AssignProcessToJobObject(processGroup, hProcess)) {
+        qCritical() << "Could NOT assign process to job object" << getLastErrorAsString();
+    }
+}
+
+#endif
diff --git a/libraries/shared/src/SharedUtil.h b/libraries/shared/src/SharedUtil.h
index 0f30842f47..25051d45ac 100644
--- a/libraries/shared/src/SharedUtil.h
+++ b/libraries/shared/src/SharedUtil.h
@@ -235,4 +235,13 @@ const QString& getInterfaceSharedMemoryName();
 
 void setMaxCores(uint8_t maxCores);
 
+const QString PARENT_PID_OPTION = "parent-pid";
+void watchParentProcess(int parentPID);
+
+
+#ifdef Q_OS_WIN
+void* createProcessGroup();
+void addProcessToGroup(void* processGroup, qint64 processId);
+#endif
+
 #endif // hifi_SharedUtil_h
diff --git a/libraries/shared/src/SpatiallyNestable.cpp b/libraries/shared/src/SpatiallyNestable.cpp
index 4fe9cda825..8dbd2dd5e0 100644
--- a/libraries/shared/src/SpatiallyNestable.cpp
+++ b/libraries/shared/src/SpatiallyNestable.cpp
@@ -9,12 +9,14 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include <QQueue>
+#include "SpatiallyNestable.h"
+
+#include <queue>
 
 #include "DependencyManager.h"
 #include "SharedUtil.h"
+#include "StreamUtils.h"
 #include "SharedLogging.h"
-#include "SpatiallyNestable.h"
 
 const float defaultAACubeSize = 1.0f;
 const int maxParentingChain = 30;
@@ -82,8 +84,7 @@ Transform SpatiallyNestable::getParentTransform(bool& success, int depth) const
         return result;
     }
     if (parent) {
-        Transform parentTransform = parent->getTransform(_parentJointIndex, success, depth + 1);
-        result = parentTransform.setScale(1.0f); // TODO: scaling
+        result = parent->getTransform(_parentJointIndex, success, depth + 1);
     }
     return result;
 }
@@ -101,8 +102,11 @@ SpatiallyNestablePointer SpatiallyNestable::getParentPointer(bool& success) cons
     if (parent && parent->getID() == parentID) {
         // parent pointer is up-to-date
         if (!_parentKnowsMe) {
-            parent->beParentOfChild(getThisPointer());
-            _parentKnowsMe = true;
+            SpatialParentTree* parentTree = parent->getParentTree();
+            if (!parentTree || parentTree == getParentTree()) {
+                parent->beParentOfChild(getThisPointer());
+                _parentKnowsMe = true;
+            }
         }
         success = true;
         return parent;
@@ -128,8 +132,15 @@ SpatiallyNestablePointer SpatiallyNestable::getParentPointer(bool& success) cons
 
     parent = _parent.lock();
     if (parent) {
-        parent->beParentOfChild(getThisPointer());
-        _parentKnowsMe = true;
+
+        // it's possible for an entity with a parent of AVATAR_SELF_ID can be imported into a side-tree
+        // such as the clipboard's.  if this is the case, we don't want the parent to consider this a
+        // child.
+        SpatialParentTree* parentTree = parent->getParentTree();
+        if (!parentTree || parentTree == getParentTree()) {
+            parent->beParentOfChild(getThisPointer());
+            _parentKnowsMe = true;
+        }
     }
 
     success = (parent || parentID.isNull());
@@ -155,7 +166,6 @@ void SpatiallyNestable::setParentJointIndex(quint16 parentJointIndex) {
 glm::vec3 SpatiallyNestable::worldToLocal(const glm::vec3& position,
                                           const QUuid& parentID, int parentJointIndex,
                                           bool& success) {
-    Transform result;
     QSharedPointer<SpatialParentFinder> parentFinder = DependencyManager::get<SpatialParentFinder>();
     if (!parentFinder) {
         success = false;
@@ -179,23 +189,17 @@ glm::vec3 SpatiallyNestable::worldToLocal(const glm::vec3& position,
         if (!success) {
             return glm::vec3(0.0f);
         }
-        parentTransform.setScale(1.0f); // TODO: scale
     }
     success = true;
 
-    Transform positionTransform;
-    positionTransform.setTranslation(position);
-    Transform myWorldTransform;
-    Transform::mult(myWorldTransform, parentTransform, positionTransform);
-    myWorldTransform.setTranslation(position);
-    Transform::inverseMult(result, parentTransform, myWorldTransform);
-    return result.getTranslation();
+    Transform invParentTransform;
+    parentTransform.evalInverse(invParentTransform);
+    return invParentTransform.transform(position);
 }
 
 glm::quat SpatiallyNestable::worldToLocal(const glm::quat& orientation,
                                           const QUuid& parentID, int parentJointIndex,
                                           bool& success) {
-    Transform result;
     QSharedPointer<SpatialParentFinder> parentFinder = DependencyManager::get<SpatialParentFinder>();
     if (!parentFinder) {
         success = false;
@@ -219,17 +223,11 @@ glm::quat SpatiallyNestable::worldToLocal(const glm::quat& orientation,
         if (!success) {
             return glm::quat();
         }
-        parentTransform.setScale(1.0f); // TODO: scale
     }
     success = true;
 
-    Transform orientationTransform;
-    orientationTransform.setRotation(orientation);
-    Transform myWorldTransform;
-    Transform::mult(myWorldTransform, parentTransform, orientationTransform);
-    myWorldTransform.setRotation(orientation);
-    Transform::inverseMult(result, parentTransform, myWorldTransform);
-    return result.getRotation();
+    glm::quat invParentOrientation = glm::inverse(parentTransform.getRotation());
+    return invParentOrientation * orientation;
 }
 
 glm::vec3 SpatiallyNestable::worldToLocalVelocity(const glm::vec3& velocity, const QUuid& parentID,
@@ -291,7 +289,6 @@ glm::vec3 SpatiallyNestable::localToWorld(const glm::vec3& position,
         if (!success) {
             return glm::vec3(0.0f);
         }
-        parentTransform.setScale(1.0f); // TODO: scale
     }
     success = true;
 
@@ -633,7 +630,6 @@ const Transform SpatiallyNestable::getTransform(int jointIndex, bool& success, i
     }
 
     Transform worldTransform = getTransform(success, depth);
-    worldTransform.setScale(1.0f); // TODO -- scale;
     if (!success) {
         return jointInWorldFrame;
     }
@@ -672,65 +668,55 @@ bool SpatiallyNestable::setTransform(const Transform& transform) {
     return success;
 }
 
-glm::vec3 SpatiallyNestable::getScale() const {
-    // TODO: scale
-    glm::vec3 result;
-    _transformLock.withReadLock([&] {
-        result = _transform.getScale();
-    });
+glm::vec3 SpatiallyNestable::getSNScale() const {
+    bool success;
+    auto result = getSNScale(success);
+    #ifdef WANT_DEBUG
+    if (!success) {
+        qCDebug(shared) << "Warning -- getScale failed" << getID();
+    }
+    #endif
     return result;
 }
 
-glm::vec3 SpatiallyNestable::getScale(int jointIndex) const {
-    // TODO: scale
-    return getScale();
+glm::vec3 SpatiallyNestable::getSNScale(bool& success) const {
+    return getTransform(success).getScale();
 }
 
-void SpatiallyNestable::setScale(const glm::vec3& scale) {
+glm::vec3 SpatiallyNestable::getSNScale(int jointIndex, bool& success) const {
+    return getTransform(jointIndex, success).getScale();
+}
+
+void SpatiallyNestable::setSNScale(const glm::vec3& scale) {
+    bool success;
+    setSNScale(scale, success);
+}
+
+void SpatiallyNestable::setSNScale(const glm::vec3& scale, bool& success) {
     // guard against introducing NaN into the transform
     if (isNaN(scale)) {
-        qCDebug(shared) << "SpatiallyNestable::setScale -- scale contains NaN";
+        success = false;
         return;
     }
 
     bool changed = false;
-    // TODO: scale
+    Transform parentTransform = getParentTransform(success);
+    Transform myWorldTransform;
     _transformLock.withWriteLock([&] {
-        if (_transform.getScale() != scale) {
-            _transform.setScale(scale);
+        Transform::mult(myWorldTransform, parentTransform, _transform);
+        if (myWorldTransform.getScale() != scale) {
             changed = true;
+            myWorldTransform.setScale(scale);
+            Transform::inverseMult(_transform, parentTransform, myWorldTransform);
             _scaleChanged = usecTimestampNow();
         }
     });
-    if (changed) {
-        dimensionsChanged();
+    if (success && changed) {
+        locationChanged();
     }
 }
 
-void SpatiallyNestable::setScale(float value) {
-    // guard against introducing NaN into the transform
-    if (value <= 0.0f) {
-        qCDebug(shared) << "SpatiallyNestable::setScale -- scale is zero or negative value";
-        return;
-    }
-
-    bool changed = false;
-    // TODO: scale
-    _transformLock.withWriteLock([&] {
-        glm::vec3 beforeScale = _transform.getScale();
-        _transform.setScale(value);
-        if (_transform.getScale() != beforeScale) {
-            changed = true;
-            _scaleChanged = usecTimestampNow();
-        }
-    });
-
-    if (changed) {
-        dimensionsChanged();
-    }
-}
-
-const Transform SpatiallyNestable::getLocalTransform() const {
+Transform SpatiallyNestable::getLocalTransform() const {
     Transform result;
     _transformLock.withReadLock([&] {
         result =_transform;
@@ -843,8 +829,7 @@ void SpatiallyNestable::setLocalAngularVelocity(const glm::vec3& angularVelocity
     });
 }
 
-glm::vec3 SpatiallyNestable::getLocalScale() const {
-    // TODO: scale
+glm::vec3 SpatiallyNestable::getLocalSNScale() const {
     glm::vec3 result;
     _transformLock.withReadLock([&] {
         result = _transform.getScale();
@@ -852,7 +837,7 @@ glm::vec3 SpatiallyNestable::getLocalScale() const {
     return result;
 }
 
-void SpatiallyNestable::setLocalScale(const glm::vec3& scale) {
+void SpatiallyNestable::setLocalSNScale(const glm::vec3& scale) {
     // guard against introducing NaN into the transform
     if (isNaN(scale)) {
         qCDebug(shared) << "SpatiallyNestable::setLocalScale -- scale contains NaN";
@@ -860,7 +845,6 @@ void SpatiallyNestable::setLocalScale(const glm::vec3& scale) {
     }
 
     bool changed = false;
-    // TODO: scale
     _transformLock.withWriteLock([&] {
         if (_transform.getScale() != scale) {
             _transform.setScale(scale);
@@ -904,6 +888,8 @@ const Transform SpatiallyNestable::getAbsoluteJointTransformInObjectFrame(int jo
     Transform jointTransformInObjectFrame;
     glm::vec3 position = getAbsoluteJointTranslationInObjectFrame(jointIndex);
     glm::quat orientation = getAbsoluteJointRotationInObjectFrame(jointIndex);
+    glm::vec3 scale = getAbsoluteJointScaleInObjectFrame(jointIndex);
+    jointTransformInObjectFrame.setScale(scale);
     jointTransformInObjectFrame.setRotation(orientation);
     jointTransformInObjectFrame.setTranslation(position);
     return jointTransformInObjectFrame;
@@ -915,24 +901,53 @@ SpatiallyNestablePointer SpatiallyNestable::getThisPointer() const {
     return thisPointer;
 }
 
-void SpatiallyNestable::forEachChild(std::function<void(SpatiallyNestablePointer)> actor) {
-    foreach(SpatiallyNestablePointer child, getChildren()) {
+
+void SpatiallyNestable::forEachChild(const ChildLambda& actor) const {
+    for (auto& child : getChildren()) {
         actor(child);
     }
 }
 
-void SpatiallyNestable::forEachDescendant(std::function<void(SpatiallyNestablePointer)> actor) {
-    QQueue<SpatiallyNestablePointer> toProcess;
-    foreach(SpatiallyNestablePointer child, getChildren()) {
-        toProcess.enqueue(child);
+void SpatiallyNestable::forEachChildTest(const ChildLambdaTest&  actor) const {
+    for (auto& child : getChildren()) {
+        if (!actor(child)) {
+            break;
+        }
+    }
+}
+
+// FIXME make a breadth_first_recursive_iterator to do this
+void SpatiallyNestable::forEachDescendant(const ChildLambda& actor) const {
+    std::list<SpatiallyNestablePointer> toProcess;
+    {
+        auto children = getChildren();
+        toProcess.insert(toProcess.end(), children.begin(), children.end());
     }
 
     while (!toProcess.empty()) {
-        SpatiallyNestablePointer object = toProcess.dequeue();
+        auto& object = toProcess.front();
         actor(object);
-        foreach (SpatiallyNestablePointer child, object->getChildren()) {
-            toProcess.enqueue(child);
+        auto children = object->getChildren();
+        toProcess.insert(toProcess.end(), children.begin(), children.end());
+        toProcess.pop_front();
+    }
+}
+
+void SpatiallyNestable::forEachDescendantTest(const ChildLambdaTest& actor) const {
+    std::list<SpatiallyNestablePointer> toProcess;
+    {
+        auto children = getChildren();
+        toProcess.insert(toProcess.end(), children.begin(), children.end());
+    }
+
+    while (!toProcess.empty()) {
+        auto& object = toProcess.front();
+        if (!actor(object)) {
+            break;
         }
+        auto children = object->getChildren();
+        toProcess.insert(toProcess.end(), children.begin(), children.end());
+        toProcess.pop_front();
     }
 }
 
@@ -946,13 +961,43 @@ AACube SpatiallyNestable::getMaximumAACube(bool& success) const {
     return AACube(getPosition(success) - glm::vec3(defaultAACubeSize / 2.0f), defaultAACubeSize);
 }
 
-bool SpatiallyNestable::checkAndAdjustQueryAACube() {
+const float PARENTED_EXPANSION_FACTOR = 3.0f;
+
+bool SpatiallyNestable::updateQueryAACube() {
+    if (!queryAACubeNeedsUpdate()) {
+        return false;
+    }
+
     bool success;
     AACube maxAACube = getMaximumAACube(success);
-    if (success && (!_queryAACubeSet || !_queryAACube.contains(maxAACube))) {
-        setQueryAACube(maxAACube);
+    if (!success) {
+        return false;
     }
-    return success;
+
+    if (shouldPuffQueryAACube()) {
+        // make an expanded AACube centered on the object
+        float scale = PARENTED_EXPANSION_FACTOR * maxAACube.getScale();
+        _queryAACube = AACube(maxAACube.calcCenter() - glm::vec3(0.5f * scale), scale);
+        _queryAACubeIsPuffed = true;
+    } else {
+        _queryAACube = maxAACube;
+        _queryAACubeIsPuffed = false;
+    }
+
+    forEachDescendant([&](const SpatiallyNestablePointer& descendant) {
+        bool childSuccess;
+        AACube descendantAACube = descendant->getQueryAACube(childSuccess);
+        if (childSuccess) {
+            if (_queryAACube.contains(descendantAACube)) {
+                return; // from lambda
+            }
+            _queryAACube += descendantAACube.getMinimumPoint();
+            _queryAACube += descendantAACube.getMaximumPoint();
+        }
+    });
+
+    _queryAACubeSet = true;
+    return true;
 }
 
 void SpatiallyNestable::setQueryAACube(const AACube& queryAACube) {
@@ -961,60 +1006,35 @@ void SpatiallyNestable::setQueryAACube(const AACube& queryAACube) {
         return;
     }
     _queryAACube = queryAACube;
-    if (queryAACube.getScale() > 0.0f) {
-        _queryAACubeSet = true;
-    }
+    _queryAACubeSet = true;
 }
 
-bool SpatiallyNestable::queryAABoxNeedsUpdate() const {
+bool SpatiallyNestable::queryAACubeNeedsUpdate() const {
+    if (!_queryAACubeSet) {
+        return true;
+    }
+
     bool success;
-    AACube currentAACube = getMaximumAACube(success);
-    if (!success) {
-        qCDebug(shared) << "can't getMaximumAACube for" << getID();
-        return false;
+    AACube maxAACube = getMaximumAACube(success);
+    if (success && !_queryAACube.contains(maxAACube)) {
+        return true;
+    }
+
+    if (shouldPuffQueryAACube() != _queryAACubeIsPuffed) {
+        return true;
     }
 
     // make sure children are still in their boxes, also.
     bool childNeedsUpdate = false;
-    getThisPointer()->forEachDescendant([&](SpatiallyNestablePointer descendant) {
-        if (!childNeedsUpdate && descendant->queryAABoxNeedsUpdate()) {
+    forEachDescendantTest([&](const SpatiallyNestablePointer& descendant) {
+        if (!childNeedsUpdate && descendant->queryAACubeNeedsUpdate()) {
             childNeedsUpdate = true;
+            // Don't recurse further
+            return false;
         }
-    });
-    if (childNeedsUpdate) {
         return true;
-    }
-
-    if (_queryAACubeSet && _queryAACube.contains(currentAACube)) {
-        return false;
-    }
-
-    return true;
-}
-
-bool SpatiallyNestable::computePuffedQueryAACube() {
-    if (!queryAABoxNeedsUpdate()) {
-        return false;
-    }
-    bool success;
-    AACube currentAACube = getMaximumAACube(success);
-    // make an AACube with edges thrice as long and centered on the object
-    _queryAACube = AACube(currentAACube.getCorner() - glm::vec3(currentAACube.getScale()), currentAACube.getScale() * 3.0f);
-    _queryAACubeSet = true;
-
-    getThisPointer()->forEachDescendant([&](SpatiallyNestablePointer descendant) {
-        bool success;
-        AACube descendantAACube = descendant->getQueryAACube(success);
-        if (success) {
-            if (_queryAACube.contains(descendantAACube)) {
-                return;
-            }
-            _queryAACube += descendantAACube.getMinimumPoint();
-            _queryAACube += descendantAACube.getMaximumPoint();
-        }
     });
-
-    return true;
+    return childNeedsUpdate;
 }
 
 AACube SpatiallyNestable::getQueryAACube(bool& success) const {
@@ -1153,3 +1173,29 @@ QString SpatiallyNestable::nestableTypeToString(NestableType nestableType) {
             return "unknown";
     }
 }
+
+void SpatiallyNestable::dump(const QString& prefix) const {
+    qDebug().noquote() << prefix << "id = " << getID();
+    qDebug().noquote() << prefix << "transform = " << _transform;
+    bool success;
+    SpatiallyNestablePointer parent = getParentPointer(success);
+    if (success && parent) {
+        parent->dump(prefix + "    ");
+    }
+}
+
+bool SpatiallyNestable::isParentPathComplete() const {
+    static const QUuid IDENTITY;
+    QUuid parentID = getParentID();
+    if (parentID.isNull() || parentID == IDENTITY) {
+        return true;
+    }
+
+    bool success = false;
+    SpatiallyNestablePointer parent = getParentPointer(success);
+    if (!success || !parent) {
+        return false;
+    }
+
+    return parent->isParentPathComplete();
+}
diff --git a/libraries/shared/src/SpatiallyNestable.h b/libraries/shared/src/SpatiallyNestable.h
index b98ab4c358..37f6cfdfd9 100644
--- a/libraries/shared/src/SpatiallyNestable.h
+++ b/libraries/shared/src/SpatiallyNestable.h
@@ -66,6 +66,10 @@ public:
 
     static QString nestableTypeToString(NestableType nestableType);
 
+
+    virtual bool isParentPathComplete() const;
+
+
     // world frame
     virtual const Transform getTransform(bool& success, int depth = 0) const;
     virtual const Transform getTransform() const;
@@ -102,26 +106,27 @@ public:
     virtual glm::vec3 getParentAngularVelocity(bool& success) const;
 
     virtual AACube getMaximumAACube(bool& success) const;
-    virtual bool checkAndAdjustQueryAACube();
-    virtual bool computePuffedQueryAACube();
 
     virtual void setQueryAACube(const AACube& queryAACube);
-    virtual bool queryAABoxNeedsUpdate() const;
+    virtual bool queryAACubeNeedsUpdate() const;
+    virtual bool shouldPuffQueryAACube() const { return false; }
+    bool updateQueryAACube();
     void forceQueryAACubeUpdate() { _queryAACubeSet = false; }
     virtual AACube getQueryAACube(bool& success) const;
     virtual AACube getQueryAACube() const;
 
-    virtual glm::vec3 getScale() const;
-    virtual void setScale(const glm::vec3& scale);
-    virtual void setScale(float value);
+    virtual glm::vec3 getSNScale() const;
+    virtual glm::vec3 getSNScale(bool& success) const;
+    virtual void setSNScale(const glm::vec3& scale);
+    virtual void setSNScale(const glm::vec3& scale, bool& success);
 
     // get world-frame values for a specific joint
     virtual const Transform getTransform(int jointIndex, bool& success, int depth = 0) const;
     virtual glm::vec3 getPosition(int jointIndex, bool& success) const;
-    virtual glm::vec3 getScale(int jointIndex) const;
+    virtual glm::vec3 getSNScale(int jointIndex, bool& success) const;
 
     // object's parent's frame
-    virtual const Transform getLocalTransform() const;
+    virtual Transform getLocalTransform() const;
     virtual void setLocalTransform(const Transform& transform);
 
     virtual glm::vec3 getLocalPosition() const;
@@ -136,8 +141,8 @@ public:
     virtual glm::vec3 getLocalAngularVelocity() const;
     virtual void setLocalAngularVelocity(const glm::vec3& angularVelocity);
 
-    virtual glm::vec3 getLocalScale() const;
-    virtual void setLocalScale(const glm::vec3& scale);
+    virtual glm::vec3 getLocalSNScale() const;
+    virtual void setLocalSNScale(const glm::vec3& scale);
 
     QList<SpatiallyNestablePointer> getChildren() const;
     bool hasChildren() const;
@@ -146,6 +151,7 @@ public:
 
     // this object's frame
     virtual const Transform getAbsoluteJointTransformInObjectFrame(int jointIndex) const;
+    virtual glm::vec3 getAbsoluteJointScaleInObjectFrame(int index) const { return glm::vec3(1.0f); }
     virtual glm::quat getAbsoluteJointRotationInObjectFrame(int index) const { return glm::quat(); }
     virtual glm::vec3 getAbsoluteJointTranslationInObjectFrame(int index) const { return glm::vec3(); }
     virtual bool setAbsoluteJointRotationInObjectFrame(int index, const glm::quat& rotation) { return false; }
@@ -158,8 +164,13 @@ public:
 
     SpatiallyNestablePointer getThisPointer() const;
 
-    void forEachChild(std::function<void(SpatiallyNestablePointer)> actor);
-    void forEachDescendant(std::function<void(SpatiallyNestablePointer)> actor);
+    using ChildLambda = std::function<void(const SpatiallyNestablePointer&)>;
+    using ChildLambdaTest = std::function<bool(const SpatiallyNestablePointer&)>;
+
+    void forEachChild(const ChildLambda& actor) const;
+    void forEachDescendant(const ChildLambda& actor) const;
+    void forEachChildTest(const ChildLambdaTest&  actor) const;
+    void forEachDescendantTest(const ChildLambdaTest& actor) const;
 
     void die() { _isDead = true; }
     bool isDead() const { return _isDead; }
@@ -185,6 +196,8 @@ public:
     bool tranlationChangedSince(quint64 time) const { return _translationChanged > time; }
     bool rotationChangedSince(quint64 time) const { return _rotationChanged > time; }
 
+    void dump(const QString& prefix = "") const;
+
 protected:
     const NestableType _nestableType; // EntityItem or an AvatarData
     QUuid _id;
@@ -197,7 +210,7 @@ protected:
     mutable QHash<QUuid, SpatiallyNestableWeakPointer> _children;
 
     virtual void locationChanged(bool tellPhysics = true); // called when a this object's location has changed
-    virtual void dimensionsChanged() { } // called when a this object's dimensions have changed
+    virtual void dimensionsChanged() { _queryAACubeSet = false; } // called when a this object's dimensions have changed
     virtual void parentDeleted() { } // called on children of a deleted parent
 
     // _queryAACube is used to decide where something lives in the octree
@@ -221,6 +234,7 @@ private:
     glm::vec3 _angularVelocity;
     mutable bool _parentKnowsMe { false };
     bool _isDead { false };
+    bool _queryAACubeIsPuffed { false };
 };
 
 
diff --git a/libraries/shared/src/StatTracker.cpp b/libraries/shared/src/StatTracker.cpp
index 0ac9ab0092..adfafd0ea7 100644
--- a/libraries/shared/src/StatTracker.cpp
+++ b/libraries/shared/src/StatTracker.cpp
@@ -14,15 +14,15 @@ StatTracker::StatTracker() {
 
 QVariant StatTracker::getStat(const QString& name) {
     std::lock_guard<std::mutex> lock(_statsLock);
-    return _stats[name];
+    return QVariant::fromValue<int64_t>(_stats[name]);
 }
 
-void StatTracker::setStat(const QString& name, int value) {
+void StatTracker::setStat(const QString& name, int64_t value) {
     Lock lock(_statsLock);
     _stats[name] = value;
 }
 
-void StatTracker::updateStat(const QString& name, int value) {
+void StatTracker::updateStat(const QString& name, int64_t value) {
     Lock lock(_statsLock);
     auto itr = _stats.find(name);
     if (_stats.end() == itr) {
diff --git a/libraries/shared/src/StatTracker.h b/libraries/shared/src/StatTracker.h
index 38afc2c379..4b84bbcb32 100644
--- a/libraries/shared/src/StatTracker.h
+++ b/libraries/shared/src/StatTracker.h
@@ -24,15 +24,15 @@ class StatTracker : public Dependency {
 public:
     StatTracker();
     QVariant getStat(const QString& name);
-    void setStat(const QString& name, int value);
-    void updateStat(const QString& name, int mod);
+    void setStat(const QString& name, int64_t value);
+    void updateStat(const QString& name, int64_t mod);
     void incrementStat(const QString& name);
     void decrementStat(const QString& name);
 private:
     using Mutex = std::mutex;
     using Lock = std::lock_guard<Mutex>;
     Mutex _statsLock;
-    QHash<QString, int> _stats;
+    QHash<QString, int64_t> _stats;
 };
 
 class CounterStat {
diff --git a/libraries/shared/src/ThreadHelpers.cpp b/libraries/shared/src/ThreadHelpers.cpp
index 14ae35762b..654b8e0252 100644
--- a/libraries/shared/src/ThreadHelpers.cpp
+++ b/libraries/shared/src/ThreadHelpers.cpp
@@ -10,30 +10,71 @@
 
 #include <QtCore/QDebug>
 
+// Support for viewing the thread name in the debugger.  
+// Note, Qt actually does this for you but only in debug builds
+// Code from https://msdn.microsoft.com/en-us/library/xcb2z8hs.aspx
+// and matches logic in `qt_set_thread_name` in qthread_win.cpp
+#ifdef Q_OS_WIN
+#include <qt_windows.h>
+#pragma pack(push,8)  
+struct THREADNAME_INFO {
+    DWORD dwType; // Must be 0x1000.  
+    LPCSTR szName; // Pointer to name (in user addr space).  
+    DWORD dwThreadID; // Thread ID (-1=caller thread).  
+    DWORD dwFlags; // Reserved for future use, must be zero.  
+};
+#pragma pack(pop)  
+#endif
+
+void setThreadName(const std::string& name) {
+#ifdef Q_OS_WIN
+    static const DWORD MS_VC_EXCEPTION = 0x406D1388;
+    THREADNAME_INFO info{ 0x1000, name.c_str(), (DWORD)-1, 0 };
+    __try {
+        RaiseException(MS_VC_EXCEPTION, 0, sizeof(info) / sizeof(ULONG_PTR), (ULONG_PTR*)&info);
+    } __except (EXCEPTION_EXECUTE_HANDLER) { }
+#endif
+}
+
+void moveToNewNamedThread(QObject* object, const QString& name, std::function<void(QThread*)> preStartCallback, std::function<void()> startCallback, QThread::Priority priority) {
+    Q_ASSERT(QThread::currentThread() == object->thread());
+
+    // Create the target thread
+    QThread* thread = new QThread();
+    thread->setObjectName(name);
+
+    // Execute any additional work to do before the thread starts like moving members to the target thread.
+    // This is required as QObject::moveToThread isn't virutal, so we can't override it on objects that contain
+    // an OpenGLContext and ensure that the context moves to the target thread as well.  
+    preStartCallback(thread);
+
+    // Link the in-thread initialization code
+    QObject::connect(thread, &QThread::started, [name, startCallback] { 
+        if (!name.isEmpty()) {
+            // Make it easy to spot our thread processes inside the debugger
+            setThreadName("Hifi_" + name.toStdString());
+        }
+        startCallback();
+    });
+
+    // Make sure the thread will be destroyed and cleaned up.  The assumption here is that the incoming object 
+    // will be destroyed and the thread will quit when that occurs.  
+    QObject::connect(object, &QObject::destroyed, thread, &QThread::quit);
+    // When the thread itself stops running, it should also be deleted.
+    QObject::connect(thread, &QThread::finished, thread, &QThread::deleteLater);
+
+    // put the object on the thread
+    object->moveToThread(thread);
+    thread->start();
+    if (priority != QThread::InheritPriority) {
+        thread->setPriority(priority);
+    }
+}
 
 void moveToNewNamedThread(QObject* object, const QString& name, std::function<void()> startCallback, QThread::Priority priority) {
-     Q_ASSERT(QThread::currentThread() == object->thread());
-     // setup a thread for the NodeList and its PacketReceiver
-     QThread* thread = new QThread();
-     thread->setObjectName(name);
-
-     if (priority != QThread::InheritPriority) {
-         thread->setPriority(priority);
-     }
-
-     QString tempName = name;
-     QObject::connect(thread, &QThread::started, [startCallback] {
-         startCallback();
-     });
-     // Make sure the thread will be destroyed and cleaned up
-     QObject::connect(object, &QObject::destroyed, thread, &QThread::quit);
-     QObject::connect(thread, &QThread::finished, thread, &QThread::deleteLater);
-
-     // put the object on the thread
-     object->moveToThread(thread);
-     thread->start();
+    moveToNewNamedThread(object, name, [](QThread*){}, startCallback, priority);
 }
 
 void moveToNewNamedThread(QObject* object, const QString& name, QThread::Priority priority) {
-    moveToNewNamedThread(object, name, [] {}, priority);
+    moveToNewNamedThread(object, name, [](QThread*){}, []{}, priority);
 }
diff --git a/libraries/shared/src/ThreadHelpers.h b/libraries/shared/src/ThreadHelpers.h
index 6461fa5724..d236344dc5 100644
--- a/libraries/shared/src/ThreadHelpers.h
+++ b/libraries/shared/src/ThreadHelpers.h
@@ -16,6 +16,7 @@
 
 #include <QtCore/QMutex>
 #include <QtCore/QMutexLocker>
+#include <QtCore/QWaitCondition>
 #include <QtCore/QObject>
 #include <QtCore/QString>
 #include <QtCore/QThread>
@@ -31,7 +32,37 @@ void withLock(QMutex& lock, F function) {
     function();
 }
 
-void moveToNewNamedThread(QObject* object, const QString& name, std::function<void()> startCallback, QThread::Priority priority = QThread::InheritPriority);
-void moveToNewNamedThread(QObject* object, const QString& name, QThread::Priority priority = QThread::InheritPriority);
+void moveToNewNamedThread(QObject* object, const QString& name, 
+    std::function<void(QThread*)> preStartCallback, 
+    std::function<void()> startCallback, 
+    QThread::Priority priority = QThread::InheritPriority);
+
+void moveToNewNamedThread(QObject* object, const QString& name, 
+    std::function<void()> startCallback, 
+    QThread::Priority priority = QThread::InheritPriority);
+
+void moveToNewNamedThread(QObject* object, const QString& name, 
+    QThread::Priority priority = QThread::InheritPriority);
+
+class ConditionalGuard {
+public:
+    void trigger() {
+        QMutexLocker locker(&_mutex);
+        _triggered = true;
+        _condition.wakeAll();
+    }
+
+    bool wait(unsigned long time = ULONG_MAX) {
+        QMutexLocker locker(&_mutex);
+        if (!_triggered) {
+            _condition.wait(&_mutex, time);
+        }
+        return _triggered;
+    }
+private:
+    QMutex _mutex;
+    QWaitCondition _condition;
+    bool _triggered { false };
+};
 
 #endif
diff --git a/libraries/shared/src/Transform.cpp b/libraries/shared/src/Transform.cpp
index c51b3dae4b..3e29c38add 100644
--- a/libraries/shared/src/Transform.cpp
+++ b/libraries/shared/src/Transform.cpp
@@ -150,3 +150,10 @@ QJsonObject Transform::toJson(const Transform& transform) {
     }
     return result;
 }
+
+QDebug& operator<<(QDebug& debug, const Transform& transform) {
+    debug << "Transform, trans = (" << transform._translation.x << transform._translation.y << transform._translation.z << "), rot = ("
+          << transform._rotation.x << transform._rotation.y << transform._rotation.z << transform._rotation.w << "), scale = ("
+          << transform._scale.x << transform._scale.y << transform._scale.z << ")";
+    return debug;
+}
diff --git a/libraries/shared/src/Transform.h b/libraries/shared/src/Transform.h
index 38d47695f7..7a39314f4d 100644
--- a/libraries/shared/src/Transform.h
+++ b/libraries/shared/src/Transform.h
@@ -38,6 +38,7 @@ inline bool isValidScale(float scale) {
 
 class Transform {
 public:
+    friend QDebug& operator<<(QDebug& debug, const Transform& transform);
     using Pointer = std::shared_ptr<Transform>;
     typedef glm::mat4 Mat4;
     typedef glm::mat3 Mat3;
@@ -148,6 +149,7 @@ public:
 
     Vec4 transform(const Vec4& pos) const;
     Vec3 transform(const Vec3& pos) const;
+    Vec3 transformDirection(const Vec3& dir) const;
 
     bool containsNaN() const { return isNaN(_rotation) || isNaN(glm::dot(_scale, _translation)); }
 
@@ -170,7 +172,6 @@ protected:
     };
     typedef std::bitset<NUM_FLAGS> Flags;
 
-
     // TRS
     Quat _rotation;
     Vec3 _scale;
@@ -202,6 +203,8 @@ protected:
     Mat4& getCachedMatrix(Mat4& result) const;
 };
 
+QDebug& operator<<(QDebug& debug, const Transform& transform);
+
 inline Transform& Transform::setIdentity() {
     _translation = Vec3(0.0f);
     _rotation = Quat(1.0f, 0.0f, 0.0f, 0.0f);
@@ -539,6 +542,13 @@ inline Transform::Vec3 Transform::transform(const Vec3& pos) const {
     return Vec3(result.x / result.w, result.y / result.w, result.z / result.w);
 }
 
+inline Transform::Vec3 Transform::transformDirection(const Vec3& dir) const {
+    Mat4 m;
+    getMatrix(m);
+    Vec4 result = m * Vec4(dir, 0.0f);
+    return Vec3(result.x, result.y, result.z);
+}
+
 inline Transform::Mat4& Transform::getCachedMatrix(Transform::Mat4& result) const {
     updateCache();
     result = (*_matrix);
diff --git a/libraries/shared/src/TriangleSet.cpp b/libraries/shared/src/TriangleSet.cpp
index 68c99a9753..ce7dd18921 100644
--- a/libraries/shared/src/TriangleSet.cpp
+++ b/libraries/shared/src/TriangleSet.cpp
@@ -104,8 +104,9 @@ bool TriangleSet::TriangleOctreeCell::findRayIntersectionInternal(const glm::vec
     if (_bounds.findRayIntersection(origin, direction, boxDistance, face, surfaceNormal)) {
 
         // if our bounding box intersects at a distance greater than the current known
-        // best distance, than we can safely not check any of our triangles
-        if (boxDistance > bestDistance) {
+        // best distance, and our origin isn't inside the boounds, then we can safely 
+        // not check any of our triangles
+        if (boxDistance > bestDistance && !_bounds.contains(origin)) {
             return false;
         }
 
diff --git a/libraries/shared/src/ViewFrustum.cpp b/libraries/shared/src/ViewFrustum.cpp
index 7e4f64686b..dcbfd83ec7 100644
--- a/libraries/shared/src/ViewFrustum.cpp
+++ b/libraries/shared/src/ViewFrustum.cpp
@@ -10,6 +10,7 @@
 //
 
 #include <algorithm>
+#include <array>
 
 #include <glm/glm.hpp>
 #include <glm/gtx/quaternion.hpp>
@@ -56,16 +57,17 @@ void ViewFrustum::setProjection(const glm::mat4& projection) {
     _projection = projection;
     glm::mat4 inverseProjection = glm::inverse(projection);
 
-    // compute our dimensions the usual way
+    // compute frustum corners
     for (int i = 0; i < NUM_FRUSTUM_CORNERS; ++i) {
         _corners[i] = inverseProjection * NDC_VALUES[i];
         _corners[i] /= _corners[i].w;
     }
+
+    // compute frustum properties
     _nearClip = -_corners[BOTTOM_LEFT_NEAR].z;
     _farClip = -_corners[BOTTOM_LEFT_FAR].z;
     _aspectRatio = (_corners[TOP_RIGHT_NEAR].x - _corners[BOTTOM_LEFT_NEAR].x) /
         (_corners[TOP_RIGHT_NEAR].y - _corners[BOTTOM_LEFT_NEAR].y);
-
     glm::vec4 top = inverseProjection * vec4(0.0f, 1.0f, -1.0f, 1.0f);
     top /= top.w;
     _fieldOfView = abs(glm::degrees(2.0f * abs(glm::angle(vec3(0.0f, 0.0f, -1.0f), glm::normalize(vec3(top))))));
@@ -160,16 +162,12 @@ void ViewFrustum::fromByteArray(const QByteArray& input) {
     setCenterRadius(cameraCenterRadius);
 
     // Also make sure it's got the correct lens details from the camera
-    const float VIEW_FRUSTUM_FOV_OVERSEND = 60.0f;
-    float originalFOV = cameraFov;
-    float wideFOV = originalFOV + VIEW_FRUSTUM_FOV_OVERSEND;
-
     if (0.0f != cameraAspectRatio &&
         0.0f != cameraNearClip &&
         0.0f != cameraFarClip &&
         cameraNearClip != cameraFarClip) {
         setProjection(glm::perspective(
-            glm::radians(wideFOV), // hack
+            glm::radians(cameraFov),
             cameraAspectRatio,
             cameraNearClip,
             cameraFarClip));
@@ -324,125 +322,27 @@ bool ViewFrustum::boxIntersectsKeyhole(const AABox& box) const {
     return true;
 }
 
-bool testMatches(glm::quat lhs, glm::quat rhs, float epsilon = EPSILON) {
-    return (fabs(lhs.x - rhs.x) <= epsilon && fabs(lhs.y - rhs.y) <= epsilon && fabs(lhs.z - rhs.z) <= epsilon
-            && fabs(lhs.w - rhs.w) <= epsilon);
+bool closeEnough(float a, float b, float relativeError) {
+    assert(relativeError >= 0.0f);
+    // NOTE: we add EPSILON to the denominator so we can avoid checking for division by zero.
+    // This method works fine when: fabsf(a + b) >> EPSILON
+    return fabsf(a - b) / (0.5f * fabsf(a + b) + EPSILON) < relativeError;
 }
 
-bool testMatches(glm::vec3 lhs, glm::vec3 rhs, float epsilon = EPSILON) {
-    return (fabs(lhs.x - rhs.x) <= epsilon && fabs(lhs.y - rhs.y) <= epsilon && fabs(lhs.z - rhs.z) <= epsilon);
-}
+// TODO: the slop and relative error should be passed in by argument rather than hard-coded.
+bool ViewFrustum::isVerySimilar(const ViewFrustum& other) const {
+    const float MIN_POSITION_SLOP_SQUARED = 25.0f; // 5 meters squared
+    const float MIN_ORIENTATION_DOT = 0.9924039f; // dot product of two quaternions 10 degrees apart
+    const float MIN_RELATIVE_ERROR = 0.01f; // 1%
 
-bool testMatches(float lhs, float rhs, float epsilon = EPSILON) {
-    return (fabs(lhs - rhs) <= epsilon);
-}
-
-bool ViewFrustum::matches(const ViewFrustum& compareTo, bool debug) const {
-    bool result =
-           testMatches(compareTo._position, _position) &&
-           testMatches(compareTo._direction, _direction) &&
-           testMatches(compareTo._up, _up) &&
-           testMatches(compareTo._right, _right) &&
-           testMatches(compareTo._fieldOfView, _fieldOfView) &&
-           testMatches(compareTo._aspectRatio, _aspectRatio) &&
-           testMatches(compareTo._nearClip, _nearClip) &&
-           testMatches(compareTo._farClip, _farClip) &&
-           testMatches(compareTo._focalLength, _focalLength);
-
-    if (!result && debug) {
-        qCDebug(shared, "ViewFrustum::matches()... result=%s", debug::valueOf(result));
-        qCDebug(shared, "%s -- compareTo._position=%f,%f,%f _position=%f,%f,%f",
-                (testMatches(compareTo._position,_position) ? "MATCHES " : "NO MATCH"),
-                (double)compareTo._position.x, (double)compareTo._position.y, (double)compareTo._position.z,
-                (double)_position.x, (double)_position.y, (double)_position.z);
-        qCDebug(shared, "%s -- compareTo._direction=%f,%f,%f _direction=%f,%f,%f",
-                (testMatches(compareTo._direction, _direction) ? "MATCHES " : "NO MATCH"),
-                (double)compareTo._direction.x, (double)compareTo._direction.y, (double)compareTo._direction.z,
-                (double)_direction.x, (double)_direction.y, (double)_direction.z );
-        qCDebug(shared, "%s -- compareTo._up=%f,%f,%f _up=%f,%f,%f",
-                (testMatches(compareTo._up, _up) ? "MATCHES " : "NO MATCH"),
-                (double)compareTo._up.x, (double)compareTo._up.y, (double)compareTo._up.z,
-                (double)_up.x, (double)_up.y, (double)_up.z );
-        qCDebug(shared, "%s -- compareTo._right=%f,%f,%f _right=%f,%f,%f",
-                (testMatches(compareTo._right, _right) ? "MATCHES " : "NO MATCH"),
-                (double)compareTo._right.x, (double)compareTo._right.y, (double)compareTo._right.z,
-                (double)_right.x, (double)_right.y, (double)_right.z );
-        qCDebug(shared, "%s -- compareTo._fieldOfView=%f _fieldOfView=%f",
-                (testMatches(compareTo._fieldOfView, _fieldOfView) ? "MATCHES " : "NO MATCH"),
-                (double)compareTo._fieldOfView, (double)_fieldOfView);
-        qCDebug(shared, "%s -- compareTo._aspectRatio=%f _aspectRatio=%f",
-                (testMatches(compareTo._aspectRatio, _aspectRatio) ? "MATCHES " : "NO MATCH"),
-                (double)compareTo._aspectRatio, (double)_aspectRatio);
-        qCDebug(shared, "%s -- compareTo._nearClip=%f _nearClip=%f",
-                (testMatches(compareTo._nearClip, _nearClip) ? "MATCHES " : "NO MATCH"),
-                (double)compareTo._nearClip, (double)_nearClip);
-        qCDebug(shared, "%s -- compareTo._farClip=%f _farClip=%f",
-                (testMatches(compareTo._farClip, _farClip) ? "MATCHES " : "NO MATCH"),
-                (double)compareTo._farClip, (double)_farClip);
-        qCDebug(shared, "%s -- compareTo._focalLength=%f _focalLength=%f",
-                (testMatches(compareTo._focalLength, _focalLength) ? "MATCHES " : "NO MATCH"),
-                (double)compareTo._focalLength, (double)_focalLength);
-    }
-    return result;
-}
-
-bool ViewFrustum::isVerySimilar(const ViewFrustum& compareTo, bool debug) const {
-
-    //  Compute distance between the two positions
-    const float POSITION_SIMILAR_ENOUGH = 5.0f; // 5 meters
-    float positionDistance = glm::distance(_position, compareTo._position);
-
-    // Compute the angular distance between the two orientations
-    const float ORIENTATION_SIMILAR_ENOUGH = 10.0f; // 10 degrees in any direction
-    glm::quat dQOrientation = _orientation * glm::inverse(compareTo._orientation);
-    float angleOrientation = compareTo._orientation == _orientation ? 0.0f : glm::degrees(glm::angle(dQOrientation));
-    if (isNaN(angleOrientation)) {
-        angleOrientation = 0.0f;
-    }
-
-    bool result =
-        testMatches(0, positionDistance, POSITION_SIMILAR_ENOUGH) &&
-        testMatches(0, angleOrientation, ORIENTATION_SIMILAR_ENOUGH) &&
-           testMatches(compareTo._fieldOfView, _fieldOfView) &&
-           testMatches(compareTo._aspectRatio, _aspectRatio) &&
-           testMatches(compareTo._nearClip, _nearClip) &&
-           testMatches(compareTo._farClip, _farClip) &&
-           testMatches(compareTo._focalLength, _focalLength);
-
-
-    if (!result && debug) {
-        qCDebug(shared, "ViewFrustum::isVerySimilar()... result=%s\n", debug::valueOf(result));
-        qCDebug(shared, "%s -- compareTo._position=%f,%f,%f _position=%f,%f,%f",
-                (testMatches(compareTo._position,_position, POSITION_SIMILAR_ENOUGH) ?
-                     "IS SIMILAR ENOUGH " : "IS NOT SIMILAR ENOUGH"),
-                (double)compareTo._position.x, (double)compareTo._position.y, (double)compareTo._position.z,
-                (double)_position.x, (double)_position.y, (double)_position.z );
-
-        qCDebug(shared, "%s -- positionDistance=%f",
-                (testMatches(0,positionDistance, POSITION_SIMILAR_ENOUGH) ? "IS SIMILAR ENOUGH " : "IS NOT SIMILAR ENOUGH"),
-                (double)positionDistance);
-
-        qCDebug(shared, "%s -- angleOrientation=%f",
-                (testMatches(0, angleOrientation, ORIENTATION_SIMILAR_ENOUGH) ? "IS SIMILAR ENOUGH " : "IS NOT SIMILAR ENOUGH"),
-                (double)angleOrientation);
-
-        qCDebug(shared, "%s -- compareTo._fieldOfView=%f _fieldOfView=%f",
-                (testMatches(compareTo._fieldOfView, _fieldOfView) ? "MATCHES " : "NO MATCH"),
-                (double)compareTo._fieldOfView, (double)_fieldOfView);
-        qCDebug(shared, "%s -- compareTo._aspectRatio=%f _aspectRatio=%f",
-                (testMatches(compareTo._aspectRatio, _aspectRatio) ? "MATCHES " : "NO MATCH"),
-                (double)compareTo._aspectRatio, (double)_aspectRatio);
-        qCDebug(shared, "%s -- compareTo._nearClip=%f _nearClip=%f",
-                (testMatches(compareTo._nearClip, _nearClip) ? "MATCHES " : "NO MATCH"),
-                (double)compareTo._nearClip, (double)_nearClip);
-        qCDebug(shared, "%s -- compareTo._farClip=%f _farClip=%f",
-                (testMatches(compareTo._farClip, _farClip) ? "MATCHES " : "NO MATCH"),
-                (double)compareTo._farClip, (double)_farClip);
-        qCDebug(shared, "%s -- compareTo._focalLength=%f _focalLength=%f",
-                (testMatches(compareTo._focalLength, _focalLength) ? "MATCHES " : "NO MATCH"),
-                (double)compareTo._focalLength, (double)_focalLength);
-    }
-    return result;
+    return glm::distance2(_position, other._position) < MIN_POSITION_SLOP_SQUARED &&
+        fabsf(glm::dot(_orientation, other._orientation)) > MIN_ORIENTATION_DOT &&
+        closeEnough(_fieldOfView, other._fieldOfView, MIN_RELATIVE_ERROR) &&
+        closeEnough(_aspectRatio, other._aspectRatio, MIN_RELATIVE_ERROR) &&
+        closeEnough(_nearClip, other._nearClip, MIN_RELATIVE_ERROR) &&
+        closeEnough(_farClip, other._farClip, MIN_RELATIVE_ERROR) &&
+        closeEnough(_focalLength, other._focalLength, MIN_RELATIVE_ERROR) &&
+        closeEnough(_centerSphereRadius, other._centerSphereRadius, MIN_RELATIVE_ERROR);
 }
 
 PickRay ViewFrustum::computePickRay(float x, float y) {
@@ -605,16 +505,17 @@ const int hullVertexLookup[MAX_POSSIBLE_COMBINATIONS][MAX_PROJECTED_POLYGON_VERT
     {6, TOP_RIGHT_NEAR, TOP_RIGHT_FAR, BOTTOM_RIGHT_FAR, BOTTOM_LEFT_FAR, BOTTOM_LEFT_NEAR, TOP_LEFT_NEAR}, // back, top, left
 };
 
-CubeProjectedPolygon ViewFrustum::getProjectedPolygon(const AACube& box) const {
+template <typename TBOX>
+CubeProjectedPolygon ViewFrustum::computeProjectedPolygon(const TBOX& box) const {
     const glm::vec3& bottomNearRight = box.getCorner();
     glm::vec3 topFarLeft = box.calcTopFarLeft();
 
-    int lookUp = ((_position.x < bottomNearRight.x)     )   //  1 = right      |   compute 6-bit
-               + ((_position.x > topFarLeft.x     ) << 1)   //  2 = left       |         code to
-               + ((_position.y < bottomNearRight.y) << 2)   //  4 = bottom     | classify camera
-               + ((_position.y > topFarLeft.y     ) << 3)   //  8 = top        | with respect to
-               + ((_position.z < bottomNearRight.z) << 4)   // 16 = front/near |  the 6 defining
-               + ((_position.z > topFarLeft.z     ) << 5);  // 32 = back/far   |          planes
+    int lookUp = ((_position.x < bottomNearRight.x))    //  1 = right      |   compute 6-bit
+        + ((_position.x > topFarLeft.x) << 1)           //  2 = left       |         code to
+        + ((_position.y < bottomNearRight.y) << 2)      //  4 = bottom     | classify camera
+        + ((_position.y > topFarLeft.y) << 3)           //  8 = top        | with respect to
+        + ((_position.z < bottomNearRight.z) << 4)      // 16 = front/near |  the 6 defining
+        + ((_position.z > topFarLeft.z) << 5);          // 32 = back/far   |          planes
 
     int vertexCount = hullVertexLookup[lookUp][0];  //look up number of vertices
 
@@ -625,8 +526,8 @@ CubeProjectedPolygon ViewFrustum::getProjectedPolygon(const AACube& box) const {
     bool anyPointsInView = false; // assume the worst!
     if (vertexCount) {
         allPointsInView = true; // assume the best!
-        for(int i = 0; i < vertexCount; i++) {
-            int vertexNum = hullVertexLookup[lookUp][i+1];
+        for (int i = 0; i < vertexCount; i++) {
+            int vertexNum = hullVertexLookup[lookUp][i + 1];
             glm::vec3 point = box.getVertex((BoxVertex)vertexNum);
             glm::vec2 projectedPoint = projectPoint(point, pointInView);
             allPointsInView = allPointsInView && pointInView;
@@ -639,24 +540,24 @@ CubeProjectedPolygon ViewFrustum::getProjectedPolygon(const AACube& box) const {
         // NOTE: This clipping does not improve our overall performance. It basically causes more polygons to
         // end up in the same quad/half and so the polygon lists get longer, and that's more calls to polygon.occludes()
         if ( (projectedPolygon.getMaxX() > PolygonClip::RIGHT_OF_CLIPPING_WINDOW ) ||
-             (projectedPolygon.getMaxY() > PolygonClip::TOP_OF_CLIPPING_WINDOW   ) ||
-             (projectedPolygon.getMaxX() < PolygonClip::LEFT_OF_CLIPPING_WINDOW  ) ||
-             (projectedPolygon.getMaxY() < PolygonClip::BOTTOM_OF_CLIPPING_WINDOW) ) {
+        (projectedPolygon.getMaxY() > PolygonClip::TOP_OF_CLIPPING_WINDOW   ) ||
+        (projectedPolygon.getMaxX() < PolygonClip::LEFT_OF_CLIPPING_WINDOW  ) ||
+        (projectedPolygon.getMaxY() < PolygonClip::BOTTOM_OF_CLIPPING_WINDOW) ) {
 
-            CoverageRegion::_clippedPolygons++;
+        CoverageRegion::_clippedPolygons++;
 
-            glm::vec2* clippedVertices;
-            int        clippedVertexCount;
-            PolygonClip::clipToScreen(projectedPolygon.getVertices(), vertexCount, clippedVertices, clippedVertexCount);
+        glm::vec2* clippedVertices;
+        int        clippedVertexCount;
+        PolygonClip::clipToScreen(projectedPolygon.getVertices(), vertexCount, clippedVertices, clippedVertexCount);
 
-            // Now reset the vertices of our projectedPolygon object
-            projectedPolygon.setVertexCount(clippedVertexCount);
-            for(int i = 0; i < clippedVertexCount; i++) {
-                projectedPolygon.setVertex(i, clippedVertices[i]);
-            }
-            delete[] clippedVertices;
+        // Now reset the vertices of our projectedPolygon object
+        projectedPolygon.setVertexCount(clippedVertexCount);
+        for(int i = 0; i < clippedVertexCount; i++) {
+        projectedPolygon.setVertex(i, clippedVertices[i]);
+        }
+        delete[] clippedVertices;
 
-            lookUp += PROJECTION_CLIPPED;
+        lookUp += PROJECTION_CLIPPED;
         }
         ***/
     }
@@ -669,6 +570,97 @@ CubeProjectedPolygon ViewFrustum::getProjectedPolygon(const AACube& box) const {
     return projectedPolygon;
 }
 
+CubeProjectedPolygon ViewFrustum::getProjectedPolygon(const AACube& box) const {
+    return computeProjectedPolygon(box);
+}
+
+CubeProjectedPolygon ViewFrustum::getProjectedPolygon(const AABox& box) const {
+    return computeProjectedPolygon(box);
+}
+
+bool ViewFrustum::getProjectedRect(const AABox& box, glm::vec2& bottomLeft, glm::vec2& topRight) const {
+    using Edge = std::pair<int, int>;
+
+    const int VERTEX_COUNT = 8;
+    const int EDGE_COUNT = 12;
+    // In theory, after clipping a box with a plane, only 4 new vertices at max
+    // should be created but due to potential imprecisions (edge almost parallel to 
+    // near plane for instance) there might be more
+    const int MAX_VERTEX_COUNT = VERTEX_COUNT + 4 + 2; 
+
+    std::array<glm::vec3, MAX_VERTEX_COUNT> vertices;
+    std::array<Edge, EDGE_COUNT> boxEdges{ {
+        Edge{BOTTOM_LEFT_NEAR, BOTTOM_RIGHT_NEAR},
+        Edge{TOP_LEFT_NEAR, TOP_RIGHT_NEAR},
+        Edge{BOTTOM_LEFT_FAR, BOTTOM_RIGHT_FAR},
+        Edge{TOP_LEFT_FAR, TOP_RIGHT_FAR},
+        Edge{BOTTOM_LEFT_NEAR, TOP_LEFT_NEAR},
+        Edge{BOTTOM_LEFT_FAR, TOP_LEFT_FAR},
+        Edge{BOTTOM_RIGHT_NEAR, TOP_RIGHT_NEAR},
+        Edge{BOTTOM_RIGHT_FAR, TOP_RIGHT_FAR},
+        Edge{BOTTOM_LEFT_NEAR, BOTTOM_LEFT_FAR},
+        Edge{TOP_LEFT_NEAR, TOP_LEFT_FAR},
+        Edge{BOTTOM_RIGHT_NEAR, BOTTOM_RIGHT_FAR},
+        Edge{TOP_RIGHT_NEAR, TOP_RIGHT_FAR}
+    } };
+    std::array<float, VERTEX_COUNT> distancesToNearPlane;
+    std::bitset<MAX_VERTEX_COUNT> areVerticesInside;
+    int vertexCount = VERTEX_COUNT;
+    int i;
+
+    // Clip the hull with the near plane.
+    const auto& nearPlane = _planes[NEAR_PLANE];
+
+    for (i = 0; i < VERTEX_COUNT; i++) {
+        vertices[i] = box.getVertex(static_cast<BoxVertex>(i));
+        distancesToNearPlane[i] = nearPlane.distance(vertices[i]);
+    }
+
+    for (i = 0; i < EDGE_COUNT; i++) {
+        const auto& edgeVertexIndices = boxEdges[i];
+        const auto& startVertex = vertices[edgeVertexIndices.first];
+        const auto& endVertex = vertices[edgeVertexIndices.second];
+        float startVertexDistance = distancesToNearPlane[edgeVertexIndices.first];
+        float endVertexDistance = distancesToNearPlane[edgeVertexIndices.second];
+        bool isStartPointInside = startVertexDistance >= 0.0f;
+        bool isEndPointInside = endVertexDistance >= 0.0f;
+
+        areVerticesInside.set(edgeVertexIndices.first, isStartPointInside);
+        areVerticesInside.set(edgeVertexIndices.second, isEndPointInside);
+
+        if (isStartPointInside != isEndPointInside) {
+            // One of the two vertices is behind the near plane so add a new clipped vertex
+            // add tag it as projectable.
+            vertices[vertexCount] = startVertex + (endVertex - startVertex) * (startVertexDistance / (startVertexDistance - endVertexDistance));
+            areVerticesInside.set(vertexCount);
+            vertexCount++;
+        }
+    }
+
+    // Project points that are inside
+    bottomLeft.x = std::numeric_limits<float>::max();
+    bottomLeft.y = std::numeric_limits<float>::max();
+    topRight.x = -std::numeric_limits<float>::max();
+    topRight.y = -std::numeric_limits<float>::max();
+    for (i = 0; i < vertexCount; i++) {
+        if (areVerticesInside[i]) {
+            bool isPointInside;
+            auto projectedPoint = projectPoint(vertices[i], isPointInside);
+            bottomLeft.x = std::min(bottomLeft.x, projectedPoint.x);
+            bottomLeft.y = std::min(bottomLeft.y, projectedPoint.y);
+            topRight.x = std::max(topRight.x, projectedPoint.x);
+            topRight.y = std::max(topRight.y, projectedPoint.y);
+        }
+    }
+
+    bottomLeft.x = glm::clamp(bottomLeft.x, -1.0f, 1.0f);
+    bottomLeft.y = glm::clamp(bottomLeft.y, -1.0f, 1.0f);
+    topRight.x = glm::clamp(topRight.x, -1.0f, 1.0f);
+    topRight.y = glm::clamp(topRight.y, -1.0f, 1.0f);
+
+    return areVerticesInside.any();
+}
+
 // Similar strategy to getProjectedPolygon() we use the knowledge of camera position relative to the
 // axis-aligned voxels to determine which of the voxels vertices must be the furthest. No need for
 // squares and square-roots. Just compares.
diff --git a/libraries/shared/src/ViewFrustum.h b/libraries/shared/src/ViewFrustum.h
index 221b0b5a07..98f666d666 100644
--- a/libraries/shared/src/ViewFrustum.h
+++ b/libraries/shared/src/ViewFrustum.h
@@ -107,12 +107,7 @@ public:
     bool cubeIntersectsKeyhole(const AACube& cube) const;
     bool boxIntersectsKeyhole(const AABox& box) const;
 
-    // some frustum comparisons
-    bool matches(const ViewFrustum& compareTo, bool debug = false) const;
-    bool matches(const ViewFrustum* compareTo, bool debug = false) const { return matches(*compareTo, debug); }
-
-    bool isVerySimilar(const ViewFrustum& compareTo, bool debug = false) const;
-    bool isVerySimilar(const ViewFrustum* compareTo, bool debug = false) const { return isVerySimilar(*compareTo, debug); }
+    bool isVerySimilar(const ViewFrustum& compareTo) const;
 
     PickRay computePickRay(float x, float y);
     void computePickRay(float x, float y, glm::vec3& origin, glm::vec3& direction) const;
@@ -124,6 +119,8 @@ public:
 
     glm::vec2 projectPoint(glm::vec3 point, bool& pointInView) const;
     CubeProjectedPolygon getProjectedPolygon(const AACube& box) const;
+    CubeProjectedPolygon getProjectedPolygon(const AABox& box) const;
+    bool getProjectedRect(const AABox& box, glm::vec2& bottomLeft, glm::vec2& topRight) const;
     void getFurthestPointFromCamera(const AACube& box, glm::vec3& furthestPoint) const;
 
     float distanceToCamera(const glm::vec3& point) const;
@@ -174,6 +171,10 @@ private:
 
     // Used to project points
     glm::mat4 _ourModelViewProjectionMatrix;
+    
+    template <typename TBOX>
+    CubeProjectedPolygon computeProjectedPolygon(const TBOX& box) const;
+
 };
 using ViewFrustumPointer = std::shared_ptr<ViewFrustum>;
 
diff --git a/libraries/shared/src/shared/Camera.cpp b/libraries/shared/src/shared/Camera.cpp
index 48fea9e835..ab841c4717 100644
--- a/libraries/shared/src/shared/Camera.cpp
+++ b/libraries/shared/src/shared/Camera.cpp
@@ -45,7 +45,7 @@ Camera::Camera() :
 {
 }
 
-void Camera::update(float deltaTime) {
+void Camera::update() {
     if (_isKeepLookingAt) {
         lookAt(_lookingAt);
     }
diff --git a/libraries/shared/src/shared/Camera.h b/libraries/shared/src/shared/Camera.h
index 5f2162ff6e..3ad08bd719 100644
--- a/libraries/shared/src/shared/Camera.h
+++ b/libraries/shared/src/shared/Camera.h
@@ -53,7 +53,7 @@ public:
 
     void initialize(); // instantly put the camera at the ideal position and orientation.
 
-    void update( float deltaTime );
+    void update();
 
     CameraMode getMode() const { return _mode; }
     void setMode(CameraMode m);
@@ -127,7 +127,7 @@ private:
     glm::mat4 _projection;
 
     // derived
-    glm::vec3 _position;
+    glm::vec3 _position { 0.0f, 0.0f, 0.0f };
     glm::quat _orientation;
     bool _isKeepLookingAt{ false };
     glm::vec3 _lookingAt;
diff --git a/libraries/shared/src/shared/FileCache.cpp b/libraries/shared/src/shared/FileCache.cpp
index 695336847e..9957c6bfc6 100644
--- a/libraries/shared/src/shared/FileCache.cpp
+++ b/libraries/shared/src/shared/FileCache.cpp
@@ -258,7 +258,8 @@ namespace cache {
     };
 }
 
-void FileCache::eject(const FilePointer& file) {
+// Take file pointer by value to insure it doesn't get destructed during the "erase()" calls
+void FileCache::eject(FilePointer file) {
     file->_locked = false;
     const auto& length = file->getLength();
     const auto& key = file->getKey();
diff --git a/libraries/shared/src/shared/FileCache.h b/libraries/shared/src/shared/FileCache.h
index 1580674ca0..94fa57457a 100644
--- a/libraries/shared/src/shared/FileCache.h
+++ b/libraries/shared/src/shared/FileCache.h
@@ -119,7 +119,7 @@ private:
     void clean();
     void clear();
     // Remove a file from the cache
-    void eject(const FilePointer& file);
+    void eject(FilePointer file);
 
     size_t getOverbudgetAmount() const;
 
diff --git a/libraries/shared/src/shared/FileLogger.cpp b/libraries/shared/src/shared/FileLogger.cpp
index bea28b2b6f..8ceb378574 100644
--- a/libraries/shared/src/shared/FileLogger.cpp
+++ b/libraries/shared/src/shared/FileLogger.cpp
@@ -26,7 +26,6 @@ class FilePersistThread : public GenericQueueThread < QString > {
     Q_OBJECT
 public:
     FilePersistThread(const FileLogger& logger);
-
 signals:
     void rollingLogFile(QString newFilename);
 
@@ -42,12 +41,14 @@ private:
 
 
 
-static const QString FILENAME_FORMAT = "hifi-log_%1_%2.txt";
+static const QString FILENAME_FORMAT = "hifi-log_%1%2.txt";
 static const QString DATETIME_FORMAT = "yyyy-MM-dd_hh.mm.ss";
 static const QString LOGS_DIRECTORY = "Logs";
 static const QString IPADDR_WILDCARD = "[0-9]*.[0-9]*.[0-9]*.[0-9]*";
 static const QString DATETIME_WILDCARD = "20[0-9][0-9]-[0,1][0-9]-[0-3][0-9]_[0-2][0-9].[0-6][0-9].[0-6][0-9]";
 static const QString FILENAME_WILDCARD = "hifi-log_" + IPADDR_WILDCARD + "_" + DATETIME_WILDCARD + ".txt";
+static QUuid SESSION_ID;
+
 // Max log size is 512 KB. We send log files to our crash reporter, so we want to keep this relatively
 // small so it doesn't go over the 2MB zipped limit for all of the files we send.
 static const qint64 MAX_LOG_SIZE = 512 * 1024;
@@ -62,7 +63,13 @@ QString getLogRollerFilename() {
     QString result = FileUtils::standardPath(LOGS_DIRECTORY);
     QHostAddress clientAddress = getGuessedLocalAddress();
     QDateTime now = QDateTime::currentDateTime();
-    result.append(QString(FILENAME_FORMAT).arg(clientAddress.toString(), now.toString(DATETIME_FORMAT)));
+    QString fileSessionID;
+
+    if (!SESSION_ID.isNull()) {
+        fileSessionID = "_" + SESSION_ID.toString().replace("{", "").replace("}", "");
+    }
+
+    result.append(QString(FILENAME_FORMAT).arg(now.toString(DATETIME_FORMAT), fileSessionID));
     return result;
 }
 
@@ -142,6 +149,12 @@ FileLogger::~FileLogger() {
     _persistThreadInstance->terminate();
 }
 
+void FileLogger::setSessionID(const QUuid& message) {
+    // This is for the output of log files. Once the application is first started, 
+    // this function runs and grabs the AccountManager Session ID and saves it here.
+    SESSION_ID = message;
+    }
+
 void FileLogger::addMessage(const QString& message) {
     _persistThreadInstance->queueItem(message);
     emit logReceived(message);
diff --git a/libraries/shared/src/shared/FileLogger.h b/libraries/shared/src/shared/FileLogger.h
index 15d211afe8..d9d7651147 100644
--- a/libraries/shared/src/shared/FileLogger.h
+++ b/libraries/shared/src/shared/FileLogger.h
@@ -26,6 +26,7 @@ public:
 
     QString getFilename() const { return _fileName; }
     virtual void addMessage(const QString&) override;
+    virtual void setSessionID(const QUuid&);
     virtual QString getLogData() override;
     virtual void locateLog() override;
     virtual void sync() override;
diff --git a/libraries/shared/src/shared/GlobalAppProperties.cpp b/libraries/shared/src/shared/GlobalAppProperties.cpp
index b0ba0bf83d..6c9f3f9601 100644
--- a/libraries/shared/src/shared/GlobalAppProperties.cpp
+++ b/libraries/shared/src/shared/GlobalAppProperties.cpp
@@ -17,6 +17,7 @@ namespace hifi { namespace properties {
     const char* TEST = "com.highfidelity.test";
     const char* TRACING = "com.highfidelity.tracing";
     const char* HMD = "com.highfidelity.hmd";
+    const char* APP_LOCAL_DATA_PATH = "com.highfidelity.appLocalDataPath";
 
     namespace gl {
         const char* BACKEND = "com.highfidelity.gl.backend";
diff --git a/libraries/shared/src/shared/GlobalAppProperties.h b/libraries/shared/src/shared/GlobalAppProperties.h
index b1811586ba..174be61939 100644
--- a/libraries/shared/src/shared/GlobalAppProperties.h
+++ b/libraries/shared/src/shared/GlobalAppProperties.h
@@ -19,6 +19,7 @@ namespace hifi { namespace properties {
     extern const char* TEST;
     extern const char* TRACING;
     extern const char* HMD;
+    extern const char* APP_LOCAL_DATA_PATH;
 
     namespace gl {
         extern const char* BACKEND;
diff --git a/libraries/shared/src/shared/PlatformHacks.h b/libraries/shared/src/shared/PlatformHacks.h
new file mode 100644
index 0000000000..909f0bac9a
--- /dev/null
+++ b/libraries/shared/src/shared/PlatformHacks.h
@@ -0,0 +1,18 @@
+//
+//  Created by Bradley Austin Davis on 2017/09/15
+//  Copyright 2013-2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#pragma once
+#ifndef hifi_shared_PlatformHacks_h
+#define hifi_shared_PlatformHacks_h
+
+#include <QtCore/QtGlobal>
+
+#if defined(Q_OS_ANDROID)
+#include "platform/AndroidHacks.h"
+#endif
+
+#endif
diff --git a/libraries/shared/src/shared/QtHelpers.cpp b/libraries/shared/src/shared/QtHelpers.cpp
new file mode 100644
index 0000000000..3e8c6d57ed
--- /dev/null
+++ b/libraries/shared/src/shared/QtHelpers.cpp
@@ -0,0 +1,85 @@
+//
+//  Created by Bradley Austin Davis on 2015/11/09
+//  Copyright 2013-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 "QtHelpers.h"
+
+#include <QtCore/QThread>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QLoggingCategory>
+#include <QtCore/QReadWriteLock>
+
+#include "../Profile.h"
+Q_LOGGING_CATEGORY(thread_safety, "hifi.thread_safety")
+
+namespace hifi { namespace qt {
+
+static QHash<QThread*, QString> threadHash;
+static QReadWriteLock threadHashLock;
+
+void addBlockingForbiddenThread(const QString& name, QThread* thread) {
+    if (!thread) {
+        thread = QThread::currentThread();
+    }
+    QWriteLocker locker(&threadHashLock);
+    threadHash[thread] = name;
+}
+
+bool blockingInvokeMethod(
+    const char* function,
+    QObject *obj, const char *member,
+    QGenericReturnArgument ret,
+    QGenericArgument val0,
+    QGenericArgument val1,
+    QGenericArgument val2,
+    QGenericArgument val3,
+    QGenericArgument val4,
+    QGenericArgument val5,
+    QGenericArgument val6,
+    QGenericArgument val7,
+    QGenericArgument val8,
+    QGenericArgument val9) {
+    auto currentThread = QThread::currentThread();
+    if (currentThread == qApp->thread()) {
+        qCWarning(thread_safety) << "BlockingQueuedConnection invoked on main thread from " << function;
+        return QMetaObject::invokeMethod(obj, member,
+            Qt::BlockingQueuedConnection, ret, val0, val1, val2, val3, val4, val5, val6, val7, val8, val9);
+    } 
+
+    {
+        QReadLocker locker(&threadHashLock);
+        for (const auto& thread : threadHash.keys()) {
+            if (currentThread == thread) {
+                qCWarning(thread_safety) << "BlockingQueuedConnection invoked on forbidden thread " << threadHash[thread];
+            }
+        }
+    }
+
+    PROFILE_RANGE(app, function);
+    return QMetaObject::invokeMethod(obj, member,
+            Qt::BlockingQueuedConnection, ret, val0, val1, val2, val3, val4, val5, val6, val7, val8, val9);
+}
+
+bool blockingInvokeMethod(
+    const char* function,
+    QObject *obj, const char *member,
+    QGenericArgument val0,
+    QGenericArgument val1,
+    QGenericArgument val2,
+    QGenericArgument val3,
+    QGenericArgument val4,
+    QGenericArgument val5,
+    QGenericArgument val6,
+    QGenericArgument val7,
+    QGenericArgument val8,
+    QGenericArgument val9) {
+    return blockingInvokeMethod(function, obj, member, QGenericReturnArgument(), val0, val1, val2, val3, val4, val5, val6, val7, val8, val9);
+}
+
+
+
+} }
diff --git a/libraries/shared/src/shared/QtHelpers.h b/libraries/shared/src/shared/QtHelpers.h
new file mode 100644
index 0000000000..2133119324
--- /dev/null
+++ b/libraries/shared/src/shared/QtHelpers.h
@@ -0,0 +1,53 @@
+//
+//  Created by Bradley Austin Davis on 2017/06/29
+//  Copyright 2013-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
+//
+
+#pragma once
+#ifndef hifi_Shared_QtHelpers_h
+#define hifi_Shared_QtHelpers_h
+
+#include <QtCore/QObject>
+
+
+namespace hifi { namespace qt {
+void addBlockingForbiddenThread(const QString& name, QThread* thread = nullptr);
+
+bool blockingInvokeMethod(
+    const char* function,
+    QObject *obj, const char *member,
+    QGenericReturnArgument ret,
+    QGenericArgument val0 = QGenericArgument(Q_NULLPTR),
+    QGenericArgument val1 = QGenericArgument(),
+    QGenericArgument val2 = QGenericArgument(),
+    QGenericArgument val3 = QGenericArgument(),
+    QGenericArgument val4 = QGenericArgument(),
+    QGenericArgument val5 = QGenericArgument(),
+    QGenericArgument val6 = QGenericArgument(),
+    QGenericArgument val7 = QGenericArgument(),
+    QGenericArgument val8 = QGenericArgument(),
+    QGenericArgument val9 = QGenericArgument());
+
+bool blockingInvokeMethod(
+    const char* function,
+    QObject *obj, const char *member,
+    QGenericArgument val0 = QGenericArgument(Q_NULLPTR),
+    QGenericArgument val1 = QGenericArgument(),
+    QGenericArgument val2 = QGenericArgument(),
+    QGenericArgument val3 = QGenericArgument(),
+    QGenericArgument val4 = QGenericArgument(),
+    QGenericArgument val5 = QGenericArgument(),
+    QGenericArgument val6 = QGenericArgument(),
+    QGenericArgument val7 = QGenericArgument(),
+    QGenericArgument val8 = QGenericArgument(),
+    QGenericArgument val9 = QGenericArgument());
+
+} }
+
+#define BLOCKING_INVOKE_METHOD(obj, member, ...) \
+    hifi::qt::blockingInvokeMethod(__FUNCTION__, obj, member, ##__VA_ARGS__)
+
+#endif
diff --git a/libraries/shared/src/shared/RateCounter.h b/libraries/shared/src/shared/RateCounter.h
index 3cf509b6bf..208446e9b1 100644
--- a/libraries/shared/src/shared/RateCounter.h
+++ b/libraries/shared/src/shared/RateCounter.h
@@ -35,19 +35,19 @@ public:
     uint32_t interval() const { return INTERVAL; }
 
 private:
-    mutable uint64_t _start { usecTimestampNow() };
+    mutable uint64_t _expiry { usecTimestampNow() + INTERVAL * USECS_PER_MSEC};
     mutable size_t _count { 0 };
     const float _scale { powf(10, PRECISION) };
     mutable std::atomic<float> _rate;
 
     void checkRate() const {
         auto now = usecTimestampNow();
-        float currentIntervalMs = (now - _start) / (float)USECS_PER_MSEC;
-        if (currentIntervalMs > (float)INTERVAL) {
-            float currentCount = _count;
-            float intervalSeconds = currentIntervalMs / (float)MSECS_PER_SECOND;
-            _rate = roundf(currentCount / intervalSeconds * _scale) / _scale;
-            _start = now;
+        if (now > _expiry) {
+            float MSECS_PER_USEC = 0.001f;
+            float SECS_PER_MSEC = 0.001f;
+            float intervalSeconds = ((float)INTERVAL + (float)(now - _expiry) * MSECS_PER_USEC) * SECS_PER_MSEC;
+            _rate = roundf((float)_count / intervalSeconds * _scale) / _scale;
+            _expiry = now + INTERVAL * USECS_PER_MSEC;
             _count = 0;
         };
     }
diff --git a/libraries/shared/src/shared/ReadWriteLockable.h b/libraries/shared/src/shared/ReadWriteLockable.h
index 539678a73d..17477ca215 100644
--- a/libraries/shared/src/shared/ReadWriteLockable.h
+++ b/libraries/shared/src/shared/ReadWriteLockable.h
@@ -23,6 +23,9 @@ public:
     template <typename F>
     void withWriteLock(F&& f) const;
     
+    template <typename T, typename F>
+    T resultWithWriteLock(F&& f) const;
+
     template <typename F>
     bool withWriteLock(F&& f, bool require) const;
 
@@ -36,6 +39,9 @@ public:
     template <typename F>
     void withReadLock(F&& f) const;
     
+    template <typename T, typename F>
+    T resultWithReadLock(F&& f) const;
+
     template <typename F>
     bool withReadLock(F&& f, bool require) const;
     
@@ -68,6 +74,15 @@ inline bool ReadWriteLockable::withWriteLock(F&& f, bool require) const {
     }
 }
 
+template <typename T, typename F>
+inline T ReadWriteLockable::resultWithWriteLock(F&& f) const {
+    T result;
+    withWriteLock([&] {
+        result = f();
+    });
+    return result;
+}
+
 template <typename F>
 inline bool ReadWriteLockable::withTryWriteLock(F&& f) const {
     QTryWriteLocker locker(&_lock);
@@ -94,6 +109,15 @@ inline void ReadWriteLockable::withReadLock(F&& f) const {
     f();
 }
 
+template <typename T, typename F>
+inline T ReadWriteLockable::resultWithReadLock(F&& f) const {
+    T result;
+    withReadLock([&] {
+        result = f();
+    });
+    return result;
+}
+
 template <typename F>
 inline bool ReadWriteLockable::withReadLock(F&& f, bool require) const {
     if (require) {
diff --git a/libraries/shared/src/shared/Storage.cpp b/libraries/shared/src/shared/Storage.cpp
index b07f896df0..7e9f86b049 100644
--- a/libraries/shared/src/shared/Storage.cpp
+++ b/libraries/shared/src/shared/Storage.cpp
@@ -92,9 +92,8 @@ FileStorage::FileStorage(const QString& filename) : _file(filename) {
 
 FileStorage::~FileStorage() {
     if (_mapped) {
-        if (!_file.unmap(_mapped)) {
-            throw std::runtime_error("Unable to unmap file");
-        }
+        _file.unmap(_mapped);
+        _mapped = nullptr;
     }
     if (_file.isOpen()) {
         _file.close();
diff --git a/libraries/shared/src/shared/platform/AndroidHacks.h b/libraries/shared/src/shared/platform/AndroidHacks.h
new file mode 100644
index 0000000000..29ab013f98
--- /dev/null
+++ b/libraries/shared/src/shared/platform/AndroidHacks.h
@@ -0,0 +1,50 @@
+//
+//  androidhacks.h
+//  interface/src
+//
+//  Created by Cristian Duarte & Gabriel Calero on 1/4/17.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  hacks to get android to compile
+//
+//  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_platform_androidhacks_h
+#define hifi_shared_platform_androidhacks_h
+
+#include <string>
+#include <sstream>
+
+#include <ciso646>
+
+// Only for gnu stl, so checking if using llvm
+// (If there is a better check than this http://stackoverflow.com/questions/31657499/how-to-detect-stdlib-libc-in-the-preprocessor, improve this one)
+#if (_LIBCPP_VERSION)
+    // NOTHING, these functions are well defined on libc++
+#else
+
+using namespace std;
+namespace std
+{
+                // to_string impl
+                // error: no member named 'to_string' in namespace 'std'
+                // http://stackoverflow.com/questions/26095886/error-to-string-is-not-a-member-of-std
+    template <typename T>
+    inline std::string to_string(T value) {
+        std::ostringstream os;
+        os << value;
+        return os.str();
+    }
+
+    inline float stof(std::string str) {
+                return atof(str.c_str());
+    }
+}
+
+#endif // _LIBCPP_VERSION
+
+#endif // hifi_androidhacks_h
diff --git a/libraries/shared/src/shared/types/AnimationLoop.cpp b/libraries/shared/src/shared/types/AnimationLoop.cpp
deleted file mode 100644
index f77bd8bb2a..0000000000
--- a/libraries/shared/src/shared/types/AnimationLoop.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-//  AnimationLoop.cpp
-//  libraries/animation/src/
-//
-//  Created by Brad Hefta-Gaub on 11/12/14.
-//  Copyright (c) 2014 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 "AnimationLoop.h"
-
-#include "../../NumericalConstants.h"
-#include "../../SharedUtil.h"
-#include "../../GLMHelpers.h"
-#include "../../RegisteredMetaTypes.h"
-
-const float AnimationLoop::MAXIMUM_POSSIBLE_FRAME = 100000.0f;
-
-AnimationLoop::AnimationLoop() :
-    _fps(30.0f),
-    _loop(true),
-    _hold(false),
-    _startAutomatically(false),
-    _firstFrame(0.0f),
-    _lastFrame(MAXIMUM_POSSIBLE_FRAME),
-    _running(false),
-    _currentFrame(0.0f),
-    _maxFrameIndexHint(MAXIMUM_POSSIBLE_FRAME),
-    _resetOnRunning(true),
-    _lastSimulated(usecTimestampNow())
-{
-}
-
-AnimationLoop::AnimationLoop(const AnimationDetails& animationDetails) :
-    _fps(animationDetails.fps),
-    _loop(animationDetails.loop),
-    _hold(animationDetails.hold),
-    _startAutomatically(animationDetails.startAutomatically),
-    _firstFrame(animationDetails.firstFrame),
-    _lastFrame(animationDetails.lastFrame),
-    _running(animationDetails.running),
-    _currentFrame(animationDetails.currentFrame),
-    _maxFrameIndexHint(MAXIMUM_POSSIBLE_FRAME),
-    _resetOnRunning(true),
-    _lastSimulated(usecTimestampNow())
-{
-}
-
-AnimationLoop::AnimationLoop(float fps, bool loop, bool hold, bool startAutomatically, float firstFrame, 
-                    float lastFrame, bool running, float currentFrame) :
-    _fps(fps),
-    _loop(loop),
-    _hold(hold),
-    _startAutomatically(startAutomatically),
-    _firstFrame(firstFrame),
-    _lastFrame(lastFrame),
-    _running(running),
-    _currentFrame(currentFrame),
-    _maxFrameIndexHint(MAXIMUM_POSSIBLE_FRAME),
-    _resetOnRunning(true),
-    _lastSimulated(usecTimestampNow())
-{
-}
-
-void AnimationLoop::simulateAtTime(uint64_t now) {
-    float deltaTime = (float)(now - _lastSimulated) / (float)USECS_PER_SECOND;
-    _lastSimulated = now;
-    simulate(deltaTime);
-}
-
-void AnimationLoop::simulate(float deltaTime) {
-    _currentFrame += deltaTime * _fps;
-
-    // If we knew the number of frames from the animation, we'd consider using it here 
-    // animationGeometry.animationFrames.size()
-    float maxFrame = _maxFrameIndexHint;
-    float endFrameIndex = qMin(_lastFrame, maxFrame - (_loop ? 0.0f : 1.0f));
-    float startFrameIndex = qMin(_firstFrame, endFrameIndex);
-    if ((!_loop && (_currentFrame < startFrameIndex || _currentFrame > endFrameIndex)) || startFrameIndex == endFrameIndex) {
-        // passed the end; apply the last frame
-        _currentFrame = glm::clamp(_currentFrame, startFrameIndex, endFrameIndex);
-        if (!_hold) {
-            stop();
-        }
-    } else {
-        // wrap within the the desired range
-        if (_currentFrame < startFrameIndex) {
-            _currentFrame = endFrameIndex - glm::mod(endFrameIndex - _currentFrame, endFrameIndex - startFrameIndex);
-        } else if (_currentFrame > endFrameIndex) {
-            _currentFrame = startFrameIndex + glm::mod(_currentFrame - startFrameIndex, endFrameIndex - startFrameIndex);
-        }
-    }
-}
-
-void AnimationLoop::setStartAutomatically(bool startAutomatically) {
-    if ((_startAutomatically = startAutomatically) && !getRunning()) {
-        start();
-    }
-}
-    
-void AnimationLoop::setRunning(bool running) {
-    // don't do anything if the new value is the same as the value we already have
-    if (_running != running) {
-        _running = running;
-        
-        // If we just set running to true, then also reset the frame to the first frame
-        if (running && (_resetOnRunning)) {
-            // move back to the beginning
-            _currentFrame = _firstFrame;
-        }
-
-        // If we just started running, set our 
-        if (_running) {
-            _lastSimulated = usecTimestampNow();
-        }
-    }
-}
diff --git a/libraries/shared/src/shared/types/AnimationLoop.h b/libraries/shared/src/shared/types/AnimationLoop.h
deleted file mode 100644
index 33434209e7..0000000000
--- a/libraries/shared/src/shared/types/AnimationLoop.h
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-//  AnimationLoop.h
-//  libraries/animation/src/
-//
-//  Created by Brad Hefta-Gaub on 11/12/14.
-//  Copyright (c) 2014 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_AnimationLoop_h
-#define hifi_AnimationLoop_h
-
-class AnimationDetails;
-
-#include <stdint.h>
-#include <glm/glm.hpp>
-
-class AnimationLoop {
-public:
-    static const float MAXIMUM_POSSIBLE_FRAME;
-
-    AnimationLoop();
-    explicit AnimationLoop(const AnimationDetails& animationDetails);
-    AnimationLoop(float fps, bool loop, bool hold, bool startAutomatically, float firstFrame, 
-                  float lastFrame, bool running, float currentFrame);
-
-    void setFPS(float fps) { _fps = fps; }
-    float getFPS() const { return _fps; }
-
-    void setLoop(bool loop) { _loop = loop; }
-    bool getLoop() const { return _loop; }
-    
-    void setHold(bool hold) { _hold = hold; }
-    bool getHold() const { return _hold; }
-    
-    void setStartAutomatically(bool startAutomatically);
-    bool getStartAutomatically() const { return _startAutomatically; }
-    
-    void setFirstFrame(float firstFrame) { _firstFrame = glm::clamp(firstFrame, 0.0f, MAXIMUM_POSSIBLE_FRAME); }
-    float getFirstFrame() const { return _firstFrame; }
-    
-    void setLastFrame(float lastFrame) { _lastFrame = glm::clamp(lastFrame, 0.0f, MAXIMUM_POSSIBLE_FRAME); }
-    float getLastFrame() const { return _lastFrame; }
-    
-    /// by default the AnimationLoop will always reset to the first frame on any call to setRunning
-    /// this is not desirable in the case of entities with animations, if you don't want the reset
-    /// to happen then call this method with false;
-    void setResetOnRunning(bool resetOnRunning) { _resetOnRunning = resetOnRunning; }
-    void setRunning(bool running);
-    bool getRunning() const { return _running; }
-
-    void setCurrentFrame(float currentFrame) { _currentFrame = glm::clamp(currentFrame, _firstFrame, _lastFrame); }
-    float getCurrentFrame() const { return _currentFrame; }
-
-    void setMaxFrameIndexHint(float value) { _maxFrameIndexHint = glm::clamp(value, 0.0f, MAXIMUM_POSSIBLE_FRAME); }
-    float getMaxFrameIndexHint() const { return _maxFrameIndexHint; }
-    
-    void start() { setRunning(true); }
-    void stop() { setRunning(false); }
-    void simulate(float deltaTime); /// call this with deltaTime if you as the caller are managing the delta time between calls
-
-    void simulateAtTime(uint64_t now); /// call this with "now" if you want the animationLoop to handle delta times
-
-private:
-    float _fps;
-    bool _loop;
-    bool _hold;
-    bool _startAutomatically;
-    float _firstFrame;
-    float _lastFrame;
-    bool _running;
-    float _currentFrame;
-    float _maxFrameIndexHint;
-    bool _resetOnRunning;
-    uint64_t _lastSimulated;
-};
-
-#endif // hifi_AnimationLoop_h
diff --git a/libraries/trackers/src/trackers/DeviceTracker.cpp b/libraries/trackers/src/trackers/DeviceTracker.cpp
deleted file mode 100644
index 93aeb607bc..0000000000
--- a/libraries/trackers/src/trackers/DeviceTracker.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-//
-//  Created by Sam Cake on 6/20/14.
-//  Copyright 2014 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 "DeviceTracker.h"
-
-DeviceTracker::SingletonData::~SingletonData() {
-    // Destroy all the device registered
-    //TODO C++11 for (auto device = _devicesVector.begin(); device != _devicesVector.end(); device++) {
-    for (Vector::iterator device = _devicesVector.begin(); device != _devicesVector.end(); device++) {
-        delete (*device);
-    }
-}
-
-int DeviceTracker::getNumDevices() {
-    return (int)Singleton::get()->_devicesMap.size();
-}
-
-DeviceTracker::ID DeviceTracker::getDeviceID(const Name& name) {
-    //TODO C++11 auto deviceIt = Singleton::get()->_devicesMap.find(name);
-    Map::iterator deviceIt = Singleton::get()->_devicesMap.find(name);
-    if (deviceIt != Singleton::get()->_devicesMap.end()) {
-        return (*deviceIt).second;
-    } else {
-        return INVALID_DEVICE;
-    }
-}
-
-DeviceTracker* DeviceTracker::getDevice(const Name& name) {
-    return getDevice(getDeviceID(name));
-}
-
-DeviceTracker* DeviceTracker::getDevice(DeviceTracker::ID deviceID) {
-    if ((deviceID >= 0) && (deviceID < (int)(Singleton::get()->_devicesVector.size()))) {
-        return Singleton::get()->_devicesVector[ deviceID ];
-    } else {
-        return NULL;
-    }
-}
-
-DeviceTracker::ID DeviceTracker::registerDevice(const Name& name, DeviceTracker* device) {
-    // Check that the device exists, if not exit
-    if (!device) {
-        return INVALID_DEVICE;
-    }
-
-    // Look if the name is not already used
-    ID deviceID = getDeviceID(name);
-    if (deviceID >= 0) {
-        return INVALID_DEVICE_NAME;
-    }
-
-    // Good to register the device
-    deviceID = (ID)Singleton::get()->_devicesVector.size();
-    Singleton::get()->_devicesMap.insert(Map::value_type(name, deviceID));
-    Singleton::get()->_devicesVector.push_back(device);
-    device->assignIDAndName(deviceID, name);
-
-    return deviceID;
-}
-
-void DeviceTracker::destroyDevice(const Name& name) {
-    DeviceTracker::ID deviceID = getDeviceID(name);
-    if (deviceID != INVALID_DEVICE) {
-        delete Singleton::get()->_devicesVector[getDeviceID(name)];
-        Singleton::get()->_devicesVector[getDeviceID(name)] = nullptr;
-    }
-}
-
-void DeviceTracker::updateAll() {
-    //TODO C++11 for (auto deviceIt = Singleton::get()->_devicesVector.begin(); deviceIt != Singleton::get()->_devicesVector.end(); deviceIt++) {
-    for (Vector::iterator deviceIt = Singleton::get()->_devicesVector.begin(); deviceIt != Singleton::get()->_devicesVector.end(); deviceIt++) {
-        if ((*deviceIt))
-            (*deviceIt)->update();
-    }
-}
-
-// Core features of the Device Tracker
-DeviceTracker::DeviceTracker() :
-    _ID(INVALID_DEVICE),
-    _name("Unkown")
-{
-}
-
-DeviceTracker::~DeviceTracker() {
-}
-
-void DeviceTracker::update() {
-}
diff --git a/libraries/trackers/src/trackers/DeviceTracker.h b/libraries/trackers/src/trackers/DeviceTracker.h
deleted file mode 100644
index 8a7f509cb3..0000000000
--- a/libraries/trackers/src/trackers/DeviceTracker.h
+++ /dev/null
@@ -1,115 +0,0 @@
-//
-//  Created by Sam Cake on 6/20/14.
-//  Copyright 2014 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_DeviceTracker_h
-#define hifi_DeviceTracker_h
-
-#include <string>
-#include <vector>
-#include <map>
-
-// Singleton template class
-template < typename T >
-class TemplateSingleton {
-public:
-
-    static T* get() {
-        if ( !_singleton._one ) {
-            _singleton._one = new T();
-        }
-        return _singleton._one;
-    }
-
-    TemplateSingleton() :
-        _one(0)
-        {
-        }
-    ~TemplateSingleton() {
-        if ( _one ) {
-            delete _one;
-            _one = 0;
-        }
-    }
-private:
-    static TemplateSingleton< T > _singleton;
-    T* _one;
-};
-template <typename T>
-TemplateSingleton<T> TemplateSingleton<T>::_singleton;
-
-/// Base class for device trackers.
-class DeviceTracker {
-public:
-
-    // THe ID and Name types used to manage the pool of devices
-    typedef std::string Name;
-    typedef int ID;
-    static const ID INVALID_DEVICE = -1;
-    static const ID INVALID_DEVICE_NAME = -2;
-
-    // Singleton interface to register and query the devices currently connected
-    static int getNumDevices();
-    static ID getDeviceID(const Name& name);
-    static DeviceTracker* getDevice(ID deviceID);
-    static DeviceTracker* getDevice(const Name& name);
-
-    /// Update all the devices calling for their update() function
-    /// This should be called every frame by the main loop to update all the devices that pull their state
-    static void updateAll();
-
-    /// Register a device tracker to the factory
-    /// Right after creating a new DeviceTracker, it should be registered
-    /// This is why, it's recommended to use a factory static call in the specialized class
-    /// to create a new input device
-    ///
-    /// \param name     The Name under wich registering the device
-    /// \param parent   The DeviceTracker
-    ///
-    /// \return The Index of the newly registered device.
-    ///         Valid if everything went well.
-    ///         INVALID_DEVICE if the device is not valid (NULL)
-    ///         INVALID_DEVICE_NAME if the name is already taken
-    static ID registerDevice(const Name& name, DeviceTracker* tracker);
-
-    static void destroyDevice(const Name& name);
-
-    // DeviceTracker interface
-
-    virtual void update();
-
-    /// Get the ID assigned to the Device when registered after creation, or INVALID_DEVICE if it hasn't been registered which should not happen.
-    ID getID() const { return _ID; }
-
-    /// Get the name assigned to the Device when registered after creation, or "Unknown" if it hasn't been registered which should not happen.
-    const Name& getName() const { return _name; }
-
-    typedef std::map< Name, ID > Map;
-    static const Map& getDevices() { return Singleton::get()->_devicesMap; }
-
-protected:
-    DeviceTracker();
-    virtual ~DeviceTracker();
-
-private:
-    ID _ID;
-    Name _name;
-
-    // this call is used by the singleton when the device tracker is currently beeing registered and beeing assigned an ID
-    void assignIDAndName( const ID id, const Name& name ) { _ID = id; _name = name; }
-
-    typedef std::vector< DeviceTracker* > Vector;
-    struct SingletonData {
-        Map     _devicesMap;
-        Vector  _devicesVector;
-
-        ~SingletonData();
-    };
-    typedef TemplateSingleton< SingletonData > Singleton;
-};
-
-#endif // hifi_DeviceTracker_h
diff --git a/libraries/trackers/src/trackers/EyeTracker.cpp b/libraries/trackers/src/trackers/EyeTracker.cpp
index 8733461dbb..e641abc630 100644
--- a/libraries/trackers/src/trackers/EyeTracker.cpp
+++ b/libraries/trackers/src/trackers/EyeTracker.cpp
@@ -136,7 +136,7 @@ void EyeTracker::onStreamStarted() {
         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::warning(nullptr, "Eye Tracker Error", smiReturnValueToString(result));
+            OffscreenUi::asyncWarning(nullptr, "Eye Tracker Error", smiReturnValueToString(result));
         }
     } else {
         qCDebug(interfaceapp) << "Eye Tracker: Started streaming";
@@ -149,7 +149,7 @@ void EyeTracker::onStreamStarted() {
            result = smi_loadCalibration(HIGH_FIDELITY_EYE_TRACKER_CALIBRATION);
            if (result != SMI_RET_SUCCESS) {
                qCWarning(interfaceapp) << "Eye Tracker: Error loading calibration:" << smiReturnValueToString(result);
-               OffscreenUi::warning(nullptr, "Eye Tracker Error", "Error loading calibration"
+               OffscreenUi::asyncWarning(nullptr, "Eye Tracker Error", "Error loading calibration"
                    + smiReturnValueToString(result));
            } else {
                qCDebug(interfaceapp) << "Eye Tracker: Loaded calibration";
@@ -165,7 +165,7 @@ void EyeTracker::setEnabled(bool enabled, bool simulate) {
         int result = smi_setCallback(eyeTrackerCallback);
         if (result != SMI_RET_SUCCESS) {
             qCWarning(interfaceapp) << "Eye Tracker: Error setting callback:" << smiReturnValueToString(result);
-            OffscreenUi::warning(nullptr, "Eye Tracker Error", smiReturnValueToString(result));
+            OffscreenUi::asyncWarning(nullptr, "Eye Tracker Error", smiReturnValueToString(result));
         } else {
             _isInitialized = true;
         }
@@ -270,7 +270,7 @@ void EyeTracker::calibrate(int points) {
     }
 
     if (result != SMI_RET_SUCCESS) {
-        OffscreenUi::warning(nullptr, "Eye Tracker Error", "Calibration error: " + smiReturnValueToString(result));
+        OffscreenUi::asyncWarning(nullptr, "Eye Tracker Error", "Calibration error: " + smiReturnValueToString(result));
     }
 }
 #endif
diff --git a/libraries/trackers/src/trackers/MotionTracker.cpp b/libraries/trackers/src/trackers/MotionTracker.cpp
deleted file mode 100644
index c6012c0422..0000000000
--- a/libraries/trackers/src/trackers/MotionTracker.cpp
+++ /dev/null
@@ -1,186 +0,0 @@
-//
-//  Created by Sam Cake on 6/20/14.
-//  Copyright 2014 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 "MotionTracker.h"
-
-// glm::mult(mat43, mat43) just the composition of the 2 matrices assuming they are in fact mat44 with the last raw = { 0, 0, 0, 1 }
-namespace glm {
-    mat4x3 mult(const mat4& lhs, const mat4x3& rhs) {
-        vec3 lrx(lhs[0].x, lhs[1].x, lhs[2].x);
-        vec3 lry(lhs[0].y, lhs[1].y, lhs[2].y);
-        vec3 lrz(lhs[0].z, lhs[1].z, lhs[2].z);
-        return mat4x3(
-            dot(lrx, rhs[0]),
-            dot(lry, rhs[0]),
-            dot(lrz, rhs[0]),
-
-            dot(lrx, rhs[1]),
-            dot(lry, rhs[1]),
-            dot(lrz, rhs[1]),
-
-            dot(lrx, rhs[2]),
-            dot(lry, rhs[2]),
-            dot(lrz, rhs[2]),
-
-            dot(lrx, rhs[3]) + lhs[3].x,
-            dot(lry, rhs[3]) + lhs[3].y,
-            dot(lrz, rhs[3]) + lhs[3].z
-       );
-    }
-    mat4x3 mult(const mat4x3& lhs, const mat4x3& rhs) {
-        vec3 lrx(lhs[0].x, lhs[1].x, lhs[2].x);
-        vec3 lry(lhs[0].y, lhs[1].y, lhs[2].y);
-        vec3 lrz(lhs[0].z, lhs[1].z, lhs[2].z);
-        return mat4x3(
-            dot(lrx, rhs[0]),
-            dot(lry, rhs[0]),
-            dot(lrz, rhs[0]),
-
-            dot(lrx, rhs[1]),
-            dot(lry, rhs[1]),
-            dot(lrz, rhs[1]),
-
-            dot(lrx, rhs[2]),
-            dot(lry, rhs[2]),
-            dot(lrz, rhs[2]),
-
-            dot(lrx, rhs[3]) + lhs[3].x,
-            dot(lry, rhs[3]) + lhs[3].y,
-            dot(lrz, rhs[3]) + lhs[3].z
-       );
-    }
-}
-
-// MotionTracker
-MotionTracker::MotionTracker() :
-    DeviceTracker()
-{
-    _jointsArray.resize(1);
-    _jointsMap.insert(JointTracker::Map::value_type(Semantic("Root"), 0));
-}
-
-MotionTracker::~MotionTracker()
-{
-}
-
-bool MotionTracker::isConnected() const {
-    return false;
-}
-
-MotionTracker::Index MotionTracker::addJoint(const Semantic& semantic, Index parent) {
-    // Check the parent
-    if (int(parent) < 0)
-        return INVALID_PARENT;
-
-    // Check that the semantic is not already in use
-    Index foundIndex = findJointIndex(semantic);
-    if (foundIndex >= 0) {
-        return INVALID_SEMANTIC;
-    }
-    
-
-    // All good then allocate the joint
-    Index newIndex = (Index)_jointsArray.size();
-    _jointsArray.push_back(JointTracker(semantic, parent));
-    _jointsMap.insert(JointTracker::Map::value_type(semantic, newIndex));
-
-    return newIndex;
-}
-
-MotionTracker::Index MotionTracker::findJointIndex(const Semantic& semantic) const {
-    // TODO C++11 auto jointIt = _jointsMap.find(semantic);
-    JointTracker::Map::const_iterator jointIt = _jointsMap.find(semantic);
-    if (jointIt != _jointsMap.end()) {
-        return (*jointIt).second;
-    }
-    
-    return INVALID_SEMANTIC;
-}
-
-void MotionTracker::updateAllAbsTransform() {
-    _jointsArray[0].updateAbsFromLocTransform(0);
-
-    // Because we know the hierarchy is stored from root down the branches let's just traverse and update
-    for (Index i = 1; i < (Index)(_jointsArray.size()); i++) {
-        JointTracker* joint = _jointsArray.data() + i;
-        joint->updateAbsFromLocTransform(_jointsArray.data() + joint->getParent());
-    }
-}
-
-
-// MotionTracker::JointTracker
-MotionTracker::JointTracker::JointTracker() :
-    _locFrame(),
-    _absFrame(),
-    _semantic(""),
-    _parent(INVALID_PARENT),
-    _lastUpdate(1)  // Joint inactive
-{
-}
-
-MotionTracker::JointTracker::JointTracker(const Semantic& semantic, Index parent) :
-    _semantic(semantic),
-    _parent(parent),
-    _lastUpdate(1)  // Joint inactive
-{
-}
-
-MotionTracker::JointTracker::JointTracker(const JointTracker& tracker) :
-    _locFrame(tracker._locFrame),
-    _absFrame(tracker._absFrame),
-    _semantic(tracker._semantic),
-    _parent(tracker._parent),
-    _lastUpdate(tracker._lastUpdate)
-{
-}
-
-void MotionTracker::JointTracker::updateAbsFromLocTransform(const JointTracker* parentJoint) {
-    if (parentJoint) {
-        editAbsFrame()._transform = (parentJoint->getAbsFrame()._transform * getLocFrame()._transform);
-    } else {
-        editAbsFrame()._transform = getLocFrame()._transform;
-    }
-}
-
-void MotionTracker::JointTracker::updateLocFromAbsTransform(const JointTracker* parentJoint) {
-    if (parentJoint) {
-        glm::mat4 ip = glm::inverse(parentJoint->getAbsFrame()._transform);
-        editLocFrame()._transform = (ip * getAbsFrame()._transform);
-    } else {
-        editLocFrame()._transform = getAbsFrame()._transform;
-    }
-}
-
-//--------------------------------------------------------------------------------------
-// MotionTracker::Frame
-//--------------------------------------------------------------------------------------
-
-MotionTracker::Frame::Frame() :
-    _transform()
-{
-}
-
-void MotionTracker::Frame::setRotation(const glm::quat& rotation) {
-    glm::mat3x3 rot = glm::mat3_cast(rotation);
-    _transform[0] = glm::vec4(rot[0], 0.0f);
-    _transform[1] = glm::vec4(rot[1], 0.0f);
-    _transform[2] = glm::vec4(rot[2], 0.0f);
-}
-
-void MotionTracker::Frame::getRotation(glm::quat& rotation) const {
-    rotation = glm::quat_cast(_transform);
-}
-
-void MotionTracker::Frame::setTranslation(const glm::vec3& translation) {
-    _transform[3] = glm::vec4(translation, 1.0f);
-}
-
-void MotionTracker::Frame::getTranslation(glm::vec3& translation) const {
-    translation = extractTranslation(_transform);
-}
-
diff --git a/libraries/trackers/src/trackers/MotionTracker.h b/libraries/trackers/src/trackers/MotionTracker.h
deleted file mode 100644
index 26c8dcea2c..0000000000
--- a/libraries/trackers/src/trackers/MotionTracker.h
+++ /dev/null
@@ -1,116 +0,0 @@
-//
-//  Created by Sam Cake on 6/20/14.
-//  Copyright 2014 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_MotionTracker_h
-#define hifi_MotionTracker_h
-
-#include "DeviceTracker.h"
-
-#include <GLMHelpers.h>
-
-/// Base class for device trackers.
-class MotionTracker : public DeviceTracker {
-public:
-
-    class Frame {
-    public:
-        Frame();
-
-        glm::mat4 _transform;
-
-        void setRotation(const glm::quat& rotation);
-        void getRotation(glm::quat& rotatio) const;
-
-        void setTranslation(const glm::vec3& translation);
-        void getTranslation(glm::vec3& translation) const;
-    };
-
-    // Semantic and Index types to retreive the JointTrackers of this MotionTracker
-    typedef std::string Semantic;
-    typedef int32_t Index;
-    static const Index INVALID_SEMANTIC = -1;
-    static const Index INVALID_PARENT = -2;
-
-    class JointTracker {
-    public:
-        typedef std::vector< JointTracker > Vector;
-        typedef std::map< Semantic, Index > Map;
-
-        JointTracker();
-        JointTracker(const JointTracker& tracker);
-        JointTracker(const Semantic& semantic, Index parent);
-
-        const Frame& getLocFrame() const { return _locFrame; }
-        Frame& editLocFrame() { return _locFrame; }
-        void setLocFrame(const Frame& frame) { editLocFrame() = frame; }
-
-        const Frame& getAbsFrame() const { return _absFrame; }
-        Frame& editAbsFrame() { return _absFrame; }
-        void setAbsFrame(const Frame& frame) { editAbsFrame() = frame; }
-
-        const Semantic& getSemantic() const { return _semantic; }
-        const Index& getParent() const { return _parent; }
-
-        bool isActive() const { return (_lastUpdate <= 0); }
-        void tickNewFrame() { _lastUpdate++; }
-        void activeFrame() { _lastUpdate = 0; }
-
-        /// Update the loc/abs transform for this joint from the current abs/loc value and the specified parent joint abs frame
-        void updateLocFromAbsTransform(const JointTracker* parentJoint);
-        void updateAbsFromLocTransform(const JointTracker* parentJoint);
-
-    protected:
-        Frame       _locFrame;
-        Frame       _absFrame;
-        Semantic    _semantic;
-        Index       _parent;
-        int         _lastUpdate;
-    };
-
-    virtual bool isConnected() const;
-
-    Index numJointTrackers() const { return (Index)_jointsArray.size(); }
-
-    /// Access a Joint from it's index.
-    /// Index 0 is always the "Root".
-    /// if the index is Invalid then returns NULL.
-    const JointTracker* getJointTracker(Index index) const { return ((index > 0) && (index < (Index)(_jointsArray.size())) ? _jointsArray.data() + index : NULL); }
-    JointTracker* editJointTracker(Index index) { return ((index > 0) && (index < (Index)(_jointsArray.size())) ? _jointsArray.data() + index : NULL); }
-
-    /// From a semantic, find the Index of the Joint.
-    /// \return the index of the mapped Joint or INVALID_SEMANTIC if the semantic is not knowned.
-    Index findJointIndex(const Semantic& semantic) const;
-
-protected:
-    MotionTracker();
-    virtual ~MotionTracker();
-
-    JointTracker::Vector _jointsArray;
-    JointTracker::Map _jointsMap;
-
-    /// Adding joint is only done from the specialized Motion Tracker, hence this function is protected.
-    /// The hierarchy of joints must be created from the top down to the branches.
-    /// The "Root" node is at index 0 and exists at creation of the Motion Tracker.
-    /// 
-    /// \param semantic A joint is defined by it's semantic, the unique name mapping to it
-    /// \param parent   The parent's index, the parent must be valid and correspond to a Joint that has been previously created
-    ///
-    /// \return The Index of the newly created Joint.
-    ///         Valid if everything went well.
-    ///         INVALID_SEMANTIC if the semantic is already in use
-    ///         INVALID_PARENT if the parent is not valid
-    Index addJoint(const Semantic& semantic, Index parent);
-
-    /// Update the absolute transform stack traversing the hierarchy from the root down the branches
-    /// This is a generic way to update all the Joint's absFrame by combining the locFrame going down the hierarchy branch.
-    void updateAllAbsTransform();
-};
-
-
-
-#endif // hifi_MotionTracker_h
diff --git a/libraries/ui/CMakeLists.txt b/libraries/ui/CMakeLists.txt
index 68a6fd25b9..f28157ff97 100644
--- a/libraries/ui/CMakeLists.txt
+++ b/libraries/ui/CMakeLists.txt
@@ -2,7 +2,5 @@ set(TARGET_NAME ui)
 setup_hifi_library(OpenGL Network Qml Quick Script WebChannel WebEngine WebSockets XmlPatterns)
 link_hifi_libraries(shared networking gl audio)
 
-if (NOT ANDROID)
-  # Required for some low level GL interaction in the OffscreenQMLSurface
-  target_glew()
-endif ()
+# Required for some low level GL interaction in the OffscreenQMLSurface
+target_opengl()
diff --git a/libraries/ui/src/CursorManager.cpp b/libraries/ui/src/CursorManager.cpp
index f768b5f227..8eb4989ab6 100644
--- a/libraries/ui/src/CursorManager.cpp
+++ b/libraries/ui/src/CursorManager.cpp
@@ -24,24 +24,39 @@ namespace Cursor {
         return _icon;
     }
 
-
-    class MouseInstance : public Instance {
-        Source getType() const override {
-            return Source::MOUSE;
-        }
+    QMap<uint16_t, QString> Manager::ICON_NAMES {
+        { Icon::SYSTEM, "SYSTEM", },
+        { Icon::DEFAULT, "DEFAULT", },
+        { Icon::LINK, "LINK", },
+        { Icon::ARROW, "ARROW", },
+        { Icon::RETICLE, "RETICLE", },
     };
 
-    static QMap<uint16_t, QString> ICONS;
     static uint16_t _customIconId = Icon::USER_BASE;
 
     Manager::Manager() {
-        ICONS[Icon::DEFAULT] = PathUtils::resourcesPath() + "images/arrow.png";
-        ICONS[Icon::LINK] = PathUtils::resourcesPath() + "images/link.png";
+        ICONS[Icon::SYSTEM] = PathUtils::resourcesPath() + "images/cursor-none.png";
+        ICONS[Icon::DEFAULT] = PathUtils::resourcesPath() + "images/cursor-arrow.png";
+        ICONS[Icon::LINK] = PathUtils::resourcesPath() + "images/cursor-link.png";
+        ICONS[Icon::ARROW] = PathUtils::resourcesPath() + "images/cursor-arrow.png";
+        ICONS[Icon::RETICLE] = PathUtils::resourcesPath() + "images/cursor-reticle.png";
+    }
+
+    Icon Manager::lookupIcon(const QString& name) {
+        for (const auto& kv : ICON_NAMES.toStdMap()) {
+            if (kv.second == name) {
+                return static_cast<Icon>(kv.first);
+            }
+        }
+        return Icon::DEFAULT;
+    }
+    const QString& Manager::getIconName(const Icon& icon) {
+        return ICON_NAMES.count(icon) ? ICON_NAMES[icon] : ICON_NAMES[Icon::DEFAULT];
     }
 
     Manager& Manager::instance() {
-        static Manager instance;
-        return instance;
+        static QSharedPointer<Manager> instance = DependencyManager::get<Cursor::Manager>();
+        return *instance;
     }
 
     QList<uint16_t> Manager::registeredIcons() const {
@@ -54,7 +69,6 @@ namespace Cursor {
 
     Instance* Manager::getCursor(uint8_t index) {
         Q_ASSERT(index < getCount());
-        static MouseInstance mouseInstance;
         if (index == 0) {
             return &mouseInstance;
         }
diff --git a/libraries/ui/src/CursorManager.h b/libraries/ui/src/CursorManager.h
index 99d5ccdc77..02ab99ee4b 100644
--- a/libraries/ui/src/CursorManager.h
+++ b/libraries/ui/src/CursorManager.h
@@ -8,6 +8,7 @@
 
 #pragma once
 #include <stdint.h>
+#include <DependencyManager.h>
 
 #include <GLMHelpers.h>
 
@@ -18,16 +19,18 @@ namespace Cursor {
     };
 
     enum Icon {
+        SYSTEM,
         DEFAULT,
         LINK,
         GRAB,
+        ARROW,
+        RETICLE,
 
         // Add new system cursors here
 
         // User cursors will have ids over this value
         USER_BASE = 0xFF,
     };
-
     class Instance {
     public:
         virtual Source getType() const = 0;
@@ -37,7 +40,15 @@ namespace Cursor {
         uint16_t _icon;
     };
 
-    class Manager {
+    class MouseInstance : public Instance {
+        Source getType() const override {
+            return Source::MOUSE;
+        }
+    };
+
+    class Manager : public QObject, public Dependency {
+        SINGLETON_DEPENDENCY
+
         Manager();
         Manager(const Manager& other) = delete;
     public:
@@ -49,8 +60,14 @@ namespace Cursor {
         uint16_t registerIcon(const QString& path);
         QList<uint16_t> registeredIcons() const;
         const QString& getIconImage(uint16_t icon);
+
+        static QMap<uint16_t, QString> ICON_NAMES;
+        static Icon lookupIcon(const QString& name);
+        static const QString& getIconName(const Icon& icon);
     private:
+        MouseInstance mouseInstance;
         float _scale{ 1.0f };
+        QMap<uint16_t, QString> ICONS;
     };
 }
 
diff --git a/libraries/ui/src/OffscreenUi.cpp b/libraries/ui/src/OffscreenUi.cpp
index 76a8a780b9..252c08a1f0 100644
--- a/libraries/ui/src/OffscreenUi.cpp
+++ b/libraries/ui/src/OffscreenUi.cpp
@@ -15,6 +15,7 @@
 #include <QtQuick/QQuickWindow>
 #include <QtQml/QtQml>
 
+#include <shared/QtHelpers.h>
 #include <gl/GLHelpers.h>
 
 #include <AbstractUriHandler.h>
@@ -90,8 +91,15 @@ QObject* OffscreenUi::getFlags() {
     return offscreenFlags;
 }
 
-void OffscreenUi::create(QOpenGLContext* context) {
-    OffscreenQmlSurface::create(context);
+void OffscreenUi::removeModalDialog(QObject* modal) {
+    if (modal) {
+        _modalDialogListeners.removeOne(modal);
+        modal->deleteLater();
+    }
+}
+
+void OffscreenUi::create() {
+    OffscreenQmlSurface::create();
     auto myContext = getSurfaceContext();
 
     myContext->setContextProperty("OffscreenUi", this);
@@ -128,6 +136,14 @@ void OffscreenUi::toggle(const QUrl& url, const QString& name, std::function<voi
     shownProperty.write(!shownProperty.read().toBool());
 }
 
+bool OffscreenUi::isPointOnDesktopWindow(QVariant point) {
+    QVariant result;
+    BLOCKING_INVOKE_METHOD(_desktop, "isPointOnWindow",
+                           Q_RETURN_ARG(QVariant, result),
+                           Q_ARG(QVariant, point));
+    return result.toBool();
+}
+
 void OffscreenUi::hide(const QString& name) {
     QQuickItem* item = getRootItem()->findChild<QQuickItem*>(name);
     if (item) {
@@ -144,45 +160,6 @@ bool OffscreenUi::isVisible(const QString& name) {
     }
 }
 
-class ModalDialogListener : public QObject {
-    Q_OBJECT
-    friend class OffscreenUi;
-
-protected:
-    ModalDialogListener(QQuickItem* dialog) : _dialog(dialog) {
-        if (!dialog) {
-            _finished = true;
-            return;
-        }
-        connect(_dialog, SIGNAL(destroyed()), this, SLOT(onDestroyed()));
-    }
-
-    ~ModalDialogListener() {
-        if (_dialog) {
-            disconnect(_dialog);
-        }
-    }
-
-    virtual QVariant waitForResult() {
-        while (!_finished) {
-            QCoreApplication::processEvents();
-        }
-        return _result;
-    }
-
-protected slots:
-    void onDestroyed() {
-        _finished = true;
-        disconnect(_dialog);
-        _dialog = nullptr;
-    }
-
-protected:
-    QQuickItem* _dialog;
-    bool _finished { false };
-    QVariant _result;
-};
-
 class MessageBoxListener : public ModalDialogListener {
     Q_OBJECT
 
@@ -203,6 +180,9 @@ private slots:
     void onSelected(int button) {
         _result = button;
         _finished = true;
+        auto offscreenUi = DependencyManager::get<OffscreenUi>();
+        emit response(_result);
+        offscreenUi->removeModalDialog(qobject_cast<QObject*>(this));
         disconnect(_dialog);
     }
 };
@@ -249,7 +229,7 @@ int OffscreenUi::waitForMessageBoxResult(QQuickItem* messageBox) {
 QMessageBox::StandardButton OffscreenUi::messageBox(Icon icon, const QString& title, const QString& text, QMessageBox::StandardButtons buttons, QMessageBox::StandardButton defaultButton) {
     if (QThread::currentThread() != thread()) {
         QMessageBox::StandardButton result = QMessageBox::StandardButton::NoButton;
-        QMetaObject::invokeMethod(this, "messageBox", Qt::BlockingQueuedConnection,
+        BLOCKING_INVOKE_METHOD(this, "messageBox",
             Q_RETURN_ARG(QMessageBox::StandardButton, result),
             Q_ARG(Icon, icon),
             Q_ARG(QString, title),
@@ -262,6 +242,25 @@ QMessageBox::StandardButton OffscreenUi::messageBox(Icon icon, const QString& ti
     return static_cast<QMessageBox::StandardButton>(waitForMessageBoxResult(createMessageBox(icon, title, text, buttons, defaultButton)));
 }
 
+ModalDialogListener* OffscreenUi::asyncMessageBox(Icon icon, const QString& title, const QString& text, QMessageBox::StandardButtons buttons, QMessageBox::StandardButton defaultButton) {
+    if (QThread::currentThread() != thread()) {
+        ModalDialogListener* ret;
+        BLOCKING_INVOKE_METHOD(this, "asyncMessageBox",
+                               Q_RETURN_ARG(ModalDialogListener*, ret),
+                               Q_ARG(Icon, icon),
+                               Q_ARG(QString, title),
+                               Q_ARG(QString, text),
+                               Q_ARG(QMessageBox::StandardButtons, buttons),
+                               Q_ARG(QMessageBox::StandardButton, defaultButton));
+        return ret;
+    }
+
+    MessageBoxListener* messageBoxListener = new MessageBoxListener(createMessageBox(icon, title, text, buttons, defaultButton));
+    QObject* modalDialog = qobject_cast<QObject*>(messageBoxListener);
+    _modalDialogListeners.push_back(modalDialog);
+    return messageBoxListener;
+}
+
 QMessageBox::StandardButton OffscreenUi::critical(const QString& title, const QString& text,
     QMessageBox::StandardButtons buttons, QMessageBox::StandardButton defaultButton) {
     return DependencyManager::get<OffscreenUi>()->messageBox(OffscreenUi::Icon::ICON_CRITICAL, title, text, buttons, defaultButton);
@@ -270,15 +269,36 @@ QMessageBox::StandardButton OffscreenUi::information(const QString& title, const
     QMessageBox::StandardButtons buttons, QMessageBox::StandardButton defaultButton) {
     return DependencyManager::get<OffscreenUi>()->messageBox(OffscreenUi::Icon::ICON_INFORMATION, title, text, buttons, defaultButton);
 }
+
+ModalDialogListener* OffscreenUi::asyncCritical(const QString& title, const QString& text,
+    QMessageBox::StandardButtons buttons, QMessageBox::StandardButton defaultButton) {
+    return DependencyManager::get<OffscreenUi>()->asyncMessageBox(OffscreenUi::Icon::ICON_CRITICAL, title, text, buttons, defaultButton);
+}
+
+ModalDialogListener* OffscreenUi::asyncInformation(const QString& title, const QString& text,
+    QMessageBox::StandardButtons buttons, QMessageBox::StandardButton defaultButton) {
+    return DependencyManager::get<OffscreenUi>()->asyncMessageBox(OffscreenUi::Icon::ICON_INFORMATION, title, text, buttons, defaultButton);
+}
+
 QMessageBox::StandardButton OffscreenUi::question(const QString& title, const QString& text,
     QMessageBox::StandardButtons buttons, QMessageBox::StandardButton defaultButton) {
     return DependencyManager::get<OffscreenUi>()->messageBox(OffscreenUi::Icon::ICON_QUESTION, title, text, buttons, defaultButton);
 }
+
+ModalDialogListener *OffscreenUi::asyncQuestion(const QString& title, const QString& text,
+    QMessageBox::StandardButtons buttons, QMessageBox::StandardButton defaultButton) {
+    return DependencyManager::get<OffscreenUi>()->asyncMessageBox(OffscreenUi::Icon::ICON_QUESTION, title, text, buttons, defaultButton);
+}
+
 QMessageBox::StandardButton OffscreenUi::warning(const QString& title, const QString& text,
     QMessageBox::StandardButtons buttons, QMessageBox::StandardButton defaultButton) {
     return DependencyManager::get<OffscreenUi>()->messageBox(OffscreenUi::Icon::ICON_WARNING, title, text, buttons, defaultButton);
 }
 
+ModalDialogListener* OffscreenUi::asyncWarning(const QString& title, const QString& text,
+    QMessageBox::StandardButtons buttons, QMessageBox::StandardButton defaultButton) {
+    return DependencyManager::get<OffscreenUi>()->asyncMessageBox(OffscreenUi::Icon::ICON_WARNING, title, text, buttons, defaultButton);
+}
 
 
 class InputDialogListener : public ModalDialogListener {
@@ -295,6 +315,9 @@ class InputDialogListener : public ModalDialogListener {
 private slots:
     void onSelected(const QVariant& result) {
         _result = result;
+        auto offscreenUi = DependencyManager::get<OffscreenUi>();
+        emit response(_result);
+        offscreenUi->removeModalDialog(qobject_cast<QObject*>(this));
         _finished = true;
         disconnect(_dialog);
     }
@@ -348,10 +371,35 @@ QVariant OffscreenUi::getCustomInfo(const Icon icon, const QString& title, const
     return result;
 }
 
+ModalDialogListener* OffscreenUi::getTextAsync(const Icon icon, const QString& title, const QString& label, const QString& text) {
+    return DependencyManager::get<OffscreenUi>()->inputDialogAsync(icon, title, label, text);
+}
+
+ModalDialogListener* OffscreenUi::getItemAsync(const Icon icon, const QString& title, const QString& label, const QStringList& items,
+    int current, bool editable) {
+
+    auto offscreenUi = DependencyManager::get<OffscreenUi>();
+    auto inputDialog = offscreenUi->createInputDialog(icon, title, label, current);
+    if (!inputDialog) {
+        return nullptr;
+    }
+    inputDialog->setProperty("items", items);
+    inputDialog->setProperty("editable", editable);
+
+    InputDialogListener* inputDialogListener = new InputDialogListener(inputDialog);
+    offscreenUi->getModalDialogListeners().push_back(qobject_cast<QObject*>(inputDialogListener));
+
+    return inputDialogListener;
+}
+
+ModalDialogListener* OffscreenUi::getCustomInfoAsync(const Icon icon, const QString& title, const QVariantMap& config) {
+    return DependencyManager::get<OffscreenUi>()->customInputDialogAsync(icon, title, config);
+}
+
 QVariant OffscreenUi::inputDialog(const Icon icon, const QString& title, const QString& label, const QVariant& current) {
     if (QThread::currentThread() != thread()) {
         QVariant result;
-        QMetaObject::invokeMethod(this, "inputDialog", Qt::BlockingQueuedConnection,
+        BLOCKING_INVOKE_METHOD(this, "inputDialog",
             Q_RETURN_ARG(QVariant, result),
             Q_ARG(Icon, icon),
             Q_ARG(QString, title),
@@ -363,10 +411,28 @@ QVariant OffscreenUi::inputDialog(const Icon icon, const QString& title, const Q
     return waitForInputDialogResult(createInputDialog(icon, title, label, current));
 }
 
+ModalDialogListener* OffscreenUi::inputDialogAsync(const Icon icon, const QString& title, const QString& label, const QVariant& current) {
+    if (QThread::currentThread() != thread()) {
+        ModalDialogListener* ret;
+        BLOCKING_INVOKE_METHOD(this, "inputDialogAsync",
+            Q_RETURN_ARG(ModalDialogListener*, ret),
+            Q_ARG(Icon, icon),
+            Q_ARG(QString, title),
+            Q_ARG(QString, label),
+            Q_ARG(QVariant, current));
+        return ret;
+    }
+
+    InputDialogListener* inputDialogListener = new InputDialogListener(createInputDialog(icon, title, label, current));
+    QObject* inputDialog = qobject_cast<QObject*>(inputDialogListener);
+    _modalDialogListeners.push_back(inputDialog);
+    return inputDialogListener;
+}
+
 QVariant OffscreenUi::customInputDialog(const Icon icon, const QString& title, const QVariantMap& config) {
     if (QThread::currentThread() != thread()) {
         QVariant result;
-        QMetaObject::invokeMethod(this, "customInputDialog", Qt::BlockingQueuedConnection,
+        BLOCKING_INVOKE_METHOD(this, "customInputDialog",
                                   Q_RETURN_ARG(QVariant, result),
                                   Q_ARG(Icon, icon),
                                   Q_ARG(QString, title),
@@ -383,6 +449,23 @@ QVariant OffscreenUi::customInputDialog(const Icon icon, const QString& title, c
     return result;
 }
 
+ModalDialogListener* OffscreenUi::customInputDialogAsync(const Icon icon, const QString& title, const QVariantMap& config) {
+    if (QThread::currentThread() != thread()) {
+        ModalDialogListener* ret;
+        BLOCKING_INVOKE_METHOD(this, "customInputDialogAsync",
+                               Q_RETURN_ARG(ModalDialogListener*, ret),
+                               Q_ARG(Icon, icon),
+                               Q_ARG(QString, title),
+                               Q_ARG(QVariantMap, config));
+        return ret;
+    }
+
+    InputDialogListener* inputDialogListener = new InputDialogListener(createCustomInputDialog(icon, title, config));
+    QObject* inputDialog = qobject_cast<QObject*>(inputDialogListener);
+    _modalDialogListeners.push_back(inputDialog);
+    return inputDialogListener;
+}
+
 void OffscreenUi::togglePinned() {
     bool invokeResult = QMetaObject::invokeMethod(_desktop, "togglePinned");
     if (!invokeResult) {
@@ -553,20 +636,20 @@ void OffscreenUi::createDesktop(const QUrl& url) {
     getSurfaceContext()->setContextProperty("DebugQML", QVariant(false));
 #endif
 
-    _desktop = dynamic_cast<QQuickItem*>(load(url));
-    Q_ASSERT(_desktop);
-    getSurfaceContext()->setContextProperty("desktop", _desktop);
+    load(url, [=](QQmlContext* context, QObject* newObject) {
+        Q_UNUSED(context)
+        _desktop = static_cast<QQuickItem*>(newObject);
+        getSurfaceContext()->setContextProperty("desktop", _desktop);
+        _toolWindow = _desktop->findChild<QQuickItem*>("ToolWindow");
 
-    _toolWindow = _desktop->findChild<QQuickItem*>("ToolWindow");
+        _vrMenu = new VrMenu(this);
+        for (const auto& menuInitializer : _queuedMenuInitializers) {
+            menuInitializer(_vrMenu);
+        }
 
-    _vrMenu = new VrMenu(this);
-    for (const auto& menuInitializer : _queuedMenuInitializers) {
-        menuInitializer(_vrMenu);
-    }
-
-    new KeyboardFocusHack();
-
-    connect(_desktop, SIGNAL(showDesktop()), this, SIGNAL(showDesktop()));
+        new KeyboardFocusHack();
+        connect(_desktop, SIGNAL(showDesktop()), this, SIGNAL(showDesktop()));
+    });
 }
 
 QQuickItem* OffscreenUi::getDesktop() {
@@ -600,8 +683,11 @@ class FileDialogListener : public ModalDialogListener {
 
 private slots:
     void onSelectedFile(QVariant file) {
-        _result = file;
+        _result = file.toUrl().toLocalFile();
         _finished = true;
+        auto offscreenUi = DependencyManager::get<OffscreenUi>();
+        emit response(_result);
+        offscreenUi->removeModalDialog(qobject_cast<QObject*>(this));
         disconnect(_dialog);
     }
 };
@@ -634,13 +720,42 @@ QString OffscreenUi::fileDialog(const QVariantMap& properties) {
         return QString();
     }
     qCDebug(uiLogging) << result.toString();
-    return result.toUrl().toLocalFile();
+    return result.toString();
+}
+
+ModalDialogListener* OffscreenUi::fileDialogAsync(const QVariantMap& properties) {
+    QVariant buildDialogResult;
+    bool invokeResult;
+    auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
+    TabletProxy* tablet = dynamic_cast<TabletProxy*>(tabletScriptingInterface->getTablet("com.highfidelity.interface.tablet.system"));
+    if (tablet->getToolbarMode()) {
+       invokeResult =  QMetaObject::invokeMethod(_desktop, "fileDialog",
+                                  Q_RETURN_ARG(QVariant, buildDialogResult),
+                                  Q_ARG(QVariant, QVariant::fromValue(properties)));
+    } else {
+        QQuickItem* tabletRoot = tablet->getTabletRoot();
+        invokeResult =  QMetaObject::invokeMethod(tabletRoot, "fileDialog",
+                                  Q_RETURN_ARG(QVariant, buildDialogResult),
+                                  Q_ARG(QVariant, QVariant::fromValue(properties)));
+        emit tabletScriptingInterface->tabletNotification();
+    }
+
+    if (!invokeResult) {
+        qWarning() << "Failed to create file open dialog";
+        return nullptr;
+    }
+
+    FileDialogListener* fileDialogListener = new FileDialogListener(qvariant_cast<QQuickItem*>(buildDialogResult));
+    QObject* fileModalDialog = qobject_cast<QObject*>(fileDialogListener);
+    _modalDialogListeners.push_back(fileModalDialog);
+
+    return fileDialogListener;
 }
 
 QString OffscreenUi::fileOpenDialog(const QString& caption, const QString& dir, const QString& filter, QString* selectedFilter, QFileDialog::Options options) {
     if (QThread::currentThread() != thread()) {
         QString result;
-        QMetaObject::invokeMethod(this, "fileOpenDialog", Qt::BlockingQueuedConnection,
+        BLOCKING_INVOKE_METHOD(this, "fileOpenDialog",
             Q_RETURN_ARG(QString, result),
             Q_ARG(QString, caption),
             Q_ARG(QString, dir),
@@ -659,10 +774,32 @@ QString OffscreenUi::fileOpenDialog(const QString& caption, const QString& dir,
     return fileDialog(map);
 }
 
+ModalDialogListener* OffscreenUi::fileOpenDialogAsync(const QString& caption, const QString& dir, const QString& filter, QString* selectedFilter, QFileDialog::Options options) {
+    if (QThread::currentThread() != thread()) {
+        ModalDialogListener* ret;
+        BLOCKING_INVOKE_METHOD(this, "fileOpenDialogAsync",
+            Q_RETURN_ARG(ModalDialogListener*, ret),
+            Q_ARG(QString, caption),
+            Q_ARG(QString, dir),
+            Q_ARG(QString, filter),
+            Q_ARG(QString*, selectedFilter),
+            Q_ARG(QFileDialog::Options, options));
+        return ret;
+    }
+
+    // FIXME support returning the selected filter... somehow?
+    QVariantMap map;
+    map.insert("caption", caption);
+    map.insert("dir", QUrl::fromLocalFile(dir));
+    map.insert("filter", filter);
+    map.insert("options", static_cast<int>(options));
+    return fileDialogAsync(map);
+}
+
 QString OffscreenUi::fileSaveDialog(const QString& caption, const QString& dir, const QString& filter, QString* selectedFilter, QFileDialog::Options options) {
     if (QThread::currentThread() != thread()) {
         QString result;
-        QMetaObject::invokeMethod(this, "fileSaveDialog", Qt::BlockingQueuedConnection,
+        BLOCKING_INVOKE_METHOD(this, "fileSaveDialog",
             Q_RETURN_ARG(QString, result),
             Q_ARG(QString, caption),
             Q_ARG(QString, dir),
@@ -683,10 +820,34 @@ QString OffscreenUi::fileSaveDialog(const QString& caption, const QString& dir,
     return fileDialog(map);
 }
 
+ModalDialogListener* OffscreenUi::fileSaveDialogAsync(const QString& caption, const QString& dir, const QString& filter, QString* selectedFilter, QFileDialog::Options options) {
+    if (QThread::currentThread() != thread()) {
+        ModalDialogListener* ret;
+        BLOCKING_INVOKE_METHOD(this, "fileSaveDialogAsync",
+            Q_RETURN_ARG(ModalDialogListener*, ret),
+            Q_ARG(QString, caption),
+            Q_ARG(QString, dir),
+            Q_ARG(QString, filter),
+            Q_ARG(QString*, selectedFilter),
+            Q_ARG(QFileDialog::Options, options));
+        return ret;
+    }
+
+    // FIXME support returning the selected filter... somehow?
+    QVariantMap map;
+    map.insert("caption", caption);
+    map.insert("dir", QUrl::fromLocalFile(dir));
+    map.insert("filter", filter);
+    map.insert("options", static_cast<int>(options));
+    map.insert("saveDialog", true);
+
+    return fileDialogAsync(map);
+}
+
 QString OffscreenUi::existingDirectoryDialog(const QString& caption, const QString& dir, const QString& filter, QString* selectedFilter, QFileDialog::Options options) {
     if (QThread::currentThread() != thread()) {
         QString result;
-        QMetaObject::invokeMethod(this, "existingDirectoryDialog", Qt::BlockingQueuedConnection,
+        BLOCKING_INVOKE_METHOD(this, "existingDirectoryDialog",
                                   Q_RETURN_ARG(QString, result),
                                   Q_ARG(QString, caption),
                                   Q_ARG(QString, dir),
@@ -705,18 +866,58 @@ QString OffscreenUi::existingDirectoryDialog(const QString& caption, const QStri
     return fileDialog(map);
 }
 
+ModalDialogListener* OffscreenUi::existingDirectoryDialogAsync(const QString& caption, const QString& dir, const QString& filter, QString* selectedFilter, QFileDialog::Options options) {
+    if (QThread::currentThread() != thread()) {
+        ModalDialogListener* ret;
+        BLOCKING_INVOKE_METHOD(this, "existingDirectoryDialogAsync",
+                               Q_RETURN_ARG(ModalDialogListener*, ret),
+                               Q_ARG(QString, caption),
+                               Q_ARG(QString, dir),
+                               Q_ARG(QString, filter),
+                               Q_ARG(QString*, selectedFilter),
+                               Q_ARG(QFileDialog::Options, options));
+        return ret;
+    }
+
+    QVariantMap map;
+    map.insert("caption", caption);
+    map.insert("dir", QUrl::fromLocalFile(dir));
+    map.insert("filter", filter);
+    map.insert("options", static_cast<int>(options));
+    map.insert("selectDirectory", true);
+    return fileDialogAsync(map);
+}
+
 QString OffscreenUi::getOpenFileName(void* ignored, const QString &caption, const QString &dir, const QString &filter, QString *selectedFilter, QFileDialog::Options options) {
+    Q_UNUSED(ignored)
     return DependencyManager::get<OffscreenUi>()->fileOpenDialog(caption, dir, filter, selectedFilter, options);
 }
 
+ModalDialogListener* OffscreenUi::getOpenFileNameAsync(void* ignored, const QString &caption, const QString &dir, const QString &filter, QString *selectedFilter, QFileDialog::Options options) {
+    Q_UNUSED(ignored)
+    return DependencyManager::get<OffscreenUi>()->fileOpenDialogAsync(caption, dir, filter, selectedFilter, options);
+}
+
 QString OffscreenUi::getSaveFileName(void* ignored, const QString &caption, const QString &dir, const QString &filter, QString *selectedFilter, QFileDialog::Options options) {
+    Q_UNUSED(ignored)
     return DependencyManager::get<OffscreenUi>()->fileSaveDialog(caption, dir, filter, selectedFilter, options);
 }
 
+ModalDialogListener* OffscreenUi::getSaveFileNameAsync(void* ignored, const QString &caption, const QString &dir, const QString &filter, QString *selectedFilter, QFileDialog::Options options) {
+    Q_UNUSED(ignored)
+    return DependencyManager::get<OffscreenUi>()->fileSaveDialogAsync(caption, dir, filter, selectedFilter, options);
+}
+
 QString OffscreenUi::getExistingDirectory(void* ignored, const QString &caption, const QString &dir, const QString &filter, QString *selectedFilter, QFileDialog::Options options) {
+    Q_UNUSED(ignored)
     return DependencyManager::get<OffscreenUi>()->existingDirectoryDialog(caption, dir, filter, selectedFilter, options);
 }
 
+ModalDialogListener* OffscreenUi::getExistingDirectoryAsync(void* ignored, const QString &caption, const QString &dir, const QString &filter, QString *selectedFilter, QFileDialog::Options options) {
+    Q_UNUSED(ignored)
+    return DependencyManager::get<OffscreenUi>()->existingDirectoryDialogAsync(caption, dir, filter, selectedFilter, options);
+}
+
 class AssetDialogListener : public ModalDialogListener {
     // ATP equivalent of FileDialogListener.
     Q_OBJECT
@@ -732,6 +933,9 @@ class AssetDialogListener : public ModalDialogListener {
     private slots:
     void onSelectedAsset(QVariant asset) {
         _result = asset;
+        auto offscreenUi = DependencyManager::get<OffscreenUi>();
+        emit response(_result);
+        offscreenUi->removeModalDialog(qobject_cast<QObject*>(this));
         _finished = true;
         disconnect(_dialog);
     }
@@ -769,11 +973,44 @@ QString OffscreenUi::assetDialog(const QVariantMap& properties) {
     return result.toUrl().toString();
 }
 
+ModalDialogListener *OffscreenUi::assetDialogAsync(const QVariantMap& properties) {
+    // ATP equivalent of fileDialog().
+    QVariant buildDialogResult;
+    bool invokeResult;
+    auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
+    TabletProxy* tablet = dynamic_cast<TabletProxy*>(tabletScriptingInterface->getTablet("com.highfidelity.interface.tablet.system"));
+    if (tablet->getToolbarMode()) {
+        invokeResult = QMetaObject::invokeMethod(_desktop, "assetDialog",
+            Q_RETURN_ARG(QVariant, buildDialogResult),
+            Q_ARG(QVariant, QVariant::fromValue(properties)));
+    } else {
+        QQuickItem* tabletRoot = tablet->getTabletRoot();
+        invokeResult = QMetaObject::invokeMethod(tabletRoot, "assetDialog",
+            Q_RETURN_ARG(QVariant, buildDialogResult),
+            Q_ARG(QVariant, QVariant::fromValue(properties)));
+        emit tabletScriptingInterface->tabletNotification();
+    }
+
+    if (!invokeResult) {
+        qWarning() << "Failed to create asset open dialog";
+        return nullptr;
+    }
+
+    AssetDialogListener* assetDialogListener = new AssetDialogListener(qvariant_cast<QQuickItem*>(buildDialogResult));
+    QObject* assetModalDialog = qobject_cast<QObject*>(assetDialogListener);
+    _modalDialogListeners.push_back(assetModalDialog);
+    return assetDialogListener;
+}
+
+QList<QObject *> &OffscreenUi::getModalDialogListeners() {
+    return _modalDialogListeners;
+}
+
 QString OffscreenUi::assetOpenDialog(const QString& caption, const QString& dir, const QString& filter, QString* selectedFilter, QFileDialog::Options options) {
     // ATP equivalent of fileOpenDialog().
     if (QThread::currentThread() != thread()) {
         QString result;
-        QMetaObject::invokeMethod(this, "assetOpenDialog", Qt::BlockingQueuedConnection,
+        BLOCKING_INVOKE_METHOD(this, "assetOpenDialog",
             Q_RETURN_ARG(QString, result),
             Q_ARG(QString, caption),
             Q_ARG(QString, dir),
@@ -792,11 +1029,41 @@ QString OffscreenUi::assetOpenDialog(const QString& caption, const QString& dir,
     return assetDialog(map);
 }
 
+ModalDialogListener* OffscreenUi::assetOpenDialogAsync(const QString& caption, const QString& dir, const QString& filter, QString* selectedFilter, QFileDialog::Options options) {
+    // ATP equivalent of fileOpenDialog().
+    if (QThread::currentThread() != thread()) {
+        ModalDialogListener* ret;
+        BLOCKING_INVOKE_METHOD(this, "assetOpenDialogAsync",
+            Q_RETURN_ARG(ModalDialogListener*, ret),
+            Q_ARG(QString, caption),
+            Q_ARG(QString, dir),
+            Q_ARG(QString, filter),
+            Q_ARG(QString*, selectedFilter),
+            Q_ARG(QFileDialog::Options, options));
+        return ret;
+    }
+
+    // FIXME support returning the selected filter... somehow?
+    QVariantMap map;
+    map.insert("caption", caption);
+    map.insert("dir", dir);
+    map.insert("filter", filter);
+    map.insert("options", static_cast<int>(options));
+    return assetDialogAsync(map);
+}
+
 QString OffscreenUi::getOpenAssetName(void* ignored, const QString &caption, const QString &dir, const QString &filter, QString *selectedFilter, QFileDialog::Options options) {
     // ATP equivalent of getOpenFileName().
+    Q_UNUSED(ignored)
     return DependencyManager::get<OffscreenUi>()->assetOpenDialog(caption, dir, filter, selectedFilter, options);
 }
 
+ModalDialogListener* OffscreenUi::getOpenAssetNameAsync(void* ignored, const QString &caption, const QString &dir, const QString &filter, QString *selectedFilter, QFileDialog::Options options) {
+    // ATP equivalent of getOpenFileName().
+    Q_UNUSED(ignored)
+    return DependencyManager::get<OffscreenUi>()->assetOpenDialogAsync(caption, dir, filter, selectedFilter, options);
+}
+
 bool OffscreenUi::eventFilter(QObject* originalDestination, QEvent* event) {
     if (!filterEnabled(originalDestination, event)) {
         return false;
@@ -836,5 +1103,31 @@ unsigned int OffscreenUi::getMenuUserDataId() const {
     return _vrMenu->_userDataId;
 }
 
-#include "OffscreenUi.moc"
+ModalDialogListener::ModalDialogListener(QQuickItem *dialog) : _dialog(dialog) {
+    if (!dialog) {
+        _finished = true;
+        return;
+    }
+    connect(_dialog, SIGNAL(destroyed()), this, SLOT(onDestroyed()));
+}
 
+ModalDialogListener::~ModalDialogListener() {
+    if (_dialog) {
+        disconnect(_dialog);
+    }
+}
+
+QVariant ModalDialogListener::waitForResult() {
+    while (!_finished) {
+        QCoreApplication::processEvents();
+    }
+    return _result;
+}
+
+void ModalDialogListener::onDestroyed() {
+    _finished = true;
+    disconnect(_dialog);
+    _dialog = nullptr;
+}
+
+#include "OffscreenUi.moc"
diff --git a/libraries/ui/src/OffscreenUi.h b/libraries/ui/src/OffscreenUi.h
index f228f28d5e..93c55d06f7 100644
--- a/libraries/ui/src/OffscreenUi.h
+++ b/libraries/ui/src/OffscreenUi.h
@@ -30,13 +30,34 @@ class VrMenu;
 
 #define OFFSCREEN_VISIBILITY_PROPERTY "shown"
 
+class ModalDialogListener : public QObject {
+    Q_OBJECT
+    friend class OffscreenUi;
+
+protected:
+    ModalDialogListener(QQuickItem* dialog);
+    virtual ~ModalDialogListener();
+    virtual QVariant waitForResult();
+
+signals:
+    void response(const QVariant& value);
+
+protected slots:
+    void onDestroyed();
+
+protected:
+    QQuickItem* _dialog;
+    bool _finished { false };
+    QVariant _result;
+};
+
 class OffscreenUi : public OffscreenQmlSurface, public Dependency {
     Q_OBJECT
 
     friend class VrMenu;
 public:
     OffscreenUi();
-    virtual void create(QOpenGLContext* context) override;
+    virtual void create() override;
     void createDesktop(const QUrl& url);
     void show(const QUrl& url, const QString& name, std::function<void(QQmlContext*, QObject*)> f = [](QQmlContext*, QObject*) {});
     void hide(const QString& name);
@@ -57,6 +78,7 @@ public:
     bool eventFilter(QObject* originalDestination, QEvent* event) override;
     void addMenuInitializer(std::function<void(VrMenu*)> f);
     QObject* getFlags();
+    Q_INVOKABLE bool isPointOnDesktopWindow(QVariant point);
     QQuickItem* getDesktop();
     QQuickItem* getToolWindow();
     QObject* getRootMenu();
@@ -71,6 +93,7 @@ public:
 
     // Message box compatibility
     Q_INVOKABLE QMessageBox::StandardButton messageBox(Icon icon, const QString& title, const QString& text, QMessageBox::StandardButtons buttons, QMessageBox::StandardButton defaultButton);
+    Q_INVOKABLE ModalDialogListener* asyncMessageBox(Icon icon, const QString& title, const QString& text, QMessageBox::StandardButtons buttons, QMessageBox::StandardButton defaultButton);
     // Must be called from the main thread
     QQuickItem* createMessageBox(Icon icon, const QString& title, const QString& text, QMessageBox::StandardButtons buttons, QMessageBox::StandardButton defaultButton);
     // Must be called from the main thread
@@ -88,18 +111,39 @@ public:
         QMessageBox::StandardButton defaultButton = QMessageBox::NoButton) {
         return information(title, text, buttons, defaultButton);
     }
+    static ModalDialogListener* asyncCritical(void* ignored, const QString& title, const QString& text,
+        QMessageBox::StandardButtons buttons = QMessageBox::Ok,
+        QMessageBox::StandardButton defaultButton = QMessageBox::NoButton) {
+        return asyncCritical(title, text, buttons, defaultButton);
+    }
+    static ModalDialogListener* asyncInformation(void* ignored, const QString& title, const QString& text,
+        QMessageBox::StandardButtons buttons = QMessageBox::Ok,
+        QMessageBox::StandardButton defaultButton = QMessageBox::NoButton) {
+        return asyncInformation(title, text, buttons, defaultButton);
+    }
     /// Same design as QMessageBox::question(), will block, returns result
     static QMessageBox::StandardButton question(void* ignored, const QString& title, const QString& text,
         QMessageBox::StandardButtons buttons = QMessageBox::Yes | QMessageBox::No,
         QMessageBox::StandardButton defaultButton = QMessageBox::NoButton) {
         return question(title, text, buttons, defaultButton);
     }
+
+    static ModalDialogListener* asyncQuestion(void* ignored, const QString& title, const QString& text,
+        QMessageBox::StandardButtons buttons = QMessageBox::Yes | QMessageBox::No,
+        QMessageBox::StandardButton defaultButton = QMessageBox::NoButton) {
+        return asyncQuestion(title, text, buttons, defaultButton);
+    }
     /// Same design as QMessageBox::warning(), will block, returns result
     static QMessageBox::StandardButton warning(void* ignored, const QString& title, const QString& text,
         QMessageBox::StandardButtons buttons = QMessageBox::Ok,
         QMessageBox::StandardButton defaultButton = QMessageBox::NoButton) {
         return warning(title, text, buttons, defaultButton);
     }
+    static ModalDialogListener* asyncWarning(void* ignored, const QString& title, const QString& text,
+        QMessageBox::StandardButtons buttons = QMessageBox::Ok,
+        QMessageBox::StandardButton defaultButton = QMessageBox::NoButton) {
+        return asyncWarning(title, text, buttons, defaultButton);
+    }
 
     static QMessageBox::StandardButton critical(const QString& title, const QString& text,
         QMessageBox::StandardButtons buttons = QMessageBox::Ok,
@@ -107,30 +151,55 @@ public:
     static QMessageBox::StandardButton information(const QString& title, const QString& text,
         QMessageBox::StandardButtons buttons = QMessageBox::Ok,
         QMessageBox::StandardButton defaultButton = QMessageBox::NoButton);
+    static ModalDialogListener* asyncCritical(const QString& title, const QString& text,
+        QMessageBox::StandardButtons buttons = QMessageBox::Ok,
+        QMessageBox::StandardButton defaultButton = QMessageBox::NoButton);
+    static ModalDialogListener *asyncInformation(const QString& title, const QString& text,
+        QMessageBox::StandardButtons buttons = QMessageBox::Ok,
+        QMessageBox::StandardButton defaultButton = QMessageBox::NoButton);
     static QMessageBox::StandardButton question(const QString& title, const QString& text,
         QMessageBox::StandardButtons buttons = QMessageBox::Yes | QMessageBox::No,
         QMessageBox::StandardButton defaultButton = QMessageBox::NoButton);
+    static ModalDialogListener* asyncQuestion (const QString& title, const QString& text,
+        QMessageBox::StandardButtons buttons = QMessageBox::Yes | QMessageBox::No,
+        QMessageBox::StandardButton defaultButton = QMessageBox::NoButton);
     static QMessageBox::StandardButton warning(const QString& title, const QString& text,
         QMessageBox::StandardButtons buttons = QMessageBox::Ok,
         QMessageBox::StandardButton defaultButton = QMessageBox::NoButton);
+    static ModalDialogListener *asyncWarning(const QString& title, const QString& text,
+        QMessageBox::StandardButtons buttons = QMessageBox::Ok,
+        QMessageBox::StandardButton defaultButton = QMessageBox::NoButton);
 
     Q_INVOKABLE QString fileOpenDialog(const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = 0, QFileDialog::Options options = 0);
+    Q_INVOKABLE ModalDialogListener* fileOpenDialogAsync(const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = 0, QFileDialog::Options options = 0);
+
     Q_INVOKABLE QString fileSaveDialog(const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = 0, QFileDialog::Options options = 0);
+    Q_INVOKABLE ModalDialogListener* fileSaveDialogAsync(const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = 0, QFileDialog::Options options = 0);
+
     Q_INVOKABLE QString existingDirectoryDialog(const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = 0, QFileDialog::Options options = 0);
+    Q_INVOKABLE ModalDialogListener* existingDirectoryDialogAsync(const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = 0, QFileDialog::Options options = 0);
 
     Q_INVOKABLE QString assetOpenDialog(const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = 0, QFileDialog::Options options = 0);
+    Q_INVOKABLE ModalDialogListener* assetOpenDialogAsync(const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = 0, QFileDialog::Options options = 0);
 
     // Compatibility with QFileDialog::getOpenFileName
-    static QString getOpenFileName(void* ignored, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = 0, QFileDialog::Options options = 0);
+    static QString getOpenFileName(void* ignored, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = 0, QFileDialog::Options options = 0);    
+    static ModalDialogListener* getOpenFileNameAsync(void* ignored, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = 0, QFileDialog::Options options = 0);
+
     // Compatibility with QFileDialog::getSaveFileName
     static QString getSaveFileName(void* ignored, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = 0, QFileDialog::Options options = 0);
+    static ModalDialogListener* getSaveFileNameAsync(void* ignored, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = 0, QFileDialog::Options options = 0);
     // Compatibility with QFileDialog::getExistingDirectory
     static QString getExistingDirectory(void* ignored, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = 0, QFileDialog::Options options = 0);
+    static ModalDialogListener* getExistingDirectoryAsync(void* ignored, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = 0, QFileDialog::Options options = 0);
 
     static QString getOpenAssetName(void* ignored, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = 0, QFileDialog::Options options = 0);
+    static ModalDialogListener* getOpenAssetNameAsync(void* ignored, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = 0, QFileDialog::Options options = 0);
 
     Q_INVOKABLE QVariant inputDialog(const Icon icon, const QString& title, const QString& label = QString(), const QVariant& current = QVariant());
+    Q_INVOKABLE ModalDialogListener* inputDialogAsync(const Icon icon, const QString& title, const QString& label = QString(), const QVariant& current = QVariant());
     Q_INVOKABLE QVariant customInputDialog(const Icon icon, const QString& title, const QVariantMap& config);
+    Q_INVOKABLE ModalDialogListener* customInputDialogAsync(const Icon icon, const QString& title, const QVariantMap& config);
     QQuickItem* createInputDialog(const Icon icon, const QString& title, const QString& label, const QVariant& current);
     QQuickItem* createCustomInputDialog(const Icon icon, const QString& title, const QVariantMap& config);
     QVariant waitForInputDialogResult(QQuickItem* inputDialog);
@@ -148,21 +217,47 @@ public:
         return getItem(OffscreenUi::ICON_NONE, title, label, items, current, editable, ok);
     }
 
+    // Compatibility with QInputDialog::getText
+    static ModalDialogListener* getTextAsync(void* ignored, const QString & title, const QString & label,
+        QLineEdit::EchoMode mode = QLineEdit::Normal, const QString & text = QString(), bool * ok = 0,
+        Qt::WindowFlags flags = 0, Qt::InputMethodHints inputMethodHints = Qt::ImhNone) {
+        return getTextAsync(OffscreenUi::ICON_NONE, title, label, text);
+    }
+    // Compatibility with QInputDialog::getItem
+    static ModalDialogListener* getItemAsync(void *ignored, const QString & title, const QString & label, const QStringList & items,
+        int current = 0, bool editable = true, bool * ok = 0, Qt::WindowFlags flags = 0,
+        Qt::InputMethodHints inputMethodHints = Qt::ImhNone) {
+        return getItemAsync(OffscreenUi::ICON_NONE, title, label, items, current, editable);
+    }
+
     static QString getText(const Icon icon, const QString & title, const QString & label, const QString & text = QString(), bool * ok = 0);
     static QString getItem(const Icon icon, const QString & title, const QString & label, const QStringList & items, int current = 0, bool editable = true, bool * ok = 0);
     static QVariant getCustomInfo(const Icon icon, const QString& title, const QVariantMap& config, bool* ok = 0);
+    static ModalDialogListener* getTextAsync(const Icon icon, const QString & title, const QString & label, const QString & text = QString());
+    static ModalDialogListener* getItemAsync(const Icon icon, const QString & title, const QString & label, const QStringList & items, int current = 0, bool editable = true);
+    static ModalDialogListener* getCustomInfoAsync(const Icon icon, const QString& title, const QVariantMap& config);
 
     unsigned int getMenuUserDataId() const;
+    QList<QObject *> &getModalDialogListeners();
 
 signals:
     void showDesktop();
+//    void response(QMessageBox::StandardButton response);
+//    void fileDialogResponse(QString response);
+//    void assetDialogResponse(QString response);
+//    void inputDialogResponse(QVariant response);
+public slots:
+    void removeModalDialog(QObject* modal);
 
 private:
     QString fileDialog(const QVariantMap& properties);
+    ModalDialogListener *fileDialogAsync(const QVariantMap &properties);
     QString assetDialog(const QVariantMap& properties);
+    ModalDialogListener* assetDialogAsync(const QVariantMap& properties);
 
     QQuickItem* _desktop { nullptr };
     QQuickItem* _toolWindow { nullptr };
+    QList<QObject*> _modalDialogListeners;
     std::unordered_map<int, bool> _pressedKeys;
     VrMenu* _vrMenu { nullptr };
     QQueue<std::function<void(VrMenu*)>> _queuedMenuInitializers; 
diff --git a/libraries/ui/src/QmlWebWindowClass.cpp b/libraries/ui/src/QmlWebWindowClass.cpp
index 68bb872667..44a0af7787 100644
--- a/libraries/ui/src/QmlWebWindowClass.cpp
+++ b/libraries/ui/src/QmlWebWindowClass.cpp
@@ -13,6 +13,7 @@
 #include <QtScript/QScriptContext>
 #include <QtScript/QScriptEngine>
 
+#include <shared/QtHelpers.h>
 #include "OffscreenUi.h"
 
 static const char* const URL_PROPERTY = "source";
@@ -21,39 +22,51 @@ static const char* const SCRIPT_PROPERTY = "scriptUrl";
 // Method called by Qt scripts to create a new web window in the overlay
 QScriptValue QmlWebWindowClass::constructor(QScriptContext* context, QScriptEngine* engine) {
     auto properties = parseArguments(context);
-    QmlWebWindowClass* retVal { nullptr };
     auto offscreenUi = DependencyManager::get<OffscreenUi>();
-    offscreenUi->executeOnUiThread([&] {
-        retVal = new QmlWebWindowClass();
-        retVal->initQml(properties);
-    }, true);
+    QmlWebWindowClass* retVal = new QmlWebWindowClass();
     Q_ASSERT(retVal);
+    if (QThread::currentThread() != qApp->thread()) {
+        retVal->moveToThread(qApp->thread());
+        QMetaObject::invokeMethod(retVal, "initQml", Q_ARG(QVariantMap, properties));
+    } else {
+        retVal->initQml(properties);
+    }
     connect(engine, &QScriptEngine::destroyed, retVal, &QmlWindowClass::deleteLater);
     return engine->newQObject(retVal);
 }
 
-QString QmlWebWindowClass::getURL() const {
-    QVariant result = DependencyManager::get<OffscreenUi>()->returnFromUiThread([&]()->QVariant {
-        if (_qmlWindow.isNull()) {
-            return QVariant();
-        }
-        return _qmlWindow->property(URL_PROPERTY);
-    });
-    return result.toString();
+QString QmlWebWindowClass::getURL() {
+    if (QThread::currentThread() != thread()) {
+        QString result;
+        BLOCKING_INVOKE_METHOD(this, "getURL", Q_RETURN_ARG(QString, result));
+        return result;
+    }
+
+    if (_qmlWindow.isNull()) {
+        return QString();
+    }
+        
+    return _qmlWindow->property(URL_PROPERTY).toString();
 }
 
 void QmlWebWindowClass::setURL(const QString& urlString) {
-    DependencyManager::get<OffscreenUi>()->executeOnUiThread([=] {
-        if (!_qmlWindow.isNull()) {
-            _qmlWindow->setProperty(URL_PROPERTY, urlString);
-        }
-    });
+    if (QThread::currentThread() != thread()) {
+        QMetaObject::invokeMethod(this, "setURL", Q_ARG(QString, urlString));
+        return;
+    }
+
+    if (!_qmlWindow.isNull()) {
+        _qmlWindow->setProperty(URL_PROPERTY, urlString);
+    }
 }
 
 void QmlWebWindowClass::setScriptURL(const QString& script) {
-    DependencyManager::get<OffscreenUi>()->executeOnUiThread([=] {
-        if (!_qmlWindow.isNull()) {
-            _qmlWindow->setProperty(SCRIPT_PROPERTY, script);
-        }
-    });
+    if (QThread::currentThread() != thread()) {
+        QMetaObject::invokeMethod(this, "setScriptURL", Q_ARG(QString, script));
+        return;
+    }
+
+    if (!_qmlWindow.isNull()) {
+        _qmlWindow->setProperty(SCRIPT_PROPERTY, script);
+    }
 }
diff --git a/libraries/ui/src/QmlWebWindowClass.h b/libraries/ui/src/QmlWebWindowClass.h
index 15ebe74a4f..cdc07265cd 100644
--- a/libraries/ui/src/QmlWebWindowClass.h
+++ b/libraries/ui/src/QmlWebWindowClass.h
@@ -20,7 +20,7 @@ public:
     static QScriptValue constructor(QScriptContext* context, QScriptEngine* engine);
 
 public slots:
-    QString getURL() const;
+    QString getURL();
     void setURL(const QString& url);
     void setScriptURL(const QString& script);
 
diff --git a/libraries/ui/src/QmlWindowClass.cpp b/libraries/ui/src/QmlWindowClass.cpp
index f5bb880957..14d8ec8985 100644
--- a/libraries/ui/src/QmlWindowClass.cpp
+++ b/libraries/ui/src/QmlWindowClass.cpp
@@ -23,6 +23,7 @@
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
 
+#include <shared/QtHelpers.h>
 #include "OffscreenUi.h"
 
 static const char* const SOURCE_PROPERTY = "source";
@@ -73,13 +74,15 @@ QVariantMap QmlWindowClass::parseArguments(QScriptContext* context) {
 // Method called by Qt scripts to create a new web window in the overlay
 QScriptValue QmlWindowClass::constructor(QScriptContext* context, QScriptEngine* engine) {
     auto properties = parseArguments(context);
-    QmlWindowClass* retVal { nullptr };
     auto offscreenUi = DependencyManager::get<OffscreenUi>();
-    offscreenUi->executeOnUiThread([&] {
-        retVal = new QmlWindowClass();
-        retVal->initQml(properties);
-    }, true);
+    QmlWindowClass* retVal = new QmlWindowClass();
     Q_ASSERT(retVal);
+    if (QThread::currentThread() != qApp->thread()) {
+        retVal->moveToThread(qApp->thread());
+        BLOCKING_INVOKE_METHOD(retVal, "initQml", Q_ARG(QVariantMap, properties));
+    } else {
+        retVal->initQml(properties);
+    }
     connect(engine, &QScriptEngine::destroyed, retVal, &QmlWindowClass::deleteLater);
     return engine->newQObject(retVal);
 }
@@ -90,9 +93,10 @@ QmlWindowClass::QmlWindowClass() {
 
 void QmlWindowClass::initQml(QVariantMap properties) {
     auto offscreenUi = DependencyManager::get<OffscreenUi>();
-    _toolWindow = properties.contains(TOOLWINDOW_PROPERTY) && properties[TOOLWINDOW_PROPERTY].toBool();
     _source = properties[SOURCE_PROPERTY].toString();
 
+#if QML_TOOL_WINDOW
+    _toolWindow = properties.contains(TOOLWINDOW_PROPERTY) && properties[TOOLWINDOW_PROPERTY].toBool();
     if (_toolWindow) {
         // Build the event bridge and wrapper on the main thread
         _qmlWindow = offscreenUi->getToolWindow();
@@ -103,10 +107,11 @@ void QmlWindowClass::initQml(QVariantMap properties) {
             Q_ARG(QVariant, QVariant::fromValue(properties)));
         Q_ASSERT(invokeResult);
     } else {
+#endif
         // Build the event bridge and wrapper on the main thread
         offscreenUi->loadInNewContext(qmlSource(), [&](QQmlContext* context, QObject* object) {
             _qmlWindow = object;
-            context->setContextProperty("eventBridge", this);
+            context->setContextProperty(EVENT_BRIDGE_PROPERTY, this);
             context->engine()->setObjectOwnership(this, QQmlEngine::CppOwnership);
             context->engine()->setObjectOwnership(object, QQmlEngine::CppOwnership);
             if (properties.contains(TITLE_PROPERTY)) {
@@ -133,7 +138,9 @@ void QmlWindowClass::initQml(QVariantMap properties) {
                 connect(_qmlWindow, SIGNAL(moved(QVector2D)), this, SLOT(hasMoved(QVector2D)), Qt::QueuedConnection);
             connect(_qmlWindow, SIGNAL(windowClosed()), this, SLOT(hasClosed()), Qt::QueuedConnection);
         });
+#if QML_TOOL_WINDOW
     }
+#endif
     Q_ASSERT(_qmlWindow);
     Q_ASSERT(dynamic_cast<const QQuickItem*>(_qmlWindow.data()));
 }
@@ -207,56 +214,77 @@ QmlWindowClass::~QmlWindowClass() {
 }
 
 QQuickItem* QmlWindowClass::asQuickItem() const {
+#if QML_TOOL_WINDOW
     if (_toolWindow) {
         return DependencyManager::get<OffscreenUi>()->getToolWindow();
     }
+#endif
     return _qmlWindow.isNull() ? nullptr : dynamic_cast<QQuickItem*>(_qmlWindow.data());
 }
 
 void QmlWindowClass::setVisible(bool visible) {
+    if (QThread::currentThread() != thread()) {
+        QMetaObject::invokeMethod(this, "setVisible", Q_ARG(bool, visible));
+        return;
+    }
+
     QQuickItem* targetWindow = asQuickItem();
+#if QML_TOOL_WINDOW
     if (_toolWindow) {
         // For tool window tabs we special case visibility as a function call on the tab parent
         // The tool window itself has special logic based on whether any tabs are visible
         QMetaObject::invokeMethod(targetWindow, "showTabForUrl", Qt::QueuedConnection, Q_ARG(QVariant, _source), Q_ARG(QVariant, visible));
-    } else {
-        DependencyManager::get<OffscreenUi>()->executeOnUiThread([=] {
-            targetWindow->setProperty(OFFSCREEN_VISIBILITY_PROPERTY, visible);
-        });
+        return;
+    } 
+#endif
+    targetWindow->setProperty(OFFSCREEN_VISIBILITY_PROPERTY, visible);
+}
+
+bool QmlWindowClass::isVisible() {
+    if (QThread::currentThread() != thread()) {
+        bool result = false;
+        BLOCKING_INVOKE_METHOD(this, "isVisible", Q_RETURN_ARG(bool, result));
+        return result;
     }
-}
 
-bool QmlWindowClass::isVisible() const {
     // The tool window itself has special logic based on whether any tabs are enabled
-    return DependencyManager::get<OffscreenUi>()->returnFromUiThread([&] {
-        if (_qmlWindow.isNull()) {
-            return QVariant::fromValue(false);
-        }
-        if (_toolWindow) {
-            return QVariant::fromValue(dynamic_cast<QQuickItem*>(_qmlWindow.data())->isEnabled());
-        } else {
-            return QVariant::fromValue(asQuickItem()->isVisible());
-        }
-    }).toBool();
+    if (_qmlWindow.isNull()) {
+        return false;
+    }
+
+#if QML_TOOL_WINDOW
+    if (_toolWindow) {
+        return dynamic_cast<QQuickItem*>(_qmlWindow.data())->isEnabled();
+    } 
+#endif
+
+    return asQuickItem()->isVisible();
 }
 
-glm::vec2 QmlWindowClass::getPosition() const {
-    QVariant result = DependencyManager::get<OffscreenUi>()->returnFromUiThread([&]()->QVariant {
-        if (_qmlWindow.isNull()) {
-            return QVariant(QPointF(0, 0));
-        }
-        return asQuickItem()->position();
-    });
-    return toGlm(result.toPointF());
+glm::vec2 QmlWindowClass::getPosition() {
+    if (QThread::currentThread() != thread()) {
+        vec2 result;
+        BLOCKING_INVOKE_METHOD(this, "getPosition", Q_RETURN_ARG(vec2, result));
+        return result;
+    }
+
+    if (_qmlWindow.isNull()) {
+        return {};
+    }
+
+    return toGlm(asQuickItem()->position());
 }
 
 
 void QmlWindowClass::setPosition(const glm::vec2& position) {
-    DependencyManager::get<OffscreenUi>()->executeOnUiThread([=] {
-        if (!_qmlWindow.isNull()) {
-            asQuickItem()->setPosition(QPointF(position.x, position.y));
-        }
-    });
+    if (QThread::currentThread() != thread()) {
+        QMetaObject::invokeMethod(this, "setPosition", Q_ARG(vec2, position));
+        return;
+    }
+
+    if (!_qmlWindow.isNull()) {
+        asQuickItem()->setPosition(QPointF(position.x, position.y));
+    }
 }
 
 void QmlWindowClass::setPosition(int x, int y) {
@@ -268,23 +296,29 @@ glm::vec2 toGlm(const QSizeF& size) {
     return glm::vec2(size.width(), size.height());
 }
 
-glm::vec2 QmlWindowClass::getSize() const {
-    QVariant result = DependencyManager::get<OffscreenUi>()->returnFromUiThread([&]()->QVariant {
-        if (_qmlWindow.isNull()) {
-            return QVariant(QSizeF(0, 0));
-        }
-        QQuickItem* targetWindow = asQuickItem();
-        return QSizeF(targetWindow->width(), targetWindow->height());
-    });
-    return toGlm(result.toSizeF());
+glm::vec2 QmlWindowClass::getSize() {
+    if (QThread::currentThread() != thread()) {
+        vec2 result;
+        BLOCKING_INVOKE_METHOD(this, "getSize", Q_RETURN_ARG(vec2, result));
+        return result;
+    }
+
+    if (_qmlWindow.isNull()) {
+        return {};
+    }
+    QQuickItem* targetWindow = asQuickItem();
+    return vec2(targetWindow->width(), targetWindow->height());
 }
 
 void QmlWindowClass::setSize(const glm::vec2& size) {
-    DependencyManager::get<OffscreenUi>()->executeOnUiThread([=] {
-        if (!_qmlWindow.isNull()) {
-            asQuickItem()->setSize(QSizeF(size.x, size.y));
-        }
-    });
+    if (QThread::currentThread() != thread()) {
+        QMetaObject::invokeMethod(this, "setSize", Q_ARG(vec2, size));
+        return;
+    }
+
+    if (!_qmlWindow.isNull()) {
+        asQuickItem()->setSize(QSizeF(size.x, size.y));
+    }
 }
 
 void QmlWindowClass::setSize(int width, int height) {
@@ -292,28 +326,37 @@ void QmlWindowClass::setSize(int width, int height) {
 }
 
 void QmlWindowClass::setTitle(const QString& title) {
-    DependencyManager::get<OffscreenUi>()->executeOnUiThread([=] {
-        if (!_qmlWindow.isNull()) {
-            asQuickItem()->setProperty(TITLE_PROPERTY, title);
-        }
-    });
+    if (QThread::currentThread() != thread()) {
+        QMetaObject::invokeMethod(this, "setTitle", Q_ARG(QString, title));
+        return;
+    }
+
+    if (!_qmlWindow.isNull()) {
+        asQuickItem()->setProperty(TITLE_PROPERTY, title);
+    }
 }
 
 void QmlWindowClass::close() {
-    if (_qmlWindow) {
-        if (_toolWindow) {
-            auto offscreenUi = DependencyManager::get<OffscreenUi>();
-            offscreenUi->executeOnUiThread([=] {
-                auto toolWindow = offscreenUi->getToolWindow();
-                auto invokeResult = QMetaObject::invokeMethod(toolWindow, "removeTabForUrl", Qt::DirectConnection,
-                    Q_ARG(QVariant, _source));
-                Q_ASSERT(invokeResult);
-            });
-        } else {
-            _qmlWindow->deleteLater();
-        }
-        _qmlWindow = nullptr;
+    if (QThread::currentThread() != thread()) {
+        QMetaObject::invokeMethod(this, "close");
+        return;
     }
+
+#if QML_TOOL_WINDOW
+    if (_toolWindow) {
+        auto offscreenUi = DependencyManager::get<OffscreenUi>();
+        auto toolWindow = offscreenUi->getToolWindow();
+        auto invokeResult = QMetaObject::invokeMethod(toolWindow, "removeTabForUrl", Qt::DirectConnection,
+            Q_ARG(QVariant, _source));
+        Q_ASSERT(invokeResult);
+        return;
+    } 
+#endif
+
+    if (_qmlWindow) {
+        _qmlWindow->deleteLater();
+    }
+    _qmlWindow = nullptr;
 }
 
 void QmlWindowClass::hasMoved(QVector2D position) {
@@ -325,10 +368,13 @@ void QmlWindowClass::hasClosed() {
 }
 
 void QmlWindowClass::raise() {
+    if (QThread::currentThread() != thread()) {
+        QMetaObject::invokeMethod(this, "raise");
+        return;
+    }
+
     auto offscreenUi = DependencyManager::get<OffscreenUi>();
-    offscreenUi->executeOnUiThread([=] {
-        if (!_qmlWindow.isNull()) {
-            QMetaObject::invokeMethod(asQuickItem(), "raise", Qt::DirectConnection);
-        }
-    });
+    if (_qmlWindow) {
+        QMetaObject::invokeMethod(asQuickItem(), "raise", Qt::DirectConnection);
+    }
 }
diff --git a/libraries/ui/src/QmlWindowClass.h b/libraries/ui/src/QmlWindowClass.h
index 4f604133a5..e01bc8f14b 100644
--- a/libraries/ui/src/QmlWindowClass.h
+++ b/libraries/ui/src/QmlWindowClass.h
@@ -19,6 +19,8 @@
 class QScriptEngine;
 class QScriptContext;
 
+#define QML_TOOL_WINDOW 0
+
 // FIXME refactor this class to be a QQuickItem derived type and eliminate the needless wrapping 
 class QmlWindowClass : public QObject {
     Q_OBJECT
@@ -31,18 +33,18 @@ public:
     QmlWindowClass();
     ~QmlWindowClass();
 
-    virtual void initQml(QVariantMap properties);
+    Q_INVOKABLE virtual void initQml(QVariantMap properties);
     QQuickItem* asQuickItem() const;
 
 public slots:
-    bool isVisible() const;
+    bool isVisible();
     void setVisible(bool visible);
 
-    glm::vec2 getPosition() const;
+    glm::vec2 getPosition();
     void setPosition(const glm::vec2& position);
     void setPosition(int x, int y);
 
-    glm::vec2 getSize() const;
+    glm::vec2 getSize();
     void setSize(const glm::vec2& size);
     void setSize(int width, int height);
     void setTitle(const QString& title);
@@ -85,9 +87,12 @@ protected:
 
     virtual QString qmlSource() const { return "QmlWindow.qml"; }
 
+#if QML_TOOL_WINDOW
     // FIXME needs to be initialized in the ctor once we have support
     // for tool window panes in QML
     bool _toolWindow { false };
+#endif
+
     QPointer<QObject> _qmlWindow;
     QString _source;
 
diff --git a/libraries/ui/src/VrMenu.cpp b/libraries/ui/src/VrMenu.cpp
index 3959e950e9..12cb7e2e4b 100644
--- a/libraries/ui/src/VrMenu.cpp
+++ b/libraries/ui/src/VrMenu.cpp
@@ -26,12 +26,14 @@ static unsigned int USER_DATA_ID = 0;
 // and qml object and inject the pointer into both objects
 class MenuUserData : public QObjectUserData {
 public:
-    MenuUserData(QAction* action, QObject* qmlObject) {
+    MenuUserData(QAction* action, QObject* qmlObject, QObject* qmlParent) {
         if (!USER_DATA_ID) {
             USER_DATA_ID = DependencyManager::get<OffscreenUi>()->getMenuUserDataId();
         }
         _action = action;
         _qml = qmlObject;
+        _qmlParent = qmlParent;
+
         action->setUserData(USER_DATA_ID, this);
         qmlObject->setUserData(USER_DATA_ID, this);
         qmlObject->setObjectName(uuid.toString());
@@ -43,6 +45,41 @@ public:
         _shutdownConnection = QObject::connect(qApp, &QCoreApplication::aboutToQuit, [=] {
             QObject::disconnect(_changedConnection);
         });
+
+        class ExclusionGroupSetter : public QObject {
+        public:
+            ExclusionGroupSetter(QObject* from, QObject* to, QObject* qmlParent) : QObject(from), _from(from), _to(to), _qmlParent(qmlParent) {
+                _from->installEventFilter(this);
+            }
+
+            ~ExclusionGroupSetter() {
+                _from->removeEventFilter(this);
+            }
+        protected:
+            virtual bool eventFilter(QObject* o, QEvent* e) override {
+                if (e->type() == QEvent::DynamicPropertyChange) {
+                    QDynamicPropertyChangeEvent* dpc = static_cast<QDynamicPropertyChangeEvent*>(e);
+                    if (dpc->propertyName() == "exclusionGroup")
+                    {
+                        // unfortunately Qt doesn't support passing dynamic properties between C++ / QML, so we have to use this ugly helper function
+                        QMetaObject::invokeMethod(_qmlParent,
+                            "addExclusionGroup",
+                            Qt::DirectConnection,
+                            Q_ARG(QVariant, QVariant::fromValue(_to)),
+                            Q_ARG(QVariant, _from->property(dpc->propertyName())));
+                    }
+                }
+
+                return QObject::eventFilter(o, e);
+            }
+
+        private:
+            QObject* _from;
+            QObject* _to;
+            QObject* _qmlParent;
+        };
+
+        new ExclusionGroupSetter(action, qmlObject, qmlParent);
     }
 
     ~MenuUserData() {
@@ -110,6 +147,7 @@ private:
     QMetaObject::Connection _changedConnection;
     QAction* _action { nullptr };
     QObject* _qml { nullptr };
+    QObject* _qmlParent{ nullptr };
 };
 
 
@@ -132,7 +170,7 @@ void VrMenu::addMenu(QMenu* menu) {
     QObject* parent = menu->parent();
     QObject* qmlParent = nullptr;
     QMenu* parentMenu = dynamic_cast<QMenu*>(parent);
-    if (parentMenu) {
+    if (parentMenu && menu->menuAction()) {
         MenuUserData* userData = MenuUserData::forObject(parentMenu->menuAction());
         if (!userData) {
             return;
@@ -157,16 +195,16 @@ void VrMenu::addMenu(QMenu* menu) {
     }
 
     // Bind the QML and Widget together
-    new MenuUserData(menu->menuAction(), result);
+    new MenuUserData(menu->menuAction(), result, qmlParent);
 }
 
-void bindActionToQmlAction(QObject* qmlAction, QAction* action) {
+void bindActionToQmlAction(QObject* qmlAction, QAction* action, QObject* qmlParent) {
     auto text = action->text();
     if (text == "Login") {
         qDebug(uiLogging) << "Login action " << action;
     }
 
-    new MenuUserData(action, qmlAction);
+    new MenuUserData(action, qmlAction, qmlParent);
     QObject::connect(action, &QAction::toggled, [=](bool checked) {
         qmlAction->setProperty("checked", checked);
     });
@@ -195,7 +233,7 @@ void VrMenu::addAction(QMenu* menu, QAction* action) {
     QObject* result = reinterpret_cast<QObject*>(returnedValue); // returnedValue.value<QObject*>();
     Q_ASSERT(result);
     // Bind the QML and Widget together
-    bindActionToQmlAction(result, action);
+    bindActionToQmlAction(result, action, _rootMenu);
 }
 
 void VrMenu::addSeparator(QMenu* menu) {
@@ -231,7 +269,7 @@ void VrMenu::insertAction(QAction* before, QAction* action) {
     Q_ASSERT(invokeResult);
     QObject* result = reinterpret_cast<QObject*>(returnedValue); // returnedValue.value<QObject*>();
     Q_ASSERT(result);
-    bindActionToQmlAction(result, action);
+    bindActionToQmlAction(result, action, _rootMenu);
 }
 
 class QQuickMenuBase;
diff --git a/libraries/ui/src/ui/ImageProvider.cpp b/libraries/ui/src/ui/ImageProvider.cpp
new file mode 100644
index 0000000000..7bbad43f2e
--- /dev/null
+++ b/libraries/ui/src/ui/ImageProvider.cpp
@@ -0,0 +1,59 @@
+//
+//  ImageProvider.cpp
+//  interface/src/ui
+//
+//  Created by David Kelly on 8/23/2017.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include "ImageProvider.h"
+
+#include <QReadLocker>
+#include <QWriteLocker>
+
+const QString ImageProvider::PROVIDER_NAME = "security";
+QReadWriteLock ImageProvider::_rwLock;
+QPixmap* ImageProvider::_securityImage = nullptr;
+
+ImageProvider::~ImageProvider() {
+    QWriteLocker lock(&_rwLock);
+    if (_securityImage) {
+        delete _securityImage;
+        _securityImage = nullptr;
+    }
+}
+
+void ImageProvider::setSecurityImage(const QPixmap* pixmap) {
+    // no need to delete old one, that is managed by the wallet
+    QWriteLocker lock(&_rwLock);
+    if (_securityImage) {
+        delete _securityImage;
+    }
+    if (pixmap) {
+        _securityImage = new QPixmap(*pixmap);
+    } else {
+        _securityImage = nullptr;
+    }
+}
+
+QPixmap ImageProvider::requestPixmap(const QString& id, QSize* size, const QSize& requestedSize) {
+
+    // adjust the internal pixmap to have the requested size
+    QReadLocker lock(&_rwLock);
+    if (id == "securityImage" && _securityImage) {
+        *size = _securityImage->size();
+        if (requestedSize.width() > 0 && requestedSize.height() > 0) {
+            return _securityImage->scaled(requestedSize.width(), requestedSize.height(), Qt::KeepAspectRatio);
+        } else {
+            return _securityImage->copy();
+        }
+    }
+    // otherwise just return a grey pixmap.  This avoids annoying error messages in qml we would get
+    // when sending a 'null' pixmap (QPixmap())
+    QPixmap greyPixmap(200, 200);
+    greyPixmap.fill(QColor("darkGrey"));
+    return greyPixmap;
+}
diff --git a/libraries/ui/src/ui/ImageProvider.h b/libraries/ui/src/ui/ImageProvider.h
new file mode 100644
index 0000000000..0093b60655
--- /dev/null
+++ b/libraries/ui/src/ui/ImageProvider.h
@@ -0,0 +1,34 @@
+//
+// ImageProvider.h
+//
+// Created by David Kelly on 2017/08/23
+// Copyright 2017 High Fidelity, Inc.
+
+// Distributed under the Apache License, Version 2.0
+// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#pragma once
+#ifndef hifi_ImageProvider_h
+#define hifi_ImageProvider_h
+
+#include <QQuickImageProvider>
+#include <QReadWriteLock>
+
+class ImageProvider: public QQuickImageProvider {
+public:
+    static const QString PROVIDER_NAME;
+
+    ImageProvider() : QQuickImageProvider(QQuickImageProvider::Pixmap) {}
+    virtual ~ImageProvider();
+    QPixmap requestPixmap(const QString& id, QSize* size, const QSize& requestedSize) override;
+
+    void setSecurityImage(const QPixmap* pixmap);
+protected:
+    static QReadWriteLock _rwLock;
+    static QPixmap* _securityImage;
+
+};
+
+#endif //hifi_ImageProvider_h
+
diff --git a/libraries/ui/src/ui/Menu.cpp b/libraries/ui/src/ui/Menu.cpp
index 7511448c38..4e61eba28f 100644
--- a/libraries/ui/src/ui/Menu.cpp
+++ b/libraries/ui/src/ui/Menu.cpp
@@ -13,12 +13,12 @@
 #include <QtWidgets/QShortcut>
 
 #include <SettingHandle.h>
+#include <shared/QtHelpers.h>
 
 #include "../VrMenu.h"
 #include "../OffscreenUi.h"
 
 #include "Logging.h"
-
 using namespace ui;
 
 static QList<QString> groups;
@@ -246,7 +246,7 @@ void Menu::removeAction(MenuWrapper* menu, const QString& actionName) {
 
 void Menu::setIsOptionChecked(const QString& menuOption, bool isChecked) {
     if (thread() != QThread::currentThread()) {
-        QMetaObject::invokeMethod(this, "setIsOptionChecked", Qt::BlockingQueuedConnection,
+        BLOCKING_INVOKE_METHOD(this, "setIsOptionChecked",
                     Q_ARG(const QString&, menuOption),
                     Q_ARG(bool, isChecked));
         return;
diff --git a/libraries/ui/src/ui/OffscreenQmlSurface.cpp b/libraries/ui/src/ui/OffscreenQmlSurface.cpp
index 648bdad1bf..01f8f4580a 100644
--- a/libraries/ui/src/ui/OffscreenQmlSurface.cpp
+++ b/libraries/ui/src/ui/OffscreenQmlSurface.cpp
@@ -6,6 +6,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 #include "OffscreenQmlSurface.h"
+#include "ImageProvider.h"
 
 // Has to come before Qt GL includes
 #include <gl/Config.h>
@@ -25,6 +26,8 @@
 #include <QtCore/QWaitCondition>
 
 #include <shared/NsightHelpers.h>
+#include <shared/GlobalAppProperties.h>
+#include <shared/QtHelpers.h>
 #include <PerfStat.h>
 #include <DependencyManager.h>
 #include <NumericalConstants.h>
@@ -34,15 +37,14 @@
 #include <AccountManager.h>
 #include <NetworkAccessManager.h>
 #include <GLMHelpers.h>
-#include <shared/GlobalAppProperties.h>
 
 #include <gl/OffscreenGLCanvas.h>
 #include <gl/GLHelpers.h>
 #include <gl/Context.h>
+#include <shared/ReadWriteLockable.h>
 
 #include "types/FileTypeProfile.h"
 #include "types/HFWebEngineProfile.h"
-#include "types/HFTabletWebEngineProfile.h"
 #include "types/SoundEffect.h"
 
 #include "Logging.h"
@@ -51,6 +53,53 @@ Q_LOGGING_CATEGORY(trace_render_qml, "trace.render.qml")
 Q_LOGGING_CATEGORY(trace_render_qml_gl, "trace.render.qml.gl")
 Q_LOGGING_CATEGORY(offscreenFocus, "hifi.offscreen.focus")
 
+
+class OffscreenQmlWhitelist : public Dependency, private ReadWriteLockable {
+    SINGLETON_DEPENDENCY
+
+public:
+
+    void addWhitelistContextHandler(const std::initializer_list<QUrl>& urls, const QmlContextCallback& callback) {
+        withWriteLock([&] {
+            for (const auto& url : urls) {
+                _callbacks[url].push_back(callback);
+            }
+        });
+    }
+
+    QList<QmlContextCallback> getCallbacksForUrl(const QUrl& url) const {
+        return resultWithReadLock<QList<QmlContextCallback>>([&] {
+            QList<QmlContextCallback> result;
+            auto itr = _callbacks.find(url);
+            if (_callbacks.end() != itr) {
+                result = *itr;
+            }
+            return result;
+        });
+    }
+
+private:
+    
+    QHash<QUrl, QList<QmlContextCallback>> _callbacks;
+};
+
+QSharedPointer<OffscreenQmlWhitelist> getQmlWhitelist() {
+    static std::once_flag once;
+    std::call_once(once, [&] {
+        DependencyManager::set<OffscreenQmlWhitelist>();
+    });
+
+    return DependencyManager::get<OffscreenQmlWhitelist>();
+}
+
+
+void OffscreenQmlSurface::addWhitelistContextHandler(const std::initializer_list<QUrl>& urls, const QmlContextCallback& callback) {
+    getQmlWhitelist()->addWhitelistContextHandler(urls, callback);
+}
+
+
+QmlContextCallback OffscreenQmlSurface::DEFAULT_CONTEXT_CALLBACK = [](QQmlContext*, QObject*) {};
+
 struct TextureSet {
     // The number of surfaces with this size
     size_t count { 0 };
@@ -184,7 +233,7 @@ private:
             GLuint texture = textureAndFence.first;
             uvec2 size = _textureSizes[texture];
             auto sizeKey = uvec2ToUint64(size);
-            // Textures can be returned after all surfaces of the given size have been destroyed, 
+            // Textures can be returned after all surfaces of the given size have been destroyed,
             // in which case we just destroy the texture
             if (!_textures.count(sizeKey)) {
                 destroy(textureAndFence);
@@ -210,12 +259,12 @@ class UrlHandler : public QObject {
 public:
     Q_INVOKABLE bool canHandleUrl(const QString& url) {
         static auto handler = dynamic_cast<AbstractUriHandler*>(qApp);
-        return handler->canAcceptURL(url);
+        return handler && handler->canAcceptURL(url);
     }
 
     Q_INVOKABLE bool handleUrl(const QString& url) {
         static auto handler = dynamic_cast<AbstractUriHandler*>(qApp);
-        return handler->acceptURL(url);
+        return handler && handler->acceptURL(url);
     }
 };
 
@@ -263,9 +312,6 @@ QNetworkAccessManager* QmlNetworkAccessManagerFactory::create(QObject* parent) {
     return new QmlNetworkAccessManager(parent);
 }
 
-static QQmlEngine* globalEngine { nullptr };
-static size_t globalEngineRefCount { 0 };
-
 QString getEventBridgeJavascript() {
     // FIXME: Refactor with similar code in RenderableWebEntityItem
     QString javaScriptToInject;
@@ -300,8 +346,47 @@ private:
 
 
 
+#define SINGLE_QML_ENGINE 0
+
+#if SINGLE_QML_ENGINE
+static QQmlEngine* globalEngine{ nullptr };
+static size_t globalEngineRefCount{ 0 };
+#endif
+
+void initializeQmlEngine(QQmlEngine* engine, QQuickWindow* window) {
+    // register the pixmap image provider (used only for security image, for now)
+    engine->addImageProvider(ImageProvider::PROVIDER_NAME, new ImageProvider());
+
+    engine->setNetworkAccessManagerFactory(new QmlNetworkAccessManagerFactory);
+    auto importList = engine->importPathList();
+    importList.insert(importList.begin(), PathUtils::resourcesPath());
+    engine->setImportPathList(importList);
+    for (const auto& path : importList) {
+        qDebug() << path;
+    }
+
+    if (!engine->incubationController()) {
+        engine->setIncubationController(window->incubationController());
+    }
+    auto rootContext = engine->rootContext();
+    rootContext->setContextProperty("GL", ::getGLContextData());
+    rootContext->setContextProperty("urlHandler", new UrlHandler());
+    rootContext->setContextProperty("resourceDirectoryUrl", QUrl::fromLocalFile(PathUtils::resourcesPath()));
+    rootContext->setContextProperty("pathToFonts", "../../");
+    rootContext->setContextProperty("ApplicationInterface", qApp);
+    auto javaScriptToInject = getEventBridgeJavascript();
+    if (!javaScriptToInject.isEmpty()) {
+        rootContext->setContextProperty("eventBridgeJavaScriptToInject", QVariant(javaScriptToInject));
+    }
+    rootContext->setContextProperty("FileTypeProfile", new FileTypeProfile(rootContext));
+    rootContext->setContextProperty("HFWebEngineProfile", new HFWebEngineProfile(rootContext));
+    rootContext->setContextProperty("Paths", DependencyManager::get<PathUtils>().data());
+}
+
 QQmlEngine* acquireEngine(QQuickWindow* window) {
     Q_ASSERT(QThread::currentThread() == qApp->thread());
+
+    QQmlEngine* result = nullptr;
     if (QThread::currentThread() != qApp->thread()) {
         qCWarning(uiLogging) << "Cannot acquire QML engine on any thread but the main thread";
     }
@@ -310,47 +395,43 @@ QQmlEngine* acquireEngine(QQuickWindow* window) {
         qmlRegisterType<SoundEffect>("Hifi", 1, 0, "SoundEffect");
     });
 
+
+#if SINGLE_QML_ENGINE
     if (!globalEngine) {
         Q_ASSERT(0 == globalEngineRefCount);
         globalEngine = new QQmlEngine();
-        globalEngine->setNetworkAccessManagerFactory(new QmlNetworkAccessManagerFactory);
-
-        auto importList = globalEngine->importPathList();
-        importList.insert(importList.begin(), PathUtils::resourcesPath());
-        globalEngine->setImportPathList(importList);
-        for (const auto& path : importList) {
-            qDebug() << path;
-        }
-
-        if (!globalEngine->incubationController()) {
-            globalEngine->setIncubationController(window->incubationController());
-        }
-        auto rootContext = globalEngine->rootContext();
-        rootContext->setContextProperty("GL", ::getGLContextData());
-        rootContext->setContextProperty("urlHandler", new UrlHandler());
-        rootContext->setContextProperty("resourceDirectoryUrl", QUrl::fromLocalFile(PathUtils::resourcesPath()));
-        rootContext->setContextProperty("pathToFonts", "../../");
-        rootContext->setContextProperty("ApplicationInterface", qApp);
-        auto javaScriptToInject = getEventBridgeJavascript();
-        if (!javaScriptToInject.isEmpty()) {
-            rootContext->setContextProperty("eventBridgeJavaScriptToInject", QVariant(javaScriptToInject));
-        }
-        rootContext->setContextProperty("FileTypeProfile", new FileTypeProfile(rootContext));
-        rootContext->setContextProperty("HFWebEngineProfile", new HFWebEngineProfile(rootContext));
-        rootContext->setContextProperty("HFTabletWebEngineProfile", new HFTabletWebEngineProfile(rootContext));
+        initializeQmlEngine(result, window);
+        ++globalEngineRefCount;
     }
+    result = globalEngine;
+#else
+    result = new QQmlEngine();
+    initializeQmlEngine(result, window);
+#endif
 
-    ++globalEngineRefCount;
-    return globalEngine;
+    return result;
 }
 
-void releaseEngine() {
+void releaseEngine(QQmlEngine* engine) {
     Q_ASSERT(QThread::currentThread() == qApp->thread());
+#if SINGLE_QML_ENGINE
     Q_ASSERT(0 != globalEngineRefCount);
     if (0 == --globalEngineRefCount) {
         globalEngine->deleteLater();
         globalEngine = nullptr;
     }
+#else
+    engine->deleteLater();
+#endif
+}
+
+#define OFFSCREEN_QML_SHARED_CONTEXT_PROPERTY "com.highfidelity.qml.gl.sharedContext"
+void OffscreenQmlSurface::setSharedContext(QOpenGLContext* sharedContext) {
+    qApp->setProperty(OFFSCREEN_QML_SHARED_CONTEXT_PROPERTY, QVariant::fromValue<void*>(sharedContext));
+}
+
+QOpenGLContext* OffscreenQmlSurface::getSharedContext() {
+    return static_cast<QOpenGLContext*>(qApp->property(OFFSCREEN_QML_SHARED_CONTEXT_PROPERTY).value<void*>());
 }
 
 void OffscreenQmlSurface::cleanup() {
@@ -374,9 +455,9 @@ void OffscreenQmlSurface::cleanup() {
 }
 
 void OffscreenQmlSurface::render() {
-#ifdef HIFI_ENABLE_NSIGHT_DEBUG
-    return;
-#endif
+    if (nsightActive()) {
+        return;
+    }
     if (_paused) {
         return;
     }
@@ -435,8 +516,8 @@ std::function<void(uint32_t, void*)> OffscreenQmlSurface::getDiscardLambda() {
 }
 
 bool OffscreenQmlSurface::allowNewFrame(uint8_t fps) {
-    // If we already have a pending texture, don't render another one 
-    // i.e. don't render faster than the consumer context, since it wastes 
+    // If we already have a pending texture, don't render another one
+    // i.e. don't render faster than the consumer context, since it wastes
     // GPU cycles on producing output that will never be seen
     if (0 != _latestTextureAndFence.first) {
         return false;
@@ -455,11 +536,11 @@ OffscreenQmlSurface::~OffscreenQmlSurface() {
     QObject::disconnect(qApp);
 
     cleanup();
-
+    auto engine = _qmlContext->engine();
     _canvas->deleteLater();
     _rootItem->deleteLater();
     _quickWindow->deleteLater();
-    releaseEngine();
+    releaseEngine(engine);
 }
 
 void OffscreenQmlSurface::onAboutToQuit() {
@@ -467,7 +548,7 @@ void OffscreenQmlSurface::onAboutToQuit() {
     QObject::disconnect(&_updateTimer);
 }
 
-void OffscreenQmlSurface::create(QOpenGLContext* shareContext) {
+void OffscreenQmlSurface::create() {
     qCDebug(uiLogging) << "Building QML surface";
 
     _renderControl = new QMyQuickRenderControl();
@@ -488,15 +569,22 @@ void OffscreenQmlSurface::create(QOpenGLContext* shareContext) {
     _renderControl->_renderWindow = _proxyWindow;
 
     _canvas = new OffscreenGLCanvas();
-    if (!_canvas->create(shareContext)) {
+    if (!_canvas->create(getSharedContext())) {
         qFatal("Failed to create OffscreenGLCanvas");
         return;
     };
 
     connect(_quickWindow, &QQuickWindow::focusObjectChanged, this, &OffscreenQmlSurface::onFocusObjectChanged);
 
+    // acquireEngine interrogates the GL context, so we need to have the context current here
+    if (!_canvas->makeCurrent()) {
+        qFatal("Failed to make context current for QML Renderer");
+        return;
+    }
+    
     // Create a QML engine.
     auto qmlEngine = acquireEngine(_quickWindow);
+
     _qmlContext = new QQmlContext(qmlEngine->rootContext());
 
     _qmlContext->setContextProperty("offscreenWindow", QVariant::fromValue(getWindow()));
@@ -506,11 +594,6 @@ void OffscreenQmlSurface::create(QOpenGLContext* shareContext) {
     // FIXME Compatibility mechanism for existing HTML and JS that uses eventBridgeWrapper
     // Find a way to flag older scripts using this mechanism and wanr that this is deprecated
     _qmlContext->setContextProperty("eventBridgeWrapper", new EventBridgeWrapper(this, _qmlContext));
-
-    if (!_canvas->makeCurrent()) {
-        qWarning("Failed to make context current for QML Renderer");
-        return;
-    }
     _renderControl->initialize(_canvas->getContext());
 
     // When Quick says there is a need to render, we will not render immediately. Instead,
@@ -605,18 +688,26 @@ void OffscreenQmlSurface::setBaseUrl(const QUrl& baseUrl) {
     _qmlContext->setBaseUrl(baseUrl);
 }
 
-QObject* OffscreenQmlSurface::load(const QUrl& qmlSource, bool createNewContext, std::function<void(QQmlContext*, QObject*)> f) {
+void OffscreenQmlSurface::load(const QUrl& qmlSource, bool createNewContext, const QmlContextCallback& onQmlLoadedCallback) {
     if (QThread::currentThread() != thread()) {
         qCWarning(uiLogging) << "Called load on a non-surface thread";
     }
     // Synchronous loading may take a while; restart the deadlock timer
     QMetaObject::invokeMethod(qApp, "updateHeartbeat", Qt::DirectConnection);
 
+    // Get any whitelist functionality
+    QList<QmlContextCallback> callbacks = getQmlWhitelist()->getCallbacksForUrl(qmlSource);
+    // If we have whitelisted content, we must load a new context
+    createNewContext |= !callbacks.empty();
+    callbacks.push_back(onQmlLoadedCallback);
+
     QQmlContext* targetContext = _qmlContext;
     if (_rootItem && createNewContext) {
         targetContext = new QQmlContext(targetContext);
     }
 
+
+    // FIXME eliminate loading of relative file paths for QML
     QUrl finalQmlSource = qmlSource;
     if ((qmlSource.isRelative() && !qmlSource.isEmpty()) || qmlSource.scheme() == QLatin1String("file")) {
         finalQmlSource = _qmlContext->resolvedUrl(qmlSource);
@@ -624,39 +715,41 @@ QObject* OffscreenQmlSurface::load(const QUrl& qmlSource, bool createNewContext,
 
     auto qmlComponent = new QQmlComponent(_qmlContext->engine(), finalQmlSource, QQmlComponent::PreferSynchronous);
     if (qmlComponent->isLoading()) {
-        connect(qmlComponent, &QQmlComponent::statusChanged, this,
-            [this, qmlComponent, targetContext, f](QQmlComponent::Status) {
-            finishQmlLoad(qmlComponent, targetContext, f);
+        connect(qmlComponent, &QQmlComponent::statusChanged, this, [=](QQmlComponent::Status) { 
+            finishQmlLoad(qmlComponent, targetContext, callbacks);
         });
-        return nullptr;
+        return;
     }
 
-    return finishQmlLoad(qmlComponent, targetContext, f);
+    finishQmlLoad(qmlComponent, targetContext, callbacks);
 }
 
-QObject* OffscreenQmlSurface::loadInNewContext(const QUrl& qmlSource, std::function<void(QQmlContext*, QObject*)> f) {
-    return load(qmlSource, true, f);
+void OffscreenQmlSurface::loadInNewContext(const QUrl& qmlSource, const QmlContextCallback& onQmlLoadedCallback) {
+    load(qmlSource, true, onQmlLoadedCallback);
 }
 
-QObject* OffscreenQmlSurface::load(const QUrl& qmlSource, std::function<void(QQmlContext*, QObject*)> f) {
-    return load(qmlSource, false, f);
+void OffscreenQmlSurface::load(const QUrl& qmlSource, const QmlContextCallback& onQmlLoadedCallback) {
+    load(qmlSource, false, onQmlLoadedCallback);
+}
+
+void OffscreenQmlSurface::load(const QString& qmlSourceFile, const QmlContextCallback& onQmlLoadedCallback)  {
+    return load(QUrl(qmlSourceFile), onQmlLoadedCallback);
 }
 
 void OffscreenQmlSurface::clearCache() {
     _qmlContext->engine()->clearComponentCache();
 }
 
-QObject* OffscreenQmlSurface::finishQmlLoad(QQmlComponent* qmlComponent, QQmlContext* qmlContext, std::function<void(QQmlContext*, QObject*)> f) {
+void OffscreenQmlSurface::finishQmlLoad(QQmlComponent* qmlComponent, QQmlContext* qmlContext, const QList<QmlContextCallback>& callbacks) {
     disconnect(qmlComponent, &QQmlComponent::statusChanged, this, 0);
     if (qmlComponent->isError()) {
         for (const auto& error : qmlComponent->errors()) {
             qCWarning(uiLogging) << error.url() << error.line() << error;
         }
         qmlComponent->deleteLater();
-        return nullptr;
+        return;
     }
 
-
     QObject* newObject = qmlComponent->beginCreate(qmlContext);
     if (qmlComponent->isError()) {
         for (const auto& error : qmlComponent->errors()) {
@@ -666,11 +759,26 @@ QObject* OffscreenQmlSurface::finishQmlLoad(QQmlComponent* qmlComponent, QQmlCon
             qFatal("Unable to finish loading QML root");
         }
         qmlComponent->deleteLater();
-        return nullptr;
+        return;
     }
 
     qmlContext->engine()->setObjectOwnership(this, QQmlEngine::CppOwnership);
-    f(qmlContext, newObject);
+
+    // All quick items should be focusable
+    QQuickItem* newItem = qobject_cast<QQuickItem*>(newObject);
+    if (newItem) {
+        // Make sure we make items focusable (critical for
+        // supporting keyboard shortcuts)
+        newItem->setFlag(QQuickItem::ItemIsFocusScope, true);
+    }
+
+    // Make sure we will call callback for this codepath
+    // Call this before qmlComponent->completeCreate() otherwise ghost window appears
+    if (newItem && _rootItem) {
+        for (const auto& callback : callbacks) {
+            callback(qmlContext, newObject);
+        }
+    }
 
     QObject* eventBridge = qmlContext->contextProperty("eventBridge").value<QObject*>();
     if (qmlContext != _qmlContext && eventBridge && eventBridge != this) {
@@ -682,29 +790,20 @@ QObject* OffscreenQmlSurface::finishQmlLoad(QQmlComponent* qmlComponent, QQmlCon
     qmlComponent->completeCreate();
     qmlComponent->deleteLater();
 
-
-    // All quick items should be focusable
-    QQuickItem* newItem = qobject_cast<QQuickItem*>(newObject);
-    if (newItem) {
-        // Make sure we make items focusable (critical for
-        // supporting keyboard shortcuts)
-        newItem->setFlag(QQuickItem::ItemIsFocusScope, true);
-    }
-
     // If we already have a root, just set a couple of flags and the ancestry
-    if (_rootItem) {
+    if (newItem && _rootItem) {
         // Allow child windows to be destroyed from JS
         QQmlEngine::setObjectOwnership(newObject, QQmlEngine::JavaScriptOwnership);
         newObject->setParent(_rootItem);
         if (newItem) {
             newItem->setParentItem(_rootItem);
         }
-        return newObject;
+        return;
     }
 
     if (!newItem) {
         qFatal("Could not load object as root item");
-        return nullptr;
+        return;
     }
 
     connect(newItem, SIGNAL(sendToScript(QVariant)), this, SIGNAL(fromQml(QVariant)));
@@ -713,7 +812,11 @@ QObject* OffscreenQmlSurface::finishQmlLoad(QQmlComponent* qmlComponent, QQmlCon
     _rootItem = newItem;
     _rootItem->setParentItem(_quickWindow->contentItem());
     _rootItem->setSize(_quickWindow->renderTargetSize());
-    return _rootItem;
+
+    // Call this callback after rootitem is set, otherwise VrMenu wont work
+    for (const auto& callback : callbacks) {
+        callback(qmlContext, newObject);
+    }
 }
 
 void OffscreenQmlSurface::updateQuick() {
@@ -788,7 +891,7 @@ bool OffscreenQmlSurface::eventFilter(QObject* originalDestination, QEvent* even
     switch (event->type()) {
         case QEvent::Resize: {
             QResizeEvent* resizeEvent = static_cast<QResizeEvent*>(event);
-            QWidget* widget = dynamic_cast<QWidget*>(originalDestination);
+            QWidget* widget = static_cast<QWidget*>(originalDestination);
             if (widget) {
                 this->resize(resizeEvent->size());
             }
@@ -830,7 +933,9 @@ bool OffscreenQmlSurface::eventFilter(QObject* originalDestination, QEvent* even
                     mouseEvent->screenPos(), mouseEvent->button(),
                     mouseEvent->buttons(), mouseEvent->modifiers());
             if (event->type() == QEvent::MouseMove) {
-                _qmlContext->setContextProperty("lastMousePosition", transformedPos);
+                // TODO - this line necessary for the QML Tooltop to work (which is not currently being used), but it causes interface to crash on launch on a fresh install
+                // need to investigate into why this crash is happening.
+                //_qmlContext->setContextProperty("lastMousePosition", transformedPos);
             }
             mappedEvent.ignore();
             if (QCoreApplication::sendEvent(_quickWindow, &mappedEvent)) {
@@ -886,34 +991,12 @@ QQmlContext* OffscreenQmlSurface::getSurfaceContext() {
     return _qmlContext;
 }
 
-void OffscreenQmlSurface::executeOnUiThread(std::function<void()> function, bool blocking ) {
-    if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "executeOnUiThread", blocking ? Qt::BlockingQueuedConnection : Qt::QueuedConnection,
-            Q_ARG(std::function<void()>, function));
-        return;
-    }
-
-    function();
-}
-
-QVariant OffscreenQmlSurface::returnFromUiThread(std::function<QVariant()> function) {
-    if (QThread::currentThread() != thread()) {
-        QVariant result;
-        QMetaObject::invokeMethod(this, "returnFromUiThread", Qt::BlockingQueuedConnection,
-            Q_RETURN_ARG(QVariant, result),
-            Q_ARG(std::function<QVariant()>, function));
-        return result;
-    }
-
-    return function();
-}
-
 void OffscreenQmlSurface::focusDestroyed(QObject *obj) {
     _currentFocusItem = nullptr;
 }
 
 void OffscreenQmlSurface::onFocusObjectChanged(QObject* object) {
-    QQuickItem* item = dynamic_cast<QQuickItem*>(object);
+    QQuickItem* item = static_cast<QQuickItem*>(object);
     if (!item) {
         setFocusText(false);
         _currentFocusItem = nullptr;
@@ -955,6 +1038,7 @@ static const uint8_t BACKSPACE_SYMBOL[] = { 0xE2, 0x86, 0x90, 0x00 };
 static const uint8_t LEFT_ARROW[] = { 0xE2, 0x9D, 0xAC, 0x00 };
 static const uint8_t RIGHT_ARROW[] = { 0xE2, 0x9D, 0xAD, 0x00 };
 static const uint8_t RETURN_SYMBOL[] = { 0xE2, 0x8F, 0x8E, 0x00 };
+static const uint8_t COLLAPSE_KEYBOARD[] = { 0xEE, 0x80, 0xAB, 0x00 };
 static const char PUNCTUATION_STRING[] = "123";
 static const char ALPHABET_STRING[] = "abc";
 
@@ -968,8 +1052,8 @@ static bool equals(const QByteArray& byteArray, const uint8_t* ptr) {
     return ptr[i] == 0x00;
 }
 
-void OffscreenQmlSurface::synthesizeKeyPress(QString key) {
-    auto eventHandler = getEventHandler();
+void OffscreenQmlSurface::synthesizeKeyPress(QString key, QObject* targetOverride) {
+    auto eventHandler = targetOverride ? targetOverride : getEventHandler();
     if (eventHandler) {
         auto utf8Key = key.toUtf8();
 
@@ -978,6 +1062,9 @@ void OffscreenQmlSurface::synthesizeKeyPress(QString key) {
         if (equals(utf8Key, SHIFT_ARROW) || equals(utf8Key, NUMERIC_SHIFT_ARROW) ||
             equals(utf8Key, (uint8_t*)PUNCTUATION_STRING) || equals(utf8Key, (uint8_t*)ALPHABET_STRING)) {
             return;  // ignore
+        } else if (equals(utf8Key, COLLAPSE_KEYBOARD)) {
+            lowerKeyboard();
+            return;
         } else if (equals(utf8Key, BACKSPACE_SYMBOL)) {
             scanCode = Qt::Key_Backspace;
             keyString = "\x08";
@@ -999,7 +1086,23 @@ void OffscreenQmlSurface::synthesizeKeyPress(QString key) {
     }
 }
 
-void OffscreenQmlSurface::setKeyboardRaised(QObject* object, bool raised, bool numeric) {
+void OffscreenQmlSurface::lowerKeyboard() {
+
+    QSignalBlocker blocker(_quickWindow);
+
+    if (_currentFocusItem) {
+        _currentFocusItem->setFocus(false);
+        setKeyboardRaised(_currentFocusItem, false);
+    }
+}
+
+void OffscreenQmlSurface::setKeyboardRaised(QObject* object, bool raised, bool numeric, bool passwordField) {
+    qCDebug(uiLogging) << "setKeyboardRaised: " << object << ", raised: " << raised << ", numeric: " << numeric << ", password: " << passwordField;
+
+#if Q_OS_ANDROID
+    return;
+#endif
+
     if (!object) {
         return;
     }
@@ -1007,15 +1110,33 @@ void OffscreenQmlSurface::setKeyboardRaised(QObject* object, bool raised, bool n
     // if HMD is being worn, allow keyboard to open.  allow it to close, HMD or not.
     if (!raised || qApp->property(hifi::properties::HMD).toBool()) {
         QQuickItem* item = dynamic_cast<QQuickItem*>(object);
+        if (!item) {
+            return;
+        }
+
+        // for future probably makes sense to consider one of the following:
+        // 1. make keyboard a singleton, which will be dynamically re-parented before showing
+        // 2. track currently visible keyboard somewhere, allow to subscribe for this signal
+        // any of above should also eliminate need in duplicated properties and code below
+
         while (item) {
             // Numeric value may be set in parameter from HTML UI; for QML UI, detect numeric fields here.
             numeric = numeric || QString(item->metaObject()->className()).left(7) == "SpinBox";
 
             if (item->property("keyboardRaised").isValid()) {
+
                 // FIXME - HMD only: Possibly set value of "keyboardEnabled" per isHMDMode() for use in WebView.qml.
                 if (item->property("punctuationMode").isValid()) {
                     item->setProperty("punctuationMode", QVariant(numeric));
                 }
+                if (item->property("passwordField").isValid()) {
+                    item->setProperty("passwordField", QVariant(passwordField));
+                }
+
+                if (raised) {
+                    item->setProperty("keyboardRaised", QVariant(!raised));
+                }
+
                 item->setProperty("keyboardRaised", QVariant(raised));
                 return;
             }
@@ -1040,9 +1161,13 @@ void OffscreenQmlSurface::emitWebEvent(const QVariant& message) {
         const QString RAISE_KEYBOARD = "_RAISE_KEYBOARD";
         const QString RAISE_KEYBOARD_NUMERIC = "_RAISE_KEYBOARD_NUMERIC";
         const QString LOWER_KEYBOARD = "_LOWER_KEYBOARD";
+        const QString RAISE_KEYBOARD_NUMERIC_PASSWORD = "_RAISE_KEYBOARD_NUMERIC_PASSWORD";
+        const QString RAISE_KEYBOARD_PASSWORD = "_RAISE_KEYBOARD_PASSWORD";
         QString messageString = message.type() == QVariant::String ? message.toString() : "";
         if (messageString.left(RAISE_KEYBOARD.length()) == RAISE_KEYBOARD) {
-            setKeyboardRaised(_currentFocusItem, true, messageString == RAISE_KEYBOARD_NUMERIC);
+            bool numeric = (messageString == RAISE_KEYBOARD_NUMERIC || messageString == RAISE_KEYBOARD_NUMERIC_PASSWORD);
+            bool passwordField = (messageString == RAISE_KEYBOARD_PASSWORD || messageString == RAISE_KEYBOARD_NUMERIC_PASSWORD);
+            setKeyboardRaised(_currentFocusItem, true, numeric, passwordField);
         } else if (messageString == LOWER_KEYBOARD) {
             setKeyboardRaised(_currentFocusItem, false);
         } else {
@@ -1060,4 +1185,5 @@ void OffscreenQmlSurface::sendToQml(const QVariant& message) {
     }
 }
 
+
 #include "OffscreenQmlSurface.moc"
diff --git a/libraries/ui/src/ui/OffscreenQmlSurface.h b/libraries/ui/src/ui/OffscreenQmlSurface.h
index ae81ae48b4..5acdeb4f40 100644
--- a/libraries/ui/src/ui/OffscreenQmlSurface.h
+++ b/libraries/ui/src/ui/OffscreenQmlSurface.h
@@ -35,30 +35,32 @@ class QQuickItem;
 // one copy in flight, and one copy being used by the receiver
 #define GPU_RESOURCE_BUFFER_SIZE 3
 
+using QmlContextCallback = std::function<void(QQmlContext*, QObject*)>;
+
 class OffscreenQmlSurface : public QObject {
     Q_OBJECT
     Q_PROPERTY(bool focusText READ isFocusText NOTIFY focusTextChanged)
 public:
+    static void setSharedContext(QOpenGLContext* context);
+
+    static QmlContextCallback DEFAULT_CONTEXT_CALLBACK;
+    static void addWhitelistContextHandler(const std::initializer_list<QUrl>& urls, const QmlContextCallback& callback);
+    static void addWhitelistContextHandler(const QUrl& url, const QmlContextCallback& callback) { addWhitelistContextHandler({ { url } }, callback); };
+
     OffscreenQmlSurface();
     virtual ~OffscreenQmlSurface();
 
     using MouseTranslator = std::function<QPoint(const QPointF&)>;
 
-    virtual void create(QOpenGLContext* context);
+    virtual void create();
     void resize(const QSize& size, bool forceResize = false);
     QSize size() const;
 
-    Q_INVOKABLE QObject* load(const QUrl& qmlSource, bool createNewContext, std::function<void(QQmlContext*, QObject*)> f = [](QQmlContext*, QObject*) {});
-    Q_INVOKABLE QObject* loadInNewContext(const QUrl& qmlSource, std::function<void(QQmlContext*, QObject*)> f = [](QQmlContext*, QObject*) {});
-    Q_INVOKABLE QObject* load(const QUrl& qmlSource, std::function<void(QQmlContext*, QObject*)> f = [](QQmlContext*, QObject*) {});
-    Q_INVOKABLE QObject* load(const QString& qmlSourceFile, std::function<void(QQmlContext*, QObject*)> f = [](QQmlContext*, QObject*) {}) {
-        return load(QUrl(qmlSourceFile), f);
-    }
+    Q_INVOKABLE void load(const QUrl& qmlSource, bool createNewContext, const QmlContextCallback& onQmlLoadedCallback = DEFAULT_CONTEXT_CALLBACK);
+    Q_INVOKABLE void loadInNewContext(const QUrl& qmlSource, const QmlContextCallback& onQmlLoadedCallback = DEFAULT_CONTEXT_CALLBACK);
+    Q_INVOKABLE void load(const QUrl& qmlSource, const QmlContextCallback& onQmlLoadedCallback = DEFAULT_CONTEXT_CALLBACK);
+    Q_INVOKABLE void load(const QString& qmlSourceFile, const QmlContextCallback& onQmlLoadedCallback = DEFAULT_CONTEXT_CALLBACK);
     void clearCache();
-
-    Q_INVOKABLE void executeOnUiThread(std::function<void()> function, bool blocking = false);
-    Q_INVOKABLE QVariant returnFromUiThread(std::function<QVariant()> function);
-
     void setMaxFps(uint8_t maxFps) { _maxFps = maxFps; }
     // Optional values for event handling
     void setProxyWindow(QWindow* window);
@@ -80,8 +82,9 @@ public:
     QPointF mapToVirtualScreen(const QPointF& originalPoint, QObject* originalWidget);
     bool eventFilter(QObject* originalDestination, QEvent* event) override;
 
-    void setKeyboardRaised(QObject* object, bool raised, bool numeric = false);
-    Q_INVOKABLE void synthesizeKeyPress(QString key);
+    void setKeyboardRaised(QObject* object, bool raised, bool numeric = false, bool passwordField = false);
+    Q_INVOKABLE void synthesizeKeyPress(QString key, QObject* targetOverride = nullptr);
+    Q_INVOKABLE void lowerKeyboard();
 
     using TextureAndFence = std::pair<uint32_t, void*>;
     // Checks to see if a new texture is available.  If one is, the function returns true and 
@@ -120,7 +123,9 @@ protected:
     void setFocusText(bool newFocusText);
 
 private:
-    QObject* finishQmlLoad(QQmlComponent* qmlComponent, QQmlContext* qmlContext, std::function<void(QQmlContext*, QObject*)> f);
+    static QOpenGLContext* getSharedContext();
+
+    void finishQmlLoad(QQmlComponent* qmlComponent, QQmlContext* qmlContext, const QList<QmlContextCallback>& callbacks);
     QPointF mapWindowToUi(const QPointF& sourcePosition, QObject* sourceObject);
     void setupFbo();
     bool allowNewFrame(uint8_t fps);
diff --git a/libraries/ui/src/ui/OffscreenQmlSurfaceCache.cpp b/libraries/ui/src/ui/OffscreenQmlSurfaceCache.cpp
index c047738e77..2a0ca4a2e9 100644
--- a/libraries/ui/src/ui/OffscreenQmlSurfaceCache.cpp
+++ b/libraries/ui/src/ui/OffscreenQmlSurfaceCache.cpp
@@ -44,13 +44,10 @@ void OffscreenQmlSurfaceCache::release(const QString& rootSource, const QSharedP
 
 QSharedPointer<OffscreenQmlSurface> OffscreenQmlSurfaceCache::buildSurface(const QString& rootSource) {
     auto surface = QSharedPointer<OffscreenQmlSurface>(new OffscreenQmlSurface());
-    QOpenGLContext* currentContext = QOpenGLContext::currentContext();
-    QSurface* currentSurface = currentContext->surface();
-    surface->create(currentContext);
+    surface->create();
     surface->setBaseUrl(QUrl::fromLocalFile(PathUtils::resourcesPath() + "/qml/"));
     surface->load(rootSource);
     surface->resize(QSize(100, 100));
-    currentContext->makeCurrent(currentSurface);
     return surface;
 }
 
diff --git a/libraries/ui/src/ui/QmlWrapper.cpp b/libraries/ui/src/ui/QmlWrapper.cpp
index 518a05613a..3879e1bc8f 100644
--- a/libraries/ui/src/ui/QmlWrapper.cpp
+++ b/libraries/ui/src/ui/QmlWrapper.cpp
@@ -11,6 +11,8 @@
 #include <QtCore/QThread>
 #include <QtCore/QCoreApplication>
 
+#include <shared/QtHelpers.h>
+
 QmlWrapper::QmlWrapper(QObject* qmlObject, QObject* parent)
     : QObject(parent), _qmlObject(qmlObject) {
     Q_ASSERT(QThread::currentThread() == qApp->thread());
@@ -36,7 +38,7 @@ void QmlWrapper::writeProperties(QVariant propertyMap) {
 QVariant QmlWrapper::readProperty(const QString& propertyName) {
     if (QThread::currentThread() != thread()) {
         QVariant result;
-        QMetaObject::invokeMethod(this, "readProperty", Qt::BlockingQueuedConnection, Q_RETURN_ARG(QVariant, result), Q_ARG(QString, propertyName));
+        BLOCKING_INVOKE_METHOD(this, "readProperty", Q_RETURN_ARG(QVariant, result), Q_ARG(QString, propertyName));
         return result;
     }
 
@@ -46,7 +48,7 @@ QVariant QmlWrapper::readProperty(const QString& propertyName) {
 QVariant QmlWrapper::readProperties(const QVariant& propertyList) {
     if (QThread::currentThread() != thread()) {
         QVariant result;
-        QMetaObject::invokeMethod(this, "readProperties", Qt::BlockingQueuedConnection, Q_RETURN_ARG(QVariant, result), Q_ARG(QVariant, propertyList));
+        BLOCKING_INVOKE_METHOD(this, "readProperties", Q_RETURN_ARG(QVariant, result), Q_ARG(QVariant, propertyList));
         return result;
     }
 
diff --git a/libraries/ui/src/ui/TabletScriptingInterface.cpp b/libraries/ui/src/ui/TabletScriptingInterface.cpp
index 1e426dd8f0..b9da230715 100644
--- a/libraries/ui/src/ui/TabletScriptingInterface.cpp
+++ b/libraries/ui/src/ui/TabletScriptingInterface.cpp
@@ -11,6 +11,7 @@
 #include <QtCore/QThread>
 #include <QtQml/QQmlProperty>
 
+#include <shared/QtHelpers.h>
 #include <PathUtils.h>
 #include <DependencyManager.h>
 #include <AccountManager.h>
@@ -22,16 +23,28 @@
 #include "ToolbarScriptingInterface.h"
 #include "Logging.h"
 
+#include <AudioInjector.h>
+
+#include "SettingHandle.h"
+
 // FIXME move to global app properties
 const QString SYSTEM_TOOLBAR = "com.highfidelity.interface.toolbar.system";
 const QString SYSTEM_TABLET = "com.highfidelity.interface.tablet.system";
+const QString TabletScriptingInterface::QML = "hifi/tablet/TabletRoot.qml";
+
+
+static Setting::Handle<QStringList> tabletSoundsButtonClick("TabletSounds", QStringList { "/sounds/Button06.wav",
+                                                                               "/sounds/Button04.wav",
+                                                                               "/sounds/Button07.wav",
+                                                                               "/sounds/Tab01.wav",
+                                                                               "/sounds/Tab02.wav" });
 
 TabletScriptingInterface::TabletScriptingInterface() {
-    qCDebug(uiLogging) << "Building tablet scripting interface";
+    qmlRegisterType<TabletScriptingInterface>("TabletScriptingInterface", 1, 0, "TabletEnums");
 }
 
 TabletScriptingInterface::~TabletScriptingInterface() {
-    qCDebug(uiLogging) << "Destroying tablet scripting interface";
+    tabletSoundsButtonClick.set(tabletSoundsButtonClick.get());
 }
 
 ToolbarProxy* TabletScriptingInterface::getSystemToolbarProxy() {
@@ -42,7 +55,7 @@ ToolbarProxy* TabletScriptingInterface::getSystemToolbarProxy() {
 TabletProxy* TabletScriptingInterface::getTablet(const QString& tabletId) {
     TabletProxy* tabletProxy = nullptr;
     if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "getTablet", Qt::BlockingQueuedConnection, Q_RETURN_ARG(TabletProxy*, tabletProxy), Q_ARG(QString, tabletId));
+        BLOCKING_INVOKE_METHOD(this, "getTablet", Q_RETURN_ARG(TabletProxy*, tabletProxy), Q_ARG(QString, tabletId));
         return tabletProxy;
     } 
 
@@ -62,6 +75,29 @@ TabletProxy* TabletScriptingInterface::getTablet(const QString& tabletId) {
     return tabletProxy;
 }
 
+void TabletScriptingInterface::preloadSounds() {
+    //preload audio events
+    const QStringList &audioSettings = tabletSoundsButtonClick.get();
+    for (int i = 0; i < TabletAudioEvents::Last; i++) {
+        QFileInfo inf = QFileInfo(PathUtils::resourcesPath() + audioSettings.at(i));
+        SharedSoundPointer sound = DependencyManager::get<SoundCache>()->
+                getSound(QUrl::fromLocalFile(inf.absoluteFilePath()));
+        _audioEvents.insert(static_cast<TabletAudioEvents>(i), sound);
+    }
+}
+
+void TabletScriptingInterface::playSound(TabletAudioEvents aEvent) {
+    SharedSoundPointer sound = _audioEvents[aEvent];
+    if (sound) {
+        AudioInjectorOptions options;
+        options.stereo = sound->isStereo();
+        options.ambisonic = sound->isAmbisonic();
+        options.localOnly = true;
+
+        AudioInjectorPointer injector = AudioInjector::playSoundAndDelete(sound->getByteArray(), options);
+    }
+}
+
 void TabletScriptingInterface::setToolbarMode(bool toolbarMode) {
     Q_ASSERT(QThread::currentThread() == qApp->thread());
     _toolbarMode = toolbarMode;
@@ -186,13 +222,14 @@ TabletProxy::TabletProxy(QObject* parent, const QString& name) : QObject(parent)
     if (QThread::currentThread() != qApp->thread()) {
         qCWarning(uiLogging) << "Creating tablet proxy on wrong thread " << _name;
     }
+    connect(this, &TabletProxy::tabletShownChanged, this, &TabletProxy::onTabletShown);
 }
 
 TabletProxy::~TabletProxy() {
-    qCDebug(uiLogging) << "Destroying tablet proxy " << _name;
     if (QThread::currentThread() != thread()) {
         qCWarning(uiLogging) << "Destroying tablet proxy on wrong thread" << _name;
     }
+    disconnect(this, &TabletProxy::tabletShownChanged, this, &TabletProxy::onTabletShown);
 }
 
 void TabletProxy::setToolbarMode(bool toolbarMode) {
@@ -207,32 +244,38 @@ void TabletProxy::setToolbarMode(bool toolbarMode) {
 
     _toolbarMode = toolbarMode;
 
+    auto offscreenUi = DependencyManager::get<OffscreenUi>();
+
     if (toolbarMode) {
         removeButtonsFromHomeScreen();
         addButtonsToToolbar();
 
         // create new desktop window
-        auto offscreenUi = DependencyManager::get<OffscreenUi>();
-        offscreenUi->executeOnUiThread([=] {
-            auto tabletRootWindow = new TabletRootWindow();
-            tabletRootWindow->initQml(QVariantMap());
-            auto quickItem = tabletRootWindow->asQuickItem();
-            _desktopWindow = tabletRootWindow;
-            QMetaObject::invokeMethod(quickItem, "setShown", Q_ARG(const QVariant&, QVariant(false)));
+        auto tabletRootWindow = new TabletRootWindow();
+        tabletRootWindow->initQml(QVariantMap());
+        auto quickItem = tabletRootWindow->asQuickItem();
+        _desktopWindow = tabletRootWindow;
+        QMetaObject::invokeMethod(quickItem, "setShown", Q_ARG(const QVariant&, QVariant(false)));
 
-            QObject::connect(quickItem, SIGNAL(windowClosed()), this, SLOT(desktopWindowClosed()));
+        QObject::connect(quickItem, SIGNAL(windowClosed()), this, SLOT(desktopWindowClosed()));
 
-            QObject::connect(tabletRootWindow, SIGNAL(webEventReceived(QVariant)), this, SLOT(emitWebEvent(QVariant)), Qt::DirectConnection);
+        QObject::connect(tabletRootWindow, SIGNAL(webEventReceived(QVariant)), this, SLOT(emitWebEvent(QVariant)), Qt::DirectConnection);
 
-            // forward qml surface events to interface js
-            connect(tabletRootWindow, &QmlWindowClass::fromQml, this, &TabletProxy::fromQml);
-        });
+        // forward qml surface events to interface js
+        connect(tabletRootWindow, &QmlWindowClass::fromQml, this, &TabletProxy::fromQml);
     } else {
-        _state = State::Home;
         removeButtonsFromToolbar();
-        addButtonsToHomeScreen();
-        emit screenChanged(QVariant("Home"), QVariant(TABLET_SOURCE_URL));
 
+        if (_currentPathLoaded == TABLET_SOURCE_URL) {
+            addButtonsToHomeScreen();
+        } else {
+            loadHomeScreen(true);
+        }
+        //check if running scripts window opened and save it for reopen in Tablet
+        if (offscreenUi->isVisible("RunningScripts")) {
+            offscreenUi->hide("RunningScripts");
+            _showRunningScripts = true;
+        }
         // destroy desktop window
         if (_desktopWindow) {
             _desktopWindow->deleteLater();
@@ -292,7 +335,7 @@ void TabletProxy::initialScreen(const QVariant& url) {
 bool TabletProxy::isMessageDialogOpen() {
     if (QThread::currentThread() != thread()) {
         bool result = false;
-        QMetaObject::invokeMethod(this, "isMessageDialogOpen", Qt::BlockingQueuedConnection, Q_RETURN_ARG(bool, result));
+        BLOCKING_INVOKE_METHOD(this, "isMessageDialogOpen", Q_RETURN_ARG(bool, result));
         return result;
     }
 
@@ -314,10 +357,20 @@ void TabletProxy::emitWebEvent(const QVariant& msg) {
     emit webEventReceived(msg);
 }
 
+void TabletProxy::onTabletShown() {
+    if (_tabletShown) {
+        static_cast<TabletScriptingInterface*>(parent())->playSound(TabletScriptingInterface::TabletOpen);
+        if (_showRunningScripts) {
+            _showRunningScripts = false;
+            pushOntoStack("../../hifi/dialogs/TabletRunningScripts.qml");
+        }
+    }
+}
+
 bool TabletProxy::isPathLoaded(const QVariant& path) {
     if (QThread::currentThread() != thread()) {
         bool result = false;
-        QMetaObject::invokeMethod(this, "isPathLoaded", Qt::BlockingQueuedConnection, Q_RETURN_ARG(bool, result), Q_ARG(QVariant, path));
+        BLOCKING_INVOKE_METHOD(this, "isPathLoaded", Q_RETURN_ARG(bool, result), Q_ARG(QVariant, path));
         return result;
     }
 
@@ -363,9 +416,16 @@ void TabletProxy::setQmlTabletRoot(OffscreenQmlSurface* qmlOffscreenSurface) {
         });
 
         if (_initialScreen) {
-            pushOntoStack(_initialPath);
+            if (!_showRunningScripts) {
+                pushOntoStack(_initialPath);
+            }
             _initialScreen = false;
         }
+
+        if (_showRunningScripts) {
+            //show Tablet. Make sure, setShown implemented in TabletRoot.qml
+            QMetaObject::invokeMethod(_qmlTabletRoot, "setShown", Q_ARG(const QVariant&, QVariant(true)));
+        }
     } else {
         removeButtonsFromHomeScreen();
         _state = State::Uninitialized;
@@ -405,6 +465,9 @@ void TabletProxy::gotoMenuScreen(const QString& submenu) {
         emit screenChanged(QVariant("Menu"), QVariant(VRMENU_SOURCE_URL));
         _currentPathLoaded = VRMENU_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)));
+        }
     }
 }
 
@@ -424,6 +487,9 @@ 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)));
+        }
     } else {
         qCDebug(uiLogging) << "tablet cannot load QML because _qmlTabletRoot is null";
     }
@@ -450,9 +516,9 @@ void TabletProxy::returnToPreviousApp() {
     }
 }
     
-void TabletProxy::loadQMLSource(const QVariant& path) {
+void TabletProxy::loadQMLSource(const QVariant& path, bool resizable) {
     if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "loadQMLSource", Q_ARG(QVariant, path));
+        QMetaObject::invokeMethod(this, "loadQMLSource", Q_ARG(QVariant, path), Q_ARG(bool, resizable));
         return;
     }
 
@@ -464,14 +530,18 @@ void TabletProxy::loadQMLSource(const QVariant& path) {
     }
 
     if (root) {
-        if (_state != State::QML) {
-            removeButtonsFromHomeScreen();
-            QMetaObject::invokeMethod(root, "loadSource", Q_ARG(const QVariant&, path));
-            _state = State::QML;
+        removeButtonsFromHomeScreen(); //works only in Tablet
+        QMetaObject::invokeMethod(root, "loadSource", Q_ARG(const QVariant&, path));
+        _state = State::QML;
+        if (path != _currentPathLoaded) {
             emit screenChanged(QVariant("QML"), path);
-            _currentPathLoaded = path;
-            QMetaObject::invokeMethod(root, "setShown", Q_ARG(const QVariant&, QVariant(true)));
         }
+        _currentPathLoaded = path;
+        QMetaObject::invokeMethod(root, "setShown", Q_ARG(const QVariant&, QVariant(true)));
+        if (_toolbarMode && _desktopWindow) {
+            QMetaObject::invokeMethod(root, "setResizable", Q_ARG(const QVariant&, QVariant(resizable)));
+        }
+
     } else {
         qCDebug(uiLogging) << "tablet cannot load QML because _qmlTabletRoot is null";
     }
@@ -480,10 +550,15 @@ void TabletProxy::loadQMLSource(const QVariant& path) {
 bool TabletProxy::pushOntoStack(const QVariant& path) {
     if (QThread::currentThread() != thread()) {
         bool result = false;
-        QMetaObject::invokeMethod(this, "pushOntoStack", Qt::BlockingQueuedConnection, Q_RETURN_ARG(bool, result), Q_ARG(QVariant, path));
+        BLOCKING_INVOKE_METHOD(this, "pushOntoStack", Q_RETURN_ARG(bool, result), Q_ARG(QVariant, path));
         return result;
     }
 
+    //set landscape off when pushing menu items while in Create mode
+    if (_landscape) {
+        setLandscape(false);
+    }
+
     QObject* root = nullptr;
     if (!_toolbarMode && _qmlTabletRoot) {
         root = _qmlTabletRoot;
@@ -498,11 +573,14 @@ bool TabletProxy::pushOntoStack(const QVariant& path) {
         } else {
             loadQMLSource(path);
         }
+        if (_toolbarMode && _desktopWindow) {
+            QMetaObject::invokeMethod(root, "setResizable", Q_ARG(const QVariant&, QVariant(false)));
+        }
     } else {
         qCDebug(uiLogging) << "tablet cannot push QML because _qmlTabletRoot or _desktopWindow is null";
     }
 
-    return root;
+    return (root != nullptr);
 }
 
 void TabletProxy::popFromStack() {
@@ -574,14 +652,17 @@ void TabletProxy::loadWebScreenOnTop(const QVariant& url, const QString& injectJ
     if (root) {
         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)));
     }
     _state = State::Web;
 }
 
-void TabletProxy::gotoWebScreen(const QString& url, const QString& injectedJavaScriptUrl) {
+void TabletProxy::gotoWebScreen(const QString& url, const QString& injectedJavaScriptUrl, bool loadOtherBase) {
     if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "gotoWebScreen", Q_ARG(QString, url), Q_ARG(QString, injectedJavaScriptUrl));
+        QMetaObject::invokeMethod(this, "gotoWebScreen", Q_ARG(QString, url), Q_ARG(QString, injectedJavaScriptUrl), Q_ARG(bool, loadOtherBase));
         return;
     }
 
@@ -594,8 +675,15 @@ void TabletProxy::gotoWebScreen(const QString& url, const QString& injectedJavaS
 
     if (root) {
         removeButtonsFromHomeScreen();
-        QMetaObject::invokeMethod(root, "loadWebBase");
+        if (loadOtherBase) {
+            QMetaObject::invokeMethod(root, "loadTabletWebBase");
+        } else {
+            QMetaObject::invokeMethod(root, "loadWebBase");
+        }
         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, "loadWebUrl", Q_ARG(const QVariant&, QVariant(url)), Q_ARG(const QVariant&, QVariant(injectedJavaScriptUrl)));
     }
     _state = State::Web;
@@ -606,7 +694,7 @@ void TabletProxy::gotoWebScreen(const QString& url, const QString& injectedJavaS
 TabletButtonProxy* TabletProxy::addButton(const QVariant& properties) {
     if (QThread::currentThread() != thread()) {
         TabletButtonProxy* result = nullptr;
-        QMetaObject::invokeMethod(this, "addButton", Qt::BlockingQueuedConnection, Q_RETURN_ARG(TabletButtonProxy*, result), Q_ARG(QVariant, properties));
+        BLOCKING_INVOKE_METHOD(this, "addButton", Q_RETURN_ARG(TabletButtonProxy*, result), Q_ARG(QVariant, properties));
         return result;
     }
 
@@ -633,7 +721,7 @@ TabletButtonProxy* TabletProxy::addButton(const QVariant& properties) {
 bool TabletProxy::onHomeScreen() {
     if (QThread::currentThread() != thread()) {
         bool result = false;
-        QMetaObject::invokeMethod(this, "onHomeScreen", Qt::BlockingQueuedConnection, Q_RETURN_ARG(bool, result));
+        BLOCKING_INVOKE_METHOD(this, "onHomeScreen", Q_RETURN_ARG(bool, result));
         return result;
     }
 
@@ -818,7 +906,6 @@ TabletButtonProxy::TabletButtonProxy(const QVariantMap& properties) :
 }
 
 TabletButtonProxy::~TabletButtonProxy() {
-    qCDebug(uiLogging) << "Destroying tablet button proxy " ;
     if (QThread::currentThread() != thread()) {
         qCWarning(uiLogging) << "Destroying tablet button proxy on wrong thread";
     }
@@ -826,7 +913,13 @@ TabletButtonProxy::~TabletButtonProxy() {
 
 void TabletButtonProxy::setQmlButton(QQuickItem* qmlButton) {
     Q_ASSERT(QThread::currentThread() == qApp->thread());
+    if (_qmlButton) {
+        QObject::disconnect(_qmlButton, &QQuickItem::destroyed, this, nullptr);
+    }
     _qmlButton = qmlButton;
+    if (_qmlButton) {
+        QObject::connect(_qmlButton, &QQuickItem::destroyed, this, [this] { _qmlButton = nullptr; });
+    }
 }
 
 void TabletButtonProxy::setToolbarButtonProxy(QObject* toolbarButtonProxy) {
@@ -840,7 +933,7 @@ void TabletButtonProxy::setToolbarButtonProxy(QObject* toolbarButtonProxy) {
 QVariantMap TabletButtonProxy::getProperties() {
     if (QThread::currentThread() != thread()) {
         QVariantMap result;
-        QMetaObject::invokeMethod(this, "getProperties", Qt::BlockingQueuedConnection, Q_RETURN_ARG(QVariantMap, result));
+        BLOCKING_INVOKE_METHOD(this, "getProperties", Q_RETURN_ARG(QVariantMap, result));
         return result;
     }
 
diff --git a/libraries/ui/src/ui/TabletScriptingInterface.h b/libraries/ui/src/ui/TabletScriptingInterface.h
index e61398585e..bd195fdd20 100644
--- a/libraries/ui/src/ui/TabletScriptingInterface.h
+++ b/libraries/ui/src/ui/TabletScriptingInterface.h
@@ -23,7 +23,7 @@
 #include <glm/glm.hpp>
 #include <glm/gtc/quaternion.hpp>
 #include <glm/gtx/quaternion.hpp>
-
+#include "SoundCache.h"
 #include <DependencyManager.h>
 
 class ToolbarProxy;
@@ -40,8 +40,12 @@ class OffscreenQmlSurface;
 class TabletScriptingInterface : public QObject, public Dependency {
     Q_OBJECT
 public:
+    enum TabletAudioEvents { ButtonClick, ButtonHover, TabletOpen, TabletHandsIn, TabletHandsOut, Last};
+    Q_ENUM(TabletAudioEvents)
+
     TabletScriptingInterface();
-    ~TabletScriptingInterface();
+    virtual ~TabletScriptingInterface();
+    static const QString QML;
 
     void setToolbarScriptingInterface(ToolbarScriptingInterface* toolbarScriptingInterface) { _toolbarScriptingInterface = toolbarScriptingInterface; }
 
@@ -53,6 +57,9 @@ public:
      */
     Q_INVOKABLE TabletProxy* getTablet(const QString& tabletId);
 
+    void preloadSounds();
+    Q_INVOKABLE void playSound(TabletAudioEvents aEvent);
+
     void setToolbarMode(bool toolbarMode);
 
     void setQmlTabletRoot(QString tabletId, OffscreenQmlSurface* offscreenQmlSurface);
@@ -76,6 +83,7 @@ private:
     void processTabletEvents(QObject* object, const QKeyEvent* event);
     ToolbarProxy* getSystemToolbarProxy();
 
+    QMap<TabletAudioEvents, SharedSoundPointer> _audioEvents;
 protected:
     std::map<QString, TabletProxy*> _tabletProxies;
     ToolbarScriptingInterface* _toolbarScriptingInterface { nullptr };
@@ -122,9 +130,9 @@ public:
      * @param [injectedJavaScriptUrl] {string} optional url to an additional JS script to inject into the web page.
      */
     Q_INVOKABLE void gotoWebScreen(const QString& url);
-    Q_INVOKABLE void gotoWebScreen(const QString& url, const QString& injectedJavaScriptUrl);
+    Q_INVOKABLE void gotoWebScreen(const QString& url, const QString& injectedJavaScriptUrl, bool loadOtherBase = false);
 
-    Q_INVOKABLE void loadQMLSource(const QVariant& path);
+    Q_INVOKABLE void loadQMLSource(const QVariant& path, bool resizable = false);
     // FIXME: This currently relies on a script initializing the tablet (hence the bool denoting success);
     //        it should be initialized internally so it cannot fail
     Q_INVOKABLE bool pushOntoStack(const QVariant& path);
@@ -232,6 +240,7 @@ protected slots:
     void addButtonsToHomeScreen();
     void desktopWindowClosed();
     void emitWebEvent(const QVariant& msg);
+    void onTabletShown();
 protected:
     void removeButtonsFromHomeScreen();
     void loadHomeScreen(bool forceOntoHomeScreen);
@@ -252,6 +261,7 @@ protected:
     enum class State { Uninitialized, Home, Web, Menu, QML };
     State _state { State::Uninitialized };
     bool _landscape { false };
+    bool _showRunningScripts { false };
 };
 
 Q_DECLARE_METATYPE(TabletProxy*);
diff --git a/libraries/ui/src/ui/ToolbarScriptingInterface.cpp b/libraries/ui/src/ui/ToolbarScriptingInterface.cpp
index 330c652cdc..d01b538004 100644
--- a/libraries/ui/src/ui/ToolbarScriptingInterface.cpp
+++ b/libraries/ui/src/ui/ToolbarScriptingInterface.cpp
@@ -12,6 +12,8 @@
 #include <QtQuick/QQuickItem>
 #include <QtScript/QScriptValue>
 #include <QtScript/QScriptEngine>
+
+#include <shared/QtHelpers.h>
 #include "../OffscreenUi.h"
 
 QScriptValue toolbarToScriptValue(QScriptEngine* engine, ToolbarProxy* const &in) {
@@ -68,7 +70,7 @@ ToolbarProxy::ToolbarProxy(QObject* qmlObject, QObject* parent) : QmlWrapper(qml
 ToolbarButtonProxy* ToolbarProxy::addButton(const QVariant& properties) {
     if (QThread::currentThread() != thread()) {
         ToolbarButtonProxy* result = nullptr;
-        QMetaObject::invokeMethod(this, "addButton", Qt::BlockingQueuedConnection, Q_RETURN_ARG(ToolbarButtonProxy*, result), Q_ARG(QVariant, properties));
+        BLOCKING_INVOKE_METHOD(this, "addButton", Q_RETURN_ARG(ToolbarButtonProxy*, result), Q_ARG(QVariant, properties));
         return result;
     }
 
@@ -99,18 +101,14 @@ void ToolbarProxy::removeButton(const QVariant& name) {
 ToolbarProxy* ToolbarScriptingInterface::getToolbar(const QString& toolbarId) {
     if (QThread::currentThread() != thread()) {
         ToolbarProxy* result = nullptr;
-        QMetaObject::invokeMethod(this, "getToolbar", Qt::BlockingQueuedConnection, Q_RETURN_ARG(ToolbarProxy*, result), Q_ARG(QString, toolbarId));
+        BLOCKING_INVOKE_METHOD(this, "getToolbar", Q_RETURN_ARG(ToolbarProxy*, result), Q_ARG(QString, toolbarId));
         return result;
     }
 
     auto offscreenUi = DependencyManager::get<OffscreenUi>();
     auto desktop = offscreenUi->getDesktop();
-    Qt::ConnectionType connectionType = Qt::AutoConnection;
-    if (QThread::currentThread() != desktop->thread()) {
-        connectionType = Qt::BlockingQueuedConnection;
-    }
     QVariant resultVar;
-    bool invokeResult = QMetaObject::invokeMethod(desktop, "getToolbar", connectionType, Q_RETURN_ARG(QVariant, resultVar), Q_ARG(QVariant, toolbarId));
+    bool invokeResult = QMetaObject::invokeMethod(desktop, "getToolbar", Q_RETURN_ARG(QVariant, resultVar), Q_ARG(QVariant, toolbarId));
     if (!invokeResult) {
         return nullptr;
     }
diff --git a/libraries/ui/src/ui/types/HFTabletWebEngineProfile.cpp b/libraries/ui/src/ui/types/HFTabletWebEngineProfile.cpp
deleted file mode 100644
index a3e3906497..0000000000
--- a/libraries/ui/src/ui/types/HFTabletWebEngineProfile.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-//
-//  HFTabletWebEngineProfile.h
-//  interface/src/networking
-//
-//  Created by Dante Ruiz on 2017-03-31.
-//  Copyright 2017 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-#include "HFTabletWebEngineProfile.h"
-#include "HFTabletWebEngineRequestInterceptor.h"
-
-static const QString QML_WEB_ENGINE_NAME = "qmlTabletWebEngine";
-
-HFTabletWebEngineProfile::HFTabletWebEngineProfile(QObject* parent) : QQuickWebEngineProfile(parent) {
-
-    static const QString WEB_ENGINE_USER_AGENT = "Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Mobile Safari/537.36";
-
-    setHttpUserAgent(WEB_ENGINE_USER_AGENT);
-    setStorageName(QML_WEB_ENGINE_NAME);
-
-    auto requestInterceptor = new HFTabletWebEngineRequestInterceptor(this);
-    setRequestInterceptor(requestInterceptor);
-}
-
diff --git a/libraries/ui/src/ui/types/HFTabletWebEngineRequestInterceptor.cpp b/libraries/ui/src/ui/types/HFTabletWebEngineRequestInterceptor.cpp
deleted file mode 100644
index 6ee8589615..0000000000
--- a/libraries/ui/src/ui/types/HFTabletWebEngineRequestInterceptor.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-//  HFTabletWebEngineRequestInterceptor.cpp
-//  interface/src/networking
-//
-//  Created by Dante Ruiz on 2017-3-31.
-//  Copyright 2017 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-#include "HFTabletWebEngineRequestInterceptor.h"
-#include <QtCore/QDebug>
-#include "AccountManager.h"
-
-bool isTabletAuthableHighFidelityURL(const QUrl& url) {
-    static const QStringList HF_HOSTS = {
-        "highfidelity.com", "highfidelity.io",
-        "metaverse.highfidelity.com", "metaverse.highfidelity.io"
-    };
-
-    return url.scheme() == "https" && HF_HOSTS.contains(url.host());
-}
-
-void HFTabletWebEngineRequestInterceptor::interceptRequest(QWebEngineUrlRequestInfo& info) {
-    // check if this is a request to a highfidelity URL
-    if (isTabletAuthableHighFidelityURL(info.requestUrl())) {
-        // if we have an access token, add it to the right HTTP header for authorization
-        auto accountManager = DependencyManager::get<AccountManager>();
-
-        if (accountManager->hasValidAccessToken()) {
-            static const QString OAUTH_AUTHORIZATION_HEADER = "Authorization";
-
-            QString bearerTokenString = "Bearer " + accountManager->getAccountInfo().getAccessToken().token;
-            info.setHttpHeader(OAUTH_AUTHORIZATION_HEADER.toLocal8Bit(), bearerTokenString.toLocal8Bit());
-        }
-
-        static const QString USER_AGENT = "User-Agent";
-        QString tokenString = "Chrome/48.0 (HighFidelityInterface)";
-        info.setHttpHeader(USER_AGENT.toLocal8Bit(), tokenString.toLocal8Bit());
-    } else {
-        static const QString USER_AGENT = "User-Agent";
-        QString tokenString = "Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Mobile Safari/537.36";
-        info.setHttpHeader(USER_AGENT.toLocal8Bit(), tokenString.toLocal8Bit());
-    }
-}
diff --git a/libraries/ui/src/ui/types/HFWebEngineProfile.cpp b/libraries/ui/src/ui/types/HFWebEngineProfile.cpp
index a69d4d653b..685af45dad 100644
--- a/libraries/ui/src/ui/types/HFWebEngineProfile.cpp
+++ b/libraries/ui/src/ui/types/HFWebEngineProfile.cpp
@@ -18,8 +18,6 @@ static const QString QML_WEB_ENGINE_STORAGE_NAME = "qmlWebEngine";
 HFWebEngineProfile::HFWebEngineProfile(QObject* parent) :
     QQuickWebEngineProfile(parent)
 {
-    static const QString WEB_ENGINE_USER_AGENT = "Chrome/48.0 (HighFidelityInterface)";
-    setHttpUserAgent(WEB_ENGINE_USER_AGENT);
     setStorageName(QML_WEB_ENGINE_STORAGE_NAME);
 
     // we use the HFWebEngineRequestInterceptor to make sure that web requests are authenticated for the interface user
diff --git a/libraries/ui/src/ui/types/RequestFilters.cpp b/libraries/ui/src/ui/types/RequestFilters.cpp
index 3e72b8a8bd..b1deec47c8 100644
--- a/libraries/ui/src/ui/types/RequestFilters.cpp
+++ b/libraries/ui/src/ui/types/RequestFilters.cpp
@@ -13,21 +13,23 @@
 #include "NetworkingConstants.h"
 
 #include <QtCore/QDebug>
+#include <SettingHandle.h>
 
 #include "AccountManager.h"
 
 namespace {
 
     bool isAuthableHighFidelityURL(const QUrl& url) {
+        auto metaverseServerURL = NetworkingConstants::METAVERSE_SERVER_URL;
         static const QStringList HF_HOSTS = {
             "highfidelity.com", "highfidelity.io",
-            "metaverse.highfidelity.com", "metaverse.highfidelity.io"
+            metaverseServerURL.toString(), "metaverse.highfidelity.io"
         };
         const auto& scheme = url.scheme();
         const auto& host = url.host();
 
         return (scheme == "https" && HF_HOSTS.contains(host)) ||
-            ((scheme == NetworkingConstants::METAVERSE_SERVER_URL.scheme()) && (host == NetworkingConstants::METAVERSE_SERVER_URL.host()));
+            ((scheme == metaverseServerURL.scheme()) && (host == metaverseServerURL.host()));
     }
 
      bool isScript(const QString filename) {
@@ -42,7 +44,8 @@ namespace {
 
 void RequestFilters::interceptHFWebEngineRequest(QWebEngineUrlRequestInfo& info) {
     // check if this is a request to a highfidelity URL
-    if (isAuthableHighFidelityURL(info.requestUrl())) {
+    bool isAuthable = isAuthableHighFidelityURL(info.requestUrl());
+    if (isAuthable) {
         // if we have an access token, add it to the right HTTP header for authorization
         auto accountManager = DependencyManager::get<AccountManager>();
 
@@ -53,6 +56,17 @@ void RequestFilters::interceptHFWebEngineRequest(QWebEngineUrlRequestInfo& info)
             info.setHttpHeader(OAUTH_AUTHORIZATION_HEADER.toLocal8Bit(), bearerTokenString.toLocal8Bit());
         }
     }
+    static const QString USER_AGENT = "User-Agent";
+    const QString tokenStringMobile{ "Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Mobile Safari/537.36" };
+    const QString tokenStringMetaverse{ "Chrome/48.0 (HighFidelityInterface)" };
+
+    // During the period in which we have HFC commerce in the system, but not applied everywhere:
+    const QString tokenStringCommerce{ "Chrome/48.0 (HighFidelityInterface WithHFC)" };
+    Setting::Handle<bool> _settingSwitch{ "commerce", false };
+    bool isMoney = _settingSwitch.get();
+
+    const QString tokenString = !isAuthable ? tokenStringMobile : (isMoney ? tokenStringCommerce : tokenStringMetaverse);
+    info.setHttpHeader(USER_AGENT.toLocal8Bit(), tokenString.toLocal8Bit());
 }
 
 void RequestFilters::interceptFileType(QWebEngineUrlRequestInfo& info) {
diff --git a/libraries/ui/src/ui/types/SoundEffect.h b/libraries/ui/src/ui/types/SoundEffect.h
index 656f98dd8d..a7e29d86f9 100644
--- a/libraries/ui/src/ui/types/SoundEffect.h
+++ b/libraries/ui/src/ui/types/SoundEffect.h
@@ -15,6 +15,7 @@
 #include <SoundCache.h>
 
 class AudioInjector;
+using AudioInjectorPointer = QSharedPointer<AudioInjector>;
 
 // SoundEffect object, exposed to qml only, not interface JavaScript.
 // This is used to play spatial sound effects on tablets/web entities from within QML.
@@ -38,7 +39,7 @@ protected:
     QUrl _url;
     float _volume { 1.0f };
     SharedSoundPointer _sound;
-    AudioInjector* _injector { nullptr };
+    AudioInjectorPointer _injector;
 };
 
 #endif  // hifi_SoundEffect_h
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 82ca2a7d38..06cf929368 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -30,6 +30,8 @@ if (NOT SERVER_ONLY AND NOT ANDROID)
   add_subdirectory(${DIR})
   set(DIR "steamClient")
   add_subdirectory(${DIR})
+  set(DIR "hifiLeapMotion")
+  add_subdirectory(${DIR})
 endif()
 
 # server-side plugins
diff --git a/plugins/hifiLeapMotion/CMakeLists.txt b/plugins/hifiLeapMotion/CMakeLists.txt
new file mode 100644
index 0000000000..14f9bbaa17
--- /dev/null
+++ b/plugins/hifiLeapMotion/CMakeLists.txt
@@ -0,0 +1,15 @@
+#
+#  Created by David Rowe on 15 Jun 2017.
+#  Copyright 2017 High Fidelity, Inc.
+#
+#  Distributed under the Apache License, Version 2.0.
+#  See the accompanying file LICENSE or http:#www.apache.org/licenses/LICENSE-2.0.html
+#
+
+find_package(LEAPMOTION)
+if (LEAPMOTION_FOUND) 
+    set(TARGET_NAME hifiLeapMotion)
+    setup_hifi_plugin(Script Qml Widgets)
+    link_hifi_libraries(shared controllers ui plugins input-plugins)
+    target_leapmotion()
+endif()
diff --git a/plugins/hifiLeapMotion/src/LeapMotionPlugin.cpp b/plugins/hifiLeapMotion/src/LeapMotionPlugin.cpp
new file mode 100644
index 0000000000..174dd02426
--- /dev/null
+++ b/plugins/hifiLeapMotion/src/LeapMotionPlugin.cpp
@@ -0,0 +1,493 @@
+//
+//  LeapMotionPlugin.cpp
+//
+//  Created by David Rowe on 15 Jun 2017.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include "LeapMotionPlugin.h"
+
+#include <QLoggingCategory>
+
+#include <controllers/UserInputMapper.h>
+#include <NumericalConstants.h>
+#include <PathUtils.h>
+#include <Preferences.h>
+#include <SettingHandle.h>
+
+Q_DECLARE_LOGGING_CATEGORY(inputplugins)
+Q_LOGGING_CATEGORY(inputplugins, "hifi.inputplugins")
+
+const char* LeapMotionPlugin::NAME = "Leap Motion";
+const char* LeapMotionPlugin::LEAPMOTION_ID_STRING = "Leap Motion";
+
+const bool DEFAULT_ENABLED = false;
+const char* SENSOR_ON_DESKTOP = "Desktop";
+const char* SENSOR_ON_HMD = "HMD";
+const char* DEFAULT_SENSOR_LOCATION = SENSOR_ON_DESKTOP;
+
+enum LeapMotionJointIndex {
+    LeftHand = 0,
+    LeftHandThumb1,
+    LeftHandThumb2,
+    LeftHandThumb3,
+    LeftHandThumb4,
+    LeftHandIndex1,
+    LeftHandIndex2,
+    LeftHandIndex3,
+    LeftHandIndex4,
+    LeftHandMiddle1,
+    LeftHandMiddle2,
+    LeftHandMiddle3,
+    LeftHandMiddle4,
+    LeftHandRing1,
+    LeftHandRing2,
+    LeftHandRing3,
+    LeftHandRing4,
+    LeftHandPinky1,
+    LeftHandPinky2,
+    LeftHandPinky3,
+    LeftHandPinky4,
+    RightHand,
+    RightHandThumb1,
+    RightHandThumb2,
+    RightHandThumb3,
+    RightHandThumb4,
+    RightHandIndex1,
+    RightHandIndex2,
+    RightHandIndex3,
+    RightHandIndex4,
+    RightHandMiddle1,
+    RightHandMiddle2,
+    RightHandMiddle3,
+    RightHandMiddle4,
+    RightHandRing1,
+    RightHandRing2,
+    RightHandRing3,
+    RightHandRing4,
+    RightHandPinky1,
+    RightHandPinky2,
+    RightHandPinky3,
+    RightHandPinky4,
+
+    Size
+};
+
+static controller::StandardPoseChannel LeapMotionJointIndexToPoseIndexMap[LeapMotionJointIndex::Size] = {
+    controller::LEFT_HAND,
+    controller::LEFT_HAND_THUMB1,
+    controller::LEFT_HAND_THUMB2,
+    controller::LEFT_HAND_THUMB3,
+    controller::LEFT_HAND_THUMB4,
+    controller::LEFT_HAND_INDEX1,
+    controller::LEFT_HAND_INDEX2,
+    controller::LEFT_HAND_INDEX3,
+    controller::LEFT_HAND_INDEX4,
+    controller::LEFT_HAND_MIDDLE1,
+    controller::LEFT_HAND_MIDDLE2,
+    controller::LEFT_HAND_MIDDLE3,
+    controller::LEFT_HAND_MIDDLE4,
+    controller::LEFT_HAND_RING1,
+    controller::LEFT_HAND_RING2,
+    controller::LEFT_HAND_RING3,
+    controller::LEFT_HAND_RING4,
+    controller::LEFT_HAND_PINKY1,
+    controller::LEFT_HAND_PINKY2,
+    controller::LEFT_HAND_PINKY3,
+    controller::LEFT_HAND_PINKY4,
+    controller::RIGHT_HAND,
+    controller::RIGHT_HAND_THUMB1,
+    controller::RIGHT_HAND_THUMB2,
+    controller::RIGHT_HAND_THUMB3,
+    controller::RIGHT_HAND_THUMB4,
+    controller::RIGHT_HAND_INDEX1,
+    controller::RIGHT_HAND_INDEX2,
+    controller::RIGHT_HAND_INDEX3,
+    controller::RIGHT_HAND_INDEX4,
+    controller::RIGHT_HAND_MIDDLE1,
+    controller::RIGHT_HAND_MIDDLE2,
+    controller::RIGHT_HAND_MIDDLE3,
+    controller::RIGHT_HAND_MIDDLE4,
+    controller::RIGHT_HAND_RING1,
+    controller::RIGHT_HAND_RING2,
+    controller::RIGHT_HAND_RING3,
+    controller::RIGHT_HAND_RING4,
+    controller::RIGHT_HAND_PINKY1,
+    controller::RIGHT_HAND_PINKY2,
+    controller::RIGHT_HAND_PINKY3,
+    controller::RIGHT_HAND_PINKY4
+};
+
+#define UNKNOWN_JOINT (controller::StandardPoseChannel)0 
+
+static controller::StandardPoseChannel LeapMotionJointIndexToPoseIndex(LeapMotionJointIndex i) {
+    assert(i >= 0 && i < LeapMotionJointIndex::Size);
+    if (i >= 0 && i < LeapMotionJointIndex::Size) {
+        return LeapMotionJointIndexToPoseIndexMap[i];
+    } else {
+        return UNKNOWN_JOINT;
+    }
+}
+
+QStringList controllerJointNames = {
+    "Hips",
+    "RightUpLeg",
+    "RightLeg",
+    "RightFoot",
+    "LeftUpLeg",
+    "LeftLeg",
+    "LeftFoot",
+    "Spine",
+    "Spine1",
+    "Spine2",
+    "Spine3",
+    "Neck",
+    "Head",
+    "RightShoulder",
+    "RightArm",
+    "RightForeArm",
+    "RightHand",
+    "RightHandThumb1",
+    "RightHandThumb2",
+    "RightHandThumb3",
+    "RightHandThumb4",
+    "RightHandIndex1",
+    "RightHandIndex2",
+    "RightHandIndex3",
+    "RightHandIndex4",
+    "RightHandMiddle1",
+    "RightHandMiddle2",
+    "RightHandMiddle3",
+    "RightHandMiddle4",
+    "RightHandRing1",
+    "RightHandRing2",
+    "RightHandRing3",
+    "RightHandRing4",
+    "RightHandPinky1",
+    "RightHandPinky2",
+    "RightHandPinky3",
+    "RightHandPinky4",
+    "LeftShoulder",
+    "LeftArm",
+    "LeftForeArm",
+    "LeftHand",
+    "LeftHandThumb1",
+    "LeftHandThumb2",
+    "LeftHandThumb3",
+    "LeftHandThumb4",
+    "LeftHandIndex1",
+    "LeftHandIndex2",
+    "LeftHandIndex3",
+    "LeftHandIndex4",
+    "LeftHandMiddle1",
+    "LeftHandMiddle2",
+    "LeftHandMiddle3",
+    "LeftHandMiddle4",
+    "LeftHandRing1",
+    "LeftHandRing2",
+    "LeftHandRing3",
+    "LeftHandRing4",
+    "LeftHandPinky1",
+    "LeftHandPinky2",
+    "LeftHandPinky3",
+    "LeftHandPinky4"
+};
+
+static const char* getControllerJointName(controller::StandardPoseChannel i) {
+    if (i >= 0 && i < controller::NUM_STANDARD_POSES) {
+        return qPrintable(controllerJointNames[i]);
+    }
+    return "unknown";
+}
+
+
+void LeapMotionPlugin::pluginUpdate(float deltaTime, const controller::InputCalibrationData& inputCalibrationData) {
+    if (!_enabled) {
+        return;
+    }
+
+    const auto frame = _controller.frame();
+    const auto frameID = frame.id();
+    if (_lastFrameID >= frameID) {
+        // Leap Motion not connected or duplicate frame.
+        return;
+    }
+
+    if (!_hasLeapMotionBeenConnected) {
+        emit deviceConnected(getName());
+        _hasLeapMotionBeenConnected = true;
+    }
+
+    processFrame(frame);  // Updates _joints.
+
+    auto joints = _joints;
+
+    auto userInputMapper = DependencyManager::get<controller::UserInputMapper>();
+    userInputMapper->withLock([&, this]() {
+        _inputDevice->update(deltaTime, inputCalibrationData, joints, _prevJoints);
+    });
+
+    _prevJoints = joints;
+
+    _lastFrameID = frameID;
+}
+
+controller::Input::NamedVector LeapMotionPlugin::InputDevice::getAvailableInputs() const {
+    static controller::Input::NamedVector availableInputs;
+    if (availableInputs.size() == 0) {
+        for (int i = 0; i < LeapMotionJointIndex::Size; i++) {
+            auto channel = LeapMotionJointIndexToPoseIndex(static_cast<LeapMotionJointIndex>(i));
+            availableInputs.push_back(makePair(channel, getControllerJointName(channel)));
+        }
+    };
+    return availableInputs;
+}
+
+QString LeapMotionPlugin::InputDevice::getDefaultMappingConfig() const {
+    static const QString MAPPING_JSON = PathUtils::resourcesPath() + "/controllers/leapmotion.json";
+    return MAPPING_JSON;
+}
+
+void LeapMotionPlugin::InputDevice::update(float deltaTime, const controller::InputCalibrationData& inputCalibrationData,
+        const std::vector<LeapMotionPlugin::LeapMotionJoint>& joints,
+        const std::vector<LeapMotionPlugin::LeapMotionJoint>& prevJoints) {
+
+    glm::mat4 controllerToAvatar = glm::inverse(inputCalibrationData.avatarMat) * inputCalibrationData.sensorToWorldMat;
+    glm::quat controllerToAvatarRotation = glmExtractRotation(controllerToAvatar);
+
+    glm::vec3 hmdSensorPosition;    // HMD
+    glm::quat hmdSensorOrientation; // HMD
+    glm::vec3 leapMotionOffset;     // Desktop
+    if (_isLeapOnHMD) {
+        hmdSensorPosition = extractTranslation(inputCalibrationData.hmdSensorMat);
+        hmdSensorOrientation = extractRotation(inputCalibrationData.hmdSensorMat);
+    } else {
+        // Desktop "zero" position is some distance above the Leap Motion sensor and half the avatar's shoulder-to-hand length 
+        // in front of avatar.
+        float halfShouldToHandLength = fabsf(extractTranslation(inputCalibrationData.defaultLeftHand).x
+            - extractTranslation(inputCalibrationData.defaultLeftArm).x) / 2.0f;
+        leapMotionOffset = glm::vec3(0.0f, _desktopHeightOffset, halfShouldToHandLength);
+    }
+
+    for (size_t i = 0; i < joints.size(); i++) {
+        int poseIndex = LeapMotionJointIndexToPoseIndex((LeapMotionJointIndex)i);
+
+        if (joints[i].position == Vectors::ZERO) {
+            _poseStateMap[poseIndex] = controller::Pose();
+            continue;
+        }
+
+        glm::vec3 pos;
+        glm::quat rot;
+        if (_isLeapOnHMD) {
+            auto jointPosition = joints[i].position;
+            const glm::vec3 HMD_EYE_TO_LEAP_OFFSET = glm::vec3(0.0f, 0.0f, -0.09f);  // Eyes to surface of Leap Motion.
+            jointPosition = glm::vec3(-jointPosition.x, -jointPosition.z, -jointPosition.y) + HMD_EYE_TO_LEAP_OFFSET;
+            jointPosition = hmdSensorPosition + hmdSensorOrientation * jointPosition;
+            pos = transformPoint(controllerToAvatar, jointPosition);
+
+            glm::quat jointOrientation = joints[i].orientation;
+            jointOrientation = glm::quat(jointOrientation.w, -jointOrientation.x, -jointOrientation.z, -jointOrientation.y);
+            rot = controllerToAvatarRotation * hmdSensorOrientation * jointOrientation;
+        } else {
+            pos = controllerToAvatarRotation * (joints[i].position - leapMotionOffset);
+            const glm::quat ZERO_HAND_ORIENTATION = glm::quat(glm::vec3(PI_OVER_TWO, PI, 0.0f));
+            rot = controllerToAvatarRotation * joints[i].orientation * ZERO_HAND_ORIENTATION;
+        }
+
+        glm::vec3 linearVelocity, angularVelocity;
+        if (i < prevJoints.size()) {
+            linearVelocity = (pos - (prevJoints[i].position * METERS_PER_CENTIMETER)) / deltaTime;  // m/s
+            // quat log imaginary part points along the axis of rotation, with length of one half the angle of rotation.
+            glm::quat d = glm::log(rot * glm::inverse(prevJoints[i].orientation));
+            angularVelocity = glm::vec3(d.x, d.y, d.z) / (0.5f * deltaTime); // radians/s
+        }
+
+        _poseStateMap[poseIndex] = controller::Pose(pos, rot, linearVelocity, angularVelocity);
+    }
+}
+
+void LeapMotionPlugin::init() {
+    loadSettings();
+
+    auto preferences = DependencyManager::get<Preferences>();
+    static const QString LEAPMOTION_PLUGIN { "Leap Motion" };
+    {
+        auto getter = [this]()->bool { return _enabled; };
+        auto setter = [this](bool value) {
+            _enabled = value;
+            saveSettings();
+            if (!_enabled) {
+                auto userInputMapper = DependencyManager::get<controller::UserInputMapper>();
+                userInputMapper->withLock([&, this]() {
+                    _inputDevice->clearState();
+                });
+            }
+        };
+        auto preference = new CheckPreference(LEAPMOTION_PLUGIN, "Enabled", getter, setter);
+        preferences->addPreference(preference);
+    }
+    {
+        auto getter = [this]()->QString { return _sensorLocation; };
+        auto setter = [this](QString value) {
+            _sensorLocation = value;
+            saveSettings();
+            applySensorLocation();
+        };
+        auto preference = new ComboBoxPreference(LEAPMOTION_PLUGIN, "Sensor location", getter, setter);
+        QStringList list = { SENSOR_ON_DESKTOP, SENSOR_ON_HMD };
+        preference->setItems(list);
+        preferences->addPreference(preference);
+    }
+    {
+        auto getter = [this]()->float { return _desktopHeightOffset; };
+        auto setter = [this](float value) {
+            _desktopHeightOffset = value;
+            saveSettings();
+            applyDesktopHeightOffset();
+        };
+        auto preference = new SpinnerPreference(LEAPMOTION_PLUGIN, "Desktop height for horizontal forearms", getter, setter);
+        float MIN_VALUE = 0.0f;
+        float MAX_VALUE = 1.0f;
+        float DECIMALS = 2.0f;
+        float STEP = 0.01f;
+        preference->setMin(MIN_VALUE);
+        preference->setMax(MAX_VALUE);
+        preference->setDecimals(DECIMALS);
+        preference->setStep(STEP);
+        preferences->addPreference(preference);
+    }
+}
+
+bool LeapMotionPlugin::activate() {
+    InputPlugin::activate();
+
+    // Nothing required to be done to start up Leap Motion library.
+
+    _joints.resize(LeapMotionJointIndex::Size, { glm::vec3(), glm::quat() });
+
+    auto userInputMapper = DependencyManager::get<controller::UserInputMapper>();
+    userInputMapper->registerDevice(_inputDevice);
+
+    return true;
+}
+
+void LeapMotionPlugin::deactivate() {
+    if (_inputDevice->_deviceID != controller::Input::INVALID_DEVICE) {
+        auto userInputMapper = DependencyManager::get<controller::UserInputMapper>();
+        userInputMapper->removeDevice(_inputDevice->_deviceID);
+    }
+
+    InputPlugin::deactivate();
+}
+
+const char* SETTINGS_ENABLED_KEY = "enabled";
+const char* SETTINGS_SENSOR_LOCATION_KEY = "sensorLocation";
+const char* SETTINGS_DESKTOP_HEIGHT_OFFSET_KEY = "desktopHeightOffset";
+
+void LeapMotionPlugin::saveSettings() const {
+    Settings settings;
+    QString idString = getID();
+    settings.beginGroup(idString);
+    {
+        settings.setValue(QString(SETTINGS_ENABLED_KEY), _enabled);
+        settings.setValue(QString(SETTINGS_SENSOR_LOCATION_KEY), _sensorLocation);
+        settings.setValue(QString(SETTINGS_DESKTOP_HEIGHT_OFFSET_KEY), _desktopHeightOffset);
+    }
+    settings.endGroup();
+}
+
+void LeapMotionPlugin::loadSettings() {
+    Settings settings;
+    QString idString = getID();
+    settings.beginGroup(idString);
+    {
+        _enabled = settings.value(SETTINGS_ENABLED_KEY, QVariant(DEFAULT_ENABLED)).toBool();
+        _sensorLocation = settings.value(SETTINGS_SENSOR_LOCATION_KEY, QVariant(DEFAULT_SENSOR_LOCATION)).toString();
+        _desktopHeightOffset = 
+            settings.value(SETTINGS_DESKTOP_HEIGHT_OFFSET_KEY, QVariant(DEFAULT_DESKTOP_HEIGHT_OFFSET)).toFloat();
+        applySensorLocation();
+        applyDesktopHeightOffset();
+    }
+    settings.endGroup();
+}
+
+void LeapMotionPlugin::InputDevice::clearState() {
+    for (size_t i = 0; i < LeapMotionJointIndex::Size; i++) {
+        int poseIndex = LeapMotionJointIndexToPoseIndex((LeapMotionJointIndex)i);
+        _poseStateMap[poseIndex] = controller::Pose();
+    }
+}
+
+void LeapMotionPlugin::applySensorLocation() {
+    bool isLeapOnHMD = _sensorLocation == SENSOR_ON_HMD;
+    _controller.setPolicyFlags(isLeapOnHMD ? Leap::Controller::POLICY_OPTIMIZE_HMD : Leap::Controller::POLICY_DEFAULT);
+    _inputDevice->setIsLeapOnHMD(isLeapOnHMD);
+}
+
+void LeapMotionPlugin::applyDesktopHeightOffset() {
+    _inputDevice->setDektopHeightOffset(_desktopHeightOffset);
+}
+
+const float LEFT_SIDE_SIGN = -1.0f;
+const float RIGHT_SIDE_SIGN = 1.0f;
+
+glm::quat LeapBasisToQuat(float sideSign, const Leap::Matrix& basis) {
+    glm::vec3 xAxis = sideSign * glm::vec3(basis.xBasis.x, basis.xBasis.y, basis.xBasis.z);
+    glm::vec3 yAxis = glm::vec3(basis.yBasis.x, basis.yBasis.y, basis.yBasis.z);
+    glm::vec3 zAxis = glm::vec3(basis.zBasis.x, basis.zBasis.y, basis.zBasis.z);
+    glm::quat orientation = (glm::quat_cast(glm::mat3(xAxis, yAxis, zAxis)));
+    return orientation;
+}
+
+glm::vec3 LeapVectorToVec3(const Leap::Vector& vec) {
+    return glm::vec3(vec.x * METERS_PER_MILLIMETER, vec.y * METERS_PER_MILLIMETER, vec.z * METERS_PER_MILLIMETER);
+}
+
+void LeapMotionPlugin::processFrame(const Leap::Frame& frame) {
+    // Default to uncontrolled.
+    for (int i = 0; i < _joints.size(); i++) {
+        _joints[i].position = glm::vec3();
+    }
+
+    auto hands = frame.hands();
+    const int MAX_NUMBER_OF_HANDS = 2;
+    for (int i = 0; i < hands.count() && i < MAX_NUMBER_OF_HANDS; i++) {
+        auto hand = hands[i];
+
+        int sideSign = hand.isLeft() ? LEFT_SIDE_SIGN : RIGHT_SIDE_SIGN;
+        int jointIndex = hand.isLeft() ? LeapMotionJointIndex::LeftHand : LeapMotionJointIndex::RightHand;
+
+        // Hand.
+        _joints[jointIndex].position = LeapVectorToVec3(hand.wristPosition());
+        _joints[jointIndex].orientation = LeapBasisToQuat(sideSign, hand.basis());
+
+        // Fingers.
+        // Leap Motion SDK guarantees full set of fingers and finger joints so can straightforwardly process them all.
+        Leap::FingerList fingers = hand.fingers();
+        for (int j = Leap::Finger::Type::TYPE_THUMB; j <= Leap::Finger::Type::TYPE_PINKY; j++) {
+            Leap::Finger finger;
+            finger = fingers[j];
+            Leap::Bone bone;
+            bone = finger.bone(Leap::Bone::Type::TYPE_PROXIMAL);
+            jointIndex++;
+            _joints[jointIndex].position = LeapVectorToVec3(bone.prevJoint());
+            _joints[jointIndex].orientation = LeapBasisToQuat(sideSign, bone.basis());
+            bone = finger.bone(Leap::Bone::Type::TYPE_INTERMEDIATE);
+            jointIndex++;
+            _joints[jointIndex].position = LeapVectorToVec3(bone.prevJoint());
+            _joints[jointIndex].orientation = LeapBasisToQuat(sideSign, bone.basis());
+            bone = finger.bone(Leap::Bone::Type::TYPE_DISTAL);
+            jointIndex++;
+            _joints[jointIndex].position = LeapVectorToVec3(bone.prevJoint());
+            _joints[jointIndex].orientation = LeapBasisToQuat(sideSign, bone.basis());
+            jointIndex++;
+            _joints[jointIndex].position = LeapVectorToVec3(bone.nextJoint());
+            _joints[jointIndex].orientation = LeapBasisToQuat(sideSign, bone.basis());
+        }
+    }
+}
+
diff --git a/plugins/hifiLeapMotion/src/LeapMotionPlugin.h b/plugins/hifiLeapMotion/src/LeapMotionPlugin.h
new file mode 100644
index 0000000000..391d569567
--- /dev/null
+++ b/plugins/hifiLeapMotion/src/LeapMotionPlugin.h
@@ -0,0 +1,99 @@
+//
+//  LeapMotionPlugin.h
+//
+//  Created by David Rowe on 15 Jun 2017.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_LeapMotionPlugin_h
+#define hifi_LeapMotionPlugin_h
+
+#include <controllers/InputDevice.h>
+#include <plugins/InputPlugin.h>
+
+// LeapMotion SDK
+#include <Leap.h>
+
+class LeapMotionPlugin : public InputPlugin {
+    Q_OBJECT
+
+public:
+    // InputPlugin methods
+    virtual void pluginFocusOutEvent() override { _inputDevice->focusOutEvent(); }
+    virtual void pluginUpdate(float deltaTime, const controller::InputCalibrationData& inputCalibrationData) override;
+
+    bool isHandController() const override { return true; }
+
+    // Plugin methods
+    virtual const QString getName() const override { return NAME; }
+    const QString getID() const override { return LEAPMOTION_ID_STRING; }
+
+    virtual void init() override;
+
+    virtual bool activate() override;
+    virtual void deactivate() override;
+
+    virtual void saveSettings() const override;
+    virtual void loadSettings() override;
+
+protected:
+    static const char* NAME;
+    static const char* LEAPMOTION_ID_STRING;
+    const float DEFAULT_DESKTOP_HEIGHT_OFFSET = 0.2f;
+
+    bool _enabled { false };
+    QString _sensorLocation;
+    float _desktopHeightOffset { DEFAULT_DESKTOP_HEIGHT_OFFSET };
+
+    struct LeapMotionJoint {
+        glm::vec3 position;
+        glm::quat orientation;
+    };
+
+    std::vector<LeapMotionJoint> _joints;
+    std::vector<LeapMotionJoint> _prevJoints;
+
+    class InputDevice : public controller::InputDevice {
+    public:
+        friend class LeapMotionPlugin;
+
+        InputDevice() : controller::InputDevice("LeapMotion") {}
+
+        // Device functions
+        virtual controller::Input::NamedVector getAvailableInputs() const override;
+        virtual QString getDefaultMappingConfig() const override;
+        virtual void update(float deltaTime, const controller::InputCalibrationData& inputCalibrationData) override {};
+        virtual void focusOutEvent() override {};
+
+        void update(float deltaTime, const controller::InputCalibrationData& inputCalibrationData,
+            const std::vector<LeapMotionPlugin::LeapMotionJoint>& joints, 
+            const std::vector<LeapMotionPlugin::LeapMotionJoint>& prevJoints);
+
+        void clearState();
+
+        void setDektopHeightOffset(float desktopHeightOffset) { _desktopHeightOffset = desktopHeightOffset; };
+        void setIsLeapOnHMD(bool isLeapOnHMD) { _isLeapOnHMD = isLeapOnHMD; };
+
+    private:
+        float _desktopHeightOffset { 0.0f };
+        bool _isLeapOnHMD { false };
+    };
+
+    std::shared_ptr<InputDevice> _inputDevice { std::make_shared<InputDevice>() };
+
+private:
+    void applySensorLocation();
+    void applyDesktopHeightOffset();
+
+    void processFrame(const Leap::Frame& frame);
+
+    Leap::Controller _controller;
+
+    bool _hasLeapMotionBeenConnected { false };
+    int64_t _lastFrameID { -1 };
+};
+
+#endif // hifi_LeapMotionPlugin_h
diff --git a/plugins/hifiLeapMotion/src/LeapMotionProvider.cpp b/plugins/hifiLeapMotion/src/LeapMotionProvider.cpp
new file mode 100644
index 0000000000..62517439c3
--- /dev/null
+++ b/plugins/hifiLeapMotion/src/LeapMotionProvider.cpp
@@ -0,0 +1,51 @@
+//
+//  LeapMotionProvider.cpp
+//
+//  Created by David Rowe on 15 Jun 2017.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include <mutex>
+
+#include <QtCore/QObject>
+#include <QtCore/QtPlugin>
+#include <QtCore/QStringList>
+
+#include <plugins/RuntimePlugin.h>
+#include <plugins/InputPlugin.h>
+
+#include "LeapMotionPlugin.h"
+
+class LeapMotionProvider : public QObject, public InputProvider
+{
+    Q_OBJECT
+        Q_PLUGIN_METADATA(IID InputProvider_iid FILE "plugin.json")
+        Q_INTERFACES(InputProvider)
+
+public:
+    LeapMotionProvider(QObject* parent = nullptr) : QObject(parent) {}
+    virtual ~LeapMotionProvider() {}
+
+    virtual InputPluginList getInputPlugins() override {
+        static std::once_flag once;
+        std::call_once(once, [&] {
+            InputPluginPointer plugin(new LeapMotionPlugin());
+            if (plugin->isSupported()) {
+                _inputPlugins.push_back(plugin);
+            }
+        });
+        return _inputPlugins;
+    }
+
+    virtual void destroyInputPlugins() override {
+        _inputPlugins.clear();
+    }
+
+private:
+    InputPluginList _inputPlugins;
+};
+
+#include "LeapMotionProvider.moc"
diff --git a/plugins/hifiLeapMotion/src/plugin.json b/plugins/hifiLeapMotion/src/plugin.json
new file mode 100644
index 0000000000..2e867d96e4
--- /dev/null
+++ b/plugins/hifiLeapMotion/src/plugin.json
@@ -0,0 +1 @@
+{"name":"Leap Motion"}
diff --git a/plugins/hifiNeuron/src/NeuronPlugin.cpp b/plugins/hifiNeuron/src/NeuronPlugin.cpp
index 93e7da028f..4e27777628 100644
--- a/plugins/hifiNeuron/src/NeuronPlugin.cpp
+++ b/plugins/hifiNeuron/src/NeuronPlugin.cpp
@@ -367,6 +367,12 @@ void NeuronPlugin::init() {
 
     auto preferences = DependencyManager::get<Preferences>();
     static const QString NEURON_PLUGIN { "Perception Neuron" };
+    {
+        auto getter = [this]()->bool { return _enabled; };
+        auto setter = [this](bool value) { _enabled = value; saveSettings(); };
+        auto preference = new CheckPreference(NEURON_PLUGIN, "Enabled", getter, setter);
+        preferences->addPreference(preference);
+    }
     {
         auto getter = [this]()->QString { return _serverAddress; };
         auto setter = [this](const QString& value) { _serverAddress = value; saveSettings(); };
@@ -387,12 +393,6 @@ void NeuronPlugin::init() {
         preference->setStep(1);
         preferences->addPreference(preference);
     }
-    {
-        auto getter = [this]()->bool { return _enabled; };
-        auto setter = [this](bool value) { _enabled = value; saveSettings(); };
-        auto preference = new CheckPreference(NEURON_PLUGIN, "Enabled", getter, setter);
-        preferences->addPreference(preference);
-    }
 }
 
 bool NeuronPlugin::isSupported() const {
@@ -455,6 +455,10 @@ void NeuronPlugin::deactivate() {
 }
 
 void NeuronPlugin::pluginUpdate(float deltaTime, const controller::InputCalibrationData& inputCalibrationData) {
+    if (!_enabled) {
+        return;
+    }
+
     std::vector<NeuronJoint> joints;
     {
         // lock and copy
diff --git a/plugins/hifiSdl2/src/SDL2Manager.cpp b/plugins/hifiSdl2/src/SDL2Manager.cpp
index 5ab5758412..a5376af24e 100644
--- a/plugins/hifiSdl2/src/SDL2Manager.cpp
+++ b/plugins/hifiSdl2/src/SDL2Manager.cpp
@@ -11,8 +11,10 @@
 
 #include <qapplication.h>
 
-#include <PerfStat.h>
 #include <controllers/UserInputMapper.h>
+#include <PerfStat.h>
+#include <Preferences.h>
+#include <SettingHandle.h>
 
 #include "SDL2Manager.h"
 
@@ -38,10 +40,13 @@ static_assert(
     (int)controller::RY == (int)SDL_CONTROLLER_AXIS_RIGHTY &&
     (int)controller::LT == (int)SDL_CONTROLLER_AXIS_TRIGGERLEFT &&
     (int)controller::RT == (int)SDL_CONTROLLER_AXIS_TRIGGERRIGHT,
-    "SDL2 equvalence: Enums and values from StandardControls.h are assumed to match enums from SDL_gamecontroller.h");
+    "SDL2 equivalence: Enums and values from StandardControls.h are assumed to match enums from SDL_gamecontroller.h");
 
 
 const char* SDL2Manager::NAME = "SDL2";
+const char* SDL2Manager::SDL2_ID_STRING = "SDL2";
+
+const bool DEFAULT_ENABLED = false;
 
 SDL_JoystickID SDL2Manager::getInstanceId(SDL_GameController* controller) {
     SDL_Joystick* joystick = SDL_GameControllerGetJoystick(controller);
@@ -49,35 +54,6 @@ SDL_JoystickID SDL2Manager::getInstanceId(SDL_GameController* controller) {
 }
 
 void SDL2Manager::init() {
-    bool initSuccess = (SDL_Init(SDL_INIT_GAMECONTROLLER | SDL_INIT_HAPTIC) == 0);
-
-    if (initSuccess) {
-        int joystickCount = SDL_NumJoysticks();
-
-        for (int i = 0; i < joystickCount; i++) {
-            SDL_GameController* controller = SDL_GameControllerOpen(i);
-
-            if (controller) {
-                SDL_JoystickID id = getInstanceId(controller);
-                if (!_openJoysticks.contains(id)) {
-                    //Joystick* joystick = new Joystick(id, SDL_GameControllerName(controller), controller);
-                    Joystick::Pointer joystick  = std::make_shared<Joystick>(id, controller);
-                    _openJoysticks[id] = joystick;
-                    auto userInputMapper = DependencyManager::get<controller::UserInputMapper>();
-                    userInputMapper->registerDevice(joystick);
-                    auto name = SDL_GameControllerName(controller);
-                    _subdeviceNames << name;
-                    emit joystickAdded(joystick.get());
-                    emit subdeviceConnected(getName(), name);
-                }
-            }
-        }
-
-        _isInitialized = true;
-    }
-    else {
-        qDebug() << "Error initializing SDL2 Manager";
-    }
 }
 
 QStringList SDL2Manager::getSubdeviceNames() {
@@ -91,8 +67,61 @@ void SDL2Manager::deinit() {
 }
 
 bool SDL2Manager::activate() {
+    
+    // FIXME for some reason calling this code in the `init` function triggers a crash
+    // on OSX in PR builds, but not on my local debug build.  Attempting a workaround by
+    //
+    static std::once_flag once;
+    std::call_once(once, [&]{
+        loadSettings();
+        
+        auto preferences = DependencyManager::get<Preferences>();
+        static const QString SDL2_PLUGIN { "Game Controller" };
+        {
+            auto getter = [this]()->bool { return _isEnabled; };
+            auto setter = [this](bool value) {
+                _isEnabled = value;
+                saveSettings();
+            };
+            auto preference = new CheckPreference(SDL2_PLUGIN, "Enabled", getter, setter);
+            preferences->addPreference(preference);
+        }
+        
+        bool initSuccess = (SDL_Init(SDL_INIT_GAMECONTROLLER | SDL_INIT_HAPTIC) == 0);
+        
+        if (initSuccess) {
+            int joystickCount = SDL_NumJoysticks();
+            
+            for (int i = 0; i < joystickCount; i++) {
+                SDL_GameController* controller = SDL_GameControllerOpen(i);
+                
+                if (controller) {
+                    SDL_JoystickID id = getInstanceId(controller);
+                    if (!_openJoysticks.contains(id)) {
+                        //Joystick* joystick = new Joystick(id, SDL_GameControllerName(controller), controller);
+                        Joystick::Pointer joystick  = std::make_shared<Joystick>(id, controller);
+                        _openJoysticks[id] = joystick;
+                        auto userInputMapper = DependencyManager::get<controller::UserInputMapper>();
+                        userInputMapper->registerDevice(joystick);
+                        auto name = SDL_GameControllerName(controller);
+                        _subdeviceNames << name;
+                        emit joystickAdded(joystick.get());
+                        emit subdeviceConnected(getName(), name);
+                    }
+                }
+            }
+            
+            _isInitialized = true;
+        } else {
+            qDebug() << "Error initializing SDL2 Manager";
+        }
+    });
+    
+    if (!_isInitialized) {
+        return false;
+    }
+    
     InputPlugin::activate();
-
     auto userInputMapper = DependencyManager::get<controller::UserInputMapper>();
     for (auto joystick : _openJoysticks) {
         userInputMapper->registerDevice(joystick);
@@ -110,6 +139,27 @@ void SDL2Manager::deactivate() {
     InputPlugin::deactivate();
 }
 
+const char* SETTINGS_ENABLED_KEY = "enabled";
+
+void SDL2Manager::saveSettings() const {
+    Settings settings;
+    QString idString = getID();
+    settings.beginGroup(idString);
+    {
+        settings.setValue(QString(SETTINGS_ENABLED_KEY), _isEnabled);
+    }
+    settings.endGroup();
+}
+
+void SDL2Manager::loadSettings() {
+    Settings settings;
+    QString idString = getID();
+    settings.beginGroup(idString);
+    {
+        _isEnabled = settings.value(SETTINGS_ENABLED_KEY, QVariant(DEFAULT_ENABLED)).toBool();
+    }
+    settings.endGroup();
+}
 
 bool SDL2Manager::isSupported() const {
     return true;
@@ -122,6 +172,10 @@ void SDL2Manager::pluginFocusOutEvent() {
 }
 
 void SDL2Manager::pluginUpdate(float deltaTime, const controller::InputCalibrationData& inputCalibrationData) {
+    if (!_isEnabled) {
+        return;
+    }
+
     if (_isInitialized) {
         auto userInputMapper = DependencyManager::get<controller::UserInputMapper>();
         for (auto joystick : _openJoysticks) {
diff --git a/plugins/hifiSdl2/src/SDL2Manager.h b/plugins/hifiSdl2/src/SDL2Manager.h
index 9cb4d268c0..48e779a204 100644
--- a/plugins/hifiSdl2/src/SDL2Manager.h
+++ b/plugins/hifiSdl2/src/SDL2Manager.h
@@ -25,6 +25,7 @@ public:
     // Plugin functions
     bool isSupported() const override;
     const QString getName() const override { return NAME; }
+    const QString getID() const override { return SDL2_ID_STRING; }
 
     QStringList getSubdeviceNames() override;
 
@@ -39,6 +40,9 @@ public:
     void pluginFocusOutEvent() override;
     void pluginUpdate(float deltaTime, const controller::InputCalibrationData& inputCalibrationData) override;
 
+    virtual void saveSettings() const override;
+    virtual void loadSettings() override;
+
 signals:
     void joystickAdded(Joystick* joystick);
     void joystickRemoved(Joystick* joystick);
@@ -77,8 +81,10 @@ private:
     int buttonRelease() const { return SDL_RELEASED; }
 
     QMap<SDL_JoystickID, Joystick::Pointer> _openJoysticks;
-    bool _isInitialized { false } ;
+    bool _isEnabled { false };
+    bool _isInitialized { false };
     static const char* NAME;
+    static const char* SDL2_ID_STRING;
     QStringList _subdeviceNames;
 };
 
diff --git a/plugins/hifiSixense/CMakeLists.txt b/plugins/hifiSixense/CMakeLists.txt
index 14676217db..55880584a8 100644
--- a/plugins/hifiSixense/CMakeLists.txt
+++ b/plugins/hifiSixense/CMakeLists.txt
@@ -6,6 +6,10 @@
 #  See the accompanying file LICENSE or http:#www.apache.org/licenses/LICENSE-2.0.html
 #
 
+# FIXME if we want to properly re-enable this, we need to fix the mechanism for installing the 
+# dependency dlls `msvcr100` and `msvcp100` WITHOUT using CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS
+# currently this will build the hifiSixense plugin, but unless the user has previously installed
+# the msvcr100 runtime support, the plugin will not load.
 if (NOT ANDROID)
   set(TARGET_NAME hifiSixense)
   setup_hifi_plugin(Script Qml Widgets)
diff --git a/plugins/hifiSixense/src/SixenseManager.cpp b/plugins/hifiSixense/src/SixenseManager.cpp
index 7d443bd50d..c2c1cb2ab2 100644
--- a/plugins/hifiSixense/src/SixenseManager.cpp
+++ b/plugins/hifiSixense/src/SixenseManager.cpp
@@ -29,6 +29,7 @@
 #include <PathUtils.h>
 #include <PerfStat.h>
 #include <ui-plugins/PluginContainer.h>
+#include <Preferences.h>
 #include <SettingHandle.h>
 
 #include <QLoggingCategory>
@@ -46,19 +47,26 @@ static const unsigned int BUTTON_TRIGGER = 1U << 8;
 
 const glm::vec3 SixenseManager::DEFAULT_AVATAR_POSITION { -0.25f, -0.35f, -0.3f }; // in hydra frame
 const float SixenseManager::CONTROLLER_THRESHOLD { 0.35f };
+
+bool SixenseManager::_isEnabled = false;
 bool SixenseManager::_sixenseLoaded = false;
 
+#define BAIL_IF_NOT_ENABLED \
+    if (!_isEnabled) { \
+        return; \
+    }
+
 #define BAIL_IF_NOT_LOADED \
     if (!_sixenseLoaded) { \
         return; \
     }
 
-
-
 const char* SixenseManager::NAME { "Sixense" };
-const char* SixenseManager::HYDRA_ID_STRING { "Razer Hydra" };
+const char* SixenseManager::SIXENSE_ID_STRING { "Sixense" };
 
-const char* MENU_PARENT { "Developer" };
+const bool DEFAULT_ENABLED = false;
+
+const char* MENU_PARENT{ "Developer" };
 const char* MENU_NAME { "Sixense" };
 const char* MENU_PATH { "Developer" ">" "Sixense" };
 const char* TOGGLE_SMOOTH { "Smooth Sixense Movement" };
@@ -73,6 +81,22 @@ bool SixenseManager::isSupported() const {
 #endif
 }
 
+void SixenseManager::init() {
+    loadSettings();
+
+    auto preferences = DependencyManager::get<Preferences>();
+    static const QString SIXENSE_PLUGIN { "Sixense Controllers" };
+    {
+        auto getter = [this]()->bool { return _isEnabled; };
+        auto setter = [this](bool value) {
+            _isEnabled = value;
+            saveSettings();
+        };
+        auto preference = new CheckPreference(SIXENSE_PLUGIN, "Enabled", getter, setter);
+        preferences->addPreference(preference);
+    }
+}
+
 bool SixenseManager::activate() {
     InputPlugin::activate();
 
@@ -133,6 +157,7 @@ void SixenseManager::setSixenseFilter(bool filter) {
 }
 
 void SixenseManager::pluginUpdate(float deltaTime, const controller::InputCalibrationData& inputCalibrationData) {
+    BAIL_IF_NOT_ENABLED
     BAIL_IF_NOT_LOADED
 
 #ifdef HAVE_SIXENSE
@@ -553,14 +578,19 @@ QString SixenseManager::InputDevice::getDefaultMappingConfig() const {
     return MAPPING_JSON;
 }
 
+const char* SETTINGS_ENABLED_KEY = "enabled";
+const char* SETTINGS_AVATAR_POSITION_KEY = "avatarPosition";
+const char* SETTINGS_AVATAR_ROTATION_KEY = "avatarPosition";
+
 // virtual
 void SixenseManager::saveSettings() const {
     Settings settings;
     QString idString = getID();
     settings.beginGroup(idString);
     {
-        settings.setVec3Value(QString("avatarPosition"), _inputDevice->_avatarPosition);
-        settings.setQuatValue(QString("avatarRotation"), _inputDevice->_avatarRotation);
+        settings.setValue(QString(SETTINGS_ENABLED_KEY), _isEnabled);
+        settings.setVec3Value(QString(SETTINGS_AVATAR_POSITION_KEY), _inputDevice->_avatarPosition);
+        settings.setQuatValue(QString(SETTINGS_AVATAR_ROTATION_KEY), _inputDevice->_avatarRotation);
     }
     settings.endGroup();
 }
@@ -570,8 +600,9 @@ void SixenseManager::loadSettings() {
     QString idString = getID();
     settings.beginGroup(idString);
     {
-        settings.getVec3ValueIfValid(QString("avatarPosition"), _inputDevice->_avatarPosition);
-        settings.getQuatValueIfValid(QString("avatarRotation"), _inputDevice->_avatarRotation);
+        _isEnabled = settings.value(SETTINGS_ENABLED_KEY, QVariant(DEFAULT_ENABLED)).toBool();
+        settings.getVec3ValueIfValid(QString(SETTINGS_AVATAR_POSITION_KEY), _inputDevice->_avatarPosition);
+        settings.getQuatValueIfValid(QString(SETTINGS_AVATAR_ROTATION_KEY), _inputDevice->_avatarRotation);
     }
     settings.endGroup();
 }
diff --git a/plugins/hifiSixense/src/SixenseManager.h b/plugins/hifiSixense/src/SixenseManager.h
index 5b2c140868..e9d571ad8c 100644
--- a/plugins/hifiSixense/src/SixenseManager.h
+++ b/plugins/hifiSixense/src/SixenseManager.h
@@ -29,12 +29,14 @@ public:
     // Plugin functions
     virtual bool isSupported() const override;
     virtual const QString getName() const override { return NAME; }
-    virtual const QString getID() const override { return HYDRA_ID_STRING; }
+    virtual const QString getID() const override { return SIXENSE_ID_STRING; }
 
     // Sixense always seems to initialize even if the hydras are not present. Is there
     // a way we can properly detect whether the hydras are present?
     // bool isHandController() const override { return true; }
 
+    virtual void init() override;
+
     virtual bool activate() override;
     virtual void deactivate() override;
 
@@ -93,8 +95,9 @@ private:
     std::shared_ptr<InputDevice> _inputDevice { std::make_shared<InputDevice>() };
 
     static const char* NAME;
-    static const char* HYDRA_ID_STRING;
+    static const char* SIXENSE_ID_STRING;
 
+    static bool _isEnabled;
     static bool _sixenseLoaded;
 };
 
diff --git a/plugins/oculus/src/OculusBaseDisplayPlugin.cpp b/plugins/oculus/src/OculusBaseDisplayPlugin.cpp
index 93f4787f0f..7e7fcc0db3 100644
--- a/plugins/oculus/src/OculusBaseDisplayPlugin.cpp
+++ b/plugins/oculus/src/OculusBaseDisplayPlugin.cpp
@@ -51,8 +51,6 @@ bool OculusBaseDisplayPlugin::beginFrameRender(uint32_t frameIndex) {
     });
 
     withNonPresentThreadLock([&] {
-        _uiModelTransform = DependencyManager::get<CompositorHelper>()->getModelTransform();
-        _handPoses = handPoses;
         _frameInfos[frameIndex] = _currentRenderFrameInfo;
     });
     return Parent::beginFrameRender(frameIndex);
@@ -62,6 +60,36 @@ bool OculusBaseDisplayPlugin::isSupported() const {
     return oculusAvailable();
 }
 
+glm::mat4 OculusBaseDisplayPlugin::getEyeProjection(Eye eye, const glm::mat4& baseProjection) const {
+    if (_session) {
+        ViewFrustum baseFrustum;
+        baseFrustum.setProjection(baseProjection);
+        float baseNearClip = baseFrustum.getNearClip();
+        float baseFarClip = baseFrustum.getFarClip();
+        ovrEyeType ovrEye = (eye == Left) ? ovrEye_Left : ovrEye_Right;
+        ovrFovPort fovPort = _hmdDesc.DefaultEyeFov[eye];
+        ovrEyeRenderDesc& erd = ovr_GetRenderDesc(_session, ovrEye, fovPort);
+        ovrMatrix4f ovrPerspectiveProjection = ovrMatrix4f_Projection(erd.Fov, baseNearClip, baseFarClip, ovrProjection_ClipRangeOpenGL);
+        return toGlm(ovrPerspectiveProjection);
+    } else {
+        return baseProjection;
+    }
+}
+
+glm::mat4 OculusBaseDisplayPlugin::getCullingProjection(const glm::mat4& baseProjection) const {
+    if (_session) {
+        ViewFrustum baseFrustum;
+        baseFrustum.setProjection(baseProjection);
+        float baseNearClip = baseFrustum.getNearClip();
+        float baseFarClip = baseFrustum.getFarClip();
+        auto combinedFov = _eyeFovs[0];
+        combinedFov.LeftTan = combinedFov.RightTan = std::max(combinedFov.LeftTan, combinedFov.RightTan);
+        return toGlm(ovrMatrix4f_Projection(combinedFov, baseNearClip, baseFarClip, ovrProjection_ClipRangeOpenGL));
+    } else {
+        return baseProjection;
+    }
+}
+
 // DLL based display plugins MUST initialize GLEW inside the DLL code.
 void OculusBaseDisplayPlugin::customizeContext() {
     glewExperimental = true;
@@ -126,15 +154,17 @@ void OculusBaseDisplayPlugin::internalDeactivate() {
 }
 
 bool OculusBaseDisplayPlugin::activateStandBySession() {
-    _session = acquireOculusSession();
     if (!_session) {
-        return false;
+        _session = acquireOculusSession();
     }
-    return true;
+    return _session;
 }
 void OculusBaseDisplayPlugin::deactivateSession() {
-    releaseOculusSession();
-    _session = nullptr;
+    // FIXME
+    // Switching to Qt 5.9 exposed a race condition or similar issue that caused a crash when putting on an Rift
+    // while already in VR mode.  Commenting these out is a workaround.
+    //releaseOculusSession();
+    //_session = nullptr;
 }
 void OculusBaseDisplayPlugin::updatePresentPose() {
     //mat4 sensorResetMat;
diff --git a/plugins/oculus/src/OculusBaseDisplayPlugin.h b/plugins/oculus/src/OculusBaseDisplayPlugin.h
index 5230b11681..b3b99c0ad1 100644
--- a/plugins/oculus/src/OculusBaseDisplayPlugin.h
+++ b/plugins/oculus/src/OculusBaseDisplayPlugin.h
@@ -19,6 +19,9 @@ public:
     ~OculusBaseDisplayPlugin();
     bool isSupported() const override;
 
+    glm::mat4 getEyeProjection(Eye eye, const glm::mat4& baseProjection) const override;
+    glm::mat4 getCullingProjection(const glm::mat4& baseProjection) const override;
+
     bool hasAsyncReprojection() const override { return true; }
 
 
diff --git a/plugins/oculus/src/OculusControllerManager.cpp b/plugins/oculus/src/OculusControllerManager.cpp
index 6f7be26554..d0c717bd20 100644
--- a/plugins/oculus/src/OculusControllerManager.cpp
+++ b/plugins/oculus/src/OculusControllerManager.cpp
@@ -334,10 +334,8 @@ void OculusControllerManager::TouchDevice::handleHeadPose(float deltaTime,
     glm::mat4 defaultHeadOffset = glm::inverse(inputCalibrationData.defaultCenterEyeMat) *
         inputCalibrationData.defaultHeadMat;
 
-    controller::Pose hmdHeadPose = pose.transform(sensorToAvatar);
-
     pose.valid = true;
-    _poseStateMap[controller::HEAD] = hmdHeadPose.postTransform(defaultHeadOffset);
+    _poseStateMap[controller::HEAD] = pose.postTransform(defaultHeadOffset).transform(sensorToAvatar);
 }
 
 void OculusControllerManager::TouchDevice::handleRotationForUntrackedHand(const controller::InputCalibrationData& inputCalibrationData,
diff --git a/plugins/oculus/src/OculusHelpers.cpp b/plugins/oculus/src/OculusHelpers.cpp
index 18844a1995..3d06a4b223 100644
--- a/plugins/oculus/src/OculusHelpers.cpp
+++ b/plugins/oculus/src/OculusHelpers.cpp
@@ -88,7 +88,7 @@ ovrSession acquireOculusSession() {
     }
 
     if (!session) {
-    	ovrInitParams initParams {
+        ovrInitParams initParams {
             ovrInit_RequestVersion | ovrInit_MixedRendering, OVR_MINOR_VERSION, nullptr, 0, 0
         };
 
diff --git a/plugins/oculusLegacy/CMakeLists.txt b/plugins/oculusLegacy/CMakeLists.txt
index f4e1bb76a2..12d0236cc2 100644
--- a/plugins/oculusLegacy/CMakeLists.txt
+++ b/plugins/oculusLegacy/CMakeLists.txt
@@ -13,7 +13,7 @@ if (APPLE)
 
     set(TARGET_NAME oculusLegacy)
     setup_hifi_plugin()
-    link_hifi_libraries(shared gl gpu gpu-gl plugins ui ui-plugins display-plugins input-plugins)
+    link_hifi_libraries(shared gl gpu gpu-gl plugins ui ui-plugins display-plugins input-plugins midi)
     
     include_hifi_library_headers(octree)
     
diff --git a/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp b/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp
index 80c8698bb6..804ff7d62e 100644
--- a/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp
+++ b/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp
@@ -181,7 +181,7 @@ bool OculusLegacyDisplayPlugin::internalActivate() {
 }
 
 void OculusLegacyDisplayPlugin::internalDeactivate() {
-	Parent::internalDeactivate();
+    Parent::internalDeactivate();
     ovrHmd_Destroy(_hmd);
     _hmd = nullptr;
     ovr_Shutdown();
diff --git a/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.h b/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.h
index 20345467df..36bdd1c792 100644
--- a/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.h
+++ b/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.h
@@ -17,7 +17,7 @@ const float TARGET_RATE_OculusLegacy = 75.0f;
 class GLWindow;
 
 class OculusLegacyDisplayPlugin : public HmdDisplayPlugin {
-	using Parent = HmdDisplayPlugin;
+    using Parent = HmdDisplayPlugin;
 public:
     OculusLegacyDisplayPlugin();
     bool isSupported() const override;
diff --git a/plugins/openvr/CMakeLists.txt b/plugins/openvr/CMakeLists.txt
index 6a95ef6d76..7878ae2d7e 100644
--- a/plugins/openvr/CMakeLists.txt
+++ b/plugins/openvr/CMakeLists.txt
@@ -18,6 +18,7 @@ if (WIN32)
     include_hifi_library_headers(octree)
 
     add_dependency_external_projects(OpenVR)
+
     find_package(OpenVR REQUIRED)
     target_include_directories(${TARGET_NAME} PRIVATE ${OPENVR_INCLUDE_DIRS})
     target_link_libraries(${TARGET_NAME} ${OPENVR_LIBRARIES})
diff --git a/plugins/openvr/src/OpenVrDisplayPlugin.cpp b/plugins/openvr/src/OpenVrDisplayPlugin.cpp
index 7a73c91c7d..96ad19f46b 100644
--- a/plugins/openvr/src/OpenVrDisplayPlugin.cpp
+++ b/plugins/openvr/src/OpenVrDisplayPlugin.cpp
@@ -282,7 +282,7 @@ public:
                 static const vr::VRTextureBounds_t leftBounds{ 0, 0, 0.5f, 1 };
                 static const vr::VRTextureBounds_t rightBounds{ 0.5f, 0, 1, 1 };
 
-                vr::Texture_t texture{ (void*)_colors[currentColorBuffer], vr::TextureType_OpenGL, vr::ColorSpace_Auto };
+                vr::Texture_t texture{ (void*)(uintptr_t)_colors[currentColorBuffer], vr::TextureType_OpenGL, vr::ColorSpace_Auto };
                 vr::VRCompositor()->Submit(vr::Eye_Left, &texture, &leftBounds);
                 vr::VRCompositor()->Submit(vr::Eye_Right, &texture, &rightBounds);
                 _plugin._presentRate.increment();
@@ -357,6 +357,32 @@ bool OpenVrDisplayPlugin::isSupported() const {
     return openVrSupported();
 }
 
+glm::mat4 OpenVrDisplayPlugin::getEyeProjection(Eye eye, const glm::mat4& baseProjection) const {
+    if (_system) {
+        ViewFrustum baseFrustum;
+        baseFrustum.setProjection(baseProjection);
+        float baseNearClip = baseFrustum.getNearClip();
+        float baseFarClip = baseFrustum.getFarClip();
+        vr::EVREye openVrEye = (eye == Left) ? vr::Eye_Left : vr::Eye_Right;
+        return toGlm(_system->GetProjectionMatrix(openVrEye, baseNearClip, baseFarClip));
+    } else {
+        return baseProjection;
+    }
+}
+
+glm::mat4 OpenVrDisplayPlugin::getCullingProjection(const glm::mat4& baseProjection) const {
+    if (_system) {
+        ViewFrustum baseFrustum;
+        baseFrustum.setProjection(baseProjection);
+        float baseNearClip = baseFrustum.getNearClip();
+        float baseFarClip = baseFrustum.getFarClip();
+        // FIXME Calculate the proper combined projection by using GetProjectionRaw values from both eyes
+        return toGlm(_system->GetProjectionMatrix((vr::EVREye)0, baseNearClip, baseFarClip));
+    } else {
+        return baseProjection;
+    }
+}
+
 float OpenVrDisplayPlugin::getTargetFrameRate() const {
     if (forceInterleavedReprojection && !_asyncReprojectionActive) {
         return TARGET_RATE_OpenVr / 2.0f;
@@ -594,9 +620,6 @@ bool OpenVrDisplayPlugin::beginFrameRender(uint32_t frameIndex) {
     }
 
     withNonPresentThreadLock([&] {
-        _uiModelTransform = DependencyManager::get<CompositorHelper>()->getModelTransform();
-        // Make controller poses available to the presentation thread
-        _handPoses = handPoses;
         _frameInfos[frameIndex] = _currentRenderFrameInfo;
     });
     return Parent::beginFrameRender(frameIndex);
@@ -643,7 +666,7 @@ void OpenVrDisplayPlugin::hmdPresent() {
         _submitThread->waitForPresent();
     } else {
         GLuint glTexId = getGLBackend()->getTextureID(_compositeFramebuffer->getRenderBuffer(0));
-        vr::Texture_t vrTexture { (void*)glTexId, vr::TextureType_OpenGL, vr::ColorSpace_Auto };
+        vr::Texture_t vrTexture { (void*)(uintptr_t)glTexId, vr::TextureType_OpenGL, vr::ColorSpace_Auto };
         vr::VRCompositor()->Submit(vr::Eye_Left, &vrTexture, &OPENVR_TEXTURE_BOUNDS_LEFT);
         vr::VRCompositor()->Submit(vr::Eye_Right, &vrTexture, &OPENVR_TEXTURE_BOUNDS_RIGHT);
         vr::VRCompositor()->PostPresentHandoff();
diff --git a/plugins/openvr/src/OpenVrDisplayPlugin.h b/plugins/openvr/src/OpenVrDisplayPlugin.h
index a1bbed8754..6aea6ef575 100644
--- a/plugins/openvr/src/OpenVrDisplayPlugin.h
+++ b/plugins/openvr/src/OpenVrDisplayPlugin.h
@@ -38,6 +38,9 @@ public:
     bool isSupported() const override;
     const QString getName() const override { return NAME; }
 
+    glm::mat4 getEyeProjection(Eye eye, const glm::mat4& baseProjection) const override;
+    glm::mat4 getCullingProjection(const glm::mat4& baseProjection) const override;
+
     void init() override;
 
     float getTargetFrameRate() const override;
diff --git a/plugins/openvr/src/OpenVrHelpers.cpp b/plugins/openvr/src/OpenVrHelpers.cpp
index 7e287a16c3..c8a0cb5f8b 100644
--- a/plugins/openvr/src/OpenVrHelpers.cpp
+++ b/plugins/openvr/src/OpenVrHelpers.cpp
@@ -129,7 +129,7 @@ void releaseOpenVrSystem() {
             #endif
 
             // HACK: workaround openvr crash, call submit with an invalid texture, right before VR_Shutdown.
-            const GLuint INVALID_GL_TEXTURE_HANDLE = -1;
+            const void* INVALID_GL_TEXTURE_HANDLE = (void*)(uintptr_t)-1;
             vr::Texture_t vrTexture{ (void*)INVALID_GL_TEXTURE_HANDLE, vr::TextureType_OpenGL, vr::ColorSpace_Auto };
             static vr::VRTextureBounds_t OPENVR_TEXTURE_BOUNDS_LEFT{ 0, 0, 0.5f, 1 };
             static vr::VRTextureBounds_t OPENVR_TEXTURE_BOUNDS_RIGHT{ 0.5f, 0, 1, 1 };
diff --git a/plugins/openvr/src/OpenVrHelpers.h b/plugins/openvr/src/OpenVrHelpers.h
index f4253899a2..c54f2326c2 100644
--- a/plugins/openvr/src/OpenVrHelpers.h
+++ b/plugins/openvr/src/OpenVrHelpers.h
@@ -82,6 +82,12 @@ struct PoseData {
             angularVelocities[i] = transformVectorFast(resetMat, toGlm(vrPoses[i].vAngularVelocity));
         }
     }
+
+    void resetToInvalid() {
+        for (int i = 0; i < vr::k_unMaxTrackedDeviceCount; i++) {
+            vrPoses[i].bPoseIsValid = false;
+        }
+    }
 };
 
 // FIXME remove once OpenVR header is updated
diff --git a/plugins/openvr/src/ViveControllerManager.cpp b/plugins/openvr/src/ViveControllerManager.cpp
index 648373ccc2..430dc193a3 100644
--- a/plugins/openvr/src/ViveControllerManager.cpp
+++ b/plugins/openvr/src/ViveControllerManager.cpp
@@ -28,12 +28,13 @@
 #include <GLMHelpers.h>
 #include <glm/ext.hpp>
 #include <glm/gtc/quaternion.hpp>
+#include <ui-plugins/PluginContainer.h>
+#include <plugins/DisplayPlugin.h>
 
 #include <controllers/UserInputMapper.h>
 #include <Plugins/InputConfiguration.h>
 #include <controllers/StandardControls.h>
 
-
 extern PoseData _nextSimPoseData;
 
 vr::IVRSystem* acquireOpenVrSystem();
@@ -60,11 +61,6 @@ static const int SECOND_FOOT = 1;
 static const int HIP = 2;
 static const int CHEST = 3;
 
-static float HEAD_PUCK_Y_OFFSET = -0.0254f;
-static float HEAD_PUCK_Z_OFFSET = -0.152f;
-static float HAND_PUCK_Y_OFFSET = -0.0508f;
-static float HAND_PUCK_Z_OFFSET = 0.0254f;
-
 const char* ViveControllerManager::NAME { "OpenVR" };
 
 const std::map<vr::ETrackingResult, QString> TRACKING_RESULT_TO_STRING = {
@@ -121,6 +117,29 @@ static QString deviceTrackingResultToString(vr::ETrackingResult trackingResult)
     return result;
 }
 
+static glm::mat4 calculateResetMat() {
+    auto chaperone = vr::VRChaperone();
+    if (chaperone) {
+        float const UI_RADIUS = 1.0f;
+        float const UI_HEIGHT = 1.6f;
+        float const UI_Z_OFFSET = 0.5;
+
+        float xSize, zSize;
+        chaperone->GetPlayAreaSize(&xSize, &zSize);
+        glm::vec3 uiPos(0.0f, UI_HEIGHT, UI_RADIUS - (0.5f * zSize) - UI_Z_OFFSET);
+
+        return glm::inverse(createMatFromQuatAndPos(glm::quat(), uiPos));
+    }
+    return glm::mat4();
+}
+
+bool ViveControllerManager::isDesktopMode() {
+    if (_container) {
+        return !_container->getActiveDisplayPlugin()->isHmd();
+    }
+    return false;
+}
+
 void ViveControllerManager::calibrate() {
     if (isSupported()) {
         _inputDevice->calibrateNextFrame();
@@ -141,13 +160,22 @@ bool ViveControllerManager::isSupported() const {
 
 void ViveControllerManager::setConfigurationSettings(const QJsonObject configurationSettings) {
     if (isSupported()) {
+        if (configurationSettings.contains("desktopMode")) {
+            _desktopMode = configurationSettings["desktopMode"].toBool();
+            if (!_desktopMode) {
+                _resetMatCalculated = false;
+            }
+        }
         _inputDevice->configureCalibrationSettings(configurationSettings);
+        saveSettings();
     }
 }
 
 QJsonObject ViveControllerManager::configurationSettings() {
     if (isSupported()) {
-        return _inputDevice->configurationSettings();
+        QJsonObject configurationSettings = _inputDevice->configurationSettings();
+        configurationSettings["desktopMode"] = _desktopMode;
+        return configurationSettings;
     }
 
     return QJsonObject();
@@ -160,6 +188,8 @@ QString ViveControllerManager::configurationLayout() {
 bool ViveControllerManager::activate() {
     InputPlugin::activate();
 
+    loadSettings();
+
     if (!_system) {
         _system = acquireOpenVrSystem();
     }
@@ -202,6 +232,8 @@ void ViveControllerManager::deactivate() {
     auto userInputMapper = DependencyManager::get<controller::UserInputMapper>();
     userInputMapper->removeDevice(_inputDevice->_deviceID);
     _registeredWithInputMapper = false;
+
+    saveSettings();
 }
 
 bool ViveControllerManager::isHeadControllerMounted() const {
@@ -218,6 +250,18 @@ void ViveControllerManager::pluginUpdate(float deltaTime, const controller::Inpu
         return;
     }
 
+    if (isDesktopMode() && _desktopMode) {
+        if (!_resetMatCalculated) {
+            _resetMat = calculateResetMat();
+            _resetMatCalculated = true;
+        }
+
+        _system->GetDeviceToAbsoluteTrackingPose(vr::TrackingUniverseStanding, 0, _nextSimPoseData.vrPoses, vr::k_unMaxTrackedDeviceCount);
+        _nextSimPoseData.update(_resetMat);
+    } else if (isDesktopMode()) {
+        _nextSimPoseData.resetToInvalid();
+    }
+
     auto userInputMapper = DependencyManager::get<controller::UserInputMapper>();
     handleOpenVrEvents();
     if (openVrQuitRequested()) {
@@ -242,13 +286,45 @@ void ViveControllerManager::pluginUpdate(float deltaTime, const controller::Inpu
     }
 }
 
-ViveControllerManager::InputDevice::InputDevice(vr::IVRSystem*& system) : controller::InputDevice("Vive"), _system(system) {
+void ViveControllerManager::loadSettings() {
+    Settings settings;
+    QString nameString = getName();
+    settings.beginGroup(nameString);
+    {
+        if (_inputDevice) {
+            const double DEFAULT_ARM_CIRCUMFERENCE = 0.33;
+            const double DEFAULT_SHOULDER_WIDTH = 0.48;
+            _inputDevice->_armCircumference = settings.value("armCircumference", QVariant(DEFAULT_ARM_CIRCUMFERENCE)).toDouble();
+            _inputDevice->_shoulderWidth = settings.value("shoulderWidth", QVariant(DEFAULT_SHOULDER_WIDTH)).toDouble();
+        }
+    }
+    settings.endGroup();
+}
+
+void ViveControllerManager::saveSettings() const {
+    Settings settings;
+    QString nameString = getName();
+    settings.beginGroup(nameString);
+    {
+        if (_inputDevice) {
+            settings.setValue(QString("armCircumference"), _inputDevice->_armCircumference);
+            settings.setValue(QString("shoulderWidth"), _inputDevice->_shoulderWidth);
+        }
+    }
+    settings.endGroup();
+}
+
+
+ViveControllerManager::InputDevice::InputDevice(vr::IVRSystem*& system) :
+    controller::InputDevice("Vive"),
+    _system(system) {
 
     _configStringMap[Config::None] = QString("None");
     _configStringMap[Config::Feet] = QString("Feet");
     _configStringMap[Config::FeetAndHips] = QString("FeetAndHips");
     _configStringMap[Config::FeetHipsAndChest] = QString("FeetHipsAndChest");
     _configStringMap[Config::FeetHipsAndShoulders] = QString("FeetHipsAndShoulders");
+    _configStringMap[Config::FeetHipsChestAndShoulders] = QString("FeetHipsChestAndShoulders");
 }
 
 void ViveControllerManager::InputDevice::update(float deltaTime, const controller::InputCalibrationData& inputCalibrationData) {
@@ -299,7 +375,7 @@ void ViveControllerManager::InputDevice::update(float deltaTime, const controlle
     calibrateFromHandController(inputCalibrationData);
     calibrateFromUI(inputCalibrationData);
 
-    updateCalibratedLimbs();
+    updateCalibratedLimbs(inputCalibrationData);
     _lastSimPoseData = _nextSimPoseData;
 }
 
@@ -325,10 +401,14 @@ void ViveControllerManager::InputDevice::calibrateFromUI(const controller::Input
     if (_calibrate) {
         uncalibrate();
         calibrate(inputCalibrationData);
+        emitCalibrationStatus();
         _calibrate = false;
     }
 }
 
+static const float CM_TO_M = 0.01f;
+static const float M_TO_CM = 100.0f;
+
 void ViveControllerManager::InputDevice::configureCalibrationSettings(const QJsonObject configurationSettings) {
     Locker locker(_lock);
     if (!configurationSettings.empty()) {
@@ -342,8 +422,8 @@ void ViveControllerManager::InputDevice::configureCalibrationSettings(const QJso
                 bool overrideHead = headObject["override"].toBool();
                 if (overrideHead) {
                     _headConfig = HeadConfig::Puck;
-                    HEAD_PUCK_Y_OFFSET = headObject["Y"].toDouble();
-                    HEAD_PUCK_Z_OFFSET = headObject["Z"].toDouble();
+                    _headPuckYOffset = headObject["Y"].toDouble() * CM_TO_M;
+                    _headPuckZOffset = headObject["Z"].toDouble() * CM_TO_M;
                 } else {
                     _headConfig = HeadConfig::HMD;
                 }
@@ -352,11 +432,15 @@ void ViveControllerManager::InputDevice::configureCalibrationSettings(const QJso
                 bool overrideHands = handsObject["override"].toBool();
                 if (overrideHands) {
                     _handConfig = HandConfig::Pucks;
-                    HAND_PUCK_Y_OFFSET = handsObject["Y"].toDouble();
-                    HAND_PUCK_Z_OFFSET = handsObject["Z"].toDouble();
+                    _handPuckYOffset = handsObject["Y"].toDouble() * CM_TO_M;
+                    _handPuckZOffset = handsObject["Z"].toDouble() * CM_TO_M;
                 } else {
                     _handConfig = HandConfig::HandController;
                 }
+            } else if (iter.key() == "armCircumference") {
+                _armCircumference = (float)iter.value().toDouble() * CM_TO_M;
+            } else if (iter.key() == "shoulderWidth") {
+                _shoulderWidth = (float)iter.value().toDouble() * CM_TO_M;
             }
             iter++;
         }
@@ -372,29 +456,25 @@ QJsonObject ViveControllerManager::InputDevice::configurationSettings() {
     Locker locker(_lock);
     QJsonObject configurationSettings;
     configurationSettings["trackerConfiguration"] = configToString(_preferedConfig);
-    configurationSettings["HMDHead"] = (_headConfig == HeadConfig::HMD) ? true : false;
-    configurationSettings["handController"] = (_handConfig == HandConfig::HandController) ? true : false;
+    configurationSettings["HMDHead"] = (_headConfig == HeadConfig::HMD);
+    configurationSettings["handController"] = (_handConfig == HandConfig::HandController);
+    configurationSettings["puckCount"] = (int)_validTrackedObjects.size();
+    configurationSettings["armCircumference"] = (double)_armCircumference * M_TO_CM;
+    configurationSettings["shoulderWidth"] = (double)_shoulderWidth * M_TO_CM;
     return configurationSettings;
 }
 
-void ViveControllerManager::InputDevice::emitCalibrationStatus(const bool success) {
+void ViveControllerManager::InputDevice::emitCalibrationStatus() {
     auto inputConfiguration = DependencyManager::get<InputConfiguration>();
     QJsonObject status = QJsonObject();
+    status["calibrated"] = _calibrated;
+    status["configuration"] = configToString(_preferedConfig);
+    status["head_puck"] = (_headConfig == HeadConfig::Puck);
+    status["hand_pucks"] = (_handConfig == HandConfig::Pucks);
+    status["puckCount"] = (int)_validTrackedObjects.size();
+    status["UI"] = _calibrate;
 
-    if (_calibrated && success) {
-        status["calibrated"] = _calibrated;
-        status["configuration"] = configToString(_preferedConfig);
-    } else if (!_calibrated && !success) {
-        status["calibrated"] = _calibrated;
-        status["success"] = success;
-    } else if (!_calibrated && success) {
-        status["calibrated"] = _calibrated;
-        status["success"] = success;
-        status["configuration"] = configToString(_preferedConfig);
-        status["puckCount"] = (int)_validTrackedObjects.size();
-    }
-    
-    emit inputConfiguration->calibrationStatus(status); //inputConfiguration->calibrated(status);
+    emit inputConfiguration->calibrationStatus(status);
 }
 
 void ViveControllerManager::InputDevice::handleTrackedObject(uint32_t deviceIndex, const controller::InputCalibrationData& inputCalibrationData) {
@@ -430,19 +510,38 @@ void ViveControllerManager::InputDevice::handleTrackedObject(uint32_t deviceInde
         // transform into avatar frame
         glm::mat4 controllerToAvatar = glm::inverse(inputCalibrationData.avatarMat) * inputCalibrationData.sensorToWorldMat;
         _poseStateMap[poseIndex] = pose.transform(controllerToAvatar);
-        _validTrackedObjects.push_back(std::make_pair(poseIndex, _poseStateMap[poseIndex]));
+
+        // but _validTrackedObjects remain in sensor frame
+        _validTrackedObjects.push_back(std::make_pair(poseIndex, pose));
     } else {
         controller::Pose invalidPose;
         _poseStateMap[poseIndex] = invalidPose;
     }
 }
 
+void ViveControllerManager::InputDevice::sendUserActivityData(QString activity) {
+    QJsonObject jsonData = {
+        {"num_pucks", (int)_validTrackedObjects.size()},
+        {"configuration", configToString(_preferedConfig)},
+        {"head_puck", (_headConfig == HeadConfig::Puck) ? true : false},
+        {"hand_pucks", (_handConfig == HandConfig::Pucks) ? true : false}
+    };
+
+    UserActivityLogger::getInstance().logAction(activity, jsonData);
+}
+
 void ViveControllerManager::InputDevice::calibrateOrUncalibrate(const controller::InputCalibrationData& inputCalibration) {
     if (!_calibrated) {
         calibrate(inputCalibration);
+        if (_calibrated) {
+            sendUserActivityData("mocap_button_success");
+        } else {
+            sendUserActivityData("mocap_button_fail");
+        }
+        emitCalibrationStatus();
     } else {
         uncalibrate();
-        emitCalibrationStatus(true);
+        sendUserActivityData("mocap_button_uncalibrate");
     }
 }
 
@@ -454,34 +553,32 @@ void ViveControllerManager::InputDevice::calibrate(const controller::InputCalibr
 
     if (puckCount == 0) {
         uncalibrate();
-        emitCalibrationStatus(false);
         return;
     }
 
     glm::mat4 defaultToReferenceMat = glm::mat4();
     if (_headConfig == HeadConfig::HMD) {
         defaultToReferenceMat = calculateDefaultToReferenceForHmd(inputCalibration);
-    } else if (_headConfig == HeadConfig::Puck) { 
+    } else if (_headConfig == HeadConfig::Puck) {
+        std::sort(_validTrackedObjects.begin(), _validTrackedObjects.end(), sortPucksYPosition);
         defaultToReferenceMat = calculateDefaultToReferenceForHeadPuck(inputCalibration);
     }
-    
+
     _config = _preferedConfig;
-    
+
     bool headConfigured = configureHead(defaultToReferenceMat, inputCalibration);
     bool handsConfigured = configureHands(defaultToReferenceMat, inputCalibration);
     bool bodyConfigured = configureBody(defaultToReferenceMat, inputCalibration);
 
     if (!headConfigured || !handsConfigured || !bodyConfigured) {
         uncalibrate();
-        emitCalibrationStatus(false);
     } else {
         _calibrated = true;
-        emitCalibrationStatus(true);
         qDebug() << "PuckCalibration: " << configToString(_config) << " Configuration Successful";
     }
 }
 
-bool ViveControllerManager::InputDevice::configureHands(glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration) {
+bool ViveControllerManager::InputDevice::configureHands(const glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration) {
     std::sort(_validTrackedObjects.begin(), _validTrackedObjects.end(), sortPucksXPosition);
     int puckCount = (int)_validTrackedObjects.size();
     if (_handConfig == HandConfig::Pucks && puckCount >= MIN_PUCK_COUNT) {
@@ -516,7 +613,7 @@ bool ViveControllerManager::InputDevice::configureHands(glm::mat4& defaultToRefe
     return false;
 }
 
-bool ViveControllerManager::InputDevice::configureHead(glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration) {
+bool ViveControllerManager::InputDevice::configureHead(const glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration) {
     std::sort(_validTrackedObjects.begin(), _validTrackedObjects.end(), sortPucksYPosition);
     int puckCount = (int)_validTrackedObjects.size();
     if (_headConfig == HeadConfig::Puck && puckCount >= MIN_HEAD) {
@@ -530,7 +627,7 @@ bool ViveControllerManager::InputDevice::configureHead(glm::mat4& defaultToRefer
     return false;
 }
 
-bool ViveControllerManager::InputDevice::configureBody(glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration) {
+bool ViveControllerManager::InputDevice::configureBody(const glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration) {
     std::sort(_validTrackedObjects.begin(), _validTrackedObjects.end(), sortPucksYPosition);
     int puckCount = (int)_validTrackedObjects.size();
     glm::vec3 headXAxis = getReferenceHeadXAxis(defaultToReferenceMat, inputCalibration.defaultHeadMat);
@@ -566,47 +663,66 @@ bool ViveControllerManager::InputDevice::configureBody(glm::mat4& defaultToRefer
         return true;
     }
     qDebug() << "Puck Calibration: " << configToString(_config) << " Config Failed: Could not meet the minimal # of pucks";
-    uncalibrate();
-    emitCalibrationStatus(false);
     return false;
 }
 
 void ViveControllerManager::InputDevice::uncalibrate() {
     _config = Config::None;
-    _pucksOffset.clear();
+    _pucksPostOffset.clear();
+    _pucksPreOffset.clear();
     _jointToPuckMap.clear();
     _calibrated = false;
     _overrideHead = false;
     _overrideHands = false;
 }
 
-void ViveControllerManager::InputDevice::updateCalibratedLimbs() {
-    _poseStateMap[controller::LEFT_FOOT] = addOffsetToPuckPose(controller::LEFT_FOOT);
-    _poseStateMap[controller::RIGHT_FOOT] = addOffsetToPuckPose(controller::RIGHT_FOOT);
-    _poseStateMap[controller::HIPS] = addOffsetToPuckPose(controller::HIPS);
-    _poseStateMap[controller::SPINE2] = addOffsetToPuckPose(controller::SPINE2);
-    _poseStateMap[controller::RIGHT_ARM] = addOffsetToPuckPose(controller::RIGHT_ARM);
-    _poseStateMap[controller::LEFT_ARM] = addOffsetToPuckPose(controller::LEFT_ARM);
+void ViveControllerManager::InputDevice::updateCalibratedLimbs(const controller::InputCalibrationData& inputCalibration) {
+    _poseStateMap[controller::LEFT_FOOT] = addOffsetToPuckPose(inputCalibration, controller::LEFT_FOOT);
+    _poseStateMap[controller::RIGHT_FOOT] = addOffsetToPuckPose(inputCalibration, controller::RIGHT_FOOT);
+    _poseStateMap[controller::HIPS] = addOffsetToPuckPose(inputCalibration, controller::HIPS);
+    _poseStateMap[controller::SPINE2] = addOffsetToPuckPose(inputCalibration, controller::SPINE2);
+    _poseStateMap[controller::RIGHT_ARM] = addOffsetToPuckPose(inputCalibration, controller::RIGHT_ARM);
+    _poseStateMap[controller::LEFT_ARM] = addOffsetToPuckPose(inputCalibration, controller::LEFT_ARM);
 
     if (_overrideHead) {
-        _poseStateMap[controller::HEAD] = addOffsetToPuckPose(controller::HEAD);
+        _poseStateMap[controller::HEAD] = addOffsetToPuckPose(inputCalibration, controller::HEAD);
     }
 
     if (_overrideHands) {
-        _poseStateMap[controller::LEFT_HAND] = addOffsetToPuckPose(controller::LEFT_HAND);
-        _poseStateMap[controller::RIGHT_HAND] = addOffsetToPuckPose(controller::RIGHT_HAND);
+        _poseStateMap[controller::LEFT_HAND] = addOffsetToPuckPose(inputCalibration, controller::LEFT_HAND);
+        _poseStateMap[controller::RIGHT_HAND] = addOffsetToPuckPose(inputCalibration, controller::RIGHT_HAND);
     }
 }
 
-controller::Pose ViveControllerManager::InputDevice::addOffsetToPuckPose(int joint) const {
+controller::Pose ViveControllerManager::InputDevice::addOffsetToPuckPose(const controller::InputCalibrationData& inputCalibration, int joint) const {
     auto puck = _jointToPuckMap.find(joint);
     if (puck != _jointToPuckMap.end()) {
         uint32_t puckIndex = puck->second;
-        auto puckPose = _poseStateMap.find(puckIndex);
-        auto puckOffset = _pucksOffset.find(puckIndex);
 
-        if ((puckPose != _poseStateMap.end()) && (puckOffset != _pucksOffset.end())) {
-            return puckPose->second.postTransform(puckOffset->second);
+        // use sensor space pose.
+        auto puckPoseIter = _validTrackedObjects.begin();
+        while (puckPoseIter != _validTrackedObjects.end()) {
+            if (puckPoseIter->first == puckIndex) {
+                break;
+            }
+            puckPoseIter++;
+        }
+
+        if (puckPoseIter != _validTrackedObjects.end()) {
+
+            glm::mat4 postMat; // identity
+            auto postIter = _pucksPostOffset.find(puckIndex);
+            if (postIter != _pucksPostOffset.end()) {
+                postMat = postIter->second;
+            }
+
+            glm::mat4 preMat = glm::inverse(inputCalibration.avatarMat) * inputCalibration.sensorToWorldMat;
+            auto preIter = _pucksPreOffset.find(puckIndex);
+            if (preIter != _pucksPreOffset.end()) {
+                preMat = preMat * preIter->second;
+            }
+
+            return puckPoseIter->second.postTransform(postMat).transform(preMat);
         }
     }
     return controller::Pose();
@@ -657,66 +773,70 @@ void ViveControllerManager::InputDevice::handleHandController(float deltaTime, u
             // pseudo buttons the depend on both of the above for-loops
             partitionTouchpad(controller::LS, controller::LX, controller::LY, controller::LS_CENTER, controller::LS_X, controller::LS_Y);
             partitionTouchpad(controller::RS, controller::RX, controller::RY, controller::RS_CENTER, controller::RS_X, controller::RS_Y);
-         }
+        }
     }
 }
+
+// defaultToReferenceMat is an offset from avatar space to sensor space.
+// it aligns the default center-eye in avatar space with the hmd in sensor space.
+//
+//  * E_a is the the default center-of-the-eyes transform in avatar space.
+//  * E_s is the the hmd eye-center transform in sensor space, with roll and pitch removed.
+//  * D is the defaultReferenceMat.
+//
+//  E_s = D * E_a  =>
+//  D = E_s * inverse(E_a)
+//
 glm::mat4 ViveControllerManager::InputDevice::calculateDefaultToReferenceForHmd(const controller::InputCalibrationData& inputCalibration) {
-    // convert the hmd head from sensor space to avatar space
-    glm::mat4 hmdSensorFlippedMat = inputCalibration.hmdSensorMat * Matrices::Y_180;
-    glm::mat4 sensorToAvatarMat = glm::inverse(inputCalibration.avatarMat) * inputCalibration.sensorToWorldMat;
-    glm::mat4 hmdAvatarMat = sensorToAvatarMat * hmdSensorFlippedMat;
 
-    // cancel the roll and pitch for the hmd head
-    glm::quat hmdRotation = cancelOutRollAndPitch(glmExtractRotation(hmdAvatarMat));
-    glm::vec3 hmdTranslation = extractTranslation(hmdAvatarMat);
-    glm::mat4 currentHmd = createMatFromQuatAndPos(hmdRotation, hmdTranslation);
+    // the center-eye transform in avatar space.
+    glm::mat4 E_a = inputCalibration.defaultCenterEyeMat;
 
-    // calculate the offset from the centerOfEye to defaultHeadMat
-    glm::mat4 defaultHeadOffset = glm::inverse(inputCalibration.defaultCenterEyeMat) * inputCalibration.defaultHeadMat;
+    // the center-eye transform in sensor space.
+    glm::mat4 E_s = inputCalibration.hmdSensorMat * Matrices::Y_180;  // the Y_180 is to convert hmd from -z forward to z forward.
 
-    glm::mat4 currentHead  = currentHmd * defaultHeadOffset;
+    // cancel out roll and pitch on E_s
+    glm::quat rot = cancelOutRollAndPitch(glmExtractRotation(E_s));
+    glm::vec3 trans = extractTranslation(E_s);
+    E_s = createMatFromQuatAndPos(rot, trans);
 
-    // calculate the defaultToRefrenceXform
-    glm::mat4 defaultToReferenceMat = currentHead * glm::inverse(inputCalibration.defaultHeadMat);
-
-    return defaultToReferenceMat;
+    return E_s * glm::inverse(E_a);
 }
 
+// defaultToReferenceMat is an offset from avatar space to sensor space.
+// It aligns the default center-of-the-eyes transform in avatar space with the head-puck in sensor space.
+// The offset from the center-of-the-eyes to the head-puck can be configured via _headPuckYOffset and _headPuckZOffset,
+// These values are exposed in the configuration UI.
+//
+//  * E_a is the the default center-eye transform in avatar space.
+//  * E_s is the the head-puck center-eye transform in sensor space, with roll and pitch removed.
+//  * D is the defaultReferenceMat.
+//
+//  E_s = D * E_a  =>
+//  D = E_s * inverse(E_a)
+//
 glm::mat4 ViveControllerManager::InputDevice::calculateDefaultToReferenceForHeadPuck(const controller::InputCalibrationData& inputCalibration) {
-    glm::mat4 avatarToSensorMat = glm::inverse(inputCalibration.sensorToWorldMat) * inputCalibration.avatarMat;
-    glm::mat4 sensorToAvatarMat = glm::inverse(inputCalibration.avatarMat) * inputCalibration.sensorToWorldMat;
+
+    // the center-eye transform in avatar space.
+    glm::mat4 E_a = inputCalibration.defaultCenterEyeMat;
+
+    // calculate the center-eye transform in sensor space, via the head-puck
     size_t headPuckIndex = _validTrackedObjects.size() - 1;
     controller::Pose headPuckPose = _validTrackedObjects[headPuckIndex].second;
-    glm::mat4 headPuckAvatarMat = createMatFromQuatAndPos(headPuckPose.getRotation(), headPuckPose.getTranslation()) * Matrices::Y_180;
-    glm::vec3 headPuckTranslation = extractTranslation(headPuckAvatarMat);
-    glm::vec3 headPuckZAxis = cancelOutRollAndPitch(glmExtractRotation(headPuckAvatarMat)) * glm::vec3(0.0f, 0.0f, 1.0f);
-    glm::vec3 worldUp = glm::vec3(0.0f, 1.0f, 0.0f);
 
-    // check that the head puck z axis is not parrallel to the world up
-    const float EPSILON = 1.0e-4f;
-    glm::vec3 zAxis = glmExtractRotation(headPuckAvatarMat) * glm::vec3(0.0f, 0.0f, 1.0f);
-    if (fabsf(fabsf(glm::dot(glm::normalize(worldUp), glm::normalize(zAxis))) - 1.0f) < EPSILON) {
-        headPuckZAxis = glm::vec3(1.0f, 0.0f, 0.0f);
-    }
+    // AJT: TODO: handle case were forward is parallel with UNIT_Y.
+    glm::vec3 forward = headPuckPose.rotation * -Vectors::UNIT_Z;
+    glm::vec3 x = glm::normalize(glm::cross(Vectors::UNIT_Y, forward));
+    glm::vec3 z = glm::normalize(glm::cross(x, Vectors::UNIT_Y));
+    glm::mat3 centerEyeRotMat(x, Vectors::UNIT_Y, z);
+    glm::vec3 centerEyeTrans = headPuckPose.translation + centerEyeRotMat * glm::vec3(0.0f, _headPuckYOffset, _headPuckZOffset);
 
-    glm::vec3 yPrime = glm::vec3(0.0f, 1.0f, 0.0f);
-    glm::vec3 xPrime = glm::normalize(glm::cross(worldUp, headPuckZAxis));
-    glm::vec3 zPrime = glm::normalize(glm::cross(xPrime, yPrime));
-    glm::mat4 newHeadPuck = glm::mat4(glm::vec4(xPrime, 0.0f), glm::vec4(yPrime, 0.0f),
-                                      glm::vec4(zPrime, 0.0f), glm::vec4(headPuckTranslation, 1.0f));
+    glm::mat4 E_s(glm::vec4(centerEyeRotMat[0], 0.0f),
+                  glm::vec4(centerEyeRotMat[1], 0.0f),
+                  glm::vec4(centerEyeRotMat[2], 0.0f),
+                  glm::vec4(centerEyeTrans, 1.0f));
 
-    glm::mat4 headPuckOffset = glm::mat4(glm::vec4(1.0f, 0.0f, 0.0f, 0.0f), glm::vec4(0.0f, 1.0f, 0.0f, 0.0f),
-                                         glm::vec4(0.0f, 0.0f, 1.0f, 0.0f), glm::vec4(0.0f, HEAD_PUCK_Y_OFFSET, HEAD_PUCK_Z_OFFSET, 1.0f));
-
-    glm::mat4 finalHeadPuck = newHeadPuck * headPuckOffset;
-
-    glm::mat4 defaultHeadOffset = glm::inverse(inputCalibration.defaultCenterEyeMat) * inputCalibration.defaultHeadMat;
-
-    glm::mat4 currentHead  = finalHeadPuck * defaultHeadOffset;
-
-    // calculate the defaultToRefrenceXform
-    glm::mat4 defaultToReferenceMat = currentHead * glm::inverse(inputCalibration.defaultHeadMat);
-    return defaultToReferenceMat;
+    return E_s * glm::inverse(E_a);
 }
 
 void ViveControllerManager::InputDevice::partitionTouchpad(int sButton, int xAxis, int yAxis, int centerPseudoButton, int xPseudoButton, int yPseudoButton) {
@@ -817,15 +937,12 @@ void ViveControllerManager::InputDevice::handleButtonEvent(float deltaTime, uint
 
 void ViveControllerManager::InputDevice::handleHeadPoseEvent(const controller::InputCalibrationData& inputCalibrationData, const mat4& mat,
                                                              const vec3& linearVelocity, const vec3& angularVelocity) {
-
     //perform a 180 flip to make the HMD face the +z instead of -z, beacuse the head faces +z
     glm::mat4 matYFlip = mat * Matrices::Y_180;
     controller::Pose pose(extractTranslation(matYFlip), glmExtractRotation(matYFlip), linearVelocity, angularVelocity);
-
-    glm::mat4 sensorToAvatar = glm::inverse(inputCalibrationData.avatarMat) * inputCalibrationData.sensorToWorldMat;
     glm::mat4 defaultHeadOffset = glm::inverse(inputCalibrationData.defaultCenterEyeMat) * inputCalibrationData.defaultHeadMat;
-    controller::Pose hmdHeadPose = pose.transform(sensorToAvatar);
-    _poseStateMap[controller::HEAD] = hmdHeadPose.postTransform(defaultHeadOffset);
+    glm::mat4 sensorToAvatar = glm::inverse(inputCalibrationData.avatarMat) * inputCalibrationData.sensorToWorldMat;
+    _poseStateMap[controller::HEAD] = pose.postTransform(defaultHeadOffset).transform(sensorToAvatar);
 }
 
 void ViveControllerManager::InputDevice::handlePoseEvent(float deltaTime, const controller::InputCalibrationData& inputCalibrationData,
@@ -887,7 +1004,7 @@ void ViveControllerManager::InputDevice::hapticsHelper(float deltaTime, bool lef
     }
 }
 
-void ViveControllerManager::InputDevice::calibrateLeftHand(glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration, PuckPosePair& handPair) {
+void ViveControllerManager::InputDevice::calibrateLeftHand(const glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration, PuckPosePair& handPair) {
     controller::Pose& handPose = handPair.second;
     glm::mat4 handPoseAvatarMat = createMatFromQuatAndPos(handPose.getRotation(), handPose.getTranslation());
     glm::vec3 handPoseTranslation = extractTranslation(handPoseAvatarMat);
@@ -904,21 +1021,21 @@ void ViveControllerManager::InputDevice::calibrateLeftHand(glm::mat4& defaultToR
 
     glm::mat4 newHandMat = glm::mat4(glm::vec4(xPrime, 0.0f), glm::vec4(yPrime, 0.0f),
                                      glm::vec4(zPrime, 0.0f), glm::vec4(0.0f, 0.0f, 0.0f, 1.0f));
-    
 
-    glm::vec3 translationOffset = glm::vec3(0.0f, HAND_PUCK_Y_OFFSET, HAND_PUCK_Z_OFFSET);
+
+    glm::vec3 translationOffset = glm::vec3(0.0f, _handPuckYOffset, _handPuckZOffset);
     glm::quat initialRotation = glmExtractRotation(handPoseAvatarMat);
     glm::quat finalRotation = glmExtractRotation(newHandMat);
-    
+
     glm::quat rotationOffset = glm::inverse(initialRotation) * finalRotation;
 
     glm::mat4 offsetMat = createMatFromQuatAndPos(rotationOffset, translationOffset);
 
     _jointToPuckMap[controller::LEFT_HAND] = handPair.first;
-    _pucksOffset[handPair.first] = offsetMat;
+    _pucksPostOffset[handPair.first] = offsetMat;
 }
 
-void ViveControllerManager::InputDevice::calibrateRightHand(glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration, PuckPosePair& handPair) {
+void ViveControllerManager::InputDevice::calibrateRightHand(const glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration, PuckPosePair& handPair) {
     controller::Pose& handPose = handPair.second;
     glm::mat4 handPoseAvatarMat = createMatFromQuatAndPos(handPose.getRotation(), handPose.getTranslation());
     glm::vec3 handPoseTranslation = extractTranslation(handPoseAvatarMat);
@@ -934,30 +1051,30 @@ void ViveControllerManager::InputDevice::calibrateRightHand(glm::mat4& defaultTo
     glm::vec3 yPrime = glm::normalize(glm::cross(zPrime, xPrime));
     glm::mat4 newHandMat = glm::mat4(glm::vec4(xPrime, 0.0f), glm::vec4(yPrime, 0.0f),
                                      glm::vec4(zPrime, 0.0f), glm::vec4(0.0f, 0.0f, 0.0f, 1.0f));
-    
 
 
-    glm::vec3 translationOffset = glm::vec3(0.0f, HAND_PUCK_Y_OFFSET, HAND_PUCK_Z_OFFSET);
+
+    glm::vec3 translationOffset = glm::vec3(0.0f, _handPuckYOffset, _handPuckZOffset);
     glm::quat initialRotation = glmExtractRotation(handPoseAvatarMat);
     glm::quat finalRotation = glmExtractRotation(newHandMat);
-    
+
     glm::quat rotationOffset = glm::inverse(initialRotation) * finalRotation;
 
     glm::mat4 offsetMat = createMatFromQuatAndPos(rotationOffset, translationOffset);
 
     _jointToPuckMap[controller::RIGHT_HAND] = handPair.first;
-    _pucksOffset[handPair.first] = offsetMat;
+    _pucksPostOffset[handPair.first] = offsetMat;
 }
 
 
-void ViveControllerManager::InputDevice::calibrateFeet(glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration) {
+void ViveControllerManager::InputDevice::calibrateFeet(const glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration) {
     glm::vec3 headXAxis = getReferenceHeadXAxis(defaultToReferenceMat, inputCalibration.defaultHeadMat);
     glm::vec3 headPosition = getReferenceHeadPosition(defaultToReferenceMat, inputCalibration.defaultHeadMat);
     auto& firstFoot = _validTrackedObjects[FIRST_FOOT];
     auto& secondFoot = _validTrackedObjects[SECOND_FOOT];
     controller::Pose& firstFootPose = firstFoot.second;
     controller::Pose& secondFootPose = secondFoot.second;
-    
+
     if (determineLimbOrdering(firstFootPose, secondFootPose, headXAxis, headPosition)) {
         calibrateFoot(defaultToReferenceMat, inputCalibration, firstFoot, true);
         calibrateFoot(defaultToReferenceMat, inputCalibration, secondFoot, false);
@@ -967,7 +1084,7 @@ void ViveControllerManager::InputDevice::calibrateFeet(glm::mat4& defaultToRefer
     }
 }
 
-void ViveControllerManager::InputDevice::calibrateFoot(glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration, PuckPosePair& footPair, bool isLeftFoot){
+void ViveControllerManager::InputDevice::calibrateFoot(const glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration, PuckPosePair& footPair, bool isLeftFoot){
     controller::Pose footPose = footPair.second;
     glm::mat4 puckPoseAvatarMat = createMatFromQuatAndPos(footPose.getRotation(), footPose.getTranslation());
     glm::mat4 defaultFoot = isLeftFoot ? inputCalibration.defaultLeftFoot : inputCalibration.defaultRightFoot;
@@ -982,53 +1099,96 @@ void ViveControllerManager::InputDevice::calibrateFoot(glm::mat4& defaultToRefer
 
     if (isLeftFoot) {
         _jointToPuckMap[controller::LEFT_FOOT] = footPair.first;
-        _pucksOffset[footPair.first] = finalOffset;
+        _pucksPostOffset[footPair.first] = finalOffset;
     } else {
         _jointToPuckMap[controller::RIGHT_FOOT] = footPair.first;
-        _pucksOffset[footPair.first] = finalOffset;
+        _pucksPostOffset[footPair.first] = finalOffset;
     }
 }
 
-void ViveControllerManager::InputDevice::calibrateHips(glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration) {
+void ViveControllerManager::InputDevice::calibrateHips(const glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration) {
     _jointToPuckMap[controller::HIPS] = _validTrackedObjects[HIP].first;
-    _pucksOffset[_validTrackedObjects[HIP].first] = computeOffset(defaultToReferenceMat, inputCalibration.defaultHips, _validTrackedObjects[HIP].second);
+    _pucksPostOffset[_validTrackedObjects[HIP].first] = computeOffset(defaultToReferenceMat, inputCalibration.defaultHips, _validTrackedObjects[HIP].second);
 }
 
-void ViveControllerManager::InputDevice::calibrateChest(glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration) {
+void ViveControllerManager::InputDevice::calibrateChest(const glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration) {
     _jointToPuckMap[controller::SPINE2] = _validTrackedObjects[CHEST].first;
-    _pucksOffset[_validTrackedObjects[CHEST].first] = computeOffset(defaultToReferenceMat, inputCalibration.defaultSpine2, _validTrackedObjects[CHEST].second);
+    _pucksPostOffset[_validTrackedObjects[CHEST].first] = computeOffset(defaultToReferenceMat, inputCalibration.defaultSpine2, _validTrackedObjects[CHEST].second);
 }
 
-void ViveControllerManager::InputDevice::calibrateShoulders(glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration,
+// y axis comes out of puck usb port/green light
+// -z axis comes out of puck center/vive logo
+static glm::vec3 computeUserShoulderPositionFromMeasurements(float armCirc, float shoulderSpan, const glm::mat4& headMat, const controller::Pose& armPuck, bool isLeftHand) {
+
+    float armRadius = armCirc / TWO_PI;
+
+    float sign = isLeftHand ? 1.0f : -1.0f;
+    float localArmX = sign * shoulderSpan / 2.0f;
+
+    controller::Pose localPuck = armPuck.transform(glm::inverse(headMat));
+    glm::mat4 localPuckMat = localPuck.getMatrix();
+    glm::vec3 localArmCenter = extractTranslation(localPuckMat) + armRadius * transformVectorFast(localPuckMat, Vectors::UNIT_Z);
+
+    return transformPoint(headMat, glm::vec3(localArmX, localArmCenter.y, localArmCenter.z));
+}
+
+void ViveControllerManager::InputDevice::calibrateShoulders(const glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration,
                                                             int firstShoulderIndex, int secondShoulderIndex) {
     const PuckPosePair& firstShoulder = _validTrackedObjects[firstShoulderIndex];
     const PuckPosePair& secondShoulder = _validTrackedObjects[secondShoulderIndex];
     const controller::Pose& firstShoulderPose = firstShoulder.second;
     const controller::Pose& secondShoulderPose = secondShoulder.second;
 
+    glm::mat4 refLeftArm = defaultToReferenceMat * inputCalibration.defaultLeftArm;
+    glm::mat4 refRightArm = defaultToReferenceMat * inputCalibration.defaultRightArm;
+
+    glm::mat4 userRefLeftArm = refLeftArm;
+    glm::mat4 userRefRightArm = refRightArm;
+
+    glm::mat4 headMat = defaultToReferenceMat * inputCalibration.defaultHeadMat;
+
     if (firstShoulderPose.translation.x < secondShoulderPose.translation.x) {
         _jointToPuckMap[controller::LEFT_ARM] = firstShoulder.first;
-        _pucksOffset[firstShoulder.first] = computeOffset(defaultToReferenceMat, inputCalibration.defaultLeftArm, firstShoulder.second);
         _jointToPuckMap[controller::RIGHT_ARM] = secondShoulder.first;
-        _pucksOffset[secondShoulder.first] = computeOffset(defaultToReferenceMat, inputCalibration.defaultRightArm, secondShoulder.second);
+
+        glm::vec3 leftPos = computeUserShoulderPositionFromMeasurements(_armCircumference, _shoulderWidth, headMat, firstShoulderPose, true);
+        userRefLeftArm[3] = glm::vec4(leftPos, 1.0f);
+        glm::vec3 rightPos = computeUserShoulderPositionFromMeasurements(_armCircumference, _shoulderWidth, headMat, secondShoulderPose, false);
+        userRefRightArm[3] = glm::vec4(rightPos, 1.0f);
+
+        // compute the post offset from the userRefArm
+        _pucksPostOffset[firstShoulder.first] = computeOffset(Matrices::IDENTITY, userRefLeftArm, firstShoulderPose);
+        _pucksPostOffset[secondShoulder.first] = computeOffset(Matrices::IDENTITY, userRefRightArm, secondShoulderPose);
+
+        // compute the pre offset from the diff between userRefArm and refArm transforms.
+        // as an optimization we don't do a full inverse, but subtract the translations.
+        _pucksPreOffset[firstShoulder.first] = createMatFromQuatAndPos(glm::quat(), extractTranslation(userRefLeftArm) - extractTranslation(refLeftArm));
+        _pucksPreOffset[secondShoulder.first] = createMatFromQuatAndPos(glm::quat(), extractTranslation(userRefRightArm) - extractTranslation(refRightArm));
     } else {
         _jointToPuckMap[controller::LEFT_ARM] = secondShoulder.first;
-        _pucksOffset[secondShoulder.first] = computeOffset(defaultToReferenceMat, inputCalibration.defaultLeftArm, secondShoulder.second);
         _jointToPuckMap[controller::RIGHT_ARM] = firstShoulder.first;
-        _pucksOffset[firstShoulder.first] = computeOffset(defaultToReferenceMat, inputCalibration.defaultRightArm, firstShoulder.second);
+
+        glm::vec3 leftPos = computeUserShoulderPositionFromMeasurements(_armCircumference, _shoulderWidth, headMat, secondShoulderPose, true);
+        userRefLeftArm[3] = glm::vec4(leftPos, 1.0f);
+        glm::vec3 rightPos = computeUserShoulderPositionFromMeasurements(_armCircumference, _shoulderWidth, headMat, firstShoulderPose, false);
+        userRefRightArm[3] = glm::vec4(rightPos, 1.0f);
+
+        // compute the post offset from the userRefArm
+        _pucksPostOffset[secondShoulder.first] = computeOffset(Matrices::IDENTITY, userRefLeftArm, secondShoulderPose);
+        _pucksPostOffset[firstShoulder.first] = computeOffset(Matrices::IDENTITY, userRefRightArm, firstShoulderPose);
+
+        // compute the pre offset from the diff between userRefArm and refArm transforms.
+        // as an optimization we don't do a full inverse, but subtract the translations.
+        _pucksPreOffset[secondShoulder.first] = createMatFromQuatAndPos(glm::quat(), extractTranslation(userRefLeftArm) - extractTranslation(refLeftArm));
+        _pucksPreOffset[firstShoulder.first] = createMatFromQuatAndPos(glm::quat(), extractTranslation(userRefRightArm) - extractTranslation(refRightArm));
     }
 }
 
-void ViveControllerManager::InputDevice::calibrateHead(glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration) {
+void ViveControllerManager::InputDevice::calibrateHead(const glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration) {
     size_t headIndex = _validTrackedObjects.size() - 1;
     const PuckPosePair& head = _validTrackedObjects[headIndex];
-
-    // assume the person is wearing the head puck on his/her forehead
-    glm::mat4 defaultHeadOffset = glm::inverse(inputCalibration.defaultCenterEyeMat) * inputCalibration.defaultHeadMat;
-    controller::Pose newHead = head.second.postTransform(defaultHeadOffset);
-
     _jointToPuckMap[controller::HEAD] = head.first;
-    _pucksOffset[head.first] = computeOffset(defaultToReferenceMat, inputCalibration.defaultHeadMat, newHead);
+    _pucksPostOffset[head.first] = computeOffset(defaultToReferenceMat, inputCalibration.defaultHeadMat, head.second);
 }
 
 QString ViveControllerManager::InputDevice::configToString(Config config) {
diff --git a/plugins/openvr/src/ViveControllerManager.h b/plugins/openvr/src/ViveControllerManager.h
index 0b0406bb60..4a7fcaf85e 100644
--- a/plugins/openvr/src/ViveControllerManager.h
+++ b/plugins/openvr/src/ViveControllerManager.h
@@ -57,6 +57,9 @@ public:
 
     void setRenderControllers(bool renderControllers) { _renderControllers = renderControllers; }
 
+    virtual void saveSettings() const override;
+    virtual void loadSettings() override;
+
 private:
     class InputDevice : public controller::InputDevice {
     public:
@@ -73,12 +76,13 @@ private:
         void calibrateOrUncalibrate(const controller::InputCalibrationData& inputCalibration);
         void calibrate(const controller::InputCalibrationData& inputCalibration);
         void uncalibrate();
+        void sendUserActivityData(QString activity);
         void configureCalibrationSettings(const QJsonObject configurationSettings);
         QJsonObject configurationSettings();
-        controller::Pose addOffsetToPuckPose(int joint) const;
+        controller::Pose addOffsetToPuckPose(const controller::InputCalibrationData& inputCalibration, int joint) const;
         glm::mat4 calculateDefaultToReferenceForHeadPuck(const controller::InputCalibrationData& inputCalibration);
         glm::mat4 calculateDefaultToReferenceForHmd(const controller::InputCalibrationData& inputCalibration);
-        void updateCalibratedLimbs();
+        void updateCalibratedLimbs(const controller::InputCalibrationData& inputCalibration);
         bool checkForCalibrationEvent();
         void handleHandController(float deltaTime, uint32_t deviceIndex, const controller::InputCalibrationData& inputCalibrationData, bool isLeftHand);
         void handleHmd(uint32_t deviceIndex, const controller::InputCalibrationData& inputCalibrationData);
@@ -92,21 +96,21 @@ private:
         void partitionTouchpad(int sButton, int xAxis, int yAxis, int centerPsuedoButton, int xPseudoButton, int yPseudoButton);
         void printDeviceTrackingResultChange(uint32_t deviceIndex);
         void setConfigFromString(const QString& value);
-        bool configureHead(glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration);
-        bool configureHands(glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration);
-        bool configureBody(glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration);
-        void calibrateLeftHand(glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration, PuckPosePair& handPair);
-        void calibrateRightHand(glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration, PuckPosePair& handPair);
-        void calibrateFeet(glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration);
-        void calibrateFoot(glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration, PuckPosePair& footPair, bool isLeftFoot);
-        void calibrateHips(glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration);
-        void calibrateChest(glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration);
-        void calibrateShoulders(glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration,
+        bool configureHead(const glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration);
+        bool configureHands(const glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration);
+        bool configureBody(const glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration);
+        void calibrateLeftHand(const glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration, PuckPosePair& handPair);
+        void calibrateRightHand(const glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration, PuckPosePair& handPair);
+        void calibrateFeet(const glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration);
+        void calibrateFoot(const glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration, PuckPosePair& footPair, bool isLeftFoot);
+        void calibrateHips(const glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration);
+        void calibrateChest(const glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration);
+        void calibrateShoulders(const glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration,
                                 int firstShoulderIndex, int secondShoulderIndex);
-        void calibrateHead(glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration);
+        void calibrateHead(const glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration);
         void calibrateFromHandController(const controller::InputCalibrationData& inputCalibrationData);
         void calibrateFromUI(const controller::InputCalibrationData& inputCalibrationData);
-        void emitCalibrationStatus(const bool success);
+        void emitCalibrationStatus();
         void calibrateNextFrame();
 
 
@@ -139,7 +143,7 @@ private:
             FeetAndHips,
             FeetHipsAndChest,
             FeetHipsAndShoulders,
-            FeetHipsChestAndShoulders,
+            FeetHipsChestAndShoulders
         };
 
         enum class HeadConfig {
@@ -151,7 +155,7 @@ private:
             HandController,
             Pucks
         };
-            
+
         Config _config { Config::None };
         Config _preferedConfig { Config::None };
         HeadConfig _headConfig { HeadConfig::HMD };
@@ -160,7 +164,8 @@ private:
         FilteredStick _filteredRightStick;
 
         std::vector<PuckPosePair> _validTrackedObjects;
-        std::map<uint32_t, glm::mat4> _pucksOffset;
+        std::map<uint32_t, glm::mat4> _pucksPostOffset;
+        std::map<uint32_t, glm::mat4> _pucksPreOffset;
         std::map<int, uint32_t> _jointToPuckMap;
         std::map<Config, QString> _configStringMap;
         PoseData _lastSimPoseData;
@@ -176,6 +181,12 @@ private:
         float _leftHapticDuration { 0.0f };
         float _rightHapticStrength { 0.0f };
         float _rightHapticDuration { 0.0f };
+        float _headPuckYOffset { -0.05f };
+        float _headPuckZOffset { -0.05f };
+        float _handPuckYOffset { 0.0f };
+        float _handPuckZOffset { 0.0f };
+        float _armCircumference { 0.33f };
+        float _shoulderWidth { 0.48f };
         bool _triggersPressedHandled { false };
         bool _calibrated { false };
         bool _timeTilCalibrationSet { false };
@@ -189,9 +200,12 @@ private:
     };
 
     void renderHand(const controller::Pose& pose, gpu::Batch& batch, int sign);
-
+    bool isDesktopMode();
     bool _registeredWithInputMapper { false };
     bool _modelLoaded { false };
+    bool _resetMatCalculated { false };
+    bool _desktopMode { false };
+    glm::mat4 _resetMat { glm::mat4() };
     model::Geometry _modelGeometry;
     gpu::TexturePointer _texture;
 
diff --git a/scripts/defaultScripts.js b/scripts/defaultScripts.js
index 2270118861..61e520af21 100644
--- a/scripts/defaultScripts.js
+++ b/scripts/defaultScripts.js
@@ -24,6 +24,7 @@ var DEFAULT_SCRIPTS_COMBINED = [
     "system/makeUserConnection.js",
     "system/tablet-goto.js",
     "system/marketplaces/marketplaces.js",
+    "system/commerce/wallet.js",
     "system/edit.js",
     "system/notifications.js",
     "system/dialTone.js",
@@ -31,7 +32,7 @@ var DEFAULT_SCRIPTS_COMBINED = [
     "system/tablet-ui/tabletUI.js"
 ];
 var DEFAULT_SCRIPTS_SEPARATE = [
-    "system/controllers/controllerScripts.js",
+    "system/controllers/controllerScripts.js"
     // "system/chat.js"
 ];
 
diff --git a/scripts/developer/debugging/debugHaze.qml b/scripts/developer/debugging/debugHaze.qml
new file mode 100644
index 0000000000..5a18f88c79
--- /dev/null
+++ b/scripts/developer/debugging/debugHaze.qml
@@ -0,0 +1,185 @@
+//
+//  haze.qml
+//  developer/utilities/render
+//
+//  Nissim Hadar, created on 9/8/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 "../utilities/render/configSlider"
+
+Item {
+    id: root
+    property var hazeModel: Render.getConfig("RenderMainView.HazeModel")
+
+    Column {
+        spacing: 8
+
+        Row {
+          CheckBox {
+              text: "Haze Active"
+              checked: root.hazeModel["isHazeActive"]
+              onCheckedChanged: {
+                  root.hazeModel["isHazeActive"] = checked;
+              }
+          }
+
+          CheckBox {
+              text: "Modulated Color"
+              checked: root.hazeModel["isModulateColorActive"]
+              onCheckedChanged: {
+                  root.hazeModel["isModulateColorActive"] = checked;
+              }
+          }
+        }
+        CheckBox {
+            text: "Altitude Based"
+            checked: root.hazeModel["isAltitudeBased"]
+            onCheckedChanged: {
+                root.hazeModel["isAltitudeBased"] = checked;
+            }
+        }
+        
+        ConfigSlider {
+            label: "Range"
+            integral: false
+            config: root.hazeModel
+            property: "hazeRange_m"
+            max: 10000
+            min: 5
+            width: 280
+        }
+        
+        ConfigSlider {
+            label: "Altitude"
+            integral: false
+            config: root.hazeModel
+            property: "hazeAltitude_m"
+            max: 2000
+            min: 5
+            width: 280
+        }
+        
+        ConfigSlider {
+            label: "Haze Color R"
+            integral: false
+            config: root.hazeModel
+            property: "hazeColor.r"
+            max: 1.0
+            min: 0.0
+            width: 280
+        }
+        
+        ConfigSlider {
+            label: "Haze Color G"
+            integral: false
+            config: root.hazeModel
+            property: "hazeColor.g"
+            max: 1.0
+            min: 0.0
+            width: 280
+        }
+        
+        ConfigSlider {
+            label: "Haze Color B"
+            integral: false
+            config: root.hazeModel
+            property: "hazeColor.b"
+            max: 1.0
+            min: 0.0
+            width: 280
+        }
+        
+        ConfigSlider {
+            label: "Sun R"
+            integral: false
+            config: root.hazeModel
+            property: "hazeGlareColor.r"
+            max: 1.0
+            min: 0.0
+            width: 280
+        }
+        
+        ConfigSlider {
+            label: "Sun G"
+            integral: false
+            config: root.hazeModel
+            property: "hazeGlareColor.g"
+            max: 1.0
+            min: 0.0
+            width: 280
+        }
+        
+        ConfigSlider {
+            label: "Sun B"
+            integral: false
+            config: root.hazeModel
+            property: "hazeGlareColor.b"
+            max: 1.0
+            min: 0.0
+            width: 280
+        }
+        
+        ConfigSlider {
+            label: "Sun glare angle"
+            integral: false
+            config: root.hazeModel
+            property: "hazeGlareAngle_degs"
+            max: 70.0
+            min: 0.0
+            width: 280
+        }
+        
+        ConfigSlider {
+            label: "Base"
+            integral: false
+            config: root.hazeModel
+            property: "hazeBaseReference"
+            max: 500.0
+            min: -500.0
+            width: 280
+        }
+        
+        ConfigSlider {
+            label: "BG Blend"
+            integral: false
+            config: root.hazeModel
+            property: "hazeBackgroundBlend"
+            max: 1.0
+            min: 0.0
+            width: 280
+        }
+
+        CheckBox {
+            text: "Keylight Attenuation"
+            checked: root.hazeModel["isKeyLightAttenuationActive"]
+            onCheckedChanged: {
+                root.hazeModel["isKeyLightAttenuationActive"] = checked;
+            }
+        }
+        
+        ConfigSlider {
+            label: "Range"
+            integral: false
+            config: root.hazeModel
+            property: "hazeKeyLightRange_m"
+            max: 10000
+            min: 5
+            width: 280
+        }
+        
+        ConfigSlider {
+            label: "Altitude"
+            integral: false
+            config: root.hazeModel
+            property: "hazeKeyLightAltitude_m"
+            max: 2000
+            min: 5
+            width: 280
+        }
+    }
+}
diff --git a/scripts/developer/debugging/debugWindow.js b/scripts/developer/debugging/debugWindow.js
index 6dd116089a..068efb351b 100644
--- a/scripts/developer/debugging/debugWindow.js
+++ b/scripts/developer/debugging/debugWindow.js
@@ -10,13 +10,24 @@
 
 (function() { // BEGIN LOCAL_SCOPE
 
+//check if script already running.
+var scriptData = ScriptDiscoveryService.getRunning();
+var scripts = scriptData.filter(function (datum) { return datum.name === 'debugWindow.js'; });
+if (scripts.length >= 2) {
+    //2nd instance of the script is too much
+    ScriptDiscoveryService.stopScript(scripts[1].url);
+    return;
+}
+
 // Set up the qml ui
 var qml = Script.resolvePath('debugWindow.qml');
+
 var window = new OverlayWindow({
     title: 'Debug Window',
     source: qml,
     width: 400, height: 900,
 });
+
 window.setPosition(25, 50);
 window.closed.connect(function() { Script.stop(); });
 
@@ -53,4 +64,8 @@ ScriptDiscoveryService.clearDebugWindow.connect(function() {
     window.clearDebugWindow();
 });
 
+Script.scriptEnding.connect(function () {
+    window.close();
+})
+
 }());
diff --git a/scripts/developer/debugging/surfaceGeometryPass.qml b/scripts/developer/debugging/surfaceGeometryPass.qml
new file mode 100644
index 0000000000..ba1db66d16
--- /dev/null
+++ b/scripts/developer/debugging/surfaceGeometryPass.qml
@@ -0,0 +1,64 @@
+//
+//  surfaceGeometryPass.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.5
+import QtQuick.Controls 1.4
+import "configSlider"
+
+Column {
+    spacing: 8
+    Column {
+        id: surfaceGeometry
+        spacing: 10
+
+        Column{
+                ConfigSlider {
+                    label: qsTr("Depth Threshold [cm]")
+                    integral: false
+                    config: Render.getConfig("RenderMainView.SurfaceGeometry")
+                    property: "depthThreshold"
+                    max: 5.0
+                    min: 0.0
+                }
+            Repeater {
+                model: [
+                    "Basis Scale:basisScale:2.0:false",
+                    "Curvature Scale:curvatureScale:100.0:false",
+                ]
+                ConfigSlider {
+                    label: qsTr(modelData.split(":")[0])
+                    integral: (modelData.split(":")[3] == 'true')
+                    config: Render.getConfig("RenderMainView.SurfaceGeometry")
+                    property: modelData.split(":")[1]
+                    max: modelData.split(":")[2]
+                    min: 0.0
+                }
+            }
+            CheckBox {
+                    text: "Half Resolution"
+                    checked: Render.getConfig("RenderMainView.SurfaceGeometry")["resolutionLevel"]
+                    onCheckedChanged: { Render.getConfig("RenderMainView.SurfaceGeometry")["resolutionLevel"] = checked }
+            }
+    
+            Repeater {
+                model: [ "Diffusion Scale:RenderMainView.SurfaceGeometry:diffuseFilterScale:2.0",
+                         "Diffusion Depth Threshold:RenderMainView.SurfaceGeometry:diffuseDepthThreshold:1.0"
+                ]
+                ConfigSlider {
+                    label: qsTr(modelData.split(":")[0])
+                    integral: false
+                    config: Render.getConfig(modelData.split(":")[1])
+                    property: modelData.split(":")[2]
+                    max: modelData.split(":")[3]
+                    min: 0.0
+                }
+            }
+        }
+    }
+}
diff --git a/scripts/developer/tests/avatarAttachmentTest.js b/scripts/developer/tests/avatarAttachmentTest.js
index f287013979..c9f2e1615b 100644
--- a/scripts/developer/tests/avatarAttachmentTest.js
+++ b/scripts/developer/tests/avatarAttachmentTest.js
@@ -89,9 +89,9 @@ var coatButton = new ToggleButtonBuddy(buttonPositionX, buttonPositionY, BUTTON_
 var HAT_ATTACHMENT = {
     modelURL: "https://s3.amazonaws.com/hifi-public/tony/cowboy-hat.fbx",
     jointName: "Head",
-    translation: {"x": 0, "y": 0.2, "z": 0},
+    translation: {"x": 0, "y": 0.25, "z": 0.03},
     rotation: {"x": 0, "y": 0, "z": 0, "w": 1},
-    scale: 1,
+    scale: 0.052,
     isSoft: false
 };
 
diff --git a/scripts/developer/tests/avatarToWorldTests.js b/scripts/developer/tests/avatarToWorldTests.js
index c6e23fc81b..c2da49cbd4 100644
--- a/scripts/developer/tests/avatarToWorldTests.js
+++ b/scripts/developer/tests/avatarToWorldTests.js
@@ -1,5 +1,3 @@
-var AVATAR_SELF_ID = "{00000000-0000-0000-0000-000000000001}";
-
 var debugSphereBaseProperties = {
                type: "Sphere",
                dimensions: { x: 0.2, y: 0.2, z: 0.2 },
diff --git a/scripts/developer/tests/basicEntityTest/shapeSpawner.js b/scripts/developer/tests/basicEntityTest/shapeSpawner.js
new file mode 100644
index 0000000000..9fcaf3a3db
--- /dev/null
+++ b/scripts/developer/tests/basicEntityTest/shapeSpawner.js
@@ -0,0 +1,30 @@
+// compute a position to create the object relative to avatar
+var forwardOffset = Vec3.multiply(2.0, Quat.getFront(MyAvatar.orientation));
+var objectPosition = Vec3.sum(MyAvatar.position, forwardOffset);
+
+var LIFETIME = 1800; //seconds
+var DIM_HEIGHT = 1, DIM_WIDTH = 1, DIM_DEPTH = 1;
+var COLOR_R = 100, COLOR_G = 10, COLOR_B = 200;
+
+var properties = {
+        name: "ShapeSpawnTest",
+        type: "Shape",
+        shape: "Cylinder",
+        dimensions: {x: DIM_WIDTH, y: DIM_HEIGHT, z: DIM_DEPTH},
+        color: {red: COLOR_R, green: COLOR_G, blue: COLOR_B},
+        position: objectPosition,
+        lifetime: LIFETIME,
+};
+
+// create the object
+var entityId = Entities.addEntity(properties);
+
+function cleanup() {
+    Entities.deleteEntity(entityId);
+}
+
+// delete the object when this script is stopped
+Script.scriptEnding.connect(cleanup);
+
+
+
diff --git a/scripts/developer/tests/controllerTableTest.js b/scripts/developer/tests/controllerTableTest.js
new file mode 100644
index 0000000000..239c7fd0ce
--- /dev/null
+++ b/scripts/developer/tests/controllerTableTest.js
@@ -0,0 +1,278 @@
+"use strict";
+
+/* jslint bitwise: true */
+/* global Script, Entities, MyAvatar, Vec3, Quat, Mat4 */
+
+(function() { // BEGIN LOCAL_SCOPE
+
+    // var lifetime = -1;
+    var lifetime = 600;
+    var tableSections = 32;
+    var tableRadius = 9;
+
+    var sectionRelativeRotation = 0;
+    var sectionRotation = 0;
+    var sectionRelativeCenterA = 0;
+    var sectionRelativeCenterB = 0;
+    var sectionRelativeCenterSign = 0;
+    var sectionCenterA = 0;
+    var sectionCenterB = 0;
+    var sectionCenterSign = 0;
+    var yFlip = 0;
+    
+    var objects = [];
+    var overlays = [];
+
+    var testNames = [
+        "FarActionGrab",
+        "NearParentGrabEntity",
+        "NearParentGrabOverlay",
+        "Clone Entity (dynamic)",
+        "Clone Entity (non-dynamic"
+    ];
+
+    function createCloneDynamicEntity(index) {
+        createPropsCube(index, false, false, true, true);
+        createPropsModel(index, false, false, true, true);
+        createSign(index, "Clone Dynamic Entity");
+    };
+
+    function createCloneEntity(index) {
+        createPropsCube(index, false, false, true, false);
+        createPropsModel(index, false, false, true, false);
+        createSign(index, "Clone Non-Dynamic Entity");
+    };
+
+    function createNearGrabOverlay(index) {
+        createPropsCubeOverlay(index, false, false, true, true);
+        createPropsModelOverlay(index, false, false, true, true);
+        createSign(index, "Near Grab Overlay");
+    };
+
+    function createNearGrabEntity(index) {
+        createPropsCube(index, false, false, false, false);
+        createPropsModel(index, false, false, false, false);
+        createSign(index, "Near Grab Entity");
+    };
+
+    function createFarGrabEntity(index) {
+        createPropsCube(index, true, false, false, false);
+        createPropsModel(index, true, false, false, false);
+        createSign(index, "Far Grab Entity");
+    };
+
+    function createPropsModel(i, dynamic, collisionless, clone, cloneDynamic) {
+        var propsModel = {
+            name: "controller-tests model object " + i,
+            type: "Model",
+            modelURL: "http://headache.hungry.com/~seth/hifi/controller-tests/color-cube.obj",
+            
+            position: sectionCenterA,
+            rotation: sectionRotation,
+            
+            gravity: (dynamic && !collisionless) ? { x: 0, y: -1, z: 0 } : { x: 0, y: 0, z: 0 },
+            dimensions: { x: 0.2, y: 0.2, z: 0.2 },
+            userData: JSON.stringify({
+                grabbableKey: {
+                    grabbable: true,
+                    cloneLimit: 10,
+                    cloneable: clone,
+                    cloneDynamic: cloneDynamic
+                },
+                controllerTestEntity: true
+            }),
+            lifetime: lifetime,
+            shapeType: "box",
+            dynamic: dynamic,
+            collisionless: collisionless
+        };
+        objects.push(Entities.addEntity(propsModel));
+    }
+
+    function createPropsModelOverlay(i, dynamic, collisionless, clone, cloneDynamic) {
+        var propsModel = {
+            name: "controller-tests model object " + i,
+            type: "Model",
+            modelURL: "http://headache.hungry.com/~seth/hifi/controller-tests/color-cube.obj",
+            url: "http://headache.hungry.com/~seth/hifi/controller-tests/color-cube.obj",
+            grabbable: true,
+            position: sectionCenterA,
+            rotation: sectionRotation,
+            dimensions: { x: 0.2, y: 0.2, z: 0.2 },
+            userData: JSON.stringify({
+                grabbableKey: {
+                    grabbable: true,
+                },
+                controllerTestEntity: true
+            }),
+            lifetime: lifetime,
+            visible: true,
+        };
+        overlays.push(Overlays.addOverlay("model", propsModel));
+    }
+
+
+    function createPropsCubeOverlay(i, dynamic, collisionless, clone, cloneDynamic) {
+        var propsCube = {
+            name: "controller-tests cube object " + i,
+            type: "Box",
+            color: { "blue": 200, "green": 10, "red": 20 },
+            position: sectionCenterB,
+            rotation: sectionRotation,
+            grabbable: true,
+            dimensions: { x: 0.2, y: 0.2, z: 0.2 },
+            userData: JSON.stringify({
+                grabbableKey: {
+                    grabbable: true,
+                },
+                controllerTestEntity: true
+            }),
+            lifetime: lifetime,
+            solid: true,
+            visible: true,
+        };
+        overlays.push(Overlays.addOverlay("cube", propsCube));
+    }
+
+    function createPropsCube(i, dynamic, collisionless, clone, cloneDynamic) {
+        var propsCube = {
+            name: "controller-tests cube object " + i,
+            type: "Box",
+            shape: "Cube",
+            color: { "blue": 200, "green": 10, "red": 20 },
+            position: sectionCenterB,
+            rotation: sectionRotation,
+            gravity: dynamic ? { x: 0, y: -1, z: 0 } : { x: 0, y: 0, z: 0 },
+            dimensions: { x: 0.2, y: 0.2, z: 0.2 },
+            userData: JSON.stringify({
+                grabbableKey: {
+                    grabbable: true,
+                    cloneLimit: 10,
+                    cloneable: clone,
+                    cloneDynamic: cloneDynamic
+                },
+                controllerTestEntity: true
+            }),
+            lifetime: lifetime,
+            shapeType: "box",
+            dynamic: dynamic,
+            collisionless: collisionless
+        };
+        objects.push(Entities.addEntity(propsCube));
+    }
+
+    function createSign(i, signText) {
+        var propsLabel = {
+            name: "controller-tests sign " + i,
+            type: "Text",
+            lineHeight: 0.125,
+            position: sectionCenterSign,
+            rotation: Quat.multiply(sectionRotation, yFlip),
+            text: signText,
+            dimensions: { x: 1, y: 1, z: 0.01 },
+            lifetime: lifetime,
+            userData: JSON.stringify({
+                grabbableKey: {
+                    grabbable: false,
+                },
+                controllerTestEntity: true
+            })
+        };
+        objects.push(Entities.addEntity(propsLabel));
+    }
+
+    function chooseType(index) {
+        switch (index) {
+        case 0:
+            createFarGrabEntity(index);
+            break;
+        case 1:
+            createNearGrabEntity(index);
+            break;
+        case 2:
+            createNearGrabOverlay(index);
+            break;
+        case 3:
+            createCloneDynamicEntity();
+            break;
+        case 4:
+            createCloneEntity(index);
+            break;
+        }
+    }
+
+    function setupControllerTests(testBaseTransform) {
+        // var tableID =
+        objects.push(Entities.addEntity({
+            name: "controller-tests table",
+            type: "Model",
+            modelURL: "http://headache.hungry.com/~seth/hifi/controller-tests/controller-tests-table.obj.gz",
+            position: Mat4.transformPoint(testBaseTransform, { x: 0, y: 1, z: 0 }),
+            rotation: Mat4.extractRotation(testBaseTransform),
+            userData: JSON.stringify({
+                grabbableKey: { grabbable: false },
+                soundKey: {
+                    url: "http://headache.hungry.com/~seth/hifi/sound/clock-ticking-3.wav",
+                    volume: 0.4,
+                    loop: true,
+                    playbackGap: 0,
+                    playbackGapRange: 0
+                },
+                controllerTestEntity: true
+            }),
+            shapeType: "static-mesh",
+            lifetime: lifetime
+        }));
+
+        var Xdynamic = 1;
+        var Xcollisionless = 2;
+        var Xkinematic = 4;
+        var XignoreIK = 8;
+
+        yFlip = Quat.fromPitchYawRollDegrees(0, 180, 0);
+
+        for (var i = 0; i < 16; i++) {
+            sectionRelativeRotation = Quat.fromPitchYawRollDegrees(0, -360 * i / tableSections, 0);
+            sectionRotation = Quat.multiply(Mat4.extractRotation(testBaseTransform), sectionRelativeRotation);
+            sectionRelativeCenterA = Vec3.multiplyQbyV(sectionRotation, { x: -0.2, y: 1.25, z: tableRadius - 0.8 });
+            sectionRelativeCenterB = Vec3.multiplyQbyV(sectionRotation, { x: 0.2, y: 1.25, z: tableRadius - 0.8 });
+            sectionRelativeCenterSign = Vec3.multiplyQbyV(sectionRotation, { x: 0, y: 1.5, z: tableRadius + 1.0 });
+            sectionCenterA = Mat4.transformPoint(testBaseTransform, sectionRelativeCenterA);
+            sectionCenterB = Mat4.transformPoint(testBaseTransform, sectionRelativeCenterB);
+            sectionCenterSign = Mat4.transformPoint(testBaseTransform, sectionRelativeCenterSign);
+
+            var dynamic = (i & Xdynamic) ? true : false;
+            var collisionless = (i & Xcollisionless) ? true : false;
+            var kinematic = (i & Xkinematic) ? true : false;
+            var ignoreIK = (i & XignoreIK) ? true : false;
+
+            chooseType(i);
+        }
+    }
+
+    // This assumes the avatar is standing on a flat floor with plenty of space.
+    // Find the floor:
+    var pickRay = {
+        origin: Vec3.sum(MyAvatar.position, Vec3.multiplyQbyV(MyAvatar.orientation, { x: 0, y: 2, z: -1 })),
+        direction: { x: 0, y: -1, z: 0 },
+        length: 20
+    };
+    var intersection = Entities.findRayIntersection(pickRay, true, [], [], true);
+
+    if (intersection.intersects) {
+        var testBaseTransform = Mat4.createFromRotAndTrans(MyAvatar.rotation, intersection.intersection);
+        setupControllerTests(testBaseTransform);
+    }
+
+    Script.scriptEnding.connect(function () {
+        for (var i = 0; i < objects.length; i++) {
+            var nearbyID = objects[i];
+            Entities.deleteEntity(nearbyID);
+        }
+
+        for (var i = 0; i < overlays.length; i++) {
+            var overlayID = overlays[i];
+            Overlays.deleteOverlay(overlayID);
+        }
+    });
+}()); // END LOCAL_SCOPE
diff --git a/scripts/developer/tests/entityLookupCostMeasurement.js b/scripts/developer/tests/entityLookupCostMeasurement.js
new file mode 100644
index 0000000000..15697fe13d
--- /dev/null
+++ b/scripts/developer/tests/entityLookupCostMeasurement.js
@@ -0,0 +1,104 @@
+// Creates a large number of entities on the cardinal planes of the octree (all
+// objects will live in the root octree element).  Measures how long it takes
+// to update the properties of the first and last entity.  The difference
+// between the two measurements shows how the cost of lookup changes as a
+// function of the number of entities.  For best results run this in an
+// otherwise empty domain.
+
+var firstId;
+var lastId;
+var NUM_ENTITIES_ON_SIDE = 25;
+
+// create the objects
+createObjects = function () {
+    var STRIDE = 0.75;
+    var WIDTH = 0.5;
+    var DIMENSIONS = { x: WIDTH, y: WIDTH, z: WIDTH };
+    var LIFETIME = 20;
+
+    var properties = {
+        name: "",
+        type : "Box",
+        dimensions : DIMENSIONS,
+        position : { x: 0, y: 0, z: 0},
+        lifetime : LIFETIME,
+        color : { red:255, green: 64, blue: 255 }
+    };
+
+    // xy
+    var planeName = "xy";
+    for (var i = 0; i < NUM_ENTITIES_ON_SIDE; ++i) {
+        for (var j = 0; j < NUM_ENTITIES_ON_SIDE; ++j) {
+            properties.name = "Box-" + planeName + "-" + i + "." + j;
+            properties.position = { x: i * STRIDE, y: j * STRIDE, z: 0 };
+            var red = i * 255 / NUM_ENTITIES_ON_SIDE;
+            var green = j * 255 / NUM_ENTITIES_ON_SIDE;
+            var blue = 0;
+            properties.color = { red: red, green: green, blue: blue };
+            if (i == 0 && j == 0) {
+                firstId = Entities.addEntity(properties);
+            } else {
+                Entities.addEntity(properties);
+            }
+        }
+    }
+
+    // yz
+    var planeName = "yz";
+    for (var i = 0; i < NUM_ENTITIES_ON_SIDE; ++i) {
+        for (var j = 0; j < NUM_ENTITIES_ON_SIDE; ++j) {
+            properties.name = "Box-" + planeName + "-" + i + "." + j;
+            properties.position = { x: 0, y: i * STRIDE, z: j * STRIDE };
+            var red = 0;
+            var green = i * 255 / NUM_ENTITIES_ON_SIDE;
+            var blue = j * 255 / NUM_ENTITIES_ON_SIDE;
+            properties.color = { red: red, green: green, blue: blue };
+            Entities.addEntity(properties);
+        }
+    }
+
+    // zx
+    var planeName = "zx";
+    for (var i = 0; i < NUM_ENTITIES_ON_SIDE; ++i) {
+        for (var j = 0; j < NUM_ENTITIES_ON_SIDE; ++j) {
+            properties.name = "Box-" + planeName + "-" + i + "." + j;
+            properties.position = { x: j * STRIDE, y: 0, z: i * STRIDE };
+            var red = j * 255 / NUM_ENTITIES_ON_SIDE;
+            var green = 0;
+            var blue = i * 255 / NUM_ENTITIES_ON_SIDE;
+            properties.color = { red: red, green: green, blue: blue };
+            lastId = Entities.addEntity(properties);
+        }
+    }
+};
+
+createObjects();
+
+// measure the time it takes to edit the first and last entities many times
+// (requires a lookup by entityId each time)
+changeProperties = function (id) {
+    var newProperties = { color : { red: 255, green: 255, blue: 255 } };
+    Entities.editEntity(id, newProperties);
+}
+
+// first
+var NUM_CHANGES = 10000;
+var firstStart = Date.now();
+for (var k = 0; k < NUM_CHANGES; ++k) {
+    changeProperties(firstId);
+}
+var firstEnd = Date.now();
+var firstDt = firstEnd - firstStart;
+
+// last
+var lastStart = Date.now();
+for (var k = 0; k < NUM_CHANGES; ++k) {
+    changeProperties(lastId);
+}
+var lastEnd = Date.now();
+var lastDt = lastEnd - lastStart;
+
+// print the results
+var numEntities = 3 * NUM_ENTITIES_ON_SIDE * NUM_ENTITIES_ON_SIDE;
+print("numEntities = " + numEntities + "  numEdits = " + NUM_CHANGES + "  firstDt = " + firstDt + "  lastDt = " + lastDt);
+
diff --git a/scripts/developer/tests/gravityScript.js b/scripts/developer/tests/gravityScript.js
new file mode 100644
index 0000000000..3468de72c3
--- /dev/null
+++ b/scripts/developer/tests/gravityScript.js
@@ -0,0 +1,45 @@
+//
+// Gravity Script 1.0
+// ************
+//
+// Created by Cain Kilgore on 9/14/2017
+
+// Javascript for the Gravity Modifier Implementation to test
+//
+// Distributed under the Apache License, Version 2.0.
+// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+
+function menuParameters(menuNameSelection, menuItemNameSelection) {
+  Menu.addMenuItem({
+    menuName: menuNameSelection,
+    menuItemName: menuItemNameSelection,
+    isCheckable: false
+  });
+}
+
+function setupMenu() {
+    if (!Menu.menuExists("Gravity")) {
+        Menu.addMenu("Gravity");
+        for (var i = -5; i <= 5; i++) {
+            menuParameters("Gravity", i);
+        }
+    }   
+}
+
+function menuItemEvent(menuItem) {
+    for (var i = -5; i <= 5; i++) {
+        if (menuItem == i) {
+            MyAvatar.setGravity(i);
+        }
+    }
+}
+
+function onScriptEnding() {
+  Menu.removeMenu("Gravity");
+}
+
+setupMenu();
+Menu.menuItemEvent.connect(menuItemEvent);
+Script.scriptEnding.connect(onScriptEnding);
diff --git a/scripts/developer/tests/hazeTestInitialPose.js b/scripts/developer/tests/hazeTestInitialPose.js
new file mode 100644
index 0000000000..e56fb36bc1
--- /dev/null
+++ b/scripts/developer/tests/hazeTestInitialPose.js
@@ -0,0 +1,5 @@
+var ORIGIN = {x: -68.7, y: 27.4, z: 487.7};
+var ROT_IDENT = {x: 0, y: 0.901, z: 0, w: 0.434};
+
+MyAvatar.position  = ORIGIN;
+MyAvatar.orientation = ROT_IDENT;
\ No newline at end of file
diff --git a/scripts/developer/tests/performance/rayPickPerformance.js b/scripts/developer/tests/performance/rayPickPerformance.js
index b4faf4c1be..92d12c0e71 100644
--- a/scripts/developer/tests/performance/rayPickPerformance.js
+++ b/scripts/developer/tests/performance/rayPickPerformance.js
@@ -96,7 +96,6 @@ function rayCastTest() {
                             color: color,
                             alpha: 1,
                             visible: visible,
-                            lineWidth: 2,
                             start: origin,
                             end: Vec3.sum(origin,Vec3.multiply(5,direction))
                         });
diff --git a/scripts/developer/tests/puck-attach.js b/scripts/developer/tests/puck-attach.js
index 2d0a2e6d02..04d5db5710 100644
--- a/scripts/developer/tests/puck-attach.js
+++ b/scripts/developer/tests/puck-attach.js
@@ -1,21 +1,13 @@
 //
 //  Created by Anthony J. Thibault on 2017/06/20
+//  Modified by Robbie Uvanni to support multiple pucks and easier placement of pucks on entities, on 2017/08/01
 //  Copyright 2017 High Fidelity, Inc.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 //  When this script is running, a new app button, named "PUCKTACH", will be added to the toolbar/tablet.
-//  Click this app to bring up the puck attachment panel.  This panel contains the following fields.
-//
-//  * Tracked Object - A drop down list of all the available pucks found.  If no pucks are found this list will only have a single NONE entry.
-//    Closing and re-opening the app will refresh this list.
-//  * Model URL - A model url of the model you wish to be attached to the specified puck.
-//  * Position X, Y, Z - used to apply an offset between the puck and the attached model.
-//  * Rot X, Y, Z - used to apply euler angle offsets, in degrees, between the puck and the attached model.
-//  * Create Attachment - when this button is pressed a new Entity will be created at the specified puck's location.
-//    If a puck atttachment already exists, it will be destroyed before the new entity is created.
-//  * Destroy Attachmetn - destroies the entity attached to the puck.
+//  Click this app to bring up the puck attachment panel.
 //
 
 /* eslint indent: ["error", 4, { "outerIIFEBody": 0 }] */
@@ -25,7 +17,7 @@ Script.include("/~/system/libraries/Xform.js");
 (function() { // BEGIN LOCAL_SCOPE
 
 var TABLET_BUTTON_NAME = "PUCKTACH";
-var HTML_URL = "https://s3.amazonaws.com/hifi-public/tony/html/puck-attach.html";
+var TABLET_APP_URL = "https://hifi-content.s3.amazonaws.com/seefo/production/puck-attach/puck-attach.html";
 
 var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
 var tabletButton = tablet.addButton({
@@ -34,32 +26,13 @@ var tabletButton = tablet.addButton({
     activeIcon: "https://s3.amazonaws.com/hifi-public/tony/icons/puck-a.svg"
 });
 
-tabletButton.clicked.connect(function () {
-    if (shown) {
-        tablet.gotoHomeScreen();
-    } else {
-        tablet.gotoWebScreen(HTML_URL);
-    }
-});
-
 var shown = false;
-var attachedEntity;
-var attachedObj;
-
 function onScreenChanged(type, url) {
-    if (type === "Web" && url === HTML_URL) {
+    if (type === "Web" && url === TABLET_APP_URL) {
         tabletButton.editProperties({isActive: true});
         if (!shown) {
             // hook up to event bridge
             tablet.webEventReceived.connect(onWebEventReceived);
-
-            Script.setTimeout(function () {
-                // send available tracked objects to the html running in the tablet.
-                var availableTrackedObjects = getAvailableTrackedObjects();
-                tablet.emitScriptEvent(JSON.stringify(availableTrackedObjects));
-
-                // print("PUCK-ATTACH: availableTrackedObjects = " + JSON.stringify(availableTrackedObjects));
-            }, 1000);  // wait 1 sec before sending..
         }
         shown = true;
     } else {
@@ -71,104 +44,264 @@ function onScreenChanged(type, url) {
         shown = false;
     }
 }
-
 tablet.screenChanged.connect(onScreenChanged);
 
+function pad(num, size) {
+    var tempString = "000000000" + num;
+    return tempString.substr(tempString.length - size);
+}
 function indexToTrackedObjectName(index) {
     return "TrackedObject" + pad(index, 2);
 }
-
 function getAvailableTrackedObjects() {
     var available = [];
     var NUM_TRACKED_OBJECTS = 16;
     var i;
     for (i = 0; i < NUM_TRACKED_OBJECTS; i++) {
         var key = indexToTrackedObjectName(i);
-        var pose = Controller.getPoseValue(Controller.Hardware.Vive[key]);
+        var pose = Controller.getPoseValue(Controller.Standard[key]);
         if (pose && pose.valid) {
             available.push(i);
         }
     }
     return available;
 }
-
-function attach(obj) {
-    attachedEntity = Entities.addEntity({
-        type: "Model",
-        name: "puck-attach-entity",
-        modelURL: obj.modelurl
-    });
-    attachedObj = obj;
-    var localPos = {x: Number(obj.posx), y: Number(obj.posy), z: Number(obj.posz)};
-    var localRot = Quat.fromVec3Degrees({x: Number(obj.rotx), y: Number(obj.roty), z: Number(obj.rotz)});
-    attachedObj.localXform = new Xform(localRot, localPos);
-    var key = indexToTrackedObjectName(Number(attachedObj.puckno));
-    attachedObj.key = key;
-
-    // print("PUCK-ATTACH: attachedObj = " + JSON.stringify(attachedObj));
-
-    Script.update.connect(update);
-    update();
+function sendAvailableTrackedObjects() {
+    tablet.emitScriptEvent(JSON.stringify({
+        pucks: getAvailableTrackedObjects(),
+        selectedPuck: ((lastPuck === undefined) ? -1 : lastPuck.name)
+    }));
 }
 
-function remove() {
-    if (attachedEntity) {
-        Script.update.disconnect(update);
-        Entities.deleteEntity(attachedEntity);
-        attachedEntity = undefined;
+function getRelativePosition(origin, rotation, offset) {
+    var relativeOffset = Vec3.multiplyQbyV(rotation, offset);
+    var worldPosition = Vec3.sum(origin, relativeOffset);
+    return worldPosition;
+}
+function getPropertyForEntity(entityID, propertyName) {
+    return Entities.getEntityProperties(entityID, [propertyName])[propertyName];
+}
+function entityExists(entityID) {
+    return Object.keys(Entities.getEntityProperties(entityID)).length > 0;
+}
+
+var VIVE_PUCK_MODEL = "http://content.highfidelity.com/seefo/production/puck-attach/vive_tracker_puck.obj";
+var VIVE_PUCK_DIMENSIONS = { x: 0.0945, y: 0.0921, z: 0.0423 }; // 1/1000th scale of model
+var VIVE_PUCK_SEARCH_DISTANCE = 1.5; // metres
+var VIVE_PUCK_SPAWN_DISTANCE = 0.5; // metres
+var VIVE_PUCK_TRACKED_OBJECT_MAX_DISTANCE = 10.0; // metres
+var VIVE_PUCK_NAME = "Tracked Puck";
+
+var trackedPucks = { };
+var lastPuck;
+
+function createPuck(puck) {
+    // create a puck entity and add it to our list of pucks
+    var action = indexToTrackedObjectName(puck.puckno);
+    var pose = Controller.getPoseValue(Controller.Standard[action]);
+    
+    if (pose && pose.valid) {
+        var spawnOffset = Vec3.multiply(Vec3.FRONT, VIVE_PUCK_SPAWN_DISTANCE);
+        var spawnPosition = getRelativePosition(MyAvatar.position, MyAvatar.orientation, spawnOffset);
+
+        // should be an overlay
+        var puckEntityProperties = {
+            name: "Tracked Puck",
+            type: "Model",
+            modelURL: VIVE_PUCK_MODEL,
+            dimensions: VIVE_PUCK_DIMENSIONS,
+            position: spawnPosition,
+            userData: '{ "grabbableKey": { "grabbable": true, "kinematic": false } }'
+        };
+
+        var puckEntityID = Entities.addEntity(puckEntityProperties);
+        
+        // if we've already created this puck, destroy it
+        if (trackedPucks.hasOwnProperty(puck.puckno)) {
+            destroyPuck(puck.puckno);
+        }
+        // if we had an unfinalized puck, destroy it
+        if (lastPuck !== undefined) {
+            destroyPuck(lastPuck.name);
+        }
+        // create our new unfinalized puck
+        trackedPucks[puck.puckno] = {
+            puckEntityID: puckEntityID,
+            trackedEntityID: ""
+        };
+        lastPuck = trackedPucks[puck.puckno];
+        lastPuck.name = Number(puck.puckno);
     }
-    attachedObj = undefined;
 }
+function finalizePuck(puckName) {
+    // find nearest entity and change its parent to the puck
+	
+    if (!trackedPucks.hasOwnProperty(puckName)) {
+        print('2');
+        return;
+    }
+    if (lastPuck === undefined) {
+        print('3');
+        return;
+    }
+    if (lastPuck.name !== Number(puckName)) {
+        print('1');
+        return;
+    }
+	
+    var puckPosition = getPropertyForEntity(lastPuck.puckEntityID, "position");
+    var foundEntities = Entities.findEntities(puckPosition, VIVE_PUCK_SEARCH_DISTANCE);
 
-function pad(num, size) {
-    var tempString = "000000000" + num;
-    return tempString.substr(tempString.length - size);
-}
+    var foundEntity;
+    var leastDistance = Number.MAX_VALUE;
 
-function update() {
-    if (attachedEntity && attachedObj && Controller.Hardware.Vive) {
-        var pose = Controller.getPoseValue(Controller.Hardware.Vive[attachedObj.key]);
-        var avatarXform = new Xform(MyAvatar.orientation, MyAvatar.position);
-        var puckXform = new Xform(pose.rotation, pose.translation);
-        var finalXform = Xform.mul(avatarXform, Xform.mul(puckXform, attachedObj.localXform));
-        if (pose && pose.valid) {
-            Entities.editEntity(attachedEntity, {
-                position: finalXform.pos,
-                rotation: finalXform.rot
-            });
-        } else {
-            if (pose) {
-                print("PUCK-ATTACH: WARNING: invalid pose for " + attachedObj.key);
-            } else {
-                print("PUCK-ATTACH: WARNING: could not find key " + attachedObj.key);
+    for (var i = 0; i < foundEntities.length; i++) {
+        var entity = foundEntities[i];
+
+        if (getPropertyForEntity(entity, "name") !== VIVE_PUCK_NAME) {
+            var entityPosition = getPropertyForEntity(entity, "position");
+            var d = Vec3.distance(entityPosition, puckPosition);
+
+            if (d < leastDistance) {
+                leastDistance = d;
+                foundEntity = entity;
             }
         }
     }
+
+    if (foundEntity) {
+        lastPuck.trackedEntityID = foundEntity;
+        // remember the userdata and collisionless flag for the tracked entity since 
+        // we're about to remove it and make it ungrabbable and collisionless
+        lastPuck.trackedEntityUserData = getPropertyForEntity(foundEntity, "userData");
+        lastPuck.trackedEntityCollisionFlag = getPropertyForEntity(foundEntity, "collisionless");
+        // update properties of the tracked entity
+        Entities.editEntity(lastPuck.trackedEntityID, { 
+            "parentID": lastPuck.puckEntityID,
+            "userData": '{ "grabbableKey": { "grabbable": false } }',
+            "collisionless": 1
+        });
+        // remove reference to puck since it is now calibrated and finalized
+        lastPuck = undefined;
+    }
+}
+function updatePucks() {
+    // for each puck, update its position and orientation
+    for (var puckName in trackedPucks) {
+        if (!trackedPucks.hasOwnProperty(puckName)) {
+            continue;
+        }
+        var action = indexToTrackedObjectName(puckName);
+        var pose = Controller.getPoseValue(Controller.Standard[action]);
+        if (pose && pose.valid) {
+            var puck = trackedPucks[puckName];
+            if (puck.trackedEntityID) {
+                if (entityExists(puck.trackedEntityID)) {
+                    var avatarXform = new Xform(MyAvatar.orientation, MyAvatar.position);
+                    var puckXform = new Xform(pose.rotation, pose.translation);
+                    var finalXform = Xform.mul(avatarXform, puckXform);
+                    
+                    var d = Vec3.distance(MyAvatar.position, finalXform.pos);
+                    if (d > VIVE_PUCK_TRACKED_OBJECT_MAX_DISTANCE) {
+                        print('tried to move tracked object too far away: ' + d);
+                        return;
+                    }
+
+                    Entities.editEntity(puck.puckEntityID, {
+                        position: finalXform.pos,
+                        rotation: finalXform.rot
+                    });
+                    
+                    // in case someone grabbed both entities and destroyed the 
+                    // child/parent relationship
+                    Entities.editEntity(puck.trackedEntityID, {
+                        parentID: puck.puckEntityID
+                    });
+                } else {
+                    destroyPuck(puckName);
+                }
+            } 
+        }
+    }
+}
+function destroyPuck(puckName) {
+    // unparent entity and delete its parent
+    if (!trackedPucks.hasOwnProperty(puckName)) {
+        return;
+    }
+	
+    var puck = trackedPucks[puckName];
+    var puckEntityID = puck.puckEntityID;
+    var trackedEntityID = puck.trackedEntityID;
+
+    // remove the puck as a parent entity and restore the tracked entities 
+    // former userdata and collision flag
+    Entities.editEntity(trackedEntityID, { 
+        "parentID": "{00000000-0000-0000-0000-000000000000}",
+        "userData": puck.trackedEntityUserData,
+        "collisionless": puck.trackedEntityCollisionFlag
+    });
+    
+    delete trackedPucks[puckName];
+    
+    // in some cases, the entity deletion may occur before the parent change
+    // has been processed, resulting in both the puck and the tracked entity
+    // to be deleted so we wait 100ms before deleting the puck, assuming
+    // that the parent change has occured
+    Script.setTimeout(function() {
+        // delete the puck
+        Entities.deleteEntity(puckEntityID);
+    }, 100);
+}
+function destroyPucks() {
+    // remove all pucks and unparent entities
+    for (var puckName in trackedPucks) {
+        if (trackedPucks.hasOwnProperty(puckName)) {
+            destroyPuck(puckName);
+        }
+    }
 }
 
 function onWebEventReceived(msg) {
     var obj = {};
-    try {
+
+    try { 
         obj = JSON.parse(msg);
-    } catch (err) {
-        return;
+    } catch (err) { 
+        return; 
     }
-    if (obj.cmd === "attach") {
-        remove();
-        attach(obj);
-    } else if (obj.cmd === "detach") {
-        remove();
+
+    switch (obj.cmd) {
+    case "ready":
+        sendAvailableTrackedObjects();
+        break;
+    case "create":
+        createPuck(obj);
+        break;
+    case "finalize":
+        finalizePuck(obj.puckno);
+        break;
+    case "destroy":
+        destroyPuck(obj.puckno);
+        break;
     }
 }
 
+Script.update.connect(updatePucks);
 Script.scriptEnding.connect(function () {
-    remove();
     tablet.removeButton(tabletButton);
+    destroyPucks();
     if (shown) {
         tablet.webEventReceived.disconnect(onWebEventReceived);
         tablet.gotoHomeScreen();
     }
     tablet.screenChanged.disconnect(onScreenChanged);
 });
-
-}()); // END LOCAL_SCOPE
+tabletButton.clicked.connect(function () {
+    if (shown) {
+        tablet.gotoHomeScreen();
+    } else {
+        tablet.gotoWebScreen(TABLET_APP_URL);
+    }
+});
+}()); // END LOCAL_SCOPE
\ No newline at end of file
diff --git a/scripts/developer/tests/viveTrackedObjects.js b/scripts/developer/tests/viveTrackedObjects.js
index 4155afb82b..1d60f658d9 100644
--- a/scripts/developer/tests/viveTrackedObjects.js
+++ b/scripts/developer/tests/viveTrackedObjects.js
@@ -23,7 +23,7 @@ var BLUE = {x: 0, y: 0, z: 1, w: 1};
 function update(dt) {
     if (Controller.Hardware.Vive) {
         TRACKED_OBJECT_POSES.forEach(function (key) {
-            var pose = Controller.getPoseValue(Controller.Hardware.Vive[key]);
+            var pose = Controller.getPoseValue(Controller.Standard[key]);
             if (pose.valid) {
                 DebugDraw.addMyAvatarMarker(key, pose.rotation, pose.translation, BLUE);
             } else {
diff --git a/scripts/developer/utilities/render/bloom.qml b/scripts/developer/utilities/render/bloom.qml
new file mode 100644
index 0000000000..66e92e0eff
--- /dev/null
+++ b/scripts/developer/utilities/render/bloom.qml
@@ -0,0 +1,119 @@
+//
+//  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 config: Render.getConfig("RenderMainView.Bloom")
+    property var configThreshold: Render.getConfig("RenderMainView.BloomThreshold")
+    property var configDebug: Render.getConfig("RenderMainView.DebugBloom")
+
+    Column {
+        spacing: 8
+
+        CheckBox {
+            text: "Enable"
+            checked: root.config["enabled"]
+            onCheckedChanged: {
+                root.config["enabled"] = checked;
+            }
+        }
+        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
+                }
+            }
+        }
+        ConfigSlider {
+            label: "Intensity"
+            integral: false
+            config: root.config
+            property: "intensity"
+            max: 5.0
+            min: 0.0
+            width: 280
+        }  
+        ConfigSlider {
+            label: "Size"
+            integral: false
+            config: root.config
+            property: "size"
+            max: 1.0
+            min: 0.0
+            width: 280
+        }  
+        ConfigSlider {
+            label: "Threshold"
+            integral: false
+            config: root.configThreshold
+            property: "threshold"
+            max: 2.0
+            min: 0.0
+            width: 280
+        }  
+    }
+}
diff --git a/scripts/developer/utilities/render/configSlider/ConfigSlider.qml b/scripts/developer/utilities/render/configSlider/ConfigSlider.qml
index 996cf4b34c..830dc6de23 100644
--- a/scripts/developer/utilities/render/configSlider/ConfigSlider.qml
+++ b/scripts/developer/utilities/render/configSlider/ConfigSlider.qml
@@ -1,6 +1,5 @@
 //
 //  ConfigSlider.qml
-//  examples/utilities/tools/render
 //
 //  Created by Zach Pomerantz on 2/8/2016
 //  Copyright 2016 High Fidelity, Inc.
@@ -8,12 +7,21 @@
 //  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 QtQuick 2.7
+import QtQuick.Controls 1.4 as Original
+import QtQuick.Controls.Styles 1.4
+
+import "qrc:///qml/styles-uit"
+import "qrc:///qml/controls-uit" as HifiControls
+
 
 Item {
+    HifiConstants { id: hifi }
     id: root
-    width: 400
+
+    anchors.left: parent.left
+    anchors.right: parent.right    
     height: 24
     property bool integral: false
     property var config
@@ -28,21 +36,21 @@ Item {
         bindingControl.when = true;
     }
 
-    Label {
+    HifiControls.Label {
         id: labelControl
         text: root.label
+        enabled: true
         anchors.left: root.left
-        anchors.leftMargin: 8
-        anchors.top: root.top
-        anchors.topMargin: 7
+        anchors.right: root.horizontalCenter
+        anchors.verticalCenter: root.verticalCenter
     }
 
-    Label {
+    HifiControls.Label {
+        id: labelValue
         text: sliderControl.value.toFixed(root.integral ? 0 : 2)
-        anchors.left: root.left
-        anchors.leftMargin: 200
-        anchors.top: root.top
-        anchors.topMargin: 7
+        anchors.right: root.right
+        anchors.bottom: root.bottom
+        anchors.bottomMargin: 0
     }
 
     Binding {
@@ -53,14 +61,13 @@ Item {
         when: false
     }
 
-    Slider {
+    HifiControls.Slider {
         id: sliderControl
         stepSize: root.integral ? 1.0 : 0.0
-        width: 150
-        height: 20
+        anchors.left: root.horizontalCenter
         anchors.right: root.right
-        anchors.rightMargin: 8
+        anchors.rightMargin: 0
         anchors.top: root.top
-        anchors.topMargin: 3
+        anchors.topMargin: 0
     }
 }
diff --git a/scripts/developer/utilities/render/debugBloom.js b/scripts/developer/utilities/render/debugBloom.js
new file mode 100644
index 0000000000..2328d524cf
--- /dev/null
+++ b/scripts/developer/utilities/render/debugBloom.js
@@ -0,0 +1,20 @@
+//
+//  debugBloom.js
+//  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 http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+// Set up the qml ui
+var qml = Script.resolvePath('bloom.qml');
+var window = new OverlayWindow({
+    title: 'Bloom',
+    source: qml,
+    width: 285, 
+    height: 170,
+});
+window.closed.connect(function() { Script.stop(); });
\ No newline at end of file
diff --git a/scripts/developer/utilities/render/debugDeferredLighting.js b/scripts/developer/utilities/render/debugDeferredLighting.js
deleted file mode 100644
index 2a9b1a1067..0000000000
--- a/scripts/developer/utilities/render/debugDeferredLighting.js
+++ /dev/null
@@ -1,49 +0,0 @@
-//
-//  debugDeferredLighting.js
-//
-//  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
-//
-
-// Set up the qml ui
-var qml = Script.resolvePath('deferredLighting.qml');
-var window = new OverlayWindow({
-    title: 'Lighting',
-    source: qml,
-    width: 400, height:400,
-});
-window.setPosition(Window.innerWidth - 420, 50);
-window.closed.connect(function() { Script.stop(); });
-
-
-var DDB = Render.RenderDeferredTask.DebugDeferredBuffer;
-DDB.enabled = true;
-DDB.mode = 0;
-
-// Debug buffer sizing
-var resizing = false;
-Controller.mousePressEvent.connect(function (e) {
-    if (shouldStartResizing(e.x)) {
-        resizing = true;
-    }
-});
-Controller.mouseReleaseEvent.connect(function() { resizing = false; });
-Controller.mouseMoveEvent.connect(function (e) { resizing && setDebugBufferSize(e.x); });
-Script.scriptEnding.connect(function () { DDB.enabled = false; });
-
-function shouldStartResizing(eventX) {
-    var x = Math.abs(eventX - Window.innerWidth * (1.0 + DDB.size.x) / 2.0);
-    var mode = DDB.mode;
-    return mode !== 0 && x < 20;
-}
-
-function setDebugBufferSize(x) {
-    x = (2.0 * (x / Window.innerWidth) - 1.0); // scale
-    x = Math.min(Math.max(-1, x), 1); // clamp
-    DDB.size = { x: x, y: -1, z: 1, w: 1 };
-}
-
-
diff --git a/scripts/developer/utilities/render/debugFade.js b/scripts/developer/utilities/render/debugFade.js
new file mode 100644
index 0000000000..b01c4b5e1f
--- /dev/null
+++ b/scripts/developer/utilities/render/debugFade.js
@@ -0,0 +1,21 @@
+//
+//  debugFade.js
+//  developer/utilities/render
+//
+//  Olivier Prat, created on 30/04/2017.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+// Set up the qml ui
+var qml = Script.resolvePath('fade.qml');
+var window = new OverlayWindow({
+    title: 'Fade',
+    source: qml,
+    width: 910, 
+    height: 610,
+});
+window.setPosition(50, 50);
+window.closed.connect(function() { Script.stop(); });
diff --git a/scripts/developer/utilities/render/debugHighlight.js b/scripts/developer/utilities/render/debugHighlight.js
new file mode 100644
index 0000000000..5175761978
--- /dev/null
+++ b/scripts/developer/utilities/render/debugHighlight.js
@@ -0,0 +1,160 @@
+//
+//  debugHighlight.js
+//  developer/utilities/render
+//
+//  Olivier Prat, created on 08/08/2017.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+// Set up the qml ui
+var qml = Script.resolvePath('highlight.qml');
+var window = new OverlayWindow({
+    title: 'Highlight',
+    source: qml,
+    width: 400, 
+    height: 400,
+});
+window.closed.connect(function() { Script.stop(); });
+
+"use strict";
+
+// Created by Sam Gondelman on 9/7/2017
+// Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+
+(function() { // BEGIN LOCAL_SCOPE
+
+var END_DIMENSIONS = {
+    x: 0.15,
+    y: 0.15,
+    z: 0.15
+};
+var COLOR = {red: 97, green: 247, blue: 255};
+var end = {
+    type: "sphere",
+    dimensions: END_DIMENSIONS,
+    color: COLOR,
+    ignoreRayIntersection: true,
+    alpha: 1.0,
+    visible: true
+}
+
+var COLOR2 = {red: 247, green: 97, blue: 255};
+var end2 = {
+    type: "sphere",
+    dimensions: END_DIMENSIONS,
+    color: COLOR2,
+    ignoreRayIntersection: true,
+    alpha: 1.0,
+    visible: true
+}
+
+var highlightGroupIndex = 0
+var isSelectionAddEnabled = false
+var isSelectionEnabled = false
+var renderStates = [{name: "test", end: end}];
+var defaultRenderStates = [{name: "test", distance: 20.0, end: end2}];
+var time = 0
+
+var ray = LaserPointers.createLaserPointer({
+    joint: "Mouse",
+    filter: RayPick.PICK_ENTITIES | RayPick.PICK_OVERLAYS | RayPick.PICK_AVATARS | RayPick.PICK_INVISIBLE | RayPick.PICK_NONCOLLIDABLE,
+    renderStates: renderStates,
+    defaultRenderStates: defaultRenderStates,
+    enabled: false
+});
+
+function getSelectionName() {
+    var selectionName = "contextOverlayHighlightList"
+
+    if (highlightGroupIndex>0) {
+        selectionName += highlightGroupIndex
+    }
+    return selectionName
+}
+
+function fromQml(message) {
+    tokens = message.split(' ')
+    print("Received '"+message+"' from hightlight.qml")
+    if (tokens[0]=="highlight") {
+        highlightGroupIndex = parseInt(tokens[1])
+        print("Switching to highlight group "+highlightGroupIndex)
+    } else if (tokens[0]=="pick") {
+        isSelectionEnabled = tokens[1]=='true'
+        print("Ray picking set to "+isSelectionEnabled.toString())
+        if (isSelectionEnabled) {
+            LaserPointers.enableLaserPointer(ray)
+        } else {
+            LaserPointers.disableLaserPointer(ray)
+        }
+        time = 0
+    } else if (tokens[0]=="add") {
+        isSelectionAddEnabled = tokens[1]=='true'
+        print("Add to selection set to "+isSelectionAddEnabled.toString())
+        if (!isSelectionAddEnabled) {
+            Selection.clearSelectedItemsList(getSelectionName())
+        }
+    }
+}
+
+window.fromQml.connect(fromQml);
+
+function cleanup() {
+    LaserPointers.removeLaserPointer(ray);
+}
+Script.scriptEnding.connect(cleanup);
+
+var prevID = 0
+var prevType = ""
+var selectedID = 0
+var selectedType = ""
+function update(deltaTime) {
+
+    // you have to do this repeatedly because there's a bug but I'll fix it
+    LaserPointers.setRenderState(ray, "test");
+
+    var result = LaserPointers.getPrevRayPickResult(ray);
+    var selectionName = getSelectionName()
+
+    if (isSelectionEnabled && result.type != RayPick.INTERSECTED_NONE) {
+        time += deltaTime
+        if (result.objectID != prevID) { 
+            var typeName = ""
+            if (result.type == RayPick.INTERSECTED_ENTITY) {
+                typeName = "entity"
+            } else if (result.type == RayPick.INTERSECTED_OVERLAY) {
+                typeName = "overlay"
+            } else if (result.type == RayPick.INTERSECTED_AVATAR) {
+                typeName = "avatar"
+            }
+            
+            prevID = result.objectID;
+            prevType = typeName;
+            time = 0
+        } else if (time>1.0 && prevID!=selectedID) {
+            if (prevID != 0 && !isSelectionAddEnabled) {
+                Selection.removeFromSelectedItemsList(selectionName, selectedType, selectedID)
+            }
+            selectedID = prevID
+            selectedType = prevType
+            Selection.addToSelectedItemsList(selectionName, selectedType, selectedID)
+            print("HIGHLIGHT " + highlightGroupIndex + " picked type: " + result.type + ", id: " + result.objectID);
+        }
+    } else {
+        if (prevID != 0 && !isSelectionAddEnabled) {
+            Selection.removeFromSelectedItemsList(selectionName, prevType, prevID)
+        }
+        prevID = 0
+        selectedID = 0
+        time = 0
+    }
+}
+
+Script.update.connect(update);
+
+}()); // END LOCAL_SCOPE
\ No newline at end of file
diff --git a/scripts/developer/utilities/render/debugShadow.js b/scripts/developer/utilities/render/debugShadow.js
new file mode 100644
index 0000000000..a0d2142258
--- /dev/null
+++ b/scripts/developer/utilities/render/debugShadow.js
@@ -0,0 +1,20 @@
+//
+//  debugShadow.js
+//  developer/utilities/render
+//
+//  Olivier Prat, created on 10/25/2017.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+// Set up the qml ui
+var qml = Script.resolvePath('shadow.qml');
+var window = new OverlayWindow({
+    title: 'Shadow Debug',
+    source: qml,
+    width: 200, 
+    height: 90
+});
+window.closed.connect(function() { Script.stop(); });
\ No newline at end of file
diff --git a/scripts/developer/utilities/render/deferredLighting.qml b/scripts/developer/utilities/render/deferredLighting.qml
index 2254b6d95f..86a16d9a25 100644
--- a/scripts/developer/utilities/render/deferredLighting.qml
+++ b/scripts/developer/utilities/render/deferredLighting.qml
@@ -7,204 +7,268 @@
 //  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 2.7
 import QtQuick.Controls 1.4
-import "configSlider"
+import QtQuick.Layouts 1.3
 
-Column {
-    spacing: 8
-    property var mainViewTask: Render.getConfig("RenderMainView")
+import "qrc:///qml/styles-uit"
+import "qrc:///qml/controls-uit" as HifiControls
+import  "configSlider"
+
+Rectangle {
+    HifiConstants { id: hifi;}
+    id: render;   
+    anchors.margins: hifi.dimensions.contentMargin.x
     
-    Row {
-        spacing: 8
-        Column {
-            spacing: 10
-            Repeater {
-                model: [
-                     "Unlit:LightingModel:enableUnlit", 
-                     "Emissive:LightingModel:enableEmissive", 
-                     "Lightmap:LightingModel:enableLightmap",
-                     "Background:LightingModel:enableBackground",                      
-                     "ssao:AmbientOcclusion:enabled",                      
-                     "Textures:LightingModel:enableMaterialTexturing"                     
-                ]
-                CheckBox {
-                    text: modelData.split(":")[0]
-                    checked: mainViewTask.getConfig(modelData.split(":")[1])[modelData.split(":")[2]]
-                    onCheckedChanged: { mainViewTask.getConfig(modelData.split(":")[1])[modelData.split(":")[2]] = checked }
-                }
-            }
-        }
-
-
-        Column {
-            spacing: 10
-            Repeater {
-                model: [
-                     "Obscurance:LightingModel:enableObscurance",
-                     "Scattering:LightingModel:enableScattering",
-                     "Diffuse:LightingModel:enableDiffuse",
-                     "Specular:LightingModel:enableSpecular",
-                     "Albedo:LightingModel:enableAlbedo",
-                     "Wireframe:LightingModel:enableWireframe"
-                ]
-                CheckBox {
-                    text: modelData.split(":")[0]
-                    checked: mainViewTask.getConfig(modelData.split(":")[1])[modelData.split(":")[2]]
-                    onCheckedChanged: { mainViewTask.getConfig(modelData.split(":")[1])[modelData.split(":")[2]] = checked }
-                }
-            }
-        }
-
-        Column {
-            spacing: 10
-            Repeater {
-                model: [
-                     "Ambient:LightingModel:enableAmbientLight",
-                     "Directional:LightingModel:enableDirectionalLight",
-                     "Point:LightingModel:enablePointLight",
-                     "Spot:LightingModel:enableSpotLight",
-                     "Light Contour:LightingModel:showLightContour",
-                     "Zone Stack:DrawZoneStack:enabled",
-                     "Shadow:RenderShadowTask:enabled"
-                ]
-                CheckBox {
-                    text: modelData.split(":")[0]
-                    checked: mainViewTask.getConfig(modelData.split(":")[1])[modelData.split(":")[2]]
-                    onCheckedChanged: { mainViewTask.getConfig(modelData.split(":")[1])[modelData.split(":")[2]] = checked }
-                }
-            }
-        }
-    }
+    color: hifi.colors.baseGray;
+    property var mainViewTask: Render.getConfig("RenderMainView")
+   
     Column {
-        spacing: 10 
-        Repeater {
-            model: [ "Tone Mapping Exposure:ToneMapping:exposure:5.0:-5.0"
-                          ]
-            ConfigSlider {
-                    label: qsTr(modelData.split(":")[0])
-                    integral: false
-                    config: mainViewTask.getConfig(modelData.split(":")[1])
-                    property: modelData.split(":")[2]
-                    max: modelData.split(":")[3]
-                    min: modelData.split(":")[4]
+        spacing: 5
+        anchors.left: parent.left
+        anchors.right: parent.right       
+        anchors.margins: hifi.dimensions.contentMargin.x  
+        //padding: hifi.dimensions.contentMargin.x
+        HifiControls.Label {
+                    text: "Shading"       
+        }
+        Row {
+            anchors.left: parent.left
+            anchors.right: parent.right 
+              
+            spacing: 20
+            Column { 
+                spacing: 10
+           // padding: 10
+                Repeater {
+                    model: [
+                         "Unlit:LightingModel:enableUnlit", 
+                         "Emissive:LightingModel:enableEmissive", 
+                         "Lightmap:LightingModel:enableLightmap",
+                         "Background:LightingModel:enableBackground",                      
+                         "ssao:AmbientOcclusion:enabled",                      
+                         "Textures:LightingModel:enableMaterialTexturing"                     
+                    ]
+                    HifiControls.CheckBox {
+                        boxSize: 20
+                        text: modelData.split(":")[0]
+                        checked: render.mainViewTask.getConfig(modelData.split(":")[1])[modelData.split(":")[2]]
+                        onCheckedChanged: { render.mainViewTask.getConfig(modelData.split(":")[1])[modelData.split(":")[2]] = checked }
+                    }
+                }
+            }
+
+
+            Column {
+                spacing: 10
+                Repeater {
+                    model: [
+                         "Obscurance:LightingModel:enableObscurance",
+                         "Scattering:LightingModel:enableScattering",
+                         "Diffuse:LightingModel:enableDiffuse",
+                         "Specular:LightingModel:enableSpecular",
+                         "Albedo:LightingModel:enableAlbedo",
+                         "Wireframe:LightingModel:enableWireframe"
+                    ]
+                    HifiControls.CheckBox {
+                        boxSize: 20
+                        text: modelData.split(":")[0]
+                        checked: render.mainViewTask.getConfig(modelData.split(":")[1])[modelData.split(":")[2]]
+                        onCheckedChanged: { render.mainViewTask.getConfig(modelData.split(":")[1])[modelData.split(":")[2]] = checked }
+                    }
+                }
+            }
+
+            Column {
+                spacing: 10
+                Repeater {
+                    model: [
+                         "Ambient:LightingModel:enableAmbientLight",
+                         "Directional:LightingModel:enableDirectionalLight",
+                         "Point:LightingModel:enablePointLight",
+                         "Spot:LightingModel:enableSpotLight",
+                         "Light Contour:LightingModel:showLightContour",
+                         "Zone Stack:DrawZoneStack:enabled",
+                         "Shadow:RenderShadowTask:enabled"
+                    ]
+                    HifiControls.CheckBox {
+                        boxSize: 20
+                        text: modelData.split(":")[0]
+                        checked: render.mainViewTask.getConfig(modelData.split(":")[1])[modelData.split(":")[2]]
+                        onCheckedChanged: { render.mainViewTask.getConfig(modelData.split(":")[1])[modelData.split(":")[2]] = checked }
+                    }
+                }
             }
         }
+        Separator {}          
+        Column {
+            anchors.left: parent.left
+            anchors.right: parent.right 
+            spacing: 10 
+            Repeater {
+                model: [ "Tone Mapping Exposure:ToneMapping:exposure:5.0:-5.0"
+                              ]
+                ConfigSlider {
+                        label: qsTr(modelData.split(":")[0])
+                        integral: false
+                        config: render.mainViewTask.getConfig(modelData.split(":")[1])
+                        property: modelData.split(":")[2]
+                        max: modelData.split(":")[3]
+                        min: modelData.split(":")[4]
 
-        Row {
-            Label {
-                text: "Tone Mapping Curve"
-                anchors.left: root.left           
+                        anchors.left: parent.left
+                        anchors.right: parent.right 
+                }
             }
 
-            ComboBox {
-                anchors.right: root.right           
-                currentIndex: 1
+            Item {
+                height: childrenRect.height
+                anchors.left: parent.left
+                anchors.right: parent.right 
+
+                HifiControls.Label {
+                    text: "Tone Mapping Curve"
+                    anchors.left: parent.left           
+                }
+
+                HifiControls.ComboBox {
+                    anchors.right: parent.right           
+                    currentIndex: 1
+                    model: ListModel {
+                        id: cbItems
+                        ListElement { text: "RGB"; color: "Yellow" }
+                        ListElement { text: "SRGB"; color: "Green" }
+                        ListElement { text: "Reinhard"; color: "Yellow" }
+                        ListElement { text: "Filmic"; color: "White" }
+                    }
+                    width: 200
+                    onCurrentIndexChanged: { render.mainViewTask.getConfig("ToneMapping")["curve"] = currentIndex }
+                }
+            }
+        }
+        Separator {}          
+        
+        Item {
+            height: childrenRect.height
+            anchors.left: parent.left
+            anchors.right: parent.right 
+
+            id: framebuffer
+
+            HifiControls.Label {
+                text: "Debug Framebuffer"
+                anchors.left: parent.left           
+            }
+            
+            property var config: render.mainViewTask.getConfig("DebugDeferredBuffer")
+
+            function setDebugMode(mode) {
+                framebuffer.config.enabled = (mode != 0);
+                framebuffer.config.mode = mode;
+            }
+
+            HifiControls.ComboBox {
+                anchors.right: parent.right           
+                currentIndex: 0
                 model: ListModel {
-                    id: cbItems
-                    ListElement { text: "RGB"; color: "Yellow" }
-                    ListElement { text: "SRGB"; color: "Green" }
-                    ListElement { text: "Reinhard"; color: "Yellow" }
-                    ListElement { text: "Filmic"; color: "White" }
+                    id: cbItemsFramebuffer
+                    ListElement { text: "Off"; color: "Yellow" }
+                    ListElement { text: "Depth"; color: "Green" }
+                    ListElement { text: "Albedo"; color: "Yellow" }
+                    ListElement { text: "Normal"; color: "White" }
+                    ListElement { text: "Roughness"; color: "White" }
+                    ListElement { text: "Metallic"; color: "White" }
+                    ListElement { text: "Emissive"; color: "White" }
+                    ListElement { text: "Unlit"; color: "White" }
+                    ListElement { text: "Occlusion"; color: "White" }
+                    ListElement { text: "Lightmap"; color: "White" }
+                    ListElement { text: "Scattering"; color: "White" }
+                    ListElement { text: "Lighting"; color: "White" }
+                    ListElement { text: "Shadow"; color: "White" }
+                    ListElement { text: "Linear Depth"; color: "White" }
+                    ListElement { text: "Half Linear Depth"; color: "White" }
+                    ListElement { text: "Half Normal"; color: "White" }
+                    ListElement { text: "Mid Curvature"; color: "White" }
+                    ListElement { text: "Mid Normal"; color: "White" }
+                    ListElement { text: "Low Curvature"; color: "White" }
+                    ListElement { text: "Low Normal"; color: "White" }
+                    ListElement { text: "Curvature Occlusion"; color: "White" }
+                    ListElement { text: "Debug Scattering"; color: "White" }
+                    ListElement { text: "Ambient Occlusion"; color: "White" }
+                    ListElement { text: "Ambient Occlusion Blurred"; color: "White" }
+                    ListElement { text: "Custom"; color: "White" }
                 }
                 width: 200
-                onCurrentIndexChanged: { mainViewTask.getConfig("ToneMapping")["curve"] = currentIndex }
+                onCurrentIndexChanged: { framebuffer.setDebugMode(currentIndex) }
+            }
+        }
+
+        Separator {}          
+        Row {
+            spacing: 10 
+            Column {
+                spacing: 10 
+
+                HifiControls.CheckBox {
+                    boxSize: 20
+                    text: "Opaques"
+                    checked: render.mainViewTask.getConfig("DrawOpaqueBounds")["enabled"]
+                    onCheckedChanged: { render.mainViewTask.getConfig("DrawOpaqueBounds")["enabled"] = checked }
+                }
+                HifiControls.CheckBox {
+                    boxSize: 20
+                    text: "Transparents"
+                    checked: render.mainViewTask.getConfig("DrawTransparentBounds")["enabled"]
+                    onCheckedChanged: { render.mainViewTask.getConfig("DrawTransparentBounds")["enabled"] = checked }
+                }
+                HifiControls.CheckBox {
+                    boxSize: 20
+                    text: "Opaques in Front"
+                    checked: render.mainViewTask.getConfig("DrawOverlayInFrontOpaqueBounds")["enabled"]
+                    onCheckedChanged: { render.mainViewTask.getConfig("DrawOverlayInFrontOpaqueBounds")["enabled"] = checked }
+                }
+                HifiControls.CheckBox {
+                    boxSize: 20
+                    text: "Transparents in Front"
+                    checked: render.mainViewTask.getConfig("DrawOverlayInFrontTransparentBounds")["enabled"]
+                    onCheckedChanged: { render.mainViewTask.getConfig("DrawOverlayInFrontTransparentBounds")["enabled"] = checked }
+                }
+                HifiControls.CheckBox {
+                    boxSize: 20
+                    text: "Opaques in HUD"
+                    checked: render.mainViewTask.getConfig("DrawOverlayHUDOpaqueBounds")["enabled"]
+                    onCheckedChanged: { render.mainViewTask.getConfig("DrawOverlayHUDOpaqueBounds")["enabled"] = checked }
+                }
+                HifiControls.CheckBox {
+                    boxSize: 20
+                    text: "Transparents in HUD"
+                    checked: render.mainViewTask.getConfig("DrawOverlayHUDTransparentBounds")["enabled"]
+                    onCheckedChanged: { render.mainViewTask.getConfig("DrawOverlayHUDTransparentBounds")["enabled"] = checked }
+                }
+
+            }
+            Column {
+                spacing: 10 
+                HifiControls.CheckBox {
+                    boxSize: 20
+                    text: "Metas"
+                    checked: render.mainViewTask.getConfig("DrawMetaBounds")["enabled"]
+                    onCheckedChanged: { render.mainViewTask.getConfig("DrawMetaBounds")["enabled"] = checked }
+                }   
+                HifiControls.CheckBox {
+                    boxSize: 20
+                    text: "Lights"
+                    checked: render.mainViewTask.getConfig("DrawLightBounds")["enabled"]
+                    onCheckedChanged: { render.mainViewTask.getConfig("DrawLightBounds")["enabled"] = checked; }
+                }
+                HifiControls.CheckBox {
+                    boxSize: 20
+                    text: "Zones"
+                    checked: render.mainViewTask.getConfig("DrawZones")["enabled"]
+                    onCheckedChanged: { render.mainViewTask.getConfig("ZoneRenderer")["enabled"] = checked; render.mainViewTask.getConfig("DrawZones")["enabled"] = checked; }
+                }
             }
         }
     }
-    Row {
-        id: framebuffer
-        spacing: 10 
-
-        Label {
-            text: "Debug Framebuffer"
-            anchors.left: root.left           
-        }
-        
-        property var config: mainViewTask.getConfig("DebugDeferredBuffer")
-
-        function setDebugMode(mode) {
-            framebuffer.config.enabled = (mode != 0);
-            framebuffer.config.mode = mode;
-        }
-
-        ComboBox {
-            anchors.right: root.right           
-            currentIndex: 0
-            model: ListModel {
-                id: cbItemsFramebuffer
-                ListElement { text: "Off"; color: "Yellow" }
-                ListElement { text: "Depth"; color: "Green" }
-                ListElement { text: "Albedo"; color: "Yellow" }
-                ListElement { text: "Normal"; color: "White" }
-                ListElement { text: "Roughness"; color: "White" }
-                ListElement { text: "Metallic"; color: "White" }
-                ListElement { text: "Emissive"; color: "White" }
-                ListElement { text: "Unlit"; color: "White" }
-                ListElement { text: "Occlusion"; color: "White" }
-                ListElement { text: "Lightmap"; color: "White" }
-                ListElement { text: "Scattering"; color: "White" }
-                ListElement { text: "Lighting"; color: "White" }
-                ListElement { text: "Shadow"; color: "White" }
-                ListElement { text: "Linear Depth"; color: "White" }
-                ListElement { text: "Half Linear Depth"; color: "White" }
-                ListElement { text: "Half Normal"; color: "White" }
-                ListElement { text: "Mid Curvature"; color: "White" }
-                ListElement { text: "Mid Normal"; color: "White" }
-                ListElement { text: "Low Curvature"; color: "White" }
-                ListElement { text: "Low Normal"; color: "White" }
-                ListElement { text: "Curvature Occlusion"; color: "White" }
-                ListElement { text: "Debug Scattering"; color: "White" }
-                ListElement { text: "Ambient Occlusion"; color: "White" }
-                ListElement { text: "Ambient Occlusion Blurred"; color: "White" }
-                ListElement { text: "Custom"; color: "White" }
-            }
-            width: 200
-            onCurrentIndexChanged: { framebuffer.setDebugMode(currentIndex) }
-        }
-    }
-
-    Row {
-    Column {
-
-        CheckBox {
-            text: "Opaques"
-            checked: mainViewTask.getConfig("DrawOpaqueBounds")["enabled"]
-            onCheckedChanged: { mainViewTask.getConfig("DrawOpaqueBounds")["enabled"] = checked }
-        }
-        CheckBox {
-            text: "Transparents"
-            checked: mainViewTask.getConfig("DrawTransparentBounds")["enabled"]
-            onCheckedChanged: { mainViewTask.getConfig("DrawTransparentBounds")["enabled"] = checked }
-        }
-        CheckBox {
-            text: "Overlay Opaques"
-            checked: mainViewTask.getConfig("DrawOverlayOpaqueBounds")["enabled"]
-            onCheckedChanged: { mainViewTask.getConfig("DrawOverlayOpaqueBounds")["enabled"] = checked }
-        }
-        CheckBox {
-            text: "Overlay Transparents"
-            checked: mainViewTask.getConfig("DrawOverlayTransparentBounds")["enabled"]
-            onCheckedChanged: { mainViewTask.getConfig("DrawOverlayTransparentBounds")["enabled"] = checked }
-        }
-    }
-    Column {
-        CheckBox {
-            text: "Metas"
-            checked: mainViewTask.getConfig("DrawMetaBounds")["enabled"]
-            onCheckedChanged: { mainViewTask.getConfig("DrawMetaBounds")["enabled"] = checked }
-        }   
-        CheckBox {
-            text: "Lights"
-            checked: mainViewTask.getConfig("DrawLightBounds")["enabled"]
-            onCheckedChanged: { mainViewTask.getConfig("DrawLightBounds")["enabled"] = checked; }
-        }
-        CheckBox {
-            text: "Zones"
-            checked: mainViewTask.getConfig("DrawZones")["enabled"]
-            onCheckedChanged: { mainViewTask.getConfig("ZoneRenderer")["enabled"] = checked; mainViewTask.getConfig("DrawZones")["enabled"] = checked; }
-        }
-    }
-    }
+    //}
 }
-
diff --git a/scripts/developer/utilities/render/fade.qml b/scripts/developer/utilities/render/fade.qml
new file mode 100644
index 0000000000..1dffd0fbbb
--- /dev/null
+++ b/scripts/developer/utilities/render/fade.qml
@@ -0,0 +1,397 @@
+//
+//  fade.qml
+//  developer/utilities/render
+//
+//  Olivier Prat, created on 30/04/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"
+import "../lib/plotperf"
+
+Column {
+    id: root
+    property var config: Render.getConfig("RenderMainView.Fade");
+    property var configEdit: Render.getConfig("RenderMainView.FadeEdit");
+    spacing: 8
+
+    Row {
+        spacing: 8
+
+        CheckBox {
+            text: "Edit Fade"
+            checked: root.configEdit["editFade"]
+            onCheckedChanged: {
+                root.configEdit["editFade"] = checked;
+                Render.getConfig("RenderMainView.DrawFadedOpaqueBounds").enabled = checked;
+            }
+        }
+        ComboBox {
+            id: categoryBox
+            width: 400
+            model: ["Elements enter/leave domain", "Bubble isect. - Owner POV", "Bubble isect. - Trespasser POV", "Another user leaves/arrives", "Changing an avatar"]
+            Timer {
+                id: postpone
+                interval: 100; running: false; repeat: false
+                onTriggered: { paramWidgetLoader.sourceComponent = paramWidgets }
+            }
+            onCurrentIndexChanged: {
+                root.config["editedCategory"] = currentIndex;
+                // This is a hack to be sure the widgets below properly reflect the change of category: delete the Component
+                // by setting the loader source to Null and then recreate it 100ms later
+                paramWidgetLoader.sourceComponent = undefined;
+                postpone.interval = 100
+                postpone.start()
+            }
+        }
+    }
+    Row {
+        spacing: 8
+
+        CheckBox {
+            text: "Manual"
+            checked: root.config["manualFade"]
+            onCheckedChanged: {
+                root.config["manualFade"] = checked;
+            }
+        }
+        ConfigSlider {
+            label: "Threshold"
+            integral: false
+            config: root.config
+            property: "manualThreshold"
+            max: 1.0
+            min: 0.0
+            width: 400
+        }
+    }
+
+    Action {
+        id: saveAction
+        text: "Save"
+        onTriggered: {
+            root.config.save()
+        }
+    }
+    Action {
+        id: loadAction
+        text: "Load"
+        onTriggered: {
+            root.config.load()
+            // This is a hack to be sure the widgets below properly reflect the change of category: delete the Component
+            // by setting the loader source to Null and then recreate it 500ms later
+            paramWidgetLoader.sourceComponent = undefined;
+            postpone.interval = 500
+            postpone.start()
+        }
+    }
+
+    Component {
+        id: paramWidgets
+
+        Column {
+            spacing: 8
+
+            CheckBox {
+                text: "Invert"
+                checked: root.config["isInverted"]
+                onCheckedChanged: { root.config["isInverted"] = checked }
+            }
+            Row {
+                spacing: 8
+
+                GroupBox {
+                    title: "Base Gradient"
+                    width: 450
+                    Column {
+                        spacing: 8
+
+                        ConfigSlider {
+                            label: "Size X"
+                            integral: false
+                            config: root.config
+                            property: "baseSizeX"
+                            max: 1.0
+                            min: 0.0
+                            width: 400
+                        }
+                        ConfigSlider {
+                            label: "Size Y"
+                            integral: false
+                            config: root.config
+                            property: "baseSizeY"
+                            max: 1.0
+                            min: 0.0
+                            width: 400
+                        }
+                        ConfigSlider {
+                            label: "Size Z"
+                            integral: false
+                            config: root.config
+                            property: "baseSizeZ"
+                            max: 1.0
+                            min: 0.0
+                            width: 400
+                        }
+                        ConfigSlider {
+                            label: "Level"
+                            integral: false
+                            config: root.config
+                            property: "baseLevel"
+                            max: 1.0
+                            min: 0.0
+                            width: 400
+                        }
+                    }
+                }
+                GroupBox {
+                    title: "Noise Gradient"
+                    width: 450
+                    Column {
+                        spacing: 8
+
+                        ConfigSlider {
+                            label: "Size X"
+                            integral: false
+                            config: root.config
+                            property: "noiseSizeX"
+                            max: 1.0
+                            min: 0.0
+                            width: 400
+                        }
+                        ConfigSlider {
+                            label: "Size Y"
+                            integral: false
+                            config: root.config
+                            property: "noiseSizeY"
+                            max: 1.0
+                            min: 0.0
+                            width: 400
+                        }
+                        ConfigSlider {
+                            label: "Size Z"
+                            integral: false
+                            config: root.config
+                            property: "noiseSizeZ"
+                            max: 1.0
+                            min: 0.0
+                            width: 400
+                        }
+                        ConfigSlider {
+                            label: "Level"
+                            integral: false
+                            config: root.config
+                            property: "noiseLevel"
+                            max: 1.0
+                            min: 0.0
+                            width: 400
+                        }
+                    }
+                }
+            }
+            Row {
+                spacing: 8
+
+                GroupBox {
+                    title: "Edge"
+                    width: 450
+                    Column {
+                        spacing: 8
+
+                        ConfigSlider {
+                            label: "Width"
+                            integral: false
+                            config: root.config
+                            property: "edgeWidth"
+                            max: 1.0
+                            min: 0.0
+                            width: 400
+                        }
+                        GroupBox {
+                            title: "Inner color"
+                            Column {
+                                spacing: 8
+                                ConfigSlider {
+                                    label: "Color R"
+                                    integral: false
+                                    config: root.config
+                                    property: "edgeInnerColorR"
+                                    max: 1.0
+                                    min: 0.0
+                                    width: 400
+                                }
+                                ConfigSlider {
+                                    label: "Color G"
+                                    integral: false
+                                    config: root.config
+                                    property: "edgeInnerColorG"
+                                    max: 1.0
+                                    min: 0.0
+                                    width: 400
+                                }
+                                ConfigSlider {
+                                    label: "Color B"
+                                    integral: false
+                                    config: root.config
+                                    property: "edgeInnerColorB"
+                                    max: 1.0
+                                    min: 0.0
+                                    width: 400
+                                }
+                                ConfigSlider {
+                                    label: "Color intensity"
+                                    integral: false
+                                    config: root.config
+                                    property: "edgeInnerIntensity"
+                                    max: 5.0
+                                    min: 0.0
+                                    width: 400
+                                }
+                            }
+                        }
+                        GroupBox {
+                            title: "Outer color"
+                            Column {
+                                spacing: 8
+                                ConfigSlider {
+                                    label: "Color R"
+                                    integral: false
+                                    config: root.config
+                                    property: "edgeOuterColorR"
+                                    max: 1.0
+                                    min: 0.0
+                                    width: 400
+                                }
+                                ConfigSlider {
+                                    label: "Color G"
+                                    integral: false
+                                    config: root.config
+                                    property: "edgeOuterColorG"
+                                    max: 1.0
+                                    min: 0.0
+                                    width: 400
+                                }
+                                ConfigSlider {
+                                    label: "Color B"
+                                    integral: false
+                                    config: root.config
+                                    property: "edgeOuterColorB"
+                                    max: 1.0
+                                    min: 0.0
+                                    width: 400
+                                }
+                                ConfigSlider {
+                                    label: "Color intensity"
+                                    integral: false
+                                    config: root.config
+                                    property: "edgeOuterIntensity"
+                                    max: 5.0
+                                    min: 0.0
+                                    width: 400
+                                }
+                            }
+                        }
+                    }
+                }
+
+                Column {
+                    GroupBox {
+                        title: "Timing"
+                        width: 450
+                        Column {
+                            spacing: 8
+
+                            ConfigSlider {
+                                label: "Duration"
+                                integral: false
+                                config: root.config
+                                property: "duration"
+                                max: 10.0
+                                min: 0.1
+                                width: 400
+                            }
+                            ComboBox {
+                                width: 400
+                                model: ["Linear", "Ease In", "Ease Out", "Ease In / Out"]
+                                currentIndex: root.config["timing"]
+                                onCurrentIndexChanged: {
+                                    root.config["timing"] = currentIndex;
+                                }
+                            }
+                            GroupBox {
+                                title: "Noise Animation"
+                                Column {
+                                    spacing: 8
+                                    ConfigSlider {
+                                        label: "Speed X"
+                                        integral: false
+                                        config: root.config
+                                        property: "noiseSpeedX"
+                                        max: 1.0
+                                        min: -1.0
+                                        width: 400
+                                    }
+                                    ConfigSlider {
+                                        label: "Speed Y"
+                                        integral: false
+                                        config: root.config
+                                        property: "noiseSpeedY"
+                                        max: 1.0
+                                        min: -1.0
+                                        width: 400
+                                    }
+                                    ConfigSlider {
+                                        label: "Speed Z"
+                                        integral: false
+                                        config: root.config
+                                        property: "noiseSpeedZ"
+                                        max: 1.0
+                                        min: -1.0
+                                        width: 400
+                                    }
+                                }
+                            }
+
+                            PlotPerf {
+                                title: "Threshold"
+                                height: parent.evalEvenHeight()
+                                object:  config
+                                valueUnit: "%"
+                                valueScale: 0.01
+                                valueNumDigits: "1"
+                                plots: [
+                                    {
+                                        prop: "threshold",
+                                        label: "Threshold",
+                                        color: "#FFBB77"
+                                    }
+                                ]
+                            }
+
+                        }
+                    }
+
+                    Row {
+                        spacing: 8
+                        Button {
+                            action: saveAction
+                        }
+                        Button {
+                            action: loadAction
+                        }
+                    }
+
+                }
+            }
+        }
+    }
+
+    Loader {
+        id: paramWidgetLoader
+        sourceComponent: paramWidgets
+    }
+}
diff --git a/scripts/developer/utilities/render/highlight.qml b/scripts/developer/utilities/render/highlight.qml
new file mode 100644
index 0000000000..6be74fcf40
--- /dev/null
+++ b/scripts/developer/utilities/render/highlight.qml
@@ -0,0 +1,177 @@
+//
+//  highlight.qml
+//  developer/utilities/render
+//
+//  Olivier Prat, created on 08/08/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 QtQuick.Controls 1.4
+import QtQuick.Layouts 1.3
+
+import "qrc:///qml/styles-uit"
+import "qrc:///qml/controls-uit" as HifiControls
+import  "configSlider"
+
+Rectangle {
+    id: root
+    HifiConstants { id: hifi;}
+    color: hifi.colors.baseGray;
+    anchors.margins: hifi.dimensions.contentMargin.x
+
+    property var debugConfig: Render.getConfig("RenderMainView.HighlightDebug")
+    property var highlightConfig: Render.getConfig("UpdateScene.HighlightStageSetup")
+    
+    signal sendToScript(var message);
+
+    Column {
+        id: col
+        spacing: 10
+        anchors.left: parent.left
+        anchors.right: parent.right       
+        anchors.margins: hifi.dimensions.contentMargin.x  
+
+        Row {
+            spacing: 10
+            anchors.left: parent.left
+            anchors.right: parent.right 
+
+            HifiControls.CheckBox {
+                id: debug
+                text: "View Mask"
+                checked: root.debugConfig["viewMask"]
+                onCheckedChanged: {
+                    root.debugConfig["viewMask"] = checked;
+                }
+            }
+            HifiControls.CheckBox {
+                text: "Hover select"
+                checked: false
+                onCheckedChanged: {
+                    sendToScript("pick "+checked.toString())
+                }
+            }
+            HifiControls.CheckBox {
+                text: "Add to selection"
+                checked: false
+                onCheckedChanged: {
+                    sendToScript("add "+checked.toString())
+                }
+            }
+        }
+
+        HifiControls.ComboBox {
+            id: box
+            width: 350
+            z: 999
+            editable: true
+            colorScheme: hifi.colorSchemes.dark
+            model: [
+                "contextOverlayHighlightList", 
+                "highlightList1", 
+                "highlightList2", 
+                "highlightList3", 
+                "highlightList4"]
+            label: ""
+
+            Timer {
+                id: postpone
+                interval: 100; running: false; repeat: false
+                onTriggered: { paramWidgetLoader.sourceComponent = paramWidgets }
+            }
+            onCurrentIndexChanged: {
+                root.highlightConfig["selectionName"] = model[currentIndex];
+                sendToScript("highlight "+currentIndex)
+                // This is a hack to be sure the widgets below properly reflect the change of category: delete the Component
+                // by setting the loader source to Null and then recreate it 100ms later
+                paramWidgetLoader.sourceComponent = undefined;
+                postpone.interval = 100
+                postpone.start()
+            }
+        }
+
+        Loader {
+            id: paramWidgetLoader
+            sourceComponent: paramWidgets
+            width: 350
+        }
+
+        Component {
+            id: paramWidgets
+
+            Column {
+                spacing: 10
+                anchors.margins: hifi.dimensions.contentMargin.x  
+
+                HifiControls.Label {
+                    text: "Outline"       
+                }
+                Column {
+                    spacing: 10
+                    anchors.left: parent.left
+                    anchors.right: parent.right 
+                    HifiControls.CheckBox {
+                        text: "Smooth"
+                        checked: root.highlightConfig["isOutlineSmooth"]
+                        onCheckedChanged: {
+                            root.highlightConfig["isOutlineSmooth"] = checked;
+                        }
+                    }
+                    Repeater {
+                        model: ["Width:outlineWidth:5.0:0.0",
+                                "Intensity:outlineIntensity:1.0:0.0"
+                                        ]
+                        ConfigSlider {
+                                label: qsTr(modelData.split(":")[0])
+                                integral: false
+                                config: root.highlightConfig
+                                property: modelData.split(":")[1]
+                                max: modelData.split(":")[2]
+                                min: modelData.split(":")[3]
+                        }
+                    }
+                }
+
+                Separator {}
+                HifiControls.Label {
+                    text: "Color"       
+                }
+                Repeater {
+                    model: ["Red:colorR:1.0:0.0",
+                            "Green:colorG:1.0:0.0",
+                            "Blue:colorB:1.0:0.0"
+                                    ]
+                    ConfigSlider {
+                            label: qsTr(modelData.split(":")[0])
+                            integral: false
+                            config: root.highlightConfig
+                            property: modelData.split(":")[1]
+                            max: modelData.split(":")[2]
+                            min: modelData.split(":")[3]
+                    }
+                }
+
+                Separator {}
+                HifiControls.Label {
+                    text: "Fill Opacity"       
+                }
+                Repeater {
+                    model: ["Unoccluded:unoccludedFillOpacity:1.0:0.0",
+                            "Occluded:occludedFillOpacity:1.0:0.0"
+                                    ]
+                    ConfigSlider {
+                            label: qsTr(modelData.split(":")[0])
+                            integral: false
+                            config: root.highlightConfig
+                            property: modelData.split(":")[1]
+                            max: modelData.split(":")[2]
+                            min: modelData.split(":")[3]
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/scripts/developer/utilities/render/highlightPage/HighlightPage.qml b/scripts/developer/utilities/render/highlightPage/HighlightPage.qml
new file mode 100644
index 0000000000..5669f90628
--- /dev/null
+++ b/scripts/developer/utilities/render/highlightPage/HighlightPage.qml
@@ -0,0 +1,116 @@
+//
+//  highlightPage.qml
+//  developer/utilities/render
+//
+//  Olivier Prat, created on 08/08/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 QtQuick.Controls 1.4
+import QtQuick.Layouts 1.3
+import "../configSlider"
+import "qrc:///qml/styles-uit"
+import "qrc:///qml/controls-uit" as HifiControls
+
+Rectangle {
+    id: root
+    property var highlightIndex: 0
+    property var drawConfig: Render.getConfig("RenderMainView.HighlightEffect"+highlightIndex)
+
+    HifiConstants { id: hifi;}
+    anchors.margins: hifi.dimensions.contentMargin.x
+
+    Column {
+        spacing: 5
+        anchors.left: parent.left
+        anchors.right: parent.right       
+        anchors.margins: hifi.dimensions.contentMargin.x  
+
+        HifiControls.CheckBox {
+            id: glow
+            text: "Glow"
+            checked: root.drawConfig["glow"]
+            onCheckedChanged: {
+                root.drawConfig["glow"] = checked;
+            }
+        }
+        Repeater {
+            model: ["Width:width:5.0:0.0",
+                    "Intensity:intensity:1.0:0.0"
+                            ]
+            ConfigSlider {
+                    label: qsTr(modelData.split(":")[0])
+                    integral: false
+                    config: root.drawConfig
+                    property: modelData.split(":")[1]
+                    max: modelData.split(":")[2]
+                    min: modelData.split(":")[3]
+
+                    anchors.left: parent.left
+                    anchors.right: parent.right 
+            }
+        }
+
+        GroupBox {
+            title: "Color"
+            anchors.left: parent.left
+            anchors.right: parent.right       
+            Column {
+                spacing: 10
+                anchors.left: parent.left
+                anchors.right: parent.right       
+                anchors.margins: hifi.dimensions.contentMargin.x  
+
+                Repeater {
+                    model: ["Red:colorR:1.0:0.0",
+                            "Green:colorG:1.0:0.0",
+                            "Blue:colorB:1.0:0.0"
+                                    ]
+                    ConfigSlider {
+                            label: qsTr(modelData.split(":")[0])
+                            integral: false
+                            config: root.drawConfig
+                            property: modelData.split(":")[1]
+                            max: modelData.split(":")[2]
+                            min: modelData.split(":")[3]
+
+                            anchors.left: parent.left
+                            anchors.right: parent.right 
+                    }
+                }
+            }
+        }
+
+        GroupBox {
+            title: "Fill Opacity"
+            anchors.left: parent.left
+            anchors.right: parent.right       
+            Column {
+                spacing: 10
+                anchors.left: parent.left
+                anchors.right: parent.right       
+                anchors.margins: hifi.dimensions.contentMargin.x  
+
+                Repeater {
+                    model: ["Unoccluded:unoccludedFillOpacity:1.0:0.0",
+                            "Occluded:occludedFillOpacity:1.0:0.0"
+                                    ]
+                    ConfigSlider {
+                            label: qsTr(modelData.split(":")[0])
+                            integral: false
+                            config: root.drawConfig
+                            property: modelData.split(":")[1]
+                            max: modelData.split(":")[2]
+                            min: modelData.split(":")[3]
+
+                            anchors.left: parent.left
+                            anchors.right: parent.right 
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/scripts/developer/utilities/render/highlightPage/qmldir b/scripts/developer/utilities/render/highlightPage/qmldir
new file mode 100644
index 0000000000..bb3de24b84
--- /dev/null
+++ b/scripts/developer/utilities/render/highlightPage/qmldir
@@ -0,0 +1 @@
+HighlightPage 1.0 HighlightPage.qml
\ No newline at end of file
diff --git a/scripts/developer/utilities/render/luci.js b/scripts/developer/utilities/render/luci.js
new file mode 100644
index 0000000000..1e2ac1261f
--- /dev/null
+++ b/scripts/developer/utilities/render/luci.js
@@ -0,0 +1,102 @@
+"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
+//
+
+(function() {
+    var TABLET_BUTTON_NAME = "LUCI";
+    var QMLAPP_URL = Script.resolvePath("./deferredLighting.qml");
+    var ICON_URL = Script.resolvePath("../../../system/assets/images/luci-i.svg");
+    var ACTIVE_ICON_URL = Script.resolvePath("../../../system/assets/images/luci-a.svg");
+
+   
+    var onLuciScreen = false;
+
+    function onClicked() {
+        if (onLuciScreen) {
+            tablet.gotoHomeScreen();
+        } else {
+            tablet.loadQMLSource(QMLAPP_URL);
+        }
+    }
+
+    var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
+    var button = tablet.addButton({
+        text: TABLET_BUTTON_NAME,
+        icon: ICON_URL,
+        activeIcon: ACTIVE_ICON_URL,
+        sortOrder: 1
+    });
+
+    var hasEventBridge = false;
+
+    function wireEventBridge(on) {
+        if (!tablet) {
+            print("Warning in wireEventBridge(): 'tablet' undefined!");
+            return;
+        }
+        if (on) {
+            if (!hasEventBridge) {
+                tablet.fromQml.connect(fromQml);
+                hasEventBridge = true;
+            }
+        } else {
+            if (hasEventBridge) {
+                tablet.fromQml.disconnect(fromQml);
+                hasEventBridge = false;
+            }
+        }
+    }
+
+    function onScreenChanged(type, url) {
+        if (url === QMLAPP_URL) {
+            onLuciScreen = true;
+        } else { 
+            onLuciScreen = false;
+        }
+        
+        button.editProperties({isActive: onLuciScreen});
+        wireEventBridge(onLuciScreen);
+    }
+
+    function fromQml(message) {
+    }
+        
+    button.clicked.connect(onClicked);
+    tablet.screenChanged.connect(onScreenChanged);
+
+    var moveDebugCursor = false;
+    Controller.mousePressEvent.connect(function (e) {
+        if (e.isMiddleButton) {
+            moveDebugCursor = true;
+            setDebugCursor(e.x, e.y);
+        }
+    });
+    Controller.mouseReleaseEvent.connect(function() { moveDebugCursor = false; });
+    Controller.mouseMoveEvent.connect(function (e) { if (moveDebugCursor) setDebugCursor(e.x, e.y); });
+
+
+    Script.scriptEnding.connect(function () {
+        if (onLuciScreen) {
+            tablet.gotoHomeScreen();
+        }
+        button.clicked.disconnect(onClicked);
+        tablet.screenChanged.disconnect(onScreenChanged);
+        tablet.removeButton(button);
+    });
+
+    function setDebugCursor(x, y) {
+        nx = (x / Window.innerWidth);
+        ny = 1.0 - ((y) / (Window.innerHeight - 32));
+
+         Render.getConfig("RenderMainView").getConfig("Antialiasing").debugCursorTexcoord = { x: nx, y: ny };
+    }
+
+}()); 
\ No newline at end of file
diff --git a/scripts/developer/utilities/render/shadow.qml b/scripts/developer/utilities/render/shadow.qml
new file mode 100644
index 0000000000..8548ba4119
--- /dev/null
+++ b/scripts/developer/utilities/render/shadow.qml
@@ -0,0 +1,50 @@
+//
+//  shadow.qml
+//  developer/utilities/render
+//
+//  Olivier Prat, created on 10/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
+
+Column {
+    id: root
+    spacing: 8
+    property var viewConfig: Render.getConfig("RenderMainView.DrawViewFrustum");
+    property var shadowConfig: Render.getConfig("RenderMainView.DrawShadowFrustum");
+
+    Component.onCompleted: {
+        viewConfig.enabled = true;
+        shadowConfig.enabled = true;
+    }
+    Component.onDestruction: {
+        viewConfig.enabled = false;
+        shadowConfig.enabled = false;
+    }
+
+    CheckBox {
+        text: "Freeze Frustums"
+        checked: false
+        onCheckedChanged: { 
+            viewConfig.isFrozen = checked;
+            shadowConfig.isFrozen = checked;
+        }
+    }
+    Row {
+        spacing: 8
+        Label {
+            text: "View"
+            color: "yellow"
+            font.italic: true
+        }
+        Label {
+            text: "Shadow"
+            color: "blue"
+            font.italic: true
+        }
+    }
+}
diff --git a/scripts/developer/utilities/render/statsGPU.qml b/scripts/developer/utilities/render/statsGPU.qml
index 6b80f00af3..8d284c11ca 100644
--- a/scripts/developer/utilities/render/statsGPU.qml
+++ b/scripts/developer/utilities/render/statsGPU.qml
@@ -65,6 +65,13 @@ Item {
                    label: "tone and post",
                    color: "#FF0000"
                }
+               ,
+               {
+                   object: Render.getConfig("RenderMainView.OutlineRangeTimer"),
+                   prop: "gpuRunTime",
+                   label: "outline",
+                   color: "#FFFF00"
+               }
            ]
         }
         PlotPerf {
@@ -105,6 +112,13 @@ Item {
                    label: "tone and post",
                    color: "#FF0000"
                }
+               ,
+               {
+                   object: Render.getConfig("RenderMainView.OutlineRangeTimer"),
+                   prop: "batchRunTime",
+                   label: "outline",
+                   color: "#FFFF00"
+               }
            ]
         }
     }
diff --git a/scripts/developer/utilities/tools/testEars.js b/scripts/developer/utilities/tools/testEars.js
new file mode 100644
index 0000000000..600358eeb1
--- /dev/null
+++ b/scripts/developer/utilities/tools/testEars.js
@@ -0,0 +1,101 @@
+//
+//  testEars.js
+//
+//  Positions and orients your listening position at a virtual head created in front of you.
+//
+//  Created by David Rowe on 7 Oct 2017.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html.
+//
+
+(function () {
+
+    "use strict";
+
+    var overlays = [
+            {
+                // Head
+                type: "sphere",
+                properties: {
+                    dimensions: { x: 0.2, y: 0.3, z: 0.25 },
+                    position: { x: 0, y: 0, z: -2 },
+                    rotation: Quat.fromVec3Degrees({ x: 0, y: 180, z: 0 }),
+                    color: { red: 128, green: 128, blue: 128 },
+                    alpha: 1.0,
+                    solid: true
+                }
+            },
+            {
+                // Left ear
+                type: "sphere",
+                properties: {
+                    dimensions: { x: 0.04, y: 0.10, z: 0.08 },
+                    localPosition: { x: -0.1, y: 0, z: 0.05 },
+                    localRotation: Quat.fromVec3Degrees({ x: 0, y: 0, z: 0 }),
+                    color: { red: 255, green: 0, blue: 0 }, // Red for "port".
+                    alpha: 1.0,
+                    solid: true
+                }
+            },
+            {
+                // Right ear
+                type: "sphere",
+                properties: {
+                    dimensions: { x: 0.04, y: 0.10, z: 0.08 },
+                    localPosition: { x: 0.1, y: 0, z: 0.05 },
+                    localRotation: Quat.fromVec3Degrees({ x: 0, y: 0, z: 0 }),
+                    color: { red: 0, green: 255, blue: 0 }, // Green for "starboard".
+                    alpha: 1.0,
+                    solid: true
+                }
+            },
+            {
+                // Nose
+                type: "sphere",
+                properties: {
+                    dimensions: { x: 0.04, y: 0.04, z: 0.04 },
+                    localPosition: { x: 0, y: 0, z: -0.125 },
+                    localRotation: Quat.fromVec3Degrees({ x: 0, y: -0.08, z: 0 }),
+                    color: { red: 160, green: 160, blue: 160 },
+                    alpha: 1.0,
+                    solid: true
+                }
+            }
+        ],
+        originalListenerMode;
+
+    function setUp() {
+        var i, length;
+
+        originalListenerMode = MyAvatar.audioListenerMode;
+
+        for (i = 0, length = overlays.length; i < length; i++) {
+            if (i === 0) {
+                overlays[i].properties.position = Vec3.sum(MyAvatar.getHeadPosition(),
+                    Vec3.multiplyQbyV(MyAvatar.orientation, overlays[i].properties.position));
+                overlays[i].properties.rotation = Quat.multiply(MyAvatar.orientation, overlays[i].properties.rotation);
+            } else {
+                overlays[i].properties.parentID = overlays[0].id;
+            }
+            overlays[i].id = Overlays.addOverlay(overlays[i].type, overlays[i].properties);
+        }
+
+        MyAvatar.audioListenerMode = MyAvatar.audioListenerModeCustom;
+        MyAvatar.customListenPosition = overlays[0].properties.position;
+        MyAvatar.customListenOrientation = overlays[0].properties.orientation;
+    }
+
+    function tearDown() {
+        var i, length;
+        for (i = 0, length = overlays.length; i < length; i++) {
+            Overlays.deleteOverlay(overlays[i].id);
+        }
+
+        MyAvatar.audioListenerMode = originalListenerMode;
+    }
+
+    Script.setTimeout(setUp, 2000); // Delay so that overlays display if script runs at Interface start.
+    Script.scriptEnding.connect(tearDown);
+}());
diff --git a/scripts/system/assets/images/luci-a.svg b/scripts/system/assets/images/luci-a.svg
new file mode 100644
index 0000000000..40e1481eba
--- /dev/null
+++ b/scripts/system/assets/images/luci-a.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.1.0, 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 50 50" style="enable-background:new 0 0 50 50;" xml:space="preserve">
+<path d="M18.5,36.5c-6.8-2.2-6.8-11.8-0.1-14.1l12.1-4.1c-2.6-2.4-6.1-3.8-9.9-3.8c-8.2,0-14.8,6.6-14.8,14.8
+	c0,8.2,6.6,14.8,14.8,14.8c3.7,0,7.1-1.4,9.7-3.7L18.5,36.5z"/>
+<path d="M31.9,17.9c-0.5,0.2-0.9,0.3-1.3,0.5c2.9,2.7,4.8,6.6,4.8,10.9c0,4.4-1.9,8.3-4.9,11c0.5,0.2,1,0.5,1.6,0.7l5.9,2.4
+	c3.1,1,6.2-1.3,6.2-4.5V13.2L31.9,17.9z"/>
+<circle cx="40" cy="6.6" r="3.7"/>
+</svg>
diff --git a/scripts/system/assets/images/luci-i.svg b/scripts/system/assets/images/luci-i.svg
new file mode 100644
index 0000000000..2d73339908
--- /dev/null
+++ b/scripts/system/assets/images/luci-i.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.1.0, 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 50 50" style="enable-background:new 0 0 50 50;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M18.5,36.5c-6.8-2.2-6.8-11.8-0.1-14.1l12.1-4.1c-2.6-2.4-6.1-3.8-9.9-3.8c-8.2,0-14.8,6.6-14.8,14.8
+	c0,8.2,6.6,14.8,14.8,14.8c3.7,0,7.1-1.4,9.7-3.7L18.5,36.5z"/>
+<path class="st0" d="M31.9,17.9c-0.5,0.2-0.9,0.3-1.3,0.5c2.9,2.7,4.8,6.6,4.8,10.9c0,4.4-1.9,8.3-4.9,11c0.5,0.2,1,0.5,1.6,0.7
+	l5.9,2.4c3.1,1,6.2-1.3,6.2-4.5V13.2L31.9,17.9z"/>
+<circle class="st0" cx="40" cy="6.6" r="3.7"/>
+</svg>
diff --git a/scripts/system/attachedEntitiesManager.js b/scripts/system/attachedEntitiesManager.js
index ee852d8d65..c0144e772f 100644
--- a/scripts/system/attachedEntitiesManager.js
+++ b/scripts/system/attachedEntitiesManager.js
@@ -12,7 +12,6 @@
 
 Script.include("libraries/utils.js");
 
-var NULL_UUID = "{00000000-0000-0000-0000-000000000000}";
 var DEFAULT_WEARABLE_DATA = {
     joints: {}
 };
@@ -116,7 +115,7 @@ function AttachedEntitiesManager() {
         var allowedJoints = getEntityCustomData('wearable', grabbedEntity, DEFAULT_WEARABLE_DATA).joints;
 
         var props = Entities.getEntityProperties(grabbedEntity, ["position", "parentID", "parentJointIndex"]);
-        if (props.parentID === NULL_UUID || props.parentID === MyAvatar.sessionUUID) {
+        if (props.parentID === Uuid.NULL || props.parentID === MyAvatar.sessionUUID) {
             var bestJointName = "";
             var bestJointIndex = -1;
             var bestJointDistance = 0;
@@ -168,7 +167,7 @@ function AttachedEntitiesManager() {
                 if (updatePresets) {
                     this.updateRelativeOffsets(newEntity);
                 }
-            } else if (props.parentID != NULL_UUID) {
+            } else if (props.parentID != Uuid.NULL) {
                 // drop the entity and set it to have no parent (not on the avatar), unless it's being equipped in a hand.
                 if (props.parentID === MyAvatar.sessionUUID &&
                     (props.parentJointIndex == MyAvatar.getJointIndex("RightHand") ||
@@ -176,7 +175,7 @@ function AttachedEntitiesManager() {
                     // this is equipped on a hand -- don't clear the parent.
                 } else {
                     var wearProps = Entities.getEntityProperties(grabbedEntity);
-                    wearProps.parentID = NULL_UUID;
+                    wearProps.parentID = Uuid.NULL;
                     wearProps.parentJointIndex = -1;
                     delete wearProps.id;
                     delete wearProps.created;
diff --git a/scripts/system/away.js b/scripts/system/away.js
index f98408376d..2a45786d0d 100644
--- a/scripts/system/away.js
+++ b/scripts/system/away.js
@@ -14,6 +14,8 @@
 // Goes into "paused" when the '.' key (and automatically when started in HMD), and normal when pressing any key.
 // See MAIN CONTROL, below, for what "paused" actually does.
 
+/* eslint indent: ["error", 4, { "outerIIFEBody": 0 }] */
+
 (function() { // BEGIN LOCAL_SCOPE
 
 var BASIC_TIMER_INTERVAL = 50; // 50ms = 20hz
@@ -28,18 +30,21 @@ var OVERLAY_DATA = {
 };
 var AVATAR_MOVE_FOR_ACTIVE_DISTANCE = 0.8; // meters -- no longer away if avatar moves this far while away
 
-var lastOverlayPosition = { x: 0, y: 0, z: 0};
+var CAMERA_MATRIX = -7;
+
 var OVERLAY_DATA_HMD = {
-    position: lastOverlayPosition,
+    localPosition: {x: 0, y: 0, z: -1 * MyAvatar.sensorToWorldScale},
+    localRotation: {x: 0, y: 0, z: 0, w: 1},
     width: OVERLAY_WIDTH,
     height: OVERLAY_HEIGHT,
     url: "http://hifi-content.s3.amazonaws.com/alan/production/images/images/Overlay-Viz-blank.png",
     color: {red: 255, green: 255, blue: 255},
     alpha: 1,
-    scale: 2,
+    scale: 2 * MyAvatar.sensorToWorldScale,
     emissive: true,
-    isFacingAvatar: true,
-    drawInFront: true
+    drawInFront: true,
+    parentID: MyAvatar.SELF_ID,
+    parentJointIndex: CAMERA_MATRIX
 };
 
 var AWAY_INTRO = {
@@ -83,25 +88,11 @@ function stopAwayAnimation() {
 var overlay = Overlays.addOverlay("image", OVERLAY_DATA);
 var overlayHMD = Overlays.addOverlay("image3d", OVERLAY_DATA_HMD);
 
-function moveCloserToCamera(positionAtHUD) {
-    // we don't actually want to render at the slerped look at... instead, we want to render
-    // slightly closer to the camera than that.
-    var MOVE_CLOSER_TO_CAMERA_BY = -0.25;
-    var cameraForward = Quat.getForward(Camera.orientation);
-    var closerToCamera = Vec3.multiply(cameraForward, MOVE_CLOSER_TO_CAMERA_BY); // slightly closer to camera
-    var slightlyCloserPosition = Vec3.sum(positionAtHUD, closerToCamera);
-
-    return slightlyCloserPosition;
-}
-
 function showOverlay() {
     if (HMD.active) {
         // make sure desktop version is hidden
         Overlays.editOverlay(overlay, { visible: false });
-
-        lastOverlayPosition = HMD.getHUDLookAtPosition3D();
-        var actualOverlayPositon = moveCloserToCamera(lastOverlayPosition);
-        Overlays.editOverlay(overlayHMD, { visible: true, position: actualOverlayPositon });
+        Overlays.editOverlay(overlayHMD, { visible: true });
     } else {
         // make sure HMD is hidden
         Overlays.editOverlay(overlayHMD, { visible: false });
@@ -110,9 +101,11 @@ function showOverlay() {
         var screen = Controller.getViewportDimensions();
 
         // keep the overlay it's natural size and always center it...
-        Overlays.editOverlay(overlay, { visible: true,
-                    x: ((screen.x - OVERLAY_WIDTH) / 2),
-                    y: ((screen.y - OVERLAY_HEIGHT) / 2) });
+        Overlays.editOverlay(overlay, {
+            visible: true,
+            x: ((screen.x - OVERLAY_WIDTH) / 2),
+            y: ((screen.y - OVERLAY_HEIGHT) / 2)
+        });
     }
 }
 
@@ -132,16 +125,10 @@ function maybeMoveOverlay() {
         }
 
         if (HMD.active) {
-            // Note: instead of moving it directly to the lookAt, we will move it slightly toward the
-            // new look at. This will result in a more subtle slerp toward the look at and reduce jerkiness
-            var EASE_BY_RATIO = 0.1;
-            var lookAt = HMD.getHUDLookAtPosition3D();
-            var lookAtChange = Vec3.subtract(lookAt, lastOverlayPosition);
-            var halfWayBetweenOldAndLookAt = Vec3.multiply(lookAtChange, EASE_BY_RATIO);
-            var newOverlayPosition = Vec3.sum(lastOverlayPosition, halfWayBetweenOldAndLookAt);
-            lastOverlayPosition = newOverlayPosition;
-            var actualOverlayPositon = moveCloserToCamera(lastOverlayPosition);
-            Overlays.editOverlay(overlayHMD, { visible: true, position: actualOverlayPositon });
+
+            var sensorScaleFactor = MyAvatar.sensorToWorldScale;
+            var localPosition = {x: 0, y: 0, z: -1 * sensorScaleFactor};
+            Overlays.editOverlay(overlayHMD, { visible: true, localPosition: localPosition, scale: 2 * sensorScaleFactor });
 
             // make sure desktop version is hidden
             Overlays.editOverlay(overlay, { visible: false });
@@ -191,8 +178,8 @@ function goActive() {
     MyAvatar.isAway = false;
 }
 
-MyAvatar.wentAway.connect(setAwayProperties)
-MyAvatar.wentActive.connect(setActiveProperties)
+MyAvatar.wentAway.connect(setAwayProperties);
+MyAvatar.wentActive.connect(setActiveProperties);
 
 function setAwayProperties() {
     isAway = true;
@@ -254,7 +241,7 @@ function maybeGoActive(event) {
     if (event.isAutoRepeat) {  // isAutoRepeat is true when held down (or when Windows feels like it)
         return;
     }
-    if (!isAway && (event.text == 'ESC')) {
+    if (!isAway && (event.text === 'ESC')) {
         goAway();
     } else {
         goActive();
@@ -286,7 +273,7 @@ function maybeGoAway() {
     }
 
     // If you've removed your HMD from your head, and we can detect it, we will also go away...
-    if (HMD.mounted != wasHmdMounted) {
+    if (HMD.mounted !== wasHmdMounted) {
         wasHmdMounted = HMD.mounted;
         print("HMD mounted changed...");
 
@@ -317,7 +304,7 @@ var handleMessage = function(channel, message, sender) {
         print("away.js | Got message on Hifi-Away-Enable: ", message);
         setEnabled(message === 'enable');
     }
-}
+};
 Messages.subscribe(CHANNEL_AWAY_ENABLE);
 Messages.messageReceived.connect(handleMessage);
 
diff --git a/scripts/system/bubble.js b/scripts/system/bubble.js
index c2a2f7af40..4ea684ff06 100644
--- a/scripts/system/bubble.js
+++ b/scripts/system/bubble.js
@@ -25,10 +25,10 @@
     // The bubble model itself
     var bubbleOverlay = Overlays.addOverlay("model", {
         url: Script.resolvePath("assets/models/Bubble-v14.fbx"), // If you'd like to change the model, modify this line (and the dimensions below)
-        dimensions: { x: 1.0, y: 0.75, z: 1.0 },
+        dimensions: { x: MyAvatar.sensorToWorldScale, y: 0.75 * MyAvatar.sensorToWorldScale, z: MyAvatar.sensorToWorldScale },
         position: { x: MyAvatar.position.x, y: -MyAvatar.scale * 2 + MyAvatar.position.y + MyAvatar.scale * BUBBLE_HEIGHT_SCALE, z: MyAvatar.position.z },
-        rotation: Quat.fromPitchYawRollDegrees(MyAvatar.bodyPitch, 0, MyAvatar.bodyRoll),
-        scale: { x: 2, y: MyAvatar.scale * 0.5 + 0.5, z: 2 },
+        rotation: Quat.multiply(MyAvatar.orientation, Quat.fromVec3Degrees({x: 0.0, y: 180.0, z: 0.0})),
+        scale: { x: 2 , y: MyAvatar.scale * 0.5 + 0.5, z: 2  },
         visible: false,
         ignoreRayIntersection: true
     });
@@ -62,9 +62,22 @@
         }
 
         Overlays.editOverlay(bubbleOverlay, {
-            position: { x: MyAvatar.position.x, y: -MyAvatar.scale * 2 + MyAvatar.position.y + MyAvatar.scale * BUBBLE_HEIGHT_SCALE, z: MyAvatar.position.z },
-            rotation: Quat.fromPitchYawRollDegrees(MyAvatar.bodyPitch, 0, MyAvatar.bodyRoll),
-            scale: { x: 2, y: MyAvatar.scale * 0.5 + 0.5, z: 2 },
+            dimensions: { 
+                x: MyAvatar.sensorToWorldScale, 
+                y: 0.75 * MyAvatar.sensorToWorldScale, 
+                z: MyAvatar.sensorToWorldScale 
+            },
+            position: { 
+                x: MyAvatar.position.x, 
+                y: -MyAvatar.scale * 2 + MyAvatar.position.y + MyAvatar.scale * BUBBLE_HEIGHT_SCALE, 
+                z: MyAvatar.position.z 
+            },
+            rotation: Quat.multiply(MyAvatar.orientation, Quat.fromVec3Degrees({x: 0.0, y: 180.0, z: 0.0})),
+            scale: { 
+                x: 2 , 
+                y: MyAvatar.scale * 0.5  + 0.5 , 
+                z: 2  
+            },
             visible: true
         });
         bubbleOverlayTimestamp = Date.now();
@@ -99,32 +112,42 @@
 
             if (delay < BUBBLE_RAISE_ANIMATION_DURATION_MS) {
                 Overlays.editOverlay(bubbleOverlay, {
+                    dimensions: { 
+                        x: MyAvatar.sensorToWorldScale, 
+                        y: 0.75 * MyAvatar.sensorToWorldScale, 
+                        z: MyAvatar.sensorToWorldScale 
+                    },
                     // Quickly raise the bubble from the ground up
                     position: {
                         x: MyAvatar.position.x,
                         y: (-((BUBBLE_RAISE_ANIMATION_DURATION_MS - delay) / BUBBLE_RAISE_ANIMATION_DURATION_MS)) * MyAvatar.scale * 2 + MyAvatar.position.y + MyAvatar.scale * BUBBLE_HEIGHT_SCALE,
                         z: MyAvatar.position.z
                     },
-                    rotation: Quat.fromPitchYawRollDegrees(MyAvatar.bodyPitch, 0, MyAvatar.bodyRoll),
+                    rotation: Quat.multiply(MyAvatar.orientation, Quat.fromVec3Degrees({x: 0.0, y: 180.0, z: 0.0})),
                     scale: {
-                        x: 2,
+                        x: 2 ,
                         y: ((1 - ((BUBBLE_RAISE_ANIMATION_DURATION_MS - delay) / BUBBLE_RAISE_ANIMATION_DURATION_MS)) * MyAvatar.scale * 0.5 + 0.5),
-                        z: 2
+                        z: 2 
                     }
                 });
             } else {
                 // Keep the bubble in place for a couple seconds
                 Overlays.editOverlay(bubbleOverlay, {
+                    dimensions: { 
+                        x: MyAvatar.sensorToWorldScale, 
+                        y: 0.75 * MyAvatar.sensorToWorldScale, 
+                        z: MyAvatar.sensorToWorldScale 
+                    },            
                     position: {
                         x: MyAvatar.position.x,
                         y: MyAvatar.position.y + MyAvatar.scale * BUBBLE_HEIGHT_SCALE,
                         z: MyAvatar.position.z
                     },
-                    rotation: Quat.fromPitchYawRollDegrees(MyAvatar.bodyPitch, 0, MyAvatar.bodyRoll),
+                    rotation: Quat.multiply(MyAvatar.orientation, Quat.fromVec3Degrees({x: 0.0, y: 180.0, z: 0.0})),
                     scale: {
                         x: 2,
-                        y: MyAvatar.scale * 0.5 + 0.5,
-                        z: 2
+                        y: MyAvatar.scale * 0.5  + 0.5 ,
+                        z: 2 
                     }
                 });
             }
diff --git a/scripts/system/chat.js b/scripts/system/chat.js
index d03c6aae98..0cb414e23c 100644
--- a/scripts/system/chat.js
+++ b/scripts/system/chat.js
@@ -43,6 +43,7 @@
     var speechBubbleOffset = {x: 0, y: 0.3, z: 0.0}; // The offset from the joint to whic the speech bubble is attached.
     var speechBubbleJointName = 'Head'; // The name of the joint to which the speech bubble is attached.
     var speechBubbleLineHeight = 0.05; // The height of a line of text in the speech bubble.
+    var SPEECH_BUBBLE_MAX_WIDTH = 1; // meters
 
     // Load the persistent variables from the Settings, with defaults.
     function loadSettings() {
@@ -283,8 +284,7 @@
             endParentJointIndex: yourJointIndex,
             end: yourJointPosition,
             color: identifyAvatarLineColor,
-            alpha: 1,
-            lineWidth: 1
+            alpha: 1
         };
 
         avatarIdentifiers[yourAvatarID] = identifierParams;
@@ -370,14 +370,14 @@
     // Change the avatar size to bigger.
     function biggerSize() {
         //print("biggerSize");
-        logMessage("Increasing avatar size bigger!", null);
+        logMessage("Increasing avatar size", null);
         MyAvatar.increaseSize();
     }
 
     // Change the avatar size to smaller.
     function smallerSize() {
         //print("smallerSize");
-        logMessage("Decreasing avatar size smaler!", null);
+        logMessage("Decreasing avatar size", null);
         MyAvatar.decreaseSize();
     }
 
@@ -470,14 +470,13 @@
 
             case '?':
             case 'help':
-                logMessage('Type "/?" or "/help" for help, which is this!', null);
-                logMessage('Type "/name <name>" to set your chat name, or "/name" to use your display name, or a random name if that is not defined.', null);
-                logMessage('Type "/shutup" to shut up your overhead chat message.', null);
-                logMessage('Type "/say <something>" to say something.', null);
-                logMessage('Type "/clear" to clear your cha, nullt log.', null);
-                logMessage('Type "/who" to ask who is h, nullere to chat.', null);
-                logMessage('Type "/bigger", "/smaller" or "/normal" to change, null your avatar size.', null);
-                logMessage('(Sorry, that\'s all there is so far!)', null);
+                logMessage('Type "/?" or "/help" for help', null);
+                logMessage('Type "/name <name>" to set your chat name, or "/name" to use your display name. If your display name is not defined, a random name will be used.', null);
+                logMessage('Type "/close" to close your overhead chat message.', null);
+                logMessage('Type "/say <something>" to display a new message.', null);
+                logMessage('Type "/clear" to clear your chat log.', null);
+                logMessage('Type "/who" to ask who is in the chat session.', null);
+                logMessage('Type "/bigger", "/smaller" or "/normal" to change your avatar size.', null);
                 break;
 
             case 'name':
@@ -498,9 +497,9 @@
                 }
                 break;
 
-            case 'shutup':
+            case 'close':
                 popDownSpeechBubble();
-                logMessage('Overhead chat message shut up.', null);
+                logMessage('Overhead chat message closed.', null);
                 break;
 
             case 'say':
@@ -646,8 +645,16 @@
         //print("updateSpeechBubble:", "speechBubbleMessage", speechBubbleMessage, "textSize", textSize.width, textSize.height);
 
         var fudge = 0.02;
+
         var width = textSize.width + fudge;
-        var height = textSize.height + fudge;
+        var height = speechBubbleLineHeight + fudge;
+
+        if (textSize.width >= SPEECH_BUBBLE_MAX_WIDTH) {
+            var numLines = Math.ceil(width);
+            height = speechBubbleLineHeight * numLines + fudge;
+            width = SPEECH_BUBBLE_MAX_WIDTH;
+        } 
+
         dimensions = {
             x: width,
             y: height,
@@ -673,6 +680,7 @@
             Vec3.sum(
                 headPosition,
                 rotatedOffset);
+        position.y += height / 2; // offset based on half of bubble height
         speechBubbleParams.position = position;
 
         if (!speechBubbleTextID) {
diff --git a/scripts/system/commerce/wallet.js b/scripts/system/commerce/wallet.js
new file mode 100644
index 0000000000..8e4a3215fd
--- /dev/null
+++ b/scripts/system/commerce/wallet.js
@@ -0,0 +1,179 @@
+"use strict";
+/*jslint vars:true, plusplus:true, forin:true*/
+/* eslint indent: ["error", 4, { "outerIIFEBody": 0 }] */
+//
+// wallet.js
+//
+// Created by Zach Fox on 2017-08-17
+// 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
+//
+
+/*global XXX */
+
+(function () { // BEGIN LOCAL_SCOPE
+    Script.include("/~/system/libraries/accountUtils.js");
+
+    var MARKETPLACE_URL = Account.metaverseServerURL + "/marketplace";
+
+    // Function Name: onButtonClicked()
+    //
+    // Description:
+    //   -Fired when the app button is pressed.
+    //
+    // Relevant Variables:
+    //   -WALLET_QML_SOURCE: The path to the Wallet QML
+    //   -onWalletScreen: true/false depending on whether we're looking at the app.
+    var WALLET_QML_SOURCE = Script.resourcesPath() + "qml/hifi/commerce/wallet/Wallet.qml";
+    var MARKETPLACE_PURCHASES_QML_PATH = Script.resourcesPath() + "qml/hifi/commerce/purchases/Purchases.qml";
+    var onWalletScreen = false;
+    function onButtonClicked() {
+        if (!tablet) {
+            print("Warning in buttonClicked(): 'tablet' undefined!");
+            return;
+        }
+        if (onWalletScreen) {
+            // for toolbar-mode: go back to home screen, this will close the window.
+            tablet.gotoHomeScreen();
+        } else {
+            tablet.loadQMLSource(WALLET_QML_SOURCE);
+        }
+    }
+
+    // Function Name: sendToQml()
+    //
+    // Description:
+    //   -Use this function to send a message to the QML (i.e. to change appearances). The "message" argument is what is sent to
+    //    the QML in the format "{method, params}", like json-rpc. See also fromQml().
+    function sendToQml(message) {
+        tablet.sendToQml(message);
+    }
+
+    // Function Name: fromQml()
+    //
+    // Description:
+    //   -Called when a message is received from SpectatorCamera.qml. The "message" argument is what is sent from the QML
+    //    in the format "{method, params}", like json-rpc. See also sendToQml().
+    var isHmdPreviewDisabled = true;
+    var MARKETPLACES_INJECT_SCRIPT_URL = Script.resolvePath("../html/js/marketplacesInject.js");
+    function fromQml(message) {
+        switch (message.method) {
+            case 'passphrasePopup_cancelClicked':
+            case 'walletSetup_cancelClicked':
+            case 'needsLogIn_cancelClicked':
+                tablet.gotoHomeScreen();
+                break;
+            case 'needsLogIn_loginClicked':
+                openLoginWindow();
+                break;
+            case 'disableHmdPreview':
+                isHmdPreviewDisabled = Menu.isOptionChecked("Disable Preview");
+                Menu.setIsOptionChecked("Disable Preview", true);
+                break;
+            case 'maybeEnableHmdPreview':
+                Menu.setIsOptionChecked("Disable Preview", isHmdPreviewDisabled);
+                break;
+            case 'passphraseReset':
+                onButtonClicked();
+                onButtonClicked();
+                break;
+            case 'walletReset':
+                Settings.setValue("isFirstUseOfPurchases", true);
+                onButtonClicked();
+                onButtonClicked();
+                break;
+            case 'transactionHistory_linkClicked':
+                tablet.gotoWebScreen(message.marketplaceLink, MARKETPLACES_INJECT_SCRIPT_URL);
+                break;
+            case 'goToPurchases':
+                tablet.pushOntoStack(MARKETPLACE_PURCHASES_QML_PATH);
+                break;
+            case 'goToMarketplaceItemPage':
+                tablet.gotoWebScreen(MARKETPLACE_URL + '/items/' + message.itemId, MARKETPLACES_INJECT_SCRIPT_URL);
+                break;
+            default:
+                print('Unrecognized message from QML:', JSON.stringify(message));
+        }
+    }
+
+    // Function Name: wireEventBridge()
+    //
+    // Description:
+    //   -Used to connect/disconnect the script's response to the tablet's "fromQml" signal. Set the "on" argument to enable or
+    //    disable to event bridge.
+    //
+    // Relevant Variables:
+    //   -hasEventBridge: true/false depending on whether we've already connected the event bridge.
+    var hasEventBridge = false;
+    function wireEventBridge(on) {
+        if (!tablet) {
+            print("Warning in wireEventBridge(): 'tablet' undefined!");
+            return;
+        }
+        if (on) {
+            if (!hasEventBridge) {
+                tablet.fromQml.connect(fromQml);
+                hasEventBridge = true;
+            }
+        } else {
+            if (hasEventBridge) {
+                tablet.fromQml.disconnect(fromQml);
+                hasEventBridge = false;
+            }
+        }
+    }
+
+    // Function Name: onTabletScreenChanged()
+    //
+    // Description:
+    //   -Called when the TabletScriptingInterface::screenChanged() signal is emitted. The "type" argument can be either the string
+    //    value of "Home", "Web", "Menu", "QML", or "Closed". The "url" argument is only valid for Web and QML.
+    function onTabletScreenChanged(type, url) {
+        onWalletScreen = (type === "QML" && url === WALLET_QML_SOURCE);
+        wireEventBridge(onWalletScreen);
+        // Change button to active when window is first openend, false otherwise.
+        if (button) {
+            button.editProperties({ isActive: onWalletScreen });
+        }
+    }
+
+    //
+    // Manage the connection between the button and the window.
+    //
+    var button;
+    var buttonName = "WALLET";
+    var tablet = null;
+    var walletEnabled = Settings.getValue("commerce", false);
+    function startup() {
+        if (walletEnabled) {
+            tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
+            button = tablet.addButton({
+                text: buttonName,
+                icon: "icons/tablet-icons/wallet-i.svg",
+                activeIcon: "icons/tablet-icons/wallet-a.svg",
+                sortOrder: 10
+            });
+            button.clicked.connect(onButtonClicked);
+            tablet.screenChanged.connect(onTabletScreenChanged);
+        }
+    }
+    function shutdown() {
+        button.clicked.disconnect(onButtonClicked);
+        tablet.removeButton(button);
+        if (tablet) {
+            tablet.screenChanged.disconnect(onTabletScreenChanged);
+            if (onWalletScreen) {
+                tablet.gotoHomeScreen();
+            }
+        }
+    }
+
+    //
+    // Run the functions.
+    //
+    startup();
+    Script.scriptEnding.connect(shutdown);
+
+}()); // END LOCAL_SCOPE
diff --git a/scripts/system/controllers/controllerDispatcher.js b/scripts/system/controllers/controllerDispatcher.js
new file mode 100644
index 0000000000..ee3b90d7b5
--- /dev/null
+++ b/scripts/system/controllers/controllerDispatcher.js
@@ -0,0 +1,469 @@
+"use strict";
+
+//  controllerDispatcher.js
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+
+/* jslint bitwise: true */
+
+/* global Script, Entities, Overlays, Controller, Vec3, Quat, getControllerWorldLocation, RayPick,
+   controllerDispatcherPlugins:true, controllerDispatcherPluginsNeedSort:true,
+   LEFT_HAND, RIGHT_HAND, NEAR_GRAB_PICK_RADIUS, DEFAULT_SEARCH_SPHERE_DISTANCE, DISPATCHER_PROPERTIES,
+   getGrabPointSphereOffset, HMD, MyAvatar, Messages, findHandChildEntities
+*/
+
+controllerDispatcherPlugins = {};
+controllerDispatcherPluginsNeedSort = false;
+
+Script.include("/~/system/libraries/utils.js");
+Script.include("/~/system/libraries/controllers.js");
+Script.include("/~/system/libraries/controllerDispatcherUtils.js");
+
+(function() {
+    var NEAR_MAX_RADIUS = 0.1;
+
+    var TARGET_UPDATE_HZ = 60; // 50hz good enough, but we're using update
+    var BASIC_TIMER_INTERVAL_MS = 1000 / TARGET_UPDATE_HZ;
+
+    var PROFILE = false;
+    var DEBUG = false;
+
+    if (typeof Test !== "undefined") {
+        PROFILE = true;
+    }
+
+    function ControllerDispatcher() {
+        var _this = this;
+        this.lastInterval = Date.now();
+        this.intervalCount = 0;
+        this.totalDelta = 0;
+        this.totalVariance = 0;
+        this.highVarianceCount = 0;
+        this.veryhighVarianceCount = 0;
+        this.tabletID = null;
+        this.blacklist = [];
+
+        // a module can occupy one or more "activity" slots while it's running.  If all the required slots for a module are
+        // not set to false (not in use), a module cannot start.  When a module is using a slot, that module's name
+        // is stored as the value, rather than false.
+        this.activitySlots = {
+            leftHand: false,
+            rightHand: false,
+            rightHandTrigger: false,
+            leftHandTrigger: false,
+            rightHandEquip: false,
+            leftHandEquip: false,
+            mouse: false
+        };
+
+        this.slotsAreAvailableForPlugin = function (plugin) {
+            for (var i = 0; i < plugin.parameters.activitySlots.length; i++) {
+                if (_this.activitySlots[plugin.parameters.activitySlots[i]]) {
+                    return false; // something is already using a slot which _this plugin requires
+                }
+            }
+            return true;
+        };
+
+        this.markSlots = function (plugin, pluginName) {
+            for (var i = 0; i < plugin.parameters.activitySlots.length; i++) {
+                _this.activitySlots[plugin.parameters.activitySlots[i]] = pluginName;
+            }
+        };
+
+        this.unmarkSlotsForPluginName = function (runningPluginName) {
+            // this is used to free activity-slots when a plugin is deactivated while it's running.
+            for (var activitySlot in _this.activitySlots) {
+                if (activitySlot.hasOwnProperty(activitySlot) && _this.activitySlots[activitySlot] === runningPluginName) {
+                    _this.activitySlots[activitySlot] = false;
+                }
+            }
+        };
+
+        this.runningPluginNames = {};
+        this.leftTriggerValue = 0;
+        this.leftTriggerClicked = 0;
+        this.rightTriggerValue = 0;
+        this.rightTriggerClicked = 0;
+        this.leftSecondaryValue = 0;
+        this.rightSecondaryValue = 0;
+
+        this.leftTriggerPress = function (value) {
+            _this.leftTriggerValue = value;
+        };
+        this.leftTriggerClick = function (value) {
+            _this.leftTriggerClicked = value;
+        };
+        this.rightTriggerPress = function (value) {
+            _this.rightTriggerValue = value;
+        };
+        this.rightTriggerClick = function (value) {
+            _this.rightTriggerClicked = value;
+        };
+        this.leftSecondaryPress = function (value) {
+            _this.leftSecondaryValue = value;
+        };
+        this.rightSecondaryPress = function (value) {
+            _this.rightSecondaryValue = value;
+        };
+
+
+        this.dataGatherers = {};
+        this.dataGatherers.leftControllerLocation = function () {
+            return getControllerWorldLocation(Controller.Standard.LeftHand, true);
+        };
+        this.dataGatherers.rightControllerLocation = function () {
+            return getControllerWorldLocation(Controller.Standard.RightHand, true);
+        };
+
+        this.updateTimings = function () {
+            _this.intervalCount++;
+            var thisInterval = Date.now();
+            var deltaTimeMsec = thisInterval - _this.lastInterval;
+            var deltaTime = deltaTimeMsec / 1000;
+            _this.lastInterval = thisInterval;
+
+            _this.totalDelta += deltaTimeMsec;
+
+            var variance = Math.abs(deltaTimeMsec - BASIC_TIMER_INTERVAL_MS);
+            _this.totalVariance += variance;
+
+            if (variance > 1) {
+                _this.highVarianceCount++;
+            }
+
+            if (variance > 5) {
+                _this.veryhighVarianceCount++;
+            }
+
+            return deltaTime;
+        };
+
+        this.setIgnoreTablet = function() {
+            if (HMD.tabletID !== this.tabletID) {
+                this.tabletID = HMD.tabletID;
+                RayPick.setIgnoreItems(_this.leftControllerRayPick, _this.blacklist.concat([HMD.tabletID]));
+                RayPick.setIgnoreItems(_this.rightControllerRayPick, _this.blacklist.concat([HMD.tabletID]));
+            }
+        };
+
+        this.update = function () {
+            if (PROFILE) {
+                Script.beginProfileRange("dispatch.pre");
+            }
+            var sensorScaleFactor = MyAvatar.sensorToWorldScale;
+            var deltaTime = _this.updateTimings();
+            _this.setIgnoreTablet();
+
+            if (controllerDispatcherPluginsNeedSort) {
+                _this.orderedPluginNames = [];
+                for (var pluginName in controllerDispatcherPlugins) {
+                    if (controllerDispatcherPlugins.hasOwnProperty(pluginName)) {
+                        _this.orderedPluginNames.push(pluginName);
+                    }
+                }
+                _this.orderedPluginNames.sort(function (a, b) {
+                    return controllerDispatcherPlugins[a].parameters.priority -
+                        controllerDispatcherPlugins[b].parameters.priority;
+                });
+
+                var output = "controllerDispatcher -- new plugin order: ";
+                for (var k = 0; k < _this.orderedPluginNames.length; k++) {
+                    var dbgPluginName = _this.orderedPluginNames[k];
+                    var priority = controllerDispatcherPlugins[dbgPluginName].parameters.priority;
+                    output += dbgPluginName + ":" + priority;
+                    if (k + 1 < _this.orderedPluginNames.length) {
+                        output += ", ";
+                    }
+                }
+
+                controllerDispatcherPluginsNeedSort = false;
+            }
+
+            if (PROFILE) {
+                Script.endProfileRange("dispatch.pre");
+            }
+
+            if (PROFILE) {
+                Script.beginProfileRange("dispatch.gather");
+            }
+
+            var controllerLocations = [
+                _this.dataGatherers.leftControllerLocation(),
+                _this.dataGatherers.rightControllerLocation()
+            ];
+
+            // find 3d overlays near each hand
+            var nearbyOverlayIDs = [];
+            var h;
+            for (h = LEFT_HAND; h <= RIGHT_HAND; h++) {
+                if (controllerLocations[h].valid) {
+                    var nearbyOverlays =
+                        Overlays.findOverlays(controllerLocations[h].position, NEAR_MAX_RADIUS * sensorScaleFactor);
+                    nearbyOverlays.sort(function (a, b) {
+                        var aPosition = Overlays.getProperty(a, "position");
+                        var aDistance = Vec3.distance(aPosition, controllerLocations[h].position);
+                        var bPosition = Overlays.getProperty(b, "position");
+                        var bDistance = Vec3.distance(bPosition, controllerLocations[h].position);
+                        return aDistance - bDistance;
+                    });
+                    nearbyOverlayIDs.push(nearbyOverlays);
+                } else {
+                    nearbyOverlayIDs.push([]);
+                }
+            }
+
+            // find entities near each hand
+            var nearbyEntityProperties = [[], []];
+            var nearbyEntityPropertiesByID = {};
+            for (h = LEFT_HAND; h <= RIGHT_HAND; h++) {
+                if (controllerLocations[h].valid) {
+                    var controllerPosition = controllerLocations[h].position;
+                    var nearbyEntityIDs = Entities.findEntities(controllerPosition, NEAR_MAX_RADIUS * sensorScaleFactor);
+                    for (var j = 0; j < nearbyEntityIDs.length; j++) {
+                        var entityID = nearbyEntityIDs[j];
+                        var props = Entities.getEntityProperties(entityID, DISPATCHER_PROPERTIES);
+                        props.id = entityID;
+                        props.distance = Vec3.distance(props.position, controllerLocations[h].position);
+                        nearbyEntityPropertiesByID[entityID] = props;
+                        nearbyEntityProperties[h].push(props);
+                    }
+                }
+            }
+
+            // raypick for each controller
+            var rayPicks = [
+                RayPick.getPrevRayPickResult(_this.leftControllerRayPick),
+                RayPick.getPrevRayPickResult(_this.rightControllerRayPick)
+            ];
+            var hudRayPicks = [
+                RayPick.getPrevRayPickResult(_this.leftControllerHudRayPick),
+                RayPick.getPrevRayPickResult(_this.rightControllerHudRayPick)
+            ];
+            var mouseRayPick = RayPick.getPrevRayPickResult(_this.mouseRayPick);
+            // if the pickray hit something very nearby, put it into the nearby entities list
+            for (h = LEFT_HAND; h <= RIGHT_HAND; h++) {
+
+                // XXX find a way to extract searchRay from samuel's stuff
+                rayPicks[h].searchRay = {
+                    origin: controllerLocations[h].position,
+                    direction: Quat.getUp(controllerLocations[h].orientation),
+                    length: 1000
+                };
+
+                if (rayPicks[h].type === RayPick.INTERSECTED_ENTITY) {
+                    // XXX check to make sure this one isn't already in nearbyEntityProperties?
+                    if (rayPicks[h].distance < NEAR_GRAB_PICK_RADIUS * sensorScaleFactor) {
+                        var nearEntityID = rayPicks[h].objectID;
+                        var nearbyProps = Entities.getEntityProperties(nearEntityID, DISPATCHER_PROPERTIES);
+                        nearbyProps.id = nearEntityID;
+                        nearbyProps.distance = rayPicks[h].distance;
+                        nearbyEntityPropertiesByID[nearEntityID] = nearbyProps;
+                        nearbyEntityProperties[h].push(nearbyProps);
+                    }
+                }
+
+                // sort by distance from each hand
+                nearbyEntityProperties[h].sort(function (a, b) {
+                    return a.distance - b.distance;
+                });
+            }
+
+            // sometimes, during a HMD snap-turn, an equipped or held item wont be near
+            // the hand when the findEntities is done.  Gather up any hand-children here.
+            for (h = LEFT_HAND; h <= RIGHT_HAND; h++) {
+                var handChildrenIDs = findHandChildEntities(h);
+                handChildrenIDs.forEach(function (handChildID) {
+                    if (handChildID in nearbyEntityPropertiesByID) {
+                        return;
+                    }
+                    var props = Entities.getEntityProperties(handChildID, DISPATCHER_PROPERTIES);
+                    props.id = handChildID;
+                    nearbyEntityPropertiesByID[handChildID] = props;
+                });
+            }
+
+            // bundle up all the data about the current situation
+            var controllerData = {
+                triggerValues: [_this.leftTriggerValue, _this.rightTriggerValue],
+                triggerClicks: [_this.leftTriggerClicked, _this.rightTriggerClicked],
+                secondaryValues: [_this.leftSecondaryValue, _this.rightSecondaryValue],
+                controllerLocations: controllerLocations,
+                nearbyEntityProperties: nearbyEntityProperties,
+                nearbyEntityPropertiesByID: nearbyEntityPropertiesByID,
+                nearbyOverlayIDs: nearbyOverlayIDs,
+                rayPicks: rayPicks,
+                hudRayPicks: hudRayPicks,
+                mouseRayPick: mouseRayPick
+            };
+            if (PROFILE) {
+                Script.endProfileRange("dispatch.gather");
+            }
+
+            if (PROFILE) {
+                Script.beginProfileRange("dispatch.isReady");
+            }
+            // check for plugins that would like to start.  ask in order of increasing priority value
+            for (var pluginIndex = 0; pluginIndex < _this.orderedPluginNames.length; pluginIndex++) {
+                var orderedPluginName = _this.orderedPluginNames[pluginIndex];
+                var candidatePlugin = controllerDispatcherPlugins[orderedPluginName];
+
+                if (_this.slotsAreAvailableForPlugin(candidatePlugin)) {
+                    if (PROFILE) {
+                        Script.beginProfileRange("dispatch.isReady." + orderedPluginName);
+                    }
+                    var readiness = candidatePlugin.isReady(controllerData, deltaTime);
+                    if (readiness.active) {
+                        // this plugin will start.  add it to the list of running plugins and mark the
+                        // activity-slots which this plugin consumes as "in use"
+                        _this.runningPluginNames[orderedPluginName] = true;
+                        _this.markSlots(candidatePlugin, orderedPluginName);
+                        if (DEBUG) {
+                            print("controllerDispatcher running " + orderedPluginName);
+                        }
+                    }
+                    if (PROFILE) {
+                        Script.endProfileRange("dispatch.isReady." + orderedPluginName);
+                    }
+                }
+            }
+            if (PROFILE) {
+                Script.endProfileRange("dispatch.isReady");
+            }
+
+            if (PROFILE) {
+                Script.beginProfileRange("dispatch.run");
+            }
+            // give time to running plugins
+            for (var runningPluginName in _this.runningPluginNames) {
+                if (_this.runningPluginNames.hasOwnProperty(runningPluginName)) {
+                    var plugin = controllerDispatcherPlugins[runningPluginName];
+                    if (!plugin) {
+                        // plugin was deactivated while running.  find the activity-slots it was using and make
+                        // them available.
+                        delete _this.runningPluginNames[runningPluginName];
+                        _this.unmarkSlotsForPluginName(runningPluginName);
+                    } else {
+                        if (PROFILE) {
+                            Script.beginProfileRange("dispatch.run." + runningPluginName);
+                        }
+                        var runningness = plugin.run(controllerData, deltaTime);
+                        if (!runningness.active) {
+                            // plugin is finished running, for now.  remove it from the list
+                            // of running plugins and mark its activity-slots as "not in use"
+                            delete _this.runningPluginNames[runningPluginName];
+                            _this.markSlots(plugin, false);
+                            if (DEBUG) {
+                                print("controllerDispatcher stopping " + runningPluginName);
+                            }
+                        }
+                        if (PROFILE) {
+                            Script.endProfileRange("dispatch.run." + runningPluginName);
+                        }
+                    }
+                }
+            }
+            if (PROFILE) {
+                Script.endProfileRange("dispatch.run");
+            }
+        };
+
+        this.setBlacklist = function() {
+            RayPick.setIgnoreItems(_this.leftControllerRayPick, this.blacklist.concat(HMD.tabletID));
+            RayPick.setIgnoreItems(_this.rightControllerRayPick, this.blacklist.concat(HMD.tabletID));
+        };
+
+        var MAPPING_NAME = "com.highfidelity.controllerDispatcher";
+        var mapping = Controller.newMapping(MAPPING_NAME);
+        mapping.from([Controller.Standard.RT]).peek().to(_this.rightTriggerPress);
+        mapping.from([Controller.Standard.RTClick]).peek().to(_this.rightTriggerClick);
+        mapping.from([Controller.Standard.LT]).peek().to(_this.leftTriggerPress);
+        mapping.from([Controller.Standard.LTClick]).peek().to(_this.leftTriggerClick);
+
+        mapping.from([Controller.Standard.RB]).peek().to(_this.rightSecondaryPress);
+        mapping.from([Controller.Standard.LB]).peek().to(_this.leftSecondaryPress);
+        mapping.from([Controller.Standard.LeftGrip]).peek().to(_this.leftSecondaryPress);
+        mapping.from([Controller.Standard.RightGrip]).peek().to(_this.rightSecondaryPress);
+
+        Controller.enableMapping(MAPPING_NAME);
+
+        this.leftControllerRayPick = RayPick.createRayPick({
+            joint: "_CAMERA_RELATIVE_CONTROLLER_LEFTHAND",
+            filter: RayPick.PICK_ENTITIES | RayPick.PICK_OVERLAYS,
+            enabled: true,
+            maxDistance: DEFAULT_SEARCH_SPHERE_DISTANCE,
+            posOffset: getGrabPointSphereOffset(Controller.Standard.LeftHand, true)
+        });
+        this.leftControllerHudRayPick = RayPick.createRayPick({
+            joint: "_CONTROLLER_LEFTHAND",
+            filter: RayPick.PICK_HUD,
+            enabled: true,
+            maxDistance: DEFAULT_SEARCH_SPHERE_DISTANCE,
+            posOffset: getGrabPointSphereOffset(Controller.Standard.LeftHand, true)
+        });
+        this.rightControllerRayPick = RayPick.createRayPick({
+            joint: "_CAMERA_RELATIVE_CONTROLLER_RIGHTHAND",
+            filter: RayPick.PICK_ENTITIES | RayPick.PICK_OVERLAYS,
+            enabled: true,
+            maxDistance: DEFAULT_SEARCH_SPHERE_DISTANCE,
+            posOffset: getGrabPointSphereOffset(Controller.Standard.RightHand, true)
+        });
+        this.rightControllerHudRayPick = RayPick.createRayPick({
+            joint: "_CONTROLLER_RIGHTHAND",
+            filter: RayPick.PICK_HUD,
+            enabled: true,
+            maxDistance: DEFAULT_SEARCH_SPHERE_DISTANCE,
+            posOffset: getGrabPointSphereOffset(Controller.Standard.RightHand, true)
+        });
+        this.mouseRayPick = RayPick.createRayPick({
+            joint: "Mouse",
+            filter: RayPick.PICK_ENTITIES | RayPick.PICK_OVERLAYS,
+            enabled: true
+        });
+
+        this.handleHandMessage = function(channel, message, sender) {
+            var data;
+            if (sender === MyAvatar.sessionUUID) {
+                try {
+                    if (channel === 'Hifi-Hand-RayPick-Blacklist') {
+                        data = JSON.parse(message);
+                        var action = data.action;
+                        var id = data.id;
+                        var index = _this.blacklis.indexOf(id);
+
+                        if (action === 'add' && index === -1) {
+                            _this.blacklist.push(id);
+                            _this.setBlacklist();
+                        }
+
+                        if (action === 'remove') {
+                            if (index > -1) {
+                                _this.blacklist.splice(index, 1);
+                                _this.setBlacklist();
+                            }
+                        }
+                    }
+
+                } catch (e) {
+                    print("WARNING: handControllerGrab.js -- error parsing Hifi-Hand-RayPick-Blacklist message: " + message);
+                }
+            }
+        };
+
+        this.cleanup = function () {
+            Script.update.disconnect(_this.update);
+            Controller.disableMapping(MAPPING_NAME);
+            RayPick.removeRayPick(_this.leftControllerRayPick);
+            RayPick.removeRayPick(_this.rightControllerRayPick);
+            RayPick.removeRayPick(_this.rightControllerHudRayPick);
+            RayPick.removeRayPick(_this.leftControllerHudRayPick);
+        };
+    }
+
+    var controllerDispatcher = new ControllerDispatcher();
+    Messages.subscribe('Hifi-Hand-RayPick-Blacklist');
+    Messages.messageReceived.connect(controllerDispatcher.handleHandMessage);
+    Script.scriptEnding.connect(controllerDispatcher.cleanup);
+    Script.update.connect(controllerDispatcher.update);
+}());
diff --git a/scripts/system/controllers/controllerDisplay.js b/scripts/system/controllers/controllerDisplay.js
index 980829e0a3..dc7c9b37bd 100644
--- a/scripts/system/controllers/controllerDisplay.js
+++ b/scripts/system/controllers/controllerDisplay.js
@@ -9,8 +9,6 @@
 
 /* globals createControllerDisplay:true deleteControllerDisplay:true */
 
-var PARENT_ID = "{00000000-0000-0000-0000-000000000001}";
-
 function clamp(value, min, max) {
     if (value < min) {
         return min;
@@ -49,6 +47,7 @@ createControllerDisplay = function(config) {
         partOverlays: {},
         parts: {},
         mappingName: "mapping-display-" + Math.random(),
+        partValues: {},
 
         setVisible: function(visible) {
             for (var i = 0; i < this.overlays.length; ++i) {
@@ -59,7 +58,8 @@ createControllerDisplay = function(config) {
         },
 
         setPartVisible: function(partName, visible) {
-            return;
+            // Disabled
+            /*
             if (partName in this.partOverlays) {
                 for (var i = 0; i < this.partOverlays[partName].length; ++i) {
                     Overlays.editOverlay(this.partOverlays[partName][i], {
@@ -67,6 +67,7 @@ createControllerDisplay = function(config) {
                     });
                 }
             }
+            */
         },
 
         setLayerForPart: function(partName, layerName) {
@@ -85,12 +86,86 @@ createControllerDisplay = function(config) {
                     }
                 }
             }
+        },
+
+        resize: function(sensorScaleFactor) {
+            if (this.overlays.length >= 0) {
+                var controller = config.controllers[0];
+                var position = controller.position;
+
+                // first overlay is main body.
+                var overlayID = this.overlays[0];
+                var localPosition = Vec3.multiply(sensorScaleFactor, Vec3.sum(Vec3.multiplyQbyV(controller.rotation, controller.naturalPosition), position));
+                var dimensions = Vec3.multiply(sensorScaleFactor, controller.dimensions);
+
+                Overlays.editOverlay(overlayID, {
+                    dimensions: dimensions,
+                    localPosition: localPosition
+                });
+
+                if (controller.parts) {
+                    var i = 1;
+                    for (var partName in controller.parts) {
+                        overlayID = this.overlays[i++];
+                        var part = controller.parts[partName];
+                        localPosition = Vec3.sum(controller.position, Vec3.multiplyQbyV(controller.rotation, part.naturalPosition));
+                        var localRotation;
+                        var value = this.partValues[partName];
+                        var offset, rotation;
+                        if (value !== undefined) {
+                            if (part.type === "linear") {
+                                var axis = Vec3.multiplyQbyV(controller.rotation, part.axis);
+                                offset = Vec3.multiply(part.maxTranslation * value, axis);
+                                localPosition = Vec3.sum(localPosition, offset);
+                                localRotation = undefined;
+                            } else if (part.type === "joystick") {
+                                rotation = Quat.fromPitchYawRollDegrees(value.y * part.xHalfAngle, 0, value.x * part.yHalfAngle);
+                                if (part.originOffset) {
+                                    offset = Vec3.multiplyQbyV(rotation, part.originOffset);
+                                    offset = Vec3.subtract(part.originOffset, offset);
+                                } else {
+                                    offset = { x: 0, y: 0, z: 0 };
+                                }
+                                localPosition = Vec3.sum(controller.position, Vec3.multiplyQbyV(controller.rotation, Vec3.sum(offset, part.naturalPosition)));
+                                localRotation = Quat.multiply(controller.rotation, rotation);
+                            } else if (part.type === "rotational") {
+                                value = clamp(value, part.minValue, part.maxValue);
+                                var pct = (value - part.minValue) / part.maxValue;
+                                var angle = pct * part.maxAngle;
+                                rotation = Quat.angleAxis(angle, part.axis);
+                                if (part.origin) {
+                                    offset = Vec3.multiplyQbyV(rotation, part.origin);
+                                    offset = Vec3.subtract(offset, part.origin);
+                                } else {
+                                    offset = { x: 0, y: 0, z: 0 };
+                                }
+                                localPosition = Vec3.sum(controller.position, Vec3.multiplyQbyV(controller.rotation, Vec3.sum(offset, part.naturalPosition)));
+                                localRotation = Quat.multiply(controller.rotation, rotation);
+                            }
+                        }
+                        if (localRotation !== undefined) {
+                            Overlays.editOverlay(overlayID, {
+                                dimensions: Vec3.multiply(sensorScaleFactor, part.naturalDimensions),
+                                localPosition: Vec3.multiply(sensorScaleFactor, localPosition),
+                                localRotation: localRotation
+                            });
+                        } else {
+                            Overlays.editOverlay(overlayID, {
+                                dimensions: Vec3.multiply(sensorScaleFactor, part.naturalDimensions),
+                                localPosition: Vec3.multiply(sensorScaleFactor, localPosition)
+                            });
+                        }
+                    }
+                }
+            }
         }
     };
+
     var mapping = Controller.newMapping(controllerDisplay.mappingName);
     for (var i = 0; i < config.controllers.length; ++i) {
         var controller = config.controllers[i];
         var position = controller.position;
+        var sensorScaleFactor = MyAvatar.sensorToWorldScale;
 
         if (controller.naturalPosition) {
             position = Vec3.sum(Vec3.multiplyQbyV(controller.rotation, controller.naturalPosition), position);
@@ -98,10 +173,10 @@ createControllerDisplay = function(config) {
 
         var overlayID = Overlays.addOverlay("model", {
             url: controller.modelURL,
-            dimensions: controller.dimensions,
+            dimensions: Vec3.multiply(sensorScaleFactor, controller.dimensions),
             localRotation: controller.rotation,
-            localPosition: position,
-            parentID: PARENT_ID,
+            localPosition: Vec3.multiply(sensorScaleFactor, position),
+            parentID: MyAvatar.SELF_ID,
             parentJointIndex: controller.jointIndex,
             ignoreRayIntersection: true
         });
@@ -121,7 +196,7 @@ createControllerDisplay = function(config) {
                     url: part.modelURL,
                     localPosition: partPosition,
                     localRotation: innerRotation,
-                    parentID: PARENT_ID,
+                    parentID: MyAvatar.SELF_ID,
                     parentJointIndex: controller.jointIndex,
                     ignoreRayIntersection: true
                 };
@@ -137,29 +212,13 @@ createControllerDisplay = function(config) {
                 if (part.type === "rotational") {
                     var input = resolveHardware(part.input);
                     print("Mapping to: ", part.input, input);
-                    mapping.from([input]).peek().to(function(controller, overlayID, part) {
+                    mapping.from([input]).peek().to(function(partName) {
                         return function(value) {
-                            value = clamp(value, part.minValue, part.maxValue);
-
-                            var pct = (value - part.minValue) / part.maxValue;
-                            var angle = pct * part.maxAngle;
-                            var rotation = Quat.angleAxis(angle, part.axis);
-
-                            var offset = { x: 0, y: 0, z: 0 };
-                            if (part.origin) {
-                                offset = Vec3.multiplyQbyV(rotation, part.origin);
-                                offset = Vec3.subtract(offset, part.origin);
-                            }
-
-                            var partPosition = Vec3.sum(controller.position,
-                                    Vec3.multiplyQbyV(controller.rotation, Vec3.sum(offset, part.naturalPosition)));
-
-                            Overlays.editOverlay(overlayID, {
-                                localPosition: partPosition,
-                                localRotation: Quat.multiply(controller.rotation, rotation)
-                            });
+                            // insert the most recent controller value into controllerDisplay.partValues.
+                            controllerDisplay.partValues[partName] = value;
+                            controllerDisplay.resize(MyAvatar.sensorToWorldScale);
                         };
-                    }(controller, overlayID, part));
+                    }(partName));
                 } else if (part.type === "touchpad") {
                     var visibleInput = resolveHardware(part.visibleInput);
                     var xInput = resolveHardware(part.xInput);
@@ -175,71 +234,38 @@ createControllerDisplay = function(config) {
                     mapping.from([yInput]).peek().invert().to(function(value) {
                     });
                 } else if (part.type === "joystick") {
-                    (function(controller, overlayID, part) {
-                        const xInput = resolveHardware(part.xInput);
-                        const yInput = resolveHardware(part.yInput);
-
-                        var xvalue = 0;
-                        var yvalue = 0;
-
-                        function calculatePositionAndRotation(xValue, yValue) {
-                            var rotation = Quat.fromPitchYawRollDegrees(yValue * part.xHalfAngle, 0, xValue * part.yHalfAngle);
-
-                            var offset = { x: 0, y: 0, z: 0 };
-                            if (part.originOffset) {
-                                offset = Vec3.multiplyQbyV(rotation, part.originOffset);
-                                offset = Vec3.subtract(part.originOffset, offset);
-                            }
-                            
-                            var partPosition = Vec3.sum(controller.position,
-                                    Vec3.multiplyQbyV(controller.rotation, Vec3.sum(offset, part.naturalPosition)));
-
-                            var partRotation = Quat.multiply(controller.rotation, rotation)
-
-                            return {
-                                position: partPosition,
-                                rotation: partRotation
-                            }
-                        }
-
+                    (function(part, partName) {
+                        var xInput = resolveHardware(part.xInput);
+                        var yInput = resolveHardware(part.yInput);
                         mapping.from([xInput]).peek().to(function(value) {
-                            xvalue = value;
-                            //print(overlayID, xvalue.toFixed(3), yvalue.toFixed(3));
-                            var posRot = calculatePositionAndRotation(xvalue, yvalue);
-                            Overlays.editOverlay(overlayID, {
-                                localPosition: posRot.position,
-                                localRotation: posRot.rotation
-                            });
+                            // insert the most recent controller value into controllerDisplay.partValues.
+                            if (controllerDisplay.partValues[partName]) {
+                                controllerDisplay.partValues[partName].x = value;
+                            } else {
+                                controllerDisplay.partValues[partName] = {x: value, y: 0};
+                            }
+                            controllerDisplay.resize(MyAvatar.sensorToWorldScale);
                         });
-
                         mapping.from([yInput]).peek().to(function(value) {
-                            yvalue = value;
-                            var posRot = calculatePositionAndRotation(xvalue, yvalue);
-                            Overlays.editOverlay(overlayID, {
-                                localPosition: posRot.position,
-                                localRotation: posRot.rotation
-                            });
+                            // insert the most recent controller value into controllerDisplay.partValues.
+                            if (controllerDisplay.partValues[partName]) {
+                                controllerDisplay.partValues[partName].y = value;
+                            } else {
+                                controllerDisplay.partValues[partName] = {x: 0, y: value};
+                            }
+                            controllerDisplay.resize(MyAvatar.sensorToWorldScale);
                         });
-                    })(controller, overlayID, part);
+                    })(part, partName);
 
                 } else if (part.type === "linear") {
-                    (function(controller, overlayID, part) {
-                        const input = resolveHardware(part.input);
-
+                    (function(part, partName) {
+                        var input = resolveHardware(part.input);
                         mapping.from([input]).peek().to(function(value) {
-                            //print(value);
-                            var axis = Vec3.multiplyQbyV(controller.rotation, part.axis);
-                            var offset = Vec3.multiply(part.maxTranslation * value, axis);
-
-                            var partPosition = Vec3.sum(controller.position, Vec3.multiplyQbyV(controller.rotation, part.naturalPosition));
-                            var position = Vec3.sum(partPosition, offset);
-
-                            Overlays.editOverlay(overlayID, {
-                                localPosition: position
-                            });
+                            // insert the most recent controller value into controllerDisplay.partValues.
+                            controllerDisplay.partValues[partName] = value;
+                            controllerDisplay.resize(MyAvatar.sensorToWorldScale);
                         });
-
-                    })(controller, overlayID, part);
+                    })(part, partName);
 
                 } else if (part.type === "static") {
                     // do nothing
@@ -256,6 +282,7 @@ createControllerDisplay = function(config) {
         }
     }
     Controller.enableMapping(controllerDisplay.mappingName);
+    controllerDisplay.resize(MyAvatar.sensorToWorldScale);
     return controllerDisplay;
 };
 
diff --git a/scripts/system/controllers/controllerDisplayManager.js b/scripts/system/controllers/controllerDisplayManager.js
index 56becfc453..e3fd74e05b 100644
--- a/scripts/system/controllers/controllerDisplayManager.js
+++ b/scripts/system/controllers/controllerDisplayManager.js
@@ -56,7 +56,6 @@ ControllerDisplayManager = function() {
             }
 
             if (leftConfig !== null && rightConfig !== null) {
-                print("Loading controllers");
                 if (controllerLeft === null) {
                     controllerLeft = createControllerDisplay(leftConfig);
                     controllerLeft.setVisible(true);
@@ -70,6 +69,7 @@ ControllerDisplayManager = function() {
                     Script.clearInterval(controllerCheckerIntervalID);
                     controllerCheckerIntervalID = null;
                 }
+
             } else {
                 self.deleteControllerDisplays();
                 if (!controllerCheckerIntervalID) {
@@ -86,6 +86,15 @@ ControllerDisplayManager = function() {
         }
     }
 
+    function resizeControllers(sensorScaleFactor) {
+        if (controllerLeft) {
+            controllerLeft.resize(sensorScaleFactor);
+        }
+        if (controllerRight) {
+            controllerRight.resize(sensorScaleFactor);
+        }
+    };
+
     var handleMessages = function(channel, message, sender) {
         var i, data, name, visible;
         if (!controllerLeft && !controllerRight) {
@@ -171,6 +180,7 @@ ControllerDisplayManager = function() {
 
     HMD.displayModeChanged.connect(updateControllers);
     HMD.shouldShowHandControllersChanged.connect(updateControllers);
+    MyAvatar.sensorToWorldScaleChanged.connect(resizeControllers);
 
     updateControllers();
 };
diff --git a/scripts/system/controllers/controllerModules/disableOtherModule.js b/scripts/system/controllers/controllerModules/disableOtherModule.js
new file mode 100644
index 0000000000..92784ec2ed
--- /dev/null
+++ b/scripts/system/controllers/controllerModules/disableOtherModule.js
@@ -0,0 +1,85 @@
+"use strict";
+
+//  disableOtherModule.js
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+
+
+/* global Script, MyAvatar, RIGHT_HAND, LEFT_HAND, enableDispatcherModule, disableDispatcherModule,
+   makeDispatcherModuleParameters, makeRunningValues, getEnabledModuleByName, Messages
+*/
+
+Script.include("/~/system/libraries/controllerDispatcherUtils.js");
+
+(function() {
+    function DisableModules(hand) {
+        this.hand = hand;
+        this.disableModules = false;
+        this.parameters = makeDispatcherModuleParameters(
+            90,
+            this.hand === RIGHT_HAND ?
+                ["rightHand", "rightHandEquip", "rightHandTrigger"] :
+                ["leftHand", "leftHandEquip", "leftHandTrigger"],
+            [],
+            100);
+
+        this.isReady = function(controllerData) {
+            if (this.disableModules) {
+                return makeRunningValues(true, [], []);
+            }
+            return false;
+        };
+
+        this.run = function(controllerData) {
+            var teleportModuleName = this.hand === RIGHT_HAND ? "RightTeleporter" : "LeftTeleporter";
+            var teleportModule = getEnabledModuleByName(teleportModuleName);
+
+            if (teleportModule) {
+                var ready = teleportModule.isReady(controllerData);
+                if (ready.active) {
+                    return makeRunningValues(false, [], []);
+                }
+            }
+            if (!this.disableModules) {
+                return makeRunningValues(false, [], []);
+            }
+            return makeRunningValues(true, [], []);
+        };
+    }
+
+    var leftDisableModules = new DisableModules(LEFT_HAND);
+    var rightDisableModules = new DisableModules(RIGHT_HAND);
+
+    enableDispatcherModule("LeftDisableModules", leftDisableModules);
+    enableDispatcherModule("RightDisableModules", rightDisableModules);
+    this.handleMessage = function(channel, message, sender) {
+        if (sender === MyAvatar.sessionUUID) {
+            if (channel === 'Hifi-Hand-Disabler') {
+                if (message === 'left') {
+                    leftDisableModules.disableModules = true;
+                }
+                if (message === 'right') {
+                    rightDisableModules.disableModules = true;
+                }
+                if (message === 'both' || message === 'none') {
+                    if (message === 'both') {
+                        leftDisableModules.disableModules = true;
+                        rightDisableModules.disableModules = true;
+                    } else if (message === 'none') {
+                        leftDisableModules.disableModules = false;
+                        rightDisableModules.disableModules = false;
+                    }
+                }
+            }
+        }
+    };
+
+    Messages.subscribe('Hifi-Hand-Disabler');
+    this.cleanup = function() {
+        disableDispatcherModule("LeftDisableModules");
+        disableDispatcherModule("RightDisableModules");
+    };
+    Messages.messageReceived.connect(this.handleMessage);
+    Script.scriptEnding.connect(this.cleanup);
+}());
diff --git a/scripts/system/controllers/controllerModules/equipEntity.js b/scripts/system/controllers/controllerModules/equipEntity.js
new file mode 100644
index 0000000000..7843f3a18a
--- /dev/null
+++ b/scripts/system/controllers/controllerModules/equipEntity.js
@@ -0,0 +1,778 @@
+"use strict";
+
+//  equipEntity.js
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+
+
+/* global Script, Entities, MyAvatar, Controller, RIGHT_HAND, LEFT_HAND,
+   getControllerJointIndex, enableDispatcherModule, disableDispatcherModule,
+   Messages, makeDispatcherModuleParameters, makeRunningValues, Settings, entityHasActions,
+   Vec3, Overlays, flatten, Xform, getControllerWorldLocation, ensureDynamic, entityIsCloneable,
+   cloneEntity, DISPATCHER_PROPERTIES
+*/
+
+Script.include("/~/system/libraries/Xform.js");
+Script.include("/~/system/libraries/controllerDispatcherUtils.js");
+Script.include("/~/system/libraries/controllers.js");
+Script.include("/~/system/libraries/cloneEntityUtils.js");
+
+
+var DEFAULT_SPHERE_MODEL_URL = "http://hifi-content.s3.amazonaws.com/alan/dev/equip-Fresnel-3.fbx";
+var EQUIP_SPHERE_SCALE_FACTOR = 0.65;
+
+
+// Each overlayInfoSet describes a single equip hotspot.
+// It is an object with the following keys:
+//   timestamp - last time this object was updated, used to delete stale hotspot overlays.
+//   entityID - entity assosicated with this hotspot
+//   localPosition - position relative to the entity
+//   hotspot - hotspot object
+//   overlays - array of overlay objects created by Overlay.addOverlay()
+//   currentSize - current animated scale value
+//   targetSize - the target of our scale animations
+//   type - "sphere" or "model".
+function EquipHotspotBuddy() {
+    // holds map from {string} hotspot.key to {object} overlayInfoSet.
+    this.map = {};
+
+    // array of all hotspots that are highlighed.
+    this.highlightedHotspots = [];
+}
+EquipHotspotBuddy.prototype.clear = function() {
+    var keys = Object.keys(this.map);
+    for (var i = 0; i < keys.length; i++) {
+        var overlayInfoSet = this.map[keys[i]];
+        this.deleteOverlayInfoSet(overlayInfoSet);
+    }
+    this.map = {};
+    this.highlightedHotspots = [];
+};
+EquipHotspotBuddy.prototype.highlightHotspot = function(hotspot) {
+    this.highlightedHotspots.push(hotspot.key);
+};
+EquipHotspotBuddy.prototype.updateHotspot = function(hotspot, timestamp) {
+    var overlayInfoSet = this.map[hotspot.key];
+    if (!overlayInfoSet) {
+        // create a new overlayInfoSet
+        overlayInfoSet = {
+            timestamp: timestamp,
+            entityID: hotspot.entityID,
+            localPosition: hotspot.localPosition,
+            hotspot: hotspot,
+            currentSize: 0,
+            targetSize: 1,
+            overlays: []
+        };
+
+        var diameter = hotspot.radius * 2;
+
+        // override default sphere with a user specified model, if it exists.
+        overlayInfoSet.overlays.push(Overlays.addOverlay("model", {
+            name: "hotspot overlay",
+            url: hotspot.modelURL ? hotspot.modelURL : DEFAULT_SPHERE_MODEL_URL,
+            position: hotspot.worldPosition,
+            rotation: {
+                x: 0,
+                y: 0,
+                z: 0,
+                w: 1
+            },
+            dimensions: diameter * EQUIP_SPHERE_SCALE_FACTOR,
+            scale: hotspot.modelScale,
+            ignoreRayIntersection: true
+        }));
+        overlayInfoSet.type = "model";
+        this.map[hotspot.key] = overlayInfoSet;
+    } else {
+        overlayInfoSet.timestamp = timestamp;
+    }
+};
+EquipHotspotBuddy.prototype.updateHotspots = function(hotspots, timestamp) {
+    var _this = this;
+    hotspots.forEach(function(hotspot) {
+        _this.updateHotspot(hotspot, timestamp);
+    });
+    this.highlightedHotspots = [];
+};
+EquipHotspotBuddy.prototype.update = function(deltaTime, timestamp, controllerData) {
+
+    var HIGHLIGHT_SIZE = 1.1;
+    var NORMAL_SIZE = 1.0;
+
+    var keys = Object.keys(this.map);
+    for (var i = 0; i < keys.length; i++) {
+        var overlayInfoSet = this.map[keys[i]];
+
+        // this overlayInfo is highlighted.
+        if (this.highlightedHotspots.indexOf(keys[i]) !== -1) {
+            overlayInfoSet.targetSize = HIGHLIGHT_SIZE;
+        } else {
+            overlayInfoSet.targetSize = NORMAL_SIZE;
+        }
+
+        // start to fade out this hotspot.
+        if (overlayInfoSet.timestamp !== timestamp) {
+            overlayInfoSet.targetSize = 0;
+        }
+
+        // animate the size.
+        var SIZE_TIMESCALE = 0.1;
+        var tau = deltaTime / SIZE_TIMESCALE;
+        if (tau > 1.0) {
+            tau = 1.0;
+        }
+        overlayInfoSet.currentSize += (overlayInfoSet.targetSize - overlayInfoSet.currentSize) * tau;
+
+        if (overlayInfoSet.timestamp !== timestamp && overlayInfoSet.currentSize <= 0.05) {
+            // this is an old overlay, that has finished fading out, delete it!
+            overlayInfoSet.overlays.forEach(Overlays.deleteOverlay);
+            delete this.map[keys[i]];
+        } else {
+            // update overlay position, rotation to follow the object it's attached to.
+            var props = controllerData.nearbyEntityPropertiesByID[overlayInfoSet.entityID];
+            if (props) {
+                var entityXform = new Xform(props.rotation, props.position);
+                var position = entityXform.xformPoint(overlayInfoSet.localPosition);
+
+                var dimensions;
+                if (overlayInfoSet.type === "sphere") {
+                    dimensions = overlayInfoSet.hotspot.radius * 2 * overlayInfoSet.currentSize * EQUIP_SPHERE_SCALE_FACTOR;
+                } else {
+                    dimensions = overlayInfoSet.hotspot.radius * 2 * overlayInfoSet.currentSize;
+                }
+
+                overlayInfoSet.overlays.forEach(function(overlay) {
+                    Overlays.editOverlay(overlay, {
+                        position: position,
+                        rotation: props.rotation,
+                        dimensions: dimensions
+                    });
+                });
+            } else {
+                overlayInfoSet.overlays.forEach(Overlays.deleteOverlay);
+                delete this.map[keys[i]];
+            }
+        }
+    }
+};
+
+(function() {
+
+    var ATTACH_POINT_SETTINGS = "io.highfidelity.attachPoints";
+
+    var EQUIP_RADIUS = 0.2; // radius used for palm vs equip-hotspot for equipping.
+
+    var HAPTIC_PULSE_STRENGTH = 1.0;
+    var HAPTIC_PULSE_DURATION = 13.0;
+    var HAPTIC_TEXTURE_STRENGTH = 0.1;
+    var HAPTIC_TEXTURE_DURATION = 3.0;
+    var HAPTIC_TEXTURE_DISTANCE = 0.002;
+    var HAPTIC_DEQUIP_STRENGTH = 0.75;
+    var HAPTIC_DEQUIP_DURATION = 50.0;
+
+    var TRIGGER_SMOOTH_RATIO = 0.1; //  Time averaging of trigger - 0.0 disables smoothing
+    var TRIGGER_OFF_VALUE = 0.1;
+    var TRIGGER_ON_VALUE = TRIGGER_OFF_VALUE + 0.05; //  Squeezed just enough to activate search or near grab
+    var BUMPER_ON_VALUE = 0.5;
+
+
+    function getWearableData(props) {
+        var wearable = {};
+        try {
+            if (!props.userDataParsed) {
+                props.userDataParsed = JSON.parse(props.userData);
+            }
+
+            wearable = props.userDataParsed.wearable ? props.userDataParsed.wearable : {};
+        } catch (err) {
+            // don't want to spam the logs
+        }
+        return wearable;
+    }
+    function getEquipHotspotsData(props) {
+        var equipHotspots = [];
+        try {
+            if (!props.userDataParsed) {
+                props.userDataParsed = JSON.parse(props.userData);
+            }
+
+            equipHotspots = props.userDataParsed.equipHotspots ? props.userDataParsed.equipHotspots : [];
+        } catch (err) {
+            // don't want to spam the logs
+        }
+        return equipHotspots;
+    }
+
+    function getAttachPointSettings() {
+        try {
+            var str = Settings.getValue(ATTACH_POINT_SETTINGS);
+            if (str === "false" || str === "") {
+                return {};
+            } else {
+                return JSON.parse(str);
+            }
+        } catch (err) {
+            print("Error parsing attachPointSettings: " + err);
+            return {};
+        }
+    }
+
+    function setAttachPointSettings(attachPointSettings) {
+        var str = JSON.stringify(attachPointSettings);
+        Settings.setValue(ATTACH_POINT_SETTINGS, str);
+    }
+
+    function getAttachPointForHotspotFromSettings(hotspot, hand) {
+        var skeletonModelURL = MyAvatar.skeletonModelURL;
+        var attachPointSettings = getAttachPointSettings();
+        var avatarSettingsData = attachPointSettings[skeletonModelURL];
+        if (avatarSettingsData) {
+            var jointName = (hand === RIGHT_HAND) ? "RightHand" : "LeftHand";
+            var joints = avatarSettingsData[hotspot.key];
+            if (joints) {
+                return joints[jointName];
+            }
+        }
+        return undefined;
+    }
+
+    function storeAttachPointForHotspotInSettings(hotspot, hand, offsetPosition, offsetRotation) {
+        var attachPointSettings = getAttachPointSettings();
+        var skeletonModelURL = MyAvatar.skeletonModelURL;
+        var avatarSettingsData = attachPointSettings[skeletonModelURL];
+        if (!avatarSettingsData) {
+            avatarSettingsData = {};
+            attachPointSettings[skeletonModelURL] = avatarSettingsData;
+        }
+        var jointName = (hand === RIGHT_HAND) ? "RightHand" : "LeftHand";
+        var joints = avatarSettingsData[hotspot.key];
+        if (!joints) {
+            joints = {};
+            avatarSettingsData[hotspot.key] = joints;
+        }
+        joints[jointName] = [offsetPosition, offsetRotation];
+        setAttachPointSettings(attachPointSettings);
+    }
+
+    function clearAttachPoints() {
+        setAttachPointSettings({});
+    }
+
+    function EquipEntity(hand) {
+        this.hand = hand;
+        this.targetEntityID = null;
+        this.prevHandIsUpsideDown = false;
+        this.triggerValue = 0;
+        this.messageGrabEntity = false;
+        this.grabEntityProps = null;
+        this.shouldSendStart = false;
+        this.equipedWithSecondary = false;
+
+        this.parameters = makeDispatcherModuleParameters(
+            300,
+            this.hand === RIGHT_HAND ? ["rightHand", "rightHandEquip"] : ["leftHand", "leftHandEquip"],
+            [],
+            100);
+
+        var equipHotspotBuddy = new EquipHotspotBuddy();
+
+        this.setMessageGrabData = function(entityProperties) {
+            if (entityProperties) {
+                this.messageGrabEntity = true;
+                this.grabEntityProps = entityProperties;
+            }
+        };
+
+        // returns a list of all equip-hotspots assosiated with this entity.
+        // @param {UUID} entityID
+        // @returns {Object[]} array of objects with the following fields.
+        //      * key {string} a string that can be used to uniquely identify this hotspot
+        //      * entityID {UUID}
+        //      * localPosition {Vec3} position of the hotspot in object space.
+        //      * worldPosition {vec3} position of the hotspot in world space.
+        //      * radius {number} radius of equip hotspot
+        //      * joints {Object} keys are joint names values are arrays of two elements:
+        //        offset position {Vec3} and offset rotation {Quat}, both are in the coordinate system of the joint.
+        //      * modelURL {string} url for model to use instead of default sphere.
+        //      * modelScale {Vec3} scale factor for model
+        this.collectEquipHotspots = function(props) {
+            var result = [];
+            var entityID = props.id;
+            var entityXform = new Xform(props.rotation, props.position);
+
+            var equipHotspotsProps = getEquipHotspotsData(props);
+            if (equipHotspotsProps && equipHotspotsProps.length > 0) {
+                var i, length = equipHotspotsProps.length;
+                for (i = 0; i < length; i++) {
+                    var hotspot = equipHotspotsProps[i];
+                    if (hotspot.position && hotspot.radius && hotspot.joints) {
+                        result.push({
+                            key: entityID.toString() + i.toString(),
+                            entityID: entityID,
+                            localPosition: hotspot.position,
+                            worldPosition: entityXform.xformPoint(hotspot.position),
+                            radius: hotspot.radius,
+                            joints: hotspot.joints,
+                            modelURL: hotspot.modelURL,
+                            modelScale: hotspot.modelScale
+                        });
+                    }
+                }
+            } else {
+                var wearableProps = getWearableData(props);
+                if (wearableProps && wearableProps.joints) {
+                    result.push({
+                        key: entityID.toString() + "0",
+                        entityID: entityID,
+                        localPosition: {
+                            x: 0,
+                            y: 0,
+                            z: 0
+                        },
+                        worldPosition: entityXform.pos,
+                        radius: EQUIP_RADIUS,
+                        joints: wearableProps.joints,
+                        modelURL: null,
+                        modelScale: null
+                    });
+                }
+            }
+            return result;
+        };
+
+        this.hotspotIsEquippable = function(hotspot, controllerData) {
+            var props = controllerData.nearbyEntityPropertiesByID[hotspot.entityID];
+
+            var hasParent = true;
+            if (props.parentID === Uuid.NULL) {
+                hasParent = false;
+            }
+
+            if (hasParent || entityHasActions(hotspot.entityID)) {
+                return false;
+            }
+
+            return true;
+        };
+
+        this.handToController = function() {
+            return (this.hand === RIGHT_HAND) ? Controller.Standard.RightHand : Controller.Standard.LeftHand;
+        };
+
+        this.updateSmoothedTrigger = function(controllerData) {
+            var triggerValue = controllerData.triggerValues[this.hand];
+            // smooth out trigger value
+            this.triggerValue = (this.triggerValue * TRIGGER_SMOOTH_RATIO) +
+                (triggerValue * (1.0 - TRIGGER_SMOOTH_RATIO));
+        };
+
+        this.triggerSmoothedGrab = function() {
+            return this.triggerClicked;
+        };
+
+        this.triggerSmoothedSqueezed = function() {
+            return this.triggerValue > TRIGGER_ON_VALUE;
+        };
+
+        this.triggerSmoothedReleased = function() {
+            return this.triggerValue < TRIGGER_OFF_VALUE;
+        };
+
+        this.secondaryReleased = function() {
+            return this.rawSecondaryValue < BUMPER_ON_VALUE;
+        };
+
+        this.secondarySmoothedSqueezed = function() {
+            return this.rawSecondaryValue > BUMPER_ON_VALUE;
+        };
+
+        this.chooseNearEquipHotspots = function(candidateEntityProps, controllerData) {
+            var _this = this;
+            var collectedHotspots = flatten(candidateEntityProps.map(function(props) {
+                return _this.collectEquipHotspots(props);
+            }));
+            var controllerLocation = controllerData.controllerLocations[_this.hand];
+            var worldControllerPosition = controllerLocation.position;
+            var equippableHotspots = collectedHotspots.filter(function(hotspot) {
+                var hotspotDistance = Vec3.distance(hotspot.worldPosition, worldControllerPosition);
+                return _this.hotspotIsEquippable(hotspot, controllerData) &&
+                    hotspotDistance < hotspot.radius;
+            });
+            return equippableHotspots;
+        };
+
+        this.cloneHotspot = function(props, controllerData) {
+            if (entityIsCloneable(props)) {
+                var worldEntityProps = controllerData.nearbyEntityProperties[this.hand];
+                var cloneID = cloneEntity(props, worldEntityProps);
+                return cloneID;
+            }
+
+            return null;
+        };
+
+        this.chooseBestEquipHotspot = function(candidateEntityProps, controllerData) {
+            var equippableHotspots = this.chooseNearEquipHotspots(candidateEntityProps, controllerData);
+            if (equippableHotspots.length > 0) {
+                // sort by distance;
+                var controllerLocation = controllerData.controllerLocations[this.hand];
+                var worldControllerPosition = controllerLocation.position;
+                equippableHotspots.sort(function(a, b) {
+                    var aDistance = Vec3.distance(a.worldPosition, worldControllerPosition);
+                    var bDistance = Vec3.distance(b.worldPosition, worldControllerPosition);
+                    return aDistance - bDistance;
+                });
+                return equippableHotspots[0];
+            } else {
+                return null;
+            }
+        };
+
+        this.dropGestureReset = function() {
+            this.prevHandIsUpsideDown = false;
+        };
+
+        this.dropGestureProcess = function (deltaTime) {
+            var worldHandRotation = getControllerWorldLocation(this.handToController(), true).orientation;
+            var localHandUpAxis = this.hand === RIGHT_HAND ? { x: 1, y: 0, z: 0 } : { x: -1, y: 0, z: 0 };
+            var worldHandUpAxis = Vec3.multiplyQbyV(worldHandRotation, localHandUpAxis);
+            var DOWN = { x: 0, y: -1, z: 0 };
+
+            var DROP_ANGLE = Math.PI / 3;
+            var HYSTERESIS_FACTOR = 1.1;
+            var ROTATION_ENTER_THRESHOLD = Math.cos(DROP_ANGLE);
+            var ROTATION_EXIT_THRESHOLD = Math.cos(DROP_ANGLE * HYSTERESIS_FACTOR);
+            var rotationThreshold = this.prevHandIsUpsideDown ? ROTATION_EXIT_THRESHOLD : ROTATION_ENTER_THRESHOLD;
+
+            var handIsUpsideDown = false;
+            if (Vec3.dot(worldHandUpAxis, DOWN) > rotationThreshold) {
+                handIsUpsideDown = true;
+            }
+
+            if (handIsUpsideDown !== this.prevHandIsUpsideDown) {
+                this.prevHandIsUpsideDown = handIsUpsideDown;
+                Controller.triggerHapticPulse(HAPTIC_DEQUIP_STRENGTH, HAPTIC_DEQUIP_DURATION, this.hand);
+            }
+
+            return handIsUpsideDown;
+        };
+
+        this.clearEquipHaptics = function() {
+            this.prevPotentialEquipHotspot = null;
+        };
+
+        this.updateEquipHaptics = function(potentialEquipHotspot, currentLocation) {
+            if (potentialEquipHotspot && !this.prevPotentialEquipHotspot ||
+                !potentialEquipHotspot && this.prevPotentialEquipHotspot) {
+                Controller.triggerHapticPulse(HAPTIC_TEXTURE_STRENGTH, HAPTIC_TEXTURE_DURATION, this.hand);
+                this.lastHapticPulseLocation = currentLocation;
+            } else if (potentialEquipHotspot &&
+                       Vec3.distance(this.lastHapticPulseLocation, currentLocation) > HAPTIC_TEXTURE_DISTANCE) {
+                Controller.triggerHapticPulse(HAPTIC_TEXTURE_STRENGTH, HAPTIC_TEXTURE_DURATION, this.hand);
+                this.lastHapticPulseLocation = currentLocation;
+            }
+            this.prevPotentialEquipHotspot = potentialEquipHotspot;
+        };
+
+        this.startEquipEntity = function (controllerData) {
+            this.dropGestureReset();
+            this.clearEquipHaptics();
+            Controller.triggerHapticPulse(HAPTIC_PULSE_STRENGTH, HAPTIC_PULSE_DURATION, this.hand);
+
+            var grabbedProperties = Entities.getEntityProperties(this.targetEntityID);
+
+            // if an object is "equipped" and has a predefined offset, use it.
+            var offsets = getAttachPointForHotspotFromSettings(this.grabbedHotspot, this.hand);
+            if (offsets) {
+                this.offsetPosition = offsets[0];
+                this.offsetRotation = offsets[1];
+            } else {
+                var handJointName = this.hand === RIGHT_HAND ? "RightHand" : "LeftHand";
+                if (this.grabbedHotspot.joints[handJointName]) {
+                    this.offsetPosition = this.grabbedHotspot.joints[handJointName][0];
+                    this.offsetRotation = this.grabbedHotspot.joints[handJointName][1];
+                }
+            }
+
+            var handJointIndex;
+            if (this.ignoreIK) {
+                handJointIndex = this.controllerJointIndex;
+            } else {
+                handJointIndex = MyAvatar.getJointIndex(this.hand === RIGHT_HAND ? "RightHand" : "LeftHand");
+            }
+
+            var reparentProps = {
+                parentID: MyAvatar.SELF_ID,
+                parentJointIndex: handJointIndex,
+                localVelocity: {x: 0, y: 0, z: 0},
+                localAngularVelocity: {x: 0, y: 0, z: 0},
+                localPosition: this.offsetPosition,
+                localRotation: this.offsetRotation
+            };
+
+            var isClone = false;
+            if (entityIsCloneable(grabbedProperties)) {
+                var cloneID = this.cloneHotspot(grabbedProperties, controllerData);
+                this.targetEntityID = cloneID;
+                Entities.editEntity(this.targetEntityID, reparentProps);
+                controllerData.nearbyEntityPropertiesByID[this.targetEntityID] = grabbedProperties;
+                isClone = true;
+            } else if (!grabbedProperties.locked) {
+                Entities.editEntity(this.targetEntityID, reparentProps);
+            } else {
+                this.grabbedHotspot = null;
+                this.targetEntityID = null;
+                return;
+            }
+
+            // we don't want to send startEquip message until the trigger is released.  otherwise,
+            // guns etc will fire right as they are equipped.
+            this.shouldSendStart = true;
+
+            Messages.sendMessage('Hifi-Object-Manipulation', JSON.stringify({
+                action: 'equip',
+                grabbedEntity: this.targetEntityID,
+                joint: this.hand === RIGHT_HAND ? "RightHand" : "LeftHand"
+            }));
+
+            var _this = this;
+            var grabEquipCheck = function() {
+                var args = [_this.hand === RIGHT_HAND ? "right" : "left", MyAvatar.sessionUUID];
+                Entities.callEntityMethod(_this.targetEntityID, "startEquip", args);
+            };
+
+            if (isClone) {
+                // 100 ms seems to be sufficient time to force the check even occur after the object has been initialized.
+                Script.setTimeout(grabEquipCheck, 100);
+            }
+
+        };
+
+        this.endEquipEntity = function () {
+            this.storeAttachPointInSettings();
+            Entities.editEntity(this.targetEntityID, {
+                parentID: Uuid.NULL,
+                parentJointIndex: -1
+            });
+
+            var args = [this.hand === RIGHT_HAND ? "right" : "left", MyAvatar.sessionUUID];
+            Entities.callEntityMethod(this.targetEntityID, "releaseEquip", args);
+
+            Messages.sendMessage('Hifi-Object-Manipulation', JSON.stringify({
+                action: 'release',
+                grabbedEntity: this.targetEntityID,
+                joint: this.hand === RIGHT_HAND ? "RightHand" : "LeftHand"
+            }));
+
+            ensureDynamic(this.targetEntityID);
+            this.targetEntityID = null;
+            this.messageGrabEntity = false;
+            this.grabEntityProps = null;
+        };
+
+        this.updateInputs = function (controllerData) {
+            this.rawTriggerValue = controllerData.triggerValues[this.hand];
+            this.triggerClicked = controllerData.triggerClicks[this.hand];
+            this.rawSecondaryValue = controllerData.secondaryValues[this.hand];
+            this.updateSmoothedTrigger(controllerData);
+        };
+
+        this.checkNearbyHotspots = function (controllerData, deltaTime, timestamp) {
+            this.controllerJointIndex = getControllerJointIndex(this.hand);
+
+            if (this.triggerSmoothedReleased() && this.secondaryReleased()) {
+                this.waitForTriggerRelease = false;
+            }
+
+            var controllerLocation = getControllerWorldLocation(this.handToController(), true);
+            var worldHandPosition = controllerLocation.position;
+            var candidateEntityProps = controllerData.nearbyEntityProperties[this.hand];
+
+
+            var potentialEquipHotspot = null;
+            if (this.messageGrabEntity) {
+                var hotspots = this.collectEquipHotspots(this.grabEntityProps);
+                if (hotspots.length > -1) {
+                    potentialEquipHotspot = hotspots[0];
+                }
+            } else {
+                potentialEquipHotspot = this.chooseBestEquipHotspot(candidateEntityProps, controllerData);
+            }
+
+            if (!this.waitForTriggerRelease) {
+                this.updateEquipHaptics(potentialEquipHotspot, worldHandPosition);
+            }
+
+            var nearEquipHotspots = this.chooseNearEquipHotspots(candidateEntityProps, controllerData);
+            equipHotspotBuddy.updateHotspots(nearEquipHotspots, timestamp);
+            if (potentialEquipHotspot) {
+                equipHotspotBuddy.highlightHotspot(potentialEquipHotspot);
+            }
+
+            equipHotspotBuddy.update(deltaTime, timestamp, controllerData);
+
+            // if the potentialHotspot is cloneable, clone it and return it
+            // if the potentialHotspot os not cloneable and locked return null
+
+            if (potentialEquipHotspot &&
+                (((this.triggerSmoothedSqueezed() || this.secondarySmoothedSqueezed()) && !this.waitForTriggerRelease) ||
+                 this.messageGrabEntity)) {
+                this.grabbedHotspot = potentialEquipHotspot;
+                this.targetEntityID = this.grabbedHotspot.entityID;
+                this.startEquipEntity(controllerData);
+                this.messageGrabEnity = false;
+                this.equipedWithSecondary = this.secondarySmoothedSqueezed();
+                return makeRunningValues(true, [potentialEquipHotspot.entityID], []);
+            } else {
+                return makeRunningValues(false, [], []);
+            }
+        };
+
+        this.isTargetIDValid = function(controllerData) {
+            var entityProperties = controllerData.nearbyEntityPropertiesByID[this.targetEntityID];
+            return entityProperties && "type" in entityProperties;
+        };
+
+        this.isReady = function (controllerData, deltaTime) {
+            var timestamp = Date.now();
+            this.updateInputs(controllerData);
+            return this.checkNearbyHotspots(controllerData, deltaTime, timestamp);
+        };
+
+        this.run = function (controllerData, deltaTime) {
+            var timestamp = Date.now();
+            this.updateInputs(controllerData);
+
+            if (!this.isTargetIDValid(controllerData)) {
+                this.endEquipEntity();
+                return makeRunningValues(false, [], []);
+            }
+
+            if (!this.targetEntityID) {
+                return this.checkNearbyHotspots(controllerData, deltaTime, timestamp);
+            }
+
+            if (controllerData.secondaryValues[this.hand] && !this.equipedWithSecondary) {
+                // this.secondaryReleased() will always be true when not depressed
+                // so we cannot simply rely on that for release - ensure that the
+                // trigger was first "prepared" by being pushed in before the release
+                this.preparingHoldRelease = true;
+            }
+
+            if (this.preparingHoldRelease && !controllerData.secondaryValues[this.hand]) {
+                // we have an equipped object and the secondary trigger was released
+                // short-circuit the other checks and release it
+                this.preparingHoldRelease = false;
+                this.endEquipEntity();
+                return makeRunningValues(false, [], []);
+            }
+
+            var dropDetected = this.dropGestureProcess(deltaTime);
+
+            if (this.triggerSmoothedReleased() || this.secondaryReleased()) {
+                if (this.shouldSendStart) {
+                    // we don't want to send startEquip message until the trigger is released.  otherwise,
+                    // guns etc will fire right as they are equipped.
+                    var startArgs = [this.hand === RIGHT_HAND ? "right" : "left", MyAvatar.sessionUUID];
+                    Entities.callEntityMethod(this.targetEntityID, "startEquip", startArgs);
+                    this.shouldSendStart = false;
+                }
+                this.waitForTriggerRelease = false;
+                if (this.secondaryReleased() && this.equipedWithSecondary) {
+                    this.equipedWithSecondary = false;
+                }
+            }
+
+            if (dropDetected && this.prevDropDetected !== dropDetected) {
+                this.waitForTriggerRelease = true;
+            }
+
+            // highlight the grabbed hotspot when the dropGesture is detected.
+            if (dropDetected) {
+                equipHotspotBuddy.updateHotspot(this.grabbedHotspot, timestamp);
+                equipHotspotBuddy.highlightHotspot(this.grabbedHotspot);
+            }
+
+            if (dropDetected && !this.waitForTriggerRelease && this.triggerSmoothedGrab()) {
+                this.waitForTriggerRelease = true;
+                // store the offset attach points into preferences.
+                this.endEquipEntity();
+                return makeRunningValues(false, [], []);
+            }
+            this.prevDropDetected = dropDetected;
+
+            equipHotspotBuddy.update(deltaTime, timestamp, controllerData);
+
+            if (!this.shouldSendStart) {
+                var args = [this.hand === RIGHT_HAND ? "right" : "left", MyAvatar.sessionUUID];
+                Entities.callEntityMethod(this.targetEntityID, "continueEquip", args);
+            }
+
+            return makeRunningValues(true, [this.targetEntityID], []);
+        };
+
+        this.storeAttachPointInSettings = function() {
+            if (this.grabbedHotspot && this.targetEntityID) {
+                var prefProps = Entities.getEntityProperties(this.targetEntityID, ["localPosition", "localRotation"]);
+                if (prefProps && prefProps.localPosition && prefProps.localRotation) {
+                    storeAttachPointForHotspotInSettings(this.grabbedHotspot, this.hand,
+                        prefProps.localPosition, prefProps.localRotation);
+                }
+            }
+        };
+
+        this.cleanup = function () {
+            if (this.targetEntityID) {
+                this.endEquipEntity();
+            }
+        };
+    }
+
+    var handleMessage = function(channel, message, sender) {
+        var data;
+        if (sender === MyAvatar.sessionUUID) {
+            if (channel === 'Hifi-Hand-Grab') {
+                try {
+                    data = JSON.parse(message);
+                    var equipModule = (data.hand === "left") ? leftEquipEntity : rightEquipEntity;
+                    var entityProperties = Entities.getEntityProperties(data.entityID, DISPATCHER_PROPERTIES);
+                    entityProperties.id = data.entityID;
+                    equipModule.setMessageGrabData(entityProperties);
+
+                } catch (e) {
+                    print("WARNING: equipEntity.js -- error parsing Hifi-Hand-Grab message: " + message);
+                }
+            } else if (channel === 'Hifi-Hand-Drop') {
+                if (message === "left") {
+                    leftEquipEntity.endEquipEntity();
+                } else if (message === "right") {
+                    rightEquipEntity.endEquipEntity();
+                } else if (message === "both") {
+                    leftEquipEntity.endEquipEntity();
+                    rightEquipEntity.endEquipEntity();
+                }
+            }
+        }
+    };
+
+    Messages.subscribe('Hifi-Hand-Grab');
+    Messages.subscribe('Hifi-Hand-Drop');
+    Messages.messageReceived.connect(handleMessage);
+
+    var leftEquipEntity = new EquipEntity(LEFT_HAND);
+    var rightEquipEntity = new EquipEntity(RIGHT_HAND);
+
+    enableDispatcherModule("LeftEquipEntity", leftEquipEntity);
+    enableDispatcherModule("RightEquipEntity", rightEquipEntity);
+
+    function cleanup() {
+        leftEquipEntity.cleanup();
+        rightEquipEntity.cleanup();
+        disableDispatcherModule("LeftEquipEntity");
+        disableDispatcherModule("RightEquipEntity");
+        clearAttachPoints();
+    };
+    Script.scriptEnding.connect(cleanup);
+}());
diff --git a/scripts/system/controllers/controllerModules/farActionGrabEntity.js b/scripts/system/controllers/controllerModules/farActionGrabEntity.js
new file mode 100644
index 0000000000..8139302dfe
--- /dev/null
+++ b/scripts/system/controllers/controllerModules/farActionGrabEntity.js
@@ -0,0 +1,667 @@
+"use strict";
+
+//  farActionGrabEntity.js
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+
+/* jslint bitwise: true */
+
+/* global Script, Controller, LaserPointers, RayPick, RIGHT_HAND, LEFT_HAND, Mat4, MyAvatar, Vec3, Camera, Quat,
+   getGrabPointSphereOffset, getEnabledModuleByName, makeRunningValues, Entities,
+   enableDispatcherModule, disableDispatcherModule, entityIsDistanceGrabbable, entityIsGrabbable,
+   makeDispatcherModuleParameters, MSECS_PER_SEC, HAPTIC_PULSE_STRENGTH, HAPTIC_PULSE_DURATION,
+   PICK_MAX_DISTANCE, COLORS_GRAB_SEARCHING_HALF_SQUEEZE, COLORS_GRAB_SEARCHING_FULL_SQUEEZE, COLORS_GRAB_DISTANCE_HOLD,
+   DEFAULT_SEARCH_SPHERE_DISTANCE, TRIGGER_OFF_VALUE, TRIGGER_ON_VALUE, ZERO_VEC, ensureDynamic,
+   getControllerWorldLocation, projectOntoEntityXYPlane, ContextOverlay, HMD, Reticle, Overlays, isPointingAtUI, Xform, getEntityParents
+
+*/
+
+Script.include("/~/system/libraries/controllerDispatcherUtils.js");
+Script.include("/~/system/libraries/controllers.js");
+Script.include("/~/system/libraries/Xform.js");
+
+(function() {
+    var PICK_WITH_HAND_RAY = true;
+
+    var SEARCH_SPHERE_SIZE = 0.0132;
+    var dim = {x: SEARCH_SPHERE_SIZE, y: SEARCH_SPHERE_SIZE, z: SEARCH_SPHERE_SIZE};
+    var halfPath = {
+        type: "line3d",
+        color: COLORS_GRAB_SEARCHING_HALF_SQUEEZE,
+        visible: true,
+        alpha: 1,
+        solid: true,
+        glow: 1.0,
+        ignoreRayIntersection: true, // always ignore this
+        drawInFront: true, // Even when burried inside of something, show it.
+        parentID: MyAvatar.SELF_ID
+    };
+    var halfEnd = {
+        type: "sphere",
+        dimensions: dim,
+        solid: true,
+        color: COLORS_GRAB_SEARCHING_HALF_SQUEEZE,
+        alpha: 0.9,
+        ignoreRayIntersection: true,
+        drawInFront: true, // Even when burried inside of something, show it.
+        visible: true
+    };
+    var fullPath = {
+        type: "line3d",
+        color: COLORS_GRAB_SEARCHING_FULL_SQUEEZE,
+        visible: true,
+        alpha: 1,
+        solid: true,
+        glow: 1.0,
+        ignoreRayIntersection: true, // always ignore this
+        drawInFront: true, // Even when burried inside of something, show it.
+        parentID: MyAvatar.SELF_ID
+    };
+    var fullEnd = {
+        type: "sphere",
+        dimensions: dim,
+        solid: true,
+        color: COLORS_GRAB_SEARCHING_FULL_SQUEEZE,
+        alpha: 0.9,
+        ignoreRayIntersection: true,
+        drawInFront: true, // Even when burried inside of something, show it.
+        visible: true
+    };
+    var holdPath = {
+        type: "line3d",
+        color: COLORS_GRAB_DISTANCE_HOLD,
+        visible: true,
+        alpha: 1,
+        solid: true,
+        glow: 1.0,
+        ignoreRayIntersection: true, // always ignore this
+        drawInFront: true, // Even when burried inside of something, show it.
+        parentID: MyAvatar.SELF_ID
+    };
+
+    var renderStates = [
+        {name: "half", path: halfPath, end: halfEnd},
+        {name: "full", path: fullPath, end: fullEnd},
+        {name: "hold", path: holdPath}
+    ];
+
+    var defaultRenderStates = [
+        {name: "half", distance: DEFAULT_SEARCH_SPHERE_DISTANCE, path: halfPath},
+        {name: "full", distance: DEFAULT_SEARCH_SPHERE_DISTANCE, path: fullPath},
+        {name: "hold", distance: DEFAULT_SEARCH_SPHERE_DISTANCE, path: holdPath}
+    ];
+
+    var GRABBABLE_PROPERTIES = [
+        "position",
+        "registrationPoint",
+        "rotation",
+        "gravity",
+        "collidesWith",
+        "dynamic",
+        "collisionless",
+        "locked",
+        "name",
+        "shapeType",
+        "parentID",
+        "parentJointIndex",
+        "density",
+        "dimensions",
+        "userData"
+    ];
+
+    var MARGIN = 25;
+
+    function TargetObject(entityID, entityProps) {
+        this.entityID = entityID;
+        this.entityProps = entityProps;
+        this.targetEntityID = null;
+        this.targetEntityProps = null;
+        this.previousCollisionStatus = null;
+        this.madeDynamic = null;
+
+        this.makeDynamic = function() {
+            if (this.targetEntityID) {
+                var newProps = {
+                    dynamic: true,
+                    collisionless: true
+                };
+                this.previousCollisionStatus = this.targetEntityProps.collisionless;
+                Entities.editEntity(this.targetEntityID, newProps);
+                this.madeDynamic = true;
+            }
+        };
+
+        this.restoreTargetEntityOriginalProps = function() {
+            if (this.madeDynamic) {
+                var props = {};
+                props.dynamic = false;
+                props.collisionless = this.previousCollisionStatus;
+                var zeroVector = {x: 0, y: 0, z:0};
+                props.localVelocity = zeroVector;
+                props.localRotation = zeroVector;
+                Entities.editEntity(this.targetEntityID, props);
+            }
+        };
+
+        this.getTargetEntity = function() {
+            var parentPropsLength = this.parentProps.length;
+            if (parentPropsLength !== 0) {
+                var targetEntity = {
+                    id: this.parentProps[parentPropsLength - 1].id,
+                    props: this.parentProps[parentPropsLength - 1]};
+                this.targetEntityID = targetEntity.id;
+                this.targetEntityProps = targetEntity.props;
+                return targetEntity;
+            }
+            this.targetEntityID = this.entityID;
+            this.targetEntityProps = this.entityProps;
+            return {
+                id: this.entityID,
+                props: this.entityProps};
+        };
+    }
+
+    function FarActionGrabEntity(hand) {
+        this.hand = hand;
+        this.grabbedThingID = null;
+        this.targetObject = null;
+        this.actionID = null; // action this script created...
+        this.entityToLockOnto = null;
+        this.entityWithContextOverlay = false;
+        this.contextOverlayTimer = false;
+        this.previousCollisionStatus = false;
+        this.locked = false;
+        this.reticleMinX = MARGIN;
+        this.reticleMaxX;
+        this.reticleMinY = MARGIN;
+        this.reticleMaxY;
+
+        var ACTION_TTL = 15; // seconds
+
+        var DISTANCE_HOLDING_RADIUS_FACTOR = 3.5; // multiplied by distance between hand and object
+        var DISTANCE_HOLDING_ACTION_TIMEFRAME = 0.1; // how quickly objects move to their new position
+        var DISTANCE_HOLDING_UNITY_MASS = 1200; //  The mass at which the distance holding action timeframe is unmodified
+        var DISTANCE_HOLDING_UNITY_DISTANCE = 6; //  The distance at which the distance holding action timeframe is unmodified
+
+        this.parameters = makeDispatcherModuleParameters(
+            550,
+            this.hand === RIGHT_HAND ? ["rightHand"] : ["leftHand"],
+            [],
+            100);
+
+        this.updateLaserPointer = function(controllerData) {
+            var mode = "hold";
+            if (!this.distanceHolding && !this.distanceRotating) {
+                if (controllerData.triggerClicks[this.hand]) {
+                    mode = "full";
+                } else {
+                    mode = "half";
+                }
+            }
+
+            var laserPointerID = PICK_WITH_HAND_RAY ? this.laserPointer : this.headLaserPointer;
+            if (mode === "full") {
+                this.contextOverlayTimer = false;
+                this.destroyContextOverlay();
+            }
+
+            LaserPointers.enableLaserPointer(laserPointerID);
+            LaserPointers.setRenderState(laserPointerID, mode);
+            if (this.distanceHolding || this.distanceRotating) {
+                if (!this.locked) {
+                    // calculate offset
+                    var targetProps = Entities.getEntityProperties(this.targetObject.entityID, [
+                        "position",
+                        "rotation"
+                    ]);
+                    var zeroVector = { x: 0, y: 0, z:0, w: 0 };
+                    var intersection = controllerData.rayPicks[this.hand].intersection;
+                    var intersectionMat = new Xform(zeroVector, intersection);
+                    var modelMat = new Xform(targetProps.rotation, targetProps.position);
+                    var modelMatInv = modelMat.inv();
+                    var xformMat = Xform.mul(modelMatInv, intersectionMat);
+                    var offsetMat = Mat4.createFromRotAndTrans(xformMat.rot, xformMat.pos);
+                    LaserPointers.setLockEndUUID(laserPointerID, this.targetObject.entityID, this.grabbedIsOverlay, offsetMat);
+                    this.locked = true;
+                }
+            } else {
+                LaserPointers.setLockEndUUID(laserPointerID, null, false);
+                this.locked = false;
+            }
+        };
+
+        this.laserPointerOff = function() {
+            LaserPointers.disableLaserPointer(this.laserPointer);
+            LaserPointers.disableLaserPointer(this.headLaserPointer);
+        };
+
+
+        this.handToController = function() {
+            return (this.hand === RIGHT_HAND) ? Controller.Standard.RightHand : Controller.Standard.LeftHand;
+        };
+
+        this.distanceGrabTimescale = function(mass, distance) {
+            var timeScale = DISTANCE_HOLDING_ACTION_TIMEFRAME * mass /
+                DISTANCE_HOLDING_UNITY_MASS * distance /
+                DISTANCE_HOLDING_UNITY_DISTANCE;
+            if (timeScale < DISTANCE_HOLDING_ACTION_TIMEFRAME) {
+                timeScale = DISTANCE_HOLDING_ACTION_TIMEFRAME;
+            }
+            return timeScale;
+        };
+
+        this.getMass = function(dimensions, density) {
+            return (dimensions.x * dimensions.y * dimensions.z) * density;
+        };
+
+        this.startFarGrabAction = function (controllerData, grabbedProperties) {
+            var controllerLocation = controllerData.controllerLocations[this.hand];
+            var worldControllerPosition = controllerLocation.position;
+            var worldControllerRotation = controllerLocation.orientation;
+
+            // transform the position into room space
+            var worldToSensorMat = Mat4.inverse(MyAvatar.getSensorToWorldMatrix());
+            var roomControllerPosition = Mat4.transformPoint(worldToSensorMat, worldControllerPosition);
+
+            var now = Date.now();
+
+            // add the action and initialize some variables
+            this.currentObjectPosition = grabbedProperties.position;
+            this.currentObjectRotation = grabbedProperties.rotation;
+            this.currentObjectTime = now;
+            this.currentCameraOrientation = Camera.orientation;
+
+            this.grabRadius = this.grabbedDistance;
+            this.grabRadialVelocity = 0.0;
+
+            // offset between controller vector at the grab radius and the entity position
+            var targetPosition = Vec3.multiply(this.grabRadius, Quat.getUp(worldControllerRotation));
+            targetPosition = Vec3.sum(targetPosition, worldControllerPosition);
+            this.offsetPosition = Vec3.subtract(this.currentObjectPosition, targetPosition);
+
+            // compute a constant based on the initial conditions which we use below to exaggerate hand motion
+            // onto the held object
+            this.radiusScalar = Math.log(this.grabRadius + 1.0);
+            if (this.radiusScalar < 1.0) {
+                this.radiusScalar = 1.0;
+            }
+
+            // compute the mass for the purpose of energy and how quickly to move object
+            this.mass = this.getMass(grabbedProperties.dimensions, grabbedProperties.density);
+            var distanceToObject = Vec3.length(Vec3.subtract(MyAvatar.position, grabbedProperties.position));
+            var timeScale = this.distanceGrabTimescale(this.mass, distanceToObject);
+            this.linearTimeScale = timeScale;
+            this.actionID = Entities.addAction("far-grab", this.grabbedThingID, {
+                targetPosition: this.currentObjectPosition,
+                linearTimeScale: timeScale,
+                targetRotation: this.currentObjectRotation,
+                angularTimeScale: timeScale,
+                tag: "far-grab-" + MyAvatar.sessionUUID,
+                ttl: ACTION_TTL
+            });
+            if (this.actionID === Uuid.NULL) {
+                this.actionID = null;
+            }
+
+            if (this.actionID !== null) {
+                var args = [this.hand === RIGHT_HAND ? "right" : "left", MyAvatar.sessionUUID];
+                Entities.callEntityMethod(this.grabbedThingID, "startDistanceGrab", args);
+            }
+
+            Controller.triggerHapticPulse(HAPTIC_PULSE_STRENGTH, HAPTIC_PULSE_DURATION, this.hand);
+            this.previousRoomControllerPosition = roomControllerPosition;
+        };
+
+        this.continueDistanceHolding = function(controllerData) {
+            var controllerLocation = controllerData.controllerLocations[this.hand];
+            var worldControllerPosition = controllerLocation.position;
+            var worldControllerRotation = controllerLocation.orientation;
+
+            // also transform the position into room space
+            var worldToSensorMat = Mat4.inverse(MyAvatar.getSensorToWorldMatrix());
+            var roomControllerPosition = Mat4.transformPoint(worldToSensorMat, worldControllerPosition);
+
+            var grabbedProperties = Entities.getEntityProperties(this.grabbedThingID, ["position"]);
+            var now = Date.now();
+            var deltaObjectTime = (now - this.currentObjectTime) / MSECS_PER_SEC; // convert to seconds
+            this.currentObjectTime = now;
+
+            // the action was set up when this.distanceHolding was called.  update the targets.
+            var radius = Vec3.distance(this.currentObjectPosition, worldControllerPosition) *
+                this.radiusScalar * DISTANCE_HOLDING_RADIUS_FACTOR;
+            if (radius < 1.0) {
+                radius = 1.0;
+            }
+
+            var roomHandDelta = Vec3.subtract(roomControllerPosition, this.previousRoomControllerPosition);
+            var worldHandDelta = Mat4.transformVector(MyAvatar.getSensorToWorldMatrix(), roomHandDelta);
+            var handMoved = Vec3.multiply(worldHandDelta, radius);
+            this.currentObjectPosition = Vec3.sum(this.currentObjectPosition, handMoved);
+
+            var args = [this.hand === RIGHT_HAND ? "right" : "left", MyAvatar.sessionUUID];
+            Entities.callEntityMethod(this.grabbedThingID, "continueDistanceGrab", args);
+
+            //  Update radialVelocity
+            var lastVelocity = Vec3.multiply(worldHandDelta, 1.0 / deltaObjectTime);
+            var delta = Vec3.normalize(Vec3.subtract(grabbedProperties.position, worldControllerPosition));
+            var newRadialVelocity = Vec3.dot(lastVelocity, delta);
+
+            var VELOCITY_AVERAGING_TIME = 0.016;
+            var blendFactor = deltaObjectTime / VELOCITY_AVERAGING_TIME;
+            if (blendFactor < 0.0) {
+                blendFactor = 0.0;
+            } else if (blendFactor > 1.0) {
+                blendFactor = 1.0;
+            }
+            this.grabRadialVelocity = blendFactor * newRadialVelocity + (1.0 - blendFactor) * this.grabRadialVelocity;
+
+            var RADIAL_GRAB_AMPLIFIER = 10.0;
+            if (Math.abs(this.grabRadialVelocity) > 0.0) {
+                this.grabRadius = this.grabRadius + (this.grabRadialVelocity * deltaObjectTime *
+                                                     this.grabRadius * RADIAL_GRAB_AMPLIFIER);
+            }
+
+            // don't let grabRadius go all the way to zero, because it can't come back from that
+            var MINIMUM_GRAB_RADIUS = 0.1;
+            if (this.grabRadius < MINIMUM_GRAB_RADIUS) {
+                this.grabRadius = MINIMUM_GRAB_RADIUS;
+            }
+            var newTargetPosition = Vec3.multiply(this.grabRadius, Quat.getUp(worldControllerRotation));
+            newTargetPosition = Vec3.sum(newTargetPosition, worldControllerPosition);
+            newTargetPosition = Vec3.sum(newTargetPosition, this.offsetPosition);
+
+            // XXX
+            // this.maybeScale(grabbedProperties);
+
+            // visualizations
+            this.updateLaserPointer(controllerData);
+
+            var distanceToObject = Vec3.length(Vec3.subtract(MyAvatar.position, this.currentObjectPosition));
+
+            this.linearTimeScale = (this.linearTimeScale / 2);
+            if (this.linearTimeScale <= DISTANCE_HOLDING_ACTION_TIMEFRAME) {
+                this.linearTimeScale = DISTANCE_HOLDING_ACTION_TIMEFRAME;
+            }
+            var success = Entities.updateAction(this.grabbedThingID, this.actionID, {
+                targetPosition: newTargetPosition,
+                linearTimeScale: this.linearTimeScale,
+                targetRotation: this.currentObjectRotation,
+                angularTimeScale: this.distanceGrabTimescale(this.mass, distanceToObject),
+                ttl: ACTION_TTL
+            });
+            if (!success) {
+                print("continueDistanceHolding -- updateAction failed: " + this.actionID);
+                this.actionID = null;
+            }
+
+            this.previousRoomControllerPosition = roomControllerPosition;
+        };
+
+        this.endNearGrabAction = function () {
+            ensureDynamic(this.grabbedThingID);
+            this.distanceHolding = false;
+            this.distanceRotating = false;
+            Entities.deleteAction(this.grabbedThingID, this.actionID);
+
+            var args = [this.hand === RIGHT_HAND ? "right" : "left", MyAvatar.sessionUUID];
+            Entities.callEntityMethod(this.grabbedThingID, "releaseGrab", args);
+            if (this.targetObject) {
+                this.targetObject.restoreTargetEntityOriginalProps();
+            }
+            this.actionID = null;
+            this.grabbedThingID = null;
+            this.targetObject = null;
+        };
+
+        this.updateRecommendedArea = function() {
+            var dims = Controller.getViewportDimensions();
+            this.reticleMaxX = dims.x - MARGIN;
+            this.reticleMaxY = dims.y - MARGIN;
+        };
+
+        this.calculateNewReticlePosition = function(intersection) {
+            this.updateRecommendedArea();
+            var point2d = HMD.overlayFromWorldPoint(intersection);
+            point2d.x = Math.max(this.reticleMinX, Math.min(point2d.x, this.reticleMaxX));
+            point2d.y = Math.max(this.reticleMinY, Math.min(point2d.y, this.reticleMaxY));
+            return point2d;
+        };
+
+        this.notPointingAtEntity = function(controllerData) {
+            var intersection = controllerData.rayPicks[this.hand];
+            var entityProperty = Entities.getEntityProperties(intersection.objectID);
+            var entityType = entityProperty.type;
+            var hudRayPick = controllerData.hudRayPicks[this.hand];
+            var point2d = this.calculateNewReticlePosition(hudRayPick.intersection);
+            if ((intersection.type === RayPick.INTERSECTED_ENTITY && entityType === "Web") ||
+                intersection.type === RayPick.INTERSECTED_OVERLAY || Window.isPointOnDesktopWindow(point2d)) {
+                return true;
+            }
+            return false;
+        };
+
+        this.distanceRotate = function(otherFarGrabModule) {
+            this.distanceRotating = true;
+            this.distanceHolding = false;
+
+            var worldControllerRotation = getControllerWorldLocation(this.handToController(), true).orientation;
+            var controllerRotationDelta =
+                Quat.multiply(worldControllerRotation, Quat.inverse(this.previousWorldControllerRotation));
+            // Rotate entity by twice the delta rotation.
+            controllerRotationDelta = Quat.multiply(controllerRotationDelta, controllerRotationDelta);
+
+            // Perform the rotation in the translation controller's action update.
+            otherFarGrabModule.currentObjectRotation = Quat.multiply(controllerRotationDelta,
+                otherFarGrabModule.currentObjectRotation);
+
+            this.previousWorldControllerRotation = worldControllerRotation;
+        };
+
+        this.prepareDistanceRotatingData = function(controllerData) {
+            var intersection = controllerData.rayPicks[this.hand];
+
+            var controllerLocation = getControllerWorldLocation(this.handToController(), true);
+            var worldControllerPosition = controllerLocation.position;
+            var worldControllerRotation = controllerLocation.orientation;
+
+            var grabbedProperties = Entities.getEntityProperties(intersection.objectID, GRABBABLE_PROPERTIES);
+            this.currentObjectPosition = grabbedProperties.position;
+            this.grabRadius = intersection.distance;
+
+            // Offset between controller vector at the grab radius and the entity position.
+            var targetPosition = Vec3.multiply(this.grabRadius, Quat.getUp(worldControllerRotation));
+            targetPosition = Vec3.sum(targetPosition, worldControllerPosition);
+            this.offsetPosition = Vec3.subtract(this.currentObjectPosition, targetPosition);
+
+            // Initial controller rotation.
+            this.previousWorldControllerRotation = worldControllerRotation;
+        };
+
+        this.destroyContextOverlay = function(controllerData) {
+            if (this.entityWithContextOverlay) {
+                ContextOverlay.destroyContextOverlay(this.entityWithContextOverlay);
+                this.entityWithContextOverlay = false;
+            }
+        };
+
+        this.isReady = function (controllerData) {
+            if (this.notPointingAtEntity(controllerData)) {
+                return makeRunningValues(false, [], []);
+            }
+
+            this.distanceHolding = false;
+            this.distanceRotating = false;
+
+            if (controllerData.triggerValues[this.hand] > TRIGGER_ON_VALUE) {
+                this.prepareDistanceRotatingData(controllerData);
+                return makeRunningValues(true, [], []);
+            } else {
+                this.destroyContextOverlay();
+                return makeRunningValues(false, [], []);
+            }
+        };
+
+        this.run = function (controllerData) {
+            if (controllerData.triggerValues[this.hand] < TRIGGER_OFF_VALUE ||
+                this.notPointingAtEntity(controllerData)) {
+                this.endNearGrabAction();
+                this.laserPointerOff();
+                return makeRunningValues(false, [], []);
+            }
+            this.intersectionDistance = controllerData.rayPicks[this.hand].distance;
+            this.updateLaserPointer(controllerData);
+
+            var otherModuleName =this.hand === RIGHT_HAND ? "LeftFarActionGrabEntity" : "RightFarActionGrabEntity";
+            var otherFarGrabModule = getEnabledModuleByName(otherModuleName);
+
+            // gather up the readiness of the near-grab modules
+            var nearGrabNames = [
+                this.hand === RIGHT_HAND ? "RightScaleAvatar" : "LeftScaleAvatar",
+                this.hand === RIGHT_HAND ? "RightFarTriggerEntity" : "LeftFarTriggerEntity",
+                this.hand === RIGHT_HAND ? "RightNearActionGrabEntity" : "LeftNearActionGrabEntity",
+                this.hand === RIGHT_HAND ? "RightNearParentingGrabEntity" : "LeftNearParentingGrabEntity",
+                this.hand === RIGHT_HAND ? "RightNearParentingGrabOverlay" : "LeftNearParentingGrabOverlay"
+            ];
+
+            var nearGrabReadiness = [];
+            for (var i = 0; i < nearGrabNames.length; i++) {
+                var nearGrabModule = getEnabledModuleByName(nearGrabNames[i]);
+                var ready = nearGrabModule ? nearGrabModule.isReady(controllerData) : makeRunningValues(false, [], []);
+                nearGrabReadiness.push(ready);
+            }
+
+            if (this.actionID) {
+                // if we are doing a distance grab and the object gets close enough to the controller,
+                // stop the far-grab so the near-grab or equip can take over.
+                for (var k = 0; k < nearGrabReadiness.length; k++) {
+                    if (nearGrabReadiness[k].active && nearGrabReadiness[k].targets[0] === this.grabbedThingID) {
+                        this.laserPointerOff();
+                        this.endNearGrabAction();
+                        return makeRunningValues(false, [], []);
+                    }
+                }
+
+                this.continueDistanceHolding(controllerData);
+            } else {
+                // if we are doing a distance search and this controller moves into a position
+                // where it could near-grab something, stop searching.
+                for (var j = 0; j < nearGrabReadiness.length; j++) {
+                    if (nearGrabReadiness[j].active) {
+                        this.laserPointerOff();
+                        this.endNearGrabAction();
+                        return makeRunningValues(false, [], []);
+                    }
+                }
+
+                var rayPickInfo = controllerData.rayPicks[this.hand];
+                if (rayPickInfo.type === RayPick.INTERSECTED_ENTITY) {
+                    if (controllerData.triggerClicks[this.hand]) {
+                        var entityID = rayPickInfo.objectID;
+                        var targetProps = Entities.getEntityProperties(entityID, [
+                            "dynamic", "shapeType", "position",
+                            "rotation", "dimensions", "density",
+                            "userData", "locked", "type"
+                        ]);
+
+                        this.targetObject = new TargetObject(entityID, targetProps);
+                        this.targetObject.parentProps = getEntityParents(targetProps);
+                        if (entityID !== this.entityWithContextOverlay) {
+                            this.destroyContextOverlay();
+                        }
+                        var targetEntity = this.targetObject.getTargetEntity();
+                        entityID = targetEntity.id;
+                        targetProps = targetEntity.props;
+
+                        if (entityIsGrabbable(targetProps)) {
+                            if (!entityIsDistanceGrabbable(targetProps)) {
+                                this.targetObject.makeDynamic();
+                            }
+
+                            if (!this.distanceRotating) {
+                                this.grabbedThingID = entityID;
+                                this.grabbedDistance = rayPickInfo.distance;
+                            }
+
+                            if (otherFarGrabModule.grabbedThingID === this.grabbedThingID && otherFarGrabModule.distanceHolding) {
+                                this.prepareDistanceRotatingData(controllerData);
+                                this.distanceRotate(otherFarGrabModule);
+                            } else {
+                                this.distanceHolding = true;
+                                this.distanceRotating = false;
+                                this.startFarGrabAction(controllerData, targetProps);
+                            }
+                        }
+                    } else if (!this.entityWithContextOverlay && !this.contextOverlayTimer) {
+                        var _this = this;
+                        _this.contextOverlayTimer = Script.setTimeout(function () {
+                            if (!_this.entityWithContextOverlay && _this.contextOverlayTimer) {
+                                var props = Entities.getEntityProperties(rayPickInfo.objectID);
+                                var pointerEvent = {
+                                    type: "Move",
+                                    id: this.hand + 1, // 0 is reserved for hardware mouse
+                                    pos2D: projectOntoEntityXYPlane(rayPickInfo.objectID, rayPickInfo.intersection, props),
+                                    pos3D: rayPickInfo.intersection,
+                                    normal: rayPickInfo.surfaceNormal,
+                                    direction: Vec3.subtract(ZERO_VEC, rayPickInfo.surfaceNormal),
+                                    button: "Secondary"
+                                };
+                                if (ContextOverlay.createOrDestroyContextOverlay(rayPickInfo.objectID, pointerEvent)) {
+                                    _this.entityWithContextOverlay = rayPickInfo.objectID;
+                                }
+                            }
+                            _this.contextOverlayTimer = false;
+                        }, 500);
+                    }
+                } else if (this.distanceRotating) {
+                    this.distanceRotate(otherFarGrabModule);
+                }
+            }
+            return this.exitIfDisabled();
+        };
+
+        this.exitIfDisabled = function() {
+            var moduleName = this.hand === RIGHT_HAND ? "RightDisableModules" : "LeftDisableModules";
+            var disableModule = getEnabledModuleByName(moduleName);
+            if (disableModule) {
+                if (disableModule.disableModules) {
+                    this.laserPointerOff();
+                    this.endNearGrabAction();
+                    return makeRunningValues(false, [], []);
+                }
+            }
+            return makeRunningValues(true, [], []);
+        };
+
+        this.cleanup = function () {
+            LaserPointers.disableLaserPointer(this.laserPointer);
+            LaserPointers.removeLaserPointer(this.laserPointer);
+        };
+
+        this.laserPointer = LaserPointers.createLaserPointer({
+            joint: (this.hand === RIGHT_HAND) ? "_CAMERA_RELATIVE_CONTROLLER_RIGHTHAND" : "_CAMERA_RELATIVE_CONTROLLER_LEFTHAND",
+            filter: RayPick.PICK_ENTITIES | RayPick.PICK_OVERLAYS,
+            maxDistance: PICK_MAX_DISTANCE,
+            posOffset: getGrabPointSphereOffset(this.handToController(), true),
+            renderStates: renderStates,
+            faceAvatar: true,
+            distanceScaleEnd: true,
+            scaleWithAvatar: true,
+            defaultRenderStates: defaultRenderStates
+        });
+    }
+
+    var leftFarActionGrabEntity = new FarActionGrabEntity(LEFT_HAND);
+    var rightFarActionGrabEntity = new FarActionGrabEntity(RIGHT_HAND);
+
+    enableDispatcherModule("LeftFarActionGrabEntity", leftFarActionGrabEntity);
+    enableDispatcherModule("RightFarActionGrabEntity", rightFarActionGrabEntity);
+
+    this.cleanup = function () {
+        leftFarActionGrabEntity.cleanup();
+        rightFarActionGrabEntity.cleanup();
+        disableDispatcherModule("LeftFarActionGrabEntity");
+        disableDispatcherModule("RightFarActionGrabEntity");
+    };
+    Script.scriptEnding.connect(this.cleanup);
+}());
diff --git a/scripts/system/controllers/controllerModules/farTrigger.js b/scripts/system/controllers/controllerModules/farTrigger.js
new file mode 100644
index 0000000000..9c72c3df4d
--- /dev/null
+++ b/scripts/system/controllers/controllerModules/farTrigger.js
@@ -0,0 +1,217 @@
+"use strict";
+
+//  farTrigger.js
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+
+
+/* global Script, Controller, LaserPointers, RayPick, RIGHT_HAND, LEFT_HAND, MyAvatar, getGrabPointSphereOffset,
+   makeRunningValues, Entities, enableDispatcherModule, disableDispatcherModule, makeDispatcherModuleParameters,
+   PICK_MAX_DISTANCE, COLORS_GRAB_SEARCHING_HALF_SQUEEZE, COLORS_GRAB_SEARCHING_FULL_SQUEEZE, COLORS_GRAB_DISTANCE_HOLD,
+   DEFAULT_SEARCH_SPHERE_DISTANCE, getGrabbableData
+*/
+
+Script.include("/~/system/libraries/controllerDispatcherUtils.js");
+Script.include("/~/system/libraries/controllers.js");
+
+(function() {
+    var SEARCH_SPHERE_SIZE = 0.0132;
+    var dim = {x: SEARCH_SPHERE_SIZE, y: SEARCH_SPHERE_SIZE, z: SEARCH_SPHERE_SIZE};
+    var halfPath = {
+        type: "line3d",
+        color: COLORS_GRAB_SEARCHING_HALF_SQUEEZE,
+        visible: true,
+        alpha: 1,
+        solid: true,
+        glow: 1.0,
+        ignoreRayIntersection: true, // always ignore this
+        drawInFront: true, // Even when burried inside of something, show it.
+        parentID: MyAvatar.SELF_ID
+    };
+    var halfEnd = {
+        type: "sphere",
+        dimensions: dim,
+        solid: true,
+        color: COLORS_GRAB_SEARCHING_HALF_SQUEEZE,
+        alpha: 0.9,
+        ignoreRayIntersection: true,
+        drawInFront: true, // Even when burried inside of something, show it.
+        visible: true
+    };
+    var fullPath = {
+        type: "line3d",
+        color: COLORS_GRAB_SEARCHING_FULL_SQUEEZE,
+        visible: true,
+        alpha: 1,
+        solid: true,
+        glow: 1.0,
+        ignoreRayIntersection: true, // always ignore this
+        drawInFront: true, // Even when burried inside of something, show it.
+        parentID: MyAvatar.SELF_ID
+    };
+    var fullEnd = {
+        type: "sphere",
+        dimensions: dim,
+        solid: true,
+        color: COLORS_GRAB_SEARCHING_FULL_SQUEEZE,
+        alpha: 0.9,
+        ignoreRayIntersection: true,
+        drawInFront: true, // Even when burried inside of something, show it.
+        visible: true
+    };
+    var holdPath = {
+        type: "line3d",
+        color: COLORS_GRAB_DISTANCE_HOLD,
+        visible: true,
+        alpha: 1,
+        solid: true,
+        glow: 1.0,
+        ignoreRayIntersection: true, // always ignore this
+        drawInFront: true, // Even when burried inside of something, show it.
+        parentID: MyAvatar.SELF_ID
+    };
+
+    var renderStates = [
+        {name: "half", path: halfPath, end: halfEnd},
+        {name: "full", path: fullPath, end: fullEnd},
+        {name: "hold", path: holdPath}
+    ];
+
+    var defaultRenderStates = [
+        {name: "half", distance: DEFAULT_SEARCH_SPHERE_DISTANCE, path: halfPath},
+        {name: "full", distance: DEFAULT_SEARCH_SPHERE_DISTANCE, path: fullPath},
+        {name: "hold", distance: DEFAULT_SEARCH_SPHERE_DISTANCE, path: holdPath}
+    ];
+
+    function entityWantsNearTrigger(props) {
+        var grabbableData = getGrabbableData(props);
+        return grabbableData.triggerable || grabbableData.wantsTrigger;
+    }
+
+    function FarTriggerEntity(hand) {
+        this.hand = hand;
+        this.targetEntityID = null;
+        this.grabbing = false;
+        this.previousParentID = {};
+        this.previousParentJointIndex = {};
+        this.previouslyUnhooked = {};
+
+        this.parameters = makeDispatcherModuleParameters(
+            520,
+            this.hand === RIGHT_HAND ? ["rightHand"] : ["leftHand"],
+            [],
+            100);
+
+        this.handToController = function() {
+            return (this.hand === RIGHT_HAND) ? Controller.Standard.RightHand : Controller.Standard.LeftHand;
+        };
+
+        this.updateLaserPointer = function(controllerData) {
+            var mode = "none";
+            if (controllerData.triggerClicks[this.hand]) {
+                mode = "full";
+            } else {
+                mode = "half";
+            }
+
+            LaserPointers.enableLaserPointer(this.laserPointer);
+            LaserPointers.setRenderState(this.laserPointer, mode);
+        };
+
+        this.laserPointerOff = function() {
+            LaserPointers.disableLaserPointer(this.laserPointer);
+        };
+
+        this.getTargetProps = function (controllerData) {
+            // nearbyEntityProperties is already sorted by length from controller
+            var targetEntity = controllerData.rayPicks[this.hand].objectID;
+            if (targetEntity) {
+                var targetProperties = Entities.getEntityProperties(targetEntity);
+                if (entityWantsNearTrigger(targetProperties)) {
+                    return targetProperties;
+                }
+            }
+            return null;
+        };
+
+        this.startFarTrigger = function (controllerData) {
+            var args = [this.hand === RIGHT_HAND ? "right" : "left", MyAvatar.sessionUUID];
+            Entities.callEntityMethod(this.targetEntityID, "startFarTrigger", args);
+        };
+
+        this.continueFarTrigger = function (controllerData) {
+            var args = [this.hand === RIGHT_HAND ? "right" : "left", MyAvatar.sessionUUID];
+            Entities.callEntityMethod(this.targetEntityID, "continueFarTrigger", args);
+        };
+
+        this.endFarTrigger = function (controllerData) {
+            var args = [this.hand === RIGHT_HAND ? "right" : "left", MyAvatar.sessionUUID];
+            Entities.callEntityMethod(this.targetEntityID, "stopFarTrigger", args);
+            this.laserPointerOff();
+        };
+
+        this.isReady = function (controllerData) {
+            this.targetEntityID = null;
+            if (controllerData.triggerClicks[this.hand] === 0) {
+                return makeRunningValues(false, [], []);
+            }
+
+            var targetProps = this.getTargetProps(controllerData);
+            if (targetProps) {
+                this.targetEntityID = targetProps.id;
+                this.startFarTrigger(controllerData);
+                return makeRunningValues(true, [this.targetEntityID], []);
+            } else {
+                return makeRunningValues(false, [], []);
+            }
+        };
+
+        this.run = function (controllerData) {
+            var targetEntity = controllerData.rayPicks[this.hand].objectID;
+            if (controllerData.triggerClicks[this.hand] === 0 || this.targetEntityID !== targetEntity) {
+                this.endFarTrigger(controllerData);
+                return makeRunningValues(false, [], []);
+            }
+
+            this.updateLaserPointer(controllerData);
+            this.continueFarTrigger(controllerData);
+            return makeRunningValues(true, [this.targetEntityID], []);
+        };
+
+        this.laserPointer = LaserPointers.createLaserPointer({
+            joint: (this.hand === RIGHT_HAND) ? "_CAMERA_RELATIVE_CONTROLLER_RIGHTHAND" : "_CAMERA_RELATIVE_CONTROLLER_LEFTHAND",
+            filter: RayPick.PICK_ENTITIES | RayPick.PICK_OVERLAYS,
+            maxDistance: PICK_MAX_DISTANCE,
+            posOffset: getGrabPointSphereOffset(this.handToController(), true),
+            renderStates: renderStates,
+            faceAvatar: true,
+            distanceScaleEnd: true,
+            scaleWithAvatar: true,
+            defaultRenderStates: defaultRenderStates
+        });
+
+        this.cleanup = function () {
+            if (this.targetEntityID) {
+                this.endFarTrigger();
+            }
+
+            LaserPointers.disableLaserPointer(this.laserPointer);
+            LaserPointers.removeLaserPointer(this.laserPointer);
+        };
+    }
+
+    var leftFarTriggerEntity = new FarTriggerEntity(LEFT_HAND);
+    var rightFarTriggerEntity = new FarTriggerEntity(RIGHT_HAND);
+
+    enableDispatcherModule("LeftFarTriggerEntity", leftFarTriggerEntity);
+    enableDispatcherModule("RightFarTriggerEntity", rightFarTriggerEntity);
+
+    this.cleanup = function () {
+        leftFarTriggerEntity.cleanup();
+        rightFarTriggerEntity.cleanup();
+        disableDispatcherModule("LeftFarTriggerEntity");
+        disableDispatcherModule("RightFarTriggerEntity");
+    };
+    Script.scriptEnding.connect(this.cleanup);
+}());
diff --git a/scripts/system/controllers/controllerModules/hudOverlayPointer.js b/scripts/system/controllers/controllerModules/hudOverlayPointer.js
new file mode 100644
index 0000000000..acddcaf246
--- /dev/null
+++ b/scripts/system/controllers/controllerModules/hudOverlayPointer.js
@@ -0,0 +1,234 @@
+//
+//  hudOverlayPointer.js
+//
+//  scripts/system/controllers/controllerModules/
+//
+//  Created by Dante Ruiz 2017-9-21
+//  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
+//
+
+/* global Script, Controller, LaserPointers, RayPick, RIGHT_HAND, LEFT_HAND, Mat4, MyAvatar, Vec3, Camera, Quat,
+   getGrabPointSphereOffset, getEnabledModuleByName, makeRunningValues, Entities,
+   enableDispatcherModule, disableDispatcherModule, entityIsDistanceGrabbable,
+   makeDispatcherModuleParameters, MSECS_PER_SEC, HAPTIC_PULSE_STRENGTH, HAPTIC_PULSE_DURATION,
+   PICK_MAX_DISTANCE, COLORS_GRAB_SEARCHING_HALF_SQUEEZE, COLORS_GRAB_SEARCHING_FULL_SQUEEZE, COLORS_GRAB_DISTANCE_HOLD,
+   DEFAULT_SEARCH_SPHERE_DISTANCE, TRIGGER_OFF_VALUE, TRIGGER_ON_VALUE, ZERO_VEC, ensureDynamic,
+   getControllerWorldLocation, projectOntoEntityXYPlane, ContextOverlay, HMD, Reticle, Overlays, isPointingAtUI
+
+*/
+(function() {
+    Script.include("/~/system/libraries/controllers.js");
+    var ControllerDispatcherUtils = Script.require("/~/system/libraries/controllerDispatcherUtils.js");
+    var END_RADIUS = 0.005;
+    var dim = { x: END_RADIUS, y: END_RADIUS, z: END_RADIUS };
+    var halfPath = {
+        type: "line3d",
+        color: COLORS_GRAB_SEARCHING_HALF_SQUEEZE,
+        visible: true,
+        alpha: 1,
+        solid: true,
+        glow: 1.0,
+        ignoreRayIntersection: true, // always ignore this
+        drawHUDLayer: true,
+        parentID: MyAvatar.SELF_ID
+    };
+    var halfEnd = {
+        type: "sphere",
+        dimensions: dim,
+        solid: true,
+        color: COLORS_GRAB_SEARCHING_HALF_SQUEEZE,
+        alpha: 0.9,
+        ignoreRayIntersection: true,
+        drawHUDLayer: true,
+        visible: true
+    };
+    var fullPath = {
+        type: "line3d",
+        color: COLORS_GRAB_SEARCHING_FULL_SQUEEZE,
+        visible: true,
+        alpha: 1,
+        solid: true,
+        glow: 1.0,
+        ignoreRayIntersection: true, // always ignore this
+        drawHUDLayer: true,
+        parentID: MyAvatar.SELF_ID
+    };
+    var fullEnd = {
+        type: "sphere",
+        dimensions: dim,
+        solid: true,
+        color: COLORS_GRAB_SEARCHING_FULL_SQUEEZE,
+        alpha: 0.9,
+        ignoreRayIntersection: true,
+        drawHUDLayer: true,
+        visible: true
+    };
+    var holdPath = {
+        type: "line3d",
+        color: COLORS_GRAB_DISTANCE_HOLD,
+        visible: true,
+        alpha: 1,
+        solid: true,
+        glow: 1.0,
+        ignoreRayIntersection: true, // always ignore this
+        drawHUDLayer: true,
+        parentID: MyAvatar.SELF_ID
+    };
+
+    var renderStates = [
+        {name: "half", path: halfPath, end: halfEnd},
+        {name: "full", path: fullPath, end: fullEnd},
+        {name: "hold", path: holdPath}
+    ];
+
+    var defaultRenderStates = [
+        {name: "half", distance: DEFAULT_SEARCH_SPHERE_DISTANCE, path: halfPath},
+        {name: "full", distance: DEFAULT_SEARCH_SPHERE_DISTANCE, path: fullPath},
+        {name: "hold", distance: DEFAULT_SEARCH_SPHERE_DISTANCE, path: holdPath}
+    ];
+
+    var MARGIN = 25;
+
+    function HudOverlayPointer(hand) {
+        var _this = this;
+        this.hand = hand;
+        this.reticleMinX = MARGIN;
+        this.reticleMaxX;
+        this.reticleMinY = MARGIN;
+        this.reticleMaxY;
+        this.clicked = false;
+        this.triggerClicked = 0;
+        this.movedAway = false;
+        this.parameters = ControllerDispatcherUtils.makeDispatcherModuleParameters(
+            540,
+            this.hand === RIGHT_HAND ? ["rightHand"] : ["leftHand"],
+            [],
+            100);
+
+        this.getOtherHandController = function() {
+            return (this.hand === RIGHT_HAND) ? Controller.Standard.LeftHand : Controller.Standard.RightHand;
+        };
+
+        _this.isClicked = function() {
+            return _this.triggerClicked;
+        };
+
+        this.handToController = function() {
+            return (this.hand === RIGHT_HAND) ? Controller.Standard.RightHand : Controller.Standard.LeftHand;
+        };
+
+        this.updateRecommendedArea = function() {
+            var dims = Controller.getViewportDimensions();
+            this.reticleMaxX = dims.x - MARGIN;
+            this.reticleMaxY = dims.y - MARGIN;
+        };
+
+        this.updateLaserPointer = function(controllerData) {
+            LaserPointers.enableLaserPointer(this.laserPointer);
+            LaserPointers.setRenderState(this.laserPointer, this.mode);
+        };
+
+        this.processControllerTriggers = function(controllerData) {
+            if (controllerData.triggerClicks[this.hand]) {
+                this.mode = "full";
+            } else if (controllerData.triggerValues[this.hand] > TRIGGER_ON_VALUE) {
+                this.clicked = false;
+                this.mode = "half";
+            } else {
+                this.mode = "none";
+            }
+        };
+
+        this.calculateNewReticlePosition = function(intersection) {
+            this.updateRecommendedArea();
+            var point2d = HMD.overlayFromWorldPoint(intersection);
+            point2d.x = Math.max(this.reticleMinX, Math.min(point2d.x, this.reticleMaxX));
+            point2d.y = Math.max(this.reticleMinY, Math.min(point2d.y, this.reticleMaxY));
+            return point2d;
+        };
+
+        this.setReticlePosition = function(point2d) {
+            Reticle.setPosition(point2d);
+        };
+
+        this.pointingAtTablet = function(controllerData) {
+            var rayPick = controllerData.rayPicks[this.hand];
+            return (rayPick.objectID === HMD.tabletScreenID || rayPick.objectID === HMD.homeButtonID);
+        };
+
+        this.processLaser = function(controllerData) {
+            var controllerLocation = controllerData.controllerLocations[this.hand];
+            if ((controllerData.triggerValues[this.hand] < ControllerDispatcherUtils.TRIGGER_ON_VALUE || !controllerLocation.valid) ||
+                this.pointingAtTablet(controllerData)) {
+                this.exitModule();
+                return false;
+            }
+            var hudRayPick = controllerData.hudRayPicks[this.hand];
+            var point2d = this.calculateNewReticlePosition(hudRayPick.intersection);
+            if (!Window.isPointOnDesktopWindow(point2d) && !this.triggerClicked) {
+                this.exitModule();
+                return false;
+            }
+            this.setReticlePosition(point2d);
+            Reticle.visible = false;
+            this.movedAway = false;
+            this.triggerClicked = controllerData.triggerClicks[this.hand];
+            this.processControllerTriggers(controllerData);
+            this.updateLaserPointer(controllerData);
+            return true;
+        };
+
+        this.exitModule = function() {
+            LaserPointers.disableLaserPointer(this.laserPointer);
+        };
+
+        this.isReady = function (controllerData) {
+            if (this.processLaser(controllerData)) {
+                return ControllerDispatcherUtils.makeRunningValues(true, [], []);
+            } else {
+                return ControllerDispatcherUtils.makeRunningValues(false, [], []);
+            }
+        };
+
+        this.run = function (controllerData, deltaTime) {
+            return this.isReady(controllerData);
+        };
+
+        this.cleanup = function () {
+            LaserPointers.disableLaserPointer(this.laserPointer);
+            LaserPointers.removeLaserPointer(this.laserPointer);
+        };
+
+        this.laserPointer = LaserPointers.createLaserPointer({
+            joint: (this.hand === RIGHT_HAND) ? "_CONTROLLER_RIGHTHAND" : "_CONTROLLER_LEFTHAND",
+            filter: RayPick.PICK_HUD,
+            maxDistance: PICK_MAX_DISTANCE,
+            posOffset: getGrabPointSphereOffset(this.handToController(), true),
+            renderStates: renderStates,
+            enabled: true,
+            defaultRenderStates: defaultRenderStates
+        });
+    }
+
+
+    var leftHudOverlayPointer = new HudOverlayPointer(LEFT_HAND);
+    var rightHudOverlayPointer = new HudOverlayPointer(RIGHT_HAND);
+
+    var clickMapping = Controller.newMapping('HudOverlayPointer-click');
+    clickMapping.from(rightHudOverlayPointer.isClicked).to(Controller.Actions.ReticleClick);
+    clickMapping.from(leftHudOverlayPointer.isClicked).to(Controller.Actions.ReticleClick);
+    clickMapping.enable();
+
+    ControllerDispatcherUtils.enableDispatcherModule("LeftHudOverlayPointer", leftHudOverlayPointer);
+    ControllerDispatcherUtils.enableDispatcherModule("RightHudOverlayPointer", rightHudOverlayPointer);
+
+    function cleanup() {
+        ControllerDispatcherUtils.disableDispatcherModule("LeftHudOverlayPointer");
+        ControllerDispatcherUtils.disableDispatcherModule("RightHudOverlayPointer");
+    }
+    Script.scriptEnding.connect(cleanup);
+
+})();
diff --git a/scripts/system/controllers/controllerModules/inEditMode.js b/scripts/system/controllers/controllerModules/inEditMode.js
new file mode 100644
index 0000000000..94233376c7
--- /dev/null
+++ b/scripts/system/controllers/controllerModules/inEditMode.js
@@ -0,0 +1,258 @@
+"use strict";
+
+//  inEditMode.js
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+
+/* jslint bitwise: true */
+
+/* global Script, Controller, RIGHT_HAND, LEFT_HAND, enableDispatcherModule, disableDispatcherModule, makeRunningValues,
+   Messages, makeDispatcherModuleParameters, HMD, getGrabPointSphereOffset, COLORS_GRAB_SEARCHING_HALF_SQUEEZE,
+   COLORS_GRAB_SEARCHING_FULL_SQUEEZE, COLORS_GRAB_DISTANCE_HOLD, DEFAULT_SEARCH_SPHERE_DISTANCE, TRIGGER_ON_VALUE,
+   getEnabledModuleByName, PICK_MAX_DISTANCE, isInEditMode, LaserPointers, RayPick
+*/
+
+Script.include("/~/system/libraries/controllerDispatcherUtils.js");
+Script.include("/~/system/libraries/controllers.js");
+Script.include("/~/system/libraries/utils.js");
+
+(function () {
+    var END_RADIUS = 0.005;
+    var dim = { x: END_RADIUS, y: END_RADIUS, z: END_RADIUS };
+    var halfPath = {
+        type: "line3d",
+        color: COLORS_GRAB_SEARCHING_HALF_SQUEEZE,
+        visible: true,
+        alpha: 1,
+        solid: true,
+        glow: 1.0,
+        ignoreRayIntersection: true, // always ignore this
+        drawInFront: true, // Even when burried inside of something, show it.
+        parentID: MyAvatar.SELF_ID
+    };
+    var halfEnd = {
+        type: "sphere",
+        dimensions: dim,
+        solid: true,
+        color: COLORS_GRAB_SEARCHING_HALF_SQUEEZE,
+        alpha: 0.9,
+        ignoreRayIntersection: true,
+        drawInFront: true, // Even when burried inside of something, show it.
+        visible: true
+    };
+    var fullPath = {
+        type: "line3d",
+        color: COLORS_GRAB_SEARCHING_FULL_SQUEEZE,
+        visible: true,
+        alpha: 1,
+        solid: true,
+        glow: 1.0,
+        ignoreRayIntersection: true, // always ignore this
+        drawInFront: true, // Even when burried inside of something, show it.
+        parentID: MyAvatar.SELF_ID
+    };
+    var fullEnd = {
+        type: "sphere",
+        dimensions: dim,
+        solid: true,
+        color: COLORS_GRAB_SEARCHING_FULL_SQUEEZE,
+        alpha: 0.9,
+        ignoreRayIntersection: true,
+        drawInFront: true, // Even when burried inside of something, show it.
+        visible: true
+    };
+    var holdPath = {
+        type: "line3d",
+        color: COLORS_GRAB_DISTANCE_HOLD,
+        visible: true,
+        alpha: 1,
+        solid: true,
+        glow: 1.0,
+        ignoreRayIntersection: true, // always ignore this
+        drawInFront: true, // Even when burried inside of something, show it.
+        parentID: MyAvatar.SELF_ID
+    };
+
+    var renderStates = [
+        {name: "half", path: halfPath, end: halfEnd},
+        {name: "full", path: fullPath, end: fullEnd},
+        {name: "hold", path: holdPath}
+    ];
+
+    var defaultRenderStates = [
+        {name: "half", distance: DEFAULT_SEARCH_SPHERE_DISTANCE, path: halfPath},
+        {name: "full", distance: DEFAULT_SEARCH_SPHERE_DISTANCE, path: fullPath},
+        {name: "hold", distance: DEFAULT_SEARCH_SPHERE_DISTANCE, path: holdPath}
+    ];
+
+    function InEditMode(hand) {
+        this.hand = hand;
+        this.triggerClicked = false;
+        this.mode = "none";
+
+        this.parameters = makeDispatcherModuleParameters(
+            160,
+            this.hand === RIGHT_HAND ? ["rightHand", "rightHandEquip", "rightHandTrigger"] : ["leftHand", "leftHandEquip", "leftHandTrigger"],
+            [],
+            100);
+
+        this.nearTablet = function(overlays) {
+            for (var i = 0; i < overlays.length; i++) {
+                if (overlays[i] === HMD.tabletID) {
+                    return true;
+                }
+            }
+            return false;
+        };
+
+        this.handToController = function() {
+            return (this.hand === RIGHT_HAND) ? Controller.Standard.RightHand : Controller.Standard.LeftHand;
+        };
+
+
+        this.processControllerTriggers = function(controllerData) {
+            if (controllerData.triggerClicks[this.hand]) {
+                this.mode = "full";
+            } else if (controllerData.triggerValues[this.hand] > TRIGGER_ON_VALUE) {
+                this.mode = "half";
+            } else {
+                this.mode = "none";
+            }
+        };
+
+        this.updateLaserPointer = function(controllerData) {
+            LaserPointers.enableLaserPointer(this.laserPointer);
+            LaserPointers.setRenderState(this.laserPointer, this.mode);
+
+            if (HMD.tabletID !== this.tabletID || HMD.tabletButtonID !== this.tabletButtonID || HMD.tabletScreenID !== this.tabletScreenID) {
+                this.tabletID = HMD.tabletID;
+                this.tabletButtonID = HMD.tabletButtonID;
+                this.tabletScreenID = HMD.tabletScreenID;
+                LaserPointers.setIgnoreItems(this.laserPointer, [HMD.tabletID, HMD.tabletButtonID, HMD.tabletScreenID]);
+            }
+        };
+
+        this.pointingAtTablet = function(objectID) {
+            if (objectID === HMD.tabletScreenID || objectID === HMD.tabletButtonID) {
+                return true;
+            }
+            return false;
+        };
+
+        this.sendPickData = function(controllerData) {
+            if (controllerData.triggerClicks[this.hand] && !this.triggerClicked) {
+                var intersection = controllerData.rayPicks[this.hand];
+                if (intersection.type === RayPick.INTERSECTED_ENTITY) {
+                    Messages.sendLocalMessage("entityToolUpdates", JSON.stringify({
+                        method: "selectEntity",
+                        entityID: intersection.objectID
+                    }));
+                } else if (intersection.type === RayPick.INTERSECTED_OVERLAY) {
+                    Messages.sendLocalMessage("entityToolUpdates", JSON.stringify({
+                        method: "selectOverlay",
+                        overlayID: intersection.objectID
+                    }));
+                }
+
+                this.triggerClicked = true;
+            } else {
+                this.triggerClicked = false;
+            }
+        };
+
+        this.exitModule = function() {
+            this.disableLasers();
+            return makeRunningValues(false, [], []);
+        };
+
+        this.disableLasers = function() {
+            LaserPointers.disableLaserPointer(this.laserPointer);
+        };
+
+        this.isReady = function(controllerData) {
+            if (isInEditMode()) {
+                this.triggerClicked = false;
+                return makeRunningValues(true, [], []);
+            }
+            return this.exitModule();
+        };
+
+        this.run = function(controllerData) {
+            var tabletStylusInput = getEnabledModuleByName(this.hand === RIGHT_HAND ? "RightTabletStylusInput" : "LeftTabletStylusInput");
+            if (tabletStylusInput) {
+                var tabletReady = tabletStylusInput.isReady(controllerData);
+
+                if (tabletReady.active) {
+                    return this.exitModule();
+                }
+            }
+
+            var overlayLaser = getEnabledModuleByName(this.hand === RIGHT_HAND ? "RightOverlayLaserInput" : "LeftOverlayLaserInput");
+            if (overlayLaser) {
+                var overlayLaserReady = overlayLaser.isReady(controllerData);
+
+                if (overlayLaserReady.active && this.pointingAtTablet(overlayLaser.target)) {
+                    return this.exitModule();
+                }
+            }
+
+            var nearOverlay = getEnabledModuleByName(this.hand === RIGHT_HAND ? "RightNearParentingGrabOverlay" : "LeftNearParentingGrabOverlay");
+            if (nearOverlay) {
+                var nearOverlayReady = nearOverlay.isReady(controllerData);
+
+                if (nearOverlayReady.active && nearOverlay.grabbedThingID === HMD.tabletID) {
+                    return this.exitModule();
+                }
+            }
+
+            var teleport = getEnabledModuleByName(this.hand === RIGHT_HAND ? "RightTeleporter" : "LeftTeleporter");
+            if (teleport) {
+                var teleportReady = teleport.isReady(controllerData);
+                if (teleportReady.active) {
+                    return this.exitModule();
+                }
+            }
+
+            this.processControllerTriggers(controllerData);
+            this.updateLaserPointer(controllerData);
+            this.sendPickData(controllerData);
+
+
+            return this.isReady(controllerData);
+        };
+
+        this.cleanup = function() {
+            LaserPointers.disableLaserPointer(this.laserPointer);
+            LaserPointers.removeLaserPointer(this.laserPointer);
+        };
+
+        this.laserPointer = LaserPointers.createLaserPointer({
+            joint: (this.hand === RIGHT_HAND) ? "_CONTROLLER_RIGHTHAND" : "_CONTROLLER_LEFTHAND",
+            filter: RayPick.PICK_ENTITIES | RayPick.PICK_OVERLAYS,
+            maxDistance: PICK_MAX_DISTANCE,
+            posOffset: getGrabPointSphereOffset(this.handToController(), true),
+            renderStates: renderStates,
+            faceAvatar: true,
+            scaleWithAvatar: true,
+            defaultRenderStates: defaultRenderStates
+        });
+
+        LaserPointers.setIgnoreItems(this.laserPointer, [HMD.tabletID, HMD.tabletButtonID, HMD.tabletScreenID]);
+    }
+
+    var leftHandInEditMode = new InEditMode(LEFT_HAND);
+    var rightHandInEditMode = new InEditMode(RIGHT_HAND);
+
+    enableDispatcherModule("LeftHandInEditMode", leftHandInEditMode);
+    enableDispatcherModule("RightHandInEditMode", rightHandInEditMode);
+
+    this.cleanup = function() {
+        leftHandInEditMode.cleanup();
+        rightHandInEditMode.cleanup();
+        disableDispatcherModule("LeftHandInEditMode");
+        disableDispatcherModule("RightHandInEditMode");
+    };
+
+    Script.scriptEnding.connect(this.cleanup);
+}());
diff --git a/scripts/system/controllers/controllerModules/inVREditMode.js b/scripts/system/controllers/controllerModules/inVREditMode.js
new file mode 100644
index 0000000000..e3035b26f2
--- /dev/null
+++ b/scripts/system/controllers/controllerModules/inVREditMode.js
@@ -0,0 +1,108 @@
+"use strict";
+
+//  inVREditMode.js
+//
+//  Created by David Rowe on 16 Sep 2017.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+
+/* global Script, MyAvatar, RIGHT_HAND, LEFT_HAND, enableDispatcherModule, disableDispatcherModule,
+   makeDispatcherModuleParameters, makeRunningValues, getEnabledModuleByName
+*/
+
+Script.include("/~/system/libraries/controllerDispatcherUtils.js");
+
+(function () {
+
+    function InVREditMode(hand) {
+        this.hand = hand;
+        this.disableModules = false;
+        this.parameters = makeDispatcherModuleParameters(
+            200, // Not too high otherwise the tablet laser doesn't work.
+            this.hand === RIGHT_HAND
+                ? ["rightHand", "rightHandEquip", "rightHandTrigger"]
+                : ["leftHand", "leftHandEquip", "leftHandTrigger"],
+            [],
+            100
+        );
+
+        this.isReady = function (controllerData) {
+            if (this.disableModules) {
+                return makeRunningValues(true, [], []);
+            }
+            return makeRunningValues(false, [], []);
+        };
+
+        this.run = function (controllerData) {
+            // Default behavior if disabling is not enabled.
+            if (!this.disableModules) {
+                return makeRunningValues(false, [], []);
+            }
+
+            // Tablet stylus.
+            // Includes the tablet laser.
+            var tabletStylusInput = getEnabledModuleByName(this.hand === RIGHT_HAND
+                ? "RightTabletStylusInput"
+                : "LeftTabletStylusInput");
+            if (tabletStylusInput) {
+                var tabletReady = tabletStylusInput.isReady(controllerData);
+                if (tabletReady.active) {
+                    return makeRunningValues(false, [], []);
+                }
+            }
+
+            // Tablet grabbing.
+            var nearOverlay = getEnabledModuleByName(this.hand === RIGHT_HAND
+                ? "RightNearParentingGrabOverlay"
+                : "LeftNearParentingGrabOverlay");
+            if (nearOverlay) {
+                var nearOverlayReady = nearOverlay.isReady(controllerData);
+                if (nearOverlayReady.active && nearOverlay.grabbedThingID === HMD.tabletID) {
+                    return makeRunningValues(false, [], []);
+                }
+            }
+
+            // Teleport.
+            var teleporter = getEnabledModuleByName(this.hand === RIGHT_HAND
+                ? "RightTeleporter"
+                : "LeftTeleporter");
+            if (teleporter) {
+                var teleporterReady = teleporter.isReady(controllerData);
+                if (teleporterReady.active) {
+                    return makeRunningValues(false, [], []);
+                }
+            }
+
+            // Other behaviors are disabled.
+            return makeRunningValues(true, [], []);
+        };
+    }
+
+    var leftHandInVREditMode = new InVREditMode(LEFT_HAND);
+    var rightHandInVREditMode = new InVREditMode(RIGHT_HAND);
+    enableDispatcherModule("LeftHandInVREditMode", leftHandInVREditMode);
+    enableDispatcherModule("RightHandInVREditMode", rightHandInVREditMode);
+
+    var INVREDIT_DISABLER_MESSAGE_CHANNEL = "Hifi-InVREdit-Disabler";
+    this.handleMessage = function (channel, message, sender) {
+        if (sender === MyAvatar.sessionUUID && channel === INVREDIT_DISABLER_MESSAGE_CHANNEL) {
+            if (message === "both") {
+                leftHandInVREditMode.disableModules = true;
+                rightHandInVREditMode.disableModules = true;
+            } else if (message === "none") {
+                leftHandInVREditMode.disableModules = false;
+                rightHandInVREditMode.disableModules = false;
+            }
+        }
+    };
+    Messages.subscribe(INVREDIT_DISABLER_MESSAGE_CHANNEL);
+    Messages.messageReceived.connect(this.handleMessage);
+
+    this.cleanup = function () {
+        disableDispatcherModule("LeftHandInVREditMode");
+        disableDispatcherModule("RightHandInVREditMode");
+    };
+    Script.scriptEnding.connect(this.cleanup);
+}());
diff --git a/scripts/system/controllers/controllerModules/mouseHMD.js b/scripts/system/controllers/controllerModules/mouseHMD.js
new file mode 100644
index 0000000000..1d8aeee1f9
--- /dev/null
+++ b/scripts/system/controllers/controllerModules/mouseHMD.js
@@ -0,0 +1,143 @@
+//
+//  mouseHMD.js
+//
+//  scripts/system/controllers/controllerModules/
+//
+//  Created by Dante Ruiz 2017-9-22
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+(function() {
+    var ControllerDispatcherUtils = Script.require("/~/system/libraries/controllerDispatcherUtils.js");
+
+    function TimeLock(experation) {
+        this.experation = experation;
+        this.last = 0;
+        this.update = function(time) {
+            this.last = time || Date.now();
+        };
+
+        this.expired = function(time) {
+            return ((time || Date.now()) - this.last) > this.experation;
+        };
+    }
+
+    function MouseHMD() {
+        var _this = this;
+        this.mouseMoved = false;
+        this.mouseActivity = new TimeLock(5000);
+        this.handControllerActivity = new TimeLock(4000);
+        this.parameters = ControllerDispatcherUtils.makeDispatcherModuleParameters(
+            10,
+            ["mouse"],
+            [],
+            100);
+
+        this.onMouseMove = function() {
+            _this.updateMouseActivity();
+        };
+
+        this.onMouseClick = function() {
+            _this.updateMouseActivity();
+        };
+
+        this.updateMouseActivity = function(isClick) {
+            if (_this.ignoreMouseActivity()) {
+                return;
+            }
+
+            if (HMD.active) {
+                var now = Date.now();
+                _this.mouseActivity.update(now);
+            }
+        };
+
+        this.adjustReticleDepth = function(controllerData) {
+            if (Reticle.isPointingAtSystemOverlay(Reticle.position)) {
+                var reticlePositionOnHUD = HMD.worldPointFromOverlay(Reticle.position);
+                Reticle.depth = Vec3.distance(reticlePositionOnHUD, HMD.position);
+            } else {
+                var APPARENT_MAXIMUM_DEPTH = 100.0;
+                var result = controllerData.mouseRayPick;
+                Reticle.depth = result.intersects ? result.distance : APPARENT_MAXIMUM_DEPTH;
+            }
+        };
+
+        this.ignoreMouseActivity = function() {
+            if (!Reticle.allowMouseCapture) {
+                return true;
+            }
+
+            var pos = Reticle.position;
+            if (!pos || (pos.x === -1 && pos.y === -1)) {
+                return true;
+            }
+
+            if (!_this.handControllerActivity.expired()) {
+                return true;
+            }
+
+            return false;
+        };
+
+        this.triggersPressed = function(controllerData, now) {
+            var onValue = ControllerDispatcherUtils.TRIGGER_ON_VALUE;
+            var rightHand = ControllerDispatcherUtils.RIGHT_HAND;
+            var leftHand = ControllerDispatcherUtils.LEFT_HAND;
+            var leftTriggerValue = controllerData.triggerValues[leftHand];
+            var rightTriggerValue = controllerData.triggerValues[rightHand];
+
+            if (leftTriggerValue > onValue || rightTriggerValue > onValue) {
+                this.handControllerActivity.update(now);
+                return true;
+            }
+
+            return false;
+        };
+
+        this.isReady = function(controllerData, deltaTime) {
+            var now = Date.now();
+            this.triggersPressed(controllerData, now);
+            if ((HMD.active && !this.mouseActivity.expired(now)) && _this.handControllerActivity.expired()) {
+                Reticle.visible = true;
+                return ControllerDispatcherUtils.makeRunningValues(true, [], []);
+            }
+            if (HMD.active) {
+                Reticle.visible = false;
+            }
+
+            return ControllerDispatcherUtils.makeRunningValues(false, [], []);
+        };
+
+        this.run = function(controllerData, deltaTime) {
+            var now = Date.now();
+            var hmdActive = HMD.active;
+            if (this.mouseActivity.expired(now) || this.triggersPressed(controllerData, now) || !hmdActive) {
+                if (!hmdActive) {
+                    Reticle.visible = true;
+                } else { 
+                    Reticle.visible = false;
+                }
+
+                return ControllerDispatcherUtils.makeRunningValues(false, [], []);
+            }
+            this.adjustReticleDepth(controllerData);
+            return ControllerDispatcherUtils.makeRunningValues(true, [], []);
+        };
+    }
+
+    var mouseHMD = new MouseHMD();
+    ControllerDispatcherUtils.enableDispatcherModule("MouseHMD", mouseHMD);
+
+    Controller.mouseMoveEvent.connect(mouseHMD.onMouseMove);
+    Controller.mousePressEvent.connect(mouseHMD.onMouseClick);
+
+    function cleanup() {
+        ControllerDispatcherUtils.disableDispatcherModule("MouseHMD");
+    }
+
+    Script.scriptEnding.connect(cleanup);
+})();
diff --git a/scripts/system/controllers/controllerModules/nearActionGrabEntity.js b/scripts/system/controllers/controllerModules/nearActionGrabEntity.js
new file mode 100644
index 0000000000..6b2a986f0f
--- /dev/null
+++ b/scripts/system/controllers/controllerModules/nearActionGrabEntity.js
@@ -0,0 +1,266 @@
+"use strict";
+
+//  nearActionGrabEntity.js
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+
+/* global Script, Entities, MyAvatar, Controller, RIGHT_HAND, LEFT_HAND,
+   getControllerJointIndex, getGrabbableData, enableDispatcherModule, disableDispatcherModule,
+   propsArePhysical, Messages, HAPTIC_PULSE_STRENGTH, HAPTIC_PULSE_DURATION, entityIsGrabbable,
+   Quat, Vec3, MSECS_PER_SEC, getControllerWorldLocation, makeDispatcherModuleParameters, makeRunningValues,
+   TRIGGER_OFF_VALUE, NEAR_GRAB_RADIUS, findGroupParent, entityIsCloneable, propsAreCloneDynamic, cloneEntity,
+   HAPTIC_PULSE_STRENGTH, HAPTIC_PULSE_DURATION, BUMPER_ON_VALUE
+*/
+
+Script.include("/~/system/libraries/controllerDispatcherUtils.js");
+Script.include("/~/system/libraries/controllers.js");
+Script.include("/~/system/libraries/cloneEntityUtils.js");
+
+(function() {
+
+    function NearActionGrabEntity(hand) {
+        this.hand = hand;
+        this.targetEntityID = null;
+        this.actionID = null; // action this script created...
+        this.hapticTargetID = null;
+
+        this.parameters = makeDispatcherModuleParameters(
+            500,
+            this.hand === RIGHT_HAND ? ["rightHand"] : ["leftHand"],
+            [],
+            100);
+
+        var NEAR_GRABBING_ACTION_TIMEFRAME = 0.05; // how quickly objects move to their new position
+        var ACTION_TTL = 15; // seconds
+        var ACTION_TTL_REFRESH = 5;
+
+        // XXX does handJointIndex change if the avatar changes?
+        this.handJointIndex = MyAvatar.getJointIndex(this.hand === RIGHT_HAND ? "RightHand" : "LeftHand");
+        this.controllerJointIndex = getControllerJointIndex(this.hand);
+
+
+        // handPosition is where the avatar's hand appears to be, in-world.
+        this.getHandPosition = function () {
+            if (this.hand === RIGHT_HAND) {
+                return MyAvatar.getRightPalmPosition();
+            } else {
+                return MyAvatar.getLeftPalmPosition();
+            }
+        };
+
+        this.getHandRotation = function () {
+            if (this.hand === RIGHT_HAND) {
+                return MyAvatar.getRightPalmRotation();
+            } else {
+                return MyAvatar.getLeftPalmRotation();
+            }
+        };
+
+
+        this.startNearGrabAction = function (controllerData, targetProps) {
+            Controller.triggerHapticPulse(HAPTIC_PULSE_STRENGTH, HAPTIC_PULSE_DURATION, this.hand);
+
+            var grabbableData = getGrabbableData(targetProps);
+            this.ignoreIK = grabbableData.ignoreIK;
+            this.kinematicGrab = grabbableData.kinematic;
+
+            var handRotation;
+            var handPosition;
+            if (this.ignoreIK) {
+                var controllerID =
+                    (this.hand === RIGHT_HAND) ? Controller.Standard.RightHand : Controller.Standard.LeftHand;
+                var controllerLocation = getControllerWorldLocation(controllerID, false);
+                handRotation = controllerLocation.orientation;
+                handPosition = controllerLocation.position;
+            } else {
+                handRotation = this.getHandRotation();
+                handPosition = this.getHandPosition();
+            }
+
+            var objectRotation = targetProps.rotation;
+            this.offsetRotation = Quat.multiply(Quat.inverse(handRotation), objectRotation);
+
+            var currentObjectPosition = targetProps.position;
+            var offset = Vec3.subtract(currentObjectPosition, handPosition);
+            this.offsetPosition = Vec3.multiplyQbyV(Quat.inverse(Quat.multiply(handRotation, this.offsetRotation)), offset);
+
+            var now = Date.now();
+            this.actionTimeout = now + (ACTION_TTL * MSECS_PER_SEC);
+
+            if (this.actionID) {
+                Entities.deleteAction(this.targetEntityID, this.actionID);
+            }
+            this.actionID = Entities.addAction("hold", this.targetEntityID, {
+                hand: this.hand === RIGHT_HAND ? "right" : "left",
+                timeScale: NEAR_GRABBING_ACTION_TIMEFRAME,
+                relativePosition: this.offsetPosition,
+                relativeRotation: this.offsetRotation,
+                ttl: ACTION_TTL,
+                kinematic: this.kinematicGrab,
+                kinematicSetVelocity: true,
+                ignoreIK: this.ignoreIK
+            });
+            if (this.actionID === Uuid.NULL) {
+                this.actionID = null;
+                return;
+            }
+
+            Messages.sendMessage('Hifi-Object-Manipulation', JSON.stringify({
+                action: 'grab',
+                grabbedEntity: this.targetEntityID,
+                joint: this.hand === RIGHT_HAND ? "RightHand" : "LeftHand"
+            }));
+
+            var args = [this.hand === RIGHT_HAND ? "right" : "left", MyAvatar.sessionUUID];
+            Entities.callEntityMethod(this.targetEntityID, "startNearGrab", args);
+        };
+
+        // this is for when the action is going to time-out
+        this.refreshNearGrabAction = function (controllerData) {
+            var now = Date.now();
+            if (this.actionID && this.actionTimeout - now < ACTION_TTL_REFRESH * MSECS_PER_SEC) {
+                // if less than a 5 seconds left, refresh the actions ttl
+                var success = Entities.updateAction(this.targetEntityID, this.actionID, {
+                    hand: this.hand === RIGHT_HAND ? "right" : "left",
+                    timeScale: NEAR_GRABBING_ACTION_TIMEFRAME,
+                    relativePosition: this.offsetPosition,
+                    relativeRotation: this.offsetRotation,
+                    ttl: ACTION_TTL,
+                    kinematic: this.kinematicGrab,
+                    kinematicSetVelocity: true,
+                    ignoreIK: this.ignoreIK
+                });
+                if (success) {
+                    this.actionTimeout = now + (ACTION_TTL * MSECS_PER_SEC);
+                }
+            }
+        };
+
+        this.endNearGrabAction = function () {
+            var args = [this.hand === RIGHT_HAND ? "right" : "left", MyAvatar.sessionUUID];
+            Entities.callEntityMethod(this.targetEntityID, "releaseGrab", args);
+
+            Entities.deleteAction(this.targetEntityID, this.actionID);
+            this.actionID = null;
+
+            Messages.sendMessage('Hifi-Object-Manipulation', JSON.stringify({
+                action: 'release',
+                grabbedEntity: this.targetEntityID,
+                joint: this.hand === RIGHT_HAND ? "RightHand" : "LeftHand"
+            }));
+
+            this.targetEntityID = null;
+        };
+
+        this.getTargetProps = function (controllerData) {
+            // nearbyEntityProperties is already sorted by distance from controller
+            var nearbyEntityProperties = controllerData.nearbyEntityProperties[this.hand];
+            var sensorScaleFactor = MyAvatar.sensorToWorldScale;
+            for (var i = 0; i < nearbyEntityProperties.length; i++) {
+                var props = nearbyEntityProperties[i];
+                if (props.distance > NEAR_GRAB_RADIUS * sensorScaleFactor) {
+                    break;
+                }
+                if (entityIsGrabbable(props) || entityIsCloneable(props)) {
+                    if (props.id !== this.hapticTargetID) {
+                        Controller.triggerHapticPulse(HAPTIC_PULSE_STRENGTH, HAPTIC_PULSE_DURATION, this.hand);
+                        this.hapticTargetID = props.id;
+                    }
+                    // if we've attempted to grab a child, roll up to the root of the tree
+                    var groupRootProps = findGroupParent(controllerData, props);
+                    if (entityIsGrabbable(groupRootProps)) {
+                        return groupRootProps;
+                    }
+                    return props;
+                }
+            }
+            return null;
+        };
+
+        this.isReady = function (controllerData) {
+            this.targetEntityID = null;
+
+            var targetProps = this.getTargetProps(controllerData);
+            if (controllerData.triggerValues[this.hand] < TRIGGER_OFF_VALUE &&
+                controllerData.secondaryValues[this.hand] < TRIGGER_OFF_VALUE) {
+                return makeRunningValues(false, [], []);
+            }
+
+            if (targetProps) {
+                if ((!propsArePhysical(targetProps) && !propsAreCloneDynamic(targetProps)) ||
+                    targetProps.parentID !== Uuid.NULL) {
+                    return makeRunningValues(false, [], []); // let nearParentGrabEntity handle it
+                } else {
+                    this.targetEntityID = targetProps.id;
+                    return makeRunningValues(true, [this.targetEntityID], []);
+                }
+            } else {
+                this.hapticTargetID = null;
+                return makeRunningValues(false, [], []);
+            }
+        };
+
+        this.run = function (controllerData) {
+            if (this.actionID) {
+                if (controllerData.triggerClicks[this.hand] < TRIGGER_OFF_VALUE &&
+                    controllerData.secondaryValues[this.hand] < TRIGGER_OFF_VALUE) {
+                    this.endNearGrabAction();
+                    this.hapticTargetID = null;
+                    return makeRunningValues(false, [], []);
+                }
+
+                this.refreshNearGrabAction(controllerData);
+                var args = [this.hand === RIGHT_HAND ? "right" : "left", MyAvatar.sessionUUID];
+                Entities.callEntityMethod(this.targetEntityID, "continueNearGrab", args);
+            } else {
+
+                // still searching / highlighting
+                var readiness = this.isReady (controllerData);
+                if (!readiness.active) {
+                    return readiness;
+                }
+
+                var targetProps = this.getTargetProps(controllerData);
+                if (targetProps) {
+                    if (controllerData.triggerClicks[this.hand] ||
+                        controllerData.secondaryValues[this.hand] > BUMPER_ON_VALUE) {
+                        // switch to grabbing
+                        var targetCloneable = entityIsCloneable(targetProps);
+                        if (targetCloneable) {
+                            var worldEntityProps = controllerData.nearbyEntityProperties[this.hand];
+                            var cloneID = cloneEntity(targetProps, worldEntityProps);
+                            var cloneProps = Entities.getEntityProperties(cloneID);
+                            this.targetEntityID = cloneID;
+                            this.startNearGrabAction(controllerData, cloneProps);
+                        } else {
+                            this.startNearGrabAction(controllerData, targetProps);
+                        }
+                    }
+                }
+            }
+
+            return makeRunningValues(true, [this.targetEntityID], []);
+        };
+
+        this.cleanup = function () {
+            if (this.targetEntityID) {
+                this.endNearGrabAction();
+            }
+        };
+    }
+
+    var leftNearActionGrabEntity = new NearActionGrabEntity(LEFT_HAND);
+    var rightNearActionGrabEntity = new NearActionGrabEntity(RIGHT_HAND);
+
+    enableDispatcherModule("LeftNearActionGrabEntity", leftNearActionGrabEntity);
+    enableDispatcherModule("RightNearActionGrabEntity", rightNearActionGrabEntity);
+
+    this.cleanup = function () {
+        leftNearActionGrabEntity.cleanup();
+        rightNearActionGrabEntity.cleanup();
+        disableDispatcherModule("LeftNearActionGrabEntity");
+        disableDispatcherModule("RightNearActionGrabEntity");
+    };
+    Script.scriptEnding.connect(this.cleanup);
+}());
diff --git a/scripts/system/controllers/controllerModules/nearParentGrabEntity.js b/scripts/system/controllers/controllerModules/nearParentGrabEntity.js
new file mode 100644
index 0000000000..178d459b1d
--- /dev/null
+++ b/scripts/system/controllers/controllerModules/nearParentGrabEntity.js
@@ -0,0 +1,348 @@
+"use strict";
+
+//  nearParentGrabEntity.js
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+
+
+/* global Script, Entities, MyAvatar, Controller, RIGHT_HAND, LEFT_HAND, getControllerJointIndex,
+   enableDispatcherModule, disableDispatcherModule, propsArePhysical, Messages, HAPTIC_PULSE_STRENGTH, HAPTIC_PULSE_DURATION,
+   TRIGGER_OFF_VALUE, makeDispatcherModuleParameters, entityIsGrabbable, makeRunningValues, NEAR_GRAB_RADIUS,
+   findGroupParent, Vec3, cloneEntity, entityIsCloneable, propsAreCloneDynamic, HAPTIC_PULSE_STRENGTH,
+   HAPTIC_PULSE_DURATION, BUMPER_ON_VALUE, findHandChildEntities, TEAR_AWAY_DISTANCE, MSECS_PER_SEC, TEAR_AWAY_CHECK_TIME,
+   TEAR_AWAY_COUNT, distanceBetweenPointAndEntityBoundingBox
+*/
+
+Script.include("/~/system/libraries/controllerDispatcherUtils.js");
+Script.include("/~/system/libraries/cloneEntityUtils.js");
+
+(function() {
+
+    // XXX this.ignoreIK = (grabbableData.ignoreIK !== undefined) ? grabbableData.ignoreIK : true;
+    // XXX this.kinematicGrab = (grabbableData.kinematic !== undefined) ? grabbableData.kinematic : NEAR_GRABBING_KINEMATIC;
+
+    function NearParentingGrabEntity(hand) {
+        this.hand = hand;
+        this.targetEntityID = null;
+        this.grabbing = false;
+        this.previousParentID = {};
+        this.previousParentJointIndex = {};
+        this.previouslyUnhooked = {};
+        this.hapticTargetID = null;
+        this.lastUnequipCheckTime = 0;
+        this.autoUnequipCounter = 0;
+        this.lastUnexpectedChildrenCheckTime = 0;
+
+        this.parameters = makeDispatcherModuleParameters(
+            500,
+            this.hand === RIGHT_HAND ? ["rightHand"] : ["leftHand"],
+            [],
+            100);
+
+
+        // XXX does handJointIndex change if the avatar changes?
+        this.handJointIndex = MyAvatar.getJointIndex(this.hand === RIGHT_HAND ? "RightHand" : "LeftHand");
+        this.controllerJointIndex = getControllerJointIndex(this.hand);
+
+        this.thisHandIsParent = function(props) {
+            if (!props) {
+                return false;
+            }
+
+            if (props.parentID !== MyAvatar.sessionUUID && props.parentID !== MyAvatar.SELF_ID) {
+                return false;
+            }
+
+            var handJointIndex = MyAvatar.getJointIndex(this.hand === RIGHT_HAND ? "RightHand" : "LeftHand");
+            if (props.parentJointIndex === handJointIndex) {
+                return true;
+            }
+
+            var controllerJointIndex = this.controllerJointIndex;
+            if (props.parentJointIndex === controllerJointIndex) {
+                return true;
+            }
+
+            var controllerCRJointIndex = MyAvatar.getJointIndex(this.hand === RIGHT_HAND ?
+                "_CAMERA_RELATIVE_CONTROLLER_RIGHTHAND" :
+                "_CAMERA_RELATIVE_CONTROLLER_LEFTHAND");
+
+            if (props.parentJointIndex === controllerCRJointIndex) {
+                return true;
+            }
+
+            return false;
+        };
+
+        this.startNearParentingGrabEntity = function (controllerData, targetProps) {
+            Controller.triggerHapticPulse(HAPTIC_PULSE_STRENGTH, HAPTIC_PULSE_DURATION, this.hand);
+
+            var handJointIndex;
+            // if (this.ignoreIK) {
+            //     handJointIndex = this.controllerJointIndex;
+            // } else {
+            //     handJointIndex = MyAvatar.getJointIndex(this.hand === RIGHT_HAND ? "RightHand" : "LeftHand");
+            // }
+            handJointIndex = this.controllerJointIndex;
+
+            var args = [this.hand === RIGHT_HAND ? "right" : "left", MyAvatar.sessionUUID];
+            Entities.callEntityMethod(targetProps.id, "startNearGrab", args);
+
+            var reparentProps = {
+                parentID: MyAvatar.SELF_ID,
+                parentJointIndex: handJointIndex,
+                localVelocity: {x: 0, y: 0, z: 0},
+                localAngularVelocity: {x: 0, y: 0, z: 0}
+            };
+
+            if (this.thisHandIsParent(targetProps)) {
+                // this should never happen, but if it does, don't set previous parent to be this hand.
+                this.previousParentID[targetProps.id] = null;
+                this.previousParentJointIndex[targetProps.id] = -1;
+            } else {
+                this.previousParentID[targetProps.id] = targetProps.parentID;
+                this.previousParentJointIndex[targetProps.id] = targetProps.parentJointIndex;
+            }
+
+            this.targetEntityID = targetProps.id;
+            Entities.editEntity(targetProps.id, reparentProps);
+
+            Messages.sendMessage('Hifi-Object-Manipulation', JSON.stringify({
+                action: 'grab',
+                grabbedEntity: targetProps.id,
+                joint: this.hand === RIGHT_HAND ? "RightHand" : "LeftHand"
+            }));
+            this.grabbing = true;
+        };
+
+        this.endNearParentingGrabEntity = function (controllerData) {
+            this.hapticTargetID = null;
+            var props = controllerData.nearbyEntityPropertiesByID[this.targetEntityID];
+            if (this.thisHandIsParent(props)) {
+                if (this.previousParentID[this.targetEntityID] === Uuid.NULL || this.previousParentID === undefined) {
+                    Entities.editEntity(this.targetEntityID, {
+                        parentID: this.previousParentID[this.targetEntityID],
+                        parentJointIndex: this.previousParentJointIndex[this.targetEntityID]
+                    });
+                } else {
+                    // we're putting this back as a child of some other parent, so zero its velocity
+                    Entities.editEntity(this.targetEntityID, {
+                        parentID: this.previousParentID[this.targetEntityID],
+                        parentJointIndex: this.previousParentJointIndex[this.targetEntityID],
+                        localVelocity: {x: 0, y: 0, z: 0},
+                        localAngularVelocity: {x: 0, y: 0, z: 0}
+                    });
+                }
+            }
+
+            var args = [this.hand === RIGHT_HAND ? "right" : "left", MyAvatar.sessionUUID];
+            Entities.callEntityMethod(this.targetEntityID, "releaseGrab", args);
+            Messages.sendMessage('Hifi-Object-Manipulation', JSON.stringify({
+                action: 'release',
+                grabbedEntity: this.targetEntityID,
+                joint: this.hand === RIGHT_HAND ? "RightHand" : "LeftHand"
+            }));
+            this.grabbing = false;
+            this.targetEntityID = null;
+        };
+
+        this.checkForChildTooFarAway = function (controllerData) {
+            var props = controllerData.nearbyEntityPropertiesByID[this.targetEntityID];
+            var now = Date.now();
+            if (now - this.lastUnequipCheckTime > MSECS_PER_SEC * TEAR_AWAY_CHECK_TIME) {
+                this.lastUnequipCheckTime = now;
+                if (props.parentID === MyAvatar.SELF_ID) {
+                    var sensorScaleFactor = MyAvatar.sensorToWorldScale;
+                    var handPosition = controllerData.controllerLocations[this.hand].position;
+                    var dist = distanceBetweenPointAndEntityBoundingBox(handPosition, props);
+                    var distance = Vec3.distance(props.position, handPosition);
+                    if ((dist > TEAR_AWAY_DISTANCE) ||
+                        (distance > NEAR_GRAB_RADIUS * sensorScaleFactor)) {
+                        this.autoUnequipCounter++;
+                    } else {
+                        this.autoUnequipCounter = 0;
+                    }
+                    if (this.autoUnequipCounter >= TEAR_AWAY_COUNT) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        };
+
+
+        this.checkForUnexpectedChildren = function (controllerData) {
+            // sometimes things can get parented to a hand and this script is unaware.  Search for such entities and
+            // unhook them.
+
+            var now = Date.now();
+            var UNEXPECTED_CHILDREN_CHECK_TIME = 0.1; // seconds
+            if (now - this.lastUnexpectedChildrenCheckTime > MSECS_PER_SEC * UNEXPECTED_CHILDREN_CHECK_TIME) {
+                this.lastUnexpectedChildrenCheckTime = now;
+
+                var children = findHandChildEntities(this.hand);
+                var _this = this;
+
+                children.forEach(function(childID) {
+                    // we appear to be holding something and this script isn't in a state that would be holding something.
+                    // unhook it.  if we previously took note of this entity's parent, put it back where it was.  This
+                    // works around some problems that happen when more than one hand or avatar is passing something around.
+                    if (_this.previousParentID[childID]) {
+                        var previousParentID = _this.previousParentID[childID];
+                        var previousParentJointIndex = _this.previousParentJointIndex[childID];
+
+                        // The main flaw with keeping track of previous parentage in individual scripts is:
+                        // (1) A grabs something (2) B takes it from A (3) A takes it from B (4) A releases it
+                        // now A and B will take turns passing it back to the other.  Detect this and stop the loop here...
+                        var UNHOOK_LOOP_DETECT_MS = 200;
+                        if (_this.previouslyUnhooked[childID]) {
+                            if (now - _this.previouslyUnhooked[childID] < UNHOOK_LOOP_DETECT_MS) {
+                                previousParentID = Uuid.NULL;
+                                previousParentJointIndex = -1;
+                            }
+                        }
+                        _this.previouslyUnhooked[childID] = now;
+
+                        Entities.editEntity(childID, {
+                            parentID: previousParentID,
+                            parentJointIndex: previousParentJointIndex
+                        });
+                    } else {
+                        Entities.editEntity(childID, { parentID: Uuid.NULL });
+                    }
+                });
+            }
+        };
+
+        this.getTargetProps = function (controllerData) {
+            // nearbyEntityProperties is already sorted by length from controller
+            var nearbyEntityProperties = controllerData.nearbyEntityProperties[this.hand];
+            var sensorScaleFactor = MyAvatar.sensorToWorldScale;
+            for (var i = 0; i < nearbyEntityProperties.length; i++) {
+                var props = nearbyEntityProperties[i];
+                var handPosition = controllerData.controllerLocations[this.hand].position;
+                var dist = distanceBetweenPointAndEntityBoundingBox(handPosition, props);
+                var distance = Vec3.distance(handPosition, props.position);
+                if ((dist > TEAR_AWAY_DISTANCE) ||
+                    (distance > NEAR_GRAB_RADIUS * sensorScaleFactor)) {
+                    continue;
+                }
+                if (entityIsGrabbable(props) || entityIsCloneable(props)) {
+                    // give haptic feedback
+                    if (props.id !== this.hapticTargetID) {
+                        Controller.triggerHapticPulse(HAPTIC_PULSE_STRENGTH, HAPTIC_PULSE_DURATION, this.hand);
+                        this.hapticTargetID = props.id;
+                    }
+                    // if we've attempted to grab a child, roll up to the root of the tree
+                    var groupRootProps = findGroupParent(controllerData, props);
+                    if (entityIsGrabbable(groupRootProps)) {
+                        return groupRootProps;
+                    }
+                    return props;
+                }
+            }
+            return null;
+        };
+
+        this.isReady = function (controllerData, deltaTime) {
+            this.targetEntityID = null;
+            this.grabbing = false;
+
+            var targetProps = this.getTargetProps(controllerData);
+            if (controllerData.triggerValues[this.hand] < TRIGGER_OFF_VALUE &&
+                controllerData.secondaryValues[this.hand] < TRIGGER_OFF_VALUE) {
+                this.checkForUnexpectedChildren(controllerData);
+                return makeRunningValues(false, [], []);
+            }
+
+            if (targetProps) {
+                if ((propsArePhysical(targetProps) || propsAreCloneDynamic(targetProps)) &&
+                    targetProps.parentID === Uuid.NULL) {
+                    return makeRunningValues(false, [], []); // let nearActionGrabEntity handle it
+                } else {
+                    this.targetEntityID = targetProps.id;
+                    return makeRunningValues(true, [this.targetEntityID], []);
+                }
+            } else {
+                this.hapticTargetID = null;
+                return makeRunningValues(false, [], []);
+            }
+        };
+
+        this.run = function (controllerData, deltaTime) {
+            if (this.grabbing) {
+                if (controllerData.triggerClicks[this.hand] < TRIGGER_OFF_VALUE &&
+                    controllerData.secondaryValues[this.hand] < TRIGGER_OFF_VALUE) {
+                    this.endNearParentingGrabEntity(controllerData);
+                    return makeRunningValues(false, [], []);
+                }
+
+                var props = controllerData.nearbyEntityPropertiesByID[this.targetEntityID];
+                if (!props) {
+                    // entity was deleted
+                    this.grabbing = false;
+                    this.targetEntityID = null;
+                    this.hapticTargetID = null;
+                    return makeRunningValues(false, [], []);
+                }
+
+                if (this.checkForChildTooFarAway(controllerData)) {
+                    // if the held entity moves too far from the hand, release it
+                    print("nearParentGrabEntity -- autoreleasing held item because it is far from hand");
+                    this.endNearParentingGrabEntity(controllerData);
+                    return makeRunningValues(false, [], []);
+                }
+
+                var args = [this.hand === RIGHT_HAND ? "right" : "left", MyAvatar.sessionUUID];
+                Entities.callEntityMethod(this.targetEntityID, "continueNearGrab", args);
+            } else {
+                // still searching / highlighting
+                var readiness = this.isReady(controllerData);
+                if (!readiness.active) {
+                    return readiness;
+                }
+                if (controllerData.triggerClicks[this.hand] || controllerData.secondaryValues[this.hand] > BUMPER_ON_VALUE) {
+                    // switch to grab
+                    var targetProps = this.getTargetProps(controllerData);
+                    var targetCloneable = entityIsCloneable(targetProps);
+
+                    if (targetCloneable) {
+                        var worldEntityProps = controllerData.nearbyEntityProperties[this.hand];
+                        var cloneID = cloneEntity(targetProps, worldEntityProps);
+                        var cloneProps = Entities.getEntityProperties(cloneID);
+                        this.grabbing = true;
+                        this.targetEntityID = cloneID;
+                        this.startNearParentingGrabEntity(controllerData, cloneProps);
+
+                    } else if (targetProps) {
+                        this.grabbing = true;
+                        this.startNearParentingGrabEntity(controllerData, targetProps);
+                    }
+                }
+            }
+
+            return makeRunningValues(true, [this.targetEntityID], []);
+        };
+
+        this.cleanup = function () {
+            if (this.targetEntityID) {
+                this.endNearParentingGrabEntity();
+            }
+        };
+    }
+
+    var leftNearParentingGrabEntity = new NearParentingGrabEntity(LEFT_HAND);
+    var rightNearParentingGrabEntity = new NearParentingGrabEntity(RIGHT_HAND);
+
+    enableDispatcherModule("LeftNearParentingGrabEntity", leftNearParentingGrabEntity);
+    enableDispatcherModule("RightNearParentingGrabEntity", rightNearParentingGrabEntity);
+
+    this.cleanup = function () {
+        leftNearParentingGrabEntity.cleanup();
+        rightNearParentingGrabEntity.cleanup();
+        disableDispatcherModule("LeftNearParentingGrabEntity");
+        disableDispatcherModule("RightNearParentingGrabEntity");
+    };
+    Script.scriptEnding.connect(this.cleanup);
+}());
diff --git a/scripts/system/controllers/controllerModules/nearParentGrabOverlay.js b/scripts/system/controllers/controllerModules/nearParentGrabOverlay.js
new file mode 100644
index 0000000000..925c50df5e
--- /dev/null
+++ b/scripts/system/controllers/controllerModules/nearParentGrabOverlay.js
@@ -0,0 +1,234 @@
+"use strict";
+
+//  nearParentGrabOverlay.js
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+
+
+/* global Script, MyAvatar, Controller, RIGHT_HAND, LEFT_HAND, getControllerJointIndex,
+   enableDispatcherModule, disableDispatcherModule, Messages, HAPTIC_PULSE_STRENGTH, HAPTIC_PULSE_DURATION,
+   makeDispatcherModuleParameters, Overlays, makeRunningValues, Vec3, resizeTablet, getTabletWidthFromSettings,
+   NEAR_GRAB_RADIUS
+*/
+
+Script.include("/~/system/libraries/controllerDispatcherUtils.js");
+Script.include("/~/system/libraries/utils.js");
+
+(function() {
+
+    // XXX this.ignoreIK = (grabbableData.ignoreIK !== undefined) ? grabbableData.ignoreIK : true;
+    // XXX this.kinematicGrab = (grabbableData.kinematic !== undefined) ? grabbableData.kinematic : NEAR_GRABBING_KINEMATIC;
+
+    function NearParentingGrabOverlay(hand) {
+        this.hand = hand;
+        this.grabbedThingID = null;
+        this.previousParentID = {};
+        this.previousParentJointIndex = {};
+        this.previouslyUnhooked = {};
+        this.robbed = false;
+
+        this.parameters = makeDispatcherModuleParameters(
+            90,
+            this.hand === RIGHT_HAND ? ["rightHand"] : ["leftHand"],
+            [],
+            100);
+
+
+        // XXX does handJointIndex change if the avatar changes?
+        this.handJointIndex = MyAvatar.getJointIndex(this.hand === RIGHT_HAND ? "RightHand" : "LeftHand");
+        this.controllerJointIndex = getControllerJointIndex(this.hand);
+
+        this.getOtherModule = function() {
+            return (this.hand === RIGHT_HAND) ? leftNearParentingGrabOverlay : rightNearParentingGrabOverlay;
+        };
+
+        this.otherHandIsParent = function(props) {
+            return this.getOtherModule().thisHandIsParent(props);
+        };
+
+        this.thisHandIsParent = function(props) {
+            if (props.parentID !== MyAvatar.sessionUUID && props.parentID !== MyAvatar.SELF_ID) {
+                return false;
+            }
+
+            var handJointIndex = MyAvatar.getJointIndex(this.hand === RIGHT_HAND ? "RightHand" : "LeftHand");
+            if (props.parentJointIndex === handJointIndex) {
+                return true;
+            }
+
+            var controllerJointIndex = this.controllerJointIndex;
+            if (props.parentJointIndex === controllerJointIndex) {
+                return true;
+            }
+
+            var controllerCRJointIndex = MyAvatar.getJointIndex(this.hand === RIGHT_HAND ?
+                "_CAMERA_RELATIVE_CONTROLLER_RIGHTHAND" :
+                "_CAMERA_RELATIVE_CONTROLLER_LEFTHAND");
+
+            if (props.parentJointIndex === controllerCRJointIndex) {
+                return true;
+            }
+
+            return false;
+        };
+
+        this.getGrabbedProperties = function() {
+            return {
+                position: Overlays.getProperty(this.grabbedThingID, "position"),
+                rotation: Overlays.getProperty(this.grabbedThingID, "rotation"),
+                parentID: Overlays.getProperty(this.grabbedThingID, "parentID"),
+                parentJointIndex: Overlays.getProperty(this.grabbedThingID, "parentJointIndex"),
+                dynamic: false,
+                shapeType: "none"
+            };
+        };
+
+
+        this.startNearParentingGrabOverlay = function (controllerData) {
+            Controller.triggerHapticPulse(HAPTIC_PULSE_STRENGTH, HAPTIC_PULSE_DURATION, this.hand);
+
+            this.controllerJointIndex = getControllerJointIndex(this.hand);
+            var handJointIndex = this.controllerJointIndex;
+
+            var grabbedProperties = this.getGrabbedProperties();
+
+            var reparentProps = {
+                parentID: MyAvatar.SELF_ID,
+                parentJointIndex: handJointIndex,
+                velocity: {x: 0, y: 0, z: 0},
+                angularVelocity: {x: 0, y: 0, z: 0}
+            };
+
+            if (this.thisHandIsParent(grabbedProperties)) {
+                // this should never happen, but if it does, don't set previous parent to be this hand.
+                // this.previousParentID[this.grabbedThingID] = NULL;
+                // this.previousParentJointIndex[this.grabbedThingID] = -1;
+            } else if (this.otherHandIsParent(grabbedProperties)) {
+                // the other hand is parent. Steal the object and information
+                var otherModule = this.getOtherModule();
+                this.previousParentID[this.grabbedThingID] = otherModule.previousParentID[this.grabbedThingID];
+                this.previousParentJointIndex[this.grabbedThingID] = otherModule.previousParentJointIndex[this.grabbedThingID];
+                otherModule.robbed = true;
+            } else {
+                this.previousParentID[this.grabbedThingID] = grabbedProperties.parentID;
+                this.previousParentJointIndex[this.grabbedThingID] = grabbedProperties.parentJointIndex;
+            }
+            Overlays.editOverlay(this.grabbedThingID, reparentProps);
+
+            // resizeTablet to counter adjust offsets to account for change of scale from sensorToWorldMatrix
+            if (this.grabbedThingID === HMD.tabletID) {
+                resizeTablet(getTabletWidthFromSettings(), reparentProps.parentJointIndex);
+            }
+
+            Messages.sendMessage('Hifi-Object-Manipulation', JSON.stringify({
+                action: 'grab',
+                grabbedEntity: this.grabbedThingID,
+                joint: this.hand === RIGHT_HAND ? "RightHand" : "LeftHand"
+            }));
+        };
+
+        this.endNearParentingGrabOverlay = function () {
+            var previousParentID = this.previousParentID[this.grabbedThingID];
+            if ((previousParentID === Uuid.NULL || previousParentID === null) && !this.robbed) {
+                Overlays.editOverlay(this.grabbedThingID, {
+                    parentID: Uuid.NULL,
+                    parentJointIndex: -1
+                });
+            } else if (!this.robbed){
+                // before we grabbed it, overlay was a child of something; put it back.
+                Overlays.editOverlay(this.grabbedThingID, {
+                    parentID: this.previousParentID[this.grabbedThingID],
+                    parentJointIndex: this.previousParentJointIndex[this.grabbedThingID]
+                });
+
+                // resizeTablet to counter adjust offsets to account for change of scale from sensorToWorldMatrix
+                if (this.grabbedThingID === HMD.tabletID) {
+                    resizeTablet(getTabletWidthFromSettings(), this.previousParentJointIndex[this.grabbedThingID]);
+                }
+            }
+
+            Messages.sendMessage('Hifi-Object-Manipulation', JSON.stringify({
+                action: 'release',
+                grabbedEntity: this.grabbedThingID,
+                joint: this.hand === RIGHT_HAND ? "RightHand" : "LeftHand"
+            }));
+
+            this.grabbedThingID = null;
+        };
+
+        this.getTargetID = function(overlays, controllerData) {
+            var sensorScaleFactor = MyAvatar.sensorToWorldScale;
+            for (var i = 0; i < overlays.length; i++) {
+                var overlayPosition = Overlays.getProperty(overlays[i], "position");
+                var handPosition = controllerData.controllerLocations[this.hand].position;
+                var distance = Vec3.distance(overlayPosition, handPosition);
+                if (distance <= NEAR_GRAB_RADIUS * sensorScaleFactor) {
+                    return overlays[i];
+                }
+            }
+            return null;
+        };
+
+
+        this.isReady = function (controllerData) {
+            if ((controllerData.triggerClicks[this.hand] === 0 &&
+                 controllerData.secondaryValues[this.hand] === 0)) {
+                this.robbed = false;
+                return makeRunningValues(false, [], []);
+            }
+
+            this.grabbedThingID = null;
+
+            var candidateOverlays = controllerData.nearbyOverlayIDs[this.hand];
+            var grabbableOverlays = candidateOverlays.filter(function(overlayID) {
+                return Overlays.getProperty(overlayID, "grabbable");
+            });
+
+            var targetID = this.getTargetID(grabbableOverlays, controllerData);
+            if (targetID && !this.robbed) {
+                this.grabbedThingID = targetID;
+                this.startNearParentingGrabOverlay(controllerData);
+                return makeRunningValues(true, [this.grabbedThingID], []);
+            } else {
+                return makeRunningValues(false, [], []);
+            }
+        };
+
+        this.run = function (controllerData) {
+            if (controllerData.triggerClicks[this.hand] === 0 && controllerData.secondaryValues[this.hand] === 0) {
+                this.endNearParentingGrabOverlay();
+                this.robbed = false;
+                return makeRunningValues(false, [], []);
+            } else {
+                // check if someone stole the target from us
+                var grabbedProperties = this.getGrabbedProperties();
+                if (!this.thisHandIsParent(grabbedProperties)) {
+                    return makeRunningValues(false, [], []);
+                }
+
+                return makeRunningValues(true, [this.grabbedThingID], []);
+            }
+        };
+
+        this.cleanup = function () {
+            if (this.grabbedThingID) {
+                this.endNearParentingGrabOverlay();
+            }
+        };
+    }
+
+    var leftNearParentingGrabOverlay = new NearParentingGrabOverlay(LEFT_HAND);
+    var rightNearParentingGrabOverlay = new NearParentingGrabOverlay(RIGHT_HAND);
+
+    enableDispatcherModule("LeftNearParentingGrabOverlay", leftNearParentingGrabOverlay);
+    enableDispatcherModule("RightNearParentingGrabOverlay", rightNearParentingGrabOverlay);
+
+    this.cleanup = function () {
+        leftNearParentingGrabOverlay.cleanup();
+        rightNearParentingGrabOverlay.cleanup();
+        disableDispatcherModule("LeftNearParentingGrabOverlay");
+        disableDispatcherModule("RightNearParentingGrabOverlay");
+    };
+    Script.scriptEnding.connect(this.cleanup);
+}());
diff --git a/scripts/system/controllers/controllerModules/nearTrigger.js b/scripts/system/controllers/controllerModules/nearTrigger.js
new file mode 100644
index 0000000000..56a4e93495
--- /dev/null
+++ b/scripts/system/controllers/controllerModules/nearTrigger.js
@@ -0,0 +1,120 @@
+"use strict";
+
+//  nearTrigger.js
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+
+
+/* global Script, Entities, MyAvatar, RIGHT_HAND, LEFT_HAND, enableDispatcherModule, disableDispatcherModule, getGrabbableData,
+   Vec3, TRIGGER_OFF_VALUE, makeDispatcherModuleParameters, makeRunningValues, NEAR_GRAB_RADIUS
+*/
+
+Script.include("/~/system/libraries/controllerDispatcherUtils.js");
+
+(function() {
+
+    function entityWantsNearTrigger(props) {
+        var grabbableData = getGrabbableData(props);
+        return grabbableData.triggerable || grabbableData.wantsTrigger;
+    }
+
+    function NearTriggerEntity(hand) {
+        this.hand = hand;
+        this.targetEntityID = null;
+        this.grabbing = false;
+        this.previousParentID = {};
+        this.previousParentJointIndex = {};
+        this.previouslyUnhooked = {};
+        this.startSent = false;
+
+        this.parameters = makeDispatcherModuleParameters(
+            480,
+            this.hand === RIGHT_HAND ? ["rightHandTrigger", "rightHand"] : ["leftHandTrigger", "leftHand"],
+            [],
+            100);
+
+        this.getTargetProps = function (controllerData) {
+            // nearbyEntityProperties is already sorted by length from controller
+            var nearbyEntityProperties = controllerData.nearbyEntityProperties[this.hand];
+            var sensorScaleFactor = MyAvatar.sensorToWorldScale;
+            for (var i = 0; i < nearbyEntityProperties.length; i++) {
+                var props = nearbyEntityProperties[i];
+                var handPosition = controllerData.controllerLocations[this.hand].position;
+                var distance = Vec3.distance(props.position, handPosition);
+                if (distance > NEAR_GRAB_RADIUS * sensorScaleFactor) {
+                    continue;
+                }
+                if (entityWantsNearTrigger(props)) {
+                    return props;
+                }
+            }
+            return null;
+        };
+
+        this.startNearTrigger = function (controllerData) {
+            var args = [this.hand === RIGHT_HAND ? "right" : "left", MyAvatar.sessionUUID];
+            Entities.callEntityMethod(this.targetEntityID, "startNearTrigger", args);
+        };
+
+        this.continueNearTrigger = function (controllerData) {
+            var args = [this.hand === RIGHT_HAND ? "right" : "left", MyAvatar.sessionUUID];
+            Entities.callEntityMethod(this.targetEntityID, "continueNearTrigger", args);
+        };
+
+        this.endNearTrigger = function (controllerData) {
+            var args = [this.hand === RIGHT_HAND ? "right" : "left", MyAvatar.sessionUUID];
+            Entities.callEntityMethod(this.targetEntityID, "stopNearTrigger", args);
+        };
+
+        this.isReady = function (controllerData) {
+            this.targetEntityID = null;
+
+            if (controllerData.triggerValues[this.hand] < TRIGGER_OFF_VALUE) {
+                return makeRunningValues(false, [], []);
+            }
+
+            var targetProps = this.getTargetProps(controllerData);
+            if (targetProps) {
+                this.targetEntityID = targetProps.id;
+                return makeRunningValues(true, [this.targetEntityID], []);
+            } else {
+                return makeRunningValues(false, [], []);
+            }
+        };
+
+        this.run = function (controllerData) {
+            if (!this.startSent) {
+                this.startNearTrigger(controllerData);
+                this.startSent = true;
+            } else if (controllerData.triggerValues[this.hand] < TRIGGER_OFF_VALUE) {
+                this.endNearTrigger(controllerData);
+                this.startSent = false;
+                return makeRunningValues(false, [], []);
+            } else {
+                this.continueNearTrigger(controllerData);
+            }
+            return makeRunningValues(true, [this.targetEntityID], []);
+        };
+
+        this.cleanup = function () {
+            if (this.targetEntityID) {
+                this.endNearTrigger();
+            }
+        };
+    }
+
+    var leftNearTriggerEntity = new NearTriggerEntity(LEFT_HAND);
+    var rightNearTriggerEntity = new NearTriggerEntity(RIGHT_HAND);
+
+    enableDispatcherModule("LeftNearTriggerEntity", leftNearTriggerEntity);
+    enableDispatcherModule("RightNearTriggerEntity", rightNearTriggerEntity);
+
+    this.cleanup = function () {
+        leftNearTriggerEntity.cleanup();
+        rightNearTriggerEntity.cleanup();
+        disableDispatcherModule("LeftNearTriggerEntity");
+        disableDispatcherModule("RightNearTriggerEntity");
+    };
+    Script.scriptEnding.connect(this.cleanup);
+}());
diff --git a/scripts/system/controllers/controllerModules/overlayLaserInput.js b/scripts/system/controllers/controllerModules/overlayLaserInput.js
new file mode 100644
index 0000000000..538a943901
--- /dev/null
+++ b/scripts/system/controllers/controllerModules/overlayLaserInput.js
@@ -0,0 +1,391 @@
+"use strict";
+
+//  overlayLaserInput.js
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+
+/* global Script, Entities, Controller, RIGHT_HAND, LEFT_HAND, enableDispatcherModule, disableDispatcherModule,
+   makeRunningValues, Messages, Quat, Vec3, makeDispatcherModuleParameters, Overlays, ZERO_VEC, HMD,
+   INCHES_TO_METERS, DEFAULT_REGISTRATION_POINT, getGrabPointSphereOffset, COLORS_GRAB_SEARCHING_HALF_SQUEEZE,
+   COLORS_GRAB_SEARCHING_FULL_SQUEEZE, COLORS_GRAB_DISTANCE_HOLD, DEFAULT_SEARCH_SPHERE_DISTANCE, TRIGGER_ON_VALUE,
+   TRIGGER_OFF_VALUE, getEnabledModuleByName, PICK_MAX_DISTANCE, LaserPointers, RayPick, ContextOverlay
+*/
+
+Script.include("/~/system/libraries/controllerDispatcherUtils.js");
+Script.include("/~/system/libraries/controllers.js");
+
+(function() {
+    var TouchEventUtils = Script.require("/~/system/libraries/touchEventUtils.js");
+    var END_RADIUS = 0.005;
+    var dim = { x: END_RADIUS, y: END_RADIUS, z: END_RADIUS };
+    var halfPath = {
+        type: "line3d",
+        color: COLORS_GRAB_SEARCHING_HALF_SQUEEZE,
+        visible: true,
+        alpha: 1,
+        solid: true,
+        glow: 1.0,
+        ignoreRayIntersection: true, // always ignore this
+        drawInFront: true, // Even when burried inside of something, show it.
+        parentID: MyAvatar.SELF_ID
+    };
+    var halfEnd = {
+        type: "sphere",
+        dimensions: dim,
+        solid: true,
+        color: COLORS_GRAB_SEARCHING_HALF_SQUEEZE,
+        alpha: 0.9,
+        ignoreRayIntersection: true,
+        drawInFront: true, // Even when burried inside of something, show it.
+        visible: true
+    };
+    var fullPath = {
+        type: "line3d",
+        color: COLORS_GRAB_SEARCHING_FULL_SQUEEZE,
+        visible: true,
+        alpha: 1,
+        solid: true,
+        glow: 1.0,
+        ignoreRayIntersection: true, // always ignore this
+        drawInFront: true, // Even when burried inside of something, show it.
+        parentID: MyAvatar.SELF_ID
+    };
+    var fullEnd = {
+        type: "sphere",
+        dimensions: dim,
+        solid: true,
+        color: COLORS_GRAB_SEARCHING_FULL_SQUEEZE,
+        alpha: 0.9,
+        ignoreRayIntersection: true,
+        drawInFront: true, // Even when burried inside of something, show it.
+        visible: true
+    };
+    var holdPath = {
+        type: "line3d",
+        color: COLORS_GRAB_DISTANCE_HOLD,
+        visible: true,
+        alpha: 1,
+        solid: true,
+        glow: 1.0,
+        ignoreRayIntersection: true, // always ignore this
+        drawInFront: true, // Even when burried inside of something, show it.
+        parentID: MyAvatar.SELF_ID
+    };
+
+    var renderStates = [
+        {name: "half", path: halfPath, end: halfEnd},
+        {name: "full", path: fullPath, end: fullEnd},
+        {name: "hold", path: holdPath}
+    ];
+
+    var defaultRenderStates = [
+        {name: "half", distance: DEFAULT_SEARCH_SPHERE_DISTANCE, path: halfPath},
+        {name: "full", distance: DEFAULT_SEARCH_SPHERE_DISTANCE, path: fullPath},
+        {name: "hold", distance: DEFAULT_SEARCH_SPHERE_DISTANCE, path: holdPath}
+    ];
+
+
+    // triggered when stylus presses a web overlay/entity
+    var HAPTIC_STYLUS_STRENGTH = 1.0;
+    var HAPTIC_STYLUS_DURATION = 20.0;
+
+    function distance2D(a, b) {
+        var dx = (a.x - b.x);
+        var dy = (a.y - b.y);
+        return Math.sqrt(dx * dx + dy * dy);
+    }
+
+    function OverlayLaserInput(hand) {
+        this.hand = hand;
+        this.active = false;
+        this.previousLaserClickedTarget = false;
+        this.laserPressingTarget = false;
+        this.mode = "none";
+        this.laserTarget = null;
+        this.pressEnterLaserTarget = null;
+
+
+        this.parameters = makeDispatcherModuleParameters(
+            120,
+            this.hand === RIGHT_HAND ? ["rightHand"] : ["leftHand"],
+            [],
+            100);
+
+        this.getOtherHandController = function() {
+            return (this.hand === RIGHT_HAND) ? Controller.Standard.LeftHand : Controller.Standard.RightHand;
+        };
+
+        this.getOtherModule = function() {
+            return (this.hand === RIGHT_HAND) ? leftOverlayLaserInput : rightOverlayLaserInput;
+        };
+
+        this.handToController = function() {
+            return (this.hand === RIGHT_HAND) ? Controller.Standard.RightHand : Controller.Standard.LeftHand;
+        };
+
+        this.hasTouchFocus = function(laserTarget) {
+            return (laserTarget.overlayID === this.hoverOverlay);
+        };
+
+        this.requestTouchFocus = function(laserTarget) {
+            if (laserTarget.overlayID &&
+                laserTarget.overlayID !== this.hoverOverlay) {
+                this.hoverOverlay = laserTarget.overlayID;
+                TouchEventUtils.sendHoverEnterEventToTouchTarget(this.hand, laserTarget);
+            }
+        };
+
+        this.relinquishTouchFocus = function() {
+            // send hover leave event.
+            if (this.hoverOverlay) {
+                var pointerEvent = { type: "Move", id: this.hand + 1 };
+                Overlays.sendMouseMoveOnOverlay(this.hoverOverlay, pointerEvent);
+                Overlays.sendHoverOverOverlay(this.hoverOverlay, pointerEvent);
+                Overlays.sendHoverLeaveOverlay(this.hoverOverlay, pointerEvent);
+                this.hoverOverlay = null;
+            }
+        };
+
+        this.relinquishStylusTargetTouchFocus = function(laserTarget) {
+            var stylusModuleNames = ["LeftTabletStylusInput", "RightTabletStylusError"];
+            for (var i = 0; i < stylusModuleNames.length; i++) {
+                var stylusModule = getEnabledModuleByName(stylusModuleNames[i]);
+                if (stylusModule) {
+                    if (stylusModule.hoverOverlay === laserTarget.overlayID) {
+                        stylusModule.relinquishTouchFocus();
+                    }
+                }
+            }
+        };
+
+        this.stealTouchFocus = function(laserTarget) {
+            if (laserTarget.overlayID === this.getOtherModule().hoverOverlay) {
+                this.getOtherModule().relinquishTouchFocus();
+            }
+
+            // If the focus target we want to request is the same of one of the stylus
+            // tell the stylus to relinquish it focus on our target
+            this.relinquishStylusTargetTouchFocus(laserTarget);
+
+            this.requestTouchFocus(laserTarget);
+        };
+
+        this.updateLaserPointer = function(controllerData) {
+            LaserPointers.enableLaserPointer(this.laserPointer);
+            LaserPointers.setRenderState(this.laserPointer, this.mode);
+
+            if (HMD.tabletID !== this.tabletID) {
+                this.tabletID = HMD.tabletID;
+                LaserPointers.setIgnoreItems(this.laserPointer, [HMD.tabletID]);
+            }
+        };
+
+        this.processControllerTriggers = function(controllerData) {
+            if (controllerData.triggerClicks[this.hand]) {
+                this.mode = "full";
+            } else if (controllerData.triggerValues[this.hand] > TRIGGER_ON_VALUE) {
+                this.mode = "half";
+            } else {
+                this.mode = "none";
+            }
+        };
+
+        this.laserPressEnter = function () {
+            this.stealTouchFocus(this.laserTarget);
+            TouchEventUtils.sendTouchStartEventToTouchTarget(this.hand, this.laserTarget);
+            Controller.triggerHapticPulse(HAPTIC_STYLUS_STRENGTH, HAPTIC_STYLUS_DURATION, this.hand);
+
+            this.touchingEnterTimer = 0;
+            this.pressEnterLaserTarget = this.laserTarget;
+            this.deadspotExpired = false;
+
+            var LASER_PRESS_TO_MOVE_DEADSPOT = 0.094;
+            this.deadspotRadius = Math.tan(LASER_PRESS_TO_MOVE_DEADSPOT) * this.laserTarget.distance;
+        };
+
+        this.laserPressExit = function () {
+            if (this.laserTarget === null) {
+                return;
+            }
+
+            // special case to handle home button.
+            if (this.laserTarget.overlayID === HMD.homeButtonID) {
+                Messages.sendLocalMessage("home", this.laserTarget.overlayID);
+            }
+
+            // send press event
+            if (this.deadspotExpired) {
+                TouchEventUtils.sendTouchEndEventToTouchTarget(this.hand, this.laserTarget);
+            } else {
+                TouchEventUtils.sendTouchEndEventToTouchTarget(this.hand, this.pressEnterLaserTarget);
+            }
+        };
+
+        this.laserPressing = function (controllerData, dt) {
+            this.touchingEnterTimer += dt;
+
+            if (this.laserTarget) {
+                if (controllerData.triggerClicks[this.hand]) {
+                    var POINTER_PRESS_TO_MOVE_DELAY = 0.33; // seconds
+                    if (this.deadspotExpired || this.touchingEnterTimer > POINTER_PRESS_TO_MOVE_DELAY ||
+                        distance2D(this.laserTarget.position2D,
+                            this.pressEnterLaserTarget.position2D) > this.deadspotRadius) {
+                        TouchEventUtils.sendTouchMoveEventToTouchTarget(this.hand, this.laserTarget);
+                        this.deadspotExpired = true;
+                    }
+                } else {
+                    this.laserPressingTarget = false;
+                }
+            } else {
+                this.laserPressingTarget = false;
+            }
+        };
+
+        this.processLaser = function(controllerData) {
+            if (this.shouldExit(controllerData) || this.getOtherModule().active) {
+                this.exitModule();
+                return false;
+            }
+            var intersection = controllerData.rayPicks[this.hand];
+            var laserTarget = TouchEventUtils.composeTouchTargetFromIntersection(intersection);
+
+            if (controllerData.triggerClicks[this.hand]) {
+                this.laserTarget = laserTarget;
+                this.laserPressingTarget = true;
+            } else {
+                this.requestTouchFocus(laserTarget);
+
+                if (!TouchEventUtils.touchTargetHasKeyboardFocus(laserTarget)) {
+                    TouchEventUtils.setKeyboardFocusOnTouchTarget(laserTarget);
+                }
+
+                if (this.hasTouchFocus(laserTarget) && !this.laserPressingTarget) {
+                    TouchEventUtils.sendHoverOverEventToTouchTarget(this.hand, laserTarget);
+                }
+            }
+
+            this.processControllerTriggers(controllerData);
+            this.updateLaserPointer(controllerData);
+            this.active = true;
+            return true;
+        };
+
+        this.grabModuleWantsNearbyOverlay = function(controllerData) {
+            if (controllerData.triggerValues[this.hand] > TRIGGER_ON_VALUE) {
+                var nearGrabName = this.hand === RIGHT_HAND ? "RightNearParentingGrabOverlay" : "LeftNearParentingGrabOverlay";
+                var nearGrabModule = getEnabledModuleByName(nearGrabName);
+                if (nearGrabModule) {
+                    var candidateOverlays = controllerData.nearbyOverlayIDs[this.hand];
+                    var grabbableOverlays = candidateOverlays.filter(function(overlayID) {
+                        return Overlays.getProperty(overlayID, "grabbable");
+                    });
+                    var target = nearGrabModule.getTargetID(grabbableOverlays, controllerData);
+                    if (target) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        };
+
+        this.shouldExit = function(controllerData) {
+            var intersection = controllerData.rayPicks[this.hand];
+            var offOverlay = (intersection.type !== RayPick.INTERSECTED_OVERLAY);
+            var triggerOff = (controllerData.triggerValues[this.hand] < TRIGGER_OFF_VALUE);
+            if (triggerOff) {
+                this.deleteContextOverlay();
+            }
+            var grabbingOverlay = this.grabModuleWantsNearbyOverlay(controllerData);
+            return offOverlay || grabbingOverlay || triggerOff;
+        };
+
+        this.exitModule = function() {
+            if (this.laserPressingTarget) {
+                this.deadspotExpired = true;
+                this.laserPressExit();
+                this.laserPressingTarget = false;
+            }
+            this.relinquishTouchFocus();
+            this.reset();
+            this.updateLaserPointer();
+            LaserPointers.disableLaserPointer(this.laserPointer);
+        };
+
+        this.reset = function() {
+            this.mode = "none";
+            this.active = false;
+        };
+
+        this.deleteContextOverlay = function() {
+            var farGrabModule = getEnabledModuleByName(this.hand === RIGHT_HAND ? "RightFarActionGrabEntity" : "LeftFarActionGrabEntity");
+            if (farGrabModule) {
+                var entityWithContextOverlay = farGrabModule.entityWithContextOverlay;
+
+                if (entityWithContextOverlay) {
+                    ContextOverlay.destroyContextOverlay(entityWithContextOverlay);
+                    farGrabModule.entityWithContextOverlay = false;
+                }
+            }
+        };
+
+        this.isReady = function (controllerData) {
+            if (this.processLaser(controllerData)) {
+                return makeRunningValues(true, [], []);
+            }
+            return makeRunningValues(false, [], []);
+        };
+
+        this.run = function (controllerData, deltaTime) {
+            if (!this.previousLaserClickedTarget && this.laserPressingTarget) {
+                this.laserPressEnter();
+            }
+            if (this.previousLaserClickedTarget && !this.laserPressingTarget) {
+                this.laserPressExit();
+            }
+            this.previousLaserClickedTarget = this.laserPressingTarget;
+
+            if (this.laserPressingTarget) {
+                this.laserPressing(controllerData, deltaTime);
+            }
+
+            if (this.processLaser(controllerData)) {
+                return makeRunningValues(true, [], []);
+            } else {
+                return makeRunningValues(false, [], []);
+            }
+        };
+
+        this.cleanup = function () {
+            LaserPointers.disableLaserPointer(this.laserPointer);
+            LaserPointers.removeLaserPointer(this.laserPointer);
+        };
+
+        this.laserPointer = LaserPointers.createLaserPointer({
+            joint: (this.hand === RIGHT_HAND) ? "_CAMERA_RELATIVE_CONTROLLER_RIGHTHAND" : "_CAMERA_RELATIVE_CONTROLLER_LEFTHAND",
+            filter: RayPick.PICK_OVERLAYS,
+            maxDistance: PICK_MAX_DISTANCE,
+            posOffset: getGrabPointSphereOffset(this.handToController(), true),
+            renderStates: renderStates,
+            faceAvatar: true,
+            scaleWithAvatar: true,
+            defaultRenderStates: defaultRenderStates
+        });
+
+        LaserPointers.setIgnoreItems(this.laserPointer, [HMD.tabletID]);
+    }
+
+    var leftOverlayLaserInput = new OverlayLaserInput(LEFT_HAND);
+    var rightOverlayLaserInput = new OverlayLaserInput(RIGHT_HAND);
+
+    enableDispatcherModule("LeftOverlayLaserInput", leftOverlayLaserInput);
+    enableDispatcherModule("RightOverlayLaserInput", rightOverlayLaserInput);
+
+    this.cleanup = function () {
+        leftOverlayLaserInput.cleanup();
+        rightOverlayLaserInput.cleanup();
+        disableDispatcherModule("LeftOverlayLaserInput");
+        disableDispatcherModule("RightOverlayLaserInput");
+    };
+    Script.scriptEnding.connect(this.cleanup);
+}());
diff --git a/scripts/system/controllers/controllerModules/scaleAvatar.js b/scripts/system/controllers/controllerModules/scaleAvatar.js
new file mode 100644
index 0000000000..de0434258c
--- /dev/null
+++ b/scripts/system/controllers/controllerModules/scaleAvatar.js
@@ -0,0 +1,84 @@
+//  scaleAvatar.js
+//
+//  Created by Dante Ruiz on  9/11/17
+//
+//  Grabs physically moveable entities with hydra-like controllers; it works for either near or far objects.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+
+/* global Script, Vec3, MyAvatar, RIGHT_HAND */
+/* eslint indent: ["error", 4, { "outerIIFEBody": 0 }] */
+
+(function () {
+    var dispatcherUtils = Script.require("/~/system/libraries/controllerDispatcherUtils.js");
+
+    function ScaleAvatar(hand) {
+        this.hand = hand;
+        this.scalingStartAvatarScale = 0;
+        this.scalingStartDistance = 0;
+
+        this.parameters = dispatcherUtils.makeDispatcherModuleParameters(
+            120,
+            this.hand === RIGHT_HAND ? ["rightHand"] : ["leftHand"],
+            [],
+            100
+        );
+
+        this.otherHand = function() {
+            return this.hand === dispatcherUtils.RIGHT_HAND ? dispatcherUtils.LEFT_HAND : dispatcherUtils.RIGHT_HAND;
+        };
+
+        this.getOtherModule = function() {
+            var otherModule = this.hand === dispatcherUtils.RIGHT_HAND ? leftScaleAvatar : rightScaleAvatar;
+            return otherModule;
+        };
+
+        this.triggersPressed = function(controllerData) {
+            if (controllerData.triggerClicks[this.hand] &&
+                controllerData.secondaryValues[this.hand] > dispatcherUtils.BUMPER_ON_VALUE) {
+                return true;
+            }
+            return false;
+        };
+
+        this.isReady = function(controllerData) {
+            var otherModule = this.getOtherModule();
+            if (this.triggersPressed(controllerData) && otherModule.triggersPressed(controllerData)) {
+                this.scalingStartAvatarScale = MyAvatar.scale;
+                this.scalingStartDistance = Vec3.length(Vec3.subtract(controllerData.controllerLocations[this.hand].position,
+                    controllerData.controllerLocations[this.otherHand()].position));
+                return dispatcherUtils.makeRunningValues(true, [], []);
+            }
+            return dispatcherUtils.makeRunningValues(false, [], []);
+        };
+
+        this.run = function(controllerData) {
+            var otherModule = this.getOtherModule();
+            if (this.triggersPressed(controllerData) && otherModule.triggersPressed(controllerData)) {
+                if (this.hand === dispatcherUtils.RIGHT_HAND) {
+                    var scalingCurrentDistance =
+                        Vec3.length(Vec3.subtract(controllerData.controllerLocations[this.hand].position,
+                        controllerData.controllerLocations[this.otherHand()].position));
+
+                    var newAvatarScale = (scalingCurrentDistance / this.scalingStartDistance) * this.scalingStartAvatarScale;
+                    MyAvatar.scale = newAvatarScale;
+                }
+                return dispatcherUtils.makeRunningValues(true, [], []);
+            }
+            return dispatcherUtils.makeRunningValues(false, [], []);
+        };
+    }
+
+    var leftScaleAvatar = new ScaleAvatar(dispatcherUtils.LEFT_HAND);
+    var rightScaleAvatar = new ScaleAvatar(dispatcherUtils.RIGHT_HAND);
+
+    dispatcherUtils.enableDispatcherModule("LeftScaleAvatar", leftScaleAvatar);
+    dispatcherUtils.enableDispatcherModule("RightScaleAvatar", rightScaleAvatar);
+
+    function cleanup() {
+        dispatcherUtils.disableDispatcherModule("LeftScaleAvatar");
+        dispatcherUtils.disableDispatcherModule("RightScaleAvatar");
+    };
+    Script.scriptEnding.connect(cleanup);
+})();
diff --git a/scripts/system/controllers/controllerModules/scaleEntity.js b/scripts/system/controllers/controllerModules/scaleEntity.js
new file mode 100644
index 0000000000..79b1d18db9
--- /dev/null
+++ b/scripts/system/controllers/controllerModules/scaleEntity.js
@@ -0,0 +1,106 @@
+//  scaleEntity.js
+//
+//  Created by Dante Ruiz on  9/18/17
+//
+//  Grabs physically moveable entities with hydra-like controllers; it works for either near or far objects.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+
+/* global Script, Vec3, MyAvatar, RIGHT_HAND */
+/* eslint indent: ["error", 4, { "outerIIFEBody": 0 }] */
+
+(function() {
+    var dispatcherUtils = Script.require("/~/system/libraries/controllerDispatcherUtils.js");
+
+    function ScaleEntity(hand) {
+        this.hand = hand;
+        this.grabbedThingID = false;
+        this.scalingStartDistance = false;
+        this.scalingStartDimensions = false;
+
+        this.parameters = dispatcherUtils.makeDispatcherModuleParameters(
+            120,
+            this.hand === RIGHT_HAND ? ["rightHandTrigger"] : ["leftHandTrigger"],
+            [],
+            100
+        );
+
+        this.otherHand = function() {
+            return this.hand === dispatcherUtils.RIGHT_HAND ? dispatcherUtils.LEFT_HAND : dispatcherUtils.RIGHT_HAND;
+        };
+
+        this.otherModule = function() {
+            return this.hand === dispatcherUtils.RIGHT_HAND ? leftScaleEntity : rightScaleEntity;
+        };
+
+        this.bumperPressed = function(controllerData) {
+            return ( controllerData.secondaryValues[this.hand] > dispatcherUtils.BUMPER_ON_VALUE);
+        };
+
+        this.getTargetProps = function(controllerData) {
+            // nearbyEntityProperties is already sorted by length from controller
+            var nearbyEntityProperties = controllerData.nearbyEntityProperties[this.hand];
+            var sensorScaleFactor = MyAvatar.sensorToWorldScale;
+            for (var i = 0; i < nearbyEntityProperties.length; i++) {
+                var props = nearbyEntityProperties[i];
+                var handPosition = controllerData.controllerLocations[this.hand].position;
+                var distance = Vec3.distance(props.position, handPosition);
+                if (distance > dispatcherUtils.NEAR_GRAB_RADIUS * sensorScaleFactor) {
+                    continue;
+                }
+                if ((dispatcherUtils.entityIsGrabbable(props) ||
+                     dispatcherUtils.propsArePhysical(props)) && !props.locked) {
+                    return props;
+                }
+            }
+            return null;
+        };
+
+        this.isReady = function(controllerData) {
+            var otherModule = this.otherModule();
+            if (this.bumperPressed(controllerData) && otherModule.bumperPressed(controllerData)) {
+                var thisHandTargetProps = this.getTargetProps(controllerData);
+                var otherHandTargetProps = otherModule.getTargetProps(controllerData);
+                if (thisHandTargetProps && otherHandTargetProps) {
+                    if (thisHandTargetProps.id === otherHandTargetProps.id) {
+                        this.grabbedThingID = thisHandTargetProps.id;
+                        this.scalingStartDistance = Vec3.length(Vec3.subtract(controllerData.controllerLocations[this.hand].position,
+                            controllerData.controllerLocations[this.otherHand()].position));
+                        this.scalingStartDimensions = thisHandTargetProps.dimensions;
+                        return dispatcherUtils.makeRunningValues(true, [], []);
+                    }
+                }
+            }
+            return dispatcherUtils.makeRunningValues(false, [], []);
+        };
+
+        this.run = function(controllerData) {
+            var otherModule = this.otherModule();
+            if (this.bumperPressed(controllerData) && otherModule.bumperPressed(controllerData)) {
+                if (this.hand === dispatcherUtils.RIGHT_HAND) {
+                    var scalingCurrentDistance =
+                        Vec3.length(Vec3.subtract(controllerData.controllerLocations[this.hand].position,
+                        controllerData.controllerLocations[this.otherHand()].position));
+                    var currentRescale = scalingCurrentDistance / this.scalingStartDistance;
+                    var newDimensions = Vec3.multiply(currentRescale, this.scalingStartDimensions);
+                    Entities.editEntity(this.grabbedThingID, { dimensions: newDimensions });
+                }
+                return dispatcherUtils.makeRunningValues(true, [], []);
+            }
+            return dispatcherUtils.makeRunningValues(false, [], []);
+        };
+    }
+
+    var leftScaleEntity = new ScaleEntity(dispatcherUtils.LEFT_HAND);
+    var rightScaleEntity = new ScaleEntity(dispatcherUtils.RIGHT_HAND);
+
+    dispatcherUtils.enableDispatcherModule("LeftScaleEntity", leftScaleEntity);
+    dispatcherUtils.enableDispatcherModule("RightScaleEntity", rightScaleEntity);
+
+    this.cleanup = function() {
+        dispatcherUtils.disableDispatcherModule("LeftScaleEntity");
+        dispatcherUtils.disableDispatcherModule("RightScaleEntity");
+    };
+    Script.scriptEnding.connect(this.cleanup);
+})();
diff --git a/scripts/system/controllers/controllerModules/tabletStylusInput.js b/scripts/system/controllers/controllerModules/tabletStylusInput.js
new file mode 100644
index 0000000000..46b630d023
--- /dev/null
+++ b/scripts/system/controllers/controllerModules/tabletStylusInput.js
@@ -0,0 +1,518 @@
+"use strict";
+
+//  tabletStylusInput.js
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+
+/* global Script, Entities, MyAvatar, Controller, RIGHT_HAND, LEFT_HAND,
+   enableDispatcherModule, disableDispatcherModule, makeRunningValues,
+   Messages, Quat, Vec3, getControllerWorldLocation, makeDispatcherModuleParameters, Overlays, ZERO_VEC,
+   HMD, INCHES_TO_METERS, DEFAULT_REGISTRATION_POINT, Settings, getGrabPointSphereOffset,
+   getEnabledModuleByName
+*/
+
+Script.include("/~/system/libraries/controllerDispatcherUtils.js");
+Script.include("/~/system/libraries/controllers.js");
+
+(function() {
+    var TouchEventUtils = Script.require("/~/system/libraries/touchEventUtils.js");
+    // triggered when stylus presses a web overlay/entity
+    var HAPTIC_STYLUS_STRENGTH = 1.0;
+    var HAPTIC_STYLUS_DURATION = 20.0;
+
+    var WEB_DISPLAY_STYLUS_DISTANCE = 0.5;
+    var WEB_STYLUS_LENGTH = 0.2;
+    var WEB_TOUCH_Y_OFFSET = 0.105; // how far forward (or back with a negative number) to slide stylus in hand
+
+    function isNearStylusTarget(stylusTargets, edgeBorder, minNormalDistance, maxNormalDistance) {
+        for (var i = 0; i < stylusTargets.length; i++) {
+            var stylusTarget = stylusTargets[i];
+
+            // check to see if the projected stylusTip is within within the 2d border
+            var borderMin = {x: -edgeBorder, y: -edgeBorder};
+            var borderMax = {x: stylusTarget.dimensions.x + edgeBorder, y: stylusTarget.dimensions.y + edgeBorder};
+            if (stylusTarget.distance >= minNormalDistance && stylusTarget.distance <= maxNormalDistance &&
+                stylusTarget.position2D.x >= borderMin.x && stylusTarget.position2D.y >= borderMin.y &&
+                stylusTarget.position2D.x <= borderMax.x && stylusTarget.position2D.y <= borderMax.y) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    function calculateNearestStylusTarget(stylusTargets) {
+        var nearestStylusTarget;
+
+        for (var i = 0; i < stylusTargets.length; i++) {
+            var stylusTarget = stylusTargets[i];
+
+            if ((!nearestStylusTarget || stylusTarget.distance < nearestStylusTarget.distance) &&
+                stylusTarget.normalizedPosition.x >= 0 && stylusTarget.normalizedPosition.y >= 0 &&
+                stylusTarget.normalizedPosition.x <= 1 && stylusTarget.normalizedPosition.y <= 1) {
+                nearestStylusTarget = stylusTarget;
+            }
+        }
+
+        return nearestStylusTarget;
+    }
+
+    function getFingerWorldLocation(hand) {
+        var fingerJointName = (hand === RIGHT_HAND) ? "RightHandIndex4" : "LeftHandIndex4";
+
+        var fingerJointIndex = MyAvatar.getJointIndex(fingerJointName);
+        var fingerPosition = MyAvatar.getAbsoluteJointTranslationInObjectFrame(fingerJointIndex);
+        var fingerRotation = MyAvatar.getAbsoluteJointRotationInObjectFrame(fingerJointIndex);
+        var worldFingerRotation = Quat.multiply(MyAvatar.orientation, fingerRotation);
+        var worldFingerPosition = Vec3.sum(MyAvatar.position, Vec3.multiplyQbyV(MyAvatar.orientation, fingerPosition));
+
+        return {
+            position: worldFingerPosition,
+            orientation: worldFingerRotation,
+            rotation: worldFingerRotation,
+            valid: true
+        };
+    }
+
+    function distance2D(a, b) {
+        var dx = (a.x - b.x);
+        var dy = (a.y - b.y);
+        return Math.sqrt(dx * dx + dy * dy);
+    }
+
+    function TabletStylusInput(hand) {
+        this.hand = hand;
+        this.previousStylusTouchingTarget = false;
+        this.stylusTouchingTarget = false;
+
+        this.useFingerInsteadOfStylus = false;
+        this.fingerPointing = false;
+
+        // initialize stylus tip
+        var DEFAULT_STYLUS_TIP = {
+            position: {x: 0, y: 0, z: 0},
+            orientation: {x: 0, y: 0, z: 0, w: 0},
+            rotation: {x: 0, y: 0, z: 0, w: 0},
+            velocity: {x: 0, y: 0, z: 0},
+            valid: false
+        };
+        this.stylusTip = DEFAULT_STYLUS_TIP;
+
+
+        this.parameters = makeDispatcherModuleParameters(
+            100,
+            this.hand === RIGHT_HAND ? ["rightHand"] : ["leftHand"],
+            [],
+            100);
+
+        this.getOtherHandController = function() {
+            return (this.hand === RIGHT_HAND) ? leftTabletStylusInput : rightTabletStylusInput;
+        };
+
+        this.handToController = function() {
+            return (this.hand === RIGHT_HAND) ? Controller.Standard.RightHand : Controller.Standard.LeftHand;
+        };
+
+        this.updateFingerAsStylusSetting = function () {
+            var DEFAULT_USE_FINGER_AS_STYLUS = false;
+            var USE_FINGER_AS_STYLUS = Settings.getValue("preferAvatarFingerOverStylus");
+            if (USE_FINGER_AS_STYLUS === "") {
+                USE_FINGER_AS_STYLUS = DEFAULT_USE_FINGER_AS_STYLUS;
+            }
+            if (USE_FINGER_AS_STYLUS && MyAvatar.getJointIndex("LeftHandIndex4") !== -1) {
+                this.useFingerInsteadOfStylus = true;
+            } else {
+                this.useFingerInsteadOfStylus = false;
+            }
+        };
+
+        this.updateStylusTip = function() {
+            if (this.useFingerInsteadOfStylus) {
+                this.stylusTip = getFingerWorldLocation(this.hand);
+            } else {
+                this.stylusTip = getControllerWorldLocation(this.handToController(), true);
+
+                // translate tip forward according to constant.
+                var TIP_OFFSET = Vec3.multiply(MyAvatar.sensorToWorldScale, {x: 0, y: WEB_STYLUS_LENGTH - WEB_TOUCH_Y_OFFSET, z: 0});
+                this.stylusTip.position = Vec3.sum(this.stylusTip.position,
+                    Vec3.multiplyQbyV(this.stylusTip.orientation, TIP_OFFSET));
+            }
+
+            // compute tip velocity from hand controller motion, it is more accurate than computing it from previous positions.
+            var pose = Controller.getPoseValue(this.handToController());
+            if (pose.valid) {
+                var worldControllerPos = Vec3.sum(MyAvatar.position, Vec3.multiplyQbyV(MyAvatar.orientation, pose.translation));
+                var worldControllerLinearVel = Vec3.multiplyQbyV(MyAvatar.orientation, pose.velocity);
+                var worldControllerAngularVel = Vec3.multiplyQbyV(MyAvatar.orientation, pose.angularVelocity);
+                var tipVelocity = Vec3.sum(worldControllerLinearVel, Vec3.cross(worldControllerAngularVel,
+                    Vec3.subtract(this.stylusTip.position, worldControllerPos)));
+                this.stylusTip.velocity = tipVelocity;
+            } else {
+                this.stylusTip.velocity = {x: 0, y: 0, z: 0};
+            }
+        };
+
+        this.showStylus = function() {
+            if (this.stylus) {
+                var X_ROT_NEG_90 = { x: -0.70710678, y: 0, z: 0, w: 0.70710678 };
+                var modelOrientation = Quat.multiply(this.stylusTip.orientation, X_ROT_NEG_90);
+                var modelOrientationAngles = Quat.safeEulerAngles(modelOrientation);
+
+                var rotation = Overlays.getProperty(this.stylus, "rotation");
+                var rotationAngles = Quat.safeEulerAngles(rotation);
+
+                if(!Vec3.withinEpsilon(modelOrientationAngles, rotationAngles, 1)) {
+                    var modelPositionOffset = Vec3.multiplyQbyV(modelOrientation, { x: 0, y: 0, z: MyAvatar.sensorToWorldScale * -WEB_STYLUS_LENGTH / 2 });
+
+                    var updatedStylusProperties = { 
+                        position: Vec3.sum(this.stylusTip.position, modelPositionOffset),
+                        rotation: modelOrientation,
+                        dimensions: Vec3.multiply(MyAvatar.sensorToWorldScale, { x: 0.01, y: 0.01, z: WEB_STYLUS_LENGTH }),
+                    };
+
+                    Overlays.editOverlay(this.stylus, updatedStylusProperties);
+                }
+
+                return;
+            }
+
+            var X_ROT_NEG_90 = { x: -0.70710678, y: 0, z: 0, w: 0.70710678 };
+            var modelOrientation = Quat.multiply(this.stylusTip.orientation, X_ROT_NEG_90);
+            var modelPositionOffset = Vec3.multiplyQbyV(modelOrientation, { x: 0, y: 0, z: MyAvatar.sensorToWorldScale * -WEB_STYLUS_LENGTH / 2 });
+
+            var stylusProperties = {
+                name: "stylus",
+                url: Script.resourcesPath() + "meshes/tablet-stylus-fat.fbx",
+                loadPriority: 10.0,
+                position: Vec3.sum(this.stylusTip.position, modelPositionOffset),
+                rotation: modelOrientation,
+                dimensions: Vec3.multiply(MyAvatar.sensorToWorldScale, { x: 0.01, y: 0.01, z: WEB_STYLUS_LENGTH }),
+                solid: true,
+                visible: true,
+                ignoreRayIntersection: true,
+                drawInFront: false,
+                parentID: MyAvatar.SELF_ID,
+                parentJointIndex: MyAvatar.getJointIndex(this.hand === RIGHT_HAND ?
+                    "_CAMERA_RELATIVE_CONTROLLER_RIGHTHAND" :
+                    "_CAMERA_RELATIVE_CONTROLLER_LEFTHAND")
+            };
+            this.stylus = Overlays.addOverlay("model", stylusProperties);
+        };
+
+        this.hideStylus = function() {
+            if (!this.stylus) {
+                return;
+            }
+            Overlays.deleteOverlay(this.stylus);
+            this.stylus = null;
+        };
+
+        this.stealTouchFocus = function(stylusTarget) {
+            // send hover events to target
+            // record the entity or overlay we are hovering over.
+            if ((stylusTarget.entityID === this.getOtherHandController().hoverEntity) ||
+                (stylusTarget.overlayID === this.getOtherHandController().hoverOverlay)) {
+                this.getOtherHandController().relinquishTouchFocus();
+            }
+            this.requestTouchFocus(stylusTarget);
+        };
+
+        this.requestTouchFocus = function(stylusTarget) {
+
+            // send hover events to target if we can.
+            // record the entity or overlay we are hovering over.
+            if (stylusTarget.entityID &&
+                stylusTarget.entityID !== this.hoverEntity &&
+                stylusTarget.entityID !== this.getOtherHandController().hoverEntity) {
+                this.hoverEntity = stylusTarget.entityID;
+                TouchEventUtils.sendHoverEnterEventToTouchTarget(this.hand, stylusTarget);
+            } else if (stylusTarget.overlayID &&
+                       stylusTarget.overlayID !== this.hoverOverlay &&
+                       stylusTarget.overlayID !== this.getOtherHandController().hoverOverlay) {
+                this.hoverOverlay = stylusTarget.overlayID;
+                TouchEventUtils.sendHoverEnterEventToTouchTarget(this.hand, stylusTarget);
+            }
+        };
+
+        this.hasTouchFocus = function(stylusTarget) {
+            return ((stylusTarget.entityID && stylusTarget.entityID === this.hoverEntity) ||
+                    (stylusTarget.overlayID && stylusTarget.overlayID === this.hoverOverlay));
+        };
+
+        this.relinquishTouchFocus = function() {
+            // send hover leave event.
+            var pointerEvent = { type: "Move", id: this.hand + 1 };
+            if (this.hoverEntity) {
+                Entities.sendHoverLeaveEntity(this.hoverEntity, pointerEvent);
+                this.hoverEntity = null;
+            } else if (this.hoverOverlay) {
+                Overlays.sendMouseMoveOnOverlay(this.hoverOverlay, pointerEvent);
+                Overlays.sendHoverOverOverlay(this.hoverOverlay, pointerEvent);
+                Overlays.sendHoverLeaveOverlay(this.hoverOverlay, pointerEvent);
+                this.hoverOverlay = null;
+            }
+        };
+
+        this.pointFinger = function(value) {
+            var HIFI_POINT_INDEX_MESSAGE_CHANNEL = "Hifi-Point-Index";
+            if (this.fingerPointing !== value) {
+                var message;
+                if (this.hand === RIGHT_HAND) {
+                    message = { pointRightIndex: value };
+                } else {
+                    message = { pointLeftIndex: value };
+                }
+                Messages.sendMessage(HIFI_POINT_INDEX_MESSAGE_CHANNEL, JSON.stringify(message), true);
+                this.fingerPointing = value;
+            }
+        };
+
+        this.otherModuleNeedsToRun = function(controllerData) {
+            var grabOverlayModuleName = this.hand === RIGHT_HAND ? "RightNearParentingGrabOverlay" : "LeftNearParentingGrabOverlay";
+            var grabOverlayModule = getEnabledModuleByName(grabOverlayModuleName);
+            var grabOverlayModuleReady = grabOverlayModule ? grabOverlayModule.isReady(controllerData) : makeRunningValues(false, [], []);
+            var farGrabModuleName = this.hand === RIGHT_HAND ? "RightFarActionGrabEntity" : "LeftFarActionGrabEntity";
+            var farGrabModule = getEnabledModuleByName(farGrabModuleName);
+            var farGrabModuleReady = farGrabModule ? farGrabModule.isReady(controllerData) : makeRunningValues(false, [], []);
+            return grabOverlayModuleReady.active || farGrabModuleReady.active;
+        };
+
+        this.processStylus = function(controllerData) {
+            this.updateStylusTip();
+
+            if (!this.stylusTip.valid || this.overlayLaserActive(controllerData) || this.otherModuleNeedsToRun(controllerData)) {
+                this.pointFinger(false);
+                this.hideStylus();
+                this.stylusTouchingTarget = false;
+                this.relinquishTouchFocus();
+                return false;
+            }
+
+            if (this.useFingerInsteadOfStylus) {
+                this.hideStylus();
+            }
+
+            // build list of stylus targets, near the stylusTip
+            var stylusTargets = [];
+            var candidateEntities = controllerData.nearbyEntityProperties;
+            var i, props, stylusTarget;
+            for (i = 0; i < candidateEntities.length; i++) {
+                props = candidateEntities[i];
+                if (props && props.type === "Web") {
+                    stylusTarget = TouchEventUtils.calculateTouchTargetFromEntity(this.stylusTip, candidateEntities[i]);
+                    if (stylusTarget) {
+                        stylusTargets.push(stylusTarget);
+                    }
+                }
+            }
+
+            // add the tabletScreen, if it is valid
+            if (HMD.tabletScreenID && HMD.tabletScreenID !== Uuid.NULL &&
+                Overlays.getProperty(HMD.tabletScreenID, "visible")) {
+                stylusTarget = TouchEventUtils.calculateTouchTargetFromOverlay(this.stylusTip, HMD.tabletScreenID);
+                if (stylusTarget) {
+                    stylusTargets.push(stylusTarget);
+                }
+            }
+
+            // add the tablet home button.
+            if (HMD.homeButtonID && HMD.homeButtonID !== Uuid.NULL &&
+                Overlays.getProperty(HMD.homeButtonID, "visible")) {
+                stylusTarget = TouchEventUtils.calculateTouchTargetFromOverlay(this.stylusTip, HMD.homeButtonID);
+                if (stylusTarget) {
+                    stylusTargets.push(stylusTarget);
+                }
+            }
+
+            var TABLET_MIN_HOVER_DISTANCE = 0.01;
+            var TABLET_MAX_HOVER_DISTANCE = 0.1;
+            var TABLET_MIN_TOUCH_DISTANCE = -0.05;
+            var TABLET_MAX_TOUCH_DISTANCE = TABLET_MIN_HOVER_DISTANCE;
+            var EDGE_BORDER = 0.075;
+
+            var hysteresisOffset = 0.0;
+            if (this.isNearStylusTarget) {
+                hysteresisOffset = 0.05;
+            }
+
+            var sensorScaleFactor = MyAvatar.sensorToWorldScale;
+            this.isNearStylusTarget = isNearStylusTarget(stylusTargets,
+                (EDGE_BORDER + hysteresisOffset) * sensorScaleFactor,
+                (TABLET_MIN_TOUCH_DISTANCE - hysteresisOffset) * sensorScaleFactor,
+                (WEB_DISPLAY_STYLUS_DISTANCE + hysteresisOffset) * sensorScaleFactor);
+
+            if (this.isNearStylusTarget) {
+                if (!this.useFingerInsteadOfStylus) {
+                    this.showStylus();
+                } else {
+                    this.pointFinger(true);
+                }
+            } else {
+                this.hideStylus();
+                this.pointFinger(false);
+            }
+
+            var nearestStylusTarget = calculateNearestStylusTarget(stylusTargets);
+
+            var SCALED_TABLET_MIN_TOUCH_DISTANCE = TABLET_MIN_TOUCH_DISTANCE * sensorScaleFactor;
+            var SCALED_TABLET_MAX_TOUCH_DISTANCE = TABLET_MAX_TOUCH_DISTANCE * sensorScaleFactor;
+            var SCALED_TABLET_MAX_HOVER_DISTANCE = TABLET_MAX_HOVER_DISTANCE * sensorScaleFactor;
+
+            if (nearestStylusTarget && nearestStylusTarget.distance > SCALED_TABLET_MIN_TOUCH_DISTANCE &&
+                nearestStylusTarget.distance < SCALED_TABLET_MAX_HOVER_DISTANCE && !this.getOtherHandController().stylusTouchingTarget) {
+
+                this.requestTouchFocus(nearestStylusTarget);
+
+                if (!TouchEventUtils.touchTargetHasKeyboardFocus(nearestStylusTarget)) {
+                    TouchEventUtils.setKeyboardFocusOnTouchTarget(nearestStylusTarget);
+                }
+
+                if (this.hasTouchFocus(nearestStylusTarget) && !this.stylusTouchingTarget) {
+                    TouchEventUtils.sendHoverOverEventToTouchTarget(this.hand, nearestStylusTarget);
+                }
+
+                // filter out presses when tip is moving away from tablet.
+                // ensure that stylus is within bounding box by checking normalizedPosition
+                if (nearestStylusTarget.valid && nearestStylusTarget.distance > SCALED_TABLET_MIN_TOUCH_DISTANCE &&
+                    nearestStylusTarget.distance < SCALED_TABLET_MAX_TOUCH_DISTANCE &&
+                    Vec3.dot(this.stylusTip.velocity, nearestStylusTarget.normal) < 0 &&
+                    nearestStylusTarget.normalizedPosition.x >= 0 && nearestStylusTarget.normalizedPosition.x <= 1 &&
+                    nearestStylusTarget.normalizedPosition.y >= 0 && nearestStylusTarget.normalizedPosition.y <= 1) {
+
+                    this.stylusTarget = nearestStylusTarget;
+                    this.stylusTouchingTarget = true;
+                }
+            } else {
+                this.relinquishTouchFocus();
+            }
+
+            this.homeButtonTouched = false;
+
+            if (this.isNearStylusTarget) {
+                return true;
+            } else {
+                this.pointFinger(false);
+                this.hideStylus();
+                return false;
+            }
+        };
+
+        this.stylusTouchingEnter = function () {
+            this.stealTouchFocus(this.stylusTarget);
+            TouchEventUtils.sendTouchStartEventToTouchTarget(this.hand, this.stylusTarget);
+            Controller.triggerHapticPulse(HAPTIC_STYLUS_STRENGTH, HAPTIC_STYLUS_DURATION, this.hand);
+
+            this.touchingEnterTimer = 0;
+            this.touchingEnterStylusTarget = this.stylusTarget;
+            this.deadspotExpired = false;
+
+            var TOUCH_PRESS_TO_MOVE_DEADSPOT = 0.0481;
+            this.deadspotRadius = TOUCH_PRESS_TO_MOVE_DEADSPOT;
+        };
+
+        this.stylusTouchingExit = function () {
+
+            if (this.stylusTarget === undefined) {
+                return;
+            }
+
+            // special case to handle home button.
+            if (this.stylusTarget.overlayID === HMD.homeButtonID) {
+                Messages.sendLocalMessage("home", this.stylusTarget.overlayID);
+            }
+
+            // send press event
+            if (this.deadspotExpired) {
+                TouchEventUtils.sendTouchEndEventToTouchTarget(this.hand, this.stylusTarget);
+            } else {
+                TouchEventUtils.sendTouchEndEventToTouchTarget(this.hand, this.touchingEnterStylusTarget);
+            }
+        };
+
+        this.stylusTouching = function (controllerData, dt) {
+
+            this.touchingEnterTimer += dt;
+
+            if (this.stylusTarget.entityID) {
+                this.stylusTarget = TouchEventUtils.calculateTouchTargetFromEntity(this.stylusTip, this.stylusTarget.entityProps);
+            } else if (this.stylusTarget.overlayID) {
+                this.stylusTarget = TouchEventUtils.calculateTouchTargetFromOverlay(this.stylusTip, this.stylusTarget.overlayID);
+            }
+
+            var TABLET_MIN_TOUCH_DISTANCE = -0.1;
+            var TABLET_MAX_TOUCH_DISTANCE = 0.01;
+
+            if (this.stylusTarget) {
+                if (this.stylusTarget.distance > TABLET_MIN_TOUCH_DISTANCE &&
+                    this.stylusTarget.distance < TABLET_MAX_TOUCH_DISTANCE) {
+                    var POINTER_PRESS_TO_MOVE_DELAY = 0.33; // seconds
+                    if (this.deadspotExpired || this.touchingEnterTimer > POINTER_PRESS_TO_MOVE_DELAY ||
+                        distance2D(this.stylusTarget.position2D,
+                            this.touchingEnterStylusTarget.position2D) > this.deadspotRadius) {
+                        TouchEventUtils.sendTouchMoveEventToTouchTarget(this.hand, this.stylusTarget);
+                        this.deadspotExpired = true;
+                    }
+                } else {
+                    this.stylusTouchingTarget = false;
+                }
+            } else {
+                this.stylusTouchingTarget = false;
+            }
+        };
+
+        this.overlayLaserActive = function(controllerData) {
+            var rightOverlayLaserModule = getEnabledModuleByName("RightOverlayLaserInput");
+            var leftOverlayLaserModule = getEnabledModuleByName("LeftOverlayLaserInput");
+            var rightModuleRunning = rightOverlayLaserModule ? !rightOverlayLaserModule.shouldExit(controllerData) : false;
+            var leftModuleRunning = leftOverlayLaserModule ? !leftOverlayLaserModule.shouldExit(controllerData) : false;
+            return leftModuleRunning || rightModuleRunning;
+        };
+
+        this.isReady = function (controllerData) {
+            if (this.processStylus(controllerData)) {
+                return makeRunningValues(true, [], []);
+            } else {
+                return makeRunningValues(false, [], []);
+            }
+        };
+
+        this.run = function (controllerData, deltaTime) {
+            this.updateFingerAsStylusSetting();
+
+            if (!this.previousStylusTouchingTarget && this.stylusTouchingTarget) {
+                this.stylusTouchingEnter();
+            }
+            if (this.previousStylusTouchingTarget && !this.stylusTouchingTarget) {
+                this.stylusTouchingExit();
+            }
+            this.previousStylusTouchingTarget = this.stylusTouchingTarget;
+
+            if (this.stylusTouchingTarget) {
+                this.stylusTouching(controllerData, deltaTime);
+            }
+            if (this.processStylus(controllerData)) {
+                return makeRunningValues(true, [], []);
+            } else {
+                return makeRunningValues(false, [], []);
+            }
+        };
+
+        this.cleanup = function () {
+            this.hideStylus();
+        };
+    }
+
+    var leftTabletStylusInput = new TabletStylusInput(LEFT_HAND);
+    var rightTabletStylusInput = new TabletStylusInput(RIGHT_HAND);
+
+    enableDispatcherModule("LeftTabletStylusInput", leftTabletStylusInput);
+    enableDispatcherModule("RightTabletStylusInput", rightTabletStylusInput);
+
+    this.cleanup = function () {
+        leftTabletStylusInput.cleanup();
+        rightTabletStylusInput.cleanup();
+        disableDispatcherModule("LeftTabletStylusInput");
+        disableDispatcherModule("RightTabletStylusInput");
+    };
+    Script.scriptEnding.connect(this.cleanup);
+}());
diff --git a/scripts/system/controllers/controllerModules/teleport.js b/scripts/system/controllers/controllerModules/teleport.js
new file mode 100644
index 0000000000..c4fbe781b9
--- /dev/null
+++ b/scripts/system/controllers/controllerModules/teleport.js
@@ -0,0 +1,502 @@
+"use strict";
+
+// Created by james b. pollack @imgntn on 7/2/2016
+// Copyright 2016 High Fidelity, Inc.
+//
+//  Creates a beam and target and then teleports you there.  Release when its close to you to cancel.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+
+/* jslint bitwise: true */
+
+/* global Script, Entities, MyAvatar, Controller, RIGHT_HAND, LEFT_HAND, getControllerJointIndex,
+   enableDispatcherModule, disableDispatcherModule, Messages, makeDispatcherModuleParameters, makeRunningValues, Vec3,
+   LaserPointers, RayPick, HMD, Uuid, AvatarList
+*/
+
+Script.include("/~/system/libraries/Xform.js");
+Script.include("/~/system/libraries/controllerDispatcherUtils.js");
+Script.include("/~/system/libraries/controllers.js");
+
+(function() { // BEGIN LOCAL_SCOPE
+
+    var TARGET_MODEL_URL = Script.resolvePath("../../assets/models/teleport-destination.fbx");
+    var TOO_CLOSE_MODEL_URL = Script.resolvePath("../../assets/models/teleport-cancel.fbx");
+    var SEAT_MODEL_URL = Script.resolvePath("../../assets/models/teleport-seat.fbx");
+
+    var TARGET_MODEL_DIMENSIONS = {
+        x: 1.15,
+        y: 0.5,
+        z: 1.15
+    };
+
+    var COLORS_TELEPORT_SEAT = {
+        red: 255,
+        green: 0,
+        blue: 170
+    };
+
+    var COLORS_TELEPORT_CAN_TELEPORT = {
+        red: 97,
+        green: 247,
+        blue: 255
+    };
+
+    var COLORS_TELEPORT_CANCEL = {
+        red: 255,
+        green: 184,
+        blue: 73
+    };
+
+    var TELEPORT_CANCEL_RANGE = 1;
+    var COOL_IN_DURATION = 300;
+
+    var handInfo = {
+        right: {
+            controllerInput: Controller.Standard.RightHand
+        },
+        left: {
+            controllerInput: Controller.Standard.LeftHand
+        }
+    };
+
+    var cancelPath = {
+        type: "line3d",
+        color: COLORS_TELEPORT_CANCEL,
+        ignoreRayIntersection: true,
+        alpha: 1,
+        solid: true,
+        drawInFront: true,
+        glow: 1.0
+    };
+    var teleportPath = {
+        type: "line3d",
+        color: COLORS_TELEPORT_CAN_TELEPORT,
+        ignoreRayIntersection: true,
+        alpha: 1,
+        solid: true,
+        drawInFront: true,
+        glow: 1.0
+    };
+    var seatPath = {
+        type: "line3d",
+        color: COLORS_TELEPORT_SEAT,
+        ignoreRayIntersection: true,
+        alpha: 1,
+        solid: true,
+        drawInFront: true,
+        glow: 1.0
+    };
+    var cancelEnd = {
+        type: "model",
+        url: TOO_CLOSE_MODEL_URL,
+        dimensions: TARGET_MODEL_DIMENSIONS,
+        ignoreRayIntersection: true
+    };
+    var teleportEnd = {
+        type: "model",
+        url: TARGET_MODEL_URL,
+        dimensions: TARGET_MODEL_DIMENSIONS,
+        ignoreRayIntersection: true
+    };
+    var seatEnd = {
+        type: "model",
+        url: SEAT_MODEL_URL,
+        dimensions: TARGET_MODEL_DIMENSIONS,
+        ignoreRayIntersection: true
+    };
+
+
+    var teleportRenderStates = [{name: "cancel", path: cancelPath, end: cancelEnd},
+                                {name: "teleport", path: teleportPath, end: teleportEnd},
+                                {name: "seat", path: seatPath, end: seatEnd}];
+
+    var DEFAULT_DISTANCE = 50;
+    var teleportDefaultRenderStates = [{name: "cancel", distance: DEFAULT_DISTANCE, path: cancelPath}];
+
+    var coolInTimeout = null;
+    var ignoredEntities = [];
+
+
+    var TELEPORTER_STATES = {
+        IDLE: 'idle',
+        COOL_IN: 'cool_in',
+        TARGETTING: 'targetting',
+        TARGETTING_INVALID: 'targetting_invalid'
+    };
+
+    var TARGET = {
+        NONE: 'none',            // Not currently targetting anything
+        INVISIBLE: 'invisible',  // The current target is an invvsible surface
+        INVALID: 'invalid',      // The current target is invalid (wall, ceiling, etc.)
+        SURFACE: 'surface',      // The current target is a valid surface
+        SEAT: 'seat'             // The current target is a seat
+    };
+
+    function Teleporter(hand) {
+        var _this = this;
+        this.hand = hand;
+        this.buttonValue = 0;
+        this.disabled = false;  // used by the 'Hifi-Teleport-Disabler' message handler
+        this.active = false;
+        this.state = TELEPORTER_STATES.IDLE;
+        this.currentTarget = TARGET.INVALID;
+        this.currentResult = null;
+
+        this.getOtherModule = function() {
+            var otherModule = this.hand === RIGHT_HAND ? leftTeleporter : rightTeleporter;
+            return otherModule;
+        };
+
+        this.teleportRayHandVisible = LaserPointers.createLaserPointer({
+            joint: (_this.hand === RIGHT_HAND) ? "RightHand" : "LeftHand",
+            filter: RayPick.PICK_ENTITIES,
+            faceAvatar: true,
+            scaleWithAvatar: true,
+            centerEndY: false,
+            renderStates: teleportRenderStates,
+            defaultRenderStates: teleportDefaultRenderStates
+        });
+        this.teleportRayHandInvisible = LaserPointers.createLaserPointer({
+            joint: (_this.hand === RIGHT_HAND) ? "RightHand" : "LeftHand",
+            filter: RayPick.PICK_ENTITIES | RayPick.PICK_INCLUDE_INVISIBLE,
+            faceAvatar: true,
+            scaleWithAvatar: true,
+            centerEndY: false,
+            renderStates: teleportRenderStates
+        });
+        this.teleportRayHeadVisible = LaserPointers.createLaserPointer({
+            joint: "Avatar",
+            filter: RayPick.PICK_ENTITIES,
+            faceAvatar: true,
+            scaleWithAvatar: true,
+            centerEndY: false,
+            renderStates: teleportRenderStates,
+            defaultRenderStates: teleportDefaultRenderStates
+        });
+        this.teleportRayHeadInvisible = LaserPointers.createLaserPointer({
+            joint: "Avatar",
+            filter: RayPick.PICK_ENTITIES | RayPick.PICK_INCLUDE_INVISIBLE,
+            faceAvatar: true,
+            scaleWithAvatar: true,
+            centerEndY: false,
+            renderStates: teleportRenderStates
+        });
+
+        this.cleanup = function() {
+            LaserPointers.removeLaserPointer(this.teleportRayHandVisible);
+            LaserPointers.removeLaserPointer(this.teleportRayHandInvisible);
+            LaserPointers.removeLaserPointer(this.teleportRayHeadVisible);
+            LaserPointers.removeLaserPointer(this.teleportRayHeadInvisible);
+        };
+
+        this.buttonPress = function(value) {
+            _this.buttonValue = value;
+        };
+
+        this.parameters = makeDispatcherModuleParameters(
+            80,
+            this.hand === RIGHT_HAND ? ["rightHand"] : ["leftHand"],
+            [],
+            100);
+
+        this.enterTeleport = function() {
+            if (coolInTimeout !== null) {
+                Script.clearTimeout(coolInTimeout);
+            }
+
+            this.state = TELEPORTER_STATES.COOL_IN;
+            coolInTimeout = Script.setTimeout(function() {
+                if (_this.state === TELEPORTER_STATES.COOL_IN) {
+                    _this.state = TELEPORTER_STATES.TARGETTING;
+                }
+            }, COOL_IN_DURATION);
+
+            // pad scale with avatar size
+            var AVATAR_PROPORTIONAL_TARGET_MODEL_DIMENSIONS = Vec3.multiply(MyAvatar.sensorToWorldScale, TARGET_MODEL_DIMENSIONS);
+
+            if (!Vec3.equal(AVATAR_PROPORTIONAL_TARGET_MODEL_DIMENSIONS, cancelEnd.dimensions)) {
+                cancelEnd.dimensions = AVATAR_PROPORTIONAL_TARGET_MODEL_DIMENSIONS;
+                teleportEnd.dimensions = AVATAR_PROPORTIONAL_TARGET_MODEL_DIMENSIONS;
+                seatEnd.dimensions = AVATAR_PROPORTIONAL_TARGET_MODEL_DIMENSIONS;
+
+                teleportRenderStates = [{name: "cancel", path: cancelPath, end: cancelEnd},
+                                        {name: "teleport", path: teleportPath, end: teleportEnd},
+                                        {name: "seat", path: seatPath, end: seatEnd}];
+
+                LaserPointers.editRenderState(this.teleportRayHandVisible, "cancel", teleportRenderStates[0]);
+                LaserPointers.editRenderState(this.teleportRayHandInvisible, "cancel", teleportRenderStates[0]);
+                LaserPointers.editRenderState(this.teleportRayHeadVisible, "cancel", teleportRenderStates[0]);
+                LaserPointers.editRenderState(this.teleportRayHeadInvisible, "cancel", teleportRenderStates[0]);
+
+                LaserPointers.editRenderState(this.teleportRayHandVisible, "teleport", teleportRenderStates[1]);
+                LaserPointers.editRenderState(this.teleportRayHandInvisible, "teleport", teleportRenderStates[1]);
+                LaserPointers.editRenderState(this.teleportRayHeadVisible, "teleport", teleportRenderStates[1]);
+                LaserPointers.editRenderState(this.teleportRayHeadInvisible, "teleport", teleportRenderStates[1]);
+
+                LaserPointers.editRenderState(this.teleportRayHandVisible, "seat", teleportRenderStates[2]);
+                LaserPointers.editRenderState(this.teleportRayHandInvisible, "seat", teleportRenderStates[2]);
+                LaserPointers.editRenderState(this.teleportRayHeadVisible, "seat", teleportRenderStates[2]);
+                LaserPointers.editRenderState(this.teleportRayHeadInvisible, "seat", teleportRenderStates[2]);
+            }
+        };
+
+        this.isReady = function(controllerData, deltaTime) {
+            var otherModule = this.getOtherModule();
+            if (!this.disabled && this.buttonValue !== 0 && !otherModule.active) {
+                this.active = true;
+                this.enterTeleport();
+                return makeRunningValues(true, [], []);
+            }
+            return makeRunningValues(false, [], []);
+        };
+
+        this.run = function(controllerData, deltaTime) {
+
+            // Get current hand pose information to see if the pose is valid
+            var pose = Controller.getPoseValue(handInfo[(_this.hand === RIGHT_HAND) ? 'right' : 'left'].controllerInput);
+            var mode = pose.valid ? _this.hand : 'head';
+            if (!pose.valid) {
+                LaserPointers.disableLaserPointer(_this.teleportRayHandVisible);
+                LaserPointers.disableLaserPointer(_this.teleportRayHandInvisible);
+                LaserPointers.enableLaserPointer(_this.teleportRayHeadVisible);
+                LaserPointers.enableLaserPointer(_this.teleportRayHeadInvisible);
+            } else {
+                LaserPointers.enableLaserPointer(_this.teleportRayHandVisible);
+                LaserPointers.enableLaserPointer(_this.teleportRayHandInvisible);
+                LaserPointers.disableLaserPointer(_this.teleportRayHeadVisible);
+                LaserPointers.disableLaserPointer(_this.teleportRayHeadInvisible);
+            }
+
+            // We do up to 2 ray picks to find a teleport location.
+            // There are 2 types of teleport locations we are interested in:
+            //   1. A visible floor. This can be any entity surface that points within some degree of "up"
+            //   2. A seat. The seat can be visible or invisible.
+            //
+            //  * In the first pass we pick against visible and invisible entities so that we can find invisible seats.
+            //    We might hit an invisible entity that is not a seat, so we need to do a second pass.
+            //  * In the second pass we pick against visible entities only.
+            //
+            var result;
+            if (mode === 'head') {
+                result = LaserPointers.getPrevRayPickResult(_this.teleportRayHeadInvisible);
+            } else {
+                result = LaserPointers.getPrevRayPickResult(_this.teleportRayHandInvisible);
+            }
+
+            var teleportLocationType = getTeleportTargetType(result);
+            if (teleportLocationType === TARGET.INVISIBLE) {
+                if (mode === 'head') {
+                    result = LaserPointers.getPrevRayPickResult(_this.teleportRayHeadVisible);
+                } else {
+                    result = LaserPointers.getPrevRayPickResult(_this.teleportRayHandVisible);
+                }
+                teleportLocationType = getTeleportTargetType(result);
+            }
+
+            if (teleportLocationType === TARGET.NONE) {
+                // Use the cancel default state
+                this.setTeleportState(mode, "cancel", "");
+            } else if (teleportLocationType === TARGET.INVALID || teleportLocationType === TARGET.INVISIBLE) {
+                this.setTeleportState(mode, "", "cancel");
+            } else if (teleportLocationType === TARGET.SURFACE) {
+                if (this.state === TELEPORTER_STATES.COOL_IN) {
+                    this.setTeleportState(mode, "cancel", "");
+                } else {
+                    this.setTeleportState(mode, "teleport", "");
+                }
+            } else if (teleportLocationType === TARGET.SEAT) {
+                this.setTeleportState(mode, "", "seat");
+            }
+            return this.teleport(result, teleportLocationType);
+        };
+
+        this.teleport = function(newResult, target) {
+            var result = newResult;
+            if (_this.buttonValue !== 0) {
+                return makeRunningValues(true, [], []);
+            }
+
+            if (target === TARGET.NONE || target === TARGET.INVALID || this.state === TELEPORTER_STATES.COOL_IN) {
+                // Do nothing
+            } else if (target === TARGET.SEAT) {
+                Entities.callEntityMethod(result.objectID, 'sit');
+            } else if (target === TARGET.SURFACE) {
+                var offset = getAvatarFootOffset();
+                result.intersection.y += offset;
+                MyAvatar.goToLocation(result.intersection, false, {x: 0, y: 0, z: 0, w: 1}, false);
+                HMD.centerUI();
+                MyAvatar.centerBody();
+            }
+
+            this.disableLasers();
+            this.active = false;
+            return makeRunningValues(false, [], []);
+        };
+
+        this.disableLasers = function() {
+            LaserPointers.disableLaserPointer(_this.teleportRayHandVisible);
+            LaserPointers.disableLaserPointer(_this.teleportRayHandInvisible);
+            LaserPointers.disableLaserPointer(_this.teleportRayHeadVisible);
+            LaserPointers.disableLaserPointer(_this.teleportRayHeadInvisible);
+        };
+
+        this.setTeleportState = function(mode, visibleState, invisibleState) {
+            if (mode === 'head') {
+                LaserPointers.setRenderState(_this.teleportRayHeadVisible, visibleState);
+                LaserPointers.setRenderState(_this.teleportRayHeadInvisible, invisibleState);
+            } else {
+                LaserPointers.setRenderState(_this.teleportRayHandVisible, visibleState);
+                LaserPointers.setRenderState(_this.teleportRayHandInvisible, invisibleState);
+            }
+        };
+
+        this.setIgnoreEntities = function(entitiesToIgnore) {
+            LaserPointers.setIgnoreItems(this.teleportRayHandVisible, entitiesToIgnore);
+            LaserPointers.setIgnoreItems(this.teleportRayHandInvisible, entitiesToIgnore);
+            LaserPointers.setIgnoreItems(this.teleportRayHeadVisible, entitiesToIgnore);
+            LaserPointers.setIgnoreItems(this.teleportRayHeadInvisible, entitiesToIgnore);
+        };
+    }
+
+    // related to repositioning the avatar after you teleport
+    var FOOT_JOINT_NAMES = ["RightToe_End", "RightToeBase", "RightFoot"];
+    var DEFAULT_ROOT_TO_FOOT_OFFSET = 0.5;
+    function getAvatarFootOffset() {
+
+        // find a valid foot jointIndex
+        var footJointIndex = -1;
+        var i, l = FOOT_JOINT_NAMES.length;
+        for (i = 0; i < l; i++) {
+            footJointIndex = MyAvatar.getJointIndex(FOOT_JOINT_NAMES[i]);
+            if (footJointIndex !== -1) {
+                break;
+            }
+        }
+        if (footJointIndex !== -1) {
+            // default vertical offset from foot to avatar root.
+            var footPos = MyAvatar.getAbsoluteDefaultJointTranslationInObjectFrame(footJointIndex);
+            if (footPos.x === 0 && footPos.y === 0 && footPos.z === 0.0) {
+                // if footPos is exactly zero, it's probably wrong because avatar is currently loading, fall back to default.
+                return DEFAULT_ROOT_TO_FOOT_OFFSET * MyAvatar.scale;
+            } else {
+                return -footPos.y;
+            }
+        } else {
+            return DEFAULT_ROOT_TO_FOOT_OFFSET * MyAvatar.scale;
+        }
+    }
+
+    var mappingName, teleportMapping;
+
+    function parseJSON(json) {
+        try {
+            return JSON.parse(json);
+        } catch (e) {
+            return undefined;
+        }
+    }
+    // When determininig whether you can teleport to a location, the normal of the
+    // point that is being intersected with is looked at. If this normal is more
+    // than MAX_ANGLE_FROM_UP_TO_TELEPORT degrees from <0, 1, 0> (straight up), then
+    // you can't teleport there.
+    var MAX_ANGLE_FROM_UP_TO_TELEPORT = 70;
+    function getTeleportTargetType(result) {
+        if (result.type === RayPick.INTERSECTED_NONE) {
+            return TARGET.NONE;
+        }
+
+        var props = Entities.getEntityProperties(result.objectID, ['userData', 'visible']);
+        var data = parseJSON(props.userData);
+        if (data !== undefined && data.seat !== undefined) {
+            var avatarUuid = Uuid.fromString(data.seat.user);
+            if (Uuid.isNull(avatarUuid) || !AvatarList.getAvatar(avatarUuid)) {
+                return TARGET.SEAT;
+            } else {
+                return TARGET.INVALID;
+            }
+        }
+
+        if (!props.visible) {
+            return TARGET.INVISIBLE;
+        }
+
+        var surfaceNormal = result.surfaceNormal;
+        var adj = Math.sqrt(surfaceNormal.x * surfaceNormal.x + surfaceNormal.z * surfaceNormal.z);
+        var angleUp = Math.atan2(surfaceNormal.y, adj) * (180 / Math.PI);
+
+        if (angleUp < (90 - MAX_ANGLE_FROM_UP_TO_TELEPORT) ||
+            angleUp > (90 + MAX_ANGLE_FROM_UP_TO_TELEPORT) ||
+            Vec3.distance(MyAvatar.position, result.intersection) <= TELEPORT_CANCEL_RANGE * MyAvatar.sensorToWorldScale) {
+            return TARGET.INVALID;
+        } else {
+            return TARGET.SURFACE;
+        }
+    }
+
+    function registerMappings() {
+        mappingName = 'Hifi-Teleporter-Dev-' + Math.random();
+        teleportMapping = Controller.newMapping(mappingName);
+
+        teleportMapping.from(Controller.Standard.RightPrimaryThumb).peek().to(rightTeleporter.buttonPress);
+        teleportMapping.from(Controller.Standard.LeftPrimaryThumb).peek().to(leftTeleporter.buttonPress);
+    }
+
+    var leftTeleporter = new Teleporter(LEFT_HAND);
+    var rightTeleporter = new Teleporter(RIGHT_HAND);
+
+    enableDispatcherModule("LeftTeleporter", leftTeleporter);
+    enableDispatcherModule("RightTeleporter", rightTeleporter);
+    registerMappings();
+    Controller.enableMapping(mappingName);
+
+    function cleanup() {
+        teleportMapping.disable();
+        disableDispatcherModule("LeftTeleporter");
+        disableDispatcherModule("RightTeleporter");
+    }
+    Script.scriptEnding.connect(cleanup);
+
+    var handleTeleportMessages = function(channel, message, sender) {
+        if (sender === MyAvatar.sessionUUID) {
+            if (channel === 'Hifi-Teleport-Disabler') {
+                if (message === 'both') {
+                    leftTeleporter.disabled = true;
+                    rightTeleporter.disabled = true;
+                }
+                if (message === 'left') {
+                    leftTeleporter.disabled = true;
+                    rightTeleporter.disabled = false;
+                }
+                if (message === 'right') {
+                    leftTeleporter.disabled = false;
+                    rightTeleporter.disabled = true;
+                }
+                if (message === 'none') {
+                    leftTeleporter.disabled = false;
+                    rightTeleporter.disabled = false;
+                }
+            } else if (channel === 'Hifi-Teleport-Ignore-Add' &&
+                       !Uuid.isNull(message) &&
+                       ignoredEntities.indexOf(message) === -1) {
+                ignoredEntities.push(message);
+                leftTeleporter.setIgnoreEntities(ignoredEntities);
+                rightTeleporter.setIgnoreEntities(ignoredEntities);
+            } else if (channel === 'Hifi-Teleport-Ignore-Remove' && !Uuid.isNull(message)) {
+                var removeIndex = ignoredEntities.indexOf(message);
+                if (removeIndex > -1) {
+                    ignoredEntities.splice(removeIndex, 1);
+                    leftTeleporter.setIgnoreEntities(ignoredEntities);
+                    rightTeleporter.setIgnoreEntities(ignoredEntities);
+                }
+            }
+        }
+    };
+
+    Messages.subscribe('Hifi-Teleport-Disabler');
+    Messages.subscribe('Hifi-Teleport-Ignore-Add');
+    Messages.subscribe('Hifi-Teleport-Ignore-Remove');
+    Messages.messageReceived.connect(handleTeleportMessages);
+
+}()); // END LOCAL_SCOPE
diff --git a/scripts/system/controllers/controllerModules/webEntityLaserInput.js b/scripts/system/controllers/controllerModules/webEntityLaserInput.js
new file mode 100644
index 0000000000..36a36d38f3
--- /dev/null
+++ b/scripts/system/controllers/controllerModules/webEntityLaserInput.js
@@ -0,0 +1,471 @@
+"use strict";
+
+//  webEntityLaserInput.js
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+
+/* jslint bitwise: true */
+
+/* global Script, Controller, LaserPointers, RayPick, RIGHT_HAND, LEFT_HAND, Vec3, Quat, getGrabPointSphereOffset,
+   makeRunningValues, Entities, enableDispatcherModule, disableDispatcherModule, makeDispatcherModuleParameters,
+   PICK_MAX_DISTANCE, COLORS_GRAB_SEARCHING_HALF_SQUEEZE, COLORS_GRAB_SEARCHING_FULL_SQUEEZE, COLORS_GRAB_DISTANCE_HOLD,
+   DEFAULT_SEARCH_SPHERE_DISTANCE, TRIGGER_ON_VALUE, ZERO_VEC, Overlays
+*/
+
+Script.include("/~/system/libraries/controllerDispatcherUtils.js");
+Script.include("/~/system/libraries/controllers.js");
+
+(function() {
+    var END_RADIUS = 0.005;
+    var dim = { x: END_RADIUS, y: END_RADIUS, z: END_RADIUS };
+    var halfPath = {
+        type: "line3d",
+        color: COLORS_GRAB_SEARCHING_HALF_SQUEEZE,
+        visible: true,
+        alpha: 1,
+        solid: true,
+        glow: 1.0,
+        ignoreRayIntersection: true, // always ignore this
+        drawInFront: true, // Even when burried inside of something, show it.
+        parentID: MyAvatar.SELF_ID
+    };
+    var halfEnd = {
+        type: "sphere",
+        dimensions: dim,
+        solid: true,
+        color: COLORS_GRAB_SEARCHING_HALF_SQUEEZE,
+        alpha: 0.9,
+        ignoreRayIntersection: true,
+        drawInFront: true, // Even when burried inside of something, show it.
+        visible: true
+    };
+    var fullPath = {
+        type: "line3d",
+        color: COLORS_GRAB_SEARCHING_FULL_SQUEEZE,
+        visible: true,
+        alpha: 1,
+        solid: true,
+        glow: 1.0,
+        ignoreRayIntersection: true, // always ignore this
+        drawInFront: true, // Even when burried inside of something, show it.
+        parentID: MyAvatar.SELF_ID
+    };
+    var fullEnd = {
+        type: "sphere",
+        dimensions: dim,
+        solid: true,
+        color: COLORS_GRAB_SEARCHING_FULL_SQUEEZE,
+        alpha: 0.9,
+        ignoreRayIntersection: true,
+        drawInFront: true, // Even when burried inside of something, show it.
+        visible: true
+    };
+    var holdPath = {
+        type: "line3d",
+        color: COLORS_GRAB_DISTANCE_HOLD,
+        visible: true,
+        alpha: 1,
+        solid: true,
+        glow: 1.0,
+        ignoreRayIntersection: true, // always ignore this
+        drawInFront: true, // Even when burried inside of something, show it.
+        parentID: MyAvatar.SELF_ID
+    };
+
+    var renderStates = [
+        {name: "half", path: halfPath, end: halfEnd},
+        {name: "full", path: fullPath, end: fullEnd},
+        {name: "hold", path: holdPath}
+    ];
+
+    var defaultRenderStates = [
+        {name: "half", distance: DEFAULT_SEARCH_SPHERE_DISTANCE, path: halfPath},
+        {name: "full", distance: DEFAULT_SEARCH_SPHERE_DISTANCE, path: fullPath},
+        {name: "hold", distance: DEFAULT_SEARCH_SPHERE_DISTANCE, path: holdPath}
+    ];
+
+    // triggered when stylus presses a web overlay/entity
+    var HAPTIC_STYLUS_STRENGTH = 1.0;
+    var HAPTIC_STYLUS_DURATION = 20.0;
+
+    function laserTargetHasKeyboardFocus(laserTarget) {
+        if (laserTarget && laserTarget !== Uuid.NULL) {
+            return Entities.keyboardFocusOverlay === laserTarget;
+        }
+    }
+
+    function setKeyboardFocusOnLaserTarget(laserTarget) {
+        if (laserTarget && laserTarget !== Uuid.NULL) {
+            Entities.wantsHandControllerPointerEvents(laserTarget);
+            Overlays.keyboardFocusOverlay = Uuid.NULL;
+            Entities.keyboardFocusEntity = laserTarget;
+        }
+    }
+
+    function sendHoverEnterEventToLaserTarget(hand, laserTarget) {
+        if (!laserTarget) {
+            return;
+        }
+        var pointerEvent = {
+            type: "Move",
+            id: hand + 1, // 0 is reserved for hardware mouse
+            pos2D: laserTarget.position2D,
+            pos3D: laserTarget.position,
+            normal: laserTarget.normal,
+            direction: Vec3.subtract(ZERO_VEC, laserTarget.normal),
+            button: "None"
+        };
+
+        if (laserTarget.entityID && laserTarget.entityID !== Uuid.NULL) {
+            Entities.sendHoverEnterEntity(laserTarget.entityID, pointerEvent);
+        }
+    }
+
+    function sendHoverOverEventToLaserTarget(hand, laserTarget) {
+
+        if (!laserTarget) {
+            return;
+        }
+        var pointerEvent = {
+            type: "Move",
+            id: hand + 1, // 0 is reserved for hardware mouse
+            pos2D: laserTarget.position2D,
+            pos3D: laserTarget.position,
+            normal: laserTarget.normal,
+            direction: Vec3.subtract(ZERO_VEC, laserTarget.normal),
+            button: "None"
+        };
+
+        if (laserTarget.entityID && laserTarget.entityID !== Uuid.NULL) {
+            Entities.sendMouseMoveOnEntity(laserTarget.entityID, pointerEvent);
+            Entities.sendHoverOverEntity(laserTarget.entityID, pointerEvent);
+        }
+    }
+
+
+    function sendTouchStartEventToLaserTarget(hand, laserTarget) {
+        var pointerEvent = {
+            type: "Press",
+            id: hand + 1, // 0 is reserved for hardware mouse
+            pos2D: laserTarget.position2D,
+            pos3D: laserTarget.position,
+            normal: laserTarget.normal,
+            direction: Vec3.subtract(ZERO_VEC, laserTarget.normal),
+            button: "Primary",
+            isPrimaryHeld: true
+        };
+
+        if (laserTarget.entityID && laserTarget.entityID !== Uuid.NULL) {
+            Entities.sendMousePressOnEntity(laserTarget.entityID, pointerEvent);
+            Entities.sendClickDownOnEntity(laserTarget.entityID, pointerEvent);
+        }
+    }
+
+    function sendTouchEndEventToLaserTarget(hand, laserTarget) {
+        var pointerEvent = {
+            type: "Release",
+            id: hand + 1, // 0 is reserved for hardware mouse
+            pos2D: laserTarget.position2D,
+            pos3D: laserTarget.position,
+            normal: laserTarget.normal,
+            direction: Vec3.subtract(ZERO_VEC, laserTarget.normal),
+            button: "Primary"
+        };
+
+        if (laserTarget.entityID && laserTarget.entityID !== Uuid.NULL) {
+            Entities.sendMouseReleaseOnEntity(laserTarget.entityID, pointerEvent);
+            Entities.sendClickReleaseOnEntity(laserTarget.entityID, pointerEvent);
+            Entities.sendHoverLeaveEntity(laserTarget.entityID, pointerEvent);
+        }
+    }
+
+    function sendTouchMoveEventToLaserTarget(hand, laserTarget) {
+        var pointerEvent = {
+            type: "Move",
+            id: hand + 1, // 0 is reserved for hardware mouse
+            pos2D: laserTarget.position2D,
+            pos3D: laserTarget.position,
+            normal: laserTarget.normal,
+            direction: Vec3.subtract(ZERO_VEC, laserTarget.normal),
+            button: "Primary",
+            isPrimaryHeld: true
+        };
+
+        if (laserTarget.entityID && laserTarget.entityID !== Uuid.NULL) {
+            Entities.sendMouseMoveOnEntity(laserTarget.entityID, pointerEvent);
+            Entities.sendHoldingClickOnEntity(laserTarget.entityID, pointerEvent);
+        }
+    }
+
+    function calculateTargetFromEntity(intersection, props) {
+        if (props.rotation === undefined) {
+            // if rotation is missing from props object, then this entity has probably been deleted.
+            return null;
+        }
+
+        // project stylus tip onto entity plane.
+        var normal = Vec3.multiplyQbyV(props.rotation, {x: 0, y: 0, z: 1});
+        Vec3.multiplyQbyV(props.rotation, {x: 0, y: 1, z: 0});
+        var distance = Vec3.dot(Vec3.subtract(intersection, props.position), normal);
+        var position = Vec3.subtract(intersection, Vec3.multiply(normal, distance));
+
+        // generate normalized coordinates
+        var invRot = Quat.inverse(props.rotation);
+        var localPos = Vec3.multiplyQbyV(invRot, Vec3.subtract(position, props.position));
+        var invDimensions = { x: 1 / props.dimensions.x, y: 1 / props.dimensions.y, z: 1 / props.dimensions.z };
+        var normalizedPosition = Vec3.sum(Vec3.multiplyVbyV(localPos, invDimensions), props.registrationPoint);
+
+        // 2D position on entity plane in meters, relative to the bounding box upper-left hand corner.
+        var position2D = {
+            x: normalizedPosition.x * props.dimensions.x,
+            y: (1 - normalizedPosition.y) * props.dimensions.y // flip y-axis
+        };
+
+        return {
+            entityID: props.id,
+            entityProps: props,
+            overlayID: null,
+            distance: distance,
+            position: position,
+            position2D: position2D,
+            normal: normal,
+            normalizedPosition: normalizedPosition,
+            dimensions: props.dimensions,
+            valid: true
+        };
+    }
+
+    function distance2D(a, b) {
+        var dx = (a.x - b.x);
+        var dy = (a.y - b.y);
+        return Math.sqrt(dx * dx + dy * dy);
+    }
+
+    function WebEntityLaserInput(hand) {
+        this.hand = hand;
+        this.active = false;
+        this.previousLaserClickedTarget = false;
+        this.laserPressingTarget = false;
+        this.hover = false;
+        this.mode = "none";
+        this.pressEnterLaserTarget = null;
+        this.laserTarget = null;
+        this.laserTargetID = null;
+        this.lastValidTargetID = null;
+
+        this.handToController = function() {
+            return (this.hand === RIGHT_HAND) ? Controller.Standard.RightHand : Controller.Standard.LeftHand;
+        };
+
+        this.getOtherModule = function() {
+            return (this.hand === RIGHT_HAND) ? leftWebEntityLaserInput : rightWebEntityLaserInput;
+        };
+
+        this.parameters = makeDispatcherModuleParameters(
+            550,
+            this.hand === RIGHT_HAND ? ["rightHand"] : ["leftHand"],
+            [],
+            100);
+
+        this.requestTouchFocus = function(laserTarget) {
+            if (laserTarget !== null || laserTarget !== undefined) {
+                sendHoverEnterEventToLaserTarget(this.hand, this.laserTarget);
+                this.lastValidTargetID = laserTarget;
+            }
+        };
+
+        this.relinquishTouchFocus = function() {
+            // send hover leave event.
+            var pointerEvent = { type: "Move", id: this.hand + 1 };
+            Entities.sendMouseMoveOnEntity(this.lastValidTargetID, pointerEvent);
+            Entities.sendHoverOverEntity(this.lastValidTargetID, pointerEvent);
+            Entities.sendHoverLeaveEntity(this.lastValidID, pointerEvent);
+        };
+
+        this.updateLaserTargets = function(controllerData) {
+            var intersection = controllerData.rayPicks[this.hand];
+            this.laserTargetID = intersection.objectID;
+            var props = Entities.getEntityProperties(intersection.objectID);
+            this.laserTarget = calculateTargetFromEntity(intersection.intersection, props);
+        };
+
+        this.processControllerTriggers = function(controllerData) {
+            if (controllerData.triggerClicks[this.hand]) {
+                this.mode = "full";
+                this.laserPressingTarget = true;
+                this.hover = false;
+            } else if (controllerData.triggerValues[this.hand] > TRIGGER_ON_VALUE) {
+                this.mode = "half";
+                this.laserPressingTarget = false;
+                this.hover = true;
+                this.requestTouchFocus(this.laserTargetID);
+            } else {
+                this.mode = "none";
+                this.laserPressingTarget = false;
+                this.hover = false;
+                this.relinquishTouchFocus();
+
+            }
+        };
+
+        this.hovering = function() {
+            if (!laserTargetHasKeyboardFocus(this.laserTagetID)) {
+                setKeyboardFocusOnLaserTarget(this.laserTargetID);
+            }
+            sendHoverOverEventToLaserTarget(this.hand, this.laserTarget);
+        };
+
+        this.laserPressEnter = function () {
+            sendTouchStartEventToLaserTarget(this.hand, this.laserTarget);
+            Controller.triggerHapticPulse(HAPTIC_STYLUS_STRENGTH, HAPTIC_STYLUS_DURATION, this.hand);
+
+            this.touchingEnterTimer = 0;
+            this.pressEnterLaserTarget = this.laserTarget;
+            this.deadspotExpired = false;
+
+            var LASER_PRESS_TO_MOVE_DEADSPOT = 0.026;
+            this.deadspotRadius = Math.tan(LASER_PRESS_TO_MOVE_DEADSPOT) * this.laserTarget.distance;
+        };
+
+        this.laserPressExit = function () {
+            if (this.laserTarget === null) {
+                return;
+            }
+
+            // send press event
+            if (this.deadspotExpired) {
+                sendTouchEndEventToLaserTarget(this.hand, this.laserTarget);
+            } else {
+                sendTouchEndEventToLaserTarget(this.hand, this.pressEnterLaserTarget);
+            }
+        };
+
+        this.laserPressing = function (controllerData, dt) {
+            this.touchingEnterTimer += dt;
+
+            if (this.laserTarget) {
+                var POINTER_PRESS_TO_MOVE_DELAY = 0.33; // seconds
+                if (this.deadspotExpired || this.touchingEnterTimer > POINTER_PRESS_TO_MOVE_DELAY ||
+                    distance2D(this.laserTarget.position2D,
+                        this.pressEnterLaserTarget.position2D) > this.deadspotRadius) {
+                    sendTouchMoveEventToLaserTarget(this.hand, this.laserTarget);
+                    this.deadspotExpired = true;
+                }
+            } else {
+                this.laserPressingTarget = false;
+            }
+        };
+
+        this.releaseTouchEvent = function() {
+            if (this.pressEnterLaserTarget === null) {
+                return;
+            }
+
+            sendTouchEndEventToLaserTarget(this.hand, this.pressEnterLaserTarget);
+        };
+
+        this.updateLaserPointer = function(controllerData) {
+            LaserPointers.enableLaserPointer(this.laserPointer);
+            LaserPointers.setRenderState(this.laserPointer, this.mode);
+        };
+
+        this.isPointingAtWebEntity = function(controllerData) {
+            var intersection = controllerData.rayPicks[this.hand];
+            var entityProperty = Entities.getEntityProperties(intersection.objectID);
+            var entityType = entityProperty.type;
+
+            if ((intersection.type === RayPick.INTERSECTED_ENTITY && entityType === "Web")) {
+                return true;
+            }
+            return false;
+        };
+
+        this.exitModule = function() {
+            this.releaseTouchEvent();
+            this.relinquishTouchFocus();
+            this.reset();
+            this.updateLaserPointer();
+            LaserPointers.disableLaserPointer(this.laserPointer);
+        };
+
+        this.reset = function() {
+            this.pressEnterLaserTarget = null;
+            this.laserTarget = null;
+            this.laserTargetID = null;
+            this.laserPressingTarget = false;
+            this.previousLaserClickedTarget = null;
+            this.mode = "none";
+            this.active = false;
+        };
+
+        this.isReady = function(controllerData) {
+            var otherModule = this.getOtherModule();
+            if (this.isPointingAtWebEntity(controllerData) && !otherModule.active) {
+                return makeRunningValues(true, [], []);
+            }
+
+            return makeRunningValues(false, [], []);
+        };
+
+        this.run = function(controllerData, deltaTime) {
+            if (!this.isPointingAtWebEntity(controllerData)) {
+                this.exitModule();
+                return makeRunningValues(false, [], []);
+            }
+
+            this.updateLaserTargets(controllerData);
+            this.processControllerTriggers(controllerData);
+            this.updateLaserPointer(controllerData);
+
+            if (!this.previousLaserClickedTarget && this.laserPressingTarget) {
+                this.laserPressEnter();
+            }
+            if (this.previousLaserClickedTarget && !this.laserPressingTarget) {
+                this.laserPressExit();
+            }
+            this.previousLaserClickedTarget = this.laserPressingTarget;
+
+            if (this.laserPressingTarget) {
+                this.laserPressing(controllerData, deltaTime);
+            }
+
+            if (this.hover) {
+                this.hovering();
+            }
+            return makeRunningValues(true, [], []);
+        };
+
+        this.cleanup = function() {
+            LaserPointers.disableLaserPointer(this.laserPointer);
+            LaserPointers.removeLaserPointer(this.laserPointer);
+        };
+
+        this.laserPointer = LaserPointers.createLaserPointer({
+            joint: (this.hand === RIGHT_HAND) ? "_CONTROLLER_RIGHTHAND" : "_CONTROLLER_LEFTHAND",
+            filter: RayPick.PICK_ENTITIES,
+            maxDistance: PICK_MAX_DISTANCE,
+            posOffset: getGrabPointSphereOffset(this.handToController(), true),
+            renderStates: renderStates,
+            faceAvatar: true,
+            scaleWithAvatar: true,
+            defaultRenderStates: defaultRenderStates
+        });
+    }
+
+
+    var leftWebEntityLaserInput = new WebEntityLaserInput(LEFT_HAND);
+    var rightWebEntityLaserInput = new WebEntityLaserInput(RIGHT_HAND);
+
+    enableDispatcherModule("LeftWebEntityLaserInput", leftWebEntityLaserInput);
+    enableDispatcherModule("RightWebEntityLaserInput", rightWebEntityLaserInput);
+
+    this.cleanup = function() {
+        leftWebEntityLaserInput.cleanup();
+        rightWebEntityLaserInput.cleanup();
+        disableDispatcherModule("LeftWebEntityLaserInput");
+        disableDispatcherModule("RightWebEntityLaserInput");
+    };
+    Script.scriptEnding.connect(this.cleanup);
+
+}());
diff --git a/scripts/system/controllers/controllerScripts.js b/scripts/system/controllers/controllerScripts.js
index df11a1e5be..83576bd9a4 100644
--- a/scripts/system/controllers/controllerScripts.js
+++ b/scripts/system/controllers/controllerScripts.js
@@ -12,11 +12,27 @@
 var CONTOLLER_SCRIPTS = [
     "squeezeHands.js",
     "controllerDisplayManager.js",
-    "handControllerGrab.js",
-    "handControllerPointer.js",
     "grab.js",
-    "teleport.js",
     "toggleAdvancedMovementForHandControllers.js",
+    "controllerDispatcher.js",
+    "controllerModules/nearParentGrabEntity.js",
+    "controllerModules/nearParentGrabOverlay.js",
+    "controllerModules/nearActionGrabEntity.js",
+    "controllerModules/farActionGrabEntity.js",
+    "controllerModules/tabletStylusInput.js",
+    "controllerModules/equipEntity.js",
+    "controllerModules/nearTrigger.js",
+    "controllerModules/overlayLaserInput.js",
+    "controllerModules/webEntityLaserInput.js",
+    "controllerModules/inEditMode.js",
+    "controllerModules/inVREditMode.js",
+    "controllerModules/disableOtherModule.js",
+    "controllerModules/farTrigger.js",
+    "controllerModules/teleport.js",
+    "controllerModules/scaleAvatar.js",
+    "controllerModules/hudOverlayPointer.js",
+    "controllerModules/mouseHMD.js",
+    "controllerModules/scaleEntity.js"
 ];
 
 var DEBUG_MENU_ITEM = "Debug defaultScripts.js";
diff --git a/scripts/system/controllers/godView.js b/scripts/system/controllers/godView.js
new file mode 100644
index 0000000000..4b406399fd
--- /dev/null
+++ b/scripts/system/controllers/godView.js
@@ -0,0 +1,116 @@
+"use strict";
+//
+//  godView.js
+//  scripts/system/
+//
+//  Created by Brad Hefta-Gaub on 1 Jun 2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+/* globals HMD, Script, Menu, Tablet, Camera */
+/* eslint indent: ["error", 4, { "outerIIFEBody": 0 }] */
+
+(function() { // BEGIN LOCAL_SCOPE
+
+var godView = false;
+
+var GOD_CAMERA_OFFSET = -1; // 1 meter below the avatar
+var GOD_VIEW_HEIGHT = 300; // 300 meter above the ground
+var ABOVE_GROUND_DROP = 2;
+var MOVE_BY = 1;
+
+function moveTo(position) {
+    if (godView) {
+        MyAvatar.position = position;
+        Camera.position = Vec3.sum(MyAvatar.position, {x:0, y: GOD_CAMERA_OFFSET, z: 0});
+    } else {
+        MyAvatar.position = position;
+    }
+}
+
+function keyPressEvent(event) {
+    if (godView) {
+        switch(event.text) {
+            case "UP":
+                moveTo(Vec3.sum(MyAvatar.position, {x:0.0, y: 0, z: -1 * MOVE_BY}));
+                break;
+            case "DOWN":
+                moveTo(Vec3.sum(MyAvatar.position, {x:0, y: 0, z: MOVE_BY}));
+                break;
+            case "LEFT":
+                moveTo(Vec3.sum(MyAvatar.position, {x:-1 * MOVE_BY, y: 0, z: 0}));
+                break;
+            case "RIGHT":
+                moveTo(Vec3.sum(MyAvatar.position, {x:MOVE_BY, y: 0, z: 0}));
+                break;
+        }
+    }
+}
+
+function mousePress(event) {
+    if (godView) {
+        var pickRay = Camera.computePickRay(event.x, event.y);
+        var pointingAt = Vec3.sum(pickRay.origin, Vec3.multiply(pickRay.direction,300));
+        var moveToPosition = { x: pointingAt.x, y: MyAvatar.position.y, z: pointingAt.z };
+        moveTo(moveToPosition);
+    }
+}
+
+
+var oldCameraMode = Camera.mode;
+
+function startGodView() {
+    if (!godView) {
+        oldCameraMode = Camera.mode;
+        MyAvatar.position = Vec3.sum(MyAvatar.position, {x:0, y: GOD_VIEW_HEIGHT, z: 0});
+        Camera.mode = "independent";
+        Camera.position = Vec3.sum(MyAvatar.position, {x:0, y: GOD_CAMERA_OFFSET, z: 0});
+        Camera.orientation = Quat.fromPitchYawRollDegrees(-90,0,0);
+        godView = true;
+    }
+}
+
+function endGodView() {
+    if (godView) {
+        Camera.mode = oldCameraMode;
+        MyAvatar.position = Vec3.sum(MyAvatar.position, {x:0, y: (-1 * GOD_VIEW_HEIGHT) + ABOVE_GROUND_DROP, z: 0});
+        godView = false;
+    }
+}
+
+var button;
+var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
+
+function onClicked() {
+    if (godView) {
+        endGodView();
+    } else {
+        startGodView();
+    }
+}
+
+button = tablet.addButton({
+    icon: "icons/tablet-icons/switch-desk-i.svg", // FIXME - consider a better icon from Alan
+    text: "God View"
+});
+
+button.clicked.connect(onClicked);
+Controller.keyPressEvent.connect(keyPressEvent);
+Controller.mousePressEvent.connect(mousePress);
+
+
+Script.scriptEnding.connect(function () {
+    if (godView) {
+        endGodView();
+    }
+    button.clicked.disconnect(onClicked);
+    if (tablet) {
+        tablet.removeButton(button);
+    }
+    Controller.keyPressEvent.disconnect(keyPressEvent);
+    Controller.mousePressEvent.disconnect(mousePress);
+});
+
+}()); // END LOCAL_SCOPE
diff --git a/scripts/system/controllers/grab.js b/scripts/system/controllers/grab.js
index 14a86510c2..eaa15ee3b1 100644
--- a/scripts/system/controllers/grab.js
+++ b/scripts/system/controllers/grab.js
@@ -14,14 +14,18 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-/* global MyAvatar, Entities, Script, Camera, Vec3, Reticle, Overlays, getEntityCustomData, Messages, Quat, Controller */
+/* global MyAvatar, Entities, Script, Camera, Vec3, Reticle, Overlays, getEntityCustomData, Messages, Quat, Controller,
+   isInEditMode, HMD entityIsGrabbable*/
 
 
 (function() { // BEGIN LOCAL_SCOPE
 
-Script.include("/~/system/libraries/utils.js");
+    Script.include("/~/system/libraries/utils.js");
+    Script.include("/~/system/libraries/controllerDispatcherUtils.js");
 var MAX_SOLID_ANGLE = 0.01; // objects that appear smaller than this can't be grabbed
 
+var DELAY_FOR_30HZ = 33; // milliseconds
+
 var ZERO_VEC3 = {
     x: 0,
     y: 0,
@@ -46,7 +50,7 @@ var ACTION_TTL = 10; // seconds
 function getTag() {
     return "grab-" + MyAvatar.sessionUUID;
 }
-  
+
 var DISTANCE_HOLDING_ACTION_TIMEFRAME = 0.1; // how quickly objects move to their new position
 var DISTANCE_HOLDING_UNITY_MASS = 1200; //  The mass at which the distance holding action timeframe is unmodified
 var DISTANCE_HOLDING_UNITY_DISTANCE = 6; //  The distance at which the distance holding action timeframe is unmodified
@@ -194,53 +198,24 @@ Mouse.prototype.restoreRotateCursor = function() {
 
 var mouse = new Mouse();
 
-
-// Beacon class stores info for drawing a line at object's target position
-function Beacon() {
-    this.height = 0.10;
-    this.overlayID = Overlays.addOverlay("line3d", {
-        color: {
-            red: 200,
-            green: 200,
-            blue: 200
-        },
-        alpha: 1,
-        visible: false,
-        lineWidth: 2
-    });
-}
-
-Beacon.prototype.enable = function() {
-    Overlays.editOverlay(this.overlayID, {
-        visible: true
-    });
+var beacon = {
+    type: "cube",
+    dimensions: {
+        x: 0.01,
+        y: 0,
+        z: 0.01
+    },
+    color: {
+        red: 200,
+        green: 200,
+        blue: 200
+    },
+    alpha: 1,
+    solid: true,
+    ignoreRayIntersection: true,
+    visible: true
 };
 
-Beacon.prototype.disable = function() {
-    Overlays.editOverlay(this.overlayID, {
-        visible: false
-    });
-};
-
-Beacon.prototype.updatePosition = function(position) {
-    Overlays.editOverlay(this.overlayID, {
-        visible: true,
-        start: {
-            x: position.x,
-            y: position.y + this.height,
-            z: position.z
-        },
-        end: {
-            x: position.x,
-            y: position.y - this.height,
-            z: position.z
-        }
-    });
-};
-
-var beacon = new Beacon();
-
-
 // TODO: play sounds again when we aren't leaking AudioInjector threads
 // var grabSound = SoundCache.getSound("https://hifi-public.s3.amazonaws.com/eric/sounds/CloseClamp.wav");
 // var releaseSound = SoundCache.getSound("https://hifi-public.s3.amazonaws.com/eric/sounds/ReleaseClamp.wav");
@@ -282,6 +257,21 @@ function Grabber() {
 
     this.liftKey = false; // SHIFT
     this.rotateKey = false; // CONTROL
+
+    this.mouseRayOverlays = RayPick.createRayPick({
+        joint: "Mouse",
+        filter: RayPick.PICK_OVERLAYS,
+        enabled: true
+    });
+    RayPick.setIncludeItems(this.mouseRayOverlays, [HMD.tabletID, HMD.tabletScreenID, HMD.homeButtonID]);
+    var renderStates = [{name: "grabbed", end: beacon}];
+    this.mouseRayEntities = LaserPointers.createLaserPointer({
+        joint: "Mouse",
+        filter: RayPick.PICK_ENTITIES,
+        faceAvatar: true,
+        enabled: true,
+        renderStates: renderStates
+    });
 }
 
 Grabber.prototype.computeNewGrabPlane = function() {
@@ -317,7 +307,7 @@ Grabber.prototype.computeNewGrabPlane = function() {
 };
 
 Grabber.prototype.pressEvent = function(event) {
-    if (isInEditMode()) {
+    if (isInEditMode() || HMD.active) {
         return;
     }
 
@@ -325,51 +315,65 @@ Grabber.prototype.pressEvent = function(event) {
         return;
     }
 
+    if (event.isAlt || event.isMeta) {
+        return;
+    }
+
     if (Overlays.getOverlayAtPoint(Reticle.position) > 0) {
         // the mouse is pointing at an overlay; don't look for entities underneath the overlay.
         return;
     }
 
-    var pickRay = Camera.computePickRay(event.x, event.y);
-
-    var overlayResult = Overlays.findRayIntersection(pickRay, true, [HMD.tabletID, HMD.tabletScreenID, HMD.homeButtonID]);
-    if (overlayResult.intersects) {
+    var overlayResult = RayPick.getPrevRayPickResult(this.mouseRayOverlays);
+    if (overlayResult.type != RayPick.INTERSECTED_NONE) {
         return;
     }
 
-    var pickResults = Entities.findRayIntersection(pickRay, true); // accurate picking
-    if (!pickResults.intersects) {
-        // didn't click on anything
+    var pickResults = LaserPointers.getPrevRayPickResult(this.mouseRayEntities);
+    if (pickResults.type == RayPick.INTERSECTED_NONE) {
+        LaserPointers.setRenderState(this.mouseRayEntities, "");
         return;
     }
 
-    var isDynamic = Entities.getEntityProperties(pickResults.entityID, "dynamic").dynamic;
-    if (!isDynamic) {
-        // only grab dynamic objects
+    var props = Entities.getEntityProperties(pickResults.objectID, ["dynamic", "userData", "locked", "type"]);
+    var isDynamic = props.dynamic;
+    var isGrabbable = props.grabbable;
+    if (!entityIsGrabbable(props)) {
+        // only grab grabbable objects
         return;
     }
 
-    var grabbableData = getEntityCustomData(GRABBABLE_DATA_KEY, pickResults.entityID, DEFAULT_GRABBABLE_DATA);
+    var grabbableData = getEntityCustomData(GRABBABLE_DATA_KEY, pickResults.objectID, DEFAULT_GRABBABLE_DATA);
     if (grabbableData.grabbable === false) {
         return;
     }
 
+    LaserPointers.setRenderState(this.mouseRayEntities, "grabbed");
+    LaserPointers.setLockEndUUID(this.mouseRayEntities, pickResults.objectID, false);
+
     mouse.startDrag(event);
 
-    var clickedEntity = pickResults.entityID;
+    var clickedEntity = pickResults.objectID;
     var entityProperties = Entities.getEntityProperties(clickedEntity);
     this.startPosition = entityProperties.position;
     this.lastRotation = entityProperties.rotation;
+    this.madeDynamic = false;
     var cameraPosition = Camera.getPosition();
 
     var objectBoundingDiameter = Vec3.length(entityProperties.dimensions);
-    beacon.height = objectBoundingDiameter;
+    beacon.dimensions.y = objectBoundingDiameter;
+    LaserPointers.editRenderState(this.mouseRayEntities, "grabbed", {end: beacon});
     this.maxDistance = objectBoundingDiameter / MAX_SOLID_ANGLE;
     if (Vec3.distance(this.startPosition, cameraPosition) > this.maxDistance) {
         // don't allow grabs of things far away
         return;
     }
 
+    if (entityIsGrabbable(props) && !isDynamic) {
+        entityProperties.dynamic = true;
+        Entities.editEntity(clickedEntity, entityProperties);
+        this.madeDynamic = true;
+    }
     // this.activateEntity(clickedEntity, entityProperties);
     this.isGrabbing = true;
 
@@ -382,6 +386,7 @@ Grabber.prototype.pressEvent = function(event) {
     };
 
     // compute the grab point
+    var pickRay = Camera.computePickRay(event.x, event.y);
     var nearestPoint = Vec3.subtract(this.startPosition, cameraPosition);
     var distanceToGrab = Vec3.dot(nearestPoint, pickRay.direction);
     nearestPoint = Vec3.multiply(distanceToGrab, pickRay.direction);
@@ -392,8 +397,6 @@ Grabber.prototype.pressEvent = function(event) {
 
     this.computeNewGrabPlane();
 
-    beacon.updatePosition(this.startPosition);
-
     if (!entityIsGrabbedByOther(this.entityID)) {
       this.moveEvent(event);
     }
@@ -411,19 +414,32 @@ Grabber.prototype.pressEvent = function(event) {
 };
 
 Grabber.prototype.releaseEvent = function(event) {
-    if (event.isLeftButton!==true ||event.isRightButton===true || event.isMiddleButton===true) {
+    if ((event.isLeftButton!==true || event.isRightButton===true || event.isMiddleButton===true) && !HMD.active) {
         return;
     }
 
+    if (this.moveEventTimer) {
+        Script.clearTimeout(this.moveEventTimer);
+        this.moveEventTimer = null;
+    }
+
     if (this.isGrabbing) {
         // this.deactivateEntity(this.entityID);
         this.isGrabbing = false;
         if (this.actionID) {
             Entities.deleteAction(this.entityID, this.actionID);
         }
+
+        if (this.madeDynamic) {
+            var entityProps = {};
+            entityProps.dynamic = false;
+            entityProps.localVelocity = {x: 0, y: 0, z: 0};
+            Entities.editEntity(this.entityID, entityProps);
+        }
+
         this.actionID = null;
 
-        beacon.disable();
+        LaserPointers.setRenderState(this.mouseRayEntities, "");
 
         var args = "mouse";
         Entities.callEntityMethod(this.entityID, "releaseGrab", args);
@@ -439,15 +455,31 @@ Grabber.prototype.releaseEvent = function(event) {
     }
 };
 
+Grabber.prototype.scheduleMouseMoveProcessor = function(event) {
+    var _this = this;
+    if (!this.moveEventTimer) {
+        this.moveEventTimer = Script.setTimeout(function() {
+            _this.moveEventProcess();
+        }, DELAY_FOR_30HZ);
+    }
+};
+
 Grabber.prototype.moveEvent = function(event) {
-    if (!this.isGrabbing) {
+    // during the handling of the event, do as little as possible.  We save the updated mouse position,
+    // and start a timer to react to the change.  If more changes arrive before the timer fires, only
+    // the last update will be considered.  This is done to avoid backing-up Qt's event queue.
+    if (!this.isGrabbing || HMD.active) {
         return;
     }
     mouse.updateDrag(event);
+    this.scheduleMouseMoveProcessor();
+};
 
+Grabber.prototype.moveEventProcess = function() {
+    this.moveEventTimer = null;
     // see if something added/restored gravity
     var entityProperties = Entities.getEntityProperties(this.entityID);
-    if (!entityProperties || !entityProperties.gravity) {
+    if (!entityProperties || !entityProperties.gravity || HMD.active) {
         return;
     }
 
@@ -489,7 +521,7 @@ Grabber.prototype.moveEvent = function(event) {
 
     } else {
         var newPointOnPlane;
-        
+
         if (this.mode === "verticalCylinder") {
             // for this mode we recompute the plane based on current Camera
             var planeNormal = Quat.getForward(Camera.getOrientation());
@@ -505,7 +537,7 @@ Grabber.prototype.moveEvent = function(event) {
             };
 
         } else {
-            
+
             newPointOnPlane = mouseIntersectionWithPlane(
                     this.pointOnPlane, this.planeNormal, mouse.current, this.maxDistance);
             var relativePosition = Vec3.subtract(newPointOnPlane, cameraPosition);
@@ -528,7 +560,6 @@ Grabber.prototype.moveEvent = function(event) {
             ttl: ACTION_TTL
         };
 
-        beacon.updatePosition(this.targetPosition);
     }
 
     if (!this.actionID) {
@@ -538,6 +569,8 @@ Grabber.prototype.moveEvent = function(event) {
     } else {
         Entities.updateAction(this.entityID, this.actionID, actionArgs);
     }
+
+    this.scheduleMouseMoveProcessor();
 };
 
 Grabber.prototype.keyReleaseEvent = function(event) {
@@ -560,6 +593,11 @@ Grabber.prototype.keyPressEvent = function(event) {
     this.computeNewGrabPlane();
 };
 
+Grabber.prototype.cleanup = function() {
+    LaserPointers.removeLaserPointer(this.mouseRayEntities);
+    RayPick.removeRayPick(this.mouseRayOverlays);
+};
+
 var grabber = new Grabber();
 
 function pressEvent(event) {
@@ -582,10 +620,15 @@ function keyReleaseEvent(event) {
     grabber.keyReleaseEvent(event);
 }
 
+function cleanup() {
+    grabber.cleanup();
+}
+
 Controller.mousePressEvent.connect(pressEvent);
 Controller.mouseMoveEvent.connect(moveEvent);
 Controller.mouseReleaseEvent.connect(releaseEvent);
 Controller.keyPressEvent.connect(keyPressEvent);
 Controller.keyReleaseEvent.connect(keyReleaseEvent);
+Script.scriptEnding.connect(cleanup);
 
 }()); // END LOCAL_SCOPE
diff --git a/scripts/system/controllers/handControllerGrab.js b/scripts/system/controllers/handControllerGrab.js
deleted file mode 100644
index 04921fe14d..0000000000
--- a/scripts/system/controllers/handControllerGrab.js
+++ /dev/null
@@ -1,4172 +0,0 @@
-"use strict";
-
-//  handControllerGrab.js
-//
-//  Created by Eric Levin on  9/2/15
-//  Additions by James B. Pollack @imgntn on 9/24/2015
-//  Additions By Seth Alves on 10/20/2015
-//  Copyright 2015 High Fidelity, Inc.
-//
-//  Grabs physically moveable entities with hydra-like controllers; it works for either near or far objects.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-
-/* global getEntityCustomData, flatten, Xform, Script, Quat, Vec3, MyAvatar, Entities, Overlays, Settings,
-    Reticle, Controller, Camera, Messages, Mat4, getControllerWorldLocation, getGrabPointSphereOffset,
-   setGrabCommunications, Menu, HMD, isInEditMode, AvatarList */
-/* eslint indent: ["error", 4, { "outerIIFEBody": 0 }] */
-
-(function() { // BEGIN LOCAL_SCOPE
-
-Script.include("/~/system/libraries/utils.js");
-Script.include("/~/system/libraries/Xform.js");
-Script.include("/~/system/libraries/controllers.js");
-
-//
-// add lines where the hand ray picking is happening
-//
-
-var WANT_DEBUG = false;
-var WANT_DEBUG_STATE = false;
-var WANT_DEBUG_SEARCH_NAME = null;
-
-var UPDATE_SLEEP_MS = 16; // how many milliseconds to wait between "update" calls
-
-var FORCE_IGNORE_IK = false;
-var SHOW_GRAB_POINT_SPHERE = false;
-
-//
-// these tune time-averaging and "on" value for analog trigger
-//
-
-var TRIGGER_SMOOTH_RATIO = 0.1; //  Time averaging of trigger - 0.0 disables smoothing
-var TRIGGER_OFF_VALUE = 0.1;
-var TRIGGER_ON_VALUE = TRIGGER_OFF_VALUE + 0.05; //  Squeezed just enough to activate search or near grab
-
-var BUMPER_ON_VALUE = 0.5;
-
-var THUMB_ON_VALUE = 0.5;
-
-var HAPTIC_PULSE_STRENGTH = 1.0;
-var HAPTIC_PULSE_DURATION = 13.0;
-var HAPTIC_TEXTURE_STRENGTH = 0.1;
-var HAPTIC_TEXTURE_DURATION = 3.0;
-var HAPTIC_TEXTURE_DISTANCE = 0.002;
-var HAPTIC_DEQUIP_STRENGTH = 0.75;
-var HAPTIC_DEQUIP_DURATION = 50.0;
-
-// triggered when stylus presses a web overlay/entity
-var HAPTIC_STYLUS_STRENGTH = 1.0;
-var HAPTIC_STYLUS_DURATION = 20.0;
-
-// triggerd when ui laser presses a web overlay/entity
-var HAPTIC_LASER_UI_STRENGTH = 1.0;
-var HAPTIC_LASER_UI_DURATION = 20.0;
-
-var HAND_HEAD_MIX_RATIO = 0.0; //  0 = only use hands for search/move.  1 = only use head for search/move.
-
-var PICK_WITH_HAND_RAY = true;
-
-var EQUIP_SPHERE_SCALE_FACTOR = 0.65;
-
-var WEB_DISPLAY_STYLUS_DISTANCE = 0.5;
-var WEB_STYLUS_LENGTH = 0.2;
-var WEB_TOUCH_Y_OFFSET = 0.05; // how far forward (or back with a negative number) to slide stylus in hand
-
-//
-// distant manipulation
-//
-var DISTANCE_HOLDING_RADIUS_FACTOR = 3.5; // multiplied by distance between hand and object
-var DISTANCE_HOLDING_ACTION_TIMEFRAME = 0.1; // how quickly objects move to their new position
-var DISTANCE_HOLDING_UNITY_MASS = 1200; //  The mass at which the distance holding action timeframe is unmodified
-var DISTANCE_HOLDING_UNITY_DISTANCE = 6; //  The distance at which the distance holding action timeframe is unmodified
-var MOVE_WITH_HEAD = true; // experimental head-control of distantly held objects
-
-var COLORS_GRAB_SEARCHING_HALF_SQUEEZE = {
-    red: 10,
-    green: 10,
-    blue: 255
-};
-
-var COLORS_GRAB_SEARCHING_FULL_SQUEEZE = {
-    red: 250,
-    green: 10,
-    blue: 10
-};
-
-var COLORS_GRAB_DISTANCE_HOLD = {
-    red: 238,
-    green: 75,
-    blue: 214
-};
-
-var PICK_MAX_DISTANCE = 500; // max length of pick-ray
-
-//
-// near grabbing
-//
-
-var EQUIP_RADIUS = 0.2; // radius used for palm vs equip-hotspot for equipping.
-// if EQUIP_HOTSPOT_RENDER_RADIUS is greater than zero, the hotspot will appear before the hand
-// has reached the required position, and then grow larger once the hand is close enough to equip.
-var EQUIP_HOTSPOT_RENDER_RADIUS = 0.0; // radius used for palm vs equip-hotspot for rendering hot-spots
-var MAX_EQUIP_HOTSPOT_RADIUS = 1.0;
-var MAX_FAR_TO_NEAR_EQUIP_HOTSPOT_RADIUS = 0.5; // radius used for far to near equipping object.
-var NEAR_GRABBING_ACTION_TIMEFRAME = 0.05; // how quickly objects move to their new position
-
-var NEAR_GRAB_RADIUS = 0.1; // radius used for palm vs object for near grabbing.
-var NEAR_GRAB_MAX_DISTANCE = 1.0; // you cannot grab objects that are this far away from your hand
-var FAR_TO_NEAR_GRAB_MAX_DISTANCE = 0.3; // In far to near grabbing conversion,grab the object if distancetoObject from hand is less than this.
-var NEAR_GRAB_PICK_RADIUS = 0.25; // radius used for search ray vs object for near grabbing.
-var NEAR_GRABBING_KINEMATIC = true; // force objects to be kinematic when near-grabbed
-
-// if an equipped item is "adjusted" to be too far from the hand it's in, it will be unequipped.
-var CHECK_TOO_FAR_UNEQUIP_TIME = 0.3; // seconds, duration between checks
-
-
-var GRAB_POINT_SPHERE_RADIUS = NEAR_GRAB_RADIUS;
-var GRAB_POINT_SPHERE_COLOR = { red: 240, green: 240, blue: 240 };
-var GRAB_POINT_SPHERE_ALPHA = 0.85;
-
-//
-// other constants
-//
-var RIGHT_HAND = 1;
-var LEFT_HAND = 0;
-
-var ZERO_VEC = {
-    x: 0,
-    y: 0,
-    z: 0
-};
-
-var ONE_VEC = {
-    x: 1,
-    y: 1,
-    z: 1
-};
-
-var NULL_UUID = "{00000000-0000-0000-0000-000000000000}";
-var AVATAR_SELF_ID = "{00000000-0000-0000-0000-000000000001}";
-
-var DEFAULT_REGISTRATION_POINT = { x: 0.5, y: 0.5, z: 0.5 };
-var INCHES_TO_METERS = 1.0 / 39.3701;
-
-
-// these control how long an abandoned pointer line or action will hang around
-var ACTION_TTL = 15; // seconds
-var ACTION_TTL_REFRESH = 5;
-var PICKS_PER_SECOND_PER_HAND = 60;
-var MSECS_PER_SEC = 1000.0;
-var GRABBABLE_PROPERTIES = [
-    "position",
-    "registrationPoint",
-    "rotation",
-    "gravity",
-    "collidesWith",
-    "dynamic",
-    "collisionless",
-    "locked",
-    "name",
-    "shapeType",
-    "parentID",
-    "parentJointIndex",
-    "density",
-    "dimensions",
-    "userData"
-];
-
-var GRABBABLE_DATA_KEY = "grabbableKey"; // shared with grab.js
-
-var DEFAULT_GRABBABLE_DATA = {
-    disableReleaseVelocity: false
-};
-
-// sometimes we want to exclude objects from being picked
-var USE_BLACKLIST = true;
-var blacklist = [];
-
-var FORBIDDEN_GRAB_NAMES = ["Grab Debug Entity", "grab pointer"];
-var FORBIDDEN_GRAB_TYPES = ["Unknown", "Light", "PolyLine", "Zone"];
-
-var holdEnabled = true;
-var nearGrabEnabled = true;
-var farGrabEnabled = true;
-var myAvatarScalingEnabled = true;
-var objectScalingEnabled = true;
-var mostRecentSearchingHand = RIGHT_HAND;
-var DEFAULT_SPHERE_MODEL_URL = "http://hifi-content.s3.amazonaws.com/alan/dev/equip-Fresnel-3.fbx";
-var HARDWARE_MOUSE_ID = 0;  // Value reserved for hardware mouse.
-
-// states for the state machine
-var STATE_OFF = 0;
-var STATE_SEARCHING = 1;
-var STATE_DISTANCE_HOLDING = 2;
-var STATE_DISTANCE_ROTATING = 3;
-var STATE_NEAR_GRABBING = 4;
-var STATE_NEAR_TRIGGER = 5;
-var STATE_FAR_TRIGGER = 6;
-var STATE_HOLD = 7;
-var STATE_ENTITY_LASER_TOUCHING = 8;
-var STATE_OVERLAY_LASER_TOUCHING = 9;
-var STATE_STYLUS_TOUCHING = 10;
-
-var CONTROLLER_STATE_MACHINE = {};
-
-CONTROLLER_STATE_MACHINE[STATE_OFF] = {
-    name: "off",
-    enterMethod: "offEnter",
-    updateMethod: "off"
-};
-CONTROLLER_STATE_MACHINE[STATE_SEARCHING] = {
-    name: "searching",
-    enterMethod: "searchEnter",
-    updateMethod: "search"
-};
-CONTROLLER_STATE_MACHINE[STATE_DISTANCE_HOLDING] = {
-    name: "distance_holding",
-    enterMethod: "distanceHoldingEnter",
-    updateMethod: "distanceHolding"
-};
-CONTROLLER_STATE_MACHINE[STATE_DISTANCE_ROTATING] = {
-    name: "distance_rotating",
-    enterMethod: "distanceRotatingEnter",
-    updateMethod: "distanceRotating"
-};
-CONTROLLER_STATE_MACHINE[STATE_NEAR_GRABBING] = {
-    name: "near_grabbing",
-    enterMethod: "nearGrabbingEnter",
-    updateMethod: "nearGrabbing"
-};
-CONTROLLER_STATE_MACHINE[STATE_HOLD] = {
-    name: "hold",
-    enterMethod: "nearGrabbingEnter",
-    updateMethod: "nearGrabbing"
-};
-CONTROLLER_STATE_MACHINE[STATE_NEAR_TRIGGER] = {
-    name: "trigger",
-    enterMethod: "nearTriggerEnter",
-    updateMethod: "nearTrigger"
-};
-CONTROLLER_STATE_MACHINE[STATE_FAR_TRIGGER] = {
-    name: "far_trigger",
-    enterMethod: "farTriggerEnter",
-    updateMethod: "farTrigger"
-};
-CONTROLLER_STATE_MACHINE[STATE_ENTITY_LASER_TOUCHING] = {
-    name: "entityLaserTouching",
-    enterMethod: "entityLaserTouchingEnter",
-    exitMethod: "entityLaserTouchingExit",
-    updateMethod: "entityLaserTouching"
-};
-CONTROLLER_STATE_MACHINE[STATE_OVERLAY_LASER_TOUCHING] = {
-    name: "overlayLaserTouching",
-    enterMethod: "overlayLaserTouchingEnter",
-    exitMethod: "overlayLaserTouchingExit",
-    updateMethod: "overlayLaserTouching"
-};
-CONTROLLER_STATE_MACHINE[STATE_STYLUS_TOUCHING] = {
-    name: "stylusTouching",
-    enterMethod: "stylusTouchingEnter",
-    exitMethod: "stylusTouchingExit",
-    updateMethod: "stylusTouching"
-};
-
-function distance2D(a, b) {
-    var dx = (a.x - b.x);
-    var dy = (a.y - b.y);
-    return Math.sqrt(dx * dx + dy * dy);
-}
-
-function getFingerWorldLocation(hand) {
-    var fingerJointName = (hand === RIGHT_HAND) ? "RightHandIndex4" : "LeftHandIndex4";
-
-    var fingerJointIndex = MyAvatar.getJointIndex(fingerJointName);
-    var fingerPosition = MyAvatar.getAbsoluteJointTranslationInObjectFrame(fingerJointIndex);
-    var fingerRotation = MyAvatar.getAbsoluteJointRotationInObjectFrame(fingerJointIndex);
-    var worldFingerRotation = Quat.multiply(MyAvatar.orientation, fingerRotation);
-    var worldFingerPosition = Vec3.sum(MyAvatar.position, Vec3.multiplyQbyV(MyAvatar.orientation, fingerPosition));
-
-    return {
-        position: worldFingerPosition,
-        orientation: worldFingerRotation,
-        rotation: worldFingerRotation,
-        valid: true
-    };
-}
-
-// Object assign  polyfill
-if (typeof Object.assign != 'function') {
-    Object.assign = function(target, varArgs) {
-        if (target === null) {
-            throw new TypeError('Cannot convert undefined or null to object');
-        }
-        var to = Object(target);
-        for (var index = 1; index < arguments.length; index++) {
-            var nextSource = arguments[index];
-            if (nextSource !== null) {
-                for (var nextKey in nextSource) {
-                    if (Object.prototype.hasOwnProperty.call(nextSource, nextKey)) {
-                        to[nextKey] = nextSource[nextKey];
-                    }
-                }
-            }
-        }
-        return to;
-    };
-}
-
-function distanceBetweenPointAndEntityBoundingBox(point, entityProps) {
-    var entityXform = new Xform(entityProps.rotation, entityProps.position);
-    var localPoint = entityXform.inv().xformPoint(point);
-    var minOffset = Vec3.multiplyVbyV(entityProps.registrationPoint, entityProps.dimensions);
-    var maxOffset = Vec3.multiplyVbyV(Vec3.subtract(ONE_VEC, entityProps.registrationPoint), entityProps.dimensions);
-    var localMin = Vec3.subtract(entityXform.trans, minOffset);
-    var localMax = Vec3.sum(entityXform.trans, maxOffset);
-
-    var v = {x: localPoint.x, y: localPoint.y, z: localPoint.z};
-    v.x = Math.max(v.x, localMin.x);
-    v.x = Math.min(v.x, localMax.x);
-    v.y = Math.max(v.y, localMin.y);
-    v.y = Math.min(v.y, localMax.y);
-    v.z = Math.max(v.z, localMin.z);
-    v.z = Math.min(v.z, localMax.z);
-
-    return Vec3.distance(v, localPoint);
-}
-
-function projectOntoXYPlane(worldPos, position, rotation, dimensions, registrationPoint) {
-    var invRot = Quat.inverse(rotation);
-    var localPos = Vec3.multiplyQbyV(invRot, Vec3.subtract(worldPos, position));
-    var invDimensions = { x: 1 / dimensions.x,
-                          y: 1 / dimensions.y,
-                          z: 1 / dimensions.z };
-    var normalizedPos = Vec3.sum(Vec3.multiplyVbyV(localPos, invDimensions), registrationPoint);
-    return { x: normalizedPos.x * dimensions.x,
-             y: (1 - normalizedPos.y) * dimensions.y }; // flip y-axis
-}
-
-function projectOntoEntityXYPlane(entityID, worldPos) {
-    var props = entityPropertiesCache.getProps(entityID);
-    return projectOntoXYPlane(worldPos, props.position, props.rotation, props.dimensions, props.registrationPoint);
-}
-
-function projectOntoOverlayXYPlane(overlayID, worldPos) {
-    var position = Overlays.getProperty(overlayID, "position");
-    var rotation = Overlays.getProperty(overlayID, "rotation");
-    var dimensions;
-
-    var dpi = Overlays.getProperty(overlayID, "dpi");
-    if (dpi) {
-        // Calculate physical dimensions for web3d overlay from resolution and dpi; "dimensions" property is used as a scale.
-        var resolution = Overlays.getProperty(overlayID, "resolution");
-        resolution.z = 1;  // Circumvent divide-by-zero.
-        var scale = Overlays.getProperty(overlayID, "dimensions");
-        scale.z = 0.01;    // overlay dimensions are 2D, not 3D.
-        dimensions = Vec3.multiplyVbyV(Vec3.multiply(resolution, INCHES_TO_METERS / dpi), scale);
-    } else {
-        dimensions = Overlays.getProperty(overlayID, "dimensions");
-        dimensions.z = 0.01;    // overlay dimensions are 2D, not 3D.
-    }
-
-    return projectOntoXYPlane(worldPos, position, rotation, dimensions, DEFAULT_REGISTRATION_POINT);
-}
-
-function handLaserIntersectItem(position, rotation, start) {
-    var worldHandPosition = start.position;
-    var worldHandRotation = start.orientation;
-
-    if (position) {
-        var planePosition = position;
-        var planeNormal = Vec3.multiplyQbyV(rotation, {x: 0, y: 0, z: 1.0});
-        var rayStart = worldHandPosition;
-        var rayDirection = Quat.getUp(worldHandRotation);
-        var intersectionInfo = rayIntersectPlane(planePosition, planeNormal, rayStart, rayDirection);
-
-        var intersectionPoint = planePosition;
-        if (intersectionInfo.hit && intersectionInfo.distance > 0) {
-            intersectionPoint = Vec3.sum(rayStart, Vec3.multiply(intersectionInfo.distance, rayDirection));
-        } else {
-            intersectionPoint = planePosition;
-        }
-        intersectionInfo.point = intersectionPoint;
-        intersectionInfo.normal = planeNormal;
-        intersectionInfo.searchRay = {
-            origin: rayStart,
-            direction: rayDirection,
-            length: PICK_MAX_DISTANCE
-        };
-
-        return intersectionInfo;
-    } else {
-        // entity has been destroyed? or is no longer in cache
-        return null;
-    }
-}
-
-function handLaserIntersectEntity(entityID, start) {
-    var props = entityPropertiesCache.getProps(entityID);
-    return handLaserIntersectItem(props.position, props.rotation, start);
-}
-
-function handLaserIntersectOverlay(overlayID, start) {
-    var position = Overlays.getProperty(overlayID, "position");
-    var rotation = Overlays.getProperty(overlayID, "rotation");
-    return handLaserIntersectItem(position, rotation, start);
-}
-
-function rayIntersectPlane(planePosition, planeNormal, rayStart, rayDirection) {
-    var rayDirectionDotPlaneNormal = Vec3.dot(rayDirection, planeNormal);
-    if (rayDirectionDotPlaneNormal > 0.00001 || rayDirectionDotPlaneNormal < -0.00001) {
-        var rayStartDotPlaneNormal = Vec3.dot(Vec3.subtract(planePosition, rayStart), planeNormal);
-        var distance = rayStartDotPlaneNormal / rayDirectionDotPlaneNormal;
-        return {hit: true, distance: distance};
-    } else {
-        // ray is parallel to the plane
-        return {hit: false, distance: 0};
-    }
-}
-
-function stateToName(state) {
-    return CONTROLLER_STATE_MACHINE[state] ? CONTROLLER_STATE_MACHINE[state].name : "???";
-}
-
-function getTag() {
-    return "grab-" + MyAvatar.sessionUUID;
-}
-
-function colorPow(color, power) {
-    return {
-        red: Math.pow(color.red / 255.0, power) * 255,
-        green: Math.pow(color.green / 255.0, power) * 255,
-        blue: Math.pow(color.blue / 255.0, power) * 255
-    };
-}
-
-function entityHasActions(entityID) {
-    return Entities.getActionIDs(entityID).length > 0;
-}
-
-function findRayIntersection(pickRay, precise, include, exclude) {
-    var entities = Entities.findRayIntersection(pickRay, precise, include, exclude, true);
-    var overlays = Overlays.findRayIntersection(pickRay, precise, [], [HMD.tabletID]);
-    if (!overlays.intersects || (entities.intersects && (entities.distance <= overlays.distance))) {
-        return entities;
-    }
-    return overlays;
-}
-
-function entityIsGrabbedByOther(entityID) {
-    // by convention, a distance grab sets the tag of its action to be grab-*owner-session-id*.
-    var actionIDs = Entities.getActionIDs(entityID);
-    for (var actionIndex = 0; actionIndex < actionIDs.length; actionIndex++) {
-        var actionID = actionIDs[actionIndex];
-        var actionArguments = Entities.getActionArguments(entityID, actionID);
-        var tag = actionArguments.tag;
-        if (tag === getTag()) {
-            // we see a grab-*uuid* shaped tag, but it's our tag, so that's okay.
-            continue;
-        }
-        var GRAB_PREFIX_LENGTH = 5;
-        var UUID_LENGTH = 38;
-        if (tag && tag.slice(0, GRAB_PREFIX_LENGTH) == "grab-") {
-            // we see a grab-*uuid* shaped tag and it's not ours, so someone else is grabbing it.
-            return tag.slice(GRAB_PREFIX_LENGTH, GRAB_PREFIX_LENGTH + UUID_LENGTH - 1);
-        }
-    }
-    return null;
-}
-
-function propsArePhysical(props) {
-    if (!props.dynamic) {
-        return false;
-    }
-    var isPhysical = (props.shapeType && props.shapeType != 'none');
-    return isPhysical;
-}
-
-var USE_ATTACH_POINT_SETTINGS = true;
-
-var ATTACH_POINT_SETTINGS = "io.highfidelity.attachPoints";
-
-function getAttachPointSettings() {
-    try {
-        var str = Settings.getValue(ATTACH_POINT_SETTINGS);
-        if (str === "false") {
-            return {};
-        } else {
-            return JSON.parse(str);
-        }
-    } catch (err) {
-        print("Error parsing attachPointSettings: " + err);
-        return {};
-    }
-}
-
-function setAttachPointSettings(attachPointSettings) {
-    var str = JSON.stringify(attachPointSettings);
-    Settings.setValue(ATTACH_POINT_SETTINGS, str);
-}
-
-function getAttachPointForHotspotFromSettings(hotspot, hand) {
-    var attachPointSettings = getAttachPointSettings();
-    var jointName = (hand === RIGHT_HAND) ? "RightHand" : "LeftHand";
-    var joints = attachPointSettings[hotspot.key];
-    if (joints) {
-        return joints[jointName];
-    } else {
-        return undefined;
-    }
-}
-
-function storeAttachPointForHotspotInSettings(hotspot, hand, offsetPosition, offsetRotation) {
-    var attachPointSettings = getAttachPointSettings();
-    var jointName = (hand === RIGHT_HAND) ? "RightHand" : "LeftHand";
-    var joints = attachPointSettings[hotspot.key];
-    if (!joints) {
-        joints = {};
-        attachPointSettings[hotspot.key] = joints;
-    }
-    joints[jointName] = [offsetPosition, offsetRotation];
-    setAttachPointSettings(attachPointSettings);
-}
-
-// If another script is managing the reticle (as is done by HandControllerPointer), we should not be setting it here,
-// and we should not be showing lasers when someone else is using the Reticle to indicate a 2D minor mode.
-var EXTERNALLY_MANAGED_2D_MINOR_MODE = true;
-
-function isEditing() {
-    return EXTERNALLY_MANAGED_2D_MINOR_MODE && isInEditMode();
-}
-
-function isIn2DMode() {
-    // In this version, we make our own determination of whether we're aimed a HUD element,
-    // because other scripts (such as handControllerPointer) might be using some other visualization
-    // instead of setting Reticle.visible.
-    return (EXTERNALLY_MANAGED_2D_MINOR_MODE &&
-        (Reticle.pointingAtSystemOverlay || Overlays.getOverlayAtPoint(Reticle.position)));
-}
-
-function restore2DMode() {
-    if (!EXTERNALLY_MANAGED_2D_MINOR_MODE) {
-        Reticle.setVisible(true);
-    }
-}
-
-function stylusTargetHasKeyboardFocus(stylusTarget) {
-    if (stylusTarget.entityID && stylusTarget.entityID !== NULL_UUID) {
-        return Entities.keyboardFocusEntity === stylusTarget.entityID;
-    } else if (stylusTarget.overlayID && stylusTarget.overlayID !== NULL_UUID) {
-        return Overlays.keyboardFocusOverlay === stylusTarget.overlayID;
-    }
-}
-
-function setKeyboardFocusOnStylusTarget(stylusTarget) {
-    if (stylusTarget.entityID && stylusTarget.entityID !== NULL_UUID && Entities.wantsHandControllerPointerEvents(stylusTarget.entityID)) {
-        Overlays.keyboardFocusOverlay = NULL_UUID;
-        Entities.keyboardFocusEntity = stylusTarget.entityID;
-    } else if (stylusTarget.overlayID && stylusTarget.overlayID !== NULL_UUID) {
-        Overlays.keyboardFocusOverlay = stylusTarget.overlayID;
-        Entities.keyboardFocusEntity = NULL_UUID;
-    }
-}
-
-function sendHoverEnterEventToStylusTarget(hand, stylusTarget) {
-    var pointerEvent = {
-        type: "Move",
-        id: hand + 1, // 0 is reserved for hardware mouse
-        pos2D: stylusTarget.position2D,
-        pos3D: stylusTarget.position,
-        normal: stylusTarget.normal,
-        direction: Vec3.subtract(ZERO_VEC, stylusTarget.normal),
-        button: "None"
-    };
-
-    if (stylusTarget.entityID && stylusTarget.entityID !== NULL_UUID) {
-        Entities.sendHoverEnterEntity(stylusTarget.entityID, pointerEvent);
-    } else if (stylusTarget.overlayID && stylusTarget.overlayID !== NULL_UUID) {
-        Overlays.sendHoverEnterOverlay(stylusTarget.overlayID, pointerEvent);
-    }
-}
-
-function sendHoverOverEventToStylusTarget(hand, stylusTarget) {
-    var pointerEvent = {
-        type: "Move",
-        id: hand + 1, // 0 is reserved for hardware mouse
-        pos2D: stylusTarget.position2D,
-        pos3D: stylusTarget.position,
-        normal: stylusTarget.normal,
-        direction: Vec3.subtract(ZERO_VEC, stylusTarget.normal),
-        button: "None"
-    };
-
-    if (stylusTarget.entityID && stylusTarget.entityID !== NULL_UUID) {
-        Entities.sendMouseMoveOnEntity(stylusTarget.entityID, pointerEvent);
-        Entities.sendHoverOverEntity(stylusTarget.entityID, pointerEvent);
-    } else if (stylusTarget.overlayID && stylusTarget.overlayID !== NULL_UUID) {
-        Overlays.sendMouseMoveOnOverlay(stylusTarget.overlayID, pointerEvent);
-        Overlays.sendHoverOverOverlay(stylusTarget.overlayID, pointerEvent);
-    }
-}
-
-function sendTouchStartEventToStylusTarget(hand, stylusTarget) {
-    var pointerEvent = {
-        type: "Press",
-        id: hand + 1, // 0 is reserved for hardware mouse
-        pos2D: stylusTarget.position2D,
-        pos3D: stylusTarget.position,
-        normal: stylusTarget.normal,
-        direction: Vec3.subtract(ZERO_VEC, stylusTarget.normal),
-        button: "Primary",
-        isPrimaryHeld: true
-    };
-
-    if (stylusTarget.entityID && stylusTarget.entityID !== NULL_UUID) {
-        Entities.sendMousePressOnEntity(stylusTarget.entityID, pointerEvent);
-        Entities.sendClickDownOnEntity(stylusTarget.entityID, pointerEvent);
-    } else if (stylusTarget.overlayID && stylusTarget.overlayID !== NULL_UUID) {
-        Overlays.sendMousePressOnOverlay(stylusTarget.overlayID, pointerEvent);
-    }
-}
-
-function sendTouchEndEventToStylusTarget(hand, stylusTarget) {
-    var pointerEvent = {
-        type: "Release",
-        id: hand + 1, // 0 is reserved for hardware mouse
-        pos2D: stylusTarget.position2D,
-        pos3D: stylusTarget.position,
-        normal: stylusTarget.normal,
-        direction: Vec3.subtract(ZERO_VEC, stylusTarget.normal),
-        button: "Primary"
-    };
-
-    if (stylusTarget.entityID && stylusTarget.entityID !== NULL_UUID) {
-        Entities.sendMouseReleaseOnEntity(stylusTarget.entityID, pointerEvent);
-        Entities.sendClickReleaseOnEntity(stylusTarget.entityID, pointerEvent);
-        Entities.sendHoverLeaveEntity(stylusTarget.entityID, pointerEvent);
-    } else if (stylusTarget.overlayID && stylusTarget.overlayID !== NULL_UUID) {
-        Overlays.sendMouseReleaseOnOverlay(stylusTarget.overlayID, pointerEvent);
-    }
-}
-
-function sendTouchMoveEventToStylusTarget(hand, stylusTarget) {
-    var pointerEvent = {
-        type: "Move",
-        id: hand + 1, // 0 is reserved for hardware mouse
-        pos2D: stylusTarget.position2D,
-        pos3D: stylusTarget.position,
-        normal: stylusTarget.normal,
-        direction: Vec3.subtract(ZERO_VEC, stylusTarget.normal),
-        button: "Primary",
-        isPrimaryHeld: true
-    };
-
-    if (stylusTarget.entityID && stylusTarget.entityID !== NULL_UUID) {
-        Entities.sendMouseMoveOnEntity(stylusTarget.entityID, pointerEvent);
-        Entities.sendHoldingClickOnEntity(stylusTarget.entityID, pointerEvent);
-    } else if (stylusTarget.overlayID && stylusTarget.overlayID !== NULL_UUID) {
-        Overlays.sendMouseMoveOnOverlay(stylusTarget.overlayID, pointerEvent);
-    }
-}
-
-// will return undefined if entity does not exist.
-function calculateStylusTargetFromEntity(stylusTip, entityID) {
-    var props = entityPropertiesCache.getProps(entityID);
-    if (props.rotation === undefined) {
-        // if rotation is missing from props object, then this entity has probably been deleted.
-        return;
-    }
-
-    // project stylus tip onto entity plane.
-    var normal = Vec3.multiplyQbyV(props.rotation, {x: 0, y: 0, z: 1});
-    Vec3.multiplyQbyV(props.rotation, {x: 0, y: 1, z: 0});
-    var distance = Vec3.dot(Vec3.subtract(stylusTip.position, props.position), normal);
-    var position = Vec3.subtract(stylusTip.position, Vec3.multiply(normal, distance));
-
-    // generate normalized coordinates
-    var invRot = Quat.inverse(props.rotation);
-    var localPos = Vec3.multiplyQbyV(invRot, Vec3.subtract(position, props.position));
-    var invDimensions = { x: 1 / props.dimensions.x, y: 1 / props.dimensions.y, z: 1 / props.dimensions.z };
-    var normalizedPosition = Vec3.sum(Vec3.multiplyVbyV(localPos, invDimensions), props.registrationPoint);
-
-    // 2D position on entity plane in meters, relative to the bounding box upper-left hand corner.
-    var position2D = { x: normalizedPosition.x * props.dimensions.x, y: (1 - normalizedPosition.y) * props.dimensions.y }; // flip y-axis
-
-    return {
-        entityID: entityID,
-        overlayID: null,
-        distance: distance,
-        position: position,
-        position2D: position2D,
-        normal: normal,
-        normalizedPosition: normalizedPosition,
-        dimensions: props.dimensions,
-        valid: true
-    };
-}
-
-// will return undefined if overlayID does not exist.
-function calculateStylusTargetFromOverlay(stylusTip, overlayID) {
-    var overlayPosition = Overlays.getProperty(overlayID, "position");
-    if (overlayPosition === undefined) {
-        return;
-    }
-
-    // project stylusTip onto overlay plane.
-    var overlayRotation = Overlays.getProperty(overlayID, "rotation");
-    if (overlayRotation === undefined) {
-        return;
-    }
-    var normal = Vec3.multiplyQbyV(overlayRotation, {x: 0, y: 0, z: 1});
-    var distance = Vec3.dot(Vec3.subtract(stylusTip.position, overlayPosition), normal);
-    var position = Vec3.subtract(stylusTip.position, Vec3.multiply(normal, distance));
-
-    // calclulate normalized position
-    var invRot = Quat.inverse(overlayRotation);
-    var localPos = Vec3.multiplyQbyV(invRot, Vec3.subtract(position, overlayPosition));
-    var dpi = Overlays.getProperty(overlayID, "dpi");
-
-    var dimensions;
-    if (dpi) {
-        // Calculate physical dimensions for web3d overlay from resolution and dpi; "dimensions" property is used as a scale.
-        var resolution = Overlays.getProperty(overlayID, "resolution");
-        if (resolution === undefined) {
-            return;
-        }
-        resolution.z = 1;  // Circumvent divide-by-zero.
-        var scale = Overlays.getProperty(overlayID, "dimensions");
-        if (scale === undefined) {
-            return;
-        }
-        scale.z = 0.01;    // overlay dimensions are 2D, not 3D.
-        dimensions = Vec3.multiplyVbyV(Vec3.multiply(resolution, INCHES_TO_METERS / dpi), scale);
-    } else {
-        dimensions = Overlays.getProperty(overlayID, "dimensions");
-        if (dimensions === undefined) {
-            return;
-        }
-        if (!dimensions.z) {
-            dimensions.z = 0.01;    // sometimes overlay dimensions are 2D, not 3D.
-        }
-    }
-    var invDimensions = { x: 1 / dimensions.x, y: 1 / dimensions.y, z: 1 / dimensions.z };
-    var normalizedPosition = Vec3.sum(Vec3.multiplyVbyV(localPos, invDimensions), DEFAULT_REGISTRATION_POINT);
-
-    // 2D position on overlay plane in meters, relative to the bounding box upper-left hand corner.
-    var position2D = { x: normalizedPosition.x * dimensions.x, y: (1 - normalizedPosition.y) * dimensions.y }; // flip y-axis
-
-    return {
-        entityID: null,
-        overlayID: overlayID,
-        distance: distance,
-        position: position,
-        position2D: position2D,
-        normal: normal,
-        normalizedPosition: normalizedPosition,
-        dimensions: dimensions,
-        valid: true
-    };
-}
-
-function isNearStylusTarget(stylusTargets, edgeBorder, minNormalDistance, maxNormalDistance) {
-    for (var i = 0; i < stylusTargets.length; i++) {
-        var stylusTarget = stylusTargets[i];
-
-        // check to see if the projected stylusTip is within within the 2d border
-        var borderMin = {x: -edgeBorder, y: -edgeBorder};
-        var borderMax = {x: stylusTarget.dimensions.x + edgeBorder, y: stylusTarget.dimensions.y + edgeBorder};
-        if (stylusTarget.distance >= minNormalDistance && stylusTarget.distance <= maxNormalDistance &&
-            stylusTarget.position2D.x >= borderMin.x && stylusTarget.position2D.y >= borderMin.y &&
-            stylusTarget.position2D.x <= borderMax.x && stylusTarget.position2D.y <= borderMax.y) {
-            return true;
-        }
-    }
-    return false;
-}
-
-function calculateNearestStylusTarget(stylusTargets) {
-    var nearestStylusTarget;
-
-    for (var i = 0; i < stylusTargets.length; i++) {
-        var stylusTarget = stylusTargets[i];
-
-        if ((!nearestStylusTarget || stylusTarget.distance < nearestStylusTarget.distance) &&
-            stylusTarget.normalizedPosition.x >= 0 && stylusTarget.normalizedPosition.y >= 0 &&
-            stylusTarget.normalizedPosition.x <= 1 && stylusTarget.normalizedPosition.y <= 1) {
-            nearestStylusTarget = stylusTarget;
-        }
-    }
-
-    return nearestStylusTarget;
-}
-
-// EntityPropertiesCache is a helper class that contains a cache of entity properties.
-// the hope is to prevent excess calls to Entity.getEntityProperties()
-//
-// usage:
-//   call EntityPropertiesCache.addEntities with all the entities that you are interested in.
-//   This will fetch their properties.  Then call EntityPropertiesCache.getProps to receive an object
-//   containing a cache of all the properties previously fetched.
-function EntityPropertiesCache() {
-    this.cache = {};
-}
-EntityPropertiesCache.prototype.clear = function() {
-    this.cache = {};
-};
-EntityPropertiesCache.prototype.addEntity = function(entityID) {
-    var cacheEntry = this.cache[entityID];
-    if (cacheEntry && cacheEntry.refCount) {
-        cacheEntry.refCount += 1;
-    } else {
-        this._updateCacheEntry(entityID);
-    }
-};
-EntityPropertiesCache.prototype.addEntities = function(entities) {
-    var _this = this;
-    entities.forEach(function(entityID) {
-        _this.addEntity(entityID);
-    });
-};
-EntityPropertiesCache.prototype._updateCacheEntry = function(entityID) {
-    var props = Entities.getEntityProperties(entityID, GRABBABLE_PROPERTIES);
-
-    // convert props.userData from a string to an object.
-    var userData = {};
-    if (props.userData) {
-        try {
-            userData = JSON.parse(props.userData);
-        } catch (err) {
-            print("WARNING: malformed userData on " + entityID + ", name = " + props.name + ", error = " + err);
-        }
-    }
-    props.userData = userData;
-    props.refCount = 1;
-
-    this.cache[entityID] = props;
-};
-EntityPropertiesCache.prototype.update = function() {
-    // delete any cacheEntries with zero refCounts.
-    var entities = Object.keys(this.cache);
-    for (var i = 0; i < entities.length; i++) {
-        var props = this.cache[entities[i]];
-        if (props.refCount === 0) {
-            delete this.cache[entities[i]];
-        } else {
-            props.refCount = 0;
-        }
-    }
-};
-EntityPropertiesCache.prototype.getProps = function(entityID) {
-    var obj = this.cache[entityID];
-    return obj ? obj : undefined;
-};
-EntityPropertiesCache.prototype.getGrabbableProps = function(entityID) {
-    var props = this.cache[entityID];
-    if (props) {
-        return props.userData.grabbableKey ? props.userData.grabbableKey : DEFAULT_GRABBABLE_DATA;
-    } else {
-        return undefined;
-    }
-};
-EntityPropertiesCache.prototype.getGrabProps = function(entityID) {
-    var props = this.cache[entityID];
-    if (props) {
-        return props.userData.grabKey ? props.userData.grabKey : {};
-    } else {
-        return undefined;
-    }
-};
-EntityPropertiesCache.prototype.getWearableProps = function(entityID) {
-    var props = this.cache[entityID];
-    if (props) {
-        return props.userData.wearable ? props.userData.wearable : {};
-    } else {
-        return undefined;
-    }
-};
-EntityPropertiesCache.prototype.getEquipHotspotsProps = function(entityID) {
-    var props = this.cache[entityID];
-    if (props) {
-        return props.userData.equipHotspots ? props.userData.equipHotspots : {};
-    } else {
-        return undefined;
-    }
-};
-
-// global cache
-var entityPropertiesCache = new EntityPropertiesCache();
-
-// Each overlayInfoSet describes a single equip hotspot.
-// It is an object with the following keys:
-//   timestamp - last time this object was updated, used to delete stale hotspot overlays.
-//   entityID - entity assosicated with this hotspot
-//   localPosition - position relative to the entity
-//   hotspot - hotspot object
-//   overlays - array of overlay objects created by Overlay.addOverlay()
-//   currentSize - current animated scale value
-//   targetSize - the target of our scale animations
-//   type - "sphere" or "model".
-function EquipHotspotBuddy() {
-    // holds map from {string} hotspot.key to {object} overlayInfoSet.
-    this.map = {};
-
-    // array of all hotspots that are highlighed.
-    this.highlightedHotspots = [];
-}
-EquipHotspotBuddy.prototype.clear = function() {
-    var keys = Object.keys(this.map);
-    for (var i = 0; i < keys.length; i++) {
-        var overlayInfoSet = this.map[keys[i]];
-        this.deleteOverlayInfoSet(overlayInfoSet);
-    }
-    this.map = {};
-    this.highlightedHotspots = [];
-};
-EquipHotspotBuddy.prototype.highlightHotspot = function(hotspot) {
-    this.highlightedHotspots.push(hotspot.key);
-};
-EquipHotspotBuddy.prototype.updateHotspot = function(hotspot, timestamp) {
-    var overlayInfoSet = this.map[hotspot.key];
-    if (!overlayInfoSet) {
-        // create a new overlayInfoSet
-        overlayInfoSet = {
-            timestamp: timestamp,
-            entityID: hotspot.entityID,
-            localPosition: hotspot.localPosition,
-            hotspot: hotspot,
-            currentSize: 0,
-            targetSize: 1,
-            overlays: []
-        };
-
-        var diameter = hotspot.radius * 2;
-
-        // override default sphere with a user specified model, if it exists.
-        overlayInfoSet.overlays.push(Overlays.addOverlay("model", {
-            name: "hotspot overlay",
-            url: hotspot.modelURL ? hotspot.modelURL : DEFAULT_SPHERE_MODEL_URL,
-            position: hotspot.worldPosition,
-            rotation: {
-                x: 0,
-                y: 0,
-                z: 0,
-                w: 1
-            },
-            dimensions: diameter * EQUIP_SPHERE_SCALE_FACTOR,
-            scale: hotspot.modelScale,
-            ignoreRayIntersection: true
-        }));
-        overlayInfoSet.type = "model";
-        this.map[hotspot.key] = overlayInfoSet;
-    } else {
-        overlayInfoSet.timestamp = timestamp;
-    }
-};
-EquipHotspotBuddy.prototype.updateHotspots = function(hotspots, timestamp) {
-    var _this = this;
-    hotspots.forEach(function(hotspot) {
-        _this.updateHotspot(hotspot, timestamp);
-    });
-    this.highlightedHotspots = [];
-};
-EquipHotspotBuddy.prototype.update = function(deltaTime, timestamp) {
-
-    var HIGHLIGHT_SIZE = 1.1;
-    var NORMAL_SIZE = 1.0;
-
-    var keys = Object.keys(this.map);
-    for (var i = 0; i < keys.length; i++) {
-        var overlayInfoSet = this.map[keys[i]];
-
-        // this overlayInfo is highlighted.
-        if (this.highlightedHotspots.indexOf(keys[i]) != -1) {
-            overlayInfoSet.targetSize = HIGHLIGHT_SIZE;
-        } else {
-            overlayInfoSet.targetSize = NORMAL_SIZE;
-        }
-
-        // start to fade out this hotspot.
-        if (overlayInfoSet.timestamp != timestamp) {
-            // because this item timestamp has expired, it might not be in the cache anymore....
-            entityPropertiesCache.addEntity(overlayInfoSet.entityID);
-            overlayInfoSet.targetSize = 0;
-        }
-
-        // animate the size.
-        var SIZE_TIMESCALE = 0.1;
-        var tau = deltaTime / SIZE_TIMESCALE;
-        if (tau > 1.0) {
-            tau = 1.0;
-        }
-        overlayInfoSet.currentSize += (overlayInfoSet.targetSize - overlayInfoSet.currentSize) * tau;
-
-        if (overlayInfoSet.timestamp != timestamp && overlayInfoSet.currentSize <= 0.05) {
-            // this is an old overlay, that has finished fading out, delete it!
-            overlayInfoSet.overlays.forEach(Overlays.deleteOverlay);
-            delete this.map[keys[i]];
-        } else {
-            // update overlay position, rotation to follow the object it's attached to.
-
-            var props = entityPropertiesCache.getProps(overlayInfoSet.entityID);
-            var entityXform = new Xform(props.rotation, props.position);
-            var position = entityXform.xformPoint(overlayInfoSet.localPosition);
-
-            var dimensions;
-            if (overlayInfoSet.type == "sphere") {
-                dimensions = overlayInfoSet.hotspot.radius * 2 * overlayInfoSet.currentSize * EQUIP_SPHERE_SCALE_FACTOR;
-            } else {
-                dimensions = overlayInfoSet.hotspot.radius * 2 * overlayInfoSet.currentSize;
-            }
-
-            overlayInfoSet.overlays.forEach(function(overlay) {
-                Overlays.editOverlay(overlay, {
-                    position: position,
-                    rotation: props.rotation,
-                    dimensions: dimensions
-                });
-            });
-        }
-    }
-};
-
-function getControllerJointIndex(hand) {
-    if (HMD.isHandControllerAvailable()) {
-        return MyAvatar.getJointIndex(hand === RIGHT_HAND ?
-                                      "_CONTROLLER_RIGHTHAND" :
-                                      "_CONTROLLER_LEFTHAND");
-    }
-
-    return MyAvatar.getJointIndex("Head");
-}
-
-// global EquipHotspotBuddy instance
-var equipHotspotBuddy = new EquipHotspotBuddy();
-
-function MyController(hand) {
-    this.hand = hand;
-    this.autoUnequipCounter = 0;
-    this.grabPointIntersectsEntity = false;
-    this.stylus = null;
-    this.homeButtonTouched = false;
-    this.editTriggered = false;
-
-    // Until there is some reliable way to keep track of a "stack" of parentIDs, we'll have problems
-    // when more than one avatar does parenting grabs on things.  This script tries to work
-    // around this with two associative arrays: previousParentID and previousParentJointIndex.  If
-    // (1) avatar-A does a parenting grab on something, and then (2) avatar-B takes it, and (3) avatar-A
-    // releases it and then (4) avatar-B releases it, then avatar-B will set the parent back to
-    // avatar-A's hand.  Avatar-A is no longer grabbing it, so it will end up triggering avatar-A's
-    // checkForUnexpectedChildren which will put it back to wherever it was when avatar-A initially grabbed it.
-    // this will work most of the time, unless avatar-A crashes or logs out while avatar-B is grabbing the
-    // entity.  This can also happen when a single avatar passes something from hand to hand.
-    this.previousParentID = {};
-    this.previousParentJointIndex = {};
-    this.previouslyUnhooked = {};
-
-    this.shouldScale = false;
-    this.isScalingAvatar = false;
-
-    // handPosition is where the avatar's hand appears to be, in-world.
-    this.getHandPosition = function () {
-        if (this.hand === RIGHT_HAND) {
-            return MyAvatar.getRightPalmPosition();
-        } else {
-            return MyAvatar.getLeftPalmPosition();
-        }
-    };
-    this.getHandRotation = function () {
-        if (this.hand === RIGHT_HAND) {
-            return MyAvatar.getRightPalmRotation();
-        } else {
-            return MyAvatar.getLeftPalmRotation();
-        }
-    };
-
-    this.handToController = function() {
-        return (hand === RIGHT_HAND) ? Controller.Standard.RightHand : Controller.Standard.LeftHand;
-    };
-
-    this.actionID = null; // action this script created...
-    this.grabbedThingID = null; // on this entity.
-    this.grabbedOverlay = null;
-    this.state = STATE_OFF;
-    this.pointer = null; // entity-id of line object
-
-    this.triggerValue = 0; // rolling average of trigger value
-    this.triggerClicked = false;
-    this.rawTriggerValue = 0;
-    this.rawSecondaryValue = 0;
-    this.rawThumbValue = 0;
-
-    // for visualizations
-    this.overlayLine = null;
-    this.searchSphere = null;
-    this.otherGrabbingLine = null;
-
-    this.otherGrabbingUUID = null;
-
-    this.waitForTriggerRelease = false;
-
-    // how far from camera to search intersection?
-    var DEFAULT_SEARCH_SPHERE_DISTANCE = 1000;
-    this.intersectionDistance = 0.0;
-    this.searchSphereDistance = DEFAULT_SEARCH_SPHERE_DISTANCE;
-
-    this.ignoreIK = false;
-    this.offsetPosition = Vec3.ZERO;
-    this.offsetRotation = Quat.IDENTITY;
-
-    this.lastPickTime = 0;
-    this.lastUnequipCheckTime = 0;
-
-    this.equipOverlayInfoSetMap = {};
-
-    this.tabletStabbed = false;
-    this.tabletStabbedPos2D = null;
-    this.tabletStabbedPos3D = null;
-
-    this.useFingerInsteadOfStylus = false;
-    this.fingerPointing = false;
-
-    // initialize stylus tip
-    var DEFAULT_STYLUS_TIP = {
-        position: {x: 0, y: 0, z: 0},
-        orientation: {x: 0, y: 0, z: 0, w: 0},
-        rotation: {x: 0, y: 0, z: 0, w: 0},
-        velocity: {x: 0, y: 0, z: 0},
-        valid: false
-    };
-    this.stylusTip = DEFAULT_STYLUS_TIP;
-
-    var _this = this;
-
-    var suppressedIn2D = [STATE_OFF, STATE_SEARCHING];
-    this.ignoreInput = function() {
-        // We've made the decision to use 'this' for new code, even though it is fragile,
-        // in order to keep/ the code uniform without making any no-op line changes.
-        return (-1 !== suppressedIn2D.indexOf(this.state)) && isIn2DMode();
-    };
-
-    this.updateStylusTip = function() {
-        if (this.useFingerInsteadOfStylus) {
-            this.stylusTip = getFingerWorldLocation(this.hand);
-        } else {
-            this.stylusTip = getControllerWorldLocation(this.handToController(), true);
-
-            // translate tip forward according to constant.
-            var TIP_OFFSET = {x: 0, y: WEB_STYLUS_LENGTH - WEB_TOUCH_Y_OFFSET, z: 0};
-            this.stylusTip.position = Vec3.sum(this.stylusTip.position, Vec3.multiplyQbyV(this.stylusTip.orientation, TIP_OFFSET));
-        }
-
-        // compute tip velocity from hand controller motion, it is more accurate then computing it from previous positions.
-        var pose = Controller.getPoseValue(this.handToController());
-        if (pose.valid) {
-            var worldControllerPos = Vec3.sum(MyAvatar.position, Vec3.multiplyQbyV(MyAvatar.orientation, pose.translation));
-            var worldControllerLinearVel = Vec3.multiplyQbyV(MyAvatar.orientation, pose.velocity);
-            var worldControllerAngularVel = Vec3.multiplyQbyV(MyAvatar.orientation, pose.angularVelocity);
-            var tipVelocity = Vec3.sum(worldControllerLinearVel, Vec3.cross(worldControllerAngularVel, Vec3.subtract(this.stylusTip.position, worldControllerPos)));
-            this.stylusTip.velocity = tipVelocity;
-        } else {
-            this.stylusTip.velocity = {x: 0, y: 0, z: 0};
-        }
-    };
-
-    this.update = function(deltaTime, timestamp) {
-        this.updateSmoothedTrigger();
-        this.maybeScaleMyAvatar();
-
-        this.updateStylusTip();
-
-        var DEFAULT_USE_FINGER_AS_STYLUS = false;
-        var USE_FINGER_AS_STYLUS = Settings.getValue("preferAvatarFingerOverStylus");
-        if (USE_FINGER_AS_STYLUS === "") {
-            USE_FINGER_AS_STYLUS = DEFAULT_USE_FINGER_AS_STYLUS;
-        }
-        if (USE_FINGER_AS_STYLUS && MyAvatar.getJointIndex("LeftHandIndex4") !== -1) {
-            this.useFingerInsteadOfStylus = true;
-        } else {
-            this.useFingerInsteadOfStylus = false;
-        }
-
-        if (this.ignoreInput()) {
-
-            // Most hand input is disabled, because we are interacting with the 2d hud.
-            // However, we still should check for collisions of the stylus with the web overlay.
-            this.processStylus();
-            this.turnOffVisualizations();
-            return;
-        }
-
-        if (CONTROLLER_STATE_MACHINE[this.state]) {
-            var updateMethodName = CONTROLLER_STATE_MACHINE[this.state].updateMethod;
-            var updateMethod = this[updateMethodName];
-            if (updateMethod) {
-                updateMethod.call(this, deltaTime, timestamp);
-            } else {
-                print("WARNING: could not find updateMethod for state " + stateToName(this.state));
-            }
-        } else {
-            print("WARNING: could not find state " + this.state + " in state machine");
-        }
-    };
-
-    this.callEntityMethodOnGrabbed = function(entityMethodName) {
-        if (this.grabbedIsOverlay) {
-            return;
-        }
-        var args = [this.hand === RIGHT_HAND ? "right" : "left", MyAvatar.sessionUUID];
-        Entities.callEntityMethod(this.grabbedThingID, entityMethodName, args);
-    };
-
-    this.setState = function(newState, reason) {
-        if ((isInEditMode() && this.grabbedThingID !== HMD.tabletID) &&
-            (newState !== STATE_OFF &&
-             newState !== STATE_SEARCHING &&
-             newState !== STATE_STYLUS_TOUCHING &&
-             newState !== STATE_OVERLAY_LASER_TOUCHING)) {
-            return;
-        }
-        setGrabCommunications((newState === STATE_DISTANCE_HOLDING) ||
-                              (newState === STATE_DISTANCE_ROTATING) ||
-                              (newState === STATE_NEAR_GRABBING));
-        if (WANT_DEBUG || WANT_DEBUG_STATE) {
-            var oldStateName = stateToName(this.state);
-            var newStateName = stateToName(newState);
-            print("STATE (" + this.hand + "): " + this.state + "-" + newStateName +
-                  " <-- " + oldStateName + ", reason = " + reason);
-        }
-
-        // exit the old state
-        if (CONTROLLER_STATE_MACHINE[this.state]) {
-            var exitMethodName = CONTROLLER_STATE_MACHINE[this.state].exitMethod;
-            var exitMethod = this[exitMethodName];
-            if (exitMethod) {
-                exitMethod.call(this);
-            }
-        } else {
-            print("WARNING: could not find state " + this.state + " in state machine");
-        }
-
-        this.state = newState;
-
-        // enter the new state
-        if (CONTROLLER_STATE_MACHINE[newState]) {
-            var enterMethodName = CONTROLLER_STATE_MACHINE[newState].enterMethod;
-            var enterMethod = this[enterMethodName];
-            if (enterMethod) {
-                enterMethod.call(this);
-            }
-        } else {
-            print("WARNING: could not find newState " + newState + " in state machine");
-        }
-    };
-
-    this.grabPointSphereOn = function() {
-        if (!SHOW_GRAB_POINT_SPHERE) {
-            return;
-        }
-
-        if (!this.grabPointSphere) {
-            this.grabPointSphere = Overlays.addOverlay("sphere", {
-                name: "grabPointSphere",
-                localPosition: getGrabPointSphereOffset(this.handToController()),
-                localRotation: { x: 0, y: 0, z: 0, w: 1 },
-                dimensions: GRAB_POINT_SPHERE_RADIUS * 2,
-                color: GRAB_POINT_SPHERE_COLOR,
-                alpha: GRAB_POINT_SPHERE_ALPHA,
-                solid: true,
-                visible: true,
-                ignoreRayIntersection: true,
-                drawInFront: false,
-                parentID: AVATAR_SELF_ID,
-                parentJointIndex: this.controllerJointIndex
-            });
-        }
-    };
-
-    this.grabPointSphereOff = function() {
-        if (this.grabPointSphere) {
-            Overlays.deleteOverlay(this.grabPointSphere);
-            this.grabPointSphere = null;
-        }
-    };
-
-    this.searchSphereOn = function(location, size, color) {
-
-        var rotation = Quat.lookAt(location, Camera.getPosition(), Vec3.UP);
-        var brightColor = colorPow(color, 0.06);
-        if (this.searchSphere === null) {
-            var sphereProperties = {
-                name: "searchSphere",
-                position: location,
-                rotation: rotation,
-                outerRadius: size * 1.2,
-                innerColor: brightColor,
-                outerColor: color,
-                innerAlpha: 0.9,
-                outerAlpha: 0.0,
-                solid: true,
-                ignoreRayIntersection: true,
-                drawInFront: true, // Even when burried inside of something, show it.
-                visible: true
-            };
-            this.searchSphere = Overlays.addOverlay("circle3d", sphereProperties);
-        } else {
-            Overlays.editOverlay(this.searchSphere, {
-                position: location,
-                rotation: rotation,
-                innerColor: brightColor,
-                outerColor: color,
-                innerAlpha: 1.0,
-                outerAlpha: 0.0,
-                outerRadius: size * 1.2,
-                visible: true,
-                ignoreRayIntersection: true
-            });
-        }
-    };
-
-    this.showStylus = function() {
-        if (this.stylus) {
-            return;
-        }
-
-        var stylusProperties = {
-            name: "stylus",
-            url: Script.resourcesPath() + "meshes/tablet-stylus-fat.fbx",
-            loadPriority: 10.0,
-            localPosition: Vec3.sum({ x: 0.0,
-                                      y: WEB_TOUCH_Y_OFFSET,
-                                      z: 0.0 },
-                                    getGrabPointSphereOffset(this.handToController())),
-            localRotation: Quat.fromVec3Degrees({ x: -90, y: 0, z: 0 }),
-            dimensions: { x: 0.01, y: 0.01, z: WEB_STYLUS_LENGTH },
-            solid: true,
-            visible: true,
-            ignoreRayIntersection: true,
-            drawInFront: false,
-            parentID: AVATAR_SELF_ID,
-            parentJointIndex: MyAvatar.getJointIndex(this.hand === RIGHT_HAND ?
-                                                     "_CAMERA_RELATIVE_CONTROLLER_RIGHTHAND" :
-                                                     "_CAMERA_RELATIVE_CONTROLLER_LEFTHAND")
-        };
-        this.stylus = Overlays.addOverlay("model", stylusProperties);
-    };
-
-    this.hideStylus = function() {
-        if (!this.stylus) {
-            return;
-        }
-        Overlays.deleteOverlay(this.stylus);
-        this.stylus = null;
-    };
-
-    this.overlayLineOn = function(closePoint, farPoint, color, farParentID) {
-        if (this.overlayLine === null) {
-            var lineProperties = {
-                name: "line",
-                glow: 1.0,
-                lineWidth: 5,
-                start: closePoint,
-                end: farPoint,
-                color: color,
-                ignoreRayIntersection: true, // always ignore this
-                drawInFront: true, // Even when burried inside of something, show it.
-                visible: true,
-                alpha: 1,
-                parentID: AVATAR_SELF_ID,
-                parentJointIndex: MyAvatar.getJointIndex(this.hand === RIGHT_HAND ?
-                                                         "_CAMERA_RELATIVE_CONTROLLER_RIGHTHAND" :
-                                                         "_CAMERA_RELATIVE_CONTROLLER_LEFTHAND"),
-                endParentID: farParentID
-            };
-            this.overlayLine = Overlays.addOverlay("line3d", lineProperties);
-
-        } else {
-            if (farParentID && farParentID != NULL_UUID) {
-                Overlays.editOverlay(this.overlayLine, {
-                    color: color,
-                        endParentID: farParentID
-                });
-            } else {
-                Overlays.editOverlay(this.overlayLine, {
-                    length: Vec3.distance(farPoint, closePoint),
-                    color: color,
-                    endParentID: farParentID
-                });
-            }
-        }
-    };
-
-    this.searchIndicatorOn = function(distantPickRay) {
-        var handPosition = distantPickRay.origin;
-        var SEARCH_SPHERE_SIZE = 0.011;
-        var SEARCH_SPHERE_FOLLOW_RATE = 0.50;
-
-        if (this.intersectionDistance > 0) {
-            //  If we hit something with our pick ray, move the search sphere toward that distance
-            this.searchSphereDistance = this.searchSphereDistance * SEARCH_SPHERE_FOLLOW_RATE +
-                this.intersectionDistance * (1.0 - SEARCH_SPHERE_FOLLOW_RATE);
-        }
-
-        var searchSphereLocation = Vec3.sum(distantPickRay.origin,
-                                            Vec3.multiply(distantPickRay.direction, this.searchSphereDistance));
-        this.searchSphereOn(searchSphereLocation, SEARCH_SPHERE_SIZE * this.searchSphereDistance,
-                            (this.triggerSmoothedGrab() || this.secondarySqueezed()) ?
-                            COLORS_GRAB_SEARCHING_FULL_SQUEEZE :
-                            COLORS_GRAB_SEARCHING_HALF_SQUEEZE);
-        if (PICK_WITH_HAND_RAY) {
-            this.overlayLineOn(handPosition, searchSphereLocation,
-                               (this.triggerSmoothedGrab() || this.secondarySqueezed()) ?
-                               COLORS_GRAB_SEARCHING_FULL_SQUEEZE :
-                               COLORS_GRAB_SEARCHING_HALF_SQUEEZE);
-        }
-    };
-
-    // Turns off indicators used for searching. Overlay line and sphere.
-    this.searchIndicatorOff = function() {
-        this.searchSphereOff();
-        if (PICK_WITH_HAND_RAY) {
-            this.overlayLineOff();
-        }
-    };
-
-    this.otherGrabbingLineOn = function(avatarPosition, entityPosition, color) {
-        if (this.otherGrabbingLine === null) {
-            var lineProperties = {
-                lineWidth: 5,
-                start: avatarPosition,
-                end: entityPosition,
-                color: color,
-                glow: 1.0,
-                ignoreRayIntersection: true,
-                drawInFront: true,
-                visible: true,
-                alpha: 1
-            };
-            this.otherGrabbingLine = Overlays.addOverlay("line3d", lineProperties);
-        } else {
-            Overlays.editOverlay(this.otherGrabbingLine, {
-                start: avatarPosition,
-                end: entityPosition,
-                color: color
-            });
-        }
-    };
-
-    this.evalLightWorldTransform = function(modelPos, modelRot) {
-
-        var MODEL_LIGHT_POSITION = {
-            x: 0,
-            y: -0.3,
-            z: 0
-        };
-
-        var MODEL_LIGHT_ROTATION = Quat.angleAxis(-90, {
-            x: 1,
-            y: 0,
-            z: 0
-        });
-
-        return {
-            p: Vec3.sum(modelPos, Vec3.multiplyQbyV(modelRot, MODEL_LIGHT_POSITION)),
-            q: Quat.multiply(modelRot, MODEL_LIGHT_ROTATION)
-        };
-    };
-
-    this.lineOff = function() {
-        if (this.pointer !== null) {
-            Entities.deleteEntity(this.pointer);
-        }
-        this.pointer = null;
-    };
-
-    this.overlayLineOff = function() {
-        if (this.overlayLine !== null) {
-            Overlays.deleteOverlay(this.overlayLine);
-        }
-        this.overlayLine = null;
-    };
-
-    this.searchSphereOff = function() {
-        if (this.searchSphere !== null) {
-            Overlays.deleteOverlay(this.searchSphere);
-            this.searchSphere = null;
-            this.searchSphereDistance = DEFAULT_SEARCH_SPHERE_DISTANCE;
-            this.intersectionDistance = 0.0;
-        }
-    };
-
-    this.otherGrabbingLineOff = function() {
-        if (this.otherGrabbingLine !== null) {
-            Overlays.deleteOverlay(this.otherGrabbingLine);
-        }
-        this.otherGrabbingLine = null;
-    };
-
-    this.turnOffVisualizations = function() {
-        this.overlayLineOff();
-        this.grabPointSphereOff();
-        this.lineOff();
-        this.searchSphereOff();
-        this.otherGrabbingLineOff();
-        restore2DMode();
-    };
-
-    this.triggerPress = function(value) {
-        _this.rawTriggerValue = value;
-    };
-
-    this.triggerClick = function(value) {
-        _this.triggerClicked = value;
-    };
-
-    this.secondaryPress = function(value) {
-        _this.rawSecondaryValue = value;
-    };
-
-    this.updateSmoothedTrigger = function() {
-        var triggerValue = this.rawTriggerValue;
-        // smooth out trigger value
-        this.triggerValue = (this.triggerValue * TRIGGER_SMOOTH_RATIO) +
-            (triggerValue * (1.0 - TRIGGER_SMOOTH_RATIO));
-    };
-
-    this.triggerSmoothedGrab = function() {
-        return this.triggerClicked;
-    };
-
-    this.triggerSmoothedSqueezed = function() {
-        return this.triggerValue > TRIGGER_ON_VALUE;
-    };
-
-    this.triggerSmoothedReleased = function() {
-        return this.triggerValue < TRIGGER_OFF_VALUE;
-    };
-
-    this.secondarySqueezed = function() {
-        return _this.rawSecondaryValue > BUMPER_ON_VALUE;
-    };
-
-    this.secondaryReleased = function() {
-        return _this.rawSecondaryValue < BUMPER_ON_VALUE;
-    };
-
-    // this.triggerOrsecondarySqueezed = function () {
-    //     return triggerSmoothedSqueezed() || secondarySqueezed();
-    // }
-
-    // this.triggerAndSecondaryReleased = function () {
-    //     return triggerSmoothedReleased() && secondaryReleased();
-    // }
-
-    this.thumbPress = function(value) {
-        _this.rawThumbValue = value;
-    };
-
-    this.thumbPressed = function() {
-        return _this.rawThumbValue > THUMB_ON_VALUE;
-    };
-
-    this.thumbReleased = function() {
-        return _this.rawThumbValue < THUMB_ON_VALUE;
-    };
-
-    this.stealTouchFocus = function(stylusTarget) {
-        // send hover events to target
-        // record the entity or overlay we are hovering over.
-        if ((stylusTarget.entityID === this.getOtherHandController().hoverEntity) ||
-            (stylusTarget.overlayID === this.getOtherHandController().hoverOverlay)) {
-            this.getOtherHandController().relinquishTouchFocus();
-        }
-        this.requestTouchFocus(stylusTarget);
-    };
-
-    this.requestTouchFocus = function(stylusTarget) {
-
-        // send hover events to target if we can.
-        // record the entity or overlay we are hovering over.
-        if (stylusTarget.entityID && stylusTarget.entityID !== this.hoverEntity && stylusTarget.entityID !== this.getOtherHandController().hoverEntity) {
-            this.hoverEntity = stylusTarget.entityID;
-            sendHoverEnterEventToStylusTarget(this.hand, stylusTarget);
-        } else if (stylusTarget.overlayID && stylusTarget.overlayID !== this.hoverOverlay && stylusTarget.overlayID !== this.getOtherHandController().hoverOverlay) {
-            this.hoverOverlay = stylusTarget.overlayID;
-            sendHoverEnterEventToStylusTarget(this.hand, stylusTarget);
-        }
-    };
-
-    this.hasTouchFocus = function(stylusTarget) {
-        return ((stylusTarget.entityID && stylusTarget.entityID === this.hoverEntity) ||
-                (stylusTarget.overlayID && stylusTarget.overlayID === this.hoverOverlay));
-    };
-
-    this.relinquishTouchFocus = function() {
-
-        // send hover leave event.
-        var pointerEvent = { type: "Move", id: this.hand + 1 };
-        if (this.hoverEntity) {
-            Entities.sendHoverLeaveEntity(this.hoverEntity, pointerEvent);
-            this.hoverEntity = null;
-        } else if (this.hoverOverlay) {
-            Overlays.sendMouseMoveOnOverlay(this.hoverOverlay, pointerEvent);
-            Overlays.sendHoverOverOverlay(this.hoverOverlay, pointerEvent);
-            Overlays.sendHoverLeaveOverlay(this.hoverOverlay, pointerEvent);
-            this.hoverOverlay = null;
-        }
-    };
-
-    this.pointFinger = function(value) {
-        var HIFI_POINT_INDEX_MESSAGE_CHANNEL = "Hifi-Point-Index";
-        if (this.fingerPointing !== value) {
-            var message;
-            if (this.hand === RIGHT_HAND) {
-                message = { pointRightIndex: value };
-            } else {
-                message = { pointLeftIndex: value };
-            }
-            Messages.sendMessage(HIFI_POINT_INDEX_MESSAGE_CHANNEL, JSON.stringify(message), true);
-            this.fingerPointing = value;
-        }
-    };
-
-    this.processStylus = function() {
-        if (!this.stylusTip.valid) {
-            this.pointFinger(false);
-            this.hideStylus();
-            return;
-        }
-
-        if (this.useFingerInsteadOfStylus) {
-            this.hideStylus();
-        }
-
-        var tipPosition = this.stylusTip.position;
-
-        // build list of stylus targets, near the stylusTip
-        var stylusTargets = [];
-        var candidateEntities = Entities.findEntities(tipPosition, WEB_DISPLAY_STYLUS_DISTANCE);
-        entityPropertiesCache.addEntities(candidateEntities);
-        var i, props, stylusTarget;
-        for (i = 0; i < candidateEntities.length; i++) {
-            props = entityPropertiesCache.getProps(candidateEntities[i]);
-            if (props && (props.type === "Web" || this.isTablet(candidateEntities[i]))) {
-                stylusTarget = calculateStylusTargetFromEntity(this.stylusTip, candidateEntities[i]);
-                if (stylusTarget) {
-                    stylusTargets.push(stylusTarget);
-                }
-            }
-        }
-
-        // add the tabletScreen, if it is valid
-        if (HMD.tabletScreenID && HMD.tabletScreenID !== NULL_UUID && Overlays.getProperty(HMD.tabletScreenID, "visible")) {
-            stylusTarget = calculateStylusTargetFromOverlay(this.stylusTip, HMD.tabletScreenID);
-            if (stylusTarget) {
-                stylusTargets.push(stylusTarget);
-            }
-        }
-
-        // add the tablet home button.
-        if (HMD.homeButtonID && HMD.homeButtonID !== NULL_UUID && Overlays.getProperty(HMD.homeButtonID, "visible")) {
-            stylusTarget = calculateStylusTargetFromOverlay(this.stylusTip, HMD.homeButtonID);
-            if (stylusTarget) {
-                stylusTargets.push(stylusTarget);
-            }
-        }
-
-        var TABLET_MIN_HOVER_DISTANCE = 0.01;
-        var TABLET_MAX_HOVER_DISTANCE = 0.1;
-        var TABLET_MIN_TOUCH_DISTANCE = -0.05;
-        var TABLET_MAX_TOUCH_DISTANCE = TABLET_MIN_HOVER_DISTANCE;
-        var EDGE_BORDER = 0.075;
-
-        var hysteresisOffset = 0.0;
-        if (this.isNearStylusTarget) {
-            hysteresisOffset = 0.05;
-        }
-
-        this.isNearStylusTarget = isNearStylusTarget(stylusTargets, EDGE_BORDER + hysteresisOffset,
-                                                     TABLET_MIN_TOUCH_DISTANCE - hysteresisOffset, WEB_DISPLAY_STYLUS_DISTANCE + hysteresisOffset);
-
-        if (this.isNearStylusTarget) {
-            if (!this.useFingerInsteadOfStylus) {
-                this.showStylus();
-            } else {
-                this.pointFinger(true);
-            }
-        } else {
-            this.hideStylus();
-            this.pointFinger(false);
-        }
-
-        var nearestStylusTarget = calculateNearestStylusTarget(stylusTargets);
-
-        if (nearestStylusTarget && nearestStylusTarget.distance > TABLET_MIN_TOUCH_DISTANCE &&
-            nearestStylusTarget.distance < TABLET_MAX_HOVER_DISTANCE) {
-
-            this.requestTouchFocus(nearestStylusTarget);
-
-            if (!stylusTargetHasKeyboardFocus(nearestStylusTarget)) {
-                setKeyboardFocusOnStylusTarget(nearestStylusTarget);
-            }
-
-            if (this.hasTouchFocus(nearestStylusTarget)) {
-                sendHoverOverEventToStylusTarget(this.hand, nearestStylusTarget);
-            }
-
-            // filter out presses when tip is moving away from tablet.
-            // ensure that stylus is within bounding box by checking normalizedPosition
-            if (nearestStylusTarget.valid && nearestStylusTarget.distance > TABLET_MIN_TOUCH_DISTANCE &&
-                nearestStylusTarget.distance < TABLET_MAX_TOUCH_DISTANCE && Vec3.dot(this.stylusTip.velocity, nearestStylusTarget.normal) < 0 &&
-                nearestStylusTarget.normalizedPosition.x >= 0 && nearestStylusTarget.normalizedPosition.x <= 1 &&
-                nearestStylusTarget.normalizedPosition.y >= 0 && nearestStylusTarget.normalizedPosition.y <= 1) {
-
-                var name;
-                if (nearestStylusTarget.entityID) {
-                    name = entityPropertiesCache.getProps(nearestStylusTarget.entityID).name;
-                    this.stylusTarget = nearestStylusTarget;
-                    this.setState(STATE_STYLUS_TOUCHING, "begin touching entity '" + name + "'");
-                } else if (nearestStylusTarget.overlayID) {
-                    name = Overlays.getProperty(nearestStylusTarget.overlayID, "name");
-                    this.stylusTarget = nearestStylusTarget;
-                    this.setState(STATE_STYLUS_TOUCHING, "begin touching overlay '" + name + "'");
-                }
-            }
-        } else {
-            this.relinquishTouchFocus();
-        }
-
-        this.homeButtonTouched = false;
-    };
-
-    this.off = function(deltaTime, timestamp) {
-
-        this.controllerJointIndex = getControllerJointIndex(this.hand);
-        this.checkForUnexpectedChildren();
-
-        if (this.editTriggered) {
-            this.editTriggered = false;
-        }
-
-        if (this.triggerSmoothedReleased() && this.secondaryReleased()) {
-            this.waitForTriggerRelease = false;
-        }
-        if (!this.waitForTriggerRelease && (this.triggerSmoothedSqueezed() || this.secondarySqueezed())) {
-            this.lastPickTime = 0;
-            this.startingHandRotation = getControllerWorldLocation(this.handToController(), true).orientation;
-            this.searchStartTime = Date.now();
-            this.setState(STATE_SEARCHING, "trigger squeeze detected");
-            return;
-        }
-
-        var controllerLocation = getControllerWorldLocation(this.handToController(), true);
-        var worldHandPosition = controllerLocation.position;
-
-        var candidateEntities = Entities.findEntities(worldHandPosition, MAX_EQUIP_HOTSPOT_RADIUS);
-        entityPropertiesCache.addEntities(candidateEntities);
-        var potentialEquipHotspot = this.chooseBestEquipHotspot(candidateEntities);
-        if (!this.waitForTriggerRelease) {
-            this.updateEquipHaptics(potentialEquipHotspot, worldHandPosition);
-        }
-
-        var nearEquipHotspots = this.chooseNearEquipHotspots(candidateEntities, EQUIP_HOTSPOT_RENDER_RADIUS);
-        equipHotspotBuddy.updateHotspots(nearEquipHotspots, timestamp);
-        if (potentialEquipHotspot) {
-            equipHotspotBuddy.highlightHotspot(potentialEquipHotspot);
-        }
-
-        // when the grab-point enters a grabable entity, give a haptic pulse
-        candidateEntities = Entities.findEntities(worldHandPosition, NEAR_GRAB_RADIUS);
-        var grabbableEntities = candidateEntities.filter(function(entity) {
-            return _this.entityIsNearGrabbable(entity, worldHandPosition, NEAR_GRAB_MAX_DISTANCE);
-        });
-        if (grabbableEntities.length > 0) {
-            if (!this.grabPointIntersectsEntity) {
-                // don't do haptic pulse for tablet
-                var nonTabletEntities = grabbableEntities.filter(function(entityID) {
-                    return entityID != HMD.tabletID && entityID != HMD.homeButtonID;
-                });
-                if (nonTabletEntities.length > 0) {
-                    Controller.triggerHapticPulse(1, 20, this.hand);
-                }
-                this.grabPointIntersectsEntity = true;
-                this.grabPointSphereOn();
-            }
-        } else {
-            this.grabPointIntersectsEntity = false;
-            this.grabPointSphereOff();
-        }
-
-        this.processStylus();
-
-        if (isInEditMode() && !this.isNearStylusTarget && HMD.isHandControllerAvailable()) {
-            // Always showing lasers while in edit mode and hands/stylus is not active.
-            var rayPickInfo = this.calcRayPickInfo(this.hand);
-            this.intersectionDistance = (rayPickInfo.entityID || rayPickInfo.overlayID) ? rayPickInfo.distance : 0;
-            this.searchIndicatorOn(rayPickInfo.searchRay);
-        } else {
-            this.searchIndicatorOff();
-        }
-    };
-
-    this.handleLaserOnHomeButton = function(rayPickInfo) {
-        if (rayPickInfo.overlayID && this.triggerSmoothedGrab()) {
-            var homeButton = rayPickInfo.overlayID;
-            var hmdHomeButton = HMD.homeButtonID;
-            if (homeButton === hmdHomeButton) {
-                if (this.homeButtonTouched === false) {
-                    this.homeButtonTouched = true;
-                    Controller.triggerHapticPulse(HAPTIC_LASER_UI_STRENGTH, HAPTIC_LASER_UI_DURATION, this.hand);
-                    Messages.sendLocalMessage("home", homeButton);
-                }
-            } else {
-                this.homeButtonTouched = false;
-            }
-        } else {
-            this.homeButtonTouched = false;
-        }
-    };
-
-    this.clearEquipHaptics = function() {
-        this.prevPotentialEquipHotspot = null;
-    };
-
-    this.updateEquipHaptics = function(potentialEquipHotspot, currentLocation) {
-        if (potentialEquipHotspot && !this.prevPotentialEquipHotspot ||
-            !potentialEquipHotspot && this.prevPotentialEquipHotspot) {
-            Controller.triggerHapticPulse(HAPTIC_TEXTURE_STRENGTH, HAPTIC_TEXTURE_DURATION, this.hand);
-            this.lastHapticPulseLocation = currentLocation;
-        } else if (potentialEquipHotspot &&
-                   Vec3.distance(this.lastHapticPulseLocation, currentLocation) > HAPTIC_TEXTURE_DISTANCE) {
-            Controller.triggerHapticPulse(HAPTIC_TEXTURE_STRENGTH, HAPTIC_TEXTURE_DURATION, this.hand);
-            this.lastHapticPulseLocation = currentLocation;
-        }
-        this.prevPotentialEquipHotspot = potentialEquipHotspot;
-    };
-
-    // Performs ray pick test from the hand controller into the world
-    // @param {number} which hand to use, RIGHT_HAND or LEFT_HAND
-    // @param {object} if set, use this as as the pick ray, expects origin, direction, and length fields.
-    // @returns {object} returns object with two keys entityID and distance
-    //
-    this.calcRayPickInfo = function(hand, pickRayOverride) {
-
-        var pickRay;
-        if (pickRayOverride) {
-            pickRay = pickRayOverride;
-        } else {
-            var controllerLocation = getControllerWorldLocation(this.handToController(), true);
-            var worldHandPosition = controllerLocation.position;
-            var worldHandRotation = controllerLocation.orientation;
-
-            pickRay = {
-                origin: PICK_WITH_HAND_RAY ? worldHandPosition : Camera.position,
-                direction: PICK_WITH_HAND_RAY ? Quat.getUp(worldHandRotation) : Vec3.mix(Quat.getUp(worldHandRotation),
-                                                                                         Quat.getFront(Camera.orientation),
-                                                                                         HAND_HEAD_MIX_RATIO),
-                length: PICK_MAX_DISTANCE
-            };
-        }
-
-        var result = {
-            entityID: null,
-            overlayID: null,
-            searchRay: pickRay,
-            distance: PICK_MAX_DISTANCE
-        };
-
-        var now = Date.now();
-        if (now - this.lastPickTime < MSECS_PER_SEC / PICKS_PER_SECOND_PER_HAND) {
-            return result;
-        }
-        this.lastPickTime = now;
-
-        var intersection;
-        if (USE_BLACKLIST === true && blacklist.length !== 0) {
-            intersection = findRayIntersection(pickRay, true, [], blacklist, true);
-        } else {
-            intersection = findRayIntersection(pickRay, true, [], [], true);
-        }
-
-        if (intersection.intersects) {
-            return {
-                entityID: intersection.entityID,
-                overlayID: intersection.overlayID,
-                searchRay: pickRay,
-                distance: Vec3.distance(pickRay.origin, intersection.intersection),
-                intersection: intersection.intersection,
-                normal: intersection.surfaceNormal,
-                properties: intersection.properties
-            };
-        } else {
-            return result;
-        }
-    };
-
-    this.entityWantsTrigger = function(entityID) {
-        var grabbableProps = entityPropertiesCache.getGrabbableProps(entityID);
-        return grabbableProps && grabbableProps.wantsTrigger;
-    };
-
-    // returns a list of all equip-hotspots assosiated with this entity.
-    // @param {UUID} entityID
-    // @returns {Object[]} array of objects with the following fields.
-    //      * key {string} a string that can be used to uniquely identify this hotspot
-    //      * entityID {UUID}
-    //      * localPosition {Vec3} position of the hotspot in object space.
-    //      * worldPosition {vec3} position of the hotspot in world space.
-    //      * radius {number} radius of equip hotspot
-    //      * joints {Object} keys are joint names values are arrays of two elements:
-    //        offset position {Vec3} and offset rotation {Quat}, both are in the coordinate system of the joint.
-    //      * modelURL {string} url for model to use instead of default sphere.
-    //      * modelScale {Vec3} scale factor for model
-    this.collectEquipHotspots = function(entityID) {
-        var result = [];
-        var props = entityPropertiesCache.getProps(entityID);
-        var entityXform = new Xform(props.rotation, props.position);
-        var equipHotspotsProps = entityPropertiesCache.getEquipHotspotsProps(entityID);
-        if (equipHotspotsProps && equipHotspotsProps.length > 0) {
-            var i, length = equipHotspotsProps.length;
-            for (i = 0; i < length; i++) {
-                var hotspot = equipHotspotsProps[i];
-                if (hotspot.position && hotspot.radius && hotspot.joints) {
-                    result.push({
-                        key: entityID.toString() + i.toString(),
-                        entityID: entityID,
-                        localPosition: hotspot.position,
-                        worldPosition: entityXform.xformPoint(hotspot.position),
-                        radius: hotspot.radius,
-                        joints: hotspot.joints,
-                        modelURL: hotspot.modelURL,
-                        modelScale: hotspot.modelScale
-                    });
-                }
-            }
-        } else {
-            var wearableProps = entityPropertiesCache.getWearableProps(entityID);
-            if (wearableProps && wearableProps.joints) {
-                result.push({
-                    key: entityID.toString() + "0",
-                    entityID: entityID,
-                    localPosition: {
-                        x: 0,
-                        y: 0,
-                        z: 0
-                    },
-                    worldPosition: entityXform.pos,
-                    radius: EQUIP_RADIUS,
-                    joints: wearableProps.joints,
-                    modelURL: null,
-                    modelScale: null
-                });
-            }
-        }
-        return result;
-    };
-
-    this.hotspotIsEquippable = function(hotspot) {
-        var props = entityPropertiesCache.getProps(hotspot.entityID);
-        var debug = (WANT_DEBUG_SEARCH_NAME && props.name === WANT_DEBUG_SEARCH_NAME);
-
-        var otherHandControllerState = this.getOtherHandController().state;
-        var okToEquipFromOtherHand = ((otherHandControllerState === STATE_NEAR_GRABBING ||
-                                       otherHandControllerState === STATE_DISTANCE_HOLDING ||
-                                       otherHandControllerState === STATE_DISTANCE_ROTATING) &&
-                                      this.getOtherHandController().grabbedThingID === hotspot.entityID);
-        var hasParent = true;
-        if (props.parentID === NULL_UUID) {
-            hasParent = false;
-        }
-        if ((hasParent || entityHasActions(hotspot.entityID)) && !okToEquipFromOtherHand) {
-            if (debug) {
-                print("equip is skipping '" + props.name + "': grabbed by someone else");
-            }
-            return false;
-        }
-
-        return true;
-    };
-    this.entityIsCloneable = function(entityID) {
-        var entityProps = entityPropertiesCache.getGrabbableProps(entityID);
-        var props = entityPropertiesCache.getProps(entityID);
-        if (!props) {
-            return false;
-        }
-
-        if (entityProps.hasOwnProperty("cloneable")) {
-            return entityProps.cloneable;
-        }
-        return false;
-    };
-    this.entityIsGrabbable = function(entityID) {
-        var grabbableProps = entityPropertiesCache.getGrabbableProps(entityID);
-        var props = entityPropertiesCache.getProps(entityID);
-        if (!props) {
-            return false;
-        }
-        var debug = (WANT_DEBUG_SEARCH_NAME && props.name === WANT_DEBUG_SEARCH_NAME);
-        var grabbable = propsArePhysical(props);
-        if (grabbableProps.hasOwnProperty("grabbable")) {
-            grabbable = grabbableProps.grabbable;
-        }
-
-        if (!grabbable && !grabbableProps.wantsTrigger) {
-            if (debug) {
-                print("grab is skipping '" + props.name + "': not grabbable.");
-            }
-            return false;
-        }
-        if (FORBIDDEN_GRAB_TYPES.indexOf(props.type) >= 0) {
-            if (debug) {
-                print("grab is skipping '" + props.name + "': forbidden entity type.");
-            }
-            return false;
-        }
-        if (props.locked && !grabbableProps.wantsTrigger) {
-            if (debug) {
-                print("grab is skipping '" + props.name + "': locked and not triggerable.");
-            }
-            return false;
-        }
-        if (FORBIDDEN_GRAB_NAMES.indexOf(props.name) >= 0) {
-            if (debug) {
-                print("grab is skipping '" + props.name + "': forbidden name.");
-            }
-            return false;
-        }
-
-        return true;
-    };
-
-    this.entityIsDistanceGrabbable = function(entityID, handPosition) {
-        if (!this.entityIsGrabbable(entityID)) {
-            return false;
-        }
-
-        var props = entityPropertiesCache.getProps(entityID);
-        var distance = Vec3.distance(props.position, handPosition);
-        var debug = (WANT_DEBUG_SEARCH_NAME && props.name === WANT_DEBUG_SEARCH_NAME);
-
-        // we can't distance-grab non-physical
-        var isPhysical = propsArePhysical(props);
-        if (!isPhysical) {
-            if (debug) {
-                print("distance grab is skipping '" + props.name + "': not physical");
-            }
-            return false;
-        }
-
-        if (distance > PICK_MAX_DISTANCE) {
-            // too far away, don't grab
-            if (debug) {
-                print("distance grab is skipping '" + props.name + "': too far away.");
-            }
-            return false;
-        }
-
-        this.otherGrabbingUUID = entityIsGrabbedByOther(entityID);
-        if (this.otherGrabbingUUID !== null) {
-            // don't distance grab something that is already grabbed.
-            if (debug) {
-                print("distance grab is skipping '" + props.name + "': already grabbed by another.");
-            }
-            return false;
-        }
-
-        return true;
-    };
-
-    this.entityIsNearGrabbable = function(entityID, handPosition, maxDistance) {
-
-        if (!this.entityIsCloneable(entityID) && !this.entityIsGrabbable(entityID)) {
-            return false;
-        }
-
-        var props = entityPropertiesCache.getProps(entityID);
-        var distance = Vec3.distance(props.position, handPosition);
-        var debug = (WANT_DEBUG_SEARCH_NAME && props.name === WANT_DEBUG_SEARCH_NAME);
-
-        if (distance > maxDistance) {
-            // too far away, don't grab
-            if (debug) {
-                print(" grab is skipping '" + props.name + "': too far away.");
-            }
-            return false;
-        }
-
-        return true;
-    };
-
-    this.entityIsFarToNearGrabbable = function (objectPosition, handPosition, maxDistance) {
-        var distanceToObjectFromHand = Vec3.length(Vec3.subtract(handPosition, objectPosition));
-
-        if (distanceToObjectFromHand > maxDistance) {
-          return false;
-        }
-        return true;
-    };
-
-    this.chooseNearEquipHotspots = function(candidateEntities, distance) {
-        var equippableHotspots = flatten(candidateEntities.map(function(entityID) {
-            return _this.collectEquipHotspots(entityID);
-        })).filter(function(hotspot) {
-            return (_this.hotspotIsEquippable(hotspot) &&
-                    Vec3.distance(hotspot.worldPosition, getControllerWorldLocation(_this.handToController(), true).position) <
-                    hotspot.radius + distance);
-        });
-        return equippableHotspots;
-    };
-
-    this.chooseBestEquipHotspot = function(candidateEntities) {
-        var DISTANCE = 0;
-        var equippableHotspots = this.chooseNearEquipHotspots(candidateEntities, DISTANCE);
-        var _this = this;
-        if (equippableHotspots.length > 0) {
-            // sort by distance
-            equippableHotspots.sort(function(a, b) {
-                var handControllerLocation = getControllerWorldLocation(_this.handToController(), true);
-                var aDistance = Vec3.distance(a.worldPosition, handControllerLocation.position);
-                var bDistance = Vec3.distance(b.worldPosition, handControllerLocation.position);
-                return aDistance - bDistance;
-            });
-            return equippableHotspots[0];
-        } else {
-            return null;
-        }
-    };
-
-    this.chooseNearEquipHotspotsForFarToNearEquip = function(candidateEntities, distance) {
-        var equippableHotspots = flatten(candidateEntities.map(function(entityID) {
-                return _this.collectEquipHotspots(entityID);
-            })).filter(function(hotspot) {
-                return (Vec3.distance(hotspot.worldPosition, getControllerWorldLocation(_this.handToController(), true).position) <
-                    hotspot.radius + distance);
-            });
-            return equippableHotspots;
-    };
-
-    this.chooseBestEquipHotspotForFarToNearEquip = function(candidateEntities) {
-        var DISTANCE = 1;
-        var equippableHotspots = this.chooseNearEquipHotspotsForFarToNearEquip(candidateEntities, DISTANCE);
-        var _this = this;
-        if (equippableHotspots.length > 0) {
-            // sort by distance
-            equippableHotspots.sort(function(a, b) {
-                var handControllerLocation = getControllerWorldLocation(_this.handToController(), true);
-                var aDistance = Vec3.distance(a.worldPosition, handControllerLocation.position);
-                var bDistance = Vec3.distance(b.worldPosition, handControllerLocation.position);
-                return aDistance - bDistance;
-            });
-            return equippableHotspots[0];
-        } else {
-            return null;
-        }
-    };
-
-    this.searchEnter = function() {
-        mostRecentSearchingHand = this.hand;
-        var rayPickInfo = this.calcRayPickInfo(this.hand);
-        if (rayPickInfo.entityID || rayPickInfo.overlayID) {
-            this.intersectionDistance = rayPickInfo.distance;
-            this.searchSphereDistance = this.intersectionDistance;
-        }
-    };
-
-    this.search = function(deltaTime, timestamp) {
-        var _this = this;
-        var name;
-        var FAR_SEARCH_DELAY = 0;  //  msecs before search beam appears
-
-        var farSearching =  this.triggerSmoothedSqueezed() && (Date.now() - this.searchStartTime > FAR_SEARCH_DELAY);
-
-        this.grabbedThingID = null;
-        this.grabbedOverlay = null;
-        this.isInitialGrab = false;
-        this.preparingHoldRelease = false;
-
-        this.checkForUnexpectedChildren();
-
-        if ((this.triggerSmoothedReleased() && this.secondaryReleased())) {
-            this.grabbedThingID = null;
-            this.setState(STATE_OFF, "trigger released");
-            return;
-        }
-
-        var controllerLocation = getControllerWorldLocation(this.handToController(), true);
-        var handPosition = controllerLocation.position;
-
-        var rayPickInfo = this.calcRayPickInfo(this.hand);
-
-        if (rayPickInfo.entityID) {
-            entityPropertiesCache.addEntity(rayPickInfo.entityID);
-        }
-
-        var candidateHotSpotEntities = Entities.findEntities(handPosition, MAX_EQUIP_HOTSPOT_RADIUS);
-        entityPropertiesCache.addEntities(candidateHotSpotEntities);
-
-        var potentialEquipHotspot = this.chooseBestEquipHotspot(candidateHotSpotEntities);
-        if (potentialEquipHotspot) {
-            if ((this.triggerSmoothedGrab() || this.secondarySqueezed()) && holdEnabled) {
-                this.grabbedHotspot = potentialEquipHotspot;
-                this.grabbedThingID = potentialEquipHotspot.entityID;
-                this.grabbedIsOverlay = false;
-                this.setState(STATE_HOLD, "equipping '" + entityPropertiesCache.getProps(this.grabbedThingID).name + "'");
-
-                return;
-            }
-        }
-
-        var candidateEntities = Entities.findEntities(handPosition, NEAR_GRAB_RADIUS);
-        var grabbableEntities = candidateEntities.filter(function(entity) {
-            return _this.entityIsNearGrabbable(entity, handPosition, NEAR_GRAB_MAX_DISTANCE);
-        });
-
-        var candidateOverlays = Overlays.findOverlays(handPosition, NEAR_GRAB_RADIUS);
-        var grabbableOverlays = candidateOverlays.filter(function(overlayID) {
-            return Overlays.getProperty(overlayID, "grabbable");
-        });
-
-        if (rayPickInfo.entityID) {
-            this.intersectionDistance = rayPickInfo.distance;
-            if (this.entityIsGrabbable(rayPickInfo.entityID) && rayPickInfo.distance < NEAR_GRAB_PICK_RADIUS) {
-                grabbableEntities.push(rayPickInfo.entityID);
-            }
-        } else if (rayPickInfo.overlayID) {
-            this.intersectionDistance = rayPickInfo.distance;
-        } else {
-            this.intersectionDistance = 0;
-        }
-
-        if (grabbableOverlays.length > 0) {
-            grabbableOverlays.sort(function(a, b) {
-                var aPosition = Overlays.getProperty(a, "position");
-                var aDistance = Vec3.distance(aPosition, handPosition);
-                var bPosition = Overlays.getProperty(b, "position");
-                var bDistance = Vec3.distance(bPosition, handPosition);
-                return aDistance - bDistance;
-            });
-            this.grabbedThingID = grabbableOverlays[0];
-            this.grabbedIsOverlay = true;
-            if ((this.triggerSmoothedGrab() || this.secondarySqueezed()) && nearGrabEnabled) {
-                this.setState(STATE_NEAR_GRABBING, "near grab overlay '" +
-                              Overlays.getProperty(this.grabbedThingID, "name") + "'");
-                return;
-            }
-        }
-
-        var entity;
-        if (grabbableEntities.length > 0) {
-            // sort by distance
-            grabbableEntities.sort(function(a, b) {
-                var aDistance = Vec3.distance(entityPropertiesCache.getProps(a).position, handPosition);
-                var bDistance = Vec3.distance(entityPropertiesCache.getProps(b).position, handPosition);
-                return aDistance - bDistance;
-            });
-            entity = grabbableEntities[0];
-            if (!isInEditMode() || entity == HMD.tabletID) { // tablet is grabbable, even when editing
-                name = entityPropertiesCache.getProps(entity).name;
-                this.grabbedThingID = entity;
-                this.grabbedIsOverlay = false;
-                if (this.entityWantsTrigger(entity)) {
-                    if (this.triggerSmoothedGrab()) {
-                        this.setState(STATE_NEAR_TRIGGER, "near trigger '" + name + "'");
-                        return;
-                    }
-                } else {
-                    //  If near something grabbable, grab it!
-                    if ((this.triggerSmoothedGrab() || this.secondarySqueezed()) && nearGrabEnabled) {
-                        this.setState(STATE_NEAR_GRABBING, "near grab entity '" + name + "'");
-                        return;
-                    }
-                }
-            }
-        }
-
-        if (rayPickInfo.distance >= WEB_STYLUS_LENGTH / 2.0 + WEB_TOUCH_Y_OFFSET) {
-            this.handleLaserOnHomeButton(rayPickInfo);
-            if (this.handleLaserOnWebEntity(rayPickInfo)) {
-                return;
-            }
-            if (this.handleLaserOnWebOverlay(rayPickInfo)) {
-                return;
-            }
-        }
-
-        if (isInEditMode()) {
-            this.searchIndicatorOn(rayPickInfo.searchRay);
-            if (this.triggerSmoothedGrab()) {
-                if (!this.editTriggered){
-                    if (rayPickInfo.entityID) {
-                        Messages.sendLocalMessage("entityToolUpdates", JSON.stringify({
-                            method: "selectEntity",
-                            entityID: rayPickInfo.entityID
-                        }));
-                    } else if (rayPickInfo.overlayID) {
-                        Messages.sendLocalMessage("entityToolUpdates", JSON.stringify({
-                            method: "selectOverlay",
-                            overlayID: rayPickInfo.overlayID
-                        }));
-                    }
-                }
-                this.editTriggered = true;
-            }
-            Reticle.setVisible(false);
-            return;
-        }
-
-        if (rayPickInfo.entityID) {
-            entity = rayPickInfo.entityID;
-            name = entityPropertiesCache.getProps(entity).name;
-            if (this.entityWantsTrigger(entity)) {
-                if (this.triggerSmoothedGrab()) {
-                    this.grabbedThingID = entity;
-                    this.grabbedIsOverlay = false;
-                    this.setState(STATE_FAR_TRIGGER, "far trigger '" + name + "'");
-                    return;
-                } else {
-                    // potentialFarTriggerEntity = entity;
-                }
-                this.otherGrabbingLineOff();
-            } else if (this.entityIsDistanceGrabbable(rayPickInfo.entityID, handPosition)) {
-                if (this.triggerSmoothedGrab() && !isEditing() && farGrabEnabled && farSearching) {
-                    this.grabbedThingID = entity;
-                    this.grabbedIsOverlay = false;
-                    this.grabbedDistance = rayPickInfo.distance;
-                    if (this.getOtherHandController().state === STATE_DISTANCE_HOLDING) {
-                        this.setState(STATE_DISTANCE_ROTATING, "distance rotate '" + name + "'");
-                    } else {
-                        this.setState(STATE_DISTANCE_HOLDING, "distance hold '" + name + "'");
-                    }
-                    return;
-                } else {
-                    // potentialFarGrabEntity = entity;
-                }
-                this.otherGrabbingLineOff();
-            } else if (this.otherGrabbingUUID !== null) {
-                if (this.triggerSmoothedGrab() && !isEditing() && farGrabEnabled && farSearching) {
-                    var avatar = AvatarList.getAvatar(this.otherGrabbingUUID);
-                    var IN_FRONT_OF_AVATAR = { x: 0, y: 0.2, z: 0.4 };  // Up from hips and in front of avatar.
-                    var startPosition = Vec3.sum(avatar.position, Vec3.multiplyQbyV(avatar.rotation, IN_FRONT_OF_AVATAR));
-                    var rayHitProps = entityPropertiesCache.getProps(rayPickInfo.entityID);
-                    var finishPisition = Vec3.sum(rayHitProps.position,  // Entity's centroid.
-                        Vec3.multiplyQbyV(rayHitProps.rotation,
-                        Vec3.multiplyVbyV(rayHitProps.dimensions,
-                        Vec3.subtract(DEFAULT_REGISTRATION_POINT, rayHitProps.registrationPoint))));
-                    this.otherGrabbingLineOn(startPosition, finishPisition, COLORS_GRAB_DISTANCE_HOLD);
-                } else {
-                    this.otherGrabbingLineOff();
-                }
-            } else {
-                this.otherGrabbingLineOff();
-            }
-        } else {
-            this.otherGrabbingLineOff();
-        }
-
-        this.updateEquipHaptics(potentialEquipHotspot, handPosition);
-
-        var nearEquipHotspots = this.chooseNearEquipHotspots(candidateEntities, EQUIP_HOTSPOT_RENDER_RADIUS);
-        equipHotspotBuddy.updateHotspots(nearEquipHotspots, timestamp);
-        if (potentialEquipHotspot) {
-            equipHotspotBuddy.highlightHotspot(potentialEquipHotspot);
-        }
-
-        if (farGrabEnabled && farSearching) {
-            this.searchIndicatorOn(rayPickInfo.searchRay);
-        }
-        Reticle.setVisible(false);
-    };
-
-    this.isTablet = function (entityID) {
-        if (entityID === HMD.tabletID) {
-            return true;
-        }
-        return false;
-    };
-
-    this.handleLaserOnWebEntity = function (rayPickInfo) {
-        var pointerEvent;
-
-        if (rayPickInfo.entityID && Entities.wantsHandControllerPointerEvents(rayPickInfo.entityID)) {
-            var entity = rayPickInfo.entityID;
-            var name = entityPropertiesCache.getProps(entity).name;
-
-            if (Entities.keyboardFocusEntity != entity) {
-                Overlays.keyboardFocusOverlay = 0;
-                Entities.keyboardFocusEntity = entity;
-
-                pointerEvent = {
-                    type: "Move",
-                    id: this.hand + 1, // 0 is reserved for hardware mouse
-                    pos2D: projectOntoEntityXYPlane(entity, rayPickInfo.intersection),
-                    pos3D: rayPickInfo.intersection,
-                     normal: rayPickInfo.normal,
-                    direction: rayPickInfo.searchRay.direction,
-                    button: "None"
-                };
-
-                this.hoverEntity = entity;
-                Entities.sendHoverEnterEntity(entity, pointerEvent);
-            }
-
-            // send mouse events for button highlights and tooltips.
-            if (this.hand == mostRecentSearchingHand ||
-                (this.hand !== mostRecentSearchingHand &&
-                 this.getOtherHandController().state !== STATE_SEARCHING &&
-                 this.getOtherHandController().state !== STATE_STYLUS_TOUCHING &&
-                 this.getOtherHandController().state !== STATE_ENTITY_LASER_TOUCHING &&
-                 this.getOtherHandController().state !== STATE_OVERLAY_LASER_TOUCHING)) {
-
-                // most recently searching hand has priority over other hand, for the purposes of button highlighting.
-                pointerEvent = {
-                    type: "Move",
-                    id: this.hand + 1, // 0 is reserved for hardware mouse
-                    pos2D: projectOntoEntityXYPlane(entity, rayPickInfo.intersection),
-                    pos3D: rayPickInfo.intersection,
-                    normal: rayPickInfo.normal,
-                    direction: rayPickInfo.searchRay.direction,
-                    button: "None"
-                };
-
-                Entities.sendMouseMoveOnEntity(entity, pointerEvent);
-                Entities.sendHoverOverEntity(entity, pointerEvent);
-            }
-
-            if (this.triggerSmoothedGrab()) {
-                this.grabbedThingID = entity;
-                this.grabbedIsOverlay = false;
-                this.setState(STATE_ENTITY_LASER_TOUCHING, "begin touching entity '" + name + "'");
-                return true;
-            }
-
-        } else if (this.hoverEntity) {
-            pointerEvent = {
-                type: "Move",
-                id: this.hand + 1
-            };
-            Entities.sendHoverLeaveEntity(this.hoverEntity, pointerEvent);
-            this.hoverEntity = null;
-        }
-
-        return false;
-    };
-
-    this.handleLaserOnWebOverlay = function (rayPickInfo) {
-        var pointerEvent;
-        if (rayPickInfo.overlayID) {
-            var overlay = rayPickInfo.overlayID;
-            if (Overlays.getProperty(overlay, "type") != "web3d") {
-                return false;
-            }
-            if (Overlays.keyboardFocusOverlay != overlay) {
-                Entities.keyboardFocusEntity = null;
-                Overlays.keyboardFocusOverlay = overlay;
-
-                pointerEvent = {
-                    type: "Move",
-                    id: HARDWARE_MOUSE_ID,
-                    pos2D: projectOntoOverlayXYPlane(overlay, rayPickInfo.intersection),
-                    pos3D: rayPickInfo.intersection,
-                    normal: rayPickInfo.normal,
-                    direction: rayPickInfo.searchRay.direction,
-                    button: "None"
-                };
-
-                this.hoverOverlay = overlay;
-                Overlays.sendHoverEnterOverlay(overlay, pointerEvent);
-            }
-
-            // Send mouse events for button highlights and tooltips.
-            if (this.hand == mostRecentSearchingHand ||
-                (this.hand !== mostRecentSearchingHand &&
-                 this.getOtherHandController().state !== STATE_SEARCHING &&
-                 this.getOtherHandController().state !== STATE_STYLUS_TOUCHING &&
-                 this.getOtherHandController().state !== STATE_ENTITY_LASER_TOUCHING &&
-                 this.getOtherHandController().state !== STATE_OVERLAY_LASER_TOUCHING)) {
-
-                // most recently searching hand has priority over other hand, for the purposes of button highlighting.
-                pointerEvent = {
-                    type: "Move",
-                    id: HARDWARE_MOUSE_ID,
-                    pos2D: projectOntoOverlayXYPlane(overlay, rayPickInfo.intersection),
-                    pos3D: rayPickInfo.intersection,
-                    normal: rayPickInfo.normal,
-                    direction: rayPickInfo.searchRay.direction,
-                    button: "None"
-                };
-
-                Overlays.sendMouseMoveOnOverlay(overlay, pointerEvent);
-                Overlays.sendHoverOverOverlay(overlay, pointerEvent);
-            }
-
-            if (this.triggerSmoothedGrab()) {
-                this.grabbedOverlay = overlay;
-                this.setState(STATE_OVERLAY_LASER_TOUCHING, "begin touching overlay '" + overlay + "'");
-                return true;
-            }
-
-        } else if (this.hoverOverlay) {
-            pointerEvent = {
-                type: "Move",
-                id: HARDWARE_MOUSE_ID
-            };
-            Overlays.sendHoverLeaveOverlay(this.hoverOverlay, pointerEvent);
-            this.hoverOverlay = null;
-        }
-
-        return false;
-    };
-
-    this.distanceGrabTimescale = function(mass, distance) {
-        var timeScale = DISTANCE_HOLDING_ACTION_TIMEFRAME * mass /
-            DISTANCE_HOLDING_UNITY_MASS * distance /
-            DISTANCE_HOLDING_UNITY_DISTANCE;
-        if (timeScale < DISTANCE_HOLDING_ACTION_TIMEFRAME) {
-            timeScale = DISTANCE_HOLDING_ACTION_TIMEFRAME;
-        }
-        return timeScale;
-    };
-
-    this.getMass = function(dimensions, density) {
-        return (dimensions.x * dimensions.y * dimensions.z) * density;
-    };
-
-    this.ensureDynamic = function () {
-        // if we distance hold something and keep it very still before releasing it, it ends up
-        // non-dynamic in bullet.  If it's too still, give it a little bounce so it will fall.
-        var props = Entities.getEntityProperties(this.grabbedThingID, ["velocity", "dynamic", "parentID"]);
-        if (props.dynamic && props.parentID == NULL_UUID) {
-            var velocity = props.velocity;
-            if (Vec3.length(velocity) < 0.05) { // see EntityMotionState.cpp DYNAMIC_LINEAR_VELOCITY_THRESHOLD
-                velocity = { x: 0.0, y: 0.2, z: 0.0 };
-                Entities.editEntity(this.grabbedThingID, { velocity: velocity });
-            }
-        }
-    };
-
-    this.distanceHoldingEnter = function() {
-        this.clearEquipHaptics();
-        this.grabPointSphereOff();
-
-        this.shouldScale = false;
-
-        var controllerLocation = getControllerWorldLocation(this.handToController(), true);
-        var worldControllerPosition = controllerLocation.position;
-        var worldControllerRotation = controllerLocation.orientation;
-
-        // transform the position into room space
-        var worldToSensorMat = Mat4.inverse(MyAvatar.getSensorToWorldMatrix());
-        var roomControllerPosition = Mat4.transformPoint(worldToSensorMat, worldControllerPosition);
-
-        var grabbedProperties = Entities.getEntityProperties(this.grabbedThingID, GRABBABLE_PROPERTIES);
-        var now = Date.now();
-
-        // add the action and initialize some variables
-        this.currentObjectPosition = grabbedProperties.position;
-        this.currentObjectRotation = grabbedProperties.rotation;
-        this.currentObjectTime = now;
-        this.currentCameraOrientation = Camera.orientation;
-
-        this.grabRadius = this.grabbedDistance;
-        this.grabRadialVelocity = 0.0;
-
-        // offset between controller vector at the grab radius and the entity position
-        var targetPosition = Vec3.multiply(this.grabRadius, Quat.getUp(worldControllerRotation));
-        targetPosition = Vec3.sum(targetPosition, worldControllerPosition);
-        this.offsetPosition = Vec3.subtract(this.currentObjectPosition, targetPosition);
-
-        // compute a constant based on the initial conditions which we use below to exaggerate hand motion
-        // onto the held object
-        this.radiusScalar = Math.log(this.grabRadius + 1.0);
-        if (this.radiusScalar < 1.0) {
-            this.radiusScalar = 1.0;
-        }
-
-        // compute the mass for the purpose of energy and how quickly to move object
-        this.mass = this.getMass(grabbedProperties.dimensions, grabbedProperties.density);
-        var distanceToObject = Vec3.length(Vec3.subtract(MyAvatar.position, grabbedProperties.position));
-        var timeScale = this.distanceGrabTimescale(this.mass, distanceToObject);
-        this.linearTimeScale = timeScale;
-        this.actionID = NULL_UUID;
-        this.actionID = Entities.addAction("far-grab", this.grabbedThingID, {
-            targetPosition: this.currentObjectPosition,
-            linearTimeScale: timeScale,
-            targetRotation: this.currentObjectRotation,
-            angularTimeScale: timeScale,
-            tag: getTag(),
-            ttl: ACTION_TTL
-        });
-        if (this.actionID === NULL_UUID) {
-            this.actionID = null;
-        }
-        this.actionTimeout = now + (ACTION_TTL * MSECS_PER_SEC);
-
-        if (this.actionID !== null) {
-            this.callEntityMethodOnGrabbed("startDistanceGrab");
-        }
-
-        Controller.triggerHapticPulse(HAPTIC_PULSE_STRENGTH, HAPTIC_PULSE_DURATION, this.hand);
-        this.turnOffVisualizations();
-        this.previousRoomControllerPosition = roomControllerPosition;
-    };
-
-    this.distanceHolding = function(deltaTime, timestamp) {
-
-        if (!this.triggerClicked) {
-            this.callEntityMethodOnGrabbed("releaseGrab");
-            this.ensureDynamic();
-            this.setState(STATE_OFF, "trigger released");
-            if (this.getOtherHandController().state === STATE_DISTANCE_ROTATING) {
-                this.getOtherHandController().setState(STATE_SEARCHING, "trigger released on holding controller");
-                // Can't set state of other controller to STATE_DISTANCE_HOLDING because then either:
-                // (a) The entity would jump to line up with the formerly rotating controller's orientation, or
-                // (b) The grab beam would need an orientation offset to the controller's true orientation.
-                // Neither of these options is good, so instead set STATE_SEARCHING and subsequently let the formerly distance
-                // rotating controller start distance holding the entity if it happens to be pointing at the entity.
-            }
-            return;
-        }
-
-        var controllerLocation = getControllerWorldLocation(this.handToController(), true);
-        var worldControllerPosition = controllerLocation.position;
-        var worldControllerRotation = controllerLocation.orientation;
-
-        // also transform the position into room space
-        var worldToSensorMat = Mat4.inverse(MyAvatar.getSensorToWorldMatrix());
-        var roomControllerPosition = Mat4.transformPoint(worldToSensorMat, worldControllerPosition);
-
-        var grabbedProperties = Entities.getEntityProperties(this.grabbedThingID, GRABBABLE_PROPERTIES);
-        var now = Date.now();
-        var deltaObjectTime = (now - this.currentObjectTime) / MSECS_PER_SEC; // convert to seconds
-        this.currentObjectTime = now;
-
-        // the action was set up when this.distanceHolding was called.  update the targets.
-        var radius = Vec3.distance(this.currentObjectPosition, worldControllerPosition) *
-            this.radiusScalar * DISTANCE_HOLDING_RADIUS_FACTOR;
-        if (radius < 1.0) {
-            radius = 1.0;
-        }
-
-        var roomHandDelta = Vec3.subtract(roomControllerPosition, this.previousRoomControllerPosition);
-        var worldHandDelta = Mat4.transformVector(MyAvatar.getSensorToWorldMatrix(), roomHandDelta);
-        var handMoved = Vec3.multiply(worldHandDelta, radius);
-        this.currentObjectPosition = Vec3.sum(this.currentObjectPosition, handMoved);
-
-        this.callEntityMethodOnGrabbed("continueDistantGrab");
-
-        var defaultMoveWithHeadData = {
-            disableMoveWithHead: false
-        };
-
-        //  Update radialVelocity
-        var lastVelocity = Vec3.multiply(worldHandDelta, 1.0 / deltaObjectTime);
-        var delta = Vec3.normalize(Vec3.subtract(grabbedProperties.position, worldControllerPosition));
-        var newRadialVelocity = Vec3.dot(lastVelocity, delta);
-
-        var VELOCITY_AVERAGING_TIME = 0.016;
-        var blendFactor = deltaObjectTime / VELOCITY_AVERAGING_TIME;
-        if (blendFactor < 0.0) {
-            blendFactor = 0.0;
-        } else if (blendFactor > 1.0) {
-            blendFactor = 1.0;
-        }
-        this.grabRadialVelocity = blendFactor * newRadialVelocity + (1.0 - blendFactor) * this.grabRadialVelocity;
-
-        var RADIAL_GRAB_AMPLIFIER = 10.0;
-        if (Math.abs(this.grabRadialVelocity) > 0.0) {
-            this.grabRadius = this.grabRadius + (this.grabRadialVelocity * deltaObjectTime *
-                                                 this.grabRadius * RADIAL_GRAB_AMPLIFIER);
-        }
-
-        // don't let grabRadius go all the way to zero, because it can't come back from that
-        var MINIMUM_GRAB_RADIUS = 0.1;
-        if (this.grabRadius < MINIMUM_GRAB_RADIUS) {
-            this.grabRadius = MINIMUM_GRAB_RADIUS;
-        }
-        var newTargetPosition = Vec3.multiply(this.grabRadius, Quat.getUp(worldControllerRotation));
-        newTargetPosition = Vec3.sum(newTargetPosition, worldControllerPosition);
-        newTargetPosition = Vec3.sum(newTargetPosition, this.offsetPosition);
-        var objectToAvatar = Vec3.subtract(this.currentObjectPosition, MyAvatar.position);
-        var handControllerData = getEntityCustomData('handControllerKey', this.grabbedThingID, defaultMoveWithHeadData);
-        if (handControllerData.disableMoveWithHead !== true) {
-            // mix in head motion
-            if (MOVE_WITH_HEAD) {
-                var objDistance = Vec3.length(objectToAvatar);
-                var before = Vec3.multiplyQbyV(this.currentCameraOrientation, {
-                    x: 0.0,
-                    y: 0.0,
-                    z: objDistance
-                });
-                var after = Vec3.multiplyQbyV(Camera.orientation, {
-                    x: 0.0,
-                    y: 0.0,
-                    z: objDistance
-                });
-                var change = Vec3.multiply(Vec3.subtract(before, after), HAND_HEAD_MIX_RATIO);
-                this.currentCameraOrientation = Camera.orientation;
-                this.currentObjectPosition = Vec3.sum(this.currentObjectPosition, change);
-            }
-        }
-
-        this.maybeScale(grabbedProperties);
-
-        // visualizations
-        var rayPickInfo = this.calcRayPickInfo(this.hand);
-        this.overlayLineOn(rayPickInfo.searchRay.origin,
-                           Vec3.subtract(grabbedProperties.position, this.offsetPosition),
-                           COLORS_GRAB_DISTANCE_HOLD,
-                           this.grabbedThingID);
-
-        var distanceToObject = Vec3.length(Vec3.subtract(MyAvatar.position, this.currentObjectPosition));
-
-        var candidateHotSpotEntities =
-            Entities.findEntities(controllerLocation.position,MAX_FAR_TO_NEAR_EQUIP_HOTSPOT_RADIUS);
-        entityPropertiesCache.addEntities(candidateHotSpotEntities);
-
-        var potentialEquipHotspot = this.chooseBestEquipHotspotForFarToNearEquip(candidateHotSpotEntities);
-        if (potentialEquipHotspot && (potentialEquipHotspot.entityID == this.grabbedThingID)) {
-            if ((this.triggerSmoothedGrab() || this.secondarySqueezed()) && holdEnabled) {
-                this.grabbedHotspot = potentialEquipHotspot;
-                this.grabbedThingID = potentialEquipHotspot.entityID;
-                this.grabbedIsOverlay = false;
-
-                Entities.deleteAction(this.grabbedThingID, this.actionID);
-                this.actionID = null;
-
-                this.setState(STATE_HOLD, "equipping '" + entityPropertiesCache.getProps(this.grabbedThingID).name + "'");
-                return;
-             }
-        }
-        var rayPositionOnEntity = Vec3.subtract(grabbedProperties.position, this.offsetPosition);
-        //Far to Near Grab: If object is draw by user inside FAR_TO_NEAR_GRAB_MAX_DISTANCE, grab it
-        if (this.entityIsFarToNearGrabbable(rayPositionOnEntity,
-                                            controllerLocation.position,
-                                            FAR_TO_NEAR_GRAB_MAX_DISTANCE)) {
-            this.farToNearGrab = true;
-
-            Entities.deleteAction(this.grabbedThingID, this.actionID);
-            this.actionID = null;
-
-            this.setState(STATE_NEAR_GRABBING , "near grab entity '" + this.grabbedThingID + "'");
-            return;
-        }
-
-        this.linearTimeScale = (this.linearTimeScale / 2);
-        if (this.linearTimeScale <= DISTANCE_HOLDING_ACTION_TIMEFRAME) {
-            this.linearTimeScale = DISTANCE_HOLDING_ACTION_TIMEFRAME;
-        }
-        var success = Entities.updateAction(this.grabbedThingID, this.actionID, {
-            targetPosition: newTargetPosition,
-            linearTimeScale: this.linearTimeScale,
-            targetRotation: this.currentObjectRotation,
-            angularTimeScale: this.distanceGrabTimescale(this.mass, distanceToObject),
-            ttl: ACTION_TTL
-        });
-        if (success) {
-            this.actionTimeout = now + (ACTION_TTL * MSECS_PER_SEC);
-        } else {
-            print("continueDistanceHolding -- updateAction failed");
-        }
-
-        this.previousRoomControllerPosition = roomControllerPosition;
-    };
-
-    this.distanceRotatingEnter = function() {
-        this.clearEquipHaptics();
-        this.grabPointSphereOff();
-
-        var controllerLocation = getControllerWorldLocation(this.handToController(), true);
-        var worldControllerPosition = controllerLocation.position;
-        var worldControllerRotation = controllerLocation.orientation;
-
-        var grabbedProperties = Entities.getEntityProperties(this.grabbedThingID, GRABBABLE_PROPERTIES);
-        this.currentObjectPosition = grabbedProperties.position;
-        this.grabRadius = this.grabbedDistance;
-
-        // Offset between controller vector at the grab radius and the entity position.
-        var targetPosition = Vec3.multiply(this.grabRadius, Quat.getUp(worldControllerRotation));
-        targetPosition = Vec3.sum(targetPosition, worldControllerPosition);
-        this.offsetPosition = Vec3.subtract(this.currentObjectPosition, targetPosition);
-
-        // Initial controller rotation.
-        this.previousWorldControllerRotation = worldControllerRotation;
-
-        Controller.triggerHapticPulse(HAPTIC_PULSE_STRENGTH, HAPTIC_PULSE_DURATION, this.hand);
-        this.turnOffVisualizations();
-    };
-
-    this.distanceRotating = function(deltaTime, timestamp) {
-
-        if (!this.triggerClicked) {
-            this.callEntityMethodOnGrabbed("releaseGrab");
-            this.ensureDynamic();
-            this.setState(STATE_OFF, "trigger released");
-            return;
-        }
-
-        var grabbedProperties = Entities.getEntityProperties(this.grabbedThingID, GRABBABLE_PROPERTIES);
-
-        // Delta rotation of grabbing controller since last update.
-        var worldControllerRotation = getControllerWorldLocation(this.handToController(), true).orientation;
-        var controllerRotationDelta = Quat.multiply(worldControllerRotation, Quat.inverse(this.previousWorldControllerRotation));
-
-        // Rotate entity by twice the delta rotation.
-        controllerRotationDelta = Quat.multiply(controllerRotationDelta, controllerRotationDelta);
-
-        // Perform the rotation in the translation controller's action update.
-        this.getOtherHandController().currentObjectRotation = Quat.multiply(controllerRotationDelta,
-            this.getOtherHandController().currentObjectRotation);
-
-        // Rotate about the translation controller's target position.
-        this.offsetPosition = Vec3.multiplyQbyV(controllerRotationDelta, this.offsetPosition);
-        this.getOtherHandController().offsetPosition = Vec3.multiplyQbyV(controllerRotationDelta,
-            this.getOtherHandController().offsetPosition);
-
-        var rayPickInfo = this.calcRayPickInfo(this.hand);
-        this.overlayLineOn(rayPickInfo.searchRay.origin, Vec3.subtract(grabbedProperties.position, this.offsetPosition),
-            COLORS_GRAB_DISTANCE_HOLD, this.grabbedThingID);
-
-        this.previousWorldControllerRotation = worldControllerRotation;
-    };
-
-    this.setupHoldAction = function() {
-        this.actionID = Entities.addAction("hold", this.grabbedThingID, {
-            hand: this.hand === RIGHT_HAND ? "right" : "left",
-            timeScale: NEAR_GRABBING_ACTION_TIMEFRAME,
-            relativePosition: this.offsetPosition,
-            relativeRotation: this.offsetRotation,
-            ttl: ACTION_TTL,
-            kinematic: this.kinematicGrab,
-            kinematicSetVelocity: true,
-            ignoreIK: this.ignoreIK
-        });
-        if (this.actionID === NULL_UUID) {
-            this.actionID = null;
-            return false;
-        }
-        var now = Date.now();
-        this.actionTimeout = now + (ACTION_TTL * MSECS_PER_SEC);
-        return true;
-    };
-
-    this.projectVectorAlongAxis = function(position, axisStart, axisEnd) {
-        var aPrime = Vec3.subtract(position, axisStart);
-        var bPrime = Vec3.subtract(axisEnd, axisStart);
-        var bPrimeMagnitude = Vec3.length(bPrime);
-        var dotProduct = Vec3.dot(aPrime, bPrime);
-        var scalar = dotProduct / bPrimeMagnitude;
-        if (scalar < 0) {
-            scalar = 0;
-        }
-        if (scalar > 1) {
-            scalar = 1;
-        }
-        var projection = Vec3.sum(axisStart, Vec3.multiply(scalar, Vec3.normalize(bPrime)));
-        return projection;
-    };
-
-    this.dropGestureReset = function() {
-        this.prevHandIsUpsideDown = false;
-    };
-
-    this.dropGestureProcess = function(deltaTime) {
-        var worldHandRotation = getControllerWorldLocation(this.handToController(), true).orientation;
-        var localHandUpAxis = this.hand === RIGHT_HAND ? {
-            x: 1,
-            y: 0,
-            z: 0
-        } : {
-            x: -1,
-            y: 0,
-            z: 0
-        };
-        var worldHandUpAxis = Vec3.multiplyQbyV(worldHandRotation, localHandUpAxis);
-        var DOWN = {
-            x: 0,
-            y: -1,
-            z: 0
-        };
-
-        var DROP_ANGLE = Math.PI / 3;
-        var HYSTERESIS_FACTOR = 1.1;
-        var ROTATION_ENTER_THRESHOLD = Math.cos(DROP_ANGLE);
-        var ROTATION_EXIT_THRESHOLD = Math.cos(DROP_ANGLE * HYSTERESIS_FACTOR);
-        var rotationThreshold = this.prevHandIsUpsideDown ? ROTATION_EXIT_THRESHOLD : ROTATION_ENTER_THRESHOLD;
-
-        var handIsUpsideDown = false;
-        if (Vec3.dot(worldHandUpAxis, DOWN) > rotationThreshold) {
-            handIsUpsideDown = true;
-        }
-
-        if (handIsUpsideDown != this.prevHandIsUpsideDown) {
-            this.prevHandIsUpsideDown = handIsUpsideDown;
-            Controller.triggerHapticPulse(HAPTIC_DEQUIP_STRENGTH, HAPTIC_DEQUIP_DURATION, this.hand);
-        }
-
-        return handIsUpsideDown;
-    };
-
-    this.nearGrabbingEnter = function() {
-        this.grabPointSphereOff();
-        this.lineOff();
-        this.overlayLineOff();
-        this.searchSphereOff();
-        this.otherGrabbingLineOff();
-
-        this.dropGestureReset();
-        this.clearEquipHaptics();
-
-        this.shouldScale = false;
-
-        Controller.triggerHapticPulse(HAPTIC_PULSE_STRENGTH, HAPTIC_PULSE_DURATION, this.hand);
-
-        var grabbedProperties;
-        if (this.grabbedIsOverlay) {
-            grabbedProperties = {
-                position: Overlays.getProperty(this.grabbedThingID, "position"),
-                rotation: Overlays.getProperty(this.grabbedThingID, "rotation"),
-                parentID: Overlays.getProperty(this.grabbedThingID, "parentID"),
-                parentJointIndex: Overlays.getProperty(this.grabbedThingID, "parentJointIndex"),
-                dynamic: false,
-                shapeType: "none"
-            };
-            this.ignoreIK = true;
-        } else {
-            grabbedProperties = Entities.getEntityProperties(this.grabbedThingID, GRABBABLE_PROPERTIES);
-            var grabbableData = getEntityCustomData(GRABBABLE_DATA_KEY, this.grabbedThingID, DEFAULT_GRABBABLE_DATA);
-            if (FORCE_IGNORE_IK) {
-                this.ignoreIK = true;
-            } else {
-                this.ignoreIK = (grabbableData.ignoreIK !== undefined) ? grabbableData.ignoreIK : true;
-            }
-
-            this.kinematicGrab = (grabbableData.kinematic !== undefined) ? grabbableData.kinematic : NEAR_GRABBING_KINEMATIC;
-        }
-
-        var handRotation;
-        var handPosition;
-        if (this.ignoreIK) {
-            var controllerLocation = getControllerWorldLocation(this.handToController(), false);
-            handRotation = controllerLocation.orientation;
-            handPosition = controllerLocation.position;
-        } else {
-            handRotation = this.getHandRotation();
-            handPosition = this.getHandPosition();
-        }
-
-        var hasPresetPosition = false;
-        if (this.state == STATE_HOLD && this.grabbedHotspot) {
-            // if an object is "equipped" and has a predefined offset, use it.
-            var offsets = USE_ATTACH_POINT_SETTINGS && getAttachPointForHotspotFromSettings(this.grabbedHotspot, this.hand);
-            if (offsets) {
-                this.offsetPosition = offsets[0];
-                this.offsetRotation = offsets[1];
-                hasPresetPosition = true;
-            } else {
-                var handJointName = this.hand === RIGHT_HAND ? "RightHand" : "LeftHand";
-                if (this.grabbedHotspot.joints[handJointName]) {
-                    this.offsetPosition = this.grabbedHotspot.joints[handJointName][0];
-                    this.offsetRotation = this.grabbedHotspot.joints[handJointName][1];
-                    hasPresetPosition = true;
-                }
-            }
-        } else {
-            var objectRotation = grabbedProperties.rotation;
-            this.offsetRotation = Quat.multiply(Quat.inverse(handRotation), objectRotation);
-
-            var currentObjectPosition = grabbedProperties.position;
-            var offset = Vec3.subtract(currentObjectPosition, handPosition);
-            this.offsetPosition = Vec3.multiplyQbyV(Quat.inverse(Quat.multiply(handRotation, this.offsetRotation)), offset);
-        }
-
-        // This boolean is used to check if the object that is grabbed has just been cloned
-        // It is only set true, if the object that is grabbed creates a new clone.
-        var isClone = false;
-        var isPhysical = propsArePhysical(grabbedProperties) ||
-            (!this.grabbedIsOverlay && entityHasActions(this.grabbedThingID));
-        if (isPhysical && this.state == STATE_NEAR_GRABBING && grabbedProperties.parentID === NULL_UUID) {
-            // grab entity via action
-            if (!this.setupHoldAction()) {
-                return;
-            }
-            Messages.sendMessage('Hifi-Object-Manipulation', JSON.stringify({
-                action: 'grab',
-                grabbedEntity: this.grabbedThingID,
-                joint: this.hand === RIGHT_HAND ? "RightHand" : "LeftHand"
-            }));
-        } else {
-            // grab entity via parenting
-            this.actionID = null;
-            var handJointIndex;
-            if (this.ignoreIK) {
-                handJointIndex = this.controllerJointIndex;
-            } else {
-                handJointIndex = MyAvatar.getJointIndex(this.hand === RIGHT_HAND ? "RightHand" : "LeftHand");
-            }
-
-            var reparentProps = {
-                parentID: AVATAR_SELF_ID,
-                parentJointIndex: handJointIndex,
-                velocity: {x: 0, y: 0, z: 0},
-                angularVelocity: {x: 0, y: 0, z: 0}
-            };
-            if (hasPresetPosition) {
-                reparentProps.localPosition = this.offsetPosition;
-                reparentProps.localRotation = this.offsetRotation;
-            }
-
-            if (this.grabbedIsOverlay) {
-                Overlays.editOverlay(this.grabbedThingID, reparentProps);
-            } else {
-                if (grabbedProperties.userData.length > 0) {
-                    try{
-                        var userData = JSON.parse(grabbedProperties.userData);
-                        var grabInfo = userData.grabbableKey;
-                        if (grabInfo && grabInfo.cloneable) {
-                            var worldEntities = Entities.findEntities(MyAvatar.position, 50);
-                            var count = 0;
-                            worldEntities.forEach(function(item) {
-                                var itemWE = Entities.getEntityProperties(item, ["name"]);
-                                if (itemWE.name.indexOf('-clone-' + grabbedProperties.id) !== -1) {
-                                    count++;
-                                }
-                            });
-
-                            var limit = grabInfo.cloneLimit ? grabInfo.cloneLimit : 0;
-                            if (count >= limit && limit !== 0) {
-                                return;
-                            }
-
-                            var cloneableProps = Entities.getEntityProperties(grabbedProperties.id);
-                            cloneableProps.name = cloneableProps.name + '-clone-' + grabbedProperties.id;
-                            var lifetime = grabInfo.cloneLifetime ? grabInfo.cloneLifetime : 300;
-                            var dynamic = grabInfo.cloneDynamic ? grabInfo.cloneDynamic : false;
-                            var cUserData = Object.assign({}, userData);
-                            var cProperties = Object.assign({}, cloneableProps);
-                            isClone = true;
-
-                            delete cUserData.grabbableKey.cloneLifetime;
-                            delete cUserData.grabbableKey.cloneable;
-                            delete cUserData.grabbableKey.cloneDynamic;
-                            delete cUserData.grabbableKey.cloneLimit;
-                            delete cProperties.id;
-
-                            cProperties.dynamic = dynamic;
-                            cProperties.locked = false;
-                            cUserData.grabbableKey.triggerable = true;
-                            cUserData.grabbableKey.grabbable = true;
-                            cProperties.lifetime = lifetime;
-                            cProperties.userData = JSON.stringify(cUserData);
-                            var cloneID = Entities.addEntity(cProperties);
-                            this.grabbedThingID = cloneID;
-                            grabbedProperties = Entities.getEntityProperties(cloneID);
-                        }
-                    }catch(e) {}
-                }
-                Entities.editEntity(this.grabbedThingID, reparentProps);
-            }
-
-            if (this.thisHandIsParent(grabbedProperties)) {
-                // this should never happen, but if it does, don't set previous parent to be this hand.
-                // this.previousParentID[this.grabbedThingID] = NULL;
-                // this.previousParentJointIndex[this.grabbedThingID] = -1;
-            } else {
-                this.previousParentID[this.grabbedThingID] = grabbedProperties.parentID;
-                this.previousParentJointIndex[this.grabbedThingID] = grabbedProperties.parentJointIndex;
-            }
-            Messages.sendMessage('Hifi-Object-Manipulation', JSON.stringify({
-                action: 'equip',
-                grabbedEntity: this.grabbedThingID,
-                joint: this.hand === RIGHT_HAND ? "RightHand" : "LeftHand"
-            }));
-        }
-
-        if (!this.grabbedIsOverlay) {
-            Entities.editEntity(this.grabbedThingID, {
-                velocity: { x: 0, y: 0, z: 0 },
-                angularVelocity: { x: 0, y: 0, z: 0 },
-                // dynamic: false
-            });
-        }
-
-        var _this = this;
-        /*
-         * Setting context for function that is either called via timer or directly, depending if
-         * if the object in question is a clone. If it is a clone, we need to make sure that the intial equipment event
-         * is called correctly, as these just freshly created entity may not have completely initialized.
-        */
-        var grabEquipCheck = function () {
-            if (_this.state == STATE_NEAR_GRABBING) {
-                _this.callEntityMethodOnGrabbed("startNearGrab");
-            } else { // this.state == STATE_HOLD
-                _this.callEntityMethodOnGrabbed("startEquip");
-            }
-
-            // don't block teleport raypick with equipped entity
-            Messages.sendMessage('Hifi-Teleport-Ignore-Add', _this.grabbedThingID);
-
-            _this.currentHandControllerTipPosition =
-                (_this.hand === RIGHT_HAND) ? MyAvatar.rightHandTipPosition : MyAvatar.leftHandTipPosition;
-            _this.currentObjectTime = Date.now();
-
-            _this.currentObjectPosition = grabbedProperties.position;
-            _this.currentObjectRotation = grabbedProperties.rotation;
-            _this.currentVelocity = ZERO_VEC;
-            _this.currentAngularVelocity = ZERO_VEC;
-
-            _this.prevDropDetected = false;
-        };
-
-        if (isClone) {
-            // 100 ms seems to be sufficient time to force the check even occur after the object has been initialized.
-            Script.setTimeout(grabEquipCheck, 100);
-        } else {
-            grabEquipCheck();
-        }
-    };
-
-    this.nearGrabbing = function(deltaTime, timestamp) {
-        this.grabPointSphereOff();
-
-        var ttl = ACTION_TTL;
-
-        if (this.farToNearGrab) {
-            if(!this.triggerClicked){
-               this.farToNearGrab = false;
-            }
-        }
-
-        if (this.state == STATE_NEAR_GRABBING && (!this.triggerClicked && this.secondaryReleased())) {
-            this.callEntityMethodOnGrabbed("releaseGrab");
-            this.setState(STATE_OFF, "trigger released");
-            return;
-        }
-
-        if (this.state == STATE_HOLD) {
-
-            if (this.secondarySqueezed()) {
-                // this.secondaryReleased() will always be true when not depressed
-                // so we cannot simply rely on that for release - ensure that the
-                // trigger was first "prepared" by being pushed in before the release
-                this.preparingHoldRelease = true;
-            }
-
-            if (this.preparingHoldRelease && this.secondaryReleased()) {
-                // we have an equipped object and the secondary trigger was released
-                // short-circuit the other checks and release it
-                this.preparingHoldRelease = false;
-                this.callEntityMethodOnGrabbed("releaseEquip");
-                this.setState(STATE_OFF, "equipping ended via secondary press");
-                return;
-            }
-
-            var dropDetected = this.dropGestureProcess(deltaTime);
-
-            if (this.triggerSmoothedReleased()) {
-                this.waitForTriggerRelease = false;
-            }
-
-            if (dropDetected && this.prevDropDetected != dropDetected) {
-                this.waitForTriggerRelease = true;
-            }
-
-            // highlight the grabbed hotspot when the dropGesture is detected.
-            if (dropDetected) {
-                entityPropertiesCache.addEntity(this.grabbedHotspot.entityID);
-                equipHotspotBuddy.updateHotspot(this.grabbedHotspot, timestamp);
-                equipHotspotBuddy.highlightHotspot(this.grabbedHotspot);
-            }
-
-            if (dropDetected && !this.waitForTriggerRelease && this.triggerSmoothedGrab()) {
-                // store the offset attach points into preferences.
-                if (USE_ATTACH_POINT_SETTINGS && this.grabbedHotspot && this.grabbedThingID) {
-                    var prefprops = Entities.getEntityProperties(this.grabbedThingID, ["localPosition", "localRotation"]);
-                    if (prefprops && prefprops.localPosition && prefprops.localRotation) {
-                        storeAttachPointForHotspotInSettings(this.grabbedHotspot, this.hand,
-                                                             prefprops.localPosition, prefprops.localRotation);
-                    }
-                }
-
-                var grabbedEntity = this.grabbedThingID;
-                this.release();
-                this.grabbedThingID = grabbedEntity;
-                this.setState(STATE_NEAR_GRABBING, "drop gesture detected");
-                return;
-            }
-            this.prevDropDetected = dropDetected;
-        }
-
-        var props;
-        if (this.grabbedIsOverlay) {
-            props = {
-                localPosition: Overlays.getProperty(this.grabbedThingID, "localPosition"),
-                parentID: Overlays.getProperty(this.grabbedThingID, "parentID"),
-                parentJointIndex: Overlays.getProperty(this.grabbedThingID, "parentJointIndex"),
-                position: Overlays.getProperty(this.grabbedThingID, "position"),
-                rotation: Overlays.getProperty(this.grabbedThingID, "rotation"),
-                dimensions: Overlays.getProperty(this.grabbedThingID, "dimensions"),
-                registrationPoint: { x: 0.5, y: 0.5, z: 0.5 }
-            };
-        } else {
-            props = Entities.getEntityProperties(this.grabbedThingID, ["localPosition", "parentID", "parentJointIndex",
-                                                                      "position", "rotation", "dimensions",
-                                                                      "registrationPoint"]);
-        }
-        if (!props.position) {
-            // server may have reset, taking our equipped entity with it.  move back to "off" state
-            this.callEntityMethodOnGrabbed("releaseGrab");
-            this.setState(STATE_OFF, "entity has no position property");
-            return;
-        }
-
-        if (this.state == STATE_NEAR_GRABBING && this.actionID === null && !this.thisHandIsParent(props)) {
-            // someone took it from us or otherwise edited the parentID.  end the grab.  We don't do this
-            // for equipped things so that they can be adjusted while equipped.
-            this.callEntityMethodOnGrabbed("releaseGrab");
-            this.grabbedThingID = null;
-            this.setState(STATE_OFF, "someone took it");
-            return;
-        }
-
-        var now = Date.now();
-        if (this.state == STATE_HOLD && now - this.lastUnequipCheckTime > MSECS_PER_SEC * CHECK_TOO_FAR_UNEQUIP_TIME) {
-            this.lastUnequipCheckTime = now;
-
-            if (props.parentID == AVATAR_SELF_ID) {
-                var handPosition;
-                if (this.ignoreIK) {
-                    handPosition = getControllerWorldLocation(this.handToController(), false).position;
-                } else {
-                    handPosition = this.getHandPosition();
-                }
-
-                var TEAR_AWAY_DISTANCE = 0.1;
-                var dist = distanceBetweenPointAndEntityBoundingBox(handPosition, props);
-                if (dist > TEAR_AWAY_DISTANCE) {
-                    this.autoUnequipCounter += deltaTime;
-                } else {
-                    this.autoUnequipCounter = 0;
-                }
-
-                if (this.autoUnequipCounter > 0.25) {
-                        // for whatever reason, the held/equipped entity has been pulled away.  ungrab or unequip.
-                    print("handControllerGrab -- autoreleasing held or equipped item because it is far from hand." +
-                        props.parentID + ", dist = " + dist);
-
-                    if (this.state == STATE_NEAR_GRABBING) {
-                        this.callEntityMethodOnGrabbed("releaseGrab");
-                    } else { // this.state == STATE_HOLD
-                        this.callEntityMethodOnGrabbed("releaseEquip");
-                    }
-                    this.setState(STATE_OFF, "held object too far away");
-                    return;
-                }
-            }
-        }
-
-        // Keep track of the fingertip velocity to impart when we release the object.
-        // Note that the idea of using a constant 'tip' velocity regardless of the
-        // object's actual held offset is an idea intended to make it easier to throw things:
-        // Because we might catch something or transfer it between hands without a good idea
-        // of it's actual offset, let's try imparting a velocity which is at a fixed radius
-        // from the palm.
-
-        var handControllerPosition = (this.hand === RIGHT_HAND) ? MyAvatar.rightHandPosition : MyAvatar.leftHandPosition;
-
-        var deltaObjectTime = (now - this.currentObjectTime) / MSECS_PER_SEC; // convert to seconds
-
-        if (deltaObjectTime > 0.0) {
-            var worldDeltaPosition = Vec3.subtract(props.position, this.currentObjectPosition);
-
-            var previousEulers = Quat.safeEulerAngles(this.currentObjectRotation);
-            var newEulers = Quat.safeEulerAngles(props.rotation);
-            var worldDeltaRotation = Vec3.subtract(newEulers, previousEulers);
-
-            this.currentVelocity = Vec3.multiply(worldDeltaPosition, 1.0 / deltaObjectTime);
-            this.currentAngularVelocity = Vec3.multiply(worldDeltaRotation, Math.PI / (deltaObjectTime * 180.0));
-
-            this.currentObjectPosition = props.position;
-            this.currentObjectRotation = props.rotation;
-        }
-
-        this.currentHandControllerTipPosition = handControllerPosition;
-        this.currentObjectTime = now;
-
-        if (this.state === STATE_HOLD) {
-            this.callEntityMethodOnGrabbed("continueEquip");
-        }
-        if (this.state == STATE_NEAR_GRABBING) {
-            this.callEntityMethodOnGrabbed("continueNearGrab");
-        }
-
-        if (this.state == STATE_NEAR_GRABBING) {
-            this.maybeScale(props);
-        }
-
-        if (this.actionID && this.actionTimeout - now < ACTION_TTL_REFRESH * MSECS_PER_SEC) {
-            // if less than a 5 seconds left, refresh the actions ttl
-            var success = Entities.updateAction(this.grabbedThingID, this.actionID, {
-                hand: this.hand === RIGHT_HAND ? "right" : "left",
-                timeScale: NEAR_GRABBING_ACTION_TIMEFRAME,
-                relativePosition: this.offsetPosition,
-                relativeRotation: this.offsetRotation,
-                ttl: ttl,
-                kinematic: this.kinematicGrab,
-                kinematicSetVelocity: true,
-                ignoreIK: this.ignoreIK
-            });
-            if (success) {
-               this.actionTimeout = now + (ttl * MSECS_PER_SEC);
-            } else {
-                print("continueNearGrabbing -- updateAction failed");
-                Entities.deleteAction(this.grabbedThingID, this.actionID);
-                this.setupHoldAction();
-            }
-        }
-    };
-
-    this.maybeScale = function(props) {
-        if (!objectScalingEnabled || this.isTablet(this.grabbedThingID) || this.grabbedIsOverlay) {
-            return;
-        }
-
-        if (!this.shouldScale) {
-            //  If both secondary triggers squeezed, and the non-holding hand is empty, start scaling
-            if (this.secondarySqueezed() &&
-                this.getOtherHandController().secondarySqueezed() &&
-                this.grabbedThingID && this.getOtherHandController().grabbedThingID &&
-                this.grabbedThingID == this.getOtherHandController().grabbedThingID) {
-                this.scalingStartDistance = Vec3.length(Vec3.subtract(this.getHandPosition(),
-                                                                      this.getOtherHandController().getHandPosition()));
-                this.scalingStartDimensions = props.dimensions;
-                this.shouldScale = true;
-            }
-        } else if (!this.secondarySqueezed() || !this.getOtherHandController().secondarySqueezed()) {
-            this.shouldScale = false;
-        }
-        if (this.shouldScale) {
-            var scalingCurrentDistance = Vec3.length(Vec3.subtract(this.getHandPosition(),
-                                                                   this.getOtherHandController().getHandPosition()));
-            var currentRescale = scalingCurrentDistance / this.scalingStartDistance;
-            var newDimensions = Vec3.multiply(currentRescale, this.scalingStartDimensions);
-            Entities.editEntity(this.grabbedThingID, { dimensions: newDimensions });
-        }
-    };
-
-    this.maybeScaleMyAvatar = function() {
-        if (!myAvatarScalingEnabled || this.shouldScale || this.hand === LEFT_HAND) {
-            //  If scaling disabled, or if we are currently scaling an entity, don't scale avatar
-            //  and only rescale avatar for one hand (so we're not doing it twice)
-            return;
-        }
-
-        // Only scale avatar if both triggers and grips are squeezed
-        var tryingToScale = this.secondarySqueezed() && this.getOtherHandController().secondarySqueezed() &&
-                            this.triggerSmoothedSqueezed() && this.getOtherHandController().triggerSmoothedSqueezed();
-
-
-        if (!this.isScalingAvatar) {
-            //  If both secondary triggers squeezed, start scaling
-            if (tryingToScale) {
-                this.scalingStartDistance = Vec3.length(Vec3.subtract(this.getHandPosition(),
-                                                                      this.getOtherHandController().getHandPosition()));
-                this.scalingStartAvatarScale = MyAvatar.scale;
-                this.isScalingAvatar = true;
-            }
-        } else if (!tryingToScale) {
-            this.isScalingAvatar = false;
-        }
-        if (this.isScalingAvatar) {
-            var scalingCurrentDistance = Vec3.length(Vec3.subtract(this.getHandPosition(),
-                                                                   this.getOtherHandController().getHandPosition()));
-            var newAvatarScale = (scalingCurrentDistance / this.scalingStartDistance) * this.scalingStartAvatarScale;
-            MyAvatar.scale = newAvatarScale;
-        }
-    };
-
-    this.nearTriggerEnter = function() {
-        this.clearEquipHaptics();
-        this.grabPointSphereOff();
-        Controller.triggerShortHapticPulse(1.0, this.hand);
-        this.callEntityMethodOnGrabbed("startNearTrigger");
-    };
-
-    this.farTriggerEnter = function() {
-        this.clearEquipHaptics();
-        this.grabPointSphereOff();
-        this.callEntityMethodOnGrabbed("startFarTrigger");
-    };
-
-    this.nearTrigger = function(deltaTime, timestamp) {
-        if (this.triggerSmoothedReleased()) {
-            this.callEntityMethodOnGrabbed("stopNearTrigger");
-            this.grabbedThingID = null;
-            this.setState(STATE_OFF, "trigger released");
-            return;
-        }
-        this.callEntityMethodOnGrabbed("continueNearTrigger");
-    };
-
-    this.farTrigger = function(deltaTime, timestamp) {
-        if (this.triggerSmoothedReleased()) {
-            this.callEntityMethodOnGrabbed("stopFarTrigger");
-            this.grabbedThingID = null;
-            this.setState(STATE_OFF, "trigger released");
-            return;
-        }
-
-        var pickRay = {
-            origin: getControllerWorldLocation(this.handToController(), false).position,
-            direction: Quat.getUp(getControllerWorldLocation(this.handToController(), false).orientation)
-        };
-
-        var now = Date.now();
-        if (now - this.lastPickTime > MSECS_PER_SEC / PICKS_PER_SECOND_PER_HAND) {
-            var intersection = findRayIntersection(pickRay, true, [], [], true);
-            if (intersection.accurate || intersection.overlayID) {
-                this.lastPickTime = now;
-                if (intersection.entityID != this.grabbedThingID) {
-                    this.callEntityMethodOnGrabbed("stopFarTrigger");
-                    this.grabbedThingID = null;
-                    this.setState(STATE_OFF, "laser moved off of entity");
-                    return;
-                }
-                if (intersection.intersects) {
-                    this.intersectionDistance = Vec3.distance(pickRay.origin, intersection.intersection);
-                }
-                if (farGrabEnabled) {
-                    this.searchIndicatorOn(pickRay);
-                }
-            }
-        }
-
-        this.callEntityMethodOnGrabbed("continueFarTrigger");
-    };
-
-    this.offEnter = function() {
-        // Reuse the existing search distance if lasers were active since
-        // they will be shown in OFF state while in edit mode.
-        var existingSearchDistance = this.searchSphereDistance;
-        this.release();
-
-        if (isInEditMode()) {
-            this.searchSphereDistance = existingSearchDistance;
-        }
-    };
-
-    this.entityLaserTouchingEnter = function() {
-        // test for intersection between controller laser and web entity plane.
-        var controllerLocation = getControllerWorldLocation(this.handToController(), true);
-        var intersectInfo = handLaserIntersectEntity(this.grabbedThingID, controllerLocation);
-        if (intersectInfo) {
-            var pointerEvent = {
-                type: "Press",
-                id: this.hand + 1, // 0 is reserved for hardware mouse
-                pos2D: projectOntoEntityXYPlane(this.grabbedThingID, intersectInfo.point),
-                pos3D: intersectInfo.point,
-                normal: intersectInfo.normal,
-                direction: intersectInfo.searchRay.direction,
-                button: "Primary",
-                isPrimaryHeld: true
-            };
-
-            Entities.sendMousePressOnEntity(this.grabbedThingID, pointerEvent);
-            Entities.sendClickDownOnEntity(this.grabbedThingID, pointerEvent);
-
-            this.touchingEnterTimer = 0;
-            this.touchingEnterPointerEvent = pointerEvent;
-            this.touchingEnterPointerEvent.button = "None";
-            this.deadspotExpired = false;
-
-            var LASER_PRESS_TO_MOVE_DEADSPOT_ANGLE = 0.026; // radians ~ 1.2 degrees
-            this.deadspotRadius = Math.tan(LASER_PRESS_TO_MOVE_DEADSPOT_ANGLE) * intersectInfo.distance;  // dead spot radius in meters
-        }
-
-        Controller.triggerHapticPulse(HAPTIC_LASER_UI_STRENGTH, HAPTIC_LASER_UI_DURATION, this.hand);
-    };
-
-    this.entityLaserTouchingExit = function() {
-        // test for intersection between controller laser and web entity plane.
-        var controllerLocation = getControllerWorldLocation(this.handToController(), true);
-        var intersectInfo = handLaserIntersectEntity(this.grabbedThingID, controllerLocation);
-        if (intersectInfo) {
-            var pointerEvent;
-            if (this.deadspotExpired) {
-                pointerEvent = {
-                    type: "Release",
-                    id: this.hand + 1, // 0 is reserved for hardware mouse
-                    pos2D: projectOntoEntityXYPlane(this.grabbedThingID, intersectInfo.point),
-                    pos3D: intersectInfo.point,
-                    normal: intersectInfo.normal,
-                    direction: intersectInfo.searchRay.direction,
-                    button: "Primary"
-                };
-            } else {
-                pointerEvent = this.touchingEnterPointerEvent;
-                pointerEvent.type = "Release";
-                pointerEvent.button = "Primary";
-                pointerEvent.isPrimaryHeld = false;
-            }
-
-            Entities.sendMouseReleaseOnEntity(this.grabbedThingID, pointerEvent);
-            Entities.sendClickReleaseOnEntity(this.grabbedThingID, pointerEvent);
-            Entities.sendHoverLeaveEntity(this.grabbedThingID, pointerEvent);
-        }
-        this.grabbedThingID = null;
-        this.grabbedOverlay = null;
-    };
-
-    this.entityLaserTouching = function(dt) {
-
-        this.touchingEnterTimer += dt;
-
-        entityPropertiesCache.addEntity(this.grabbedThingID);
-
-        if (this.state == STATE_ENTITY_LASER_TOUCHING && !this.triggerSmoothedGrab()) {  // AJT:
-            this.setState(STATE_OFF, "released trigger");
-            return;
-        }
-
-        // test for intersection between controller laser and web entity plane.
-        var controllerLocation = getControllerWorldLocation(this.handToController(), true);
-        var intersectInfo = handLaserIntersectEntity(this.grabbedThingID, controllerLocation);
-        if (intersectInfo) {
-
-            if (Entities.keyboardFocusEntity != this.grabbedThingID) {
-                Overlays.keyboardFocusOverlay = 0;
-                Entities.keyboardFocusEntity = this.grabbedThingID;
-            }
-
-            var pointerEvent = {
-                type: "Move",
-                id: this.hand + 1, // 0 is reserved for hardware mouse
-                pos2D: projectOntoEntityXYPlane(this.grabbedThingID, intersectInfo.point),
-                pos3D: intersectInfo.point,
-                normal: intersectInfo.normal,
-                direction: intersectInfo.searchRay.direction,
-                button: "NoButtons",
-                isPrimaryHeld: true
-            };
-
-            var POINTER_PRESS_TO_MOVE_DELAY = 0.25; // seconds
-            if (this.deadspotExpired || this.touchingEnterTimer > POINTER_PRESS_TO_MOVE_DELAY ||
-                Vec3.distance(intersectInfo.point, this.touchingEnterPointerEvent.pos3D) > this.deadspotRadius) {
-                Entities.sendMouseMoveOnEntity(this.grabbedThingID, pointerEvent);
-                Entities.sendHoldingClickOnEntity(this.grabbedThingID, pointerEvent);
-                this.deadspotExpired = true;
-            }
-
-            this.intersectionDistance = intersectInfo.distance;
-            if (this.state == STATE_ENTITY_LASER_TOUCHING) {
-                this.searchIndicatorOn(intersectInfo.searchRay);
-            }
-            Reticle.setVisible(false);
-        } else {
-            this.grabbedThingID = null;
-            this.setState(STATE_OFF, "grabbed entity was destroyed");
-            return;
-        }
-    };
-
-    this.overlayLaserTouchingEnter = function () {
-        // Test for intersection between controller laser and Web overlay plane.
-        var controllerLocation = getControllerWorldLocation(this.handToController(), true);
-        var intersectInfo = handLaserIntersectOverlay(this.grabbedOverlay, controllerLocation);
-        if (intersectInfo) {
-            var pointerEvent = {
-                type: "Press",
-                id: this.hand + 1,
-                pos2D: projectOntoOverlayXYPlane(this.grabbedOverlay, intersectInfo.point),
-                pos3D: intersectInfo.point,
-                normal: intersectInfo.normal,
-                direction: intersectInfo.searchRay.direction,
-                button: "Primary",
-                isPrimaryHeld: true
-            };
-
-            Overlays.sendMousePressOnOverlay(this.grabbedOverlay, pointerEvent);
-
-            this.touchingEnterTimer = 0;
-            this.touchingEnterPointerEvent = pointerEvent;
-            this.touchingEnterPointerEvent.button = "None";
-            this.deadspotExpired = false;
-
-            var LASER_PRESS_TO_MOVE_DEADSPOT_ANGLE = 0.026; // radians ~ 1.2 degrees
-            this.deadspotRadius = Math.tan(LASER_PRESS_TO_MOVE_DEADSPOT_ANGLE) * intersectInfo.distance;  // dead spot radius in meters
-        }
-
-        Controller.triggerHapticPulse(HAPTIC_LASER_UI_STRENGTH, HAPTIC_LASER_UI_DURATION, this.hand);
-    };
-
-    this.overlayLaserTouchingExit = function () {
-        // Test for intersection between controller laser and Web overlay plane.
-        var controllerLocation = getControllerWorldLocation(this.handToController(), true);
-        var intersectInfo = handLaserIntersectOverlay(this.grabbedOverlay, controllerLocation);
-        if (intersectInfo) {
-            var pointerEvent;
-
-            var pos2D;
-            var pos3D;
-            if (this.tabletStabbed) {
-                // Some people like to jam the stylus a long ways into the tablet when clicking on a button.
-                // They almost always move out of the deadzone when they do this.  We detect if the stylus
-                // has gone far through the tablet and suppress any further faux mouse events until the
-                // stylus is withdrawn.  Once it has withdrawn, we do a release click wherever the stylus was
-                // when it was pushed into the tablet.
-                this.tabletStabbed = false;
-                pos2D = this.tabletStabbedPos2D;
-                pos3D = this.tabletStabbedPos3D;
-            } else {
-                pos2D = projectOntoOverlayXYPlane(this.grabbedOverlay, intersectInfo.point);
-                pos3D = intersectInfo.point;
-            }
-
-            if (this.deadspotExpired) {
-                pointerEvent = {
-                    type: "Release",
-                    id: this.hand + 1,
-                    pos2D: pos2D,
-                    pos3D: pos3D,
-                    normal: intersectInfo.normal,
-                    direction: intersectInfo.searchRay.direction,
-                    button: "Primary"
-                };
-            } else {
-                pointerEvent = this.touchingEnterPointerEvent;
-                pointerEvent.type = "Release";
-                pointerEvent.button = "Primary";
-                pointerEvent.isPrimaryHeld = false;
-            }
-
-            Overlays.sendMouseReleaseOnOverlay(this.grabbedOverlay, pointerEvent);
-            Overlays.sendHoverLeaveOverlay(this.grabbedOverlay, pointerEvent);
-        }
-        this.grabbedThingID = null;
-        this.grabbedOverlay = null;
-    };
-
-    this.overlayLaserTouching = function (dt) {
-        this.touchingEnterTimer += dt;
-
-        if (this.state == STATE_OVERLAY_LASER_TOUCHING && !this.triggerSmoothedGrab()) {
-            this.setState(STATE_OFF, "released trigger");
-            return;
-        }
-
-        // Test for intersection between controller laser and Web overlay plane.
-        var controllerLocation = getControllerWorldLocation(this.handToController(), true);
-        var intersectInfo = handLaserIntersectOverlay(this.grabbedOverlay, controllerLocation);
-        if (intersectInfo) {
-
-            var pos2D = projectOntoOverlayXYPlane(this.grabbedOverlay, intersectInfo.point);
-            var pos3D = intersectInfo.point;
-
-            if (Overlays.keyboardFocusOverlay != this.grabbedOverlay) {
-                Entities.keyboardFocusEntity = null;
-                Overlays.keyboardFocusOverlay = this.grabbedOverlay;
-            }
-
-            var pointerEvent = {
-                type: "Move",
-                id: this.hand + 1,
-                pos2D: pos2D,
-                pos3D: pos3D,
-                normal: intersectInfo.normal,
-                direction: intersectInfo.searchRay.direction,
-                button: "NoButtons",
-                isPrimaryHeld: true
-            };
-
-            var POINTER_PRESS_TO_MOVE_DELAY = 0.25; // seconds
-            if (this.deadspotExpired || this.touchingEnterTimer > POINTER_PRESS_TO_MOVE_DELAY ||
-                Vec3.distance(intersectInfo.point, this.touchingEnterPointerEvent.pos3D) > this.deadspotRadius) {
-                Overlays.sendMouseMoveOnOverlay(this.grabbedOverlay, pointerEvent);
-                this.deadspotExpired = true;
-            }
-
-            this.intersectionDistance = intersectInfo.distance;
-            if (this.state == STATE_OVERLAY_LASER_TOUCHING) {
-                this.searchIndicatorOn(intersectInfo.searchRay);
-            }
-            Reticle.setVisible(false);
-        } else {
-            this.grabbedThingID = null;
-            this.setState(STATE_OFF, "grabbed overlay was destroyed");
-            return;
-        }
-    };
-
-    this.stylusTouchingEnter = function () {
-        this.stealTouchFocus(this.stylusTarget);
-        sendTouchStartEventToStylusTarget(this.hand, this.stylusTarget);
-        Controller.triggerHapticPulse(HAPTIC_STYLUS_STRENGTH, HAPTIC_STYLUS_DURATION, this.hand);
-
-        this.touchingEnterTimer = 0;
-        this.touchingEnterStylusTarget = this.stylusTarget;
-        this.deadspotExpired = false;
-
-        var TOUCH_PRESS_TO_MOVE_DEADSPOT = 0.0381;
-        this.deadspotRadius = TOUCH_PRESS_TO_MOVE_DEADSPOT;
-    };
-
-    this.stylusTouchingExit = function () {
-
-        if (this.stylusTarget === undefined) {
-            return;
-        }
-
-        // special case to handle home button.
-        if (this.stylusTarget.overlayID === HMD.homeButtonID) {
-            Messages.sendLocalMessage("home", this.stylusTarget.overlayID);
-        }
-
-        // send press event
-        if (this.deadspotExpired) {
-            sendTouchEndEventToStylusTarget(this.hand, this.stylusTarget);
-        } else {
-            sendTouchEndEventToStylusTarget(this.hand, this.touchingEnterStylusTarget);
-        }
-    };
-
-    this.stylusTouching = function (dt) {
-
-        this.touchingEnterTimer += dt;
-
-        if (this.stylusTarget.entityID) {
-            entityPropertiesCache.addEntity(this.stylusTarget.entityID);
-            this.stylusTarget = calculateStylusTargetFromEntity(this.stylusTip, this.stylusTarget.entityID);
-        } else if (this.stylusTarget.overlayID) {
-            this.stylusTarget = calculateStylusTargetFromOverlay(this.stylusTip, this.stylusTarget.overlayID);
-        }
-
-        var TABLET_MIN_TOUCH_DISTANCE = -0.1;
-        var TABLET_MAX_TOUCH_DISTANCE = 0.01;
-
-        if (this.stylusTarget) {
-            if (this.stylusTarget.distance > TABLET_MIN_TOUCH_DISTANCE &&
-                this.stylusTarget.distance < TABLET_MAX_TOUCH_DISTANCE) {
-                var POINTER_PRESS_TO_MOVE_DELAY = 0.33; // seconds
-                if (this.deadspotExpired || this.touchingEnterTimer > POINTER_PRESS_TO_MOVE_DELAY ||
-                    distance2D(this.stylusTarget.position2D,
-                               this.touchingEnterStylusTarget.position2D) > this.deadspotRadius) {
-                    sendTouchMoveEventToStylusTarget(this.hand, this.stylusTarget);
-                    this.deadspotExpired = true;
-                }
-            } else {
-                this.setState(STATE_OFF, "hand moved away from touch surface");
-            }
-        } else {
-            this.setState(STATE_OFF, "touch surface was destroyed");
-        }
-    };
-
-    this.release = function() {
-        this.turnOffVisualizations();
-
-        if (this.grabbedThingID !== null) {
-
-            Messages.sendMessage('Hifi-Teleport-Ignore-Remove', this.grabbedThingID);
-
-            if (this.state === STATE_HOLD) {
-                this.callEntityMethodOnGrabbed("releaseEquip");
-            }
-
-            // Make a small release haptic pulse if we really were holding something
-            Controller.triggerHapticPulse(HAPTIC_PULSE_STRENGTH, HAPTIC_PULSE_DURATION, this.hand);
-            if (this.actionID !== null) {
-                Entities.deleteAction(this.grabbedThingID, this.actionID);
-            } else {
-                // no action, so it's a parenting grab
-                if (this.previousParentID[this.grabbedThingID] === NULL_UUID) {
-                    if (this.grabbedIsOverlay) {
-                        Overlays.editOverlay(this.grabbedThingID, {
-                            parentID: NULL_UUID,
-                            parentJointIndex: -1
-                        });
-                    } else {
-                        Entities.editEntity(this.grabbedThingID, {
-                            parentID: this.previousParentID[this.grabbedThingID],
-                            parentJointIndex: this.previousParentJointIndex[this.grabbedThingID]
-                        });
-                        this.ensureDynamic();
-                    }
-                } else {
-                    if (this.grabbedIsOverlay) {
-                        Overlays.editOverlay(this.grabbedThingID, {
-                            parentID: this.previousParentID[this.grabbedThingID],
-                            parentJointIndex: this.previousParentJointIndex[this.grabbedThingID],
-                        });
-                    } else {
-                        // we're putting this back as a child of some other parent, so zero its velocity
-                        Entities.editEntity(this.grabbedThingID, {
-                            parentID: this.previousParentID[this.grabbedThingID],
-                            parentJointIndex: this.previousParentJointIndex[this.grabbedThingID],
-                            velocity: {x: 0, y: 0, z: 0},
-                            angularVelocity: {x: 0, y: 0, z: 0}
-                        });
-                    }
-                }
-            }
-
-            Messages.sendMessage('Hifi-Object-Manipulation', JSON.stringify({
-                action: 'release',
-                grabbedEntity: this.grabbedThingID,
-                joint: this.hand === RIGHT_HAND ? "RightHand" : "LeftHand"
-            }));
-        }
-
-        this.actionID = null;
-        this.grabbedThingID = null;
-        this.grabbedOverlay = null;
-        this.grabbedHotspot = null;
-
-        if (this.triggerSmoothedGrab() || this.secondarySqueezed()) {
-            this.waitForTriggerRelease = true;
-        }
-    };
-
-    this.cleanup = function() {
-        this.release();
-        this.grabPointSphereOff();
-        this.hideStylus();
-        this.overlayLineOff();
-    };
-
-    this.thisHandIsParent = function(props) {
-        if (props.parentID !== MyAvatar.sessionUUID && props.parentID !== AVATAR_SELF_ID) {
-            return false;
-        }
-
-        var handJointIndex = MyAvatar.getJointIndex(this.hand === RIGHT_HAND ? "RightHand" : "LeftHand");
-        if (props.parentJointIndex == handJointIndex) {
-            return true;
-        }
-
-        var controllerJointIndex = this.controllerJointIndex;
-        if (props.parentJointIndex == controllerJointIndex) {
-            return true;
-        }
-
-        var controllerCRJointIndex = MyAvatar.getJointIndex(this.hand === RIGHT_HAND ?
-                                                            "_CAMERA_RELATIVE_CONTROLLER_RIGHTHAND" :
-                                                            "_CAMERA_RELATIVE_CONTROLLER_LEFTHAND");
-        if (props.parentJointIndex == controllerCRJointIndex) {
-            return true;
-        }
-
-        return false;
-    };
-
-    this.checkForUnexpectedChildren = function() {
-        var _this = this;
-        // sometimes things can get parented to a hand and this script is unaware.  Search for such entities and
-        // unhook them.
-
-        // find children of avatar's hand joint
-        var handJointIndex = MyAvatar.getJointIndex(this.hand === RIGHT_HAND ? "RightHand" : "LeftHand");
-        var children = Entities.getChildrenIDsOfJoint(MyAvatar.sessionUUID, handJointIndex);
-        children = children.concat(Entities.getChildrenIDsOfJoint(AVATAR_SELF_ID, handJointIndex));
-
-        // find children of faux controller joint
-        var controllerJointIndex = this.controllerJointIndex;
-        children = children.concat(Entities.getChildrenIDsOfJoint(MyAvatar.sessionUUID, controllerJointIndex));
-        children = children.concat(Entities.getChildrenIDsOfJoint(AVATAR_SELF_ID, controllerJointIndex));
-
-        // find children of faux camera-relative controller joint
-        var controllerCRJointIndex = MyAvatar.getJointIndex(this.hand === RIGHT_HAND ?
-                                                            "_CAMERA_RELATIVE_CONTROLLER_RIGHTHAND" :
-                                                            "_CAMERA_RELATIVE_CONTROLLER_LEFTHAND");
-        children = children.concat(Entities.getChildrenIDsOfJoint(MyAvatar.sessionUUID, controllerCRJointIndex));
-        children = children.concat(Entities.getChildrenIDsOfJoint(AVATAR_SELF_ID, controllerCRJointIndex));
-
-        children.forEach(function(childID) {
-            if (childID !== _this.stylus &&
-                childID !== _this.overlayLine) {
-                // we appear to be holding something and this script isn't in a state that would be holding something.
-                // unhook it.  if we previously took note of this entity's parent, put it back where it was.  This
-                // works around some problems that happen when more than one hand or avatar is passing something around.
-                var childType = Entities.getNestableType(childID);
-                if (_this.previousParentID[childID]) {
-                    var previousParentID = _this.previousParentID[childID];
-                    var previousParentJointIndex = _this.previousParentJointIndex[childID];
-
-                    // The main flaw with keeping track of previous parantage in individual scripts is:
-                    // (1) A grabs something (2) B takes it from A (3) A takes it from B (4) A releases it
-                    // now A and B will take turns passing it back to the other.  Detect this and stop the loop here...
-                    var UNHOOK_LOOP_DETECT_MS = 200;
-                    var now = Date.now();
-                    if (_this.previouslyUnhooked[childID]) {
-                        if (now - _this.previouslyUnhooked[childID] < UNHOOK_LOOP_DETECT_MS) {
-                            previousParentID = NULL_UUID;
-                            previousParentJointIndex = -1;
-                        }
-                    }
-                    _this.previouslyUnhooked[childID] = now;
-
-                    if (childType == "overlay" && Overlays.getProperty(childID, "grabbable")) {
-                        // only auto-unhook overlays that were flagged as grabbable.  this avoids unhooking overlays
-                        // used in tutorial.
-                        Overlays.editOverlay(childID, {
-                            parentID: previousParentID,
-                            parentJointIndex: previousParentJointIndex
-                        });
-                    }
-                    if (childType == "entity") {
-                        Entities.editEntity(childID, {
-                            parentID: previousParentID,
-                            parentJointIndex: previousParentJointIndex
-                        });
-                    }
-
-                } else {
-                    if (childType == "entity") {
-                        Entities.editEntity(childID, { parentID: NULL_UUID });
-                    } else if (childType == "overlay") {
-                        if (Overlays.getProperty(childID, "grabbable")) {
-                            Overlays.editOverlay(childID, { parentID: NULL_UUID });
-                        }
-                    }
-                }
-            }
-        });
-    };
-
-    this.getOtherHandController = function() {
-        return (this.hand === RIGHT_HAND) ? leftController : rightController;
-    };
-}
-
-var rightController = new MyController(RIGHT_HAND);
-var leftController = new MyController(LEFT_HAND);
-
-var MAPPING_NAME = "com.highfidelity.handControllerGrab";
-
-var mapping = Controller.newMapping(MAPPING_NAME);
-mapping.from([Controller.Standard.RT]).peek().to(rightController.triggerPress);
-mapping.from([Controller.Standard.RTClick]).peek().to(rightController.triggerClick);
-
-mapping.from([Controller.Standard.LT]).peek().to(leftController.triggerPress);
-mapping.from([Controller.Standard.LTClick]).peek().to(leftController.triggerClick);
-
-mapping.from([Controller.Standard.RB]).peek().to(rightController.secondaryPress);
-mapping.from([Controller.Standard.LB]).peek().to(leftController.secondaryPress);
-mapping.from([Controller.Standard.LeftGrip]).peek().to(leftController.secondaryPress);
-mapping.from([Controller.Standard.RightGrip]).peek().to(rightController.secondaryPress);
-
-mapping.from([Controller.Standard.LeftPrimaryThumb]).peek().to(leftController.thumbPress);
-mapping.from([Controller.Standard.RightPrimaryThumb]).peek().to(rightController.thumbPress);
-
-Controller.enableMapping(MAPPING_NAME);
-
-function handleMenuEvent(menuItem) {
-    if (menuItem === "Show Grab Sphere") {
-        SHOW_GRAB_POINT_SPHERE = Menu.isOptionChecked("Show Grab Sphere");
-    }
-}
-
-Menu.addMenuItem({ menuName: "Developer", menuItemName: "Show Grab Sphere", isCheckable: true, isChecked: false });
-Menu.menuItemEvent.connect(handleMenuEvent);
-
-// the section below allows the grab script to listen for messages
-// that disable either one or both hands.  useful for two handed items
-var handToDisable = 'none';
-
-function update(deltaTime) {
-    var timestamp = Date.now();
-
-    if (handToDisable !== LEFT_HAND && handToDisable !== 'both') {
-        leftController.update(deltaTime, timestamp);
-    } else {
-        leftController.release();
-    }
-    if (handToDisable !== RIGHT_HAND && handToDisable !== 'both') {
-        rightController.update(deltaTime, timestamp);
-    } else {
-        rightController.release();
-    }
-    equipHotspotBuddy.update(deltaTime, timestamp);
-    entityPropertiesCache.update();
-}
-
-Messages.subscribe('Hifi-Grab-Disable');
-Messages.subscribe('Hifi-Hand-Disabler');
-Messages.subscribe('Hifi-Hand-Grab');
-Messages.subscribe('Hifi-Hand-RayPick-Blacklist');
-Messages.subscribe('Hifi-Object-Manipulation');
-Messages.subscribe('Hifi-Hand-Drop');
-
-var handleHandMessages = function(channel, message, sender) {
-    var data;
-    if (sender === MyAvatar.sessionUUID) {
-        if (channel === 'Hifi-Hand-Disabler') {
-            if (message === 'left') {
-                handToDisable = LEFT_HAND;
-                leftController.turnOffVisualizations();
-            }
-            if (message === 'right') {
-                handToDisable = RIGHT_HAND;
-                rightController.turnOffVisualizations();
-            }
-            if (message === 'both' || message === 'none') {
-                if (message === 'both') {
-                    rightController.turnOffVisualizations();
-                    leftController.turnOffVisualizations();
-
-                }
-                handToDisable = message;
-            }
-        } else if (channel === 'Hifi-Grab-Disable') {
-            data = JSON.parse(message);
-            if (data.holdEnabled !== undefined) {
-                print("holdEnabled: ", data.holdEnabled);
-                holdEnabled = data.holdEnabled;
-            }
-            if (data.nearGrabEnabled !== undefined) {
-                print("nearGrabEnabled: ", data.nearGrabEnabled);
-                nearGrabEnabled = data.nearGrabEnabled;
-            }
-            if (data.farGrabEnabled !== undefined) {
-                print("farGrabEnabled: ", data.farGrabEnabled);
-                farGrabEnabled = data.farGrabEnabled;
-            }
-            if (data.myAvatarScalingEnabled !== undefined) {
-                print("myAvatarScalingEnabled: ", data.myAvatarScalingEnabled);
-                myAvatarScalingEnabled = data.myAvatarScalingEnabled;
-            }
-            if (data.objectScalingEnabled !== undefined) {
-                print("objectScalingEnabled: ", data.objectScalingEnabled);
-                objectScalingEnabled = data.objectScalingEnabled;
-            }
-        } else if (channel === 'Hifi-Hand-Grab') {
-            try {
-                data = JSON.parse(message);
-                var selectedController = (data.hand === 'left') ? leftController : rightController;
-                var hotspotIndex = data.hotspotIndex !== undefined ? parseInt(data.hotspotIndex) : 0;
-                selectedController.release();
-                var wearableEntity = data.entityID;
-                entityPropertiesCache.addEntity(wearableEntity);
-                selectedController.grabbedThingID = wearableEntity;
-                var hotspots = selectedController.collectEquipHotspots(selectedController.grabbedThingID);
-                if (hotspots.length > 0) {
-                    if (hotspotIndex >= hotspots.length) {
-                        hotspotIndex = 0;
-                    }
-                    selectedController.grabbedHotspot = hotspots[hotspotIndex];
-                }
-                selectedController.setState(STATE_HOLD, "Hifi-Hand-Grab msg received");
-                selectedController.nearGrabbingEnter();
-
-            } catch (e) {
-                print("WARNING: handControllerGrab.js -- error parsing Hifi-Hand-Grab message: " + message);
-            }
-
-        } else if (channel === 'Hifi-Hand-RayPick-Blacklist') {
-            try {
-                data = JSON.parse(message);
-                var action = data.action;
-                var id = data.id;
-                var index = blacklist.indexOf(id);
-
-                if (action === 'add' && index === -1) {
-                    blacklist.push(id);
-                }
-                if (action === 'remove') {
-                    if (index > -1) {
-                        blacklist.splice(index, 1);
-                    }
-                }
-
-            } catch (e) {
-                print("WARNING: handControllerGrab.js -- error parsing Hifi-Hand-RayPick-Blacklist message: " + message);
-            }
-        } else if (channel === 'Hifi-Hand-Drop') {
-            if (message === 'left') {
-                leftController.release();
-            } else if (message === 'right') {
-                rightController.release();
-            } else if (message === 'both') {
-                leftController.release();
-                rightController.release();
-            }
-        }
-    }
-};
-
-Messages.messageReceived.connect(handleHandMessages);
-
-var TARGET_UPDATE_HZ = 60; // 50hz good enough, but we're using update
-var BASIC_TIMER_INTERVAL_MS = 1000 / TARGET_UPDATE_HZ;
-var lastInterval = Date.now();
-
-var intervalCount = 0;
-var totalDelta = 0;
-var totalVariance = 0;
-var highVarianceCount = 0;
-var veryhighVarianceCount = 0;
-var updateTotalWork = 0;
-
-var UPDATE_PERFORMANCE_DEBUGGING = false;
-
-var updateWrapper = function () {
-
-    intervalCount++;
-    var thisInterval = Date.now();
-    var deltaTimeMsec = thisInterval - lastInterval;
-    var deltaTime = deltaTimeMsec / 1000;
-    lastInterval = thisInterval;
-
-    totalDelta += deltaTimeMsec;
-
-    var variance = Math.abs(deltaTimeMsec - BASIC_TIMER_INTERVAL_MS);
-    totalVariance += variance;
-
-    if (variance > 1) {
-        highVarianceCount++;
-    }
-
-    if (variance > 5) {
-        veryhighVarianceCount++;
-    }
-
-    // will call update for both hands
-    var preWork = Date.now();
-    update(deltaTime);
-    var postWork = Date.now();
-    var workDelta = postWork - preWork;
-    updateTotalWork += workDelta;
-
-    if (intervalCount == 100) {
-
-        if (UPDATE_PERFORMANCE_DEBUGGING) {
-            print("handControllerGrab.js -- For " + intervalCount + " samples average= " +
-                  totalDelta/intervalCount + " ms" +
-                  " average variance:" + totalVariance/intervalCount + " ms" +
-                  " high variance count:" + highVarianceCount + " [ " + (highVarianceCount/intervalCount) * 100 + "% ] " +
-                  " VERY high variance count:" + veryhighVarianceCount +
-                  " [ " + (veryhighVarianceCount/intervalCount) * 100 + "% ] " +
-                  " average work:" + updateTotalWork/intervalCount + " ms");
-        }
-
-        intervalCount = 0;
-        totalDelta = 0;
-        totalVariance = 0;
-        highVarianceCount = 0;
-        veryhighVarianceCount = 0;
-        updateTotalWork = 0;
-    }
-
-    Script.setTimeout(updateWrapper, UPDATE_SLEEP_MS);
-};
-
-Script.setTimeout(updateWrapper, UPDATE_SLEEP_MS);
-function cleanup() {
-    Menu.removeMenuItem("Developer", "Show Grab Sphere");
-    rightController.cleanup();
-    leftController.cleanup();
-    Controller.disableMapping(MAPPING_NAME);
-    Reticle.setVisible(true);
-}
-
-Script.scriptEnding.connect(cleanup);
-
-}()); // END LOCAL_SCOPE
diff --git a/scripts/system/controllers/handControllerPointer.js b/scripts/system/controllers/handControllerPointer.js
deleted file mode 100644
index eb94428100..0000000000
--- a/scripts/system/controllers/handControllerPointer.js
+++ /dev/null
@@ -1,609 +0,0 @@
-"use strict";
-
-//
-//  handControllerPointer.js
-//  examples/controllers
-//
-//  Created by Howard Stearns on 2016/04/22
-//  Copyright 2016 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() { // BEGIN LOCAL_SCOPE
-
-// Control the "mouse" using hand controller. (HMD and desktop.)
-// First-person only.
-// Starts right handed, but switches to whichever is free: Whichever hand was NOT most recently squeezed.
-//   (For now, the thumb buttons on both controllers are always on.)
-// When partially squeezing over a HUD element, a laser or the reticle is shown where the active hand
-// controller beam intersects the HUD.
-
-var activeTrigger;
-function isLaserOn() {
-    return activeTrigger.partial();
-}
-Script.include("../libraries/controllers.js");
-
-// UTILITIES -------------
-//
-function ignore() { }
-
-// Utility to make it easier to setup and disconnect cleanly.
-function setupHandler(event, handler) {
-    event.connect(handler);
-    Script.scriptEnding.connect(function () {
-        event.disconnect(handler);
-    });
-}
-
-// If some capability is not available until expiration milliseconds after the last update.
-function TimeLock(expiration) {
-    var last = 0;
-    this.update = function (optionalNow) {
-        last = optionalNow || Date.now();
-    };
-    this.expired = function (optionalNow) {
-        return ((optionalNow || Date.now()) - last) > expiration;
-    };
-}
-
-var handControllerLockOut = new TimeLock(2000);
-
-function Trigger(label) {
-    // This part is copied and adapted from handControllerGrab.js. Maybe we should refactor this.
-    var that = this;
-    that.label = label;
-    that.TRIGGER_SMOOTH_RATIO = 0.1; //  Time averaging of trigger - 0.0 disables smoothing
-    that.TRIGGER_OFF_VALUE = 0.10;
-    that.TRIGGER_ON_VALUE = that.TRIGGER_OFF_VALUE + 0.05;     //  Squeezed just enough to activate search or near grab
-    that.rawTriggerValue = 0;
-    that.triggerValue = 0;           // rolling average of trigger value
-    that.triggerClicked = false;
-    that.triggerClick = function (value) { that.triggerClicked = value; };
-    that.triggerPress = function (value) { that.rawTriggerValue = value; };
-    that.updateSmoothedTrigger = function () { // e.g., call once/update for effect
-        var triggerValue = that.rawTriggerValue;
-        // smooth out trigger value
-        that.triggerValue = (that.triggerValue * that.TRIGGER_SMOOTH_RATIO) +
-            (triggerValue * (1.0 - that.TRIGGER_SMOOTH_RATIO));
-        OffscreenFlags.navigationFocusDisabled = that.triggerValue != 0.0;
-    };
-    // Current smoothed state, without hysteresis. Answering booleans.
-    that.triggerSmoothedClick = function () {
-        return that.triggerClicked;
-    };
-    that.triggerSmoothedSqueezed = function () {
-        return that.triggerValue > that.TRIGGER_ON_VALUE;
-    };
-    that.triggerSmoothedReleased = function () {
-        return that.triggerValue < that.TRIGGER_OFF_VALUE;
-    };
-
-    // This part is not from handControllerGrab.js
-    that.state = null; // tri-state: falsey, 'partial', 'full'
-    that.update = function () { // update state, called from an update function
-        var state = that.state;
-        that.updateSmoothedTrigger();
-
-        // The first two are independent of previous state:
-        if (that.triggerSmoothedClick()) {
-            state = 'full';
-        } else if (that.triggerSmoothedReleased()) {
-            state = null;
-        } else if (that.triggerSmoothedSqueezed()) {
-            // Another way to do this would be to have hysteresis in this branch, but that seems to make things harder to use.
-            // In particular, the vive has a nice detent as you release off of full, and we want that to be a transition from
-            // full to partial.
-            state = 'partial';
-        }
-        that.state = state;
-    };
-    // Answer a controller source function (answering either 0.0 or 1.0).
-    that.partial = function () {
-        return that.state ? 1.0 : 0.0; // either 'partial' or 'full'
-    };
-    that.full = function () {
-        return (that.state === 'full') ? 1.0 : 0.0;
-    };
-}
-
-// VERTICAL FIELD OF VIEW ---------
-//
-// Cache the verticalFieldOfView setting and update it every so often.
-var verticalFieldOfView, DEFAULT_VERTICAL_FIELD_OF_VIEW = 45; // degrees
-function updateFieldOfView() {
-    verticalFieldOfView = Settings.getValue('fieldOfView') || DEFAULT_VERTICAL_FIELD_OF_VIEW;
-}
-
-// SHIMS ----------
-//
-var weMovedReticle = false;
-function ignoreMouseActivity() {
-    // If we're paused, or if change in cursor position is from this script, not the hardware mouse.
-    if (!Reticle.allowMouseCapture) {
-        return true;
-    }
-    var pos = Reticle.position;
-    if (!pos || (pos.x == -1 && pos.y == -1)) {
-        return true;
-    }
-    // Only we know if we moved it, which is why this script has to replace depthReticle.js
-    if (!weMovedReticle) {
-        return false;
-    }
-    weMovedReticle = false;
-    return true;
-}
-var MARGIN = 25;
-var reticleMinX = MARGIN, reticleMaxX, reticleMinY = MARGIN, reticleMaxY;
-function updateRecommendedArea() {
-    var dims = Controller.getViewportDimensions();
-    reticleMaxX = dims.x - MARGIN;
-    reticleMaxY = dims.y - MARGIN;
-}
-var setReticlePosition = function (point2d) {
-    weMovedReticle = true;
-    point2d.x = Math.max(reticleMinX, Math.min(point2d.x, reticleMaxX));
-    point2d.y = Math.max(reticleMinY, Math.min(point2d.y, reticleMaxY));
-    Reticle.setPosition(point2d);
-};
-
-// Generalizations of utilities that work with system and overlay elements.
-function findRayIntersection(pickRay) {
-    // Check 3D overlays and entities. Argument is an object with origin and direction.
-    var result = Overlays.findRayIntersection(pickRay);
-    if (!result.intersects) {
-        result = Entities.findRayIntersection(pickRay, true);
-    }
-    return result;
-}
-function isPointingAtOverlay(optionalHudPosition2d) {
-    return Reticle.pointingAtSystemOverlay || Overlays.getOverlayAtPoint(optionalHudPosition2d || Reticle.position);
-}
-
-// Generalized HUD utilities, with or without HMD:
-// This "var" is for documentation. Do not change the value!
-var PLANAR_PERPENDICULAR_HUD_DISTANCE = 1;
-function calculateRayUICollisionPoint(position, direction) {
-    // Answer the 3D intersection of the HUD by the given ray, or falsey if no intersection.
-    if (HMD.active) {
-        return HMD.calculateRayUICollisionPoint(position, direction);
-    }
-    // interect HUD plane, 1m in front of camera, using formula:
-    //   scale = hudNormal dot (hudPoint - position) / hudNormal dot direction
-    //   intersection = postion + scale*direction
-    var hudNormal = Quat.getForward(Camera.getOrientation());
-    var hudPoint = Vec3.sum(Camera.getPosition(), hudNormal); // must also scale if PLANAR_PERPENDICULAR_HUD_DISTANCE!=1
-    var denominator = Vec3.dot(hudNormal, direction);
-    if (denominator === 0) {
-        return null;
-    } // parallel to plane
-    var numerator = Vec3.dot(hudNormal, Vec3.subtract(hudPoint, position));
-    var scale = numerator / denominator;
-    return Vec3.sum(position, Vec3.multiply(scale, direction));
-}
-var DEGREES_TO_HALF_RADIANS = Math.PI / 360;
-function overlayFromWorldPoint(point) {
-    // Answer the 2d pixel-space location in the HUD that covers the given 3D point.
-    // REQUIRES: that the 3d point be on the hud surface!
-    // Note that this is based on the Camera, and doesn't know anything about any
-    // ray that may or may not have been used to compute the point. E.g., the
-    // overlay point is NOT the intersection of some non-camera ray with the HUD.
-    if (HMD.active) {
-        return HMD.overlayFromWorldPoint(point);
-    }
-    var cameraToPoint = Vec3.subtract(point, Camera.getPosition());
-    var cameraX = Vec3.dot(cameraToPoint, Quat.getRight(Camera.getOrientation()));
-    var cameraY = Vec3.dot(cameraToPoint, Quat.getUp(Camera.getOrientation()));
-    var size = Controller.getViewportDimensions();
-    var hudHeight = 2 * Math.tan(verticalFieldOfView * DEGREES_TO_HALF_RADIANS); // must adjust if PLANAR_PERPENDICULAR_HUD_DISTANCE!=1
-    var hudWidth = hudHeight * size.x / size.y;
-    var horizontalFraction = (cameraX / hudWidth + 0.5);
-    var verticalFraction = 1 - (cameraY / hudHeight + 0.5);
-    var horizontalPixels = size.x * horizontalFraction;
-    var verticalPixels = size.y * verticalFraction;
-    return { x: horizontalPixels, y: verticalPixels };
-}
-
-var gamePad = Controller.findDevice("GamePad");
-function activeHudPoint2dGamePad() {
-    if (!HMD.active) {
-      return;
-    }
-    var headPosition = MyAvatar.getHeadPosition();
-    var headDirection = Quat.getUp(Quat.multiply(MyAvatar.headOrientation, Quat.angleAxis(-90, { x: 1, y: 0, z: 0 })));
-
-    var hudPoint3d = calculateRayUICollisionPoint(headPosition, headDirection);
-
-    if (!hudPoint3d) {
-        if (Menu.isOptionChecked("Overlays")) { // With our hud resetting strategy, hudPoint3d should be valid here
-            print('Controller is parallel to HUD');  // so let us know that our assumptions are wrong.
-        }
-        return;
-    }
-    var hudPoint2d = overlayFromWorldPoint(hudPoint3d);
-
-    // We don't know yet if we'll want to make the cursor or laser visble, but we need to move it to see if
-    // it's pointing at a QML tool (aka system overlay).
-    setReticlePosition(hudPoint2d);
-
-    return hudPoint2d;
-}
-
-
-function activeHudPoint2d(activeHand) { // if controller is valid, update reticle position and answer 2d point. Otherwise falsey.
-    var controllerPose = getControllerWorldLocation(activeHand, true); // note: this will return head pose if hand pose is invalid (third eye)
-    if (!controllerPose.valid) {
-        return; // Controller is cradled.
-    }
-    var controllerPosition = controllerPose.position;
-    var controllerDirection = Quat.getUp(controllerPose.rotation);
-
-    var hudPoint3d = calculateRayUICollisionPoint(controllerPosition, controllerDirection);
-    if (!hudPoint3d) {
-        if (Menu.isOptionChecked("Overlays")) { // With our hud resetting strategy, hudPoint3d should be valid here
-            print('Controller is parallel to HUD');  // so let us know that our assumptions are wrong.
-        }
-        return;
-    }
-    var hudPoint2d = overlayFromWorldPoint(hudPoint3d);
-
-    // We don't know yet if we'll want to make the cursor or laser visble, but we need to move it to see if
-    // it's pointing at a QML tool (aka system overlay).
-    setReticlePosition(hudPoint2d);
-    return hudPoint2d;
-}
-
-// MOUSE ACTIVITY --------
-//
-var isSeeking = false;
-var averageMouseVelocity = 0, lastIntegration = 0, lastMouse;
-var WEIGHTING = 1 / 20; // simple moving average over last 20 samples
-var ONE_MINUS_WEIGHTING = 1 - WEIGHTING;
-var AVERAGE_MOUSE_VELOCITY_FOR_SEEK_TO = 20;
-function isShakingMouse() { // True if the person is waving the mouse around trying to find it.
-    var now = Date.now(), mouse = Reticle.position, isShaking = false;
-    if (lastIntegration && (lastIntegration !== now)) {
-        var velocity = Vec3.length(Vec3.subtract(mouse, lastMouse)) / (now - lastIntegration);
-        averageMouseVelocity = (ONE_MINUS_WEIGHTING * averageMouseVelocity) + (WEIGHTING * velocity);
-        if (averageMouseVelocity > AVERAGE_MOUSE_VELOCITY_FOR_SEEK_TO) {
-            isShaking = true;
-        }
-    }
-    lastIntegration = now;
-    lastMouse = mouse;
-    return isShaking;
-}
-var NON_LINEAR_DIVISOR = 2;
-var MINIMUM_SEEK_DISTANCE = 0.1;
-function updateSeeking(doNotStartSeeking) {
-    if (!doNotStartSeeking && !isLaserOn() && (!Reticle.visible || isShakingMouse())) {
-        isSeeking = true;
-    } // e.g., if we're about to turn it on with first movement.
-    if (!isSeeking) {
-        return;
-    }
-    averageMouseVelocity = lastIntegration = 0;
-    var lookAt2D = HMD.getHUDLookAtPosition2D();
-    if (!lookAt2D) { // If this happens, something has gone terribly wrong.
-        isSeeking = false;
-        return; // E.g., if parallel to location in HUD
-    }
-    var copy = Reticle.position;
-    function updateDimension(axis) {
-        var distanceBetween = lookAt2D[axis] - Reticle.position[axis];
-        var move = distanceBetween / NON_LINEAR_DIVISOR;
-        if (Math.abs(move) < MINIMUM_SEEK_DISTANCE) {
-            return false;
-        }
-        copy[axis] += move;
-        return true;
-    }
-    var okX = !updateDimension('x'), okY = !updateDimension('y'); // Evaluate both. Don't short-circuit.
-    if (okX && okY) {
-        isSeeking = false;
-    } else {
-        Reticle.setPosition(copy); // Not setReticlePosition
-    }
-}
-
-var mouseCursorActivity = new TimeLock(5000);
-var APPARENT_MAXIMUM_DEPTH = 100.0; // this is a depth at which things all seem sufficiently distant
-function updateMouseActivity(isClick) {
-    if (ignoreMouseActivity()) {
-        return;
-    }
-    var now = Date.now();
-    mouseCursorActivity.update(now);
-    if (isClick) {
-        return;
-    } // Bug: mouse clicks should keep going. Just not hand controller clicks
-    handControllerLockOut.update(now);
-    Reticle.visible = true;
-}
-function expireMouseCursor(now) {
-    if (!isPointingAtOverlay() && mouseCursorActivity.expired(now)) {
-        Reticle.visible = false;
-    }
-}
-function hudReticleDistance() { // 3d distance from camera to the reticle position on hud
-    // (The camera is only in the center of the sphere on reset.)
-    var reticlePositionOnHUD = HMD.worldPointFromOverlay(Reticle.position);
-    return Vec3.distance(reticlePositionOnHUD, HMD.position);
-}
-
-function maybeAdjustReticleDepth() {
-    if (HMD.active) { // set depth
-        if (isPointingAtOverlay()) {
-            Reticle.depth = hudReticleDistance();
-        }
-    }
-}
-var ADJUST_RETICLE_DEPTH_INTERVAL = 50; // 20hz
-Script.setInterval(maybeAdjustReticleDepth,ADJUST_RETICLE_DEPTH_INTERVAL);
-
-function onMouseMove() {
-    // Display cursor at correct depth (as in depthReticle.js), and updateMouseActivity.
-    if (ignoreMouseActivity()) {
-        return;
-    }
-
-    if (HMD.active) { // set depth
-        updateSeeking();
-        if (isPointingAtOverlay()) {
-            Reticle.depth = hudReticleDistance();
-        } else {
-            var result = findRayIntersection(Camera.computePickRay(Reticle.position.x, Reticle.position.y));
-            Reticle.depth = result.intersects ? result.distance : APPARENT_MAXIMUM_DEPTH;
-        }
-    }
-    updateMouseActivity(); // After the above, just in case the depth movement is awkward when becoming visible.
-}
-function onMouseClick() {
-    updateMouseActivity(true);
-}
-setupHandler(Controller.mouseMoveEvent, onMouseMove);
-setupHandler(Controller.mousePressEvent, onMouseClick);
-setupHandler(Controller.mouseDoublePressEvent, onMouseClick);
-
-// CONTROLLER MAPPING ---------
-//
-
-var leftTrigger = new Trigger('left');
-var rightTrigger = new Trigger('right');
-activeTrigger = rightTrigger;
-var activeHand = Controller.Standard.RightHand;
-var LEFT_HUD_LASER = 1;
-var RIGHT_HUD_LASER = 2;
-var BOTH_HUD_LASERS = LEFT_HUD_LASER + RIGHT_HUD_LASER;
-var activeHudLaser = RIGHT_HUD_LASER;
-function toggleHand() { // unequivocally switch which hand controls mouse position
-    if (activeHand === Controller.Standard.RightHand) {
-        activeHand = Controller.Standard.LeftHand;
-        activeTrigger = leftTrigger;
-        activeHudLaser = LEFT_HUD_LASER;
-    } else {
-        activeHand = Controller.Standard.RightHand;
-        activeTrigger = rightTrigger;
-        activeHudLaser = RIGHT_HUD_LASER;
-    }
-    clearSystemLaser();
-}
-function makeToggleAction(hand) { // return a function(0|1) that makes the specified hand control mouse when 1
-    return function (on) {
-        if (on && (activeHand !== hand)) {
-            toggleHand();
-        }
-    };
-}
-
-var clickMapping = Controller.newMapping('handControllerPointer-click');
-Script.scriptEnding.connect(clickMapping.disable);
-
-// Gather the trigger data for smoothing.
-clickMapping.from(Controller.Standard.RT).peek().to(rightTrigger.triggerPress);
-clickMapping.from(Controller.Standard.LT).peek().to(leftTrigger.triggerPress);
-clickMapping.from(Controller.Standard.RTClick).peek().to(rightTrigger.triggerClick);
-clickMapping.from(Controller.Standard.LTClick).peek().to(leftTrigger.triggerClick);
-// Full smoothed trigger is a click.
-function isPointingAtOverlayStartedNonFullTrigger(trigger) {
-    // true if isPointingAtOverlay AND we were NOT full triggered when we became so.
-    // The idea is to not count clicks when we're full-triggering and reach the edge of a window.
-    var lockedIn = false;
-    return function () {
-        if (trigger !== activeTrigger) {
-            return lockedIn = false;
-        }
-        if (!isPointingAtOverlay()) {
-            return lockedIn = false;
-        }
-        if (lockedIn) {
-            return true;
-        }
-        lockedIn = !trigger.full();
-        return lockedIn;
-    }
-}
-clickMapping.from(rightTrigger.full).when(isPointingAtOverlayStartedNonFullTrigger(rightTrigger)).to(Controller.Actions.ReticleClick);
-clickMapping.from(leftTrigger.full).when(isPointingAtOverlayStartedNonFullTrigger(leftTrigger)).to(Controller.Actions.ReticleClick);
-// The following is essentially like Left and Right versions of
-// clickMapping.from(Controller.Standard.RightSecondaryThumb).peek().to(Controller.Actions.ContextMenu);
-// except that we first update the reticle position from the appropriate hand position, before invoking the  .
-var wantsMenu = 0;
-clickMapping.from(function () { return wantsMenu; }).to(Controller.Actions.ContextMenu);
-clickMapping.from(Controller.Standard.RightSecondaryThumb).peek().to(function (clicked) {
-    if (clicked) {
-        activeHudPoint2d(Controller.Standard.RightHand);
-        Messages.sendLocalMessage("toggleHand", Controller.Standard.RightHand);
-    }
-    wantsMenu = clicked;
-});
-clickMapping.from(Controller.Standard.LeftSecondaryThumb).peek().to(function (clicked) {
-    if (clicked) {
-        activeHudPoint2d(Controller.Standard.LeftHand);
-        Messages.sendLocalMessage("toggleHand", Controller.Standard.LeftHand);
-    }
-    wantsMenu = clicked;
-});
-clickMapping.from(Controller.Standard.Start).peek().to(function (clicked) {
-    if (clicked) {
-        activeHudPoint2dGamePad();
-        var noHands = -1;
-        Messages.sendLocalMessage("toggleHand", noHands);
-      }
-
-      wantsMenu = clicked;
-});
-clickMapping.from(Controller.Hardware.Keyboard.RightMouseClicked).peek().to(function () {
-    // Allow the reticle depth to be set correctly:
-    // Wait a tick for the context menu to be displayed, and then simulate a (non-hand-controller) mouse move
-    // so that the system updates qml state (Reticle.pointingAtSystemOverlay) before it gives us a mouseMove.
-    // We don't want the system code to always do this for us, because, e.g., we do not want to get a mouseMove
-    // after the Left/RightSecondaryThumb gives us a context menu. Only from the mouse.
-    Script.setTimeout(function () {
-        var noHands = -1;
-        Messages.sendLocalMessage("toggleHand", noHands);
-        Reticle.setPosition(Reticle.position);
-    }, 0);
-});
-// Partial smoothed trigger is activation.
-clickMapping.from(rightTrigger.partial).to(makeToggleAction(Controller.Standard.RightHand));
-clickMapping.from(leftTrigger.partial).to(makeToggleAction(Controller.Standard.LeftHand));
-clickMapping.enable();
-
-// VISUAL AID -----------
-// Same properties as handControllerGrab search sphere
-var LASER_ALPHA = 0.5;
-var LASER_SEARCH_COLOR_XYZW = {x: 10 / 255, y: 10 / 255, z: 255 / 255, w: LASER_ALPHA};
-var LASER_TRIGGER_COLOR_XYZW = {x: 250 / 255, y: 10 / 255, z: 10 / 255, w: LASER_ALPHA};
-var SYSTEM_LASER_DIRECTION = {x: 0, y: 0, z: -1};
-var systemLaserOn = false;
-
-var HIFI_POINTER_DISABLE_MESSAGE_CHANNEL = "Hifi-Pointer-Disable";
-var isPointerEnabled = true;
-
-function clearSystemLaser() {
-    if (!systemLaserOn) {
-        return;
-    }
-    HMD.disableHandLasers(BOTH_HUD_LASERS);
-    HMD.disableExtraLaser();
-    systemLaserOn = false;
-    weMovedReticle = true;
-}
-function setColoredLaser() { // answer trigger state if lasers supported, else falsey.
-    var color = (activeTrigger.state === 'full') ? LASER_TRIGGER_COLOR_XYZW : LASER_SEARCH_COLOR_XYZW;
-
-    if (!HMD.isHandControllerAvailable()) {
-        // NOTE: keep this offset in sync with scripts/system/librarires/controllers.js:57
-        var VERTICAL_HEAD_LASER_OFFSET = 0.1;
-        var position = Vec3.sum(HMD.position, Vec3.multiplyQbyV(HMD.orientation, {x: 0, y: VERTICAL_HEAD_LASER_OFFSET, z: 0}));
-        var orientation = Quat.multiply(HMD.orientation, Quat.angleAxis(-90, { x: 1, y: 0, z: 0 }));
-        return HMD.setExtraLaser(position, true, color, Quat.getUp(orientation));
-    }
-
-    return HMD.setHandLasers(activeHudLaser, true, color, SYSTEM_LASER_DIRECTION) && activeTrigger.state;
-}
-
-// MAIN OPERATIONS -----------
-//
-function update() {
-    var now = Date.now();
-    function off() {
-        expireMouseCursor();
-        clearSystemLaser();
-    }
-
-    updateSeeking(true);
-    if (!handControllerLockOut.expired(now)) {
-        return off(); // Let them use mouse in peace.
-    }
-
-    if ((!Window.hasFocus() && !HMD.active) || !Reticle.allowMouseCapture) {
-        // In desktop it's pretty clear when another app is on top. In that case we bail, because
-        // hand controllers might be sputtering "valid" data and that will keep someone from deliberately
-        // using the mouse on another app. (Fogbugz case 546.)
-        // However, in HMD, you might not realize you're not on top, and you wouldn't be able to operate
-        // other apps anyway. So in that case, we DO keep going even though we're not on top. (Fogbugz 1831.)
-        return off(); // Don't mess with other apps or paused mouse activity
-    }
-
-    leftTrigger.update();
-    rightTrigger.update();
-    if (!activeTrigger.state) {
-        return off(); // No trigger
-    }
-
-    if (getGrabCommunications()) {
-        return off();
-    }
-
-
-    var hudPoint2d = activeHudPoint2d(activeHand);
-    if (!hudPoint2d) {
-        return off();
-    }
-
-    // If there's a HUD element at the (newly moved) reticle, just make it visible and bail.
-    if (isPointingAtOverlay(hudPoint2d) && isPointerEnabled) {
-        if (HMD.active) {
-            Reticle.depth = hudReticleDistance();
-
-            if (!HMD.isHandControllerAvailable()) {
-                var color = (activeTrigger.state === 'full') ? LASER_TRIGGER_COLOR_XYZW : LASER_SEARCH_COLOR_XYZW;
-                var position = MyAvatar.getHeadPosition();
-                var direction = Quat.getUp(Quat.multiply(MyAvatar.headOrientation, Quat.angleAxis(-90, { x: 1, y: 0, z: 0 })));
-                HMD.setExtraLaser(position, true, color, direction);
-            }
-        }
-
-        if (activeTrigger.state && (!systemLaserOn || (systemLaserOn !== activeTrigger.state))) { // last=>wrong color
-            // If the active plugin doesn't implement hand lasers, show the mouse reticle instead.
-            systemLaserOn = setColoredLaser();
-            Reticle.visible = !systemLaserOn;
-        } else if ((systemLaserOn || Reticle.visible) && !activeTrigger.state) {
-            clearSystemLaser();
-            Reticle.visible = false;
-        }
-        return;
-    }
-    // We are not pointing at a HUD element (but it could be a 3d overlay).
-    clearSystemLaser();
-    Reticle.visible = false;
-}
-
-// Check periodically for changes to setup.
-var SETTINGS_CHANGE_RECHECK_INTERVAL = 10 * 1000; // 10 seconds
-function checkSettings() {
-    updateFieldOfView();
-    updateRecommendedArea();
-}
-checkSettings();
-
-// Enable/disable pointer.
-function handleMessages(channel, message, sender) {
-    if (sender === MyAvatar.sessionUUID && channel === HIFI_POINTER_DISABLE_MESSAGE_CHANNEL) {
-        var data = JSON.parse(message);
-        if (data.pointerEnabled !== undefined) {
-            print("pointerEnabled: " + data.pointerEnabled);
-            isPointerEnabled = data.pointerEnabled;
-        }
-    }
-}
-
-Messages.subscribe(HIFI_POINTER_DISABLE_MESSAGE_CHANNEL);
-Messages.messageReceived.connect(handleMessages);
-
-var settingsChecker = Script.setInterval(checkSettings, SETTINGS_CHANGE_RECHECK_INTERVAL);
-Script.update.connect(update);
-Script.scriptEnding.connect(function () {
-    Messages.unsubscribe(HIFI_POINTER_DISABLE_MESSAGE_CHANNEL);
-    Messages.messageReceived.disconnect(handleMessages);
-    Script.clearInterval(settingsChecker);
-    Script.update.disconnect(update);
-    OffscreenFlags.navigationFocusDisabled = false;
-});
-
-}()); // END LOCAL_SCOPE
diff --git a/scripts/system/controllers/leapHands.js b/scripts/system/controllers/leapHands.js
deleted file mode 100644
index 1be0b1e5f6..0000000000
--- a/scripts/system/controllers/leapHands.js
+++ /dev/null
@@ -1,527 +0,0 @@
-//
-//  leapHands.js
-//  examples
-//
-//  Created by David Rowe on 8 Sep 2014.
-//  Copyright 2014 High Fidelity, Inc.
-//
-//  This is an example script that uses the Leap Motion to make the avatar's hands replicate the user's hand actions.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-var leftTriggerValue = 0;
-var rightTriggerValue = 0;
-
-var LEAP_TRIGGER_START_ANGLE = 15.0;
-var LEAP_TRIGGER_END_ANGLE = 40.0;
-
-function getLeapMotionLeftTrigger() {
-    //print("left trigger = " + leftTriggerValue);
-    return leftTriggerValue;
-}
-function getLeapMotionRightTrigger() {
-    //print("right trigger = " + rightTriggerValue);
-    return rightTriggerValue;
-}
-
-var leapHands = (function () {
-
-    var isOnHMD,
-        LEAP_ON_HMD_MENU_ITEM = "Leap Motion on HMD",
-        LEAP_OFFSET = 0.019,  // Thickness of Leap Motion plus HMD clip
-        HMD_OFFSET = 0.070,  // Eyeballs to front surface of Oculus DK2  TODO: Confirm and make depend on device and eye relief
-        hasHandAndWristJoints,
-        handToWristOffset = [],  // For avatars without a wrist joint we control an estimate of a proper hand joint position
-        HAND_OFFSET = 0.4,  // Relative distance of wrist to hand versus wrist to index finger knuckle
-        handAnimationStateHandlers,
-        handAnimationStateFunctions,
-        handAnimationStateProperties,
-        hands,
-        wrists,
-        NUM_HANDS = 2,  // 0 = left; 1 = right
-        fingers,
-        NUM_FINGERS = 5,  // 0 = thumb; ...; 4 = pinky
-        THUMB = 0,
-        MIDDLE_FINGER = 2,
-        NUM_FINGER_JOINTS = 3,  // 0 = metacarpal(hand)-proximal(finger) joint; ...; 2 = intermediate-distal joint
-        MAX_HAND_INACTIVE_COUNT = 20,
-        calibrationStatus,
-        UNCALIBRATED = 0,
-        CALIBRATING = 1,
-        CALIBRATED = 2,
-        CALIBRATION_TIME = 1000,  // milliseconds
-        avatarScale,
-        avatarFaceModelURL,
-        avatarSkeletonModelURL,
-        settingsTimer,
-        HMD_CAMERA_TO_AVATAR_ROTATION = [
-            Quat.angleAxis(180.0, { x: 0, y: 0, z: 1 }),
-            Quat.angleAxis(-180.0, { x: 0, y: 0, z: 1 })
-        ],
-        DESKTOP_CAMERA_TO_AVATAR_ROTATION =
-            Quat.multiply(Quat.angleAxis(180.0, { x: 0, y: 1, z: 0 }), Quat.angleAxis(90.0, { x: 0, y: 0, z: 1 })),
-        LEAP_THUMB_ROOT_ADJUST = [Quat.fromPitchYawRollDegrees(0, 0, 20), Quat.fromPitchYawRollDegrees(0, 0, -20)];
-
-    function printSkeletonJointNames() {
-        var jointNames,
-            i;
-
-        print(MyAvatar.skeletonModelURL);
-
-        print("Skeleton joint names ...");
-        jointNames = MyAvatar.getJointNames();
-        for (i = 0; i < jointNames.length; i += 1) {
-            print(i + ": " + jointNames[i]);
-        }
-        print("... skeleton joint names");
-    }
-
-    function animateLeftHand() {
-        var ROTATION_AND_POSITION = 0;
-
-        return {
-            leftHandType: ROTATION_AND_POSITION,
-            leftHandPosition: hands[0].position,
-            leftHandRotation: hands[0].rotation
-        };
-    }
-
-    function animateRightHand() {
-        var ROTATION_AND_POSITION = 0;
-
-        return {
-            rightHandType: ROTATION_AND_POSITION,
-            rightHandPosition: hands[1].position,
-            rightHandRotation: hands[1].rotation
-        };
-    }
-
-    function finishCalibration() {
-        var avatarPosition,
-            handPosition,
-            middleFingerPosition,
-            leapHandHeight,
-            h;
-
-        if (!isOnHMD) {
-            if (hands[0].controller.isActive() && hands[1].controller.isActive()) {
-                leapHandHeight = (hands[0].controller.getAbsTranslation().y + hands[1].controller.getAbsTranslation().y) / 2.0;
-            } else {
-                calibrationStatus = UNCALIBRATED;
-                return;
-            }
-        }
-
-        avatarPosition = MyAvatar.position;
-
-        for (h = 0; h < NUM_HANDS; h += 1) {
-            handPosition = MyAvatar.getJointPosition(hands[h].jointName);
-            if (!hasHandAndWristJoints) {
-                middleFingerPosition = MyAvatar.getJointPosition(fingers[h][MIDDLE_FINGER][0].jointName);
-                handToWristOffset[h] = Vec3.multiply(Vec3.subtract(handPosition, middleFingerPosition), 1.0 - HAND_OFFSET);
-            }
-
-            if (isOnHMD) {
-                // Offset of Leap Motion origin from physical eye position
-                hands[h].zeroPosition = { x: 0.0, y: 0.0, z: HMD_OFFSET + LEAP_OFFSET };
-            } else {
-                hands[h].zeroPosition = {
-                    x: handPosition.x - avatarPosition.x,
-                    y: handPosition.y - avatarPosition.y,
-                    z: avatarPosition.z - handPosition.z
-                };
-                hands[h].zeroPosition = Vec3.multiplyQbyV(MyAvatar.orientation, hands[h].zeroPosition);
-                hands[h].zeroPosition.y = hands[h].zeroPosition.y - leapHandHeight;
-            }
-        }
-
-        MyAvatar.clearJointData("LeftHand");
-        MyAvatar.clearJointData("LeftForeArm");
-        MyAvatar.clearJointData("RightHand");
-        MyAvatar.clearJointData("RightForeArm");
-
-        calibrationStatus = CALIBRATED;
-        print("Leap Motion: Calibrated");
-    }
-
-    function calibrate() {
-        var jointNames,
-            i;
-
-        calibrationStatus = CALIBRATING;
-
-        avatarScale = MyAvatar.scale;
-        avatarFaceModelURL = MyAvatar.faceModelURL;
-        avatarSkeletonModelURL = MyAvatar.skeletonModelURL;
-
-        // Does this skeleton have both wrist and hand joints?
-        hasHandAndWristJoints = false;
-        jointNames = MyAvatar.getJointNames();
-        for (i = 0; i < jointNames.length; i += 1) {
-            hasHandAndWristJoints = hasHandAndWristJoints || jointNames[i].toLowerCase() === "leftwrist";
-        }
-
-        // Set avatar arms vertical, forearms horizontal, as "zero" position for calibration
-        MyAvatar.setJointRotation("LeftForeArm", Quat.fromPitchYawRollDegrees(0.0, 0.0, 90.0));
-        MyAvatar.setJointRotation("LeftHand", Quat.fromPitchYawRollDegrees(0.0, 90.0, 0.0));
-        MyAvatar.setJointRotation("RightForeArm", Quat.fromPitchYawRollDegrees(0.0, 0.0, -90.0));
-        MyAvatar.setJointRotation("RightHand", Quat.fromPitchYawRollDegrees(0.0, -90.0, 0.0));
-
-        // Wait for arms to assume their positions before calculating
-        Script.setTimeout(finishCalibration, CALIBRATION_TIME);
-    }
-
-    function checkCalibration() {
-
-        if (calibrationStatus === CALIBRATED) {
-            return true;
-        }
-
-        if (calibrationStatus !== CALIBRATING) {
-            calibrate();
-        }
-
-        return false;
-    }
-
-    function setIsOnHMD() {
-        isOnHMD = Menu.isOptionChecked(LEAP_ON_HMD_MENU_ITEM);
-        print("Leap Motion: " + (isOnHMD ? "Is on HMD" : "Is on desk"));
-    }
-
-    function checkSettings() {
-        if (calibrationStatus > UNCALIBRATED && (MyAvatar.scale !== avatarScale
-            || MyAvatar.faceModelURL !== avatarFaceModelURL
-            || MyAvatar.skeletonModelURL !== avatarSkeletonModelURL
-            || Menu.isOptionChecked(LEAP_ON_HMD_MENU_ITEM) !== isOnHMD)) {
-            print("Leap Motion: Recalibrate...");
-            calibrationStatus = UNCALIBRATED;
-
-            setIsOnHMD();
-        }
-    }
-
-    function setUp() {
-
-        wrists = [
-            {
-                jointName: "LeftWrist",
-                controller: Controller.createInputController("Spatial", "joint_L_wrist")
-            },
-            {
-                jointName: "RightWrist",
-                controller: Controller.createInputController("Spatial", "joint_R_wrist")
-            }
-        ];
-
-        hands = [
-            {
-                jointName: "LeftHand",
-                controller: Controller.createInputController("Spatial", "joint_L_hand"),
-                inactiveCount: 0
-            },
-            {
-                jointName: "RightHand",
-                controller: Controller.createInputController("Spatial", "joint_R_hand"),
-                inactiveCount: 0
-            }
-        ];
-
-        // The Leap controller's first joint is the hand-metacarpal joint but this joint's data is not used because it's too
-        // dependent on the model skeleton exactly matching the Leap skeleton; using just the second and subsequent joints 
-        // seems to work better over all.
-        fingers = [{}, {}];
-        fingers[0] = [
-            [
-                { jointName: "LeftHandThumb1", controller: Controller.createInputController("Spatial", "joint_L_thumb2") },
-                { jointName: "LeftHandThumb2", controller: Controller.createInputController("Spatial", "joint_L_thumb3") },
-                { jointName: "LeftHandThumb3", controller: Controller.createInputController("Spatial", "joint_L_thumb4") }
-            ],
-            [
-                { jointName: "LeftHandIndex1", controller: Controller.createInputController("Spatial", "joint_L_index2") },
-                { jointName: "LeftHandIndex2", controller: Controller.createInputController("Spatial", "joint_L_index3") },
-                { jointName: "LeftHandIndex3", controller: Controller.createInputController("Spatial", "joint_L_index4") }
-            ],
-            [
-                { jointName: "LeftHandMiddle1", controller: Controller.createInputController("Spatial", "joint_L_middle2") },
-                { jointName: "LeftHandMiddle2", controller: Controller.createInputController("Spatial", "joint_L_middle3") },
-                { jointName: "LeftHandMiddle3", controller: Controller.createInputController("Spatial", "joint_L_middle4") }
-            ],
-            [
-                { jointName: "LeftHandRing1", controller: Controller.createInputController("Spatial", "joint_L_ring2") },
-                { jointName: "LeftHandRing2", controller: Controller.createInputController("Spatial", "joint_L_ring3") },
-                { jointName: "LeftHandRing3", controller: Controller.createInputController("Spatial", "joint_L_ring4") }
-            ],
-            [
-                { jointName: "LeftHandPinky1", controller: Controller.createInputController("Spatial", "joint_L_pinky2") },
-                { jointName: "LeftHandPinky2", controller: Controller.createInputController("Spatial", "joint_L_pinky3") },
-                { jointName: "LeftHandPinky3", controller: Controller.createInputController("Spatial", "joint_L_pinky4") }
-            ]
-        ];
-        fingers[1] = [
-            [
-                { jointName: "RightHandThumb1", controller: Controller.createInputController("Spatial", "joint_R_thumb2") },
-                { jointName: "RightHandThumb2", controller: Controller.createInputController("Spatial", "joint_R_thumb3") },
-                { jointName: "RightHandThumb3", controller: Controller.createInputController("Spatial", "joint_R_thumb4") }
-            ],
-            [
-                { jointName: "RightHandIndex1", controller: Controller.createInputController("Spatial", "joint_R_index2") },
-                { jointName: "RightHandIndex2", controller: Controller.createInputController("Spatial", "joint_R_index3") },
-                { jointName: "RightHandIndex3", controller: Controller.createInputController("Spatial", "joint_R_index4") }
-            ],
-            [
-                { jointName: "RightHandMiddle1", controller: Controller.createInputController("Spatial", "joint_R_middle2") },
-                { jointName: "RightHandMiddle2", controller: Controller.createInputController("Spatial", "joint_R_middle3") },
-                { jointName: "RightHandMiddle3", controller: Controller.createInputController("Spatial", "joint_R_middle4") }
-            ],
-            [
-                { jointName: "RightHandRing1", controller: Controller.createInputController("Spatial", "joint_R_ring2") },
-                { jointName: "RightHandRing2", controller: Controller.createInputController("Spatial", "joint_R_ring3") },
-                { jointName: "RightHandRing3", controller: Controller.createInputController("Spatial", "joint_R_ring4") }
-            ],
-            [
-                { jointName: "RightHandPinky1", controller: Controller.createInputController("Spatial", "joint_R_pinky2") },
-                { jointName: "RightHandPinky2", controller: Controller.createInputController("Spatial", "joint_R_pinky3") },
-                { jointName: "RightHandPinky3", controller: Controller.createInputController("Spatial", "joint_R_pinky4") }
-            ]
-        ];
-
-        handAnimationStateHandlers = [null, null];
-        handAnimationStateFunctions = [animateLeftHand, animateRightHand];
-        handAnimationStateProperties = [
-            ["leftHandType", "leftHandPosition", "leftHandRotation"],
-            ["rightHandType", "rightHandPosition", "rightHandPosition"]
-        ];
-
-        setIsOnHMD();
-
-        settingsTimer = Script.setInterval(checkSettings, 2000);
-
-        calibrationStatus = UNCALIBRATED;
-
-        {
-            var mapping = Controller.newMapping("LeapmotionTrigger");
-            mapping.from(getLeapMotionLeftTrigger).to(Controller.Standard.LT);
-            mapping.from(getLeapMotionRightTrigger).to(Controller.Standard.RT);
-            mapping.enable();
-        }
-    }
-
-    function moveHands() {
-        var h,
-            i,
-            j,
-            side,
-            handOffset,
-            wristOffset,
-            handRotation,
-            locRotation,
-            cameraOrientation,
-            inverseAvatarOrientation;
-
-        for (h = 0; h < NUM_HANDS; h += 1) {
-            side = h === 0 ? -1.0 : 1.0;
-
-            if (hands[h].controller.isActive()) {
-
-                // Calibrate if necessary.
-                if (!checkCalibration()) {
-                    return;
-                }
-
-                // Hand animation handlers ...
-                if (handAnimationStateHandlers[h] === null) {
-                    handAnimationStateHandlers[h] = MyAvatar.addAnimationStateHandler(handAnimationStateFunctions[h],
-                        handAnimationStateProperties[h]);
-                }
-
-                // Hand position ...
-                handOffset = hands[h].controller.getAbsTranslation();
-                handRotation = hands[h].controller.getAbsRotation();
-
-                if (isOnHMD) {
-
-                    // Adjust to control wrist position if "hand" joint is at wrist ...
-                    if (!hasHandAndWristJoints) {
-                        wristOffset = Vec3.multiplyQbyV(handRotation, handToWristOffset[h]);
-                        handOffset = Vec3.sum(handOffset, wristOffset);
-                    }
-
-                    // Hand offset in camera coordinates ...
-                    handOffset = {
-                        x: -handOffset.x,
-                        y: -handOffset.z,
-                        z: -handOffset.y - hands[h].zeroPosition.z
-                    };
-
-                    // Hand offset in world coordinates ...
-                    cameraOrientation = Camera.getOrientation();
-                    handOffset = Vec3.sum(Camera.getPosition(), Vec3.multiplyQbyV(cameraOrientation, handOffset));
-
-                    // Hand offset in avatar coordinates ...
-                    inverseAvatarOrientation = Quat.inverse(MyAvatar.orientation);
-                    handOffset = Vec3.subtract(handOffset, MyAvatar.position);
-                    handOffset = Vec3.multiplyQbyV(inverseAvatarOrientation, handOffset);
-                    handOffset.z = -handOffset.z;
-                    handOffset.x = -handOffset.x;
-
-
-                    // Hand rotation in camera coordinates ...
-                    handRotation = {
-                        x: -handRotation.y,
-                        y: -handRotation.z,
-                        z: -handRotation.x,
-                        w: handRotation.w
-                    };
-
-                    // Hand rotation in avatar coordinates ...
-                    handRotation = Quat.multiply(HMD_CAMERA_TO_AVATAR_ROTATION[h], handRotation);
-                    cameraOrientation = {
-                        x: cameraOrientation.z,
-                        y: cameraOrientation.y,
-                        z: cameraOrientation.x,
-                        w: cameraOrientation.w
-                    };
-                    cameraOrientation = Quat.multiply(cameraOrientation, Quat.inverse(MyAvatar.orientation));
-                    handRotation = Quat.multiply(handRotation, cameraOrientation);  // Works!!!
-
-                } else {
-
-                    // Adjust to control wrist position if "hand" joint is at wrist ...
-                    if (!hasHandAndWristJoints) {
-                        wristOffset = Vec3.multiplyQbyV(handRotation, handToWristOffset[h]);
-                        handOffset = Vec3.sum(handOffset, wristOffset);
-                    }
-
-                    // Hand offset in camera coordinates ...
-                    handOffset = {
-                        x: -handOffset.x,
-                        y: hands[h].zeroPosition.y + handOffset.y,
-                        z: hands[h].zeroPosition.z - handOffset.z
-                    };
-
-                    // Hand rotation in camera coordinates ...
-                    handRotation = {
-                        x: handRotation.z,
-                        y: handRotation.y,
-                        z: handRotation.x,
-                        w: handRotation.w
-                    };
-
-                    // Hand rotation in avatar coordinates ...
-                    handRotation = Quat.multiply(DESKTOP_CAMERA_TO_AVATAR_ROTATION, handRotation);
-                }
-
-                // Set hand position and orientation for animation state handler ...
-                hands[h].position = handOffset;
-                hands[h].rotation = handRotation;
-
-                // Set finger joints ...
-                var summed = 0;
-                var closeAngle = 0;
-                for (i = 0; i < NUM_FINGERS; i += 1) {
-                    for (j = 0; j < NUM_FINGER_JOINTS; j += 1) {
-                        if (fingers[h][i][j].controller !== null) {
-                            locRotation = fingers[h][i][j].controller.getLocRotation();
-                            var eulers = Quat.safeEulerAngles(locRotation);
-                            closeAngle += eulers.x;
-
-                            summed++;
-
-                            if (i === THUMB) {
-                                locRotation = {
-                                    x: side * locRotation.y,
-                                    y: side * -locRotation.z,
-                                    z: side * -locRotation.x,
-                                    w: locRotation.w
-                                };
-                                if (j === 0) {
-                                    // Adjust avatar thumb root joint rotation to make avatar hands look better
-                                    locRotation = Quat.multiply(LEAP_THUMB_ROOT_ADJUST[h], locRotation);
-                                }
-                            } else {
-                                locRotation = {
-                                    x: -locRotation.x,
-                                    y: -locRotation.z,
-                                    z: -locRotation.y,
-                                    w: locRotation.w
-                                };
-                            }
-                            MyAvatar.setJointRotation(fingers[h][i][j].jointName, locRotation);
-                        }
-                    }
-                }
- 
-                hands[h].inactiveCount = 0;
-                if (summed > 0) {
-                    closeAngle /= summed;
-                }
-
-                var triggerValue = (-closeAngle - LEAP_TRIGGER_START_ANGLE) /  (LEAP_TRIGGER_END_ANGLE - LEAP_TRIGGER_START_ANGLE);
-                triggerValue = Math.max(0.0, Math.min(triggerValue, 1.0));
-
-                if (h == 0) {
-                    leftTriggerValue = triggerValue; 
-                } else {
-                    rightTriggerValue = triggerValue;
-
-                }
-
-            } else {
-
-                if (hands[h].inactiveCount < MAX_HAND_INACTIVE_COUNT) {
-
-                    hands[h].inactiveCount += 1;
-
-                    if (hands[h].inactiveCount === MAX_HAND_INACTIVE_COUNT) {
-                        if (handAnimationStateHandlers[h] !== null) {
-                            MyAvatar.removeAnimationStateHandler(handAnimationStateHandlers[h]);
-                            handAnimationStateHandlers[h] = null;
-                            leftTriggerValue = 0.0;
-                            rightTriggerValue = 0.0;
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    function tearDown() {
-        var h,
-            i,
-            j;
-
-        Script.clearInterval(settingsTimer);
-
-        for (h = 0; h < NUM_HANDS; h += 1) {
-            Controller.releaseInputController(hands[h].controller);
-            Controller.releaseInputController(wrists[h].controller);
-            if (handAnimationStateHandlers[h] !== null) {
-                MyAvatar.removeAnimationStateHandler(handAnimationStateHandlers[h]);
-            }
-            for (i = 0; i < NUM_FINGERS; i += 1) {
-                for (j = 0; j < NUM_FINGER_JOINTS; j += 1) {
-                    if (fingers[h][i][j].controller !== null) {
-                        Controller.releaseInputController(fingers[h][i][j].controller);
-                    }
-                }
-            }
-        }
-    }
-
-    return {
-        printSkeletonJointNames: printSkeletonJointNames,
-        setUp : setUp,
-        moveHands : moveHands,
-        tearDown : tearDown
-    };
-}());
-
-
-//leapHands.printSkeletonJointNames();
-
-leapHands.setUp();
-Script.update.connect(leapHands.moveHands);
-Script.scriptEnding.connect(leapHands.tearDown);
diff --git a/scripts/system/controllers/teleport.js b/scripts/system/controllers/teleport.js
deleted file mode 100644
index b058ec670f..0000000000
--- a/scripts/system/controllers/teleport.js
+++ /dev/null
@@ -1,538 +0,0 @@
-"use strict";
-
-// Created by james b. pollack @imgntn on 7/2/2016
-// Copyright 2016 High Fidelity, Inc.
-//
-//  Creates a beam and target and then teleports you there.  Release when its close to you to cancel.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-
-(function() { // BEGIN LOCAL_SCOPE
-
-var inTeleportMode = false;
-
-var SMOOTH_ARRIVAL_SPACING = 33;
-var NUMBER_OF_STEPS = 6;
-
-var TARGET_MODEL_URL = Script.resolvePath("../assets/models/teleport-destination.fbx");
-var TOO_CLOSE_MODEL_URL = Script.resolvePath("../assets/models/teleport-cancel.fbx");
-var SEAT_MODEL_URL = Script.resolvePath("../assets/models/teleport-seat.fbx");
-
-var TARGET_MODEL_DIMENSIONS = {
-    x: 1.15,
-    y: 0.5,
-    z: 1.15
-};
-
-var COLORS_TELEPORT_SEAT = {
-    red: 255,
-    green: 0,
-    blue: 170
-};
-
-var COLORS_TELEPORT_CAN_TELEPORT = {
-    red: 97,
-    green: 247,
-    blue: 255
-};
-
-var COLORS_TELEPORT_CANNOT_TELEPORT = {
-    red: 0,
-    green: 121,
-    blue: 141
-};
-
-var COLORS_TELEPORT_CANCEL = {
-    red: 255,
-    green: 184,
-    blue: 73
-};
-
-var TELEPORT_CANCEL_RANGE = 1;
-var COOL_IN_DURATION = 500;
-
-var handInfo = {
-    right: {
-        controllerInput: Controller.Standard.RightHand
-    },
-    left: {
-        controllerInput: Controller.Standard.LeftHand
-    }
-};
-
-function ThumbPad(hand) {
-    this.hand = hand;
-    var _thisPad = this;
-
-    this.buttonPress = function(value) {
-        _thisPad.buttonValue = value;
-    };
-}
-
-function Trigger(hand) {
-    this.hand = hand;
-    var _this = this;
-
-    this.buttonPress = function(value) {
-        _this.buttonValue = value;
-    };
-
-    this.down = function() {
-        var down = _this.buttonValue === 1 ? 1.0 : 0.0;
-        return down;
-    };
-}
-
-var coolInTimeout = null;
-var ignoredEntities = [];
-
-var TELEPORTER_STATES = {
-    IDLE: 'idle',
-    COOL_IN: 'cool_in',
-    TARGETTING: 'targetting',
-    TARGETTING_INVALID: 'targetting_invalid',
-};
-
-var TARGET = {
-    NONE: 'none',            // Not currently targetting anything
-    INVISIBLE: 'invisible',  // The current target is an invvsible surface
-    INVALID: 'invalid',      // The current target is invalid (wall, ceiling, etc.)
-    SURFACE: 'surface',      // The current target is a valid surface
-    SEAT: 'seat',            // The current target is a seat
-};
-
-function Teleporter() {
-    var _this = this;
-    this.active = false;
-    this.state = TELEPORTER_STATES.IDLE;
-    this.currentTarget = TARGET.INVALID;
-
-    this.overlayLines = {
-        left: null,
-        right: null,
-    };
-    this.updateConnected = null;
-    this.activeHand = null;
-
-    this.teleporterMappingInternalName = 'Hifi-Teleporter-Internal-Dev-' + Math.random();
-    this.teleportMappingInternal = Controller.newMapping(this.teleporterMappingInternalName);
-
-    // Setup overlays
-    this.cancelOverlay = Overlays.addOverlay("model", {
-        url: TOO_CLOSE_MODEL_URL,
-        dimensions: TARGET_MODEL_DIMENSIONS,
-        visible: false
-    });
-    this.targetOverlay = Overlays.addOverlay("model", {
-        url: TARGET_MODEL_URL,
-        dimensions: TARGET_MODEL_DIMENSIONS,
-        visible: false
-    });
-    this.seatOverlay = Overlays.addOverlay("model", {
-        url: SEAT_MODEL_URL,
-        dimensions: TARGET_MODEL_DIMENSIONS,
-        visible: false
-    });
-
-    this.enableMappings = function() {
-        Controller.enableMapping(this.teleporterMappingInternalName);
-    };
-
-    this.disableMappings = function() {
-        Controller.disableMapping(teleporter.teleporterMappingInternalName);
-    };
-
-    this.cleanup = function() {
-        this.disableMappings();
-
-        Overlays.deleteOverlay(this.targetOverlay);
-        this.targetOverlay = null;
-
-        Overlays.deleteOverlay(this.cancelOverlay);
-        this.cancelOverlay = null;
-
-        Overlays.deleteOverlay(this.seatOverlay);
-        this.seatOverlay = null;
-
-        this.deleteOverlayBeams();
-        if (this.updateConnected === true) {
-            Script.update.disconnect(this, this.update);
-        }
-    };
-
-    this.enterTeleportMode = function(hand) {
-        if (inTeleportMode === true) {
-            return;
-        }
-        if (isDisabled === 'both' || isDisabled === hand) {
-            return;
-        }
-
-        inTeleportMode = true;
-
-        if (coolInTimeout !== null) {
-            Script.clearTimeout(coolInTimeout);
-        }
-
-        this.state = TELEPORTER_STATES.COOL_IN;
-        coolInTimeout = Script.setTimeout(function() {
-            if (_this.state === TELEPORTER_STATES.COOL_IN) {
-                _this.state = TELEPORTER_STATES.TARGETTING;
-            }
-        }, COOL_IN_DURATION);
-
-        this.activeHand = hand;
-        this.enableMappings();
-        Script.update.connect(this, this.update);
-        this.updateConnected = true;
-    };
-
-    this.exitTeleportMode = function(value) {
-        if (this.updateConnected === true) {
-            Script.update.disconnect(this, this.update);
-        }
-
-        this.disableMappings();
-        this.deleteOverlayBeams();
-        this.hideTargetOverlay();
-        this.hideCancelOverlay();
-
-        this.updateConnected = null;
-        this.state = TELEPORTER_STATES.IDLE;
-        inTeleportMode = false;
-    };
-
-    this.deleteOverlayBeams = function() {
-        for (var key in this.overlayLines) {
-            if (this.overlayLines[key] !== null) {
-                Overlays.deleteOverlay(this.overlayLines[key]);
-                this.overlayLines[key] = null;
-            }
-        }
-    };
-
-    this.update = function() {
-        if (_this.state === TELEPORTER_STATES.IDLE) {
-            return;
-        }
-
-        // Get current hand pose information so that we can get the direction of the teleport beam
-        var pose = Controller.getPoseValue(handInfo[_this.activeHand].controllerInput);
-        var handPosition = pose.valid ? Vec3.sum(Vec3.multiplyQbyV(MyAvatar.orientation, pose.translation), MyAvatar.position) : MyAvatar.getHeadPosition();
-        var handRotation = pose.valid ? Quat.multiply(MyAvatar.orientation, pose.rotation) :
-            Quat.multiply(MyAvatar.headOrientation, Quat.angleAxis(-90, {
-                x: 1,
-                y: 0,
-                z: 0
-            }));
-
-        var pickRay = {
-            origin: handPosition,
-            direction: Quat.getUp(handRotation),
-        };
-
-        // We do up to 2 ray picks to find a teleport location.
-        // There are 2 types of teleport locations we are interested in:
-        //   1. A visible floor. This can be any entity surface that points within some degree of "up"
-        //   2. A seat. The seat can be visible or invisible.
-        //
-        //  * In the first pass we pick against visible and invisible entities so that we can find invisible seats.
-        //    We might hit an invisible entity that is not a seat, so we need to do a second pass.
-        //  * In the second pass we pick against visible entities only.
-        //
-        var intersection = Entities.findRayIntersection(pickRay, true, [], [this.targetEntity].concat(ignoredEntities), false, true);
-
-        var teleportLocationType = getTeleportTargetType(intersection);
-        if (teleportLocationType === TARGET.INVISIBLE) {
-            intersection = Entities.findRayIntersection(pickRay, true, [], [this.targetEntity].concat(ignoredEntities), true, true);
-            teleportLocationType = getTeleportTargetType(intersection);
-        }
-
-        if (teleportLocationType === TARGET.NONE) {
-            this.hideTargetOverlay();
-            this.hideCancelOverlay();
-            this.hideSeatOverlay();
-
-            var farPosition = Vec3.sum(pickRay.origin, Vec3.multiply(pickRay.direction, 50));
-            this.updateLineOverlay(_this.activeHand, pickRay.origin, farPosition, COLORS_TELEPORT_CANNOT_TELEPORT);
-        } else if (teleportLocationType === TARGET.INVALID || teleportLocationType === TARGET.INVISIBLE) {
-            this.hideTargetOverlay();
-            this.hideSeatOverlay();
-
-            this.updateLineOverlay(_this.activeHand, pickRay.origin, intersection.intersection, COLORS_TELEPORT_CANCEL);
-            this.updateDestinationOverlay(this.cancelOverlay, intersection);
-        } else if (teleportLocationType === TARGET.SURFACE) {
-            if (this.state === TELEPORTER_STATES.COOL_IN) {
-                this.hideTargetOverlay();
-                this.hideSeatOverlay();
-
-                this.updateLineOverlay(_this.activeHand, pickRay.origin, intersection.intersection, COLORS_TELEPORT_CANCEL);
-                this.updateDestinationOverlay(this.cancelOverlay, intersection);
-            } else {
-                this.hideCancelOverlay();
-                this.hideSeatOverlay();
-
-                this.updateLineOverlay(_this.activeHand, pickRay.origin, intersection.intersection,
-                                       COLORS_TELEPORT_CAN_TELEPORT);
-                this.updateDestinationOverlay(this.targetOverlay, intersection);
-            }
-        } else if (teleportLocationType === TARGET.SEAT) {
-            this.hideCancelOverlay();
-            this.hideTargetOverlay();
-
-            this.updateLineOverlay(_this.activeHand, pickRay.origin, intersection.intersection, COLORS_TELEPORT_SEAT);
-            this.updateDestinationOverlay(this.seatOverlay, intersection);
-        }
-
-
-        if (((_this.activeHand === 'left' ? leftPad : rightPad).buttonValue === 0) && inTeleportMode === true) {
-            // remember the state before we exit teleport mode and set it back to IDLE
-            var previousState = this.state;
-            this.exitTeleportMode();
-            this.hideCancelOverlay();
-            this.hideTargetOverlay();
-            this.hideSeatOverlay();
-
-            if (teleportLocationType === TARGET.NONE || teleportLocationType === TARGET.INVALID || previousState === TELEPORTER_STATES.COOL_IN) {
-                // Do nothing
-            } else if (teleportLocationType === TARGET.SEAT) {
-                Entities.callEntityMethod(intersection.entityID, 'sit');
-            } else if (teleportLocationType === TARGET.SURFACE) {
-                var offset = getAvatarFootOffset();
-                intersection.intersection.y += offset;
-                MyAvatar.goToLocation(intersection.intersection, false, {x: 0, y: 0, z: 0, w: 1}, false);
-                HMD.centerUI();
-                MyAvatar.centerBody();
-            }
-        }
-    };
-
-    this.updateLineOverlay = function(hand, closePoint, farPoint, color) {
-        if (this.overlayLines[hand] === null) {
-            var lineProperties = {
-                start: closePoint,
-                end: farPoint,
-                color: color,
-                ignoreRayIntersection: true,
-                visible: true,
-                alpha: 1,
-                solid: true,
-                drawInFront: true,
-                glow: 1.0
-            };
-
-            this.overlayLines[hand] = Overlays.addOverlay("line3d", lineProperties);
-
-        } else {
-            Overlays.editOverlay(this.overlayLines[hand], {
-                start: closePoint,
-                end: farPoint,
-                color: color
-            });
-        }
-    };
-
-    this.hideCancelOverlay = function() {
-        Overlays.editOverlay(this.cancelOverlay, { visible: false });
-    };
-
-    this.hideTargetOverlay = function() {
-        Overlays.editOverlay(this.targetOverlay, { visible: false });
-    };
-
-    this.hideSeatOverlay = function() {
-        Overlays.editOverlay(this.seatOverlay, { visible: false });
-    };
-
-    this.updateDestinationOverlay = function(overlayID, intersection) {
-        var rotation = Quat.lookAt(intersection.intersection, MyAvatar.position, Vec3.UP);
-        var euler = Quat.safeEulerAngles(rotation);
-        var position = {
-            x: intersection.intersection.x,
-            y: intersection.intersection.y + TARGET_MODEL_DIMENSIONS.y / 2,
-            z: intersection.intersection.z
-        };
-
-        var towardUs = Quat.fromPitchYawRollDegrees(0, euler.y, 0);
-
-        Overlays.editOverlay(overlayID, {
-            visible: true,
-            position: position,
-            rotation: towardUs
-        });
-
-    };
-}
-
-// related to repositioning the avatar after you teleport
-var FOOT_JOINT_NAMES = ["RightToe_End", "RightToeBase", "RightFoot"];
-var DEFAULT_ROOT_TO_FOOT_OFFSET = 0.5;
-function getAvatarFootOffset() {
-
-    // find a valid foot jointIndex
-    var footJointIndex = -1;
-    var i, l = FOOT_JOINT_NAMES.length;
-    for (i = 0; i < l; i++) {
-        footJointIndex = MyAvatar.getJointIndex(FOOT_JOINT_NAMES[i]);
-        if (footJointIndex != -1) {
-            break;
-        }
-    }
-    if (footJointIndex != -1) {
-        // default vertical offset from foot to avatar root.
-        return -MyAvatar.getAbsoluteDefaultJointTranslationInObjectFrame(footJointIndex).y;
-    } else {
-        return DEFAULT_ROOT_TO_FOOT_OFFSET * MyAvatar.scale;
-    }
-}
-
-var leftPad = new ThumbPad('left');
-var rightPad = new ThumbPad('right');
-var leftTrigger = new Trigger('left');
-var rightTrigger = new Trigger('right');
-
-var mappingName, teleportMapping;
-
-var TELEPORT_DELAY = 0;
-
-function isMoving() {
-    var LY = Controller.getValue(Controller.Standard.LY);
-    var LX = Controller.getValue(Controller.Standard.LX);
-    if (LY !== 0 || LX !== 0) {
-        return true;
-    } else {
-        return false;
-    }
-}
-
-function parseJSON(json) {
-    try {
-        return JSON.parse(json);
-    } catch (e) {
-        return undefined;
-    }
-}
-// When determininig whether you can teleport to a location, the normal of the
-// point that is being intersected with is looked at. If this normal is more
-// than MAX_ANGLE_FROM_UP_TO_TELEPORT degrees from <0, 1, 0> (straight up), then
-// you can't teleport there.
-var MAX_ANGLE_FROM_UP_TO_TELEPORT = 70;
-function getTeleportTargetType(intersection) {
-    if (!intersection.intersects) {
-        return TARGET.NONE;
-    }
-
-    var props = Entities.getEntityProperties(intersection.entityID, ['userData', 'visible']);
-    var data = parseJSON(props.userData);
-    if (data !== undefined && data.seat !== undefined) {
-        var avatarUuid = Uuid.fromString(data.seat.user);
-        if (Uuid.isNull(avatarUuid) || !AvatarList.getAvatar(avatarUuid)) {
-            return TARGET.SEAT;
-        } else {
-            return TARGET.INVALID;
-        }
-    }
-
-    if (!props.visible) {
-        return TARGET.INVISIBLE;
-    }
-
-    var surfaceNormal = intersection.surfaceNormal;
-    var adj = Math.sqrt(surfaceNormal.x * surfaceNormal.x + surfaceNormal.z * surfaceNormal.z);
-    var angleUp = Math.atan2(surfaceNormal.y, adj) * (180 / Math.PI);
-
-    if (angleUp < (90 - MAX_ANGLE_FROM_UP_TO_TELEPORT) ||
-            angleUp > (90 + MAX_ANGLE_FROM_UP_TO_TELEPORT) ||
-            Vec3.distance(MyAvatar.position, intersection.intersection) <= TELEPORT_CANCEL_RANGE) {
-        return TARGET.INVALID;
-    } else {
-        return TARGET.SURFACE;
-    }
-}
-
-function registerMappings() {
-    mappingName = 'Hifi-Teleporter-Dev-' + Math.random();
-    teleportMapping = Controller.newMapping(mappingName);
-    teleportMapping.from(Controller.Standard.RT).peek().to(rightTrigger.buttonPress);
-    teleportMapping.from(Controller.Standard.LT).peek().to(leftTrigger.buttonPress);
-
-    teleportMapping.from(Controller.Standard.RightPrimaryThumb).peek().to(rightPad.buttonPress);
-    teleportMapping.from(Controller.Standard.LeftPrimaryThumb).peek().to(leftPad.buttonPress);
-
-    teleportMapping.from(Controller.Standard.LeftPrimaryThumb)
-        .to(function(value) {
-            if (isDisabled === 'left' || isDisabled === 'both') {
-                return;
-            }
-            if (leftTrigger.down()) {
-                return;
-            }
-            if (isMoving() === true) {
-                return;
-            }
-            teleporter.enterTeleportMode('left');
-            return;
-        });
-    teleportMapping.from(Controller.Standard.RightPrimaryThumb)
-        .to(function(value) {
-            if (isDisabled === 'right' || isDisabled === 'both') {
-                return;
-            }
-            if (rightTrigger.down()) {
-                return;
-            }
-            if (isMoving() === true) {
-                return;
-            }
-
-            teleporter.enterTeleportMode('right');
-            return;
-        });
-}
-
-registerMappings();
-
-var teleporter = new Teleporter();
-
-Controller.enableMapping(mappingName);
-
-function cleanup() {
-    teleportMapping.disable();
-    teleporter.cleanup();
-}
-Script.scriptEnding.connect(cleanup);
-
-var isDisabled = false;
-var handleTeleportMessages = function(channel, message, sender) {
-    if (sender === MyAvatar.sessionUUID) {
-        if (channel === 'Hifi-Teleport-Disabler') {
-            if (message === 'both') {
-                isDisabled = 'both';
-            }
-            if (message === 'left') {
-                isDisabled = 'left';
-            }
-            if (message === 'right') {
-                isDisabled = 'right';
-            }
-            if (message === 'none') {
-                isDisabled = false;
-            }
-        } else if (channel === 'Hifi-Teleport-Ignore-Add' && !Uuid.isNull(message) && ignoredEntities.indexOf(message) === -1) {
-            ignoredEntities.push(message);
-        } else if (channel === 'Hifi-Teleport-Ignore-Remove' && !Uuid.isNull(message)) {
-            var removeIndex = ignoredEntities.indexOf(message);
-            if (removeIndex > -1) {
-                ignoredEntities.splice(removeIndex, 1);
-            }
-        }
-    }
-};
-
-Messages.subscribe('Hifi-Teleport-Disabler');
-Messages.subscribe('Hifi-Teleport-Ignore-Add');
-Messages.subscribe('Hifi-Teleport-Ignore-Remove');
-Messages.messageReceived.connect(handleTeleportMessages);
-
-}()); // END LOCAL_SCOPE
diff --git a/scripts/system/controllers/touchControllerConfiguration.js b/scripts/system/controllers/touchControllerConfiguration.js
index a4622fd5e6..9df8f9e97d 100644
--- a/scripts/system/controllers/touchControllerConfiguration.js
+++ b/scripts/system/controllers/touchControllerConfiguration.js
@@ -55,6 +55,7 @@ TOUCH_CONTROLLER_CONFIGURATION_LEFT = {
                     type: "static",
                     modelURL: BASE_URL + "Oculus-Labels-L.fbx",
                     naturalPosition: { x: -0.022335469722747803, y: 0.00022516027092933655, z: 0.020340695977211 },
+                    naturalDimensions: { x: 0.132063, y: 0.0856, z: 0.130282 },
 
                     textureName: "blank",
                     defaultTextureLayer: "blank",
@@ -84,6 +85,7 @@ TOUCH_CONTROLLER_CONFIGURATION_LEFT = {
                     type: "rotational",
                     modelURL: BASE_URL + "touch_l_trigger.fbx",
                     naturalPosition: { x: 0.0008544912561774254, y: -0.019867943599820137, z: 0.018800459802150726 },
+                    naturalDimensions: { x: 0.027509, y: 0.025211, z: 0.018443 },
 
                     // rotational 
                     input: Controller.Standard.LT,
@@ -109,6 +111,7 @@ TOUCH_CONTROLLER_CONFIGURATION_LEFT = {
                     type: "linear",
                     modelURL: BASE_URL + "touch_l_bumper.fbx",
                     naturalPosition: { x: 0.00008066371083259583, y: -0.02715788595378399, z: -0.02448512241244316 },
+                    naturalDimensions: { x: 0.017444, y: 0.020297, z: 0.026003 },
 
                     // linear properties
                     // Offset from origin = 0.36470, 0.11048, 0.11066
@@ -132,6 +135,7 @@ TOUCH_CONTROLLER_CONFIGURATION_LEFT = {
                     type: "joystick",
                     modelURL: BASE_URL + "touch_l_joystick.fbx",
                     naturalPosition: { x: 0.0075613949447870255, y: -0.008225866593420506, z: 0.004792703315615654 },
+                    naturalDimensions: { x: 0.027386, y: 0.033254, z: 0.027272 },
 
                     // joystick
                     xInput: "OculusTouch.LX",
@@ -156,6 +160,7 @@ TOUCH_CONTROLLER_CONFIGURATION_LEFT = {
                     type: "linear",
                     modelURL: BASE_URL + "touch_l_button_x.fbx",
                     naturalPosition: { x: -0.009307309985160828, y: -0.00005015172064304352, z: -0.012594521045684814 },
+                    naturalDimensions: { x: 0.009861, y: 0.004345, z: 0.00982 },
 
                     input: "OculusTouch.X",
                     axis: { x: 0, y: -1, z: 0 },
@@ -177,6 +182,7 @@ TOUCH_CONTROLLER_CONFIGURATION_LEFT = {
                     type: "linear",
                     modelURL: BASE_URL + "touch_l_button_y.fbx",
                     naturalPosition: { x: -0.01616849936544895, y: -0.000050364527851343155, z: 0.0017703399062156677 },
+                    naturalDimensions: { x: 0.010014, y: 0.004412, z: 0.009972 },
 
                     input: "OculusTouch.Y",
                     axis: { x: 0, y: -1, z: 0 },
@@ -214,6 +220,7 @@ TOUCH_CONTROLLER_CONFIGURATION_RIGHT = {
                     type: "static",
                     modelURL: BASE_URL + "Oculus-Labels-R.fbx",
                     naturalPosition: { x: 0.009739525616168976, y: -0.0017818436026573181, z: 0.016794726252555847 },
+                    naturalDimensions: { x: 0.129049, y: 0.078297, z: 0.139492 },
 
                     textureName: "blank",
                     defaultTextureLayer: "blank",
@@ -243,6 +250,7 @@ TOUCH_CONTROLLER_CONFIGURATION_RIGHT = {
                     type: "rotational",
                     modelURL: BASE_URL + "touch_r_trigger.fbx",
                     naturalPosition: { x: -0.0008544912561774254, y: -0.019867943599820137, z: 0.018800459802150726 },
+                    naturalDimensions: { x: 0.027384, y: 0.025201, z: 0.018425 },
 
                     // rotational 
                     input: "OculusTouch.RT",
@@ -268,6 +276,7 @@ TOUCH_CONTROLLER_CONFIGURATION_RIGHT = {
                     type: "linear",
                     modelURL: BASE_URL + "touch_r_bumper.fbx",
                     naturalPosition: { x: -0.0000806618481874466, y: -0.027157839387655258, z: -0.024485092610120773 },
+                    naturalDimensions: { x: 0.017268, y: 0.020366, z: 0.02599 },
 
                     // linear properties
                     // Offset from origin = 0.36470, 0.11048, 0.11066
@@ -292,6 +301,7 @@ TOUCH_CONTROLLER_CONFIGURATION_RIGHT = {
                     type: "joystick",
                     modelURL: BASE_URL + "touch_r_joystick.fbx",
                     naturalPosition: { x: -0.007561382371932268, y: -0.008225853554904461, z: 0.00479268841445446 },
+                    naturalDimensions: { x: 0.027272, y: 0.033254, z: 0.027272 },
 
                     // joystick
                     xInput: "OculusTouch.RX",
@@ -316,6 +326,7 @@ TOUCH_CONTROLLER_CONFIGURATION_RIGHT = {
                     type: "linear",
                     modelURL: BASE_URL + "touch_r_button_a.fbx",
                     naturalPosition: { x: 0.009307296946644783, y: -0.00005015172064304352, z: -0.012594504281878471 },
+                    naturalDimensions: { x: 0.00982, y: 0.004345, z: 0.00982 },
 
                     input: "OculusTouch.A",
                     axis: { x: 0, y: -1, z: 0 },
@@ -337,6 +348,7 @@ TOUCH_CONTROLLER_CONFIGURATION_RIGHT = {
                     type: "linear",
                     modelURL: BASE_URL + "touch_r_button_b.fbx",
                     naturalPosition: { x: 0.01616847701370716, y: -0.000050364527851343155, z: 0.0017703361809253693 },
+                    naturalDimensions: { x: 0.009972, y: 0.004412, z: 0.009972 },
 
                     input: "OculusTouch.B",
                     axis: { x: 0, y: -1, z: 0 },
diff --git a/scripts/system/controllers/viveControllerConfiguration.js b/scripts/system/controllers/viveControllerConfiguration.js
index 51cbb69473..dc4a5b6bb3 100644
--- a/scripts/system/controllers/viveControllerConfiguration.js
+++ b/scripts/system/controllers/viveControllerConfiguration.js
@@ -62,7 +62,7 @@ var TIP_TEXTURE_BASE_URL = BASE_URL + "meshes/controller/vive_tips.fbm/";
 
 var viveModelURL = BASE_URL + "meshes/controller/vive_body.fbx";
 var viveTipsModelURL = BASE_URL + "meshes/controller/vive_tips.fbx";
-var viveTriggerModelURL = "meshes/controller/vive_trigger.fbx"
+var viveTriggerModelURL = "meshes/controller/vive_trigger.fbx";
 
 VIVE_CONTROLLER_CONFIGURATION_LEFT = {
     name: "Vive",
@@ -81,6 +81,7 @@ VIVE_CONTROLLER_CONFIGURATION_LEFT = {
                     type: "static",
                     modelURL: viveTipsModelURL,
                     naturalPosition: {"x":-0.004377640783786774,"y":-0.034371938556432724,"z":0.06769277155399323},
+                    naturalDimensions: {x: 0.191437, y: 0.094095, z: 0.085656},
 
                     textureName: "Tex.Blank",
                     defaultTextureLayer: "blank",
@@ -112,6 +113,7 @@ VIVE_CONTROLLER_CONFIGURATION_LEFT = {
                     xInput: "Vive.LX",
                     yInput: "Vive.LY",
                     naturalPosition: {"x":0,"y":0.000979491975158453,"z":0.04872849956154823},
+                    naturalDimensions: {x: 0.042824, y: 0.012537, z: 0.043115},
                     minValue: 0.0,
                     maxValue: 1.0,
                     minPosition: { x: -0.035, y: 0.004, z: -0.005 },
@@ -137,6 +139,7 @@ VIVE_CONTROLLER_CONFIGURATION_LEFT = {
                     modelURL: BASE_URL + "meshes/controller/vive_trigger.fbx",
                     input: Controller.Standard.LT,
                     naturalPosition: {"x":0.000004500150680541992,"y":-0.027690507471561432,"z":0.04830199480056763},
+                    naturalDimensions: {x: 0.019105, y: 0.022189, z: 0.01909},
                     origin: { x: 0, y: -0.015, z: -0.00 },
                     minValue: 0.0,
                     maxValue: 1.0,
@@ -147,10 +150,10 @@ VIVE_CONTROLLER_CONFIGURATION_LEFT = {
                     defaultTextureLayer: "normal",
                     textureLayers: {
                         normal: {
-                            defaultTextureURL: BASE_URL + viveTriggerModelURL + "/Trigger.fbm/black.jpg",
+                            defaultTextureURL: BASE_URL + viveTriggerModelURL + "/Trigger.fbm/black.jpg"
                         },
                         highlight: {
-                            defaultTextureURL: BASE_URL + viveTriggerModelURL + "/Trigger.fbm/yellow.jpg",
+                            defaultTextureURL: BASE_URL + viveTriggerModelURL + "/Trigger.fbm/yellow.jpg"
                         }
                     }
                 },
@@ -158,30 +161,35 @@ VIVE_CONTROLLER_CONFIGURATION_LEFT = {
                 l_grip: {
                     type: "static",
                     modelURL: BASE_URL + "meshes/controller/vive_l_grip.fbx",
-                    naturalPosition: {"x":-0.01720449887216091,"y":-0.014324013143777847,"z":0.08714400231838226}
+                    naturalPosition: {"x":-0.01720449887216091,"y":-0.014324013143777847,"z":0.08714400231838226},
+                    naturalDimensions: {x: 0.010094, y: 0.015064, z: 0.029552}
                 },
 
                 r_grip: {
                     type: "static",
                     modelURL: BASE_URL + "meshes/controller/vive_r_grip.fbx",
-                    naturalPosition: {"x":0.01720449887216091,"y":-0.014324013143777847,"z":0.08714400231838226}
+                    naturalPosition: {"x":0.01720449887216091,"y":-0.014324013143777847,"z":0.08714400231838226},
+                    naturalDimensions: {x: 0.010083, y: 0.015064, z: 0.029552}
                 },
 
                 sys_button: {
                     type: "static",
                     modelURL: BASE_URL + "meshes/controller/vive_sys_button.fbx",
-                    naturalPosition: {"x":0,"y":0.0020399854984134436,"z":0.08825899660587311}
+                    naturalPosition: {"x":0,"y":0.0020399854984134436,"z":0.08825899660587311},
+                    naturalDimensions: {x: 0.009986, y: 0.004282, z: 0.010264}
                 },
 
                 button: {
                     type: "static",
                     modelURL: BASE_URL + "meshes/controller/vive_button.fbx",
-                    naturalPosition: {"x":0,"y":0.005480996798723936,"z":0.019918499514460564}
+                    naturalPosition: {"x":0,"y":0.005480996798723936,"z":0.019918499514460564},
+                    naturalDimensions: {x: 0.009986, y: 0.004496, z: 0.010121}
                 },
                 button2: {
                     type: "static",
                     modelURL: BASE_URL + "meshes/controller/vive_button.fbx",
-                    naturalPosition: {"x":0,"y":0.005480996798723936,"z":0.019918499514460564}
+                    naturalPosition: {"x":0,"y":0.005480996798723936,"z":0.019918499514460564},
+                    naturalDimensions: {x: 0.009986, y: 0.004496, z: 0.010121}
                 }
             }
         }
@@ -211,6 +219,7 @@ VIVE_CONTROLLER_CONFIGURATION_RIGHT = {
                     type: "static",
                     modelURL: viveTipsModelURL,
                     naturalPosition: {"x":-0.004377640783786774,"y":-0.034371938556432724,"z":0.06769277155399323},
+                    naturalDimensions: {x: 0.191437, y: 0.094095, z: 0.085656},
 
                     textureName: "Tex.Blank",
 
@@ -243,6 +252,7 @@ VIVE_CONTROLLER_CONFIGURATION_RIGHT = {
                     xInput: "Vive.RX",
                     yInput: "Vive.RY",
                     naturalPosition: { x: 0, y: 0.000979491975158453, z: 0.04872849956154823 },
+                    naturalDimensions: {x: 0.042824, y: 0.012537, z: 0.043115},
                     minValue: 0.0,
                     maxValue: 1.0,
                     minPosition: { x: -0.035, y: 0.004, z: -0.005 },
@@ -268,6 +278,7 @@ VIVE_CONTROLLER_CONFIGURATION_RIGHT = {
                     modelURL: BASE_URL + "meshes/controller/vive_trigger.fbx",
                     input: Controller.Standard.RT,
                     naturalPosition: {"x":0.000004500150680541992,"y":-0.027690507471561432,"z":0.04830199480056763},
+                    naturalDimensions: {x: 0.019105, y: 0.022189, z: 0.01909},
                     origin: { x: 0, y: -0.015, z: -0.00 },
                     minValue: 0.0,
                     maxValue: 1.0,
@@ -278,10 +289,10 @@ VIVE_CONTROLLER_CONFIGURATION_RIGHT = {
                     defaultTextureLayer: "normal",
                     textureLayers: {
                         normal: {
-                            defaultTextureURL: BASE_URL + viveTriggerModelURL + "/Trigger.fbm/black.jpg",
+                            defaultTextureURL: BASE_URL + viveTriggerModelURL + "/Trigger.fbm/black.jpg"
                         },
                         highlight: {
-                            defaultTextureURL: BASE_URL + viveTriggerModelURL + "/Trigger.fbm/yellow.jpg",
+                            defaultTextureURL: BASE_URL + viveTriggerModelURL + "/Trigger.fbm/yellow.jpg"
                         }
                     }
                 },
@@ -289,30 +300,35 @@ VIVE_CONTROLLER_CONFIGURATION_RIGHT = {
                 l_grip: {
                     type: "static",
                     modelURL: BASE_URL + "meshes/controller/vive_l_grip.fbx",
-                    naturalPosition: {"x":-0.01720449887216091,"y":-0.014324013143777847,"z":0.08714400231838226}
+                    naturalPosition: {"x":-0.01720449887216091,"y":-0.014324013143777847,"z":0.08714400231838226},
+                    naturalDimensions: {x: 0.010094, y: 0.015064, z: 0.029552}
                 },
 
                 r_grip: {
                     type: "static",
                     modelURL: BASE_URL + "meshes/controller/vive_r_grip.fbx",
-                    naturalPosition: {"x":0.01720449887216091,"y":-0.014324013143777847,"z":0.08714400231838226}
+                    naturalPosition: {"x":0.01720449887216091,"y":-0.014324013143777847,"z":0.08714400231838226},
+                    naturalDimensions: {x: 0.010083, y: 0.015064, z: 0.029552}
                 },
 
                 sys_button: {
                     type: "static",
                     modelURL: BASE_URL + "meshes/controller/vive_sys_button.fbx",
-                    naturalPosition: {"x":0,"y":0.0020399854984134436,"z":0.08825899660587311}
+                    naturalPosition: {"x":0,"y":0.0020399854984134436,"z":0.08825899660587311},
+                    naturalDimensions: {x: 0.009986, y: 0.004282, z: 0.010264}
                 },
 
                 button: {
                     type: "static",
                     modelURL: BASE_URL + "meshes/controller/vive_button.fbx",
-                    naturalPosition: {"x":0,"y":0.005480996798723936,"z":0.019918499514460564}
+                    naturalPosition: {"x":0,"y":0.005480996798723936,"z":0.019918499514460564},
+                    naturalDimensions: {x: 0.009986, y: 0.004496, z: 0.010121}
                 },
                 button2: {
                     type: "static",
                     modelURL: BASE_URL + "meshes/controller/vive_button.fbx",
-                    naturalPosition: {"x":0,"y":0.005480996798723936,"z":0.019918499514460564}
+                    naturalPosition: {"x":0,"y":0.005480996798723936,"z":0.019918499514460564},
+                    naturalDimensions: {x: 0.009986, y: 0.004496, z: 0.010121}
                 }
             }
         }
diff --git a/scripts/system/dialTone.js b/scripts/system/dialTone.js
index 7b693aa2de..7c0a5b250d 100644
--- a/scripts/system/dialTone.js
+++ b/scripts/system/dialTone.js
@@ -33,10 +33,4 @@ Audio.disconnected.connect(function(){
     Audio.playSound(disconnectSound, soundOptions);
 });
 
-Audio.mutedChanged.connect(function () {
-    if (Audio.muted) {
-        Audio.playSound(micMutedSound, soundOptions);
-    }
-});
-
 }()); // END LOCAL_SCOPE
diff --git a/scripts/system/directory.js b/scripts/system/directory.js
index ac65615a68..8b9ec17f05 100644
--- a/scripts/system/directory.js
+++ b/scripts/system/directory.js
@@ -15,7 +15,7 @@ Script.include([
 
 var toolIconUrl = Script.resolvePath("assets/images/tools/");
 
-var DIRECTORY_WINDOW_URL = "https://metaverse.highfidelity.com/directory";
+var DIRECTORY_WINDOW_URL = Account.metaverseServerURL + "/directory";
 var directoryWindow = new OverlayWebWindow({
     title: 'Directory',
     source: "about:blank",
diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index a83d2159bb..15f1c2f6c1 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -1,5 +1,3 @@
-"use strict";
-
 //  edit.js
 //
 //  Created by Brad Hefta-Gaub on 10/2/14.
@@ -17,6 +15,8 @@
 
 (function() { // BEGIN LOCAL_SCOPE
 
+"use strict";
+
 var HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
 var EDIT_TOGGLE_BUTTON = "com.highfidelity.interface.system.editButton";
 var SYSTEM_TOOLBAR = "com.highfidelity.interface.toolbar.system";
@@ -26,11 +26,8 @@ Script.include([
     "libraries/stringHelpers.js",
     "libraries/dataViewHelpers.js",
     "libraries/progressDialog.js",
-
     "libraries/entitySelectionTool.js",
-
     "libraries/ToolTip.js",
-
     "libraries/entityCameraTool.js",
     "libraries/gridTool.js",
     "libraries/entityList.js",
@@ -41,19 +38,19 @@ Script.include([
 var selectionDisplay = SelectionDisplay;
 var selectionManager = SelectionManager;
 
-const PARTICLE_SYSTEM_URL = Script.resolvePath("assets/images/icon-particles.svg");
-const POINT_LIGHT_URL = Script.resolvePath("assets/images/icon-point-light.svg");
-const SPOT_LIGHT_URL = Script.resolvePath("assets/images/icon-spot-light.svg");
+var PARTICLE_SYSTEM_URL = Script.resolvePath("assets/images/icon-particles.svg");
+var POINT_LIGHT_URL = Script.resolvePath("assets/images/icon-point-light.svg");
+var SPOT_LIGHT_URL = Script.resolvePath("assets/images/icon-spot-light.svg");
 entityIconOverlayManager = new EntityIconOverlayManager(['Light', 'ParticleEffect'], function(entityID) {
     var properties = Entities.getEntityProperties(entityID, ['type', 'isSpotlight']);
     if (properties.type === 'Light') {
         return {
             url: properties.isSpotlight ? SPOT_LIGHT_URL : POINT_LIGHT_URL,
-        }
+        };
     } else {
         return {
             url: PARTICLE_SYSTEM_URL,
-        }
+        };
     }
 });
 
@@ -94,7 +91,7 @@ selectionManager.addEventListener(function () {
     }
 });
 
-const KEY_P = 80; //Key code for letter p used for Parenting hotkey.
+var KEY_P = 80; //Key code for letter p used for Parenting hotkey.
 var DEGREES_TO_RADIANS = Math.PI / 180.0;
 var RADIANS_TO_DEGREES = 180.0 / Math.PI;
 
@@ -123,6 +120,8 @@ var SETTING_EASE_ON_FOCUS = "cameraEaseOnFocus";
 var SETTING_SHOW_LIGHTS_AND_PARTICLES_IN_EDIT_MODE = "showLightsAndParticlesInEditMode";
 var SETTING_SHOW_ZONES_IN_EDIT_MODE = "showZonesInEditMode";
 
+var CREATE_ENABLED_ICON = "icons/tablet-icons/edit-i.svg";
+var CREATE_DISABLED_ICON = "icons/tablet-icons/edit-disabled.svg";
 
 // marketplace info, etc.  not quite ready yet.
 var SHOULD_SHOW_PROPERTY_MENU = false;
@@ -130,6 +129,7 @@ var INSUFFICIENT_PERMISSIONS_ERROR_MSG = "You do not have the necessary permissi
 var INSUFFICIENT_PERMISSIONS_IMPORT_ERROR_MSG = "You do not have the necessary permissions to place items on this domain.";
 
 var isActive = false;
+var createButton = null;
 
 var IMPORTING_SVO_OVERLAY_WIDTH = 144;
 var IMPORTING_SVO_OVERLAY_HEIGHT = 30;
@@ -163,7 +163,7 @@ var importingSVOTextOverlay = Overlays.addOverlay("text", {
     visible: false
 });
 
-var MARKETPLACE_URL = "https://metaverse.highfidelity.com/marketplace";
+var MARKETPLACE_URL = Account.metaverseServerURL + "/marketplace";
 var marketplaceWindow = new OverlayWebWindow({
     title: 'Marketplace',
     source: "about:blank",
@@ -228,7 +228,7 @@ var GRABBABLE_ENTITIES_MENU_CATEGORY = "Edit";
 var GRABBABLE_ENTITIES_MENU_ITEM = "Create Entities As Grabbable";
 
 var toolBar = (function () {
-    var EDIT_SETTING = "io.highfidelity.isEditting"; // for communication with other scripts
+    var EDIT_SETTING = "io.highfidelity.isEditing"; // for communication with other scripts
     var that = {},
         toolBar,
         activeButton = null,
@@ -247,9 +247,12 @@ var toolBar = (function () {
                 direction = MyAvatar.orientation;
             }
             direction = Vec3.multiplyQbyV(direction, Vec3.UNIT_Z);
-
+            // Align entity with Avatar orientation.
+            properties.rotation = MyAvatar.orientation;
+            
             var PRE_ADJUST_ENTITY_TYPES = ["Box", "Sphere", "Shape", "Text", "Web"];
             if (PRE_ADJUST_ENTITY_TYPES.indexOf(properties.type) !== -1) {
+                    
                 // Adjust position of entity per bounding box prior to creating it.
                 var registration = properties.registration;
                 if (registration === undefined) {
@@ -259,7 +262,14 @@ var toolBar = (function () {
 
                 var orientation = properties.orientation;
                 if (orientation === undefined) {
-                    var DEFAULT_ORIENTATION = Quat.fromPitchYawRollDegrees(0, 0, 0);
+                    properties.orientation = MyAvatar.orientation;
+                    var DEFAULT_ORIENTATION = properties.orientation;
+                    orientation = DEFAULT_ORIENTATION;
+                } else {
+                    // If the orientation is already defined, we perform the corresponding rotation assuming that
+                    //  our start referential is the avatar referential.
+                    properties.orientation = Quat.multiply(MyAvatar.orientation, properties.orientation);
+                    var DEFAULT_ORIENTATION = properties.orientation;
                     orientation = DEFAULT_ORIENTATION;
                 }
 
@@ -272,7 +282,8 @@ var toolBar = (function () {
                 properties.userData = JSON.stringify({ grabbableKey: { grabbable: true } });
             }
             entityID = Entities.addEntity(properties);
-            if (properties.type == "ParticleEffect") {
+
+            if (properties.type === "ParticleEffect") {
                 selectParticleEntity(entityID);
             }
 
@@ -334,6 +345,8 @@ var toolBar = (function () {
     var SHAPE_TYPE_SIMPLE_HULL = 1;
     var SHAPE_TYPE_SIMPLE_COMPOUND = 2;
     var SHAPE_TYPE_STATIC_MESH = 3;
+    var SHAPE_TYPE_BOX = 4;
+    var SHAPE_TYPE_SPHERE = 5;
     var DYNAMIC_DEFAULT = false;
 
     function handleNewModelDialogResult(result) {
@@ -350,6 +363,12 @@ var toolBar = (function () {
             case SHAPE_TYPE_STATIC_MESH:
                 shapeType = "static-mesh";
                 break;
+            case SHAPE_TYPE_BOX:
+                shapeType = "box";
+                break;
+            case SHAPE_TYPE_SPHERE:
+                shapeType = "sphere";
+                break;
             default:
                 shapeType = "none";
             }
@@ -385,7 +404,6 @@ var toolBar = (function () {
 
     function initialize() {
         Script.scriptEnding.connect(cleanup);
-
         Window.domainChanged.connect(function () {
             that.setActive(false);
             that.clearEntityList();
@@ -397,36 +415,36 @@ var toolBar = (function () {
             }
         });
 
+        var hasRezPermissions = (Entities.canRez() || Entities.canRezTmp() || Entities.canRezCertified() || Entities.canRezTmpCertified());
+        var createButtonIconRsrc = (hasRezPermissions ? CREATE_ENABLED_ICON : CREATE_DISABLED_ICON);
         tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
         activeButton = tablet.addButton({
-            icon: "icons/tablet-icons/edit-i.svg",
+            captionColorOverride: hasRezPermissions ? "" : "#888888",
+            icon: createButtonIconRsrc,
             activeIcon: "icons/tablet-icons/edit-a.svg",
             text: "CREATE",
             sortOrder: 10
         });
+        createButton = activeButton;
         tablet.screenChanged.connect(function (type, url) {
             if (isActive && (type !== "QML" || url !== "Edit.qml")) {
-                that.toggle();
+                that.setActive(false)
             }
         });
         tablet.fromQml.connect(fromQml);
 
-        activeButton.clicked.connect(function() {
+        createButton.clicked.connect(function() {
+            if ( ! (Entities.canRez() || Entities.canRezTmp() || Entities.canRezCertified() || Entities.canRezTmpCertified()) ) {
+                Window.notifyEditError(INSUFFICIENT_PERMISSIONS_ERROR_MSG);
+                return;
+            }
+
             that.toggle();
         });
 
         addButton("importEntitiesButton", "assets-01.svg", function() {
-            var importURL = null;
-            var fullPath = Window.browse("Select Model to Import", "", "*.json");
-            if (fullPath) {
-                importURL = "file:///" + fullPath;
-            }
-            if (importURL) {
-                if (!isActive && (Entities.canRez() && Entities.canRezTmp())) {
-                    toolBar.toggle();
-                }
-                importSVO(importURL);
-            }
+            Window.openFileChanged.connect(onFileOpenChanged);
+            Window.browseAsync("Select Model to Import", "", "*.json");
         });
 
         addButton("openAssetBrowserButton", "assets-01.svg", function() {
@@ -440,6 +458,8 @@ var toolBar = (function () {
             SHAPE_TYPES[SHAPE_TYPE_SIMPLE_HULL] = "Basic - Whole model";
             SHAPE_TYPES[SHAPE_TYPE_SIMPLE_COMPOUND] = "Good - Sub-meshes";
             SHAPE_TYPES[SHAPE_TYPE_STATIC_MESH] = "Exact - All polygons";
+            SHAPE_TYPES[SHAPE_TYPE_BOX] = "Box";
+            SHAPE_TYPES[SHAPE_TYPE_SPHERE] = "Sphere";
             var SHAPE_TYPE_DEFAULT = SHAPE_TYPE_STATIC_MESH;
 
             // tablet version of new-model dialog
@@ -604,6 +624,7 @@ var toolBar = (function () {
     };
 
     that.setActive = function (active) {
+        ContextOverlay.enabled = !active;
         Settings.setValue(EDIT_SETTING, active);
         if (active) {
             Controller.captureEntityClickEvents();
@@ -613,7 +634,7 @@ var toolBar = (function () {
         if (active === isActive) {
             return;
         }
-        if (active && !Entities.canRez() && !Entities.canRezTmp()) {
+        if (active && !Entities.canRez() && !Entities.canRezTmp() && !Entities.canRezCertified() && !Entities.canRezTmpCertified()) {
             Window.notifyEditError(INSUFFICIENT_PERMISSIONS_ERROR_MSG);
             return;
         }
@@ -635,15 +656,16 @@ var toolBar = (function () {
             selectionDisplay.triggerMapping.disable();
             tablet.landscape = false;
         } else {
-            tablet.loadQMLSource("Edit.qml");
+            tablet.loadQMLSource("Edit.qml", true);
             UserActivityLogger.enabledEdit();
             entityListTool.setVisible(true);
             gridTool.setVisible(true);
             grid.setEnabled(true);
             propertiesTool.setVisible(true);
             selectionDisplay.triggerMapping.enable();
-            print("starting tablet in landscape mode")
+            print("starting tablet in landscape mode");
             tablet.landscape = true;
+            entityIconOverlayManager.setIconsSelectable(null,false);
             // Not sure what the following was meant to accomplish, but it currently causes
             // everybody else to think that Interface has lost focus overall. fogbugzid:558
             // Window.setFocus();
@@ -760,8 +782,39 @@ function handleOverlaySelectionToolUpdates(channel, message, sender) {
     }
 }
 
+// Handles any edit mode updates required when domains have switched
+function handleDomainChange() {
+    if ( (createButton === null) || (createButton === undefined) ){
+        //--EARLY EXIT--( nothing to safely update )
+        return;
+    }
+
+    var hasRezPermissions = (Entities.canRez() || Entities.canRezTmp() || Entities.canRezCertified() || Entities.canRezTmpCertified());
+    createButton.editProperties({
+        icon: (hasRezPermissions ? CREATE_ENABLED_ICON : CREATE_DISABLED_ICON),
+        captionColorOverride: (hasRezPermissions ? "" : "#888888"),
+    });
+}
+
+function handleMessagesReceived(channel, message, sender) {
+    switch( channel ){
+        case 'entityToolUpdates': {
+            handleOverlaySelectionToolUpdates( channel, message, sender );
+            break;
+        }
+        case 'Toolbar-DomainChanged': {
+            handleDomainChange();
+            break;
+        }
+        default: {
+            return;
+        }
+    }
+}
+
+Messages.subscribe('Toolbar-DomainChanged');
 Messages.subscribe("entityToolUpdates");
-Messages.messageReceived.connect(handleOverlaySelectionToolUpdates);
+Messages.messageReceived.connect(handleMessagesReceived);
 
 var mouseHasMovedSincePress = false;
 var mousePressStartTime = 0;
@@ -941,6 +994,7 @@ function mouseClickEvent(event) {
                 } else {
                     selectionManager.addEntity(foundEntity, true);
                 }
+
                 if (wantDebug) {
                     print("Model selected: " + foundEntity);
                 }
@@ -1010,7 +1064,6 @@ function setupModelMenus() {
     Menu.addMenuItem({
         menuName: "Edit",
         menuItemName: "Entity List...",
-        shortcutKey: "CTRL+META+L",
         afterItem: "Entities",
         grouping: "Advanced"
     });
@@ -1041,7 +1094,6 @@ function setupModelMenus() {
     Menu.addMenuItem({
         menuName: "Edit",
         menuItemName: "Allow Selecting of Large Models",
-        shortcutKey: "CTRL+META+L",
         afterItem: GRABBABLE_ENTITIES_MENU_ITEM,
         isCheckable: true,
         isChecked: true,
@@ -1050,7 +1102,6 @@ function setupModelMenus() {
     Menu.addMenuItem({
         menuName: "Edit",
         menuItemName: "Allow Selecting of Small Models",
-        shortcutKey: "CTRL+META+S",
         afterItem: "Allow Selecting of Large Models",
         isCheckable: true,
         isChecked: true,
@@ -1059,7 +1110,6 @@ function setupModelMenus() {
     Menu.addMenuItem({
         menuName: "Edit",
         menuItemName: "Allow Selecting of Lights",
-        shortcutKey: "CTRL+SHIFT+META+L",
         afterItem: "Allow Selecting of Small Models",
         isCheckable: true,
         grouping: "Advanced"
@@ -1067,14 +1117,12 @@ function setupModelMenus() {
     Menu.addMenuItem({
         menuName: "Edit",
         menuItemName: "Select All Entities In Box",
-        shortcutKey: "CTRL+SHIFT+META+A",
         afterItem: "Allow Selecting of Lights",
         grouping: "Advanced"
     });
     Menu.addMenuItem({
         menuName: "Edit",
         menuItemName: "Select All Entities Touching Box",
-        shortcutKey: "CTRL+SHIFT+META+T",
         afterItem: "Select All Entities In Box",
         grouping: "Advanced"
     });
@@ -1082,21 +1130,18 @@ function setupModelMenus() {
     Menu.addMenuItem({
         menuName: "Edit",
         menuItemName: "Export Entities",
-        shortcutKey: "CTRL+META+E",
         afterItem: "Entities",
         grouping: "Advanced"
     });
     Menu.addMenuItem({
         menuName: "Edit",
         menuItemName: "Import Entities",
-        shortcutKey: "CTRL+META+I",
         afterItem: "Export Entities",
         grouping: "Advanced"
     });
     Menu.addMenuItem({
         menuName: "Edit",
         menuItemName: "Import Entities from URL",
-        shortcutKey: "CTRL+META+U",
         afterItem: "Import Entities",
         grouping: "Advanced"
     });
@@ -1187,8 +1232,11 @@ Script.scriptEnding.connect(function () {
     Controller.mouseMoveEvent.disconnect(mouseMoveEventBuffered);
     Controller.mouseReleaseEvent.disconnect(mouseReleaseEvent);
 
-    Messages.messageReceived.disconnect(handleOverlaySelectionToolUpdates);
+    Messages.messageReceived.disconnect(handleMessagesReceived);
     Messages.unsubscribe("entityToolUpdates");
+    // Messages.unsubscribe("Toolbar-DomainChanged"); // Do not unsubscribe because the shapes.js app also subscribes and 
+    // Messages.subscribe works script engine-wide which would mess things up if they're both run in the same engine.
+    createButton = null;
 });
 
 var lastOrientation = null;
@@ -1198,6 +1246,7 @@ var lastPosition = null;
 Script.update.connect(function (deltaTime) {
     progressDialog.move();
     selectionDisplay.checkMove();
+    selectionDisplay.checkControllerMove();
     var dOrientation = Math.abs(Quat.dot(Camera.orientation, lastOrientation) - 1);
     var dPosition = Vec3.distance(Camera.position, lastPosition);
     if (dOrientation > 0.001 || dPosition > 0.001) {
@@ -1284,7 +1333,7 @@ function sortSelectedEntities(selected) {
     return sortedEntities;
 }
 
-function recursiveDelete(entities, childrenList) {
+function recursiveDelete(entities, childrenList, deletedIDs) {
     var entitiesLength = entities.length;
     for (var i = 0; i < entitiesLength; i++) {
         var entityID = entities[i];
@@ -1297,6 +1346,7 @@ function recursiveDelete(entities, childrenList) {
             properties: initialProperties,
             children: grandchildrenList
         });
+        deletedIDs.push(entityID);
         Entities.deleteEntity(entityID);
     }
 }
@@ -1311,10 +1361,10 @@ function unparentSelectedEntities() {
         }
         selectedEntities.forEach(function (id, index) {
             var parentId = Entities.getEntityProperties(id, ["parentID"]).parentID;
-            if (parentId !== null && parentId.length > 0 && parentId !== "{00000000-0000-0000-0000-000000000000}") {
+            if (parentId !== null && parentId.length > 0 && parentId !== Uuid.NULL) {
                 parentCheck = true;
             }
-            Entities.editEntity(id, {parentID: null})
+            Entities.editEntity(id, {parentID: null});
             return true;
         });
         if (parentCheck) {
@@ -1349,7 +1399,7 @@ function parentSelectedEntities() {
                 if (parentId !== lastEntityId) {
                     parentCheck = true;
                 }
-                Entities.editEntity(id, {parentID: lastEntityId})
+                Entities.editEntity(id, {parentID: lastEntityId});
             }
         });
 
@@ -1364,6 +1414,8 @@ function parentSelectedEntities() {
 }
 function deleteSelectedEntities() {
     if (SelectionManager.hasSelection()) {
+        var deletedIDs = [];
+
         selectedParticleEntityID = null;
         particleExplorerTool.destroyWebView();
         SelectionManager.saveProperties();
@@ -1374,16 +1426,22 @@ function deleteSelectedEntities() {
             var initialProperties = SelectionManager.savedProperties[entityID];
             var children = Entities.getChildrenIDs(entityID);
             var childList = [];
-            recursiveDelete(children, childList);
+            recursiveDelete(children, childList, deletedIDs);
             savedProperties.push({
                 entityID: entityID,
                 properties: initialProperties,
                 children: childList
             });
+            deletedIDs.push(entityID);
             Entities.deleteEntity(entityID);
         }
         SelectionManager.clearSelections();
         pushCommandForSelections([], savedProperties);
+
+        entityListTool.webView.emitScriptEvent(JSON.stringify({
+            type: "deleted",
+            ids: deletedIDs
+        }));
     }
 }
 
@@ -1415,6 +1473,50 @@ function toggleSelectedEntitiesVisible() {
     }
 }
 
+function onFileSaveChanged(filename) {
+    Window.saveFileChanged.disconnect(onFileSaveChanged);
+    if (filename !== "") {
+        var success = Clipboard.exportEntities(filename, selectionManager.selections);
+        if (!success) {
+            Window.notifyEditError("Export failed.");
+        }
+    }
+}
+
+function onFileOpenChanged(filename) {
+    // disconnect the event, otherwise the requests will stack up
+    try {
+        // Not all calls to onFileOpenChanged() connect an event.
+        Window.openFileChanged.disconnect(onFileOpenChanged);
+    } catch (e) {
+        // Ignore.
+    }
+
+    var importURL = null;
+    if (filename !== "") {
+        importURL = filename;
+        if (!/^(http|https):\/\//.test(filename)) {
+            importURL = "file:///" + importURL;
+        }
+    }
+    if (importURL) {
+        if (!isActive && (Entities.canRez() && Entities.canRezTmp() && Entities.canRezCertified() && Entities.canRezTmpCertified())) {
+            toolBar.toggle();
+        }
+        importSVO(importURL);
+    }
+}
+
+function onPromptTextChanged(prompt) {
+    Window.promptTextChanged.disconnect(onPromptTextChanged);
+    if (prompt !== "") {
+        if (!isActive && (Entities.canRez() && Entities.canRezTmp() && Entities.canRezCertified() && Entities.canRezTmpCertified())) {
+            toolBar.toggle();
+        }
+        importSVO(prompt);
+    }
+}
+
 function handeMenuEvent(menuItem) {
     if (menuItem === "Allow Selecting of Small Models") {
         allowSmallModels = Menu.isOptionChecked("Allow Selecting of Small Models");
@@ -1432,30 +1534,16 @@ function handeMenuEvent(menuItem) {
         if (!selectionManager.hasSelection()) {
             Window.notifyEditError("No entities have been selected.");
         } else {
-            var filename = Window.save("Select Where to Save", "", "*.json");
-            if (filename) {
-                var success = Clipboard.exportEntities(filename, selectionManager.selections);
-                if (!success) {
-                    Window.notifyEditError("Export failed.");
-                }
-            }
+            Window.saveFileChanged.connect(onFileSaveChanged);
+            Window.saveAsync("Select Where to Save", "", "*.json");
         }
     } else if (menuItem === "Import Entities" || menuItem === "Import Entities from URL") {
-        var importURL = null;
         if (menuItem === "Import Entities") {
-            var fullPath = Window.browse("Select Model to Import", "", "*.json");
-            if (fullPath) {
-                importURL = "file:///" + fullPath;
-            }
+            Window.openFileChanged.connect(onFileOpenChanged);
+            Window.browseAsync("Select Model to Import", "", "*.json");
         } else {
-            importURL = Window.prompt("URL of SVO to import", "");
-        }
-
-        if (importURL) {
-            if (!isActive && (Entities.canRez() && Entities.canRezTmp())) {
-                toolBar.toggle();
-            }
-            importSVO(importURL);
+            Window.promptTextChanged.connect(onPromptTextChanged);
+            Window.promptAsync("URL of SVO to import", "");
         }
     } else if (menuItem === "Entity List...") {
         entityListTool.toggleVisible();
@@ -1491,7 +1579,8 @@ function getPositionToCreateEntity(extra) {
 }
 
 function importSVO(importURL) {
-    if (!Entities.canRez() && !Entities.canRezTmp()) {
+    if (!Entities.canRez() && !Entities.canRezTmp() &&
+        !Entities.canRezCertified() && !Entities.canRezTmpCertified()) {
         Window.notifyEditError(INSUFFICIENT_PERMISSIONS_IMPORT_ERROR_MSG);
         return;
     }
@@ -1522,9 +1611,9 @@ function importSVO(importURL) {
                 var entityPositions = [];
                 var entityParentIDs = [];
 
-                var properties = Entities.getEntityProperties(pastedEntityIDs[0], ["type"]);
+                var propType = Entities.getEntityProperties(pastedEntityIDs[0], ["type"]).type;
                 var NO_ADJUST_ENTITY_TYPES = ["Zone", "Light", "ParticleEffect"];
-                if (NO_ADJUST_ENTITY_TYPES.indexOf(properties.type) === -1) {
+                if (NO_ADJUST_ENTITY_TYPES.indexOf(propType) === -1) {
                     var targetDirection;
                     if (Camera.mode === "entity" || Camera.mode === "independent") {
                         targetDirection = Camera.orientation;
@@ -1537,36 +1626,36 @@ function importSVO(importURL) {
                     var deltaParallel = HALF_TREE_SCALE;  // Distance to move entities parallel to targetDirection.
                     var deltaPerpendicular = Vec3.ZERO;  // Distance to move entities perpendicular to targetDirection.
                     for (var i = 0, length = pastedEntityIDs.length; i < length; i++) {
-                        var properties = Entities.getEntityProperties(pastedEntityIDs[i], ["position", "dimensions",
+                        var curLoopEntityProps = Entities.getEntityProperties(pastedEntityIDs[i], ["position", "dimensions",
                             "registrationPoint", "rotation", "parentID"]);
                         var adjustedPosition = adjustPositionPerBoundingBox(targetPosition, targetDirection,
-                            properties.registrationPoint, properties.dimensions, properties.rotation);
-                        var delta = Vec3.subtract(adjustedPosition, properties.position);
+                            curLoopEntityProps.registrationPoint, curLoopEntityProps.dimensions, curLoopEntityProps.rotation);
+                        var delta = Vec3.subtract(adjustedPosition, curLoopEntityProps.position);
                         var distance = Vec3.dot(delta, targetDirection);
                         deltaParallel = Math.min(distance, deltaParallel);
                         deltaPerpendicular = Vec3.sum(Vec3.subtract(delta, Vec3.multiply(distance, targetDirection)),
                             deltaPerpendicular);
-                        entityPositions[i] = properties.position;
-                        entityParentIDs[i] = properties.parentID;
+                        entityPositions[i] = curLoopEntityProps.position;
+                        entityParentIDs[i] = curLoopEntityProps.parentID;
                     }
                     deltaPerpendicular = Vec3.multiply(1 / pastedEntityIDs.length, deltaPerpendicular);
                     deltaPosition = Vec3.sum(Vec3.multiply(deltaParallel, targetDirection), deltaPerpendicular);
                 }
 
                 if (grid.getSnapToGrid()) {
-                    var properties = Entities.getEntityProperties(pastedEntityIDs[0], ["position", "dimensions",
+                    var firstEntityProps = Entities.getEntityProperties(pastedEntityIDs[0], ["position", "dimensions",
                         "registrationPoint"]);
-                    var position = Vec3.sum(deltaPosition, properties.position);
-                    position = grid.snapToSurface(grid.snapToGrid(position, false, properties.dimensions,
-                            properties.registrationPoint), properties.dimensions, properties.registrationPoint);
-                    deltaPosition = Vec3.subtract(position, properties.position);
+                    var positionPreSnap = Vec3.sum(deltaPosition, firstEntityProps.position);
+                    position = grid.snapToSurface(grid.snapToGrid(positionPreSnap, false, firstEntityProps.dimensions,
+                            firstEntityProps.registrationPoint), firstEntityProps.dimensions, firstEntityProps.registrationPoint);
+                    deltaPosition = Vec3.subtract(position, firstEntityProps.position);
                 }
 
                 if (!Vec3.equal(deltaPosition, Vec3.ZERO)) {
-                    for (var i = 0, length = pastedEntityIDs.length; i < length; i++) {
-                        if (Uuid.isNull(entityParentIDs[i])) {
-                            Entities.editEntity(pastedEntityIDs[i], {
-                                position: Vec3.sum(deltaPosition, entityPositions[i])
+                    for (var editEntityIndex = 0, numEntities = pastedEntityIDs.length; editEntityIndex < numEntities; editEntityIndex++) {
+                        if (Uuid.isNull(entityParentIDs[editEntityIndex])) {
+                            Entities.editEntity(pastedEntityIDs[editEntityIndex], {
+                                position: Vec3.sum(deltaPosition, entityPositions[editEntityIndex])
                             });
                         }
                     }
@@ -2151,6 +2240,7 @@ var PopupMenu = function () {
     };
 
     function cleanup() {
+        ContextOverlay.enabled = true;
         for (var i = 0; i < overlays.length; i++) {
             Overlays.deleteOverlay(overlays[i]);
         }
@@ -2184,10 +2274,9 @@ var particleExplorerTool = new ParticleExplorerTool();
 var selectedParticleEntity = 0;
 var selectedParticleEntityID = null;
 
-
 function selectParticleEntity(entityID) {
     var properties = Entities.getEntityProperties(entityID);
-
+    selectedParticleEntityID = entityID;
     if (properties.emitOrientation) {
         properties.emitOrientation = Quat.safeEulerAngles(properties.emitOrientation);
     }
@@ -2212,7 +2301,7 @@ entityListTool.webView.webEventReceived.connect(function (data) {
     try {
         data = JSON.parse(data);
     } catch(e) {
-        print("edit.js: Error parsing JSON: " + e.name + " data " + data)
+        print("edit.js: Error parsing JSON: " + e.name + " data " + data);
         return;
     }
 
@@ -2229,7 +2318,6 @@ entityListTool.webView.webEventReceived.connect(function (data) {
                     return;
                 }
                 // Destroy the old particles web view first
-                selectParticleEntity(ids[0]);
             } else {
                 selectedParticleEntity = 0;
                 particleExplorerTool.destroyWebView();
diff --git a/scripts/system/help.js b/scripts/system/help.js
index 1265a5597b..9ab7fa3fb3 100644
--- a/scripts/system/help.js
+++ b/scripts/system/help.js
@@ -61,6 +61,7 @@
             tablet.gotoHomeScreen();
         }
         button.clicked.disconnect(onClicked);
+        tablet.screenChanged.disconnect(onScreenChanged);
         Script.clearInterval(interval);
         if (tablet) {
             tablet.removeButton(button);
diff --git a/scripts/system/hmd.js b/scripts/system/hmd.js
index c545e6bcee..b9fd7f725c 100644
--- a/scripts/system/hmd.js
+++ b/scripts/system/hmd.js
@@ -40,21 +40,23 @@ function updateControllerDisplay() {
 var button;
 var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
 
-// Independent and Entity mode make people sick. Third Person and Mirror have traps that we need to work through.
-// Disable them in hmd.
-var desktopOnlyViews = ['Mirror', 'Independent Mode', 'Entity Mode'];
+// Independent and Entity mode make people sick; disable them in hmd.
+var desktopOnlyViews = ['Independent Mode', 'Entity Mode'];
+
+var switchToVR = "ENTER VR";
+var switchToDesktop = "EXIT VR";
 
 function onHmdChanged(isHmd) {
     HMD.closeTablet();
     if (isHmd) {
         button.editProperties({
             icon: "icons/tablet-icons/switch-desk-i.svg",
-            text: "DESKTOP"
+            text: switchToDesktop
         });
     } else {
         button.editProperties({
             icon: "icons/tablet-icons/switch-vr-i.svg",
-            text: "VR"
+            text: switchToVR
         });
     }
     desktopOnlyViews.forEach(function (view) {
@@ -66,12 +68,15 @@ function onHmdChanged(isHmd) {
 function onClicked() {
     var isDesktop = Menu.isOptionChecked(desktopMenuItemName);
     Menu.setIsOptionChecked(isDesktop ? headset : desktopMenuItemName, true);
+    if (!isDesktop) {
+        UserActivityLogger.logAction("exit_vr");
+    }
 }
 
 if (headset) {
     button = tablet.addButton({
         icon: HMD.active ? "icons/tablet-icons/switch-desk-i.svg" : "icons/tablet-icons/switch-vr-i.svg",
-        text: HMD.active ? "DESKTOP" : "VR",
+        text: HMD.active ? switchToDesktop : switchToVR,
         sortOrder: 2
     });
     onHmdChanged(HMD.active);
diff --git a/scripts/system/html/ChatPage.html b/scripts/system/html/ChatPage.html
index e1a3776dd5..9606eeab3e 100644
--- a/scripts/system/html/ChatPage.html
+++ b/scripts/system/html/ChatPage.html
@@ -195,7 +195,7 @@
             <div class="ChatLog" id="ChatLog"></div>
 
             <div class="ChatInput">
-              <input type="text" class="ChatInputText" id="ChatInputText" size="256"/>
+              <input type="text" class="ChatInputText" id="ChatInputText" size="256" maxlength="256" />
             </div>
 
         </div>
diff --git a/scripts/system/html/css/edit-style.css b/scripts/system/html/css/edit-style.css
index 40f3d682cd..6aacaa5333 100644
--- a/scripts/system/html/css/edit-style.css
+++ b/scripts/system/html/css/edit-style.css
@@ -267,18 +267,17 @@ input[type=number] {
     padding-right: 3px;
 }
 input[type=number]::-webkit-inner-spin-button {
-    -webkit-appearance: none;
     opacity: 1.0;
     display: block;
     position: relative;
     width: 10px;
-    height: 100%;
+    height: 90%;
     overflow: hidden;
     font-family: hifi-glyphs;
-    font-size: 46px;
+    font-size: 32px;
     color: #afafaf;
     cursor: pointer;
-    /*background-color: #000000;*/
+    background-color: #000000;
 }
 input[type=number]::-webkit-inner-spin-button:before,
 input[type=number]::-webkit-inner-spin-button:after {
@@ -449,8 +448,68 @@ input[type=checkbox]:checked + label:hover {
     border: 1.5pt solid black;
 }
 
+.shape-section, .light-section, .model-section, .web-section, .hyperlink-section, .text-section, .zone-section {
+    display: table;
+}
 
-.section-header, .sub-section-header, hr {
+
+
+#properties-list fieldset {
+    position: relative;
+    /* 0.1px on the top is to prevent margin collapsing between this and it's first child */
+    margin: 21px -21px 0px -21px;
+    padding: 0.1px 21px 0px 21px;
+    border: none;
+    border-top: 1px rgb(90,90,90) solid;
+    box-shadow: 0px -1px 0px rgb(37,37,37);
+}
+
+#properties-list fieldset.fstuple, #properties-list fieldset.fsrow {
+    margin-top: 21px;
+    border: none;
+    box-shadow: none;
+}
+
+#properties-list > fieldset[data-collapsed="true"] + fieldset {
+    margin-top: 0px;
+}
+
+#properties-list > fieldset[data-collapsed="true"] > *:not(legend) {
+     display: none !important;
+}
+
+#properties-list legend + fieldset {
+    margin-top: 0px;
+    border: none;
+    box-shadow: none;
+}
+
+#properties-list > fieldset#properties-header {
+    margin-top: 0px;
+    padding-bottom: 0px;
+}
+
+
+
+#properties-list > fieldset > legend {
+    position: relative;
+    display: table;
+    width: 100%;
+    margin: 21px -21px 0 -21px;
+    padding: 14px 21px 0 21px;
+    font-family: Raleway-Regular;
+    font-size: 12px;
+    color: #afafaf;
+    height: 28px;
+    text-transform: uppercase;
+    outline: none;
+    background-color: #404040;
+    border: none;
+    border-top: 1px rgb(90,90,90) solid;
+    box-shadow: 0 -1px 0 rgb(37,37,37), 0 4px 4px 0 rgba(0,0,0,0.75);
+}
+
+div.section-header, .sub-section-header, hr {
     display: table;
     width: 100%;
     margin: 21px -21px 0 -21px;
@@ -463,16 +522,18 @@ input[type=checkbox]:checked + label:hover {
     outline: none;
 }
 
-.section-header {
-    position: relative;
-    background: #404040 url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAqCAIAAAAbNW1vAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAmSURBVChTY1BFAgzhSIDBAQmMcoYHRwIJMCgjAQZ9JMBgBQdWVgBh5XmBV5A2FQAAAABJRU5ErkJggg==) repeat-x top left;
+
+
+.column .sub-section-header {
+    background-image: none;
+    padding-top: 0;
 }
 
 .sub-section-header, .no-collapse, hr {
     background: #404040 url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAYAAACp8Z5+AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAAjSURBVBhXY1RVVf3PgARYjIyMoEwIYHRwcEBRwQSloYCBAQCwjgPMiI7W2QAAAABJRU5ErkJggg==) repeat-x top left;
 }
 
-.section-header:first-child {
+div.section-header:first-child {
     margin-top: -2px;
     padding-top: 0;
     background: none;
@@ -483,7 +544,7 @@ input[type=checkbox]:checked + label:hover {
     margin-bottom: -10px;
 }
 
-.section-header span {
+#properties-list > fieldset > legend span, .section-header span {
     font-family: HiFi-Glyphs;
     font-size: 30px;
     float: right;
@@ -537,6 +598,18 @@ hr {
     font-size: 13px;
 }
 
+.property legend, .number legend {
+    display: table-cell;
+    vertical-align: middle;
+    font-family: Raleway-SemiBold;
+    font-size: 14px;
+}
+.property legend .unit, .number legend .unit {
+    margin-left: 8px;
+    font-family: Raleway-Light;
+    font-size: 13px;
+}
+
 .value {
     display: block;
     min-height: 18px;
@@ -546,6 +619,11 @@ hr {
     vertical-align: top;
     width: 48px;
 }
+.value legend {
+    display: inline-block;
+    vertical-align: top;
+    width: 48px;
+}
 .value span {
     font-family: FiraSans-SemiBold;
     font-size: 15px;
@@ -573,6 +651,13 @@ hr {
     margin-top: -2px;
 }
 
+.text legend, .url legend, .number legend, .textarea legend, .rgb legend, .xyz legend, .pyr legend, .dropdown legend, .gen legend {
+    float: left;
+    margin-left: 1px;
+    margin-bottom: 3px;
+    margin-top: -2px;
+}
+
 .number > input {
     clear: both;
     float: left;
@@ -715,6 +800,14 @@ div.refresh input[type="button"] {
     display: none !important;
 }
 
+#property-color-control1 {
+    display: table-cell;
+    float: none;
+}
+
+#property-color-control1 + label  {
+    border-left: 20px transparent solid;
+}
 
 .rgb label {
     float: left;
@@ -725,6 +818,15 @@ div.refresh input[type="button"] {
     clear: both;
 }
 
+.rgb legend {
+    float: left;
+    margin-top: 10px;
+    margin-left: 21px;
+}
+.rgb legend + * {
+    clear: both;
+}
+
 .tuple div {
     display: inline-block;
     position: relative;
@@ -814,6 +916,42 @@ tuple, .blue:focus, .tuple .z:focus, .tuple .roll:focus {
     display: table-cell;
     width: 50%;
 }
+
+#properties-list fieldset .two-column {
+    padding-top:21px;
+    display: flex;
+}
+
+#properties-list .two-column  fieldset {
+    /*display: table-cell;*/
+    width: 50%;
+    margin: 0;
+    padding: 0;
+    border-top: none;
+    box-shadow: none;
+}
+
+#properties-list .two-column  fieldset legend {
+    display: table;
+    width: 100%;
+    margin: 21px -21px 0px -21px;
+    padding: 0px 0px 0px 21px;
+    font-family: Raleway-Regular;
+    font-size: 12px;
+    color: #afafaf;
+    height: 28px;
+    text-transform: uppercase;
+    outline: none;
+}
+
+fieldset .checkbox-sub-props {
+     margin-top: 0;
+ }
+
+fieldset .checkbox-sub-props .property:first-child {
+    margin-top: 0;
+}
+
 .column {
     vertical-align: top;
 }
@@ -1155,9 +1293,11 @@ th#entity-hasScript {
 }
 
 
-#properties-header {
+#properties-list #properties-header {
     display: table-row;
     height: 28px;
+    border-top: none;
+    box-shadow: none;
 }
 
 #properties-header .property {
@@ -1262,3 +1402,260 @@ input#reset-to-natural-dimensions {
     font-size:16px;
     display:none;
 }
+
+#properties-list #collision-info > fieldset:first-of-type {
+    border-top: none !important;
+    box-shadow: none;
+    margin-top: 0;
+}
+
+#properties-list {
+    display: flex;
+    flex-direction: column;
+}
+
+/* -----   Order of Menu items for Primitive   ----- */
+#properties-list.ShapeMenu #general,
+#properties-list.BoxMenu #general,
+#properties-list.SphereMenu #general {
+    order: 1;
+}
+
+#properties-list.ShapeMenu #collision-info,
+#properties-list.BoxMenu #collision-info,
+#properties-list.SphereMenu #collision-info {
+    order: 2;
+}
+
+#properties-list.ShapeMenu #physical,
+#properties-list.BoxMenu #physical,
+#properties-list.SphereMenu #physical {
+    order: 3;
+}
+
+#properties-list.ShapeMenu #spatial,
+#properties-list.BoxMenu #spatial,
+#properties-list.SphereMenu #spatial {
+    order: 4;
+}
+
+#properties-list.ShapeMenu #behavior,
+#properties-list.BoxMenu #behavior,
+#properties-list.SphereMenu #behavior {
+    order: 5;
+}
+
+#properties-list.ShapeMenu #hyperlink,
+#properties-list.BoxMenu #hyperlink,
+#properties-list.SphereMenu #hyperlink {
+    order: 6;
+}
+
+#properties-list.ShapeMenu #light,
+#properties-list.BoxMenu #light,
+#properties-list.SphereMenu #light,
+#properties-list.ShapeMenu #model,
+#properties-list.BoxMenu #model,
+#properties-list.SphereMenu #model,
+#properties-list.ShapeMenu #zone,
+#properties-list.BoxMenu #zone,
+#properties-list.SphereMenu #zone,
+#properties-list.ShapeMenu #text,
+#properties-list.BoxMenu #text,
+#properties-list.SphereMenu #text,
+#properties-list.ShapeMenu #web,
+#properties-list.BoxMenu #web,
+#properties-list.SphereMenu #web {
+    display: none;
+}
+
+
+/* -----   Order of Menu items for Light   ----- */
+#properties-list.LightMenu #general {
+    order: 1;
+}
+#properties-list.LightMenu #light {
+    order: 2;
+}
+#properties-list.LightMenu #physical {
+    order: 3;
+}
+#properties-list.LightMenu #spatial {
+    order: 4;
+}
+#properties-list.LightMenu #behavior {
+    order: 5;
+}
+#properties-list.LightMenu #collision-info {
+    order: 6;
+}
+#properties-list.LightMenu #hyperlink {
+    order: 7;
+}
+/* sections to hide    */
+#properties-list.LightMenu #model,
+#properties-list.LightMenu #zone,
+#properties-list.LightMenu #text,
+#properties-list.LightMenu #web {
+    display: none;
+}
+/* items to hide */
+#properties-list.LightMenu .shape-group.shape-section.property.dropdown,
+#properties-list.LightMenu color-section.color-control1 {
+    display: none
+}
+
+
+/* -----   Order of Menu items for Model   ----- */
+#properties-list.ModelMenu #general {
+    order: 1;
+}
+#properties-list.ModelMenu #model {
+    order: 2;
+}
+#properties-list.ModelMenu #collision-info {
+    order: 3;
+}
+#properties-list.ModelMenu #physical {
+    order: 4;
+}
+#properties-list.ModelMenu #spatial {
+    order: 5;
+}
+#properties-list.ModelMenu #behavior {
+    order: 6;
+}
+#properties-list.ModelMenu #hyperlink {
+    order: 7;
+}
+/* sections to hide    */
+#properties-list.ModelMenu #light,
+#properties-list.ModelMenu #zone,
+#properties-list.ModelMenu #text,
+#properties-list.ModelMenu #web {
+    display: none;
+}
+/* items to hide */
+#properties-list.ModelMenu .shape-group.shape-section.property.dropdown,
+#properties-list.ModelMenu .color-section.color-control1 {
+    display: none
+}
+
+
+/* -----   Order of Menu items for Zone   ----- */
+#properties-list.ZoneMenu #general {
+    order: 1;
+}
+#properties-list.ZoneMenu #zone {
+    order: 2;
+}
+#properties-list.ZoneMenu #physical {
+    order: 3;
+}
+#properties-list.ZoneMenu #spatial {
+    order: 4;
+}
+#properties-list.ZoneMenu #behavior {
+    order: 5;
+}
+#properties-list.ZoneMenu #collision-info {
+    order: 6;
+}
+#properties-list.ZoneMenu #hyperlink {
+    order: 7;
+}
+/* sections to hide    */
+#properties-list.ZoneMenu #light,
+#properties-list.ZoneMenu #model,
+#properties-list.ZoneMenu #text,
+#properties-list.ZoneMenu #web {
+    display: none;
+}
+/* items to hide */
+#properties-list.ZoneMenu .shape-group.shape-section.property.dropdown,
+#properties-list.ZoneMenu .color-section.color-control1 {
+    display: none
+}
+
+
+/* -----   Order of Menu items for Web   ----- */
+#properties-list.WebMenu #general {
+    order: 1;
+}
+#properties-list.WebMenu #web {
+    order: 2;
+}
+#properties-list.WebMenu #collision-info {
+    order: 3;
+}
+#properties-list.WebMenu #physical {
+    order: 4;
+}
+#properties-list.WebMenu #spatial {
+    order: 5;
+}
+#properties-list.WebMenu #behavior {
+    order: 6;
+}
+#properties-list.WebMenu #hyperlink {
+    order: 7;
+}
+/* sections to hide    */
+#properties-list.WebMenu #light,
+#properties-list.WebMenu #model,
+#properties-list.WebMenu #zone,
+#properties-list.WebMenu #text {
+    display: none;
+}
+/* items to hide */
+#properties-list.WebMenu .shape-group.shape-section.property.dropdown,
+#properties-list.WebMenu .color-section.color-control1 {
+    display: none;
+}
+
+
+
+/* -----   Order of Menu items for Text   ----- */
+#properties-list.TextMenu #general {
+    order: 1;
+}
+#properties-list.TextMenu #text {
+    order: 2;
+}
+#properties-list.TextMenu #collision-info {
+    order: 3;
+}
+#properties-list.TextMenu #physical {
+    order: 4;
+}
+#properties-list.TextMenu #spatial {
+    order: 5;
+}
+#properties-list.TextMenu #behavior {
+    order: 6;
+}
+#properties-list.TextMenu #hyperlink {
+    order: 7;
+}
+/* sections to hide    */
+#properties-list.TextMenu #light,
+#properties-list.TextMenu #model,
+#properties-list.TextMenu #zone,
+#properties-list.TextMenu #web {
+    display: none;
+}
+/* items to hide */
+#properties-list.TextMenu .shape-group.shape-section.property.dropdown,
+#properties-list.TextMenu .color-section.color-control1 {
+    display: none
+}
+
+
+/* Currently always hidden */
+#properties-list #polyvox {
+    display: none;
+}
+
+.skybox-section {
+    display: none;
+}
\ No newline at end of file
diff --git a/scripts/system/html/entityProperties.html b/scripts/system/html/entityProperties.html
index bf65bdad32..8b2a088d83 100644
--- a/scripts/system/html/entityProperties.html
+++ b/scripts/system/html/entityProperties.html
@@ -1,4 +1,4 @@
-<!--
+<!--
 //  entityProperties.html
 //
 //  Created by Ryan Huffman on 13 Nov 2014
@@ -8,130 +8,272 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 -->
 <html>
-    <head>
-        <title>Properties</title>
-        <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-        <link rel="stylesheet" type="text/css" href="css/edit-style.css">
-        <link rel="stylesheet" type="text/css" href="css/colpick.css">
-        <link href="css/jsoneditor.css" rel="stylesheet" type="text/css">
-        <script src="js/jquery-2.1.4.min.js"></script>
-        <script src="js/colpick.js"></script>
-        <script type="text/javascript" src="qrc:///qtwebchannel/qwebchannel.js"></script>
-        <script type="text/javascript" src="js/eventBridgeLoader.js"></script>
-        <script type="text/javascript" src="js/spinButtons.js"></script>
-        <script type="text/javascript" src="js/keyboardControl.js"></script>
-        <script type="text/javascript" src="js/entityProperties.js"></script>
-        <script src="js/jsoneditor.min.js"></script>
-    </head>
-    <body onload='loaded();'>
-        <div id="properties-list">
-            <div id="properties-header">
-                <div id="type" class="property value">
-                    <span id="type-icon"></span><label id="property-type"><i>No selection</i></label>
-                </div>
-                <div class="property checkbox">
-                    <input type="checkbox" id="property-locked">
-                    <label for="property-locked"><span>&#xe006;</span>&nbsp;Locked</label>
-                </div>
-                <div class="property checkbox">
-                    <input type="checkbox" id="property-visible">
-                    <label for="property-visible"><span>&#xe007;</span>&nbsp;Visible</label>
-                </div>
+
+<head>
+    <title>Properties</title>
+    <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
+    <link rel="stylesheet" type="text/css" href="css/edit-style.css">
+    <link rel="stylesheet" type="text/css" href="css/colpick.css">
+    <link href="css/jsoneditor.css" rel="stylesheet" type="text/css">
+    <script src="js/jquery-2.1.4.min.js"></script>
+    <script src="js/colpick.js"></script>
+    <script type="text/javascript" src="qrc:///qtwebchannel/qwebchannel.js"></script>
+    <script type="text/javascript" src="js/eventBridgeLoader.js"></script>
+    <script type="text/javascript" src="js/spinButtons.js"></script>
+    <script type="text/javascript" src="js/keyboardControl.js"></script>
+    <script type="text/javascript" src="js/entityProperties.js"></script>
+    <script src="js/jsoneditor.min.js"></script>
+</head>
+
+<body onload='loaded();'>
+    <div id="properties-list">
+
+        <fieldset id="properties-header">
+            <div id="type" class="property value">
+                <span id="type-icon"></span><label id="property-type"><i>No selection</i></label>
             </div>
-            <hr />
+            <div class="property checkbox">
+                <input type="checkbox" id="property-locked">
+                <label for="property-locked"><span>&#xe006;</span>&nbsp;Locked</label>
+            </div>
+            <div class="property checkbox">
+                <input type="checkbox" id="property-visible">
+                <label for="property-visible"><span>&#xe007;</span>&nbsp;Visible</label>
+            </div>
+        </fieldset>
+
+
+        <fieldset id="general" class="major">
             <div class="shape-group shape-section property dropdown">
                 <label for="property-shape">Shape</label>
                 <select name="SelectShape" id="property-shape">
-                    <option value="Cube">Box</option>
-                    <option value="Sphere">Sphere</option>
-                    <option value="Tetrahedron">Tetrahedron</option>
-                    <option value="Octahedron">Octahedron</option>
-                    <option value="Icosahedron">Icosahedron</option>
-                    <option value="Dodecahedron">Dodecahedron</option>
-                    <option value="Hexagon">Hexagon</option>
-                    <option value="Triangle">Triangle</option>
-                    <option value="Octagon">Octagon</option>
-                    <option value="Cylinder">Cylinder</option>
-                    <option value="Cone">Cone</option>
-                    <option value="Circle">Circle</option>
-                </select>
+                        <option value="Cube">Box</option>
+                        <option value="Sphere">Sphere</option>
+                        <option value="Tetrahedron">Tetrahedron</option>
+                        <option value="Octahedron">Octahedron</option>
+                        <option value="Icosahedron">Icosahedron</option>
+                        <option value="Dodecahedron">Dodecahedron</option>
+                        <option value="Hexagon">Hexagon</option>
+                        <option value="Triangle">Triangle</option>
+                        <option value="Octagon">Octagon</option>
+                        <option value="Cylinder">Cylinder</option>
+                        <option value="Cone">Cone</option>
+                        <option value="Circle">Circle</option>
+                        <option value="Quad">Quad</option>
+                    </select>
             </div>
             <div class="property text">
                 <label for="property-name">Name</label>
                 <input type="text" id="property-name">
             </div>
-            <div class="property text">
-                <label for="property-description">Description</label>
-                <input type="text" id="property-description">
+            <div class="physical-group color-section property color-control1">
+                <div class="color-picker" id="property-color-control1"></div>
+                <label>Entity color</label>
             </div>
-
-            <div class="property textarea">
-                <label for="property-user-data">User data</label>
-                <br>
-                <div class="row">
-                    <input type="button" class="red" id="userdata-clear" value="Clear User Data">
-                    <input type="button" class="blue" id="userdata-new-editor" value="Edit as JSON">
-                    <input disabled type="button" class="black" id="userdata-save" value="Save User Data">
-                    <span id="userdata-saved">Saved!</span>
+        </fieldset>
+        <fieldset id="collision-info">
+            <fieldset class="minor">
+                <div class="behavior-group property checkbox">
+                    <input type="checkbox" id="property-collisionless">
+                    <label for="property-collisionless">Collisionless</label>
                 </div>
-                <div id="static-userdata"></div>
-                <div id="userdata-editor"></div>
-                <textarea id="property-user-data"></textarea>
-            </div>
-            <div id="id" class="property value">
-                <label>ID:</label>
-                <input type="text" id="property-id" readonly>
-            </div>
-            <div class="section-header hyperlink-group hyperlink-section">
-                <label>Hyperlink</label><span>M</span>
-            </div>
-            <div class="hyperlink-group hyperlink-section property url">
-                <label for="property-hyperlink-href">Href - hifi://address</label>
-                <input type="text" id="property-hyperlink-href">
-            </div>
-            <div class="section-header spatial-group">
-                <label>Spatial</label><span>M</span>
-            </div>
-            <div class="spatial-group property xyz">
-                <label>Position <span class="unit">m</span></label>
+                <div class="behavior-group property checkbox">
+                    <input type="checkbox" id="property-dynamic">
+                    <label for="property-dynamic">Dynamic</label>
+                </div>
+            </fieldset>
+            <fieldset class="minor">
+                <div class="behavior-group two-column">
+                    <fieldset class="column">
+                        <legend class="sub-section-header">
+                            Collides With
+                        </legend>
+                        <div class="checkbox-sub-props">
+                            <div class="property checkbox">
+                                <input type="checkbox" id="property-collide-static">
+                                <label for="property-collide-static">Static entities</label>
+                            </div>
+                            <div class="property checkbox">
+                                <input type="checkbox" id="property-collide-dynamic">
+                                <label for="property-collide-dynamic">Dynamic entities</label>
+                            </div>
+                            <div class="property checkbox">
+                                <input type="checkbox" id="property-collide-kinematic">
+                                <label for="property-collide-kinematic">Kinematic entities</label>
+                            </div>
+                            <div class="property checkbox">
+                                <input type="checkbox" id="property-collide-myAvatar">
+                                <label for="property-collide-myAvatar">My avatar</label>
+                            </div>
+                            <div class="property checkbox">
+                                <input type="checkbox" id="property-collide-otherAvatar">
+                                <label for="property-collide-otherAvatar">Other avatars</label>
+                            </div>
+                        </div>
+                    </fieldset>
+                    <fieldset class="column">
+                        <legend class="sub-section-header">
+                            Grabbing
+                        </legend>
+                        <div class="checkbox-sub-props">
+                            <div class="property checkbox">
+                                <input type="checkbox" id="property-grabbable">
+                                <label for="property-grabbable">Grabbable</label>
+                            </div>
+                            <div class="property checkbox">
+                                <input type="checkbox" id="property-wants-trigger">
+                                <label for="property-wants-trigger">Triggerable</label>
+                            </div>
+                            <div class="property checkbox">
+                                <input type="checkbox" id="property-cloneable">
+                                <label for="property-cloneable">Cloneable</label>
+                            </div>
+                            <div class="property checkbox">
+                                <input type="checkbox" id="property-ignore-ik">
+                                <label for="property-ignore-ik">Ignore inverse kinematics</label>
+                            </div>
+                        </div>
+                    </fieldset>
+
+                    <fieldset class="column" id="group-cloneable-group" style="display:none;">
+                        <legend class="sub-section-header">
+                            <span>Cloneable Settings</span>
+                        </legend>
+                        <fieldset class="minor">
+                            <div><label>Clone Lifetime</label><input type="number" data-user-data-type="cloneLifetime" id="property-cloneable-lifetime"></div>
+                        </fieldset>
+                        <fieldset class="minor">
+                            <div><label>Clone Limit</label><input type="number" data-user-data-type="cloneLimit" id="property-cloneable-limit"></div>
+                        </fieldset>
+                        <div class="property checkbox">
+                            <input type="checkbox" id="property-cloneable-dynamic">
+                            <label for="property-cloneable-dynamic">Clone Dynamic</label>
+                        </div>
+                        <div class="property checkbox">
+                            <input type="checkbox" id="property-cloneable-avatarEntity">
+                            <label for="property-cloneable-avatarEntity">Clone Avatar Entity</label>
+                        </div>
+                    </fieldset>
+                </div>
+            </fieldset>
+        </fieldset>
+
+
+        <fieldset id="physical" class="major">
+            <legend class="section-header physical-group">
+                Physical<span>M</span>
+            </legend>
+            <fieldset class="minor">
+                <fieldset class="physical-group property xyz fstuple">
+                    <legend>Linear velocity <span class="unit">m/s</span></legend>
+                    <div class="tuple">
+                        <div><input type="number" class="x" id="property-lvel-x"><label for="property-lvel-x">X:</label></div>
+                        <div><input type="number" class="y" id="property-lvel-y"><label for="property-lvel-y">Y:</label></div>
+                        <div><input type="number" class="z" id="property-lvel-z"><label for="property-lvel-z">Z:</label></div>
+                    </div>
+                </fieldset>
+                <div class="physical-group property number">
+                    <label>Linear damping</label>
+                    <input type="number" id="property-ldamping">
+                </div>
+            </fieldset>
+            <fieldset class="minor">
+                <fieldset class="physical-group property pyr fstuple">
+                    <legend>Angular velocity <span class="unit">deg/s</span></legend>
+                    <div class="tuple">
+                        <div><input type="number" class="pitch" id="property-avel-x"><label for="property-avel-x">Pitch:</label></div>
+                        <div><input type="number" class="yaw" id="property-avel-y"><label for="property-avel-y">Yaw:</label></div>
+                        <div><input type="number" class="roll" id="property-avel-z"><label for="property-avel-z">Roll:</label></div>
+                    </div>
+                </fieldset>
+                <div class="physical-group property number">
+                    <label>Angular damping</label>
+                    <input type="number" id="property-adamping">
+                </div>
+            </fieldset>
+            <fieldset class="physical-group property gen fstuple">
+                <div class="tuple">
+                    <div><label>Restitution</label><input type="number" id="property-restitution"></div>
+                    <div><label>Friction</label><input type="number" id="property-friction"></div>
+                    <div><label>Density</label><input type="number" id="property-density"></div>
+                </div>
+            </fieldset>
+            <fieldset class="minor">
+                <fieldset class="physical-group property xyz fstuple">
+                    <legend>Gravity <span class="unit">m/s<sup>2</sup></span></legend>
+                    <div class="tuple">
+                        <div><input type="number" class="x" id="property-grav-x"><label for="property-grav-x">X:</label></div>
+                        <div><input type="number" class="y" id="property-grav-y"><label for="property-grav-y">Y:</label></div>
+                        <div><input type="number" class="z" id="property-grav-z"><label for="property-grav-z">Z:</label></div>
+                    </div>
+                </fieldset>
+                <fieldset class="physical-group property xyz fstuple">
+                    <legend>Acceleration <span class="unit">m/s<sup>2</sup></span></legend>
+                    <div class="tuple">
+                        <div><input type="number" class="x" id="property-lacc-x"><label for="property-lacc-x">X:</label></div>
+                        <div><input type="number" class="y" id="property-lacc-y"><label for="property-lacc-y">Y:</label></div>
+                        <div><input type="number" class="z" id="property-lacc-z"><label for="property-lacc-z">Z:</label></div>
+                    </div>
+                </fieldset>
+            </fieldset>
+            <fieldset class="minor">
+                <div class="physical-group color-section property rgb fstuple">
+                    <div class="color-picker" id="property-color-control2"></div>
+                    <label>Entity color</label>
+                    <div class="tuple">
+                        <div><input type="number" class="red" id="property-color-red"><label for="property-color-red">Red:</label></div>
+                        <div><input type="number" class="green" id="property-color-green"><label for="property-color-green">Green:</label></div>
+                        <div><input type="number" class="blue" id="property-color-blue"><label for="property-color-blue">Blue:</label></div>
+                    </div>
+                </div>
+            </fieldset>
+        </fieldset>
+
+
+        <fieldset id="spatial" class="major">
+            <legend class="section-header spatial-group">
+                Spatial<span>M</span>
+            </legend>
+            <fieldset class="spatial-group property xyz fstuple">
+                <legend>Position <span class="unit">m</span></legend>
                 <div class="tuple">
                     <div><input type="number" class="x" id="property-pos-x"><label for="property-pos-x">X:</label></div>
                     <div><input type="number" class="y" id="property-pos-y"><label for="property-pos-y">Y:</label></div>
                     <div><input type="number" class="z" id="property-pos-z"><label for="property-pos-z">Z:</label></div>
                 </div>
-            </div>
-            <div class="spatial-group property pyr">
-                <label>Rotation <span class="unit">deg</span></label>
+            </fieldset>
+            <fieldset class="spatial-group property pyr fstuple">
+                <legend>Rotation <span class="unit">deg</span></legend>
                 <div class="tuple">
                     <div><input type="number" class="pitch" id="property-rot-x" step="0.1"><label for="property-rot-x">Pitch:</label></div>
                     <div><input type="number" class="yaw" id="property-rot-y" step="0.1"><label for="property-rot-y">Yaw:</label></div>
                     <div><input type="number" class="roll" id="property-rot-z" step="0.1"><label for="property-rot-z">Roll:</label></div>
                 </div>
-            </div>
-            <div class="spatial-group property xyz">
-                <label>Dimensions <span class="unit">m</span></label>
+            </fieldset>
+            <fieldset class="spatial-group property xyz fstuple">
+                <legend>Dimensions <span class="unit">m</span></legend>
                 <div class="tuple">
                     <div><input type="number" class="x" id="property-dim-x" step="0.1"><label for="property-dim-x">X:</label></div>
                     <div><input type="number" class="y" id="property-dim-y" step="0.1"><label for="property-dim-y">Y:</label></div>
                     <div><input type="number" class="z" id="property-dim-z" step="0.1"><label for="property-dim-z">Z:</label></div>
                 </div>
-            </div>
-            <div class="spatial-group property xyz">
-                <label>Registration <span class="unit">(pivot offset as ratio of dimension)</span></label>
+            </fieldset>
+            <fieldset class="spatial-group property xyz fstuple">
+                <legend>Registration <span class="unit">(pivot offset as ratio of dimension)</span></legend>
                 <div class="tuple">
                     <div><input type="number" class="x" id="property-reg-x" step="0.1"><label for="property-reg-x">X:</label></div>
                     <div><input type="number" class="y" id="property-reg-y" step="0.1"><label for="property-reg-y">Y:</label></div>
                     <div><input type="number" class="z" id="property-reg-z" step="0.1"><label for="property-reg-z">Z:</label></div>
                 </div>
-            </div>
-            <div class="spatial-group property gen">
-                <label>Scale <span class="unit">%</span></label>
+            </fieldset>
+            <fieldset class="spatial-group property gen fsrow">
+                <legend>Scale <span class="unit">%</span></legend>
                 <div class="row">
                     <input type="number" id="dimension-rescale-pct" value=100>
                     <input type="button" class="blue" id="dimension-rescale-button" value="Rescale">
                     <input type="button" class="red" id="reset-to-natural-dimensions" value="Reset Dimensions">
                 </div>
-            </div>
+            </fieldset>
             <div class="spatial-group row">
                 <div class="property text">
                     <label for="property-parent-id">Parent ID</label>
@@ -153,278 +295,407 @@
                     </div>
                 </div>
             </div>
-            <hr class="spatial-group poly-vox-section" />
-            <div class="spatial-group poly-vox-section property xyz">
-                <label>Voxel volume size <span class="unit">m</span></label>
+        </fieldset>
+
+
+        <fieldset id="behavior" class="major">
+            <legend class="section-header behavior-group">
+                Behavior<span>M</span>
+            </legend>
+            <div class="property textarea">
+                <label for="property-user-data">User data</label>
+                <br>
+                <div class="row">
+                    <input type="button" class="red" id="userdata-clear" value="Clear User Data">
+                    <input type="button" class="blue" id="userdata-new-editor" value="Edit as JSON">
+                    <input disabled type="button" class="black" id="userdata-save" value="Save User Data">
+                    <span id="userdata-saved">Saved!</span>
+                </div>
+                <div id="static-userdata"></div>
+                <div id="userdata-editor"></div>
+                <textarea id="property-user-data"></textarea>
+            </div>
+            <div id="id" class="property value">
+                <label>ID:</label>
+                <input type="text" id="property-id" readonly>
+            </div>
+
+            <fieldset class="minor">
+                <div class="behavior-group property url ">
+                    <label for="property-collision-sound-url">Collision sound URL</label>
+                    <input type="text" id="property-collision-sound-url">
+                </div>
+                <div class="behavior-group property number">
+                    <label>Lifetime <span class="unit">s</span></label>
+                    <input type="number" id="property-lifetime">
+                </div>
+            </fieldset>
+            <fieldset class="minor">
+                <div class="behavior-group property url refresh">
+                    <input type="hidden" id="property-script-timestamp" class="value">
+                    <label for="property-script-url">Script URL</label>
+                    <input type="text" id="property-script-url">
+                    <input type="button" id="reload-script-button" class="glyph" value="F">
+                </div>
+            </fieldset>
+            <fieldset class="minor">
+                <div class="behavior-group property url refresh">
+                    <label for="property-server-scripts">Server Script URL</label>
+                    <input type="text" id="property-server-scripts">
+                    <input type="button" id="reload-server-scripts-button" class="glyph" value="F">
+                </div>
+                <div class="behavior-group property">
+                    <label for="server-script-status">Server Script Status</label>
+                    <span id="server-script-status"></span>
+                </div>
+                <div class="behavior-group property">
+                    <textarea id="server-script-error"></textarea>
+                </div>
+            </fieldset>
+            <div class="property text">
+                <label for="property-description">Description</label>
+                <input type="text" id="property-description">
+            </div>
+        </fieldset>
+
+
+        <fieldset id="hyperlink" class="major">
+            <legend class="section-header hyperlink-group hyperlink-section">
+                Hyperlink<span>M</span>
+            </legend>
+            <div class="hyperlink-group hyperlink-section property url">
+                <label for="property-hyperlink-href">Href - hifi://address</label>
+                <input type="text" id="property-hyperlink-href">
+            </div>
+        </fieldset>
+
+
+
+        <fieldset id="light" class="major">
+            <legend class="section-header light-group light-section">
+                Light<span>M</span>
+            </legend>
+            <fieldset class="light-group light-section property rgb fstuple">
+                <div class="color-picker" id="property-light-color"></div>
+                <legend>Light color</legend>
                 <div class="tuple">
-                    <div><input type="number" class="x" id="property-voxel-volume-size-x"><label for="property-voxel-volume-size-x">X:</label></div>
-                    <div><input type="number" class="y" id="property-voxel-volume-size-y"><label for="property-voxel-volume-size-y">Y:</label></div>
-                    <div><input type="number" class="z" id="property-voxel-volume-size-z"><label for="property-voxel-volume-size-z">Z:</label></div>
+                    <div><input type="number" class="red" id="property-light-color-red"><label for="property-light-color-red">Red:</label></div>
+                    <div><input type="number" class="green" id="property-light-color-green"><label for="property-light-color-green">Green:</label></div>
+                    <div><input type="number" class="blue" id="property-light-color-blue"><label for="property-light-color-blue">Blue:</label></div>
                 </div>
-            </div>
-            <div class="spatial-group poly-vox-section property dropdown">
-                <label>Surface extractor</label>
-                <select name="SelectVoxelSurfaceStyle" id="property-voxel-surface-style">
-                    <option value="0">Marching cubes</option>
-                    <option value="1">Cubic</option>
-                    <option value="2">Edged cubic</option>
-                    <option value="3">Edged marching cubes</option>
-                </select>
-            </div>
-            <div class="spatial-group poly-vox-section property url ">
-                <label for="property-x-texture-url">X-axis texture URL</label>
-                <input type="text" id="property-x-texture-url">
-            </div>
-            <div class="spatial-group poly-vox-section property url ">
-                <label for="property-y-texture-url">Y-axis texture URL</label>
-                <input type="text" id="property-y-texture-url">
-            </div>
-            <div class="spatial-group poly-vox-section property url ">
-                <label for="property-z-texture-url">Z-axis texture URL</label>
-                <input type="text" id="property-z-texture-url">
-            </div>
-            <div class="section-header physical-group">
-                <label>Physical</label><span>M</span>
-            </div>
-            <div class="physical-group property xyz">
-                <label>Linear velocity <span class="unit">m/s</span></label>
+            </fieldset>
+            <fieldset class="light-group light-section property gen fstuple">
                 <div class="tuple">
-                    <div><input type="number" class="x" id="property-lvel-x"><label for="property-lvel-x">X:</label></div>
-                    <div><input type="number" class="y" id="property-lvel-y"><label for="property-lvel-y">Y:</label></div>
-                    <div><input type="number" class="z" id="property-lvel-z"><label for="property-lvel-z">Z:</label></div>
+                    <div><label>Intensity</label><input type="number" id="property-light-intensity" min="0" step="0.1"></div>
+                    <div><label>Fall-off radius <span class="unit">m</span></label><input type="number" id="property-light-falloff-radius" min="0" step="0.1"></div>
+                    <div></div>
                 </div>
+            </fieldset>
+            <div class="light-group light-section property checkbox">
+                <input type="checkbox" id="property-light-spot-light">
+                <label for="property-light-spot-light">Spotlight</label>
             </div>
-            <div class="physical-group property number">
-                <label>Linear damping</label>
-                <input type="number" id="property-ldamping">
-            </div>
-            <hr class="physical-group"  />
-            <div class="physical-group property pyr">
-                <label>Angular velocity <span class="unit">deg/s</span></label>
+            <fieldset class="light-group light-section property gen fstuple">
                 <div class="tuple">
-                    <div><input type="number" class="pitch" id="property-avel-x"><label for="property-avel-x">Pitch:</label></div>
-                    <div><input type="number" class="yaw" id="property-avel-y"><label for="property-avel-y">Yaw:</label></div>
-                    <div><input type="number" class="roll" id="property-avel-z"><label for="property-avel-z">Roll:</label></div>
+                    <div><label>Spotlight exponent</label><input type="number" id="property-light-exponent" step="0.01"></div>
+                    <div><label>Spotlight cut-off</label><input type="number" id="property-light-cutoff" step="0.01"></div>
+                    <div></div>
                 </div>
-            </div>
-            <div class="physical-group property number">
-                <label>Angular damping</label>
-                <input type="number" id="property-adamping">
-            </div>
-            <hr class="physical-group" />
-            <div class="physical-group property gen">
-                <div class="tuple">
-                    <div><label>Restitution</label><input type="number" id="property-restitution"></div>
-                    <div><label>Friction</label><input type="number" id="property-friction"></div>
-                    <div><label>Density</label><input type="number" id="property-density"></div>
+            </fieldset>
+        </fieldset>
+
+
+        <fieldset id="model" class="major">
+            <legend class="section-header model-group model-section zone-section">
+                Model<span>M</span>
+            </legend>
+            <fieldset class="minor">
+                <div class="model-group model-section property url ">
+                    <label for="property-model-url">Model URL</label>
+                    <input type="text" id="property-model-url">
                 </div>
-            </div>
-            <hr class="physical-group" />
-            <div class="physical-group property xyz">
-                <label>Gravity <span class="unit">m/s<sup>2</sup></span></label>
-                <div class="tuple">
-                    <div><input type="number" class="x" id="property-grav-x"><label for="property-grav-x">X:</label></div>
-                    <div><input type="number" class="y" id="property-grav-y"><label for="property-grav-y">Y:</label></div>
-                    <div><input type="number" class="z" id="property-grav-z"><label for="property-grav-z">Z:</label></div>
+                <div class="model-group model-section zone-section property dropdown">
+                    <label>Collision shape type</label>
+                    <select name="SelectShapeType" id="property-shape-type">
+                           <option value="none">No Collision</option>
+                           <option value="box">Box</option>
+                           <option value="sphere">Sphere</option>
+                           <option value="compound">Compound</option>
+                           <option value="simple-hull">Basic - Whole model</option>
+                           <option value="simple-compound">Good - Sub-meshes</option>
+                           <option value="static-mesh">Exact - All polygons (non-dynamic only)</option>
+                       </select>
                 </div>
-            </div>
-            <div class="physical-group property xyz">
-                <label>Acceleration <span class="unit">m/s<sup>2</sup></span></label>
-                <div class="tuple">
-                    <div><input type="number" class="x" id="property-lacc-x"><label for="property-lacc-x">X:</label></div>
-                    <div><input type="number" class="y" id="property-lacc-y"><label for="property-lacc-y">Y:</label></div>
-                    <div><input type="number" class="z" id="property-lacc-z"><label for="property-lacc-z">Z:</label></div>
+                <div class="model-group model-section zone-section property url ">
+                    <label for="property-compound-shape-url">Compound shape URL</label>
+                    <input type="text" id="property-compound-shape-url">
                 </div>
-            </div>
-            <hr class="physical-group color-section" />
-            <div class="physical-group color-section property rgb">
-                <div id="property-color" class="color-picker"></div>
-                <label>Entity color</label>
-                <div class="tuple">
-                    <div><input type="number" class="red" id="property-color-red"><label for="property-color-red">Red:</label></div>
-                    <div><input type="number" class="green" id="property-color-green"><label for="property-color-green">Green:</label></div>
-                    <div><input type="number" class="blue" id="property-color-blue"><label for="property-color-blue">Blue:</label></div>
+            </fieldset>
+            <fieldset class="minor">
+                <div class="model-group model-section property url ">
+                    <label for="property-model-animation-url">Animation URL</label>
+                    <input type="text" id="property-model-animation-url">
                 </div>
-            </div>
-            <div class="section-header behavior-group">
-                <label>Behavior</label><span>M</span>
-            </div>
-            <div class="behavior-group property checkbox">
-                <input type="checkbox" id="property-collisionless">
-                <label for="property-collisionless">Collisionless</label>
-            </div>
-            <div class="behavior-group property checkbox">
-                <input type="checkbox" id="property-dynamic">
-                <label for="property-dynamic">Dynamic</label>
-            </div>
-            <div class="behavior-group two-column">
-                <div class="column">
-                    <div class="sub-section-header">
-                        <span>Collides With</span>
+
+                <div class="model-group model-section two-column">
+                    <div class="column">
+                        <div class="property checkbox">
+                            <input type="checkbox" id="property-model-animation-playing">
+                            <label for="property-model-animation-playing">Animation playing</label>
+                        </div>
+                        <div class="property checkbox indent">
+                            <input type="checkbox" id="property-model-animation-loop">
+                            <label for="property-model-animation-loop">Animation loop</label>
+                        </div>
+                        <div class="property checkbox indent">
+                            <input type="checkbox" id="property-model-animation-hold">
+                            <label for="property-model-animation-hold">Animation hold</label>
+                        </div>
+                        <div class="property checkbox indent">
+                            <input type="checkbox" id="property-model-animation-allow-translation">
+                            <label for="property-model-animation-allow-translation">Animation Allow Translation</label>
+                        </div>
+                        <div id="animation-fps" class="property number">
+                            <label>Animation FPS</label>
+                            <input type="number" id="property-model-animation-fps">
+                        </div>
                     </div>
-                    <div class="checkbox-sub-props">
-                        <div class="property checkbox">
-                            <input type="checkbox" id="property-collide-static">
-                            <label for="property-collide-static">Static entities</label>
+                    <div class="column">
+                        <div class="property number">
+                            <label>Animation frame</label>
+                            <input type="number" id="property-model-animation-frame">
                         </div>
-                        <div class="property checkbox">
-                            <input type="checkbox" id="property-collide-dynamic">
-                            <label for="property-collide-dynamic">Dynamic entities</label>
+                        <div class="property number">
+                            <label>First frame</label>
+                            <input type="number" id="property-model-animation-first-frame">
                         </div>
-                        <div class="property checkbox">
-                            <input type="checkbox" id="property-collide-kinematic">
-                            <label for="property-collide-kinematic">Kinematic entities</label>
-                        </div>
-                        <div class="property checkbox">
-                            <input type="checkbox" id="property-collide-myAvatar">
-                            <label for="property-collide-myAvatar">My avatar</label>
-                        </div>
-                        <div class="property checkbox">
-                            <input type="checkbox" id="property-collide-otherAvatar">
-                            <label for="property-collide-otherAvatar">Other avatars</label>
+                        <div class="property number">
+                            <label>Last frame</label>
+                            <input type="number" id="property-model-animation-last-frame">
                         </div>
                     </div>
                 </div>
-                <div class="column">
-                    <div class="sub-section-header">
-                        <span>Grabbing</span>
-                    </div>
-                    <div class="checkbox-sub-props">
-                        <div class="property checkbox">
-                            <input type="checkbox" id="property-grabbable">
-                            <label for="property-grabbable">Grabbable</label>
-                        </div>
-                        <div class="property checkbox">
-                            <input type="checkbox" id="property-wants-trigger">
-                            <label for="property-wants-trigger">Triggerable</label>
-                        </div>
-                        <div class="property checkbox">
-                            <input type="checkbox" id="property-cloneable">
-                            <label for="property-cloneable">Cloneable</label>
-                        </div>
-                        <div class="property checkbox">
-                            <input type="checkbox" id="property-ignore-ik">
-                            <label for="property-ignore-ik">Ignore inverse kinematics</label>
-                        </div>
+            </fieldset>
+            <fieldset class="minor">
+                <div class="model-group model-section property textarea">
+                    <label for="property-model-textures">Textures</label>
+                    <textarea id="property-model-textures"></textarea>
+                </div>
+                <div class="model-group model-section property textarea">
+                    <label for="property-model-original-textures">Original textures</label>
+                    <textarea id="property-model-original-textures" readonly></textarea>
+                </div>
+            </fieldset>
+        </fieldset>
+
+
+        <fieldset id="zone" class="major">
+            <legend class="section-header zone-group zone-section">
+                Zone<span>M</span>
+            </legend>
+            <fieldset class="minor">
+                <div class="zone-group zone-section property checkbox">
+                    <input type="checkbox" id="property-zone-stage-sun-model-enabled">
+                    <label for="property-zone-stage-sun-model-enabled">Enable stage sun model</label>
+                </div>
+                <div class="zone-group zone-section property checkbox">
+                    <input type="checkbox" id="property-zone-flying-allowed">
+                    <label for="property-zone-flying-allowed">Flying allowed</label>
+                </div>
+                <div class="zone-group zone-section property checkbox">
+                    <input type="checkbox" id="property-zone-ghosting-allowed">
+                    <label for="property-zone-ghosting-allowed">Ghosting allowed</label>
+                </div>
+            </fieldset>
+            <fieldset class="minor">
+                <div class="zone-group zone-section property url ">
+                    <label for="property-zone-filter-url">Filter URL</label>
+                    <input type="text" id="property-zone-filter-url">
+                </div>
+                <div class="sub-section-header zone-group zone-section keylight-section">
+                    <label>Key Light</label>
+                </div>
+                <div class="zone-section keylight-section zone-group property rgb">
+                    <div class="color-picker" id="property-zone-key-light-color"></div>
+                    <label>Key light color</label>
+                    <div class="tuple">
+                        <div><input type="number" class="red" id="property-zone-key-light-color-red" min="0" max="255" step="1"><label for="property-zone-key-light-color-red">Red:</label></div>
+                        <div><input type="number" class="green" id="property-zone-key-light-color-green" min="0" max="255" step="1"><label for="property-zone-key-light-color-green">Green:</label></div>
+                        <div><input type="number" class="blue" id="property-zone-key-light-color-blue" min="0" max="255" step="1"><label for="property-zone-key-light-color-blue">Blue:</label></div>
                     </div>
                 </div>
-                <div class="column" id="group-cloneable-group" style="display:none;">
-                    <div class="sub-section-header">
-                        <span>Cloneable Settings</span>
+                <div class="zone-section keylight-section zone-group property number">
+                    <label>Light intensity</label>
+                    <input type="number" id="property-zone-key-intensity" min="0" max="10" step="0.1">
+                </div>
+                <div class="zone-group zone-section keylight-section property gen">
+                    <div class="tuple">
+                        <div><label>Light altitude <span class="unit">deg</span></label><input type="number" id="property-zone-key-light-direction-x"></div>
+                        <div><label>Light azimuth <span class="unit">deg</span></label><input type="number" id="property-zone-key-light-direction-y"></div>
+                        <div></div>
                     </div>
-                    <div class="cloneable-group property gen">
-                        <div><label>Clone Lifetime</label><input type="number" data-user-data-type="cloneLifetime" id="property-cloneable-lifetime"></div>
-                        <div><label>Clone Limit</label><input type="number" data-user-data-type="cloneLimit" id="property-cloneable-limit"></div>
-                        <div class="property checkbox">
-                            <input type="checkbox" id="property-cloneable-dynamic">
-                            <label for="property-cloneable-dynamic">Clone Dynamic</label>
+                </div>
+                <div class="zone-group zone-section keylight-section property number">
+                    <label>Ambient intensity</label>
+                    <input type="number" id="property-zone-key-ambient-intensity" min="0" max="10" step="0.1">
+                </div>
+                <div class="zone-group zone-section keylight-section property url ">
+                    <label for="property-zone-key-ambient-url">Ambient URL</label>
+                    <input type="text" id="property-zone-key-ambient-url">
+                </div>
+            </fieldset>
+            <fieldset class="minor">
+                <legend class="sub-section-header zone-group zone-section haze-section">
+                    Haze
+                </legend>
+                <form>
+                  <input type="radio" name="hazeMode" value="inherit" id="property-zone-haze-mode-inherit" checked> Inherit
+                  <input type="radio" name="hazeMode" value="disabled" id="property-zone-haze-mode-disabled"> Off
+                  <input type="radio" name="hazeMode" value="enabled" id="property-zone-haze-mode-enabled"> On
+                </form>
+                <fieldset class="zone-group zone-section haze-section property gen fstuple">
+                    <div class="tuple">
+                        <div>
+                              <label>Range<span class="unit">m</span></label>
+                              <input type="number" id="property-zone-haze-range" min="5" max="10000" step="5">
                         </div>
                     </div>
+                </fieldset>
+                    <div class="zone-group zone-section haze-section property checkbox">
+                        <input type="checkbox" id="property-zone-haze-altitude-effect">
+                        <label for="property-zone-haze-altitude-effect">Use Altitude</label>
+                    </div>
+                <fieldset class="zone-group zone-section haze-section property gen fstuple">
+                  <div class="tuple">
+                      <div><label>Base<span class="unit">m</span></label><input type="number" id="property-zone-haze-base" min="-1000" max="1000" step="10"></div>
+                      <div><label>Ceiling<span class="unit">m</span></label><input type="number" id="property-zone-haze-ceiling" min="-1000" max="5000" step="10"></div>
+                  </div>
+                </fieldset>
+                <fieldset class="zone-group zone-section haze-section property rgb fstuple">
+                    <div class="color-picker" id="property-zone-haze-color"></div>
+                    <legend>Haze Color</legend>
+                    <div class="tuple">
+                        <div><input type="number" class="red" id="property-zone-haze-color-red" min="0" max="255" step="1">
+                          <label for="property-zone-haze-blend-in-color-red">Red:</label></div>
+                        <div><input type="number" class="green" id="property-zone-haze-color-green" min="0" max="255" step="1">
+                          <label for="property-zone-haze-blend-in-color-green">Green:</label></div>
+                        <div><input type="number" class="blue" id="property-zone-haze-color-blue" min="0" max="255" step="1">
+                          <label for="property-zone-haze-blend-in-color-blue">Blue:</label></div>
+                    </div>
+                </fieldset>
+                <fieldset class="zone-group zone-section haze-section property gen fstuple">
+                    <div class="tuple">
+                        <div>
+                            <br>
+                                <table>
+                                    <td><label>Background Blend&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;0.0</label></td>
+                                    <td><input type="range" class="slider" id="property-zone-haze-background-blend" min="0.0" max="1.0" step="0.01" value="0.0"></td>
+                                    <td><label>1.0</label></td>
+                                </table>
+                        </div>
+                    </div>
+                </fieldset>
+                <div class="zone-group zone-section haze-section property checkbox">
+                    <input type="checkbox" id="property-zone-haze-enable-light-blend">
+                    <label for="property-zone-haze-enable-light-blend">Enable Glare</label>
                 </div>
-            </div>
-            <hr class="behavior-group" />
-            <div class="behavior-group property url ">
-                <label for="property-collision-sound-url">Collision sound URL</label>
-                <input type="text" id="property-collision-sound-url">
-            </div>
-            <div class="behavior-group property number">
-                <label>Lifetime <span class="unit">s</span></label>
-                <input type="number" id="property-lifetime">
-            </div>
-            <hr class="behavior-group" />
-            <div class="behavior-group property url refresh">
-                <input type="hidden" id="property-script-timestamp" class="value">
-                <label for="property-script-url">Script URL</label>
-                <input type="text" id="property-script-url">
-                <input type="button" id="reload-script-button" class="glyph" value="F">
-            </div>
-            <hr class="behavior-group" />
-            <div class="behavior-group property url refresh">
-                <label for="property-server-scripts">Server Script URL</label>
-                <input type="text" id="property-server-scripts">
-                <input type="button" id="reload-server-scripts-button" class="glyph" value="F">
-            </div>
-            <div class="behavior-group property">
-                <label for="server-script-status">Server Script Status</label>
-                <span id="server-script-status"></span>
-            </div>
-            <div class="behavior-group property">
-                <textarea id="server-script-error"></textarea>
-            </div>
-            <div class="section-header model-group model-section zone-section">
-                <label>Model</label><span>M</span>
-            </div>
-            <div class="model-group model-section property url ">
-                <label for="property-model-url">Model URL</label>
-                <input type="text" id="property-model-url">
-            </div>
-            <div class="model-group model-section zone-section property dropdown">
-                <label>Collision shape type</label>
-                <select name="SelectShapeType" id="property-shape-type">
-                    <option value="none">No Collision</option>
-                    <option value="box">Box</option>
-                    <option value="sphere">Sphere</option>
-                    <option value="compound">Compound</option>
-                    <option value="simple-hull">Basic - Whole model</option>
-                    <option value="simple-compound">Good - Sub-meshes</option>
-                    <option value="static-mesh">Exact - All polygons (non-dynamic only)</option>
-                </select>
-            </div>
-            <div class="model-group model-section zone-section property url ">
-                <label for="property-compound-shape-url">Compound shape URL</label>
-                <input type="text" id="property-compound-shape-url">
-            </div>
-            <hr class="model-group model-section" />
-            <div class="model-group model-section property url ">
-                <label for="property-model-animation-url">Animation URL</label>
-                <input type="text" id="property-model-animation-url">
-            </div>
-            <div class="model-group model-section two-column">
-                <div class="column">
-                    <div class="property checkbox">
-                        <input type="checkbox" id="property-model-animation-playing">
-                        <label for="property-model-animation-playing">Animation playing</label>
+                <fieldset class="zone-group zone-section haze-section property rgb fstuple">
+                    <div class="color-picker" id="property-zone-haze-glare-color"></div>
+                    <legend>Glare Color</legend>
+                    <div class="tuple">
+                        <div><input type="number" class="red" id="property-zone-haze-glare-color-red" min="0" max="255" step="1">
+                          <label for="property-zone-haze-blend-out-color-red">Red:</label></div>
+                        <div><input type="number" class="green" id="property-zone-haze-glare-color-green" min="0" max="255" step="1">
+                          <label for="property-zone-haze-blend-out-color-green">Green:</label></div>
+                        <div><input type="number" class="blue" id="property-zone-haze-glare-color-blue" min="0" max="255" step="1">
+                          <label for="property-zone-haze-blend-out-color-blue">Blue:</label></div>
                     </div>
-                    <div class="property checkbox indent">
-                        <input type="checkbox" id="property-model-animation-loop">
-                        <label for="property-model-animation-loop">Animation loop</label>
-                    </div>
-                    <div class="property checkbox indent">
-                        <input type="checkbox" id="property-model-animation-hold">
-                        <label for="property-model-animation-hold">Animation hold</label>
-                    </div>
-                    <div id="animation-fps" class="property number">
-                        <label>Animation FPS</label>
-                        <input type="number" id="property-model-animation-fps">
+                </fieldset>
+                <fieldset class="zone-group zone-section haze-section property gen fstuple">
+                    <div class="tuple">
+                        <div>
+                            <br>
+                            <table>
+                                <td><label>Glare Angle&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;0</label></td>
+                                <td><input type="range" class="slider" id="property-zone-haze-blend-angle" min="0" max="180" step="1"></td>
+                                <td><label>180</label>
+                            </table>
+                        </div>
                     </div>
+                </fieldset>
+                <!--div class="zone-group zone-section haze-section property checkbox">
+                    <input type="checkbox" id="property-zone-haze-attenuate-keylight">
+                    <label for="property-zone-haze-attenuate-keylight">Attenuate Keylight</label>
                 </div>
-                <div class="column">
-                    <div class="property number">
-                        <label>Animation frame</label>
-                        <input type="number" id="property-model-animation-frame">
+                <fieldset class="zone-group zone-section haze-section property gen fstuple">
+                    <div class="tuple">
+                        <div><label>Range<span class="unit">m</span></label><input type="number" id="property-zone-haze-keylight-range" 
+                        min="5" max="1000000" step="5"></div>
+                        <div><label>Altitude<span class="unit">m</span></label><input type="number" id="property-zone-haze-keylight-altitude" 
+                        min="-1000" max="50000" step="10"></div>
                     </div>
-                    <div class="property number">
-                        <label>First frame</label>
-                        <input type="number" id="property-model-animation-first-frame">
-                    </div>
-                    <div class="property number">
-                        <label>Last frame</label>
-                        <input type="number" id="property-model-animation-last-frame">
+                </fieldset-->
+           </fieldset>
+            <fieldset class="minor">
+                <legend class="sub-section-header zone-group zone-section stage-section">
+                    Stage
+                </legend>
+                <fieldset class="zone-group zone-section stage-section property gen fstuple">
+                    <div class="tuple">
+                        <div><label>Latitude <span class="unit">deg</span></label><input type="number" id="property-zone-stage-latitude" min="-90" max="90" step="1"></div>
+                        <div><label>Longitude <span class="unit">deg</span></label><input type="number" id="property-zone-stage-longitude" min="-180" max="180" step="1"></div>
+                        <div><label>Altitude <span class="unit">m</span></label><input type="number" id="property-zone-stage-altitude" step="1"></div>
                     </div>
+                </fieldset>
+                <div class="zone-group zone-section stage-section property checkbox">
+                    <input type="checkbox" id="property-zone-stage-automatic-hour-day">
+                    <label for="property-zone-stage-automatic-hour-day">Match stage hour and day to location</label>
                 </div>
-            </div>
-            <hr class="model-group model-section" />
-            <div class="model-group model-section property textarea">
-                <label for="property-model-textures">Textures</label>
-                <textarea id="property-model-textures"></textarea>
-            </div>
-            <div class="model-group model-section property textarea">
-                <label for="property-model-original-textures">Original textures</label>
-                <textarea id="property-model-original-textures" readonly></textarea>
-            </div>
-            <div class="section-header text-group text-section">
-                <label>Text</label><span>M</span>
-            </div>
+                <fieldset class="zone-group zone-section stage-section property gen fstuple">
+                    <div class="tuple">
+                        <div><label>Day of year</label><input type="number" id="property-zone-stage-day" min="0" max="365" step="1"></div>
+                        <div><label>Hour</label><input type="number" id="property-zone-stage-hour" min="0" max="24" step="0.5"></div>
+                        <div></div>
+                    </div>
+                </fieldset>
+            </fieldset>
+            <fieldset class="minor">
+                <legend class="sub-section-header zone-group zone-section background-section">
+                    Background
+                </legend>
+                <div class="zone-group zone-section background-section property dropdown">
+                    <label>Background mode</label>
+                    <select name="SelectBackgroundMode" id="property-zone-background-mode">
+                        <option value="inherit">Nothing</option>
+                        <option value="skybox">Skybox</option>
+                    </select>
+                </div>
+            </fieldset>
+            <fieldset class="minor skybox-section">
+                <legend class="sub-section-header zone-group zone-section skybox-section">
+                    Skybox
+                </legend>
+                <fieldset class="zone-group zone-section skybox-section property rgb fstuple">
+                    <div class="color-picker" id="property-zone-skybox-color"></div>
+                    <legend>Skybox color</legend>
+                    <div class="tuple">
+                        <div><input type="number" class="red" id="property-zone-skybox-color-red"><label for="property-zone-skybox-color-red">Red:</label></div>
+                        <div><input type="number" class="green" id="property-zone-skybox-color-green"><label for="property-zone-skybox-color-green">Green:</label></div>
+                        <div><input type="number" class="blue" id="property-zone-skybox-color-blue"><label for="property-zone-skybox-color-blue">Blue:</label></div>
+                    </div>
+                </fieldset>
+                <div class="zone-group zone-section skybox-section property url ">
+                    <label for="property-zone-skybox-url">Skybox URL</label>
+                    <input type="text" id="property-zone-skybox-url">
+                </div>
+            </fieldset>
+        </fieldset>
+
+
+        <fieldset id="text" class="major">
+            <legend class="section-header text-group text-section">
+                Text<span>M</span>
+            </legend>
             <div class="text-group text-section property text">
                 <label for="property-text-text">Text content</label>
                 <input type="text" id="property-text-text">
@@ -446,116 +717,22 @@
                     <div><input type="number" class="blue" id="property-text-text-color-blue"><label for="property-text-text-color-blue">Blue:</label></div>
                 </div>
             </div>
-            <div class="text-group text-section property rgb">
+            <fieldset class="text-group text-section property rgb fstuple">
                 <div class="color-picker" id="property-text-background-color"></div>
-                <label>Background color</label>
+                <legend>Background color</legend>
                 <div class="tuple">
                     <div><input type="number" class="red" id="property-text-background-color-red"><label for="roperty-text-background-color-red">Red:</label></div>
                     <div><input type="number" class="green" id="property-text-background-color-green"><label for="property-text-background-color-green">Green:</label></div>
                     <div><input type="number" class="blue" id="property-text-background-color-blue"><label for="property-text-background-color-blue">Blue:</label></div>
                 </div>
-            </div>
-            <div class="section-header zone-group zone-section">
-                <label>Zone</label><span>M</span>
-            </div>
-            <div class="zone-group zone-section property checkbox">
-                <input type="checkbox" id="property-zone-stage-sun-model-enabled">
-                <label for="property-zone-stage-sun-model-enabled">Enable stage sun model</label>
-            </div>
-            <div class="zone-group zone-section property checkbox">
-                <input type="checkbox" id="property-zone-flying-allowed">
-                <label for="property-zone-flying-allowed">Flying allowed</label>
-            </div>
-            <div class="zone-group zone-section property checkbox">
-                <input type="checkbox" id="property-zone-ghosting-allowed">
-                <label for="property-zone-ghosting-allowed">Ghosting allowed</label>
-            </div>
-            <hr class="zone-group zone-section">
-            <div class="zone-group zone-section property url ">
-                <label for="property-zone-filter-url">Filter URL</label>
-                <input type="text" id="property-zone-filter-url">
-            </div>
-            <div class="sub-section-header zone-group zone-section keylight-section">
-                <label>Key Light</label>
-            </div>
-            <div class="zone-section keylight-section zone-group property rgb">
-                <div class="color-picker" id="property-zone-key-light-color"></div>
-                <label>Key light color</label>
-                <div class="tuple">
-                    <div><input type="number" class="red" id="property-zone-key-light-color-red" min="0" max="255" step="1"><label for="property-zone-key-light-color-red">Red:</label></div>
-                    <div><input type="number" class="green" id="property-zone-key-light-color-green" min="0" max="255" step="1"><label for="property-zone-key-light-color-green">Green:</label></div>
-                    <div><input type="number" class="blue" id="property-zone-key-light-color-blue" min="0" max="255" step="1"><label for="property-zone-key-light-color-blue">Blue:</label></div>
-                </div>
-            </div>
-            <div class="zone-section keylight-section zone-group property number">
-                <label>Light intensity</label>
-                <input type="number" id="property-zone-key-intensity" min="0" max="10" step="0.1">
-            </div>
-            <div class="zone-group zone-section keylight-section property gen">
-                <div class="tuple">
-                    <div><label>Light altitude <span class="unit">deg</span></label><input type="number" id="property-zone-key-light-direction-x"></div>
-                    <div><label>Light azimuth <span class="unit">deg</span></label><input type="number" id="property-zone-key-light-direction-y"></div>
-                    <div></div>
-                </div>
-            </div>
-            <div class="zone-group zone-section keylight-section property number">
-                <label>Ambient intensity</label>
-                <input type="number" id="property-zone-key-ambient-intensity" min="0" max="10" step="0.1">
-            </div>
-            <div class="zone-group zone-section keylight-section property url ">
-                <label for="property-zone-key-ambient-url">Ambient URL</label>
-                <input type="text" id="property-zone-key-ambient-url">
-            </div>
-            <div class="sub-section-header zone-group zone-section stage-section">
-                <label>Stage</label>
-            </div>
-            <div class="zone-group zone-section stage-section property gen">
-                <div class="tuple">
-                    <div><label>Latitude <span class="unit">deg</span></label><input type="number" id="property-zone-stage-latitude" min="-90" max="90" step="1"></div>
-                    <div><label>Longitude <span class="unit">deg</span></label><input type="number" id="property-zone-stage-longitude" min="-180" max="180" step="1"></div>
-                    <div><label>Altitude <span class="unit">m</span></label><input type="number" id="property-zone-stage-altitude" step="1"></div>
-                </div>
-            </div>
-            <div class="zone-group zone-section stage-section property checkbox">
-                <input type="checkbox" id="property-zone-stage-automatic-hour-day">
-                <label for="property-zone-stage-automatic-hour-day">Match stage hour and day to location</label>
-            </div>
-            <div class="zone-group zone-section stage-section property gen">
-                <div class="tuple">
-                    <div><label>Day of year</label><input type="number" id="property-zone-stage-day" min="0" max="365" step="1"></div>
-                    <div><label>Hour</label><input type="number" id="property-zone-stage-hour" min="0" max="24" step="0.5"></div>
-                    <div></div>
-                </div>
-            </div>
-            <div class="sub-section-header zone-group zone-section background-section">
-                <label>Background</label>
-            </div>
-            <div class="zone-group zone-section background-section property dropdown">
-                <label>Background mode</label>
-                <select name="SelectBackgroundMode" id="property-zone-background-mode">
-                    <option value="inherit">Nothing</option>
-                    <option value="skybox">Skybox</option>
-                </select>
-            </div>
-            <div class="sub-section-header zone-group zone-section skybox-section">
-                <label>Skybox</label>
-            </div>
-            <div class="zone-group zone-section skybox-section property rgb">
-                <div class="color-picker" id="property-zone-skybox-color"></div>
-                <label>Skybox color</label>
-                <div class="tuple">
-                    <div><input type="number" class="red" id="property-zone-skybox-color-red"><label for="property-zone-skybox-color-red">Red:</label></div>
-                    <div><input type="number" class="green" id="property-zone-skybox-color-green"><label for="property-zone-skybox-color-green">Green:</label></div>
-                    <div><input type="number" class="blue" id="property-zone-skybox-color-blue"><label for="property-zone-skybox-color-blue">Blue:</label></div>
-                </div>
-            </div>
-            <div class="zone-group zone-section skybox-section property url ">
-                <label for="property-zone-skybox-url">Skybox URL</label>
-                <input type="text" id="property-zone-skybox-url">
-            </div>
-            <div class="section-header web-group web-section">
-                <label>Web</label><span>M</span>
-            </div>
+            </fieldset>
+        </fieldset>
+
+
+        <fieldset id="web" class="major">
+            <legend class="section-header web-group web-section">
+                Web<span>M</span>
+            </legend>
             <div class="web-group web-section property url ">
                 <label for="property-web-source-url">Source URL</label>
                 <input type="text" id="property-web-source-url">
@@ -564,36 +741,41 @@
                 <label for="property-web-dpi">Resolution (DPI)</label>
                 <input type="number" id="property-web-dpi">
             </div>
-            <div class="section-header light-group light-section">
-                <label>Light</label><span>M</span>
+        </fieldset>
+
+        <fieldset id="polyvox" class="major">
+            <legend class="section-header spatial-group poly-vox-section property xyz">
+                Voxel volume size <span>m</span>
+            </legend>
+            <div class="tuple">
+                <div><input type="number" class="x" id="property-voxel-volume-size-x"><label for="property-voxel-volume-size-x">X:</label></div>
+                <div><input type="number" class="y" id="property-voxel-volume-size-y"><label for="property-voxel-volume-size-y">Y:</label></div>
+                <div><input type="number" class="z" id="property-voxel-volume-size-z"><label for="property-voxel-volume-size-z">Z:</label></div>
             </div>
-            <div class="light-group light-section property rgb">
-                <div class="color-picker" id="property-light-color"></div>
-                <label>Light color</label>
-                <div class="tuple">
-                    <div><input type="number" class="red" id="property-light-color-red"><label for="property-light-color-red">Red:</label></div>
-                    <div><input type="number" class="green" id="property-light-color-green"><label for="property-light-color-green">Green:</label></div>
-                    <div><input type="number" class="blue" id="property-light-color-blue"><label for="property-light-color-blue">Blue:</label></div>
-                </div>
+            <div class="spatial-group poly-vox-section property dropdown">
+                <label>Surface extractor</label>
+                <select name="SelectVoxelSurfaceStyle" id="property-voxel-surface-style">
+                     <option value="0">Marching cubes</option>
+                     <option value="1">Cubic</option>
+                     <option value="2">Edged cubic</option>
+                     <option value="3">Edged marching cubes</option>
+                 </select>
             </div>
-            <div class="light-group light-section property gen">
-                <div class="tuple">
-                    <div><label>Intensity</label><input type="number" id="property-light-intensity" min="0" step="0.1"></div>
-                    <div><label>Fall-off radius <span class="unit">m</span></label><input type="number" id="property-light-falloff-radius" min="0" step="0.1"></div>
-                    <div></div>
-                </div>
+            <div class="spatial-group poly-vox-section property url ">
+                <label for="property-x-texture-url">X-axis texture URL</label>
+                <input type="text" id="property-x-texture-url">
             </div>
-            <div class="light-group light-section property checkbox">
-                <input type="checkbox" id="property-light-spot-light">
-                <label for="property-light-spot-light">Spotlight</label>
+            <div class="spatial-group poly-vox-section property url ">
+                <label for="property-y-texture-url">Y-axis texture URL</label>
+                <input type="text" id="property-y-texture-url">
             </div>
-            <div class="light-group light-section property gen">
-                <div class="tuple">
-                    <div><label>Spotlight exponent</label><input type="number" id="property-light-exponent" step="0.01"></div>
-                    <div><label>Spotlight cut-off</label><input type="number" id="property-light-cutoff" step="0.01"></div>
-                    <div></div>
-                </div>
+            <div class="spatial-group poly-vox-section property url ">
+                <label for="property-z-texture-url">Z-axis texture URL</label>
+                <input type="text" id="property-z-texture-url">
             </div>
-        </div>
-    </body>
+        </fieldset>
+
+    </div>
+</body>
+
 </html>
diff --git a/scripts/system/html/img/blocks-tile.png b/scripts/system/html/img/blocks-tile.png
new file mode 100644
index 0000000000..49de535c1c
Binary files /dev/null and b/scripts/system/html/img/blocks-tile.png differ
diff --git a/scripts/system/html/js/SnapshotReview.js b/scripts/system/html/js/SnapshotReview.js
index a3d1923aa9..5ea1dd0963 100644
--- a/scripts/system/html/js/SnapshotReview.js
+++ b/scripts/system/html/js/SnapshotReview.js
@@ -20,7 +20,9 @@ var blastShareText = "Blast to my Connections",
     hifiShareText = "Share to Snaps Feed",
     hifiAlreadySharedText = "Already Shared to Snaps Feed",
     facebookShareText = "Share to Facebook",
-    twitterShareText = "Share to Twitter";
+    twitterShareText = "Share to Twitter",
+    shareButtonLabelTextActive = "SHARE&#58;",
+    shareButtonLabelTextInactive = "SHARE";
 
 function fileExtensionMatches(filePath, extension) {
     return filePath.split('.').pop().toLowerCase() === extension;
@@ -138,6 +140,8 @@ function selectImageToShare(selectedID, isSelected) {
     var imageContainer = document.getElementById(selectedID),
         image = document.getElementById(selectedID + 'img'),
         shareBar = document.getElementById(selectedID + "shareBar"),
+        showShareButtonsDots = document.getElementById(selectedID + "showShareButtonsDots"),
+        showShareButtonsLabel = document.getElementById(selectedID + "showShareButtonsLabel"),
         shareButtonsDiv = document.getElementById(selectedID + "shareButtonsDiv"),
         shareBarHelp = document.getElementById(selectedID + "shareBarHelp"),
         showShareButtonsButtonDiv = document.getElementById(selectedID + "showShareButtonsButtonDiv"),
@@ -156,6 +160,9 @@ function selectImageToShare(selectedID, isSelected) {
         shareBar.style.backgroundColor = "rgba(0, 0, 0, 0.45)";
         shareBar.style.pointerEvents = "initial";
 
+        showShareButtonsDots.style.visibility = "hidden";
+        showShareButtonsLabel.innerHTML = shareButtonLabelTextActive;
+
         shareButtonsDiv.style.visibility = "visible";
         shareBarHelp.style.visibility = "visible";
 
@@ -176,6 +183,9 @@ function selectImageToShare(selectedID, isSelected) {
         shareBar.style.backgroundColor = "rgba(0, 0, 0, 0.0)";
         shareBar.style.pointerEvents = "none";
 
+        showShareButtonsDots.style.visibility = "visible";
+        showShareButtonsLabel.innerHTML = shareButtonLabelTextInactive;
+
         shareButtonsDiv.style.visibility = "hidden";
         shareBarHelp.style.visibility = "hidden";
     }
@@ -185,6 +195,7 @@ function createShareBar(parentID, isLoggedIn, canShare, isGif, blastButtonDisabl
         shareBarHelpID = parentID + "shareBarHelp",
         shareButtonsDivID = parentID + "shareButtonsDiv",
         showShareButtonsButtonDivID = parentID + "showShareButtonsButtonDiv",
+        showShareButtonsDotsID = parentID + "showShareButtonsDots",
         showShareButtonsLabelID = parentID + "showShareButtonsLabel",
         blastToConnectionsButtonID = parentID + "blastToConnectionsButton",
         shareWithEveryoneButtonID = parentID + "shareWithEveryoneButton",
@@ -199,8 +210,8 @@ function createShareBar(parentID, isLoggedIn, canShare, isGif, blastButtonDisabl
         if (canShare) {
             shareBarInnerHTML = '<div class="shareControlsHelp" id="' + shareBarHelpID + '" style="visibility:hidden;' + ((canBlast && blastButtonDisabled || !canBlast && hifiButtonDisabled) ? "background-color:#000;opacity:0.5;" : "") + '"></div>' +
                 '<div class="showShareButtonsButtonDiv inactive" id="' + showShareButtonsButtonDivID + '" onclick="selectImageToShare(' + parentID + ', true)">' +
-                    '<label id="' + showShareButtonsLabelID + '">SHARE</label>' +
-                    '<span class="showShareButtonDots">' +
+                    '<label id="' + showShareButtonsLabelID + '">' + shareButtonLabelTextInactive + '</label>' +
+                    '<span id="' + showShareButtonsDotsID + '" class="showShareButtonDots">' +
                         '&#xe019;' +
                     '</div>' +
                 '</div>' +
@@ -217,7 +228,7 @@ function createShareBar(parentID, isLoggedIn, canShare, isGif, blastButtonDisabl
             document.getElementById(parentID + 'img').onclick = function () { selectImageToShare(parentID, true); };
         } else {
             shareBarInnerHTML = '<div class="showShareButtonsButtonDiv inactive" id="' + showShareButtonsButtonDivID + '" onclick="selectImageToShare(' + parentID + ', true)">' +
-                    '<label id="' + showShareButtonsLabelID + '">SHARE</label>' +
+                    '<label id="' + showShareButtonsLabelID + '">' + shareButtonLabelTextInactive + '</label>' +
                     '<span class="showShareButtonDots">' +
                         '&#xe019;' +
                     '</div>' +
@@ -230,7 +241,7 @@ function createShareBar(parentID, isLoggedIn, canShare, isGif, blastButtonDisabl
         }
     } else {
         shareBarInnerHTML = '<div class="showShareButtonsButtonDiv inactive" id="' + showShareButtonsButtonDivID + '" onclick="selectImageToShare(' + parentID + ', true)">' +
-                '<label id="' + showShareButtonsLabelID + '">SHARE</label>' +
+                '<label id="' + showShareButtonsLabelID + '">' + shareButtonLabelTextInactive + '</label>' +
                 '<span class="showShareButtonDots">' +
                     '&#xe019;' +
                 '</div>' +
diff --git a/scripts/system/html/js/colpick.js b/scripts/system/html/js/colpick.js
index 01a3bc1e52..f808262e9e 100644
--- a/scripts/system/html/js/colpick.js
+++ b/scripts/system/html/js/colpick.js
@@ -68,6 +68,7 @@ For usage and examples: colpick.com/plugin
                     cal.data('colpick').color = col = hexToHsb(fixHex(this.value));
                     fillRGBFields(col, cal.get(0));
                     fillHSBFields(col, cal.get(0));
+                    fillHexFields(col, cal.get(0));
                 } else if (this.parentNode.className.indexOf('_hsb') > 0) {
                     cal.data('colpick').color = col = fixHSB({
                         h: parseInt(cal.data('colpick').fields.eq(4).val(), 10),
@@ -76,6 +77,7 @@ For usage and examples: colpick.com/plugin
                     });
                     fillRGBFields(col, cal.get(0));
                     fillHexFields(col, cal.get(0));
+                    fillHSBFields(col, cal.get(0));
                 } else {
                     cal.data('colpick').color = col = rgbToHsb(fixRGB({
                         r: parseInt(cal.data('colpick').fields.eq(1).val(), 10),
@@ -84,6 +86,7 @@ For usage and examples: colpick.com/plugin
                     }));
                     fillHexFields(col, cal.get(0));
                     fillHSBFields(col, cal.get(0));
+                    fillRGBFields(col, cal.get(0));
                 }
                 setSelector(col, cal.get(0));
                 setHue(col, cal.get(0));
diff --git a/scripts/system/html/js/entityList.js b/scripts/system/html/js/entityList.js
index ea79750154..7b25e66c67 100644
--- a/scripts/system/html/js/entityList.js
+++ b/scripts/system/html/js/entityList.js
@@ -286,7 +286,6 @@ function loaded() {
       }
       elDelete.onclick = function() {
           EventBridge.emitWebEvent(JSON.stringify({ type: 'delete' }));
-          refreshEntities();
       }
 
       document.addEventListener("keydown", function (keyDownEvent) {
@@ -362,6 +361,12 @@ function loaded() {
                       updateSelectedEntities(data.selectedIDs);
                       resize();
                   }
+              } else if (data.type === "deleted") {
+                  for (i = 0, length = data.ids.length; i < length; i++) {
+                      delete entities[data.ids[i]];
+                      entityList.remove("id", data.ids[i]);
+                  }
+                  refreshFooter();
               }
           });
           setTimeout(refreshEntities, 1000);
diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index 777ef54085..f54394a353 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -146,6 +146,22 @@ function createEmitTextPropertyUpdateFunction(propertyName) {
     };
 }
 
+function createZoneComponentModeChangedFunction(zoneComponent, zoneComponentModeInherit, zoneComponentModeDisabled, zoneComponentModeEnabled) {
+    return function() {
+        var zoneComponentMode;
+
+        if (zoneComponentModeInherit.checked) {
+            zoneComponentMode = 'inherit';
+        } else if (zoneComponentModeDisabled.checked) {
+            zoneComponentMode = 'disabled';
+        } else if (zoneComponentModeEnabled.checked) {
+            zoneComponentMode = 'enabled';
+        }
+
+        updateProperty(zoneComponent, zoneComponentMode);
+    }
+}
+
 function createEmitGroupTextPropertyUpdateFunction(group, propertyName) {
     return function() {
         var properties = {};
@@ -475,10 +491,20 @@ function unbindAllInputs() {
     }
 }
 
+function clearSelection() {
+	if(document.selection && document.selection.empty) {
+		document.selection.empty();
+	} else if(window.getSelection) {
+		var sel = window.getSelection();
+		sel.removeAllRanges();
+	}
+}
+
 function loaded() {
     openEventBridge(function() {
 
         var allSections = [];
+        var elPropertiesList = document.getElementById("properties-list");
         var elID = document.getElementById("property-id");
         var elType = document.getElementById("property-type");
         var elTypeIcon = document.getElementById("type-icon");
@@ -544,6 +570,7 @@ function loaded() {
 
         var elCloneable = document.getElementById("property-cloneable");
         var elCloneableDynamic = document.getElementById("property-cloneable-dynamic");
+        var elCloneableAvatarEntity = document.getElementById("property-cloneable-avatarEntity");
         var elCloneableGroup = document.getElementById("group-cloneable-group");
         var elCloneableLifetime = document.getElementById("property-cloneable-lifetime");
         var elCloneableLimit = document.getElementById("property-cloneable-limit");
@@ -565,7 +592,8 @@ function loaded() {
         var elJSONEditor = document.getElementById("userdata-editor");
         var elNewJSONEditor = document.getElementById('userdata-new-editor');
         var elColorSections = document.querySelectorAll(".color-section");
-        var elColor = document.getElementById("property-color");
+        var elColorControl1 = document.getElementById("property-color-control1");
+        var elColorControl2 = document.getElementById("property-color-control2");
         var elColorRed = document.getElementById("property-color-red");
         var elColorGreen = document.getElementById("property-color-green");
         var elColorBlue = document.getElementById("property-color-blue");
@@ -600,6 +628,7 @@ function loaded() {
         var elModelAnimationLastFrame = document.getElementById("property-model-animation-last-frame");
         var elModelAnimationLoop = document.getElementById("property-model-animation-loop");
         var elModelAnimationHold = document.getElementById("property-model-animation-hold");
+        var elModelAnimationAllowTranslation = document.getElementById("property-model-animation-allow-translation");
         var elModelTextures = document.getElementById("property-model-textures");
         var elModelOriginalTextures = document.getElementById("property-model-original-textures");
 
@@ -644,6 +673,32 @@ function loaded() {
         var elZoneKeyLightDirectionZ = document.getElementById("property-zone-key-light-direction-z");
         var elZoneKeyLightAmbientURL = document.getElementById("property-zone-key-ambient-url");
 
+        var elZoneHazeModeInherit = document.getElementById("property-zone-haze-mode-inherit");
+        var elZoneHazeModeDisabled = document.getElementById("property-zone-haze-mode-disabled");
+        var elZoneHazeModeEnabled = document.getElementById("property-zone-haze-mode-enabled");
+        
+        var elZoneHazeRange = document.getElementById("property-zone-haze-range");
+        var elZoneHazeColor = document.getElementById("property-zone-haze-color");
+        var elZoneHazeColorRed = document.getElementById("property-zone-haze-color-red");
+        var elZoneHazeColorGreen = document.getElementById("property-zone-haze-color-green");
+        var elZoneHazeColorBlue = document.getElementById("property-zone-haze-color-blue");
+        var elZoneHazeGlareColor = document.getElementById("property-zone-haze-glare-color");
+        var elZoneHazeGlareColorRed = document.getElementById("property-zone-haze-glare-color-red");
+        var elZoneHazeGlareColorGreen = document.getElementById("property-zone-haze-glare-color-green");
+        var elZoneHazeGlareColorBlue = document.getElementById("property-zone-haze-glare-color-blue");
+        var elZoneHazeEnableGlare = document.getElementById("property-zone-haze-enable-light-blend");
+        var elZonehazeGlareAngle = document.getElementById("property-zone-haze-blend-angle");
+        
+        var elZoneHazeAltitudeEffect = document.getElementById("property-zone-haze-altitude-effect");
+        var elZoneHazeBaseRef = document.getElementById("property-zone-haze-base");
+        var elZoneHazeCeiling = document.getElementById("property-zone-haze-ceiling");
+
+        var elZoneHazeBackgroundBlend = document.getElementById("property-zone-haze-background-blend");
+        
+        var elZoneHazeAttenuateKeyLight = document.getElementById("property-zone-haze-attenuate-keylight");
+        var elZoneHazeKeyLightRange = document.getElementById("property-zone-haze-keylight-range");
+        var elZoneHazeKeyLightAltitude = document.getElementById("property-zone-haze-keylight-altitude");
+       
         var elZoneStageLatitude = document.getElementById("property-zone-stage-latitude");
         var elZoneStageLongitude = document.getElementById("property-zone-stage-longitude");
         var elZoneStageAltitude = document.getElementById("property-zone-stage-altitude");
@@ -679,7 +734,10 @@ function loaded() {
                 data = JSON.parse(data);
                 if (data.type == "server_script_status") {
                     elServerScriptError.value = data.errorInfo;
-                    elServerScriptError.style.display = data.errorInfo ? "block" : "none";
+                    // If we just set elServerScriptError's diplay to block or none, we still end up with
+                    //it's parent contributing 21px bottom padding even when elServerScriptError is display:none.
+                    // So set it's parent to block or none
+                    elServerScriptError.parentElement.style.display = data.errorInfo ? "block" : "none";
                     if (data.statusRetrieved === false) {
                         elServerScriptStatus.innerText = "Failed to retrieve status";
                     } else if (data.isRunning) {
@@ -705,6 +763,7 @@ function loaded() {
                         elTypeIcon.style.display = "none";
                         elType.innerHTML = "<i>No selection</i>";
                         elID.value = "";
+                        elPropertiesList.className = '';
                         disableProperties();
                     } else if (data.selections && data.selections.length > 1) {
                         deleteJSONEditor();
@@ -733,6 +792,7 @@ function loaded() {
                         elType.innerHTML = type + " (" + data.selections.length + ")";
                         elTypeIcon.innerHTML = ICON_FOR_TYPE[type];
                         elTypeIcon.style.display = "inline-block";
+                        elPropertiesList.className = '';
 
                         elID.value = "";
 
@@ -749,6 +809,7 @@ function loaded() {
                         lastEntityID = '"' + properties.id + '"';
                         elID.value = properties.id;
 
+                        elPropertiesList.className = properties.type + 'Menu';
                         elType.innerHTML = properties.type;
                         elTypeIcon.innerHTML = ICON_FOR_TYPE[properties.type];
                         elTypeIcon.style.display = "inline-block";
@@ -821,36 +882,59 @@ function loaded() {
                         elCloneableLimit.value = 0;
                         elCloneableLifetime.value = 300;
 
+                        var grabbablesSet = false;
                         var parsedUserData = {}
                         try {
                             parsedUserData = JSON.parse(properties.userData);
 
                             if ("grabbableKey" in parsedUserData) {
-                                if ("grabbable" in parsedUserData["grabbableKey"]) {
-                                    elGrabbable.checked = parsedUserData["grabbableKey"].grabbable;
+                                grabbablesSet = true;
+                                var grabbableData = parsedUserData["grabbableKey"];
+                                if ("grabbable" in grabbableData) {
+                                    elGrabbable.checked = grabbableData.grabbable;
+                                } else {
+                                    elGrabbable.checked = true;
                                 }
-                                if ("wantsTrigger" in parsedUserData["grabbableKey"]) {
-                                    elWantsTrigger.checked = parsedUserData["grabbableKey"].wantsTrigger;
+                                if ("wantsTrigger" in grabbableData) {
+                                    elWantsTrigger.checked = grabbableData.wantsTrigger;
+                                } else {
+                                    elWantsTrigger.checked = false;
                                 }
-                                if ("ignoreIK" in parsedUserData["grabbableKey"]) {
-                                    elIgnoreIK.checked = parsedUserData["grabbableKey"].ignoreIK;
+                                if ("ignoreIK" in grabbableData) {
+                                    elIgnoreIK.checked = grabbableData.ignoreIK;
+                                } else {
+                                    elIgnoreIK.checked = true;
                                 }
-                                if ("cloneable" in parsedUserData["grabbableKey"]) {
-                                    elCloneable.checked = parsedUserData["grabbableKey"].cloneable;
+                                if ("cloneable" in grabbableData) {
+                                    elCloneable.checked = grabbableData.cloneable;
                                     elCloneableGroup.style.display = elCloneable.checked ? "block": "none";
-                                    elCloneableDynamic.checked = parsedUserData["grabbableKey"].cloneDynamic ? parsedUserData["grabbableKey"].cloneDynamic : properties.dynamic;
+                                    elCloneableDynamic.checked =
+                                        grabbableData.cloneDynamic ? grabbableData.cloneDynamic : properties.dynamic;
                                     if (elCloneable.checked) {
-                                      if ("cloneLifetime" in parsedUserData["grabbableKey"]) {
-                                          elCloneableLifetime.value = parsedUserData["grabbableKey"].cloneLifetime ? parsedUserData["grabbableKey"].cloneLifetime : 300;
+                                      if ("cloneLifetime" in grabbableData) {
+                                          elCloneableLifetime.value =
+                                              grabbableData.cloneLifetime ? grabbableData.cloneLifetime : 300;
                                       }
-                                      if ("cloneLimit" in parsedUserData["grabbableKey"]) {
-                                          elCloneableLimit.value = parsedUserData["grabbableKey"].cloneLimit ? parsedUserData["grabbableKey"].cloneLimit : 0;
+                                      if ("cloneLimit" in grabbableData) {
+                                          elCloneableLimit.value = grabbableData.cloneLimit ? grabbableData.cloneLimit : 0;
+                                      }
+                                      if ("cloneAvatarEntity" in grabbableData) {
+                                          elCloneableAvatarEntity.checked =
+                                              grabbableData.cloneAvatarEntity ? grabbableData.cloneAvatarEntity : false;
                                       }
                                     }
+                                } else {
+                                    elCloneable.checked = false;
                                 }
                             }
                         } catch (e) {
                         }
+                        if (!grabbablesSet) {
+                            elGrabbable.checked = true;
+                            elWantsTrigger.checked = false;
+                            elIgnoreIK.checked = true;
+                            elCloneable.checked = false;
+                        }
 
                         elCollisionSoundURL.value = properties.collisionSoundURL;
                         elLifetime.value = properties.lifetime;
@@ -883,48 +967,20 @@ function loaded() {
                         elHyperlinkHref.value = properties.href;
                         elDescription.value = properties.description;
 
-                        for (var i = 0; i < allSections.length; i++) {
-                            for (var j = 0; j < allSections[i].length; j++) {
-                                allSections[i][j].style.display = 'none';
-                            }
-                        }
-
-                        for (var i = 0; i < elHyperlinkSections.length; i++) {
-                            elHyperlinkSections[i].style.display = 'table';
-                        }
 
                         if (properties.type == "Shape" || properties.type == "Box" || properties.type == "Sphere") {
-                            for (var i = 0; i < elShapeSections.length; i++) {
-                                elShapeSections[i].style.display = 'table';
-                            }
                             elShape.value = properties.shape;
                             setDropdownText(elShape);
-
-                        } else {
-                            for (var i = 0; i < elShapeSections.length; i++) {
-                                elShapeSections[i].style.display = 'none';
-                            }
                         }
 
                         if (properties.type == "Shape" || properties.type == "Box" || properties.type == "Sphere" || properties.type == "ParticleEffect") {
-                            for (var i = 0; i < elColorSections.length; i++) {
-                                elColorSections[i].style.display = 'table';
-                            }
                             elColorRed.value = properties.color.red;
                             elColorGreen.value = properties.color.green;
                             elColorBlue.value = properties.color.blue;
-                            elColor.style.backgroundColor = "rgb(" + properties.color.red + "," + properties.color.green + "," + properties.color.blue + ")";
-                        } else {
-                            for (var i = 0; i < elColorSections.length; i++) {
-                                elColorSections[i].style.display = 'none';
-                            }
+                            elColorControl1.style.backgroundColor = elColorControl2.style.backgroundColor = "rgb(" + properties.color.red + "," + properties.color.green + "," + properties.color.blue + ")";
                         }
 
                         if (properties.type == "Model") {
-                            for (var i = 0; i < elModelSections.length; i++) {
-                                elModelSections[i].style.display = 'table';
-                            }
-
                             elModelURL.value = properties.modelURL;
                             elShapeType.value = properties.shapeType;
                             setDropdownText(elShapeType);
@@ -937,25 +993,15 @@ function loaded() {
                             elModelAnimationLastFrame.value = properties.animation.lastFrame;
                             elModelAnimationLoop.checked = properties.animation.loop;
                             elModelAnimationHold.checked = properties.animation.hold;
+                            elModelAnimationAllowTranslation.checked = properties.animation.allowTranslation;
                             elModelTextures.value = properties.textures;
                             setTextareaScrolling(elModelTextures);
                             elModelOriginalTextures.value = properties.originalTextures;
                             setTextareaScrolling(elModelOriginalTextures);
                         } else if (properties.type == "Web") {
-                            for (var i = 0; i < elWebSections.length; i++) {
-                                elWebSections[i].style.display = 'table';
-                            }
-                            for (var i = 0; i < elHyperlinkSections.length; i++) {
-                                elHyperlinkSections[i].style.display = 'none';
-                            }
-
                             elWebSourceURL.value = properties.sourceUrl;
                             elWebDPI.value = properties.dpi;
                         } else if (properties.type == "Text") {
-                            for (var i = 0; i < elTextSections.length; i++) {
-                                elTextSections[i].style.display = 'table';
-                            }
-
                             elTextText.value = properties.text;
                             elTextLineHeight.value = properties.lineHeight.toFixed(4);
                             elTextFaceCamera.checked = properties.faceCamera;
@@ -967,10 +1013,6 @@ function loaded() {
                             elTextBackgroundColorGreen.value = properties.backgroundColor.green;
                             elTextBackgroundColorBlue.value = properties.backgroundColor.blue;
                         } else if (properties.type == "Light") {
-                            for (var i = 0; i < elLightSections.length; i++) {
-                                elLightSections[i].style.display = 'table';
-                            }
-
                             elLightSpotLight.checked = properties.isSpotlight;
 
                             elLightColor.style.backgroundColor = "rgb(" + properties.color.red + "," + properties.color.green + "," + properties.color.blue + ")";
@@ -983,10 +1025,6 @@ function loaded() {
                             elLightExponent.value = properties.exponent.toFixed(2);
                             elLightCutoff.value = properties.cutoff.toFixed(2);
                         } else if (properties.type == "Zone") {
-                            for (var i = 0; i < elZoneSections.length; i++) {
-                                elZoneSections[i].style.display = 'table';
-                            }
-
                             elZoneStageSunModelEnabled.checked = properties.stage.sunModelEnabled;
                             elZoneKeyLightColor.style.backgroundColor = "rgb(" + properties.keyLight.color.red + "," + properties.keyLight.color.green + "," + properties.keyLight.color.blue + ")";
                             elZoneKeyLightColorRed.value = properties.keyLight.color.red;
@@ -998,6 +1036,42 @@ function loaded() {
                             elZoneKeyLightDirectionY.value = properties.keyLight.direction.y.toFixed(2);
                             elZoneKeyLightAmbientURL.value = properties.keyLight.ambientURL;
 
+                            elZoneHazeModeInherit.checked = (properties.hazeMode == 'inherit');
+                            elZoneHazeModeDisabled.checked = (properties.hazeMode == 'disabled');
+                            elZoneHazeModeEnabled.checked = (properties.hazeMode == 'enabled');
+
+                            elZoneHazeRange.value = properties.haze.hazeRange.toFixed(0);
+                            elZoneHazeColor.style.backgroundColor = "rgb(" + 
+                                properties.haze.hazeColor.red + "," + 
+                                properties.haze.hazeColor.green + "," + 
+                                properties.haze.hazeColor.blue + ")";
+
+                            elZoneHazeColorRed.value = properties.haze.hazeColor.red;
+                            elZoneHazeColorGreen.value = properties.haze.hazeColor.green;
+                            elZoneHazeColorBlue.value = properties.haze.hazeColor.blue;
+                            elZoneHazeBackgroundBlend.value = properties.haze.hazeBackgroundBlend.toFixed(2);
+
+                            elZoneHazeGlareColor.style.backgroundColor = "rgb(" + 
+                                properties.haze.hazeGlareColor.red + "," + 
+                                properties.haze.hazeGlareColor.green + "," + 
+                                properties.haze.hazeGlareColor.blue + ")";
+
+                            elZoneHazeGlareColorRed.value = properties.haze.hazeGlareColor.red;
+                            elZoneHazeGlareColorGreen.value = properties.haze.hazeGlareColor.green;
+                            elZoneHazeGlareColorBlue.value = properties.haze.hazeGlareColor.blue;
+
+                            elZoneHazeEnableGlare.checked = properties.haze.hazeEnableGlare;
+                            elZonehazeGlareAngle.value = properties.haze.hazeGlareAngle.toFixed(0);
+
+                            elZoneHazeAltitudeEffect.checked = properties.haze.hazeAltitudeEffect;
+                            elZoneHazeBaseRef.value = properties.haze.hazeBaseRef.toFixed(0);
+                            elZoneHazeCeiling.value = properties.haze.hazeCeiling.toFixed(0);
+
+                            elZoneHazeBackgroundBlend.value = properties.haze.hazeBackgroundBlend.toFixed(2);
+
+//                            elZoneHazeAttenuateKeyLight.checked = properties.haze.hazeAttenuateKeyLight;
+//                            elZoneHazeKeyLightRange.value = properties.haze.hazeKeyLightRange.toFixed(0);
+//                            elZoneHazeKeyLightAltitude.value = properties.haze.hazeKeyLightAltitude.toFixed(0);
 
                             elZoneStageLatitude.value = properties.stage.latitude.toFixed(2);
                             elZoneStageLongitude.value = properties.stage.longitude.toFixed(2);
@@ -1023,10 +1097,6 @@ function loaded() {
 
                             showElements(document.getElementsByClassName('skybox-section'), elZoneBackgroundMode.value == 'skybox');
                         } else if (properties.type == "PolyVox") {
-                            for (var i = 0; i < elPolyVoxSections.length; i++) {
-                                elPolyVoxSections[i].style.display = 'table';
-                            }
-
                             elVoxelVolumeSizeX.value = properties.voxelVolumeSize.x.toFixed(2);
                             elVoxelVolumeSizeY.value = properties.voxelVolumeSize.y.toFixed(2);
                             elVoxelVolumeSizeZ.value = properties.voxelVolumeSize.z.toFixed(2);
@@ -1051,6 +1121,7 @@ function loaded() {
                             activeElement.select();
                         }
                     }
+					clearSelection();
                 }
             });
         }
@@ -1074,7 +1145,7 @@ function loaded() {
         elDimensionsZ.addEventListener('change', dimensionsChangeFunction);
 
         elParentID.addEventListener('change', createEmitTextPropertyUpdateFunction('parentID'));
-        elParentJointIndex.addEventListener('change', createEmitNumberPropertyUpdateFunction('parentJointIndex'));
+        elParentJointIndex.addEventListener('change', createEmitNumberPropertyUpdateFunction('parentJointIndex', 0));
 
         var registrationChangeFunction = createEmitVec3PropertyUpdateFunction(
             'registrationPoint', elRegistrationX, elRegistrationY, elRegistrationZ);
@@ -1145,9 +1216,14 @@ function loaded() {
             }
             userDataChanger("grabbableKey", "grabbable", elGrabbable, elUserData, properties.dynamic);
         });
-        elCloneableDynamic.addEventListener('change', function (event){
+        elCloneableDynamic.addEventListener('change', function(event) {
             userDataChanger("grabbableKey", "cloneDynamic", event.target, elUserData, -1);
         });
+
+        elCloneableAvatarEntity.addEventListener('change', function(event) {
+            userDataChanger("grabbableKey", "cloneAvatarEntity", event.target, elUserData, -1);
+        });
+
         elCloneable.addEventListener('change', function (event) {
             var checked = event.target.checked;
             if (checked) {
@@ -1155,6 +1231,7 @@ function loaded() {
                         cloneLifetime: elCloneableLifetime,
                         cloneLimit: elCloneableLimit,
                         cloneDynamic: elCloneableDynamic,
+                        cloneAvatarEntity: elCloneableAvatarEntity,
                         cloneable: event.target,
                         grabbable: null
                     }, elUserData, {});
@@ -1165,6 +1242,7 @@ function loaded() {
                         cloneLifetime: null,
                         cloneLimit: null,
                         cloneDynamic: null,
+                        cloneAvatarEntity: null,
                         cloneable: false
                     }, elUserData, {});
                 elCloneableGroup.style.display = "none";
@@ -1225,20 +1303,41 @@ function loaded() {
         elColorRed.addEventListener('change', colorChangeFunction);
         elColorGreen.addEventListener('change', colorChangeFunction);
         elColorBlue.addEventListener('change', colorChangeFunction);
-        colorPickers.push($('#property-color').colpick({
+        colorPickers.push($('#property-color-control1').colpick({
             colorScheme: 'dark',
             layout: 'hex',
             color: '000000',
             onShow: function(colpick) {
-                $('#property-color').attr('active', 'true');
+                $('#property-color-control1').attr('active', 'true');
             },
             onHide: function(colpick) {
-                $('#property-color').attr('active', 'false');
+                $('#property-color-control1').attr('active', 'false');
             },
             onSubmit: function(hsb, hex, rgb, el) {
                 $(el).css('background-color', '#' + hex);
                 $(el).colpickHide();
                 emitColorPropertyUpdate('color', rgb.r, rgb.g, rgb.b);
+                // Keep the companion control in sync
+                elColorControl2.style.backgroundColor = "rgb(" + rgb.r + "," + rgb.g + "," + rgb.b + ")";
+            }
+        }));
+        colorPickers.push($('#property-color-control2').colpick({
+            colorScheme: 'dark',
+            layout: 'hex',
+            color: '000000',
+            onShow: function(colpick) {
+                $('#property-color-control2').attr('active', 'true');
+            },
+            onHide: function(colpick) {
+                $('#property-color-control2').attr('active', 'false');
+            },
+            onSubmit: function(hsb, hex, rgb, el) {
+                $(el).css('background-color', '#' + hex);
+                $(el).colpickHide();
+                emitColorPropertyUpdate('color', rgb.r, rgb.g, rgb.b);
+                // Keep the companion control in sync
+                elColorControl1.style.backgroundColor = "rgb(" + rgb.r + "," + rgb.g + "," + rgb.b + ")";
+
             }
         }));
 
@@ -1274,7 +1373,7 @@ function loaded() {
         elShape.addEventListener('change', createEmitTextPropertyUpdateFunction('shape'));
 
         elWebSourceURL.addEventListener('change', createEmitTextPropertyUpdateFunction('sourceUrl'));
-        elWebDPI.addEventListener('change', createEmitNumberPropertyUpdateFunction('dpi'));
+        elWebDPI.addEventListener('change', createEmitNumberPropertyUpdateFunction('dpi', 0));
 
         elModelURL.addEventListener('change', createEmitTextPropertyUpdateFunction('modelURL'));
         elShapeType.addEventListener('change', createEmitTextPropertyUpdateFunction('shapeType'));
@@ -1288,6 +1387,7 @@ function loaded() {
         elModelAnimationLastFrame.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('animation', 'lastFrame'));
         elModelAnimationLoop.addEventListener('change', createEmitGroupCheckedPropertyUpdateFunction('animation', 'loop'));
         elModelAnimationHold.addEventListener('change', createEmitGroupCheckedPropertyUpdateFunction('animation', 'hold'));
+        elModelAnimationAllowTranslation.addEventListener('change', createEmitGroupCheckedPropertyUpdateFunction('animation', 'allowTranslation'));
 
         elModelTextures.addEventListener('change', createEmitTextPropertyUpdateFunction('textures'));
 
@@ -1367,6 +1467,76 @@ function loaded() {
         elZoneKeyLightDirectionX.addEventListener('change', zoneKeyLightDirectionChangeFunction);
         elZoneKeyLightDirectionY.addEventListener('change', zoneKeyLightDirectionChangeFunction);
 
+        var hazeModeChanged = createZoneComponentModeChangedFunction('hazeMode', elZoneHazeModeInherit, elZoneHazeModeDisabled, elZoneHazeModeEnabled)
+        elZoneHazeModeInherit.addEventListener('change', hazeModeChanged);
+        elZoneHazeModeDisabled.addEventListener('change', hazeModeChanged);
+        elZoneHazeModeEnabled.addEventListener('change', hazeModeChanged);
+
+        elZoneHazeRange.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('haze', 'hazeRange'));
+
+        colorPickers.push($('#property-zone-haze-color').colpick({
+            colorScheme: 'dark',
+            layout: 'hex',
+            color: '000000',
+            onShow: function(colpick) {
+                $('#property-zone-haze-color').attr('active', 'true');
+            },
+            onHide: function(colpick) {
+                $('#property-zone-haze-color').attr('active', 'false');
+            },
+            onSubmit: function(hsb, hex, rgb, el) {
+                $(el).css('background-color', '#' + hex);
+                $(el).colpickHide();
+                emitColorPropertyUpdate('hazeColor', rgb.r, rgb.g, rgb.b, 'haze');
+            }
+        }));
+        var zoneHazeColorChangeFunction = createEmitGroupColorPropertyUpdateFunction('haze', 'hazeColor', 
+            elZoneHazeColorRed, 
+            elZoneHazeColorGreen, 
+            elZoneHazeColorBlue);
+
+        elZoneHazeColorRed.addEventListener('change', zoneHazeColorChangeFunction);
+        elZoneHazeColorGreen.addEventListener('change', zoneHazeColorChangeFunction);
+        elZoneHazeColorBlue.addEventListener('change', zoneHazeColorChangeFunction);
+
+        colorPickers.push($('#property-zone-haze-glare-color').colpick({
+            colorScheme: 'dark',
+            layout: 'hex',
+            color: '000000',
+            onShow: function(colpick) {
+                $('#property-zone-haze-glare-color').attr('active', 'true');
+            },
+            onHide: function(colpick) {
+                $('#property-zone-haze-glare-color').attr('active', 'false');
+            },
+            onSubmit: function(hsb, hex, rgb, el) {
+                $(el).css('background-color', '#' + hex);
+                $(el).colpickHide();
+                emitColorPropertyUpdate('hazeGlareColor', rgb.r, rgb.g, rgb.b, 'haze');
+            }
+        }));
+        var zoneHazeGlareColorChangeFunction = createEmitGroupColorPropertyUpdateFunction('haze', 'hazeGlareColor', 
+            elZoneHazeGlareColorRed, 
+            elZoneHazeGlareColorGreen, 
+            elZoneHazeGlareColorBlue);
+
+        elZoneHazeGlareColorRed.addEventListener('change', zoneHazeGlareColorChangeFunction);
+        elZoneHazeGlareColorGreen.addEventListener('change', zoneHazeGlareColorChangeFunction);
+        elZoneHazeGlareColorBlue.addEventListener('change', zoneHazeGlareColorChangeFunction);
+
+        elZoneHazeEnableGlare.addEventListener('change', createEmitGroupCheckedPropertyUpdateFunction('haze', 'hazeEnableGlare'));
+        elZonehazeGlareAngle.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('haze', 'hazeGlareAngle'));
+
+        elZoneHazeAltitudeEffect.addEventListener('change', createEmitGroupCheckedPropertyUpdateFunction('haze', 'hazeAltitudeEffect'));
+        elZoneHazeCeiling.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('haze', 'hazeCeiling'));
+        elZoneHazeBaseRef.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('haze', 'hazeBaseRef'));
+
+        elZoneHazeBackgroundBlend.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('haze', 'hazeBackgroundBlend'));
+
+//        elZoneHazeAttenuateKeyLight.addEventListener('change', createEmitGroupCheckedPropertyUpdateFunction('haze', 'hazeAttenuateKeyLight'));
+//        elZoneHazeKeyLightRange.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('haze', 'hazeKeyLightRange'));
+//        elZoneHazeKeyLightAltitude.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('haze', 'hazeKeyLightAltitude'));
+
         elZoneStageLatitude.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('stage', 'latitude'));
         elZoneStageLongitude.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('stage', 'longitude'));
         elZoneStageAltitude.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('stage', 'altitude'));
@@ -1374,8 +1544,8 @@ function loaded() {
         elZoneStageDay.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('stage', 'day'));
         elZoneStageHour.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('stage', 'hour'));
 
-
         elZoneBackgroundMode.addEventListener('change', createEmitTextPropertyUpdateFunction('backgroundMode'));
+
         var zoneSkyboxColorChangeFunction = createEmitGroupColorPropertyUpdateFunction('skybox', 'color',
             elZoneSkyboxColorRed, elZoneSkyboxColorGreen, elZoneSkyboxColorBlue);
         elZoneSkyboxColorRed.addEventListener('change', zoneSkyboxColorChangeFunction);
@@ -1502,11 +1672,9 @@ function loaded() {
     var elCollapsible = document.getElementsByClassName("section-header");
 
     var toggleCollapsedEvent = function(event) {
-        var element = event.target;
-        if (element.nodeName !== "DIV") {
-            element = element.parentNode;
-        }
-        var isCollapsed = element.getAttribute("collapsed") !== "true";
+        var element = event.target.parentNode.parentNode;
+        var isCollapsed = element.dataset.collapsed !== "true";
+        element.dataset.collapsed = isCollapsed ? "true" : false
         element.setAttribute("collapsed", isCollapsed ? "true" : "false");
         element.getElementsByTagName("span")[0].textContent = isCollapsed ? "L" : "M";
     };
diff --git a/scripts/system/html/js/marketplacesInject.js b/scripts/system/html/js/marketplacesInject.js
index 3b3d4b4937..1346bcd750 100644
--- a/scripts/system/html/js/marketplacesInject.js
+++ b/scripts/system/html/js/marketplacesInject.js
@@ -25,7 +25,12 @@
     var canWriteAssets = false;
     var xmlHttpRequest = null;
     var isPreparing = false;  // Explicitly track download request status.
-    
+
+    var commerceMode = false;
+    var userIsLoggedIn = false;
+    var walletNeedsSetup = false;
+    var metaverseServerURL = "https://metaverse.highfidelity.com";
+
     function injectCommonCode(isDirectoryPage) {
 
         // Supporting styles from marketplaces.css.
@@ -33,8 +38,8 @@
         $("head").append(
             '<style>' +
                 '#marketplace-navigation { font-family: Arial, Helvetica, sans-serif; width: 100%; height: 50px; background: #00b4ef; position: fixed; bottom: 0; z-index: 1000; }' +
-                '#marketplace-navigation .glyph { margin-left: 20px; margin-right: 3px; font-family: sans-serif; color: #fff; font-size: 24px; line-height: 50px; }' +
-                '#marketplace-navigation .text { color: #fff; font-size: 18px; line-height: 50px; vertical-align: top; position: relative; top: 1px; }' +
+                '#marketplace-navigation .glyph { margin-left: 10px; margin-right: 3px; font-family: sans-serif; color: #fff; font-size: 24px; line-height: 50px; }' +
+                '#marketplace-navigation .text { color: #fff; font-size: 16px; line-height: 50px; vertical-align: top; position: relative; top: 1px; }' +
                 '#marketplace-navigation input#back-button { position: absolute; left: 20px; margin-top: 12px; padding-left: 0; padding-right: 5px; }' +
                 '#marketplace-navigation input#all-markets { position: absolute; right: 20px; margin-top: 12px; padding-left: 15px; padding-right: 15px; }' +
                 '#marketplace-navigation .right { position: absolute; right: 20px; }' +
@@ -53,11 +58,11 @@
         );
 
         // Footer.
-        var isInitialHiFiPage = location.href === "https://metaverse.highfidelity.com/marketplace?";
+        var isInitialHiFiPage = location.href === metaverseServerURL + "/marketplace?";
         $("body").append(
             '<div id="marketplace-navigation">' +
                 (!isInitialHiFiPage ? '<input id="back-button" type="button" class="white" value="&lt; Back" />' : '') +
-                (isInitialHiFiPage ? '<span class="glyph">&#x1f6c8;</span> <span class="text">See also other marketplaces.</span>' : '') +
+                (isInitialHiFiPage ? '<span class="glyph">&#x1f6c8;</span> <span class="text">Get items from Clara.io!</span>' : '') +
                 (!isDirectoryPage ? '<input id="all-markets" type="button" class="white" value="See All Markets" />' : '') +
                 (isDirectoryPage ? '<span class="right"><span class="glyph">&#x1f6c8;</span> <span class="text">Select a marketplace to explore.</span><span>' : '') +
             '</div>'
@@ -65,7 +70,7 @@
 
         // Footer actions.
         $("#back-button").on("click", function () {
-            window.history.back();
+            (document.referrer !== "") ? window.history.back() : window.location = (metaverseServerURL + "/marketplace?");
         });
         $("#all-markets").on("click", function () {
             EventBridge.emitWebEvent(GOTO_DIRECTORY);
@@ -79,6 +84,7 @@
         letUsKnow.replaceWith(letUsKnow.html());
 
         // Add button links.
+
         $('#exploreClaraMarketplace').on('click', function () {
             window.location = "https://clara.io/library?gameCheck=true&public=true";
         });
@@ -87,8 +93,312 @@
         });
     }
 
+    emitWalletSetupEvent = function() {
+        EventBridge.emitWebEvent(JSON.stringify({
+            type: "WALLET_SETUP"
+        }));
+    }
+
+    function maybeAddSetupWalletButton() {
+        if (!$('body').hasClass("walletsetup-injected") && userIsLoggedIn && walletNeedsSetup) {
+            $('body').addClass("walletsetup-injected");
+
+            var resultsElement = document.getElementById('results');
+            var setupWalletElement = document.createElement('div');
+            setupWalletElement.classList.add("row");
+            setupWalletElement.id = "setupWalletDiv";
+            setupWalletElement.style = "height:60px;margin:20px 10px 10px 10px;padding:12px 5px;" +
+                "background-color:#D6F4D8;border-color:#aee9b2;border-width:2px;border-style:solid;border-radius:5px;";
+
+            var span = document.createElement('span');
+            span.style = "margin:10px 5px;color:#1b6420;font-size:15px;";
+            span.innerHTML = "<a href='#' onclick='emitWalletSetupEvent(); return false;'>Setup your Wallet</a> to get money and shop in Marketplace.";
+
+            var xButton = document.createElement('a');
+            xButton.id = "xButton";
+            xButton.setAttribute('href', "#");
+            xButton.style = "width:50px;height:100%;margin:0;color:#ccc;font-size:20px;";
+            xButton.innerHTML = "X";
+            xButton.onclick = function () {
+                setupWalletElement.remove();
+                dummyRow.remove();
+            };
+
+            setupWalletElement.appendChild(span);
+            setupWalletElement.appendChild(xButton);
+
+            resultsElement.insertBefore(setupWalletElement, resultsElement.firstChild);
+
+            // Dummy row for padding
+            var dummyRow = document.createElement('div');
+            dummyRow.classList.add("row");
+            dummyRow.style = "height:15px;";
+            resultsElement.insertBefore(dummyRow, resultsElement.firstChild);
+        }
+    }
+
+    function maybeAddLogInButton() {
+        if (!$('body').hasClass("login-injected") && !userIsLoggedIn) {
+            $('body').addClass("login-injected");
+            var resultsElement = document.getElementById('results');
+            if (!resultsElement) { // If we're on the main page, this will evaluate to `true`
+                resultsElement = document.getElementById('item-show');
+                resultsElement.style = 'margin-top:0;';
+            }
+            var logInElement = document.createElement('div');
+            logInElement.classList.add("row");
+            logInElement.id = "logInDiv";
+            logInElement.style = "height:60px;margin:20px 10px 10px 10px;padding:5px;" +
+                "background-color:#D6F4D8;border-color:#aee9b2;border-width:2px;border-style:solid;border-radius:5px;";
+
+            var button = document.createElement('a');
+            button.classList.add("btn");
+            button.classList.add("btn-default");
+            button.id = "logInButton";
+            button.setAttribute('href', "#");
+            button.innerHTML = "LOG IN";
+            button.style = "width:80px;height:100%;margin-top:0;margin-left:10px;padding:13px;font-weight:bold;background:linear-gradient(white, #ccc);";
+            button.onclick = function () {
+                EventBridge.emitWebEvent(JSON.stringify({
+                    type: "LOGIN"
+                }));
+            };
+
+            var span = document.createElement('span');
+            span.style = "margin:10px;color:#1b6420;font-size:15px;";
+            span.innerHTML = "to purchase items from the Marketplace.";
+
+            var xButton = document.createElement('a');
+            xButton.id = "xButton";
+            xButton.setAttribute('href', "#");
+            xButton.style = "width:50px;height:100%;margin:0;color:#ccc;font-size:20px;";
+            xButton.innerHTML = "X";
+            xButton.onclick = function () {
+                logInElement.remove();
+                dummyRow.remove();
+            };
+
+            logInElement.appendChild(button);
+            logInElement.appendChild(span);
+            logInElement.appendChild(xButton);
+
+            resultsElement.insertBefore(logInElement, resultsElement.firstChild);
+
+            // Dummy row for padding
+            var dummyRow = document.createElement('div');
+            dummyRow.classList.add("row");
+            dummyRow.style = "height:15px;";
+            resultsElement.insertBefore(dummyRow, resultsElement.firstChild);
+        }
+    }
+
+    function maybeAddPurchasesButton() {
+        if (userIsLoggedIn) {
+            // Why isn't this an id?! This really shouldn't be a class on the website, but it is.
+            var navbarBrandElement = document.getElementsByClassName('navbar-brand')[0];
+            var purchasesElement = document.createElement('a');
+            var dropDownElement = document.getElementById('user-dropdown');
+
+            $('#user-dropdown').find('.username')[0].style = "max-width:80px;white-space:nowrap;overflow:hidden;" + 
+                "text-overflow:ellipsis;display:inline-block;position:relative;top:4px;";
+            $('#user-dropdown').find('.caret')[0].style = "position:relative;top:-3px;";
+
+            purchasesElement.id = "purchasesButton";
+            purchasesElement.setAttribute('href', "#");
+            purchasesElement.innerHTML = "My Purchases";
+            // FRONTEND WEBDEV RANT: The username dropdown should REALLY not be programmed to be on the same
+            //     line as the search bar, overlaid on top of the search bar, floated right, and then relatively bumped up using "top:-50px".
+            purchasesElement.style = "height:100%;margin-top:18px;font-weight:bold;float:right;margin-right:" + (dropDownElement.offsetWidth + 30) +
+                "px;position:relative;z-index:999;";
+            navbarBrandElement.parentNode.insertAdjacentElement('beforeend', purchasesElement);
+            $('#purchasesButton').on('click', function () {
+                EventBridge.emitWebEvent(JSON.stringify({
+                    type: "PURCHASES",
+                    referrerURL: window.location.href
+                }));
+            });
+        }
+    }
+
+    function changeDropdownMenu() {
+        var logInOrOutButton = document.createElement('a');
+        logInOrOutButton.id = "logInOrOutButton";
+        logInOrOutButton.setAttribute('href', "#");
+        logInOrOutButton.innerHTML = userIsLoggedIn ? "Log Out" : "Log In";
+        logInOrOutButton.onclick = function () {
+            EventBridge.emitWebEvent(JSON.stringify({
+                type: "LOGIN"
+            }));
+        };
+
+        $($('.dropdown-menu').find('li')[0]).append(logInOrOutButton);
+
+        $('a[href="/marketplace?view=mine"]').each(function () {
+            $(this).attr('href', '#');
+            $(this).on('click', function () {
+                EventBridge.emitWebEvent(JSON.stringify({
+                    type: "MY_ITEMS"
+                }));
+            });
+        });
+    }
+
+    function buyButtonClicked(id, name, author, price, href) {
+        EventBridge.emitWebEvent(JSON.stringify({
+            type: "CHECKOUT",
+            itemId: id,
+            itemName: name,
+            itemPrice: price ? parseInt(price, 10) : 0,
+            itemHref: href
+        }));
+    }
+
+    function injectBuyButtonOnMainPage() {
+        var cost;
+
+        // Unbind original mouseenter and mouseleave behavior
+        $('body').off('mouseenter', '#price-or-edit .price');
+        $('body').off('mouseleave', '#price-or-edit .price');
+
+        $('.grid-item').find('#price-or-edit').each(function () {
+            $(this).css({ "margin-top": "0" });
+        });
+
+        $('.grid-item').find('#price-or-edit').find('a').each(function() {
+            $(this).attr('data-href', $(this).attr('href'));
+            $(this).attr('href', '#');
+            cost = $(this).closest('.col-xs-3').find('.item-cost').text();
+
+            $(this).closest('.col-xs-3').prev().attr("class", 'col-xs-6');
+            $(this).closest('.col-xs-3').attr("class", 'col-xs-6');
+
+            var priceElement = $(this).find('.price')
+            priceElement.css({
+                "padding": "3px 5px",
+                "height": "40px",
+                "background": "linear-gradient(#00b4ef, #0093C5)",
+                "color": "#FFF",
+                "font-weight": "600",
+                "line-height": "34px"
+            });
+
+            if (parseInt(cost) > 0) {
+                priceElement.css({ "width": "auto" });
+                priceElement.html('<span class="hifi-glyph hifi-glyph-hfc" style="filter:invert(1);background-size:20px;' +
+                    'width:20px;height:20px;position:relative;top:5px;"></span> ' + cost);
+                priceElement.css({ "min-width": priceElement.width() + 30 });
+            }
+        });
+
+        // change pricing to GET/BUY on button hover
+        $('body').on('mouseenter', '#price-or-edit .price', function () {
+            var $this = $(this);
+            $this.data('initialHtml', $this.html());
+
+            var cost = $(this).parent().siblings().text();
+            if (parseInt(cost) > 0) {
+                $this.text('BUY');
+            } else {
+                $this.text('GET');
+            }
+        });
+
+        $('body').on('mouseleave', '#price-or-edit .price', function () {
+            var $this = $(this);
+            $this.html($this.data('initialHtml'));
+        });
+
+
+        $('.grid-item').find('#price-or-edit').find('a').on('click', function () {
+            buyButtonClicked($(this).closest('.grid-item').attr('data-item-id'),
+                $(this).closest('.grid-item').find('.item-title').text(),
+                $(this).closest('.grid-item').find('.creator').find('.value').text(),
+                $(this).closest('.grid-item').find('.item-cost').text(),
+                $(this).attr('data-href'));
+        });
+    }
+
+    function injectUnfocusOnSearch() {
+        // unfocus input field on search, thus hiding virtual keyboard
+        $('#search-box').on('submit', function () {
+            if (document.activeElement) {
+                document.activeElement.blur();
+            }
+        });
+    }
+
     function injectHiFiCode() {
-        // Nothing to do.
+        if (commerceMode) {
+            maybeAddLogInButton();
+            maybeAddSetupWalletButton();
+
+            if (!$('body').hasClass("code-injected")) {
+
+                $('body').addClass("code-injected");
+                changeDropdownMenu();
+
+                var target = document.getElementById('templated-items');
+                // MutationObserver is necessary because the DOM is populated after the page is loaded.
+                // We're searching for changes to the element whose ID is '#templated-items' - this is
+                //     the element that gets filled in by the AJAX.
+                var observer = new MutationObserver(function (mutations) {
+                    mutations.forEach(function (mutation) {
+                        injectBuyButtonOnMainPage();
+                    });
+                    //observer.disconnect();
+                });
+                var config = { attributes: true, childList: true, characterData: true };
+                observer.observe(target, config);
+
+                // Try this here in case it works (it will if the user just pressed the "back" button,
+                //     since that doesn't trigger another AJAX request.
+                injectBuyButtonOnMainPage();
+                maybeAddPurchasesButton();
+            }
+        }
+
+        injectUnfocusOnSearch();
+    }
+
+    function injectHiFiItemPageCode() {
+        if (commerceMode) {
+            maybeAddLogInButton();
+
+            if (!$('body').hasClass("code-injected")) {
+
+                $('body').addClass("code-injected");
+                changeDropdownMenu();
+
+                var purchaseButton = $('#side-info').find('.btn').first();
+
+                var href = purchaseButton.attr('href');
+                purchaseButton.attr('href', '#');
+                purchaseButton.css({
+                    "background": "linear-gradient(#00b4ef, #0093C5)",
+                    "color": "#FFF",
+                    "font-weight": "600",
+                    "padding-bottom": "10px"
+                });
+
+                var cost = $('.item-cost').text();
+
+                if (parseInt(cost) > 0 && $('#side-info').find('#buyItemButton').size() === 0) {
+                    purchaseButton.html('PURCHASE <span class="hifi-glyph hifi-glyph-hfc" style="filter:invert(1);background-size:20px;' +
+                        'width:20px;height:20px;position:relative;top:5px;"></span> ' + cost);
+                }
+
+                purchaseButton.on('click', function () {
+                    buyButtonClicked(window.location.pathname.split("/")[3],
+                        $('#top-center').find('h1').text(),
+                        $('#creator').find('.value').text(),
+                        cost,
+                        href);
+                });
+                maybeAddPurchasesButton();
+            }
+        }
+
+        injectUnfocusOnSearch();
     }
 
     function updateClaraCode() {
@@ -140,7 +450,7 @@
 
                 // One file request at a time.
                 if (isPreparing) {
-                    console.log("WARNIKNG: Clara.io FBX: Prepare only one download at a time");
+                    console.log("WARNING: Clara.io FBX: Prepare only one download at a time");
                     return;
                 }
 
@@ -162,7 +472,7 @@
                 // Reference: https://clara.io/learn/sdk/api/export
 
                 //var XMLHTTPREQUEST_URL = "https://clara.io/api/scenes/{uuid}/export/fbx?zip=true&centerScene=true&alignSceneGround=true&fbxUnit=Meter&fbxVersion=7&fbxEmbedTextures=true&imageFormat=WebGL";
-                // 13 Jan 2017: Specify FBX version 5 and remove some options in order to make Clara.io site more likely to 
+                // 13 Jan 2017: Specify FBX version 5 and remove some options in order to make Clara.io site more likely to
                 // be successful in generating zip files.
                 var XMLHTTPREQUEST_URL = "https://clara.io/api/scenes/{uuid}/export/fbx?fbxUnit=Meter&fbxVersion=5&fbxEmbedTextures=true&imageFormat=WebGL";
 
@@ -308,25 +618,16 @@
         }
     }
 
-    function onLoad() {
-
-        EventBridge.scriptEventReceived.connect(function (message) {
-            if (message.slice(0, CAN_WRITE_ASSETS.length) === CAN_WRITE_ASSETS) {
-                canWriteAssets = message.slice(-4) === "true";
-            }
-
-            if (message.slice(0, CLARA_IO_CANCEL_DOWNLOAD.length) === CLARA_IO_CANCEL_DOWNLOAD) {
-                cancelClaraDownload();
-            }
-        });
-
+    function injectCode() {
         var DIRECTORY = 0;
         var HIFI = 1;
         var CLARA = 2;
+        var HIFI_ITEM_PAGE = 3;
         var pageType = DIRECTORY;
 
         if (location.href.indexOf("highfidelity.com/") !== -1) { pageType = HIFI; }
         if (location.href.indexOf("clara.io/") !== -1) { pageType = CLARA; }
+        if (location.href.indexOf("highfidelity.com/marketplace/items/") !== -1) { pageType = HIFI_ITEM_PAGE; }
 
         injectCommonCode(pageType === DIRECTORY);
         switch (pageType) {
@@ -339,10 +640,42 @@
             case CLARA:
                 injectClaraCode();
                 break;
+            case HIFI_ITEM_PAGE:
+                injectHiFiItemPageCode();
+                break;
+
         }
     }
 
+    function onLoad() {
+        EventBridge.scriptEventReceived.connect(function (message) {
+            if (message.slice(0, CAN_WRITE_ASSETS.length) === CAN_WRITE_ASSETS) {
+                canWriteAssets = message.slice(-4) === "true";
+            } else if (message.slice(0, CLARA_IO_CANCEL_DOWNLOAD.length) === CLARA_IO_CANCEL_DOWNLOAD) {
+                cancelClaraDownload();
+            } else {
+                var parsedJsonMessage = JSON.parse(message);
+
+                if (parsedJsonMessage.type === "marketplaces") {
+                    if (parsedJsonMessage.action === "commerceSetting") {
+                        commerceMode = !!parsedJsonMessage.data.commerceMode;
+                        userIsLoggedIn = !!parsedJsonMessage.data.userIsLoggedIn;
+                        walletNeedsSetup = !!parsedJsonMessage.data.walletNeedsSetup;
+                        metaverseServerURL = parsedJsonMessage.data.metaverseServerURL;
+                        injectCode();
+                    }
+                }
+            }
+        });
+
+        // Request commerce setting
+        // Code is injected into the webpage after the setting comes back.
+        EventBridge.emitWebEvent(JSON.stringify({
+            type: "REQUEST_SETTING"
+        }));
+    }
+
     // Load / unload.
     window.addEventListener("load", onLoad);  // More robust to Web site issues than using $(document).ready().
-
+    window.addEventListener("page:change", onLoad);  // Triggered after Marketplace HTML is changed
 }());
diff --git a/scripts/system/html/marketplaces.html b/scripts/system/html/marketplaces.html
index 6051a9df96..9e001c064f 100644
--- a/scripts/system/html/marketplaces.html
+++ b/scripts/system/html/marketplaces.html
@@ -25,25 +25,25 @@
                 </div>
                 <div class="marketplace-tile-second-column">
                     <p class="marketplace-tile-description">This is the default High Fidelity marketplace.  Viewing and downloading content from here is fully supported in Interface.</p>
-                    <div class="exploreButton-holder">
-                        <input class="blue exploreButton" type="button" value="Explore" id="exploreHifiMarketplace" />
-                    </div>
-                    <hr class="tile-divider">
                 </div>
-                <div class="marketplace-tile">
-                    <div class="marketplace-tile-first-column">
-                        <img class="marketplace-tile-image" src="img/clara-tile.png">
-                    </div>
-                    <div class="marketplace-tile-second-column">
-                        <p class="marketplace-tile-description">Clara.io has thousands of models available for importing into High Fidelity.  Follow these steps for the best experience:</p>
-                        <ol class="marketplace-clara-steps">
-                            <li><a id="claraSignUp" href="http://www.clara.io/signup">Create an account here </a>or log in as an existing user.</li>
-                            <li>Choose a model from the list and click &ldquo;Download to High Fidelity&rdquo;.</li>
-                        </ol>
-                        <div class="exploreButton-holder">
-                            <input class="blue exploreButton" type="button" value="Explore" id="exploreClaraMarketplace" />
-                        </div>
-                    </div>
+                <div class="exploreButton-holder">
+                    <input class="blue exploreButton" type="button" value="Explore" id="exploreHifiMarketplace" />
+                </div>
+                <hr class="tile-divider">
+            </div>
+            <div class="marketplace-tile">
+                <div class="marketplace-tile-first-column">
+                    <img class="marketplace-tile-image" src="img/clara-tile.png">
+                </div>
+                <div class="marketplace-tile-second-column">
+                    <p class="marketplace-tile-description">Clara.io has thousands of models available for importing into High Fidelity.  Follow these steps for the best experience:</p>
+                    <ol class="marketplace-clara-steps">
+                        <li><a id="claraSignUp" href="http://www.clara.io/signup">Create an account here </a>or log in as an existing user.</li>
+                        <li>Choose a model from the list and click &ldquo;Download to High Fidelity&rdquo;.</li>
+                    </ol>
+                </div>
+                <div class="exploreButton-holder">
+                    <input class="blue exploreButton" type="button" value="Explore" id="exploreClaraMarketplace" />
                 </div>
             </div>
         </div>
diff --git a/scripts/system/libraries/WebTablet.js b/scripts/system/libraries/WebTablet.js
index b429a9f3ae..c46cfaa073 100644
--- a/scripts/system/libraries/WebTablet.js
+++ b/scripts/system/libraries/WebTablet.js
@@ -8,14 +8,12 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 /* global getControllerWorldLocation, Tablet, WebTablet:true, HMD, Settings, Script,
-   Vec3, Quat, MyAvatar, Entities, Overlays, Camera, Messages, Xform, clamp, Controller, Mat4 */
+   Vec3, Quat, MyAvatar, Entities, Overlays, Camera, Messages, Xform, clamp, Controller, Mat4, resizeTablet */
 
 Script.include(Script.resolvePath("../libraries/utils.js"));
 Script.include(Script.resolvePath("../libraries/controllers.js"));
 Script.include(Script.resolvePath("../libraries/Xform.js"));
 
-var VEC3_ZERO = {x: 0, y: 0, z: 0};
-var X_AXIS = {x: 1, y: 0, z: 0};
 var Y_AXIS = {x: 0, y: 1, z: 0};
 var DEFAULT_DPI = 34;
 var DEFAULT_WIDTH = 0.4375;
@@ -25,12 +23,12 @@ var CAMERA_MATRIX = -7;
 var ROT_Y_180 = {x: 0.0, y: 1.0, z: 0, w: 0};
 var ROT_LANDSCAPE = {x: 1.0, y: 1.0, z: 0, w: 0};
 var ROT_LANDSCAPE_WINDOW = {x: 0.0, y: 0.0, z: 0.0, w: 0};
-var ROT_IDENT = {x: 0, y: 0, z: 0, w: 1};
 var TABLET_TEXTURE_RESOLUTION = { x: 480, y: 706 };
 var INCHES_TO_METERS = 1 / 39.3701;
-var AVATAR_SELF_ID = "{00000000-0000-0000-0000-000000000001}";
 
 var NO_HANDS = -1;
+var DELAY_FOR_30HZ = 33; // milliseconds
+
 
 // will need to be recaclulated if dimensions of fbx model change.
 var TABLET_NATURAL_DIMENSIONS = {x: 33.797, y: 50.129, z: 2.269};
@@ -43,56 +41,20 @@ var LOCAL_TABLET_MODEL_PATH = Script.resourcesPath() + "meshes/tablet-with-home-
 // returns object with two fields:
 //    * position - position in front of the user
 //    * rotation - rotation of entity so it faces the user.
-function calcSpawnInfo(hand, tabletHeight) {
+function calcSpawnInfo(hand, landscape) {
     var finalPosition;
 
     var headPos = (HMD.active && Camera.mode === "first person") ? HMD.position : Camera.position;
     var headRot = (HMD.active && Camera.mode === "first person") ? HMD.orientation : Camera.orientation;
 
-    if (!hand) {
-        hand = NO_HANDS;
-    }
-
-    var handController = null;
-    if (HMD.active && hand !== NO_HANDS) {
-        handController = getControllerWorldLocation(hand, true);
-    }
-
-    if (handController && handController.valid) {
-        // Orient tablet per hand pitch and yaw.
-        // Angle it back similar to holding it like a book.
-        // Move tablet up so that hand is at bottom.
-        // Move tablet back so that hand is in front.
-
-        var position = handController.position;
-        var rotation = handController.rotation;
-
-        if (hand === Controller.Standard.LeftHand) {
-            rotation = Quat.multiply(rotation, Quat.fromPitchYawRollDegrees(0, 90, 0));
-        } else {
-            rotation = Quat.multiply(rotation, Quat.fromPitchYawRollDegrees(0, -90, 0));
-        }
-        var normal = Vec3.multiplyQbyV(rotation, Vec3.UNIT_NEG_Y);
-        var lookAt = Quat.lookAt(Vec3.ZERO, normal, Vec3.multiplyQbyV(MyAvatar.orientation, Vec3.UNIT_Y));
-        var TABLET_RAKE_ANGLE = 30;
-        rotation = Quat.multiply(Quat.angleAxis(TABLET_RAKE_ANGLE, Vec3.multiplyQbyV(lookAt, Vec3.UNIT_X)), lookAt);
-
-        var RELATIVE_SPAWN_OFFSET = { x: 0, y: 0.4, z: 0.05 };
-        position = Vec3.sum(position, Vec3.multiplyQbyV(rotation, Vec3.multiply(tabletHeight, RELATIVE_SPAWN_OFFSET)));
-
-        return {
-            position: position,
-            rotation: rotation
-        };
-    } else {
-        var forward = Quat.getForward(headRot);
-        finalPosition = Vec3.sum(headPos, Vec3.multiply(0.6, forward));
-        var orientation = Quat.lookAt({x: 0, y: 0, z: 0}, forward, {x: 0, y: 1, z: 0});
-        return {
-            position: finalPosition,
-            rotation: Quat.multiply(orientation, {x: 0, y: 1, z: 0, w: 0})
-        };
-    }
+    var forward = Quat.getForward(headRot);
+    var FORWARD_OFFSET = 0.5 * MyAvatar.sensorToWorldScale;
+    finalPosition = Vec3.sum(headPos, Vec3.multiply(FORWARD_OFFSET, forward));
+    var orientation = Quat.lookAt({x: 0, y: 0, z: 0}, forward, Vec3.multiplyQbyV(MyAvatar.orientation, Vec3.UNIT_Y));
+    return {
+        position: finalPosition,
+        rotation: landscape ? Quat.multiply(orientation, ROT_LANDSCAPE) : Quat.multiply(orientation, ROT_Y_180)
+    };
 }
 
 /**
@@ -107,19 +69,22 @@ WebTablet = function (url, width, dpi, hand, clientOnly, location, visible) {
 
     var _this = this;
 
+    var sensorScaleFactor = MyAvatar.sensorToWorldScale;
+
     // scale factor of natural tablet dimensions.
-    this.width = width || DEFAULT_WIDTH;
-    var tabletScaleFactor = this.width / TABLET_NATURAL_DIMENSIONS.x;
-    this.height = TABLET_NATURAL_DIMENSIONS.y * tabletScaleFactor;
-    this.depth = TABLET_NATURAL_DIMENSIONS.z * tabletScaleFactor;
+    var tabletWidth = (width || DEFAULT_WIDTH) * sensorScaleFactor;
+    var tabletScaleFactor = tabletWidth / TABLET_NATURAL_DIMENSIONS.x;
+    var tabletHeight = TABLET_NATURAL_DIMENSIONS.y * tabletScaleFactor;
+    var tabletDepth = TABLET_NATURAL_DIMENSIONS.z * tabletScaleFactor;
     this.landscape = false;
 
     visible = visible === true;
 
+    var tabletDpi;
     if (dpi) {
-        this.dpi = dpi;
+        tabletDpi = dpi;
     } else {
-        this.dpi = DEFAULT_DPI * (DEFAULT_WIDTH / this.width);
+        tabletDpi = DEFAULT_DPI * (DEFAULT_WIDTH / tabletWidth);
     }
 
     var modelURL = LOCAL_TABLET_MODEL_PATH;
@@ -133,8 +98,8 @@ WebTablet = function (url, width, dpi, hand, clientOnly, location, visible) {
         userData: JSON.stringify({
             "grabbableKey": {"grabbable": true}
         }),
-        dimensions: this.getDimensions(),
-        parentID: AVATAR_SELF_ID,
+        dimensions: { x: tabletWidth, y: tabletHeight, z: tabletDepth },
+        parentID: MyAvatar.SELF_ID,
         visible: visible
     };
 
@@ -153,8 +118,8 @@ WebTablet = function (url, width, dpi, hand, clientOnly, location, visible) {
         Overlays.deleteOverlay(this.webOverlayID);
     }
 
-    var WEB_ENTITY_Z_OFFSET = (this.depth / 2);
-    var WEB_ENTITY_Y_OFFSET = 0.004;
+    var WEB_ENTITY_Z_OFFSET = (tabletDepth / 2) * (1 / sensorScaleFactor);
+    var WEB_ENTITY_Y_OFFSET = 0.004 * (1 / sensorScaleFactor);
 
     this.webOverlayID = Overlays.addOverlay("web3d", {
         name: "WebTablet Web",
@@ -162,17 +127,16 @@ WebTablet = function (url, width, dpi, hand, clientOnly, location, visible) {
         localPosition: { x: 0, y: WEB_ENTITY_Y_OFFSET, z: -WEB_ENTITY_Z_OFFSET },
         localRotation: Quat.angleAxis(180, Y_AXIS),
         resolution: this.getTabletTextureResolution(),
-        dpi: this.dpi,
+        dpi: tabletDpi,
         color: { red: 255, green: 255, blue: 255 },
         alpha: 1.0,
         parentID: this.tabletEntityID,
         parentJointIndex: -1,
         showKeyboardFocusHighlight: false,
-        isAA: HMD.active,
         visible: visible
     });
 
-    var HOME_BUTTON_Y_OFFSET = (this.height / 2) - (this.height / 20);
+    var HOME_BUTTON_Y_OFFSET = ((tabletHeight / 2) - (tabletHeight / 20)) * (1 / sensorScaleFactor);
     this.homeButtonID = Overlays.addOverlay("sphere", {
         name: "homeButton",
         localPosition: {x: -0.001, y: -HOME_BUTTON_Y_OFFSET, z: 0.0},
@@ -185,6 +149,23 @@ WebTablet = function (url, width, dpi, hand, clientOnly, location, visible) {
         parentJointIndex: -1
     });
 
+    this.homeButtonHighlightID = Overlays.addOverlay("circle3d", {
+        name: "homeButtonHighlight",
+        localPosition: { x: 0, y: -HOME_BUTTON_Y_OFFSET + 0.003, z: -0.0158 },
+        localRotation: { x: 0, y: 1, z: 0, w: 0 },
+        dimensions: { x: 4 * tabletScaleFactor, y: 4 * tabletScaleFactor, z: 4 * tabletScaleFactor },
+        solid: true,
+        outerRadius: 25 * tabletScaleFactor,
+        innerRadius: 20 * tabletScaleFactor,
+        ignoreIntersection: true,
+        alpha: 1.0,
+        color: { red: 255, green: 255, blue: 255 },
+        visible: visible,
+        drawInFront: false,
+        parentID: this.tabletEntityID,
+        parentJointIndex: -1
+     });
+
     this.receive = function (channel, senderID, senderUUID, localOnly) {
         if (_this.homeButtonID == senderID) {
             var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
@@ -205,6 +186,23 @@ WebTablet = function (url, width, dpi, hand, clientOnly, location, visible) {
         }
     };
 
+    this.myOnHoverEnterOverlay = function (overlayID, pointerEvent) {
+        _this.onHoverEnterOverlay(overlayID, pointerEvent);
+    };
+
+    Overlays.hoverEnterOverlay.connect(this.myOnHoverEnterOverlay);
+
+    this.myOnHoverLeaveOverlay = function (overlayID, pointerEvent) {
+        _this.onHoverLeaveOverlay(overlayID, pointerEvent);
+    };
+
+    Overlays.hoverLeaveOverlay.connect(this.myOnHoverLeaveOverlay);
+
+    this.myOnHoverOverOverlay = function (overlayID, pointerEvent) {
+        _this.onHoverOverOverlay(overlayID, pointerEvent);
+    };
+    Overlays.hoverOverOverlay.connect(this.myOnHoverOverOverlay);
+
     this.state = "idle";
 
     this.getRoot = function() {
@@ -249,10 +247,6 @@ WebTablet = function (url, width, dpi, hand, clientOnly, location, visible) {
     Camera.modeUpdated.connect(this.myCameraModeChanged);
 };
 
-WebTablet.prototype.getDimensions = function() {
-    return { x: this.width, y: this.height, z: this.depth };
-};
-
 WebTablet.prototype.getTabletTextureResolution = function() {
     if (this.landscape) {
         return { x: TABLET_TEXTURE_RESOLUTION.y , y: TABLET_TEXTURE_RESOLUTION.x };
@@ -261,6 +255,10 @@ WebTablet.prototype.getTabletTextureResolution = function() {
     }
 };
 
+WebTablet.prototype.getLandscape = function() {
+    return this.landscape;
+}
+
 WebTablet.prototype.setLandscape = function(newLandscapeValue) {
     if (this.landscape === newLandscapeValue) {
         return;
@@ -303,37 +301,19 @@ WebTablet.prototype.getOverlayObject = function () {
 };
 
 WebTablet.prototype.setWidth = function (width) {
-
-    // scale factor of natural tablet dimensions.
-    this.width = width || DEFAULT_WIDTH;
-    var tabletScaleFactor = this.width / TABLET_NATURAL_DIMENSIONS.x;
-    this.height = TABLET_NATURAL_DIMENSIONS.y * tabletScaleFactor;
-    this.depth = TABLET_NATURAL_DIMENSIONS.z * tabletScaleFactor;
-    this.dpi = DEFAULT_DPI * (DEFAULT_WIDTH / this.width);
-
-    // update tablet model dimensions
-    Overlays.editOverlay(this.tabletEntityID, { dimensions: this.getDimensions() });
-
-    // update webOverlay
-    var WEB_ENTITY_Z_OFFSET = (this.depth / 2);
-    var WEB_ENTITY_Y_OFFSET = 0.004;
-    Overlays.editOverlay(this.webOverlayID, {
-        localPosition: { x: 0, y: WEB_ENTITY_Y_OFFSET, z: -WEB_ENTITY_Z_OFFSET },
-        dpi: this.dpi
-    });
-
-    // update homeButton
-    var HOME_BUTTON_Y_OFFSET = (this.height / 2) - (this.height / 20);
-    Overlays.editOverlay(this.homeButtonID, {
-        localPosition: {x: -0.001, y: -HOME_BUTTON_Y_OFFSET, z: 0.0},
-        dimensions: { x: 4 * tabletScaleFactor, y: 4 * tabletScaleFactor, z: 4 * tabletScaleFactor}
-    });
+    // imported from libraries/utils.js
+    resizeTablet(width);
 };
 
 WebTablet.prototype.destroy = function () {
+    Overlays.hoverEnterOverlay.disconnect(this.myOnHoverEnterOverlay);
+    Overlays.hoverLeaveOverlay.disconnect(this.myOnHoverLeaveOverlay);
+    Overlays.hoverOverOverlay.disconnect(this.myOnHoverOverOverlay);
+
     Overlays.deleteOverlay(this.webOverlayID);
     Overlays.deleteOverlay(this.tabletEntityID);
     Overlays.deleteOverlay(this.homeButtonID);
+    Overlays.deleteOverlay(this.homeButtonHighlightID);
     HMD.displayModeChanged.disconnect(this.myOnHmdChanged);
 
     Controller.mousePressEvent.disconnect(this.myMousePressEvent);
@@ -347,11 +327,9 @@ WebTablet.prototype.destroy = function () {
 WebTablet.prototype.geometryChanged = function (geometry) {
     if (!HMD.active) {
         var tabletProperties = {};
-
         // compute position, rotation & parentJointIndex of the tablet
         this.calculateTabletAttachmentProperties(NO_HANDS, false, tabletProperties);
-        // TODO -- is this still needed?
-        // Entities.editEntity(this.tabletEntityID, tabletProperties);
+        Overlays.editOverlay(HMD.tabletID, tabletProperties);
     }
 };
 
@@ -382,10 +360,19 @@ WebTablet.prototype.calculateWorldAttitudeRelativeToCamera = function (windowPos
     windowPos.y = clamp(windowPos.y, Y_CLAMP, Window.innerHeight - Y_CLAMP);
 
     var fov = (Settings.getValue('fieldOfView') || DEFAULT_VERTICAL_FIELD_OF_VIEW) * (Math.PI / 180);
+
+    // scale factor of natural tablet dimensions.
+    var sensorScaleFactor = MyAvatar.sensorToWorldScale;
+    var tabletWidth = getTabletWidthFromSettings() * sensorScaleFactor;
+    var tabletScaleFactor = tabletWidth / TABLET_NATURAL_DIMENSIONS.x;
+    var tabletHeight = TABLET_NATURAL_DIMENSIONS.y * tabletScaleFactor;
+    var tabletDepth = TABLET_NATURAL_DIMENSIONS.z * tabletScaleFactor;
+    var tabletDpi = DEFAULT_DPI * (DEFAULT_WIDTH / tabletWidth);
+
     var MAX_PADDING_FACTOR = 2.2;
     var PADDING_FACTOR = Math.min(Window.innerHeight / this.getTabletTextureResolution().y, MAX_PADDING_FACTOR);
-    var TABLET_HEIGHT = (this.getTabletTextureResolution().y / this.dpi) * INCHES_TO_METERS;
-    var WEB_ENTITY_Z_OFFSET = (this.depth / 2);
+    var TABLET_HEIGHT = (this.getTabletTextureResolution().y / tabletDpi) * INCHES_TO_METERS;
+    var WEB_ENTITY_Z_OFFSET = (tabletDepth / 2);
 
     // calcualte distance from camera
     var dist = (PADDING_FACTOR * TABLET_HEIGHT) / (2 * Math.tan(fov / 2) * (DESKTOP_TABLET_SCALE / 100)) - WEB_ENTITY_Z_OFFSET;
@@ -418,6 +405,24 @@ WebTablet.prototype.calculateWorldAttitudeRelativeToCamera = function (windowPos
     };
 };
 
+WebTablet.prototype.onHoverEnterOverlay = function (overlayID, pointerEvent) {
+    if (overlayID === this.homeButtonID) {
+        Overlays.editOverlay(this.homeButtonHighlightID, { alpha: 1.0 });
+    }
+}
+
+WebTablet.prototype.onHoverOverOverlay = function (overlayID, pointerEvent) {
+    if (overlayID !== this.homeButtonID) {
+        Overlays.editOverlay(this.homeButtonHighlightID, { alpha: 0.0 });
+    }
+}
+
+WebTablet.prototype.onHoverLeaveOverlay = function (overlayID, pointerEvent) {
+    if (overlayID === this.homeButtonID) {
+        Overlays.editOverlay(this.homeButtonHighlightID, { alpha: 0.0 });
+    }
+}
+
 // compute position, rotation & parentJointIndex of the tablet
 WebTablet.prototype.calculateTabletAttachmentProperties = function (hand, useMouse, tabletProperties) {
     if (HMD.active) {
@@ -425,7 +430,7 @@ WebTablet.prototype.calculateTabletAttachmentProperties = function (hand, useMou
         tabletProperties.parentJointIndex = SENSOR_TO_ROOM_MATRIX;
 
         // compute the appropriate position of the tablet, near the hand controller that was used to spawn it.
-        var spawnInfo = calcSpawnInfo(hand, this.height);
+        var spawnInfo = calcSpawnInfo(hand, this.landscape);
         tabletProperties.position = spawnInfo.position;
         tabletProperties.rotation = spawnInfo.rotation;
     } else {
@@ -448,16 +453,10 @@ WebTablet.prototype.calculateTabletAttachmentProperties = function (hand, useMou
 };
 
 WebTablet.prototype.onHmdChanged = function () {
-
     var tabletProperties = {};
     // compute position, rotation & parentJointIndex of the tablet
     this.calculateTabletAttachmentProperties(NO_HANDS, false, tabletProperties);
-    // TODO -- is this still needed?
-    // Entities.editEntity(this.tabletEntityID, tabletProperties);
-
-    // Full scene FXAA should be disabled on the overlay when the tablet in desktop mode.
-    // This should make the text more readable.
-    Overlays.editOverlay(this.webOverlayID, { isAA: HMD.active });
+    Overlays.editOverlay(HMD.tabletID, tabletProperties);
 };
 
 WebTablet.prototype.pickle = function () {
@@ -471,7 +470,7 @@ WebTablet.prototype.register = function() {
 
 WebTablet.prototype.cleanUpOldTabletsOnJoint = function(jointIndex) {
     var children = Entities.getChildrenIDsOfJoint(MyAvatar.sessionUUID, jointIndex);
-    children = children.concat(Entities.getChildrenIDsOfJoint(AVATAR_SELF_ID, jointIndex));
+    children = children.concat(Entities.getChildrenIDsOfJoint(MyAvatar.SELF_ID, jointIndex));
     children.forEach(function(childID) {
         var props = Entities.getEntityProperties(childID, ["name"]);
         if (props.name === "WebTablet Tablet") {
@@ -537,16 +536,7 @@ WebTablet.prototype.mousePressEvent = function (event) {
 };
 
 WebTablet.prototype.cameraModeChanged = function (newMode) {
-    // reposition the tablet.
-    // This allows HMD.position to reflect the new camera mode.
-    if (HMD.active) {
-        var self = this;
-        var tabletProperties = {};
-        // compute position, rotation & parentJointIndex of the tablet
-        self.calculateTabletAttachmentProperties(NO_HANDS, false, tabletProperties);
-        // TODO -- is this still needed?
-        // Entities.editEntity(self.tabletEntityID, tabletProperties);
-    }
+    ;
 };
 
 function rayIntersectPlane(planePosition, planeNormal, rayStart, rayDirection) {
@@ -561,9 +551,47 @@ function rayIntersectPlane(planePosition, planeNormal, rayStart, rayDirection) {
     }
 }
 
+WebTablet.prototype.scheduleMouseMoveProcessor = function() {
+    var _this = this;
+    if (!this.moveEventTimer) {
+        this.moveEventTimer = Script.setTimeout(function() {
+            _this.mouseMoveProcessor();
+        }, DELAY_FOR_30HZ);
+    }
+};
+
+WebTablet.prototype.handleHomeButtonHover = function(x, y) {
+    var pickRay = Camera.computePickRay(x, y);
+    var entityPickResults;
+    var homebuttonHovered = false;
+    entityPickResults = Overlays.findRayIntersection(pickRay, true, [this.tabletEntityID]);
+    if (entityPickResults.intersects && (entityPickResults.entityID === this.tabletEntityID ||
+        entityPickResults.overlayID === this.tabletEntityID)) {
+        var overlayPickResults = Overlays.findRayIntersection(pickRay, true, [this.homeButtonID], []);
+        if (overlayPickResults.intersects && overlayPickResults.overlayID === this.homeButtonID) {
+            homebuttonHovered = true;
+        }
+    }
+
+    Overlays.editOverlay(this.homeButtonHighlightID, { alpha: homebuttonHovered ? 1.0 : 0.0 });
+}
+
 WebTablet.prototype.mouseMoveEvent = function (event) {
     if (this.dragging) {
-        var pickRay = Camera.computePickRay(event.x, event.y);
+        this.currentMouse = {
+            x: event.x,
+            y: event.y
+        };
+        this.scheduleMouseMoveProcessor();
+    } else {
+        this.handleHomeButtonHover(event.x, event.y);
+    }
+};
+
+WebTablet.prototype.mouseMoveProcessor = function () {
+    this.moveEventTimer = null;
+    if (this.dragging) {
+        var pickRay = Camera.computePickRay(this.currentMouse.x, this.currentMouse.y);
 
         // transform pickRay into camera local coordinates
         var invCameraXform = new Xform(Camera.orientation, Camera.position).inv();
@@ -582,6 +610,9 @@ WebTablet.prototype.mouseMoveEvent = function (event) {
                 localPosition: localPosition
             });
         }
+        this.scheduleMouseMoveProcessor();
+    } else {
+        this.handleHomeButtonHover(this.currentMouse.x, this.currentMouse.y);
     }
 };
 
diff --git a/scripts/system/libraries/accountUtils.js b/scripts/system/libraries/accountUtils.js
new file mode 100644
index 0000000000..6df0aa3a87
--- /dev/null
+++ b/scripts/system/libraries/accountUtils.js
@@ -0,0 +1,16 @@
+//
+//  accountUtils.js
+//  scripts/system/libraries/libraries
+//
+//  Copyright 2017 High Fidelity, Inc.
+//
+
+openLoginWindow = function openLoginWindow() {
+    if ((HMD.active && Settings.getValue("hmdTabletBecomesToolbar", false))
+        || (!HMD.active && Settings.getValue("desktopTabletBecomesToolbar", true))) {
+        Menu.triggerOption("Login / Sign Up");
+    } else {
+        tablet.loadQMLOnTop("../../dialogs/TabletLoginDialog.qml");
+        HMD.openTablet();
+    }
+};        
diff --git a/scripts/system/libraries/cloneEntityUtils.js b/scripts/system/libraries/cloneEntityUtils.js
new file mode 100644
index 0000000000..63b161eb80
--- /dev/null
+++ b/scripts/system/libraries/cloneEntityUtils.js
@@ -0,0 +1,97 @@
+"use strict";
+
+//  cloneEntity.js
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+
+/* global entityIsCloneable:true, getGrabbableData:true, cloneEntity:true, propsAreCloneDynamic:true, Script,
+   propsAreCloneDynamic:true, Entities*/
+
+Script.include("/~/system/libraries/controllerDispatcherUtils.js");
+
+// Object assign  polyfill
+if (typeof Object.assign !== 'function') {
+    Object.assign = function(target, varArgs) {
+        if (target === null) {
+            throw new TypeError('Cannot convert undefined or null to object');
+        }
+        var to = Object(target);
+        for (var index = 1; index < arguments.length; index++) {
+            var nextSource = arguments[index];
+            if (nextSource !== null) {
+                for (var nextKey in nextSource) {
+                    if (Object.prototype.hasOwnProperty.call(nextSource, nextKey)) {
+                        to[nextKey] = nextSource[nextKey];
+                    }
+                }
+            }
+        }
+        return to;
+    };
+}
+
+entityIsCloneable = function(props) {
+    if (props) {
+        var grabbableData = getGrabbableData(props);
+        return grabbableData.cloneable;
+    }
+    return false;
+};
+
+propsAreCloneDynamic = function(props) {
+    var cloneable = entityIsCloneable(props);
+    if (cloneable) {
+        var grabInfo = getGrabbableData(props);
+        if (grabInfo.cloneDynamic) {
+            return true;
+        }
+    }
+    return false;
+};
+
+
+cloneEntity = function(props, worldEntityProps) {
+    // we need all the properties, for this
+    var cloneableProps = Entities.getEntityProperties(props.id);
+
+    var count = 0;
+    worldEntityProps.forEach(function(itemWE) {
+        if (itemWE.name.indexOf('-clone-' + cloneableProps.id) !== -1) {
+            count++;
+        }
+    });
+
+    var grabInfo = getGrabbableData(cloneableProps);
+    var limit = grabInfo.cloneLimit ? grabInfo.cloneLimit : 0;
+    if (count >= limit && limit !== 0) {
+        return null;
+    }
+
+    cloneableProps.name = cloneableProps.name + '-clone-' + cloneableProps.id;
+    var lifetime = grabInfo.cloneLifetime ? grabInfo.cloneLifetime : 300;
+    var dynamic = grabInfo.cloneDynamic ? grabInfo.cloneDynamic : false;
+    var triggerable = grabInfo.triggerable ? grabInfo.triggerable : false;
+    var avatarEntity = grabInfo.cloneAvatarEntity ? grabInfo.cloneAvatarEntity : false;
+    var cUserData = Object.assign({}, JSON.parse(cloneableProps.userData));
+    var cProperties = Object.assign({}, cloneableProps);
+
+
+    delete cUserData.grabbableKey.cloneLifetime;
+    delete cUserData.grabbableKey.cloneable;
+    delete cUserData.grabbableKey.cloneDynamic;
+    delete cUserData.grabbableKey.cloneLimit;
+    delete cUserData.grabbableKey.cloneAvatarEntity;
+    delete cProperties.id;
+
+
+    cProperties.dynamic = dynamic;
+    cProperties.locked = false;
+    cUserData.grabbableKey.triggerable = triggerable;
+    cUserData.grabbableKey.grabbable = true;
+    cProperties.lifetime = lifetime;
+    cProperties.userData = JSON.stringify(cUserData);
+
+    var cloneID = Entities.addEntity(cProperties, avatarEntity);
+    return cloneID;
+};
diff --git a/scripts/system/libraries/controllerDispatcherUtils.js b/scripts/system/libraries/controllerDispatcherUtils.js
new file mode 100644
index 0000000000..fb6de0e683
--- /dev/null
+++ b/scripts/system/libraries/controllerDispatcherUtils.js
@@ -0,0 +1,390 @@
+"use strict";
+
+//  controllerDispatcherUtils.js
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+
+
+/* global module, Camera, HMD, MyAvatar, controllerDispatcherPlugins:true, Quat, Vec3, Overlays, Xform,
+   MSECS_PER_SEC:true , LEFT_HAND:true, RIGHT_HAND:true, FORBIDDEN_GRAB_TYPES:true,
+   HAPTIC_PULSE_STRENGTH:true, HAPTIC_PULSE_DURATION:true, ZERO_VEC:true, ONE_VEC:true,
+   DEFAULT_REGISTRATION_POINT:true, INCHES_TO_METERS:true,
+   TRIGGER_OFF_VALUE:true,
+   TRIGGER_ON_VALUE:true,
+   PICK_MAX_DISTANCE:true,
+   DEFAULT_SEARCH_SPHERE_DISTANCE:true,
+   NEAR_GRAB_PICK_RADIUS:true,
+   COLORS_GRAB_SEARCHING_HALF_SQUEEZE:true,
+   COLORS_GRAB_SEARCHING_FULL_SQUEEZE:true,
+   COLORS_GRAB_DISTANCE_HOLD:true,
+   NEAR_GRAB_RADIUS:true,
+   DISPATCHER_PROPERTIES:true,
+   HAPTIC_PULSE_STRENGTH:true,
+   HAPTIC_PULSE_DURATION:true,
+   Entities,
+   makeDispatcherModuleParameters:true,
+   makeRunningValues:true,
+   enableDispatcherModule:true,
+   disableDispatcherModule:true,
+   getEnabledModuleByName:true,
+   getGrabbableData:true,
+   entityIsGrabbable:true,
+   entityIsDistanceGrabbable:true,
+   getControllerJointIndex:true,
+   propsArePhysical:true,
+   controllerDispatcherPluginsNeedSort:true,
+   projectOntoXYPlane:true,
+   getChildrenProps:true,
+   projectOntoEntityXYPlane:true,
+   projectOntoOverlayXYPlane:true,
+   entityHasActions:true,
+   ensureDynamic:true,
+   findGroupParent:true,
+   BUMPER_ON_VALUE:true,
+   getEntityParents:true,
+   findHandChildEntities:true,
+   TEAR_AWAY_DISTANCE:true,
+   TEAR_AWAY_COUNT:true,
+   TEAR_AWAY_CHECK_TIME:true,
+   distanceBetweenPointAndEntityBoundingBox:true
+*/
+
+MSECS_PER_SEC = 1000.0;
+INCHES_TO_METERS = 1.0 / 39.3701;
+
+HAPTIC_PULSE_STRENGTH = 1.0;
+HAPTIC_PULSE_DURATION = 13.0;
+
+ZERO_VEC = { x: 0, y: 0, z: 0 };
+ONE_VEC = { x: 1, y: 1, z: 1 };
+
+LEFT_HAND = 0;
+RIGHT_HAND = 1;
+
+FORBIDDEN_GRAB_TYPES = ["Unknown", "Light", "PolyLine", "Zone"];
+
+HAPTIC_PULSE_STRENGTH = 1.0;
+HAPTIC_PULSE_DURATION = 13.0;
+
+DEFAULT_REGISTRATION_POINT = { x: 0.5, y: 0.5, z: 0.5 };
+
+TRIGGER_OFF_VALUE = 0.1;
+TRIGGER_ON_VALUE = TRIGGER_OFF_VALUE + 0.05; // Squeezed just enough to activate search or near grab
+BUMPER_ON_VALUE = 0.5;
+
+PICK_MAX_DISTANCE = 500; // max length of pick-ray
+DEFAULT_SEARCH_SPHERE_DISTANCE = 1000; // how far from camera to search intersection?
+NEAR_GRAB_PICK_RADIUS = 0.25; // radius used for search ray vs object for near grabbing.
+
+COLORS_GRAB_SEARCHING_HALF_SQUEEZE = { red: 10, green: 10, blue: 255 };
+COLORS_GRAB_SEARCHING_FULL_SQUEEZE = { red: 250, green: 10, blue: 10 };
+COLORS_GRAB_DISTANCE_HOLD = { red: 238, green: 75, blue: 214 };
+
+NEAR_GRAB_RADIUS = 1.0;
+
+TEAR_AWAY_DISTANCE = 0.1; // ungrab an entity if its bounding-box moves this far from the hand
+TEAR_AWAY_COUNT = 2; // multiply by TEAR_AWAY_CHECK_TIME to know how long the item must be away
+TEAR_AWAY_CHECK_TIME = 0.15; // seconds, duration between checks
+
+DISPATCHER_PROPERTIES = [
+    "position",
+    "registrationPoint",
+    "rotation",
+    "gravity",
+    "collidesWith",
+    "dynamic",
+    "collisionless",
+    "locked",
+    "name",
+    "shapeType",
+    "parentID",
+    "parentJointIndex",
+    "density",
+    "dimensions",
+    "userData"
+];
+
+// priority -- a lower priority means the module will be asked sooner than one with a higher priority in a given update step
+// activitySlots -- indicates which "slots" must not yet be in use for this module to start
+// requiredDataForReady -- which "situation" parts this module looks at to decide if it will start
+// sleepMSBetweenRuns -- how long to wait between calls to this module's "run" method
+makeDispatcherModuleParameters = function (priority, activitySlots, requiredDataForReady, sleepMSBetweenRuns) {
+    return {
+        priority: priority,
+        activitySlots: activitySlots,
+        requiredDataForReady: requiredDataForReady,
+        sleepMSBetweenRuns: sleepMSBetweenRuns
+    };
+};
+
+makeRunningValues = function (active, targets, requiredDataForRun) {
+    return {
+        active: active,
+        targets: targets,
+        requiredDataForRun: requiredDataForRun
+    };
+};
+
+enableDispatcherModule = function (moduleName, module, priority) {
+    if (!controllerDispatcherPlugins) {
+        controllerDispatcherPlugins = {};
+    }
+    controllerDispatcherPlugins[moduleName] = module;
+    controllerDispatcherPluginsNeedSort = true;
+};
+
+disableDispatcherModule = function (moduleName) {
+    delete controllerDispatcherPlugins[moduleName];
+    controllerDispatcherPluginsNeedSort = true;
+};
+
+getEnabledModuleByName = function (moduleName) {
+    if (controllerDispatcherPlugins.hasOwnProperty(moduleName)) {
+        return controllerDispatcherPlugins[moduleName];
+    }
+    return null;
+};
+
+getGrabbableData = function (props) {
+    // look in userData for a "grabbable" key, return the value or some defaults
+    var grabbableData = {};
+    var userDataParsed = null;
+    try {
+        if (!props.userDataParsed) {
+            props.userDataParsed = JSON.parse(props.userData);
+        }
+        userDataParsed = props.userDataParsed;
+    } catch (err) {
+        userDataParsed = {};
+    }
+    if (userDataParsed.grabbableKey) {
+        grabbableData = userDataParsed.grabbableKey;
+    }
+    if (!grabbableData.hasOwnProperty("grabbable")) {
+        grabbableData.grabbable = true;
+    }
+    if (!grabbableData.hasOwnProperty("ignoreIK")) {
+        grabbableData.ignoreIK = true;
+    }
+    if (!grabbableData.hasOwnProperty("kinematic")) {
+        grabbableData.kinematic = true;
+    }
+    if (!grabbableData.hasOwnProperty("wantsTrigger")) {
+        grabbableData.wantsTrigger = false;
+    }
+    if (!grabbableData.hasOwnProperty("triggerable")) {
+        grabbableData.triggerable = false;
+    }
+
+    return grabbableData;
+};
+
+entityIsGrabbable = function (props) {
+    var grabbable = getGrabbableData(props).grabbable;
+    if (!grabbable ||
+        props.locked ||
+        FORBIDDEN_GRAB_TYPES.indexOf(props.type) >= 0) {
+        return false;
+    }
+    return true;
+};
+
+entityIsDistanceGrabbable = function(props) {
+    if (!entityIsGrabbable(props)) {
+        return false;
+    }
+
+    // we can't distance-grab non-physical
+    var isPhysical = propsArePhysical(props);
+    if (!isPhysical) {
+        return false;
+    }
+
+    return true;
+};
+
+
+getControllerJointIndex = function (hand) {
+    if (HMD.isHandControllerAvailable()) {
+        var controllerJointIndex = -1;
+        if (Camera.mode === "first person") {
+            controllerJointIndex = MyAvatar.getJointIndex(hand === RIGHT_HAND ?
+                "_CONTROLLER_RIGHTHAND" :
+                "_CONTROLLER_LEFTHAND");
+        } else if (Camera.mode === "third person") {
+            controllerJointIndex = MyAvatar.getJointIndex(hand === RIGHT_HAND ?
+                "_CAMERA_RELATIVE_CONTROLLER_RIGHTHAND" :
+                "_CAMERA_RELATIVE_CONTROLLER_LEFTHAND");
+        }
+
+        return controllerJointIndex;
+    }
+
+    return -1;
+};
+
+propsArePhysical = function (props) {
+    if (!props.dynamic) {
+        return false;
+    }
+    var isPhysical = (props.shapeType && props.shapeType !== 'none');
+    return isPhysical;
+};
+
+projectOntoXYPlane = function (worldPos, position, rotation, dimensions, registrationPoint) {
+    var invRot = Quat.inverse(rotation);
+    var localPos = Vec3.multiplyQbyV(invRot, Vec3.subtract(worldPos, position));
+    var invDimensions = {
+        x: 1 / dimensions.x,
+        y: 1 / dimensions.y,
+        z: 1 / dimensions.z
+    };
+
+    var normalizedPos = Vec3.sum(Vec3.multiplyVbyV(localPos, invDimensions), registrationPoint);
+    return {
+        x: normalizedPos.x * dimensions.x,
+        y: (1 - normalizedPos.y) * dimensions.y // flip y-axis
+    };
+};
+
+projectOntoEntityXYPlane = function (entityID, worldPos, props) {
+    return projectOntoXYPlane(worldPos, props.position, props.rotation, props.dimensions, props.registrationPoint);
+};
+
+projectOntoOverlayXYPlane = function projectOntoOverlayXYPlane(overlayID, worldPos) {
+    var position = Overlays.getProperty(overlayID, "position");
+    var rotation = Overlays.getProperty(overlayID, "rotation");
+    var dimensions;
+
+    var dpi = Overlays.getProperty(overlayID, "dpi");
+    if (dpi) {
+        // Calculate physical dimensions for web3d overlay from resolution and dpi; "dimensions" property is used as a scale.
+        var resolution = Overlays.getProperty(overlayID, "resolution");
+        resolution.z = 1; // Circumvent divide-by-zero.
+        var scale = Overlays.getProperty(overlayID, "dimensions");
+        scale.z = 0.01; // overlay dimensions are 2D, not 3D.
+        dimensions = Vec3.multiplyVbyV(Vec3.multiply(resolution, INCHES_TO_METERS / dpi), scale);
+    } else {
+        dimensions = Overlays.getProperty(overlayID, "dimensions");
+        if (dimensions.z) {
+            dimensions.z = 0.01; // overlay dimensions are 2D, not 3D.
+        }
+    }
+
+    return projectOntoXYPlane(worldPos, position, rotation, dimensions, DEFAULT_REGISTRATION_POINT);
+};
+
+entityHasActions = function (entityID) {
+    return Entities.getActionIDs(entityID).length > 0;
+};
+
+ensureDynamic = function (entityID) {
+    // if we distance hold something and keep it very still before releasing it, it ends up
+    // non-dynamic in bullet.  If it's too still, give it a little bounce so it will fall.
+    var props = Entities.getEntityProperties(entityID, ["velocity", "dynamic", "parentID"]);
+    if (props.dynamic && props.parentID === Uuid.NULL) {
+        var velocity = props.velocity;
+        if (Vec3.length(velocity) < 0.05) { // see EntityMotionState.cpp DYNAMIC_LINEAR_VELOCITY_THRESHOLD
+            velocity = { x: 0.0, y: 0.2, z: 0.0 };
+            Entities.editEntity(entityID, { velocity: velocity });
+        }
+    }
+};
+
+findGroupParent = function (controllerData, targetProps) {
+    while (targetProps.parentID &&
+           targetProps.parentID !== Uuid.NULL &&
+           Entities.getNestableType(targetProps.parentID) == "entity") {
+        var parentProps = Entities.getEntityProperties(targetProps.parentID, DISPATCHER_PROPERTIES);
+        if (!parentProps) {
+            break;
+        }
+        parentProps.id = targetProps.parentID;
+        targetProps = parentProps;
+        controllerData.nearbyEntityPropertiesByID[targetProps.id] = targetProps;
+    }
+
+    return targetProps;
+};
+
+getEntityParents = function(targetProps) {
+    var parentProperties = [];
+    while (targetProps.parentID &&
+           targetProps.parentID !== Uuid.NULL &&
+           Entities.getNestableType(targetProps.parentID) == "entity") {
+        var parentProps = Entities.getEntityProperties(targetProps.parentID, DISPATCHER_PROPERTIES);
+        if (!parentProps) {
+            break;
+        }
+        parentProps.id = targetProps.parentID;
+        targetProps = parentProps;
+        parentProperties.push(parentProps);
+    }
+
+    return parentProperties;
+};
+
+
+findHandChildEntities = function(hand) {
+    // find children of avatar's hand joint
+    var handJointIndex = MyAvatar.getJointIndex(hand === RIGHT_HAND ? "RightHand" : "LeftHand");
+    var children = Entities.getChildrenIDsOfJoint(MyAvatar.sessionUUID, handJointIndex);
+    children = children.concat(Entities.getChildrenIDsOfJoint(MyAvatar.SELF_ID, handJointIndex));
+
+    // find children of faux controller joint
+    var controllerJointIndex = getControllerJointIndex(hand);
+    children = children.concat(Entities.getChildrenIDsOfJoint(MyAvatar.sessionUUID, controllerJointIndex));
+    children = children.concat(Entities.getChildrenIDsOfJoint(MyAvatar.SELF_ID, controllerJointIndex));
+
+    // find children of faux camera-relative controller joint
+    var controllerCRJointIndex = MyAvatar.getJointIndex(hand === RIGHT_HAND ?
+                                                        "_CAMERA_RELATIVE_CONTROLLER_RIGHTHAND" :
+                                                        "_CAMERA_RELATIVE_CONTROLLER_LEFTHAND");
+    children = children.concat(Entities.getChildrenIDsOfJoint(MyAvatar.sessionUUID, controllerCRJointIndex));
+    children = children.concat(Entities.getChildrenIDsOfJoint(MyAvatar.SELF_ID, controllerCRJointIndex));
+
+    return children.filter(function (childID) {
+        var childType = Entities.getNestableType(childID);
+        return childType == "entity";
+    });
+};
+
+distanceBetweenPointAndEntityBoundingBox = function(point, entityProps) {
+    var entityXform = new Xform(entityProps.rotation, entityProps.position);
+    var localPoint = entityXform.inv().xformPoint(point);
+    var minOffset = Vec3.multiplyVbyV(entityProps.registrationPoint, entityProps.dimensions);
+    var maxOffset = Vec3.multiplyVbyV(Vec3.subtract(ONE_VEC, entityProps.registrationPoint), entityProps.dimensions);
+    var localMin = Vec3.subtract(entityXform.trans, minOffset);
+    var localMax = Vec3.sum(entityXform.trans, maxOffset);
+
+    var v = {x: localPoint.x, y: localPoint.y, z: localPoint.z};
+    v.x = Math.max(v.x, localMin.x);
+    v.x = Math.min(v.x, localMax.x);
+    v.y = Math.max(v.y, localMin.y);
+    v.y = Math.min(v.y, localMax.y);
+    v.z = Math.max(v.z, localMin.z);
+    v.z = Math.min(v.z, localMax.z);
+
+    return Vec3.distance(v, localPoint);
+};
+
+if (typeof module !== 'undefined') {
+    module.exports = {
+        makeDispatcherModuleParameters: makeDispatcherModuleParameters,
+        enableDispatcherModule: enableDispatcherModule,
+        disableDispatcherModule: disableDispatcherModule,
+        makeRunningValues: makeRunningValues,
+        LEFT_HAND: LEFT_HAND,
+        RIGHT_HAND: RIGHT_HAND,
+        BUMPER_ON_VALUE: BUMPER_ON_VALUE,
+        TEAR_AWAY_DISTANCE: TEAR_AWAY_DISTANCE,
+        propsArePhysical: propsArePhysical,
+        entityIsGrabbable: entityIsGrabbable,
+        NEAR_GRAB_RADIUS: NEAR_GRAB_RADIUS,
+        projectOntoOverlayXYPlane: projectOntoOverlayXYPlane,
+        projectOntoEntityXYPlane: projectOntoEntityXYPlane,
+        TRIGGER_OFF_VALUE: TRIGGER_OFF_VALUE,
+        TRIGGER_ON_VALUE: TRIGGER_ON_VALUE
+    };
+}
diff --git a/scripts/system/libraries/controllers.js b/scripts/system/libraries/controllers.js
index 75bca34ed6..d99fd0db48 100644
--- a/scripts/system/libraries/controllers.js
+++ b/scripts/system/libraries/controllers.js
@@ -18,15 +18,20 @@ getGrabCommunications = function getFarGrabCommunications() {
 // this offset needs to match the one in libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp:378
 var GRAB_POINT_SPHERE_OFFSET = { x: 0.04, y: 0.13, z: 0.039 };  // x = upward, y = forward, z = lateral
 
-getGrabPointSphereOffset = function(handController) {
-    if (handController === Controller.Standard.RightHand) {
-        return GRAB_POINT_SPHERE_OFFSET;
+getGrabPointSphereOffset = function(handController, ignoreSensorToWorldScale) {
+    var offset = GRAB_POINT_SPHERE_OFFSET;
+    if (handController === Controller.Standard.LeftHand) {
+        offset = {
+            x: -GRAB_POINT_SPHERE_OFFSET.x,
+            y: GRAB_POINT_SPHERE_OFFSET.y,
+            z: GRAB_POINT_SPHERE_OFFSET.z
+        };
+    }
+    if (ignoreSensorToWorldScale) {
+        return offset;
+    } else {
+        return Vec3.multiply(MyAvatar.sensorToWorldScale, offset);
     }
-    return {
-        x: GRAB_POINT_SPHERE_OFFSET.x * -1,
-        y: GRAB_POINT_SPHERE_OFFSET.y,
-        z: GRAB_POINT_SPHERE_OFFSET.z
-    };
 };
 
 // controllerWorldLocation is where the controller would be, in-world, with an added offset
@@ -53,7 +58,7 @@ getControllerWorldLocation = function (handController, doOffset) {
 
     } else if (!HMD.isHandControllerAvailable()) {
         // NOTE: keep this offset in sync with scripts/system/controllers/handControllerPointer.js:493
-        var VERTICAL_HEAD_LASER_OFFSET = 0.1;
+        var VERTICAL_HEAD_LASER_OFFSET = 0.1 * MyAvatar.sensorToWorldScale;
         position = Vec3.sum(Camera.position, Vec3.multiplyQbyV(Camera.orientation, {x: 0, y: VERTICAL_HEAD_LASER_OFFSET, z: 0}));
         orientation = Quat.multiply(Camera.orientation, Quat.angleAxis(-90, { x: 1, y: 0, z: 0 }));
         valid = true;
diff --git a/scripts/system/libraries/entityCameraTool.js b/scripts/system/libraries/entityCameraTool.js
index 6becc81d9b..0e52353dfb 100644
--- a/scripts/system/libraries/entityCameraTool.js
+++ b/scripts/system/libraries/entityCameraTool.js
@@ -118,20 +118,12 @@ CameraManager = function() {
     that.targetYaw = 0;
     that.targetPitch = 0;
 
-    that.focalPoint = {
-        x: 0,
-        y: 0,
-        z: 0
-    };
-    that.targetFocalPoint = {
-        x: 0,
-        y: 0,
-        z: 0
-    };
+    that.focalPoint = Vec3.ZERO;
+    that.targetFocalPoint = Vec3.ZERO;
 
     easing = false;
     easingTime = 0;
-    startOrientation = Quat.fromPitchYawRollDegrees(0, 0, 0);
+    startOrientation = Quat.IDENTITY;
 
     that.previousCameraMode = null;
 
diff --git a/scripts/system/libraries/entityIconOverlayManager.js b/scripts/system/libraries/entityIconOverlayManager.js
index f557a05f60..a374783b1f 100644
--- a/scripts/system/libraries/entityIconOverlayManager.js
+++ b/scripts/system/libraries/entityIconOverlayManager.js
@@ -1,6 +1,7 @@
 /* globals EntityIconOverlayManager:true */
 
 EntityIconOverlayManager = function(entityTypes, getOverlayPropertiesFunc) {
+
     var visible = false;
 
     // List of all created overlays
@@ -69,6 +70,29 @@ EntityIconOverlayManager = function(entityTypes, getOverlayPropertiesFunc) {
         }
     };
 
+
+    this.setIconsSelectable = function(arrayOfSelectedEntityIDs, isIconsSelectable) {
+        if (arrayOfSelectedEntityIDs === null) {
+            for (var id in entityOverlays) {
+                Overlays.editOverlay(entityOverlays[id], {
+                    ignoreRayIntersection: isIconsSelectable
+                });
+            }
+        } else {
+            for (var id in entityOverlays) {
+                if (arrayOfSelectedEntityIDs.indexOf(id) !== -1) { // in the entityOverlays array and selectable
+                    Overlays.editOverlay(entityOverlays[id], {
+                        ignoreRayIntersection: isIconsSelectable
+                    });
+                } else {
+                    Overlays.editOverlay(entityOverlays[id], {
+                        ignoreRayIntersection: !isIconsSelectable
+                    });
+                }
+            }
+        }
+    };
+
     // Allocate or get an unused overlay
     function getOverlay() {
         var overlay;
@@ -114,6 +138,9 @@ EntityIconOverlayManager = function(entityTypes, getOverlayPropertiesFunc) {
                     overlayProperties[key] = customProperties[key];
                 }
             }
+            if(properties.type === 'ParticleEffect' || properties.type === 'Light'){
+                overlayProperties.ignoreRayIntersection = true;
+            }
             Overlays.editOverlay(overlay, overlayProperties);
         }
     }
diff --git a/scripts/system/libraries/entityList.js b/scripts/system/libraries/entityList.js
index 64a05fcebf..9d9689000e 100644
--- a/scripts/system/libraries/entityList.js
+++ b/scripts/system/libraries/entityList.js
@@ -108,6 +108,16 @@ EntityListTool = function(opts) {
         webView.emitScriptEvent(JSON.stringify(data));
     };
 
+    function onFileSaveChanged(filename) {
+        Window.saveFileChanged.disconnect(onFileSaveChanged);
+        if (filename !== "") {
+            var success = Clipboard.exportEntities(filename, selectionManager.selections);
+            if (!success) {
+                Window.notifyEditError("Export failed.");
+            }
+        }
+    }
+
     webView.webEventReceived.connect(function(data) {
         try {
             data = JSON.parse(data);
@@ -139,13 +149,8 @@ EntityListTool = function(opts) {
             if (!selectionManager.hasSelection()) {
                 Window.notifyEditError("No entities have been selected.");
             } else {
-                var filename = Window.save("Select Where to Save", "", "*.json");
-                if (filename) {
-                    var success = Clipboard.exportEntities(filename, selectionManager.selections);
-                    if (!success) {
-                        Window.notifyEditError("Export failed.");
-                    }
-                }
+                Window.saveFileChanged.connect(onFileSaveChanged);
+                Window.saveAsync("Select Where to Save", "", "*.json");
             }
         } else if (data.type == "pal") {
             var sessionIds = {}; // Collect the sessionsIds of all selected entitities, w/o duplicates.
diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index 725803f824..d947a1d397 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -3,7 +3,7 @@
 //  examples
 //
 //  Created by Brad hefta-Gaub on 10/1/14.
-//    Modified by Daniela Fontes @DanielaFifo and Tiago Andrade @TagoWill on 4/7/2017
+//    Modified by Daniela Fontes * @DanielaFifo and Tiago Andrade @TagoWill on 4/7/2017
 //  Copyright 2014 High Fidelity, Inc.
 //
 //  This script implements a class useful for building tools for editing entities.
@@ -30,11 +30,13 @@ function objectTranslationPlanePoint(position, dimensions) {
 SelectionManager = (function() {
     var that = {};
 
+    // FUNCTION: SUBSCRIBE TO UPDATE MESSAGES
     function subscribeToUpdateMessages() {
         Messages.subscribe("entityToolUpdates");
         Messages.messageReceived.connect(handleEntitySelectionToolUpdates);
     }
 
+    // FUNCTION: HANDLE ENTITY SELECTION TOOL UDPATES
     function handleEntitySelectionToolUpdates(channel, message, sender) {
         if (channel !== 'entityToolUpdates') {
             return;
@@ -43,11 +45,12 @@ SelectionManager = (function() {
             return;
         }
 
+        var wantDebug = false;
         var messageParsed;
         try {
             messageParsed = JSON.parse(message);
         } catch (err) {
-            print("error -- entitySelectionTool got malformed message: " + message);
+            print("ERROR: entitySelectionTool.handleEntitySelectionToolUpdates - got malformed message: " + message);
         }
 
         // if (message === 'callUpdate') {
@@ -55,7 +58,9 @@ SelectionManager = (function() {
         // }
 
         if (messageParsed.method === "selectEntity") {
-            print("setting selection to " + messageParsed.entityID);
+            if (wantDebug) {
+                print("setting selection to " + messageParsed.entityID);
+            }
             that.setSelections([messageParsed.entityID]);
         }
     }
@@ -66,44 +71,16 @@ SelectionManager = (function() {
     that.selections = [];
     var listeners = [];
 
-    that.localRotation = Quat.fromPitchYawRollDegrees(0, 0, 0);
-    that.localPosition = {
-        x: 0,
-        y: 0,
-        z: 0
-    };
-    that.localDimensions = {
-        x: 0,
-        y: 0,
-        z: 0
-    };
-    that.localRegistrationPoint = {
-        x: 0.5,
-        y: 0.5,
-        z: 0.5
-    };
+    that.localRotation = Quat.IDENTITY;
+    that.localPosition = Vec3.ZERO;
+    that.localDimensions = Vec3.ZERO;
+    that.localRegistrationPoint = Vec3.HALF;
 
-    that.worldRotation = Quat.fromPitchYawRollDegrees(0, 0, 0);
-    that.worldPosition = {
-        x: 0,
-        y: 0,
-        z: 0
-    };
-    that.worldDimensions = {
-        x: 0,
-        y: 0,
-        z: 0
-    };
-    that.worldRegistrationPoint = {
-        x: 0.5,
-        y: 0.5,
-        z: 0.5
-    };
-    that.centerPosition = {
-        x: 0,
-        y: 0,
-        z: 0
-    };
+    that.worldRotation = Quat.IDENTITY;
+    that.worldPosition = Vec3.ZERO;
+    that.worldDimensions = Vec3.ZERO;
+    that.worldRegistrationPoint = Vec3.HALF;
+    that.centerPosition = Vec3.ZERO;
 
     that.saveProperties = function() {
         that.savedProperties = {};
@@ -135,12 +112,12 @@ SelectionManager = (function() {
         if (entityID) {
             var idx = -1;
             for (var i = 0; i < that.selections.length; i++) {
-                if (entityID == that.selections[i]) {
+                if (entityID === that.selections[i]) {
                     idx = i;
                     break;
                 }
             }
-            if (idx == -1) {
+            if (idx === -1) {
                 that.selections.push(entityID);
             } else if (toggleSelection) {
                 that.selections.splice(idx, 1);
@@ -170,7 +147,7 @@ SelectionManager = (function() {
             that.localPosition = null;
             that.worldDimensions = null;
             that.worldPosition = null;
-        } else if (that.selections.length == 1) {
+        } else if (that.selections.length === 1) {
             properties = Entities.getEntityProperties(that.selections[0]);
             that.localDimensions = properties.dimensions;
             that.localPosition = properties.position;
@@ -212,7 +189,7 @@ SelectionManager = (function() {
             that.worldPosition = {
                 x: brn.x + (that.worldDimensions.x / 2),
                 y: brn.y + (that.worldDimensions.y / 2),
-                z: brn.z + (that.worldDimensions.z / 2),
+                z: brn.z + (that.worldDimensions.z / 2)
             };
 
             // For 1+ selections we can only modify selections in world space
@@ -223,9 +200,10 @@ SelectionManager = (function() {
             try {
                 listeners[j](selectionUpdated === true);
             } catch (e) {
-                print("EntitySelectionTool got exception: " + JSON.stringify(e));
+                print("ERROR: entitySelectionTool.update got exception: " + JSON.stringify(e));
             }
         }
+
     };
 
     return that;
@@ -233,11 +211,15 @@ SelectionManager = (function() {
 
 // Normalize degrees to be in the range (-180, 180]
 function normalizeDegrees(degrees) {
-    while (degrees > 180) degrees -= 360;
-    while (degrees <= -180) degrees += 360;
+    degrees = ((degrees + 180) % 360) - 180;
+    if (degrees <= -180) {
+        degrees += 360;
+    }
+
     return degrees;
 }
 
+// FUNCTION: getRelativeCenterPosition
 // Return the enter position of an entity relative to it's registrationPoint
 // A registration point of (0.5, 0.5, 0.5) will have an offset of (0, 0, 0)
 // A registration point of (1.0, 1.0, 1.0) will have an offset of (-dimensions.x / 2, -dimensions.y / 2, -dimensions.z / 2)
@@ -249,6 +231,7 @@ function getRelativeCenterPosition(dimensions, registrationPoint) {
     };
 }
 
+// SELECTION DISPLAY DEFINITION
 SelectionDisplay = (function() {
     var that = {};
 
@@ -268,10 +251,13 @@ SelectionDisplay = (function() {
     var showExtendedStretchHandles = false;
 
     var spaceMode = SPACE_LOCAL;
-    var mode = "UNKNOWN";
     var overlayNames = [];
     var lastCameraPosition = Camera.getPosition();
     var lastCameraOrientation = Camera.getOrientation();
+    var lastControllerPoses = [
+        getControllerWorldLocation(Controller.Standard.LeftHand, true),
+        getControllerWorldLocation(Controller.Standard.RightHand, true)
+    ];
 
     var handleHoverColor = {
         red: 224,
@@ -280,7 +266,6 @@ SelectionDisplay = (function() {
     };
     var handleHoverAlpha = 1.0;
 
-    var rotateOverlayTargetSize = 10000; // really big target
     var innerSnapAngle = 22.5; // the angle which we snap to on the inner rotation tool
     var innerRadius;
     var outerRadius;
@@ -290,19 +275,9 @@ SelectionDisplay = (function() {
     var yawCenter;
     var pitchCenter;
     var rollCenter;
-    var yawZero;
-    var pitchZero;
-    var rollZero;
-    var yawNormal;
-    var pitchNormal;
-    var rollNormal;
+    var rotZero;
     var rotationNormal;
 
-    var originalRotation;
-    var originalPitch;
-    var originalYaw;
-    var originalRoll;
-
 
     var handleColor = {
         red: 255,
@@ -348,11 +323,7 @@ SelectionDisplay = (function() {
     };
     var grabberLineWidth = 0.5;
     var grabberSolid = true;
-    var grabberMoveUpPosition = {
-        x: 0,
-        y: 0,
-        z: 0
-    };
+    var grabberMoveUpPosition = Vec3.ZERO;
 
     var lightOverlayColor = {
         red: 255,
@@ -361,84 +332,59 @@ SelectionDisplay = (function() {
     };
 
     var grabberPropertiesCorner = {
-        position: {
-            x: 0,
-            y: 0,
-            z: 0
-        },
+        position: Vec3.ZERO,
         size: grabberSizeCorner,
         color: grabberColorCorner,
         alpha: 1,
         solid: grabberSolid,
         visible: false,
         dashed: false,
-        lineWidth: grabberLineWidth,
         drawInFront: true,
-        borderSize: 1.4,
+        borderSize: 1.4
     };
 
     var grabberPropertiesEdge = {
-        position: {
-            x: 0,
-            y: 0,
-            z: 0
-        },
+        position: Vec3.ZERO,
         size: grabberSizeEdge,
         color: grabberColorEdge,
         alpha: 1,
         solid: grabberSolid,
         visible: false,
         dashed: false,
-        lineWidth: grabberLineWidth,
         drawInFront: true,
-        borderSize: 1.4,
+        borderSize: 1.4
     };
 
     var grabberPropertiesFace = {
-        position: {
-            x: 0,
-            y: 0,
-            z: 0
-        },
+        position: Vec3.ZERO,
         size: grabberSizeFace,
         color: grabberColorFace,
         alpha: 1,
         solid: grabberSolid,
         visible: false,
         dashed: false,
-        lineWidth: grabberLineWidth,
         drawInFront: true,
-        borderSize: 1.4,
+        borderSize: 1.4
     };
 
     var grabberPropertiesCloner = {
-        position: {
-            x: 0,
-            y: 0,
-            z: 0
-        },
+        position: Vec3.ZERO,
         size: grabberSizeCorner,
         color: grabberColorCloner,
         alpha: 1,
         solid: grabberSolid,
         visible: false,
         dashed: false,
-        lineWidth: grabberLineWidth,
         drawInFront: true,
-        borderSize: 1.4,
+        borderSize: 1.4
     };
 
     var spotLightLineProperties = {
-        color: lightOverlayColor,
-        lineWidth: 1.5,
+        color: lightOverlayColor
     };
 
     var highlightBox = Overlays.addOverlay("cube", {
-        position: {
-            x: 0,
-            y: 0,
-            z: 0
-        },
+        position: Vec3.ZERO,
         size: 1,
         color: {
             red: 90,
@@ -449,17 +395,12 @@ SelectionDisplay = (function() {
         solid: false,
         visible: false,
         dashed: true,
-        lineWidth: 2.0,
         ignoreRayIntersection: true, // this never ray intersects
         drawInFront: true
     });
 
     var selectionBox = Overlays.addOverlay("cube", {
-        position: {
-            x: 0,
-            y: 0,
-            z: 0
-        },
+        position: Vec3.ZERO,
         size: 1,
         color: {
             red: 255,
@@ -469,18 +410,13 @@ SelectionDisplay = (function() {
         alpha: 1,
         solid: false,
         visible: false,
-        dashed: false,
-        lineWidth: 1.0,
+        dashed: false
     });
 
     var selectionBoxes = [];
 
     var rotationDegreesDisplay = Overlays.addOverlay("text3d", {
-        position: {
-            x: 0,
-            y: 0,
-            z: 0
-        },
+        position: Vec3.ZERO,
         text: "",
         color: {
             red: 0,
@@ -506,28 +442,23 @@ SelectionDisplay = (function() {
         topMargin: 0,
         rightMargin: 0,
         bottomMargin: 0,
-        leftMargin: 0,
+        leftMargin: 0
     });
 
     var grabberMoveUp = Overlays.addOverlay("image3d", {
         url: HIFI_PUBLIC_BUCKET + "images/up-arrow.svg",
-        position: {
-            x: 0,
-            y: 0,
-            z: 0
-        },
+        position: Vec3.ZERO,
         color: handleColor,
         alpha: handleAlpha,
         visible: false,
         size: 0.1,
         scale: 0.1,
         isFacingAvatar: true,
-        drawInFront: true,
+        drawInFront: true
     });
 
     // var normalLine = Overlays.addOverlay("line3d", {
     //                 visible: true,
-    //                 lineWidth: 2.0,
     //                 start: { x: 0, y: 0, z: 0 },
     //                 end: { x: 0, y: 0, z: 0 },
     //                 color: { red: 255, green: 255, blue: 0 },
@@ -580,6 +511,12 @@ SelectionDisplay = (function() {
     var grabberSpotLightT = Overlays.addOverlay("cube", grabberPropertiesEdge);
     var grabberSpotLightB = Overlays.addOverlay("cube", grabberPropertiesEdge);
 
+    var spotLightGrabberHandles = [
+        grabberSpotLightCircle, grabberSpotLightCenter, grabberSpotLightRadius,
+        grabberSpotLightLineT, grabberSpotLightLineB, grabberSpotLightLineL, grabberSpotLightLineR,
+        grabberSpotLightT, grabberSpotLightB, grabberSpotLightL, grabberSpotLightR
+    ];
+
     var grabberPointLightCircleX = Overlays.addOverlay("circle3d", {
         rotation: Quat.fromPitchYawRollDegrees(0, 90, 0),
         color: lightOverlayColor,
@@ -605,6 +542,12 @@ SelectionDisplay = (function() {
     var grabberPointLightF = Overlays.addOverlay("cube", grabberPropertiesEdge);
     var grabberPointLightN = Overlays.addOverlay("cube", grabberPropertiesEdge);
 
+    var pointLightGrabberHandles = [
+        grabberPointLightCircleX, grabberPointLightCircleY, grabberPointLightCircleZ,
+        grabberPointLightT, grabberPointLightB, grabberPointLightL,
+        grabberPointLightR, grabberPointLightF, grabberPointLightN
+    ];
+
     var grabberCloner = Overlays.addOverlay("cube", grabberPropertiesCloner);
 
     var stretchHandles = [
@@ -681,7 +624,7 @@ SelectionDisplay = (function() {
         width: 300,
         height: 200,
         rotation: baseOverlayRotation,
-        ignoreRayIntersection: true, // always ignore this
+        ignoreRayIntersection: true // always ignore this
     });
 
     var yawOverlayAngles = {
@@ -705,17 +648,8 @@ SelectionDisplay = (function() {
 
     var xRailOverlay = Overlays.addOverlay("line3d", {
         visible: false,
-        lineWidth: 1.0,
-        start: {
-            x: 0,
-            y: 0,
-            z: 0
-        },
-        end: {
-            x: 0,
-            y: 0,
-            z: 0
-        },
+        start: Vec3.ZERO,
+        end: Vec3.ZERO,
         color: {
             red: 255,
             green: 0,
@@ -725,17 +659,8 @@ SelectionDisplay = (function() {
     });
     var yRailOverlay = Overlays.addOverlay("line3d", {
         visible: false,
-        lineWidth: 1.0,
-        start: {
-            x: 0,
-            y: 0,
-            z: 0
-        },
-        end: {
-            x: 0,
-            y: 0,
-            z: 0
-        },
+        start: Vec3.ZERO,
+        end: Vec3.ZERO,
         color: {
             red: 0,
             green: 255,
@@ -745,17 +670,8 @@ SelectionDisplay = (function() {
     });
     var zRailOverlay = Overlays.addOverlay("line3d", {
         visible: false,
-        lineWidth: 1.0,
-        start: {
-            x: 0,
-            y: 0,
-            z: 0
-        },
-        end: {
-            x: 0,
-            y: 0,
-            z: 0
-        },
+        start: Vec3.ZERO,
+        end: Vec3.ZERO,
         color: {
             red: 0,
             green: 0,
@@ -766,71 +682,31 @@ SelectionDisplay = (function() {
 
     var rotateZeroOverlay = Overlays.addOverlay("line3d", {
         visible: false,
-        lineWidth: 2.0,
-        start: {
-            x: 0,
-            y: 0,
-            z: 0
-        },
-        end: {
-            x: 0,
-            y: 0,
-            z: 0
-        },
+        start: Vec3.ZERO,
+        end: Vec3.ZERO,
         color: {
             red: 255,
             green: 0,
             blue: 0
         },
-        ignoreRayIntersection: true, // always ignore this
+        ignoreRayIntersection: true // always ignore this
     });
 
     var rotateCurrentOverlay = Overlays.addOverlay("line3d", {
         visible: false,
-        lineWidth: 2.0,
-        start: {
-            x: 0,
-            y: 0,
-            z: 0
-        },
-        end: {
-            x: 0,
-            y: 0,
-            z: 0
-        },
+        start: Vec3.ZERO,
+        end: Vec3.ZERO,
         color: {
             red: 0,
             green: 0,
             blue: 255
         },
-        ignoreRayIntersection: true, // always ignore this
+        ignoreRayIntersection: true // always ignore this
     });
 
 
-    var rotateOverlayTarget = Overlays.addOverlay("circle3d", {
-        position: {
-            x: 0,
-            y: 0,
-            z: 0
-        },
-        size: rotateOverlayTargetSize,
-        color: {
-            red: 0,
-            green: 0,
-            blue: 0
-        },
-        alpha: 0.0,
-        solid: true,
-        visible: false,
-        rotation: yawOverlayRotation,
-    });
-
     var rotateOverlayInner = Overlays.addOverlay("circle3d", {
-        position: {
-            x: 0,
-            y: 0,
-            z: 0
-        },
+        position: Vec3.ZERO,
         size: 1,
         color: {
             red: 51,
@@ -856,15 +732,11 @@ SelectionDisplay = (function() {
             green: 0,
             blue: 0
         },
-        ignoreRayIntersection: true, // always ignore this
+        ignoreRayIntersection: true // always ignore this
     });
 
     var rotateOverlayOuter = Overlays.addOverlay("circle3d", {
-        position: {
-            x: 0,
-            y: 0,
-            z: 0
-        },
+        position: Vec3.ZERO,
         size: 1,
         color: {
             red: 51,
@@ -891,15 +763,11 @@ SelectionDisplay = (function() {
             green: 0,
             blue: 0
         },
-        ignoreRayIntersection: true, // always ignore this
+        ignoreRayIntersection: true // always ignore this
     });
 
     var rotateOverlayCurrent = Overlays.addOverlay("circle3d", {
-        position: {
-            x: 0,
-            y: 0,
-            z: 0
-        },
+        position: Vec3.ZERO,
         size: 1,
         color: {
             red: 224,
@@ -921,57 +789,45 @@ SelectionDisplay = (function() {
             red: 0,
             green: 0,
             blue: 0
-        },
+        }
     });
 
     var yawHandle = Overlays.addOverlay("image3d", {
         url: ROTATE_ARROW_WEST_NORTH_URL,
-        position: {
-            x: 0,
-            y: 0,
-            z: 0
-        },
+        position: Vec3.ZERO,
         color: handleColor,
         alpha: handleAlpha,
         visible: false,
         size: 0.1,
         scale: 0.1,
         isFacingAvatar: false,
-        drawInFront: true,
+        drawInFront: true
     });
 
 
     var pitchHandle = Overlays.addOverlay("image3d", {
         url: ROTATE_ARROW_WEST_NORTH_URL,
-        position: {
-            x: 0,
-            y: 0,
-            z: 0
-        },
+        position: Vec3.ZERO,
         color: handleColor,
         alpha: handleAlpha,
         visible: false,
         size: 0.1,
         scale: 0.1,
         isFacingAvatar: false,
-        drawInFront: true,
+        drawInFront: true
     });
 
 
     var rollHandle = Overlays.addOverlay("image3d", {
         url: ROTATE_ARROW_WEST_NORTH_URL,
-        position: {
-            x: 0,
-            y: 0,
-            z: 0
-        },
+        position: Vec3.ZERO,
         color: handleColor,
         alpha: handleAlpha,
         visible: false,
         size: 0.1,
         scale: 0.1,
         isFacingAvatar: false,
-        drawInFront: true,
+        drawInFront: true
     });
 
     var allOverlays = [
@@ -981,7 +837,6 @@ SelectionDisplay = (function() {
         yawHandle,
         pitchHandle,
         rollHandle,
-        rotateOverlayTarget,
         rotateOverlayInner,
         rotateOverlayOuter,
         rotateOverlayCurrent,
@@ -995,7 +850,7 @@ SelectionDisplay = (function() {
         grabberSpotLightCircle,
         grabberPointLightCircleX,
         grabberPointLightCircleY,
-        grabberPointLightCircleZ,
+        grabberPointLightCircleZ
 
     ].concat(stretchHandles);
 
@@ -1036,7 +891,6 @@ SelectionDisplay = (function() {
     overlayNames[pitchHandle] = "pitchHandle";
     overlayNames[rollHandle] = "rollHandle";
 
-    overlayNames[rotateOverlayTarget] = "rotateOverlayTarget";
     overlayNames[rotateOverlayInner] = "rotateOverlayInner";
     overlayNames[rotateOverlayOuter] = "rotateOverlayOuter";
     overlayNames[rotateOverlayCurrent] = "rotateOverlayCurrent";
@@ -1051,7 +905,7 @@ SelectionDisplay = (function() {
     // But we dont' get mousePressEvents.
     that.triggerMapping = Controller.newMapping(Script.resolvePath('') + '-click');
     Script.scriptEnding.connect(that.triggerMapping.disable);
-    that.TRIGGER_GRAB_VALUE = 0.85;  //  From handControllerGrab/Pointer.js. Should refactor.
+    that.TRIGGER_GRAB_VALUE = 0.85; //  From handControllerGrab/Pointer.js. Should refactor.
     that.TRIGGER_ON_VALUE = 0.4;
     that.TRIGGER_OFF_VALUE = 0.15;
     that.triggered = false;
@@ -1092,12 +946,37 @@ SelectionDisplay = (function() {
         return controllerComputePickRay() || Camera.computePickRay(x, y);
     }
     function addGrabberTool(overlay, tool) {
-        grabberTools[overlay] = {
-            mode: tool.mode,
-            onBegin: tool.onBegin,
-            onMove: tool.onMove,
-            onEnd: tool.onEnd,
-        };
+        grabberTools[overlay] = tool;
+        return tool;
+    }
+
+    // @param: toolHandle:  The overlayID associated with the tool
+    //         that correlates to the tool you wish to query.
+    // @note: If toolHandle is null or undefined then activeTool
+    //        will be checked against those values as opposed to
+    //        the tool registered under toolHandle.  Null & Undefined 
+    //        are treated as separate values.
+    // @return: bool - Indicates if the activeTool is that queried.
+    function isActiveTool(toolHandle) {
+        if (!toolHandle) {
+            // Allow isActiveTool(null) and similar to return true if there's
+            // no active tool
+            return (activeTool === toolHandle);
+        }
+
+        if (!grabberTools.hasOwnProperty(toolHandle)) {
+            print("WARNING: entitySelectionTool.isActiveTool - Encountered unknown grabberToolHandle: " + toolHandle + ". Tools should be egistered via addGrabberTool.");
+            // EARLY EXIT
+            return false;
+        }
+
+        return (activeTool === grabberTools[ toolHandle ]);
+    }
+
+    // @return string - The mode of the currently active tool;
+    //                  otherwise, "UNKNOWN" if there's no active tool.
+    function getMode() {
+        return (activeTool ? activeTool.mode : "UNKNOWN");
     }
 
 
@@ -1152,9 +1031,10 @@ SelectionDisplay = (function() {
         that.updateHandles();
     };
 
+    // FUNCTION: UPDATE ROTATION HANDLES
     that.updateRotationHandles = function() {
-        var diagonal = (Vec3.length(selectionManager.worldDimensions) / 2) * 1.1;
-        var halfDimensions = Vec3.multiply(selectionManager.worldDimensions, 0.5);
+        var diagonal = (Vec3.length(SelectionManager.worldDimensions) / 2) * 1.1;
+        var halfDimensions = Vec3.multiply(SelectionManager.worldDimensions, 0.5);
         var innerActive = false;
         var innerAlpha = 0.2;
         var outerAlpha = 0.2;
@@ -1169,7 +1049,7 @@ SelectionDisplay = (function() {
         var top, far, left, bottom, near, right, boundsCenter, objectCenter, BLN, BRN, BLF, TLN, TRN, TLF, TRF;
 
         var dimensions, rotation;
-        if (spaceMode == SPACE_LOCAL) {
+        if (spaceMode === SPACE_LOCAL) {
             rotation = SelectionManager.localRotation;
         } else {
             rotation = SelectionManager.worldRotation;
@@ -1226,22 +1106,6 @@ SelectionDisplay = (function() {
                     z: 0
                 });
 
-                yawNormal = {
-                    x: 0,
-                    y: 1,
-                    z: 0
-                };
-                pitchNormal = {
-                    x: 1,
-                    y: 0,
-                    z: 0
-                };
-                rollNormal = {
-                    x: 0,
-                    y: 0,
-                    z: 1
-                };
-
                 yawCorner = {
                     x: left + rotateHandleOffset,
                     y: bottom - rotateHandleOffset,
@@ -1303,23 +1167,6 @@ SelectionDisplay = (function() {
                     z: 90
                 });
 
-                yawNormal = {
-                    x: 0,
-                    y: 1,
-                    z: 0
-                };
-                pitchNormal = {
-                    x: 1,
-                    y: 0,
-                    z: 0
-                };
-                rollNormal = {
-                    x: 0,
-                    y: 0,
-                    z: 1
-                };
-
-
                 yawCorner = {
                     x: left + rotateHandleOffset,
                     y: bottom - rotateHandleOffset,
@@ -1383,22 +1230,6 @@ SelectionDisplay = (function() {
                     z: 180
                 });
 
-                yawNormal = {
-                    x: 0,
-                    y: 1,
-                    z: 0
-                };
-                pitchNormal = {
-                    x: 1,
-                    y: 0,
-                    z: 0
-                };
-                rollNormal = {
-                    x: 0,
-                    y: 0,
-                    z: 1
-                };
-
                 yawCorner = {
                     x: right - rotateHandleOffset,
                     y: bottom - rotateHandleOffset,
@@ -1458,22 +1289,6 @@ SelectionDisplay = (function() {
                     z: 180
                 });
 
-                yawNormal = {
-                    x: 0,
-                    y: 1,
-                    z: 0
-                };
-                rollNormal = {
-                    x: 0,
-                    y: 0,
-                    z: 1
-                };
-                pitchNormal = {
-                    x: 1,
-                    y: 0,
-                    z: 0
-                };
-
                 yawCorner = {
                     x: right - rotateHandleOffset,
                     y: bottom - rotateHandleOffset,
@@ -1520,39 +1335,31 @@ SelectionDisplay = (function() {
 
         var rotateHandlesVisible = true;
         var rotationOverlaysVisible = false;
-        var translateHandlesVisible = true;
-        var stretchHandlesVisible = true;
-        var selectionBoxVisible = true;
+        // note:  Commented out as these are currently unused here; however,
+        //         leaving them around as they document intent of state as it
+        //         relates to modes that may be useful later.
+        // var translateHandlesVisible = true;
+        // var selectionBoxVisible = true;
         var isPointLight = false;
-
-        if (selectionManager.selections.length == 1) {
-            var properties = Entities.getEntityProperties(selectionManager.selections[0]);
-            isPointLight = properties.type == "Light" && !properties.isSpotlight;
+        if (SelectionManager.selections.length === 1) {
+            var properties = Entities.getEntityProperties(SelectionManager.selections[0]);
+            isPointLight = (properties.type === "Light") && !properties.isSpotlight;
         }
 
-        if (mode == "ROTATE_YAW" || mode == "ROTATE_PITCH" || mode == "ROTATE_ROLL" || mode == "TRANSLATE_X in case they Z") {
+        if (isActiveTool(yawHandle) || isActiveTool(pitchHandle) || 
+                isActiveTool(rollHandle) || isActiveTool(selectionBox) || isActiveTool(grabberCloner)) {
             rotationOverlaysVisible = true;
             rotateHandlesVisible = false;
-            translateHandlesVisible = false;
-            stretchHandlesVisible = false;
-            selectionBoxVisible = false;
-        } else if (mode == "TRANSLATE_UP_DOWN" || isPointLight) {
+            // translateHandlesVisible = false;
+            // selectionBoxVisible = false;
+        } else if (isActiveTool(grabberMoveUp) || isPointLight) {
             rotateHandlesVisible = false;
-            stretchHandlesVisible = false;
-        } else if (mode != "UNKNOWN") {
+        } else if (activeTool) {
             // every other mode is a stretch mode...
             rotateHandlesVisible = false;
-            translateHandlesVisible = false;
+            // translateHandlesVisible = false;
         }
 
-        var rotation = selectionManager.worldRotation;
-        var dimensions = selectionManager.worldDimensions;
-        var position = selectionManager.worldPosition;
-
-
-        Overlays.editOverlay(rotateOverlayTarget, {
-            visible: rotationOverlaysVisible
-        });
         Overlays.editOverlay(rotateZeroOverlay, {
             visible: rotationOverlaysVisible
         });
@@ -1560,7 +1367,6 @@ SelectionDisplay = (function() {
             visible: rotationOverlaysVisible
         });
 
-        // TODO: we have not implemented the rotating handle/controls yet... so for now, these handles are hidden
         Overlays.editOverlay(yawHandle, {
             visible: rotateHandlesVisible,
             position: yawCorner,
@@ -1578,41 +1384,119 @@ SelectionDisplay = (function() {
         });
     };
 
+    // FUNCTION: UPDATE HANDLE SIZES
+    that.updateHandleSizes = function() {
+        if (SelectionManager.hasSelection()) {
+            var diff = Vec3.subtract(SelectionManager.worldPosition, Camera.getPosition());
+            var grabberSize = Vec3.length(diff) * GRABBER_DISTANCE_TO_SIZE_RATIO * 5;
+            var dimensions = SelectionManager.worldDimensions;
+            var avgDimension = (dimensions.x + dimensions.y + dimensions.z) / 3;
+            grabberSize = Math.min(grabberSize, avgDimension / 10);
+
+            for (var i = 0; i < stretchHandles.length; i++) {
+                Overlays.editOverlay(stretchHandles[i], {
+                    size: grabberSize
+                });
+            }
+            var handleSize = Vec3.length(diff) * GRABBER_DISTANCE_TO_SIZE_RATIO * 7;
+            handleSize = Math.min(handleSize, avgDimension / 3);
+
+            Overlays.editOverlay(yawHandle, {
+                scale: handleSize
+            });
+            Overlays.editOverlay(pitchHandle, {
+                scale: handleSize
+            });
+            Overlays.editOverlay(rollHandle, {
+                scale: handleSize
+            });
+            var upDiff = Vec3.multiply((
+                Vec3.length(diff) * GRABBER_DISTANCE_TO_SIZE_RATIO * 3), 
+                Quat.getUp(MyAvatar.orientation)
+            );
+            var pos = Vec3.sum(grabberMoveUpPosition, upDiff);
+            Overlays.editOverlay(grabberMoveUp, {
+                position: pos,
+                scale: handleSize / 1.25
+            });
+        }
+    };
+    Script.update.connect(that.updateHandleSizes);
+
+    // FUNCTION: SET SPACE MODE
     that.setSpaceMode = function(newSpaceMode) {
-        if (spaceMode != newSpaceMode) {
+        var wantDebug = false;
+        if (wantDebug) {
+            print("======> SetSpaceMode called. ========");
+        }
+
+        if (spaceMode !== newSpaceMode) {
+            if (wantDebug) {
+                print("    Updating SpaceMode From: " + spaceMode + " To: " + newSpaceMode);
+            }
             spaceMode = newSpaceMode;
             that.updateHandles();
+        } else if (wantDebug) {
+            print("WARNING: entitySelectionTool.setSpaceMode - Can't update SpaceMode. CurrentMode: " + spaceMode + " DesiredMode: " + newSpaceMode);
+        }
+        if (wantDebug) {
+            print("====== SetSpaceMode called. <========");
         }
     };
 
+    // FUNCTION: TOGGLE SPACE MODE
     that.toggleSpaceMode = function() {
-        if (spaceMode == SPACE_WORLD && SelectionManager.selections.length > 1) {
-            print("Local space editing is not available with multiple selections");
+        var wantDebug = false;
+        if (wantDebug) {
+            print("========> ToggleSpaceMode called. =========");
+        }
+        if ((spaceMode === SPACE_WORLD) && (SelectionManager.selections.length > 1)) {
+            if (wantDebug) {
+                print("Local space editing is not available with multiple selections");
+            }
             return;
         }
-        spaceMode = spaceMode == SPACE_LOCAL ? SPACE_WORLD : SPACE_LOCAL;
+        if (wantDebug) {
+            print("PreToggle: " + spaceMode);
+        }
+        spaceMode = (spaceMode === SPACE_LOCAL) ? SPACE_WORLD : SPACE_LOCAL;
         that.updateHandles();
+        if (wantDebug) {
+            print("PostToggle: " + spaceMode);        
+            print("======== ToggleSpaceMode called. <=========");
+        }
     };
 
+    // FUNCTION: UNSELECT ALL
+    // TODO?: Needs implementation
     that.unselectAll = function() {};
 
+    // FUNCTION: UPDATE HANDLES
     that.updateHandles = function() {
+        var wantDebug = false;
+        if (wantDebug) {
+            print("======> Update Handles =======");
+            print("    Selections Count: " + SelectionManager.selections.length);
+            print("    SpaceMode: " + spaceMode);
+            print("    DisplayMode: " + getMode());
+        }
         if (SelectionManager.selections.length === 0) {
             that.setOverlaysVisible(false);
             return;
         }
 
+        // print("    Triggering updateRotationHandles");
         that.updateRotationHandles();
 
         var rotation, dimensions, position, registrationPoint;
 
-        if (spaceMode == SPACE_LOCAL) {
+        if (spaceMode === SPACE_LOCAL) {
             rotation = SelectionManager.localRotation;
             dimensions = SelectionManager.localDimensions;
             position = SelectionManager.localPosition;
             registrationPoint = SelectionManager.localRegistrationPoint;
         } else {
-            rotation = Quat.fromPitchYawRollDegrees(0, 0, 0);
+            rotation = Quat.IDENTITY;
             dimensions = SelectionManager.worldDimensions;
             position = SelectionManager.worldPosition;
             registrationPoint = SelectionManager.worldRegistrationPoint;
@@ -1621,11 +1505,11 @@ SelectionDisplay = (function() {
         var registrationPointDimensions = {
             x: dimensions.x * registrationPoint.x,
             y: dimensions.y * registrationPoint.y,
-            z: dimensions.z * registrationPoint.z,
+            z: dimensions.z * registrationPoint.z
         };
 
         // Center of entity, relative to registration point
-        center = getRelativeCenterPosition(dimensions, registrationPoint);
+        var center = getRelativeCenterPosition(dimensions, registrationPoint);
 
         // Distances in world coordinates relative to the registration point
         var left = -registrationPointDimensions.x;
@@ -1829,265 +1713,163 @@ SelectionDisplay = (function() {
         EdgeFR = Vec3.sum(position, EdgeFR);
         EdgeFL = Vec3.sum(position, EdgeFL);
 
-        var stretchHandlesVisible = spaceMode == SPACE_LOCAL;
-        var extendedStretchHandlesVisible = stretchHandlesVisible && showExtendedStretchHandles;
-
-        if (selectionManager.selections.length == 1) {
-            var properties = Entities.getEntityProperties(selectionManager.selections[0]);
-            if (properties.type == "Light" && properties.isSpotlight) {
-                stretchHandlesVisible = false;
-                extendedStretchHandlesVisible = false;
-
-                Overlays.editOverlay(grabberSpotLightCenter, {
-                    position: position,
-                    visible: false,
-                });
-                Overlays.editOverlay(grabberSpotLightRadius, {
-                    position: NEAR,
-                    rotation: rotation,
-                    visible: true,
-                });
-                var distance = (properties.dimensions.z / 2) * Math.sin(properties.cutoff * (Math.PI / 180));
-
-                Overlays.editOverlay(grabberSpotLightL, {
-                    position: EdgeNL,
-                    rotation: rotation,
-                    visible: true,
-                });
-                Overlays.editOverlay(grabberSpotLightR, {
-                    position: EdgeNR,
-                    rotation: rotation,
-                    visible: true,
-                });
-                Overlays.editOverlay(grabberSpotLightT, {
-                    position: EdgeTN,
-                    rotation: rotation,
-                    visible: true,
-                });
-                Overlays.editOverlay(grabberSpotLightB, {
-                    position: EdgeBN,
-                    rotation: rotation,
-                    visible: true,
-                });
-                Overlays.editOverlay(grabberSpotLightCircle, {
-                    position: NEAR,
-                    dimensions: {
-                        x: distance,
-                        y: distance,
-                        z: 1
-                    },
-                    lineWidth: 1.5,
-                    rotation: rotation,
-                    visible: true,
-                });
-
-                Overlays.editOverlay(grabberSpotLightLineT, {
-                    start: position,
-                    end: EdgeTN,
-                    visible: true,
-                });
-                Overlays.editOverlay(grabberSpotLightLineB, {
-                    start: position,
-                    end: EdgeBN,
-                    visible: true,
-                });
-                Overlays.editOverlay(grabberSpotLightLineR, {
-                    start: position,
-                    end: EdgeNR,
-                    visible: true,
-                });
-                Overlays.editOverlay(grabberSpotLightLineL, {
-                    start: position,
-                    end: EdgeNL,
-                    visible: true,
-                });
-
-                Overlays.editOverlay(grabberPointLightCircleX, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberPointLightCircleY, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberPointLightCircleZ, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberPointLightT, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberPointLightB, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberPointLightL, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberPointLightR, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberPointLightF, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberPointLightN, {
-                    visible: false
-                });
-            } else if (properties.type == "Light" && !properties.isSpotlight) {
-                stretchHandlesVisible = false;
-                extendedStretchHandlesVisible = false;
-                Overlays.editOverlay(grabberPointLightT, {
-                    position: TOP,
-                    rotation: rotation,
-                    visible: true,
-                });
-                Overlays.editOverlay(grabberPointLightB, {
-                    position: BOTTOM,
-                    rotation: rotation,
-                    visible: true,
-                });
-                Overlays.editOverlay(grabberPointLightL, {
-                    position: LEFT,
-                    rotation: rotation,
-                    visible: true,
-                });
-                Overlays.editOverlay(grabberPointLightR, {
-                    position: RIGHT,
-                    rotation: rotation,
-                    visible: true,
-                });
-                Overlays.editOverlay(grabberPointLightF, {
-                    position: FAR,
-                    rotation: rotation,
-                    visible: true,
-                });
-                Overlays.editOverlay(grabberPointLightN, {
-                    position: NEAR,
-                    rotation: rotation,
-                    visible: true,
-                });
-                Overlays.editOverlay(grabberPointLightCircleX, {
-                    position: position,
-                    rotation: Quat.multiply(rotation, Quat.fromPitchYawRollDegrees(0, 90, 0)),
-                    dimensions: {
-                        x: properties.dimensions.z / 2.0,
-                        y: properties.dimensions.z / 2.0,
-                        z: 1
-                    },
-                    visible: true,
-                });
-                Overlays.editOverlay(grabberPointLightCircleY, {
-                    position: position,
-                    rotation: Quat.multiply(rotation, Quat.fromPitchYawRollDegrees(90, 0, 0)),
-                    dimensions: {
-                        x: properties.dimensions.z / 2.0,
-                        y: properties.dimensions.z / 2.0,
-                        z: 1
-                    },
-                    visible: true,
-                });
-                Overlays.editOverlay(grabberPointLightCircleZ, {
-                    position: position,
-                    rotation: rotation,
-                    dimensions: {
-                        x: properties.dimensions.z / 2.0,
-                        y: properties.dimensions.z / 2.0,
-                        z: 1
-                    },
-                    visible: true,
-                });
-
-                Overlays.editOverlay(grabberSpotLightRadius, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberSpotLightL, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberSpotLightR, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberSpotLightT, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberSpotLightB, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberSpotLightCircle, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberSpotLightLineL, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberSpotLightLineR, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberSpotLightLineT, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberSpotLightLineB, {
-                    visible: false
-                });
-            } else {
-                Overlays.editOverlay(grabberSpotLightCenter, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberSpotLightRadius, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberSpotLightL, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberSpotLightR, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberSpotLightT, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberSpotLightB, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberSpotLightCircle, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberSpotLightLineL, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberSpotLightLineR, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberSpotLightLineT, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberSpotLightLineB, {
-                    visible: false
-                });
-
-                Overlays.editOverlay(grabberPointLightCircleX, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberPointLightCircleY, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberPointLightCircleZ, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberPointLightT, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberPointLightB, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberPointLightL, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberPointLightR, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberPointLightF, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberPointLightN, {
-                    visible: false
-                });
-            }
+        var inModeRotate = (isActiveTool(yawHandle) || isActiveTool(pitchHandle) || isActiveTool(rollHandle));
+        var inModeTranslate = (isActiveTool(selectionBox) || isActiveTool(grabberCloner) || isActiveTool(grabberMoveUp));
+        var stretchHandlesVisible = !(inModeRotate || inModeTranslate) && (spaceMode === SPACE_LOCAL);
+        var extendedStretchHandlesVisible = (stretchHandlesVisible && showExtendedStretchHandles);
+        var cloneHandleVisible = !(inModeRotate || inModeTranslate);
+        if (wantDebug) {
+            print("    Set Non-Light Grabbers Visible - Norm: " + stretchHandlesVisible + " Ext: " + extendedStretchHandlesVisible);
         }
+        var isSingleSelection = (SelectionManager.selections.length === 1);
 
+        if (isSingleSelection) {
+            var properties = Entities.getEntityProperties(SelectionManager.selections[0]);
+            var isLightSelection = (properties.type === "Light");
+            if (isLightSelection) {
+                if (wantDebug) {
+                    print("    Light Selection revoking Non-Light Grabbers Visibility!");
+                }
+                stretchHandlesVisible = false;
+                extendedStretchHandlesVisible = false;
+                cloneHandleVisible = false;
+                if (properties.isSpotlight) {
+                    that.setPointLightHandlesVisible(false);
+
+                    var distance = (properties.dimensions.z / 2) * Math.sin(properties.cutoff * (Math.PI / 180));
+                    var showEdgeSpotGrabbers = !(inModeTranslate || inModeRotate);
+                    Overlays.editOverlay(grabberSpotLightCenter, {
+                        position: position,
+                        visible: false
+                    });
+                    Overlays.editOverlay(grabberSpotLightRadius, {
+                        position: NEAR,
+                        rotation: rotation,
+                        visible: showEdgeSpotGrabbers
+                    });
+
+                    Overlays.editOverlay(grabberSpotLightL, {
+                        position: EdgeNL,
+                        rotation: rotation,
+                        visible: showEdgeSpotGrabbers
+                    });
+                    Overlays.editOverlay(grabberSpotLightR, {
+                        position: EdgeNR,
+                        rotation: rotation,
+                        visible: showEdgeSpotGrabbers
+                    });
+                    Overlays.editOverlay(grabberSpotLightT, {
+                        position: EdgeTN,
+                        rotation: rotation,
+                        visible: showEdgeSpotGrabbers
+                    });
+                    Overlays.editOverlay(grabberSpotLightB, {
+                        position: EdgeBN,
+                        rotation: rotation,
+                        visible: showEdgeSpotGrabbers
+                    });
+                    Overlays.editOverlay(grabberSpotLightCircle, {
+                        position: NEAR,
+                        dimensions: {
+                            x: distance,
+                            y: distance,
+                            z: 1
+                        },
+                        rotation: rotation,
+                        visible: true
+                    });
+
+                    Overlays.editOverlay(grabberSpotLightLineT, {
+                        start: position,
+                        end: EdgeTN,
+                        visible: true
+                    });
+                    Overlays.editOverlay(grabberSpotLightLineB, {
+                        start: position,
+                        end: EdgeBN,
+                        visible: true
+                    });
+                    Overlays.editOverlay(grabberSpotLightLineR, {
+                        start: position,
+                        end: EdgeNR,
+                        visible: true
+                    });
+                    Overlays.editOverlay(grabberSpotLightLineL, {
+                        start: position,
+                        end: EdgeNL,
+                        visible: true
+                    });
+
+                } else { // ..it's a PointLight
+                    that.setSpotLightHandlesVisible(false);
+
+                    var showEdgePointGrabbers = !inModeTranslate;
+                    Overlays.editOverlay(grabberPointLightT, {
+                        position: TOP,
+                        rotation: rotation,
+                        visible: showEdgePointGrabbers
+                    });
+                    Overlays.editOverlay(grabberPointLightB, {
+                        position: BOTTOM,
+                        rotation: rotation,
+                        visible: showEdgePointGrabbers
+                    });
+                    Overlays.editOverlay(grabberPointLightL, {
+                        position: LEFT,
+                        rotation: rotation,
+                        visible: showEdgePointGrabbers
+                    });
+                    Overlays.editOverlay(grabberPointLightR, {
+                        position: RIGHT,
+                        rotation: rotation,
+                        visible: showEdgePointGrabbers
+                    });
+                    Overlays.editOverlay(grabberPointLightF, {
+                        position: FAR,
+                        rotation: rotation,
+                        visible: showEdgePointGrabbers
+                    });
+                    Overlays.editOverlay(grabberPointLightN, {
+                        position: NEAR,
+                        rotation: rotation,
+                        visible: showEdgePointGrabbers
+                    });
+                    Overlays.editOverlay(grabberPointLightCircleX, {
+                        position: position,
+                        rotation: Quat.multiply(rotation, Quat.fromPitchYawRollDegrees(0, 90, 0)),
+                        dimensions: {
+                            x: properties.dimensions.z / 2.0,
+                            y: properties.dimensions.z / 2.0,
+                            z: 1
+                        },
+                        visible: true
+                    });
+                    Overlays.editOverlay(grabberPointLightCircleY, {
+                        position: position,
+                        rotation: Quat.multiply(rotation, Quat.fromPitchYawRollDegrees(90, 0, 0)),
+                        dimensions: {
+                            x: properties.dimensions.z / 2.0,
+                            y: properties.dimensions.z / 2.0,
+                            z: 1
+                        },
+                        visible: true
+                    });
+                    Overlays.editOverlay(grabberPointLightCircleZ, {
+                        position: position,
+                        rotation: rotation,
+                        dimensions: {
+                            x: properties.dimensions.z / 2.0,
+                            y: properties.dimensions.z / 2.0,
+                            z: 1
+                        },
+                        visible: true
+                    });
+                }
+            } else { // ..it's not a light at all
+                that.setSpotLightHandlesVisible(false);
+                that.setPointLightHandlesVisible(false);
+            }
+        }// end of isSingleSelection
 
 
         Overlays.editOverlay(grabberLBN, {
@@ -2164,22 +1946,22 @@ SelectionDisplay = (function() {
         });
 
         Overlays.editOverlay(grabberCloner, {
-            visible: true,
+            visible: cloneHandleVisible,
             rotation: rotation,
             position: EdgeTR
         });
 
-        var boxPosition = Vec3.multiplyQbyV(rotation, center);
-        boxPosition = Vec3.sum(position, boxPosition);
+        var selectionBoxPosition = Vec3.multiplyQbyV(rotation, center);
+        selectionBoxPosition = Vec3.sum(position, selectionBoxPosition);
         Overlays.editOverlay(selectionBox, {
-            position: boxPosition,
+            position: selectionBoxPosition,
             dimensions: dimensions,
             rotation: rotation,
-            visible: !(mode == "ROTATE_YAW" || mode == "ROTATE_PITCH" || mode == "ROTATE_ROLL"),
+            visible: !inModeRotate
         });
 
         // Create more selection box overlays if we don't have enough
-        var overlaysNeeded = selectionManager.selections.length - selectionBoxes.length;
+        var overlaysNeeded = SelectionManager.selections.length - selectionBoxes.length;
         for (var i = 0; i < overlaysNeeded; i++) {
             selectionBoxes.push(
                 Overlays.addOverlay("cube", {
@@ -2198,16 +1980,15 @@ SelectionDisplay = (function() {
                     solid: false,
                     visible: false,
                     dashed: false,
-                    lineWidth: 1.0,
-                    ignoreRayIntersection: true,
+                    ignoreRayIntersection: true
                 }));
         }
 
         i = 0;
         // Only show individual selections boxes if there is more than 1 selection
-        if (selectionManager.selections.length > 1) {
-            for (; i < selectionManager.selections.length; i++) {
-                var props = Entities.getEntityProperties(selectionManager.selections[i]);
+        if (SelectionManager.selections.length > 1) {
+            for (; i < SelectionManager.selections.length; i++) {
+                var props = Entities.getEntityProperties(SelectionManager.selections[i]);
 
                 // Adjust overlay position to take registrationPoint into account
                 // centeredRP = registrationPoint with range [-0.5, 0.5]
@@ -2219,17 +2000,19 @@ SelectionDisplay = (function() {
                 var offset = vec3Mult(props.dimensions, centeredRP);
                 offset = Vec3.multiply(-1, offset);
                 offset = Vec3.multiplyQbyV(props.rotation, offset);
-                var boxPosition = Vec3.sum(props.position, offset);
+                var curBoxPosition = Vec3.sum(props.position, offset);
 
                 var color = {red: 255, green: 128, blue: 0};
-                if (i >= selectionManager.selections.length - 1) color = {red: 255, green: 255, blue: 64};
+                if (i >= SelectionManager.selections.length - 1) {
+                    color = {red: 255, green: 255, blue: 64};
+                }
 
                 Overlays.editOverlay(selectionBoxes[i], {
-                    position: boxPosition,
+                    position: curBoxPosition,
                     color: color,
                     rotation: props.rotation,
                     dimensions: props.dimensions,
-                    visible: true,
+                    visible: true
                 });
             }
         }
@@ -2302,47 +2085,94 @@ SelectionDisplay = (function() {
         });
 
         var grabberMoveUpOffset = 0.1;
+        var upVec = Quat.getUp(MyAvatar.orientation);
         grabberMoveUpPosition = {
-            x: position.x,
-            y: position.y + worldTop + grabberMoveUpOffset,
-            z: position.z
-        }
+            x: position.x + (grabberMoveUpOffset + worldTop) * upVec.x ,
+            y: position.y+ (grabberMoveUpOffset + worldTop) * upVec.y,
+            z: position.z + (grabberMoveUpOffset + worldTop) * upVec.z
+        };
         Overlays.editOverlay(grabberMoveUp, {
-            visible: activeTool == null || mode == "TRANSLATE_UP_DOWN"
+            visible: (!activeTool) || isActiveTool(grabberMoveUp)
         });
 
         Overlays.editOverlay(baseOfEntityProjectionOverlay, {
-            visible: mode != "ROTATE_YAW" && mode != "ROTATE_PITCH" && mode != "ROTATE_ROLL",
+            visible: !inModeRotate,
             solid: true,
             position: {
-                x: selectionManager.worldPosition.x,
+                x: SelectionManager.worldPosition.x,
                 y: grid.getOrigin().y,
-                z: selectionManager.worldPosition.z
+                z: SelectionManager.worldPosition.z
             },
             dimensions: {
-                x: selectionManager.worldDimensions.x,
-                y: selectionManager.worldDimensions.z
+                x: SelectionManager.worldDimensions.x,
+                y: SelectionManager.worldDimensions.z
             },
-            rotation: Quat.fromPitchYawRollDegrees(90, 0, 0),
+            rotation: Quat.fromPitchYawRollDegrees(90, 0, 0)
         });
 
+        if (wantDebug) {
+            print("====== Update Handles <=======");
+        }
+
     };
 
+    function helperSetOverlaysVisibility(handleArray, isVisible) {
+        var numHandles = handleArray.length;
+        var visibilityUpdate = { visible: isVisible };
+        for (var handleIndex = 0; handleIndex < numHandles; ++handleIndex) {
+            Overlays.editOverlay(handleArray[ handleIndex ], visibilityUpdate);
+        }
+    }
+
+    // FUNCTION: SET OVERLAYS VISIBLE
     that.setOverlaysVisible = function(isVisible) {
-        var length = allOverlays.length;
-        for (var i = 0; i < length; i++) {
-            Overlays.editOverlay(allOverlays[i], {
-                visible: isVisible
-            });
-        }
-        length = selectionBoxes.length;
-        for (var i = 0; i < length; i++) {
-            Overlays.editOverlay(selectionBoxes[i], {
-                visible: isVisible
-            });
+        helperSetOverlaysVisibility(allOverlays, isVisible);
+        helperSetOverlaysVisibility(selectionBoxes, isVisible);
+    };
+
+    // FUNCTION: SET ROTATION HANDLES VISIBLE
+    that.setRotationHandlesVisible = function(isVisible) {
+        var visibilityUpdate = { visible: isVisible };
+        Overlays.editOverlay(yawHandle, visibilityUpdate);
+        Overlays.editOverlay(pitchHandle, visibilityUpdate);
+        Overlays.editOverlay(rollHandle, visibilityUpdate);
+    };
+
+    // FUNCTION: SET STRETCH HANDLES VISIBLE
+    that.setStretchHandlesVisible = function(isVisible) {
+        helperSetOverlaysVisibility(stretchHandles, isVisible);
+    };
+
+    // FUNCTION: SET GRABBER MOVE UP VISIBLE
+    that.setGrabberMoveUpVisible = function(isVisible) {
+        Overlays.editOverlay(grabberMoveUp, { visible: isVisible });
+    };
+
+    // FUNCTION: SET GRABBER TOOLS UP VISIBLE
+    that.setGrabberToolsVisible = function(isVisible) {
+        var visibilityUpdate = { visible: isVisible };
+        for (var toolKey in grabberTools) {
+            if (!grabberTools.hasOwnProperty(toolKey)) {
+                // EARLY ITERATION EXIT--(On to the next one)
+                continue;
+            }
+
+            Overlays.editOverlay(toolKey, visibilityUpdate);
         }
     };
 
+    // FUNCTION: SET POINT LIGHT HANDLES VISIBLE
+    that.setPointLightHandlesVisible = function(isVisible) {
+        helperSetOverlaysVisibility(pointLightGrabberHandles, isVisible);
+    };
+
+    // FUNCTION: SET SPOT LIGHT HANDLES VISIBLE
+    that.setSpotLightHandlesVisible = function(isVisible) {
+        helperSetOverlaysVisibility(spotLightGrabberHandles, isVisible);
+    };
+
+    // FUNCTION: UNSELECT
+    // TODO?: Needs implementation
     that.unselect = function(entityID) {};
 
     var initialXZPick = null;
@@ -2351,18 +2181,39 @@ SelectionDisplay = (function() {
     var startPosition = null;
     var duplicatedEntityIDs = null;
 
-    var translateXZTool = {
+    // TOOL DEFINITION: TRANSLATE XZ TOOL
+    var translateXZTool = addGrabberTool(selectionBox,{
         mode: 'TRANSLATE_XZ',
         pickPlanePosition: { x: 0, y: 0, z: 0 },
         greatestDimension: 0.0,
         startingDistance: 0.0,
         startingElevation: 0.0,
-        onBegin: function(event,isAltFromGrab) {
-            SelectionManager.saveProperties();
-            startPosition = SelectionManager.worldPosition;
-            var dimensions = SelectionManager.worldDimensions;
+        onBegin: function(event, pickRay, pickResult, doClone) {
+            var wantDebug = false;
+            if (wantDebug) {
+                print("================== TRANSLATE_XZ(Beg) -> =======================");
+                Vec3.print("    pickRay", pickRay);
+                Vec3.print("    pickRay.origin", pickRay.origin);
+                Vec3.print("    pickResult.intersection", pickResult.intersection);
+            }
+
+            SelectionManager.saveProperties();
+            that.setRotationHandlesVisible(false);
+            that.setStretchHandlesVisible(false);
+            that.setGrabberMoveUpVisible(false);
+
+            startPosition = SelectionManager.worldPosition;
+
+            translateXZTool.pickPlanePosition = pickResult.intersection;
+            translateXZTool.greatestDimension = Math.max(Math.max(SelectionManager.worldDimensions.x, SelectionManager.worldDimensions.y), SelectionManager.worldDimensions.z);
+            translateXZTool.startingDistance = Vec3.distance(pickRay.origin, SelectionManager.position);
+            translateXZTool.startingElevation = translateXZTool.elevation(pickRay.origin, translateXZTool.pickPlanePosition);
+            if (wantDebug) {
+                print("    longest dimension: " + translateXZTool.greatestDimension);
+                print("    starting distance: " + translateXZTool.startingDistance);
+                print("    starting elevation: " + translateXZTool.startingElevation);
+            }
 
-            var pickRay = generalComputePickRay(event.x, event.y);
             initialXZPick = rayPlaneIntersection(pickRay, translateXZTool.pickPlanePosition, {
                 x: 0,
                 y: 1,
@@ -2372,7 +2223,7 @@ SelectionDisplay = (function() {
             // Duplicate entities if alt is pressed.  This will make a
             // copy of the selected entities and move the _original_ entities, not
             // the new ones.
-            if (event.isAlt || isAltFromGrab) {
+            if (event.isAlt || doClone) {
                 duplicatedEntityIDs = [];
                 for (var otherEntityID in SelectionManager.savedProperties) {
                     var properties = SelectionManager.savedProperties[otherEntityID];
@@ -2380,7 +2231,7 @@ SelectionDisplay = (function() {
                         var entityID = Entities.addEntity(properties);
                         duplicatedEntityIDs.push({
                             entityID: entityID,
-                            properties: properties,
+                            properties: properties
                         });
                     }
                 }
@@ -2389,6 +2240,9 @@ SelectionDisplay = (function() {
             }
 
             isConstrained = false;
+            if (wantDebug) {
+                print("================== TRANSLATE_XZ(End) <- =======================");
+            }
         },
         onEnd: function(event, reason) {
             pushCommandForSelections(duplicatedEntityIDs);
@@ -2417,29 +2271,33 @@ SelectionDisplay = (function() {
             // this will happen when someone drags across the horizon from the side they started on.
             if (!pick) {
                 if (wantDebug) {
-                    print("Pick ray does not intersect XZ plane.");
+                    print("    "+ translateXZTool.mode + "Pick ray does not intersect XZ plane.");
                 }
+                
+                // EARLY EXIT--(Invalid ray detected.)
                 return;
             }
 
             var vector = Vec3.subtract(pick, initialXZPick);
 
             // If the mouse is too close to the horizon of the pick plane, stop moving
-            var MIN_ELEVATION = 0.02;   //  largest dimension of object divided by distance to it
+            var MIN_ELEVATION = 0.02; //  largest dimension of object divided by distance to it
             var elevation = translateXZTool.elevation(pickRay.origin, pick);
             if (wantDebug) {
-                    print("Start Elevation: " + translateXZTool.startingElevation + ", elevation: " + elevation);
+                print("Start Elevation: " + translateXZTool.startingElevation + ", elevation: " + elevation);
             }
             if ((translateXZTool.startingElevation > 0.0 && elevation < MIN_ELEVATION) ||
                 (translateXZTool.startingElevation < 0.0 && elevation > -MIN_ELEVATION)) {
                 if (wantDebug) {
-                    print("too close to horizon!");
+                    print("    "+ translateXZTool.mode + " - too close to horizon!");
                 }
+
+                // EARLY EXIT--(Don't proceed past the reached limit.)
                 return;
             }
 
             //  If the angular size of the object is too small, stop moving
-            var MIN_ANGULAR_SIZE = 0.01;   //  Radians
+            var MIN_ANGULAR_SIZE = 0.01; //  Radians
             if (translateXZTool.greatestDimension > 0) {
                 var angularSize = Math.atan(translateXZTool.greatestDimension / Vec3.distance(pickRay.origin, pick));
                 if (wantDebug) {
@@ -2506,13 +2364,12 @@ SelectionDisplay = (function() {
             }
 
             constrainMajorOnly = event.isControl;
-            var cornerPosition = Vec3.sum(startPosition, Vec3.multiply(-0.5, selectionManager.worldDimensions));
+            var cornerPosition = Vec3.sum(startPosition, Vec3.multiply(-0.5, SelectionManager.worldDimensions));
             vector = Vec3.subtract(
                 grid.snapToGrid(Vec3.sum(cornerPosition, vector), constrainMajorOnly),
                 cornerPosition);
 
 
-
             for (var i = 0; i < SelectionManager.selections.length; i++) {
                 var properties = SelectionManager.savedProperties[SelectionManager.selections[i]];
                 if (!properties) {
@@ -2524,7 +2381,7 @@ SelectionDisplay = (function() {
                     z: vector.z
                 });
                 Entities.editEntity(SelectionManager.selections[i], {
-                    position: newPosition,
+                    position: newPosition
                 });
 
                 if (wantDebug) {
@@ -2537,22 +2394,21 @@ SelectionDisplay = (function() {
 
             SelectionManager._update();
         }
-    };
-
-    var lastXYPick = null
+    });
+    
+    // GRABBER TOOL: GRABBER MOVE UP
+    var lastXYPick = null;
     var upDownPickNormal = null;
     addGrabberTool(grabberMoveUp, {
         mode: "TRANSLATE_UP_DOWN",
-        onBegin: function(event) {
-            pickRay = generalComputePickRay(event.x, event.y);
-
+        onBegin: function(event, pickRay, pickResult) {
             upDownPickNormal = Quat.getForward(lastCameraOrientation);
-            // Remove y component so the y-axis lies along the plane we picking on - this will
-            // give movements that follow the mouse.
-            upDownPickNormal.y = 0;
             lastXYPick = rayPlaneIntersection(pickRay, SelectionManager.worldPosition, upDownPickNormal);
 
             SelectionManager.saveProperties();
+            that.setGrabberMoveUpVisible(true);
+            that.setStretchHandlesVisible(false);
+            that.setRotationHandlesVisible(false);
 
             // Duplicate entities if alt is pressed.  This will make a
             // copy of the selected entities and move the _original_ entities, not
@@ -2565,7 +2421,7 @@ SelectionDisplay = (function() {
                         var entityID = Entities.addEntity(properties);
                         duplicatedEntityIDs.push({
                             entityID: entityID,
-                            properties: properties,
+                            properties: properties
                         });
                     }
                 }
@@ -2583,11 +2439,17 @@ SelectionDisplay = (function() {
             var newIntersection = rayPlaneIntersection(pickRay, SelectionManager.worldPosition, upDownPickNormal);
 
             var vector = Vec3.subtract(newIntersection, lastXYPick);
+
+            // project vector onto avatar up vector
+            // we want the avatar referential not the camera.
+            var avatarUpVector = Quat.getUp(MyAvatar.orientation);
+            var dotVectorUp = Vec3.dot(vector, avatarUpVector);
+            vector = Vec3.multiply(dotVectorUp, avatarUpVector);
+
+
             vector = grid.snapToGrid(vector);
 
-            // we only care about the Y axis
-            vector.x = 0;
-            vector.z = 0;
+            
 
             var wantDebug = false;
             if (wantDebug) {
@@ -2595,35 +2457,30 @@ SelectionDisplay = (function() {
                 print("                event.y:" + event.y);
                 Vec3.print("        newIntersection:", newIntersection);
                 Vec3.print("                 vector:", vector);
-                Vec3.print("            newPosition:", newPosition);
+                // Vec3.print("            newPosition:", newPosition);
             }
             for (var i = 0; i < SelectionManager.selections.length; i++) {
                 var id = SelectionManager.selections[i];
-                var properties = selectionManager.savedProperties[id];
+                var properties = SelectionManager.savedProperties[id];
 
                 var original = properties.position;
                 var newPosition = Vec3.sum(properties.position, vector);
 
                 Entities.editEntity(id, {
-                    position: newPosition,
+                    position: newPosition
                 });
             }
 
             SelectionManager._update();
-        },
+        }
     });
 
+    // GRABBER TOOL: GRABBER CLONER
     addGrabberTool(grabberCloner, {
         mode: "CLONE",
-        onBegin: function(event) {
-
-            var pickRay = generalComputePickRay(event.x, event.y);
-            var result = Overlays.findRayIntersection(pickRay);
-            translateXZTool.pickPlanePosition = result.intersection;
-            translateXZTool.greatestDimension = Math.max(Math.max(SelectionManager.worldDimensions.x, SelectionManager.worldDimensions.y),
-                SelectionManager.worldDimensions.z);
-
-            translateXZTool.onBegin(event,true);
+        onBegin: function(event, pickRay, pickResult) {
+            var doClone = true;
+            translateXZTool.onBegin(event,pickRay,pickResult,doClone);
         },
         elevation: function (event) {
             translateXZTool.elevation(event);
@@ -2639,19 +2496,21 @@ SelectionDisplay = (function() {
     });
 
 
-
-
+    // FUNCTION: VEC 3 MULT
     var vec3Mult = function(v1, v2) {
-            return {
-                x: v1.x * v2.x,
-                y: v1.y * v2.y,
-                z: v1.z * v2.z
-            };
+        return {
+            x: v1.x * v2.x,
+            y: v1.y * v2.y,
+            z: v1.z * v2.z
+        };
     };
+
+    // FUNCTION: MAKE STRETCH TOOL
     // stretchMode - name of mode
     // direction - direction to stretch in
     // pivot - point to use as a pivot
     // offset - the position of the overlay tool relative to the selections center position
+    // @return: tool obj
     var makeStretchTool = function(stretchMode, direction, pivot, offset, customOnMove) {
         //  directionFor3DStretch - direction and pivot for 3D stretch
         //  distanceFor3DStretch - distance from the intersection point and the handController 
@@ -2666,16 +2525,15 @@ SelectionDisplay = (function() {
         var signs = {
             x: direction.x < 0 ? -1 : (direction.x > 0 ? 1 : 0),
             y: direction.y < 0 ? -1 : (direction.y > 0 ? 1 : 0),
-            z: direction.z < 0 ? -1 : (direction.z > 0 ? 1 : 0),
+            z: direction.z < 0 ? -1 : (direction.z > 0 ? 1 : 0)
         };
 
         var mask = {
             x: Math.abs(direction.x) > 0 ? 1 : 0,
             y: Math.abs(direction.y) > 0 ? 1 : 0,
-            z: Math.abs(direction.z) > 0 ? 1 : 0,
+            z: Math.abs(direction.z) > 0 ? 1 : 0
         };
-        
-        
+
 
         var numDimensions = mask.x + mask.y + mask.z;
 
@@ -2693,12 +2551,12 @@ SelectionDisplay = (function() {
         var pickRayPosition3D = null;
         var rotation = null;
 
-        var onBegin = function(event) {
+        var onBegin = function(event, pickRay, pickResult) {
             var properties = Entities.getEntityProperties(SelectionManager.selections[0]);
             initialProperties = properties;
-            rotation = spaceMode == SPACE_LOCAL ? properties.rotation : Quat.fromPitchYawRollDegrees(0, 0, 0);
+            rotation = (spaceMode === SPACE_LOCAL) ? properties.rotation : Quat.IDENTITY;
 
-            if (spaceMode == SPACE_LOCAL) {
+            if (spaceMode === SPACE_LOCAL) {
                 rotation = SelectionManager.localRotation;
                 initialPosition = SelectionManager.localPosition;
                 initialDimensions = SelectionManager.localDimensions;
@@ -2737,14 +2595,13 @@ SelectionDisplay = (function() {
                 deltaPivot3D = Vec3.subtract(centeredRP, scaledPivot3D);
                 
                 var scaledOffsetWorld3D = vec3Mult(initialDimensions, 
-                    Vec3.subtract(Vec3.multiply(0.5, Vec3.multiply(-1.0, directionFor3DStretch)), 
-                    centeredRP));
+                    Vec3.subtract(Vec3.multiply(0.5, Vec3.multiply(-1.0, directionFor3DStretch)), centeredRP));
                 
                 pickRayPosition3D = Vec3.sum(initialPosition, Vec3.multiplyQbyV(rotation, scaledOffsetWorld));
             }
             var start = null;
             var end = null;
-            if (numDimensions == 1 && mask.x) {
+            if ((numDimensions === 1) && mask.x) {
                 start = Vec3.multiplyQbyV(rotation, {
                     x: -10000,
                     y: 0,
@@ -2760,10 +2617,10 @@ SelectionDisplay = (function() {
                 Overlays.editOverlay(xRailOverlay, {
                     start: start,
                     end: end,
-                    visible: true,
+                    visible: true
                 });
             }
-            if (numDimensions == 1 && mask.y) {
+            if ((numDimensions === 1) && mask.y) {
                 start = Vec3.multiplyQbyV(rotation, {
                     x: 0,
                     y: -10000,
@@ -2779,10 +2636,10 @@ SelectionDisplay = (function() {
                 Overlays.editOverlay(yRailOverlay, {
                     start: start,
                     end: end,
-                    visible: true,
+                    visible: true
                 });
             }
-            if (numDimensions == 1 && mask.z) {
+            if ((numDimensions === 1) && mask.z) {
                 start = Vec3.multiplyQbyV(rotation, {
                     x: 0,
                     y: 0,
@@ -2798,17 +2655,17 @@ SelectionDisplay = (function() {
                 Overlays.editOverlay(zRailOverlay, {
                     start: start,
                     end: end,
-                    visible: true,
+                    visible: true
                 });
             }
-            if (numDimensions == 1) {
-                if (mask.x == 1) {
+            if (numDimensions === 1) {
+                if (mask.x === 1) {
                     planeNormal = {
                         x: 0,
                         y: 1,
                         z: 0
                     };
-                } else if (mask.y == 1) {
+                } else if (mask.y === 1) {
                     planeNormal = {
                         x: 1,
                         y: 0,
@@ -2821,7 +2678,7 @@ SelectionDisplay = (function() {
                         z: 0
                     };
                 }
-            } else if (numDimensions == 2) {
+            } else if (numDimensions === 2) {
                 if (mask.x === 0) {
                     planeNormal = {
                         x: 1,
@@ -2838,13 +2695,12 @@ SelectionDisplay = (function() {
                     planeNormal = {
                         x: 0,
                         y: 0,
-                        z: z
+                        z: 1
                     };
                 }
             }
             
             planeNormal = Vec3.multiplyQbyV(rotation, planeNormal);
-            var pickRay = generalComputePickRay(event.x, event.y);
             lastPick = rayPlaneIntersection(pickRay,
                 pickRayPosition,
                 planeNormal);
@@ -2879,10 +2735,10 @@ SelectionDisplay = (function() {
         };
 
         var onMove = function(event) {
-            var proportional = spaceMode == SPACE_WORLD || event.isShifted || activeTool.mode == "STRETCH_RADIUS";
+            var proportional = (spaceMode === SPACE_WORLD) || event.isShifted || isActiveTool(grabberSpotLightRadius);
 
             var position, dimensions, rotation;
-            if (spaceMode == SPACE_LOCAL) {
+            if (spaceMode === SPACE_LOCAL) {
                 position = SelectionManager.localPosition;
                 dimensions = SelectionManager.localDimensions;
                 rotation = SelectionManager.localRotation;
@@ -2899,13 +2755,14 @@ SelectionDisplay = (function() {
             
             // Are we using handControllers or Mouse - only relevant for 3D tools
             var controllerPose = getControllerWorldLocation(activeHand, true);
-            if (HMD.isHMDAvailable() 
-                && HMD.isHandControllerAvailable() && controllerPose.valid && that.triggered && directionFor3DStretch) {
+            var vector = null;
+            if (HMD.isHMDAvailable() && HMD.isHandControllerAvailable() && 
+                    controllerPose.valid && that.triggered && directionFor3DStretch) {
                 localDeltaPivot = deltaPivot3D;
 
                 newPick = pickRay.origin;
             
-                var vector = Vec3.subtract(newPick, lastPick3D);
+                vector = Vec3.subtract(newPick, lastPick3D);
                 
                 vector = Vec3.multiplyQbyV(Quat.inverse(rotation), vector);
             
@@ -2918,9 +2775,9 @@ SelectionDisplay = (function() {
                 
             } else {
                 newPick = rayPlaneIntersection(pickRay,
-                pickRayPosition,
-                planeNormal);
-                var vector = Vec3.subtract(newPick, lastPick);
+                    pickRayPosition,
+                    planeNormal);
+                vector = Vec3.subtract(newPick, lastPick);
 
                 vector = Vec3.multiplyQbyV(Quat.inverse(rotation), vector);
 
@@ -2956,41 +2813,39 @@ SelectionDisplay = (function() {
                 } else {
                     newDimensions = Vec3.sum(initialDimensions, changeInDimensions);
                 }
-            }
-        
-        
-            newDimensions.x = Math.max(newDimensions.x, MINIMUM_DIMENSION);
-            newDimensions.y = Math.max(newDimensions.y, MINIMUM_DIMENSION);
-            newDimensions.z = Math.max(newDimensions.z, MINIMUM_DIMENSION);
 
-            var changeInPosition = Vec3.multiplyQbyV(rotation, vec3Mult(localDeltaPivot, changeInDimensions));
-            var newPosition = Vec3.sum(initialPosition, changeInPosition);
+                newDimensions.x = Math.max(newDimensions.x, MINIMUM_DIMENSION);
+                newDimensions.y = Math.max(newDimensions.y, MINIMUM_DIMENSION);
+                newDimensions.z = Math.max(newDimensions.z, MINIMUM_DIMENSION);
 
-            for (var i = 0; i < SelectionManager.selections.length; i++) {
-                Entities.editEntity(SelectionManager.selections[i], {
-                    position: newPosition,
-                    dimensions: newDimensions,
-                });
-            }
-            
+                var changeInPosition = Vec3.multiplyQbyV(rotation, vec3Mult(localDeltaPivot, changeInDimensions));
+                var newPosition = Vec3.sum(initialPosition, changeInPosition);
 
-            var wantDebug = false;
-            if (wantDebug) {
-                print(stretchMode);
-                //Vec3.print("        newIntersection:", newIntersection);
-                Vec3.print("                 vector:", vector);
-                //Vec3.print("           oldPOS:", oldPOS);
-                //Vec3.print("                newPOS:", newPOS);
-                Vec3.print("            changeInDimensions:", changeInDimensions);
-                Vec3.print("                 newDimensions:", newDimensions);
+                for (var i = 0; i < SelectionManager.selections.length; i++) {
+                    Entities.editEntity(SelectionManager.selections[i], {
+                        position: newPosition,
+                        dimensions: newDimensions
+                    });
+                }
+                
 
-                Vec3.print("              changeInPosition:", changeInPosition);
-                Vec3.print("                   newPosition:", newPosition);
+                var wantDebug = false;
+                if (wantDebug) {
+                    print(stretchMode);
+                    // Vec3.print("        newIntersection:", newIntersection);
+                    Vec3.print("                 vector:", vector);
+                    // Vec3.print("           oldPOS:", oldPOS);
+                    // Vec3.print("                newPOS:", newPOS);
+                    Vec3.print("            changeInDimensions:", changeInDimensions);
+                    Vec3.print("                 newDimensions:", newDimensions);
+
+                    Vec3.print("              changeInPosition:", changeInPosition);
+                    Vec3.print("                   newPosition:", newPosition);
+                }
             }
 
             SelectionManager._update();
-
-        };
+        };// End of onMove def
 
         return {
             mode: stretchMode,
@@ -3043,7 +2898,8 @@ SelectionDisplay = (function() {
             z: -1
         }
     };
-    
+
+    // FUNCTION: GET DIRECTION FOR 3D STRETCH    
     // Returns a vector with directions for the stretch tool in 3D using hand controllers
     function getDirectionsFor3DStretch(mode) {
         if (mode === "STRETCH_LBN") {
@@ -3068,21 +2924,25 @@ SelectionDisplay = (function() {
     }
     
     
-
+    // FUNCTION: ADD STRETCH TOOL
     function addStretchTool(overlay, mode, pivot, direction, offset, handleMove) {
         if (!pivot) {
             pivot = direction;
         }
         var tool = makeStretchTool(mode, direction, pivot, offset, handleMove);
 
-        addGrabberTool(overlay, tool);
+        return addGrabberTool(overlay, tool);
     }
 
+    // FUNCTION: CUTOFF STRETCH FUNC
     function cutoffStretchFunc(vector, change) {
         vector = change;
-        Vec3.print("Radius stretch: ", vector);
+        var wantDebug = false;
+        if (wantDebug) {
+            Vec3.print("Radius stretch: ", vector);
+        }
         var length = vector.x + vector.y + vector.z;
-        var props = selectionManager.savedProperties[selectionManager.selections[0]];
+        var props = SelectionManager.savedProperties[SelectionManager.selections[0]];
 
         var radius = props.dimensions.z / 2;
         var originalCutoff = props.cutoff;
@@ -3091,15 +2951,16 @@ SelectionDisplay = (function() {
         var newSize = originalSize + length;
         var cutoff = Math.atan2(newSize, radius) * 180 / Math.PI;
 
-        Entities.editEntity(selectionManager.selections[0], {
-            cutoff: cutoff,
+        Entities.editEntity(SelectionManager.selections[0], {
+            cutoff: cutoff
         });
 
         SelectionManager._update();
     }
 
+    // FUNCTION: RADIUS STRETCH FUNC
     function radiusStretchFunc(vector, change) {
-        var props = selectionManager.savedProperties[selectionManager.selections[0]];
+        var props = SelectionManager.savedProperties[SelectionManager.selections[0]];
 
         // Find the axis being adjusted
         var size;
@@ -3117,13 +2978,14 @@ SelectionDisplay = (function() {
             z: size
         };
 
-        Entities.editEntity(selectionManager.selections[0], {
-            dimensions: newDimensions,
+        Entities.editEntity(SelectionManager.selections[0], {
+            dimensions: newDimensions
         });
 
         SelectionManager._update();
     }
 
+    // STRETCH TOOL DEF SECTION
     addStretchTool(grabberNEAR, "STRETCH_NEAR", {
         x: 0,
         y: 0,
@@ -3530,525 +3392,337 @@ SelectionDisplay = (function() {
         z: 1
     });
 
+    // FUNCTION: UPDATE ROTATION DEGREES OVERLAY
     function updateRotationDegreesOverlay(angleFromZero, handleRotation, centerPosition) {
+        var wantDebug = false;
+        if (wantDebug) {
+            print("---> updateRotationDegreesOverlay ---");
+            print("    AngleFromZero: " + angleFromZero);
+            print("    HandleRotation - X: " + handleRotation.x + " Y: " + handleRotation.y + " Z: " + handleRotation.z);
+            print("    CenterPos - " + centerPosition.x + " Y: " + centerPosition.y + " Z: " + centerPosition.z);
+        }
+
         var angle = angleFromZero * (Math.PI / 180);
         var position = {
             x: Math.cos(angle) * outerRadius * ROTATION_DISPLAY_DISTANCE_MULTIPLIER,
             y: Math.sin(angle) * outerRadius * ROTATION_DISPLAY_DISTANCE_MULTIPLIER,
-            z: 0,
+            z: 0
         };
+        if (wantDebug) {
+            print("    Angle: " + angle);
+            print("    InitialPos: " + position.x + ", " + position.y + ", " + position.z);
+        }
+        
         position = Vec3.multiplyQbyV(handleRotation, position);
         position = Vec3.sum(centerPosition, position);
-        Overlays.editOverlay(rotationDegreesDisplay, {
+        var overlayProps = {
             position: position,
             dimensions: {
                 x: innerRadius * ROTATION_DISPLAY_SIZE_X_MULTIPLIER,
                 y: innerRadius * ROTATION_DISPLAY_SIZE_Y_MULTIPLIER
             },
             lineHeight: innerRadius * ROTATION_DISPLAY_LINE_HEIGHT_MULTIPLIER,
-            text: normalizeDegrees(angleFromZero) + "°",
-        });
+            text: normalizeDegrees(angleFromZero) + "°"
+        };
+        if (wantDebug) {
+            print("    TranslatedPos: " + position.x + ", " + position.y + ", " + position.z);
+            print("    OverlayDim - X: " + overlayProps.dimensions.x + " Y: " + overlayProps.dimensions.y + " Z: " + overlayProps.dimensions.z);
+            print("    OverlayLineHeight: " + overlayProps.lineHeight);
+            print("    OverlayText: " + overlayProps.text);
+        }
+
+        Overlays.editOverlay(rotationDegreesDisplay, overlayProps);
+        if (wantDebug) {
+            print("<--- updateRotationDegreesOverlay ---");
+        }
     }
 
+    // FUNCTION DEF: updateSelectionsRotation
+    //    Helper func used by rotation grabber tools 
+    function updateSelectionsRotation(rotationChange) {
+        if (!rotationChange) {
+            print("ERROR: entitySelectionTool.updateSelectionsRotation - Invalid arg specified!!");
+
+            // EARLY EXIT
+            return;
+        }
+        
+        // Entities should only reposition if we are rotating multiple selections around
+        // the selections center point.  Otherwise, the rotation will be around the entities
+        // registration point which does not need repositioning.
+        var reposition = (SelectionManager.selections.length > 1);
+        for (var i = 0; i < SelectionManager.selections.length; i++) {
+            var entityID = SelectionManager.selections[i];
+            var initialProperties = SelectionManager.savedProperties[entityID];
+
+            var newProperties = {
+                rotation: Quat.multiply(rotationChange, initialProperties.rotation)
+            };
+
+            if (reposition) {
+                var dPos = Vec3.subtract(initialProperties.position, initialPosition);
+                dPos = Vec3.multiplyQbyV(rotationChange, dPos);
+                newProperties.position = Vec3.sum(initialPosition, dPos);
+            }
+
+            Entities.editEntity(entityID, newProperties);
+        }
+    }
+
+    function helperRotationHandleOnBegin(event, pickRay, rotAroundAxis, rotCenter, handleRotation) {
+        var wantDebug = false;
+        if (wantDebug) {
+            print("================== " + getMode() + "(rotation helper onBegin) -> =======================");
+        }
+
+        SelectionManager.saveProperties();
+        that.setRotationHandlesVisible(false);
+        that.setStretchHandlesVisible(false);
+        that.setGrabberMoveUpVisible(false);
+
+        initialPosition = SelectionManager.worldPosition;
+        rotationNormal = { x: 0, y: 0, z: 0 };
+        rotationNormal[rotAroundAxis] = 1;
+
+        // Size the overlays to the current selection size
+        var diagonal = (Vec3.length(SelectionManager.worldDimensions) / 2) * 1.1;
+        var halfDimensions = Vec3.multiply(SelectionManager.worldDimensions, 0.5);
+        innerRadius = diagonal;
+        outerRadius = diagonal * 1.15;
+        var innerAlpha = 0.2;
+        var outerAlpha = 0.2;
+        Overlays.editOverlay(rotateOverlayInner, {
+            visible: true,
+            rotation: handleRotation,
+            position: rotCenter,
+            size: innerRadius,
+            innerRadius: 0.9,
+            startAt: 0,
+            endAt: 360,
+            alpha: innerAlpha
+        });
+
+        Overlays.editOverlay(rotateOverlayOuter, {
+            visible: true,
+            rotation: handleRotation,
+            position: rotCenter,
+            size: outerRadius,
+            innerRadius: 0.9,
+            startAt: 0,
+            endAt: 360,
+            alpha: outerAlpha
+        });
+
+        Overlays.editOverlay(rotateOverlayCurrent, {
+            visible: true,
+            rotation: handleRotation,
+            position: rotCenter,
+            size: outerRadius,
+            startAt: 0,
+            endAt: 0,
+            innerRadius: 0.9
+        });
+
+        Overlays.editOverlay(rotationDegreesDisplay, {
+            visible: true
+        });
+
+        updateRotationDegreesOverlay(0, handleRotation, rotCenter);
+        
+        // editOverlays may not have committed rotation changes.
+        // Compute zero position based on where the overlay will be eventually.
+        var result = rayPlaneIntersection(pickRay, rotCenter, rotationNormal);
+        // In case of a parallel ray, this will be null, which will cause early-out
+        // in the onMove helper.
+        rotZero = result;
+        
+        if (wantDebug) {
+            print("================== " + getMode() + "(rotation helper onBegin) <- =======================");
+        }
+    }// End_Function(helperRotationHandleOnBegin)
+
+    function helperRotationHandleOnMove(event, rotAroundAxis, rotCenter, handleRotation) {
+
+        if (!rotZero) {
+            print("ERROR: entitySelectionTool.handleRotationHandleOnMove - Invalid RotationZero Specified (missed rotation target plane?)");
+
+            // EARLY EXIT
+            return;
+        }
+
+        var wantDebug = false;
+        if (wantDebug) {
+            print("================== "+ getMode() + "(rotation helper onMove) -> =======================");
+            Vec3.print("    rotZero: ", rotZero);
+        }
+        var pickRay = generalComputePickRay(event.x, event.y);
+        Overlays.editOverlay(selectionBox, {
+            visible: false
+        });
+        Overlays.editOverlay(baseOfEntityProjectionOverlay, {
+            visible: false
+        });
+
+        var result = rayPlaneIntersection(pickRay, rotCenter, rotationNormal);
+        if (result) {
+            var centerToZero = Vec3.subtract(rotZero, rotCenter);
+            var centerToIntersect = Vec3.subtract(result, rotCenter);
+            if (wantDebug) {
+                Vec3.print("    RotationNormal:    ", rotationNormal);
+                Vec3.print("    rotZero:           ", rotZero);
+                Vec3.print("    rotCenter:         ", rotCenter);
+                Vec3.print("    intersect:         ", result);
+                Vec3.print("    centerToZero:      ", centerToZero);
+                Vec3.print("    centerToIntersect: ", centerToIntersect);
+            }
+            // Note: orientedAngle which wants normalized centerToZero and centerToIntersect
+            //             handles that internally, so it's to pass unnormalized vectors here.
+            var angleFromZero = Vec3.orientedAngle(centerToZero, centerToIntersect, rotationNormal);
+
+            var distanceFromCenter = Vec3.length(centerToIntersect);
+            var snapToInner = distanceFromCenter < innerRadius;
+            var snapAngle = snapToInner ? innerSnapAngle : 1.0;
+            angleFromZero = Math.floor(angleFromZero / snapAngle) * snapAngle;
+
+            var vec3Degrees = { x: 0, y: 0, z: 0 };
+            vec3Degrees[rotAroundAxis] = angleFromZero;
+            var rotChange = Quat.fromVec3Degrees(vec3Degrees);
+            updateSelectionsRotation(rotChange);
+
+            updateRotationDegreesOverlay(angleFromZero, handleRotation, rotCenter);
+
+            // update the rotation display accordingly...
+            var startAtCurrent = 0;
+            var endAtCurrent = angleFromZero;
+            var startAtRemainder = angleFromZero;
+            var endAtRemainder = 360;
+            if (angleFromZero < 0) {
+                startAtCurrent = 360 + angleFromZero;
+                endAtCurrent = 360;
+                startAtRemainder = 0;
+                endAtRemainder = startAtCurrent;
+            }
+            if (snapToInner) {
+                Overlays.editOverlay(rotateOverlayOuter, {
+                    startAt: 0,
+                    endAt: 360
+                });
+                Overlays.editOverlay(rotateOverlayInner, {
+                    startAt: startAtRemainder,
+                    endAt: endAtRemainder
+                });
+                Overlays.editOverlay(rotateOverlayCurrent, {
+                    startAt: startAtCurrent,
+                    endAt: endAtCurrent,
+                    size: innerRadius,
+                    majorTickMarksAngle: innerSnapAngle,
+                    minorTickMarksAngle: 0,
+                    majorTickMarksLength: -0.25,
+                    minorTickMarksLength: 0
+                });
+            } else {
+                Overlays.editOverlay(rotateOverlayInner, {
+                    startAt: 0,
+                    endAt: 360
+                });
+                Overlays.editOverlay(rotateOverlayOuter, {
+                    startAt: startAtRemainder,
+                    endAt: endAtRemainder
+                });
+                Overlays.editOverlay(rotateOverlayCurrent, {
+                    startAt: startAtCurrent,
+                    endAt: endAtCurrent,
+                    size: outerRadius,
+                    majorTickMarksAngle: 45.0,
+                    minorTickMarksAngle: 5,
+                    majorTickMarksLength: 0.25,
+                    minorTickMarksLength: 0.1
+                });
+            }
+        }// End_If(results.intersects)
+
+        if (wantDebug) {
+            print("================== "+ getMode() + "(rotation helper onMove) <- =======================");
+        }
+    }// End_Function(helperRotationHandleOnMove)
+
+    function helperRotationHandleOnEnd() {
+        var wantDebug = false;
+        if (wantDebug) {
+            print("================== " + getMode() + "(onEnd) -> =======================");
+        }
+        Overlays.editOverlay(rotateOverlayInner, {
+            visible: false
+        });
+        Overlays.editOverlay(rotateOverlayOuter, {
+            visible: false
+        });
+        Overlays.editOverlay(rotateOverlayCurrent, {
+            visible: false
+        });
+        Overlays.editOverlay(rotationDegreesDisplay, {
+            visible: false
+        });
+
+        pushCommandForSelections();
+
+        if (wantDebug) {
+            print("================== " + getMode() + "(onEnd) <- =======================");
+        }
+    }// End_Function(helperRotationHandleOnEnd)
+
+
+    // YAW GRABBER TOOL DEFINITION
     var initialPosition = SelectionManager.worldPosition;
     addGrabberTool(yawHandle, {
         mode: "ROTATE_YAW",
-        onBegin: function(event) {
-            SelectionManager.saveProperties();
-            initialPosition = SelectionManager.worldPosition;
-
-            // Size the overlays to the current selection size
-            var diagonal = (Vec3.length(selectionManager.worldDimensions) / 2) * 1.1;
-            var halfDimensions = Vec3.multiply(selectionManager.worldDimensions, 0.5);
-            innerRadius = diagonal;
-            outerRadius = diagonal * 1.15;
-            var innerAlpha = 0.2;
-            var outerAlpha = 0.2;
-            Overlays.editOverlay(rotateOverlayInner, {
-                visible: true,
-                size: innerRadius,
-                innerRadius: 0.9,
-                startAt: 0,
-                endAt: 360,
-                alpha: innerAlpha
-            });
-
-            Overlays.editOverlay(rotateOverlayOuter, {
-                visible: true,
-                size: outerRadius,
-                innerRadius: 0.9,
-                startAt: 0,
-                endAt: 360,
-                alpha: outerAlpha,
-            });
-
-            Overlays.editOverlay(rotateOverlayCurrent, {
-                visible: true,
-                size: outerRadius,
-                startAt: 0,
-                endAt: 0,
-                innerRadius: 0.9,
-            });
-
-            Overlays.editOverlay(rotationDegreesDisplay, {
-                visible: true,
-            });
-
-            updateRotationDegreesOverlay(0, yawHandleRotation, yawCenter);
+        onBegin: function(event, pickRay, pickResult) {
+            helperRotationHandleOnBegin(event, pickRay, "y", yawCenter, yawHandleRotation);
         },
         onEnd: function(event, reason) {
-            Overlays.editOverlay(rotateOverlayInner, {
-                visible: false
-            });
-            Overlays.editOverlay(rotateOverlayOuter, {
-                visible: false
-            });
-            Overlays.editOverlay(rotateOverlayCurrent, {
-                visible: false
-            });
-            Overlays.editOverlay(rotationDegreesDisplay, {
-                visible: false
-            });
-
-            pushCommandForSelections();
+            helperRotationHandleOnEnd();
         },
         onMove: function(event) {
-            var pickRay = generalComputePickRay(event.x, event.y);
-            Overlays.editOverlay(selectionBox, {
-                ignoreRayIntersection: true,
-                visible: false
-            });
-            Overlays.editOverlay(baseOfEntityProjectionOverlay, {
-                ignoreRayIntersection: true,
-                visible: false
-            });
-            Overlays.editOverlay(rotateOverlayTarget, {
-                ignoreRayIntersection: false
-            });
-
-            var result = Overlays.findRayIntersection(pickRay);
-
-            if (result.intersects) {
-                var center = yawCenter;
-                var zero = yawZero;
-                var centerToZero = Vec3.subtract(center, zero);
-                var centerToIntersect = Vec3.subtract(center, result.intersection);
-                var angleFromZero = Vec3.orientedAngle(centerToZero, centerToIntersect, rotationNormal);
-                var distanceFromCenter = Vec3.distance(center, result.intersection);
-                var snapToInner = distanceFromCenter < innerRadius;
-                var snapAngle = snapToInner ? innerSnapAngle : 1.0;
-                angleFromZero = Math.floor(angleFromZero / snapAngle) * snapAngle;
-                var yawChange = Quat.fromVec3Degrees({
-                    x: 0,
-                    y: angleFromZero,
-                    z: 0
-                });
-
-                // Entities should only reposition if we are rotating multiple selections around
-                // the selections center point.  Otherwise, the rotation will be around the entities
-                // registration point which does not need repositioning.
-                var reposition = SelectionManager.selections.length > 1;
-                for (var i = 0; i < SelectionManager.selections.length; i++) {
-                    var entityID = SelectionManager.selections[i];
-                    var properties = Entities.getEntityProperties(entityID);
-                    var initialProperties = SelectionManager.savedProperties[entityID];
-
-                    var newProperties = {
-                        rotation: Quat.multiply(yawChange, initialProperties.rotation),
-                    };
-
-                    if (reposition) {
-                        var dPos = Vec3.subtract(initialProperties.position, initialPosition);
-                        dPos = Vec3.multiplyQbyV(yawChange, dPos);
-                        newProperties.position = Vec3.sum(initialPosition, dPos);
-                    }
-
-                    Entities.editEntity(entityID, newProperties);
-                }
-
-                updateRotationDegreesOverlay(angleFromZero, yawHandleRotation, yawCenter);
-
-                // update the rotation display accordingly...
-                var startAtCurrent = 0;
-                var endAtCurrent = angleFromZero;
-                var startAtRemainder = angleFromZero;
-                var endAtRemainder = 360;
-                if (angleFromZero < 0) {
-                    startAtCurrent = 360 + angleFromZero;
-                    endAtCurrent = 360;
-                    startAtRemainder = 0;
-                    endAtRemainder = startAtCurrent;
-                }
-                if (snapToInner) {
-                    Overlays.editOverlay(rotateOverlayOuter, {
-                        startAt: 0,
-                        endAt: 360
-                    });
-                    Overlays.editOverlay(rotateOverlayInner, {
-                        startAt: startAtRemainder,
-                        endAt: endAtRemainder
-                    });
-                    Overlays.editOverlay(rotateOverlayCurrent, {
-                        startAt: startAtCurrent,
-                        endAt: endAtCurrent,
-                        size: innerRadius,
-                        majorTickMarksAngle: innerSnapAngle,
-                        minorTickMarksAngle: 0,
-                        majorTickMarksLength: -0.25,
-                        minorTickMarksLength: 0,
-                    });
-                } else {
-                    Overlays.editOverlay(rotateOverlayInner, {
-                        startAt: 0,
-                        endAt: 360
-                    });
-                    Overlays.editOverlay(rotateOverlayOuter, {
-                        startAt: startAtRemainder,
-                        endAt: endAtRemainder
-                    });
-                    Overlays.editOverlay(rotateOverlayCurrent, {
-                        startAt: startAtCurrent,
-                        endAt: endAtCurrent,
-                        size: outerRadius,
-                        majorTickMarksAngle: 45.0,
-                        minorTickMarksAngle: 5,
-                        majorTickMarksLength: 0.25,
-                        minorTickMarksLength: 0.1,
-                    });
-                }
-
-            }
+            helperRotationHandleOnMove(event, "y", yawCenter, yawHandleRotation);
         }
     });
 
+
+    // PITCH GRABBER TOOL DEFINITION
     addGrabberTool(pitchHandle, {
         mode: "ROTATE_PITCH",
-        onBegin: function(event) {
-            SelectionManager.saveProperties();
-            initialPosition = SelectionManager.worldPosition;
-
-            // Size the overlays to the current selection size
-            var diagonal = (Vec3.length(selectionManager.worldDimensions) / 2) * 1.1;
-            var halfDimensions = Vec3.multiply(selectionManager.worldDimensions, 0.5);
-            innerRadius = diagonal;
-            outerRadius = diagonal * 1.15;
-            var innerAlpha = 0.2;
-            var outerAlpha = 0.2;
-            Overlays.editOverlay(rotateOverlayInner, {
-                visible: true,
-                size: innerRadius,
-                innerRadius: 0.9,
-                startAt: 0,
-                endAt: 360,
-                alpha: innerAlpha
-            });
-
-            Overlays.editOverlay(rotateOverlayOuter, {
-                visible: true,
-                size: outerRadius,
-                innerRadius: 0.9,
-                startAt: 0,
-                endAt: 360,
-                alpha: outerAlpha,
-            });
-
-            Overlays.editOverlay(rotateOverlayCurrent, {
-                visible: true,
-                size: outerRadius,
-                startAt: 0,
-                endAt: 0,
-                innerRadius: 0.9,
-            });
-
-            Overlays.editOverlay(rotationDegreesDisplay, {
-                visible: true,
-            });
-
-            updateRotationDegreesOverlay(0, pitchHandleRotation, pitchCenter);
+        onBegin: function(event, pickRay, pickResult) {
+            helperRotationHandleOnBegin(event, pickRay, "x", pitchCenter, pitchHandleRotation);
         },
         onEnd: function(event, reason) {
-            Overlays.editOverlay(rotateOverlayInner, {
-                visible: false
-            });
-            Overlays.editOverlay(rotateOverlayOuter, {
-                visible: false
-            });
-            Overlays.editOverlay(rotateOverlayCurrent, {
-                visible: false
-            });
-            Overlays.editOverlay(rotationDegreesDisplay, {
-                visible: false
-            });
-
-            pushCommandForSelections();
+            helperRotationHandleOnEnd();
         },
-        onMove: function(event) {
-            var pickRay = generalComputePickRay(event.x, event.y);
-            Overlays.editOverlay(selectionBox, {
-                ignoreRayIntersection: true,
-                visible: false
-            });
-            Overlays.editOverlay(baseOfEntityProjectionOverlay, {
-                ignoreRayIntersection: true,
-                visible: false
-            });
-            Overlays.editOverlay(rotateOverlayTarget, {
-                ignoreRayIntersection: false
-            });
-            var result = Overlays.findRayIntersection(pickRay);
-
-            if (result.intersects) {
-                var properties = Entities.getEntityProperties(selectionManager.selections[0]);
-                var center = pitchCenter;
-                var zero = pitchZero;
-                var centerToZero = Vec3.subtract(center, zero);
-                var centerToIntersect = Vec3.subtract(center, result.intersection);
-                var angleFromZero = Vec3.orientedAngle(centerToZero, centerToIntersect, rotationNormal);
-
-                var distanceFromCenter = Vec3.distance(center, result.intersection);
-                var snapToInner = distanceFromCenter < innerRadius;
-                var snapAngle = snapToInner ? innerSnapAngle : 1.0;
-                angleFromZero = Math.floor(angleFromZero / snapAngle) * snapAngle;
-
-                var pitchChange = Quat.fromVec3Degrees({
-                    x: angleFromZero,
-                    y: 0,
-                    z: 0
-                });
-
-                for (var i = 0; i < SelectionManager.selections.length; i++) {
-                    var entityID = SelectionManager.selections[i];
-                    var properties = Entities.getEntityProperties(entityID);
-                    var initialProperties = SelectionManager.savedProperties[entityID];
-                    var dPos = Vec3.subtract(initialProperties.position, initialPosition);
-                    dPos = Vec3.multiplyQbyV(pitchChange, dPos);
-
-                    Entities.editEntity(entityID, {
-                        position: Vec3.sum(initialPosition, dPos),
-                        rotation: Quat.multiply(pitchChange, initialProperties.rotation),
-                    });
-                }
-
-                updateRotationDegreesOverlay(angleFromZero, pitchHandleRotation, pitchCenter);
-
-                // update the rotation display accordingly...
-                var startAtCurrent = 0;
-                var endAtCurrent = angleFromZero;
-                var startAtRemainder = angleFromZero;
-                var endAtRemainder = 360;
-                if (angleFromZero < 0) {
-                    startAtCurrent = 360 + angleFromZero;
-                    endAtCurrent = 360;
-                    startAtRemainder = 0;
-                    endAtRemainder = startAtCurrent;
-                }
-                if (snapToInner) {
-                    Overlays.editOverlay(rotateOverlayOuter, {
-                        startAt: 0,
-                        endAt: 360
-                    });
-                    Overlays.editOverlay(rotateOverlayInner, {
-                        startAt: startAtRemainder,
-                        endAt: endAtRemainder
-                    });
-                    Overlays.editOverlay(rotateOverlayCurrent, {
-                        startAt: startAtCurrent,
-                        endAt: endAtCurrent,
-                        size: innerRadius,
-                        majorTickMarksAngle: innerSnapAngle,
-                        minorTickMarksAngle: 0,
-                        majorTickMarksLength: -0.25,
-                        minorTickMarksLength: 0,
-                    });
-                } else {
-                    Overlays.editOverlay(rotateOverlayInner, {
-                        startAt: 0,
-                        endAt: 360
-                    });
-                    Overlays.editOverlay(rotateOverlayOuter, {
-                        startAt: startAtRemainder,
-                        endAt: endAtRemainder
-                    });
-                    Overlays.editOverlay(rotateOverlayCurrent, {
-                        startAt: startAtCurrent,
-                        endAt: endAtCurrent,
-                        size: outerRadius,
-                        majorTickMarksAngle: 45.0,
-                        minorTickMarksAngle: 5,
-                        majorTickMarksLength: 0.25,
-                        minorTickMarksLength: 0.1,
-                    });
-                }
-            }
+        onMove: function (event) {
+            helperRotationHandleOnMove(event, "x", pitchCenter, pitchHandleRotation);
         }
     });
 
+
+    // ROLL GRABBER TOOL DEFINITION
     addGrabberTool(rollHandle, {
         mode: "ROTATE_ROLL",
-        onBegin: function(event) {
-            SelectionManager.saveProperties();
-            initialPosition = SelectionManager.worldPosition;
-
-            // Size the overlays to the current selection size
-            var diagonal = (Vec3.length(selectionManager.worldDimensions) / 2) * 1.1;
-            var halfDimensions = Vec3.multiply(selectionManager.worldDimensions, 0.5);
-            innerRadius = diagonal;
-            outerRadius = diagonal * 1.15;
-            var innerAlpha = 0.2;
-            var outerAlpha = 0.2;
-            Overlays.editOverlay(rotateOverlayInner, {
-                visible: true,
-                size: innerRadius,
-                innerRadius: 0.9,
-                startAt: 0,
-                endAt: 360,
-                alpha: innerAlpha
-            });
-
-            Overlays.editOverlay(rotateOverlayOuter, {
-                visible: true,
-                size: outerRadius,
-                innerRadius: 0.9,
-                startAt: 0,
-                endAt: 360,
-                alpha: outerAlpha,
-            });
-
-            Overlays.editOverlay(rotateOverlayCurrent, {
-                visible: true,
-                size: outerRadius,
-                startAt: 0,
-                endAt: 0,
-                innerRadius: 0.9,
-            });
-
-            Overlays.editOverlay(rotationDegreesDisplay, {
-                visible: true,
-            });
-
-            updateRotationDegreesOverlay(0, rollHandleRotation, rollCenter);
+        onBegin: function(event, pickRay, pickResult) {
+            helperRotationHandleOnBegin(event, pickRay, "z", rollCenter, rollHandleRotation);
         },
-        onEnd: function(event, reason) {
-            Overlays.editOverlay(rotateOverlayInner, {
-                visible: false
-            });
-            Overlays.editOverlay(rotateOverlayOuter, {
-                visible: false
-            });
-            Overlays.editOverlay(rotateOverlayCurrent, {
-                visible: false
-            });
-            Overlays.editOverlay(rotationDegreesDisplay, {
-                visible: false
-            });
-
-            pushCommandForSelections();
+        onEnd: function (event, reason) {
+            helperRotationHandleOnEnd();
         },
         onMove: function(event) {
-            var pickRay = generalComputePickRay(event.x, event.y);
-            Overlays.editOverlay(selectionBox, {
-                ignoreRayIntersection: true,
-                visible: false
-            });
-            Overlays.editOverlay(baseOfEntityProjectionOverlay, {
-                ignoreRayIntersection: true,
-                visible: false
-            });
-            Overlays.editOverlay(rotateOverlayTarget, {
-                ignoreRayIntersection: false
-            });
-            var result = Overlays.findRayIntersection(pickRay);
-
-            if (result.intersects) {
-                var properties = Entities.getEntityProperties(selectionManager.selections[0]);
-                var center = rollCenter;
-                var zero = rollZero;
-                var centerToZero = Vec3.subtract(center, zero);
-                var centerToIntersect = Vec3.subtract(center, result.intersection);
-                var angleFromZero = Vec3.orientedAngle(centerToZero, centerToIntersect, rotationNormal);
-
-                var distanceFromCenter = Vec3.distance(center, result.intersection);
-                var snapToInner = distanceFromCenter < innerRadius;
-                var snapAngle = snapToInner ? innerSnapAngle : 1.0;
-                angleFromZero = Math.floor(angleFromZero / snapAngle) * snapAngle;
-
-                var rollChange = Quat.fromVec3Degrees({
-                    x: 0,
-                    y: 0,
-                    z: angleFromZero
-                });
-                for (var i = 0; i < SelectionManager.selections.length; i++) {
-                    var entityID = SelectionManager.selections[i];
-                    var properties = Entities.getEntityProperties(entityID);
-                    var initialProperties = SelectionManager.savedProperties[entityID];
-                    var dPos = Vec3.subtract(initialProperties.position, initialPosition);
-                    dPos = Vec3.multiplyQbyV(rollChange, dPos);
-
-                    Entities.editEntity(entityID, {
-                        position: Vec3.sum(initialPosition, dPos),
-                        rotation: Quat.multiply(rollChange, initialProperties.rotation),
-                    });
-                }
-
-                updateRotationDegreesOverlay(angleFromZero, rollHandleRotation, rollCenter);
-
-                // update the rotation display accordingly...
-                var startAtCurrent = 0;
-                var endAtCurrent = angleFromZero;
-                var startAtRemainder = angleFromZero;
-                var endAtRemainder = 360;
-                if (angleFromZero < 0) {
-                    startAtCurrent = 360 + angleFromZero;
-                    endAtCurrent = 360;
-                    startAtRemainder = 0;
-                    endAtRemainder = startAtCurrent;
-                }
-                if (snapToInner) {
-                    Overlays.editOverlay(rotateOverlayOuter, {
-                        startAt: 0,
-                        endAt: 360
-                    });
-                    Overlays.editOverlay(rotateOverlayInner, {
-                        startAt: startAtRemainder,
-                        endAt: endAtRemainder
-                    });
-                    Overlays.editOverlay(rotateOverlayCurrent, {
-                        startAt: startAtCurrent,
-                        endAt: endAtCurrent,
-                        size: innerRadius,
-                        majorTickMarksAngle: innerSnapAngle,
-                        minorTickMarksAngle: 0,
-                        majorTickMarksLength: -0.25,
-                        minorTickMarksLength: 0,
-                    });
-                } else {
-                    Overlays.editOverlay(rotateOverlayInner, {
-                        startAt: 0,
-                        endAt: 360
-                    });
-                    Overlays.editOverlay(rotateOverlayOuter, {
-                        startAt: startAtRemainder,
-                        endAt: endAtRemainder
-                    });
-                    Overlays.editOverlay(rotateOverlayCurrent, {
-                        startAt: startAtCurrent,
-                        endAt: endAtCurrent,
-                        size: outerRadius,
-                        majorTickMarksAngle: 45.0,
-                        minorTickMarksAngle: 5,
-                        majorTickMarksLength: 0.25,
-                        minorTickMarksLength: 0.1,
-                    });
-                }
-            }
+            helperRotationHandleOnMove(event, "z", rollCenter, rollHandleRotation);
         }
     });
 
+    // FUNCTION: CHECK MOVE
     that.checkMove = function() {
         if (SelectionManager.hasSelection()) {
 
             // FIXME - this cause problems with editing in the entity properties window
-            //SelectionManager._update();
+            // SelectionManager._update();
 
             if (!Vec3.equal(Camera.getPosition(), lastCameraPosition) ||
                 !Quat.equal(Camera.getOrientation(), lastCameraOrientation)) {
@@ -4058,412 +3732,128 @@ SelectionDisplay = (function() {
         }
     };
 
-    that.mousePressEvent = function(event) {
-        var wantDebug = false;
-        if (!event.isLeftButton && !that.triggered) {
-            // if another mouse button than left is pressed ignore it
-            return false;
-        }
-
-        var somethingClicked = false;
-        var pickRay = generalComputePickRay(event.x, event.y);
-
-        var result = Overlays.findRayIntersection(pickRay, true, [HMD.tabletID, HMD.tabletScreenID, HMD.homeButtonID]);
-        if (result.intersects) {
-            // mouse clicks on the tablet should override the edit affordances
-            return false;
-        }
-
-        // before we do a ray test for grabbers, disable the ray intersection for our selection box
-        Overlays.editOverlay(selectionBox, {
-            ignoreRayIntersection: true
-        });
-        Overlays.editOverlay(yawHandle, {
-            ignoreRayIntersection: true
-        });
-        Overlays.editOverlay(pitchHandle, {
-            ignoreRayIntersection: true
-        });
-        Overlays.editOverlay(rollHandle, {
-            ignoreRayIntersection: true
-        });
-
-        result = Overlays.findRayIntersection(pickRay);
-        if (result.intersects) {
-            if (wantDebug) {
-                print("something intersects... ");
-                print("   result.overlayID:" + result.overlayID + "[" + overlayNames[result.overlayID] + "]");
-                print("   result.intersects:" + result.intersects);
-                print("   result.overlayID:" + result.overlayID);
-                print("   result.distance:" + result.distance);
-                print("   result.face:" + result.face);
-                Vec3.print("   result.intersection:", result.intersection);
-            }
-
-            var tool = grabberTools[result.overlayID];
-            if (tool) {
-                activeTool = tool;
-                mode = tool.mode;
-                somethingClicked = 'tool';
-                if (activeTool && activeTool.onBegin) {
-                    activeTool.onBegin(event);
-                }
-            } else {
-                switch (result.overlayID) {
-                    case grabberMoveUp:
-                        mode = "TRANSLATE_UP_DOWN";
-                        somethingClicked = mode;
-
-                        // in translate mode, we hide our stretch handles...
-                        for (var i = 0; i < stretchHandles.length; i++) {
-                            Overlays.editOverlay(stretchHandles[i], {
-                                visible: false
-                            });
-                        }
-                        break;
-
-
-                    case grabberNEAR:
-                    case grabberEdgeTN: // TODO: maybe this should be TOP+NEAR stretching?
-                    case grabberEdgeBN: // TODO: maybe this should be BOTTOM+FAR stretching?
-                        mode = "STRETCH_NEAR";
-                        somethingClicked = mode;
-                        break;
-
-                    case grabberFAR:
-                    case grabberEdgeTF: // TODO: maybe this should be TOP+FAR stretching?
-                    case grabberEdgeBF: // TODO: maybe this should be BOTTOM+FAR stretching?
-                        mode = "STRETCH_FAR";
-                        somethingClicked = mode;
-                        break;
-                    case grabberTOP:
-                        mode = "STRETCH_TOP";
-                        somethingClicked = mode;
-                        break;
-                    case grabberBOTTOM:
-                        mode = "STRETCH_BOTTOM";
-                        somethingClicked = mode;
-                        break;
-                    case grabberRIGHT:
-                    case grabberEdgeTR: // TODO: maybe this should be TOP+RIGHT stretching?
-                    case grabberEdgeBR: // TODO: maybe this should be BOTTOM+RIGHT stretching?
-                        mode = "STRETCH_RIGHT";
-                        somethingClicked = mode;
-                        break;
-                    case grabberLEFT:
-                    case grabberEdgeTL: // TODO: maybe this should be TOP+LEFT stretching?
-                    case grabberEdgeBL: // TODO: maybe this should be BOTTOM+LEFT stretching?
-                        mode = "STRETCH_LEFT";
-                        somethingClicked = mode;
-                        break;
-
-                    default:
-                        mode = "UNKNOWN";
-                        break;
+    that.checkControllerMove = function() {
+        if (SelectionManager.hasSelection()) {
+            var controllerPose = getControllerWorldLocation(activeHand, true);
+            var hand = (activeHand === Controller.Standard.LeftHand) ? 0 : 1;
+            if (controllerPose.valid && lastControllerPoses[hand].valid) {
+                if (!Vec3.equal(controllerPose.position, lastControllerPoses[hand].position) ||
+                    !Vec3.equal(controllerPose.rotation, lastControllerPoses[hand].rotation)) {
+                    that.mouseMoveEvent({});
                 }
             }
+            lastControllerPoses[hand] = controllerPose;
         }
-
-        // if one of the items above was clicked, then we know we are in translate or stretch mode, and we
-        // should hide our rotate handles...
-        if (somethingClicked) {
-            Overlays.editOverlay(yawHandle, {
-                visible: false
-            });
-            Overlays.editOverlay(pitchHandle, {
-                visible: false
-            });
-            Overlays.editOverlay(rollHandle, {
-                visible: false
-            });
-
-            if (mode != "TRANSLATE_UP_DOWN") {
-                Overlays.editOverlay(grabberMoveUp, {
-                    visible: false
-                });
-            }
-        }
-
-        if (!somethingClicked) {
-
-            if (wantDebug) {
-                print("rotate handle case...");
-            }
-
-
-            // After testing our stretch handles, then check out rotate handles
-            Overlays.editOverlay(yawHandle, {
-                ignoreRayIntersection: false
-            });
-            Overlays.editOverlay(pitchHandle, {
-                ignoreRayIntersection: false
-            });
-            Overlays.editOverlay(rollHandle, {
-                ignoreRayIntersection: false
-            });
-            var result = Overlays.findRayIntersection(pickRay);
-
-            var overlayOrientation;
-            var overlayCenter;
-
-            var properties = Entities.getEntityProperties(selectionManager.selections[0]);
-            var angles = Quat.safeEulerAngles(properties.rotation);
-            var pitch = angles.x;
-            var yaw = angles.y;
-            var roll = angles.z;
-
-            originalRotation = properties.rotation;
-            originalPitch = pitch;
-            originalYaw = yaw;
-            originalRoll = roll;
-
-            if (result.intersects) {
-                var tool = grabberTools[result.overlayID];
-                if (tool) {
-                    activeTool = tool;
-                    mode = tool.mode;
-                    somethingClicked = 'tool';
-                    if (activeTool && activeTool.onBegin) {
-                        activeTool.onBegin(event);
-                    }
-                }
-                switch (result.overlayID) {
-                    case yawHandle:
-                        mode = "ROTATE_YAW";
-                        somethingClicked = mode;
-                        overlayOrientation = yawHandleRotation;
-                        overlayCenter = yawCenter;
-                        yawZero = result.intersection;
-                        rotationNormal = yawNormal;
-                        break;
-
-                    case pitchHandle:
-                        mode = "ROTATE_PITCH";
-                        initialPosition = SelectionManager.worldPosition;
-                        somethingClicked = mode;
-                        overlayOrientation = pitchHandleRotation;
-                        overlayCenter = pitchCenter;
-                        pitchZero = result.intersection;
-                        rotationNormal = pitchNormal;
-                        break;
-
-                    case rollHandle:
-                        mode = "ROTATE_ROLL";
-                        somethingClicked = mode;
-                        overlayOrientation = rollHandleRotation;
-                        overlayCenter = rollCenter;
-                        rollZero = result.intersection;
-                        rotationNormal = rollNormal;
-                        break;
-
-                    default:
-                        if (wantDebug) {
-                            print("mousePressEvent()...... " + overlayNames[result.overlayID]);
-                        }
-                        mode = "UNKNOWN";
-                        break;
-                }
-            }
-            if (wantDebug) {
-                print("    somethingClicked:" + somethingClicked);
-                print("                mode:" + mode);
-            }
-
-            if (somethingClicked) {
-
-                Overlays.editOverlay(rotateOverlayTarget, {
-                    visible: true,
-                    rotation: overlayOrientation,
-                    position: overlayCenter
-                });
-                Overlays.editOverlay(rotateOverlayInner, {
-                    visible: true,
-                    rotation: overlayOrientation,
-                    position: overlayCenter
-                });
-                Overlays.editOverlay(rotateOverlayOuter, {
-                    visible: true,
-                    rotation: overlayOrientation,
-                    position: overlayCenter,
-                    startAt: 0,
-                    endAt: 360
-                });
-                Overlays.editOverlay(rotateOverlayCurrent, {
-                    visible: true,
-                    rotation: overlayOrientation,
-                    position: overlayCenter,
-                    startAt: 0,
-                    endAt: 0
-                });
-                Overlays.editOverlay(yawHandle, {
-                    visible: false
-                });
-                Overlays.editOverlay(pitchHandle, {
-                    visible: false
-                });
-                Overlays.editOverlay(rollHandle, {
-                    visible: false
-                });
-
-
-                Overlays.editOverlay(yawHandle, {
-                    visible: false
-                });
-                Overlays.editOverlay(pitchHandle, {
-                    visible: false
-                });
-                Overlays.editOverlay(rollHandle, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberMoveUp, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberLBN, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberLBF, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberRBN, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberRBF, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberLTN, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberLTF, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberRTN, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberRTF, {
-                    visible: false
-                });
-
-                Overlays.editOverlay(grabberTOP, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberBOTTOM, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberLEFT, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberRIGHT, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberNEAR, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberFAR, {
-                    visible: false
-                });
-
-                Overlays.editOverlay(grabberEdgeTR, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberEdgeTL, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberEdgeTF, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberEdgeTN, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberEdgeBR, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberEdgeBL, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberEdgeBF, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberEdgeBN, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberEdgeNR, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberEdgeNL, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberEdgeFR, {
-                    visible: false
-                });
-                Overlays.editOverlay(grabberEdgeFL, {
-                    visible: false
-                });
-            }
-        }
-
-        if (!somethingClicked) {
-            Overlays.editOverlay(selectionBox, {
-                ignoreRayIntersection: false
-            });
-            var result = Overlays.findRayIntersection(pickRay);
-            if (result.intersects) {
-                switch (result.overlayID) {
-                    case selectionBox:
-                        activeTool = translateXZTool;
-                        translateXZTool.pickPlanePosition = result.intersection;
-                        translateXZTool.greatestDimension = Math.max(Math.max(SelectionManager.worldDimensions.x, SelectionManager.worldDimensions.y),
-                            SelectionManager.worldDimensions.z);
-                        if (wantDebug) {
-                            print("longest dimension: " + translateXZTool.greatestDimension);
-                            translateXZTool.startingDistance = Vec3.distance(pickRay.origin, SelectionManager.position);
-                            print("starting distance: " + translateXZTool.startingDistance);
-                            translateXZTool.startingElevation = translateXZTool.elevation(pickRay.origin, translateXZTool.pickPlanePosition);
-                            print(" starting elevation: " + translateXZTool.startingElevation);
-                        }
-
-                        mode = translateXZTool.mode;
-                        activeTool.onBegin(event);
-                        somethingClicked = 'selectionBox';
-                        break;
-                    default:
-                        if (wantDebug) {
-                            print("mousePressEvent()...... " + overlayNames[result.overlayID]);
-                        }
-                        mode = "UNKNOWN";
-                        break;
-                }
-            }
-        }
-
-        if (somethingClicked) {
-            pickRay = generalComputePickRay(event.x, event.y);
-            if (wantDebug) {
-                print("mousePressEvent()...... " + overlayNames[result.overlayID]);
-            }
-        }
-
-        // reset everything as intersectable...
-        // TODO: we could optimize this since some of these were already flipped back
-        Overlays.editOverlay(selectionBox, {
-            ignoreRayIntersection: false
-        });
-        Overlays.editOverlay(yawHandle, {
-            ignoreRayIntersection: false
-        });
-        Overlays.editOverlay(pitchHandle, {
-            ignoreRayIntersection: false
-        });
-        Overlays.editOverlay(rollHandle, {
-            ignoreRayIntersection: false
-        });
-
-        return somethingClicked;
     };
 
+
+    // FUNCTION DEF(s): Intersection Check Helpers
+    function testRayIntersect(queryRay, overlayIncludes, overlayExcludes) {
+        var wantDebug = false;
+        if ((queryRay === undefined) || (queryRay === null)) {
+            if (wantDebug) {
+                print("testRayIntersect - EARLY EXIT -> queryRay is undefined OR null!");
+            }
+            return null;
+        }
+
+        var intersectObj = Overlays.findRayIntersection(queryRay, true, overlayIncludes, overlayExcludes);
+
+        if (wantDebug) {
+            if (!overlayIncludes) {
+                print("testRayIntersect - no overlayIncludes provided.");
+            }
+            if (!overlayExcludes) {
+                print("testRayIntersect - no overlayExcludes provided.");
+            }
+            print("testRayIntersect - Hit: " + intersectObj.intersects);
+            print("    intersectObj.overlayID:" + intersectObj.overlayID + "[" + overlayNames[intersectObj.overlayID] + "]");
+            print("        OverlayName: " + overlayNames[intersectObj.overlayID]);
+            print("    intersectObj.distance:" + intersectObj.distance);
+            print("    intersectObj.face:" + intersectObj.face);
+            Vec3.print("    intersectObj.intersection:", intersectObj.intersection);
+        }
+
+        return intersectObj;
+    }
+
+    // FUNCTION: MOUSE PRESS EVENT
+    that.mousePressEvent = function (event) {
+        var wantDebug = false;
+        if (wantDebug) {
+            print("=============== eST::MousePressEvent BEG =======================");
+        }
+        if (!event.isLeftButton && !that.triggered) {
+            // EARLY EXIT-(if another mouse button than left is pressed ignore it)
+            return false;
+        }
+
+        var pickRay = generalComputePickRay(event.x, event.y);
+        // TODO_Case6491:  Move this out to setup just to make it once
+        var interactiveOverlays = [HMD.tabletID, HMD.tabletScreenID, HMD.homeButtonID, selectionBox];
+        for (var key in grabberTools) {
+            if (grabberTools.hasOwnProperty(key)) {
+                interactiveOverlays.push(key);
+            }
+        }
+
+        // Start with unknown mode, in case no tool can handle this.
+        activeTool = null;
+
+        var results = testRayIntersect(pickRay, interactiveOverlays);
+        if (results.intersects) {
+            var hitOverlayID = results.overlayID;
+            if ((hitOverlayID === HMD.tabletID) || (hitOverlayID === HMD.tabletScreenID) || (hitOverlayID === HMD.homeButtonID)) {
+                // EARLY EXIT-(mouse clicks on the tablet should override the edit affordances)
+                return false;
+            }
+
+            entityIconOverlayManager.setIconsSelectable(SelectionManager.selections, true);
+
+            var hitTool = grabberTools[ hitOverlayID ];
+            if (hitTool) {
+                activeTool = hitTool;
+                if (activeTool.onBegin) {
+                    activeTool.onBegin(event, pickRay, results);
+                } else {
+                    print("ERROR: entitySelectionTool.mousePressEvent - ActiveTool(" + activeTool.mode + ") missing onBegin");
+                }
+            } else {
+                print("ERROR: entitySelectionTool.mousePressEvent - Hit unexpected object, check interactiveOverlays");
+            }// End_if (hitTool)
+        }// End_If(results.intersects)
+
+        if (wantDebug) {
+            print("    DisplayMode: " + getMode());
+            print("=============== eST::MousePressEvent END =======================");
+        }
+
+        // If mode is known then we successfully handled this;
+        // otherwise, we're missing a tool.
+        return activeTool;
+    };
+
+    // FUNCTION: MOUSE MOVE EVENT
     that.mouseMoveEvent = function(event) {
+        var wantDebug = false;
+        if (wantDebug) {
+            print("=============== eST::MouseMoveEvent BEG =======================");
+        }
         if (activeTool) {
+            if (wantDebug) {
+                print("    Trigger ActiveTool(" + activeTool.mode + ")'s onMove");
+            }
             activeTool.onMove(event);
+
+            if (wantDebug) {
+                print("    Trigger SelectionManager::update");
+            }
             SelectionManager._update();
+
+            if (wantDebug) {
+                print("=============== eST::MouseMoveEvent END =======================");
+            }
+            // EARLY EXIT--(Move handled via active tool)
             return true;
         }
 
@@ -4547,7 +3937,7 @@ SelectionDisplay = (function() {
                     pickedAlpha = grabberAlpha;
                     highlightNeeded = true;
                     break;
-                    
+
                 default:
                     if (previousHandle) {
                         Overlays.editOverlay(previousHandle, {
@@ -4586,59 +3976,35 @@ SelectionDisplay = (function() {
             }
         }
 
+        if (wantDebug) {
+            print("=============== eST::MouseMoveEvent END =======================");
+        }
         return false;
     };
 
-
-    that.updateHandleSizes = function() {
-        if (selectionManager.hasSelection()) {
-            var diff = Vec3.subtract(selectionManager.worldPosition, Camera.getPosition());
-            var grabberSize = Vec3.length(diff) * GRABBER_DISTANCE_TO_SIZE_RATIO * 5;
-            var dimensions = SelectionManager.worldDimensions;
-            var avgDimension = (dimensions.x + dimensions.y + dimensions.z) / 3;
-            grabberSize = Math.min(grabberSize, avgDimension / 10);
-
-            for (var i = 0; i < stretchHandles.length; i++) {
-                Overlays.editOverlay(stretchHandles[i], {
-                    size: grabberSize,
-                });
-            }
-            var handleSize = Vec3.length(diff) * GRABBER_DISTANCE_TO_SIZE_RATIO * 7;
-            handleSize = Math.min(handleSize, avgDimension / 3);
-
-            Overlays.editOverlay(yawHandle, {
-                scale: handleSize,
-            });
-            Overlays.editOverlay(pitchHandle, {
-                scale: handleSize,
-            });
-            Overlays.editOverlay(rollHandle, {
-                scale: handleSize,
-            });
-            var pos = Vec3.sum(grabberMoveUpPosition, {
-                x: 0,
-                y: Vec3.length(diff) * GRABBER_DISTANCE_TO_SIZE_RATIO * 3,
-                z: 0
-            });
-            Overlays.editOverlay(grabberMoveUp, {
-                position: pos,
-                scale: handleSize / 1.25,
-            });
-        }
-    };
-    Script.update.connect(that.updateHandleSizes);
-
+    // FUNCTION: MOUSE RELEASE EVENT
     that.mouseReleaseEvent = function(event) {
-        var showHandles = false;
-        if (activeTool && activeTool.onEnd) {
-            activeTool.onEnd(event);
+        var wantDebug = false;
+        if (wantDebug) {
+            print("=============== eST::MouseReleaseEvent BEG =======================");
         }
-        activeTool = null;
+        var showHandles = false;
+        if (activeTool) {
+            if (activeTool.onEnd) {
+                if (wantDebug) {
+                    print("    Triggering ActiveTool(" + activeTool.mode + ")'s onEnd");
+                }
+                activeTool.onEnd(event);
+            } else if (wantDebug) {
+                print("    ActiveTool(" + activeTool.mode + ")'s missing onEnd");
+            }
+        }
+        
         // hide our rotation overlays..., and show our handles
-        if (mode == "ROTATE_YAW" || mode == "ROTATE_PITCH" || mode == "ROTATE_ROLL") {
-            Overlays.editOverlay(rotateOverlayTarget, {
-                visible: false
-            });
+        if (isActiveTool(yawHandle) || isActiveTool(pitchHandle) || isActiveTool(rollHandle)) {
+            if (wantDebug) {
+                print("    Triggering hide of RotateOverlays");
+            }
             Overlays.editOverlay(rotateOverlayInner, {
                 visible: false
             });
@@ -4648,22 +4014,25 @@ SelectionDisplay = (function() {
             Overlays.editOverlay(rotateOverlayCurrent, {
                 visible: false
             });
-            showHandles = true;
+            
         }
 
-        if (mode != "UNKNOWN") {
-            showHandles = true;
-        }
-
-        mode = "UNKNOWN";
+        showHandles = activeTool; // base on prior tool value
+        activeTool = null;
 
         // if something is selected, then reset the "original" properties for any potential next click+move operation
         if (SelectionManager.hasSelection()) {
             if (showHandles) {
+                if (wantDebug) {
+                    print("    Triggering that.select");
+                }
                 that.select(SelectionManager.selections[0], event);
             }
         }
 
+        if (wantDebug) {
+            print("=============== eST::MouseReleaseEvent END =======================");
+        }
     };
 
     // NOTE: mousePressEvent and mouseMoveEvent from the main script should call us., so we don't hook these:
@@ -4672,7 +4041,6 @@ SelectionDisplay = (function() {
     Controller.mouseReleaseEvent.connect(that.mouseReleaseEvent);
 
 
-
     return that;
 
 }());
diff --git a/scripts/system/libraries/overlayUtils.js b/scripts/system/libraries/overlayUtils.js
index a5622ec435..366cdbcc97 100644
--- a/scripts/system/libraries/overlayUtils.js
+++ b/scripts/system/libraries/overlayUtils.js
@@ -18,7 +18,7 @@ OverlayGroup = function(opts) {
     var overlays = {};
 
     var rootPosition = opts.position || { x: 0, y: 0, z: 0 };
-    var rootRotation = opts.rotation || Quat.fromPitchYawRollRadians(0, 0, 0);
+    var rootRotation = opts.rotation || Quat.IDENTITY;
     var visible = opts.visible == true;
 
     function updateOverlays() {
@@ -36,7 +36,7 @@ OverlayGroup = function(opts) {
 
     that.createOverlay = function(type, properties) {
         properties.position = properties.position || { x: 0, y: 0, z: 0 };
-        properties.rotation = properties.rotation || Quat.fromPitchYawRollRadians(0, 0, 0);
+        properties.rotation = properties.rotation || Quat.IDENTITY;
 
         var overlay = Overlays.addOverlay(type, properties);
 
diff --git a/scripts/system/libraries/toolBars.js b/scripts/system/libraries/toolBars.js
index 351f10e7bd..058910940b 100644
--- a/scripts/system/libraries/toolBars.js
+++ b/scripts/system/libraries/toolBars.js
@@ -370,7 +370,7 @@ ToolBar = function(x, y, direction, optionalPersistenceKey, optionalInitialPosit
         return Math.min(Math.max(value, min), max);
     }
 
-    var recommendedRect = Controller.getRecommendedOverlayRect();
+    var recommendedRect = Controller.getRecommendedHUDRect();
     var recommendedDimmensions = { x: recommendedRect.width, y: recommendedRect.height };
     that.windowDimensions = recommendedDimmensions; // Controller.getViewportDimensions();
     that.origin = { x: recommendedRect.x, y: recommendedRect.y };
@@ -378,7 +378,7 @@ ToolBar = function(x, y, direction, optionalPersistenceKey, optionalInitialPosit
     // For example, maybe we want "keep the same percentage to whatever two edges are closest to the edge of screen".
     // If we change that, the places to do so are onResizeViewport, save (maybe), and the initial move based on Settings, below.
     that.onResizeViewport = function (newSize) { // Can be overridden or extended by clients.
-        var recommendedRect = Controller.getRecommendedOverlayRect();
+        var recommendedRect = Controller.getRecommendedHUDRect();
         var recommendedDimmensions = { x: recommendedRect.width, y: recommendedRect.height };
         var originRelativeX = (that.x - that.origin.x - that.offset.x);
         var originRelativeY = (that.y - that.origin.y - that.offset.y);
@@ -396,7 +396,7 @@ ToolBar = function(x, y, direction, optionalPersistenceKey, optionalInitialPosit
         // code once the new toolbar position is well established with users.
         this.isNewPositionKey = optionalPersistenceKey + '.isNewPosition';
         this.save = function () {
-            var recommendedRect = Controller.getRecommendedOverlayRect();
+            var recommendedRect = Controller.getRecommendedHUDRect();
             var screenSize = { x: recommendedRect.width, y: recommendedRect.height };
             if (screenSize.x > 0 && screenSize.y > 0) {
                 // Guard against invalid screen size that can occur at shut-down.
@@ -443,7 +443,7 @@ ToolBar = function(x, y, direction, optionalPersistenceKey, optionalInitialPosit
         that.move(that.dragOffsetX + event.x, that.dragOffsetY + event.y);
     };
     that.checkResize = function () { // Can be overriden or extended, but usually not. See onResizeViewport.
-        var recommendedRect = Controller.getRecommendedOverlayRect();
+        var recommendedRect = Controller.getRecommendedHUDRect();
         var currentWindowSize = { x: recommendedRect.width, y: recommendedRect.height };
 
         if ((currentWindowSize.x !== that.windowDimensions.x) || (currentWindowSize.y !== that.windowDimensions.y)) {
@@ -471,7 +471,7 @@ ToolBar = function(x, y, direction, optionalPersistenceKey, optionalInitialPosit
         var savedFraction = isNewPosition ? JSON.parse(Settings.getValue(this.fractionKey) || "0") : 0;
         Settings.setValue(this.isNewPositionKey, true);
 
-        var recommendedRect = Controller.getRecommendedOverlayRect();
+        var recommendedRect = Controller.getRecommendedHUDRect();
         var screenSize = { x: recommendedRect.width, y: recommendedRect.height };
         if (savedFraction) {
             // If we have saved data, keep the toolbar at the same proportion of the screen width/height.
diff --git a/scripts/system/libraries/touchEventUtils.js b/scripts/system/libraries/touchEventUtils.js
new file mode 100644
index 0000000000..3c76c4c144
--- /dev/null
+++ b/scripts/system/libraries/touchEventUtils.js
@@ -0,0 +1,270 @@
+"use strict";
+
+//  touchEventUtils.js
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+
+/* global Script, Entities, MyAvatar, Controller, RIGHT_HAND, LEFT_HAND,
+   enableDispatcherModule, disableDispatcherModule, makeRunningValues,
+   Messages, Quat, Vec3, getControllerWorldLocation, makeDispatcherModuleParameters, Overlays, controllerDispatcher.ZERO_VEC,
+   HMD, INCHES_TO_METERS, DEFAULT_REGISTRATION_POINT, Settings, getGrabPointSphereOffset
+*/
+
+var controllerDispatcher = Script.require("/~/system/libraries/controllerDispatcherUtils.js");
+function touchTargetHasKeyboardFocus(touchTarget) {
+    if (touchTarget.entityID && touchTarget.entityID !== Uuid.NULL) {
+        return Entities.keyboardFocusEntity === touchTarget.entityID;
+    } else if (touchTarget.overlayID && touchTarget.overlayID !== Uuid.NULL) {
+        return Overlays.keyboardFocusOverlay === touchTarget.overlayID;
+    }
+}
+
+function setKeyboardFocusOnTouchTarget(touchTarget) {
+    if (touchTarget.entityID && touchTarget.entityID !== Uuid.NULL &&
+        Entities.wantsHandControllerPointerEvents(touchTarget.entityID)) {
+        Overlays.keyboardFocusOverlay = Uuid.NULL;
+        Entities.keyboardFocusEntity = touchTarget.entityID;
+    } else if (touchTarget.overlayID && touchTarget.overlayID !== Uuid.NULL) {
+        Overlays.keyboardFocusOverlay = touchTarget.overlayID;
+        Entities.keyboardFocusEntity = Uuid.NULL;
+    }
+}
+
+function sendHoverEnterEventToTouchTarget(hand, touchTarget) {
+    var pointerEvent = {
+        type: "Move",
+        id: hand + 1, // 0 is reserved for hardware mouse
+        pos2D: touchTarget.position2D,
+        pos3D: touchTarget.position,
+        normal: touchTarget.normal,
+        direction: Vec3.subtract(controllerDispatcher.ZERO_VEC, touchTarget.normal),
+        button: "None"
+    };
+
+    if (touchTarget.entityID && touchTarget.entityID !== Uuid.NULL) {
+        Entities.sendHoverEnterEntity(touchTarget.entityID, pointerEvent);
+    } else if (touchTarget.overlayID && touchTarget.overlayID !== Uuid.NULL) {
+        Overlays.sendHoverEnterOverlay(touchTarget.overlayID, pointerEvent);
+    }
+}
+
+function sendHoverOverEventToTouchTarget(hand, touchTarget) {
+    var pointerEvent = {
+        type: "Move",
+        id: hand + 1, // 0 is reserved for hardware mouse
+        pos2D: touchTarget.position2D,
+        pos3D: touchTarget.position,
+        normal: touchTarget.normal,
+        direction: Vec3.subtract(controllerDispatcher.ZERO_VEC, touchTarget.normal),
+        button: "None"
+    };
+
+    if (touchTarget.entityID && touchTarget.entityID !== Uuid.NULL) {
+        Entities.sendMouseMoveOnEntity(touchTarget.entityID, pointerEvent);
+        Entities.sendHoverOverEntity(touchTarget.entityID, pointerEvent);
+    } else if (touchTarget.overlayID && touchTarget.overlayID !== Uuid.NULL) {
+        Overlays.sendMouseMoveOnOverlay(touchTarget.overlayID, pointerEvent);
+        Overlays.sendHoverOverOverlay(touchTarget.overlayID, pointerEvent);
+    }
+}
+
+function sendTouchStartEventToTouchTarget(hand, touchTarget) {
+    var pointerEvent = {
+        type: "Press",
+        id: hand + 1, // 0 is reserved for hardware mouse
+        pos2D: touchTarget.position2D,
+        pos3D: touchTarget.position,
+        normal: touchTarget.normal,
+        direction: Vec3.subtract(controllerDispatcher.ZERO_VEC, touchTarget.normal),
+        button: "Primary",
+        isPrimaryHeld: true
+    };
+
+    if (touchTarget.entityID && touchTarget.entityID !== Uuid.NULL) {
+        Entities.sendMousePressOnEntity(touchTarget.entityID, pointerEvent);
+        Entities.sendClickDownOnEntity(touchTarget.entityID, pointerEvent);
+    } else if (touchTarget.overlayID && touchTarget.overlayID !== Uuid.NULL) {
+        Overlays.sendMousePressOnOverlay(touchTarget.overlayID, pointerEvent);
+    }
+}
+
+function sendTouchEndEventToTouchTarget(hand, touchTarget) {
+    var pointerEvent = {
+        type: "Release",
+        id: hand + 1, // 0 is reserved for hardware mouse
+        pos2D: touchTarget.position2D,
+        pos3D: touchTarget.position,
+        normal: touchTarget.normal,
+        direction: Vec3.subtract(controllerDispatcher.ZERO_VEC, touchTarget.normal),
+        button: "Primary"
+    };
+
+    if (touchTarget.entityID && touchTarget.entityID !== Uuid.NULL) {
+        Entities.sendMouseReleaseOnEntity(touchTarget.entityID, pointerEvent);
+        Entities.sendClickReleaseOnEntity(touchTarget.entityID, pointerEvent);
+        Entities.sendHoverLeaveEntity(touchTarget.entityID, pointerEvent);
+    } else if (touchTarget.overlayID && touchTarget.overlayID !== Uuid.NULL) {
+        Overlays.sendMouseReleaseOnOverlay(touchTarget.overlayID, pointerEvent);
+    }
+}
+
+function sendTouchMoveEventToTouchTarget(hand, touchTarget) {
+    var pointerEvent = {
+        type: "Move",
+        id: hand + 1, // 0 is reserved for hardware mouse
+        pos2D: touchTarget.position2D,
+        pos3D: touchTarget.position,
+        normal: touchTarget.normal,
+        direction: Vec3.subtract(controllerDispatcher.ZERO_VEC, touchTarget.normal),
+        button: "Primary",
+        isPrimaryHeld: true
+    };
+
+    if (touchTarget.entityID && touchTarget.entityID !== Uuid.NULL) {
+        Entities.sendMouseMoveOnEntity(touchTarget.entityID, pointerEvent);
+        Entities.sendHoldingClickOnEntity(touchTarget.entityID, pointerEvent);
+    } else if (touchTarget.overlayID && touchTarget.overlayID !== Uuid.NULL) {
+        Overlays.sendMouseMoveOnOverlay(touchTarget.overlayID, pointerEvent);
+    }
+}
+
+function composeTouchTargetFromIntersection(intersection) {
+    var isEntity = (intersection.type === RayPick.INTERSECTED_ENTITY);
+    var objectID = intersection.objectID;
+    var worldPos = intersection.intersection;
+    var props = null;
+    if (isEntity) {
+        props = Entities.getProperties(intersection.objectID);
+    }
+
+    var position2D =(isEntity ? controllerDispatcher.projectOntoEntityXYPlane(objectID, worldPos, props) :
+        controllerDispatcher.projectOntoOverlayXYPlane(objectID, worldPos));
+    return {
+        entityID: isEntity ? objectID : null,
+        overlayID: isEntity ? null : objectID,
+        distance: intersection.distance,
+        position: worldPos,
+        position2D: position2D,
+        normal: intersection.surfaceNormal
+    };
+}
+
+// will return undefined if overlayID does not exist.
+function calculateTouchTargetFromOverlay(touchTip, overlayID) {
+    var overlayPosition = Overlays.getProperty(overlayID, "position");
+    if (overlayPosition === undefined) {
+        return;
+    }
+
+    // project touchTip onto overlay plane.
+    var overlayRotation = Overlays.getProperty(overlayID, "rotation");
+    if (overlayRotation === undefined) {
+        return;
+    }
+    var normal = Vec3.multiplyQbyV(overlayRotation, {x: 0, y: 0, z: 1});
+    var distance = Vec3.dot(Vec3.subtract(touchTip.position, overlayPosition), normal);
+    var position = Vec3.subtract(touchTip.position, Vec3.multiply(normal, distance));
+
+    // calclulate normalized position
+    var invRot = Quat.inverse(overlayRotation);
+    var localPos = Vec3.multiplyQbyV(invRot, Vec3.subtract(position, overlayPosition));
+    var dpi = Overlays.getProperty(overlayID, "dpi");
+
+    var dimensions;
+    if (dpi) {
+        // Calculate physical dimensions for web3d overlay from resolution and dpi; "dimensions" property
+        // is used as a scale.
+        var resolution = Overlays.getProperty(overlayID, "resolution");
+        if (resolution === undefined) {
+            return;
+        }
+        resolution.z = 1; // Circumvent divide-by-zero.
+        var scale = Overlays.getProperty(overlayID, "dimensions");
+        if (scale === undefined) {
+            return;
+        }
+        scale.z = 0.01; // overlay dimensions are 2D, not 3D.
+        dimensions = Vec3.multiplyVbyV(Vec3.multiply(resolution, INCHES_TO_METERS / dpi), scale);
+    } else {
+        dimensions = Overlays.getProperty(overlayID, "dimensions");
+        if (dimensions === undefined) {
+            return;
+        }
+        if (!dimensions.z) {
+            dimensions.z = 0.01; // sometimes overlay dimensions are 2D, not 3D.
+        }
+    }
+    var invDimensions = { x: 1 / dimensions.x, y: 1 / dimensions.y, z: 1 / dimensions.z };
+    var normalizedPosition = Vec3.sum(Vec3.multiplyVbyV(localPos, invDimensions), DEFAULT_REGISTRATION_POINT);
+
+    // 2D position on overlay plane in meters, relative to the bounding box upper-left hand corner.
+    var position2D = {
+        x: normalizedPosition.x * dimensions.x,
+        y: (1 - normalizedPosition.y) * dimensions.y // flip y-axis
+    };
+
+    return {
+        entityID: null,
+        overlayID: overlayID,
+        distance: distance,
+        position: position,
+        position2D: position2D,
+        normal: normal,
+        normalizedPosition: normalizedPosition,
+        dimensions: dimensions,
+        valid: true
+    };
+}
+
+// will return undefined if entity does not exist.
+function calculateTouchTargetFromEntity(touchTip, props) {
+    if (props.rotation === undefined) {
+        // if rotation is missing from props object, then this entity has probably been deleted.
+        return;
+    }
+
+    // project touch tip onto entity plane.
+    var normal = Vec3.multiplyQbyV(props.rotation, {x: 0, y: 0, z: 1});
+    Vec3.multiplyQbyV(props.rotation, {x: 0, y: 1, z: 0});
+    var distance = Vec3.dot(Vec3.subtract(touchTip.position, props.position), normal);
+    var position = Vec3.subtract(touchTip.position, Vec3.multiply(normal, distance));
+
+    // generate normalized coordinates
+    var invRot = Quat.inverse(props.rotation);
+    var localPos = Vec3.multiplyQbyV(invRot, Vec3.subtract(position, props.position));
+    var invDimensions = { x: 1 / props.dimensions.x, y: 1 / props.dimensions.y, z: 1 / props.dimensions.z };
+    var normalizedPosition = Vec3.sum(Vec3.multiplyVbyV(localPos, invDimensions), props.registrationPoint);
+
+    // 2D position on entity plane in meters, relative to the bounding box upper-left hand corner.
+    var position2D = {
+        x: normalizedPosition.x * props.dimensions.x,
+        y: (1 - normalizedPosition.y) * props.dimensions.y // flip y-axis
+    };
+
+    return {
+        entityID: props.id,
+        entityProps: props,
+        overlayID: null,
+        distance: distance,
+        position: position,
+        position2D: position2D,
+        normal: normal,
+        normalizedPosition: normalizedPosition,
+        dimensions: props.dimensions,
+        valid: true
+    };
+}
+
+module.exports = {
+    calculateTouchTargetFromEntity: calculateTouchTargetFromEntity,
+    calculateTouchTargetFromOverlay: calculateTouchTargetFromOverlay,
+    touchTargetHasKeyboardFocus: touchTargetHasKeyboardFocus,
+    setKeyboardFocusOnTouchTarget: setKeyboardFocusOnTouchTarget,
+    sendHoverEnterEventToTouchTarget: sendHoverEnterEventToTouchTarget,
+    sendHoverOverEventToTouchTarget: sendHoverOverEventToTouchTarget,
+    sendTouchStartEventToTouchTarget: sendTouchStartEventToTouchTarget,
+    sendTouchEndEventToTouchTarget: sendTouchEndEventToTouchTarget,
+    sendTouchMoveEventToTouchTarget: sendTouchMoveEventToTouchTarget,
+    composeTouchTargetFromIntersection: composeTouchTargetFromIntersection
+};
diff --git a/scripts/system/libraries/utils.js b/scripts/system/libraries/utils.js
index a5e97d8949..76c248d880 100644
--- a/scripts/system/libraries/utils.js
+++ b/scripts/system/libraries/utils.js
@@ -6,8 +6,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-// note: this constant is currently duplicated in edit.js
-EDIT_SETTING = "io.highfidelity.isEditting";
+// note: this constant is currently duplicated in edit.js and ambientSound.js
+EDIT_SETTING = "io.highfidelity.isEditing";
 isInEditMode = function isInEditMode() {
     return Settings.getValue(EDIT_SETTING);
 };
@@ -351,3 +351,73 @@ clamp = function(val, min, max){
 flatten = function(array) {
     return [].concat.apply([], array);
 }
+
+getTabletWidthFromSettings = function () {
+    var DEFAULT_TABLET_WIDTH = 0.4375;
+    var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
+    var toolbarMode = tablet.toolbarMode;
+    var DEFAULT_TABLET_SCALE = 100;
+    var tabletScalePercentage = DEFAULT_TABLET_SCALE;
+    if (!toolbarMode) {
+        if (HMD.active) {
+            tabletScalePercentage = Settings.getValue("hmdTabletScale") || DEFAULT_TABLET_SCALE;
+        } else {
+            tabletScalePercentage = Settings.getValue("desktopTabletScale") || DEFAULT_TABLET_SCALE;
+        }
+    }
+    return DEFAULT_TABLET_WIDTH * (tabletScalePercentage / 100);
+};
+
+resizeTablet = function (width, newParentJointIndex, sensorToWorldScaleOverride) {
+
+    if (!HMD.tabletID || !HMD.tabletScreenID || !HMD.homeButtonID || !HMD.homeButtonHighlightID) {
+        return;
+    }
+
+    var sensorScaleFactor = sensorToWorldScaleOverride || MyAvatar.sensorToWorldScale;
+    var sensorScaleOffsetOverride = 1;
+    var SENSOR_TO_ROOM_MATRIX = 65534;
+    var parentJointIndex = newParentJointIndex || Overlays.getProperty(HMD.tabletID, "parentJointIndex");
+    if (parentJointIndex === SENSOR_TO_ROOM_MATRIX) {
+        sensorScaleOffsetOverride = 1 / sensorScaleFactor;
+    }
+
+    // will need to be recaclulated if dimensions of fbx model change.
+    var TABLET_NATURAL_DIMENSIONS = {x: 33.797, y: 50.129, z: 2.269};
+    var DEFAULT_DPI = 34;
+    var DEFAULT_WIDTH = 0.4375;
+
+    // scale factor of natural tablet dimensions.
+    var tabletWidth = (width || DEFAULT_WIDTH) * sensorScaleFactor;
+    var tabletScaleFactor = tabletWidth / TABLET_NATURAL_DIMENSIONS.x;
+    var tabletHeight = TABLET_NATURAL_DIMENSIONS.y * tabletScaleFactor;
+    var tabletDepth = TABLET_NATURAL_DIMENSIONS.z * tabletScaleFactor;
+    var tabletDpi = DEFAULT_DPI * (DEFAULT_WIDTH / tabletWidth);
+
+    // update tablet model dimensions
+    Overlays.editOverlay(HMD.tabletID, {
+        dimensions: { x: tabletWidth, y: tabletHeight, z: tabletDepth }
+    });
+
+    // update webOverlay
+    var WEB_ENTITY_Z_OFFSET = (tabletDepth / 2) * sensorScaleOffsetOverride;
+    var WEB_ENTITY_Y_OFFSET = 0.004 * sensorScaleOffsetOverride;
+    Overlays.editOverlay(HMD.tabletScreenID, {
+        localPosition: { x: 0, y: WEB_ENTITY_Y_OFFSET, z: -WEB_ENTITY_Z_OFFSET },
+        dpi: tabletDpi
+    });
+
+    // update homeButton
+    var HOME_BUTTON_Y_OFFSET = ((tabletHeight / 2) - (tabletHeight / 20)) * sensorScaleOffsetOverride;
+    Overlays.editOverlay(HMD.homeButtonID, {
+        localPosition: {x: -0.001, y: -HOME_BUTTON_Y_OFFSET, z: 0.0},
+        dimensions: { x: 4 * tabletScaleFactor, y: 4 * tabletScaleFactor, z: 4 * tabletScaleFactor}
+    });
+
+    Overlays.editOverlay(HMD.homeButtonHighlightID, {
+        localPosition: { x: 0, y: -HOME_BUTTON_Y_OFFSET + 0.003, z: -0.0158 },
+        dimensions: { x: 4 * tabletScaleFactor, y: 4 * tabletScaleFactor, z: 4 * tabletScaleFactor },
+        outerRadius: 25 * tabletScaleFactor,
+        innerRadius: 20 * tabletScaleFactor
+    });
+};
diff --git a/scripts/system/makeUserConnection.js b/scripts/system/makeUserConnection.js
index d95ad919b6..7dddd46562 100644
--- a/scripts/system/makeUserConnection.js
+++ b/scripts/system/makeUserConnection.js
@@ -16,6 +16,7 @@
 
     var request = Script.require('request').request;
 
+    var WANT_DEBUG = Settings.getValue('MAKE_USER_CONNECTION_DEBUG', false);
     var LABEL = "makeUserConnection";
     var MAX_AVATAR_DISTANCE = 0.2; // m
     var GRIP_MIN = 0.75; // goes from 0-1, so 75% pressed is pressed
@@ -120,6 +121,9 @@
     var successfulHandshakeSound;
 
     function debug() {
+        if (!WANT_DEBUG) {
+            return;
+        }
         var stateString = "<" + STATE_STRINGS[state] + ">";
         var connecting = "[" + connectingId + "/" + connectingHandJointIndex + "]";
         var current = "[" + currentHand + "/" + currentHandJointIndex + "]"
@@ -372,7 +376,7 @@
             var myHeadIndex = MyAvatar.getJointIndex("Head");
             var otherHeadIndex = avatar.getJointIndex("Head");
             var diff = (avatar.getJointPosition(otherHeadIndex).y - MyAvatar.getJointPosition(myHeadIndex).y) / 2;
-            print("head height difference: " + diff);
+            debug("head height difference: " + diff);
             updateAnimationData(diff);
         }
     }
@@ -440,7 +444,7 @@
         }, WAITING_INTERVAL);
     }
 
-    var pollCount = 0, requestUrl = location.metaverseServerUrl + '/api/v1/user/connection_request';
+    var pollCount = 0, requestUrl = Account.metaverseServerURL + '/api/v1/user/connection_request';
     // As currently implemented, we select the closest waiting avatar (if close enough) and send
     // them a connectionRequest.  If nobody is close enough we send a waiting message, and wait for a
     // connectionRequest.  If the 2 people who want to connect are both somewhat out of range when they
@@ -565,7 +569,7 @@
         // IWBNI we also did some fail sound/visual effect.
         Window.makeConnection(false, result.connection);
         if (Account.isLoggedIn()) { // Give extra failure info
-            request(location.metaverseServerUrl + '/api/v1/users/' + Account.username + '/location', function (error, response) {
+            request(Account.metaverseServerURL + '/api/v1/users/' + Account.username + '/location', function (error, response) {
                 var message = '';
                 if (error || response.status !== 'success') {
                     message = 'Unable to get location.';
diff --git a/scripts/system/marketplaces/marketplace.js b/scripts/system/marketplaces/marketplace.js
index f365ca5d4c..d90695c767 100644
--- a/scripts/system/marketplaces/marketplace.js
+++ b/scripts/system/marketplaces/marketplace.js
@@ -15,7 +15,7 @@ Script.include("../libraries/WebTablet.js");
 
 var toolIconUrl = Script.resolvePath("../assets/images/tools/");
 
-var MARKETPLACE_URL = "https://metaverse.highfidelity.com/marketplace";
+var MARKETPLACE_URL = Account.metaverseServerURL + "/marketplace";
 var marketplaceWindow = new OverlayWebWindow({
     title: "Marketplace",
     source: "about:blank",
diff --git a/scripts/system/marketplaces/marketplaces.js b/scripts/system/marketplaces/marketplaces.js
index 3be8143830..80990402d7 100644
--- a/scripts/system/marketplaces/marketplaces.js
+++ b/scripts/system/marketplaces/marketplaces.js
@@ -11,67 +11,280 @@
 /* global Tablet, Script, HMD, UserActivityLogger, Entities */
 /* eslint indent: ["error", 4, { "outerIIFEBody": 0 }] */
 
-(function() { // BEGIN LOCAL_SCOPE
+(function () { // BEGIN LOCAL_SCOPE
 
-Script.include("../libraries/WebTablet.js");
+    Script.include("../libraries/WebTablet.js");
 
-var MARKETPLACE_URL = "https://metaverse.highfidelity.com/marketplace";
-var MARKETPLACE_URL_INITIAL = MARKETPLACE_URL + "?";  // Append "?" to signal injected script that it's the initial page.
-var MARKETPLACES_URL = Script.resolvePath("../html/marketplaces.html");
-var MARKETPLACES_INJECT_SCRIPT_URL = Script.resolvePath("../html/js/marketplacesInject.js");
+    var METAVERSE_SERVER_URL = Account.metaverseServerURL;
+    var MARKETPLACE_URL = METAVERSE_SERVER_URL + "/marketplace";
+    var MARKETPLACE_URL_INITIAL = MARKETPLACE_URL + "?";  // Append "?" to signal injected script that it's the initial page.
+    var MARKETPLACES_URL = Script.resolvePath("../html/marketplaces.html");
+    var MARKETPLACES_INJECT_SCRIPT_URL = Script.resolvePath("../html/js/marketplacesInject.js");
+    var MARKETPLACE_CHECKOUT_QML_PATH_BASE = "qml/hifi/commerce/checkout/Checkout.qml";
+    var MARKETPLACE_CHECKOUT_QML_PATH = Script.resourcesPath() + MARKETPLACE_CHECKOUT_QML_PATH_BASE;
+    var MARKETPLACE_PURCHASES_QML_PATH = Script.resourcesPath() + "qml/hifi/commerce/purchases/Purchases.qml";
+    var MARKETPLACE_WALLET_QML_PATH = Script.resourcesPath() + "qml/hifi/commerce/wallet/Wallet.qml";
+    var MARKETPLACE_INSPECTIONCERTIFICATE_QML_PATH = "commerce/inspectionCertificate/InspectionCertificate.qml";
 
-var HOME_BUTTON_TEXTURE = "http://hifi-content.s3.amazonaws.com/alan/dev/tablet-with-home-button.fbx/tablet-with-home-button.fbm/button-root.png";
-// var HOME_BUTTON_TEXTURE = Script.resourcesPath() + "meshes/tablet-with-home-button.fbx/tablet-with-home-button.fbm/button-root.png";
+    var HOME_BUTTON_TEXTURE = "http://hifi-content.s3.amazonaws.com/alan/dev/tablet-with-home-button.fbx/tablet-with-home-button.fbm/button-root.png";
+    // var HOME_BUTTON_TEXTURE = Script.resourcesPath() + "meshes/tablet-with-home-button.fbx/tablet-with-home-button.fbm/button-root.png";
 
-// Event bridge messages.
-var CLARA_IO_DOWNLOAD = "CLARA.IO DOWNLOAD";
-var CLARA_IO_STATUS = "CLARA.IO STATUS";
-var CLARA_IO_CANCEL_DOWNLOAD = "CLARA.IO CANCEL DOWNLOAD";
-var CLARA_IO_CANCELLED_DOWNLOAD = "CLARA.IO CANCELLED DOWNLOAD";
-var GOTO_DIRECTORY = "GOTO_DIRECTORY";
-var QUERY_CAN_WRITE_ASSETS = "QUERY_CAN_WRITE_ASSETS";
-var CAN_WRITE_ASSETS = "CAN_WRITE_ASSETS";
-var WARN_USER_NO_PERMISSIONS = "WARN_USER_NO_PERMISSIONS";
+    // Event bridge messages.
+    var CLARA_IO_DOWNLOAD = "CLARA.IO DOWNLOAD";
+    var CLARA_IO_STATUS = "CLARA.IO STATUS";
+    var CLARA_IO_CANCEL_DOWNLOAD = "CLARA.IO CANCEL DOWNLOAD";
+    var CLARA_IO_CANCELLED_DOWNLOAD = "CLARA.IO CANCELLED DOWNLOAD";
+    var GOTO_DIRECTORY = "GOTO_DIRECTORY";
+    var QUERY_CAN_WRITE_ASSETS = "QUERY_CAN_WRITE_ASSETS";
+    var CAN_WRITE_ASSETS = "CAN_WRITE_ASSETS";
+    var WARN_USER_NO_PERMISSIONS = "WARN_USER_NO_PERMISSIONS";
 
-var CLARA_DOWNLOAD_TITLE = "Preparing Download";
-var messageBox = null;
-var isDownloadBeingCancelled = false;
+    var CLARA_DOWNLOAD_TITLE = "Preparing Download";
+    var messageBox = null;
+    var isDownloadBeingCancelled = false;
 
-var CANCEL_BUTTON = 4194304;  // QMessageBox::Cancel
-var NO_BUTTON = 0;  // QMessageBox::NoButton
+    var CANCEL_BUTTON = 4194304;  // QMessageBox::Cancel
+    var NO_BUTTON = 0;  // QMessageBox::NoButton
 
-var NO_PERMISSIONS_ERROR_MESSAGE = "Cannot download model because you can't write to \nthe domain's Asset Server.";
+    var NO_PERMISSIONS_ERROR_MESSAGE = "Cannot download model because you can't write to \nthe domain's Asset Server.";
 
-function onMessageBoxClosed(id, button) {
-    if (id === messageBox && button === CANCEL_BUTTON) {
-        isDownloadBeingCancelled = true;
-        messageBox = null;
-        tablet.emitScriptEvent(CLARA_IO_CANCEL_DOWNLOAD);
+    function onMessageBoxClosed(id, button) {
+        if (id === messageBox && button === CANCEL_BUTTON) {
+            isDownloadBeingCancelled = true;
+            messageBox = null;
+            tablet.emitScriptEvent(CLARA_IO_CANCEL_DOWNLOAD);
+        }
     }
-}
 
-Window.messageBoxClosed.connect(onMessageBoxClosed);
+    Window.messageBoxClosed.connect(onMessageBoxClosed);
 
-var onMarketplaceScreen = false;
+    var onMarketplaceScreen = false;
+    var onCommerceScreen = false;
 
-function showMarketplace() {
-    UserActivityLogger.openedMarketplace();
-    tablet.gotoWebScreen(MARKETPLACE_URL_INITIAL, MARKETPLACES_INJECT_SCRIPT_URL);
-    tablet.webEventReceived.connect(function (message) {
+    var debugCheckout = false;
+    var debugError = false;
+    function showMarketplace() {
+        if (!debugCheckout) {
+            UserActivityLogger.openedMarketplace();
+            tablet.gotoWebScreen(MARKETPLACE_URL_INITIAL, MARKETPLACES_INJECT_SCRIPT_URL);
+        } else {
+            tablet.pushOntoStack(MARKETPLACE_CHECKOUT_QML_PATH);
+            tablet.sendToQml({
+                method: 'updateCheckoutQML', params: {
+                    itemId: '0d90d21c-ce7a-4990-ad18-e9d2cf991027',
+                    itemName: 'Test Flaregun',
+                    itemPrice: (debugError ? 10 : 17),
+                    itemHref: 'http://mpassets.highfidelity.com/0d90d21c-ce7a-4990-ad18-e9d2cf991027-v1/flaregun.json',
+                    categories: ["Wearables", "Miscellaneous"]
+                }
+            });
+        }
+    }
+
+    var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
+    var marketplaceButton = tablet.addButton({
+        icon: "icons/tablet-icons/market-i.svg",
+        activeIcon: "icons/tablet-icons/market-a.svg",
+        text: "MARKET",
+        sortOrder: 9
+    });
+
+    function onCanWriteAssetsChanged() {
+        var message = CAN_WRITE_ASSETS + " " + Entities.canWriteAssets();
+        tablet.emitScriptEvent(message);
+    }
+
+    function onClick() {
+        if (onMarketplaceScreen || onCommerceScreen) {
+            // for toolbar-mode: go back to home screen, this will close the window.
+            tablet.gotoHomeScreen();
+        } else {
+            Wallet.refreshWalletStatus();
+            var entity = HMD.tabletID;
+            Entities.editEntity(entity, { textures: JSON.stringify({ "tex.close": HOME_BUTTON_TEXTURE }) });
+            showMarketplace();
+        }
+    }
+
+    var referrerURL; // Used for updating Purchases QML
+    var filterText; // Used for updating Purchases QML
+    function onScreenChanged(type, url) {
+        onMarketplaceScreen = type === "Web" && url.indexOf(MARKETPLACE_URL) !== -1;
+        onCommerceScreen = type === "QML" && (url.indexOf(MARKETPLACE_CHECKOUT_QML_PATH_BASE) !== -1 || url === MARKETPLACE_PURCHASES_QML_PATH || url.indexOf(MARKETPLACE_INSPECTIONCERTIFICATE_QML_PATH) !== -1);
+        wireEventBridge(onCommerceScreen);
+
+        if (url === MARKETPLACE_PURCHASES_QML_PATH) {
+            tablet.sendToQml({
+                method: 'updatePurchases',
+                referrerURL: referrerURL,
+                filterText: filterText
+            });
+        }
+
+        // for toolbar mode: change button to active when window is first openend, false otherwise.
+        marketplaceButton.editProperties({ isActive: onMarketplaceScreen || onCommerceScreen });
+        if (type === "Web" && url.indexOf(MARKETPLACE_URL) !== -1) {
+            ContextOverlay.isInMarketplaceInspectionMode = true;
+        } else {
+            ContextOverlay.isInMarketplaceInspectionMode = false;
+        }
+
+        if (!onCommerceScreen) {
+            tablet.sendToQml({
+                method: 'inspectionCertificate_resetCert'
+            });
+        }
+    }
+
+    function openWallet() {
+        tablet.pushOntoStack(MARKETPLACE_WALLET_QML_PATH);
+    }
+
+    function setCertificateInfo(currentEntityWithContextOverlay, itemCertificateId) {
+        wireEventBridge(true);
+        var certificateId = itemCertificateId || (Entities.getEntityProperties(currentEntityWithContextOverlay, ['certificateID']).certificateID);
+        tablet.sendToQml({
+            method: 'inspectionCertificate_setCertificateId',
+            certificateId: certificateId
+        });
+    }
+
+    function onUsernameChanged() {
+        if (onMarketplaceScreen) {
+            tablet.gotoWebScreen(MARKETPLACE_URL_INITIAL, MARKETPLACES_INJECT_SCRIPT_URL);
+        }
+    }
+
+    function sendCommerceSettings() {
+        tablet.emitScriptEvent(JSON.stringify({
+            type: "marketplaces",
+            action: "commerceSetting",
+            data: {
+                commerceMode: Settings.getValue("commerce", false),
+                userIsLoggedIn: Account.loggedIn,
+                walletNeedsSetup: Wallet.walletStatus === 1,
+                metaverseServerURL: Account.metaverseServerURL
+            }
+        }));
+    }
+
+    var HALF_TREE_SCALE = 16384;
+    function getPositionToCreateEntity(extra) {
+        var CREATE_DISTANCE = 2;
+        var position;
+        var delta = extra !== undefined ? extra : 0;
+        if (Camera.mode === "entity" || Camera.mode === "independent") {
+            position = Vec3.sum(Camera.position, Vec3.multiply(Quat.getForward(Camera.orientation), CREATE_DISTANCE + delta));
+        } else {
+            position = Vec3.sum(MyAvatar.position, Vec3.multiply(Quat.getForward(MyAvatar.orientation), CREATE_DISTANCE + delta));
+            position.y += 0.5;
+        }
+
+        if (position.x > HALF_TREE_SCALE || position.y > HALF_TREE_SCALE || position.z > HALF_TREE_SCALE) {
+            return null;
+        }
+        return position;
+    }
+
+    function rezEntity(itemHref, isWearable) {
+        var success = Clipboard.importEntities(itemHref);
+
+        if (success) {
+            var VERY_LARGE = 10000;
+            var isLargeImport = Clipboard.getClipboardContentsLargestDimension() >= VERY_LARGE;
+            var position = Vec3.ZERO;
+            if (!isLargeImport) {
+                position = getPositionToCreateEntity(Clipboard.getClipboardContentsLargestDimension() / 2);
+            }
+            if (position !== null && position !== undefined) {
+                var pastedEntityIDs = Clipboard.pasteEntities(position);
+                if (!isLargeImport) {
+                    // The first entity in Clipboard gets the specified position with the rest being relative to it. Therefore, move
+                    // entities after they're imported so that they're all the correct distance in front of and with geometric mean
+                    // centered on the avatar/camera direction.
+                    var deltaPosition = Vec3.ZERO;
+                    var entityPositions = [];
+                    var entityParentIDs = [];
+
+                    var propType = Entities.getEntityProperties(pastedEntityIDs[0], ["type"]).type;
+                    var NO_ADJUST_ENTITY_TYPES = ["Zone", "Light", "ParticleEffect"];
+                    if (NO_ADJUST_ENTITY_TYPES.indexOf(propType) === -1) {
+                        var targetDirection;
+                        if (Camera.mode === "entity" || Camera.mode === "independent") {
+                            targetDirection = Camera.orientation;
+                        } else {
+                            targetDirection = MyAvatar.orientation;
+                        }
+                        targetDirection = Vec3.multiplyQbyV(targetDirection, Vec3.UNIT_Z);
+
+                        var targetPosition = getPositionToCreateEntity();
+                        var deltaParallel = HALF_TREE_SCALE;  // Distance to move entities parallel to targetDirection.
+                        var deltaPerpendicular = Vec3.ZERO;  // Distance to move entities perpendicular to targetDirection.
+                        for (var i = 0, length = pastedEntityIDs.length; i < length; i++) {
+                            var curLoopEntityProps = Entities.getEntityProperties(pastedEntityIDs[i], ["position", "dimensions",
+                                "registrationPoint", "rotation", "parentID"]);
+                            var adjustedPosition = adjustPositionPerBoundingBox(targetPosition, targetDirection,
+                                curLoopEntityProps.registrationPoint, curLoopEntityProps.dimensions, curLoopEntityProps.rotation);
+                            var delta = Vec3.subtract(adjustedPosition, curLoopEntityProps.position);
+                            var distance = Vec3.dot(delta, targetDirection);
+                            deltaParallel = Math.min(distance, deltaParallel);
+                            deltaPerpendicular = Vec3.sum(Vec3.subtract(delta, Vec3.multiply(distance, targetDirection)),
+                                deltaPerpendicular);
+                            entityPositions[i] = curLoopEntityProps.position;
+                            entityParentIDs[i] = curLoopEntityProps.parentID;
+                        }
+                        deltaPerpendicular = Vec3.multiply(1 / pastedEntityIDs.length, deltaPerpendicular);
+                        deltaPosition = Vec3.sum(Vec3.multiply(deltaParallel, targetDirection), deltaPerpendicular);
+                    }
+
+                    if (grid.getSnapToGrid()) {
+                        var firstEntityProps = Entities.getEntityProperties(pastedEntityIDs[0], ["position", "dimensions",
+                            "registrationPoint"]);
+                        var positionPreSnap = Vec3.sum(deltaPosition, firstEntityProps.position);
+                        position = grid.snapToSurface(grid.snapToGrid(positionPreSnap, false, firstEntityProps.dimensions,
+                                firstEntityProps.registrationPoint), firstEntityProps.dimensions, firstEntityProps.registrationPoint);
+                        deltaPosition = Vec3.subtract(position, firstEntityProps.position);
+                    }
+
+                    if (!Vec3.equal(deltaPosition, Vec3.ZERO)) {
+                        for (var editEntityIndex = 0, numEntities = pastedEntityIDs.length; editEntityIndex < numEntities; editEntityIndex++) {
+                            if (Uuid.isNull(entityParentIDs[editEntityIndex])) {
+                                Entities.editEntity(pastedEntityIDs[editEntityIndex], {
+                                    position: Vec3.sum(deltaPosition, entityPositions[editEntityIndex])
+                                });
+                            }
+                        }
+                    }
+                }
+
+                if (isActive) {
+                    selectionManager.setSelections(pastedEntityIDs);
+                }
+            } else {
+                Window.notifyEditError("Can't import entities: entities would be out of bounds.");
+            }
+        } else {
+            Window.notifyEditError("There was an error importing the entity file.");
+        }
+    }
+
+    marketplaceButton.clicked.connect(onClick);
+    tablet.screenChanged.connect(onScreenChanged);
+    Entities.canWriteAssetsChanged.connect(onCanWriteAssetsChanged);
+    ContextOverlay.contextOverlayClicked.connect(setCertificateInfo);
+    GlobalServices.myUsernameChanged.connect(onUsernameChanged);
+    Wallet.walletStatusChanged.connect(sendCommerceSettings);
+    Wallet.refreshWalletStatus();
+
+    function onMessage(message) {
 
         if (message === GOTO_DIRECTORY) {
             tablet.gotoWebScreen(MARKETPLACES_URL, MARKETPLACES_INJECT_SCRIPT_URL);
-        }
-
-        if (message === QUERY_CAN_WRITE_ASSETS) {
+        } else if (message === QUERY_CAN_WRITE_ASSETS) {
             tablet.emitScriptEvent(CAN_WRITE_ASSETS + " " + Entities.canWriteAssets());
-        }
-
-        if (message === WARN_USER_NO_PERMISSIONS) {
+        } else if (message === WARN_USER_NO_PERMISSIONS) {
             Window.alert(NO_PERMISSIONS_ERROR_MESSAGE);
-        }
-
-        if (message.slice(0, CLARA_IO_STATUS.length) === CLARA_IO_STATUS) {
+        } else if (message.slice(0, CLARA_IO_STATUS.length) === CLARA_IO_STATUS) {
             if (isDownloadBeingCancelled) {
                 return;
             }
@@ -83,63 +296,189 @@ function showMarketplace() {
                 Window.updateMessageBox(messageBox, CLARA_DOWNLOAD_TITLE, text, CANCEL_BUTTON, NO_BUTTON);
             }
             return;
-        }
-
-        if (message.slice(0, CLARA_IO_DOWNLOAD.length) === CLARA_IO_DOWNLOAD) {
+        } else if (message.slice(0, CLARA_IO_DOWNLOAD.length) === CLARA_IO_DOWNLOAD) {
             if (messageBox !== null) {
                 Window.closeMessageBox(messageBox);
                 messageBox = null;
             }
             return;
-        }
-
-        if (message === CLARA_IO_CANCELLED_DOWNLOAD) {
+        } else if (message === CLARA_IO_CANCELLED_DOWNLOAD) {
             isDownloadBeingCancelled = false;
+        } else {
+            var parsedJsonMessage = JSON.parse(message);
+            if (parsedJsonMessage.type === "CHECKOUT") {
+                wireEventBridge(true);
+                tablet.pushOntoStack(MARKETPLACE_CHECKOUT_QML_PATH);
+                tablet.sendToQml({
+                    method: 'updateCheckoutQML',
+                    params: parsedJsonMessage
+                });
+            } else if (parsedJsonMessage.type === "REQUEST_SETTING") {
+                sendCommerceSettings();
+            } else if (parsedJsonMessage.type === "PURCHASES") {
+                referrerURL = parsedJsonMessage.referrerURL;
+                filterText = "";
+                tablet.pushOntoStack(MARKETPLACE_PURCHASES_QML_PATH);
+            } else if (parsedJsonMessage.type === "LOGIN") {
+                openLoginWindow();
+            } else if (parsedJsonMessage.type === "WALLET_SETUP") {
+                openWallet();
+            } else if (parsedJsonMessage.type === "MY_ITEMS") {
+                referrerURL = MARKETPLACE_URL_INITIAL;
+                filterText = "";
+                tablet.pushOntoStack(MARKETPLACE_PURCHASES_QML_PATH);
+                wireEventBridge(true);
+                tablet.sendToQml({
+                    method: 'purchases_showMyItems'
+                });
+            }
         }
+    }
+
+    tablet.webEventReceived.connect(onMessage);
+
+    Script.scriptEnding.connect(function () {
+        if (onMarketplaceScreen || onCommerceScreen) {
+            tablet.gotoHomeScreen();
+        }
+        tablet.removeButton(marketplaceButton);
+        tablet.screenChanged.disconnect(onScreenChanged);
+        ContextOverlay.contextOverlayClicked.disconnect(setCertificateInfo);
+        tablet.webEventReceived.disconnect(onMessage);
+        Entities.canWriteAssetsChanged.disconnect(onCanWriteAssetsChanged);
+        GlobalServices.myUsernameChanged.disconnect(onUsernameChanged);
+        Wallet.walletStatusChanged.disconnect(sendCommerceSettings);
     });
-}
 
-var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
-var marketplaceButton = tablet.addButton({
-    icon: "icons/tablet-icons/market-i.svg",
-    activeIcon: "icons/tablet-icons/market-a.svg",
-    text: "MARKET",
-    sortOrder: 9
-});
 
-function onCanWriteAssetsChanged() {
-    var message = CAN_WRITE_ASSETS + " " + Entities.canWriteAssets();
-    tablet.emitScriptEvent(message);
-}
 
-function onClick() {
-    if (onMarketplaceScreen) {
-        // for toolbar-mode: go back to home screen, this will close the window.
-        tablet.gotoHomeScreen();
-    } else {
-        var entity = HMD.tabletID;
-        Entities.editEntity(entity, {textures: JSON.stringify({"tex.close": HOME_BUTTON_TEXTURE})});
-        showMarketplace();
+    // Function Name: wireEventBridge()
+    //
+    // Description:
+    //   -Used to connect/disconnect the script's response to the tablet's "fromQml" signal. Set the "on" argument to enable or
+    //    disable to event bridge.
+    //
+    // Relevant Variables:
+    //   -hasEventBridge: true/false depending on whether we've already connected the event bridge.
+    var hasEventBridge = false;
+    function wireEventBridge(on) {
+        if (!tablet) {
+            print("Warning in wireEventBridge(): 'tablet' undefined!");
+            return;
+        }
+        if (on) {
+            if (!hasEventBridge) {
+                tablet.fromQml.connect(fromQml);
+                hasEventBridge = true;
+            }
+        } else {
+            if (hasEventBridge) {
+                tablet.fromQml.disconnect(fromQml);
+                hasEventBridge = false;
+            }
+        }
     }
-}
 
-function onScreenChanged(type, url) {
-    onMarketplaceScreen = type === "Web" && url === MARKETPLACE_URL_INITIAL 
-    // for toolbar mode: change button to active when window is first openend, false otherwise.
-    marketplaceButton.editProperties({isActive: onMarketplaceScreen});
-}
-
-marketplaceButton.clicked.connect(onClick);
-tablet.screenChanged.connect(onScreenChanged);
-Entities.canWriteAssetsChanged.connect(onCanWriteAssetsChanged);
-
-Script.scriptEnding.connect(function () {
-    if (onMarketplaceScreen) {
-        tablet.gotoHomeScreen();
+    // Function Name: fromQml()
+    //
+    // Description:
+    //   -Called when a message is received from Checkout.qml. The "message" argument is what is sent from the Checkout QML
+    //    in the format "{method, params}", like json-rpc.
+    var isHmdPreviewDisabled = true;
+    function fromQml(message) {
+        switch (message.method) {
+            case 'purchases_openWallet':
+            case 'checkout_openWallet':
+            case 'checkout_setUpClicked':
+                openWallet();
+                break;
+            case 'purchases_walletNotSetUp':
+                wireEventBridge(true);
+                tablet.sendToQml({
+                    method: 'updateWalletReferrer',
+                    referrer: "purchases"
+                });
+                openWallet();
+            case 'checkout_walletNotSetUp':
+                wireEventBridge(true);
+                tablet.sendToQml({
+                    method: 'updateWalletReferrer',
+                    referrer: message.itemId
+                });
+                openWallet();
+                break;
+            case 'checkout_cancelClicked':
+                tablet.gotoWebScreen(MARKETPLACE_URL + '/items/' + message.params, MARKETPLACES_INJECT_SCRIPT_URL);
+                // TODO: Make Marketplace a QML app that's a WebView wrapper so we can use the app stack.
+                // I don't think this is trivial to do since we also want to inject some JS into the DOM.
+                //tablet.popFromStack();
+                break;
+            case 'header_goToPurchases':
+            case 'checkout_goToPurchases':
+                referrerURL = MARKETPLACE_URL_INITIAL;
+                filterText = message.filterText;
+                tablet.pushOntoStack(MARKETPLACE_PURCHASES_QML_PATH);
+                break;
+            case 'checkout_itemLinkClicked':
+            case 'checkout_continueShopping':
+                tablet.gotoWebScreen(MARKETPLACE_URL + '/items/' + message.itemId, MARKETPLACES_INJECT_SCRIPT_URL);
+                //tablet.popFromStack();
+                break;
+            case 'purchases_itemInfoClicked':
+                var itemId = message.itemId;
+                if (itemId && itemId !== "") {
+                    tablet.gotoWebScreen(MARKETPLACE_URL + '/items/' + itemId, MARKETPLACES_INJECT_SCRIPT_URL);
+                }
+                break;
+            case 'checkout_rezClicked':
+            case 'purchases_rezClicked':
+                rezEntity(message.itemHref, message.isWearable);
+                break;
+            case 'header_marketplaceImageClicked':
+            case 'purchases_backClicked':
+                tablet.gotoWebScreen(message.referrerURL, MARKETPLACES_INJECT_SCRIPT_URL);
+                break;
+            case 'purchases_goToMarketplaceClicked':
+                tablet.gotoWebScreen(MARKETPLACE_URL_INITIAL, MARKETPLACES_INJECT_SCRIPT_URL);
+                break;
+            case 'passphrasePopup_cancelClicked':
+            case 'needsLogIn_cancelClicked':
+                tablet.gotoWebScreen(MARKETPLACE_URL_INITIAL, MARKETPLACES_INJECT_SCRIPT_URL);
+                break;
+            case 'needsLogIn_loginClicked':
+                openLoginWindow();
+                break;
+            case 'disableHmdPreview':
+                isHmdPreviewDisabled = Menu.isOptionChecked("Disable Preview");
+                Menu.setIsOptionChecked("Disable Preview", true);
+                break;
+            case 'maybeEnableHmdPreview':
+                Menu.setIsOptionChecked("Disable Preview", isHmdPreviewDisabled);
+                break;
+            case 'purchases_openGoTo':
+                tablet.loadQMLSource("TabletAddressDialog.qml");
+                break;
+            case 'purchases_itemCertificateClicked':
+                setCertificateInfo("", message.itemCertificateId);
+                break;
+            case 'inspectionCertificate_closeClicked':
+                tablet.gotoHomeScreen();
+                break;
+            case 'inspectionCertificate_showInMarketplaceClicked':
+                tablet.gotoWebScreen(message.marketplaceUrl, MARKETPLACES_INJECT_SCRIPT_URL);
+                break;
+            case 'header_myItemsClicked':
+                referrerURL = MARKETPLACE_URL_INITIAL;
+                filterText = "";
+                tablet.pushOntoStack(MARKETPLACE_PURCHASES_QML_PATH);
+                wireEventBridge(true);
+                tablet.sendToQml({
+                    method: 'purchases_showMyItems'
+                });
+                break;
+            default:
+                print('Unrecognized message from Checkout.qml or Purchases.qml: ' + JSON.stringify(message));
+        }
     }
-    tablet.removeButton(marketplaceButton);
-    tablet.screenChanged.disconnect(onScreenChanged);
-    Entities.canWriteAssetsChanged.disconnect(onCanWriteAssetsChanged);
-});
 
 }()); // END LOCAL_SCOPE
diff --git a/scripts/system/nameTag.js b/scripts/system/nameTag.js
index 17944bcf85..69e5dac1bf 100644
--- a/scripts/system/nameTag.js
+++ b/scripts/system/nameTag.js
@@ -13,7 +13,6 @@
 // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 
 const CLIENTONLY = false;
-const NULL_UUID = "{00000000-0000-0000-0000-000000000000}";
 const ENTITY_CHECK_INTERVAL = 5000; // ms = 5 seconds
 const STARTUP_DELAY = 2000; // ms = 2 second
 const OLD_AGE = 3500; // we recreate the entity if older than this time in seconds 
@@ -24,7 +23,7 @@ const SIZE_Y = 0.075;
 const LETTER_OFFSET = 0.03; // arbitrary value to dynamically change width, could be more accurate by detecting characters
 const LINE_HEIGHT = 0.05;
 
-var nameTagEntityID = NULL_UUID;
+var nameTagEntityID = Uuid.NULL;
 var lastCheckForEntity = 0;
 
 // create the name tag entity after a brief delay
@@ -62,9 +61,9 @@ function updateNameTag() {
 };
 
 function deleteNameTag() {
-    if(nameTagEntityID !== NULL_UUID) {
+    if(nameTagEntityID !== Uuid.NULL) {
         Entities.deleteEntity(nameTagEntityID);
-        nameTagEntityID = NULL_UUID;
+        nameTagEntityID = Uuid.NULL;
     }
 }
 
@@ -85,7 +84,7 @@ function cleanup() {
 Script.update.connect(update);
 function update() {
     // if no entity we return
-    if(nameTagEntityID == NULL_UUID) {
+    if(nameTagEntityID == Uuid.NULL) {
         return;
     }
 
diff --git a/scripts/system/notifications.js b/scripts/system/notifications.js
index b34630f3f8..b6ddd9d33e 100644
--- a/scripts/system/notifications.js
+++ b/scripts/system/notifications.js
@@ -85,6 +85,7 @@
     var PLAY_NOTIFICATION_SOUNDS_SETTING = "play_notification_sounds";
     var PLAY_NOTIFICATION_SOUNDS_TYPE_SETTING_PRE = "play_notification_sounds_type_";
     var lodTextID = false;
+    var NOTIFICATIONS_MESSAGE_CHANNEL = "Hifi-Notifications"
 
     var NotificationType = {
         UNKNOWN: 0,
@@ -94,13 +95,15 @@
         EDIT_ERROR: 4,
         TABLET: 5,
         CONNECTION: 6,
+        WALLET: 7,
         properties: [
             { text: "Snapshot" },
             { text: "Level of Detail" },
             { text: "Connection Refused" },
             { text: "Edit error" },
             { text: "Tablet" },
-            { text: "Connection" }
+            { text: "Connection" },
+            { text: "Wallet" }
         ],
         getTypeFromMenuItem: function (menuItemName) {
             var type;
@@ -207,7 +210,7 @@
             notificationOrientation,
             notificationPosition,
             buttonPosition;
-
+        var sensorScaleFactor = MyAvatar.sensorToWorldScale;
         // Notification plane positions
         noticeY = -y * NOTIFICATION_3D_SCALE - noticeHeight / 2;
         notificationPosition = { x: 0, y: noticeY, z: 0 };
@@ -221,8 +224,8 @@
 
         // Translate plane
         originOffset = Vec3.multiplyQbyV(Quat.fromPitchYawRollDegrees(0, NOTIFICATIONS_3D_DIRECTION, 0),
-                                         { x: 0, y: 0, z: -NOTIFICATIONS_3D_DISTANCE });
-        originOffset.y += NOTIFICATIONS_3D_ELEVATION;
+                                         { x: 0, y: 0, z: -NOTIFICATIONS_3D_DISTANCE * sensorScaleFactor});
+        originOffset.y += NOTIFICATIONS_3D_ELEVATION * sensorScaleFactor;
         notificationPosition = Vec3.sum(originOffset, notificationPosition);
         buttonPosition = Vec3.sum(originOffset, buttonPosition);
 
@@ -242,7 +245,7 @@
             noticeHeight,
             positions,
             last;
-
+        var sensorScaleFactor = MyAvatar.sensorToWorldScale;
         if (isOnHMD) {
             // Calculate 3D values from 2D overlay properties.
 
@@ -261,7 +264,7 @@
                 notice.leftMargin = 2 * notice.leftMargin * NOTIFICATION_3D_SCALE;
                 notice.bottomMargin = 0;
                 notice.rightMargin = 0;
-                notice.lineHeight = 10.0 * (fontSize / 12.0) * NOTIFICATION_3D_SCALE;
+                notice.lineHeight = 10.0 * (fontSize * sensorScaleFactor / 12.0) * NOTIFICATION_3D_SCALE;
                 notice.isFacingAvatar = false;
 
                 notificationText = Overlays.addOverlay("text3d", notice);
@@ -366,6 +369,7 @@
             buttonProperties,
             i;
 
+        var sensorScaleFactor = MyAvatar.sensorToWorldScale;
         if (text.length >= breakPoint) {
             breaks = count;
         }
@@ -387,7 +391,7 @@
             alpha: backgroundAlpha,
             topMargin: topMargin,
             leftMargin: leftMargin,
-            font: {size: fontSize},
+            font: {size: fontSize * sensorScaleFactor},
             text: text
         };
 
@@ -448,7 +452,23 @@
         return finishedLines.join('\n');
     }
 
+    function updateNotificationsTexts() {
+        var sensorScaleFactor = MyAvatar.sensorToWorldScale;
+        for (var i = 0; i < notifications.length; i++) {
+            var overlayType = Overlays.getOverlayType(notifications[i]);
+
+            if (overlayType === "text3d") {
+                var props = {
+                    font: {size: fontSize * sensorScaleFactor},
+                    lineHeight: 10.0 * (fontSize * sensorScaleFactor / 12.0) * NOTIFICATION_3D_SCALE
+                };
+                Overlays.editOverlay(notifications[i], props);
+            }
+        }
+    }
+
     function update() {
+        updateNotificationsTexts();
         var noticeOut,
             buttonOut,
             arraysOut,
@@ -531,6 +551,13 @@
         createNotification(wordWrap(msg), NotificationType.UNKNOWN); // Needs a generic notification system for user feedback, thus using this
     }
 
+    function onMessageReceived(channel, message) {
+        if (channel === NOTIFICATIONS_MESSAGE_CHANNEL) {
+            message = JSON.parse(message);
+            createNotification(wordWrap(message.message), message.notificationType);
+        }
+    }
+
     function onSnapshotTaken(pathStillSnapshot, notify) {
         if (notify) {
             var imageProperties = {
@@ -549,6 +576,10 @@
         createNotification("Processing GIF snapshot...", NotificationType.SNAPSHOT);
     }
 
+    function walletNotSetup() {
+        createNotification("Your wallet isn't set up. Open the WALLET app.", NotificationType.WALLET);
+    }
+
     function connectionAdded(connectionName) {
         createNotification(connectionName, NotificationType.CONNECTION);
     }
@@ -623,6 +654,7 @@
             Overlays.deleteOverlay(buttons[notificationIndex]);
         }
         Menu.removeMenu(MENU_NAME);
+        Messages.unsubscribe(NOTIFICATIONS_MESSAGE_CHANNEL);
     }
 
     function menuItemEvent(menuItem) {
@@ -665,6 +697,11 @@
     Window.notifyEditError = onEditError;
     Window.notify = onNotify;
     Tablet.tabletNotification.connect(tabletNotification);
+    Wallet.walletNotSetup.connect(walletNotSetup);
+
+    Messages.subscribe(NOTIFICATIONS_MESSAGE_CHANNEL);
+    Messages.messageReceived.connect(onMessageReceived);
+
     setup();
 
 }()); // END LOCAL_SCOPE
diff --git a/scripts/system/pal.js b/scripts/system/pal.js
index 2c81622668..b5551cf596 100644
--- a/scripts/system/pal.js
+++ b/scripts/system/pal.js
@@ -189,7 +189,6 @@ function HighlightedEntity(id, entityProperties) {
             green: 0x91,
             blue: 0x29
         },
-        lineWidth: 1.0,
         ignoreRayIntersection: true,
         drawInFront: false // Arguable. For now, let's not distract with mysterious wires around the scene.
     });
@@ -334,7 +333,7 @@ function updateUser(data) {
 // User management services
 //
 // These are prototype versions that will be changed when the back end changes.
-var METAVERSE_BASE = location.metaverseServerUrl;
+var METAVERSE_BASE = Account.metaverseServerURL;
 
 function requestJSON(url, callback) { // callback(data) if successfull. Logs otherwise.
     request({
@@ -482,10 +481,10 @@ function populateNearbyUserList(selectData, oldAudioData) {
             isPresent: true,
             isReplicated: avatar.isReplicated
         };
+        // Everyone needs to see admin status. Username and fingerprint returns default constructor output if the requesting user isn't an admin.
+        Users.requestUsernameFromID(id);
         if (id) {
             addAvatarNode(id); // No overlay for ourselves
-            // Everyone needs to see admin status. Username and fingerprint returns default constructor output if the requesting user isn't an admin.
-            Users.requestUsernameFromID(id);
             avatarsOfInterest[id] = true;
         } else {
             // Return our username from the Account API
@@ -710,6 +709,7 @@ function off() {
         Controller.mouseMoveEvent.disconnect(handleMouseMoveEvent);
         tablet.tabletShownChanged.disconnect(tabletVisibilityChanged);
         isWired = false;
+        ContextOverlay.enabled = true
     }
     if (audioTimer) {
         Script.clearInterval(audioTimer);
@@ -722,6 +722,7 @@ function off() {
 
 function tabletVisibilityChanged() {
     if (!tablet.tabletShown) {
+        ContextOverlay.enabled = true;
         tablet.gotoHomeScreen();
     }
 }
@@ -732,7 +733,9 @@ function onTabletButtonClicked() {
     if (onPalScreen) {
         // for toolbar-mode: go back to home screen, this will close the window.
         tablet.gotoHomeScreen();
+        ContextOverlay.enabled = true;
     } else {
+        ContextOverlay.enabled = false;
         tablet.loadQMLSource(PAL_QML_SOURCE);
         tablet.tabletShownChanged.connect(tabletVisibilityChanged);
         Users.requestsDomainListData = true;
@@ -862,6 +865,10 @@ function avatarDisconnected(nodeID) {
 
 function clearLocalQMLDataAndClosePAL() {
     sendToQml({ method: 'clearLocalQMLData' });
+    if (onPalScreen) {
+        ContextOverlay.enabled = true;
+        tablet.gotoHomeScreen();
+    }
 }
 
 function avatarAdded(avatarID) {
diff --git a/scripts/system/particle_explorer/particleExplorer.js b/scripts/system/particle_explorer/particleExplorer.js
index ca6a873b73..057bd1dd85 100644
--- a/scripts/system/particle_explorer/particleExplorer.js
+++ b/scripts/system/particle_explorer/particleExplorer.js
@@ -178,8 +178,8 @@
                     type: "Row"
                 },
                 {
-                    id: "emitShouldTrail",
-                    name: "Emit Should Trail",
+                    id: "emitterShouldTrail",
+                    name: "Emitter Should Trail",
                     type: "Boolean"
                 },
                 {
diff --git a/scripts/system/snapshot.js b/scripts/system/snapshot.js
index c60e3a67f7..9afdb4ec53 100644
--- a/scripts/system/snapshot.js
+++ b/scripts/system/snapshot.js
@@ -10,7 +10,8 @@
 /* globals Tablet, Script, HMD, Settings, DialogsManager, Menu, Reticle, OverlayWebWindow, Desktop, Account, MyAvatar, Snapshot */
 /* eslint indent: ["error", 4, { "outerIIFEBody": 0 }] */
 
-(function() { // BEGIN LOCAL_SCOPE
+(function () { // BEGIN LOCAL_SCOPE
+Script.include("/~/system/libraries/accountUtils.js");
 
 var SNAPSHOT_DELAY = 500; // 500ms
 var FINISH_SOUND_DELAY = 350;
@@ -34,7 +35,7 @@ var imageData = [];
 var storyIDsToMaybeDelete = [];
 var shareAfterLogin = false;
 var snapshotToShareAfterLogin = [];
-var METAVERSE_BASE = location.metaverseServerUrl;
+var METAVERSE_BASE = Account.metaverseServerURL;
 var isLoggedIn;
 var numGifSnapshotUploadsPending = 0;
 var numStillSnapshotUploadsPending = 0;
@@ -52,15 +53,7 @@ try {
     print('Failed to resolve request api, error: ' + err);
 }
 
-function openLoginWindow() {
-    if ((HMD.active && Settings.getValue("hmdTabletBecomesToolbar", false))
-        || (!HMD.active && Settings.getValue("desktopTabletBecomesToolbar", true))) {
-        Menu.triggerOption("Login / Sign Up");
-    } else {
-        tablet.loadQMLOnTop("../../dialogs/TabletLoginDialog.qml");
-        HMD.openTablet();
-    }
-}
+
 
 function removeFromStoryIDsToMaybeDelete(story_id) {
     storyIDsToMaybeDelete.splice(storyIDsToMaybeDelete.indexOf(story_id), 1);
@@ -120,15 +113,8 @@ function onMessage(message) {
             openLoginWindow();
             break;
         case 'chooseSnapshotLocation':
-            var snapshotPath = Window.browseDir("Choose Snapshots Directory", "", "");
-
-            if (snapshotPath) { // not cancelled
-                Snapshot.setSnapshotsLocation(snapshotPath);
-                tablet.emitScriptEvent(JSON.stringify({
-                    type: "snapshot",
-                    action: "snapshotLocationChosen"
-                }));
-            }
+            Window.browseDirChanged.connect(snapshotDirChanged);
+            Window.browseDirAsync("Choose Snapshots Directory", "", "");
             break;
         case 'openSettings':
             if ((HMD.active && Settings.getValue("hmdTabletBecomesToolbar", false))
@@ -384,7 +370,6 @@ function onButtonClicked() {
     } else {
         fillImageDataFromPrevious();
         tablet.gotoWebScreen(SNAPSHOT_REVIEW_URL);
-        tablet.webEventReceived.connect(onMessage);
         HMD.openTablet();
     }
 }
@@ -504,8 +489,9 @@ function takeSnapshot() {
             Window.takeSnapshot(false, includeAnimated, 1.91);
         }, SNAPSHOT_DELAY);
     }, FINISH_SOUND_DELAY);
+    UserActivityLogger.logAction("snaphshot_taken", { location: location.href });
 }
-
+    
 function isDomainOpen(id, callback) {
     print("Checking open status of domain with ID:", id);
     var status = false;
@@ -579,6 +565,17 @@ function stillSnapshotTaken(pathStillSnapshot, notify) {
     });
 }
 
+function snapshotDirChanged(snapshotPath) {
+    Window.browseDirChanged.disconnect(snapshotDirChanged);
+    if (snapshotPath !== "") { // not cancelled
+        Snapshot.setSnapshotsLocation(snapshotPath);
+        tablet.emitScriptEvent(JSON.stringify({
+            type: "snapshot",
+            action: "snapshotLocationChosen"
+        }));
+    }
+}
+
 function processingGifStarted(pathStillSnapshot) {
     Window.processingGifStarted.disconnect(processingGifStarted);
     Window.processingGifCompleted.connect(processingGifCompleted);
@@ -659,10 +656,15 @@ function maybeDeleteSnapshotStories() {
     storyIDsToMaybeDelete = [];
 }
 function onTabletScreenChanged(type, url) {
+    var wasInSnapshotReview = isInSnapshotReview; 
     isInSnapshotReview = (type === "Web" && url === SNAPSHOT_REVIEW_URL);
     button.editProperties({ isActive: isInSnapshotReview });
-    if (!isInSnapshotReview) {
-        tablet.webEventReceived.disconnect(onMessage);
+    if (isInSnapshotReview !== wasInSnapshotReview) {
+        if (isInSnapshotReview) {
+            tablet.webEventReceived.connect(onMessage);
+        } else {
+            tablet.webEventReceived.disconnect(onMessage);
+        }
     }
 }
 function onUsernameChanged() {
@@ -759,8 +761,8 @@ Script.scriptEnding.connect(function () {
     }
     Window.snapshotShared.disconnect(snapshotUploaded);
     Snapshot.snapshotLocationSet.disconnect(snapshotLocationSet);
-    Entities.canRezChanged.disconnect(processRezPermissionChange);
-    Entities.canRezTmpChanged.disconnect(processRezPermissionChange);
+    Entities.canRezChanged.disconnect(updatePrintPermissions);
+    Entities.canRezTmpChanged.disconnect(updatePrintPermissions);
 });
 
 }()); // END LOCAL_SCOPE
diff --git a/scripts/system/tablet-goto.js b/scripts/system/tablet-goto.js
index fb842d1314..929c6e0e5c 100644
--- a/scripts/system/tablet-goto.js
+++ b/scripts/system/tablet-goto.js
@@ -42,6 +42,8 @@
     });
     
     function fromQml(message) {
+        console.debug('tablet-goto::fromQml: message = ', JSON.stringify(message));
+
         var response = {id: message.id, jsonrpc: "2.0"};
         switch (message.method) {
         case 'request':
@@ -98,6 +100,8 @@
             button.editProperties({isActive: shouldActivateButton});
             wireEventBridge(true);
             messagesWaiting(false);
+            tablet.sendToQml({ method: 'refreshFeeds' })
+
         } else {
             shouldActivateButton = false;
             onGotoScreen = false;
@@ -111,7 +115,7 @@
     var stories = {}, pingPong = false;
     function expire(id) {
         var options = {
-            uri: location.metaverseServerUrl + '/api/v1/user_stories/' + id,
+            uri: Account.metaverseServerURL + '/api/v1/user_stories/' + id,
             method: 'PUT',
             json: true,
             body: {expire: "true"}
@@ -135,7 +139,7 @@
             'protocol=' + encodeURIComponent(location.protocolVersion()),
             'per_page=' + count
         ];
-        var url = location.metaverseServerUrl + '/api/v1/user_stories?' + options.join('&');
+        var url = Account.metaverseServerURL + '/api/v1/user_stories?' + options.join('&');
         request({
             uri: url
         }, function (error, data) {
diff --git a/scripts/system/tablet-ui/tabletUI.js b/scripts/system/tablet-ui/tabletUI.js
index 9188f39a2e..17821c737e 100644
--- a/scripts/system/tablet-ui/tabletUI.js
+++ b/scripts/system/tablet-ui/tabletUI.js
@@ -71,9 +71,9 @@
         return tabletScalePercentage;
     }
 
-    function updateTabletWidthFromSettings() {
+    function updateTabletWidthFromSettings(force) {
         var newTabletScalePercentage = getTabletScalePercentageFromSettings();
-        if (newTabletScalePercentage !== tabletScalePercentage && UIWebTablet) {
+        if ((force || (newTabletScalePercentage !== tabletScalePercentage)) && UIWebTablet) {
             tabletScalePercentage = newTabletScalePercentage;
             UIWebTablet.setWidth(DEFAULT_WIDTH * (tabletScalePercentage / 100));
         }
@@ -83,6 +83,13 @@
         updateTabletWidthFromSettings();
     }
 
+    function onSensorToWorldScaleChanged(sensorScaleFactor) {
+        if (HMD.active) {
+            var newTabletScalePercentage = getTabletScalePercentageFromSettings();
+            resizeTablet(DEFAULT_WIDTH * (newTabletScalePercentage / 100), undefined, sensorScaleFactor);
+        }
+    }
+
     function rezTablet() {
         if (debugTablet) {
             print("TABLET rezzing");
@@ -90,21 +97,22 @@
         checkTablet()
 
         tabletScalePercentage = getTabletScalePercentageFromSettings();
-        UIWebTablet = new WebTablet("qml/hifi/tablet/TabletRoot.qml",
+        UIWebTablet = new WebTablet("hifi/tablet/TabletRoot.qml",
                                     DEFAULT_WIDTH * (tabletScalePercentage / 100),
                                     null, activeHand, true, null, false);
         UIWebTablet.register();
         HMD.tabletID = UIWebTablet.tabletEntityID;
         HMD.homeButtonID = UIWebTablet.homeButtonID;
+        HMD.homeButtonHighlightID = UIWebTablet.homeButtonHighlightID;
         HMD.tabletScreenID = UIWebTablet.webOverlayID;
         HMD.displayModeChanged.connect(onHmdChanged);
+        MyAvatar.sensorToWorldScaleChanged.connect(onSensorToWorldScaleChanged);
 
         tabletRezzed = true;
     }
 
     function showTabletUI() {
         checkTablet()
-        gTablet.tabletShown = true;
 
         if (!tabletRezzed || !tabletIsValid()) {
             closeTabletUI();
@@ -116,13 +124,18 @@
                 print("TABLET in showTabletUI, already rezzed");
             }
             var tabletProperties = {};
-            UIWebTablet.calculateTabletAttachmentProperties(activeHand, true, tabletProperties);
+            if (!HMD.tabletContextualMode) { // contextual mode forces tablet in place -> don't update attachment
+                UIWebTablet.calculateTabletAttachmentProperties(activeHand, true, tabletProperties);
+            }
             tabletProperties.visible = true;
             Overlays.editOverlay(HMD.tabletID, tabletProperties);
             Overlays.editOverlay(HMD.homeButtonID, { visible: true });
+            Overlays.editOverlay(HMD.homeButtonHighlightID, { visible: true });
             Overlays.editOverlay(HMD.tabletScreenID, { visible: true });
             Overlays.editOverlay(HMD.tabletScreenID, { maxFPS: 90 });
+            updateTabletWidthFromSettings(true);
         }
+        gTablet.tabletShown = true;
     }
 
     function hideTabletUI() {
@@ -138,6 +151,7 @@
 
         Overlays.editOverlay(HMD.tabletID, { visible: false });
         Overlays.editOverlay(HMD.homeButtonID, { visible: false });
+        Overlays.editOverlay(HMD.homeButtonHighlightID, { visible: false });
         Overlays.editOverlay(HMD.tabletScreenID, { visible: false });
         Overlays.editOverlay(HMD.tabletScreenID, { maxFPS: 1 });
     }
@@ -158,6 +172,7 @@
             UIWebTablet = null;
             HMD.tabletID = null;
             HMD.homeButtonID = null;
+            HMD.homeButtonHighlightID = null;
             HMD.tabletScreenID = null;
         } else if (debugTablet) {
             print("TABLET closeTabletUI, UIWebTablet is null");
@@ -183,9 +198,13 @@
             return;
         }
 
-        if (now - validCheckTime > MSECS_PER_SEC) {
+        var needInstantUpdate = UIWebTablet && UIWebTablet.getLandscape() !== landscape;
+
+        if ((now - validCheckTime > MSECS_PER_SEC) || needInstantUpdate) {
             validCheckTime = now;
+
             updateTabletWidthFromSettings();
+
             if (UIWebTablet) {
                 UIWebTablet.setLandscape(landscape);
             }
@@ -261,6 +280,36 @@
     Messages.subscribe("home");
     Messages.messageReceived.connect(handleMessage);
 
+    var clickMapping = Controller.newMapping('tabletToggle-click');
+    var wantsMenu = 0;
+    clickMapping.from(function () { return wantsMenu; }).to(Controller.Actions.ContextMenu);
+    clickMapping.from(Controller.Standard.RightSecondaryThumb).peek().to(function (clicked) {
+    if (clicked) {
+        //activeHudPoint2d(Controller.Standard.RightHand);
+        Messages.sendLocalMessage("toggleHand", Controller.Standard.RightHand);
+    }
+        wantsMenu = clicked;
+    });
+    
+    clickMapping.from(Controller.Standard.LeftSecondaryThumb).peek().to(function (clicked) {
+        if (clicked) {
+            //activeHudPoint2d(Controller.Standard.LeftHand);
+            Messages.sendLocalMessage("toggleHand", Controller.Standard.LeftHand);
+        }
+        wantsMenu = clicked;
+    });
+    
+    clickMapping.from(Controller.Standard.Start).peek().to(function (clicked) {
+    if (clicked) {
+        //activeHudPoint2dGamePad();
+        var noHands = -1;
+        Messages.sendLocalMessage("toggleHand", Controller.Standard.LeftHand);
+    }
+
+        wantsMenu = clicked;
+    });
+    clickMapping.enable();
+
     Script.setInterval(updateShowTablet, 100);
 
     Script.scriptEnding.connect(function () {
@@ -276,6 +325,7 @@
         Overlays.deleteOverlay(tabletID);
         HMD.tabletID = null;
         HMD.homeButtonID = null;
+        HMD.homeButtonHighlightID = null;
         HMD.tabletScreenID = null;
     });
 }()); // END LOCAL_SCOPE
diff --git a/scripts/system/tablet-users.js b/scripts/system/tablet-users.js
index 591537f9bc..6f37cd55eb 100644
--- a/scripts/system/tablet-users.js
+++ b/scripts/system/tablet-users.js
@@ -14,7 +14,7 @@
     var USERS_URL = "https://hifi-content.s3.amazonaws.com/faye/tablet-dev/users.html";
     var HOME_BUTTON_TEXTURE = Script.resourcesPath() + "meshes/tablet-with-home-button.fbx/tablet-with-home-button.fbm/button-root.png";
 
-    var FRIENDS_WINDOW_URL = "https://metaverse.highfidelity.com/user/friends";
+    var FRIENDS_WINDOW_URL = Account.metaverseServerURL + "/user/friends";
     var FRIENDS_WINDOW_WIDTH = 290;
     var FRIENDS_WINDOW_HEIGHT = 500;
     var FRIENDS_WINDOW_TITLE = "Add/Remove Friends";
diff --git a/scripts/tutorials/createMidiSphere.js b/scripts/tutorials/createMidiSphere.js
new file mode 100644
index 0000000000..56eae98585
--- /dev/null
+++ b/scripts/tutorials/createMidiSphere.js
@@ -0,0 +1,50 @@
+//
+//  Created by James B. Pollack @imgntn on April 18, 2016.
+//  Adapted by Burt
+//  Copyright 2016 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 SCRIPT_URL =  "file:///e:/hifi/scripts/tutorials/entity_scripts/midiSphere.js";
+var SCRIPT_URL =  "http://hifi-files.s3-website-us-west-2.amazonaws.com/midiSphere.js";
+var center = Vec3.sum(MyAvatar.position, Vec3.multiply(0.5, Quat.getForward(Camera.getOrientation())));
+
+var BALL_GRAVITY = {
+    x: 0,
+    y: 0,
+    z: 0
+};
+    
+var BALL_DIMENSIONS = {
+    x: 0.4,
+    y: 0.4,
+    z: 0.4
+};
+
+
+var BALL_COLOR = {
+    red: 255,
+    green: 0,
+    blue: 0
+};
+
+var midiSphereProperties = {
+    name: 'MIDI Sphere',
+    shapeType: 'sphere',
+    type: 'Sphere',
+    script: SCRIPT_URL,
+    color: BALL_COLOR,
+    dimensions: BALL_DIMENSIONS,
+    gravity: BALL_GRAVITY,
+    dynamic: false,
+    position: center,
+    collisionless: false,
+    ignoreForCollisions: true
+};
+
+var midiSphere = Entities.addEntity(midiSphereProperties);
+
+Script.stop();
diff --git a/scripts/tutorials/createTetherballStick.js b/scripts/tutorials/createTetherballStick.js
index 8d36d8ee59..35f5fb0344 100644
--- a/scripts/tutorials/createTetherballStick.js
+++ b/scripts/tutorials/createTetherballStick.js
@@ -14,7 +14,6 @@
 // Distributed under the Apache License, Version 2.0.
 // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 
-var NULL_UUID = "{00000000-0000-0000-0000-000000000000}";
 var LIFETIME = 3600;
 var BALL_SIZE = 0.175;
 var BALL_DAMPING = 0.5;
diff --git a/scripts/tutorials/entity_scripts/ambientSound.js b/scripts/tutorials/entity_scripts/ambientSound.js
index e0a7d0a3cf..dd964fb4e0 100644
--- a/scripts/tutorials/entity_scripts/ambientSound.js
+++ b/scripts/tutorials/entity_scripts/ambientSound.js
@@ -139,7 +139,7 @@
 
     this._toggle = function(hint) {
         // Toggle between ON/OFF state, but only if not in edit mode
-        if (Settings.getValue("io.highfidelity.isEditting")) {
+        if (Settings.getValue("io.highfidelity.isEditing")) {
             return;
         }
         var props = Entities.getEntityProperties(entity, [ "userData" ]);
diff --git a/scripts/tutorials/entity_scripts/midiSphere.js b/scripts/tutorials/entity_scripts/midiSphere.js
new file mode 100644
index 0000000000..980f8f834e
--- /dev/null
+++ b/scripts/tutorials/entity_scripts/midiSphere.js
@@ -0,0 +1,52 @@
+//  midiSphere.js
+//
+//  Script Type: Entity
+//  Created by James B. Pollack @imgntn on 9/21/2015
+//  Adapted by Burt
+//  Copyright 2015 High Fidelity, Inc.
+//  
+//  This script listens to MIDI and makes the ball change color.
+//  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 _this;
+
+    function MidiSphere() {
+        _this = this;
+        this.clicked = false;
+        return;
+    }
+    
+    MidiSphere.prototype = {
+        preload: function(entityID) {
+            this.entityID = entityID;
+            Midi.midiNote.connect(function(eventData) {
+                print("MidiSphere.noteReceived: "+JSON.stringify(eventData));
+                Entities.editEntity(entityID, { color: { red: 2*eventData.note, green: 2*eventData.note, blue: 2*eventData.note} });
+            });
+            print("MidiSphere.preload");
+        },
+        unload: function(entityID) {
+            print("MidiSphere.unload");
+        },
+
+        clickDownOnEntity: function(entityID, mouseEvent) { 
+            print("MidiSphere.clickDownOnEntity");
+            if (this.clicked) {
+                Entities.editEntity(entityID, { color: { red: 0, green: 255, blue: 255} });
+                this.clicked = false;
+                Midi.playMidiNote(144, 64, 0);
+            } else {
+                Entities.editEntity(entityID, { color: { red: 255, green: 255, blue: 0} });
+                this.clicked = true;
+                Midi.playMidiNote(144, 64, 100);
+            }
+        }
+
+    };
+
+    // entity scripts should return a newly constructed object of our type
+    return new MidiSphere();
+});
\ No newline at end of file
diff --git a/scripts/tutorials/entity_scripts/pistol.js b/scripts/tutorials/entity_scripts/pistol.js
index 1a570cc80f..62517f486d 100644
--- a/scripts/tutorials/entity_scripts/pistol.js
+++ b/scripts/tutorials/entity_scripts/pistol.js
@@ -350,8 +350,7 @@
                 end: ZERO_VECTOR,
                 color: { red: 255, green: 0, blue: 0},
                 alpha: 1,
-                visible: true,
-                lineWidth: 2
+                visible: true
             });
         },
     };
diff --git a/scripts/tutorials/entity_scripts/sit.js b/scripts/tutorials/entity_scripts/sit.js
index 3d3bc10fb1..70456ea493 100644
--- a/scripts/tutorials/entity_scripts/sit.js
+++ b/scripts/tutorials/entity_scripts/sit.js
@@ -12,9 +12,9 @@
     Script.include("/~/system/libraries/utils.js");
     if (!String.prototype.startsWith) {
         String.prototype.startsWith = function(searchString, position){
-          position = position || 0;
-          return this.substr(position, searchString.length) === searchString;
-      };
+            position = position || 0;
+            return this.substr(position, searchString.length) === searchString;
+        };
     }
 
     var SETTING_KEY = "com.highfidelity.avatar.isSitting";
@@ -122,10 +122,20 @@
 
     this.rolesToOverride = function() {
         return MyAvatar.getAnimationRoles().filter(function(role) {
-            return role === "fly" || role.startsWith("inAir");
+            return !(role.startsWith("right") || role.startsWith("left"));
         });
     }
 
+    // Handler for user changing the avatar model while sitting. There's currently an issue with changing avatar models while override role animations are applied,
+    // so to avoid that problem, re-apply the role overrides once the model has finished changing.
+    this.modelURLChangeFinished = function () {
+        print("Sitter's model has FINISHED changing. Reapply anim role overrides.");
+        var roles = this.rolesToOverride();
+        for (i in roles) {
+            MyAvatar.overrideRoleAnimation(roles[i], ANIMATION_URL, ANIMATION_FPS, true, ANIMATION_FIRST_FRAME, ANIMATION_LAST_FRAME);
+        }
+    }
+
     this.sitDown = function() {
         if (this.checkSeatForAvatar()) {
             print("Someone is already sitting in that chair.");
@@ -164,12 +174,14 @@
             return { headType: 0 };
         }, ["headType"]);
         Script.update.connect(this, this.update);
+        MyAvatar.onLoadComplete.connect(this, this.modelURLChangeFinished);
     }
 
     this.standUp = function() {
         print("Standing up (" + this.entityID + ")");
         MyAvatar.removeAnimationStateHandler(this.animStateHandlerID);
         Script.update.disconnect(this, this.update);
+        MyAvatar.onLoadComplete.disconnect(this, this.modelURLChangeFinished);
 
         if (MyAvatar.sessionUUID === this.getSeatUser()) {
             this.setSeatUser(null);
@@ -331,7 +343,7 @@
         }
         this.cleanupOverlay();
     }
-
+    
     this.clickDownOnEntity = function (id, event) {
         if (isInEditMode()) {
             return;
diff --git a/scripts/tutorials/getDomainMetadata.js b/scripts/tutorials/getDomainMetadata.js
index 54c356ae7b..1af801f2d6 100644
--- a/scripts/tutorials/getDomainMetadata.js
+++ b/scripts/tutorials/getDomainMetadata.js
@@ -6,7 +6,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-var SERVER = 'https://metaverse.highfidelity.com/api/v1';
+var SERVER = Account.metaverseServerURL + '/api/v1';
 
 var OVERLAY = null;
 
diff --git a/server-console/src/main.js b/server-console/src/main.js
index 95fb0d81b2..efa04a8512 100644
--- a/server-console/src/main.js
+++ b/server-console/src/main.js
@@ -334,6 +334,7 @@ function startInterface(url) {
 
     // create a new Interface instance - Interface makes sure only one is running at a time
     var pInterface = new Process('interface', interfacePath, argArray);
+    pInterface.detached = true;
     pInterface.start();
 }
 
@@ -892,10 +893,19 @@ function onContentLoaded() {
     deleteOldFiles(logPath, DELETE_LOG_FILES_OLDER_THAN_X_SECONDS, LOG_FILE_REGEX);
 
     if (dsPath && acPath) {
-        domainServer = new Process('domain-server', dsPath, ["--get-temp-name"], logPath);
-        acMonitor = new ACMonitorProcess('ac-monitor', acPath, ['-n7',
-                                                                '--log-directory', logPath,
-                                                                '--http-status-port', httpStatusPort], httpStatusPort, logPath);
+        var dsArguments = ['--get-temp-name',
+                           '--parent-pid', process.pid];
+        domainServer = new Process('domain-server', dsPath, dsArguments, logPath);
+        domainServer.restartOnCrash = true;
+
+        var acArguments = ['-n7',
+                           '--log-directory', logPath,
+                           '--http-status-port', httpStatusPort,
+                           '--parent-pid', process.pid];
+        acMonitor = new ACMonitorProcess('ac-monitor', acPath, acArguments,
+                                         httpStatusPort, logPath);
+        acMonitor.restartOnCrash = true;
+
         homeServer = new ProcessGroup('home', [domainServer, acMonitor]);
         logWindow = new LogWindow(acMonitor, domainServer);
 
diff --git a/server-console/src/modules/hf-process.js b/server-console/src/modules/hf-process.js
index 20b8966148..767befec7b 100644
--- a/server-console/src/modules/hf-process.js
+++ b/server-console/src/modules/hf-process.js
@@ -113,6 +113,10 @@ function Process(name, command, commandArgs, logDirectory) {
     this.logDirectory = logDirectory;
     this.logStdout = null;
     this.logStderr = null;
+    this.detached = false;
+    this.restartOnCrash = false;
+    this.restartCount = 0;
+    this.firstRestartTimestamp = Date.now();
 
     this.state = ProcessStates.STOPPED;
 };
@@ -165,9 +169,10 @@ Process.prototype = extend(Process.prototype, {
 
         try {
             this.child = childProcess.spawn(this.command, this.commandArgs, {
-                detached: false,
+                detached: this.detached,
                 stdio: ['ignore', logStdout, logStderr]
             });
+            log.debug("Spawned " + this.command + " with pid " + this.child.pid);
         } catch (e) {
             log.debug("Got error starting child process for " + this.name, e);
             this.child = null;
@@ -266,7 +271,30 @@ Process.prototype = extend(Process.prototype, {
             clearTimeout(this.stoppingTimeoutID);
             this.stoppingTimeoutID = null;
         }
+        // Grab current state before updating it.
+        var unexpectedShutdown = this.state != ProcessStates.STOPPING;
         this.updateState(ProcessStates.STOPPED);
+
+        if (unexpectedShutdown && this.restartOnCrash) {
+            var MAX_RESTARTS = 10;
+            var MAX_RESTARTS_PERIOD = 10; // 10 min
+            var MSEC_PER_MIN = 1000 * 60;
+            var now = Date.now();
+            var timeDiff = (now - this.firstRestartTimestamp) / MSEC_PER_MIN;
+            if (timeDiff > MAX_RESTARTS_PERIOD) {
+                this.firstRestartTimestamp = now;
+                this.restartCount = 0;
+            }
+
+            if (this.restartCount < 10) {
+                this.restartCount++;
+
+                log.warn("Child stopped unexpectedly, restarting.");
+                this.start();
+            } else {
+                log.warn("Child stopped unexpectedly too many times, not restarting.");
+            }
+        }
     }
 });
 
diff --git a/tests/baking/CMakeLists.txt b/tests/baking/CMakeLists.txt
new file mode 100644
index 0000000000..40217eded4
--- /dev/null
+++ b/tests/baking/CMakeLists.txt
@@ -0,0 +1,10 @@
+
+# Declare dependencies
+macro (setup_testcase_dependencies)
+  # link in the shared libraries
+  link_hifi_libraries(shared baking)
+
+  package_libraries_for_deployment()
+endmacro ()
+
+setup_hifi_testcase()
diff --git a/tests/baking/src/JSBakerTest.cpp b/tests/baking/src/JSBakerTest.cpp
new file mode 100644
index 0000000000..082ffb047f
--- /dev/null
+++ b/tests/baking/src/JSBakerTest.cpp
@@ -0,0 +1,92 @@
+//
+//  JSBakerTest.cpp
+//  tests/networking/src
+//
+//  Created by Utkarsh Gautam on 09/26/17.
+//  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 "JSBakerTest.h"
+QTEST_MAIN(JSBakerTest)
+
+void JSBakerTest::setTestCases() {
+    // Test cases contain a std::pair(input, desiredOutput)
+
+    _testCases.emplace_back("var a=1;", "var a=1;");
+    _testCases.emplace_back("var a=1;//single line comment\nvar b=2;", "var a=1;var b=2;");
+    _testCases.emplace_back("a\rb", "a\nb");
+    _testCases.emplace_back("a/*multi\n line \n comment*/ b", "ab");
+    _testCases.emplace_back("a/b", "a/b");
+    _testCases.emplace_back("var a =      1;", "var a=1;"); // Multiple spaces omitted
+    _testCases.emplace_back("var a=\t\t\t1;", "var a=1;"); // Multiple tabs omitted
+
+                                                              // Cases for space not omitted
+    _testCases.emplace_back("var x", "var x");
+    _testCases.emplace_back("a '", "a '");
+    _testCases.emplace_back("a $", "a $");
+    _testCases.emplace_back("a _", "a _");
+    _testCases.emplace_back("a /", "a /");
+    _testCases.emplace_back("a 1", "a 1");
+    _testCases.emplace_back("1 a", "1 a");
+    _testCases.emplace_back("$ a", "$ a");
+    _testCases.emplace_back("_ a", "_ a");
+    _testCases.emplace_back("/ a", "/ a");
+    _testCases.emplace_back("$ $", "$ $");
+    _testCases.emplace_back("_ _", "_ _");
+    _testCases.emplace_back("/ /", "/ /");
+
+    _testCases.emplace_back("a\n\n\n\nb", "a\nb"); // Skip multiple new lines
+    _testCases.emplace_back("a\n\n b", "a\nb"); // Skip multiple new lines followed by whitespace
+    _testCases.emplace_back("a\n\n  b", "a\nb"); // Skip multiple new lines followed by tab
+
+                                                 //Cases for new line not omitted
+    _testCases.emplace_back("a\nb", "a\nb");
+    _testCases.emplace_back("a\n9", "a\n9");
+    _testCases.emplace_back("9\na", "9\na");
+    _testCases.emplace_back("a\n$", "a\n$");
+    _testCases.emplace_back("a\n[", "a\n[");
+    _testCases.emplace_back("a\n{", "a\n{");
+    _testCases.emplace_back("a\n(", "a\n(");
+    _testCases.emplace_back("a\n+", "a\n+");
+    _testCases.emplace_back("a\n'", "a\n'");
+    _testCases.emplace_back("a\n-", "a\n-");
+    _testCases.emplace_back("$\na", "$\na");
+    _testCases.emplace_back("$\na", "$\na");
+    _testCases.emplace_back("_\na", "_\na");
+    _testCases.emplace_back("]\na", "]\na");
+    _testCases.emplace_back("}\na", "}\na");
+    _testCases.emplace_back(")\na", ")\na");
+    _testCases.emplace_back("+\na", "+\na");
+    _testCases.emplace_back("-\na", "-\na");
+
+    // Cases to check quoted strings are not modified
+    _testCases.emplace_back("'abcd1234$%^&[](){}'\na", "'abcd1234$%^&[](){}'\na");
+    _testCases.emplace_back("\"abcd1234$%^&[](){}\"\na", "\"abcd1234$%^&[](){}\"\na");
+    _testCases.emplace_back("`abcd1234$%^&[](){}`\na", "`abcd1234$%^&[](){}`a");
+
+    // Edge Cases
+
+    //No semicolon to terminate an expression, instead a new line used for termination
+    _testCases.emplace_back("var x=5\nvar y=6;", "var x=5\nvar y=6;");
+    
+     //a + ++b is minified as a+ ++b.
+    _testCases.emplace_back("a + ++b", "a + ++b");
+
+    //a - --b is minified as a- --b.
+    _testCases.emplace_back("a - --b", "a - --b");
+}
+
+void JSBakerTest::testJSBaking() {
+
+    for (int i = 0;i < _testCases.size();i++) {
+        QByteArray output;
+        auto input = _testCases.at(i).first;
+        JSBaker::bakeJS(input, output);
+
+        auto desiredOutput = _testCases.at(i).second;
+        QCOMPARE(output, desiredOutput);
+    }
+}
diff --git a/tests/baking/src/JSBakerTest.h b/tests/baking/src/JSBakerTest.h
new file mode 100644
index 0000000000..ea2cdc6696
--- /dev/null
+++ b/tests/baking/src/JSBakerTest.h
@@ -0,0 +1,29 @@
+//
+//  JSBakerTest.h
+//  tests/networking/src
+//
+//  Created by Utkarsh Gautam on 9/26/17.
+//  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_JSBakerTest_h
+#define hifi_JSBakerTest_h
+
+#include <QtTest/QtTest>
+#include <JSBaker.h>
+
+class JSBakerTest : public QObject {
+    Q_OBJECT
+
+private slots:
+    void setTestCases();
+    void testJSBaking();
+
+private:
+    std::vector<std::pair<QByteArray, QByteArray>> _testCases;
+};
+
+#endif
diff --git a/tests/gpu-test/src/TestInstancedShapes.cpp b/tests/gpu-test/src/TestInstancedShapes.cpp
index 6a98ee58b9..da50f8521f 100644
--- a/tests/gpu-test/src/TestInstancedShapes.cpp
+++ b/tests/gpu-test/src/TestInstancedShapes.cpp
@@ -10,18 +10,18 @@
 
 gpu::Stream::FormatPointer& getInstancedSolidStreamFormat();
 
-static const size_t TYPE_COUNT = 4;
-static const size_t ITEM_COUNT = 50;
-static const float SHAPE_INTERVAL = (PI * 2.0f) / ITEM_COUNT;
-static const float ITEM_INTERVAL = SHAPE_INTERVAL / TYPE_COUNT;
-
-static GeometryCache::Shape SHAPE[TYPE_COUNT] = {
+static GeometryCache::Shape SHAPE[] = {
     GeometryCache::Icosahedron,
     GeometryCache::Cube,
     GeometryCache::Sphere,
     GeometryCache::Tetrahedron,
 };
 
+static const size_t TYPE_COUNT = (sizeof(SHAPE) / sizeof((SHAPE)[0]));
+static const size_t ITEM_COUNT = 50;
+static const float SHAPE_INTERVAL = (PI * 2.0f) / ITEM_COUNT;
+static const float ITEM_INTERVAL = SHAPE_INTERVAL / TYPE_COUNT;
+
 const gpu::Element POSITION_ELEMENT { gpu::VEC3, gpu::FLOAT, gpu::XYZ };
 const gpu::Element NORMAL_ELEMENT { gpu::VEC3, gpu::FLOAT, gpu::XYZ };
 const gpu::Element COLOR_ELEMENT { gpu::VEC4, gpu::NUINT8, gpu::RGBA };
@@ -34,8 +34,6 @@ TestInstancedShapes::TestInstancedShapes() {
     static const float ITEM_RADIUS = 20;
     static const vec3 ITEM_TRANSLATION { 0, 0, -ITEM_RADIUS };
     for (size_t i = 0; i < TYPE_COUNT; ++i) {
-        GeometryCache::Shape shape = SHAPE[i];
-        GeometryCache::ShapeData shapeData = geometryCache->_shapes[shape];
         //indirectCommand._count
         float startingInterval = ITEM_INTERVAL * i;
         std::vector<mat4> typeTransforms;
@@ -62,7 +60,12 @@ void TestInstancedShapes::renderTest(size_t testId, RenderArgs* args) {
     batch.setInputFormat(getInstancedSolidStreamFormat());
     for (size_t i = 0; i < TYPE_COUNT; ++i) {
         GeometryCache::Shape shape = SHAPE[i];
-        GeometryCache::ShapeData shapeData = geometryCache->_shapes[shape];
+        const GeometryCache::ShapeData *shapeData = geometryCache->getShapeData( shape );
+        if (!shapeData) {
+
+            //--EARLY ITERATION EXIT--( didn't have shape data yet )
+            continue;
+        }
         
         std::string namedCall = __FUNCTION__ + std::to_string(i);
 
@@ -71,13 +74,13 @@ void TestInstancedShapes::renderTest(size_t testId, RenderArgs* args) {
             batch.setModelTransform(transforms[i][j]);
             batch.setupNamedCalls(namedCall, [=](gpu::Batch& batch, gpu::Batch::NamedBatchData&) {
                 batch.setInputBuffer(gpu::Stream::COLOR, gpu::BufferView(colorBuffer, i * ITEM_COUNT * 4, colorBuffer->getSize(), COLOR_ELEMENT));
-                shapeData.drawInstances(batch, ITEM_COUNT);
+                shapeData->drawInstances(batch, ITEM_COUNT);
             });
         }
 
         //for (size_t j = 0; j < ITEM_COUNT; ++j) {
         //    batch.setModelTransform(transforms[j + i * ITEM_COUNT]);
-        //    shapeData.draw(batch);
+        //    shapeData->draw(batch);
         //}
     }
 }
diff --git a/tests/gpu-test/src/TestWindow.cpp b/tests/gpu-test/src/TestWindow.cpp
index 5b5102701a..9ae78527cc 100644
--- a/tests/gpu-test/src/TestWindow.cpp
+++ b/tests/gpu-test/src/TestWindow.cpp
@@ -24,7 +24,7 @@
 #include <TextureCache.h>
 
 #ifdef DEFERRED_LIGHTING
-extern void initDeferredPipelines(render::ShapePlumber& plumber);
+extern void initDeferredPipelines(render::ShapePlumber& plumber, const render::ShapePipeline::BatchSetter& batchSetter, const render::ShapePipeline::ItemSetter& itemSetter);
 extern void initStencilPipeline(gpu::PipelinePointer& pipeline);
 #endif
 
@@ -77,8 +77,7 @@ void TestWindow::initGl() {
 #ifdef DEFERRED_LIGHTING
     auto deferredLightingEffect = DependencyManager::get<DeferredLightingEffect>();
     deferredLightingEffect->init();
-   // deferredLightingEffect->setGlobalLight(_light);
-    initDeferredPipelines(*_shapePlumber);
+    initDeferredPipelines(*_shapePlumber, nullptr, nullptr);
 #endif
 }
 
diff --git a/tests/octree/src/OctreeTests.cpp b/tests/octree/src/OctreeTests.cpp
index 64d68e8e13..81300a1293 100644
--- a/tests/octree/src/OctreeTests.cpp
+++ b/tests/octree/src/OctreeTests.cpp
@@ -74,7 +74,7 @@ void OctreeTests::propertyFlagsTests() {
         EntityPropertyFlags props;
         props.setHasProperty(PROP_VISIBLE);
         props.setHasProperty(PROP_POSITION);
-        props.setHasProperty(PROP_RADIUS);
+        props.setHasProperty(PROP_DIMENSIONS);
         props.setHasProperty(PROP_MODEL_URL);
         props.setHasProperty(PROP_COMPOUND_SHAPE_URL);
         props.setHasProperty(PROP_ROTATION);
diff --git a/tests/physics/src/ShapeInfoTests.cpp b/tests/physics/src/ShapeInfoTests.cpp
index c6a19084a2..79d0092dc3 100644
--- a/tests/physics/src/ShapeInfoTests.cpp
+++ b/tests/physics/src/ShapeInfoTests.cpp
@@ -14,7 +14,7 @@
 #include <btBulletDynamicsCommon.h>
 #include <LinearMath/btHashMap.h>
 
-#include <DoubleHashKey.h>
+#include <HashKey.h>
 #include <ShapeInfo.h>
 #include <ShapeFactory.h>
 #include <StreamUtils.h>
@@ -23,108 +23,78 @@
 
 QTEST_MAIN(ShapeInfoTests)
 
+// Enable this to manually run testHashCollisions
+// (NOT a regular unit test; takes ~40 secs to run on an i7)
+//#define MANUAL_TEST true
+
 void ShapeInfoTests::testHashFunctions() {
 #if MANUAL_TEST
     int maxTests = 10000000;
     ShapeInfo info;
-    btHashMap<btHashInt, uint32_t> hashes;
+    btHashMap<HashKey, int32_t> hashes;
 
-    uint32_t bits[32];
-    uint32_t masks[32];
-    for (int i = 0; i < 32; ++i) {
+    const int32_t NUM_HASH_BITS = 32;
+    uint32_t bits[NUM_HASH_BITS];
+    uint32_t masks[NUM_HASH_BITS];
+    for (int i = 0; i < NUM_HASH_BITS; ++i) {
         bits[i] = 0;
-        masks[i] = 1U << i;
+        masks[i] = 1UL << i;
     }
 
-    float deltaLength = 0.002f;
-    float endLength = 100.0f;
+    float deltaLength = 1.0f / (HashKey::getNumQuantizedValuesPerMeter() - 3.0f);
+    float endLength = 2000.0f * deltaLength;
     int numSteps = (int)(endLength / deltaLength);
 
     int testCount = 0;
     int numCollisions = 0;
 
     btClock timer;
-    for (int x = 1; x < numSteps && testCount < maxTests; ++x) {
-        float radiusX = (float)x * deltaLength;
+    for (int i = 1; i < numSteps && testCount < maxTests; ++i) {
+        float radiusX = (float)i * deltaLength;
+        int32_t* hashPtr;
         // test sphere
         info.setSphere(radiusX);
         ++testCount;
-        DoubleHashKey key = info.getHash();
-        uint32_t* hashPtr = hashes.find(key.getHash());
-        if (hashPtr && *hashPtr == key.getHash2()) {
-            std::cout << testCount << "  hash collision radiusX = " << radiusX
-                << "  h1 = 0x" << std::hex << key.getHash()
-                << "  h2 = 0x" << std::hex << key.getHash2()
-                << std::endl;
+        HashKey key = info.getHash();
+        hashPtr = hashes.find(key);
+        if (hashPtr) {
+            std::cout << testCount << "  hash collision sphere radius = " << radiusX
+                << "  h = 0x" << std::hex << key.getHash() << " : 0x" << *hashPtr
+                << std::dec << std::endl;
             ++numCollisions;
             assert(false);
         } else {
-            hashes.insert(key.getHash(), key.getHash2());
+            hashes.insert(key, key.getHash());
         }
-        for (int k = 0; k < 32; ++k) {
-            if (masks[k] & key.getHash2()) {
-                ++bits[k];
+        // track bit distribution counts to evaluate hash function randomness
+        for (int j = 0; j < NUM_HASH_BITS; ++j) {
+            if (masks[j] & key.getHash()) {
+                ++bits[j];
             }
         }
 
         for (int y = 1; y < numSteps && testCount < maxTests; ++y) {
             float radiusY = (float)y * deltaLength;
-            /* TODO: reimplement Cylinder and Capsule shapes
-            // test cylinder and capsule
-            int types[] = { CYLINDER_SHAPE_PROXYTYPE, CAPSULE_SHAPE_PROXYTYPE };
-            for (int i = 0; i < 2; ++i) {
-                switch(types[i]) {
-                    case CYLINDER_SHAPE_PROXYTYPE: {
-                        info.setCylinder(radiusX, radiusY);
-                        break;
-                    }
-                    case CAPSULE_SHAPE_PROXYTYPE: {
-                        info.setCapsuleY(radiusX, radiusY);
-                        break;
-                    }
-                }
-
-                ++testCount;
-                key = info.getHash();
-                hashPtr = hashes.find(key.getHash());
-                if (hashPtr && *hashPtr == key.getHash2()) {
-                    std::cout << testCount << "  hash collision radiusX = " << radiusX << "  radiusY = " << radiusY
-                        << "  h1 = 0x" << std::hex << key.getHash()
-                        << "  h2 = 0x" << std::hex << key.getHash2()
-                        << std::endl;
-                    ++numCollisions;
-                    assert(false);
-                } else {
-                    hashes.insert(key.getHash(), key.getHash2());
-                }
-                for (int k = 0; k < 32; ++k) {
-                    if (masks[k] & key.getHash2()) {
-                        ++bits[k];
-                    }
-                }
-            }
-            */
-
             for (int z = 1; z < numSteps && testCount < maxTests; ++z) {
                 float radiusZ = (float)z * deltaLength;
                 // test box
                 info.setBox(glm::vec3(radiusX, radiusY, radiusZ));
                 ++testCount;
-                DoubleHashKey key = info.getHash();
-                hashPtr = hashes.find(key.getHash());
-                if (hashPtr && *hashPtr == key.getHash2()) {
-                    std::cout << testCount << "  hash collision radiusX = " << radiusX
-                        << "  radiusY = " << radiusY << "  radiusZ = " << radiusZ
-                        << "  h1 = 0x" << std::hex << key.getHash()
-                        << "  h2 = 0x" << std::hex << key.getHash2()
-                        << std::endl;
+                HashKey key = info.getHash();
+                hashPtr = hashes.find(key);
+                if (hashPtr) {
+                    std::cout << testCount << "  hash collision box dimensions = < " << radiusX
+                        << ", " << radiusY << ", " << radiusZ << " >"
+                        << "  h = 0x" << std::hex << key.getHash() << " : 0x" << *hashPtr << " : 0x" << key.getHash64()
+                        << std::dec << std::endl;
                     ++numCollisions;
                     assert(false);
                 } else {
-                    hashes.insert(key.getHash(), key.getHash2());
+                    hashes.insert(key, key.getHash());
                 }
-                for (int k = 0; k < 32; ++k) {
-                    if (masks[k] & key.getHash2()) {
+                // track bit distribution counts to evaluate hash function randomness
+                for (int k = 0; k < NUM_HASH_BITS; ++k) {
+                    if (masks[k] & key.getHash()) {
                         ++bits[k];
                     }
                 }
@@ -135,7 +105,8 @@ void ShapeInfoTests::testHashFunctions() {
     std::cout << msec << " msec with " << numCollisions << " collisions out of " << testCount << " hashes" << std::endl;
 
     // print out distribution of bits
-    for (int i = 0; i < 32; ++i) {
+    // ideally the numbers in each bin will be about the same
+    for (int i = 0; i < NUM_HASH_BITS; ++i) {
         std::cout << "bit 0x" << std::hex << masks[i] << std::dec << " = " << bits[i] << std::endl;
     }
     QCOMPARE(numCollisions, 0);
@@ -146,15 +117,14 @@ void ShapeInfoTests::testBoxShape() {
     ShapeInfo info;
     glm::vec3 halfExtents(1.23f, 4.56f, 7.89f);
     info.setBox(halfExtents);
-    DoubleHashKey key = info.getHash();
+    HashKey key = info.getHash();
 
     const btCollisionShape* shape = ShapeFactory::createShapeFromInfo(info);
     QCOMPARE(shape != nullptr, true);
 
     ShapeInfo otherInfo = info;
-    DoubleHashKey otherKey = otherInfo.getHash();
+    HashKey otherKey = otherInfo.getHash();
     QCOMPARE(key.getHash(), otherKey.getHash());
-    QCOMPARE(key.getHash2(), otherKey.getHash2());
 
     delete shape;
 }
@@ -163,15 +133,14 @@ void ShapeInfoTests::testSphereShape() {
     ShapeInfo info;
     float radius = 1.23f;
     info.setSphere(radius);
-    DoubleHashKey key = info.getHash();
+    HashKey key = info.getHash();
 
     const btCollisionShape* shape = ShapeFactory::createShapeFromInfo(info);
     QCOMPARE(shape != nullptr, true);
 
     ShapeInfo otherInfo = info;
-    DoubleHashKey otherKey = otherInfo.getHash();
+    HashKey otherKey = otherInfo.getHash();
     QCOMPARE(key.getHash(), otherKey.getHash());
-    QCOMPARE(key.getHash2(), otherKey.getHash2());
 
     delete shape;
 }
@@ -182,15 +151,14 @@ void ShapeInfoTests::testCylinderShape() {
     float radius = 1.23f;
     float height = 4.56f;
     info.setCylinder(radius, height);
-    DoubleHashKey key = info.getHash();
+    HashKey key = info.getHash();
 
     btCollisionShape* shape = ShapeFactory::createShapeFromInfo(info);
     QCOMPARE(shape != nullptr, true);
 
     ShapeInfo otherInfo = info;
-    DoubleHashKey otherKey = otherInfo.getHash();
+    HashKey otherKey = otherInfo.getHash();
     QCOMPARE(key.getHash(), otherKey.getHash());
-    QCOMPARE(key.getHash2(), otherKey.getHash2());
 
     delete shape;
     */
@@ -202,15 +170,14 @@ void ShapeInfoTests::testCapsuleShape() {
     float radius = 1.23f;
     float height = 4.56f;
     info.setCapsule(radius, height);
-    DoubleHashKey key = info.getHash();
+    HashKey key = info.getHash();
 
     btCollisionShape* shape = ShapeFactory::createShapeFromInfo(info);
     QCOMPARE(shape != nullptr, true);
 
     ShapeInfo otherInfo = info;
-    DoubleHashKey otherKey = otherInfo.getHash();
+    HashKey otherKey = otherInfo.getHash();
     QCOMPARE(key.getHash(), otherKey.getHash());
-    QCOMPARE(key.getHash2(), otherKey.getHash2());
 
     delete shape;
     */
diff --git a/tests/physics/src/ShapeInfoTests.h b/tests/physics/src/ShapeInfoTests.h
index fbd89a13a8..1f6054dd1a 100644
--- a/tests/physics/src/ShapeInfoTests.h
+++ b/tests/physics/src/ShapeInfoTests.h
@@ -18,10 +18,6 @@
 //#include "BulletTestUtils.h"
 //#include "../QTestExtensions.h"
 
-// Enable this to manually run testHashCollisions
-// (NOT a regular unit test; takes ~17 secs to run on an i7)
-#define MANUAL_TEST false
-
 class ShapeInfoTests : public QObject {
     Q_OBJECT
 private slots:
diff --git a/tests/render-perf/CMakeLists.txt b/tests/render-perf/CMakeLists.txt
index b6989a57b7..5b83ff313b 100644
--- a/tests/render-perf/CMakeLists.txt
+++ b/tests/render-perf/CMakeLists.txt
@@ -12,8 +12,7 @@ setup_hifi_project(Quick Gui OpenGL)
 set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
 
 # link in the shared libraries
-link_hifi_libraries(shared networking model fbx ktx image octree gl gpu gpu-gl render model-networking networking render-utils entities entities-renderer animation audio avatars script-engine physics procedural)
-
+link_hifi_libraries(shared networking model fbx ktx image octree gl gpu gpu-gl render model-networking networking render-utils entities entities-renderer animation audio avatars script-engine physics procedural midi ui)
 
 package_libraries_for_deployment()
 
diff --git a/tests/render-perf/src/main.cpp b/tests/render-perf/src/main.cpp
index 2b91a36b48..c70a74cd7f 100644
--- a/tests/render-perf/src/main.cpp
+++ b/tests/render-perf/src/main.cpp
@@ -42,11 +42,15 @@
 #include <LogHandler.h>
 #include <AssetClient.h>
 
+#include <gl/OffscreenGLCanvas.h>
+
 #include <gpu/gl/GLBackend.h>
 #include <gpu/gl/GLFramebuffer.h>
 #include <gpu/gl/GLTexture.h>
 #include <gpu/StandardShaderLib.h>
 
+#include <ui/OffscreenQmlSurface.h>
+
 #include <AnimationCache.h>
 #include <SimpleEntitySimulation.h>
 #include <EntityDynamicInterface.h>
@@ -62,6 +66,8 @@
 #include <GeometryCache.h>
 #include <DeferredLightingEffect.h>
 #include <render/RenderFetchCullSortTask.h>
+#include <UpdateSceneTask.h>
+#include <RenderViewTask.h>
 #include <RenderShadowTask.h>
 #include <RenderDeferredTask.h>
 #include <RenderForwardTask.h>
@@ -425,6 +431,10 @@ namespace render {
     }
 }
 
+OffscreenGLCanvas* _chromiumShareContext{ nullptr };
+Q_GUI_EXPORT void qt_gl_set_global_share_context(QOpenGLContext *context);
+
+
 // Create a simple OpenGL window that renders text in various ways
 class QTestWindow : public QWindow, public AbstractViewStateInterface {
 
@@ -433,10 +443,6 @@ protected:
         viewOut = _viewFrustum;
     }
 
-    void copyShadowViewFrustum(ViewFrustum& viewOut) const override {
-        viewOut = _shadowViewFrustum;
-    }
-
     QThread* getMainThread() override {
         return QThread::currentThread();
     }
@@ -504,8 +510,6 @@ public:
         AbstractViewStateInterface::setInstance(this);
         _octree = DependencyManager::set<EntityTreeRenderer>(false, this, nullptr);
         _octree->init();
-        // Prevent web entities from rendering
-        REGISTER_ENTITY_TYPE_WITH_FACTORY(Web, WebEntityItem::factory);
 
         DependencyManager::set<ParentFinder>(_octree->getTree());
         auto nodeList = DependencyManager::get<LimitedNodeList>();
@@ -533,20 +537,33 @@ public:
         _renderThread.initialize(this, _initContext);
         _initContext.makeCurrent();
 
+        if (nsightActive()) {
+            // Prevent web entities from rendering
+            REGISTER_ENTITY_TYPE_WITH_FACTORY(Web, WebEntityItem::factory);
+        } else {
+            _chromiumShareContext = new OffscreenGLCanvas();
+            _chromiumShareContext->setObjectName("ChromiumShareContext");
+            _chromiumShareContext->create(_initContext.qglContext());
+            _chromiumShareContext->makeCurrent();
+            qt_gl_set_global_share_context(_chromiumShareContext->getContext());
+
+            // Make sure all QML surfaces share the main thread GL context
+            OffscreenQmlSurface::setSharedContext(_initContext.qglContext());
+
+            _initContext.makeCurrent();
+        }
+
+
         // FIXME use a wait condition
         QThread::msleep(1000);
         _renderThread.submitFrame(gpu::FramePointer());
         _initContext.makeCurrent();
+        DependencyManager::get<GeometryCache>()->initializeShapePipelines();
         // Render engine init
-        _renderEngine->addJob<RenderShadowTask>("RenderShadowTask", _cullFunctor);
-        const auto items = _renderEngine->addJob<RenderFetchCullSortTask>("FetchCullSort", _cullFunctor);
-        assert(items.canCast<RenderFetchCullSortTask::Output>());
         static const QString RENDER_FORWARD = "HIFI_RENDER_FORWARD";
-        if (QProcessEnvironment::systemEnvironment().contains(RENDER_FORWARD)) {
-            _renderEngine->addJob<RenderForwardTask>("RenderForwardTask", items);
-        } else {
-            _renderEngine->addJob<RenderDeferredTask>("RenderDeferredTask", items);
-        }
+        bool isDeferred = !QProcessEnvironment::systemEnvironment().contains(RENDER_FORWARD);
+        _renderEngine->addJob<UpdateSceneTask>("UpdateScene");
+        _renderEngine->addJob<RenderViewTask>("RenderMainView", _cullFunctor, isDeferred);
         _renderEngine->load();
         _renderEngine->registerScene(_main3DScene);
 
@@ -681,7 +698,8 @@ private:
         _renderCount = _renderThread._presentCount.load();
         update();
 
-        RenderArgs renderArgs(_renderThread._gpuContext, _octree, DEFAULT_OCTREE_SIZE_SCALE,
+        _initContext.makeCurrent();
+        RenderArgs renderArgs(_renderThread._gpuContext, DEFAULT_OCTREE_SIZE_SCALE,
             0, RenderArgs::DEFAULT_RENDER_MODE,
             RenderArgs::MONO, RenderArgs::RENDER_DEBUG_NONE);
 
@@ -721,6 +739,7 @@ private:
         // Viewport is assigned to the size of the framebuffer
         renderArgs._viewport = ivec4(0, 0, windowSize.width(), windowSize.height());
         renderArgs.setViewFrustum(_viewFrustum);
+        renderArgs._scene = _main3DScene;
 
         // Final framebuffer that will be handled to the display-plugin
         render(&renderArgs);
@@ -876,7 +895,7 @@ private:
 
         last = now;
 
-        getEntities()->update();
+        getEntities()->update(false);
 
         // The pending changes collecting the changes here
         render::Transaction transaction;
@@ -889,11 +908,6 @@ private:
             BackgroundRenderData::_item = _main3DScene->allocateID();
             transaction.resetItem(BackgroundRenderData::_item, backgroundRenderPayload);
         }
-        // Setup the current Zone Entity lighting
-        {
-            auto stage = DependencyManager::get<SceneScriptingInterface>()->getSkyStage();
-           // DependencyManager::get<DeferredLightingEffect>()->setGlobalLight(stage->getSunLight());
-        }
 
         {
             PerformanceTimer perfTimer("SceneProcessTransaction");
@@ -914,8 +928,6 @@ private:
         PerformanceTimer perfTimer("draw");
         // The pending changes collecting the changes here
         render::Transaction transaction;
-        // Setup the current Zone Entity lighting
-      //  DependencyManager::get<DeferredLightingEffect>()->setGlobalLight(_sunSkyStage.getSunLight());
         {
             PerformanceTimer perfTimer("SceneProcessTransaction");
             _main3DScene->enqueueTransaction(transaction);
@@ -1102,7 +1114,6 @@ private:
     RenderThread _renderThread;
     QWindowCamera _camera;
     ViewFrustum _viewFrustum; // current state of view frustum, perspective, orientation, etc.
-    ViewFrustum _shadowViewFrustum; // current state of view frustum, perspective, orientation, etc.
     model::SunSkyStage _sunSkyStage;
     model::LightPointer _globalLight { std::make_shared<model::Light>() };
     bool _ready { false };
diff --git a/tests/render-texture-load/src/GLIHelpers.h b/tests/render-texture-load/src/GLIHelpers.h
index c2841311a9..886176e874 100644
--- a/tests/render-texture-load/src/GLIHelpers.h
+++ b/tests/render-texture-load/src/GLIHelpers.h
@@ -28,6 +28,7 @@
 #pragma GCC diagnostic ignored "-Wunused-but-set-variable"
 #pragma GCC diagnostic ignored "-Wunused-result"
 #pragma GCC diagnostic ignored "-Wignored-qualifiers"
+#pragma GCC diagnostic ignored "-Wtype-limits"
 #endif
 
 #include <gli/gli.hpp>
diff --git a/tests/shaders/src/main.cpp b/tests/shaders/src/main.cpp
index d10ab1ddbe..7c6886ad93 100644
--- a/tests/shaders/src/main.cpp
+++ b/tests/shaders/src/main.cpp
@@ -19,6 +19,7 @@
 #include <QGuiApplication>
 
 #include <gl/GLHelpers.h>
+#include <gl/GLShaders.h>
 
 #include <gl/QOpenGLContextWrapper.h>
 
@@ -57,8 +58,6 @@
 #include <render-utils/model_lightmap_specular_map_frag.h>
 #include <render-utils/model_translucent_frag.h>
 
-#include <entities-renderer/untextured_particle_frag.h>
-#include <entities-renderer/untextured_particle_vert.h>
 #include <entities-renderer/textured_particle_frag.h>
 #include <entities-renderer/textured_particle_vert.h>
 
@@ -116,13 +115,37 @@ public:
     }
 };
 
+
+
+const std::string VERTEX_SHADER_DEFINES{ R"GLSL(
+#version 410 core
+#define GPU_VERTEX_SHADER
+#define GPU_TRANSFORM_IS_STEREO
+#define GPU_TRANSFORM_STEREO_CAMERA
+#define GPU_TRANSFORM_STEREO_CAMERA_INSTANCED
+#define GPU_TRANSFORM_STEREO_SPLIT_SCREEN
+)GLSL" };
+
+const std::string PIXEL_SHADER_DEFINES{ R"GLSL(
+#version 410 core
+#define GPU_PIXEL_SHADER
+#define GPU_TRANSFORM_IS_STEREO
+#define GPU_TRANSFORM_STEREO_CAMERA
+#define GPU_TRANSFORM_STEREO_CAMERA_INSTANCED
+#define GPU_TRANSFORM_STEREO_SPLIT_SCREEN
+)GLSL" };
+
 void testShaderBuild(const char* vs_src, const char * fs_src) {
-    auto vs = gpu::Shader::createVertex(std::string(vs_src));
-    auto fs = gpu::Shader::createPixel(std::string(fs_src));
-    auto pr = gpu::Shader::createProgram(vs, fs);
-    if (!gpu::Shader::makeProgram(*pr)) {
+    std::string error;
+    GLuint vs, fs;
+    if (!gl::compileShader(GL_VERTEX_SHADER, vs_src, VERTEX_SHADER_DEFINES, vs, error) || 
+        !gl::compileShader(GL_FRAGMENT_SHADER, fs_src, PIXEL_SHADER_DEFINES, fs, error)) {
         throw std::runtime_error("Failed to compile shader");
     }
+    auto pr = gl::compileProgram({ vs, fs }, error);
+    if (!pr) {
+        throw std::runtime_error("Failed to link shader");
+    }
 }
 
 void QTestWindow::draw() {
@@ -172,7 +195,6 @@ void QTestWindow::draw() {
         testShaderBuild(skin_model_normal_map_vert, model_translucent_frag);
 
         testShaderBuild(model_shadow_vert, model_shadow_frag);
-        testShaderBuild(untextured_particle_vert, untextured_particle_frag);
         testShaderBuild(textured_particle_vert, textured_particle_frag);
 /* FIXME: Bring back the ssao shader tests
         testShaderBuild(gaussian_blur_vertical_vert, gaussian_blur_frag);
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 0561956709..cf11ef9e7a 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -2,23 +2,25 @@
 add_subdirectory(scribe)
 set_target_properties(scribe PROPERTIES FOLDER "Tools")
 
-add_subdirectory(udt-test)
-set_target_properties(udt-test PROPERTIES FOLDER "Tools")
+if (BUILD_TOOLS)
+  add_subdirectory(udt-test)
+  set_target_properties(udt-test PROPERTIES FOLDER "Tools")
 
-add_subdirectory(vhacd-util)
-set_target_properties(vhacd-util PROPERTIES FOLDER "Tools")
+  add_subdirectory(vhacd-util)
+  set_target_properties(vhacd-util PROPERTIES FOLDER "Tools")
 
-add_subdirectory(ice-client)
-set_target_properties(ice-client PROPERTIES FOLDER "Tools")
+  add_subdirectory(ice-client)
+  set_target_properties(ice-client PROPERTIES FOLDER "Tools")
 
-add_subdirectory(ac-client)
-set_target_properties(ac-client PROPERTIES FOLDER "Tools")
+  add_subdirectory(ac-client)
+  set_target_properties(ac-client PROPERTIES FOLDER "Tools")
 
-add_subdirectory(skeleton-dump)
-set_target_properties(skeleton-dump PROPERTIES FOLDER "Tools")
+  add_subdirectory(skeleton-dump)
+  set_target_properties(skeleton-dump PROPERTIES FOLDER "Tools")
 
-add_subdirectory(atp-get)
-set_target_properties(atp-get PROPERTIES FOLDER "Tools")
+  add_subdirectory(atp-client)
+  set_target_properties(atp-client PROPERTIES FOLDER "Tools")
 
-add_subdirectory(oven)
-set_target_properties(oven PROPERTIES FOLDER "Tools")
+  add_subdirectory(oven)
+  set_target_properties(oven PROPERTIES FOLDER "Tools")
+endif()
diff --git a/tools/ac-client/src/ACClientApp.cpp b/tools/ac-client/src/ACClientApp.cpp
index b81d092662..e00560158f 100644
--- a/tools/ac-client/src/ACClientApp.cpp
+++ b/tools/ac-client/src/ACClientApp.cpp
@@ -14,6 +14,7 @@
 #include <QLoggingCategory>
 #include <QCommandLineParser>
 #include <NetworkLogging.h>
+#include <NetworkingConstants.h>
 #include <SharedLogging.h>
 #include <AddressManager.h>
 #include <DependencyManager.h>
@@ -33,6 +34,9 @@ ACClientApp::ACClientApp(int argc, char* argv[]) :
     const QCommandLineOption verboseOutput("v", "verbose output");
     parser.addOption(verboseOutput);
 
+    const QCommandLineOption authOption("u", "set usename and pass", "username:password");
+    parser.addOption(authOption);
+
     const QCommandLineOption domainAddressOption("d", "domain-server address", "127.0.0.1");
     parser.addOption(domainAddressOption);
 
@@ -42,7 +46,6 @@ ACClientApp::ACClientApp(int argc, char* argv[]) :
     const QCommandLineOption listenPortOption("listenPort", "listen port", QString::number(INVALID_PORT));
     parser.addOption(listenPortOption);
 
-
     if (!parser.parse(QCoreApplication::arguments())) {
         qCritical() << parser.errorText() << endl;
         parser.showHelp();
@@ -66,6 +69,7 @@ ACClientApp::ACClientApp(int argc, char* argv[]) :
         const_cast<QLoggingCategory*>(&shared())->setEnabled(QtInfoMsg, false);
         const_cast<QLoggingCategory*>(&shared())->setEnabled(QtWarningMsg, false);
     }
+    
 
     QString domainServerAddress = "127.0.0.1:40103";
     if (parser.isSet(domainAddressOption)) {
@@ -81,6 +85,18 @@ ACClientApp::ACClientApp(int argc, char* argv[]) :
         listenPort = parser.value(listenPortOption).toInt();
     }
 
+    if (parser.isSet(authOption)) {
+        QStringList pieces = parser.value(authOption).split(":");
+        if (pieces.size() != 2) {
+            qDebug() << "-u should be followed by username:password";
+            parser.showHelp();
+            Q_UNREACHABLE();
+        }
+
+        _username = pieces[0];
+        _password = pieces[1];
+    }
+
     Setting::init();
     DependencyManager::registerInheritance<LimitedNodeList, NodeList>();
 
@@ -88,33 +104,56 @@ ACClientApp::ACClientApp(int argc, char* argv[]) :
     DependencyManager::set<AddressManager>();
     DependencyManager::set<NodeList>(NodeType::Agent, listenPort);
 
+    auto accountManager = DependencyManager::get<AccountManager>();
+    accountManager->setIsAgent(true);
+    accountManager->setAuthURL(NetworkingConstants::METAVERSE_SERVER_URL);
 
     auto nodeList = DependencyManager::get<NodeList>();
-    // start the nodeThread so its event loop is running
-    nodeList->startThread();
 
     // setup a timer for domain-server check ins
     QTimer* domainCheckInTimer = new QTimer(nodeList.data());
     connect(domainCheckInTimer, &QTimer::timeout, nodeList.data(), &NodeList::sendDomainServerCheckIn);
     domainCheckInTimer->start(DOMAIN_SERVER_CHECK_IN_MSECS);
 
-    const DomainHandler& domainHandler = nodeList->getDomainHandler();
+    // start the nodeThread so its event loop is running
+    // (must happen after the checkin timer is created with the nodelist as it's parent)
+    nodeList->startThread();
 
+    const DomainHandler& domainHandler = nodeList->getDomainHandler();
     connect(&domainHandler, SIGNAL(hostnameChanged(const QString&)), SLOT(domainChanged(const QString&)));
-    // connect(&domainHandler, SIGNAL(resetting()), SLOT(resettingDomain()));
-    // connect(&domainHandler, SIGNAL(disconnectedFromDomain()), SLOT(clearDomainOctreeDetails()));
     connect(&domainHandler, &DomainHandler::domainConnectionRefused, this, &ACClientApp::domainConnectionRefused);
 
     connect(nodeList.data(), &NodeList::nodeAdded, this, &ACClientApp::nodeAdded);
     connect(nodeList.data(), &NodeList::nodeKilled, this, &ACClientApp::nodeKilled);
     connect(nodeList.data(), &NodeList::nodeActivated, this, &ACClientApp::nodeActivated);
-    // connect(nodeList.data(), &NodeList::uuidChanged, getMyAvatar(), &MyAvatar::setSessionUUID);
-    // connect(nodeList.data(), &NodeList::uuidChanged, this, &ACClientApp::setSessionUUID);
     connect(nodeList.data(), &NodeList::packetVersionMismatch, this, &ACClientApp::notifyPacketVersionMismatch);
-
     nodeList->addSetOfNodeTypesToNodeInterestSet(NodeSet() << NodeType::AudioMixer << NodeType::AvatarMixer
                                                  << NodeType::EntityServer << NodeType::AssetServer << NodeType::MessagesMixer);
 
+    if (_verbose) {
+        QString username = accountManager->getAccountInfo().getUsername();
+        qDebug() << "cached username is" << username << ", isLoggedIn =" << accountManager->isLoggedIn();
+    }
+
+    if (!_username.isEmpty()) {
+
+        connect(accountManager.data(), &AccountManager::newKeypair, this, [&](){
+            if (_verbose) {
+                qDebug() << "new keypair has been created.";
+            }
+        });
+
+        connect(accountManager.data(), &AccountManager::loginComplete, this, [&](){
+            if (_verbose) {
+                qDebug() << "login successful";
+            }
+        });
+        connect(accountManager.data(), &AccountManager::loginFailed, this, [&](){
+            qDebug() << "login failed.";
+        });
+        accountManager->requestAccessToken(_username, _password);
+    }
+
     DependencyManager::get<AddressManager>()->handleLookupString(domainServerAddress, false);
 
     QTimer* doTimer = new QTimer(this);
diff --git a/tools/ac-client/src/ACClientApp.h b/tools/ac-client/src/ACClientApp.h
index 29d571688e..e295b17654 100644
--- a/tools/ac-client/src/ACClientApp.h
+++ b/tools/ac-client/src/ACClientApp.h
@@ -47,6 +47,9 @@ private:
     bool _sawAvatarMixer { false };
     bool _sawAssetServer { false };
     bool _sawMessagesMixer { false };
+
+    QString _username;
+    QString _password;
 };
 
 #endif //hifi_ACClientApp_h
diff --git a/tools/atp-get/CMakeLists.txt b/tools/atp-client/CMakeLists.txt
similarity index 77%
rename from tools/atp-get/CMakeLists.txt
rename to tools/atp-client/CMakeLists.txt
index 75f92b787d..4cee30bcc3 100644
--- a/tools/atp-get/CMakeLists.txt
+++ b/tools/atp-client/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(TARGET_NAME atp-get)
+set(TARGET_NAME atp-client)
 setup_hifi_project(Core Widgets)
 setup_memory_debugger()
 link_hifi_libraries(shared networking)
diff --git a/tools/atp-client/src/ATPClientApp.cpp b/tools/atp-client/src/ATPClientApp.cpp
new file mode 100644
index 0000000000..c5edf27b67
--- /dev/null
+++ b/tools/atp-client/src/ATPClientApp.cpp
@@ -0,0 +1,408 @@
+//
+//  ATPClientApp.cpp
+//  tools/atp-client/src
+//
+//  Created by Seth Alves on 2017-3-15
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include <QDataStream>
+#include <QTextStream>
+#include <QThread>
+#include <QFile>
+#include <QLoggingCategory>
+#include <QCommandLineParser>
+
+#include <NetworkLogging.h>
+#include <NetworkingConstants.h>
+#include <SharedLogging.h>
+#include <AddressManager.h>
+#include <DependencyManager.h>
+#include <SettingHandle.h>
+#include <AssetUpload.h>
+#include <StatTracker.h>
+
+#include "ATPClientApp.h"
+
+#define HIGH_FIDELITY_ATP_CLIENT_USER_AGENT "Mozilla/5.0 (HighFidelityATPClient)"
+#define TIMEOUT_MILLISECONDS 8000
+
+ATPClientApp::ATPClientApp(int argc, char* argv[]) :
+    QCoreApplication(argc, argv)
+{
+    // parse command-line
+    QCommandLineParser parser;
+    parser.setApplicationDescription("High Fidelity ATP-Client");
+
+    const QCommandLineOption helpOption = parser.addHelpOption();
+
+    const QCommandLineOption verboseOutput("v", "verbose output");
+    parser.addOption(verboseOutput);
+
+    const QCommandLineOption uploadOption("T", "upload local file", "local-file-to-send");
+    parser.addOption(uploadOption);
+
+    const QCommandLineOption authOption("u", "set usename and pass", "username:password");
+    parser.addOption(authOption);
+
+    const QCommandLineOption outputFilenameOption("o", "output filename", "output-file-name");
+    parser.addOption(outputFilenameOption);
+
+    const QCommandLineOption domainAddressOption("d", "domain-server address", "127.0.0.1");
+    parser.addOption(domainAddressOption);
+
+    const QCommandLineOption listenPortOption("listenPort", "listen port", QString::number(INVALID_PORT));
+    parser.addOption(listenPortOption);
+
+    if (!parser.parse(QCoreApplication::arguments())) {
+        qCritical() << parser.errorText() << endl;
+        parser.showHelp();
+        Q_UNREACHABLE();
+    }
+
+    if (parser.isSet(helpOption)) {
+        parser.showHelp();
+        Q_UNREACHABLE();
+    }
+
+    _verbose = parser.isSet(verboseOutput);
+    if (!_verbose) {
+        QLoggingCategory::setFilterRules("qt.network.ssl.warning=false");
+
+        const_cast<QLoggingCategory*>(&networking())->setEnabled(QtDebugMsg, false);
+        const_cast<QLoggingCategory*>(&networking())->setEnabled(QtInfoMsg, false);
+        const_cast<QLoggingCategory*>(&networking())->setEnabled(QtWarningMsg, false);
+
+        const_cast<QLoggingCategory*>(&shared())->setEnabled(QtDebugMsg, false);
+        const_cast<QLoggingCategory*>(&shared())->setEnabled(QtInfoMsg, false);
+        const_cast<QLoggingCategory*>(&shared())->setEnabled(QtWarningMsg, false);
+    }
+
+    QStringList posArgs = parser.positionalArguments();
+    if (posArgs.size() != 1) {
+        qDebug() << "give remote url argument";
+        parser.showHelp();
+        Q_UNREACHABLE();
+    }
+
+    _url = QUrl(posArgs[0]);
+    if (_url.scheme() != "atp") {
+        qDebug() << "url should start with atp:";
+        parser.showHelp();
+        Q_UNREACHABLE();
+    }
+
+    int domainPort = 40103;
+    if (_url.port() != -1) {
+        domainPort = _url.port();
+    }
+
+    if (parser.isSet(outputFilenameOption)) {
+        _localOutputFile = parser.value(outputFilenameOption);
+    }
+
+    if (parser.isSet(uploadOption)) {
+        _localUploadFile = parser.value(uploadOption);
+    }
+
+    if (parser.isSet(authOption)) {
+        QStringList pieces = parser.value(authOption).split(":");
+        if (pieces.size() != 2) {
+            qDebug() << "-u should be followed by username:password";
+            parser.showHelp();
+            Q_UNREACHABLE();
+        }
+
+        _username = pieces[0];
+        _password = pieces[1];
+        _waitingForLogin = true;
+    }
+
+    if (parser.isSet(listenPortOption)) {
+        _listenPort = parser.value(listenPortOption).toInt();
+    }
+
+    _domainServerAddress = QString("127.0.0.1") + ":" + QString::number(domainPort);
+    if (parser.isSet(domainAddressOption)) {
+        _domainServerAddress = parser.value(domainAddressOption);
+    } else if (!_url.host().isEmpty()) {
+        QUrl domainURL;
+        domainURL.setScheme("hifi");
+        domainURL.setHost(_url.host());
+        _domainServerAddress = domainURL.toString();
+    }
+
+    Setting::init();
+    DependencyManager::registerInheritance<LimitedNodeList, NodeList>();
+
+    DependencyManager::set<StatTracker>();
+    DependencyManager::set<AccountManager>([&]{ return QString(HIGH_FIDELITY_ATP_CLIENT_USER_AGENT); });
+    DependencyManager::set<AddressManager>();
+    DependencyManager::set<NodeList>(NodeType::Agent, _listenPort);
+
+    auto accountManager = DependencyManager::get<AccountManager>();
+    accountManager->setIsAgent(true);
+    accountManager->setAuthURL(NetworkingConstants::METAVERSE_SERVER_URL);
+
+    auto nodeList = DependencyManager::get<NodeList>();
+
+    // setup a timer for domain-server check ins
+    _domainCheckInTimer = new QTimer(nodeList.data());
+    connect(_domainCheckInTimer, &QTimer::timeout, nodeList.data(), &NodeList::sendDomainServerCheckIn);
+    _domainCheckInTimer->start(DOMAIN_SERVER_CHECK_IN_MSECS);
+
+    // start the nodeThread so its event loop is running
+    // (must happen after the checkin timer is created with the nodelist as it's parent)
+    nodeList->startThread();
+
+    const DomainHandler& domainHandler = nodeList->getDomainHandler();
+    connect(&domainHandler, SIGNAL(hostnameChanged(const QString&)), SLOT(domainChanged(const QString&)));
+    connect(&domainHandler, &DomainHandler::domainConnectionRefused, this, &ATPClientApp::domainConnectionRefused);
+
+    connect(nodeList.data(), &NodeList::nodeAdded, this, &ATPClientApp::nodeAdded);
+    connect(nodeList.data(), &NodeList::nodeKilled, this, &ATPClientApp::nodeKilled);
+    connect(nodeList.data(), &NodeList::nodeActivated, this, &ATPClientApp::nodeActivated);
+    connect(nodeList.data(), &NodeList::packetVersionMismatch, this, &ATPClientApp::notifyPacketVersionMismatch);
+    nodeList->addSetOfNodeTypesToNodeInterestSet(NodeSet() << NodeType::AudioMixer << NodeType::AvatarMixer
+                                                 << NodeType::EntityServer << NodeType::AssetServer << NodeType::MessagesMixer);
+
+    if (_verbose) {
+        QString username = accountManager->getAccountInfo().getUsername();
+        qDebug() << "cached username is" << username << ", isLoggedIn =" << accountManager->isLoggedIn();
+    }
+
+    if (!_username.isEmpty()) {
+
+        connect(accountManager.data(), &AccountManager::newKeypair, this, [&](){
+            if (_verbose) {
+                qDebug() << "new keypair has been created.";
+            }
+        });
+
+        connect(accountManager.data(), &AccountManager::loginComplete, this, [&](){
+            if (_verbose) {
+                qDebug() << "login successful";
+            }
+            _waitingForLogin = false;
+            go();
+        });
+        connect(accountManager.data(), &AccountManager::loginFailed, this, [&](){
+            qDebug() << "login failed.";
+            _waitingForLogin = false;
+            go();
+        });
+        accountManager->requestAccessToken(_username, _password);
+    }
+
+    auto assetClient = DependencyManager::set<AssetClient>();
+    assetClient->init();
+
+    if (_verbose) {
+        qDebug() << "domain-server address is" << _domainServerAddress;
+    }
+
+    DependencyManager::get<AddressManager>()->handleLookupString(_domainServerAddress, false);
+
+    QTimer* _timeoutTimer = new QTimer(this);
+    _timeoutTimer->setSingleShot(true);
+    connect(_timeoutTimer, &QTimer::timeout, this, &ATPClientApp::timedOut);
+    _timeoutTimer->start(TIMEOUT_MILLISECONDS);
+}
+
+ATPClientApp::~ATPClientApp() {
+    if (_domainCheckInTimer) {
+        QMetaObject::invokeMethod(_domainCheckInTimer, "deleteLater", Qt::QueuedConnection);
+    }
+    if (_timeoutTimer) {
+        QMetaObject::invokeMethod(_timeoutTimer, "deleteLater", Qt::QueuedConnection);
+    }
+}
+
+void ATPClientApp::domainConnectionRefused(const QString& reasonMessage, int reasonCodeInt, const QString& extraInfo) {
+    // this is non-fatal if we are trying to get an authenticated connection -- it will be retried.
+    if (_verbose) {
+        qDebug() << "domainConnectionRefused";
+    }
+}
+
+void ATPClientApp::domainChanged(const QString& domainHostname) {
+    if (_verbose) {
+        qDebug() << "domainChanged";
+    }
+}
+
+void ATPClientApp::nodeAdded(SharedNodePointer node) {
+    if (_verbose) {
+        qDebug() << "node added: " << node->getType();
+    }
+}
+
+void ATPClientApp::nodeActivated(SharedNodePointer node) {
+    if (!_waitingForLogin && node->getType() == NodeType::AssetServer) {
+        _waitingForNode = false;
+        go();
+    }
+}
+
+void ATPClientApp::go() {
+    if (_waitingForLogin || _waitingForNode) {
+        return;
+    }
+
+    auto path = _url.path();
+
+    if (_verbose) {
+        qDebug() << "path is " << path;
+    }
+
+    if (!_localUploadFile.isEmpty()) {
+        uploadAsset();
+    } else if (path == "/") {
+        listAssets();
+    } else {
+        lookupAsset();
+    }
+}
+
+void ATPClientApp::nodeKilled(SharedNodePointer node) {
+    if (_verbose) {
+        qDebug() << "nodeKilled" << node->getType();
+    }
+}
+
+void ATPClientApp::timedOut() {
+    finish(1);
+}
+
+void ATPClientApp::notifyPacketVersionMismatch() {
+    if (_verbose) {
+        qDebug() << "packet version mismatch";
+    }
+    finish(1);
+}
+
+void ATPClientApp::uploadAsset() {
+    auto path = _url.path();
+    if (path == "/") {
+        qDebug() << "cannot upload to path of /";
+        QCoreApplication::exit(1);
+    }
+
+    auto upload = DependencyManager::get<AssetClient>()->createUpload(_localUploadFile);
+    QObject::connect(upload, &AssetUpload::finished, this, [=](AssetUpload* upload, const QString& hash) mutable {
+        if (upload->getError() != AssetUpload::NoError) {
+            qDebug() << "upload failed: " << upload->getErrorString();
+        } else {
+            setMapping(hash);
+        }
+
+        upload->deleteLater();
+    });
+
+    upload->start();
+}
+
+void ATPClientApp::setMapping(QString hash) {
+    auto path = _url.path();
+    auto assetClient = DependencyManager::get<AssetClient>();
+    auto request = assetClient->createSetMappingRequest(path, hash);
+
+    connect(request, &SetMappingRequest::finished, this, [=](SetMappingRequest* request) mutable {
+        if (request->getError() != SetMappingRequest::NoError) {
+            qDebug() << "upload succeeded, but couldn't set mapping: " << request->getErrorString();
+        } else if (_verbose) {
+            qDebug() << "mapping set.";
+        }
+        request->deleteLater();
+        finish(0);
+    });
+
+    request->start();
+}
+
+void ATPClientApp::listAssets() {
+    auto request = DependencyManager::get<AssetClient>()->createGetAllMappingsRequest();
+    QObject::connect(request, &GetAllMappingsRequest::finished, this, [=](GetAllMappingsRequest* request) mutable {
+        auto result = request->getError();
+        if (result == GetAllMappingsRequest::NotFound) {
+            qDebug() << "not found: " << request->getErrorString();
+        } else if (result == GetAllMappingsRequest::NoError) {
+            auto mappings = request->getMappings();
+            for (auto& kv : mappings ) {
+                qDebug() << kv.first << kv.second.hash;
+            }
+        } else {
+            qDebug() << "error -- " << request->getError() << " -- " << request->getErrorString();
+        }
+        request->deleteLater();
+        finish(0);
+    });
+    request->start();
+}
+
+void ATPClientApp::lookupAsset() {
+    auto path = _url.path();
+    auto request = DependencyManager::get<AssetClient>()->createGetMappingRequest(path);
+    QObject::connect(request, &GetMappingRequest::finished, this, [=](GetMappingRequest* request) mutable {
+        auto result = request->getError();
+        if (result == GetMappingRequest::NotFound) {
+            qDebug() << "not found: " << request->getErrorString();
+        } else if (result == GetMappingRequest::NoError) {
+            qDebug() << "found, hash is " << request->getHash();
+            download(request->getHash());
+        } else {
+            qDebug() << "error -- " << request->getError() << " -- " << request->getErrorString();
+        }
+        request->deleteLater();
+    });
+    request->start();
+}
+
+void ATPClientApp::download(AssetHash hash) {
+    auto assetClient = DependencyManager::get<AssetClient>();
+    auto assetRequest = new AssetRequest(hash);
+
+    connect(assetRequest, &AssetRequest::finished, this, [this](AssetRequest* request) mutable {
+        Q_ASSERT(request->getState() == AssetRequest::Finished);
+
+        if (request->getError() == AssetRequest::Error::NoError) {
+            QString data = QString::fromUtf8(request->getData());
+            if (_localOutputFile == "" || _localOutputFile == "-") {
+                QTextStream cout(stdout);
+                cout << data;
+            } else {
+                QFile outputHandle(_localOutputFile);
+                if (outputHandle.open(QIODevice::ReadWrite)) {
+                    QTextStream stream( &outputHandle );
+                    stream << data;
+                } else {
+                    qDebug() << "couldn't open output file:" << _localOutputFile;
+                }
+            }
+        }
+
+        request->deleteLater();
+        finish(0);
+    });
+
+    assetRequest->start();
+}
+
+void ATPClientApp::finish(int exitCode) {
+    auto nodeList = DependencyManager::get<NodeList>();
+
+    // send the domain a disconnect packet, force stoppage of domain-server check-ins
+    nodeList->getDomainHandler().disconnect();
+    nodeList->setIsShuttingDown(true);
+
+    // tell the packet receiver we're shutting down, so it can drop packets
+    nodeList->getPacketReceiver().setShouldDropPackets(true);
+
+    // remove the NodeList from the DependencyManager
+    DependencyManager::destroy<NodeList>();
+
+    QCoreApplication::exit(exitCode);
+}
diff --git a/tools/atp-get/src/ATPGetApp.h b/tools/atp-client/src/ATPClientApp.h
similarity index 60%
rename from tools/atp-get/src/ATPGetApp.h
rename to tools/atp-client/src/ATPClientApp.h
index 5507d2aa62..a3904d6e50 100644
--- a/tools/atp-get/src/ATPGetApp.h
+++ b/tools/atp-client/src/ATPClientApp.h
@@ -1,6 +1,6 @@
 //
-//  ATPGetApp.h
-//  tools/atp-get/src
+//  ATPClientApp.h
+//  tools/atp-client/src
 //
 //  Created by Seth Alves on 2017-3-15
 //  Copyright 2017 High Fidelity, Inc.
@@ -10,8 +10,8 @@
 //
 
 
-#ifndef hifi_ATPGetApp_h
-#define hifi_ATPGetApp_h
+#ifndef hifi_ATPClientApp_h
+#define hifi_ATPClientApp_h
 
 #include <QApplication>
 #include <udt/Constants.h>
@@ -23,11 +23,11 @@
 #include <MappingRequest.h>
 
 
-class ATPGetApp : public QCoreApplication {
+class ATPClientApp : public QCoreApplication {
     Q_OBJECT
 public:
-    ATPGetApp(int argc, char* argv[]);
-    ~ATPGetApp();
+    ATPClientApp(int argc, char* argv[]);
+    ~ATPClientApp();
 
 private slots:
     void domainConnectionRefused(const QString& reasonMessage, int reasonCodeInt, const QString& extraInfo);
@@ -38,15 +38,33 @@ private slots:
     void notifyPacketVersionMismatch();
 
 private:
+    void go();
     NodeList* _nodeList;
     void timedOut();
-    void lookup();
+    void uploadAsset();
+    void setMapping(QString hash);
+    void lookupAsset();
+    void listAssets();
     void download(AssetHash hash);
     void finish(int exitCode);
     bool _verbose;
 
     QUrl _url;
     QString _localOutputFile;
+    QString _localUploadFile;
+
+    int _listenPort { INVALID_PORT };
+
+    QString _domainServerAddress;
+
+    QString _username;
+    QString _password;
+
+    bool _waitingForLogin { false };
+    bool _waitingForNode { true };
+
+    QTimer* _domainCheckInTimer { nullptr };
+    QTimer* _timeoutTimer { nullptr };
 };
 
-#endif // hifi_ATPGetApp_h
+#endif // hifi_ATPClientApp_h
diff --git a/tools/atp-get/src/main.cpp b/tools/atp-client/src/main.cpp
similarity index 89%
rename from tools/atp-get/src/main.cpp
rename to tools/atp-client/src/main.cpp
index bddf30c666..88119604cf 100644
--- a/tools/atp-get/src/main.cpp
+++ b/tools/atp-client/src/main.cpp
@@ -1,6 +1,6 @@
 //
 //  main.cpp
-//  tools/atp-get/src
+//  tools/atp-client/src
 //
 //  Created by Seth Alves on 2017-3-15
 //  Copyright 2017 High Fidelity, Inc.
@@ -15,7 +15,7 @@
 
 #include <BuildInfo.h>
 
-#include "ATPGetApp.h"
+#include "ATPClientApp.h"
 
 using namespace std;
 
@@ -25,7 +25,7 @@ int main(int argc, char * argv[]) {
     QCoreApplication::setOrganizationDomain(BuildInfo::ORGANIZATION_DOMAIN);
     QCoreApplication::setApplicationVersion(BuildInfo::VERSION);
 
-    ATPGetApp app(argc, argv);
+    ATPClientApp app(argc, argv);
 
     return app.exec();
 }
diff --git a/tools/atp-get/src/ATPGetApp.cpp b/tools/atp-get/src/ATPGetApp.cpp
deleted file mode 100644
index 4125582c21..0000000000
--- a/tools/atp-get/src/ATPGetApp.cpp
+++ /dev/null
@@ -1,255 +0,0 @@
-//
-//  ATPGetApp.cpp
-//  tools/atp-get/src
-//
-//  Created by Seth Alves on 2017-3-15
-//  Copyright 2017 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-#include <QDataStream>
-#include <QTextStream>
-#include <QThread>
-#include <QFile>
-#include <QLoggingCategory>
-#include <QCommandLineParser>
-#include <NetworkLogging.h>
-#include <SharedLogging.h>
-#include <AddressManager.h>
-#include <DependencyManager.h>
-#include <SettingHandle.h>
-
-#include "ATPGetApp.h"
-
-ATPGetApp::ATPGetApp(int argc, char* argv[]) :
-    QCoreApplication(argc, argv)
-{
-    // parse command-line
-    QCommandLineParser parser;
-    parser.setApplicationDescription("High Fidelity ATP-Get");
-
-    const QCommandLineOption helpOption = parser.addHelpOption();
-
-    const QCommandLineOption verboseOutput("v", "verbose output");
-    parser.addOption(verboseOutput);
-
-    const QCommandLineOption domainAddressOption("d", "domain-server address", "127.0.0.1");
-    parser.addOption(domainAddressOption);
-
-    const QCommandLineOption cacheSTUNOption("s", "cache stun-server response");
-    parser.addOption(cacheSTUNOption);
-
-    const QCommandLineOption listenPortOption("listenPort", "listen port", QString::number(INVALID_PORT));
-    parser.addOption(listenPortOption);
-
-
-    if (!parser.parse(QCoreApplication::arguments())) {
-        qCritical() << parser.errorText() << endl;
-        parser.showHelp();
-        Q_UNREACHABLE();
-    }
-
-    if (parser.isSet(helpOption)) {
-        parser.showHelp();
-        Q_UNREACHABLE();
-    }
-
-    _verbose = parser.isSet(verboseOutput);
-    if (!_verbose) {
-        QLoggingCategory::setFilterRules("qt.network.ssl.warning=false");
-
-        const_cast<QLoggingCategory*>(&networking())->setEnabled(QtDebugMsg, false);
-        const_cast<QLoggingCategory*>(&networking())->setEnabled(QtInfoMsg, false);
-        const_cast<QLoggingCategory*>(&networking())->setEnabled(QtWarningMsg, false);
-
-        const_cast<QLoggingCategory*>(&shared())->setEnabled(QtDebugMsg, false);
-        const_cast<QLoggingCategory*>(&shared())->setEnabled(QtInfoMsg, false);
-        const_cast<QLoggingCategory*>(&shared())->setEnabled(QtWarningMsg, false);
-    }
-
-
-    QStringList filenames = parser.positionalArguments();
-    if (filenames.empty() || filenames.size() > 2) {
-        qDebug() << "give remote url and optional local filename as arguments";
-        parser.showHelp();
-        Q_UNREACHABLE();
-    }
-
-    _url = QUrl(filenames[0]);
-    if (_url.scheme() != "atp") {
-        qDebug() << "url should start with atp:";
-        parser.showHelp();
-        Q_UNREACHABLE();
-    }
-
-    if (filenames.size() == 2) {
-        _localOutputFile = filenames[1];
-    }
-
-    QString domainServerAddress = "127.0.0.1:40103";
-    if (parser.isSet(domainAddressOption)) {
-        domainServerAddress = parser.value(domainAddressOption);
-    }
-
-    if (_verbose) {
-        qDebug() << "domain-server address is" << domainServerAddress;
-    }
-
-    int listenPort = INVALID_PORT;
-    if (parser.isSet(listenPortOption)) {
-        listenPort = parser.value(listenPortOption).toInt();
-    }
-
-    Setting::init();
-    DependencyManager::registerInheritance<LimitedNodeList, NodeList>();
-
-    DependencyManager::set<AccountManager>([&]{ return QString("Mozilla/5.0 (HighFidelityATPGet)"); });
-    DependencyManager::set<AddressManager>();
-    DependencyManager::set<NodeList>(NodeType::Agent, listenPort);
-
-
-    auto nodeList = DependencyManager::get<NodeList>();
-    nodeList->startThread();
-
-    // setup a timer for domain-server check ins
-    QTimer* domainCheckInTimer = new QTimer(nodeList.data());
-    connect(domainCheckInTimer, &QTimer::timeout, nodeList.data(), &NodeList::sendDomainServerCheckIn);
-    domainCheckInTimer->start(DOMAIN_SERVER_CHECK_IN_MSECS);
-
-    const DomainHandler& domainHandler = nodeList->getDomainHandler();
-
-    connect(&domainHandler, SIGNAL(hostnameChanged(const QString&)), SLOT(domainChanged(const QString&)));
-    // connect(&domainHandler, SIGNAL(resetting()), SLOT(resettingDomain()));
-    // connect(&domainHandler, SIGNAL(disconnectedFromDomain()), SLOT(clearDomainOctreeDetails()));
-    connect(&domainHandler, &DomainHandler::domainConnectionRefused, this, &ATPGetApp::domainConnectionRefused);
-
-    connect(nodeList.data(), &NodeList::nodeAdded, this, &ATPGetApp::nodeAdded);
-    connect(nodeList.data(), &NodeList::nodeKilled, this, &ATPGetApp::nodeKilled);
-    connect(nodeList.data(), &NodeList::nodeActivated, this, &ATPGetApp::nodeActivated);
-    // connect(nodeList.data(), &NodeList::uuidChanged, getMyAvatar(), &MyAvatar::setSessionUUID);
-    // connect(nodeList.data(), &NodeList::uuidChanged, this, &ATPGetApp::setSessionUUID);
-    connect(nodeList.data(), &NodeList::packetVersionMismatch, this, &ATPGetApp::notifyPacketVersionMismatch);
-
-    nodeList->addSetOfNodeTypesToNodeInterestSet(NodeSet() << NodeType::AudioMixer << NodeType::AvatarMixer
-                                                 << NodeType::EntityServer << NodeType::AssetServer << NodeType::MessagesMixer);
-
-    DependencyManager::get<AddressManager>()->handleLookupString(domainServerAddress, false);
-
-    auto assetClient = DependencyManager::set<AssetClient>();
-    assetClient->init();
-
-    QTimer* doTimer = new QTimer(this);
-    doTimer->setSingleShot(true);
-    connect(doTimer, &QTimer::timeout, this, &ATPGetApp::timedOut);
-    doTimer->start(4000);
-}
-
-ATPGetApp::~ATPGetApp() {
-}
-
-
-void ATPGetApp::domainConnectionRefused(const QString& reasonMessage, int reasonCodeInt, const QString& extraInfo) {
-    qDebug() << "domainConnectionRefused";
-}
-
-void ATPGetApp::domainChanged(const QString& domainHostname) {
-    if (_verbose) {
-        qDebug() << "domainChanged";
-    }
-}
-
-void ATPGetApp::nodeAdded(SharedNodePointer node) {
-    if (_verbose) {
-        qDebug() << "node added: " << node->getType();
-    }
-}
-
-void ATPGetApp::nodeActivated(SharedNodePointer node) {
-    if (node->getType() == NodeType::AssetServer) {
-        lookup();
-    }
-}
-
-void ATPGetApp::nodeKilled(SharedNodePointer node) {
-    qDebug() << "nodeKilled";
-}
-
-void ATPGetApp::timedOut() {
-    finish(1);
-}
-
-void ATPGetApp::notifyPacketVersionMismatch() {
-    if (_verbose) {
-        qDebug() << "packet version mismatch";
-    }
-    finish(1);
-}
-
-void ATPGetApp::lookup() {
-
-    auto path = _url.path();
-    qDebug() << "path is " << path;
-
-    auto request = DependencyManager::get<AssetClient>()->createGetMappingRequest(path);
-    QObject::connect(request, &GetMappingRequest::finished, this, [=](GetMappingRequest* request) mutable {
-        auto result = request->getError();
-        if (result == GetMappingRequest::NotFound) {
-            qDebug() << "not found";
-        } else if (result == GetMappingRequest::NoError) {
-            qDebug() << "found, hash is " << request->getHash();
-            download(request->getHash());
-        } else {
-            qDebug() << "error -- " << request->getError() << " -- " << request->getErrorString();
-        }
-        request->deleteLater();
-    });
-    request->start();
-}
-
-void ATPGetApp::download(AssetHash hash) {
-    auto assetClient = DependencyManager::get<AssetClient>();
-    auto assetRequest = new AssetRequest(hash);
-
-    connect(assetRequest, &AssetRequest::finished, this, [this](AssetRequest* request) mutable {
-        Q_ASSERT(request->getState() == AssetRequest::Finished);
-
-        if (request->getError() == AssetRequest::Error::NoError) {
-            QString data = QString::fromUtf8(request->getData());
-            if (_localOutputFile == "") {
-                QTextStream cout(stdout);
-                cout << data;
-            } else {
-                QFile outputHandle(_localOutputFile);
-                if (outputHandle.open(QIODevice::ReadWrite)) {
-                    QTextStream stream( &outputHandle );
-                    stream << data;
-                } else {
-                    qDebug() << "couldn't open output file:" << _localOutputFile;
-                }
-            }
-        }
-
-        request->deleteLater();
-        finish(0);
-    });
-
-    assetRequest->start();
-}
-
-void ATPGetApp::finish(int exitCode) {
-    auto nodeList = DependencyManager::get<NodeList>();
-
-    // send the domain a disconnect packet, force stoppage of domain-server check-ins
-    nodeList->getDomainHandler().disconnect();
-    nodeList->setIsShuttingDown(true);
-
-    // tell the packet receiver we're shutting down, so it can drop packets
-    nodeList->getPacketReceiver().setShouldDropPackets(true);
-
-    // remove the NodeList from the DependencyManager
-    DependencyManager::destroy<NodeList>();
-
-    QCoreApplication::exit(exitCode);
-}
diff --git a/tools/dimensions.mel b/tools/dimensions.mel
new file mode 100644
index 0000000000..c477fd04e8
--- /dev/null
+++ b/tools/dimensions.mel
@@ -0,0 +1,30 @@
+//
+//  dimensions.mel
+//
+//  Created by Anthony J. Thibault on September 5th, 2017.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+//  Maya Mel script to determine the High Fidelity "naturalDimensions" of a model.
+
+// get a list of all mesh objects
+string $meshes[] = `ls -type mesh`;
+
+// compute the bounding box
+float $boundingBox[] = `polyEvaluate -boundingBox $meshes`;
+
+// copy values into variables for readability
+float $xmin = $boundingBox[0];
+float $xmax = $boundingBox[1];
+float $ymin = $boundingBox[2];
+float $ymax = $boundingBox[3];
+float $zmin = $boundingBox[4];
+float $zmax = $boundingBox[5];
+
+// compute dimensions, and convert from cm to meters
+vector $dim = <<($xmax - $xmin) / 100.0, ($ymax - $ymin) / 100.0, ($zmax - $zmin) / 100.0>>;
+
+// print result
+print $dim;
diff --git a/tools/oven/CMakeLists.txt b/tools/oven/CMakeLists.txt
index f4fca3304c..1022c204c5 100644
--- a/tools/oven/CMakeLists.txt
+++ b/tools/oven/CMakeLists.txt
@@ -2,7 +2,7 @@ set(TARGET_NAME oven)
 
 setup_hifi_project(Widgets Gui Concurrent)
 
-link_hifi_libraries(networking shared image gpu ktx)
+link_hifi_libraries(networking shared image gpu ktx fbx baking model)
 
 setup_memory_debugger()
 
@@ -17,16 +17,4 @@ if (UNIX)
   endif()
 endif ()
 
-# try to find the FBX SDK but fail silently if we don't
-# because this tool is not built by default
-find_package(FBX)
-if (FBX_FOUND)
-  if (CMAKE_THREAD_LIBS_INIT)
-    target_link_libraries(${TARGET_NAME} ${FBX_LIBRARIES} "${CMAKE_THREAD_LIBS_INIT}")
-  else ()
-    target_link_libraries(${TARGET_NAME} ${FBX_LIBRARIES})
-  endif ()
-  target_include_directories(${TARGET_NAME} SYSTEM PRIVATE ${FBX_INCLUDE_DIR})
-endif ()
-
 set_target_properties(${TARGET_NAME} PROPERTIES EXCLUDE_FROM_ALL TRUE EXCLUDE_FROM_DEFAULT_BUILD TRUE)
diff --git a/tools/oven/src/BakerCLI.cpp b/tools/oven/src/BakerCLI.cpp
index 14eb9de150..5ab995be95 100644
--- a/tools/oven/src/BakerCLI.cpp
+++ b/tools/oven/src/BakerCLI.cpp
@@ -41,8 +41,8 @@ void BakerCLI::bakeFile(QUrl inputUrl, const QString outputPath) {
 
     // create our appropiate baker
     if (isFBX) {
-        _baker = std::unique_ptr<Baker> { new FBXBaker(inputUrl, outputPath, []() -> QThread* { return qApp->getNextWorkerThread(); }) };
-        _baker->moveToThread(qApp->getFBXBakerThread());
+        _baker = std::unique_ptr<Baker> { new FBXBaker(inputUrl, []() -> QThread* { return qApp->getNextWorkerThread(); }, outputPath) };
+        _baker->moveToThread(qApp->getNextWorkerThread());
     } else if (isSupportedImage) {
         _baker = std::unique_ptr<Baker> { new TextureBaker(inputUrl, image::TextureUsage::CUBE_TEXTURE, outputPath) };
         _baker->moveToThread(qApp->getNextWorkerThread());
@@ -61,4 +61,4 @@ void BakerCLI::bakeFile(QUrl inputUrl, const QString outputPath) {
 void BakerCLI::handleFinishedBaker() {
     qCDebug(model_baking) << "Finished baking file.";
     QApplication::exit(_baker.get()->hasErrors());
-}
\ No newline at end of file
+}
diff --git a/tools/oven/src/DomainBaker.cpp b/tools/oven/src/DomainBaker.cpp
index 03bc350f42..535d9a49a9 100644
--- a/tools/oven/src/DomainBaker.cpp
+++ b/tools/oven/src/DomainBaker.cpp
@@ -192,10 +192,18 @@ void DomainBaker::enumerateEntities() {
 
                     // setup an FBXBaker for this URL, as long as we don't already have one
                     if (!_modelBakers.contains(modelURL)) {
+                        auto filename = modelURL.fileName();
+                        auto baseName = filename.left(filename.lastIndexOf('.'));
+                        auto subDirName = "/" + baseName;
+                        int i = 0;
+                        while (QDir(_contentOutputPath + subDirName).exists()) {
+                            subDirName = "/" + baseName + "-" + i++;
+                        }
                         QSharedPointer<FBXBaker> baker {
-                            new FBXBaker(modelURL, _contentOutputPath, []() -> QThread* {
+                            new FBXBaker(modelURL, []() -> QThread* {
                                 return qApp->getNextWorkerThread();
-                            }), &FBXBaker::deleteLater
+                            }, _contentOutputPath + subDirName + "/baked", _contentOutputPath + subDirName + "/original"),
+                            &FBXBaker::deleteLater
                         };
 
                         // make sure our handler is called when the baker is done
@@ -206,7 +214,7 @@ void DomainBaker::enumerateEntities() {
 
                         // move the baker to the baker thread
                         // and kickoff the bake
-                        baker->moveToThread(qApp->getFBXBakerThread());
+                        baker->moveToThread(qApp->getNextWorkerThread());
                         QMetaObject::invokeMethod(baker.data(), "bake");
 
                         // keep track of the total number of baking entities
@@ -309,7 +317,11 @@ void DomainBaker::handleFinishedModelBaker() {
                 QUrl oldModelURL { entity[ENTITY_MODEL_URL_KEY].toString() };
 
                 // setup a new URL using the prefix we were passed
-                QUrl newModelURL = _destinationPath.resolved(baker->getBakedFBXRelativePath());
+                auto relativeFBXFilePath = baker->getBakedFBXFilePath().remove(_contentOutputPath);
+                if (relativeFBXFilePath.startsWith("/")) {
+                    relativeFBXFilePath = relativeFBXFilePath.right(relativeFBXFilePath.length() - 1);
+                }
+                QUrl newModelURL = _destinationPath.resolved(relativeFBXFilePath);
 
                 // copy the fragment and query, and user info from the old model URL
                 newModelURL.setQuery(oldModelURL.query());
@@ -335,7 +347,7 @@ void DomainBaker::handleFinishedModelBaker() {
                         if (oldAnimationURL.matches(oldModelURL, QUrl::RemoveQuery | QUrl::RemoveFragment)) {
                             // the animation URL matched the old model URL, so make the animation URL point to the baked FBX
                             // with its original query and fragment
-                            auto newAnimationURL = _destinationPath.resolved(baker->getBakedFBXRelativePath());
+                            auto newAnimationURL = _destinationPath.resolved(relativeFBXFilePath);
                             newAnimationURL.setQuery(oldAnimationURL.query());
                             newAnimationURL.setFragment(oldAnimationURL.fragment());
                             newAnimationURL.setUserInfo(oldAnimationURL.userInfo());
diff --git a/tools/oven/src/DomainBaker.h b/tools/oven/src/DomainBaker.h
index 34c5e11e63..6426af0710 100644
--- a/tools/oven/src/DomainBaker.h
+++ b/tools/oven/src/DomainBaker.h
@@ -55,6 +55,8 @@ private:
     QString _baseOutputPath;
     QString _uniqueOutputPath;
     QString _contentOutputPath;
+    QString _bakedOutputPath;
+    QString _originalOutputPath;
     QUrl _destinationPath;
 
     QJsonArray _entities;
diff --git a/tools/oven/src/FBXBaker.cpp b/tools/oven/src/FBXBaker.cpp
deleted file mode 100644
index 8a72784d7c..0000000000
--- a/tools/oven/src/FBXBaker.cpp
+++ /dev/null
@@ -1,554 +0,0 @@
-//
-//  FBXBaker.cpp
-//  tools/oven/src
-//
-//  Created by Stephen Birarda on 3/30/17.
-//  Copyright 2017 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-#include <cmath> // need this include so we don't get an error looking for std::isnan
-
-#include <fbxsdk.h>
-
-#include <QtConcurrent>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDir>
-#include <QtCore/QEventLoop>
-#include <QtCore/QFileInfo>
-#include <QtCore/QThread>
-
-#include <mutex>
-
-#include <NetworkAccessManager.h>
-#include <SharedUtil.h>
-
-#include "ModelBakingLoggingCategory.h"
-#include "TextureBaker.h"
-
-#include "FBXBaker.h"
-
-std::once_flag onceFlag;
-FBXSDKManagerUniquePointer FBXBaker::_sdkManager { nullptr };
-
-FBXBaker::FBXBaker(const QUrl& fbxURL, const QString& baseOutputPath, 
-                   TextureBakerThreadGetter textureThreadGetter, bool copyOriginals) :
-    _fbxURL(fbxURL),
-    _baseOutputPath(baseOutputPath),
-    _textureThreadGetter(textureThreadGetter),
-    _copyOriginals(copyOriginals)
-{
-    std::call_once(onceFlag, [](){
-        // create the static FBX SDK manager
-        _sdkManager = FBXSDKManagerUniquePointer(FbxManager::Create(), [](FbxManager* manager){
-            manager->Destroy();
-        });
-    });
-
-    // grab the name of the FBX from the URL, this is used for folder output names
-    auto fileName = fbxURL.fileName();
-    _fbxName = fileName.left(fileName.lastIndexOf('.'));
-}
-
-static const QString BAKED_OUTPUT_SUBFOLDER = "baked/";
-static const QString ORIGINAL_OUTPUT_SUBFOLDER = "original/";
-
-QString FBXBaker::pathToCopyOfOriginal() const {
-    return _uniqueOutputPath + ORIGINAL_OUTPUT_SUBFOLDER + _fbxURL.fileName();
-}
-
-void FBXBaker::bake() {
-    qCDebug(model_baking) << "Baking" << _fbxURL;
-
-    // setup the output folder for the results of this bake
-    setupOutputFolder();
-
-    if (hasErrors()) {
-        return;
-    }
-
-    connect(this, &FBXBaker::sourceCopyReadyToLoad, this, &FBXBaker::bakeSourceCopy);
-
-    // make a local copy of the FBX file
-    loadSourceFBX();
-}
-
-void FBXBaker::bakeSourceCopy() {
-    // load the scene from the FBX file
-    importScene();
-
-    if (hasErrors()) {
-        return;
-    }
-
-    // enumerate the textures found in the scene and start a bake for them
-    rewriteAndBakeSceneTextures();
-
-    if (hasErrors()) {
-        return;
-    }
-
-    // export the FBX with re-written texture references
-    exportScene();
-
-    if (hasErrors()) {
-        return;
-    }
-
-    // check if we're already done with textures (in case we had none to re-write)
-    checkIfTexturesFinished();
-}
-
-void FBXBaker::setupOutputFolder() {
-    // construct the output path using the name of the fbx and the base output path
-    _uniqueOutputPath =  _baseOutputPath + "/" + _fbxName + "/";
-
-    // make sure there isn't already an output directory using the same name
-    int iteration = 0;
-
-    while (QDir(_uniqueOutputPath).exists()) {
-        _uniqueOutputPath = _baseOutputPath + "/" + _fbxName + "-" + QString::number(++iteration) + "/";
-    }
-
-    qCDebug(model_baking) << "Creating FBX output folder" << _uniqueOutputPath;
-
-    // attempt to make the output folder
-    if (!QDir().mkdir(_uniqueOutputPath)) {
-        handleError("Failed to create FBX output folder " + _uniqueOutputPath);
-        return;
-    }
-
-    // make the baked and original sub-folders used during export
-    QDir uniqueOutputDir = _uniqueOutputPath;
-    if (!uniqueOutputDir.mkdir(BAKED_OUTPUT_SUBFOLDER) || !uniqueOutputDir.mkdir(ORIGINAL_OUTPUT_SUBFOLDER)) {
-        handleError("Failed to create baked/original subfolders in " + _uniqueOutputPath);
-        return;
-    }
-}
-
-void FBXBaker::loadSourceFBX() {
-    // check if the FBX is local or first needs to be downloaded
-    if (_fbxURL.isLocalFile()) {
-        // load up the local file
-        QFile localFBX { _fbxURL.toLocalFile() };
-
-        // make a copy in the output folder
-        localFBX.copy(pathToCopyOfOriginal());
-
-        // emit our signal to start the import of the FBX source copy
-        emit sourceCopyReadyToLoad();
-    } else {
-        // remote file, kick off a download
-        auto& networkAccessManager = NetworkAccessManager::getInstance();
-
-        QNetworkRequest networkRequest;
-
-        // setup the request to follow re-directs and always hit the network
-        networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
-        networkRequest.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::AlwaysNetwork);
-        networkRequest.setHeader(QNetworkRequest::UserAgentHeader, HIGH_FIDELITY_USER_AGENT);
-
-
-        networkRequest.setUrl(_fbxURL);
-
-        qCDebug(model_baking) << "Downloading" << _fbxURL;
-        auto networkReply = networkAccessManager.get(networkRequest);
-
-        connect(networkReply, &QNetworkReply::finished, this, &FBXBaker::handleFBXNetworkReply);
-    }
-}
-
-void FBXBaker::handleFBXNetworkReply() {
-    auto requestReply = qobject_cast<QNetworkReply*>(sender());
-
-    if (requestReply->error() == QNetworkReply::NoError) {
-        qCDebug(model_baking) << "Downloaded" << _fbxURL;
-
-        // grab the contents of the reply and make a copy in the output folder
-        QFile copyOfOriginal(pathToCopyOfOriginal());
-
-        qDebug(model_baking) << "Writing copy of original FBX to" << copyOfOriginal.fileName();
-
-        if (!copyOfOriginal.open(QIODevice::WriteOnly) || (copyOfOriginal.write(requestReply->readAll()) == -1)) {
-            // add an error to the error list for this FBX stating that a duplicate of the original FBX could not be made
-            handleError("Could not create copy of " + _fbxURL.toString());
-            return;
-        }
-
-        // close that file now that we are done writing to it
-        copyOfOriginal.close();
-
-        // emit our signal to start the import of the FBX source copy
-        emit sourceCopyReadyToLoad();
-    } else {
-        // add an error to our list stating that the FBX could not be downloaded
-        handleError("Failed to download " + _fbxURL.toString());
-    }
-}
-
-void FBXBaker::importScene() {
-    // create an FBX SDK importer
-    FbxImporter* importer = FbxImporter::Create(_sdkManager.get(), "");
-
-    // import the copy of the original FBX file
-    QString originalCopyPath = pathToCopyOfOriginal();
-    bool importStatus = importer->Initialize(originalCopyPath.toLocal8Bit().data());
-
-    if (!importStatus) {
-        // failed to initialize importer, print an error and return
-        handleError("Failed to import " + _fbxURL.toString() + " - " + importer->GetStatus().GetErrorString());
-        return;
-    } else {
-        qCDebug(model_baking) << "Imported" << _fbxURL << "to FbxScene";
-    }
-
-    // setup a new scene to hold the imported file
-    _scene = FbxScene::Create(_sdkManager.get(), "bakeScene");
-
-    // import the file to the created scene
-    importer->Import(_scene);
-
-    // destroy the importer that is no longer needed
-    importer->Destroy();
-}
-
-QString texturePathRelativeToFBX(QUrl fbxURL, QUrl textureURL) {
-    auto fbxPath = fbxURL.toString(QUrl::RemoveFilename | QUrl::RemoveQuery | QUrl::RemoveFragment);
-    auto texturePath = textureURL.toString(QUrl::RemoveFilename | QUrl::RemoveQuery | QUrl::RemoveFragment);
-
-    if (texturePath.startsWith(fbxPath)) {
-        // texture path is a child of the FBX path, return the texture path without the fbx path
-        return texturePath.mid(fbxPath.length());
-    } else {
-        // the texture path was not a child of the FBX path, return the empty string
-        return "";
-    }
-}
-
-QString FBXBaker::createBakedTextureFileName(const QFileInfo& textureFileInfo) {
-    // first make sure we have a unique base name for this texture
-    // in case another texture referenced by this model has the same base name
-    auto nameMatches = _textureNameMatchCount[textureFileInfo.baseName()];
-
-    QString bakedTextureFileName { textureFileInfo.completeBaseName() };
-
-    if (nameMatches > 0) {
-        // there are already nameMatches texture with this name
-        // append - and that number to our baked texture file name so that it is unique
-        bakedTextureFileName += "-" + QString::number(nameMatches);
-    }
-
-    bakedTextureFileName += BAKED_TEXTURE_EXT;
-
-    // increment the number of name matches
-    ++nameMatches;
-
-    return bakedTextureFileName;
-}
-
-QUrl FBXBaker::getTextureURL(const QFileInfo& textureFileInfo, FbxFileTexture* fileTexture) {
-    QUrl urlToTexture;
-
-    if (textureFileInfo.exists() && textureFileInfo.isFile()) {
-        // set the texture URL to the local texture that we have confirmed exists
-        urlToTexture = QUrl::fromLocalFile(textureFileInfo.absoluteFilePath());
-    } else {
-        // external texture that we'll need to download or find
-
-        // first check if it the RelativePath to the texture in the FBX was relative
-        QString relativeFileName = fileTexture->GetRelativeFileName();
-        auto apparentRelativePath = QFileInfo(relativeFileName.replace("\\", "/"));
-
-        // this is a relative file path which will require different handling
-        // depending on the location of the original FBX
-        if (_fbxURL.isLocalFile() && apparentRelativePath.exists() && apparentRelativePath.isFile()) {
-            // the absolute path we ran into for the texture in the FBX exists on this machine
-            // so use that file
-            urlToTexture = QUrl::fromLocalFile(apparentRelativePath.absoluteFilePath());
-        } else {
-            // we didn't find the texture on this machine at the absolute path
-            // so assume that it is right beside the FBX to match the behaviour of interface
-            urlToTexture = _fbxURL.resolved(apparentRelativePath.fileName());
-        }
-    }
-
-    return urlToTexture;
-}
-
-image::TextureUsage::Type textureTypeForMaterialProperty(FbxProperty& property, FbxSurfaceMaterial* material) {
-    using namespace image::TextureUsage;
-    
-    // this is a property we know has a texture, we need to match it to a High Fidelity known texture type
-    // since that information is passed to the baking process
-
-    // grab the hierarchical name for this property and lowercase it for case-insensitive compare
-    auto propertyName = QString(property.GetHierarchicalName()).toLower();
-
-    // figure out the type of the property based on what known value string it matches
-    if ((propertyName.contains("diffuse") && !propertyName.contains("tex_global_diffuse"))
-        || propertyName.contains("tex_color_map")) {
-        return ALBEDO_TEXTURE;
-    } else if (propertyName.contains("transparentcolor") ||  propertyName.contains("transparencyfactor")) {
-        return ALBEDO_TEXTURE;
-    } else if (propertyName.contains("bump")) {
-        return BUMP_TEXTURE;
-    } else if (propertyName.contains("normal")) {
-        return NORMAL_TEXTURE;
-    } else if ((propertyName.contains("specular") && !propertyName.contains("tex_global_specular"))
-               || propertyName.contains("reflection")) {
-        return SPECULAR_TEXTURE;
-    } else if (propertyName.contains("tex_metallic_map")) {
-        return METALLIC_TEXTURE;
-    } else if (propertyName.contains("shininess")) {
-        return GLOSS_TEXTURE;
-    } else if (propertyName.contains("tex_roughness_map")) {
-        return ROUGHNESS_TEXTURE;
-    } else if (propertyName.contains("emissive")) {
-        return EMISSIVE_TEXTURE;
-    } else if (propertyName.contains("ambientcolor")) {
-        return LIGHTMAP_TEXTURE;
-    } else if (propertyName.contains("ambientfactor")) {
-        // we need to check what the ambient factor is, since that tells Interface to process this texture
-        // either as an occlusion texture or a light map
-        auto lambertMaterial = FbxCast<FbxSurfaceLambert>(material);
-
-        if (lambertMaterial->AmbientFactor == 0) {
-            return LIGHTMAP_TEXTURE;
-        } else if (lambertMaterial->AmbientFactor > 0) {
-            return OCCLUSION_TEXTURE;
-        } else {
-            return UNUSED_TEXTURE;
-        }
-
-    } else if (propertyName.contains("tex_ao_map")) {
-        return OCCLUSION_TEXTURE;
-    }
-
-    return UNUSED_TEXTURE;
-}
-
-void FBXBaker::rewriteAndBakeSceneTextures() {
-
-    // enumerate the surface materials to find the textures used in the scene
-    int numMaterials = _scene->GetMaterialCount();
-    for (int i = 0; i < numMaterials; i++) {
-        FbxSurfaceMaterial* material = _scene->GetMaterial(i);
-
-        if (material) {
-            // enumerate the properties of this material to see what texture channels it might have
-            FbxProperty property = material->GetFirstProperty();
-
-            while (property.IsValid()) {
-                // first check if this property has connected textures, if not we don't need to bother with it here
-                if (property.GetSrcObjectCount<FbxTexture>() > 0) {
-
-                    // figure out the type of texture from the material property
-                    auto textureType = textureTypeForMaterialProperty(property, material);
-
-                    if (textureType != image::TextureUsage::UNUSED_TEXTURE) {
-                        int numTextures = property.GetSrcObjectCount<FbxFileTexture>();
-
-                        for (int j = 0; j < numTextures; j++) {
-                            FbxFileTexture* fileTexture = property.GetSrcObject<FbxFileTexture>(j);
-
-                            // use QFileInfo to easily split up the existing texture filename into its components
-                            QString fbxFileName { fileTexture->GetFileName() };
-                            QFileInfo textureFileInfo { fbxFileName.replace("\\", "/") };
-
-                            // make sure this texture points to something and isn't one we've already re-mapped
-                            if (!textureFileInfo.filePath().isEmpty()
-                                && textureFileInfo.suffix() != BAKED_TEXTURE_EXT.mid(1)) {
-
-                                // construct the new baked texture file name and file path
-                                // ensuring that the baked texture will have a unique name
-                                // even if there was another texture with the same name at a different path
-                                auto bakedTextureFileName = createBakedTextureFileName(textureFileInfo);
-                                QString bakedTextureFilePath {
-                                    _uniqueOutputPath + BAKED_OUTPUT_SUBFOLDER + bakedTextureFileName
-                                };
-
-                                qCDebug(model_baking).noquote() << "Re-mapping" << fileTexture->GetFileName()
-                                    << "to" << bakedTextureFilePath;
-
-                                // write the new filename into the FBX scene
-                                fileTexture->SetFileName(bakedTextureFilePath.toLocal8Bit());
-
-                                // write the relative filename to be the baked texture file name since it will
-                                // be right beside the FBX
-                                fileTexture->SetRelativeFileName(bakedTextureFileName.toLocal8Bit().constData());
-
-                                // figure out the URL to this texture, embedded or external
-                                auto urlToTexture = getTextureURL(textureFileInfo, fileTexture);
-
-                                if (!_bakingTextures.contains(urlToTexture)) {
-                                    // bake this texture asynchronously
-                                    bakeTexture(urlToTexture, textureType, _uniqueOutputPath + BAKED_OUTPUT_SUBFOLDER);
-                                }
-                            }
-                        }
-                    }
-                }
-
-                property = material->GetNextProperty(property);
-            }
-        }
-    }
-}
-
-void FBXBaker::bakeTexture(const QUrl& textureURL, image::TextureUsage::Type textureType, const QDir& outputDir) {
-    // start a bake for this texture and add it to our list to keep track of
-    QSharedPointer<TextureBaker> bakingTexture {
-        new TextureBaker(textureURL, textureType, outputDir),
-        &TextureBaker::deleteLater
-    };
-
-    // make sure we hear when the baking texture is done
-    connect(bakingTexture.data(), &Baker::finished, this, &FBXBaker::handleBakedTexture);
-
-    // keep a shared pointer to the baking texture
-    _bakingTextures.insert(textureURL, bakingTexture);
-
-    // start baking the texture on one of our available worker threads
-    bakingTexture->moveToThread(_textureThreadGetter());
-    QMetaObject::invokeMethod(bakingTexture.data(), "bake");
-}
-
-void FBXBaker::handleBakedTexture() {
-    TextureBaker* bakedTexture = qobject_cast<TextureBaker*>(sender());
-
-    // make sure we haven't already run into errors, and that this is a valid texture
-    if (bakedTexture) {
-        if (!hasErrors()) {
-            if (!bakedTexture->hasErrors()) {
-                if (_copyOriginals) {
-                    // we've been asked to make copies of the originals, so we need to make copies of this if it is a linked texture
-
-                    // use the path to the texture being baked to determine if this was an embedded or a linked texture
-
-                    // it is embeddded if the texure being baked was inside the original output folder
-                    // since that is where the FBX SDK places the .fbm folder it generates when importing the FBX
-
-                    auto originalOutputFolder = QUrl::fromLocalFile(_uniqueOutputPath + ORIGINAL_OUTPUT_SUBFOLDER);
-
-                    if (!originalOutputFolder.isParentOf(bakedTexture->getTextureURL())) {
-                        // for linked textures we want to save a copy of original texture beside the original FBX
-
-                        qCDebug(model_baking) << "Saving original texture for" << bakedTexture->getTextureURL();
-
-                        // check if we have a relative path to use for the texture
-                        auto relativeTexturePath = texturePathRelativeToFBX(_fbxURL, bakedTexture->getTextureURL());
-
-                        QFile originalTextureFile {
-                            _uniqueOutputPath + ORIGINAL_OUTPUT_SUBFOLDER + relativeTexturePath + bakedTexture->getTextureURL().fileName()
-                        };
-
-                        if (relativeTexturePath.length() > 0) {
-                            // make the folders needed by the relative path
-                        }
-
-                        if (originalTextureFile.open(QIODevice::WriteOnly) && originalTextureFile.write(bakedTexture->getOriginalTexture()) != -1) {
-                            qCDebug(model_baking) << "Saved original texture file" << originalTextureFile.fileName()
-                            << "for" << _fbxURL;
-                        } else {
-                            handleError("Could not save original external texture " + originalTextureFile.fileName()
-                                        + " for " + _fbxURL.toString());
-                            return;
-                        }
-                    }
-                }
-
-
-                // now that this texture has been baked and handled, we can remove that TextureBaker from our hash
-                _bakingTextures.remove(bakedTexture->getTextureURL());
-
-                checkIfTexturesFinished();
-            } else {
-                // there was an error baking this texture - add it to our list of errors
-                _errorList.append(bakedTexture->getErrors());
-                
-                // we don't emit finished yet so that the other textures can finish baking first
-                _pendingErrorEmission = true;
-                
-                // now that this texture has been baked, even though it failed, we can remove that TextureBaker from our list
-                _bakingTextures.remove(bakedTexture->getTextureURL());
-                
-                checkIfTexturesFinished();
-            }
-        } else {
-            // we have errors to attend to, so we don't do extra processing for this texture
-            // but we do need to remove that TextureBaker from our list
-            // and then check if we're done with all textures
-            _bakingTextures.remove(bakedTexture->getTextureURL());
-
-            checkIfTexturesFinished();
-        }
-    }
-}
-
-void FBXBaker::exportScene() {
-    // setup the exporter
-    FbxExporter* exporter = FbxExporter::Create(_sdkManager.get(), "");
-
-    auto rewrittenFBXPath = _uniqueOutputPath + BAKED_OUTPUT_SUBFOLDER + _fbxName + BAKED_FBX_EXTENSION;
-
-    // save the relative path to this FBX inside our passed output folder
-    _bakedFBXRelativePath = rewrittenFBXPath;
-    _bakedFBXRelativePath.remove(_baseOutputPath + "/");
-
-    bool exportStatus = exporter->Initialize(rewrittenFBXPath.toLocal8Bit().data());
-
-    if (!exportStatus) {
-        // failed to initialize exporter, print an error and return
-        handleError("Failed to export FBX file at " + _fbxURL.toString() + " to " + rewrittenFBXPath
-                    + "- error: " + exporter->GetStatus().GetErrorString());
-    }
-
-    // export the scene
-    exporter->Export(_scene);
-
-    qCDebug(model_baking) << "Exported" << _fbxURL << "with re-written paths to" << rewrittenFBXPath;
-}
-
-
-void FBXBaker::removeEmbeddedMediaFolder() {
-    // now that the bake is complete, remove the embedded media folder produced by the FBX SDK when it imports an FBX
-    auto embeddedMediaFolderName = _fbxURL.fileName().replace(".fbx", ".fbm");
-    QDir(_uniqueOutputPath + ORIGINAL_OUTPUT_SUBFOLDER + embeddedMediaFolderName).removeRecursively();
-}
-
-void FBXBaker::possiblyCleanupOriginals() {
-    if (!_copyOriginals) {
-        // caller did not ask us to keep the original around, so delete the original output folder now
-        QDir(_uniqueOutputPath + ORIGINAL_OUTPUT_SUBFOLDER).removeRecursively();
-    }
-}
-
-void FBXBaker::checkIfTexturesFinished() {
-    // check if we're done everything we need to do for this FBX
-    // and emit our finished signal if we're done
-
-    if (_bakingTextures.isEmpty()) {
-        // remove the embedded media folder that the FBX SDK produces when reading the original
-        removeEmbeddedMediaFolder();
-
-        // cleanup the originals if we weren't asked to keep them around
-        possiblyCleanupOriginals();
-
-        if (hasErrors()) {
-            // if we're checking for completion but we have errors
-            // that means one or more of our texture baking operations failed
-
-            if (_pendingErrorEmission) {
-                emit finished();
-            }
-
-            return;
-        } else {
-            qCDebug(model_baking) << "Finished baking" << _fbxURL;
-
-            emit finished();
-        }
-    }
-}
diff --git a/tools/oven/src/Oven.cpp b/tools/oven/src/Oven.cpp
index dc763cc82d..d91206a592 100644
--- a/tools/oven/src/Oven.cpp
+++ b/tools/oven/src/Oven.cpp
@@ -44,24 +44,22 @@ Oven::Oven(int argc, char* argv[]) :
     parser.addHelpOption();
     parser.process(*this);
 
-    // enable compression in image library, except for cube maps
+    // enable compression in image library
     image::setColorTexturesCompressionEnabled(true);
     image::setGrayscaleTexturesCompressionEnabled(true);
     image::setNormalTexturesCompressionEnabled(true);
     image::setCubeTexturesCompressionEnabled(true);
 
     // setup our worker threads
-    setupWorkerThreads(QThread::idealThreadCount() - 1);
-
-    // Autodesk's SDK means that we need a single thread for all FBX importing/exporting in the same process
-    // setup the FBX Baker thread
-    setupFBXBakerThread();
+    setupWorkerThreads(QThread::idealThreadCount());
 
     // check if we were passed any command line arguments that would tell us just to run without the GUI
     if (parser.isSet(CLI_INPUT_PARAMETER) || parser.isSet(CLI_OUTPUT_PARAMETER)) {
         if (parser.isSet(CLI_INPUT_PARAMETER) && parser.isSet(CLI_OUTPUT_PARAMETER)) {
             BakerCLI* cli = new BakerCLI(this);
-            cli->bakeFile(parser.value(CLI_INPUT_PARAMETER), parser.value(CLI_OUTPUT_PARAMETER));
+            QUrl inputUrl(QDir::fromNativeSeparators(parser.value(CLI_INPUT_PARAMETER)));
+            QUrl outputUrl(QDir::fromNativeSeparators(parser.value(CLI_OUTPUT_PARAMETER)));
+            cli->bakeFile(inputUrl, outputUrl.toString());
         } else {
             parser.showHelp();
             QApplication::quit();
@@ -79,10 +77,6 @@ Oven::~Oven() {
         _workerThreads[i]->quit();
         _workerThreads[i]->wait();
     }
-
-    // cleanup the FBX Baker thread
-    _fbxBakerThread->quit();
-    _fbxBakerThread->wait();
 }
 
 void Oven::setupWorkerThreads(int numWorkerThreads) {
@@ -95,22 +89,6 @@ void Oven::setupWorkerThreads(int numWorkerThreads) {
     }
 }
 
-void Oven::setupFBXBakerThread() {
-    // we're being asked for the FBX baker thread, but we don't have one yet
-    // so set that up now
-    _fbxBakerThread = new QThread(this);
-    _fbxBakerThread->setObjectName("Oven FBX Baker Thread");
-}
-
-QThread* Oven::getFBXBakerThread() {
-    if (!_fbxBakerThread->isRunning()) {
-        // start the FBX baker thread if it isn't running yet
-        _fbxBakerThread->start();
-    }
-
-    return _fbxBakerThread;
-}
-
 QThread* Oven::getNextWorkerThread() {
     // Here we replicate some of the functionality of QThreadPool by giving callers an available worker thread to use.
     // We can't use QThreadPool because we want to put QObjects with signals/slots on these threads.
diff --git a/tools/oven/src/Oven.h b/tools/oven/src/Oven.h
index 569b73a3e2..928ba4eb11 100644
--- a/tools/oven/src/Oven.h
+++ b/tools/oven/src/Oven.h
@@ -34,7 +34,6 @@ public:
 
     OvenMainWindow* getMainWindow() const { return _mainWindow; }
 
-    QThread* getFBXBakerThread();
     QThread* getNextWorkerThread();
 
 private:
@@ -42,7 +41,6 @@ private:
     void setupFBXBakerThread();
 
     OvenMainWindow* _mainWindow;
-    QThread* _fbxBakerThread;
     QList<QThread*> _workerThreads;
 
     std::atomic<uint> _nextWorkerThreadIndex;
diff --git a/tools/oven/src/ui/BakeWidget.cpp b/tools/oven/src/ui/BakeWidget.cpp
index 23a4822d82..9fb8f2f880 100644
--- a/tools/oven/src/ui/BakeWidget.cpp
+++ b/tools/oven/src/ui/BakeWidget.cpp
@@ -17,7 +17,7 @@
 #include "BakeWidget.h"
 
 BakeWidget::BakeWidget(QWidget* parent, Qt::WindowFlags flags) :
-	QWidget(parent, flags)
+    QWidget(parent, flags)
 {
 
 }
diff --git a/tools/oven/src/ui/BakeWidget.h b/tools/oven/src/ui/BakeWidget.h
index e7ab8d1840..00996128ed 100644
--- a/tools/oven/src/ui/BakeWidget.h
+++ b/tools/oven/src/ui/BakeWidget.h
@@ -14,7 +14,7 @@
 
 #include <QtWidgets/QWidget>
 
-#include "../Baker.h"
+#include <Baker.h>
 
 class BakeWidget : public QWidget {
     Q_OBJECT
diff --git a/tools/oven/src/ui/ModelBakeWidget.cpp b/tools/oven/src/ui/ModelBakeWidget.cpp
index c696fbad26..7963b3f3c4 100644
--- a/tools/oven/src/ui/ModelBakeWidget.cpp
+++ b/tools/oven/src/ui/ModelBakeWidget.cpp
@@ -15,6 +15,7 @@
 #include <QtWidgets/QLineEdit>
 #include <QtWidgets/QPushButton>
 #include <QtWidgets/QStackedWidget>
+#include <QtWidgets/QMessageBox>
 
 #include <QtCore/QDir>
 #include <QtCore/QDebug>
@@ -155,15 +156,10 @@ void ModelBakeWidget::outputDirectoryChanged(const QString& newDirectory) {
 }
 
 void ModelBakeWidget::bakeButtonClicked() {
-    // make sure we have a valid output directory
-    QDir outputDirectory(_outputDirLineEdit->text());
-
-    if (!outputDirectory.exists()) {
-        return;
-    }
 
     // make sure we have a non empty URL to a model to bake
     if (_modelLineEdit->text().isEmpty()) {
+        QMessageBox::warning(this, "Model URL unspecified", "A model file is required.");
         return;
     }
 
@@ -175,18 +171,49 @@ void ModelBakeWidget::bakeButtonClicked() {
 
         // if the URL doesn't have a scheme, assume it is a local file
         if (modelToBakeURL.scheme() != "http" && modelToBakeURL.scheme() != "https" && modelToBakeURL.scheme() != "ftp") {
-            modelToBakeURL.setScheme("file");
+            qDebug() << modelToBakeURL.toString();
+            qDebug() << modelToBakeURL.scheme();
+            modelToBakeURL = QUrl::fromLocalFile(fileURLString);
+            qDebug() << "New url: " << modelToBakeURL;
         }
 
+        auto modelName = modelToBakeURL.fileName().left(modelToBakeURL.fileName().lastIndexOf('.'));
+
+        // make sure we have a valid output directory
+        QDir outputDirectory(_outputDirLineEdit->text());
+        QString subFolderName = modelName + "/";
+
+        // output in a sub-folder with the name of the fbx, potentially suffixed by a number to make it unique
+        int iteration = 0;
+
+        while (outputDirectory.exists(subFolderName)) {
+            subFolderName = modelName + "-" + QString::number(++iteration) + "/";
+        }
+
+        outputDirectory.mkdir(subFolderName);
+
+        if (!outputDirectory.exists()) {
+            QMessageBox::warning(this, "Unable to create directory", "Unable to create output directory. Please create it manually or choose a different directory.");
+            return;
+        }
+
+        outputDirectory.cd(subFolderName);
+
+        QDir bakedOutputDirectory = outputDirectory.absoluteFilePath("baked");
+        QDir originalOutputDirectory = outputDirectory.absoluteFilePath("original");
+        
+        bakedOutputDirectory.mkdir(".");
+        originalOutputDirectory.mkdir(".");
+
         // everything seems to be in place, kick off a bake for this model now
         auto baker = std::unique_ptr<FBXBaker> {
-            new FBXBaker(modelToBakeURL, outputDirectory.absolutePath(), []() -> QThread* {
+            new FBXBaker(modelToBakeURL, []() -> QThread* {
                 return qApp->getNextWorkerThread();
-            }, false)
+            }, bakedOutputDirectory.absolutePath(), originalOutputDirectory.absolutePath())
         };
 
         // move the baker to the FBX baker thread
-        baker->moveToThread(qApp->getFBXBakerThread());
+        baker->moveToThread(qApp->getNextWorkerThread());
 
         // invoke the bake method on the baker thread
         QMetaObject::invokeMethod(baker.get(), "bake");
@@ -211,6 +238,10 @@ void ModelBakeWidget::handleFinishedBaker() {
             return value.first.get() == baker;
         });
 
+        for (auto& file : baker->getOutputFiles()) {
+            qDebug() << "Baked file: " << file;
+        }
+
         if (it != _bakers.end()) {
             auto resultRow = it->second;
             auto resultsWindow = qApp->getMainWindow()->showResultsWindow();
diff --git a/tools/oven/src/ui/ModelBakeWidget.h b/tools/oven/src/ui/ModelBakeWidget.h
index ed08990ba5..b42b8725f6 100644
--- a/tools/oven/src/ui/ModelBakeWidget.h
+++ b/tools/oven/src/ui/ModelBakeWidget.h
@@ -16,7 +16,7 @@
 
 #include <SettingHandle.h>
 
-#include "../FBXBaker.h"
+#include <FBXBaker.h>
 
 #include "BakeWidget.h"
 
diff --git a/tools/oven/src/ui/ResultsWindow.cpp b/tools/oven/src/ui/ResultsWindow.cpp
index 35b5160f9b..3a37a328de 100644
--- a/tools/oven/src/ui/ResultsWindow.cpp
+++ b/tools/oven/src/ui/ResultsWindow.cpp
@@ -50,6 +50,7 @@ void ResultsWindow::setupUI() {
     // strech the last column of the table (that holds the results) to fill up the remaining available size
     _resultsTable->horizontalHeader()->resizeSection(0, 0.25 * FIXED_WINDOW_WIDTH);
     _resultsTable->horizontalHeader()->setSectionResizeMode(1, QHeaderView::ResizeToContents);
+    _resultsTable->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
 
     // make sure we hear about cell clicks so that we can show the output directory for the given row
     connect(_resultsTable, &QTableWidget::cellClicked, this, &ResultsWindow::handleCellClicked);
diff --git a/tools/oven/src/ui/SkyboxBakeWidget.cpp b/tools/oven/src/ui/SkyboxBakeWidget.cpp
index d5c280aebd..cbaaa5ec0a 100644
--- a/tools/oven/src/ui/SkyboxBakeWidget.cpp
+++ b/tools/oven/src/ui/SkyboxBakeWidget.cpp
@@ -13,6 +13,7 @@
 #include <QtWidgets/QGridLayout>
 #include <QtWidgets/QLabel>
 #include <QtWidgets/QLineEdit>
+#include <QtWidgets/QMessageBox>
 #include <QtWidgets/QPushButton>
 #include <QtWidgets/QStackedWidget>
 
@@ -155,7 +156,9 @@ void SkyboxBakeWidget::bakeButtonClicked() {
     // make sure we have a valid output directory
     QDir outputDirectory(_outputDirLineEdit->text());
 
+    outputDirectory.mkdir(".");
     if (!outputDirectory.exists()) {
+        QMessageBox::warning(this, "Unable to create directory", "Unable to create output directory. Please create it manually or choose a different directory.");
         return;
     }
 
diff --git a/tools/oven/src/ui/SkyboxBakeWidget.h b/tools/oven/src/ui/SkyboxBakeWidget.h
index 4063a5459b..f00ab07f33 100644
--- a/tools/oven/src/ui/SkyboxBakeWidget.h
+++ b/tools/oven/src/ui/SkyboxBakeWidget.h
@@ -16,7 +16,7 @@
 
 #include <SettingHandle.h>
 
-#include "../TextureBaker.h"
+#include <TextureBaker.h>
 
 #include "BakeWidget.h"
 
diff --git a/unpublishedScripts/DomainContent/Cupcake/eatable.js b/unpublishedScripts/DomainContent/Cupcake/eatable.js
new file mode 100644
index 0000000000..8b261b7ea2
--- /dev/null
+++ b/unpublishedScripts/DomainContent/Cupcake/eatable.js
@@ -0,0 +1,36 @@
+//
+// eatable.js
+//
+//  Created by Alan-Michael Moody on 7/24/2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+(function () {
+    var NOMNOM_SOUND = SoundCache.getSound('http://hifi-content.s3.amazonaws.com/DomainContent/production/audio/vegcrunch.wav');
+
+    var _entityID;
+
+    this.preload = function (entityID) {
+        _entityID = entityID;
+    };
+
+    this.collisionWithEntity = function(entityUuid, collisionEntityID, collisionInfo) {
+        var entity = Entities.getEntityProperties(collisionEntityID, ['userData', 'name']);
+        var isClone = (entity.name.substring(1).split('-')[0] === 'clone');
+        var isEatable = (JSON.parse(entity.userData).eatable);
+
+        if (isEatable && isClone) {
+            Audio.playSound(NOMNOM_SOUND, {
+                position: Entities.getEntityProperties(_entityID, ['position']).position,
+                volume: 0.2,
+                localOnly: false
+            });
+
+            Entities.deleteEntity(collisionEntityID);
+        }
+    };
+});
\ No newline at end of file
diff --git a/unpublishedScripts/DomainContent/Toybox/bow/bow.js b/unpublishedScripts/DomainContent/Toybox/bow/bow.js
index 0c16bcbc7b..47335bcb6d 100644
--- a/unpublishedScripts/DomainContent/Toybox/bow/bow.js
+++ b/unpublishedScripts/DomainContent/Toybox/bow/bow.js
@@ -329,7 +329,6 @@
                     y: 0,
                     z: 0
                 }, lineVectors[0]],
-                lineWidth: 5,
                 color: this.stringData.currentColor
             });
 
@@ -339,7 +338,6 @@
                     y: 0,
                     z: 0
                 }, lineVectors[1]],
-                lineWidth: 5,
                 color: this.stringData.currentColor
             });
 
diff --git a/unpublishedScripts/DomainContent/Toybox/bow/createBow.js b/unpublishedScripts/DomainContent/Toybox/bow/createBow.js
index f1ed9eb263..5a4275d96a 100644
--- a/unpublishedScripts/DomainContent/Toybox/bow/createBow.js
+++ b/unpublishedScripts/DomainContent/Toybox/bow/createBow.js
@@ -125,7 +125,6 @@ function createPreNotchString() {
             y: 0,
             z: 0
         }, downOffset)],
-        lineWidth: 5,
         color: {
             red: 255,
             green: 255,
diff --git a/unpublishedScripts/DomainContent/Toybox/hiddenEntityReset.js b/unpublishedScripts/DomainContent/Toybox/hiddenEntityReset.js
index e2deec75ed..fe514f6dfc 100644
--- a/unpublishedScripts/DomainContent/Toybox/hiddenEntityReset.js
+++ b/unpublishedScripts/DomainContent/Toybox/hiddenEntityReset.js
@@ -450,7 +450,6 @@
                         y: 0,
                         z: 0
                     }, downOffset)],
-                    lineWidth: 5,
                     color: {
                         red: 255,
                         green: 255,
diff --git a/unpublishedScripts/DomainContent/Toybox/masterReset.js b/unpublishedScripts/DomainContent/Toybox/masterReset.js
index 4ad9cce401..b621544621 100644
--- a/unpublishedScripts/DomainContent/Toybox/masterReset.js
+++ b/unpublishedScripts/DomainContent/Toybox/masterReset.js
@@ -427,7 +427,6 @@ MasterReset = function() {
                     y: 0,
                     z: 0
                 }, downOffset)],
-                lineWidth: 5,
                 color: {
                     red: 255,
                     green: 255,
diff --git a/unpublishedScripts/DomainContent/Toybox/pistol/pistol.js b/unpublishedScripts/DomainContent/Toybox/pistol/pistol.js
index 5f57c6fc17..b408e4f464 100644
--- a/unpublishedScripts/DomainContent/Toybox/pistol/pistol.js
+++ b/unpublishedScripts/DomainContent/Toybox/pistol/pistol.js
@@ -346,8 +346,7 @@
                 end:  { x: 0, y: 0, z: 0 },
                 color: COLORS.RED,
                 alpha: 1,
-                visible: true,
-                lineWidth: 2
+                visible: true
             });
         },
     };
diff --git a/unpublishedScripts/gravity.js b/unpublishedScripts/gravity.js
new file mode 100644
index 0000000000..0ef7b0caa9
--- /dev/null
+++ b/unpublishedScripts/gravity.js
@@ -0,0 +1,56 @@
+//
+//  gravity.js
+//
+//  Created by Alan-Michael Moody on 7/24/17
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+(function () {
+
+    var _entityID;
+
+    this.preload = function (entityID) {
+        _entityID = entityID;
+    };
+
+    function update(deltatime) {
+        var planet = Entities.getEntityProperties(_entityID);
+
+        //normalization happens in rotationBetween.
+        var direction = Vec3.subtract(MyAvatar.position, planet.position);
+        var localUp = Quat.getUp(MyAvatar.orientation);
+
+        MyAvatar.orientation = Quat.normalize(Quat.multiply(Quat.rotationBetween(localUp, direction), MyAvatar.orientation));
+    }
+
+    function init() {
+        Script.update.connect(update);
+    }
+
+    function clean() {
+        Script.update.disconnect(update);
+        MyAvatar.orientation = Quat.fromVec3Degrees({
+            x: 0,
+            y: 0,
+            z: 0
+        });
+    }
+
+    var _switch = true;
+
+    this.clickDownOnEntity = function(uuid, mouseEvent) {
+
+        if (_switch) {
+            init();
+        } else {
+            clean();
+        }
+        _switch = !_switch;
+    };
+
+    Script.scriptEnding.connect(clean);
+
+});
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/blocks/blocksApp.js b/unpublishedScripts/marketplace/blocks/blocksApp.js
new file mode 100644
index 0000000000..c9e8682b23
--- /dev/null
+++ b/unpublishedScripts/marketplace/blocks/blocksApp.js
@@ -0,0 +1,71 @@
+///
+/// blocksApp.js
+/// A tablet app for downloading 3D assets from Google Blocks
+/// 
+/// Author: Elisa Lupin-Jimenez
+/// Copyright High Fidelity 2017
+///
+/// Licensed under the Apache 2.0 License
+/// See accompanying license file or http://apache.org/
+///
+/// All assets are under CC Attribution Non-Commerical
+/// http://creativecommons.org/licenses/
+///
+
+(function () {
+	var APP_NAME = "BLOCKS";
+	var APP_URL = "https://vr.google.com/objects/";
+	var APP_OUTDATED_URL = "https://hifi-content.s3.amazonaws.com/elisalj/blocks/updateToBlocks.html";
+	var APP_ICON = "https://hifi-content.s3.amazonaws.com/elisalj/blocks/blocks-i.svg";
+	var APP_ICON_ACTIVE = "https://hifi-content.s3.amazonaws.com/elisalj/blocks/blocks-a.svg";
+
+    try {
+        print("Current Interface version: " + Window.checkVersion());
+    } catch(err) {
+        print("Outdated Interface version does not support Blocks");
+        APP_URL = APP_OUTDATED_URL;
+    }
+
+	var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
+	var button = tablet.addButton({
+	    icon: APP_ICON,
+        activeIcon: APP_ICON_ACTIVE,
+		text: APP_NAME
+	});
+
+	function onClicked() {
+	    if (!shown) {
+	        tablet.gotoWebScreen(APP_URL, "", true);
+	    } else {
+	        tablet.gotoHomeScreen();
+	    }
+	}
+	button.clicked.connect(onClicked);
+
+	var shown = false;
+
+	function checkIfBlocks(url) {
+	    if (url.indexOf("google") !== -1) {
+	        return true;
+	    }
+	    return false;
+	}
+
+	function onScreenChanged(type, url) {
+	    if ((type === 'Web' && checkIfBlocks(url)) || url === APP_OUTDATED_URL) {
+	        button.editProperties({ isActive: true });
+	        shown = true;
+	    } else {
+	        button.editProperties({ isActive: false });
+	        shown = false;
+	    }
+	}
+
+	tablet.screenChanged.connect(onScreenChanged);
+
+	function cleanup() {
+	    tablet.removeButton(button);
+	}
+
+	Script.scriptEnding.connect(cleanup);
+}());
diff --git a/unpublishedScripts/marketplace/bow/bow.js b/unpublishedScripts/marketplace/bow/bow.js
index 818960e335..883eff113c 100644
--- a/unpublishedScripts/marketplace/bow/bow.js
+++ b/unpublishedScripts/marketplace/bow/bow.js
@@ -266,7 +266,6 @@
                     dimensions: { "x": 5, "y": 5, "z": 5 },
                     ignoreForCollisions: 1,
                     linePoints: [ { "x": 0, "y": 0, "z": 0 }, { "x": 0, "y": -1.2, "z": 0 } ],
-                    lineWidth: 5,
                     name: STRING_NAME,
                     parentID: this.entityID,
                     localPosition: { "x": 0, "y": 0.6, "z": 0.1 },
@@ -287,7 +286,6 @@
         resetStringToIdlePosition: function() {
             Entities.editEntity(this.stringID, {
                 linePoints: [ { "x": 0, "y": 0, "z": 0 }, { "x": 0, "y": -1.2, "z": 0 } ],
-                lineWidth: 5,
                 localPosition: { "x": 0, "y": 0.6, "z": 0.1 },
                 localRotation: { "w": 1, "x": 0, "y": 0, "z": 0 },
             });
diff --git a/unpublishedScripts/marketplace/camera-move/Eye-Camera.svg b/unpublishedScripts/marketplace/camera-move/Eye-Camera.svg
new file mode 100644
index 0000000000..c58700823d
--- /dev/null
+++ b/unpublishedScripts/marketplace/camera-move/Eye-Camera.svg
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<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 -270 2622 1198" enable-background="new 0 0 2622 1198" xml:space="preserve">
+<g transform="scale(1,.4546)">
+	<path d="M2591,599c0,0-573.0756,558.7166-1280,558.7166S31,599,31,599S604.0755,40.2834,1311,40.2834S2591,599,2591,599z"/>
+	<g>
+		<path fill="#FFFFFF" d="M1507.3644,831.6261c8.1908-85.9868,6.8108-166.8081,5.306-206.6722l-92.7485,160.6452l0.1365,0.2027
+			c-0.0315,0.0212-0.1725,0.1157-0.4128,0.2759l-0.3179,0.5509h-0.5111c-11.4204,7.5681-99.7214,65.3458-204.2842,113.1478
+			c-65.7413,30.0543-125.0349,50.3848-176.2341,60.427c-33.0687,6.4862-62.8685,8.665-89.223,6.5692
+			c93.1363,91.6643,220.923,148.226,361.9247,148.226c38.7316,0,76.463-4.2765,112.7566-12.3666
+			c19.0804-22.5304,35.3513-53.2766,48.5972-91.9321C1488.853,962.5517,1500.6323,902.3027,1507.3644,831.6261z"/>
+		<path fill="#FFFFFF" d="M1202.6725,411.3712h0.5111c11.4207-7.5681,99.7214-65.3457,204.2842-113.1477
+			c65.7412-30.0542,125.0348-50.3848,176.234-60.4269c33.0687-6.4863,62.8685-8.6651,89.223-6.5692
+			C1579.7885,139.563,1452.0017,83.0015,1311,83.0015c-38.7316,0-76.463,4.2764-112.7566,12.3666
+			c-19.0803,22.5305-35.3513,53.2766-48.5973,91.932c-16.499,48.1481-28.2784,108.3973-35.0105,179.0738
+			c-8.1908,85.9868-6.8108,166.8082-5.306,206.6722l92.7484-160.6451l-0.1364-0.2027c0.0314-0.0211,0.1724-0.1157,0.4127-0.2759
+			L1202.6725,411.3712z"/>
+		<path fill="#FFFFFF" d="M1586.8657,253.4136c-49.9471,9.7853-108.0142,29.7088-172.5878,59.2168
+			c-78.5621,35.9-147.8654,77.5058-181.6364,98.741h185.4969l0.1073-0.2195c0.0342,0.0167,0.1865,0.0915,0.4454,0.2195h0.6364
+			l0.2554,0.4426c12.2645,6.1064,106.4518,53.6884,200.1307,120.3414c58.8986,41.9065,106.1522,83.091,140.4484,122.4097
+			c22.2083,25.4601,39.0232,50.2394,50.3865,74.1677c10.7344-41.452,16.45-84.9244,16.45-129.7325
+			c0-134.8296-51.7194-257.5746-136.3927-349.4958C1661.5886,244.2816,1626.8857,245.5726,1586.8657,253.4136z"/>
+		<path fill="#FFFFFF" d="M1748.2195,665.1135c-33.4479-38.3628-79.7356-78.6885-137.5773-119.857
+			c-70.3712-50.0869-141.0546-89.3023-176.3302-107.9312l92.7485,160.6452l0.2438-0.0168c0.0027,0.0379,0.014,0.2072,0.0326,0.4955
+			l0.318,0.551l-0.2555,0.4425c0.844,13.6745,6.7305,119.0341-4.1532,233.4891c-6.8429,71.9608-18.8829,133.4758-35.7858,182.8367
+			c-10.9449,31.963-23.9971,58.9147-39.0378,80.7199c168.875-46.5455,303.0535-176.7669,355.1321-343.2732
+			C1793.5869,725.4113,1775.0889,695.9305,1748.2195,665.1135z"/>
+		<path fill="#FFFFFF" d="M1035.1344,944.5864c49.947-9.7854,108.014-29.7087,172.5876-59.2168
+			c78.5623-35.9,147.8655-77.5058,181.6365-98.741h-185.4971l-0.1073,0.2195c-0.0342-0.0167-0.1865-0.0915-0.4454-0.2195h-0.6364
+			l-0.2554-0.4426c-12.2645-6.1064-106.4518-53.6884-200.1309-120.3412c-58.8984-41.9065-106.152-83.091-140.4482-122.4097
+			c-22.2083-25.46-39.0232-50.2393-50.3865-74.1676C800.7169,510.7194,795.0015,554.192,795.0015,599
+			c0,134.8295,51.7193,257.5745,136.3928,349.4958C960.4114,953.7184,995.1143,952.4273,1035.1344,944.5864z"/>
+		<path fill="#FFFFFF" d="M873.7805,532.8865c33.4479,38.3627,79.7355,78.6885,137.5771,119.857
+			c70.3715,50.0868,141.0547,89.3022,176.3304,107.9312l-92.7487-160.645l-0.2438,0.0167c-0.0026-0.0378-0.014-0.2072-0.0326-0.4954
+			l-0.318-0.551l0.2555-0.4426c-0.8439-13.6744-6.7303-119.034,4.1532-233.4892c6.8429-71.9607,18.8829-133.4758,35.7858-182.8366
+			c10.9451-31.963,23.9971-58.9148,39.0378-80.7198c-168.8749,46.5456-303.0535,176.7669-355.132,343.2733
+			C828.413,472.5887,846.9111,502.0695,873.7805,532.8865z"/>
+	</g>
+</g>
+</svg>
diff --git a/unpublishedScripts/marketplace/camera-move/_debug.js b/unpublishedScripts/marketplace/camera-move/_debug.js
new file mode 100644
index 0000000000..d8c05d646e
--- /dev/null
+++ b/unpublishedScripts/marketplace/camera-move/_debug.js
@@ -0,0 +1,133 @@
+/* eslint-env jquery, browser */
+/* eslint-disable comma-dangle, no-empty */
+/* global EventBridge: true, PARAMS, signal, assert, log, debugPrint,
+   bridgedSettings, _utils, jquerySettings,  */
+
+// helper functions for debugging and testing the UI in an external web brower
+var _debug = {
+    handleUncaughtException: function onerror(message, fileName, lineNumber, colNumber, err) {
+        if (message === onerror.lastMessage) {
+            return;
+        }
+        onerror.lastMessage = message;
+        var error = (err || Error.lastError);
+        // var stack = error && error.stack;
+        var output = _utils.normalizeStackTrace(error || { message: message });
+        window.console.error(['window.onerror: ', output, message]); // eslint-disable-line no-console
+        var errorNode = document.querySelector('#errors'),
+            textNode = errorNode && errorNode.querySelector('.output');
+        if (textNode) {
+            textNode.innerText = output;
+        }
+        if (errorNode) {
+            errorNode.style.display = 'block';
+        }
+        if (error){
+            error.onerrored = true;
+        }
+    },
+    loadScriptNodes: function loadScriptNodes(selector) {
+        // scripts are loaded this way to ensure that when the client script refreshes, so are the app's dependencies
+        [].forEach.call(document.querySelectorAll(selector), function(script) {
+            script.parentNode.removeChild(script);
+            if (script.src) {
+                script.src += location.search;
+            }
+            script.type = 'application/javascript';
+            document.write(script.outerHTML);
+        });
+    },
+
+    // TESTING MOCKs
+    openEventBridgeMock: function openEventBridgeMock(onEventBridgeOpened) {
+        var updatedValues = openEventBridgeMock.updatedValues = {};
+        // emulate EventBridge's API
+        EventBridge = {
+            emitWebEvent: signal(function emitWebEvent(message){}),
+            scriptEventReceived: signal(function scriptEventReceived(message){}),
+        };
+        EventBridge.emitWebEvent.connect(onEmitWebEvent);
+        onEventBridgeOpened(EventBridge);
+        assert(!bridgedSettings.onUnhandledMessage);
+        bridgedSettings.onUnhandledMessage = function(msg) {
+            log('bridgedSettings.onUnhandledMessage', msg);
+            return true;
+        };
+        // manually trigger initial bootstrapping responses (that the client script would normally send)
+        bridgedSettings.handleExtraParams({uuid: PARAMS.uuid, ns: PARAMS.ns, extraParams: {
+            mock: true,
+            appVersion: 'browsermock',
+            toggleKey: { text: 'SPACE', isShifted: true },
+            mode: {
+                toolbar: true,
+                browser: true,
+                desktop: true,
+                tablet: /tablet/.test(location) || /android|ipad|iphone/i.test(navigator.userAgent),
+                hmd: /hmd/.test(location),
+            },
+        } });
+        bridgedSettings.setValue('ui-show-advanced-options', true);
+
+        function log(msg) {
+            // eslint-disable-next-line no-console
+            console.log.apply(console, ['[mock] ' + msg].concat([].slice.call(arguments,1)));
+        }
+
+        // generate mock data in response to outgoing web page events
+        function onEmitWebEvent(message) {
+            try {
+                var obj = JSON.parse(message);
+            } catch (e) {}
+            if (!obj) {
+                // message isn't JSON so just log it and bail early
+                log('consuming non-callback web event', message);
+                return;
+            }
+            switch (obj.method) {
+                case 'valueUpdated': {
+                    log('valueUpdated',obj.params);
+                    updatedValues[obj.params[0]] = obj.params[1];
+                    return;
+                }
+                case 'Settings.getValue': {
+                    var key = obj.params[0];
+                    var node = jquerySettings.findNodeByKey(key, true);
+                    // log('Settings.getValue.findNodeByKey', key, node);
+                    var type = node && (node.dataset.hifiType || node.dataset.type || node.type);
+                    switch (type) {
+                        case 'hifiButton':
+                        case 'hifiCheckbox': {
+                            obj.result = /tooltip|advanced-options/i.test(key) || PARAMS.tooltiptest ? true : Math.random() > 0.5;
+                        } break;
+                        case 'hifiRadioGroup': {
+                            var radios = $(node).find('input[type=radio]').toArray();
+                            while (Math.random() < 0.9) {
+                                radios.push(radios.shift());
+                            }
+                            obj.result = radios[0].value;
+                        } break;
+                        case 'hifiSpinner':
+                        case 'hifiSlider': {
+                            var step = node.step || 1, precision = (1/step).toString().length - 1;
+                            var magnitude = node.max || (precision >=1 ? Math.pow(10, precision-1) : 10);
+                            obj.result = parseFloat((Math.random() * magnitude).toFixed(precision||1));
+                        } break;
+                        default: {
+                            log('unhandled node type for making dummy data: ' + [key, node && node.type, type, node && node.type] + ' @ ' + (node && node.id));
+                            obj.result = updatedValues[key] || false;
+                        } break;
+                    }
+                    debugPrint('mock getValue data %c%s = %c%s', 'color:blue',
+                        JSON.stringify(key), 'color:green', JSON.stringify(obj.result));
+                } break;
+                default: {
+                    log('ignoring outbound method call', obj);
+                } break;
+            }
+            setTimeout(function() {
+                EventBridge.scriptEventReceived(JSON.stringify(obj));
+            }, 100);
+        }
+    },
+};
+
diff --git a/unpublishedScripts/marketplace/camera-move/_json-persist.js b/unpublishedScripts/marketplace/camera-move/_json-persist.js
new file mode 100644
index 0000000000..5915842d1b
--- /dev/null
+++ b/unpublishedScripts/marketplace/camera-move/_json-persist.js
@@ -0,0 +1,130 @@
+/* eslint-env jquery, browser */
+/* eslint-disable comma-dangle, no-empty */
+/* global _utils, PARAMS, VERSION, signal, assert, log, debugPrint,
+          bridgedSettings, POPUP */
+
+// JSON export / import helpers proto module
+var SettingsJSON = (function() {
+    _utils.exists;
+    assert.exists;
+
+    return {
+        setPath: setPath,
+        rollupPaths: rollupPaths,
+        encodeNodes: encodeNodes,
+        exportAll: exportAll,
+        showSettings: showSettings,
+        applyJSON: applyJSON,
+        promptJSON: promptJSON,
+        popupJSON: popupJSON,
+    };
+
+    function encodeNodes(resolver) {
+        return resolver.getAllNodes().reduce((function(out, input, i) {
+            //debugPrint('input['+i+']', input.id);
+            var id = input.id,
+                key = resolver.getKey(id);
+            //debugPrint('toJSON', id, key, input.id);
+            setPath(out, key.split('/'), resolver.getValue(key));
+            return out;
+        }).bind(this), {});
+    }
+
+    function setPath(obj, path, value) {
+        var key = path.pop();
+        obj = path.reduce(function(obj, subkey) {
+            return obj[subkey] = obj[subkey] || {};
+        }, obj);
+        //debugPrint('setPath', key, Object.keys(obj));
+        obj[key] = value;
+    }
+
+    function rollupPaths(obj, output, path) {
+        path = path || [];
+        output = output || {};
+        // log('rollupPaths', Object.keys(obj||{}), Object.keys(output), path);
+        for (var p in obj) {
+            path.push(p);
+            var value = obj[p];
+            if (value && typeof value === 'object') {
+                rollupPaths(obj[p], output, path);
+            } else {
+                output[path.join('/')] = value;
+            }
+            path.pop();
+        }
+        return output;
+    }
+
+    function exportAll(resolver, name) {
+        var settings = encodeNodes(resolver);
+        Object.keys(settings).forEach(function(prop) {
+            if (typeof settings[prop] === 'object') {
+                _utils.sortedAssign(settings[prop]);
+            }
+        });
+        return {
+            version: VERSION,
+            name: name || undefined,
+            settings: settings,
+            _metadata: { timestamp: new Date(), PARAMS: PARAMS, url: location.href, }
+        };
+    }
+
+    function showSettings(resolver, saveName) {
+        popupJSON(saveName || '(current settings)', Object.assign(exportAll(resolver, saveName), {
+            extraParams: bridgedSettings.extraParams,
+        }));
+    }
+
+    function popupJSON(title, tmp) {
+        var HTML = document.getElementById('POPUP').innerHTML
+            .replace(/\bxx-script\b/g, 'script')
+            .replace('JSON', JSON.stringify(tmp, 0, 2).replace(/\n/g, '<br />'));
+        if (/WebWindowEx/.test(navigator.userAgent) ) {
+            bridgedSettings.sendEvent({
+                method: 'overlayWebWindow',
+                userAgent: navigator.userAgent,
+                options: {
+                    title: 'app-camera-move-export' + (title ? '::'+title : ''),
+                    content: HTML,
+                },
+            });
+        } else {
+            // append a footer to the data URI so it displays cleaner in the built-in browser window that opens
+            var footer = '<\!-- #' + HTML.substr(0,256).replace(/./g,' ') + (title || 'Camera Move Settings');
+            window.open("data:text/html;escape," + encodeURIComponent(HTML) + footer,"app-camera-move-export");
+        }
+    }
+
+    function applyJSON(resolver, name, tmp) {
+        assert(tmp && 'version' in tmp && 'settings' in tmp, 'invalid settings record: ' + JSON.stringify(tmp));
+        var settings = rollupPaths(tmp.settings);
+        for (var p in settings) {
+            if (/^[.]/.test(p)) {
+                continue;
+            }
+            var key = resolver.getId(p, true);
+            if (!key) {
+                log('$applySettings -- skipping unregistered Settings key: ', p);
+            } else {
+                resolver.setValue(p, settings[p], name+'.settings.'+p);
+            }
+        }
+    }
+
+    function promptJSON() {
+        var json = window.prompt('(paste JSON here)', '');
+        if (!json) {
+            return;
+        }
+        try {
+            log('parsing json', json);
+            json = JSON.parse(json);
+        } catch (e) {
+            throw new Error('Could not parse pasted JSON: ' + e + '\n\n' + (json||'').replace(/</g,'&lt;'));
+        }
+        return json;
+    }
+})(this);
+
diff --git a/unpublishedScripts/marketplace/camera-move/_less-utils.js b/unpublishedScripts/marketplace/camera-move/_less-utils.js
new file mode 100644
index 0000000000..780b0770c7
--- /dev/null
+++ b/unpublishedScripts/marketplace/camera-move/_less-utils.js
@@ -0,0 +1,107 @@
+/* eslint-env jquery, browser */
+/* eslint-disable comma-dangle */
+/* global PARAMS, signal, assert, log, debugPrint */
+
+function preconfigureLESS(options) {
+    assert(function assertion() {
+        return options.selector && options.globalVars;
+    });
+
+    options.globalVars = Object.assign(options.globalVars||{}, { hash: '' });
+    Object.assign(options, {
+        errorReporting: Object.assign(function errorReporting(op, e, rootHref) {
+            var type = 'Less-'+e.type+'-Error';
+            var lastResult = errorReporting.lastResult;
+            delete errorReporting.lastResult;
+            if (lastResult && lastResult['#line']) {
+                e.line += lastResult['#line'] - 2;
+            }
+            e.stack = [type+':'+e.message+' at '+e.filename+':'+(e.line+1)]
+                .concat((e.extract||[]).map(function(output, index) {
+                    return (index + e.line)+': '+output;
+                })).join('\n\t');
+            _debug.handleUncaughtException(type+': ' + e.message, e.filename, e.line, e.column, {
+                type: type,
+                message: e.message,
+                fileName: e.filename,
+                lineNumber: e.line,
+                stack: e.stack,
+            });
+        }, {
+            lastResult: null,
+            lastSource: null,
+            getLocation: null,
+            $patch: function() {
+                // when errors occur, stash the source and #line {offset} for better error dispay above
+                assert(!this.getLocation);
+                var originalGetLocation = less.utils.getLocation,
+                    self = this;
+                less.utils.getLocation = customGetLocation;
+                delete self.$patch; // only need to apply once
+                function customGetLocation(index, stream) {
+                    self.lastSource = stream;
+                    var result = originalGetLocation.apply(this, arguments);
+                    result.source = stream;
+                    stream.replace(/#line (\d+)/, function(_, offset) {
+                        result['#line'] = parseInt(offset);
+                    });
+                    return self.lastResult = result;
+                }
+            },
+        }),
+        // poll: 1000,
+        // watch: true,
+    });
+    var lessManager = {
+        options: options,
+        onViewportUpdated: onViewportUpdated,
+        elements: $(options.selector).remove()
+    };
+
+    return lessManager;
+
+    function onViewportUpdated(viewport) {
+        var globalVars = options.globalVars,
+            less = window.less;
+        if (onViewportUpdated.to) {
+            clearTimeout(onViewportUpdated.to);
+            onViewportUpdated.to = 0;
+        } else if (globalVars.hash) {
+            onViewportUpdated.to = setTimeout(onViewportUpdated.bind(this, viewport), 500); // debounce
+            return;
+        }
+        delete globalVars.hash;
+        Object.assign(globalVars, {
+            'inner-width': viewport.inner.width,
+            'inner-height': viewport.inner.height,
+            'client-width': viewport.client.width,
+            'client-height': viewport.client.height,
+            'hash': '',
+        });
+        globalVars.hash = JSON.stringify(JSON.stringify(globalVars,0,2)).replace(/\\n/g , '\\000a');
+        var hash = JSON.stringify(globalVars, 0, 2);
+        debugPrint('onViewportUpdated', JSON.parse(onViewportUpdated.lastHash||'{}')['inner-width'], JSON.parse(hash)['inner-width']);
+        if (onViewportUpdated.lastHash !== hash) {
+            debugPrint('updating lessVars', 'less.modifyVars:' + typeof less.modifyVars, JSON.stringify(globalVars, 0, 2));
+            // dump less variables if lessDebug=true was in the url
+            PARAMS.lessDebug && $('#errors').show().html("<pre>").children(0).text(hash);
+
+            // patch less with absolute line number reporting
+            options.errorReporting && options.errorReporting.$patch && options.errorReporting.$patch();
+
+            // to recompile inline styles (in response to onresize or when developing),
+            // a fresh copy of the source nodes gets swapped-in
+            var newNodes = lessManager.elements.clone().appendTo(document.body);
+            // note: refresh(reload, modifyVars, clearFileCache)
+            less.refresh(false, globalVars).then(function(result) {
+                debugPrint('less.refresh completed OK', result);
+            })['catch'](function(err) {
+                log('less ERROR:', err);
+            });
+            var oldNodes = onViewportUpdated.lastNodes;
+            oldNodes && oldNodes.remove();
+            onViewportUpdated.lastNodes = newNodes;
+        }
+        onViewportUpdated.lastHash = hash;
+    }
+}
diff --git a/unpublishedScripts/marketplace/camera-move/_tooltips.js b/unpublishedScripts/marketplace/camera-move/_tooltips.js
new file mode 100644
index 0000000000..94206b2ef9
--- /dev/null
+++ b/unpublishedScripts/marketplace/camera-move/_tooltips.js
@@ -0,0 +1,169 @@
+/* eslint-env jquery, browser */
+/* eslint-disable comma-dangle, no-empty */
+/* global PARAMS, signal, assert, log, debugPrint */
+
+// ----------------------------------------------------------------------------
+// manage jquery-tooltipster hover tooltips
+var TooltipManager = (function(global) {
+    Object.assign(TooltipManager, {
+        BASECONFIG: {
+            theme: ['tooltipster-noir'],
+            side: ['right','top','bottom', 'left'],
+            updateAnimation: 'scale',
+            delay: [750, 1000],
+            distance: { right: 24, left: 8, top: 8, bottom: 8 },
+            contentAsHTML: true,
+        },
+    });
+
+    function TooltipManager(options) {
+        assert(options.elements && options.tooltips, 'TooltipManager constructor expects .elements and .tooltips');
+        Object.assign(this, {
+            instances: [],
+            options: options,
+            config: Object.assign({}, TooltipManager.BASECONFIG, {
+                trigger: !options.testmode ? 'hover' : 'click',
+                interactive: options.testmode,
+                minWidth: options.viewport && options.viewport.min.width,
+                maxWidth: options.viewport && options.viewport.max.width,
+            }),
+        });
+        options.enabled && this.initialize();
+    }
+
+    TooltipManager.prototype = {
+        constructor: TooltipManager,
+        initialize: function() {
+            var options = this.options,
+                _config = this.config,
+                _self = this,
+                candidates = $(options.elements);
+
+            candidates.add($('button')).each(function() {
+                var id = this.id,
+                    input = $(this),
+                    tip = options.tooltips[id] || options.tooltips[input.data('for')];
+
+                var alreadyTipped = input.is('.tooltipstered') || input.closest('.tooltipstered').get(0);
+                if (alreadyTipped || !tip) {
+                    return !tip && _debugPrint('!tooltippable -- missing tooltip for ' + (id || input.data('for') || input.text()));
+                }
+                var config = Object.assign({ content: tip }, _config);
+
+                function mergeConfig() {
+                    var attr = $(this).attr('data-tooltipster'),
+                        object = $(this).data('tooltipster');
+                    typeof object === 'object' && Object.assign(config, object);
+                    attr && Object.assign(config, JSON.parse(attr));
+                }
+                try {
+                    input.parents(':data(tooltipster),[data-tooltipster]').each(mergeConfig);
+                    input.each(mergeConfig); // prioritize own settings
+                } catch(e) {
+                    console.error('error extracting tooltipster data:' + [e, id]);
+                }
+
+                var target = $(input.closest('.tooltip-target').get(0) ||
+                               (input.is('input') && input) || null);
+
+                assert(target && target[0] && tip);
+                debugPrint('binding tooltip', config, target[0].nodeName, id || target[0]);
+                var instance = target.tooltipster(config)
+                    .tooltipster('instance');
+
+                instance.on('close', function(event) {
+                    if (options.keepopen === target) {
+                        debugPrint(event.type, 'canceling close keepopen === target', id);
+                        event.stop();
+                        options.keepopen = null;
+                    }
+                });
+                instance.on('before', function(event) {
+                    debugPrint(event.type, 'before', event);
+                    !options.testmode && _self.closeAll();
+                    !options.enabled && event.stop();
+                });
+                target.find(':focusable, input, [tabindex], button, .control')
+                    .add(target).add(input)
+                    .add(input.closest(':focusable, input, [tabindex]'))
+                    .on({
+                        click: function(evt) {
+                            if (input.is('button')) {
+                                return setTimeout(instance.close.bind(instance,null),50);
+                            }
+                            options.keepopen = target;
+                        },
+                        focus: instance.open.bind(instance, null),
+                        blur: function(evt) {
+                            instance.close(); _self.openFocusedTooltip();
+                        },
+                    });
+                _self.instances.push(instance);
+            });
+            return this.instances;
+        },
+        openFocusedTooltip: function() {
+            if (!this.options.enabled) {
+                return;
+            }
+            setTimeout(function() {
+                if (!document.activeElement || document.activeElement === document.body ||
+                    !$(document.activeElement).closest('section')) {
+                    return;
+                }
+                var tip = $([])
+                    .add($(document.activeElement))
+                    .add($(document.activeElement).find('.tooltipstered'))
+                    .add($(document.activeElement).closest('.tooltipstered'))
+                    .filter('.tooltipstered');
+                if (tip.is('.tooltipstered')) {
+                    // log('opening focused tooltip', tip.length, tip[0].id);
+                    tip.tooltipster('open');
+                }
+            }, 1);
+        },
+        rapidClose: function(instance, reopen) {
+            if (!instance.status().open) {
+                return;
+            }
+            instance.elementTooltip() && $(instance.elementTooltip()).hide();
+            instance.close(function() {
+                reopen && instance.open();
+            });
+        },
+        openAll: function() {
+            $('.tooltipstered').tooltipster('open');
+        },
+        closeAll: function() {
+            $.tooltipster.instances().forEach(function(instance) {
+                this.rapidClose(instance);
+            }.bind(this));
+        },
+        updateViewport: function(viewport) {
+            var options = {
+                minWidth: viewport.min.width,
+                maxWidth: viewport.max.width,
+            };
+            Object.assign(this.config, options);
+            $.tooltipster.setDefaults(options);
+            debugPrint('updating tooltipster options', JSON.stringify(options));
+            $.tooltipster.instances().forEach(function(instance) {
+                instance.option('minWidth', options.minWidth);
+                instance.option('maxWidth', options.maxWidth);
+                this.rapidClose(instance, instance.status().open);
+            }.bind(this));
+        },
+        enable: function() {
+            this.options.enabled = true;
+            if (this.options.testmode) {
+                this.openAll();
+            }
+        },
+        disable: function() {
+            this.options.enabled = false;
+            this.closeAll();
+        },
+    };// prototype
+
+    return TooltipManager;
+})(this);
diff --git a/unpublishedScripts/marketplace/camera-move/app-camera-move.js b/unpublishedScripts/marketplace/camera-move/app-camera-move.js
new file mode 100644
index 0000000000..f58dd3d3bd
--- /dev/null
+++ b/unpublishedScripts/marketplace/camera-move/app-camera-move.js
@@ -0,0 +1,644 @@
+//  app-camera-move.js
+//
+//  Created by Timothy Dedischew on 05/05/2017.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+//  This Client script sets up the Camera Control Tablet App, which can be used to configure and
+//  drive your avatar with easing/smoothing movement constraints for a less jittery filming experience.
+
+/* eslint-disable comma-dangle, no-empty */
+"use strict";
+
+var VERSION = '0.0.1',
+    NAMESPACE = 'app-camera-move',
+    APP_HTML_URL = Script.resolvePath('app.html'),
+    BUTTON_CONFIG = {
+        text: '\nCam Drive',
+        icon: Script.resolvePath('Eye-Camera.svg'),
+    },
+    DEFAULT_TOGGLE_KEY = { text: 'SPACE' };
+
+var MINIMAL_CURSOR_SCALE = 0.5,
+    FILENAME = Script.resolvePath(''),
+    WANT_DEBUG = Settings.getValue(NAMESPACE + '/debug', false)
+    EPSILON = 1e-6;
+
+function log() {
+    print( NAMESPACE + ' | ' + [].slice.call(arguments).join(' ') );
+}
+
+var require = Script.require,
+    debugPrint = function(){},
+    _debugChannel = NAMESPACE + '.stats',
+    overlayDebugOutput = function(){};
+
+if (WANT_DEBUG) {
+    log('WANT_DEBUG is true; instrumenting debug support', WANT_DEBUG);
+    _instrumentDebug();
+}
+
+var _utils = require('./modules/_utils.js'),
+    assert = _utils.assert,
+    CustomSettingsApp = require('./modules/custom-settings-app/CustomSettingsApp.js'),
+    movementUtils = require('./modules/movement-utils.js?'+ +new Date),
+    configUtils = require('./modules/config-utils.js'),
+    AvatarUpdater = require('./avatar-updater.js');
+
+
+Object.assign = Object.assign || _utils.assign;
+
+var cameraControls, eventMapper, cameraConfig, applicationConfig;
+
+var DEFAULTS = {
+    'namespace': NAMESPACE,
+    'debug': WANT_DEBUG,
+    'jitter-test': false,
+    'camera-move-enabled': false,
+    'thread-update-mode': movementUtils.CameraControls.SCRIPT_UPDATE,
+    'fps': 90,
+    'drive-mode': movementUtils.DriveModes.MOTOR,
+    'use-head': true,
+    'stay-grounded': true,
+    'prevent-roll': true,
+    'constant-delta-time': false,
+    'minimal-cursor': false,
+    'normalize-inputs': false,
+    'enable-mouse-smooth': true,
+    'translation-max-velocity': 5.50,
+    'translation-ease-in': 1.25,
+    'translation-ease-out': 5.50,
+    'rotation-max-velocity': 90.00,
+    'rotation-ease-in': 1.00,
+    'rotation-ease-out': 5.50,
+    'rotation-x-speed': 45,
+    'rotation-y-speed': 60,
+    'rotation-z-speed': 1,
+    'mouse-multiplier': 1.0,
+    'keyboard-multiplier': 1.0,
+
+    'ui-enable-tooltips': true,
+    'ui-show-advanced-options': false,
+
+    'Avatar/Draw Mesh': true,
+    'Scene/shouldRenderEntities': true,
+    'Scene/shouldRenderAvatars': true,
+    'Avatar/Show My Eye Vectors': false,
+    'Avatar/Show Other Eye Vectors': false,
+};
+
+// map setting names to/from corresponding Menu and API properties
+var APPLICATION_SETTINGS = {
+    'Avatar/Enable Avatar Collisions': {
+        menu: 'Avatar > Enable Avatar Collisions',
+        object: [ MyAvatar, 'collisionsEnabled' ],
+    },
+    'Avatar/Draw Mesh': {
+        menu: 'Developer > Draw Mesh',
+        object: [ MyAvatar, 'getEnableMeshVisible', 'setEnableMeshVisible' ],
+    },
+    'Avatar/Show My Eye Vectors': { menu: 'Developer > Show My Eye Vectors' },
+    'Avatar/Show Other Eye Vectors': { menu: 'Developer > Show Other Eye Vectors' },
+    'Avatar/useSnapTurn': { object: [ MyAvatar, 'getSnapTurn', 'setSnapTurn' ] },
+    'Avatar/lookAtSnappingEnabled': 'lookAtSnappingEnabled' in MyAvatar && {
+        menu: 'Developer > Enable LookAt Snapping',
+        object: [ MyAvatar, 'lookAtSnappingEnabled' ]
+    },
+    'Scene/shouldRenderEntities': { object: [ Scene, 'shouldRenderEntities' ] },
+    'Scene/shouldRenderAvatars': { object: [ Scene, 'shouldRenderAvatars' ] },
+    'camera-move-enabled': {
+        get: function() {
+            return cameraControls && cameraControls.enabled;
+        },
+        set: function(nv) {
+            cameraControls.setEnabled(!!nv);
+        },
+    },
+};
+
+var DEBUG_INFO = {
+    // these values are also sent to the tablet app after EventBridge initialization
+    appVersion: VERSION,
+    utilsVersion: _utils.version,
+    movementVersion: movementUtils.version,
+    configVersion: configUtils.version,
+    clientScript: Script.resolvePath(''),
+    MyAvatar: {
+        supportsPitchSpeed: 'pitchSpeed' in MyAvatar,
+        supportsYawSpeed: 'yawSpeed' in MyAvatar,
+        supportsLookAtSnappingEnabled: 'lookAtSnappingEnabled' in MyAvatar,
+    },
+    Reticle: {
+        supportsScale: 'scale' in Reticle,
+    },
+    protocolVersion: location.protocolVersion,
+};
+
+var globalState = {
+    // cached values from the last animation frame
+    previousValues: {
+        reset: function() {
+            this.pitchYawRoll = Vec3.ZERO;
+            this.thrust = Vec3.ZERO;
+        },
+    },
+
+    // batch updates to MyAvatar/Camera properties (submitting together seems to help reduce jitter)
+    pendingChanges: _utils.DeferredUpdater.createGroup({
+        Camera: Camera,
+        MyAvatar: MyAvatar,
+    }, { dedupe: false }),
+
+    // current input controls' effective velocities
+    currentVelocities: new movementUtils.VelocityTracker({
+        translation: Vec3.ZERO,
+        rotation: Vec3.ZERO,
+        zoom: Vec3.ZERO,
+    }),
+};
+
+function main() {
+    log('initializing...', VERSION);
+
+    var tablet = Tablet.getTablet('com.highfidelity.interface.tablet.system'),
+        button = tablet.addButton(BUTTON_CONFIG);
+
+    Script.scriptEnding.connect(function() {
+        tablet.removeButton(button);
+        button = null;
+    });
+
+    // track runtime state (applicationConfig) and Settings state (cameraConfig)
+    applicationConfig = new configUtils.ApplicationConfig({
+        namespace: DEFAULTS.namespace,
+        config: APPLICATION_SETTINGS,
+    });
+    cameraConfig = new configUtils.SettingsConfig({
+        namespace: DEFAULTS.namespace,
+        defaultValues: DEFAULTS,
+    });
+
+    var toggleKey = DEFAULT_TOGGLE_KEY;
+    if (cameraConfig.getValue('toggle-key')) {
+        try {
+            toggleKey = JSON.parse(cameraConfig.getValue('toggle-key'));
+        } catch (e) {}
+    }
+    // monitor configuration changes / keep tablet app up-to-date
+    var MONITOR_INTERVAL_MS = 1000;
+    _startConfigationMonitor(applicationConfig, cameraConfig, MONITOR_INTERVAL_MS);
+
+    // ----------------------------------------------------------------------------
+    // set up the tablet app
+    log('APP_HTML_URL', APP_HTML_URL);
+    var settingsApp = new CustomSettingsApp({
+        namespace: cameraConfig.namespace,
+        uuid: cameraConfig.uuid,
+        settingsAPI: cameraConfig,
+        url: APP_HTML_URL,
+        tablet: tablet,
+        extraParams: Object.assign({
+            toggleKey: toggleKey,
+        }, getSystemMetadata(), DEBUG_INFO),
+        debug: WANT_DEBUG > 1,
+    });
+    Script.scriptEnding.connect(settingsApp, 'cleanup');
+    settingsApp.valueUpdated.connect(function(key, value, oldValue, origin) {
+        log('settingsApp.valueUpdated: '+ key + ' = ' + JSON.stringify(value) + ' (was: ' + JSON.stringify(oldValue) + ')');
+        if (/tablet/i.test(origin)) {
+            // apply relevant settings immediately if changed from the tablet UI
+            if (applicationConfig.applyValue(key, value, origin)) {
+                log('settingsApp applied immediate setting', key, value);
+            }
+        }
+    });
+
+    // process custom eventbridge messages
+    settingsApp.onUnhandledMessage = function(msg) {
+        switch (msg.method) {
+            case 'window.close': {
+                this.toggle(false);
+            } break;
+            case 'reloadClientScript': {
+                log('reloadClientScript...');
+                _utils.reloadClientScript(FILENAME);
+            } break;
+            case 'resetSensors': {
+                Menu.triggerOption('Reset Sensors');
+                Script.setTimeout(function() {
+                    MyAvatar.bodyPitch = 0;
+                    MyAvatar.bodyRoll = 0;
+                    MyAvatar.orientation = Quat.cancelOutRollAndPitch(MyAvatar.orientation);
+                }, 500);
+            } break;
+            case 'reset': {
+                var resetValues = {};
+                // maintain current value of 'show advanced' so user can observe any advanced settings being reset
+                var showAdvancedKey = cameraConfig.resolve('ui-show-advanced-options');
+                resetValues[showAdvancedKey] = cameraConfig.getValue(showAdvancedKey);
+                Object.keys(DEFAULTS).reduce(function(out, key) {
+                    var resolved = cameraConfig.resolve(key);
+                    out[resolved] = resolved in out ? out[resolved] : DEFAULTS[key];
+                    return out;
+                }, resetValues);
+                Object.keys(applicationConfig.config).reduce(function(out, key) {
+                    var resolved = applicationConfig.resolve(key);
+                    out[resolved] = resolved in out ? out[resolved] : applicationConfig.getValue(key);
+                    return out;
+                }, resetValues);
+                log('restting to system defaults:', JSON.stringify(resetValues, 0, 2));
+                for (var p in resetValues) {
+                    var value = resetValues[p];
+                    applicationConfig.applyValue(p, value, 'reset');
+                    cameraConfig.setValue(p, value);
+                }
+            } break;
+            default: {
+                log('onUnhandledMessage', JSON.stringify(msg,0,2));
+            } break;
+        }
+    };
+
+    // ----------------------------------------------------------------------------
+    // set up the keyboard/mouse/controller input state manager
+    eventMapper = new movementUtils.MovementEventMapper({
+        namespace: DEFAULTS.namespace,
+        mouseSmooth: cameraConfig.getValue('enable-mouse-smooth'),
+        mouseMultiplier: cameraConfig.getValue('mouse-multiplier'),
+        keyboardMultiplier: cameraConfig.getValue('keyboard-multiplier'),
+        eventFilter: function eventFilter(from, event, defaultFilter) {
+            var result = defaultFilter(from, event),
+                driveKeyName = event.driveKeyName;
+            if (!result || !driveKeyName) {
+                if (from === 'Keyboard.RightMouseButton') {
+                    // let the app know when the user is mouse looking
+                    settingsApp.syncValue('Keyboard.RightMouseButton', event.actionValue, 'eventFilter');
+                }
+                return 0;
+            }
+            if (cameraConfig.getValue('normalize-inputs')) {
+                result = _utils.sign(result);
+            }
+            if (from === 'Actions.Pitch') {
+                result *= cameraConfig.getFloat('rotation-x-speed');
+            } else if (from === 'Actions.Yaw') {
+                result *= cameraConfig.getFloat('rotation-y-speed');
+            }
+            return result;
+        },
+    });
+    Script.scriptEnding.connect(eventMapper, 'disable');
+    // keep track of these changes live so the controller mapping can be kept in sync
+    applicationConfig.register({
+        'enable-mouse-smooth': { object: [ eventMapper.options, 'mouseSmooth' ] },
+        'keyboard-multiplier': { object: [ eventMapper.options, 'keyboardMultiplier' ] },
+        'mouse-multiplier': { object: [ eventMapper.options, 'mouseMultiplier' ] },
+    });
+
+    // ----------------------------------------------------------------------------
+    // set up the top-level camera controls manager / animator
+    var avatarUpdater = new AvatarUpdater({
+        debugChannel: _debugChannel,
+        globalState: globalState,
+        getCameraMovementSettings: getCameraMovementSettings,
+        getMovementState: _utils.bind(eventMapper, 'getState'),
+    });
+    cameraControls = new movementUtils.CameraControls({
+        namespace: DEFAULTS.namespace,
+        update: avatarUpdater,
+        threadMode: cameraConfig.getValue('thread-update-mode'),
+        fps: cameraConfig.getValue('fps'),
+        getRuntimeSeconds: _utils.getRuntimeSeconds,
+    });
+    Script.scriptEnding.connect(cameraControls, 'disable');
+    applicationConfig.register({
+        'thread-update-mode': { object: [ cameraControls, 'threadMode' ] },
+        'fps': { object: [ cameraControls, 'fps' ] },
+    });
+
+    // ----------------------------------------------------------------------------
+    // set up SPACEBAR for toggling camera movement mode
+    var spacebar = new _utils.KeyListener(Object.assign(toggleKey, {
+        onKeyPressEvent: function(event) {
+            cameraControls.setEnabled(!cameraControls.enabled);
+        },
+    }));
+    Script.scriptEnding.connect(spacebar, 'disconnect');
+
+    // ----------------------------------------------------------------------------
+    // set up ESC for resetting all drive key states
+    Script.scriptEnding.connect(new _utils.KeyListener({
+        text: 'ESC',
+        onKeyPressEvent: function(event) {
+            if (cameraControls.enabled) {
+                log('ESC pressed -- resetting drive keys:', JSON.stringify({
+                    virtualDriveKeys: eventMapper.states,
+                    movementState: eventMapper.getState(),
+                }, 0, 2));
+                eventMapper.states.reset();
+                MyAvatar.velocity = Vec3.ZERO;
+                MyAvatar.angularVelocity = Vec3.ZERO;
+            }
+        },
+    }), 'disconnect');
+
+    // set up the tablet button to toggle the UI display
+    button.clicked.connect(settingsApp, function(enable) {
+        Object.assign(this.extraParams, getSystemMetadata());
+        button.editProperties({ text: '(opening)' + BUTTON_CONFIG.text, isActive: true });
+        this.toggle(enable);
+    });
+
+    settingsApp.isActiveChanged.connect(function(isActive) {
+        updateButtonText();
+        if (Overlays.getOverlayType(HMD.tabletScreenID)) {
+            var fromMode = Overlays.getProperty(HMD.tabletScreenID, 'inputMode'),
+                inputMode = isActive ? "Mouse" : "Touch";
+            log('switching HMD.tabletScreenID from inputMode', fromMode, 'to', inputMode);
+            Overlays.editOverlay(HMD.tabletScreenID, { inputMode: inputMode });
+        }
+    });
+
+    cameraControls.modeChanged.connect(onCameraModeChanged);
+
+    function updateButtonText() {
+        var lines = [
+            settingsApp.isActive ? '(app open)' : '',
+            cameraControls.enabled ? (avatarUpdater.update.momentaryFPS||0).toFixed(2) + 'fps' : BUTTON_CONFIG.text.trim()
+        ];
+        button && button.editProperties({ text: lines.join('\n') });
+    }
+
+    var fpsTimeout = 0;
+    cameraControls.enabledChanged.connect(function(enabled) {
+        log('enabledChanged', enabled);
+        button && button.editProperties({ isActive: enabled });
+        if (enabled) {
+            onCameraControlsEnabled();
+            fpsTimeout = Script.setInterval(updateButtonText, 1000);
+        } else {
+            if (fpsTimeout) {
+                Script.clearInterval(fpsTimeout);
+                fpsTimeout = 0;
+            }
+            eventMapper.disable();
+            avatarUpdater._resetMyAvatarMotor({ MyAvatar: MyAvatar });
+            updateButtonText();
+            if (settingsApp.isActive) {
+                settingsApp.syncValue('Keyboard.RightMouseButton', false, 'cameraControls.disabled');
+            }
+        }
+        overlayDebugOutput.overlayID && Overlays.editOverlay(overlayDebugOutput.overlayID, { visible: enabled });
+    });
+
+    // when certain settings change we need to reset the drive systems
+    var resetIfChanged = [
+        'minimal-cursor', 'drive-mode', 'fps', 'thread-update-mode',
+        'mouse-multiplier', 'keyboard-multiplier',
+        'enable-mouse-smooth', 'constant-delta-time',
+    ].filter(Boolean).map(_utils.bind(cameraConfig, 'resolve'));
+
+    cameraConfig.valueUpdated.connect(function(key, value, oldValue, origin) {
+        var triggerReset = !!~resetIfChanged.indexOf(key);
+        log('cameraConfig.valueUpdated: ' + key + ' = ' + JSON.stringify(value), '(was:' + JSON.stringify(oldValue) + ')',
+            'triggerReset: ' + triggerReset);
+
+        if (/tablet/i.test(origin)) {
+            if (applicationConfig.applyValue(key, value, origin)) {
+                log('cameraConfig applied immediate setting', key, value);
+            }
+
+        }
+        triggerReset && cameraControls.reset();
+    });
+
+    if (cameraConfig.getValue('camera-move-enabled')) {
+        cameraControls.enable();
+    }
+
+    log('DEFAULTS', JSON.stringify(DEFAULTS, 0, 2));
+} // main()
+
+function onCameraControlsEnabled() {
+    log('onCameraControlsEnabled');
+    globalState.previousValues.reset();
+    globalState.currentVelocities.reset();
+    globalState.pendingChanges.reset();
+    eventMapper.enable();
+    if (cameraConfig.getValue('minimal-cursor')) {
+        Reticle.scale = MINIMAL_CURSOR_SCALE;
+    }
+    log('cameraConfig', JSON.stringify({
+        cameraConfig: getCameraMovementSettings(),
+    }));
+}
+
+// reset orientation-related values when the Camera.mode changes
+function onCameraModeChanged(mode, oldMode) {
+    globalState.pendingChanges.reset();
+    globalState.previousValues.reset();
+    eventMapper.reset();
+    var preventRoll = cameraConfig.getValue('prevent-roll');
+    var avatarOrientation = cameraConfig.getValue('use-head') ? MyAvatar.headOrientation : MyAvatar.orientation;
+    if (preventRoll) {
+        avatarOrientation = Quat.cancelOutRollAndPitch(avatarOrientation);
+    }
+    switch (Camera.mode) {
+        case 'mirror':
+        case 'entity':
+        case 'independent':
+            globalState.currentVelocities.reset();
+            break;
+        default:
+            Camera.position = MyAvatar.position;
+            Camera.orientation = avatarOrientation;
+            break;
+    }
+    MyAvatar.orientation = avatarOrientation;
+    if (preventRoll) {
+        MyAvatar.headPitch = MyAvatar.headRoll = 0;
+    }
+}
+
+// consolidate and normalize cameraConfig settings
+function getCameraMovementSettings() {
+    return {
+        epsilon: EPSILON,
+        debug: cameraConfig.getValue('debug'),
+        jitterTest: cameraConfig.getValue('jitter-test'),
+        driveMode: cameraConfig.getValue('drive-mode'),
+        threadMode: cameraConfig.getValue('thread-update-mode'),
+        fps: cameraConfig.getValue('fps'),
+        useHead: cameraConfig.getValue('use-head'),
+        stayGrounded: cameraConfig.getValue('stay-grounded'),
+        preventRoll: cameraConfig.getValue('prevent-roll'),
+        useConstantDeltaTime: cameraConfig.getValue('constant-delta-time'),
+
+        collisionsEnabled: applicationConfig.getValue('Avatar/Enable Avatar Collisions'),
+        mouseSmooth: cameraConfig.getValue('enable-mouse-smooth'),
+        mouseMultiplier: cameraConfig.getValue('mouse-multiplier'),
+        keyboardMultiplier: cameraConfig.getValue('keyboard-multiplier'),
+
+        rotation: _getEasingGroup(cameraConfig, 'rotation'),
+        translation: _getEasingGroup(cameraConfig, 'translation'),
+        zoom: _getEasingGroup(cameraConfig, 'zoom'),
+    };
+
+    // extract a single easing group (translation, rotation, or zoom) from cameraConfig
+    function _getEasingGroup(cameraConfig, group) {
+        var multiplier = 1.0;
+        if (group === 'zoom') {
+            // BoomIn / TranslateCameraZ support is only partially plumbed -- for now use scaled translation easings
+            group = 'translation';
+            multiplier = 0.001;
+        }
+        return {
+            easeIn: cameraConfig.getFloat(group + '-ease-in'),
+            easeOut: cameraConfig.getFloat(group + '-ease-out'),
+            maxVelocity: multiplier * cameraConfig.getFloat(group + '-max-velocity'),
+            speed: Vec3.multiply(multiplier, {
+                x: cameraConfig.getFloat(group + '-x-speed'),
+                y: cameraConfig.getFloat(group + '-y-speed'),
+                z: cameraConfig.getFloat(group + '-z-speed')
+            }),
+        };
+    }
+}
+
+// monitor and sync Application state -> Settings values
+function _startConfigationMonitor(applicationConfig, cameraConfig, interval) {
+    return Script.setInterval(function monitor() {
+        var settingNames = Object.keys(applicationConfig.config);
+        settingNames.forEach(function(key) {
+            applicationConfig.resyncValue(key); // align Menus <=> APIs
+            var value = cameraConfig.getValue(key),
+                appValue = applicationConfig.getValue(key);
+            if (appValue !== undefined && String(appValue) !== String(value)) {
+                log('applicationConfig -> cameraConfig',
+                    key, [typeof appValue, appValue], '(was:'+[typeof value, value]+')');
+                cameraConfig.setValue(key, appValue); // align Application <=> Settings
+            }
+        });
+    }, interval);
+}
+
+// ----------------------------------------------------------------------------
+// DEBUG overlay support (enable by setting app-camera-move/debug = true in settings
+// ----------------------------------------------------------------------------
+function _instrumentDebug() {
+    debugPrint = log;
+    var cacheBuster = '?' + new Date().getTime().toString(36);
+    require = Script.require(Script.resolvePath('./modules/_utils.js') + cacheBuster).makeDebugRequire(Script.resolvePath('.'));
+    APP_HTML_URL += cacheBuster;
+    overlayDebugOutput = _createOverlayDebugOutput({
+        lineHeight: 12,
+        font: { size: 12 },
+        width: 250, height: 800 });
+    // auto-disable camera move mode when debugging
+    Script.scriptEnding.connect(function() {
+        cameraConfig && cameraConfig.setValue('camera-move-enabled', false);
+    });
+}
+
+function _fixedPrecisionStringifiyFilter(key, value, object) {
+    if (typeof value === 'object' && value && 'w' in value) {
+        return Quat.safeEulerAngles(value);
+    } else if (typeof value === 'number') {
+        return value.toFixed(4)*1;
+    }
+    return value;
+}
+
+function _createOverlayDebugOutput(options) {
+    options = require('./modules/_utils.js').assign({
+        x: 0, y: 0, width: 500, height: 800, visible: false
+    }, options || {});
+    options.lineHeight = options.lineHeight || Math.round(options.height / 36);
+    options.font = options.font || { size: Math.floor(options.height / 36) };
+    overlayDebugOutput.overlayID = Overlays.addOverlay('text', options);
+
+    Messages.subscribe(_debugChannel);
+    Messages.messageReceived.connect(onMessageReceived);
+
+    Script.scriptEnding.connect(function() {
+        Overlays.deleteOverlay(overlayDebugOutput.overlayID);
+        Messages.unsubscribe(_debugChannel);
+        Messages.messageReceived.disconnect(onMessageReceived);
+    });
+    function overlayDebugOutput(output) {
+        var text = JSON.stringify(output, _fixedPrecisionStringifiyFilter, 2);
+        if (text !== overlayDebugOutput.lastText) {
+            overlayDebugOutput.lastText = text;
+            Overlays.editOverlay(overlayDebugOutput.overlayID, { text: text });
+        }
+    }
+    function onMessageReceived(channel, message, ssend, local) {
+        if (local && channel === _debugChannel) {
+            overlayDebugOutput(JSON.parse(message));
+        }
+    }
+    return overlayDebugOutput;
+}
+
+// ----------------------------------------------------------------------------
+_patchCameraModeSetting();
+function _patchCameraModeSetting() {
+    // FIXME: looks like the Camera API suffered a regression where Camera.mode = 'first person' or 'third person'
+    //  no longer works from the API; setting via Menu items still seems to work though.
+    Camera.$setModeString = Camera.$setModeString || function(mode) {
+        // 'independent' => "Independent Mode", 'first person' => 'First Person', etc.
+        var cameraMenuItem = (mode+'')
+            .replace(/^(independent|entity)$/, '$1 mode')
+            .replace(/\b[a-z]/g, function(ch) {
+                return ch.toUpperCase();
+            });
+
+        log('working around Camera.mode bug by enabling the menuItem:', cameraMenuItem);
+        Menu.setIsOptionChecked(cameraMenuItem, true);
+    };
+}
+
+function getSystemMetadata() {
+    var tablet = Tablet.getTablet('com.highfidelity.interface.tablet.system');
+    return {
+        mode: {
+            hmd: HMD.active,
+            desktop: !HMD.active,
+            toolbar: Uuid.isNull(HMD.tabletID),
+            tablet: !Uuid.isNull(HMD.tabletID),
+        },
+        tablet: {
+            toolbarMode: tablet.toolbarMode,
+            desktopScale: Settings.getValue('desktopTabletScale'),
+            hmdScale: Settings.getValue('hmdTabletScale'),
+        },
+        window: {
+            width: Window.innerWidth,
+            height: Window.innerHeight,
+        },
+        desktop: {
+            width: Desktop.width,
+            height: Desktop.height,
+        },
+    };
+}
+
+// ----------------------------------------------------------------------------
+main();
+
+if (typeof module !== 'object') {
+    // if uncaught exceptions occur, show the first in an alert with option to stop the script
+    Script.unhandledException.connect(function onUnhandledException(error) {
+        Script.unhandledException.disconnect(onUnhandledException);
+        log('UNHANDLED EXCEPTION', error, error && error.stack);
+        try {
+            cameraControls.disable();
+        } catch (e) {}
+        //  show the error message and first two stack entries
+        var trace = _utils.normalizeStackTrace(error);
+        var message = [ error ].concat(trace.split('\n').slice(0,2)).concat('stop script?').join('\n');
+        Window.confirm('app-camera-move error: ' + message.substr(0,256)) && Script.stop();
+    });
+}
diff --git a/unpublishedScripts/marketplace/camera-move/app.html b/unpublishedScripts/marketplace/camera-move/app.html
new file mode 100644
index 0000000000..100a8237b5
--- /dev/null
+++ b/unpublishedScripts/marketplace/camera-move/app.html
@@ -0,0 +1,1340 @@
+<!doctype html>
+<html class="tablet-ui">
+  <head>
+    <title>Camera Move</title>
+    <script> VERSION = '0.0.1'; </script>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
+
+    <!-- hide the page content until fully loaded -->
+    <style>
+      body { background-color: #393939 }
+      .content { display: none }
+    </style>
+
+    <!-- bring in jQuery (MIT) and jQuery UI (MIT) -->
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.js"></script>
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/themes/base/jquery-ui.css" />
+
+    <!-- bring in Mousetrap (Apache 2.0) for keybinding support -->
+    <script src="https://cdn.jsdelivr.net/g/mousetrap@1.6.1(mousetrap.js+plugins/bind-dictionary/mousetrap-bind-dictionary.min.js+plugins/global-bind/mousetrap-global-bind.min.js)"></script>
+
+    <!-- bring in Tooltipster (MIT) for tooltip support -->
+    <script src="https://cdn.jsdelivr.net/jquery.tooltipster/4.2.5/js/tooltipster.bundle.min.js"></script>
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/g/jquery.tooltipster@4.2.5(css/tooltipster.bundle.min.css+css/plugins/tooltipster/sideTip/themes/tooltipster-sideTip-noir.min.css)">
+
+    <script src='./_debug.js'></script>
+
+    <!-- load our local scripts -->
+    <script type='require' src='./modules/_utils.js'></script>
+    <script type='require' src='./modules/custom-settings-app/browser/BridgedSettings.js'></script>
+    <script type='require' src='./modules/custom-settings-app/browser/JQuerySettings.js'></script>
+    <script type='require'>{
+        signal = _utils.signal;
+        assert = _utils.assert;
+        Object.assign = Object.assign || _utils.assign;
+        browserUtils = new _utils.BrowserUtils(window);
+    }</script>
+    <script type='require' src='./app.js'></script>
+    <script type='require' src='./hifi-jquery-ui.js'></script>
+    <script type='require' src='./_json-persist.js'></script>
+    <script type='require' src='./_tooltips.js'></script>
+    <script type='require' src='./_less-utils.js'></script>
+    <script type='require' src='../app.fileOnErrors.js'></script>
+
+    <script>
+      _debug.loadScriptNodes('script[type=require]');
+    </script>
+
+    <script>;
+try {
+    // Qt web views only show the first parameter passed to console; patch if needed so all parameters show up
+    console = browserUtils.makeConsoleWorkRight(console);
+
+    // display unhandled exceptions in an error div
+    if (/debug|localhost|file:/.test(location) || window.qt) {
+        window.onerror = window._debug ? _debug.handleUncaughtException : null;
+    }
+
+    // process querystring parameters from main client script
+    var PARAMS = browserUtils.extendWithQueryParams({
+        namespace: location.pathname.split('/').pop(),
+        uuid: undefined,
+        debug: false,
+        tooltiptest: false,
+    }, location.href);
+
+    log.prefix = 'html.' + PARAMS.namespace + ' | ';
+    function log(msg) {
+        console.info.apply(console, [log.prefix + msg].concat([].slice.call(arguments,1)));
+    }
+    function _debugPrint(msg) {
+        console.debug.apply(console, [log.prefix + msg].concat([].slice.call(arguments,1)));
+    }
+    var debugPrint = PARAMS.debug ? _debugPrint : function() {};
+
+    $(document).ready(function() {
+        initializeDOM();
+
+        // event bridge intialization
+        debugPrint('document.ready...');
+        if (typeof QWebChannel === 'function') {
+            // Qt/Interface within an embedded web view
+            browserUtils.openEventBridge(onEventBridgeOpened);
+        } else {
+            // Testing in Desktop Chrome
+            _debug.openEventBridgeMock(onEventBridgeOpened);
+        }
+    });
+
+    function onEventBridgeOpened(_eventBridge) {
+        if (!window.EventBridge) {
+            window.EventBridge = _eventBridge;
+        }
+        assert(_eventBridge === window.EventBridge,
+               'ERROR: window.EventBridge materialized spontaneously and differently from the QWebChannel-derived value');
+        log('openEventBridge.opened', window.EventBridge);
+
+        bridgedSettings = new BridgedSettings({
+            namespace: PARAMS.namespace,
+            uuid: PARAMS.uuid,
+            debug: PARAMS.debug,
+            extraParams: { contentVersion: VERSION },
+        });
+        window.addEventListener('unload', bridgedSettings.cleanup.bind(bridgedSettings));
+
+        bridgedSettings.callbackError.connect(function onCallbackError(err, msg)  {
+            console.error(err.stack);
+            throw err;
+        });
+
+        jquerySettings = new JQuerySettings({
+            namespace: PARAMS.namespace,
+            uuid: PARAMS.uuid,
+            debug: PARAMS.debug,
+        });
+
+        debugPrint('>>> SENDING ACK');
+        // let Client script know we are ready
+        bridgedSettings.eventBridge.emitWebEvent(location.href);
+
+        function onValueReceived(key, value, oldValue, origin) {
+            onMutationEvent.paused++;
+            try {
+                //debugPrint('>>> onValueReceived', key, value, origin);
+                jquerySettings.setValue(key, value, origin);
+            } finally {
+                setTimeout(function() { onMutationEvent.paused--; }, 1);
+            }
+        }
+        // keep DOM in sync when Interface changes
+        bridgedSettings.valueReceived.connect(onValueReceived);
+
+        // Object.defineProperty(onMutationEvent, 'paused', {
+        //     enumerable: true,
+        //     get: function() { return this._paused || 0; },
+        //     set: function(nv) { this._paused = nv; log('paused = ' + nv); return nv; },
+        // });
+
+        var THROTTLE_DELAY_MS = 500;
+        function throttledSend(update) {
+            var $hash = [update.params[0], update.method].join('-'); // key-method
+            window.clearTimeout(throttledSend[$hash]);
+            throttledSend[$hash] = window.setTimeout(function() {
+                delete throttledSend[$hash];
+                //debugPrint('>>> throttled mutation event:', $hash, update.method, update.params);
+                bridgedSettings.sendEvent(update);
+            }, THROTTLE_DELAY_MS);
+        }
+
+        onMutationEvent.paused = 1;
+        function onMutationEvent(event) {
+            assert(onMutationEvent.paused >= 0);
+            if (!onMutationEvent.paused) {
+                //debugPrint('>>> mutation event:', event.key, event.value);
+                throttledSend({
+                    method: 'valueUpdated', params: [
+                        event.key, event.value, event.oldValue, event.hifiType
+                    ]
+                });
+            } else {
+                //debugPrint('>> (paused) mutation event:', event.key, event.value);
+            }
+        }
+
+        // unpause the mutation handler after the initial requests complete
+        bridgedSettings.pendingRequestsFinished.connect(function once() {
+            bridgedSettings.pendingRequestsFinished.disconnect(once);
+            onMutationEvent.paused--;
+            // jump to a particular page element if any match with the URL hash fragment
+            window.setTimeout(function() {
+                window.jumpToAnchor(location.hash.split(/[#?&]/g).pop());
+            }, 250);
+        });
+        jquerySettings.mutationEvent.connect(onMutationEvent);
+
+        setupUI();
+
+        window.setTimeout(function() {
+            // wait a tic before showing so initial async settings have time to queue/arrive
+            $('section').show();
+        }, 150);
+    }
+} catch(e) { alert(e) }</script>
+  </head>
+
+  <body class="settings-app">
+    <div class="content">
+      <header class="title">
+        <div class="inner-title">
+          <h1>Camera Move</h1>
+          <label><input type="checkbox" id="camera-move-enabled" /> Enabled </label>
+          <div id="appVersion"><span class='output'>...</span></div>
+        </div>
+      </header>
+
+      <div class='scrollable'>
+        <section>
+          <h2>Translation</h2>
+          <div class="number row">
+            <label>Max Linear Velocity <span class="unit">m/s</span></label>
+            <input id="translation-max-velocity" data-type="number" step=".1"  />
+            <span class="tooltip">
+              avatar walking/flying speed limit (ie: the value eased-into)
+            </span>
+          </div>
+          <div class="slider row">
+            <label>Ease In Coefficient</label>
+            <div type="slider" class="control" data-for="translation-ease-in"></div>
+            <input data-type="number" id="translation-ease-in" data-step=".1" />
+            <span class="tooltip"><ul>
+                <li>lower values gently ramp-into moving</li>
+                <li>higher values rapidly accelerate to top speed</li>
+            </ul></span>
+          </div>
+          <div class="slider row">
+            <label>Ease Out Coefficient</label>
+            <div type="slider" class="control" data-for="translation-ease-out"></div>
+            <input id="translation-ease-out" data-type="number" data-step=".1" />
+            <span class="tooltip"><ul>
+                <li>lower values bring movement to a rolling stop</li>
+                <li>higher values stop movements more immediately</li>
+            </ul></span>
+          </div>
+        </section>
+
+        <hr />
+
+        <section>
+          <h2>Rotation</h2>
+          <div class="number row">
+            <label>Max Angular Velocity<span class="unit">deg/s</span></label>
+            <input id="rotation-max-velocity" data-type="number" step=".1" />
+            <span class="tooltip">look up/down (pitch) and turn left/right (yaw) speed limit</span>
+          </div>
+          <div class="slider row">
+            <label>Ease In Coefficient</label>
+            <div type="slider" class="control" data-for="rotation-ease-in"></div>
+            <input id="rotation-ease-in" data-type="number" />
+            <ul class="tooltip">
+              <li>lower values gently start turning or looking up/down</li>
+              <li>higher values quickly turn and look around</li>
+            </ul>
+          </div>
+          <div class="slider row">
+            <label>Ease Out Coefficient</label>
+            <div type="slider" class="control" data-for="rotation-ease-out"></div>
+            <input id="rotation-ease-out" data-type="number"  />
+            <ul class="tooltip">
+              <li>lower values bring turning/looking to a rolling stop</li>
+              <li>higher values stop turning/looking more immediately</li>
+            </ul>
+          </div>
+        </section>
+
+        <hr />
+
+        <section>
+          <h2>Options</h2>
+          <div class="checkbox rows">
+            <label><input data-for="Avatar/lookAtSnappingEnabled" data-autoenable="false" type="checkbox" />
+              Avatars snap look at camera
+              <span class="tooltip">
+                uncheck this to prevent avatars from making automatic eye contact with the camera
+              </span>
+            </label>
+            <label><input data-for="Avatar/useSnapTurn" id="use-snap-turn" type="checkbox" />
+              Enable snap turn in HMD
+              <span class="tooltip">
+                toggles <b>Settings &gt; Avatar &gt; Snap turn while in HMD</b>
+              </span>
+            </label>
+            <label><input id="enable-mouse-smooth" type="checkbox"  />
+              Enable smooth mouselook
+              <span class="tooltip">
+                uncheck this to bypass smoothing for right-mouse-button drag controls</span>
+            </label>
+            <label><input id="minimal-cursor" data-autoenable="false" type="checkbox" />
+              Enable minimal cursor
+              <span class="tooltip">
+                use half-sized mouse cursor</span>
+            </label>
+          </div>
+        </section>
+
+        <!-- advanced-options -->
+        <div style='display: none' id='advanced-options'>
+          <br />
+          <br />
+          <div class='content'>
+            <hr />
+            <section>
+              <h2>Additional Options</h2>
+              <div class="checkbox rows">
+                <label><input id="collisions-enabled" data-for="Avatar/Enable Avatar Collisions" type="checkbox" />
+                  Enable Avatar Collisions
+                  <span class="tooltip">
+                    toggles <b>Avatar &gt; Enable Avatar Collisions</b>
+                  </span>
+                </label>
+                <label><input data-for="Avatar/Draw Mesh" id="draw-mesh" type="checkbox" />
+                  Render Avatar
+                  <span class="tooltip">
+                    toggles <b>Developer &gt; Avatar &gt; Draw Mesh</b>
+                  </span>
+                </label>
+                <label><input id="stay-grounded" type="checkbox" />
+                  Stay on ground
+                  <span class="tooltip">
+                    prevent Y-axis translation when <b>Application.isGrounded</b> reports true.<br /><i>(can be temporarily overridden by looking up or down &gt;= 45&deg; )</i>
+                  </span>
+                </label>
+                <label><input id="prevent-roll" type="checkbox" />
+                  Prevent Roll
+                  <span class="tooltip">
+                    keep upright by applying <b>Quat.cancelOutRoll</b> to resulting rotations
+
+                  </span>
+                </label>
+                <label><input id="ui-enable-tooltips" type="checkbox" />
+                  Enable UI tooltips
+                  <span class="tooltip">
+                    toggle display of tooltips like this one
+                  </span>
+                </label>
+                <br />
+              </div>
+            </section>
+
+            <hr />
+            <section>
+              <h2>Rotation Speeds</h2>
+              <div class="column" data-tooltipster='{"distance":{"top":24,"bottom":10},"side":["top","bottom"]}'>
+                <div class="number row">
+                  <label>Pitch speed <span class="unit">deg/unit</span></label>
+                  <input id="rotation-x-speed" data-type="number" min="-1000" step="1" />
+                  <ul class="tooltip">
+                    <li>look up/down amount applied per unit controller input</li>
+                    <li>use a negative value for inverted mouselook behavior (eg: <b>&minus;1</b>)</li>
+                  </ul>
+                </div>
+                <div class="number row">
+                  <label>Yaw speed<span class="unit">deg/unit</span></label>
+                  <input id="rotation-y-speed" data-type="number" min="-1000" step="1" />
+                  <span class="tooltip">
+                    turn left/right amount applied per unit controller input
+                  </span>
+                </div>
+              </div>
+            </section>
+
+            <hr />
+
+            <section>
+              <h2>input scaling</h2>
+              <div class="column" data-tooltipster='{"distance":{"top":24,"bottom":10},"side":["top","bottom"]}'>
+                <div class="number row">
+                  <label>Keyboard multiplier</label>
+                  <input id="keyboard-multiplier" data-type="number" min="-1000" step=".01" data-step=".1"  />
+                  <span class="tooltip">
+                    prescaled keyboard inputs by this amount
+                  </span>
+                </div>
+                <div class="number row">
+                  <label>Mouse multiplier</label>
+                  <input id="mouse-multiplier" data-type="number" min="-1000" step=".01" data-step=".1" />
+                  <span class="tooltip">
+                    prescale mouse inputs by this amount
+                  </span>
+                </div>
+              </div>
+            </section>
+
+            <hr />
+
+            <section>
+              <h2>Update Modes</h2>
+              <div class='column'>
+                <fieldset id="drive-mode" class="radio rows" data-tooltipster='{"side":["right","top"]}'>
+                  <legend>Avatar Movement</legend>
+                  <label><input value="motor" type="radio" />
+                    Scripted Motor Control
+                    <span class="tooltip">
+                      apply movements using <b>MyAvatar.motorVelocity</b>
+                    </span>
+                  </label>
+                  <label><input value="position" type="radio" />
+                    Avatar position
+                    <span class="tooltip">
+                      apply movements as changes to <b>MyAvatar.position</b>
+                    </span>
+                  </label>
+                  <label><input value="thrust" type="radio" />
+                    Thrust/force vectors
+                    <span class="tooltip">
+                      apply movements using <b>MyAvatar.setThrust()</b>
+                    </span>
+                  </label>
+                </fieldset>
+
+                <fieldset id="thread-update-mode" class="radio rows" data-tooltipster='{"side":["left","top"]}'>
+                  <legend>Timing</legend>
+                  <label><input value="update" type="radio" />
+                    Use Script.update
+                    <span class="tooltip">
+                      apply movement updates ~60 times per second
+                    </span>
+                  </label>
+                  <label><input value="setImmediate" type="radio" />
+                    Update every 5ms
+                    <span class="tooltip">
+                      schedule movement updates every 5ms
+                    </span>
+                  </label>
+                  <label><input value="nextTick" type="radio" />
+                    Update continuously
+                    <span class="tooltip">
+                      schedule movement updates continuously
+                    </span>
+                  </label>
+                  <div class="radio row extended">
+                    <label><input value="requestAnimationFrame" type="radio" />
+                      Update @ FPS:
+                      <span class="tooltip">
+                        schedule movement updates at the specified rate per second
+                      </span>
+                    </label>
+                    <input id="fps" data-type="number" data-autoenable="false" step="1" min="0" />
+                  </div>
+                </fieldset>
+              </div>
+              <br />
+            </section>
+
+            <hr />
+
+            <section>
+              <h2>Advanced Options</h2>
+              <div class="checkbox rows">
+                <label><input id="use-head" type="checkbox" />
+                  Apply rotations to Avatar Head
+                  <span class="tooltip">
+                    update <b>MyAvatar.headOrientation</b> (instead of body orientation)
+                  </span>
+                </label>
+                <label><input id="constant-delta-time" type="checkbox" />
+                  Use constant &Delta; time for frame updates
+                  <span class="tooltip">
+                    ignore actual time between frames and instead calculate using <b>(1s / requestAnimationFrame.fps)</b> or <b>(1s / 90fps)</b>
+                  </span>
+                </label>
+                <label><input id="normalize-inputs" type="checkbox" />
+                  Normalize mouse movement
+                  <span class="tooltip">
+                    convert variable mouse movements into unit values <b>&plus;1, 0, &minus;1</b>
+                  </span>
+                </label>
+                <label><input data-for="Avatar/Show My Eye Vectors" type="checkbox" />
+                  Show My Eye Vectors
+                  <span class="tooltip">
+                    toggles <b>Developer &gt; Avatar &gt; Show My Eye Vectors</b>
+                  </span>
+                </label>
+                <label><input data-for="Avatar/Show Other Eye Vectors" type="checkbox" />
+                  Show Other Eye Vectors
+                  <span class="tooltip">
+                    toggles <b>Developer &gt; Avatar &gt; Show Other Eye Vectors</b>
+                  </span>
+                </label>
+                <label class="off-red"><input data-for="Scene/shouldRenderEntities" type="checkbox" />
+                  Render Entities (debug)
+                  <span class="tooltip">
+                    toggles <b>Scene.shouldRenderEntities</b>
+                  </span>
+                </label>
+                <label class="off-red"><input data-for="Scene/shouldRenderAvatars" type="checkbox" />
+                  Render Avatars (debug)
+                  <span class="tooltip">
+                    toggles <b>Scene.shouldRenderAvatars</b>
+                  </span>
+                </label>
+                <label class="on-red"><input id="jitter-test" type="checkbox" />
+                  Jitter Rotation Test (debug)
+                  <span class="tooltip">
+                    Applies a constant avatar rotation to help reveal system-level jitter and update interference
+                  </span>
+                </label>
+              </div>
+              <br />
+            </section>
+
+            <hr />
+            <section id='debug-menu'>
+              <h2>debug menu</h2>
+              <div class='buttons'>
+                <div style='float:left'>
+                  <button id='reset-sensors'>
+                    Reset Avatar
+                    <span class="tooltip">
+                      trigger <b>MyAvatar &gt; Reset Sensors</b>;reset <b>bodyPitch</b> and <b>bodyYaw</b>
+                    </span>
+                  </button>
+                  <button title='test EventBridge.emitWebEvent' class='localhost-only' id='test-event-bridge'>EventBridge test</button>
+                  <button title='reload the tablet app web view' class='localhost-only' id='page-reload'>refresh page</button>
+                  <button title='reload the Client script' class='localhost-only' id='script-reload'>reload script</button>
+                </div>
+                <div style='float:right'>
+                  <button id='copy-json'>
+                    Export JSON
+                    <span class="tooltip">exports current settings as JSON
+                    </span>
+                  </button>
+                  <button id='paste-json'>
+                    Import JSON
+                    <span class="tooltip">replace current settings with previously-exported JSON
+                    </span>
+                  </button>
+                </div>
+              </div>
+            </section>
+
+            <hr />
+            <div class='footer-stop'>&nbsp;</div>
+          </div>
+        </div><!-- /advanced-options -->
+      </div><!-- /scrollable -->
+
+      <footer>
+        <div style='float:left'>
+          <button id='reset-to-defaults' data-tooltipster='{"side":["top"]}'>
+            Reset
+            <span class="tooltip">
+              <span style="font-size:1.5em;color:red;padding:.3em;">&#x26a0;
+              </span>
+              Reset to System Defaults
+            </span>
+          </button>
+        </div>
+        <center>
+          <div id='toggleKey'>keybinding: &nbsp; <span class='binding'>&hellip;</span></div>
+        </center>
+        <div style='float:right'>
+          <button checked=false data-for='ui-show-advanced-options' class='toggle-advanced-options' id='toggle-advanced-options'>Advanced<span class='chevron'>
+            </span>
+            <span class="tooltip">show / hide advanced settings
+            </span>
+          </button>
+        </div>
+        <br />
+      </footer>
+    </div><!-- /content -->
+
+    <div id="errors" style="display:none">
+      <div class='title'>PAGE ERROR:</div>
+      <pre class='output'></pre>
+      <pre class='debug-lines' style='display:none;'><span class='content'></span></pre>
+      <div class='buttons'><button onclick='location.reload()'>reload page</button>&nbsp; | &nbsp;<button>dismiss</button></div>
+    </div>
+    <!-- generate debug line outputs -->
+    <script>(function(template) {
+        for (var i=0; i !== 25; i++) {
+            template.parentNode.appendChild(template.cloneNode());
+        }
+      })(document.querySelector('#errors .debug-lines .content'));
+    </script>
+    <script>
+    var LESS_GLOBALS = {
+        'interface-mode': /highfidelity/i.test(navigator.userAgent),
+        'header-height': 48,
+        'footer-height': 32,
+        'font-source': /unpublishedScripts/.test(location.pathname) ? 'unpublishedScripts' : 'google',
+        'hifi-custom-font-family': 'Raleway-Regular',
+        'hifi-input-font-family': 'FiraSans-Regular',
+        'color-highlight': '#009bd5',
+        'color-text': '#afafaf',
+        'color-bg': '#393939',
+        'color-bg-darker': '#252525',
+        'color-bg-icon': '#545454',
+        'color-primary-button': 'darken(darkblue,10%)',
+        'color-alt-button': 'green',
+        'color-caution-button': 'darkred',
+    };
+    </script>
+    <style id='tablet-ui-less' type="text/less">
+// #line 613 "app.html"
+// Embedded LESS stylesheets are used as a structured way to manage page styling.
+// The template rules below get compiled at page load time by less.js.
+//   see: app.js:preconfigureLESS() and http://lesscss.org/usage/ for more info
+// ----------------------------------------------------------------------------
+// tablet-ui.less
+.load-fonts();
+.tablet-ui {
+    .mixin-tablet-mode() {
+        width: 100%;
+        margin-left: -3px;
+        margin-right: 0;
+        overflow-x: hidden;
+        .column { margin-left: -8px; }
+        .content {
+            .slider {
+                .ui-spinner {
+                    width: 80px;
+                }
+            }
+        }
+    }
+    .tablet-mode { .mixin-tablet-mode() !important; }
+
+    body {
+        color: @color-text;
+        background-color: @color-bg;
+
+        &.window-blurred header {
+            opacity: .5;
+        }
+
+        font-family: '@{custom-font-family}';
+        font-size: 15px;
+        text-rendering: optimizeLegibility;
+        -webkit-touch-callout: none;
+        -webkit-user-select: none;
+        user-select: none;
+        overflow: hidden;
+        overflow-x: hidden !important;
+        padding: 0;
+        margin: 0;
+
+        height: @client-height * 1px;
+        //margin-top: 6px;
+        margin-left: -5px;
+        overflow: hidden;
+        input, textarea {
+            font-family: '@{input-font-family}', sans-serif;
+            user-select: auto;
+            -webkit-user-select: auto;
+        }
+    }
+
+    p { margin: 2px 0; }
+
+    header { z-index: 2; }
+
+    section { padding: 0 24px; }
+
+    hr {
+        border: none;
+        background: #404040 url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAYAAACp8Z5+AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAAjSURBVBhXY1RVVf3PgARYjIyMoEwIYHRwcEBRwQSloYCBAQCwjgPMiI7W2QAAAABJRU5ErkJggg==) repeat-x top left;
+        padding: 1px;
+        margin: 0px;
+        width: 100%;
+        //position: absolute;
+    }
+
+    header.title {
+        position: relative;
+        padding: 6px 0 6px 10px;
+        text-align: left;
+        clear: both;
+
+        h1 { font-size: 18px; }
+        h1, label {
+            font-weight: normal;
+            //margin: 16px 0;
+            display: inline-block;
+        }
+    }
+
+    section h1 { font-size: 18px; }
+
+    section h2 {
+        margin-left: -12px;
+        font-size: 14px;
+        color: #ddd;
+    }
+
+    input[type=text], input[type=number], input[data-type=number], textarea {
+        margin: 0;
+        padding: 0 0 0 12px;
+        color: @color-text;
+        background-color: @color-bg-darker;
+        border: none;
+        font-size: 15px;
+        &:disabled {
+            background-color: lighten(@color-bg-darker, 25%);
+            color: darken(@color-text, 25%);
+        }
+    }
+}
+
+.scrollable {
+    top: @header-height * 1px + 1;
+    padding-top: 0;
+    padding-right: 5px;
+    left: 0;
+    position: relative;
+    //width: @client-width * 1px;
+    overflow-x: hidden;
+    height: @inner-height * 1px - @footer-height - @header-height;
+    overflow-y: scroll;
+    &::-webkit-scrollbar { width: 12px; height: 0px; }
+    &::-webkit-scrollbar-button { width: 0px; height: 0px;}
+    &::-webkit-scrollbar-thumb { background: darken(@color-highlight, 5%); border-radius: 4px; }
+    &::-webkit-scrollbar-thumb:hover { background: lighten(@color-highlight, 5%); border-radius: 4px;}
+    //&::-webkit-scrollbar-thumb:active { background: #fff; border: 1px dotted black;}
+    &::-webkit-scrollbar-track:disabled { background: @color-bg; border: 0px none #ffffff; border-radius: 0px;}
+    &::-webkit-scrollbar-track { background: #666666; border: 0px none #ffffff; border-radius: 0px;}
+    &::-webkit-scrollbar-track:hover { background: #666666;}
+    &::-webkit-scrollbar-track:active { xborder: 2px dotted #666; background: #555;}
+    &::-webkit-scrollbar-corner { background: transparent;}
+}
+//<!--/style><style id='hifi-mixins-less' type='text/less'-->
+// ----------------------------------------------------------------------------
+// hifi-mixins.less
+.mixins() {
+    .load-google-font(@font-family) {
+        @import (css) url("https://fonts.googleapis.com/css?family=@{font-family}:300,400,600,700");
+    }
+    .load-hifi-font(@font-family) {
+        @font-face {
+            font-family: '@{font-family}';
+            src: url('../../../../resources/fonts/@{font-family}.ttf'),  /* Windows production */
+            url('../../../../fonts/@{font-family}.ttf'),  /* OSX production */
+            url('../../../../interface/resources/fonts/@{font-family}.ttf'),  /* Development, running script in /HiFi/examples */
+            url('https://cdn.rawgit.com/highfidelity/hifi/9fa900ba/interface/resources/fonts/@{font-family}.ttf'); /* fallback to rawgit/github */
+        }
+    }
+    // when accessed from /HiFi/unpublishedScripts/*/*/something.html
+    .load-unpublishedScripts-font(@font-family) {
+        @font-face {
+            font-family: '@{font-family}';
+            src: url('../../../interface/resources/fonts/@{font-family}.ttf');
+        }
+    }
+}
+
+.load-fonts() when(@font-source=google) {
+    // adapt font family names from 'HifiStyle-Regular' to 'Google Style'
+    @input-font-family: replace(replace(@hifi-input-font-family, '-Regular', ''), '([a-z])([A-Z])', '$1 $2', 'g');
+    @custom-font-family: replace(replace(@hifi-custom-font-family, '-Regular', ''), '([a-z])([A-Z])', '$1 $2', 'g');
+    .mixins > .load-google-font(@custom-font-family);
+    .mixins > .load-google-font(@input-font-family);
+}
+.load-fonts() when(@font-source=hifi) {
+    @input-font-family: @hifi-input-font-family;
+    @custom-font-family: @hifi-custom-font-family;
+    .mixins > .load-hifi-font(@custom-font-family);
+    .mixins > .load-hifi-font(@input-font-family);
+}
+.load-fonts() when(@font-source=unpublishedScripts) {
+    @input-font-family: @hifi-input-font-family;
+    @custom-font-family: @hifi-custom-font-family;
+    .mixins > .load-unpublishedScripts-font(@custom-font-family);
+    .mixins > .load-unpublishedScripts-font(@input-font-family);
+}
+
+//<!--/style><style id='jquery-ui-overrides-less' type='text/less'-->
+// ----------------------------------------------------------------------------
+// jquery-ui-overrides.less
+@color-subtle-border: rgba(158, 158, 158, 0.151);
+@tooltip-bg-color: darken(#624888, 5%);
+@tooltip-text-color: contrast(@tooltip-bg-color);
+
+.tablet-ui {
+    .content .tooltip { display: none; }
+    .tooltipster-base {
+        .tooltipster-box {
+            background-color: @tooltip-bg-color;
+            .tooltipster-content {
+                ul {
+                    margin: 0; padding: 0;
+                    li {
+                        list-style-position: outside;
+                        text-indent: -4px;
+                        margin-left: 14px;
+                    }
+                }
+                color: @tooltip-text-color;
+                font-weight: normal;
+                font-size: 12.5px;
+                overflow-y: hidden;
+                padding: 3px 6px 2px 6px;
+            }
+        }
+        .arrow-border(@side) {
+            &.tooltipster-@{side} {
+                .tooltipster-arrow {
+                    .tooltipster-arrow-background { border-@{side}-color: @tooltip-bg-color; }
+                    .tooltipster-arrow-border { border-@{side}-color: black; }
+                }
+            }
+        }
+        .arrow-border(top);
+        .arrow-border(right);
+        .arrow-border(left);
+        .arrow-border(bottom);
+    }
+
+    .ui-checkboxradio-label {
+        .outlined(@color) {
+            width: 8px;
+            height: 8px;
+            padding: 2px;
+            border: solid 2px @color;
+        }
+
+        &.ui-button {
+            text-align: left;
+            background: inherit;
+            border: none;
+            color: inherit;
+            .ui-icon { background-image: none; }
+        }
+
+        padding: 3px 0;
+        pointer-events: all !important;
+        &:hover {
+            .ui-icon-background {
+                .outlined(gray);
+            }
+            &.ui-state-active .ui-icon-background {
+                border-color: white;
+                background-color: @color-highlight;
+            }
+        }
+        .ui-checkboxradio-icon-space {
+            width: 8px;
+            display: inline-block;
+        }
+        &.ui-visual-focus { box-shadow: inherit; }
+        .ui-icon {
+            background-color: @color-bg-icon;
+            box-shadow: none;
+            border-radius: .25em;
+        }
+        &.ui-state-active {
+            .ui-icon-background {
+                background-color: @color-highlight;
+                .outlined(@color-bg-icon);
+            }
+        }
+    }
+    .ui-slider-range { background-color: @color-highlight; }
+
+    .ui-spinner {
+        border: none;
+        outline: none;
+        background-color: transparent;
+        margin: 4px 2px;
+        padding: 0;
+        .ui-button {
+            border-left: solid 1px @color-subtle-border;
+            background-color: inherit;
+            &:active span {
+                border-color-left: @color-subtle-border;
+                border-color: transparent;
+            }
+        }
+        input.ui-spinner-input {
+            margin: 0 !important;
+            xwidth: inherit !important;
+            &::-webkit-outer-spin-button,
+            &::-webkit-inner-spin-button {
+                -webkit-appearance: none;
+            }
+        }
+    }
+
+    .ui-slider-horizontal {
+        background-color: @color-bg-darker;
+        border-color: @color-bg-darker !important;
+        .ui-slider-handle {
+            top: -.5em;
+            width: 1.4em;
+            height: 1.4em;
+            border-radius: 100%;
+            outline: none;
+            background-color: #757575;
+            border-color: @color-bg-darker;
+            &:focus  { border-color: white; }
+            // custom inner slider handle circle
+            .inner-ui-slider-handle {
+                border-radius: 100%;
+                padding: 0px;
+                right: 2px;
+                bottom: 2px;
+                position: absolute;
+                left: 2px;
+                top: 2px;
+                border: solid black 2px;
+            }
+        }
+    }
+}
+//<!--/style><style id='CustomSettingsApp-less' type='text/less'-->
+// ----------------------------------------------------------------------------
+// CustomSettingsApp.less
+.tablet-ui .settings-app {
+    .ui-spinner-up { border-top-style: none; }
+    .radio {
+        label.ui-state-active { color: white !important; }
+        .ui-checkboxradio-label .ui-icon { border-radius: .5em; }
+    }
+
+    br { clear: both; }
+    a:not(.ui-widget) {
+        text-decoration: none;
+        color: #99f;
+        &:hover { color: darken(#99f, 10%); }
+    }
+    .content { display: block; }
+
+    #overlay {
+        opacity: .35;
+        background-color: black;
+        position: absolute;
+        top: 0;
+        left: 0;
+        height: 100%;
+        width: 100%;
+        z-index: 9999999;
+    }
+    &:not(.active) {
+        #overlay { display: block; }
+        .tooltipster-base { display: none; }
+    }
+    &.active #overlay { display: none; }
+
+    section {
+        clear: both;
+        h2 {
+            text-transform: uppercase;
+            margin-bottom: 8px;
+        }
+    }
+
+    .content footer {
+        bottom: 0;
+        top: auto;
+        text-align: center;
+        height: @footer-height * 1px;
+        border-left: none;
+        border-right: none;
+        border-bottom: none !important;//solid -1px blue;
+        box-shadow: none !important;
+        center {
+            //line-height: @footer-height * 1px;
+            vertical-align: middle;
+            font-size: .8em;
+            width: @client-width * .5px;
+            position: absolute;
+            display: block;
+            margin-left: 24%;
+            left: 0;
+            div { display: inline-block; }
+        }
+        button {
+            margin-top: 3px;
+        }
+    }
+    header, footer {
+        border: solid 1px black;
+        height: @header-height * 1px;
+        margin: 0;
+        position: fixed;
+        left: 0;
+        padding: 0;
+        top: 0;
+        width: 100%;
+        background-color: lighten(@color-bg,10%);
+        box-shadow: 2px 2px 10px rgba(0,0,0,.5);
+        z-index: 10;
+        white-space: nowrap;
+        > div {
+            position: relative;
+            padding: 0 6px;
+        }
+        .ui-icon { background-color: lighten(@color-bg-icon, 10%); }
+        .ui-checkboxradio-label {
+            &.ui-state-active {
+                .ui-icon { border-color: lighten(@color-bg-icon, 10%); }
+                &:hover .ui-icon { border-color: inherit; }
+            }
+            margin-left: 2em;
+        }
+        x.row {
+            margin-top: 2px;
+            margin-left: 10px;
+            font-size: .9em;
+            display: inline-block !important;
+            &.checkbox {
+                margin-top: inherit !important;
+                margin-bottom: inherit !important;
+            }
+        }
+    }
+
+    // row styles in two column mode
+    .column {
+        fieldset {
+            margin: 0;
+            padding: 0;
+            -webkit-touch-callout: none;
+            outline: none;
+        }
+        margin-right: -16px;
+        margin-left: -8px;
+        //white-space: nowrap;
+        .rows {
+            width: 35%;
+            &:nth-child(1) { margin-right: 1%; }
+            .radio {
+                height: 1.5em;
+                vertical-align: top;
+                display: block;
+                label { vertical-align: top; }
+                &:nth-child(1) { margin-right: 2.5%; }
+                //padding: .2em .7em .7em .7em;
+            }
+        }
+        .row {
+            display: inline-block;
+            &.number {
+                label { display: block; clear: both; }
+                width: 45%;
+            }
+
+        }
+    }
+
+    .focused() { outline: dotted 1px darken(@color-highlight,20%); }
+
+    .rows {
+        &.radio {
+            vertical-align: top;
+            border: solid 1px @color-subtle-border;
+            border-right: solid 1px @color-subtle-border;
+            border-radius: .5em;
+            padding-left: 12px;
+            padding-bottom: 12px;
+            padding-right: 4px;
+        }
+    }
+
+    // general row styles
+    .row {
+        white-space: nowrap;
+        margin-top: .25em;
+        margin-bottom: .25em;
+
+        &:focus, div:focus { .focused }
+        &.disabled input.setting { color: #000; }
+        &.invalid input.setting { border: solid 1px mix(red, @color-highlight, 55%); }
+        input {
+            outline: none !important;
+            font-size: 1.1em;
+            margin: 8px;
+            padding: 8px;
+            border: solid 1px transparent;
+            &:focus { border: solid 1px @color-highlight !important; }
+        }
+        &.slider {
+            label { display: block; clear: both }
+            .ui-spinner {
+                position: relative;
+                width: 100px;
+                max-width: 20%;
+                input { width: 80% }
+            }
+            .control  {
+                float: left;
+                clear: left;
+                width: 75%;
+                margin: 13px;
+                top: 6px;
+                height: 6px;
+            }
+        }
+        &.checkbox {
+            input[type=checkbox] { display: none; }
+            label.ui-widget {
+                padding-left: 0px; display: inline-block;
+            }
+            //display: table-row;
+            margin-top: .25em;
+            margin-bottom: .25em;
+        }
+
+         &.radio {
+            input[type=radio] { display: inline-block; }
+            //label.ui-visual-focus { .focused; }
+        }
+
+        &.radio, &.checkbox {
+            .ui-checkboxradio-label {
+                &.ui-button {
+                    text-align: left;
+                    background: inherit;
+                    border: none;
+                    color: inherit;
+                    .ui-icon { background-image: none; }
+                }
+            }
+            //&:hover { background-color: darken(@color-bg, 3%); }
+            //.ui-checkboxradio-checked { color: white }
+        }
+        &.number {
+            label {
+                display: block;
+                width: 100%;
+                margin-right: 26px;
+                //padding-bottom: 2px;
+            }
+            input { width: 10em; }
+        }
+        .unit {
+            margin-left: 6px;
+            font-weight: lighter;
+            font-size: .8em;
+            font-style: italic;
+        }
+    }
+    code {
+        font-family: monospace;
+        font-size: .8em;
+        font-weight: bold;
+        //color: mix(@color-text, magenta, 90%);
+    }
+    kbd {
+        display: inline-block;
+        margin: 0 .1em;
+        padding: .1em .6em;
+        font-family: Arial,"Helvetica Neue",Helvetica,sans-serif;
+        font-size: .85em;
+        font-weight: bold;
+        line-height: 1.1em;
+        color: #242729;
+        text-shadow: 0 1px 0 darken(#FFF, 25%);
+        background-color: darken(#e1e3e5, 25%);
+        border: 1px solid darken(#adb3b9, 25%);
+        border-radius: 3px;
+        box-shadow: 0 1px 0 rgba(12,13,14,0.2),0 0 0 2px darken(#FFF,25%) inset;
+        white-space: nowrap;
+    }
+}
+//<!--/style><style id='app-less' type='text/less'-->
+// ----------------------------------------------------------------------------
+// app.less
+.tablet-ui .settings-app {
+    &.camera-move-enabled header {
+        border-bottom: solid 1px @color-highlight;
+        label { color: white !important; font-weight: bold; }
+    }
+
+    label sup {
+        margin: 4px;
+        text-transform: uppercase;
+        font-style: italic;
+        color: black;
+    }
+    button {
+        font-weight: bold;
+        font-family: arial;
+        font-size: 12px;
+        //padding: 6px 8px;
+        cursor: pointer;
+        background-color: @color-primary-button;
+        color: white;
+        border-color: transparent;
+        margin: 2px;
+        text-transform: uppercase;
+        border: solid 1px transparent;
+        &:hover { background-color: lighten(@color-primary-button,10%); }
+        &:focus { border: dotted 1px tint(@color-highlight) !important; }
+    }
+    .localhost-only {
+        //display: none;
+        &when (@debug), (@localhost) {
+            display: inline-block;
+        }
+    }
+    #debug-menu {
+        .buttons {
+            margin: 0px -8px;
+            button {
+                padding: 4px;
+                margin: 1px;
+                font-size: 12px;
+                text-transform: none;
+                font-weight: normal;
+                border-radius: 6px;
+                &.localhost-only { background-color: #303; &:hover { background-color: lighten(#303,10%);} }
+            }
+        }
+    }
+    #advanced-options {
+        .content { background-color: #333; }
+        display: none;
+    }
+    .toggle-advanced-options {
+        background-color: darken(@color-alt-button, 5%);
+        .chevron {
+            width: 2em;
+            display: inline-block;
+            &:after { content: ' \25B7'; }
+        }
+        &:hover { background-color: lighten(@color-alt-button, 5%); }
+    }
+    #reset-to-defaults {
+        background-color: darken(@color-caution-button, 5%);
+        &:hover { background-color: lighten(@color-caution-button, 5%); }
+    }
+}
+.ui-show-advanced-options {
+    #advanced-options { display: block !important; }
+    .toggle-advanced-options {
+        background-color: mix(blue,@color-alt-button,20%) !important;
+        .chevron:after { content: ' \25B2' !important; }
+    }
+}
+
+#appVersion {
+    z-index: 1;
+    float: right;
+}
+#toggleKey { line-height: @footer-height * 1px; }
+
+// #overlay when(not(@interface-mode)) {
+//     height: 16px !important;
+// }
+
+#errors {
+    user-select: initial;
+    position: fixed;
+    left: 0;
+    top: 0;
+    height: auto;
+    min-height: @header-height * 1px;
+    border-bottom: solid 1px gray;
+    box-shadow: 2px 2px 8px black;
+    right: 0;
+    font-size: .8em;
+    background-color: rgb(95,0,0);
+    color: white;
+    overflow: auto;
+    margin: 0;
+    padding: 4px;
+    z-index: 9999999;
+    pre {
+        white-space: pre-wrap;
+        margin: 0 6px;
+    }
+    .title {
+        background-color: red;
+        padding: 2px;
+        margin-bottom: 4px;
+    }
+    .buttons {
+        user-select: none;
+        margin-top: 4px;
+        float: right;
+        button {
+            font-weight: normal;
+            margin: 4px 2px;
+        }
+    }
+    .debug-lines {
+        font-size: 8px;
+        background-color: black;
+        color: lightblue;
+        .content {
+            padding: 1px 3px;
+            &:nth-child(1):before { content: 'hash:@{hash}\000a'; }
+        }
+    }
+}
+
+footer center > div { display: none; }
+.footer-stop {
+    height: 32px;
+    background-color: darken(@color-bg,5%);
+}
+
+#tooltips { display: none }
+
+.tablet-ui .checkbox.row .ui-checkboxradio-label {
+    &.on-red {
+        &.ui-state-active {
+            //.ui-icon-background { background-color: #c33; }
+            color: #c33;
+        }
+    }
+    &.off-red {
+        &:not(.ui-state-active) { color: #c33; }
+        //&.ui-state-active { color: inherit; }
+    }
+}
+
+.tablet-ui .settings-app {
+    // special case for requestAnimationFrame radio / fps inline spinner
+    .radio.row.extended {
+        pointer-events: all;
+        .ui-spinner {
+            transform: scale(.8);
+            transform-origin: left top;
+            margin-top: 0;
+        }
+        .ui-spinner-input  {
+            width: 3em;
+            padding: 4px 8px;
+        }
+    }
+}
+</style>
+<script>
+    lessManager = preconfigureLESS({
+        env: PARAMS.debug ? 'development' : 'production',
+        selector: 'style[type="text/less"]',
+        globalVars: Object.assign({
+            debug: !!PARAMS.debug,
+            localhost: /\b(?:file:\/\/|localhost|127[.])/.test(location),
+        }, LESS_GLOBALS)
+    });
+less = lessManager.options;
+</script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/less.js/2.7.2/less.js"></script>
+<!-- JSON DUMP TEMPLATE -->
+<script type='text/html' id='POPUP'>
+  <html>
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/ir-black.min.css" />
+    <xx-script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></xx-script>
+    <body style='margin:0;overflow:hidden;'>
+      <pre><code class="json" style='height:100%'>JSON</code></pre>
+      <xx-script>hljs.initHighlighting();</xx-script>
+    </body>
+  </html>
+</script>
+
+<div id='overlay'></div>
+</body>
+</html>
diff --git a/unpublishedScripts/marketplace/camera-move/app.js b/unpublishedScripts/marketplace/camera-move/app.js
new file mode 100644
index 0000000000..0546ead02a
--- /dev/null
+++ b/unpublishedScripts/marketplace/camera-move/app.js
@@ -0,0 +1,613 @@
+// app.js -- support functions
+
+/* eslint-env console, jquery, browser, shared-node-browser */
+/* eslint-disable comma-dangle */
+/* global Mousetrap, TooltipManager, SettingsJSON, PARAMS, signal, assert, log, debugPrint */
+// ----------------------------------------------------------------------------
+
+var viewportUpdated, bridgedSettings, jquerySettings, tooltipManager, lessManager;
+
+function setupUI() {
+    $('#debug-menu button, footer button')
+        .hifiButton({
+            create: function() {
+                $(this).addClass('tooltip-target')
+                    .data('tooltipster', { side: ['top','bottom'] });
+            }
+        });
+
+    var $json = SettingsJSON;
+
+    window.buttonHandlers = {
+        'test-event-bridge': function() {
+            log('bridgedSettings.eventBridge === Window.EventBridge', bridgedSettings.eventBridge === window.EventBridge);
+            bridgedSettings.sendEvent({ method: 'test-event-bridge' });
+            EventBridge.emitWebEvent('EventBridge.emitWebEvent: testing 1..2..3..');
+        },
+        'page-reload': function() {
+            log('triggering location.reload');
+            location.reload();
+        },
+        'script-reload': function() {
+            log('triggering script.reload');
+            bridgedSettings.sendEvent({ method: 'reloadClientScript' });
+        },
+        'reset-sensors': function() {
+            log('resetting avatar orientation');
+            bridgedSettings.sendEvent({ method: 'resetSensors' });
+        },
+        'reset-to-defaults': function() {
+            tooltipManager && tooltipManager.closeAll();
+            document.activeElement && document.activeElement.blur();
+            document.body.focus();
+            setTimeout(function() {
+                bridgedSettings.sendEvent({ method: 'reset' });
+            },1);
+        },
+        'copy-json': $json.showSettings.bind($json, jquerySettings, null),
+        'paste-json': function() {
+            $json.applyJSON(
+                jquerySettings,
+                'pasted',
+                $json.promptJSON()
+            );
+        },
+        'toggle-advanced-options': function(evt) {
+            var checkbox = $(this).hifiButton('instance').checkbox;
+            var on = checkbox.value(!checkbox.value());
+            $('body').toggleClass('ui-show-advanced-options', on);
+            evt.stopPropagation();
+            evt.preventDefault();
+            if ($(this).is('.tooltipstered')) {
+                $(this).tooltipster('instance').content((on ? 'hide' : 'show') + ' advanced options');
+            }
+            if (checkbox.value()) {
+                $('.scrollable').delay(100).animate({
+                    scrollTop: innerHeight - $('header').innerHeight() - 24
+                }, 1500);
+            }
+        },
+        'appVersion': function(evt) {
+            evt.shiftKey && $json.showSettings(jquerySettings);
+        },
+        'errors': function(evt) {
+            $(evt.target).is('button') && $(this).find('.output').text('').end().hide();
+        },
+    };
+    buttonHandlers['button-toggle-advanced-options'] =
+        buttonHandlers['toggle-advanced-options'];
+    Object.keys(window.buttonHandlers).forEach(function(p) {
+        $('#' + p).on('click', window.buttonHandlers[p]);
+    });
+
+    // ----------------------------------------------------------------
+    // trim whitespace in labels
+    $('label').contents().filter(function() {
+        if (this.nodeType !== window.Node.TEXT_NODE) {
+            return false;
+        }
+        this.textContent = this.textContent.trim();
+        return !this.textContent.length;
+    }).remove();
+
+    var settingsNodes = $('fieldset,button[data-for],input:not([type=radio])');
+    settingsNodes.each(function() {
+        // set up the bidirectional mapping between DOM and Settings
+        jquerySettings.registerNode(this);
+    });
+
+    var spinnerOptions = {
+        disabled: true,
+        create: function() {
+            var input = $(this),
+                key = assert(jquerySettings.getKey(input.data('for')));
+
+            var options = input.hifiSpinner('instance').options;
+            options.min = options.min || 0.0;
+
+            bridgedSettings.getValueAsync(key, function(err, result) {
+                input.filter(':not([data-autoenable=false])').hifiSpinner('enable');
+                jquerySettings.setValue(key, result);
+            });
+        },
+    };
+
+    $( ".rows > label" ).each(function() {
+        var label = $(this),
+            input = label.find('input'),
+            type = input.data('type') || input.attr('type');
+        label.wrap('<div>').parent().addClass(['hifi-'+type, type, 'row'].join(' '))
+            .on('focus.row, click.row, hover.row', function() {
+                $(this).find('.tooltipstered').tooltipster('open');
+            });
+    });
+
+    debugPrint('initializing hifiSpinners');
+    // numeric settings
+    $( ".number.row" )
+        .find( "input[data-type=number]" )
+        .addClass('setting')
+        .hifiSpinner(spinnerOptions);
+
+    // radio groups settings
+    $( ".radio.rows" )
+        .find('label').addClass('tooltip-target').end()
+        .addClass('setting')
+        .hifiRadioGroup({
+            direction: 'vertical',
+            disabled: true,
+            create: function() {
+                assert(this !== window);
+                var group = $(this), id = this.id;
+                var key = assert(jquerySettings.getKey(group.data('for')));
+
+                bridgedSettings.getValueAsync(key, function(err, result) {
+                    debugPrint('> GOT RADIO', key, id, result);
+                    group.filter(':not([data-autoenable=false])').hifiRadioGroup('enable');
+                    jquerySettings.setValue(key, result);
+                    group.change();
+                });
+            },
+        })
+
+    // checkbox settings
+    $( "input[type=checkbox]" )
+        .addClass('setting')
+        .hifiCheckbox({
+            disabled: true,
+            create: function() {
+                var key = assert(jquerySettings.getKey(this.id)),
+                    input = $(this);
+                input.closest('label').addClass('tooltip-target');
+                bridgedSettings.getValueAsync(key, function(err, result) {
+                    input.filter(':not([data-autoenable=false])').hifiCheckbox('enable');
+                    jquerySettings.setValue(key, result);
+                });
+            },
+        });
+
+    // slider + numeric settings
+    // use the whole row as a tooltip target
+    $( ".slider.row" ).addClass('tooltip-target').data('tooltipster', {
+        distance: -20,
+        side: ['top', 'bottom'],
+    }).each(function(ent) {
+        var element = $(this).find( ".control" ),
+            input = $(this).find('input'),
+            id = input.prop('id'),
+            key = assert(jquerySettings.getKey(id));
+
+        var commonOptions = {
+            disabled: true,
+            min: parseFloat(input.prop('min') || 0),
+            max: parseFloat(input.prop('max') || 10),
+            step: parseFloat(input.prop('step') || 0.01),
+            autoenable: input.data('autoenable') !== 'false',
+        };
+        debugPrint('commonOptions', commonOptions);
+
+        // see: https://api.jqueryui.com/slider/ for more options
+        var slider = element.hifiSlider(Object.assign({
+            orientation: "horizontal",
+            range: "min",
+            animate: 'fast',
+            value: 0.0
+        }, commonOptions)).hifiSlider('instance');
+
+        debugPrint('initializing hifiSlider->hifiSpinner');
+        // setup chrome up/down arrow steps and propagate input field -> slider
+        var spinner = input.on('change', function() {
+            var value = spinner.value();
+            if (isFinite(value) && slider.value() !== value) {
+                slider.value(value);
+            }
+        }).addClass('setting')
+            .hifiSpinner(
+                Object.assign({}, commonOptions, { max: 1e4 })
+            ).hifiSpinner('instance');
+
+        bridgedSettings.getValueAsync(key, function(err, result) {
+            slider.options.autoenable !== false && slider.enable();
+            spinner.options.autoenable !== false && spinner.enable();
+            spinner.value(result);
+        });
+    });
+
+    $('#fps').hifiSpinner(spinnerOptions).closest('.row').css('pointer-events', 'all').on('click.subinput', function(evt) {
+        jquerySettings.setValue('thread-update-mode', 'requestAnimationFrame');
+        evt.target.focus();
+    });
+    // detect invalid numbers entered into spinner fields
+    $(':ui-hifiSpinner').on('change.validation', function(evt) {
+        var spinner = $(this).hifiSpinner('instance');
+        $(this).closest('.row').toggleClass('invalid', !spinner.isValid());
+    });
+
+    // ----------------------------------------------------------------------------
+    // allow tabbing between checkboxes using the container row
+    $(':ui-hifiCheckbox,:ui-hifiRadioButton').prop('tabindex', -1).closest('.row').prop('tabindex', 0);
+
+
+    // select the input field text when first focused
+    $('input').not('input[type=radio],input[type=checkbox]').on('focus', function () {
+        var dt = (new Date - this.blurredAt);
+        if (!(dt < 5)) { // debounce
+            this.blurredAt = +new Date;
+            $(this).one('mouseup.selectit', function() {
+                $(this).select();
+                return false;
+            }).select();
+        }
+    }).on('blur', function(e) {
+        this.blurredAt = new Date;
+    });
+
+    // monitor changes to specific settings that affect the UI
+    var monitors = {
+        // advanced options toggle
+        'ui-show-advanced-options': function onChange(value) {
+            function handle(err, result) {
+                log('** ui-show-advanced-options updated', result+'');
+                $('body').toggleClass('ui-show-advanced-options', !!result);
+                jquerySettings.setValue('ui-show-advanced-options', result)
+            }
+            if (!onChange.fetched) {
+                bridgedSettings.getValueAsync('ui-show-advanced-options', handle);
+                return onChange.fetched = true;
+            }
+            handle(null, value);
+        },
+
+        // UI tooltips toggle
+        'ui-enable-tooltips': function(value) {
+            if (!tooltipManager) return;
+            if (value) {
+                tooltipManager.enable();
+                tooltipManager.openFocusedTooltip();
+            } else {
+                tooltipManager.disable();
+            }
+        },
+
+        // enable/disable fps field (based on whether thread mode is requestAnimationFrame)
+        'thread-update-mode': function(value) {
+            var enabled = (value === 'requestAnimationFrame'), fps = $('#fps');
+            fps.hifiSpinner(enabled ? 'enable' : 'disable');
+            fps.closest('.row').toggleClass('disabled', !enabled);
+        },
+
+        // flag BODY with CSS class to indicate active camera move mode
+        'camera-move-enabled': function(value) {
+            $('body').toggleClass('camera-move-enabled', value);
+        },
+
+        // update the "keybinding" and #appVersion extraParams displays
+        '.extraParams': function extraParams(value, other) {
+            value = bridgedSettings.extraParams;
+            if (value.mode) {
+                for (var p in value.mode) {
+                    // tablet-mode, hmd-mode, etc.
+                    $('body').toggleClass(p + '-mode', value.mode[p]);
+                }
+                document.oncontextmenu = value.mode.tablet ? function(evt) { return evt.preventDefault(),false; }  : null;
+                $('[data-type=number]').prop('type', value.mode.tablet ? 'number' : 'text');
+            }
+            var versionDisplay = [
+                value.appVersion || '(unknown appVersion)',
+                PARAMS.debug && '(debug)',
+                value.mode && value.mode.tablet ? '(tablet)' : '',
+            ].filter(Boolean).join(' | ');
+            $('#appVersion').find('.output').text(versionDisplay).end().show();
+
+            if (value.toggleKey) {
+                $('#toggleKey').find('.binding').empty()
+                    .append(getKeysHTML(value.toggleKey)).end().show();
+            }
+
+            var activateLookAtOption = value.MyAvatar && value.MyAvatar.supportsLookAtSnappingEnabled;
+            $(jquerySettings.findNodeByKey('Avatar/lookAtSnappingEnabled'))
+                .hifiCheckbox(activateLookAtOption ? 'enable' : 'disable')
+                .closest('.row').toggleClass('disabled', !activateLookAtOption)
+                .css('pointer-events', 'all') // so tooltips display regardless
+
+            var activateCursorOption = value.Reticle && value.Reticle.supportsScale;
+            $('#minimal-cursor:ui-hifiCheckbox')
+                .hifiCheckbox(activateCursorOption ? 'enable' : 'disable')
+                .closest('.row').toggleClass('disabled', !activateCursorOption)
+                .css('pointer-events', 'all') // so tooltips display regardless
+        },
+
+        // gray out / ungray out page content if user is mouse looking around in Interface
+        // (otherwise the cursor still interacts with web content...)
+        'Keyboard.RightMouseButton': function(localValue, key, value) {
+            debugPrint(localValue, '... Keyboard.RightMouseButton:' + value);
+            window.active = !value;
+        },
+    };
+    monitors['toggle-advanced-options'] = monitors['ui-toggle-advanced-options'];
+    monitorSettings(monitors);
+    // disable selection
+    // $('input').css('-webkit-user-select', 'none');
+
+    viewportUpdated.connect(lessManager, 'onViewportUpdated');
+
+    setupTooltips();
+
+    $(window).trigger('resize'); // populate viewport
+
+    // set up DOM MutationObservers
+    settingsNodes.each(function tcobo() {
+        if (this.dataset.hifiType === 'hifiButton') {
+            return;
+        }
+        var id = assert(this.dataset['for'] || this.id, 'could not id for node: ' + this.outerHTML);
+        assert(!tcobo[id]); // detect dupes
+        tcobo[id] = true;
+        debugPrint('OBSERVING NODE', id, this.id || this.getAttribute('for'));
+        jquerySettings.observeNode(this);
+    });
+
+    // set up key bindings
+    setupMousetrapKeys();
+
+    function getKeysHTML(binding) {
+        var text = binding.text || ('(#' + binding.key + ')');
+        // translate hifi's proprietary key scheme into human-friendly KBDs
+        return [ 'Control', 'Meta', 'Alt', 'Super', 'Menu', 'Shifted' ]
+            .map(function(flag) {
+                return binding['is' + flag] && flag;
+            })
+            .concat(text)
+            .filter(Boolean)
+            .map(function(key) {
+                return '<kbd>' + key.replace('Shifted','Shift') + '</kbd>';
+            })
+            .join('-');
+    }
+} // setupUI
+
+function setupTooltips() {
+    // extract the tooltip captions
+    var tooltips = window.tooltips = {};
+    var target = '[id], [data-for], [for]';
+    $('.tooltip')
+        .removeClass('tooltip').addClass('x-tooltip')
+        .each(function() {
+            var element = $(this),
+                input = $(element.parent().find('input').get(0) ||
+                          element.closest('button').get(0));
+            id = element.prop('id') || element.data('for') ||
+                input.prop('id') || input.data('for');
+            assert(id);
+            tooltips[id] = this.outerHTML;
+        }).hide();
+    tooltipManager = new TooltipManager({
+        enabled: false,
+        testmode: PARAMS.tooltiptest,
+        viewport: PARAMS.viewport,
+        tooltips: tooltips,
+        elements: '#reset-to-defaults, button, input',
+    });
+    viewportUpdated.connect(tooltipManager, 'updateViewport');
+    // tooltips aren't needed right away, so defer initializing for better page load times
+    window.setTimeout(tooltipManager.initialize.bind(tooltipManager), 1000);
+}
+
+// helper for instrumenting local jquery onchange handlers
+function monitorSettings(options) {
+    return Object.keys(options).reduce(function(out, id) {
+        var key = bridgedSettings.resolve(id),
+            domId = jquerySettings.getId(key, true);
+
+        if (!domId) {
+            var placeholder = {
+                id: id,
+                type: 'placeholder',
+                toString: function() {
+                    return this.id;
+                },
+                value: undefined,
+            };
+            jquerySettings.registerSetting(placeholder, key);
+            debugPrint('registered placeholder value for setting', id, key);
+            assert(jquerySettings.findNodeByKey(key) === placeholder);
+        }
+
+        // if (domId === 'toggle-advanced-options') alert([key,id,domId, jquerySettings.findNodeByKey(key)])
+        assert(function assertion(){
+            return typeof key === 'string';
+        }, 'monitorSettings -- received invalid key type');
+
+        var context = {
+            id: id,
+            key: key,
+            domId: domId,
+            options: options,
+            lastValue: undefined,
+            initializer: function(hint) {
+                var key = this.key,
+                    lastValue = this.lastValue;
+                if (lastValue !== undefined) {
+                    return log('skipping repeat initializer', key, hint);
+                }
+                this.lastValue = lastValue = jquerySettings.getValue(key);
+                this._onChange.call(jquerySettings, key, lastValue, undefined, hint);
+            },
+            _onChange: function _onChange(key, value) {
+                var currentValue = this.getValue(context.id),
+                    jsonCurrentValue = JSON.stringify(currentValue);
+
+                if (jsonCurrentValue === context.jsonLastValue) {
+                    if (jsonCurrentValue !== undefined) {
+                        debugPrint([context.key, '_onChange', this, 'not triggering _onChange for duplicated value']);
+                    }
+                    return;
+                }
+                context.jsonLastValue = jsonCurrentValue;
+                var args = [].slice.call(arguments, 0);
+                debugPrint('monitorSetting._onChange', context.key, value, [].concat(args).pop());
+                context.options[context.id].apply(this, [ currentValue ].concat(args));
+            },
+
+            onValueReceived: function(key) {
+                if (key === this.key) {
+                    this._onChange.apply(bridgedSettings, arguments);
+                }
+            },
+            onMutationEvent: function(event) {
+                if (event.key === this.key) {
+                    context._onChange.call(jquerySettings, event.key, event.value, event.oldValue, event.hifiType+':mutation');
+                }
+            },
+            onPendingRequestsFinished: function onPendingRequestsFinished() {
+                bridgedSettings.pendingRequestsFinished.disconnect(this, 'onPendingRequestsFinished');
+                this.initializer('pendingRequestsFinished');
+            },
+        };
+
+        bridgedSettings.valueReceived.connect(context, 'onValueReceived');
+        jquerySettings.mutationEvent.connect(context, 'onMutationEvent');
+
+        if (bridgedSettings.pendingRequestCount()) {
+            bridgedSettings.pendingRequestsFinished.connect(context, 'onPendingRequestsFinished');
+        } else {
+            window.setTimeout(context.initializer.bind(context, 'monitorSettings init'), 1);
+        }
+        return context;
+    }, {});
+}
+
+function initializeDOM() {
+
+    Object.defineProperty(window, 'active', {
+        get: function() {
+            return window._active;
+        },
+        set: function(nv) {
+            nv = !!nv;
+            window._active = nv;
+            debugPrint('window.active == ' + nv);
+            if (!nv) {
+                document.activeElement && document.activeElement.blur();
+                document.body.focus();
+                tooltipManager && tooltipManager.disable();
+                debugPrint('TOOLTIPS DISABLED');
+            } else if (tooltipManager && bridgedSettings) {
+                if (bridgedSettings.getValue('ui-enable-tooltips')){
+                    tooltipManager.enable();
+                    debugPrint('TOOLTIPS RE-ENABLED');
+                }
+            }
+            $('body').toggleClass('active', window._active);
+        },
+    });
+    $('body').toggleClass('active', window._active = true);
+
+    function checkAnim(evt) {
+        if (!checkAnim.disabled) {
+            if ($('.scrollable').is(':animated')) {
+                $('.scrollable').stop();
+                log(evt.type, 'stop animation');
+            }
+        }
+    }
+    viewportUpdated = signal(function viewportUpdated(viewport) {});
+    function triggerViewportUpdate() {
+        var viewport = {
+            inner: { width: innerWidth, height: innerHeight },
+            client: {
+                width: document.body.clientWidth || window.innerWidth,
+                height: document.body.clientHeight || window.innerHeight,
+            },
+            min: { width: window.innerWidth / 3, height: 32 },
+            max: { width: window.innerWidth * 7/8, height: window.innerHeight * 7/8 },
+        };
+        debugPrint('viewportUpdated', viewport);
+        PARAMS.viewport = Object.assign(PARAMS.viewport||{}, viewport);
+        viewportUpdated(viewport, triggerViewportUpdate.lastViewport);
+        triggerViewportUpdate.lastViewport = viewport;
+    }
+    $(window).on({
+        resize: function resize() {
+            window.clearTimeout(resize.to);
+            resize.to = window.setTimeout(triggerViewportUpdate, 100);
+        },
+        mousedown: checkAnim, mouseup: checkAnim, scroll: checkAnim, wheel: checkAnim,
+        blur: function() {
+            log('** BLUR ** ');
+            $('body').addClass('window-blurred');
+            document.body.focus();
+            document.activeElement && document.activeElement.blur();
+            // tooltipManager.closeAll();
+        },
+        focus: function() {
+            log('** FOCUS **');
+            $('body').removeClass('window-blurred');
+        },
+    });
+}
+
+function setupMousetrapKeys() {
+    if (!window.Mousetrap) {
+        return log('WARNING: window.Mousetrap not found; not configurating keybindings');
+    }
+    mousetrapMultiBind({
+        'ctrl+a, option+a': function global(evt, combo) {
+            $(document.activeElement).filter('input').select();
+        },
+        'enter': function global(evt, combo) {
+            var node = document.activeElement;
+            if ($(node).is('input')) {
+                log('enter on input element');
+                tooltipManager.closeAll();
+                node.blur();
+                var nexts = $('[tabindex],input,:focusable').not('[tabindex=-1],.ui-slider-handle');
+                nexts.add(nexts.find('input'));
+                nexts = nexts.toArray();
+                if (~nexts.indexOf(node)) {
+                    var nextActive = nexts[nexts.indexOf(node)+1];
+                    log('setting focus to', nextActive);
+                    $(nextActive).focus();
+                } else {
+                    log('could not deduce next tabbable element', nexts.length, this);
+                }
+            }
+            return true;
+        },
+        'ctrl+w': bridgedSettings.sendEvent.bind(bridgedSettings, { method: 'window.close' }),
+        'r': location.reload.bind(location),
+        'space': function global(evt, combo) {
+            log('SPACE', evt.target, document.activeElement);
+            $(document.activeElement).filter('.row').find(':ui-hifiCheckbox,:ui-hifiRadioButton').click();
+            if (!$(document.activeElement).is('input,.ui-widget')) {
+                return false;
+            }
+            return true;
+        },
+    });
+    // $('input').addClass('mousetrap');
+    function mousetrapMultiBind(a, b) {
+        var obj = typeof a === 'object' ? a :
+            Object.defineProperty({}, a, {enumerable: true, value: b });
+        Object.keys(obj).forEach(function(key) {
+            var method = obj[key].name === 'global' ? 'bindGlobal' : 'bind';
+            key.split(/\s*,\s*/).forEach(function(combo) {
+                debugPrint('Mousetrap', method, combo, typeof obj[key]);
+                Mousetrap[method](combo, function(evt, combo) {
+                    debugPrint('Mousetrap', method, combo);
+                    return obj[key].apply(this, arguments);
+                });
+            });
+        });
+    }
+}
+
+// support the URL having a #node-id (or #debug=1&node-id) hash fragment jumping to that element
+function jumpToAnchor(id) {
+    id = JSON.stringify(id);
+    $('[id='+id+'],[name='+id+']').first().each(function() {
+        log('jumpToAnchor', id);
+        $(this).show();
+        this.scrollIntoView({ behavior: 'smooth' });
+    });
+};
diff --git a/unpublishedScripts/marketplace/camera-move/avatar-updater.js b/unpublishedScripts/marketplace/camera-move/avatar-updater.js
new file mode 100644
index 0000000000..5a91a0e8a8
--- /dev/null
+++ b/unpublishedScripts/marketplace/camera-move/avatar-updater.js
@@ -0,0 +1,268 @@
+/* eslint-env commonjs */
+// ----------------------------------------------------------------------------
+
+// helper module that performs the avatar movement update calculations
+
+module.exports = AvatarUpdater;
+
+var _utils = require('./modules/_utils.js'),
+    assert = _utils.assert;
+
+var movementUtils = require('./modules/movement-utils.js');
+
+function AvatarUpdater(options) {
+    options = options || {};
+    assert(function assertion() {
+        return typeof options.getCameraMovementSettings === 'function' &&
+            typeof options.getMovementState === 'function' &&
+            options.globalState;
+    });
+
+    var DEFAULT_MOTOR_TIMESCALE = 1e6; // a large value that matches Interface's default
+    var EASED_MOTOR_TIMESCALE = 0.01;  // a small value to make Interface quickly apply MyAvatar.motorVelocity
+    var EASED_MOTOR_THRESHOLD = 0.1;   // above this speed (m/s) EASED_MOTOR_TIMESCALE is used
+    var ACCELERATION_MULTIPLIERS = { translation: 1, rotation: 1, zoom: 1 };
+    var STAYGROUNDED_PITCH_THRESHOLD = 45.0; // degrees; ground level is maintained when pitch is within this threshold
+    var MIN_DELTA_TIME = 0.0001; // to avoid math overflow, never consider dt less than this value
+    var DEG_TO_RAD = Math.PI / 180.0;
+    update.frameCount = 0;
+    update.endTime = update.windowStartTime = _utils.getRuntimeSeconds();
+    update.windowFrame = update.windowStartFrame= 0;
+
+    this.update = update;
+    this.options = options;
+    this._resetMyAvatarMotor = _resetMyAvatarMotor;
+    this._applyDirectPitchYaw = _applyDirectPitchYaw;
+
+    var globalState = options.globalState;
+    var getCameraMovementSettings = options.getCameraMovementSettings;
+    var getMovementState = options.getMovementState;
+    var _debugChannel = options.debugChannel;
+    function update(dt) {
+        update.frameCount++;
+        var startTime = _utils.getRuntimeSeconds();
+        var settings = getCameraMovementSettings(),
+            EPSILON = settings.epsilon;
+
+        var independentCamera = Camera.mode === 'independent',
+            headPitch = MyAvatar.headPitch;
+
+        var actualDeltaTime = startTime - update.endTime,
+            practicalDeltaTime = Math.max(MIN_DELTA_TIME, actualDeltaTime),
+            deltaTime;
+
+        if (settings.useConstantDeltaTime) {
+            deltaTime = settings.threadMode === movementUtils.CameraControls.ANIMATION_FRAME ?
+                (1 / settings.fps) : (1 / 90);
+        } else if (settings.threadMode === movementUtils.CameraControls.SCRIPT_UPDATE) {
+            deltaTime = dt;
+        } else {
+            deltaTime = practicalDeltaTime;
+        }
+
+        var orientationProperty = settings.useHead ? 'headOrientation' : 'orientation',
+            currentOrientation = independentCamera ? Camera.orientation : MyAvatar[orientationProperty],
+            currentPosition = MyAvatar.position;
+
+        var previousValues = globalState.previousValues,
+            pendingChanges = globalState.pendingChanges,
+            currentVelocities = globalState.currentVelocities;
+
+        var movementState = getMovementState({ update: deltaTime }),
+            targetState = movementUtils.applyEasing(deltaTime, 'easeIn', settings, movementState, ACCELERATION_MULTIPLIERS),
+            dragState = movementUtils.applyEasing(deltaTime, 'easeOut', settings, currentVelocities, ACCELERATION_MULTIPLIERS);
+
+        currentVelocities.integrate(targetState, currentVelocities, dragState, settings);
+
+        var currentSpeed = Vec3.length(currentVelocities.translation),
+            targetSpeed = Vec3.length(movementState.translation),
+            verticalHold = movementState.isGrounded && settings.stayGrounded && Math.abs(headPitch) < STAYGROUNDED_PITCH_THRESHOLD;
+
+        var deltaOrientation = Quat.fromVec3Degrees(Vec3.multiply(deltaTime, currentVelocities.rotation)),
+            targetOrientation = Quat.normalize(Quat.multiply(currentOrientation, deltaOrientation));
+
+        var targetVelocity = Vec3.multiplyQbyV(targetOrientation, currentVelocities.translation);
+
+        if (verticalHold) {
+            targetVelocity.y = 0;
+        }
+
+        var deltaPosition = Vec3.multiply(deltaTime, targetVelocity);
+
+        _resetMyAvatarMotor(pendingChanges);
+
+        if (!independentCamera) {
+            var DriveModes = movementUtils.DriveModes;
+            switch (settings.driveMode) {
+                case DriveModes.MOTOR: {
+                    if (currentSpeed > EPSILON || targetSpeed > EPSILON) {
+                        var motorTimescale = (currentSpeed > EASED_MOTOR_THRESHOLD ? EASED_MOTOR_TIMESCALE : DEFAULT_MOTOR_TIMESCALE);
+                        var motorPitch = Quat.fromPitchYawRollDegrees(headPitch, 180, 0),
+                            motorVelocity = Vec3.multiplyQbyV(motorPitch, currentVelocities.translation);
+                        if (verticalHold) {
+                            motorVelocity.y = 0;
+                        }
+                        Object.assign(pendingChanges.MyAvatar, {
+                            motorVelocity: motorVelocity,
+                            motorTimescale: motorTimescale
+                        });
+                    }
+                    break;
+                }
+                case DriveModes.THRUST: {
+                    var thrustVector = currentVelocities.translation,
+                        maxThrust = settings.translation.maxVelocity,
+                        thrust;
+                    if (targetSpeed > EPSILON) {
+                        thrust = movementUtils.calculateThrust(maxThrust * 5, thrustVector, previousValues.thrust);
+                    } else if (currentSpeed > 1 && Vec3.length(previousValues.thrust) > 1) {
+                        thrust = Vec3.multiply(-currentSpeed / 10.0, thrustVector);
+                    } else {
+                        thrust = Vec3.ZERO;
+                    }
+                    if (thrust) {
+                        thrust = Vec3.multiplyQbyV(MyAvatar[orientationProperty], thrust);
+                        if (verticalHold) {
+                            thrust.y = 0;
+                        }
+                    }
+                    previousValues.thrust = pendingChanges.MyAvatar.setThrust = thrust;
+                    break;
+                }
+                case DriveModes.POSITION: {
+                    pendingChanges.MyAvatar.position = Vec3.sum(currentPosition, deltaPosition);
+                    break;
+                }
+                default: {
+                    throw new Error('unknown driveMode: ' + settings.driveMode);
+                }
+            }
+        }
+
+        var finalOrientation;
+        switch (Camera.mode) {
+            case 'mirror': // fall through
+            case 'independent':
+                targetOrientation = settings.preventRoll ? Quat.cancelOutRoll(targetOrientation) : targetOrientation;
+                var boomVector = Vec3.multiply(-currentVelocities.zoom.z, Quat.getFront(targetOrientation)),
+                    deltaCameraPosition = Vec3.sum(boomVector, deltaPosition);
+                Object.assign(pendingChanges.Camera, {
+                    position: Vec3.sum(Camera.position, deltaCameraPosition),
+                    orientation: targetOrientation
+                });
+                break;
+            case 'entity':
+                finalOrientation = targetOrientation;
+                break;
+            default: // 'first person', 'third person'
+                finalOrientation = targetOrientation;
+                break;
+        }
+
+        if (settings.jitterTest) {
+            finalOrientation = Quat.multiply(MyAvatar[orientationProperty], Quat.fromPitchYawRollDegrees(0, 60 * deltaTime, 0));
+            // Quat.fromPitchYawRollDegrees(0, _utils.getRuntimeSeconds() * 60, 0)
+        }
+
+        if (finalOrientation) {
+            if (settings.preventRoll) {
+                finalOrientation = Quat.cancelOutRoll(finalOrientation);
+            }
+            previousValues.finalOrientation = pendingChanges.MyAvatar[orientationProperty] = Quat.normalize(finalOrientation);
+        }
+
+        if (!movementState.mouseSmooth && movementState.isRightMouseButton) {
+            // directly apply mouse pitch and yaw when mouse smoothing is disabled
+            _applyDirectPitchYaw(deltaTime, movementState, settings);
+        }
+
+        var endTime = _utils.getRuntimeSeconds();
+        var cycleTime = endTime - update.endTime;
+        update.endTime = endTime;
+
+        pendingChanges.submit();
+
+        if ((endTime - update.windowStartTime) > 3) {
+            update.momentaryFPS = (update.frameCount - update.windowStartFrame) /
+                (endTime - update.windowStartTime);
+            update.windowStartFrame = update.frameCount;
+            update.windowStartTime = endTime;
+        }
+
+        if (_debugChannel && update.windowStartFrame === update.frameCount) {
+            Messages.sendLocalMessage(_debugChannel, JSON.stringify({
+                threadFrames: update.threadFrames,
+                frame: update.frameCount,
+                threadMode: settings.threadMode,
+                driveMode: settings.driveMode,
+                orientationProperty: orientationProperty,
+                isGrounded: movementState.isGrounded,
+                targetAnimationFPS: settings.threadMode === movementUtils.CameraControls.ANIMATION_FRAME ? settings.fps : undefined,
+                actualFPS: 1 / actualDeltaTime,
+                effectiveAnimationFPS: 1 / deltaTime,
+                seconds: {
+                    startTime: startTime,
+                    endTime: endTime
+                },
+                milliseconds: {
+                    actualDeltaTime: actualDeltaTime * 1000,
+                    deltaTime: deltaTime * 1000,
+                    cycleTime: cycleTime * 1000,
+                    calculationTime: (endTime - startTime) * 1000
+                },
+                finalOrientation: finalOrientation,
+                thrust: thrust,
+                maxVelocity: settings.translation,
+                targetVelocity: targetVelocity,
+                currentSpeed: currentSpeed,
+                targetSpeed: targetSpeed
+            }, 0, 2));
+        }
+    }
+
+    function _resetMyAvatarMotor(targetObject) {
+        if (MyAvatar.motorTimescale !== DEFAULT_MOTOR_TIMESCALE) {
+            targetObject.MyAvatar.motorTimescale = DEFAULT_MOTOR_TIMESCALE;
+        }
+        if (MyAvatar.motorReferenceFrame !== 'avatar') {
+            targetObject.MyAvatar.motorReferenceFrame = 'avatar';
+        }
+        if (Vec3.length(MyAvatar.motorVelocity)) {
+            targetObject.MyAvatar.motorVelocity = Vec3.ZERO;
+        }
+    }
+
+    function _applyDirectPitchYaw(deltaTime, movementState, settings) {
+        var orientationProperty = settings.useHead ? 'headOrientation' : 'orientation',
+            rotation = movementState.rotation,
+            speed = Vec3.multiply(-DEG_TO_RAD / 2.0, settings.rotation.speed);
+
+        var previousValues = globalState.previousValues,
+            pendingChanges = globalState.pendingChanges,
+            currentVelocities = globalState.currentVelocities;
+
+        var previous = previousValues.pitchYawRoll,
+            target = Vec3.multiply(deltaTime, Vec3.multiplyVbyV(rotation, speed)),
+            pitchYawRoll = Vec3.mix(previous, target, 0.5),
+            orientation = Quat.fromVec3Degrees(pitchYawRoll);
+
+        previousValues.pitchYawRoll = pitchYawRoll;
+
+        if (pendingChanges.MyAvatar.headOrientation || pendingChanges.MyAvatar.orientation) {
+            var newOrientation = Quat.multiply(MyAvatar[orientationProperty], orientation);
+            delete pendingChanges.MyAvatar.headOrientation;
+            delete pendingChanges.MyAvatar.orientation;
+            if (settings.preventRoll) {
+                newOrientation = Quat.cancelOutRoll(newOrientation);
+            }
+            MyAvatar[orientationProperty] = newOrientation;
+        } else if (pendingChanges.Camera.orientation) {
+            var cameraOrientation = Quat.multiply(Camera.orientation, orientation);
+            if (settings.preventRoll) {
+                cameraOrientation = Quat.cancelOutRoll(cameraOrientation);
+            }
+            Camera.orientation = cameraOrientation;
+        }
+        currentVelocities.rotation = Vec3.ZERO;
+    }
+}
diff --git a/unpublishedScripts/marketplace/camera-move/hifi-jquery-ui.js b/unpublishedScripts/marketplace/camera-move/hifi-jquery-ui.js
new file mode 100644
index 0000000000..31f2186ee1
--- /dev/null
+++ b/unpublishedScripts/marketplace/camera-move/hifi-jquery-ui.js
@@ -0,0 +1,311 @@
+// extended jQuery UI controls
+
+/* eslint-env console, jquery, browser */
+/* eslint-disable comma-dangle, no-empty */
+/* global assert, log, debugPrint */
+// ----------------------------------------------------------------------------
+
+// WIDGET BASE
+Object.assign($.Widget.prototype, {
+    // common bootstrapping across widget types
+    initHifiControl: function initHifiControl(hifiType) {
+        initHifiControl.widgetCount = (initHifiControl.widgetCount || 0) + 1;
+        hifiType = hifiType || this.widgetName;
+
+        var element = this.element, options = this.options, node = element.get(0), dataset = node.dataset;
+        assert(!this.element.is('.initialized'));
+        this.element.addClass('initialized');
+        var attributes = [].reduce.call(node.attributes, function(out, attribute) {
+            out[attribute.name] = attribute.value;
+            return out;
+        }, {});
+
+        var searchOrder = [ options, dataset, attributes, node ];
+        function setData(key, fallback) {
+            var value = searchOrder.map(function(obj) {
+                return obj[key];
+            }).concat(fallback).filter(function(value) {
+                return value !== undefined;
+            })[0];
+            return value === undefined ? null : (dataset[key] = value);
+        }
+        options.hifiWidgetId = hifiType + '-' + initHifiControl.widgetCount;
+        node.id = node.id || options.hifiWidgetId;
+        dataset.hifiType = hifiType;
+        setData('type');
+        setData('for', node.id);
+        setData('checked');
+        if (setData('value', null) !== null) {
+            element.attr('value', dataset.value);
+        }
+
+        return node.id;
+    },
+    hifiFindWidget: function(hifiType, quiet) {
+        var selector = ':ui-'+hifiType;
+        var _for = JSON.stringify(this.element.data('for')||undefined),
+            element = _for && $('[id='+_for+']').filter(selector);
+        if (!element.is(selector)) {
+            element = this.element.closest(selector);
+        }
+        var instance = element.filter(selector)[hifiType]('instance');
+
+        if (!instance && !quiet) {
+            // eslint-disable-next-line no-console
+            console.error([
+                instance, 'could not find target instance ' + selector +
+                    ' for ' + this.element.data('hifi-type') +
+                    ' #' + this.element.prop('id') + ' for=' + this.element.data('for')
+            ]);
+        }
+        return instance;
+    },
+});
+
+// CHECKBOX
+$.widget('ui.hifiCheckbox', $.ui.checkboxradio, {
+    value: function value(nv) {
+        if (arguments.length) {
+            var currentValue = this.element.prop('checked');
+            if (nv !== currentValue){
+                this.element.prop('checked', nv);
+                this.element.change();
+            }
+        }
+        return this.element.prop('checked');
+    },
+    _create: function() {
+        var id = this.initHifiControl();
+        this.element.attr('value', id);
+        // add an implicit label if missing
+        var forId = 'for=' + JSON.stringify(id);
+        var label = $(this.element.get(0)).closest('label').add($('label[' + forId + ']'));
+        if (!label.get(0)) {
+            $('<label ' + forId + '>' + forId + '</label>').appendTo(this.element);
+        }
+        this._super();
+        this.element.on('change._hifiCheckbox, click._hifiCheckbox', function() {
+            var checked = this.value(),
+                attr = this.element.attr('checked');
+            if (checked && !attr) {
+                this.element.attr('checked', 'checked');
+            } else if (!checked && attr) {
+                this.element.removeAttr('checked');
+            }
+            this.refresh();
+        }.bind(this));
+    },
+});
+
+// BUTTON
+$.widget('ui.hifiButton', $.ui.button, {
+    value: function(nv) {
+        var dataset = this.element[0].dataset;
+        if (arguments.length) {
+            var checked = (dataset.checked === 'true');
+            nv = (nv === 'true' || !!nv);
+            if (nv !== checked) {
+                debugPrint('hifibutton checked changed', nv, checked);
+                dataset.checked = nv;
+                this.element.change();
+            } else {
+                debugPrint('hifibutton value same', nv, checked);
+            }
+        }
+        return dataset.checked === 'true';
+    },
+    _create: function() {
+        this.element.data('type', 'checkbox');
+        this.initHifiControl();
+        this._super();
+        this.element[0].dataset.checked = !!this.element.attr('checked');
+        var _for = this.element.data('for') || undefined;
+        if (_for && _for !== this.element[0].id) {
+            _for = JSON.stringify(_for);
+            var checkbox = this.hifiFindWidget('hifiCheckbox', true);
+            if (!checkbox) {
+                var input = $('<label><input type=checkbox id=' + _for + ' value=' + _for +' /></label>').hide();
+                input.appendTo(this.element);
+                checkbox = input.find('input')
+                    .hifiCheckbox()
+                    .hifiCheckbox('instance');
+            }
+            this.element.find('.tooltip-target').removeClass('tooltip-target');
+            this.element.prop('id', 'button-'+this.element.prop('id'));
+            checkbox.element.on('change._hifiButton', function() {
+                debugPrint('checkbox -> button');
+                this.value(checkbox.value());
+            }.bind(this));
+            this.element.on('change', function() {
+                debugPrint('button -> checkbox');
+                checkbox.value(this.value());
+            }.bind(this));
+            this.checkbox = checkbox;
+        }
+    },
+});
+
+// RADIO BUTTON
+$.widget('ui.hifiRadioButton', $.ui.checkboxradio, {
+    value: function value(nv) {
+        if (arguments.length) {
+            this.element.prop('checked', !!nv);
+            this.element.change();
+        }
+        return this.element.prop('checked');
+    },
+    _create: function() {
+        var id = this.initHifiControl();
+        this.element.attr('value', this.element.data('value') || id);
+        // console.log(this.element[0]);
+        assert(this.element.data('for'));
+        this._super();
+
+        this.element.on('change._hifiRadioButton, click._hifiRadioButton', function() {
+            var group = this.hifiFindWidget('hifiRadioGroup'),
+                checked = !!this.element.attr('checked'),
+                dotchecked = this.element.prop('checked'),
+                value = this.element.attr('value');
+
+            if (dotchecked !== checked || group.value() !== value) {
+                if (dotchecked && group.value() !== value) {
+                    log(value, 'UPDATING GRUOP', group.element[0].id);
+                    group.value(value);
+                }
+            }
+        }.bind(this));
+    },
+});
+
+// RADIO GROUP
+$.widget('ui.hifiRadioGroup', $.ui.controlgroup, {
+    radio: function(selector) {
+        return this.element.find(':ui-hifiRadioButton' + selector).hifiRadioButton('instance');
+    },
+    refresh: function() {
+        var value = this.value();
+        this.element.find(':ui-hifiRadioButton').each(function() {
+            $(this).prop('checked', $(this).attr('value') === value).hifiRadioButton('refresh');
+        });
+        this._super();
+    },
+    value: function value(nv) {
+        if (arguments.length) {
+            var id = this.element[0].id,
+                previous = this.value();
+            debugPrint('RADIOBUTTON GROUP value', id + ' = ' + nv + '(was: ' + previous + ')');
+            this.element.attr('value', nv);
+            this.refresh();
+        }
+        return this.element.attr('value');
+    },
+    _create: function(x) {
+        debugPrint('ui.hifiRadioGroup._create', this.element[0]);
+        this.initHifiControl();
+        this.options.items = {
+            hifiRadioButton: 'input[type=radio]',
+        };
+        this._super();
+        // allow setting correct radio button by assign to .value property (or $.fn.val() etc.)
+        Object.defineProperty(this.element[0], 'value', {
+            set: function(nv) {
+                try {
+                    this.radio('#' + nv).value(true);
+                } catch (e) {}
+                return this.value();
+            }.bind(this),
+            get: function() {
+                return this.element.attr('value');
+            }.bind(this),
+        });
+    },
+});
+
+// SPINNER (numeric input + up/down buttons)
+$.widget('ui.hifiSpinner', $.ui.spinner, {
+    value: function value(nv) {
+        if (arguments.length) {
+            var num = parseFloat(nv);
+            debugPrint('ui.hifiSpinner.value set', this.element[0].id, num, '(was: ' + this.value() + ')', 'raw:'+nv);
+            this._value(num);
+            this.element.change();
+        }
+        return parseFloat(this.element.val());
+    },
+    _value: function(value, allowAny) {
+        debugPrint('ui.hifiSpinner._value', value, allowAny);
+        return this._super(value, allowAny);
+    },
+    _create: function() {
+        this.initHifiControl();
+        var step = this.options.step = this.options.step || 1.0;
+        // allow step=".01" for precision and data-step=".1" for default increment amount
+        this.options.prescale = parseFloat(this.element.data('step') || step) / (step);
+        this._super();
+        this.previous = null;
+        this.element.on('change._hifiSpinner', function() {
+            var value = this.value(),
+                invalid = !this.isValid();
+            debugPrint('hifiSpinner.changed', value, invalid ? '!!!invalid' : 'valid');
+            !invalid && this.element.attr('value', value);
+        }.bind(this));
+    },
+    _spin: function( step, event ) {
+        step = step * this.options.prescale * (
+            event.shiftKey ? 0.1 : event.ctrlKey ? 10 : 1
+        );
+        return this._super( step, event );
+    },
+    _stop: function( event, ui ) {
+        try {
+            return this._super(event, ui);
+        } finally {
+            if (/mouse/.test(event && event.type)) {
+                var value = this.value();
+                if ((value || value === 0) && !isNaN(value) && this.previous !== null && this.previous !== value) {
+                    this.value(this.value());
+                }
+                this.previous = value;
+            }
+        }
+    },
+    _format: function(n) {
+        var precision = this._precision();
+        return parseFloat(n).toFixed(precision);
+    },
+    _events: {
+        mousewheel: function(event, delta) {
+            if (document.activeElement === this.element[0]) {
+                // fix broken mousewheel on Chrome / embedded webkit
+                delta = delta === undefined ? -(event.originalEvent.deltaY+event.originalEvent.deltaX) : delta;
+                $.ui.spinner.prototype._events.mousewheel.call(this, event, delta);
+            }
+        }
+    }
+});
+
+// SLIDER
+$.widget('ui.hifiSlider', $.ui.slider, {
+    value: function value(nv) {
+        if (arguments.length) {
+            var num = this._trimAlignValue(nv);
+            debugPrint('hifiSlider.value', nv, num);
+            if (this.options.value !== num) {
+                this.options.value = num;
+                this.element.change();
+            }
+        }
+        return this.options.value;
+    },
+    _create: function() {
+        this.initHifiControl();
+        this._super();
+        this.element
+            .attr('type', this.element.attr('type') || 'slider')
+            .find('.ui-slider-handle').html('<div class="inner-ui-slider-handle"></div>').end()
+            .on('change', function() {
+                this.hifiFindWidget('hifiSpinner').value(this.value());
+                this._refresh();
+            }.bind(this));
+    },
+});
diff --git a/unpublishedScripts/marketplace/camera-move/modules/EnumMeta.js b/unpublishedScripts/marketplace/camera-move/modules/EnumMeta.js
new file mode 100644
index 0000000000..e463442c05
--- /dev/null
+++ b/unpublishedScripts/marketplace/camera-move/modules/EnumMeta.js
@@ -0,0 +1,238 @@
+// EnumMeta.js -- helper module that maps related enum values to printable names and ids
+
+/* eslint-env commonjs */
+/* global DriveKeys, console */
+
+var VERSION = '0.0.1';
+var WANT_DEBUG = false;
+
+function _debugPrint() {
+    // eslint-disable-next-line no-console
+    (typeof Script === 'object' ? print : console.log)('EnumMeta | ' + [].slice.call(arguments).join(' '));
+}
+
+var debugPrint = WANT_DEBUG ? _debugPrint : function(){};
+
+try {
+    /* global process */
+    if (process.title === 'node') {
+        _defineNodeJSMocks();
+    }
+} catch (e) { /* eslint-disable-line empty-block */ }
+
+_debugPrint(VERSION);
+
+// FIXME: C++ emits this action event, but doesn't expose it yet to scripting
+//   (ie: as Actions.ZOOM or Actions.TranslateCameraZ)
+var ACTION_TRANSLATE_CAMERA_Z = {
+    actionName: 'TranslateCameraZ',
+    actionID: 12,
+    driveKeyName: 'ZOOM'
+};
+
+module.exports = {
+    version: VERSION,
+    DriveKeyNames: invertKeys(DriveKeys),
+    Controller: {
+        Hardware: Object.keys(Controller.Hardware).reduce(function(names, prop) {
+            names[prop+'Names'] = invertKeys(Controller.Hardware[prop]);
+            return names;
+        }, {}),
+        ActionNames: _getActionNames(),
+        StandardNames: invertKeys(Controller.Standard)
+    },
+    getDriveKeyNameFromActionName: getDriveKeyNameFromActionName,
+    getActionNameFromDriveKeyName: getActionNameFromDriveKeyName,
+    eventKeyText2KeyboardName: eventKeyText2KeyboardName,
+    keyboardName2eventKeyText: keyboardName2eventKeyText,
+    ACTION_TRANSLATE_CAMERA_Z: ACTION_TRANSLATE_CAMERA_Z,
+    INVALID_ACTION_ID: Controller.findAction('INVALID_ACTION_ID_FOO')
+};
+
+_debugPrint('///'+VERSION, Object.keys(module.exports));
+
+var actionsMapping = {}, driveKeyMapping = {};
+
+initializeMappings(actionsMapping, driveKeyMapping);
+
+function invertKeys(object) {
+    if (!object) {
+        return object;
+    }
+    return Object.keys(object).reduce(function(out, key) {
+        out[object[key]] = key;
+        return out;
+    }, {});
+}
+
+function _getActionNames() {
+    var ActionNames = invertKeys(Controller.Hardware.Actions);
+    ActionNames[ACTION_TRANSLATE_CAMERA_Z.actionID] = ACTION_TRANSLATE_CAMERA_Z.actionName;
+    function mapActionName(actionName) {
+        var actionKey = Controller.Hardware.Actions[actionName],
+            actionID = Controller.findAction(actionName),
+            similarName = eventKeyText2KeyboardName(actionName),
+            existingName = ActionNames[actionID];
+
+        var keyName = actionName;
+
+        if (actionID === module.exports.INVALID_ACTION_ID) {
+            _debugPrint('actionID === INVALID_ACTION_ID', actionName);
+        }
+        switch (actionName) {
+            case 'StepTranslateX': actionName = 'StepTranslate'; break;
+            case 'StepTranslateY': actionName = 'StepTranslate'; break;
+            case 'StepTranslateZ': actionName = 'StepTranslate'; break;
+            case 'ACTION1': actionName = 'PrimaryAction'; break;
+            case 'ACTION2': actionName = 'SecondaryAction'; break;
+        }
+        debugPrint(keyName, actionName, actionKey, actionID);
+
+        similarName = similarName.replace('Lateral','Strafe').replace(/^(?:Longitudinal|Vertical)/, '');
+        if (actionID in ActionNames) {
+            // check if overlap is just BoomIn <=> BOOM_IN
+            if (similarName !== existingName && actionName !== existingName) {
+                throw new Error('assumption failed: overlapping actionID:'+JSON.stringify({
+                    actionID: actionID,
+                    actionKey: actionKey,
+                    actionName: actionName,
+                    similarName: similarName,
+                    keyName: keyName,
+                    existingName: existingName
+                },0,2));
+            }
+        } else {
+            ActionNames[actionID] = actionName;
+            ActionNames[actionKey] = keyName;
+        }
+    }
+    // first map non-legacy (eg: Up and not VERTICAL_UP) actions
+    Object.keys(Controller.Hardware.Actions).filter(function(name) {
+        return /[a-z]/.test(name);
+    }).sort().reverse().forEach(mapActionName);
+    // now legacy actions
+    Object.keys(Controller.Hardware.Actions).filter(function(name) {
+        return !/[a-z]/.test(name);
+    }).sort().reverse().forEach(mapActionName);
+
+    return ActionNames;
+}
+
+// attempts to brute-force translate an Action name into a DriveKey name
+//   eg: _translateActionName('TranslateX') === 'TRANSLATE_X'
+//   eg: _translateActionName('Yaw') === 'YAW'
+function _translateActionName(name, _index) {
+    name = name || '';
+    var key = name;
+    var re = new RegExp('[A-Z][a-z0-9]+', 'g');
+    key = key.replace(re, function(Word) {
+        return Word.toUpperCase()+'_';
+    })
+        .replace(/_$/, '');
+
+    if (key in DriveKeys) {
+        debugPrint('getDriveKeyFromEventName', _index, name, key, DriveKeys[key]);
+        return key;
+    }
+}
+
+function getActionNameFromDriveKeyName(driveKeyName) {
+    return driveKeyMapping[driveKeyName];
+}
+// maps an action lookup value to a DriveKey name
+//  eg: actionName: 'Yaw' === 'YAW'
+//      actionKey:  Controller.Actions.Yaw => 'YAW'
+//      actionID:   Controller.findAction('Yaw') => 'YAW'
+function getDriveKeyNameFromActionName(lookupValue) {
+    if (lookupValue === ACTION_TRANSLATE_CAMERA_Z.actionName ||
+        lookupValue === ACTION_TRANSLATE_CAMERA_Z.actionID) {
+        return ACTION_TRANSLATE_CAMERA_Z.driveKeyName;
+    }
+    if (typeof lookupValue === 'string') {
+        lookupValue = Controller.findAction(lookupValue);
+    }
+    return actionsMapping[lookupValue];
+}
+
+// maps a Controller.key*Event event.text -> Controller.Hardware.Keyboard[name]
+//   eg: ('Page Up') === 'PgUp'
+//   eg: ('LEFT') === 'Left'
+function eventKeyText2KeyboardName(text) {
+    if (eventKeyText2KeyboardName[text]) {
+        // use memoized value
+        return eventKeyText2KeyboardName[text];
+    }
+    var keyboardName = (text||'').toUpperCase().split(/[ _]/).map(function(WORD) {
+        return WORD.replace(/([A-Z])(\w*)/g, function(_, A, b) {
+            return (A.toUpperCase() + b.toLowerCase());
+        });
+    }).join('').replace('Page','Pg');
+    return eventKeyText2KeyboardName[text] = eventKeyText2KeyboardName[keyboardName] = keyboardName;
+}
+
+// maps a Controller.Hardware.Keyboard[name] -> Controller.key*Event event.text
+//   eg: ('PgUp') === 'PAGE UP'
+//   eg: ('Shift') === 'SHIFT'
+function keyboardName2eventKeyText(keyName) {
+    if (keyboardName2eventKeyText[keyName]) {
+        // use memoized value
+        return keyboardName2eventKeyText[keyName];
+    }
+    var text = keyName.replace('Pg', 'Page');
+    var caseWords = text.match(/[A-Z][a-z0-9]+/g) || [ text ];
+    var eventText = caseWords.map(function(str) {
+        return str.toUpperCase();
+    }).join('_');
+    return keyboardName2eventKeyText[keyName] = eventText;
+}
+
+function initializeMappings(actionMap, driveKeyMap) {
+    _debugPrint('creating mapping');
+    var ref = ACTION_TRANSLATE_CAMERA_Z;
+    actionMap[ref.actionName] = actionMap[ref.actionID] = ref.driveKeyName;
+    actionMap.BoomIn = 'ZOOM';
+    actionMap.BoomOut = 'ZOOM';
+
+    Controller.getActionNames().sort().reduce(
+        function(out, name, index, arr) {
+            var actionKey = arr[index];
+            var actionID = Controller.findAction(name);
+            var value = actionID in out ? out[actionID] : _translateActionName(name, index);
+            if (value !== undefined) {
+                var prefix = (actionID in out ? '+++' : '---');
+                debugPrint(prefix + ' Action2DriveKeyName['+name+'('+actionID+')] = ' + value);
+                driveKeyMap[value] = driveKeyMap[value] || name;
+            }
+            out[name] = out[actionID] = out[actionKey] = value;
+            return out;
+        }, actionMap);
+}
+
+// ----------------------------------------------------------------------------
+// mocks for litmus testing using Node.js command line tools
+function _defineNodeJSMocks() {
+    /* eslint-disable no-global-assign */
+    DriveKeys = {
+        TRANSLATE_X: 12345
+    };
+    Controller = {
+        getActionNames: function() {
+            return Object.keys(this.Hardware.Actions);
+        },
+        findAction: function(name) {
+            return this.Hardware.Actions[name] || 4095;
+        },
+        Hardware: {
+            Actions: {
+                TranslateX: 54321
+            },
+            Application: {
+                Grounded: 1
+            },
+            Keyboard: {
+                A: 65
+            }
+        }
+    };
+    /* eslint-enable no-global-assign */
+}
diff --git a/unpublishedScripts/marketplace/camera-move/modules/_utils.js b/unpublishedScripts/marketplace/camera-move/modules/_utils.js
new file mode 100644
index 0000000000..bf0f09aac8
--- /dev/null
+++ b/unpublishedScripts/marketplace/camera-move/modules/_utils.js
@@ -0,0 +1,457 @@
+// _utils.js -- misc. helper classes/functions
+
+"use strict";
+/* eslint-env commonjs, hifi */
+/* eslint-disable comma-dangle, no-empty */
+/* global HIRES_CLOCK, Desktop, OverlayWebWindow */
+// var HIRES_CLOCK = (typeof Window === 'object' && Window && Window.performance) && Window.performance.now;
+var USE_HIRES_CLOCK = typeof HIRES_CLOCK === 'function';
+
+var exports = {
+    version: '0.0.1c' + (USE_HIRES_CLOCK ? '-hires' : ''),
+    bind: bind,
+    signal: signal,
+    assign: assign,
+    sortedAssign: sortedAssign,
+    sign: sign,
+    assert: assert,
+    makeDebugRequire: makeDebugRequire,
+    DeferredUpdater: DeferredUpdater,
+    KeyListener: KeyListener,
+    getRuntimeSeconds: getRuntimeSeconds,
+    createAnimationStepper: createAnimationStepper,
+    reloadClientScript: reloadClientScript,
+
+    normalizeStackTrace: normalizeStackTrace,
+    BrowserUtils: BrowserUtils,
+};
+try {
+    module.exports = exports; // Interface / Node.js
+} catch (e) {
+    this._utils = assign(this._utils || {}, exports); // browser
+}
+
+// ----------------------------------------------------------------------------
+function makeDebugRequire(relativeTo) {
+    return function boundDebugRequire(id) {
+        return debugRequire(id, relativeTo);
+    };
+}
+function debugRequire(id, relativeTo) {
+    if (typeof Script === 'object') {
+        relativeTo = (relativeTo||Script.resolvePath('.')).replace(/\/+$/, '');
+        // hack-around for use during local development / testing that forces every require to re-fetch the script from the server
+        var modulePath = Script._requireResolve(id, relativeTo+'/') + '?' + new Date().getTime().toString(36);
+        print('========== DEBUGREQUIRE:' + modulePath);
+        Script.require.cache[modulePath] = Script.require.cache[id] = undefined;
+        Script.require.__qt_data__[modulePath] = Script.require.__qt_data__[id] = true;
+        return Script.require(modulePath);
+    } else {
+        return require(id);
+    }
+}
+
+// examples:
+//     assert(function assertion() { return (conditions === true) }, 'assertion failed!')
+//     var neededValue = assert(idString, 'idString not specified!');
+//     assert(false, 'unexpected state');
+function assert(truthy, message) {
+    message = message || 'Assertion Failed:';
+
+    if (typeof truthy === 'function' && truthy.name === 'assertion') {
+        // extract function body to display with the assertion message
+        var assertion = (truthy+'').replace(/[\r\n]/g, ' ')
+            .replace(/^[^{]+\{|\}$|^\s*|\s*$/g, '').trim()
+            .replace(/^return /,'').replace(/\s[\r\n\t\s]+/g, ' ');
+        message += ' ' + JSON.stringify(assertion);
+        try {
+            truthy = truthy();
+        } catch (e) {
+            message += '(exception: ' + e +')';
+        }
+    }
+    if (!truthy) {
+        message += ' ('+truthy+')';
+        throw new Error(message);
+    }
+    return truthy;
+}
+
+
+// ----------------------------------------------------------------------------
+function sign(x) {
+    x = +x;
+    if (x === 0 || isNaN(x)) {
+        return Number(x);
+    }
+    return x > 0 ? 1 : -1;
+}
+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/assign#Polyfill
+/* eslint-disable */
+function assign(target, varArgs) { // .length of function is 2
+    'use strict';
+    if (target == null) { // TypeError if undefined or null
+        throw new TypeError('Cannot convert undefined or null to object');
+    }
+
+    var to = Object(target);
+
+    for (var index = 1; index < arguments.length; index++) {
+        var nextSource = arguments[index];
+
+        if (nextSource != null) { // Skip over if undefined or null
+            for (var nextKey in nextSource) {
+                // Avoid bugs when hasOwnProperty is shadowed
+                if (Object.prototype.hasOwnProperty.call(nextSource, nextKey)) {
+                    to[nextKey] = nextSource[nextKey];
+                }
+            }
+        }
+    }
+    return to;
+}
+/* eslint-enable */
+// //https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/assign#Polyfill
+
+// hack to sort keys in v8 for prettier JSON exports
+function sortedAssign(target, sources) {
+    var allParams = assign.apply(this, [{}].concat([].slice.call(arguments)));
+    for (var p in target) {
+        delete target[p];
+    }
+    Object.keys(allParams).sort(function(a,b) {
+        function swapCase(ch) {
+            return /[A-Z]/.test(ch) ? ch.toLowerCase() : ch.toUpperCase();
+        }
+        a = a.replace(/^./, swapCase);
+        b = b.replace(/^./, swapCase);
+        a = /Version/.test(a) ? 'AAAA'+a : a;
+        b = /Version/.test(b) ? 'AAAA'+b : b;
+        return a < b ? -1 : a > b ? 1 : 0;
+    }).forEach(function(key) {
+        target[key] = allParams[key];
+    });
+    return target;
+}
+
+// ----------------------------------------------------------------------------
+// @function - bind a function to a `this` context
+// @param {Object} - the `this` context
+// @param {Function|String} - function or method name
+bind.debug = true;
+function bind(thiz, method) {
+    var methodName = typeof method === 'string' ? method : method.name;
+    method = thiz[method] || method;
+    if (bind.debug && methodName) {
+        methodName = methodName.replace(/[^A-Za-z0-9_$]/g, '_');
+        var debug = {};
+        debug[methodName] = method;
+        return eval('1,function bound'+methodName+'() { return debug.'+methodName+'.apply(thiz, arguments); }');
+    }
+    return function() {
+        return method.apply(thiz, arguments);
+    };
+}
+
+// @function - Qt signal polyfill
+function signal(template) {
+    var callbacks = [];
+    return Object.defineProperties(function() {
+        var args = [].slice.call(arguments);
+        callbacks.forEach(function(obj) {
+            obj.handler.apply(obj.scope, args);
+        });
+    }, {
+        connect: { value: function(scope, handler) {
+            callbacks.push({scope: scope, handler: scope[handler] || handler || scope});
+        }},
+        disconnect: { value: function(scope, handler) {
+            var match = {scope: scope, handler: scope[handler] || handler || scope};
+            callbacks = callbacks.filter(function(obj) {
+                return !(obj.scope === match.scope && obj.handler === match.handler);
+            });
+        }}
+    });
+}
+// ----------------------------------------------------------------------------
+function normalizeStackTrace(err, options) {
+    options = options || {};
+    // * Chromium:   "  at <anonymous> (file://.../filename.js:45:65)"
+    // * Interface:  "  at <anonymous() file://.../filename.js:45"
+    // * normalized: "  at <anonymous> filename.js:45"
+    var output = err.stack ? err.stack.replace(
+            /((?:https?|file):[/][/].*?):(\d+)(?::\d+)?([)]|\s|$)/g,
+        function(_, url, lineNumber, suffix) {
+            var fileref = url.split(/[?#]/)[0].split('/').pop();
+            if (Array.isArray(options.wrapFilesWith)) {
+                fileref = options.wrapFilesWith[0] + fileref + options.wrapFilesWith[1];
+            }
+            if (Array.isArray(options.wrapLineNumbersWith)) {
+                lineNumber = options.wrapLineNumbersWith[0] + lineNumber + options.wrapLineNumbersWith[1];
+            }
+            return fileref + ':' + lineNumber + suffix;
+        }
+    ).replace(/[(]([-\w.%:]+[.](?:html|js))[)]/g, '$1') : err.message;
+    return '    '+output;
+}
+
+// utilities specific to use from web browsers / embedded Interface web windows
+function BrowserUtils(global) {
+    global = global || (1,eval)('this');
+    return {
+        global: global,
+        console: global.console,
+        log: function(msg) { return this.console.log('browserUtils | ' + [].slice.call(arguments).join(' ')); },
+        makeConsoleWorkRight: function(console, forcePatching) {
+            if (console.$patched || !(forcePatching || global.qt)) {
+                return console;
+            }
+            var patched = ['log','debug','info','warn','error'].reduce(function(output, method) {
+                output[method] = function() {
+                    return console[method]([].slice.call(arguments).join(' '));
+                };
+                return output;
+            }, { $patched: console });
+            for (var p in console) {
+                if (typeof console[p] === 'function' && !(p in patched)) {
+                    patched[p] = console[p].bind(console);
+                }
+            }
+            patched.__proto__ = console; // let scope chain find constants and other non-function values
+            return patched;
+        },
+        parseQueryParams: function(querystring) {
+            return this.extendWithQueryParams({}, querystring);
+        },
+        extendWithQueryParams: function(obj, querystring) {
+            querystring = querystring || global.location.href;
+            querystring.replace(/\b(\w+)=([^&?#]+)/g, function(_, key, value) {
+                value = unescape(value);
+                obj[key] = value;
+            });
+            return obj;
+        },
+        // openEventBridge handles the cluster of scenarios Interface has imposed on webviews for making EventBridge connections
+        openEventBridge: function openEventBridge(callback) {
+            this.log('openEventBridge |', 'typeof global.EventBridge == ' + [typeof global.EventBridge, global.EventBridge ]);
+            var error;
+            try {
+                global.EventBridge.toString = function() { return '[global.EventBridge at startup]'; };
+                global.EventBridge.scriptEventReceived.connect.exists;
+                // this.log('openEventBridge| EventBridge already exists... -- invoking callback', 'typeof EventBridge == ' + typeof global.EventBridge);
+                try {
+                    return callback(global.EventBridge);
+                } catch(e) {
+                    error = e;
+                }
+            } catch (e) {
+                this.log('EventBridge not found in a usable state -- attempting to instrument via qt.webChannelTransport',
+                         Object.keys(global.EventBridge||{}));
+                var QWebChannel = assert(global.QWebChannel, 'expected global.QWebChannel to exist'),
+                    qt = assert(global.qt, 'expected global.qt to exist');
+                assert(qt.webChannelTransport, 'expected global.qt.webChannelTransport to exist');
+                new QWebChannel(qt.webChannelTransport, bind(this, function (channel) {
+                    var objects = channel.objects;
+                    if (global.EventBridge) {
+                        log('>>> global.EventBridge was unavailable at page load, but has spontaneously  materialized; ' +
+                            [ typeof global.EventBridge, global.EventBridge ]);
+                    }
+                    var eventBridge = objects.eventBridge || (objects.eventBridgeWrapper && objects.eventBridgeWrapper.eventBridge);
+                    eventBridge.toString = function() { return '[window.EventBridge per QWebChannel]'; };
+                    assert(!global.EventBridge || global.EventBridge === eventBridge, 'global.EventBridge !== QWebChannel eventBridge\n' +
+                           [global.EventBridge, eventBridge]);
+                    global.EventBridge = eventBridge;
+                    global.EventBridge.$WebChannel = channel;
+                    this.log('openEventBridge opened -- invoking callback', 'typeof EventBridge === ' + typeof global.EventBridge);
+                    callback(global.EventBridge);
+                }));
+            }
+            if (error) {
+                throw error;
+            }
+        },
+    };
+}
+// ----------------------------------------------------------------------------
+// queue property/method updates to target so that they can be applied all-at-once
+function DeferredUpdater(target, options) {
+    options = options || {};
+    // define _meta as a non-enumerable (so it doesn't show up in for (var p in ...) loops)
+    Object.defineProperty(this, '_meta', { enumerable: false, value: {
+        target: target,
+        lastValue: {},
+        dedupe: options.dedupe,
+    }});
+}
+DeferredUpdater.prototype = {
+    reset: function() {
+        var self = this;
+        Object.keys(this).forEach(function(property) {
+            delete self[property];
+        });
+        this._meta.lastValue = {};
+    },
+    submit: function() {
+        var meta = this._meta,
+            target = meta.target,
+            self = this,
+            submitted = {};
+        self.submit = getRuntimeSeconds();
+        Object.keys(self).forEach(function(property) {
+            var newValue = self[property];
+            submitted[property] = newValue;
+            if (typeof target[property] === 'function') {
+                target[property](newValue);
+            } else {
+                target[property] = newValue;
+            }
+            delete self[property];
+        });
+        return submitted;
+    }
+};
+// create a group of deferred updaters eg: DeferredUpdater.createGroup({ MyAvatar: MyAvatar, Camera: Camera })
+DeferredUpdater.createGroup = function(items, options) {
+    var result = {
+        __proto__: {
+            reset: function() {
+                Object.keys(this).forEach(bind(this, function(item) {
+                    this[item].reset();
+                }));
+            },
+            submit: function() {
+                var submitted = {};
+                Object.keys(this).forEach(bind(this, function(item) {
+                    submitted[item] = this[item].submit();
+                }));
+                return submitted;
+            }
+        }
+    };
+    Object.keys(items).forEach(function(item) {
+        result[item] = new DeferredUpdater(items[item], options);
+    });
+    return result;
+};
+
+// ----------------------------------------------------------------------------
+
+// session runtime in seconds
+getRuntimeSeconds.EPOCH = getRuntimeSeconds(0);
+function getRuntimeSeconds(since) {
+    since = since === undefined ? getRuntimeSeconds.EPOCH : since;
+    var now = USE_HIRES_CLOCK ? new HIRES_CLOCK() : +new Date;
+    return ((now / 1000.0) - since);
+}
+
+// requestAnimationFrame emulation
+function createAnimationStepper(options) {
+    options = options || {};
+    var fps = options.fps || 30,
+        waitMs = 1000 / fps,
+        getTime = options.getRuntimeSeconds || getRuntimeSeconds,
+        lastUpdateTime = -1e-6,
+        timeout = 0;
+
+    requestAnimationFrame.fps = fps;
+    requestAnimationFrame.reset = function() {
+        if (timeout) {
+            Script.clearTimeout(timeout);
+            timeout = 0;
+        }
+    };
+
+    function requestAnimationFrame(update) {
+        requestAnimationFrame.reset();
+        timeout = Script.setTimeout(function() {
+            timeout = 0;
+            update(getTime(lastUpdateTime));
+            lastUpdateTime = getTime();
+        }, waitMs );
+    }
+
+    return requestAnimationFrame;
+}
+
+// ----------------------------------------------------------------------------
+// KeyListener provides a scoped wrapper where options.onKeyPressEvent gets
+//   called when a key event matches the specified event.text / key spec
+// example: var listener = new KeyListener({ text: 'SPACE', isShifted: false, onKeyPressEvent: function(event) { ... } });
+//    Script.scriptEnding.connect(listener, 'disconnect');
+function KeyListener(options) {
+    assert(typeof options === 'object' && 'text' in options && 'onKeyPressEvent' in options);
+
+    this._options = options;
+    assign(this, {
+        modifiers: this._getEventModifiers(options, true)
+    }, options);
+    this.log = options.log || function log() {
+        print('KeyListener | ', [].slice.call(arguments).join(' '));
+    };
+    this.log('created KeyListener', JSON.stringify(this.text), this.modifiers);
+    this.connect();
+}
+KeyListener.prototype = {
+    _getEventModifiers: function(event, trueOnly) {
+        return '(' + [ 'Control', 'Meta', 'Alt', 'Super', 'Menu', 'Shifted' ].map(function(mod) {
+            var isMod = 'is' + mod,
+                value = event[isMod],
+                found = (trueOnly ? value : typeof value === 'boolean');
+            return found && isMod + ' == ' + value;
+        }).filter(Boolean).sort().join(' | ') + ')';
+    },
+    handleEvent: function(event, target) {
+        if (event.text === this.text) {
+            var modifiers = this._getEventModifiers(event, true);
+            if (modifiers !== this.modifiers) {
+                return;
+            }
+            return this[target](event);
+        }
+    },
+    connect: function() {
+        return this.$bindEvents(true);
+    },
+    disconnect: function() {
+        return this.$bindEvents(false);
+    },
+    $onKeyPressEvent: function(event) {
+        return this.handleEvent(event, 'onKeyPressEvent');
+    },
+    $onKeyReleaseEvent: function(event) {
+        return this.handleEvent(event, 'onKeyReleaseEvent');
+    },
+    $bindEvents: function(connect) {
+        if (this.onKeyPressEvent) {
+            Controller.keyPressEvent[connect ? 'connect' : 'disconnect'](this, '$onKeyPressEvent');
+        }
+        if (this.onKeyReleaseEvent) {
+            Controller.keyReleaseEvent[connect ? 'connect' : 'disconnect'](this, '$onKeyReleaseEvent');
+        }
+        Controller[(connect ? 'capture' : 'release') + 'KeyEvents'](this._options);
+    }
+};
+
+// helper to reload a client script
+reloadClientScript._findRunning = function(filename) {
+    return ScriptDiscoveryService.getRunning().filter(function(script) {
+        return 0 === script.path.indexOf(filename);
+    });
+};
+function reloadClientScript(filename) {
+    function log() {
+        print('reloadClientScript | ', [].slice.call(arguments).join(' '));
+    }
+    log('attempting to reload using stopScript(..., true):', filename);
+    var result = ScriptDiscoveryService.stopScript(filename, true);
+    if (!result) {
+        var matches = reloadClientScript._findRunning(filename),
+            path = matches[0] && matches[0].path;
+        if (path) {
+            log('attempting to reload using matched getRunning path: ' + path);
+            result = ScriptDiscoveryService.stopScript(path, true);
+        }
+    }
+    log('///result:' + result);
+    return result;
+}
diff --git a/unpublishedScripts/marketplace/camera-move/modules/config-utils.js b/unpublishedScripts/marketplace/camera-move/modules/config-utils.js
new file mode 100644
index 0000000000..3b037edbea
--- /dev/null
+++ b/unpublishedScripts/marketplace/camera-move/modules/config-utils.js
@@ -0,0 +1,252 @@
+// config-utils.js -- helpers for coordinating Application runtime vs. Settings configuration
+//
+//   * ApplicationConfig -- Menu items and API values.
+//   * SettingsConfig -- scoped Settings values.
+
+"use strict";
+/* eslint-env commonjs */
+/* global log */
+module.exports = {
+    version: '0.0.1a',
+    ApplicationConfig: ApplicationConfig,
+    SettingsConfig: SettingsConfig
+};
+
+var _utils = require('./_utils.js'),
+    assert = _utils.assert;
+Object.assign = Object.assign || _utils.assign;
+
+function _debugPrint() {
+    print('config-utils | ' + [].slice.call(arguments).join(' '));
+}
+
+var debugPrint = function() {};
+
+// ----------------------------------------------------------------------------
+// Application-specific configuration values using runtime state / API props
+//
+// options.config[] supports the following item formats:
+//   'settingsName': { menu: 'Menu > MenuItem'}, // assumes MenuItem is a checkbox / checkable value
+//   'settingsName': { object: [ MyAvatar, 'property' ] },
+//   'settingsName': { object: [ MyAvatar, 'getterMethod', 'setterMethod' ] },
+//   'settingsName': { menu: 'Menu > MenuItem', object: [ MyAvatar, 'property' ] },
+//   'settingsName': { get: function getter() { ...}, set: function(nv) { ... } },
+
+function ApplicationConfig(options) {
+    options = options || {};
+    assert('namespace' in options && 'config' in options);
+    if (options.debug) {
+        debugPrint = _debugPrint;
+        debugPrint('debugPrinting enabled');
+    }
+    this.namespace = options.namespace;
+    this.valueUpdated = _utils.signal(function valueUpdated(key, newValue, oldValue, origin){});
+
+    this.config = {};
+    this.register(options.config);
+}
+ApplicationConfig.prototype = {
+    resolve: function resolve(key) {
+        assert(typeof key === 'string', 'ApplicationConfig.resolve error: key is not a string: ' + key);
+        if (0 !== key.indexOf('.') && !~key.indexOf('/')) {
+            key = [ this.namespace, key ].join('/');
+        }
+        return (key in this.config) ? key : (debugPrint('ApplicationConfig -- could not resolve key: ' + key),undefined);
+    },
+    registerItem: function(settingName, item) {
+        item._settingName = settingName;
+        item.settingName = ~settingName.indexOf('/') ? settingName : [ this.namespace, settingName ].join('/');
+        return this.config[item.settingName] = this.config[settingName] = new ApplicationConfigItem(item);
+    },
+    // process items into fully-qualfied ApplicationConfigItem instances
+    register: function(items) {
+        for (var p in items) {
+            var item = items[p];
+            item && this.registerItem(p, item);
+        }
+    },
+    _getItem: function(key) {
+        return this.config[this.resolve(key)];
+    },
+    getValue: function(key, defaultValue) {
+        var item = this._getItem(key);
+        if (!item) {
+            return defaultValue;
+        }
+        return item.get();
+    },
+    setValue: function setValue(key, value) {
+        key = this.resolve(key);
+        var lastValue = this.getValue(key, value);
+        var ret = this._getItem(key).set(value);
+        if (lastValue !== value) {
+            this.valueUpdated(key, value, lastValue, 'ApplicationConfig.setValue');
+        }
+        return ret;
+    },
+    // sync dual-source (ie: Menu + API) items
+    resyncValue: function(key) {
+        var item = this._getItem(key);
+        return item && item.resync();
+    },
+    // sync Settings values -> Application state
+    applyValue: function applyValue(key, value, origin) {
+        if (this.resolve(key)) {
+            var appValue = this.getValue(key, value);
+            debugPrint('applyValue', key, value, origin ? '['+origin+']' : '', appValue);
+            if (appValue !== value) {
+                this.setValue(key, value);
+                debugPrint('applied new setting', key, value, '(was:'+appValue+')');
+                return true;
+            }
+        }
+    }
+};
+
+// ApplicationConfigItem represents a single API/Menu item accessor
+function ApplicationConfigItem(item) {
+    Object.assign(this, item);
+    Object.assign(this, {
+        _item: item.get && item,
+        _object: this._parseObjectConfig(this.object),
+        _menu: this._parseMenuConfig(this.menu)
+    });
+    this.authority = this._item ? 'item' : this._object ? 'object' : this._menu ? 'menu' : null;
+    this._authority = this['_'+this.authority];
+    debugPrint('_authority', this.authority, this._authority, Object.keys(this._authority));
+    assert(this._authority, 'expected item.get, .object or .menu definition; ' + this.settingName);
+}
+ApplicationConfigItem.prototype = {
+    resync: function resync() {
+        var authoritativeValue = this._authority.get();
+        if (this._menu && this._menu.get() !== authoritativeValue) {
+            _debugPrint(this.settingName, this._menu.menuItem,
+                        '... menu value ('+this._menu.get()+') out of sync;',
+                        'setting to authoritativeValue ('+authoritativeValue+')');
+            this._menu.set(authoritativeValue);
+        }
+        if (this._object && this._object.get() !== authoritativeValue) {
+            _debugPrint(this.settingName, this._object.getter || this._object.property,
+                        '... object value ('+this._object.get()+') out of sync;',
+                        'setting to authoritativeValue ('+authoritativeValue+')');
+            this._object.set(authoritativeValue);
+        }
+    },
+    toString: function() {
+        return '[ApplicationConfigItem ' + [
+            'setting:' + JSON.stringify(this.settingName),
+            'authority:' + JSON.stringify(this.authority),
+            this._object && 'object:' + JSON.stringify(this._object.property || this._object.getter),
+            this._menu && 'menu:' + JSON.stringify(this._menu.menu)
+        ].filter(Boolean).join(' ') + ']';
+    },
+    get: function get() {
+        return this._authority.get();
+    },
+    set: function set(nv) {
+        this._object && this._object.set(nv);
+        this._menu && this._menu.set(nv);
+        return nv;
+    },
+    _raiseError: function(errorMessage) {
+        if (this.debug) {
+            throw new Error(errorMessage);
+        } else {
+            _debugPrint('ERROR: ' + errorMessage);
+        }
+    },
+    _parseObjectConfig: function(parts) {
+        if (!Array.isArray(parts) || parts.length < 2) {
+            return null;
+        }
+        var object = parts[0], getter = parts[1], setter = parts[2];
+        if (typeof object[getter] === 'function' && typeof object[setter] === 'function') {
+            // [ API, 'getter', 'setter' ]
+            return {
+                object: object, getter: getter, setter: setter,
+                get: function getObjectValue() {
+                    return this.object[this.getter]();
+                },
+                set: function setObjectValue(nv) {
+                    return this.object[this.setter](nv), nv;
+                }
+            };
+        } else if (getter in object) {
+            // [ API, 'property' ]
+            return {
+                object: object, property: getter,
+                get: function() {
+                    return this.object[this.property];
+                },
+                set: function(nv) {
+                    return this.object[this.property] = nv;
+                }
+            };
+        }
+        this._raiseError('{ object: [ Object, getterOrPropertyName, setterName ] } -- invalid params or does not exist: ' +
+                         [ this.settingName, this.object, getter, setter ].join(' | '));
+    },
+    _parseMenuConfig: function(menu) {
+        if (!menu || typeof menu !== 'string') {
+            return null;
+        }
+        var parts = menu.split(/\s*>\s*/), menuItemName = parts.pop(), menuName = parts.join(' > ');
+        if (menuItemName && Menu.menuItemExists(menuName, menuItemName)) {
+            return {
+                menu: menu, menuName: menuName, menuItemName: menuItemName,
+                get: function() {
+                    return Menu.isOptionChecked(this.menuItemName);
+                },
+                set: function(nv) {
+                    return Menu.setIsOptionChecked(this.menuItemName, nv), nv;
+                }
+            };
+        }
+        this._raiseError('{ menu: "Menu > Item" } structure -- invalid params or does not exist: ' +
+                         [ this.settingName, this.menu, menuName, menuItemName ].join(' | '));
+    }
+}; // ApplicationConfigItem.prototype
+
+// ----------------------------------------------------------------------------
+// grouped configuration using the Settings.* API
+function SettingsConfig(options) {
+    options = options || {};
+    assert('namespace' in options);
+    this.namespace = options.namespace;
+    this.defaultValues = {};
+    this.valueUpdated = _utils.signal(function valueUpdated(key, newValue, oldValue, origin){});
+    if (options.defaultValues) {
+        Object.keys(options.defaultValues)
+            .forEach(_utils.bind(this, function(key) {
+                var fullSettingsKey = this.resolve(key);
+                this.defaultValues[fullSettingsKey] = options.defaultValues[key];
+            }));
+    }
+}
+SettingsConfig.prototype = {
+    resolve: function(key) {
+        assert(typeof key === 'string', 'SettingsConfig.resolve error: key is not a string: ' + key);
+        return (0 !== key.indexOf('.') && !~key.indexOf('/')) ?
+            [ this.namespace, key ].join('/') : key;
+    },
+    getValue: function(key, defaultValue) {
+        key = this.resolve(key);
+        defaultValue = defaultValue === undefined ? this.defaultValues[key] : defaultValue;
+        return Settings.getValue(key, defaultValue);
+    },
+    setValue: function setValue(key, value) {
+        key = this.resolve(key);
+        var lastValue = this.getValue(key);
+        var ret = Settings.setValue(key, value);
+        if (lastValue !== value) {
+            this.valueUpdated(key, value, lastValue, 'SettingsConfig.setValue');
+        }
+        return ret;
+    },
+    getFloat: function getFloat(key, defaultValue) {
+        key = this.resolve(key);
+        defaultValue = defaultValue === undefined ? this.defaultValues[key] : defaultValue;
+        var value = parseFloat(this.getValue(key, defaultValue));
+        return isFinite(value) ? value : isFinite(defaultValue) ? defaultValue : 0.0;
+    }
+};
diff --git a/unpublishedScripts/marketplace/camera-move/modules/custom-settings-app/CustomSettingsApp.js b/unpublishedScripts/marketplace/camera-move/modules/custom-settings-app/CustomSettingsApp.js
new file mode 100644
index 0000000000..c76adea940
--- /dev/null
+++ b/unpublishedScripts/marketplace/camera-move/modules/custom-settings-app/CustomSettingsApp.js
@@ -0,0 +1,324 @@
+// CustomSettingsApp.js -- manages Settings between a Client script and connected "settings" tablet WebView page
+// see browser/BridgedSettings.js for the webView side
+
+// example:
+//   var button = tablet.addButton({ text: 'My Settings' });
+//   var mySettingsApp = new CustomSettingsApp({
+//       namespace: 'mySettingsGroup',
+//       url: Script.resolvePath('myapp.html'),
+//       uuid: button.uuid,
+//       tablet: tablet
+//   });
+//
+//   // settings are automatically sync'd from the web page back to Interface; to be notified when that happens, use:
+//   myAppSettings.valueUpdated.connect(function(name, value, oldValue, origin) {
+//      print('setting updated from web page', name, value, oldValue, origin);
+//   });
+//
+//   // settings are also automatically sync'd from Interface back to the web page; to manually sync a value, use:
+//   myAppSettings.syncValue(fullSettingsKey, value);
+
+/* eslint-env commonjs */
+"use strict";
+
+CustomSettingsApp.version = '0.0.0';
+module.exports = CustomSettingsApp;
+
+var _utils = require('../_utils.js');
+Object.assign = Object.assign || _utils.assign;
+
+function assert(truthy, message) {
+    return _utils.assert.call(this, truthy, 'CustomSettingsApp | ' + message);
+}
+
+function _debugPrint() {
+    print('CustomSettingsApp | ' + [].slice.call(arguments).join(' '));
+}
+var debugPrint = function() {};
+
+function CustomSettingsApp(options) {
+    assert('url' in options, 'expected options.url');
+    if (options.debug) {
+        debugPrint = _debugPrint;
+    }
+
+    this.url = options.url;
+    this.namespace = options.namespace || 'BridgedSettings';
+    this.uuid = options.uuid || Uuid.generate();
+    this.recheckInterval = options.recheckInterval || 1000;
+
+    this.settingsScreenVisible = false;
+    this.isActive = false;
+
+    this.extraParams = Object.assign(options.extraParams || {}, {
+        customSettingsVersion: CustomSettingsApp.version+'',
+        protocolVersion: location.protocolVersion && location.protocolVersion()
+    });
+
+    var params = {
+        namespace: this.namespace,
+        uuid: this.uuid,
+        debug: options.debug || undefined
+    };
+
+    // encode PARAMS into '?key=value&...'
+    var query = Object.keys(params).map(function encodeValue(key) {
+        var value = encodeURIComponent(params[key] === undefined ? '' : params[key]);
+        return [ key, value ].join('=');
+    }).join('&');
+    this.url += '?&' + query;
+
+    this.isActiveChanged = _utils.signal(function(isActive) {});
+    this.valueUpdated = _utils.signal(function(key, value, oldValue, origin) {});
+
+    this.settingsAPI = options.settingsAPI || Settings;
+
+    // keep track of accessed settings so they can be kept in sync if changed externally
+    this._activeSettings = { sent: {}, received: {}, remote: {} };
+
+    if (options.tablet) {
+        this._initialize(options.tablet);
+    }
+}
+
+CustomSettingsApp.prototype = {
+    tablet: null,
+    resolve: function(key) {
+        if (0 === key.indexOf('.') || ~key.indexOf('/')) {
+            // key is already qualified under a group; return as-is
+            return key;
+        }
+        // nest under the current namespace
+        return [ this.namespace, key ].join('/');
+    },
+    sendEvent: function(msg) {
+        assert(this.tablet, '!this.tablet');
+        msg.ns = msg.ns || this.namespace;
+        msg.uuid = msg.uuid || this.uuid;
+        this.tablet.emitScriptEvent(JSON.stringify(msg));
+    },
+    getValue: function(key, defaultValue) {
+        key = this.resolve(key);
+        return key in this._activeSettings.remote ? this._activeSettings.remote[key] : defaultValue;
+    },
+    setValue: function(key, value) {
+        key = this.resolve(key);
+        var current = this.getValue(key);
+        if (current !== value) {
+            return this.syncValue(key, value, 'CustomSettingsApp.setValue');
+        }
+        return false;
+    },
+    syncValue: function(key, value, origin) {
+        key = this.resolve(key);
+        var oldValue = this._activeSettings.remote[key];
+        assert(value !== null, 'CustomSettingsApp.syncValue value is null');
+        this.sendEvent({ id: 'valueUpdated', params: [key, value, oldValue, origin] });
+        this._activeSettings.sent[key] = value;
+        this._activeSettings.remote[key] = value;
+        this.valueUpdated(key, value, oldValue, (origin ? origin+':' : '') + 'CustomSettingsApp.syncValue');
+    },
+    onScreenChanged: function onScreenChanged(type, url) {
+        this.settingsScreenVisible = (url === this.url);
+        debugPrint('===> onScreenChanged', type, url, 'settingsScreenVisible: ' + this.settingsScreenVisible);
+        if (this.isActive && !this.settingsScreenVisible) {
+            this.isActiveChanged(this.isActive = false);
+        }
+    },
+
+    _apiGetValue: function(key, defaultValue) {
+        // trim rooted keys like "/desktopTabletBecomesToolbar" => "desktopTabletBecomesToolbar"
+        key = key.replace(/^\//,'');
+        return this.settingsAPI.getValue(key, defaultValue);
+    },
+    _apiSetValue: function(key, value) {
+        key = key.replace(/^\//,'');
+        return this.settingsAPI.setValue(key, value);
+    },
+    _setValue: function(key, value, oldValue, origin) {
+        var current = this._apiGetValue(key),
+            lastRemoteValue = this._activeSettings.remote[key];
+        debugPrint('.setValue(' + JSON.stringify({key: key, value: value, current: current, lastRemoteValue: lastRemoteValue })+')');
+        this._activeSettings.received[key] = value;
+        this._activeSettings.remote[key] = value;
+        var result;
+        if (lastRemoteValue !== value) {
+            this.valueUpdated(key, value, lastRemoteValue, 'CustomSettingsApp.tablet');
+        }
+        if (current !== value) {
+            result = this._apiSetValue(key, value);
+        }
+        return result;
+    },
+
+    _handleValidatedMessage: function(obj, msg) {
+        var tablet = this.tablet;
+        if (!tablet) {
+            throw new Error('_handleValidatedMessage called when not connected to tablet...');
+        }
+        var params = Array.isArray(obj.params) ? obj.params : [obj.params];
+        var parts = (obj.method||'').split('.'), api = parts[0], method = parts[1];
+        switch(api) {
+            case 'valueUpdated': obj.result = this._setValue.apply(this, params); break;
+            case 'Settings':
+                if (method && params[0]) {
+                    var key = this.resolve(params[0]), value = params[1];
+                    debugPrint('>>>>', method, key, value);
+                    switch (method) {
+                        case 'getValue':
+                            obj.result = this._apiGetValue(key, value);
+                            this._activeSettings.sent[key] = obj.result;
+                            this._activeSettings.remote[key] = obj.result;
+                            break;
+                        case 'setValue':
+                            obj.result = this._setValue(key, value, params[2], params[3]);
+                            break;
+                        default:
+                            obj.error = 'unmapped Settings method: ' + method;
+                            throw new Error(obj.error);
+                    }
+                    break;
+                }
+            default: if (this.onUnhandledMessage) {
+                this.onUnhandledMessage(obj, msg);
+            } else {
+                obj.error = 'unmapped method call: ' + msg;
+            }
+        }
+        if (obj.id) {
+            // if message has an id, reply with the same message obj which now has a .result or .error field
+            // note: a small delay is needed because of an apparent race condition between ScriptEngine and Tablet WebViews
+            Script.setTimeout(_utils.bind(this, function() {
+                this.sendEvent(obj);
+            }), 100);
+        } else if (obj.error) {
+            throw new Error(obj.error);
+        }
+    },
+    onWebEventReceived: function onWebEventReceived(msg) {
+        debugPrint('onWebEventReceived', msg);
+        var tablet = this.tablet;
+        if (!tablet) {
+            throw new Error('onWebEventReceived called when not connected to tablet...');
+        }
+        if (msg === this.url) {
+            if (this.isActive) {
+                // user (or page) refreshed the web view; trigger !isActive so client script can perform cleanup
+                this.isActiveChanged(this.isActive = false);
+            }
+            this.isActiveChanged(this.isActive = true);
+            // reply to initial HTML page ACK with any extraParams that were specified
+            this.sendEvent({ id: 'extraParams', extraParams: this.extraParams });
+            return;
+        }
+        try {
+            var obj = assert(JSON.parse(msg));
+        } catch (e) {
+            return;
+        }
+        if (obj.ns === this.namespace && obj.uuid === this.uuid) {
+            debugPrint('valid onWebEventReceived', msg);
+            this._handleValidatedMessage(obj, msg);
+        }
+    },
+
+    _initialize: function(tablet) {
+        if (this.tablet) {
+            throw new Error('CustomSettingsApp._initialize called but this.tablet already has a value');
+        }
+        this.tablet = tablet;
+        tablet.webEventReceived.connect(this, 'onWebEventReceived');
+        tablet.screenChanged.connect(this, 'onScreenChanged');
+
+        this.onAPIValueUpdated = function(key, newValue, oldValue, origin) {
+            if (this._activeSettings.remote[key] !== newValue) {
+                _debugPrint('onAPIValueUpdated: ' + key + ' = ' + JSON.stringify(newValue),
+                            '(was: ' + JSON.stringify(oldValue) +')');
+                this.syncValue(key, newValue, (origin ? origin+':' : '') + 'CustomSettingsApp.onAPIValueUpdated');
+            }
+        };
+        this.isActiveChanged.connect(this, function(isActive) {
+            this._activeSettings.remote = {}; // reset assumptions about remote values
+            isActive ? this.$startMonitor() : this.$stopMonitor();
+        });
+        debugPrint('CustomSettingsApp...initialized', this.namespace);
+    },
+
+    $syncSettings: function() {
+        for (var p in this._activeSettings.sent) {
+            var value = this._apiGetValue(p),
+                lastValue = this._activeSettings.remote[p];
+            if (value !== undefined && value !== null && value !== '' && value !== lastValue) {
+                _debugPrint('CustomSettingsApp... detected external settings change', p, value);
+                this.syncValue(p, value, 'Settings');
+                this.valueUpdated(p, value, lastValue, 'CustomSettingsApp.$syncSettings');
+            }
+        }
+    },
+    $startMonitor: function() {
+        if (!(this.recheckInterval > 0)) {
+            _debugPrint('$startMonitor -- recheckInterval <= 0; not starting settings monitor thread');
+            return false;
+        }
+        if (this.interval) {
+            this.$stopMonitor();
+        }
+        if (this.settingsAPI.valueUpdated) {
+            _debugPrint('settingsAPI supports valueUpdated -- binding to detect settings changes', this.settingsAPI);
+            this.settingsAPI.valueUpdated.connect(this, 'onAPIValueUpdated');
+        }
+        this.interval = Script.setInterval(_utils.bind(this, '$syncSettings'), this.recheckInterval);
+        _debugPrint('STARTED MONITORING THREAD');
+    },
+    $stopMonitor: function() {
+        if (this.interval) {
+            Script.clearInterval(this.interval);
+            this.interval = 0;
+            if (this.settingsAPI.valueUpdated) {
+                this.settingsAPI.valueUpdated.disconnect(this, 'onAPIValueUpdated');
+            }
+            _debugPrint('stopped monitoring thread');
+            return true;
+        }
+    },
+
+    cleanup: function() {
+        if (!this.tablet) {
+            return _debugPrint('CustomSettingsApp...cleanup called when not initialized');
+        }
+        var tablet = this.tablet;
+        tablet.webEventReceived.disconnect(this, 'onWebEventReceived');
+        tablet.screenChanged.disconnect(this, 'onScreenChanged');
+        this.$stopMonitor();
+        if (this.isActive) {
+            try {
+                this.isActiveChanged(this.isActive = false);
+            } catch (e) {
+                _debugPrint('ERROR: cleanup error during isActiveChanged(false)', e);
+            }
+        }
+        this.toggle(false);
+        this.settingsScreenVisible = false;
+        this.tablet = null;
+        debugPrint('cleanup completed', this.namespace);
+    },
+
+    toggle: function(show) {
+        if (!this.tablet) {
+            return _debugPrint('CustomSettingsApp...cleanup called when not initialized');
+        }
+        if (typeof show !== 'boolean') {
+            show = !this.settingsScreenVisible;
+        }
+
+        if (this.settingsScreenVisible && !show) {
+            this.tablet.gotoHomeScreen();
+        } else if (!this.settingsScreenVisible && show) {
+            Script.setTimeout(_utils.bind(this, function() {
+                // Interface sometimes crashes if not for adding a small timeout here :(
+                this.tablet.gotoWebScreen(this.url);
+            }), 1);
+        }
+    }
+};
+
diff --git a/unpublishedScripts/marketplace/camera-move/modules/custom-settings-app/browser/BridgedSettings.js b/unpublishedScripts/marketplace/camera-move/modules/custom-settings-app/browser/BridgedSettings.js
new file mode 100644
index 0000000000..9b4735689f
--- /dev/null
+++ b/unpublishedScripts/marketplace/camera-move/modules/custom-settings-app/browser/BridgedSettings.js
@@ -0,0 +1,197 @@
+// BridgedSettings.js -- HTML-side implementation of bridged/async Settings
+// see ../CustomSettingsApp.js for the corresponding Interface script
+
+/* eslint-env commonjs, browser */
+/* eslint-disable comma-dangle, no-empty */
+
+(function(global) {
+    "use strict";
+
+    BridgedSettings.version = '0.0.2';
+
+    try {
+        module.exports = BridgedSettings;
+    } catch (e) {
+        global.BridgedSettings = BridgedSettings;
+    }
+
+    var _utils = global._utils || (typeof require === 'function' && require('../../_utils.js'));
+    if (!_utils || !_utils.signal) {
+        throw new Error('html.BridgedSettings.js -- expected _utils to be available on the global object (ie: window._utils)');
+    }
+    var signal = _utils.signal;
+
+    function log() {
+        console.info('bridgedSettings | ' + [].slice.call(arguments).join(' ')); // eslint-disable-line no-console
+    }
+    log('version', BridgedSettings.version);
+
+    var debugPrint = function() {}; // = log
+
+    function BridgedSettings(options) {
+        options = options || {};
+        // Note: Interface changed how window.EventBridge behaves again; it now arbitrarily replaces the global value
+        // sometime after the initial page load, invaliding any held references to it.
+        // As a workaround this proxies the local property to the current global value.
+        var _lastEventBridge = global.EventBridge;
+        Object.defineProperty(this, 'eventBridge', { enumerable: true, get: function() {
+            if (_lastEventBridge !== global.EventBridge) {
+                log('>>> EventBridge changed in-flight', '(was: ' + _lastEventBridge + ' | is: ' + global.EventBridge + ')');
+                _lastEventBridge = global.EventBridge;
+            }
+            return global.EventBridge;
+        }});
+        Object.assign(this, {
+            //eventBridge: options.eventBridge || global.EventBridge,
+            namespace: options.namespace || 'BridgedSettings',
+            uuid: options.uuid || undefined,
+            valueReceived: signal(function valueReceived(key, newValue, oldValue, origin){}),
+            callbackError: signal(function callbackError(error, message){}),
+            pendingRequestsFinished: signal(function pendingRequestsFinished(){}),
+            extraParams: options.extraParams || {},
+            _hifiValues: {},
+
+            debug: options.debug,
+            log: log.bind({}, options.namespace + ' |'),
+            debugPrint: function() {
+                return this.debug && this.log.apply(this, arguments);
+            },
+            _boundScriptEventReceived: this.onScriptEventReceived.bind(this),
+            callbacks: Object.defineProperties(options.callbacks || {}, {
+                extraParams: { value: this.handleExtraParams },
+                valueUpdated: { value: this.handleValueUpdated },
+            })
+        });
+        this.log('connecting to EventBridge.scriptEventReceived');
+        this.eventBridge.scriptEventReceived.connect(this._boundScriptEventReceived);
+    }
+
+    BridgedSettings.prototype = {
+        _callbackId: 1,
+        toString: function() {
+            return '[BridgedSettings namespace='+this.namespace+']';
+        },
+        resolve: function(key) {
+            if (0 !== key.indexOf('.') && !~key.indexOf('/')) {
+                return [ this.namespace, key ].join('/');
+            } else {
+                return key;
+            }
+        },
+        handleValueUpdated: function(msg) {
+            // client script notified us that a value was updated on that side
+            var key = this.resolve(msg.params[0]),
+                value = msg.params[1],
+                oldValue = msg.params[2],
+                origin = msg.params[3];
+            log('callbacks.valueUpdated', key, value, oldValue, origin);
+            this._hifiValues[key] = value;
+            this.valueReceived(key, value, oldValue, (origin?origin+':':'') + 'callbacks.valueUpdated');
+        },
+        handleExtraParams: function(msg) {
+            // client script sent us extraParams
+            var extraParams = msg.extraParams;
+            var previousParams = JSON.parse(JSON.stringify(this.extraParams));
+
+            _utils.sortedAssign(this.extraParams, extraParams);
+
+            this._hifiValues['.extraParams'] = this.extraParams;
+            this.debugPrint('received .extraParams', JSON.stringify(extraParams,0,2));
+            this.valueReceived('.extraParams', this.extraParams, previousParams, 'html.bridgedSettings.handleExtraParams');
+        },
+        cleanup: function() {
+            try {
+                this.eventBridge.scriptEventReceived.disconnect(this._boundScriptEventReceived);
+            } catch (e) {
+                this.log('error disconnecting from scriptEventReceived:', e);
+            }
+        },
+        pendingRequestCount: function() {
+            return Object.keys(this.callbacks).length;
+        },
+        _handleValidatedMessage: function(obj, msg) {
+            var callback = this.callbacks[obj.id];
+            if (callback) {
+                try {
+                    return callback.call(this, obj) || true;
+                } catch (e) {
+                    this.log('CALLBACK ERROR', this.namespace, obj.id, '_onScriptEventReceived', e);
+                    this.callbackError(e, obj);
+                    if (this.debug) {
+                        throw e;
+                    }
+                }
+            } else if (this.onUnhandledMessage) {
+                return this.onUnhandledMessage(obj, msg);
+            }
+        },
+        onScriptEventReceived: function(msg) {
+            this.debugPrint(this.namespace, '_onScriptEventReceived......' + msg);
+            try {
+                var obj = JSON.parse(msg);
+                var validSender = obj.ns === this.namespace && obj.uuid === this.uuid;
+                if (validSender) {
+                    return this._handleValidatedMessage(obj, msg);
+                } else {
+                    debugPrint('xskipping', JSON.stringify([obj.ns, obj.uuid]), JSON.stringify(this), msg);
+                }
+            } catch (e) {
+                log('rpc error:', e, msg);
+                return e;
+            }
+        },
+        sendEvent: function(msg) {
+            msg.ns = msg.ns || this.namespace;
+            msg.uuid = msg.uuid || this.uuid;
+            debugPrint('sendEvent', JSON.stringify(msg));
+            this.eventBridge.emitWebEvent(JSON.stringify(msg));
+        },
+        getValue: function(key, defaultValue) {
+            key = this.resolve(key);
+            return key in this._hifiValues ? this._hifiValues[key] : defaultValue;
+        },
+        setValue: function(key, value) {
+            key = this.resolve(key);
+            var current = this.getValue(key);
+            if (current !== value) {
+                debugPrint('SET VALUE : ' + JSON.stringify({ key: key, current: current, value: value }));
+                return this.syncValue(key, value, 'setValue');
+            }
+            this._hifiValues[key] = value;
+            return false;
+        },
+        syncValue: function(key, value, origin) {
+            return this.sendEvent({ method: 'valueUpdated', params: [key, value, this.getValue(key), origin] });
+        },
+        getValueAsync: function(key, defaultValue, callback) {
+            key = this.resolve(key);
+            if (typeof defaultValue === 'function') {
+                callback = defaultValue;
+                defaultValue = undefined;
+            }
+            var params = defaultValue !== undefined ? [ key, defaultValue ] : [ key ],
+                event = { method: 'Settings.getValue', params: params };
+
+            this.debugPrint('< getValueAsync...', key, params);
+            if (callback) {
+                event.id = this._callbackId++;
+                this.callbacks[event.id] = function(obj) {
+                    try {
+                        callback(obj.error, obj.result);
+                        if (!obj.error) {
+                            this._hifiValues[key] = obj.result;
+                        }
+                    } finally {
+                        delete this.callbacks[event.id];
+                    }
+                    if (this.pendingRequestCount() === 0) {
+                        setTimeout(function() {
+                            this.pendingRequestsFinished();
+                        }.bind(this), 1);
+                    }
+                };
+            }
+            this.sendEvent(event);
+        },
+    };
+})(this);
diff --git a/unpublishedScripts/marketplace/camera-move/modules/custom-settings-app/browser/JQuerySettings.js b/unpublishedScripts/marketplace/camera-move/modules/custom-settings-app/browser/JQuerySettings.js
new file mode 100644
index 0000000000..66b1aad53a
--- /dev/null
+++ b/unpublishedScripts/marketplace/camera-move/modules/custom-settings-app/browser/JQuerySettings.js
@@ -0,0 +1,195 @@
+// JQuerySettings.js -- HTML-side helper class for managing settings-linked jQuery UI elements
+
+/* eslint-env jquery, commonjs, browser */
+/* eslint-disable comma-dangle, no-empty */
+/* global assert, log */
+// ----------------------------------------------------------------------------
+(function(global) {
+    "use strict";
+
+    JQuerySettings.version = '0.0.0';
+
+    try {
+        module.exports = JQuerySettings;
+    } catch (e) {
+        global.JQuerySettings= JQuerySettings;
+    }
+
+    var _utils = global._utils || (typeof require === 'function' && require('../../_utils.js'));
+
+    if (!_utils || !_utils.signal) {
+        throw new Error('html.JQuerySettings.js -- expected _utils to be available on the global object (ie: window._utils)'+module);
+    }
+    var signal = _utils.signal,
+        assert = _utils.assert;
+
+    function log() {
+        console.info('jquerySettings | ' + [].slice.call(arguments).join(' ')); // eslint-disable-line no-console
+    }
+    log('version', JQuerySettings.version);
+
+    var debugPrint = function() {}; // = log
+
+    function JQuerySettings(options) {
+        assert('namespace' in options);
+
+        Object.assign(this, {
+            id2Setting: {}, // DOM id -> qualified Settings key
+            Setting2id: {}, // qualified Settings key -> DOM id
+            observers: {},  // DOM MutationObservers
+            mutationEvent: signal(function mutationEvent(event) {}),
+            boundOnDOMMutation: this._onDOMMutation.bind(this),
+        }, options);
+    }
+    JQuerySettings.idCounter = 0;
+    JQuerySettings.prototype = {
+        toString: function() {
+            return '[JQuerySettings namespace='+this.namespace+']';
+        },
+        mutationConfig: {
+            attributes: true,
+            attributeOldValue: true,
+            attributeFilter: [ 'value', 'checked', 'data-checked', 'data-value' ]
+        },
+        _onDOMMutation: function(mutations, observer) {
+            mutations.forEach(function(mutation, index) {
+                var target = mutation.target,
+                    targetId = target.dataset['for'] || target.id,
+                    domId = target.id,
+                    attrValue = target.getAttribute(mutation.attributeName),
+                    hifiType = target.dataset.hifiType,
+                    value = hifiType ? $(target)[hifiType]('instance').value() : attrValue,
+                    oldValue = mutation.oldValue;
+                var event = {
+                    key:       this.getKey(targetId, true) || this.getKey(domId),
+                    value:     value,
+                    oldValue:  oldValue,
+                    hifiType:  hifiType,
+                    domId:     domId,
+                    domType:   target.getAttribute('type') || target.type,
+                    targetId:  targetId,
+                    attrValue: attrValue,
+                    domName:   target.name,
+                    type:      mutation.type,
+                };
+
+                switch (typeof value) {
+                    case 'boolean': event.oldValue = !!event.oldValue; break;
+                    case 'number':
+                        var tmp = parseFloat(oldValue);
+                        if (isFinite(tmp)) {
+                            event.oldValue = tmp;
+                        }
+                        break;
+                }
+
+                return (event.oldValue === event.value) ?
+                    debugPrint('SKIP NON-MUTATION', event.key, event.hifiType) :
+                    this.mutationEvent(event);
+            }.bind(this));
+        },
+        observeNode: function(node) {
+            assert(node.id);
+            var observer = this.observers[node.id];
+            if (!observer) {
+                observer = new MutationObserver(this.boundOnDOMMutation);
+                observer.observe(node, this.mutationConfig);
+                this.observers[node.id] = observer;
+            }
+            debugPrint('observeNode', node.id, node.dataset.hifiType, node.name);
+            return observer;
+        },
+        resolve: function(key) {
+            assert(typeof key === 'string');
+            if (0 !== key.indexOf('.') && !~key.indexOf('/')) {
+                return [ this.namespace, key ].join('/');
+            } else {
+                return key;
+            }
+        },
+        registerSetting: function(id, key) {
+            assert(id, 'registerSetting -- invalid id: ' + id + ' for key:' + key);
+            this.id2Setting[id] = key;
+            if (!(key in this.Setting2id)) {
+                this.Setting2id[key] = id;
+            } else {
+                key = null;
+            }
+            debugPrint('JQuerySettings.registerSetting -- registered: ' + JSON.stringify({ id: id, key: key }));
+        },
+        registerNode: function(node) {
+            var element = $(node),
+                target = element.data('for') || element.attr('for') || element.prop('id');
+            assert(target, 'registerNode could determine settings target: ' + node.outerHTML);
+            if (!node.id) {
+                node.id = ['id', target.replace(/[^-\w]/g,'-'), JQuerySettings.idCounter++ ].join('-');
+            }
+            var key = node.dataset['key'] = this.resolve(target);
+            this.registerSetting(node.id, key);
+
+            debugPrint('registerNode', node.id, target, key);
+            // return this.observeNode(node);
+        },
+        // lookup the DOM id for a given Settings key
+        getId: function(key, missingOk) {
+            key = this.resolve(key);
+            assert(missingOk || function assertion(){
+                return typeof key === 'string';
+            });
+            if (key in this.Setting2id || missingOk) {
+                return this.Setting2id[key];
+            }
+            log('WARNING: jquerySettings.getId: !Setting2id['+key+'] ' + this.Setting2id[key], key in this.Setting2id);
+        },
+        getAllNodes: function() {
+            return Object.keys(this.Setting2id)
+                .map(function(key) {
+                    return this.findNodeByKey(key);
+                }.bind(this))
+                .filter(function(node) {
+                    return node.type !== 'placeholder';
+                }).filter(Boolean);
+        },
+        // lookup the Settings key for a given DOM id
+        getKey: function(id, missingOk) {
+            if ((id in this.id2Setting) || missingOk) {
+                return this.id2Setting[id];
+            }
+            log('WARNING: jquerySettings.getKey: !id2Setting['+id+']');
+        },
+        // lookup the DOM node for a given Settings key
+        findNodeByKey: function(key, missingOk) {
+            key = this.resolve(key);
+            var id = this.getId(key, missingOk);
+            var node = typeof id === 'object' ? id : document.getElementById(id);
+            if (node || missingOk) {
+                return node;
+            }
+            log('WARNING: jquerySettings.findNodeByKey -- node not found:', 'key=='+key, 'id=='+id);
+        },
+        getValue: function(key, defaultValue) {
+            return this.getNodeValue(this.findNodeByKey(key));
+        },
+        setValue: function(key, value, origin) {
+            return this.setNodeValue(this.findNodeByKey(key), value, origin || 'setValue');
+        },
+        getNodeValue: function(node) {
+            assert(node && typeof node === 'object', 'getNodeValue expects a DOM node');
+            node = node.jquery ? node.get(0) : node;
+            if (node.type === 'placeholder') {
+                return node.value;
+            }
+            assert(node.dataset.hifiType);
+            return $(node)[node.dataset.hifiType]('instance').value();
+        },
+        setNodeValue: function(node, newValue) {
+            assert(node, 'JQuerySettings::setNodeValue -- invalid node:' + node);
+            node = node.jquery ? node[0] : node;
+            if (node.type === 'placeholder') {
+                return node.value = newValue;
+            }
+            var hifiType = assert(node.dataset.hifiType);
+            return $(node)[hifiType]('instance').value(newValue);
+        },
+    };
+})(this);
diff --git a/unpublishedScripts/marketplace/camera-move/modules/movement-utils.js b/unpublishedScripts/marketplace/camera-move/modules/movement-utils.js
new file mode 100644
index 0000000000..feedc75c83
--- /dev/null
+++ b/unpublishedScripts/marketplace/camera-move/modules/movement-utils.js
@@ -0,0 +1,773 @@
+// movement-utils.js -- helper classes for managing related Controller.*Event and input API bindings
+
+/* eslint-disable comma-dangle, no-empty */
+/* global require: true, DriveKeys, console, __filename, __dirname */
+/* eslint-env commonjs */
+"use strict";
+
+module.exports = {
+    version: '0.0.2c',
+
+    CameraControls: CameraControls,
+    MovementEventMapper: MovementEventMapper,
+    MovementMapping: MovementMapping,
+    VelocityTracker: VelocityTracker,
+    VirtualDriveKeys: VirtualDriveKeys,
+
+    applyEasing: applyEasing,
+    calculateThrust: calculateThrust,
+    vec3damp: vec3damp,
+    vec3eclamp: vec3eclamp,
+
+    DriveModes: {
+        POSITION: 'position', // ~ MyAvatar.position
+        MOTOR: 'motor',       // ~ MyAvatar.motorVelocity
+        THRUST: 'thrust',     // ~ MyAvatar.setThrust
+    },
+};
+
+var MAPPING_TEMPLATE = require('./movement-utils.mapping.json');
+var WANT_DEBUG = false;
+
+function log() {
+    // eslint-disable-next-line no-console
+    (typeof Script === 'object' ? print : console.log)('movement-utils | ' + [].slice.call(arguments).join(' '));
+}
+
+var debugPrint = function() {};
+
+log(module.exports.version);
+
+var _utils = require('./_utils.js'),
+    assert = _utils.assert;
+
+if (WANT_DEBUG) {
+    require = _utils.makeDebugRequire(__dirname);
+    _utils = require('./_utils.js'); // re-require in debug mode
+    debugPrint = log;
+}
+
+Object.assign = Object.assign || _utils.assign;
+
+var enumMeta = require('./EnumMeta.js');
+assert(enumMeta.version >= '0.0.1', 'enumMeta >= 0.0.1 expected but got: ' + enumMeta.version);
+
+Object.assign(MovementEventMapper, {
+    CAPTURE_DRIVE_KEYS: 'drive-keys',
+    CAPTURE_ACTION_EVENTS: 'action-events',
+});
+
+function MovementEventMapper(options) {
+    assert('namespace' in options, '.namespace expected ' + Object.keys(options) );
+    this.namespace = options.namespace;
+    this.enabled = false;
+
+    this.options = Object.assign({
+        namespace: this.namespace,
+        captureMode: MovementEventMapper.CAPTURE_ACTION_EVENTS,
+        excludeNames: null,
+        mouseSmooth: true,
+        keyboardMultiplier: 1.0,
+        mouseMultiplier: 1.0,
+        eventFilter: null,
+        controllerMapping: MAPPING_TEMPLATE,
+    }, options);
+
+    this.isShifted = false;
+    this.isGrounded = false;
+    this.isRightMouseButton = false;
+    this.rightMouseButtonReleased = undefined;
+
+    this.inputMapping = new MovementMapping(this.options);
+    this.inputMapping.virtualActionEvent.connect(this, 'onVirtualActionEvent');
+}
+MovementEventMapper.prototype = {
+    constructor: MovementEventMapper,
+    defaultEventFilter: function(from, event) {
+        return event.actionValue;
+    },
+    getState: function(options) {
+        var state = this.states ? this.states.getDriveKeys(options) : {};
+
+        state.enabled = this.enabled;
+
+        state.mouseSmooth = this.options.mouseSmooth;
+        state.captureMode = this.options.captureMode;
+        state.mouseMultiplier = this.options.mouseMultiplier;
+        state.keyboardMultiplier = this.options.keyboardMultiplier;
+
+        state.isGrounded = this.isGrounded;
+        state.isShifted = this.isShifted;
+        state.isRightMouseButton = this.isRightMouseButton;
+        state.rightMouseButtonReleased = this.rightMouseButtonReleased;
+
+        return state;
+    },
+    updateOptions: function(options) {
+        return _updateOptions(this.options, options || {}, this.constructor.name);
+    },
+    applyOptions: function(options, applyNow) {
+        if (this.updateOptions(options) && applyNow) {
+            this.reset();
+        }
+    },
+    reset: function() {
+        if (this.enabled) {
+            this.disable();
+            this.enable();
+        }
+    },
+    disable: function() {
+        this.inputMapping.disable();
+        this.bindEvents(false);
+        this.enabled = false;
+    },
+    enable: function() {
+        if (!this.enabled) {
+            this.enabled = true;
+            this.states = new VirtualDriveKeys({
+                eventFilter: this.options.eventFilter && _utils.bind(this, this.options.eventFilter)
+            });
+            this.bindEvents(true);
+            this.inputMapping.updateOptions(this.options);
+            this.inputMapping.enable();
+        }
+    },
+    bindEvents: function bindEvents(capture) {
+        var captureMode = this.options.captureMode;
+        assert(function assertion() {
+            return captureMode === MovementEventMapper.CAPTURE_ACTION_EVENTS ||
+                captureMode === MovementEventMapper.CAPTURE_DRIVE_KEYS;
+        });
+        log('bindEvents....', capture, this.options.captureMode);
+        var exclude = Array.isArray(this.options.excludeNames) && this.options.excludeNames;
+
+        var tmp;
+        if (!capture || this.options.captureMode === MovementEventMapper.CAPTURE_ACTION_EVENTS) {
+            tmp = capture ? 'captureActionEvents' : 'releaseActionEvents';
+            log('bindEvents -- ', tmp.toUpperCase());
+            Controller[tmp]();
+        }
+        if (!capture || this.options.captureMode === MovementEventMapper.CAPTURE_DRIVE_KEYS) {
+            tmp = capture ? 'disableDriveKey' : 'enableDriveKey';
+            log('bindEvents -- ', tmp.toUpperCase());
+            for (var p in DriveKeys) {
+                if (capture && (exclude && ~exclude.indexOf(p))) {
+                    log(tmp.toUpperCase(), 'excluding DriveKey===' + p);
+                } else {
+                    MyAvatar[tmp](DriveKeys[p]);
+                }
+            }
+        }
+        try {
+            Controller.actionEvent[capture ? 'connect' : 'disconnect'](this, 'onActionEvent');
+        } catch (e) { }
+
+        if (!capture || !/person/i.test(Camera.mode)) {
+            Controller[capture ? 'captureWheelEvents' : 'releaseWheelEvents']();
+            try {
+                Controller.wheelEvent[capture ? 'connect' : 'disconnect'](this, 'onWheelEvent');
+            } catch (e) { /* eslint-disable-line empty-block */ }
+        }
+    },
+    onWheelEvent: function onWheelEvent(event) {
+        var actionID = enumMeta.ACTION_TRANSLATE_CAMERA_Z,
+            actionValue = -event.delta;
+        return this.onActionEvent(actionID, actionValue, event);
+    },
+    onActionEvent: function(actionID, actionValue, extra) {
+        var actionName = enumMeta.Controller.ActionNames[actionID],
+            driveKeyName = enumMeta.getDriveKeyNameFromActionName(actionName),
+            prefix = (actionValue > 0 ? '+' : actionValue < 0 ? '-' : ' ');
+
+        var event = {
+            id: prefix + actionName,
+            actionName: actionName,
+            driveKey: DriveKeys[driveKeyName],
+            driveKeyName: driveKeyName,
+            actionValue: actionValue,
+            extra: extra
+        };
+        // debugPrint('onActionEvent', actionID, actionName, driveKeyName);
+        this.states.handleActionEvent('Actions.' + actionName, event);
+    },
+    onVirtualActionEvent: function(from, event) {
+        if (from === 'Application.Grounded') {
+            this.isGrounded = !!event.applicationValue;
+        } else if (from === 'Keyboard.Shift') {
+            this.isShifted = !!event.value;
+        } else if (from === 'Keyboard.RightMouseButton') {
+            this.isRightMouseButton = !!event.value;
+            this.rightMouseButtonReleased = !event.value ? new Date : undefined;
+        }
+        this.states.handleActionEvent(from, event);
+    }
+}; // MovementEventMapper.prototype
+
+// ----------------------------------------------------------------------------
+// helper JS class to track drive keys -> translation / rotation influences
+function VirtualDriveKeys(options) {
+    options = options || {};
+    Object.defineProperties(this, {
+        $pendingReset: { value: {} },
+        $eventFilter: { value: options.eventFilter },
+        $valueUpdated: { value: _utils.signal(function valueUpdated(action, newValue, oldValue){}) }
+    });
+}
+VirtualDriveKeys.prototype = {
+    constructor: VirtualDriveKeys,
+    update: function update(dt) {
+        Object.keys(this.$pendingReset).forEach(_utils.bind(this, function(i) {
+            var event = this.$pendingReset[i].event;
+            (event.driveKey in this) && this.setValue(event, 0);
+        }));
+    },
+    getValue: function(driveKey, defaultValue) {
+        return driveKey in this ? this[driveKey] : defaultValue;
+    },
+    _defaultFilter: function(from, event) {
+        return event.actionValue;
+    },
+    handleActionEvent: function(from, event) {
+        var value = this.$eventFilter ? this.$eventFilter(from, event, this._defaultFilter) : event.actionValue;
+        return event.driveKeyName && this.setValue(event, value);
+    },
+    setValue: function(event, value) {
+        var driveKeyName = event.driveKeyName,
+            driveKey = DriveKeys[driveKeyName],
+            id = event.id,
+            previous = this[driveKey],
+            autoReset = (driveKeyName === 'ZOOM');
+
+        this[driveKey] = value;
+
+        if (previous !== value) {
+            this.$valueUpdated(event, value, previous);
+        }
+        if (value === 0.0) {
+            delete this.$pendingReset[id];
+        } else if (autoReset) {
+            this.$pendingReset[id] = { event: event, value: value };
+        }
+    },
+    reset: function() {
+        Object.keys(this).forEach(_utils.bind(this, function(p) {
+            this[p] = 0.0;
+        }));
+        Object.keys(this.$pendingReset).forEach(_utils.bind(this, function(p) {
+            delete this.$pendingReset[p];
+        }));
+    },
+    toJSON: function() {
+        var obj = {};
+        for (var key in this) {
+            if (enumMeta.DriveKeyNames[key]) {
+                obj[enumMeta.DriveKeyNames[key]] = this[key];
+            }
+        }
+        return obj;
+    },
+    getDriveKeys: function(options) {
+        options = options || {};
+        try {
+            return {
+                translation: {
+                    x: this.getValue(DriveKeys.TRANSLATE_X) || 0,
+                    y: this.getValue(DriveKeys.TRANSLATE_Y) || 0,
+                    z: this.getValue(DriveKeys.TRANSLATE_Z) || 0
+                },
+                rotation: {
+                    x: this.getValue(DriveKeys.PITCH) || 0,
+                    y: this.getValue(DriveKeys.YAW) || 0,
+                    z: 'ROLL' in DriveKeys && this.getValue(DriveKeys.ROLL) || 0
+                },
+                zoom: Vec3.multiply(this.getValue(DriveKeys.ZOOM) || 0, Vec3.ONE)
+            };
+        } finally {
+            options.update && this.update(options.update);
+        }
+    }
+};
+
+// ----------------------------------------------------------------------------
+// MovementMapping
+
+function MovementMapping(options) {
+    options = options || {};
+    assert('namespace' in options && 'controllerMapping' in options);
+    this.namespace = options.namespace;
+    this.enabled = false;
+    this.options = {
+        keyboardMultiplier: 1.0,
+        mouseMultiplier: 1.0,
+        mouseSmooth: true,
+        captureMode: MovementEventMapper.CAPTURE_ACTION_EVENTS,
+        excludeNames: null,
+        controllerMapping: MAPPING_TEMPLATE,
+    };
+    this.updateOptions(options);
+    this.virtualActionEvent = _utils.signal(function virtualActionEvent(from, event) {});
+}
+MovementMapping.prototype = {
+    constructor: MovementMapping,
+    enable: function() {
+        this.enabled = true;
+        if (this.mapping) {
+            this.mapping.disable();
+        }
+        this.mapping = this._createMapping();
+        log('ENABLE CONTROLLER MAPPING', this.mapping.name);
+        this.mapping.enable();
+    },
+    disable: function() {
+        this.enabled = false;
+        if (this.mapping) {
+            log('DISABLE CONTROLLER MAPPING', this.mapping.name);
+            this.mapping.disable();
+        }
+    },
+    reset: function() {
+        var enabled = this.enabled;
+        enabled && this.disable();
+        this.mapping = this._createMapping();
+        enabled && this.enable();
+    },
+    updateOptions: function(options) {
+        return _updateOptions(this.options, options || {}, this.constructor.name);
+    },
+    applyOptions: function(options, applyNow) {
+        if (this.updateOptions(options) && applyNow) {
+            this.reset();
+        }
+    },
+    onShiftKey: function onShiftKey(value, key) {
+        var event = {
+            type: value ? 'keypress' : 'keyrelease',
+            keyboardKey: key,
+            keyboardText: 'SHIFT',
+            keyboardValue: value,
+            actionName: 'Shift',
+            actionValue: !!value,
+            value: !!value,
+            at: +new Date
+        };
+        this.virtualActionEvent('Keyboard.Shift', event);
+    },
+    onRightMouseButton: function onRightMouseButton(value, key) {
+        var event = {
+            type: value ? 'mousepress' : 'mouserelease',
+            keyboardKey: key,
+            keyboardValue: value,
+            actionName: 'RightMouseButton',
+            actionValue: !!value,
+            value: !!value,
+            at: +new Date
+        };
+        this.virtualActionEvent('Keyboard.RightMouseButton', event);
+    },
+    onApplicationEvent: function _onApplicationEvent(key, name, value) {
+        var event = {
+            type: 'application',
+            actionName: 'Application.' + name,
+            applicationKey: key,
+            applicationName: name,
+            applicationValue: value,
+            actionValue: !!value,
+            value: !!value
+        };
+        this.virtualActionEvent('Application.' + name, event);
+    },
+    _createMapping: function() {
+        this._mapping = this._getTemplate();
+        var mappingJSON = JSON.stringify(this._mapping, 0, 2);
+        var mapping = Controller.parseMapping(mappingJSON);
+        debugPrint(mappingJSON);
+        mapping.name = mapping.name || this._mapping.name;
+
+        mapping.from(Controller.Hardware.Keyboard.Shift).peek().to(_utils.bind(this, 'onShiftKey'));
+        mapping.from(Controller.Hardware.Keyboard.RightMouseButton).peek().to(_utils.bind(this, 'onRightMouseButton'));
+
+        var boundApplicationHandler = _utils.bind(this, 'onApplicationEvent');
+        Object.keys(Controller.Hardware.Application).forEach(function(name) {
+            var key = Controller.Hardware.Application[name];
+            debugPrint('observing Controller.Hardware.Application.'+ name, key);
+            mapping.from(key).to(function(value) {
+                boundApplicationHandler(key, name, value);
+            });
+        });
+
+        return mapping;
+    },
+    _getTemplate: function() {
+        assert(this.options.controllerMapping, 'MovementMapping._getTemplate -- !this.options.controllerMapping');
+        var template = JSON.parse(JSON.stringify(this.options.controllerMapping)); // make a local copy
+        template.name = this.namespace;
+        template.channels = template.channels.filter(function(item) {
+            // ignore any "JSON comment" or other bindings without a from spec
+            return item.from && item.from.makeAxis;
+        });
+        var exclude = Array.isArray(this.options.excludeNames) ? this.options.excludeNames : [];
+        if (!this.options.mouseSmooth) {
+            exclude.push('Keyboard.RightMouseButton');
+        }
+
+        log('EXCLUSIONS:' + exclude);
+
+        template.channels = template.channels.filter(_utils.bind(this, function(item, i) {
+            debugPrint('channel['+i+']', item.from && item.from.makeAxis, item.to, JSON.stringify(item.filters) || '');
+            // var hasFilters = Array.isArray(item.filters) && !item.filters[1];
+            item.filters = Array.isArray(item.filters) ? item.filters :
+                typeof item.filters === 'string' ? [ { type: item.filters }] : [ item.filters ];
+
+            if (/Mouse/.test(item.from && item.from.makeAxis)) {
+                item.filters.push({ type: 'scale', scale: this.options.mouseMultiplier });
+                log('applied mouse multiplier:', item.from.makeAxis, item.when, item.to, this.options.mouseMultiplier);
+            } else if (/Keyboard/.test(item.from && item.from.makeAxis)) {
+                item.filters.push({ type: 'scale', scale: this.options.keyboardMultiplier });
+                log('applied keyboard multiplier:', item.from.makeAxis, item.when, item.to, this.options.keyboardMultiplier);
+            }
+            item.filters = item.filters.filter(Boolean);
+            if (~exclude.indexOf(item.to)) {
+                log('EXCLUDING item.to === ' + item.to);
+                return false;
+            }
+            var when = Array.isArray(item.when) ? item.when : [item.when];
+            for (var j=0; j < when.length; j++) {
+                if (~exclude.indexOf(when[j])) {
+                    log('EXCLUDING item.when contains ' + when[j]);
+                    return false;
+                }
+            }
+            function shouldInclude(p, i) {
+                if (~exclude.indexOf(p)) {
+                    log('EXCLUDING from.makeAxis[][' + i + '] === ' + p);
+                    return false;
+                }
+                return true;
+            }
+
+            if (item.from && Array.isArray(item.from.makeAxis)) {
+                var makeAxis = item.from.makeAxis;
+                item.from.makeAxis = makeAxis.map(function(axis) {
+                    if (Array.isArray(axis)) {
+                        return axis.filter(shouldInclude);
+                    } else {
+                        return shouldInclude(axis, -1) && axis;
+                    }
+                }).filter(Boolean);
+            }
+            return true;
+        }));
+        debugPrint(JSON.stringify(template,0,2));
+        return template;
+    }
+}; // MovementMapping.prototype
+
+// update target properties from source, but iff the property already exists in target
+function _updateOptions(target, source, debugName) {
+    debugName = debugName || '_updateOptions';
+    var changed = 0;
+    if (!source || typeof source !== 'object') {
+        return changed;
+    }
+    for (var p in target) {
+        if (p in source && target[p] !== source[p]) {
+            log(debugName, 'updating source.'+p, target[p] + ' -> ' + source[p]);
+            target[p] = source[p];
+            changed++;
+        }
+    }
+    for (p in source) {
+        (!(p in target)) && log(debugName, 'warning: ignoring unknown option:', p, (source[p] +'').substr(0, 40)+'...');
+    }
+    return changed;
+}
+
+// ----------------------------------------------------------------------------
+function calculateThrust(maxVelocity, targetVelocity, previousThrust) {
+    var THRUST_FALLOFF = 0.1; // round to ZERO if component is below this threshold
+    // Note: MyAvatar.setThrust might need an update to account for the recent avatar density changes...
+    // For now, this discovered scaling factor seems to accomodate a similar easing effect to the other movement models.
+    var magicScalingFactor = 12.0 * (maxVelocity + 120) / 16 - Math.sqrt( maxVelocity / 8 );
+
+    var targetThrust = Vec3.multiply(magicScalingFactor, targetVelocity);
+    targetThrust = vec3eclamp(targetThrust, THRUST_FALLOFF, maxVelocity);
+    if (Vec3.length(MyAvatar.velocity) > maxVelocity) {
+        targetThrust = Vec3.multiply(0.5, targetThrust);
+    }
+    return targetThrust;
+}
+
+// ----------------------------------------------------------------------------
+// clamp components and magnitude to maxVelocity, rounding to Vec3.ZERO if below epsilon
+function vec3eclamp(velocity, epsilon, maxVelocity) {
+    velocity = {
+        x: Math.max(-maxVelocity, Math.min(maxVelocity, velocity.x)),
+        y: Math.max(-maxVelocity, Math.min(maxVelocity, velocity.y)),
+        z: Math.max(-maxVelocity, Math.min(maxVelocity, velocity.z))
+    };
+
+    if (Math.abs(velocity.x) < epsilon) {
+        velocity.x = 0;
+    }
+    if (Math.abs(velocity.y) < epsilon) {
+        velocity.y = 0;
+    }
+    if (Math.abs(velocity.z) < epsilon) {
+        velocity.z = 0;
+    }
+
+    var length = Vec3.length(velocity);
+    if (length > maxVelocity) {
+        velocity = Vec3.multiply(maxVelocity, Vec3.normalize(velocity));
+    } else if (length < epsilon) {
+        velocity = Vec3.ZERO;
+    }
+    return velocity;
+}
+
+function vec3damp(active, positiveEffect, negativeEffect) {
+    // If force isn't being applied in a direction, incorporate negative effect (drag);
+    negativeEffect = {
+        x: active.x ? 0 : negativeEffect.x,
+        y: active.y ? 0 : negativeEffect.y,
+        z: active.z ? 0 : negativeEffect.z,
+    };
+    return Vec3.subtract(Vec3.sum(active, positiveEffect), negativeEffect);
+}
+
+// ----------------------------------------------------------------------------
+function VelocityTracker(defaultValues) {
+    Object.defineProperty(this, 'defaultValues', { configurable: true, value: defaultValues });
+}
+VelocityTracker.prototype = {
+    constructor: VelocityTracker,
+    reset: function() {
+        Object.assign(this, this.defaultValues);
+    },
+    integrate: function(targetState, currentVelocities, drag, settings) {
+        var args = [].slice.call(arguments);
+        this._applyIntegration('translation', args);
+        this._applyIntegration('rotation', args);
+        this._applyIntegration('zoom', args);
+    },
+    _applyIntegration: function(component, args) {
+        return this._integrate.apply(this, [component].concat(args));
+    },
+    _integrate: function(component, targetState, currentVelocities, drag, settings) {
+        assert(targetState[component], component + ' not found in targetState (which has: ' + Object.keys(targetState) + ')');
+        var result = vec3damp(
+            targetState[component],
+            currentVelocities[component],
+            drag[component]
+        );
+        var maxVelocity = settings[component].maxVelocity;
+        return this[component] = vec3eclamp(result, settings.epsilon, maxVelocity);
+    },
+};
+
+// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+Object.assign(CameraControls, {
+    SCRIPT_UPDATE: 'update',
+    ANIMATION_FRAME: 'requestAnimationFrame', // emulated
+    NEXT_TICK: 'nextTick', // emulated
+    SET_IMMEDIATE: 'setImmediate', // emulated
+    //WORKER_THREAD: 'workerThread',
+});
+
+function CameraControls(options) {
+    options = options || {};
+    assert('update' in options && 'threadMode' in options);
+    this.updateObject = typeof options.update === 'function' ? options : options.update;
+    assert(typeof this.updateObject.update === 'function',
+           'construction options expected either { update: function(){}... } object or a function(){}');
+    this.update = _utils.bind(this.updateObject, 'update');
+    this.threadMode = options.threadMode;
+    this.fps = options.fps || 60;
+    this.getRuntimeSeconds = options.getRuntimeSeconds || function() {
+        return +new Date / 1000.0;
+    };
+    this.backupOptions = _utils.DeferredUpdater.createGroup({
+        MyAvatar: MyAvatar,
+        Camera: Camera,
+        Reticle: Reticle,
+    });
+
+    this.enabled = false;
+    this.enabledChanged = _utils.signal(function enabledChanged(enabled){});
+    this.modeChanged = _utils.signal(function modeChanged(mode, oldMode){});
+}
+CameraControls.prototype = {
+    constructor: CameraControls,
+    $animate: null,
+    $start: function() {
+        if (this.$animate) {
+            return;
+        }
+
+        var lastTime;
+        switch (this.threadMode) {
+            case CameraControls.SCRIPT_UPDATE: {
+                this.$animate = this.update;
+                Script.update.connect(this, '$animate');
+                this.$animate.disconnect = _utils.bind(this, function() {
+                    Script.update.disconnect(this, '$animate');
+                });
+            } break;
+
+            case CameraControls.ANIMATION_FRAME: {
+                this.requestAnimationFrame = _utils.createAnimationStepper({
+                    getRuntimeSeconds: this.getRuntimeSeconds,
+                    fps: this.fps
+                });
+                this.$animate = _utils.bind(this, function(dt) {
+                    this.update(dt);
+                    this.requestAnimationFrame(this.$animate);
+                });
+                this.$animate.disconnect = _utils.bind(this.requestAnimationFrame, 'reset');
+                this.requestAnimationFrame(this.$animate);
+            } break;
+
+            case CameraControls.SET_IMMEDIATE: {
+                // emulate process.setImmediate (attempt to execute at start of next update frame, sans Script.update throttling)
+                lastTime = this.getRuntimeSeconds();
+                this.$animate = Script.setInterval(_utils.bind(this, function() {
+                    this.update(this.getRuntimeSeconds(lastTime));
+                    lastTime = this.getRuntimeSeconds();
+                }), 5);
+                this.$animate.disconnect = function() {
+                    Script.clearInterval(this);
+                };
+            } break;
+
+            case CameraControls.NEXT_TICK: {
+                // emulate process.nextTick (attempt to queue at the very next opportunity beyond current scope)
+                lastTime = this.getRuntimeSeconds();
+                this.$animate = _utils.bind(this, function() {
+                    this.$animate.timeout = 0;
+                    if (this.$animate.quit) {
+                        return;
+                    }
+                    this.update(this.getRuntimeSeconds(lastTime));
+                    lastTime = this.getRuntimeSeconds();
+                    this.$animate.timeout = Script.setTimeout(this.$animate, 0);
+                });
+                this.$animate.quit = false;
+                this.$animate.disconnect = function() {
+                    this.timeout && Script.clearTimeout(this.timeout);
+                    this.timeout = 0;
+                    this.quit = true;
+                };
+                this.$animate();
+            } break;
+
+            default: throw new Error('unknown threadMode: ' + this.threadMode);
+        }
+        log(
+            '...$started update thread', '(threadMode: ' + this.threadMode + ')',
+            this.threadMode === CameraControls.ANIMATION_FRAME && this.fps
+        );
+    },
+    $stop: function() {
+        if (!this.$animate) {
+            return;
+        }
+        try {
+            this.$animate.disconnect();
+        } catch (e) {
+            log('$animate.disconnect error: ' + e, '(threadMode: ' + this.threadMode +')');
+        }
+        this.$animate = null;
+        log('...$stopped updated thread', '(threadMode: ' + this.threadMode +')');
+    },
+    onModeUpdated: function onModeUpdated(mode, oldMode) {
+        oldMode = oldMode || this.previousMode;
+        this.previousMode = mode;
+        log('onModeUpdated', oldMode + '->' + mode);
+        // user changed modes, so leave the current mode intact later when restoring backup values
+        delete this.backupOptions.Camera.$setModeString;
+        if (/person/.test(oldMode) && /person/.test(mode)) {
+            return; // disregard first -> third and third ->first transitions
+        }
+        this.modeChanged(mode, oldMode);
+    },
+
+    reset: function() {
+        if (this.enabled) {
+            this.disable();
+            this.enable();
+        }
+    },
+    setEnabled: function setEnabled(enabled) {
+        if (!this.enabled && enabled) {
+            this.enable();
+        } else if (this.enabled && !enabled) {
+            this.disable();
+        }
+    },
+    enable: function enable() {
+        if (this.enabled) {
+            throw new Error('CameraControls.enable -- already enabled..');
+        }
+        log('ENABLE enableCameraMove', this.threadMode);
+
+        this._backup();
+
+        this.previousMode = Camera.mode;
+        Camera.modeUpdated.connect(this, 'onModeUpdated');
+
+        this.$start();
+
+        this.enabledChanged(this.enabled = true);
+    },
+    disable: function disable() {
+        log("DISABLE CameraControls");
+        try {
+            Camera.modeUpdated.disconnect(this, 'onModeUpdated');
+        } catch (e) {
+            debugPrint(e);
+        }
+        this.$stop();
+
+        this._restore();
+
+        if (this.enabled !== false) {
+            this.enabledChanged(this.enabled = false);
+        }
+    },
+    _restore: function() {
+        var submitted = this.backupOptions.submit();
+        log('restored previous values: ' + JSON.stringify(submitted,0,2));
+        return submitted;
+    },
+    _backup: function() {
+        this.backupOptions.reset();
+        Object.assign(this.backupOptions.Reticle, {
+            scale: Reticle.scale,
+        });
+        Object.assign(this.backupOptions.Camera, {
+            $setModeString: Camera.mode,
+        });
+        Object.assign(this.backupOptions.MyAvatar, {
+            motorTimescale: MyAvatar.motorTimescale,
+            motorReferenceFrame: MyAvatar.motorReferenceFrame,
+            motorVelocity: Vec3.ZERO,
+            velocity: Vec3.ZERO,
+            angularVelocity: Vec3.ZERO,
+        });
+    },
+}; // CameraControls
+
+// ----------------------------------------------------------------------------
+function applyEasing(deltaTime, direction, settings, state, scaling) {
+    var obj = {};
+    for (var p in scaling) {
+        var group = settings[p],          // translation | rotation | zoom
+            easeConst = group[direction], // easeIn | easeOut
+            scale = scaling[p],
+            stateVector = state[p];
+        obj[p] = Vec3.multiply(easeConst * scale * deltaTime, stateVector);
+    }
+    return obj;
+}
diff --git a/unpublishedScripts/marketplace/camera-move/modules/movement-utils.mapping.json b/unpublishedScripts/marketplace/camera-move/modules/movement-utils.mapping.json
new file mode 100644
index 0000000000..ec915a9fad
--- /dev/null
+++ b/unpublishedScripts/marketplace/camera-move/modules/movement-utils.mapping.json
@@ -0,0 +1,98 @@
+{
+    "name": "app-camera-move",
+    "channels": [
+
+        { "comment": "------------------ Actions.TranslateX -------------------" },
+        {
+            "from": {"makeAxis": [["Keyboard.Left"],["Keyboard.Right"]]},
+            "when": "Keyboard.Shift",
+            "to": "Actions.TranslateX"
+        },
+        {
+            "from": {"makeAxis": [["Keyboard.A","Keyboard.TouchpadLeft"],["Keyboard.D","Keyboard.TouchpadRight"]]},
+            "when": "Keyboard.Shift",
+            "to": "Actions.TranslateX"
+        },
+
+        { "comment": "------------------ Actions.TranslateY -------------------" },
+        {
+            "from": {"makeAxis": [["Keyboard.C","Keyboard.PgDown"],["Keyboard.E","Keyboard.PgUp"]]},
+            "when": "!Keyboard.Shift",
+            "to": "Actions.TranslateY"
+        },
+
+        { "comment": "------------------ Actions.TranslateZ -------------------" },
+        {
+            "from": {"makeAxis": [["Keyboard.W"],["Keyboard.S"]]},
+            "when": "!Keyboard.Shift",
+            "to": "Actions.TranslateZ"
+        },
+        {
+            "from": {"makeAxis": [["Keyboard.Up"],["Keyboard.Down"]]},
+            "when": "!Keyboard.Shift",
+            "to": "Actions.TranslateZ"
+        },
+
+        { "comment": "------------------ Actions.Yaw -------------------" },
+        {
+            "from": {"makeAxis": [["Keyboard.A","Keyboard.TouchpadLeft"],["Keyboard.D","Keyboard.TouchpadRight"]]},
+            "when": "!Keyboard.Shift",
+            "to": "Actions.Yaw",
+            "filters": ["invert"]
+        },
+        {
+            "from": {"makeAxis": [["Keyboard.MouseMoveLeft"],["Keyboard.MouseMoveRight"]]},
+            "when": "Keyboard.RightMouseButton",
+            "to": "Actions.Yaw",
+            "filters": ["invert"]
+        },
+        {
+            "from": {"makeAxis": [["Keyboard.Left"],["Keyboard.Right"]]},
+            "when": "!Keyboard.Shift",
+            "to": "Actions.Yaw",
+            "filters": ["invert"]
+        },
+        {
+            "from": {"makeAxis": [["Keyboard.Left"],["Keyboard.Right"]]},
+            "when": ["Application.SnapTurn", "!Keyboard.Shift"],
+            "to": "Actions.StepYaw",
+            "filters":
+            [
+                "invert",
+                { "type": "pulse", "interval": 0.5, "resetOnZero": true },
+                { "type": "scale", "scale": 22.5 }
+            ]
+        },
+
+        { "comment": "------------------ Actions.Pitch -------------------" },
+        {
+            "from": {"makeAxis": [["Keyboard.W"],["Keyboard.S"]]},
+            "when": "Keyboard.Shift",
+            "to": "Actions.Pitch",
+            "filters": ["invert"]
+        },
+        {
+            "from": {"makeAxis": [["Keyboard.MouseMoveUp"],["Keyboard.MouseMoveDown"]]},
+            "when": "Keyboard.RightMouseButton",
+            "to": "Actions.Pitch",
+            "filters": ["invert"]
+        },
+        {
+            "from": {"makeAxis": [["Keyboard.Up"],["Keyboard.Down"]]},
+            "when": "Keyboard.Shift",
+            "to": "Actions.Pitch",
+            "filters": ["invert"]
+        },
+
+        { "comment": "------------------ Actions.BoomIn -------------------" },
+        {
+            "from": {"makeAxis": [["Keyboard.C","Keyboard.PgDown"],["Keyboard.E","Keyboard.PgUp"]]},
+            "when": "Keyboard.Shift",
+            "to": "Actions.BoomIn",
+            "filters": [{"type": "scale","scale": 0.005}]
+        },
+
+        { "comment": "------------------ end -------------------" }
+
+    ]
+}
diff --git a/unpublishedScripts/marketplace/clap/animations/ClapAnimation.json b/unpublishedScripts/marketplace/clap/animations/ClapAnimation.json
new file mode 100644
index 0000000000..2dca45a0de
--- /dev/null
+++ b/unpublishedScripts/marketplace/clap/animations/ClapAnimation.json
@@ -0,0 +1,386 @@
+{
+  "RightShoulder": {
+    "rotations": {
+      "x": 0.5578474402427673,
+      "y": -0.44214877486228943,
+      "z": 0.4979960322380066,
+      "w": 0.4952884614467621
+    }
+  },
+  "RightArm": {
+    "rotations": {
+      "x": 0.6266362071037292,
+      "y": -0.02882515825331211,
+      "z": -0.3233867585659027,
+      "w": 0.7084611654281616
+    }
+  },
+  "RightForeArm": {
+    "rotations": {
+      "x": 0.00004018074105260894,
+      "y": 0.06418406218290329,
+      "z": -0.5193823575973511,
+      "w": 0.8521281480789185
+    }
+  },
+  "RightHand": {
+    "rotations": {
+      "x": -0.21368850767612457,
+      "y": 0.02043931558728218,
+      "z": -0.02227853797376156,
+      "w": 0.9764339923858643
+    }
+  },
+  "RightHandPinky1": {
+    "rotations": {
+      "x": -0.003497191471979022,
+      "y": -0.01721140556037426,
+      "z": 0.19736060500144958,
+      "w": 0.980173647403717
+    }
+  },
+  "RightHandPinky2": {
+    "rotations": {
+      "x": 0.000005483317181642633,
+      "y": -0.00008023700502235442,
+      "z": -0.06867633014917374,
+      "w": 0.997639000415802
+    }
+  },
+  "RightHandPinky3": {
+    "rotations": {
+      "x": 7.18885644346301e-8,
+      "y": -2.7131383717460267e-7,
+      "z": 0.007620905060321093,
+      "w": 0.9999709725379944
+    }
+  },
+  "RightHandPinky4": {
+    "rotations": {
+      "x": -5.719068774112657e-9,
+      "y": 5.142213126418937e-7,
+      "z": -0.0075718737207353115,
+      "w": 0.999971330165863
+    }
+  },
+  "RightHandRing1": {
+    "rotations": {
+      "x": -0.0013452530838549137,
+      "y": -0.017564140260219574,
+      "z": 0.0761696845293045,
+      "w": 0.9969393610954285
+    }
+  },
+  "RightHandRing2": {
+    "rotations": {
+      "x": 0.0000010375651982030831,
+      "y": -0.00002211921673733741,
+      "z": -0.04599710553884506,
+      "w": 0.9989416003227234
+    }
+  },
+  "RightHandRing3": {
+    "rotations": {
+      "x": -2.7102969868408877e-10,
+      "y": 1.9202734335976857e-7,
+      "z": 0.0016911650309339166,
+      "w": 0.9999985694885254
+    }
+  },
+  "RightHandRing4": {
+    "rotations": {
+      "x": 2.3246689018208144e-9,
+      "y": -3.364403156069784e-8,
+      "z": 0.0004951066803187132,
+      "w": 0.9999998807907104
+    }
+  },
+  "RightHandMiddle1": {
+    "rotations": {
+      "x": 0.0012630893616005778,
+      "y": -0.017612185329198837,
+      "z": -0.07168931514024734,
+      "w": 0.9972707033157349
+    }
+  },
+  "RightHandMiddle2": {
+    "rotations": {
+      "x": 2.3561028683616314e-7,
+      "y": 0.000020313073036959395,
+      "z": 0.011195243336260319,
+      "w": 0.9999373555183411
+    }
+  },
+  "RightHandMiddle3": {
+    "rotations": {
+      "x": 6.375214667286855e-8,
+      "y": 4.750924631480302e-7,
+      "z": 0.00237679248675704,
+      "w": 0.9999971985816956
+    }
+  },
+  "RightHandMiddle4": {
+    "rotations": {
+      "x": 6.717256439969788e-8,
+      "y": 3.876683507542111e-8,
+      "z": -0.005236906465142965,
+      "w": 0.9999862909317017
+    }
+  },
+  "RightHandIndex1": {
+    "rotations": {
+      "x": 0.002164300065487623,
+      "y": -0.017346171662211418,
+      "z": -0.12158434838056564,
+      "w": 0.9924271702766418
+    }
+  },
+  "RightHandIndex2": {
+    "rotations": {
+      "x": -0.00000143755482895358,
+      "y": -0.0001614764187252149,
+      "z": 0.008941099047660828,
+      "w": 0.9999601244926453
+    }
+  },
+  "RightHandIndex3": {
+    "rotations": {
+      "x": 7.458467621290765e-8,
+      "y": 5.365728839024086e-7,
+      "z": 0.03373909369111061,
+      "w": 0.999430775642395
+    }
+  },
+  "RightHandIndex4": {
+    "rotations": {
+      "x": 4.511302997833866e-10,
+      "y": -2.259726272768603e-7,
+      "z": -0.009632252156734467,
+      "w": 0.9999536275863647
+    }
+  },
+  "RightHandThumb1": {
+    "rotations": {
+      "x": -0.0783928632736206,
+      "y": -0.3033908009529114,
+      "z": -0.26653754711151123,
+      "w": 0.9114638566970825
+    }
+  },
+  "RightHandThumb2": {
+    "rotations": {
+      "x": 0.0031029442325234413,
+      "y": 0.07382386922836304,
+      "z": 0.005253761075437069,
+      "w": 0.9972526431083679
+    }
+  },
+  "RightHandThumb3": {
+    "rotations": {
+      "x": 0.0040440745651721954,
+      "y": -0.04943573474884033,
+      "z": 0.007246015593409538,
+      "w": 0.9987428188323975
+    }
+  },
+  "RightHandThumb4": {
+    "rotations": {
+      "x": -0.00009280416270485148,
+      "y": -0.01658034883439541,
+      "z": -0.00014316302258521318,
+      "w": 0.999862551689148
+    }
+  },
+  "LeftShoulder": {
+    "rotations": {
+      "x": 0.5578474402427673,
+      "y": 0.44214877486228943,
+      "z": -0.4979960322380066,
+      "w": 0.4952884614467621
+    }
+  },
+  "LeftArm": {
+    "rotations": {
+      "x": 0.626636266708374,
+      "y": 0.028824958950281143,
+      "z": 0.3233867585659027,
+      "w": 0.7084611654281616
+    }
+  },
+  "LeftForeArm": {
+    "rotations": {
+      "x": 0.00004015670492663048,
+      "y": -0.06418408453464508,
+      "z": 0.5193824768066406,
+      "w": 0.8521282076835632
+    }
+  },
+  "LeftHand": {
+    "rotations": {
+      "x": -0.21368853747844696,
+      "y": -0.02043931558728218,
+      "z": 0.02227853797376156,
+      "w": 0.9764339923858643
+    }
+  },
+  "LeftHandPinky1": {
+    "rotations": {
+      "x": -0.003497188910841942,
+      "y": 0.01721140556037426,
+      "z": -0.19736060500144958,
+      "w": 0.980173647403717
+    }
+  },
+  "LeftHandPinky2": {
+    "rotations": {
+      "x": 0.000005479304491018411,
+      "y": 0.00008023556438274682,
+      "z": 0.06867631524801254,
+      "w": 0.997639000415802
+    }
+  },
+  "LeftHandPinky3": {
+    "rotations": {
+      "x": 7.229602516645173e-8,
+      "y": 2.709063835482084e-7,
+      "z": -0.007620909716933966,
+      "w": 0.9999709725379944
+    }
+  },
+  "LeftHandPinky4": {
+    "rotations": {
+      "x": -5.52988677071653e-9,
+      "y": -5.13755651354586e-7,
+      "z": 0.007571868598461151,
+      "w": 0.999971330165863
+    }
+  },
+  "LeftHandRing1": {
+    "rotations": {
+      "x": -0.001345252152532339,
+      "y": 0.017564138397574425,
+      "z": -0.0761696845293045,
+      "w": 0.9969393610954285
+    }
+  },
+  "LeftHandRing2": {
+    "rotations": {
+      "x": 0.000001034482806971937,
+      "y": 0.000022119218556326814,
+      "z": 0.04599710553884506,
+      "w": 0.9989416003227234
+    }
+  },
+  "LeftHandRing3": {
+    "rotations": {
+      "x": -2.8012464570181805e-10,
+      "y": -1.923183816643359e-7,
+      "z": -0.0016911652637645602,
+      "w": 0.9999985694885254
+    }
+  },
+  "LeftHandRing4": {
+    "rotations": {
+      "x": -1.1168596047994583e-9,
+      "y": 3.33529932561305e-8,
+      "z": -0.0004951058072037995,
+      "w": 0.9999998807907104
+    }
+  },
+  "LeftHandMiddle1": {
+    "rotations": {
+      "x": 0.0012630895944312215,
+      "y": 0.01761218160390854,
+      "z": 0.07168931514024734,
+      "w": 0.9972707033157349
+    }
+  },
+  "LeftHandMiddle2": {
+    "rotations": {
+      "x": 2.37378529277521e-7,
+      "y": -0.00002031277836067602,
+      "z": -0.011195233091711998,
+      "w": 0.9999373555183411
+    }
+  },
+  "LeftHandMiddle3": {
+    "rotations": {
+      "x": 7.146466884933034e-8,
+      "y": -4.7555812443533796e-7,
+      "z": -0.0023767934180796146,
+      "w": 0.9999971985816956
+    }
+  },
+  "LeftHandMiddle4": {
+    "rotations": {
+      "x": 6.549178976911207e-8,
+      "y": -3.865041975359418e-8,
+      "z": 0.005236904136836529,
+      "w": 0.9999862909317017
+    }
+  },
+  "LeftHandIndex1": {
+    "rotations": {
+      "x": 0.002164299599826336,
+      "y": 0.017346171662211418,
+      "z": 0.12158433347940445,
+      "w": 0.9924271702766418
+    }
+  },
+  "LeftHandIndex2": {
+    "rotations": {
+      "x": -0.000001437780269952782,
+      "y": 0.00016147761198226362,
+      "z": -0.008941099047660828,
+      "w": 0.9999601244926453
+    }
+  },
+  "LeftHandIndex3": {
+    "rotations": {
+      "x": 7.61426193207626e-8,
+      "y": -5.373883027459669e-7,
+      "z": -0.03373908996582031,
+      "w": 0.999430775642395
+    }
+  },
+  "LeftHandIndex4": {
+    "rotations": {
+      "x": -5.311697748311417e-10,
+      "y": 2.26380109324964e-7,
+      "z": 0.009632255882024765,
+      "w": 0.9999536275863647
+    }
+  },
+  "LeftHandThumb1": {
+    "rotations": {
+      "x": -0.07839284837245941,
+      "y": 0.3033908009529114,
+      "z": 0.26653754711151123,
+      "w": 0.9114638566970825
+    }
+  },
+  "LeftHandThumb2": {
+    "rotations": {
+      "x": 0.0031029372476041317,
+      "y": -0.07382386922836304,
+      "z": -0.005253763869404793,
+      "w": 0.9972526431083679
+    }
+  },
+  "LeftHandThumb3": {
+    "rotations": {
+      "x": 0.004044072702527046,
+      "y": 0.049435727298259735,
+      "z": -0.0072460174560546875,
+      "w": 0.9987428188323975
+    }
+  },
+  "LeftHandThumb4": {
+    "rotations": {
+      "x": -0.00009280881931772456,
+      "y": 0.016580356284976006,
+      "z": 0.00014314628788270056,
+      "w": 0.999862551689148
+    }
+  }
+}
diff --git a/unpublishedScripts/marketplace/clap/animations/Clap_left.fbx b/unpublishedScripts/marketplace/clap/animations/Clap_left.fbx
new file mode 100644
index 0000000000..a3830b9838
Binary files /dev/null and b/unpublishedScripts/marketplace/clap/animations/Clap_left.fbx differ
diff --git a/unpublishedScripts/marketplace/clap/animations/Clap_right.fbx b/unpublishedScripts/marketplace/clap/animations/Clap_right.fbx
new file mode 100644
index 0000000000..1877e963f9
Binary files /dev/null and b/unpublishedScripts/marketplace/clap/animations/Clap_right.fbx differ
diff --git a/unpublishedScripts/marketplace/clap/clapApp.js b/unpublishedScripts/marketplace/clap/clapApp.js
new file mode 100644
index 0000000000..b2d8ce55db
--- /dev/null
+++ b/unpublishedScripts/marketplace/clap/clapApp.js
@@ -0,0 +1,61 @@
+"use strict";
+
+/*
+	clapApp.js
+	unpublishedScripts/marketplace/clap/clapApp.js
+
+	Created by Matti 'Menithal' Lahtinen on 9/11/2017
+	Copyright 2017 High Fidelity, Inc.
+
+	Distributed under the Apache License, Version 2.0.
+	See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+*/
+
+// Entry Script for the clap app
+
+// Load up engine
+var APP_NAME = "CLAP";
+var ClapEngine = Script.require(Script.resolvePath("scripts/ClapEngine.js?v9"));
+var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
+
+// Define Menu
+var blackIcon = Script.resolvePath("icons/tablet-icons/clap-a.svg?foxv2");
+var whiteIcon = Script.resolvePath("icons/tablet-icons/clap-i.svg?foxv2");
+
+if (Settings.getValue("clapAppEnabled") === undefined) {
+    Settings.setValue("clapAppEnabled", true);
+}
+var isActive = Settings.getValue("clapAppEnabled");
+
+var activeButton = tablet.addButton({
+    icon: whiteIcon,
+    activeIcon: blackIcon,
+    text: APP_NAME,
+    isActive: isActive,
+    sortOrder: 11
+});
+
+if (isActive) {
+    ClapEngine.connectEngine();
+}
+
+function onClick(enabled) {
+
+    isActive = !isActive;
+    Settings.setValue("clapAppEnabled", isActive);
+    activeButton.editProperties({
+        isActive: isActive
+    });
+    if (isActive) {
+        ClapEngine.connectEngine();
+    } else {
+        ClapEngine.disconnectEngine();
+    }
+}
+activeButton.clicked.connect(onClick);
+
+Script.scriptEnding.connect(function () {
+    ClapEngine.disconnectEngine();
+    activeButton.clicked.disconnect(onClick);
+    tablet.removeButton(activeButton);
+});
diff --git a/unpublishedScripts/marketplace/clap/entities/ClapParticle.json b/unpublishedScripts/marketplace/clap/entities/ClapParticle.json
new file mode 100644
index 0000000000..bf1b70665b
--- /dev/null
+++ b/unpublishedScripts/marketplace/clap/entities/ClapParticle.json
@@ -0,0 +1,58 @@
+{
+  "alpha": 0.01,
+  "alphaFinish": 0.0,
+  "alphaSpread": 1,
+  "alphaStart": 0.05,
+  "color": {
+    "blue": 200,
+    "green": 200,
+    "red": 200
+  },
+  "colorFinish": {
+    "blue": 200,
+    "green": 200,
+    "red": 200
+  },
+  "colorStart": {
+    "blue": 200,
+    "green": 200,
+    "red": 200
+  },
+  "created": "2017-09-09T16:01:38Z",
+  "dimensions": {
+    "x": 0.5,
+    "y": 0.5,
+    "z": 0.5
+  },
+  "emitAcceleration": {
+    "x": 0,
+    "y": 0,
+    "z": 0
+  },
+  "emitDimensions": {
+    "x": 0.25,
+    "y": 0.25,
+    "z": 0.25
+  },
+  "emitOrientation": {
+    "w": 1,
+    "x": 0,
+    "y": 0,
+    "z": 0
+  },
+  "emitRate": 100,
+  "emitSpeed": 0.125,
+  "lifespan": 0.5,
+  "lifetime": 2,
+  "script": "(function(){return{preload:function(id){Script.setTimeout(function(){Entities.editEntity(id,{isEmitting:false});},200);}}})",
+  "maxParticles": 100,
+  "particleRadius": 0.05,
+  "polarFinish": 1.4311699867248535,
+  "polarStart": 1.3962633609771729,
+  "radiusFinish": 0.01,
+  "radiusSpread": 0.2,
+  "radiusStart": 0.05,
+  "speedSpread": 0,
+  "emitShouldTrail": true,
+  "type": "ParticleEffect"
+}
diff --git a/unpublishedScripts/marketplace/clap/icons/clap-a.svg b/unpublishedScripts/marketplace/clap/icons/clap-a.svg
new file mode 100644
index 0000000000..60df3e0795
--- /dev/null
+++ b/unpublishedScripts/marketplace/clap/icons/clap-a.svg
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="225pt"
+   height="225pt"
+   viewBox="0 0 79.374998 79.374998"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="clap-a.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8"
+     inkscape:cx="240.0566"
+     inkscape:cy="147.59313"
+     inkscape:document-units="mm"
+     inkscape:current-layer="g3790"
+     showgrid="false"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:pagecheckerboard="true"
+     units="pt" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-217.62501)">
+    <g
+       id="g3790"
+       transform="translate(-276.67857,-1.5119048)"
+       style="fill:#000000">
+      <path
+         sodipodi:nodetypes="ccscccsccscssscscsscsccc"
+         inkscape:connector-curvature="0"
+         id="path3764"
+         d="m 287.04656,288.04665 23.71378,9.0592 c 0,0 0.39967,-4.79605 4.5296,-6.92762 4.12992,-2.13158 7.40168,-15.99614 7.40168,-15.99614 l 2.5266,-9.92668 4.1934,-9.24819 c 0,0 -1.13082,-3.82467 -4.67519,-0.19524 -8.8408,9.05294 -3.51813,14.25651 -8.14833,14.16202 -3.77977,-0.75596 -0.13245,-10.86933 0.26722,-16.16497 0.26644,-3.06413 0.69941,-12.98928 0.29974,-18.85112 -0.39966,-5.86184 -0.93256,-6.66118 -2.66446,-6.52795 -1.73191,0.13322 -2.93093,0.93257 -4.39638,9.05919 -1.46546,8.12664 -3.33058,15.72038 -3.06414,18.91774 0.26644,3.19737 -4.36307,0.64443 -2.89762,-5.48385 1.46546,-6.12827 4.82299,-19.49577 4.95621,-21.36089 0.13322,-1.86512 -0.52548,-5.99423 -3.45641,-1.46464 -2.93091,4.52961 -8.39307,31.77464 -8.39307,31.77464 0,0 -4.61911,1.35544 4.75249,-29.62183 0.37058,-1.22492 -1.2231,-1.82036 -2.02245,-0.35491 -0.79933,1.46547 -2.93556,6.41177 -3.60169,9.47592 -0.66612,3.06413 -4.12526,18.76747 -5.99039,20.76582 -1.86514,1.99836 -0.77914,-1.64516 2.43172,-19.62594 -3.46015,-8.7099 -7.6029,16.6051 -8.29355,25.75422 -1.73191,11.05755 2.66446,14.65459 2.53124,22.78122 z"
+         style="fill:#000000;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccscsssccccccssc"
+         inkscape:connector-curvature="0"
+         id="path3766"
+         d="m 326.28601,276.79194 4.85752,2.59518 c 0,0 5.99506,0.26645 7.86018,1.19902 1.86513,0.93256 14.52136,-19.31742 14.52136,-19.31742 0,0 -1.59867,-0.39967 -3.19735,-5.32893 -1.59868,-4.92926 -7.59374,-19.98353 -9.45888,-23.44734 -1.86513,-3.46381 -2.53124,-4.66283 -3.4638,-7.46051 -0.93257,-2.7977 -2.13159,-5.0625 -3.73027,-0.13323 -1.59868,4.92927 -1.66343,10.45537 -0.46441,13.91919 1.38613,5.18454 3.8952,15.07683 1.97631,17.7369 -3.13067,-0.0635 -4.1718,-8.94257 -4.84078,-11.98701 l -10.45574,-8.48036 -1.15458,18.13553 c 0,0 3.30736,-4.0697 9.65298,-5.19422 4.51067,-0.79933 2.81751,6.4678 1.21188,14.09965 -1.34794,6.40707 -3.31442,13.66355 -3.31442,13.66355 z"
+         style="fill:#000000;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0"
+         id="path3768"
+         d="m 291.74698,236.36722 c 0,0 -1.36535,-0.56172 -0.0701,-3.22296 1.29528,-2.66125 3.72103,-1.62503 4.12138,-1.41306 -1.04349,0.50764 -3.37926,4.82292 -4.05132,4.63602 z"
+         style="fill:#000000;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3770"
+         d="m 278.60514,277.01718 c 0,0 -0.98806,-8.05217 1.36702,-17.09567 5.11868,-12.29479 -7.76345,3.61446 -1.36702,17.09567 z"
+         style="fill:#000000;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="ccc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3772"
+         d="m 283.64252,261.72126 c 0,-0.0431 -1.44898,3.96362 -0.80247,9.53246 0.42679,3.67631 0.64575,8.36037 1.90705,11.72782 3.10143,7.14376 -8.41694,-7.43352 -1.10458,-21.26028 z"
+         style="fill:#000000;stroke:#000000;stroke-width:0.11350404px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="cscc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3774"
+         d="m 318.12446,294.21149 c 0,0 6.68844,-4.71017 9.13772,-13.37686 -5.91279,4.63412 -6.77642,9.57974 -9.13772,13.37686 z"
+         style="fill:#000000;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="ccc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3778"
+         d="m 344.21877,231.00112 c 0,0 1.60041,9.36884 7.07841,21.7522 5.35526,12.10587 4.05178,-4.80879 -7.07841,-21.7522 z"
+         style="fill:#000000;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="csc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3780"
+         d="m 349.44951,230.90023 c -0.11119,-0.0477 0.96041,8.99393 4.75948,15.37263 1.48524,4.17497 3.73499,-6.08181 -4.75948,-15.37263 z"
+         style="fill:#000000;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="ccc" />
+    </g>
+  </g>
+</svg>
diff --git a/unpublishedScripts/marketplace/clap/icons/clap-i.svg b/unpublishedScripts/marketplace/clap/icons/clap-i.svg
new file mode 100644
index 0000000000..fbd9ed0f9c
--- /dev/null
+++ b/unpublishedScripts/marketplace/clap/icons/clap-i.svg
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="225pt"
+   height="225pt"
+   viewBox="0 0 79.374998 79.374998"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="clap-i.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8"
+     inkscape:cx="240.0566"
+     inkscape:cy="147.59313"
+     inkscape:document-units="mm"
+     inkscape:current-layer="g3790"
+     showgrid="false"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:pagecheckerboard="true"
+     units="pt" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-217.62501)">
+    <g
+       id="g3790"
+       transform="translate(-276.67857,-1.5119048)"
+       style="fill:#000000">
+      <path
+         sodipodi:nodetypes="ccscccsccscssscscsscsccc"
+         inkscape:connector-curvature="0"
+         id="path3764"
+         d="m 287.04656,288.04665 23.71378,9.0592 c 0,0 0.39967,-4.79605 4.5296,-6.92762 4.12992,-2.13158 7.40168,-15.99614 7.40168,-15.99614 l 2.5266,-9.92668 4.1934,-9.24819 c 0,0 -1.13082,-3.82467 -4.67519,-0.19524 -8.8408,9.05294 -3.51813,14.25651 -8.14833,14.16202 -3.77977,-0.75596 -0.13245,-10.86933 0.26722,-16.16497 0.26644,-3.06413 0.69941,-12.98928 0.29974,-18.85112 -0.39966,-5.86184 -0.93256,-6.66118 -2.66446,-6.52795 -1.73191,0.13322 -2.93093,0.93257 -4.39638,9.05919 -1.46546,8.12664 -3.33058,15.72038 -3.06414,18.91774 0.26644,3.19737 -4.36307,0.64443 -2.89762,-5.48385 1.46546,-6.12827 4.82299,-19.49577 4.95621,-21.36089 0.13322,-1.86512 -0.52548,-5.99423 -3.45641,-1.46464 -2.93091,4.52961 -8.39307,31.77464 -8.39307,31.77464 0,0 -4.61911,1.35544 4.75249,-29.62183 0.37058,-1.22492 -1.2231,-1.82036 -2.02245,-0.35491 -0.79933,1.46547 -2.93556,6.41177 -3.60169,9.47592 -0.66612,3.06413 -4.12526,18.76747 -5.99039,20.76582 -1.86514,1.99836 -0.77914,-1.64516 2.43172,-19.62594 -3.46015,-8.7099 -7.6029,16.6051 -8.29355,25.75422 -1.73191,11.05755 2.66446,14.65459 2.53124,22.78122 z"
+         style="fill:#ffffff;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccscsssccccccssc"
+         inkscape:connector-curvature="0"
+         id="path3766"
+         d="m 326.28601,276.79194 4.85752,2.59518 c 0,0 5.99506,0.26645 7.86018,1.19902 1.86513,0.93256 14.52136,-19.31742 14.52136,-19.31742 0,0 -1.59867,-0.39967 -3.19735,-5.32893 -1.59868,-4.92926 -7.59374,-19.98353 -9.45888,-23.44734 -1.86513,-3.46381 -2.53124,-4.66283 -3.4638,-7.46051 -0.93257,-2.7977 -2.13159,-5.0625 -3.73027,-0.13323 -1.59868,4.92927 -1.66343,10.45537 -0.46441,13.91919 1.38613,5.18454 3.8952,15.07683 1.97631,17.7369 -3.13067,-0.0635 -4.1718,-8.94257 -4.84078,-11.98701 l -10.45574,-8.48036 -1.15458,18.13553 c 0,0 3.30736,-4.0697 9.65298,-5.19422 4.51067,-0.79933 2.81751,6.4678 1.21188,14.09965 -1.34794,6.40707 -3.31442,13.66355 -3.31442,13.66355 z"
+         style="fill:#ffffff;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0"
+         id="path3768"
+         d="m 291.74698,236.36722 c 0,0 -1.36535,-0.56172 -0.0701,-3.22296 1.29528,-2.66125 3.72103,-1.62503 4.12138,-1.41306 -1.04349,0.50764 -3.37926,4.82292 -4.05132,4.63602 z"
+         style="fill:#ffffff;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3770"
+         d="m 278.60514,277.01718 c 0,0 -0.98806,-8.05217 1.36702,-17.09567 5.11868,-12.29479 -7.76345,3.61446 -1.36702,17.09567 z"
+         style="fill:#ffffff;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="ccc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3772"
+         d="m 283.64252,261.72126 c 0,-0.0431 -1.44898,3.96362 -0.80247,9.53246 0.42679,3.67631 0.64575,8.36037 1.90705,11.72782 3.10143,7.14376 -8.41694,-7.43352 -1.10458,-21.26028 z"
+         style="fill:#ffffff;stroke:#000000;stroke-width:0.11350404px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="cscc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3774"
+         d="m 318.12446,294.21149 c 0,0 6.68844,-4.71017 9.13772,-13.37686 -5.91279,4.63412 -6.77642,9.57974 -9.13772,13.37686 z"
+         style="fill:#ffffff;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="ccc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3778"
+         d="m 344.21877,231.00112 c 0,0 1.60041,9.36884 7.07841,21.7522 5.35526,12.10587 4.05178,-4.80879 -7.07841,-21.7522 z"
+         style="fill:#ffffff;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="csc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3780"
+         d="m 349.44951,230.90023 c -0.11119,-0.0477 0.96041,8.99393 4.75948,15.37263 1.48524,4.17497 3.73499,-6.08181 -4.75948,-15.37263 z"
+         style="fill:#ffffff;stroke:#000000;stroke-width:0.09325644px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="ccc" />
+    </g>
+  </g>
+</svg>
diff --git a/unpublishedScripts/marketplace/clap/scripts/ClapDebugger.js b/unpublishedScripts/marketplace/clap/scripts/ClapDebugger.js
new file mode 100644
index 0000000000..9e7a592c01
--- /dev/null
+++ b/unpublishedScripts/marketplace/clap/scripts/ClapDebugger.js
@@ -0,0 +1,144 @@
+"use strict";
+
+/*
+	clapApp.js
+	unpublishedScripts/marketplace/clap/scripts/clapDebugger.js
+
+	Created by Matti 'Menithal' Lahtinen on 9/11/2017
+	Copyright 2017 High Fidelity, Inc.
+
+	Distributed under the Apache License, Version 2.0.
+	See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+*/
+
+var DEBUG_RIGHT_HAND;
+var DEBUG_LEFT_HAND;
+var DEBUG_CLAP_LEFT;
+var DEBUG_CLAP_RIGHT;
+var DEBUG_CLAP;
+var DEBUG_CLAP_DIRECTION;
+
+// Debug Values:
+var DEBUG_CORRECT = {
+    red: 0,
+    green: 255,
+    blue: 0
+};
+var DEBUG_WRONG = {
+    red: 255,
+    green: 0,
+    blue: 0
+};
+
+var DEBUG_VOLUME = {
+    red: 255,
+    green: 255,
+    blue: 128
+};
+
+module.exports = {
+    disableDebug: function () {
+        Overlays.deleteOverlay(DEBUG_RIGHT_HAND);
+        Overlays.deleteOverlay(DEBUG_LEFT_HAND);
+        Overlays.deleteOverlay(DEBUG_CLAP_LEFT);
+        Overlays.deleteOverlay(DEBUG_CLAP_RIGHT);
+        Overlays.deleteOverlay(DEBUG_CLAP_DIRECTION);
+    },
+
+    debugPositions: function (leftAlignmentWorld, leftHandPositionOffset, leftHandDownWorld, rightAlignmentWorld, rightHandPositionOffset, rightHandDownWorld, tolerance) {
+
+        Overlays.editOverlay(DEBUG_CLAP_LEFT, {
+            color: leftAlignmentWorld > tolerance ? DEBUG_CORRECT : DEBUG_WRONG,
+            position: leftHandPositionOffset
+        });
+
+        Overlays.editOverlay(DEBUG_CLAP_RIGHT, {
+            color: rightAlignmentWorld > tolerance ? DEBUG_CORRECT : DEBUG_WRONG,
+            position: rightHandPositionOffset
+        });
+
+        Overlays.editOverlay(DEBUG_LEFT_HAND, {
+            color: leftAlignmentWorld > tolerance ? DEBUG_CORRECT : DEBUG_WRONG,
+            start: leftHandPositionOffset,
+            end: Vec3.sum(leftHandPositionOffset, Vec3.multiply(leftHandDownWorld, 0.2))
+        });
+
+        Overlays.editOverlay(DEBUG_RIGHT_HAND, {
+            color: rightAlignmentWorld > tolerance ? DEBUG_CORRECT : DEBUG_WRONG,
+            start: rightHandPositionOffset,
+            end: Vec3.sum(rightHandPositionOffset, Vec3.multiply(rightHandDownWorld, 0.2))
+        });
+    },
+
+    debugClapLine: function (start, end, visible) {
+        Overlays.editOverlay(DEBUG_CLAP_DIRECTION, {
+            start: start,
+            end: end,
+            visible: visible
+        });
+    },
+
+    enableDebug: function () {
+        DEBUG_RIGHT_HAND = Overlays.addOverlay("line3d", {
+            color: DEBUG_WRONG,
+            start: MyAvatar.position,
+            end: Vec3.sum(MyAvatar.position, {
+                x: 0,
+                y: 1,
+                z: 0
+            }),
+            dimensions: {
+                x: 2,
+                y: 2,
+                z: 2
+            }
+        });
+
+        DEBUG_LEFT_HAND = Overlays.addOverlay("line3d", {
+            color: DEBUG_WRONG,
+            start: MyAvatar.position,
+            end: Vec3.sum(MyAvatar.position, {
+                x: 0,
+                y: 1,
+                z: 0
+            }),
+            dimensions: {
+                x: 2,
+                y: 2,
+                z: 2
+            }
+        });
+
+        DEBUG_CLAP_LEFT = Overlays.addOverlay("sphere", {
+            position: MyAvatar.position,
+            color: DEBUG_WRONG,
+            scale: {
+                x: 0.05,
+                y: 0.05,
+                z: 0.05
+            }
+        });
+
+        DEBUG_CLAP_RIGHT = Overlays.addOverlay("sphere", {
+            position: MyAvatar.position,
+            color: DEBUG_WRONG,
+            scale: {
+                x: 0.05,
+                y: 0.05,
+                z: 0.05
+            }
+        });
+
+
+        DEBUG_CLAP_DIRECTION = Overlays.addOverlay("line3d", {
+            color: DEBUG_VOLUME,
+            start: MyAvatar.position,
+            end: MyAvatar.position,
+            dimensions: {
+                x: 2,
+                y: 2,
+                z: 2
+            }
+        });
+    }
+};
diff --git a/unpublishedScripts/marketplace/clap/scripts/ClapEngine.js b/unpublishedScripts/marketplace/clap/scripts/ClapEngine.js
new file mode 100644
index 0000000000..1a5f6665e1
--- /dev/null
+++ b/unpublishedScripts/marketplace/clap/scripts/ClapEngine.js
@@ -0,0 +1,313 @@
+"use strict";
+
+/*
+	clapEngine.js
+	unpublishedScripts/marketplace/clap/clapApp.js
+
+	Created by Matti 'Menithal' Lahtinen on 9/11/2017
+	Copyright 2017 High Fidelity, Inc.
+
+	Distributed under the Apache License, Version 2.0.
+	See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+
+
+  Main Heart of the clap script> Does both keyboard binding and tracking of the gear..
+
+*/
+var DEG_TO_RAD = Math.PI / 180;
+// If angle is closer to 0 from 25 degrees, then "clap" can happen;
+var COS_OF_TOLERANCE = Math.cos(25 * DEG_TO_RAD);
+var DISTANCE = 0.3;
+var CONTROL_MAP_PACKAGE = "com.highfidelity.avatar.clap.active";
+
+var CLAP_MENU = "Clap";
+var ENABLE_PARTICLE_MENU = "Enable Clap Particles";
+var ENABLE_DEBUG_MENU = "Enable Claping Helper";
+
+var sounds = [
+    "clap1.wav",
+    "clap2.wav",
+    "clap3.wav",
+    "clap4.wav",
+    "clap5.wav",
+    "clap6.wav"
+];
+
+
+var ClapParticle = Script.require(Script.resolvePath("../entities/ClapParticle.json?V3"));
+var ClapAnimation = Script.require(Script.resolvePath("../animations/ClapAnimation.json?V3"));
+var ClapDebugger = Script.require(Script.resolvePath("ClapDebugger.js?V3"));
+
+var settingDebug = false;
+var settingParticlesOn = true;
+
+function setJointRotation(map) {
+    Object.keys(map).forEach(function (key, index) {
+        MyAvatar.setJointRotation(MyAvatar.getJointIndex(key), map[key].rotations);
+    });
+}
+// Load Sounds to Cache
+var cache = [];
+for (var index in sounds) {
+    cache.push(SoundCache.getSound(Script.resolvePath("../sounds/" + sounds[index])));
+}
+
+
+var previousIndex;
+var clapOn = false;
+var animClap = false;
+var animThrottle;
+
+function clap(volume, position, rotation) {
+    var index;
+    // Make sure one does not generate consequtive sounds
+    do {
+        index = Math.floor(Math.random() * cache.length);
+    } while (index === previousIndex);
+
+    previousIndex = index;
+
+    Audio.playSound(cache[index], {
+        position: position,
+        volume: volume / 4 + Math.random() * (volume / 3)
+    });
+
+    if (settingParticlesOn) {
+        ClapParticle.orientation = Quat.multiply(MyAvatar.orientation, rotation);
+        ClapParticle.position = position;
+        ClapParticle.emitSpeed = volume > 1 ? 1 : volume;
+        Entities.addEntity(ClapParticle, true);
+    }
+
+
+}
+// Helper Functions
+function getHandFingerAnim(side) {
+    return Script.resolvePath("../animations/Clap_" + side + '.fbx');
+}
+
+// Disable all role animations related to fingers for side
+function overrideFingerRoleAnimation(side) {
+    var anim = getHandFingerAnim(side);
+    MyAvatar.overrideRoleAnimation(side + "HandGraspOpen", anim, 30, true, 0, 0);
+    MyAvatar.overrideRoleAnimation(side + "HandGraspClosed", anim, 30, true, 0, 0);
+    if (HMD.active) {
+        MyAvatar.overrideRoleAnimation(side + "HandPointIntro", anim, 30, true, 0, 0);
+        MyAvatar.overrideRoleAnimation(side + "HandPointHold", anim, 30, true, 0, 0);
+        MyAvatar.overrideRoleAnimation(side + "HandPointOutro", anim, 30, true, 0, 0);
+
+        MyAvatar.overrideRoleAnimation(side + "IndexPointOpen", anim, 30, true, 0, 0);
+        MyAvatar.overrideRoleAnimation(side + "IndexPointClosed", anim, 30, true, 0, 0);
+        MyAvatar.overrideRoleAnimation(side + "IndexPointAndThumbRaiseOpen", anim, 30, true, 0, 0);
+        MyAvatar.overrideRoleAnimation(side + "IndexPointAndThumbRaiseClosed", anim, 30, true, 0, 0);
+
+        MyAvatar.overrideRoleAnimation(side + "ThumbRaiseOpen", anim, 30, true, 0, 0);
+        MyAvatar.overrideRoleAnimation(side + "ThumbRaiseClosed", anim, 30, true, 0, 0);
+    }
+}
+// Re-enable all role animations for fingers
+function restoreFingerRoleAnimation(side) {
+    MyAvatar.restoreRoleAnimation(side + "HandGraspOpen");
+    MyAvatar.restoreRoleAnimation(side + "HandGraspClosed");
+    if (HMD.active) {
+        MyAvatar.restoreRoleAnimation(side + "HandPointIntro");
+        MyAvatar.restoreRoleAnimation(side + "HandPointHold");
+        MyAvatar.restoreRoleAnimation(side + "HandPointOutro");
+        MyAvatar.restoreRoleAnimation(side + "IndexPointOpen");
+
+        MyAvatar.restoreRoleAnimation(side + "IndexPointClosed");
+        MyAvatar.restoreRoleAnimation(side + "IndexPointAndThumbRaiseOpen");
+        MyAvatar.restoreRoleAnimation(side + "IndexPointAndThumbRaiseClosed");
+        MyAvatar.restoreRoleAnimation(side + "ThumbRaiseOpen");
+        MyAvatar.restoreRoleAnimation(side + "ThumbRaiseClosed");
+    }
+}
+
+
+function menuListener(menuItem) {
+    if (menuItem === ENABLE_PARTICLE_MENU) {
+        settingParticlesOn = Menu.isOptionChecked(ENABLE_PARTICLE_MENU);
+    } else if (menuItem === ENABLE_DEBUG_MENU) {
+        var debugOn = Menu.isOptionChecked(ENABLE_DEBUG_MENU);
+
+        if (debugOn) {
+            settingDebug = true;
+            ClapDebugger.enableDebug();
+        } else {
+            settingDebug = false;
+            ClapDebugger.disableDebug();
+        }
+    }
+}
+
+function update(dt) {
+
+    // NOTICE: Someof this stuff is unnessary for the actual: But they are done for Debug Purposes!
+    // Forexample, the controller doesnt really need to know where it is in the world, only its relation to the other controller!
+
+    var leftHand = Controller.getPoseValue(Controller.Standard.LeftHand);
+    var rightHand = Controller.getPoseValue(Controller.Standard.RightHand);
+
+    // Get Offset position for palms, not the controllers that are at the wrists (7.5 cm up)
+
+    var leftWorldRotation = Quat.multiply(MyAvatar.orientation, leftHand.rotation);
+    var rightWorldRotation = Quat.multiply(MyAvatar.orientation, rightHand.rotation);
+
+    var leftWorldUpNormal = Quat.getUp(leftWorldRotation);
+    var rightWorldUpNormal = Quat.getUp(rightWorldRotation);
+
+    var leftHandDownWorld = Vec3.multiply(-1, Quat.getForward(leftWorldRotation));
+    var rightHandDownWorld = Vec3.multiply(-1, Quat.getForward(rightWorldRotation));
+
+    //
+    var leftHandWorldPosition = Vec3.sum(MyAvatar.position, Vec3.multiplyQbyV(MyAvatar.orientation, leftHand.translation));
+    var rightHandWorldPosition = Vec3.sum(MyAvatar.position, Vec3.multiplyQbyV(MyAvatar.orientation, rightHand.translation));
+
+    var rightHandPositionOffset = Vec3.sum(rightHandWorldPosition, Vec3.multiply(rightWorldUpNormal, 0.035));
+    var leftHandPositionOffset = Vec3.sum(leftHandWorldPosition, Vec3.multiply(leftWorldUpNormal, 0.035));
+
+    var leftToRightWorld = Vec3.subtract(leftHandPositionOffset, rightHandPositionOffset);
+    var rightToLeftWorld = Vec3.subtract(rightHandPositionOffset, leftHandPositionOffset);
+
+    var leftAlignmentWorld = -1 * Vec3.dot(Vec3.normalize(leftToRightWorld), leftHandDownWorld);
+    var rightAlignmentWorld = -1 * Vec3.dot(Vec3.normalize(rightToLeftWorld), rightHandDownWorld);
+
+    var distance = Vec3.distance(rightHandPositionOffset, leftHandPositionOffset);
+
+    var matchTolerance = leftAlignmentWorld > COS_OF_TOLERANCE && rightAlignmentWorld > COS_OF_TOLERANCE;
+
+    if (settingDebug) {
+        ClapDebugger.debugPositions(leftAlignmentWorld,
+            leftHandPositionOffset, leftHandDownWorld,
+            rightAlignmentWorld, rightHandPositionOffset,
+            rightHandDownWorld, COS_OF_TOLERANCE);
+    }
+    // Using subtract, because these will be heading to opposite directions
+    var angularVelocity = Vec3.length(Vec3.subtract(leftHand.angularVelocity, rightHand.angularVelocity));
+    var velocity = Vec3.length(Vec3.subtract(leftHand.velocity, rightHand.velocity));
+
+    if (matchTolerance && distance < DISTANCE && !animClap) {
+        if (settingDebug) {
+            ClapDebugger.debugClapLine(leftHandPositionOffset, rightHandPositionOffset, true);
+        }
+        if (!animThrottle) {
+            overrideFingerRoleAnimation("left");
+            overrideFingerRoleAnimation("right");
+            animClap = true;
+        } else {
+            Script.clearTimeout(animThrottle);
+            animThrottle = false;
+        }
+    } else if (animClap && distance > DISTANCE) {
+        if (settingDebug) {
+            ClapDebugger.debugClapLine(leftHandPositionOffset, rightHandPositionOffset, false);
+        }
+        animThrottle = Script.setTimeout(function () {
+            restoreFingerRoleAnimation("left");
+            restoreFingerRoleAnimation("right");
+            animClap = false;
+        }, 500);
+    }
+
+    if (distance < DISTANCE && matchTolerance && !clapOn) {
+        clapOn = true;
+
+        var midClap = Vec3.mix(rightHandPositionOffset, leftHandPositionOffset, 0.5);
+        var volume = velocity / 2 + angularVelocity / 5;
+
+        clap(volume, midClap, Quat.lookAtSimple(rightHandPositionOffset, leftHandPositionOffset));
+    } else if (distance > DISTANCE && !matchTolerance) {
+        clapOn = false;
+    }
+}
+
+
+module.exports = {
+    connectEngine: function () {
+        if (!Menu.menuExists(CLAP_MENU)) {
+            Menu.addMenu(CLAP_MENU);
+        }
+
+        if (!Menu.menuItemExists(CLAP_MENU, ENABLE_PARTICLE_MENU)) {
+            Menu.addMenuItem({
+                menuName: CLAP_MENU,
+                menuItemName: ENABLE_PARTICLE_MENU,
+                isCheckable: true,
+                isChecked: settingParticlesOn
+            });
+        }
+        if (!Menu.menuItemExists(CLAP_MENU, ENABLE_DEBUG_MENU)) {
+            Menu.addMenuItem({
+                menuName: CLAP_MENU,
+                menuItemName: ENABLE_DEBUG_MENU,
+                isCheckable: true,
+                isChecked: settingDebug
+            });
+        }
+
+
+        Menu.menuItemEvent.connect(menuListener);
+
+        var controls = Controller.newMapping(CONTROL_MAP_PACKAGE);
+        var Keyboard = Controller.Hardware.Keyboard;
+
+        controls.from(Keyboard.K).to(function (down) {
+            if (down) {
+
+                setJointRotation(ClapAnimation);
+                Script.setTimeout(function () {
+                    // As soon as an animation bug is fixed, this will kick  and get fixed.s.
+                    overrideFingerRoleAnimation("left");
+                    overrideFingerRoleAnimation("right");
+
+                    var lh = MyAvatar.getJointPosition("LeftHand");
+                    var rh = MyAvatar.getJointPosition("RightHand");
+                    var midClap = Vec3.mix(rh, lh, 0.5);
+                    var volume = 0.5 + Math.random() * 0.5;
+                    var position = midClap;
+
+                    clap(volume, position, Quat.fromVec3Degrees(0, 0, 0));
+                }, 50); // delay is present to allow for frames to catch up.
+            } else {
+
+                restoreFingerRoleAnimation("left");
+
+                restoreFingerRoleAnimation("right");
+                MyAvatar.clearJointsData();
+            }
+        });
+        Controller.enableMapping(CONTROL_MAP_PACKAGE);
+
+        if (settingDebug) {
+            ClapDebugger.enableDebug();
+        }
+
+        Script.update.connect(update);
+
+        Script.scriptEnding.connect(this.disconnectEngine);
+    },
+    disconnectEngine: function () {
+        if (settingDebug) {
+            ClapDebugger.disableDebug();
+        }
+        if (Menu.menuItemExists(CLAP_MENU, ENABLE_PARTICLE_MENU)) {
+            Menu.removeMenuItem(CLAP_MENU, ENABLE_PARTICLE_MENU);
+        }
+        if (Menu.menuItemExists(CLAP_MENU, ENABLE_DEBUG_MENU)) {
+            Menu.removeMenuItem(CLAP_MENU, ENABLE_DEBUG_MENU);
+        }
+
+        if (Menu.menuExists(CLAP_MENU)) {
+            Menu.removeMenu(CLAP_MENU);
+        }
+        restoreFingerRoleAnimation('left');
+        restoreFingerRoleAnimation('right');
+
+        Controller.disableMapping(CONTROL_MAP_PACKAGE);
+        try {
+            Script.update.disconnect(update);
+        } catch (e) {
+            print("Script.update connection did not exist on disconnection. Skipping");
+        }
+    }
+};
diff --git a/unpublishedScripts/marketplace/clap/sounds/clap1.wav b/unpublishedScripts/marketplace/clap/sounds/clap1.wav
new file mode 100644
index 0000000000..679cb7e732
Binary files /dev/null and b/unpublishedScripts/marketplace/clap/sounds/clap1.wav differ
diff --git a/unpublishedScripts/marketplace/clap/sounds/clap2.wav b/unpublishedScripts/marketplace/clap/sounds/clap2.wav
new file mode 100644
index 0000000000..b43c745e52
Binary files /dev/null and b/unpublishedScripts/marketplace/clap/sounds/clap2.wav differ
diff --git a/unpublishedScripts/marketplace/clap/sounds/clap3.wav b/unpublishedScripts/marketplace/clap/sounds/clap3.wav
new file mode 100644
index 0000000000..47a4a8d48f
Binary files /dev/null and b/unpublishedScripts/marketplace/clap/sounds/clap3.wav differ
diff --git a/unpublishedScripts/marketplace/clap/sounds/clap4.wav b/unpublishedScripts/marketplace/clap/sounds/clap4.wav
new file mode 100644
index 0000000000..4e8dfca1a0
Binary files /dev/null and b/unpublishedScripts/marketplace/clap/sounds/clap4.wav differ
diff --git a/unpublishedScripts/marketplace/clap/sounds/clap5.wav b/unpublishedScripts/marketplace/clap/sounds/clap5.wav
new file mode 100644
index 0000000000..1f38864db4
Binary files /dev/null and b/unpublishedScripts/marketplace/clap/sounds/clap5.wav differ
diff --git a/unpublishedScripts/marketplace/clap/sounds/clap6.wav b/unpublishedScripts/marketplace/clap/sounds/clap6.wav
new file mode 100644
index 0000000000..4591f79d9d
Binary files /dev/null and b/unpublishedScripts/marketplace/clap/sounds/clap6.wav differ
diff --git a/unpublishedScripts/marketplace/dart/createDart.js b/unpublishedScripts/marketplace/dart/createDart.js
new file mode 100644
index 0000000000..ff13a695a8
--- /dev/null
+++ b/unpublishedScripts/marketplace/dart/createDart.js
@@ -0,0 +1,91 @@
+"use strict";
+//
+// createDart.js
+//
+// Created by MrRoboman on 17/05/04
+// Copyright 2017 High Fidelity, Inc.
+//
+// Creates five throwing darts.
+//
+// Distributed under the Apache License, Version 2.0.
+// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+
+var MODEL_URL = "https://hifi-content.s3.amazonaws.com/wadewatts/dart.fbx";
+var SCRIPT_URL = Script.resolvePath("./dart.js?v=" + Date.now());
+var START_POSITION = Vec3.sum(MyAvatar.position, Vec3.multiply(Quat.getFront(MyAvatar.orientation), 0.75));
+var START_ROTATION = MyAvatar.orientation
+var SCALE_FACTOR = 1;
+
+var dart = {
+    type: "Model",
+    shapeType: "box",
+    name: "Dart",
+    description: "Throw it at something!",
+    script: SCRIPT_URL,
+    modelURL: MODEL_URL,
+    position: START_POSITION,
+    rotation: START_ROTATION,
+    lifetime: 300,
+    gravity: {
+        x: 0,
+        y: -9.8,
+        z: 0
+    },
+    dimensions: {
+        x: 0.1,
+        y: 0.1,
+        z: 0.3
+    },
+    dynamic: true,
+    owningAvatarID: MyAvatar.sessionUUID,
+    userData: JSON.stringify({
+        grabbableKey: {
+            grabbable: true,
+            invertSolidWhileHeld: true,
+            ignoreIK: false
+        }
+    })
+};
+
+var avatarUp = Quat.getUp(MyAvatar.orientation);
+var platformPosition = Vec3.sum(START_POSITION, Vec3.multiply(avatarUp, -0.05));
+var platform = {
+    type: "Box",
+    name: "Dart Platform",
+    description: "Holds darts",
+    position: platformPosition,
+    rotation: START_ROTATION,
+    lifetime: 60,
+    dimensions: {
+        x: 0.15 * 5,
+        y: 0.01,
+        z: 0.3
+    },
+    color: {
+        red: 129,
+        green: 92,
+        blue: 11
+    },
+    owningAvatarID: MyAvatar.sessionUUID,
+    userData: JSON.stringify({
+        grabbableKey: {
+            grabbable: true,
+            invertSolidWhileHeld: true,
+            ignoreIK: false
+        }
+    })
+};
+
+
+Entities.addEntity(platform);
+
+var dartCount = 5;
+var avatarRight = Quat.getRight(MyAvatar.orientation);
+for (var i = 0; i < dartCount; i++) {
+    var j = i - Math.floor(dartCount / 2);
+    var position = Vec3.sum(START_POSITION, Vec3.multiply(avatarRight, 0.15 * j));
+    dart.position = position;
+    Entities.addEntity(dart);
+}
+
+Script.stop();
diff --git a/unpublishedScripts/marketplace/dart/dart.js b/unpublishedScripts/marketplace/dart/dart.js
new file mode 100644
index 0000000000..9debe910e3
--- /dev/null
+++ b/unpublishedScripts/marketplace/dart/dart.js
@@ -0,0 +1,81 @@
+"use strict";
+//
+// dart.js
+//
+// Created by MrRoboman on 17/05/13
+// Copyright 2017 High Fidelity, Inc.
+//
+// Simple throwing dart. Sticks to static objects.
+//
+// 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 THROW_FACTOR = 3;
+    var DART_SOUND_URL = Script.resolvePath('https://hifi-content.s3.amazonaws.com/wadewatts/dart.wav?v=' + Date.now());
+
+    var Dart = function() {};
+
+    Dart.prototype = {
+
+        preload: function(entityID) {
+            this.entityID = entityID;
+            this.actionID = null;
+            this.soundHasPlayed = true;
+            this.dartSound = SoundCache.getSound(DART_SOUND_URL);
+        },
+
+        playDartSound: function(sound) {
+            if (this.soundHasPlayed) {
+                return;
+            }
+            this.soundHasPlayed = true;
+            var position = Entities.getEntityProperties(this.entityID, 'position').position;
+            var audioProperties = {
+                volume: 0.15,
+                position: position
+            };
+            Audio.playSound(this.dartSound, audioProperties);
+        },
+
+        releaseGrab: function() {
+            this.soundHasPlayed = false;
+            var velocity = Entities.getEntityProperties(this.entityID, 'velocity').velocity;
+
+            var newVelocity = {};
+            Object.keys(velocity).forEach(function(key) {
+                newVelocity[key] = velocity[key] * THROW_FACTOR;
+            });
+
+            Entities.editEntity(this.entityID, {
+                velocity: newVelocity
+            });
+
+            if (this.actionID) {
+                Entities.deleteAction(this.entityID, this.actionID);
+            }
+            this.actionID = Entities.addAction("travel-oriented", this.entityID, {
+                forward: { x: 0, y: 0, z: 1 },
+                angularTimeScale: 0.1,
+                tag: "throwing dart",
+                ttl: 3600
+            });
+        },
+
+        collisionWithEntity: function(myID, otherID, collisionInfo) {
+            this.playDartSound();
+
+            Entities.editEntity(myID, {
+                velocity: {x: 0, y: 0, z: 0},
+                angularVelocity: {x: 0, y: 0, z: 0}
+            });
+
+            if (this.actionID) {
+                Entities.deleteAction(myID, this.actionID);
+                this.actionID = null;
+            }
+        }
+    };
+
+    return new Dart();
+});
diff --git a/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js b/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js
new file mode 100644
index 0000000000..6afb82770f
--- /dev/null
+++ b/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js
@@ -0,0 +1,168 @@
+(function () {
+
+    var FORCE_DROP_CHANNEL = "Hifi-Hand-Drop";
+
+    var proxInterval,
+        proxTimeout;
+
+    var _entityID;
+    this.preload = function (entityID) {
+        _entityID = entityID;
+
+        Entities.editEntity(_entityID, {
+            userData: '{"grabbableKey": {"grabbable": true}'
+        });
+    };
+
+    var particleTrailEntity = null;
+
+    function particleTrail() {
+
+        var props = {
+            type: 'ParticleEffect',
+            name: 'Particle',
+            parentID: _entityID,
+            isEmitting: true,
+            lifespan: 2.0,
+            maxParticles: 100,
+            textures: 'https://content.highfidelity.com/DomainContent/production/Particles/wispy-smoke.png',
+            emitRate: 50,
+            emitSpeed: 0,
+            emitterShouldTrail: true,
+            particleRadius: 0,
+            radiusSpread: 0,
+            radiusStart: .2,
+            radiusFinish: 0.1,
+            color: {
+                red: 201,
+                blue: 201,
+                green: 34
+            },
+            accelerationSpread: {
+                x: 0,
+                y: 0,
+                z: 0
+            },
+            alpha: 0,
+            alphaSpread: 0,
+            alphaStart: 1,
+            alphaFinish: 0,
+            polarStart: 0,
+            polarFinish: 0,
+            azimuthStart: -180,
+            azimuthFinish: 180
+        };
+
+        particleTrailEntity = Entities.addEntity(props);
+    }
+
+    function particleExplode() {
+        var entPos = Entities.getEntityProperties(_entityID, 'position').position;
+        var props = {
+            type: 'ParticleEffect',
+            name: 'Particle',
+            parentID: _entityID,
+            isEmitting: true,
+            lifespan: 2,
+            maxParticles: 10,
+            position: entPos,
+            textures: 'https://content.highfidelity.com/DomainContent/production/Particles/wispy-smoke.png',
+            emitRate: 1,
+            emitSpeed: 0,
+            emitterShouldTrail: false,
+            particleRadius: 1,
+            radiusSpread: 0,
+            radiusStart: 0,
+            radiusFinish: 1,
+            color: {
+                red: 232,
+                blue: 232,
+                green: 26
+            },
+            emitAcceleration: {
+                x: 0,
+                y: 0,
+                z: 0
+            },
+            alpha: 0,
+            alphaSpread: 0,
+            alphaStart: 1,
+            alphaFinish: .5,
+            polarStart: 0,
+            polarFinish: 0,
+            azimuthStart: -180,
+            azimuthFinish: 180
+        };
+        var explosionParticles = Entities.addEntity(props);
+        Entities.editEntity(_entityID, {
+            velocity: Vec3.ZERO,
+            dynamic: false
+        });
+        Script.setTimeout(function () {
+            Entities.deleteEntity(explosionParticles);
+            Entities.editEntity(_entityID, {
+                dynamic: true
+            })
+        }, 500);
+    }
+
+
+    function clearProxCheck() {
+        if (proxInterval) {
+            Script.clearInterval(proxInterval);
+            Entities.deleteEntity(particleTrailEntity);
+            particleTrailEntity = null;
+        }
+
+        if (proxTimeout) {
+            Script.clearTimeout(proxTimeout);
+        }
+    }
+
+    function proxCheck() {
+        var ballPos = Entities.getEntityProperties(_entityID, ['position']).position;
+        var isAnyAvatarInRange = AvatarList.isAvatarInRange(ballPos, 1);
+
+        if (isAnyAvatarInRange) {
+            clearProxCheck();
+            particleExplode();
+        }
+    }
+
+    this.startDistanceGrab = function (thisEntityID, triggerHandAndAvatarUUIDArray) {
+        clearProxCheck();
+        var triggerHand = triggerHandAndAvatarUUIDArray[0];
+        var avatarUUID = triggerHandAndAvatarUUIDArray[1];
+
+        var ballPos = Entities.getEntityProperties(_entityID, ['position']).position;
+        var MAX_DISTANCE_GRAB = 2; //meter
+
+        if (Vec3.distance(ballPos, AvatarList.getAvatar(avatarUUID).position) > MAX_DISTANCE_GRAB) {
+            Messages.sendMessage(FORCE_DROP_CHANNEL, triggerHand, true);
+        }
+
+    };
+    this.startNearGrab = function (thisEntityID, triggerHandAndAvatarUUIDArray) {
+        clearProxCheck();
+    };
+
+    this.releaseGrab = function (thisEntityID) {
+
+        if (particleTrailEntity === null) {
+            particleTrail();
+        }
+
+        Script.setTimeout(function () {
+            proxInterval = Script.setInterval(proxCheck, 50);
+        }, 200); // Setting a delay to give it time to leave initial avatar without proc.
+
+        proxTimeout = Script.setTimeout(function () {
+            clearProxCheck();
+        }, 10000)
+    };
+
+    this.collisionWithEntity = function (thisEntityID, collisionEntityID, collisionInfo) {
+        clearProxCheck();
+    };
+
+});
diff --git a/unpublishedScripts/marketplace/doppleganger-attachments/app-doppleganger-attachments.js b/unpublishedScripts/marketplace/doppleganger-attachments/app-doppleganger-attachments.js
index 4617cf47b6..c09ad602f8 100644
--- a/unpublishedScripts/marketplace/doppleganger-attachments/app-doppleganger-attachments.js
+++ b/unpublishedScripts/marketplace/doppleganger-attachments/app-doppleganger-attachments.js
@@ -9,21 +9,44 @@
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
+/* eslint-env commonjs */
+/* global DriveKeys, require:true, console */
+/* eslint-disable comma-dangle */
 
-var require = Script.require;
+// decomment next line for automatic require cache-busting
+// var require = function require(id) { return Script.require(id + '?'+new Date().getTime().toString(36)); };
+if (typeof require !== 'function') {
+    require = Script.require;
+}
 
+var VERSION = '0.0.0';
 var WANT_DEBUG = false;
+var DEBUG_MOVE_AS_YOU_MOVE = false;
+var ROTATE_AS_YOU_MOVE = false;
+
+log(VERSION);
 
 var DopplegangerClass = require('./doppleganger.js'),
     DopplegangerAttachments = require('./doppleganger-attachments.js'),
-    modelHelper = require('./model-helper.js').modelHelper;
+    DebugControls = require('./doppleganger-debug.js'),
+    modelHelper = require('./model-helper.js').modelHelper,
+    utils = require('./utils.js');
+
+// eslint-disable-next-line camelcase
+var isWebpack = typeof __webpack_require__ === 'function';
+
+var buttonConfig = utils.assign({
+    text: 'MIRROR',
+}, !isWebpack ? {
+    icon: Script.resolvePath('./doppleganger-i.svg'),
+    activeIcon: Script.resolvePath('./doppleganger-a.svg'),
+} : {
+    icon: require('./doppleganger-i.svg.json'),
+    activeIcon: require('./doppleganger-a.svg.json'),
+});
 
 var tablet = Tablet.getTablet('com.highfidelity.interface.tablet.system'),
-    button = tablet.addButton({
-        icon: Script.resolvePath('./doppleganger-i.svg'),
-        activeIcon: Script.resolvePath('./doppleganger-a.svg'),
-        text: 'MIRROR'
-    });
+    button = tablet.addButton(buttonConfig);
 
 Script.scriptEnding.connect(function() {
     tablet.removeButton(button);
@@ -65,6 +88,59 @@ var doppleganger = new DopplegangerClass({
     }
 }
 
+// add support for "move as you move"
+{
+    var movementKeys = 'W,A,S,D,Up,Down,Right,Left'.split(',');
+    var controllerKeys = 'LX,LY,RY'.split(',');
+    var translationKeys = Object.keys(DriveKeys).filter(function(p) {
+        return /translate/i.test(p);
+    });
+    var startingPosition;
+
+    // returns an array of any active driving keys (eg: ['W', 'TRANSLATE_Z'])
+    function currentDrivers() {
+        return [].concat(
+            movementKeys.map(function(key) {
+                return Controller.getValue(Controller.Hardware.Keyboard[key]) && key;
+            })
+        ).concat(
+            controllerKeys.map(function(key) {
+                return Controller.getValue(Controller.Standard[key]) !== 0.0 && key;
+            })
+        ).concat(
+            translationKeys.map(function(key) {
+                return MyAvatar.getRawDriveKey(DriveKeys[key]) !== 0.0 && key;
+            })
+        ).filter(Boolean);
+    }
+
+    doppleganger.jointsUpdated.connect(function(objectID) {
+        var drivers = currentDrivers(),
+            isDriving = drivers.length > 0;
+        if (isDriving) {
+            if (startingPosition) {
+                debugPrint('resetting startingPosition since drivers == ', drivers.join('|'));
+                startingPosition = null;
+            }
+        } else if (HMD.active || DEBUG_MOVE_AS_YOU_MOVE) {
+            startingPosition = startingPosition || MyAvatar.position;
+            var movement = Vec3.subtract(MyAvatar.position, startingPosition);
+            startingPosition = MyAvatar.position;
+            // Vec3.length(movement) > 0.0001 && Vec3.print('+avatarMovement', movement);
+
+            // "mirror" the relative translation vector
+            movement.x *= -1;
+            movement.z *= -1;
+            var props = {};
+            props.position = doppleganger.position = Vec3.sum(doppleganger.position, movement);
+            if (ROTATE_AS_YOU_MOVE) {
+                props.rotation = doppleganger.orientation = MyAvatar.orientation;
+            }
+            modelHelper.editObject(doppleganger.objectID, props);
+        }
+    });
+}
+
 // hide the doppleganger if this client script is unloaded
 Script.scriptEnding.connect(doppleganger, 'stop');
 
@@ -103,15 +179,21 @@ doppleganger.modelLoaded.connect(function(error, result) {
 
 // add debug indicators, but only if the user has configured the settings value
 if (Settings.getValue('debug.doppleganger', false)) {
-    WANT_DEBUG = true;
-    DopplegangerClass.addDebugControls(doppleganger);
+    WANT_DEBUG = WANT_DEBUG || true;
+    DopplegangerClass.WANT_DEBUG = WANT_DEBUG;
+    DopplegangerAttachments.WANT_DEBUG = WANT_DEBUG;
+    new DebugControls(doppleganger);
+}
+
+function log() {
+    // eslint-disable-next-line no-console
+    (typeof console === 'object' ? console.log : print)('app-doppleganger | ' + [].slice.call(arguments).join(' '));
 }
 
 function debugPrint() {
-    if (WANT_DEBUG) {
-        print('app-doppleganger | ' + [].slice.call(arguments).join(' '));
-    }
+    WANT_DEBUG && log.apply(this, arguments);
 }
+
 // ----------------------------------------------------------------------------
 
 UserActivityLogger.logAction('doppleganger_app_load');
diff --git a/unpublishedScripts/marketplace/doppleganger-attachments/dist/app-doppleganger-marketplace.js b/unpublishedScripts/marketplace/doppleganger-attachments/dist/app-doppleganger-marketplace.js
new file mode 100644
index 0000000000..bc5368ba5b
--- /dev/null
+++ b/unpublishedScripts/marketplace/doppleganger-attachments/dist/app-doppleganger-marketplace.js
@@ -0,0 +1,1514 @@
+/******/ (function(modules) { // webpackBootstrap
+/******/ 	// The module cache
+/******/ 	var installedModules = {};
+/******/
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+/******/
+/******/ 		// Check if module is in cache
+/******/ 		if(installedModules[moduleId]) {
+/******/ 			return installedModules[moduleId].exports;
+/******/ 		}
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = installedModules[moduleId] = {
+/******/ 			i: moduleId,
+/******/ 			l: false,
+/******/ 			exports: {}
+/******/ 		};
+/******/
+/******/ 		// Execute the module function
+/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+/******/
+/******/ 		// Flag the module as loaded
+/******/ 		module.l = true;
+/******/
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+/******/
+/******/
+/******/ 	// expose the modules object (__webpack_modules__)
+/******/ 	__webpack_require__.m = modules;
+/******/
+/******/ 	// expose the module cache
+/******/ 	__webpack_require__.c = installedModules;
+/******/
+/******/ 	// define getter function for harmony exports
+/******/ 	__webpack_require__.d = function(exports, name, getter) {
+/******/ 		if(!__webpack_require__.o(exports, name)) {
+/******/ 			Object.defineProperty(exports, name, {
+/******/ 				configurable: false,
+/******/ 				enumerable: true,
+/******/ 				get: getter
+/******/ 			});
+/******/ 		}
+/******/ 	};
+/******/
+/******/ 	// getDefaultExport function for compatibility with non-harmony modules
+/******/ 	__webpack_require__.n = function(module) {
+/******/ 		var getter = module && module.__esModule ?
+/******/ 			function getDefault() { return module['default']; } :
+/******/ 			function getModuleExports() { return module; };
+/******/ 		__webpack_require__.d(getter, 'a', getter);
+/******/ 		return getter;
+/******/ 	};
+/******/
+/******/ 	// Object.prototype.hasOwnProperty.call
+/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
+/******/
+/******/ 	// __webpack_public_path__
+/******/ 	__webpack_require__.p = "";
+/******/
+/******/ 	// Load entry module and return exports
+/******/ 	return __webpack_require__(__webpack_require__.s = 3);
+/******/ })
+/************************************************************************/
+/******/ ([
+/* 0 */
+/***/ (function(module, exports) {
+
+/* eslint-env commonjs */
+/* global console */
+
+module.exports = {
+    version: '0.0.1',
+    bind: bind,
+    signal: signal,
+    assign: assign,
+    assert: assert
+};
+
+function log() {
+    // eslint-disable-next-line no-console
+    (typeof console === 'object' ? console.log : print)('utils | ' + [].slice.call(arguments).join(' '));
+}
+log(module.exports.version);
+
+// @function - bind a function to a `this` context
+// @param {Object} - the `this` context
+// @param {Function|String} - function or method name
+// @param {value} varargs... - optional curry-right arguments (passed to method after any explicit arguments)
+function bind(thiz, method, varargs) {
+    method = thiz[method] || method;
+    varargs = [].slice.call(arguments, 2);
+    return function() {
+        var args = [].slice.call(arguments).concat(varargs);
+        return method.apply(thiz, args);
+    };
+}
+
+// @function - Qt signal polyfill
+function signal(template) {
+    var callbacks = [];
+    return Object.defineProperties(function() {
+        var args = [].slice.call(arguments);
+        callbacks.forEach(function(obj) {
+            obj.handler.apply(obj.scope, args);
+        });
+    }, {
+        connect: { value: function(scope, handler) {
+            var callback = {scope: scope, handler: scope[handler] || handler || scope};
+            if (!callback.handler || !callback.handler.apply) {
+                throw new Error('invalid arguments to connect:' + [template, scope, handler]);
+            }
+            callbacks.push({scope: scope, handler: scope[handler] || handler || scope});
+        }},
+        disconnect: { value: function(scope, handler) {
+            var match = {scope: scope, handler: scope[handler] || handler || scope};
+            callbacks = callbacks.filter(function(obj) {
+                return !(obj.scope === match.scope && obj.handler === match.handler);
+            });
+        }}
+    });
+}
+
+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/assign#Polyfill
+/* eslint-disable */
+function assign(target, varArgs) { // .length of function is 2
+    'use strict';
+    if (target == null) { // TypeError if undefined or null
+        throw new TypeError('Cannot convert undefined or null to object');
+    }
+
+    var to = Object(target);
+
+    for (var index = 1; index < arguments.length; index++) {
+        var nextSource = arguments[index];
+
+        if (nextSource != null) { // Skip over if undefined or null
+            for (var nextKey in nextSource) {
+                // Avoid bugs when hasOwnProperty is shadowed
+                if (Object.prototype.hasOwnProperty.call(nextSource, nextKey)) {
+                    to[nextKey] = nextSource[nextKey];
+                }
+            }
+        }
+    }
+    return to;
+}
+/* eslint-enable */
+// //https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/assign#Polyfill
+
+// examples:
+//     assert(function assertion() { return (conditions === true) }, 'assertion failed!')
+//     var neededValue = assert(idString, 'idString not specified!');
+//     assert(false, 'unexpected state');
+function assert(truthy, message) {
+    message = message || 'Assertion Failed:';
+
+    if (typeof truthy === 'function' && truthy.name === 'assertion') {
+        // extract function body to display with the assertion message
+        var assertion = (truthy+'').replace(/[\r\n]/g, ' ')
+            .replace(/^[^{]+\{|\}$|^\s*|\s*$/g, '').trim()
+            .replace(/^return /,'').replace(/\s[\r\n\t\s]+/g, ' ');
+        message += ' ' + JSON.stringify(assertion);
+        try {
+            truthy = truthy();
+        } catch (e) {
+            message += '(exception: ' + e +')';
+        }
+    }
+    if (!truthy) {
+        message += ' ('+truthy+')';
+        throw new Error(message);
+    }
+    return truthy;
+}
+
+
+/***/ }),
+/* 1 */
+/***/ (function(module, exports, __webpack_require__) {
+
+//  model-helper.js
+//
+//  Created by Timothy Dedischew on 06/01/2017.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+/* eslint-env commonjs */
+/* global console */
+// @module model-helper
+//
+// This module provides ModelReadyWatcher (a helper class for knowing when a model becomes usable inworld) and
+// also initial plumbing helpers to eliminate unnecessary API differences when working with Model Overlays and
+// Model Entities at a high-level from scripting.
+
+var utils = __webpack_require__(0),
+    assert = utils.assert;
+
+module.exports = {
+    version: '0.0.1',
+    ModelReadyWatcher: ModelReadyWatcher
+};
+
+function log() {
+    // eslint-disable-next-line no-console
+    (typeof console === 'object' ? console.log : print)('model-helper | ' + [].slice.call(arguments).join(' '));
+}
+log(module.exports.version);
+
+var _objectDeleted = utils.signal(function objectDeleted(objectID){});
+// proxy for _objectDeleted that only binds deletion tracking if script actually connects to the unified signal
+var objectDeleted = utils.assign(function objectDeleted(objectID){}, {
+    connect: function() {
+        Overlays.overlayDeleted.connect(_objectDeleted);
+        // Entities.deletingEntity.connect(objectDeleted);
+        Script.scriptEnding.connect(function() {
+            Overlays.overlayDeleted.disconnect(_objectDeleted);
+            // Entities.deletingEntity.disconnect(objectDeleted);
+        });
+        // hereafter _objectDeleted.connect will be used instead
+        this.connect = utils.bind(_objectDeleted, 'connect');
+        return this.connect.apply(this, arguments);
+    },
+    disconnect: utils.bind(_objectDeleted, 'disconnect')
+});
+
+var modelHelper = module.exports.modelHelper = {
+    // Entity <-> Overlay property translations
+    _entityFromOverlay: {
+        modelURL: function url() {
+            return this.url;
+        },
+        dimensions: function dimensions() {
+            return Vec3.multiply(this.scale, this.naturalDimensions);
+        }
+    },
+    _overlayFromEntity: {
+        url: function modelURL() {
+            return this.modelURL;
+        },
+        scale: function scale() {
+            return this.dimensions && this.naturalDimensions && {
+                x: this.dimensions.x / this.naturalDimensions.x,
+                y: this.dimensions.y / this.naturalDimensions.y,
+                z: this.dimensions.z / this.naturalDimensions.z
+            };
+        }
+    },
+    objectDeleted: objectDeleted,
+    type: function(objectID) {
+        // TODO: support Model Entities (by detecting type from objectID, which is already possible)
+        return !Uuid.isNull(objectID) ? 'overlay' : null;
+    },
+    addObject: function(properties) {
+        var type = 'overlay'; // this.resolveType(properties)
+        switch (type) {
+            case 'overlay': return Overlays.addOverlay(properties.type, this.toOverlayProps(properties));
+        }
+        return false;
+    },
+    editObject: function(objectID, properties) {
+        switch (this.type(objectID)) {
+            case 'overlay': return Overlays.editOverlay(objectID, this.toOverlayProps(properties));
+        }
+        return false;
+    },
+    deleteObject: function(objectID) {
+        return this.type(objectID) === 'overlay' && Overlays.deleteOverlay(objectID);
+    },
+    getProperty: function(objectID, propertyName) {
+        return this.type(objectID) === 'overlay' && Overlays.getProperty(objectID, propertyName);
+    },
+    getProperties: function(objectID, filter) {
+        switch (this.type(objectID)) {
+            case 'overlay':
+                filter = Array.isArray(filter) ? filter : [
+                    'position', 'rotation', 'localPosition', 'localRotation', 'parentID',
+                    'parentJointIndex', 'scale', 'name', 'visible', 'type', 'url',
+                    'dimensions', 'naturalDimensions', 'grabbable'
+                ];
+                var properties = filter.reduce(function(out, propertyName) {
+                    out[propertyName] = Overlays.getProperty(objectID, propertyName);
+                    return out;
+                }, {});
+                return this.toEntityProps(properties);
+        }
+        return null;
+    },
+    // adapt Entity conventions to Overlay (eg: { modelURL: ... } -> { url: ... })
+    toOverlayProps: function(properties) {
+        var result = {};
+        for (var from in this._overlayFromEntity) {
+            var adapter = this._overlayFromEntity[from];
+            result[from] = adapter.call(properties, from, adapter.name);
+        }
+        return utils.assign(result, properties);
+    },
+    // adapt Overlay conventions to Entity (eg: { url: ... } -> { modelURL: ... })
+    toEntityProps: function(properties) {
+        var result = {};
+        for (var from in this._entityToOverlay) {
+            var adapter = this._entityToOverlay[from];
+            result[from] = adapter.call(properties, from, adapter.name);
+        }
+        return utils.assign(result, properties);
+    },
+    editObjects: function(updatedObjects) {
+        var objectIDs = Object.keys(updatedObjects),
+            type = this.type(objectIDs[0]);
+        switch (type) {
+            case 'overlay':
+                var translated = {};
+                for (var objectID in updatedObjects) {
+                    translated[objectID] = this.toOverlayProps(updatedObjects[objectID]);
+                }
+                return Overlays.editOverlays(translated);
+        }
+        return false;
+    },
+    getJointIndex: function(objectID, name) {
+        switch (this.type(objectID)) {
+            case 'overlay': return Overlays.getProperty(objectID, 'jointNames').indexOf(name);
+        }
+        return -1;
+    },
+    getJointNames: function(objectID) {
+        switch (this.type(objectID)) {
+            case 'overlay': return Overlays.getProperty(objectID, 'jointNames');
+        }
+        return [];
+    },
+    // @function - derives mirrored joint names from a list of regular joint names
+    // @param {Array} - list of joint names to mirror
+    // @return {Array} - list of mirrored joint names (note: entries for non-mirrored joints will be `undefined`)
+    deriveMirroredJointNames: function(jointNames) {
+        return jointNames.map(function(name, i) {
+            if (/Left/.test(name)) {
+                return name.replace('Left', 'Right');
+            }
+            if (/Right/.test(name)) {
+                return name.replace('Right', 'Left');
+            }
+            return undefined;
+        });
+    },
+    getJointPosition: function(objectID, index) {
+        switch (this.type(objectID)) {
+            case 'overlay': return Overlays.getProperty(objectID, 'jointPositions')[index];
+        }
+        return Vec3.ZERO;
+    },
+    getJointPositions: function(objectID) {
+        switch (this.type(objectID)) {
+            case 'overlay': return Overlays.getProperty(objectID, 'jointPositions');
+        }
+        return [];
+    },
+    getJointOrientation: function(objectID, index) {
+        switch (this.type(objectID)) {
+            case 'overlay': return Overlays.getProperty(objectID, 'jointOrientations')[index];
+        }
+        return Quat.normalize({});
+    },
+    getJointOrientations: function(objectID) {
+        switch (this.type(objectID)) {
+            case 'overlay': return Overlays.getProperty(objectID, 'jointOrientations');
+        }
+    },
+    getJointTranslation: function(objectID, index) {
+        switch (this.type(objectID)) {
+            case 'overlay': return Overlays.getProperty(objectID, 'jointTranslations')[index];
+        }
+        return Vec3.ZERO;
+    },
+    getJointTranslations: function(objectID) {
+        switch (this.type(objectID)) {
+            case 'overlay': return Overlays.getProperty(objectID, 'jointTranslations');
+        }
+        return [];
+    },
+    getJointRotation: function(objectID, index) {
+        switch (this.type(objectID)) {
+            case 'overlay': return Overlays.getProperty(objectID, 'jointRotations')[index];
+        }
+        return Quat.normalize({});
+    },
+    getJointRotations: function(objectID) {
+        switch (this.type(objectID)) {
+            case 'overlay': return Overlays.getProperty(objectID, 'jointRotations');
+        }
+        return [];
+    }
+}; // modelHelper
+
+
+// @property {PreconditionFunction} - indicates when the model's jointNames have become available
+ModelReadyWatcher.JOINTS = function(state) {
+    return Array.isArray(state.jointNames);
+};
+// @property {PreconditionFunction} - indicates when a model's naturalDimensions have become available
+ModelReadyWatcher.DIMENSIONS = function(state) {
+    return Vec3.length(state.naturalDimensions) > 0;
+};
+// @property {PreconditionFunction} - indicates when both a model's naturalDimensions and jointNames have become available
+ModelReadyWatcher.JOINTS_AND_DIMENSIONS = function(state) {
+    // eslint-disable-next-line new-cap
+    return ModelReadyWatcher.JOINTS(state) && ModelReadyWatcher.DIMENSIONS(state);
+};
+// @property {int} - interval used for continually rechecking model readiness, until ready or a timeout occurs
+ModelReadyWatcher.RECHECK_MS = 50;
+// @property {int} - default wait time before considering a model unready-able.
+ModelReadyWatcher.DEFAULT_TIMEOUT_SECS = 10;
+
+// @private @class - waits for model to become usable inworld and tracks errors/timeouts
+// @param [Object} options -- key/value config options:
+// @param {ModelResource} options.resource - a ModelCache prefetched resource to observe for determining load state
+// @param {Uuid} options.objectID - an inworld object to observe for determining readiness states
+// @param {Function} [options.precondition=ModelReadyWatcher.JOINTS] - the precondition used to determine if the model is usable
+// @param {int} [options.maxWaitSeconds=10] - max seconds to wait for the model to become usable, after which a timeout error is emitted
+// @return {ModelReadyWatcher}
+function ModelReadyWatcher(options) {
+    options = utils.assign({
+        precondition: ModelReadyWatcher.JOINTS,
+        maxWaitSeconds: ModelReadyWatcher.DEFAULT_TIMEOUT_SECS
+    }, options);
+
+    assert(!Uuid.isNull(options.objectID), 'Error: invalid options.objectID');
+    assert(options.resource && 'state' in options.resource, 'Error: invalid options.resource');
+    assert(typeof options.precondition === 'function', 'Error: invalid options.precondition');
+
+    utils.assign(this, {
+        resource: options.resource,
+        objectID: options.objectID,
+        precondition: options.precondition,
+
+        // @signal - emitted when the model becomes ready, or with the error that prevented it
+        modelReady: utils.signal(function modelReady(error, result){}),
+
+        // @public
+        ready: false, // tracks readiness state
+        jointNames: null, // populated with detected jointNames
+        naturalDimensions: null, // populated with detected naturalDimensions
+
+        _startTime: new Date,
+        _watchdogTimer: Script.setTimeout(utils.bind(this, function() {
+            this._watchdogTimer = null;
+        }), options.maxWaitSeconds * 1000),
+        _interval: Script.setInterval(utils.bind(this, '_waitUntilReady'), ModelReadyWatcher.RECHECK_MS)
+    });
+
+    this.modelReady.connect(this, function(error, result) {
+        this.ready = !error && result;
+    });
+}
+
+ModelReadyWatcher.prototype = {
+    contructor: ModelReadyWatcher,
+    // @public method -- cancels monitoring and (if model was not yet ready) emits an error
+    cancel: function() {
+        return this._stop() && !this.ready && this.modelReady('cancelled', null);
+    },
+    // stop pending timers
+    _stop: function() {
+        var stopped = 0;
+        if (this._watchdogTimer) {
+            Script.clearTimeout(this._watchdogTimer);
+            this._watchdogTimer = null;
+            stopped++;
+        }
+        if (this._interval) {
+            Script.clearInterval(this._interval);
+            this._interval = null;
+            stopped++;
+        }
+        return stopped;
+    },
+    // the monitoring thread func
+    _waitUntilReady: function() {
+        var error = null, result = null;
+        if (!this._watchdogTimer) {
+            error = this.precondition.name || 'timeout';
+        } else if (this.resource.state === Resource.State.FAILED) {
+            error = 'prefetch_failed';
+        } else if (this.resource.state === Resource.State.FINISHED) {
+            // in theory there will always be at least one "joint name" that represents the main submesh
+            var names = modelHelper.getJointNames(this.objectID);
+            if (Array.isArray(names) && names.length) {
+                this.jointNames = names;
+            }
+            var props = modelHelper.getProperties(this.objectID, ['naturalDimensions']);
+            if (props && props.naturalDimensions && Vec3.length(props.naturalDimensions)) {
+                this.naturalDimensions = props.naturalDimensions;
+            }
+            var state = {
+                resource: this.resource,
+                objectID: this.objectID,
+                waitTime: (new Date - this._startTime) / 1000,
+                jointNames: this.jointNames,
+                naturalDimensions: this.naturalDimensions
+            };
+            if (this.precondition(state)) {
+                result = state;
+            }
+        }
+        if (error || result !== null) {
+            this._stop();
+            this.modelReady(error, result);
+        }
+    }
+}; // ModelReadyWatcher.prototype
+
+
+/***/ }),
+/* 2 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+//  doppleganger.js
+//
+//  Created by Timothy Dedischew on 04/21/2017.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+/* eslint-env commonjs */
+/* global console */
+// @module doppleganger
+//
+// This module contains the `Doppleganger` class implementation for creating an inspectable replica of
+// an Avatar (as a model directly in front of and facing them).  Joint positions and rotations are copied
+// over in an update thread, so that the model automatically mirrors the Avatar's joint movements.
+// An Avatar can then for example walk around "themselves" and examine from the back, etc.
+//
+// This should be helpful for inspecting your own look and debugging avatars, etc.
+//
+// The doppleganger is created as an overlay so that others do not see it -- and this also allows for the
+// highest possible update rate when keeping joint data in sync.
+
+module.exports = Doppleganger;
+
+Doppleganger.version = '0.0.1a';
+log(Doppleganger.version);
+
+var _modelHelper = __webpack_require__(1),
+    modelHelper = _modelHelper.modelHelper,
+    ModelReadyWatcher = _modelHelper.ModelReadyWatcher,
+    utils = __webpack_require__(0);
+
+// @property {bool} - toggle verbose debug logging on/off
+Doppleganger.WANT_DEBUG = false;
+
+// @property {bool} - when set true, Script.update will be used instead of setInterval for syncing joint data
+Doppleganger.USE_SCRIPT_UPDATE = false;
+
+// @property {int} - the frame rate to target when using setInterval for joint updates
+Doppleganger.TARGET_FPS = 60;
+
+// @class Doppleganger - Creates a new instance of a Doppleganger.
+// @param {Avatar} [options.avatar=MyAvatar] - Avatar used to retrieve position and joint data.
+// @param {bool}   [options.mirrored=true]   - Apply "symmetric mirroring" of Left/Right joints.
+// @param {bool}   [options.autoUpdate=true] - Automatically sync joint data.
+function Doppleganger(options) {
+    this.options = options = options || {};
+    this.avatar = options.avatar || MyAvatar;
+    this.mirrored = 'mirrored' in options ? options.mirrored : true;
+    this.autoUpdate = 'autoUpdate' in options ? options.autoUpdate : true;
+
+    // @public
+    this.active = false; // whether doppleganger is currently being displayed/updated
+    this.objectID = null; // current doppleganger's Overlay or Entity id
+    this.frame = 0; // current joint update frame
+
+    // @signal - emitted when .active state changes
+    this.activeChanged = utils.signal(function(active, reason) {});
+    // @signal - emitted once model is either loaded or errors out
+    this.modelLoaded = utils.signal(function(error, result){});
+    // @signal - emitted each time the model's joint data has been synchronized
+    this.jointsUpdated = utils.signal(function(objectID){});
+}
+
+Doppleganger.prototype = {
+    // @public @method - toggles doppleganger on/off
+    toggle: function() {
+        if (this.active) {
+            debugPrint('toggling off');
+            this.stop();
+        } else {
+            debugPrint('toggling on');
+            this.start();
+        }
+        return this.active;
+    },
+
+    // @private @method - get an avatar's "absolute joint translations in object frame" as local translations
+    // @param {AvatarData} - avatar to read translations from
+    // @return {glm::vec3[]} - the adapted translations
+    _getLocalAvatarJointTranslations: function(avatar) {
+        // NOTE: avatar.getJointTranslations() seems to return meters and avatar.getJointTranslation(jointIndex) centimeters...
+        //  adapting meters -> centimeters on this side seems to fix the "scrunching into ball" problem (~Beta 54)
+        //  and perform slightly faster than calling getJointTranslation(jointIndex) N times.
+        const CENTIMETERS_PER_METER = 100.0;
+        function scaleToMeters(v) {
+            return Vec3.multiply(CENTIMETERS_PER_METER, v);
+        }
+        return avatar.getJointTranslations().map(scaleToMeters);
+    },
+
+    // @public @method - synchronize the joint data between Avatar / doppleganger
+    update: function() {
+        this.frame++;
+        try {
+            if (!this.objectID) {
+                throw new Error('!this.objectID');
+            }
+
+            if (this.avatar.skeletonModelURL !== this.skeletonModelURL) {
+                return this.stop('avatar_changed');
+            }
+
+            var rotations = this.avatar.getJointRotations();
+            var translations = this._getLocalAvatarJointTranslations(this.avatar);
+            var size = rotations.length;
+
+            // note: this mismatch can happen when the avatar's model is actively changing
+            if (size !== translations.length ||
+                (this.jointStateCount && size !== this.jointStateCount)) {
+                debugPrint('mismatched joint counts (avatar model likely changed)', size, translations.length, this.jointStateCount);
+                this.stop('avatar_changed_joints');
+                return;
+            }
+            this.jointStateCount = size;
+
+            if (this.mirrored) {
+                var mirroredIndexes = this.mirroredIndexes;
+                var outRotations = new Array(size);
+                var outTranslations = new Array(size);
+                for (var i=0; i < size; i++) {
+                    var index = mirroredIndexes[i];
+                    if (index < 0 || index === false) {
+                        index = i;
+                    }
+                    var rot = rotations[index];
+                    var trans = translations[index];
+                    trans.x *= -1;
+                    rot.y *= -1;
+                    rot.z *= -1;
+                    outRotations[i] = rot;
+                    outTranslations[i] = trans;
+                }
+                rotations = outRotations;
+                translations = outTranslations;
+            }
+            var jointUpdates = {
+                jointRotations: rotations,
+                jointTranslations: translations
+            };
+            modelHelper.editObject(this.objectID, jointUpdates);
+            this.jointsUpdated(this.objectID, jointUpdates);
+        } catch (e) {
+            log('.update error: '+ e, index, e.stack);
+            this.stop('update_error');
+            throw e;
+        }
+    },
+
+    // @public @method - show the doppleganger (and start the update thread, if options.autoUpdate was specified).
+    // @param {vec3} [options.position=(in front of avatar)] - starting position
+    // @param {quat} [options.orientation=avatar.orientation] - starting orientation
+    start: function(options) {
+        options = utils.assign(this.options, options);
+        if (this.objectID) {
+            log('start() called but object model already exists', this.objectID);
+            return;
+        }
+        var avatar = this.avatar;
+        if (!avatar.jointNames.length) {
+            return this.stop('joints_unavailable');
+        }
+
+        this.frame = 0;
+        var localPosition = Vec3.multiply(2, Quat.getForward(avatar.orientation));
+        this.position = options.position || Vec3.sum(avatar.position, localPosition);
+        this.orientation = options.orientation || avatar.orientation;
+        this.skeletonModelURL = avatar.skeletonModelURL;
+        this.scale = avatar.scale || 1.0;
+        this.jointStateCount = 0;
+        this.jointNames = avatar.jointNames;
+        this.type = options.type || 'overlay';
+        this.mirroredNames = modelHelper.deriveMirroredJointNames(this.jointNames);
+        this.mirroredIndexes = this.mirroredNames.map(function(name) {
+            return name ? avatar.getJointIndex(name) : false;
+        });
+
+        this.objectID = modelHelper.addObject({
+            type: this.type === 'overlay' ? 'model' : 'Model',
+            modelURL: this.skeletonModelURL,
+            position: this.position,
+            rotation: this.orientation,
+            scale: this.scale
+        });
+        Script.scriptEnding.connect(this, function() {
+            modelHelper.deleteObject(this.objectID);
+        });
+        debugPrint('doppleganger created; objectID =', this.objectID);
+
+        // trigger clean up (and stop updates) if the object gets deleted
+        this.onObjectDeleted = function(uuid) {
+            if (uuid === this.objectID) {
+                log('onObjectDeleted', uuid);
+                this.stop('object_deleted');
+            }
+        };
+        modelHelper.objectDeleted.connect(this, 'onObjectDeleted');
+
+        if ('onLoadComplete' in avatar) {
+            // stop the current doppleganger if Avatar loads a different model URL
+            this.onLoadComplete = function() {
+                if (avatar.skeletonModelURL !== this.skeletonModelURL) {
+                    this.stop('avatar_changed_load');
+                }
+            };
+            avatar.onLoadComplete.connect(this, 'onLoadComplete');
+        }
+
+        this.onModelLoaded = function(error, result) {
+            if (error) {
+                return this.stop(error);
+            }
+            debugPrint('model ('+modelHelper.type(this.objectID)+')' + ' is ready; # joints == ' + result.jointNames.length);
+            var naturalDimensions = this.naturalDimensions = modelHelper.getProperties(this.objectID, ['naturalDimensions']).naturalDimensions;
+            debugPrint('naturalDimensions:', JSON.stringify(naturalDimensions));
+            var props = { visible: true };
+            if (naturalDimensions) {
+                props.dimensions = this.dimensions = Vec3.multiply(this.scale, naturalDimensions);
+            }
+            debugPrint('scaledDimensions:', this.scale, JSON.stringify(props.dimensions));
+            modelHelper.editObject(this.objectID, props);
+            if (!options.position) {
+                this.syncVerticalPosition();
+            }
+            if (this.autoUpdate) {
+                this._createUpdateThread();
+            }
+        };
+
+        this._resource = ModelCache.prefetch(this.skeletonModelURL);
+        this._modelReadier = new ModelReadyWatcher({
+            resource: this._resource,
+            objectID: this.objectID
+        });
+        this._modelReadier.modelReady.connect(this, 'onModelLoaded');
+        this.activeChanged(this.active = true, 'start');
+    },
+
+    // @public @method - hide the doppleganger
+    // @param {String} [reason=stop] - the reason stop was called
+    stop: function(reason) {
+        reason = reason || 'stop';
+        if (this.onUpdate) {
+            Script.update.disconnect(this, 'onUpdate');
+            delete this.onUpdate;
+        }
+        if (this._interval) {
+            Script.clearInterval(this._interval);
+            this._interval = undefined;
+        }
+        if (this.onObjectDeleted) {
+            modelHelper.objectDeleted.disconnect(this, 'onObjectDeleted');
+            delete this.onObjectDeleted;
+        }
+        if (this.onLoadComplete) {
+            this.avatar.onLoadComplete.disconnect(this, 'onLoadComplete');
+            delete this.onLoadComplete;
+        }
+        if (this.onModelLoaded) {
+            this._modelReadier && this._modelReadier.modelReady.disconnect(this, 'onModelLoaded');
+            this._modelReadier = this.onModelLoaded = undefined;
+        }
+        if (this.objectID) {
+            modelHelper.deleteObject(this.objectID);
+            this.objectID = undefined;
+        }
+        if (this.active) {
+            this.activeChanged(this.active = false, reason);
+        } else if (reason) {
+            debugPrint('already stopped so not triggering another activeChanged; latest reason was:', reason);
+        }
+    },
+    // @public @method - Reposition the doppleganger so it sees "eye to eye" with the Avatar.
+    // @param {String} [byJointName=Hips] - the reference joint used to align the Doppleganger and Avatar
+    syncVerticalPosition: function(byJointName) {
+        byJointName = byJointName || 'Hips';
+        var positions = modelHelper.getJointPositions(this.objectID),
+            properties = modelHelper.getProperties(this.objectID),
+            dopplePosition = properties.position,
+            doppleJointIndex = modelHelper.getJointIndex(this.objectID, byJointName),// names.indexOf(byJointName),
+            doppleJointPosition = positions[doppleJointIndex];
+
+        debugPrint('........... doppleJointPosition', JSON.stringify({
+            byJointName: byJointName,
+            dopplePosition: dopplePosition,
+            doppleJointIndex: doppleJointIndex,
+            doppleJointPosition: doppleJointPosition,
+            properties: properties.type,
+            positions: positions[0]
+        },0,2));
+        var avatarPosition = this.avatar.position,
+            avatarJointIndex = this.avatar.getJointIndex(byJointName),
+            avatarJointPosition = this.avatar.getJointPosition(avatarJointIndex);
+
+        var offset = (avatarJointPosition.y - doppleJointPosition.y);
+        debugPrint('adjusting for offset', offset);
+        if (properties.type === 'model') {
+            dopplePosition.y = avatarPosition.y + offset;
+        } else {
+            dopplePosition.y = avatarPosition.y - offset;
+        }
+
+        this.position = dopplePosition;
+        modelHelper.editObject(this.objectID, { position: this.position });
+    },
+
+    // @private @method - creates the update thread to synchronize joint data
+    _createUpdateThread: function() {
+        if (Doppleganger.USE_SCRIPT_UPDATE) {
+            debugPrint('creating Script.update thread');
+            this.onUpdate = this.update;
+            Script.update.connect(this, 'onUpdate');
+        } else {
+            debugPrint('creating Script.setInterval thread @ ~', Doppleganger.TARGET_FPS +'fps');
+            var timeout = 1000 / Doppleganger.TARGET_FPS;
+            this._interval = Script.setInterval(utils.bind(this, 'update'), timeout);
+        }
+    }
+
+};
+
+// @function - debug logging
+function log() {
+    // eslint-disable-next-line no-console
+    (typeof console === 'object' ? console.log : print)('doppleganger | ' + [].slice.call(arguments).join(' '));
+}
+
+function debugPrint() {
+    Doppleganger.WANT_DEBUG && log.apply(this, arguments);
+}
+
+
+/***/ }),
+/* 3 */
+/***/ (function(module, exports, __webpack_require__) {
+
+//  doppleganger-app.js
+//
+//  Created by Timothy Dedischew on 04/21/2017.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  This Client script creates an instance of a Doppleganger that can be toggled on/off via tablet button.
+//  (for more info see doppleganger.js)
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+/* eslint-env commonjs */
+/* global DriveKeys, require:true, console */
+/* eslint-disable comma-dangle */
+
+// decomment next line for automatic require cache-busting
+// var require = function require(id) { return Script.require(id + '?'+new Date().getTime().toString(36)); };
+if (false) {
+    require = Script.require;
+}
+
+var VERSION = '0.0.0';
+var WANT_DEBUG = false;
+var DEBUG_MOVE_AS_YOU_MOVE = false;
+var ROTATE_AS_YOU_MOVE = false;
+
+log(VERSION);
+
+var DopplegangerClass = __webpack_require__(2),
+    DopplegangerAttachments = __webpack_require__(4),
+    DebugControls = __webpack_require__(5),
+    modelHelper = __webpack_require__(1).modelHelper,
+    utils = __webpack_require__(0);
+
+// eslint-disable-next-line camelcase
+var isWebpack = typeof __webpack_require__ === 'function';
+
+var buttonConfig = utils.assign({
+    text: 'MIRROR',
+}, !isWebpack ? {
+    icon: Script.resolvePath('./doppleganger-i.svg'),
+    activeIcon: Script.resolvePath('./doppleganger-a.svg'),
+} : {
+    icon: __webpack_require__(6),
+    activeIcon: __webpack_require__(7),
+});
+
+var tablet = Tablet.getTablet('com.highfidelity.interface.tablet.system'),
+    button = tablet.addButton(buttonConfig);
+
+Script.scriptEnding.connect(function() {
+    tablet.removeButton(button);
+    button = null;
+});
+
+var doppleganger = new DopplegangerClass({
+    avatar: MyAvatar,
+    mirrored: false,
+    autoUpdate: true,
+    type: 'overlay'
+});
+
+// add support for displaying regular (non-soft) attachments on the doppleganger
+{
+    var RECHECK_ATTACHMENT_MS = 1000;
+    var dopplegangerAttachments = new DopplegangerAttachments(doppleganger),
+        attachmentInterval = null,
+        lastHash = dopplegangerAttachments.getAttachmentsHash();
+
+    // monitor for attachment changes, but only when the doppleganger is active
+    doppleganger.activeChanged.connect(function(active, reason) {
+        if (attachmentInterval) {
+            Script.clearInterval(attachmentInterval);
+        }
+        if (active) {
+            attachmentInterval = Script.setInterval(checkAttachmentsHash, RECHECK_ATTACHMENT_MS);
+        } else {
+            attachmentInterval = null;
+        }
+    });
+    function checkAttachmentsHash() {
+        var currentHash = dopplegangerAttachments.getAttachmentsHash();
+        if (currentHash !== lastHash) {
+            lastHash = currentHash;
+            debugPrint('app-doppleganger | detect attachment change');
+            dopplegangerAttachments.refreshAttachments();
+        }
+    }
+}
+
+// add support for "move as you move"
+{
+    var movementKeys = 'W,A,S,D,Up,Down,Right,Left'.split(',');
+    var controllerKeys = 'LX,LY,RY'.split(',');
+    var translationKeys = Object.keys(DriveKeys).filter(function(p) {
+        return /translate/i.test(p);
+    });
+    var startingPosition;
+
+    // returns an array of any active driving keys (eg: ['W', 'TRANSLATE_Z'])
+    function currentDrivers() {
+        return [].concat(
+            movementKeys.map(function(key) {
+                return Controller.getValue(Controller.Hardware.Keyboard[key]) && key;
+            })
+        ).concat(
+            controllerKeys.map(function(key) {
+                return Controller.getValue(Controller.Standard[key]) !== 0.0 && key;
+            })
+        ).concat(
+            translationKeys.map(function(key) {
+                return MyAvatar.getRawDriveKey(DriveKeys[key]) !== 0.0 && key;
+            })
+        ).filter(Boolean);
+    }
+
+    doppleganger.jointsUpdated.connect(function(objectID) {
+        var drivers = currentDrivers(),
+            isDriving = drivers.length > 0;
+        if (isDriving) {
+            if (startingPosition) {
+                debugPrint('resetting startingPosition since drivers == ', drivers.join('|'));
+                startingPosition = null;
+            }
+        } else if (HMD.active || DEBUG_MOVE_AS_YOU_MOVE) {
+            startingPosition = startingPosition || MyAvatar.position;
+            var movement = Vec3.subtract(MyAvatar.position, startingPosition);
+            startingPosition = MyAvatar.position;
+            // Vec3.length(movement) > 0.0001 && Vec3.print('+avatarMovement', movement);
+
+            // "mirror" the relative translation vector
+            movement.x *= -1;
+            movement.z *= -1;
+            var props = {};
+            props.position = doppleganger.position = Vec3.sum(doppleganger.position, movement);
+            if (ROTATE_AS_YOU_MOVE) {
+                props.rotation = doppleganger.orientation = MyAvatar.orientation;
+            }
+            modelHelper.editObject(doppleganger.objectID, props);
+        }
+    });
+}
+
+// hide the doppleganger if this client script is unloaded
+Script.scriptEnding.connect(doppleganger, 'stop');
+
+// hide the doppleganger if the user switches domains (which might place them arbitrarily far away in world space)
+function onDomainChanged() {
+    if (doppleganger.active) {
+        doppleganger.stop('domain_changed');
+    }
+}
+Window.domainChanged.connect(onDomainChanged);
+Window.domainConnectionRefused.connect(onDomainChanged);
+Script.scriptEnding.connect(function() {
+    Window.domainChanged.disconnect(onDomainChanged);
+    Window.domainConnectionRefused.disconnect(onDomainChanged);
+});
+
+// toggle on/off via tablet button
+button.clicked.connect(doppleganger, 'toggle');
+
+// highlight tablet button based on current doppleganger state
+doppleganger.activeChanged.connect(function(active, reason) {
+    if (button) {
+        button.editProperties({ isActive: active });
+        debugPrint('doppleganger.activeChanged', active, reason);
+    }
+});
+
+// alert the user if there was an error applying their skeletonModelURL
+doppleganger.modelLoaded.connect(function(error, result) {
+    if (doppleganger.active && error) {
+        Window.alert('doppleganger | ' + error + '\n' + doppleganger.skeletonModelURL);
+    }
+});
+
+// ----------------------------------------------------------------------------
+
+// add debug indicators, but only if the user has configured the settings value
+if (Settings.getValue('debug.doppleganger', false)) {
+    WANT_DEBUG = WANT_DEBUG || true;
+    DopplegangerClass.WANT_DEBUG = WANT_DEBUG;
+    DopplegangerAttachments.WANT_DEBUG = WANT_DEBUG;
+    new DebugControls(doppleganger);
+}
+
+function log() {
+    // eslint-disable-next-line no-console
+    (typeof console === 'object' ? console.log : print)('app-doppleganger | ' + [].slice.call(arguments).join(' '));
+}
+
+function debugPrint() {
+    WANT_DEBUG && log.apply(this, arguments);
+}
+
+// ----------------------------------------------------------------------------
+
+UserActivityLogger.logAction('doppleganger_app_load');
+doppleganger.activeChanged.connect(function(active, reason) {
+    if (active) {
+        UserActivityLogger.logAction('doppleganger_enable');
+    } else {
+        if (reason === 'stop') {
+            // user intentionally toggled the doppleganger
+            UserActivityLogger.logAction('doppleganger_disable');
+        } else {
+            debugPrint('doppleganger stopped:', reason);
+            UserActivityLogger.logAction('doppleganger_autodisable', { reason: reason });
+        }
+    }
+});
+dopplegangerAttachments.attachmentsUpdated.connect(function(attachments) {
+    UserActivityLogger.logAction('doppleganger_attachments', { count: attachments.length });
+});
+
+
+
+/***/ }),
+/* 4 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/* eslint-env commonjs */
+/* eslint-disable comma-dangle */
+/* global console */
+
+// var require = function(id) { return Script.require(id + '?'+new Date().getTime().toString(36)); }
+module.exports = DopplegangerAttachments;
+
+DopplegangerAttachments.version = '0.0.1b';
+DopplegangerAttachments.WANT_DEBUG = false;
+
+var _modelHelper = __webpack_require__(1),
+    modelHelper = _modelHelper.modelHelper,
+    ModelReadyWatcher = _modelHelper.ModelReadyWatcher,
+    utils = __webpack_require__(0);
+
+function log() {
+    // eslint-disable-next-line no-console
+    (typeof console === 'object' ? console.log : print)('doppleganger-attachments | ' + [].slice.call(arguments).join(' '));
+}
+log(DopplegangerAttachments.version);
+
+function debugPrint() {
+    DopplegangerAttachments.WANT_DEBUG && log.apply(this, arguments);
+}
+
+function DopplegangerAttachments(doppleganger, options) {
+    utils.assign(this, {
+        _options: options,
+        doppleganger: doppleganger,
+        attachments: undefined,
+        manualJointSync: true,
+        attachmentsUpdated: utils.signal(function attachmentsUpdated(currentAttachments, previousAttachments){}),
+    });
+    this._initialize();
+    debugPrint('DopplegangerAttachments...', JSON.stringify(options));
+}
+DopplegangerAttachments.prototype = {
+    // "hash" the current attachments (so that changes can be detected)
+    getAttachmentsHash: function() {
+        return JSON.stringify(this.doppleganger.avatar.getAttachmentsVariant());
+    },
+    // create a pure Object copy of the current native attachments variant
+    _cloneAttachmentsVariant: function() {
+        return JSON.parse(JSON.stringify(this.doppleganger.avatar.getAttachmentsVariant()));
+    },
+    // fetch and resolve attachments to include jointIndex and other relevant $metadata
+    _getResolvedAttachments: function() {
+        var attachments = this._cloneAttachmentsVariant(),
+            objectID = this.doppleganger.objectID;
+        function toString() {
+            return '[attachment #' + this.$index + ' ' + this.$path + ' @ ' + this.jointName + '{' + this.$jointIndex + '}]';
+        }
+        return attachments.map(function(attachment, i) {
+            var jointIndex = modelHelper.getJointIndex(objectID, attachment.jointName),
+                path = (attachment.modelUrl+'').split(/[?#]/)[0].split('/').slice(-3).join('/');
+            return Object.defineProperties(attachment, {
+                $hash: { value: JSON.stringify(attachment) },
+                $index: { value: i },
+                $jointIndex: { value: jointIndex },
+                $path: { value: path },
+                toString: { value: toString },
+            });
+        });
+    },
+    // compare before / after attachment sets to determine which ones need to be (re)created
+    refreshAttachments: function() {
+        if (!this.doppleganger.objectID) {
+            return log('refreshAttachments -- canceling; !this.doppleganger.objectID');
+        }
+        var before = this.attachments || [],
+            beforeIndex = before.reduce(function(out, att, index) {
+                out[att.$hash] = index; return out;
+            }, {});
+        var after = this._getResolvedAttachments(),
+            afterIndex = after.reduce(function(out, att, index) {
+                out[att.$hash] = index; return out;
+            }, {});
+
+        Object.keys(beforeIndex).concat(Object.keys(afterIndex)).forEach(function(hash) {
+            if (hash in beforeIndex && hash in afterIndex) {
+                // print('reusing previous attachment', hash);
+                after[afterIndex[hash]] = before[beforeIndex[hash]];
+            } else if (!(hash in afterIndex)) {
+                var attachment = before[beforeIndex[hash]];
+                attachment.properties && attachment.properties.objectID &&
+                    modelHelper.deleteObject(attachment.properties.objectID);
+                delete attachment.properties;
+            }
+        });
+        this.attachments = after;
+        this._createAttachmentObjects();
+        this.attachmentsUpdated(after, before);
+    },
+    _createAttachmentObjects: function() {
+        try {
+            var attachments = this.attachments,
+                parentID = this.doppleganger.objectID,
+                jointNames = this.doppleganger.jointNames,
+                properties = modelHelper.getProperties(this.doppleganger.objectID),
+                modelType = properties && properties.type;
+            utils.assert(modelType === 'model' || modelType === 'Model', 'unrecognized doppleganger modelType:' + modelType);
+            debugPrint('DopplegangerAttachments..._createAttachmentObjects', JSON.stringify({
+                modelType: modelType,
+                attachments: attachments.length,
+                parentID: parentID,
+                jointNames: jointNames.join(' | '),
+            },0,2));
+            return attachments.map(utils.bind(this, function(attachment, i) {
+                var objectType = modelHelper.type(attachment.properties && attachment.properties.objectID);
+                if (objectType === 'overlay') {
+                    debugPrint('skipping already-provisioned attachment object', objectType, attachment.properties && attachment.properties.name);
+                    return attachment;
+                }
+                var jointIndex = attachment.$jointIndex, // jointNames.indexOf(attachment.jointName),
+                    scale = this.doppleganger.avatar.scale * (attachment.scale||1.0);
+
+                attachment.properties = utils.assign({
+                    name: attachment.toString(),
+                    type: modelType,
+                    modelURL: attachment.modelUrl,
+                    scale: scale,
+                    dimensions: modelHelper.type(parentID) === 'entity' ?
+                        Vec3.multiply(attachment.scale||1.0, Vec3.ONE) : undefined,
+                    visible: false,
+                    collisionless: true,
+                    dynamic: false,
+                    shapeType: 'none',
+                    lifetime: 60,
+                }, !this.manualJointSync && {
+                    parentID: parentID,
+                    parentJointIndex: jointIndex,
+                    localPosition: attachment.translation,
+                    localRotation: Quat.fromVec3Degrees(attachment.rotation),
+                });
+                var objectID = attachment.properties.objectID = modelHelper.addObject(attachment.properties);
+                utils.assert(!Uuid.isNull(objectID), 'could not create attachment: ' + [objectID, JSON.stringify(attachment.properties,0,2)]);
+                attachment._resource = ModelCache.prefetch(attachment.properties.modelURL);
+                attachment._modelReadier = new ModelReadyWatcher({
+                    resource: attachment._resource,
+                    objectID: objectID,
+                });
+                this.doppleganger.activeChanged.connect(attachment._modelReadier, '_stop');
+
+                attachment._modelReadier.modelReady.connect(this, function(err, result) {
+                    if (err) {
+                        log('>>>>> modelReady ERROR <<<<<: ' + err, attachment.properties.modelURL);
+                        modelHelper.deleteObject(objectID);
+                        return objectID = null;
+                    }
+                    debugPrint('attachment model ('+modelHelper.type(result.objectID)+') is ready; # joints ==',
+                        result.jointNames && result.jointNames.length, JSON.stringify(result.naturalDimensions), result.objectID);
+                    var properties = modelHelper.getProperties(result.objectID),
+                        naturalDimensions = attachment.properties.naturalDimensions = properties.naturalDimensions || result.naturalDimensions;
+                    modelHelper.editObject(objectID, {
+                        dimensions: naturalDimensions ? Vec3.multiply(attachment.scale, naturalDimensions) : undefined,
+                        localRotation: Quat.normalize({}),
+                        localPosition: Vec3.ZERO,
+                    });
+                    this.onJointsUpdated(parentID); // trigger once to initialize position/rotation
+                    // give time for model overlay to "settle", then make it visible
+                    Script.setTimeout(utils.bind(this, function() {
+                        modelHelper.editObject(objectID, {
+                            visible: true,
+                        });
+                        attachment._loaded = true;
+                    }), 100);
+                });
+                return attachment;
+            }));
+        } catch (e) {
+            log('_createAttachmentObjects ERROR:', e.stack || e, e.fileName, e.lineNumber);
+        }
+    },
+
+    _removeAttachmentObjects: function() {
+        if (this.attachments) {
+            this.attachments.forEach(function(attachment) {
+                if (attachment.properties) {
+                    if (attachment.properties.objectID) {
+                        modelHelper.deleteObject(attachment.properties.objectID);
+                    }
+                    delete attachment.properties.objectID;
+                }
+            });
+            delete this.attachments;
+        }
+    },
+
+    onJointsUpdated: function onJointsUpdated(objectID, jointUpdates) {
+        var jointOrientations = modelHelper.getJointOrientations(objectID),
+            jointPositions = modelHelper.getJointPositions(objectID),
+            parentID = objectID,
+            avatarScale = this.doppleganger.scale,
+            manualJointSync = this.manualJointSync;
+
+        if (!this.attachments) {
+            this.refreshAttachments();
+        }
+        var updatedObjects = this.attachments.reduce(function(updates, attachment, i) {
+            if (!attachment.properties || !attachment._loaded) {
+                return updates;
+            }
+            var objectID = attachment.properties.objectID,
+                jointIndex = attachment.$jointIndex,
+                jointOrientation = jointOrientations[jointIndex],
+                jointPosition = jointPositions[jointIndex];
+
+            var translation = Vec3.multiply(avatarScale, attachment.translation),
+                rotation = Quat.fromVec3Degrees(attachment.rotation);
+
+            var localPosition = Vec3.multiplyQbyV(jointOrientation, translation),
+                localRotation = rotation;
+
+            updates[objectID] = manualJointSync ? {
+                visible: true,
+                position: Vec3.sum(jointPosition, localPosition),
+                rotation: Quat.multiply(jointOrientation, localRotation),
+                scale: avatarScale * attachment.scale,
+            } : {
+                visible: true,
+                parentID: parentID,
+                parentJointIndex: jointIndex,
+                localRotation: localRotation,
+                localPosition: localPosition,
+                scale: attachment.scale,
+            };
+            return updates;
+        }, {});
+        modelHelper.editObjects(updatedObjects);
+    },
+
+    _initialize: function() {
+        var doppleganger = this.doppleganger;
+        if ('$attachmentControls' in doppleganger) {
+            throw new Error('only one set of attachment controls can be added per doppleganger');
+        }
+        doppleganger.$attachmentControls = this;
+        doppleganger.activeChanged.connect(this, function(active) {
+            if (active) {
+                doppleganger.jointsUpdated.connect(this, 'onJointsUpdated');
+            } else {
+                doppleganger.jointsUpdated.disconnect(this, 'onJointsUpdated');
+                this._removeAttachmentObjects();
+            }
+        });
+
+        Script.scriptEnding.connect(this, '_removeAttachmentObjects');
+    },
+};
+
+
+/***/ }),
+/* 5 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+// -- ADVANCED DEBUGGING --
+// @function - Add debug joint indicators / extra debugging info.
+// @param {Doppleganger} - existing Doppleganger instance to add controls to
+//
+// @note:
+//   * rightclick toggles mirror mode on/off
+//   * shift-rightclick toggles the debug indicators on/off
+//   * clicking on an indicator displays the joint name and mirrored joint name in the debug log.
+//
+// Example use:
+//    var doppleganger = new DopplegangerClass();
+//    DopplegangerClass.addDebugControls(doppleganger);
+
+
+/* eslint-env commonjs */
+/* eslint-disable comma-dangle */
+/* global console */
+
+var DopplegangerClass = __webpack_require__(2),
+    modelHelper = __webpack_require__(1).modelHelper,
+    utils = __webpack_require__(0);
+
+module.exports = DebugControls;
+// mixin addDebugControls to DopplegangerClass for backwards-compatibility
+DopplegangerClass.addDebugControls = function(doppleganger) {
+    new DebugControls(doppleganger);
+    return doppleganger;
+};
+
+DebugControls.version = '0.0.0';
+DebugControls.COLOR_DEFAULT = { red: 255, blue: 255, green: 255 };
+DebugControls.COLOR_SELECTED = { red: 0, blue: 255, green: 0 };
+
+function log() {
+    // eslint-disable-next-line no-console
+    (typeof console === 'object' ? console.log : print)('doppleganger-debug | ' + [].slice.call(arguments).join(' '));
+}
+
+function DebugControls(doppleganger) {
+    this.enableIndicators = true;
+    this.selectedJointName = null;
+    this.debugOverlayIDs = undefined;
+    this.jointSelected = utils.signal(function(result) {});
+    this.doppleganger = doppleganger;
+    this._initialize();
+}
+DebugControls.prototype = {
+    start: function() {
+        if (!this.onMousePressEvent) {
+            this.onMousePressEvent = this._onMousePressEvent;
+            Controller.mousePressEvent.connect(this, 'onMousePressEvent');
+            this.doppleganger.jointsUpdated.connect(this, 'onJointsUpdated');
+        }
+    },
+
+    stop: function() {
+        this.removeIndicators();
+        if (this.onMousePressEvent) {
+            this.doppleganger.jointsUpdated.disconnect(this, 'onJointsUpdated');
+            Controller.mousePressEvent.disconnect(this, 'onMousePressEvent');
+            delete this.onMousePressEvent;
+        }
+    },
+
+    createIndicators: function(jointNames) {
+        this.jointNames = jointNames;
+        return jointNames.map(function(name, i) {
+            return Overlays.addOverlay('shape', {
+                shape: 'Icosahedron',
+                scale: 0.1,
+                solid: false,
+                alpha: 0.5
+            });
+        });
+    },
+
+    removeIndicators: function() {
+        if (this.debugOverlayIDs) {
+            this.debugOverlayIDs.forEach(Overlays.deleteOverlay);
+            this.debugOverlayIDs = undefined;
+        }
+    },
+
+    onJointsUpdated: function(overlayID) {
+        if (!this.enableIndicators) {
+            return;
+        }
+        var jointNames = Overlays.getProperty(overlayID, 'jointNames'),
+            jointOrientations = Overlays.getProperty(overlayID, 'jointOrientations'),
+            jointPositions = Overlays.getProperty(overlayID, 'jointPositions'),
+            selectedIndex = jointNames.indexOf(this.selectedJointName);
+
+        if (!this.debugOverlayIDs) {
+            this.debugOverlayIDs = this.createIndicators(jointNames);
+        }
+
+        // batch all updates into a single call (using the editOverlays({ id: {props...}, ... }) API)
+        var updatedOverlays = this.debugOverlayIDs.reduce(function(updates, id, i) {
+            updates[id] = {
+                position: jointPositions[i],
+                rotation: jointOrientations[i],
+                color: i === selectedIndex ? DebugControls.COLOR_SELECTED : DebugControls.COLOR_DEFAULT,
+                solid: i === selectedIndex
+            };
+            return updates;
+        }, {});
+        Overlays.editOverlays(updatedOverlays);
+    },
+
+    _onMousePressEvent: function(evt) {
+        if (evt.isLeftButton) {
+            if (!this.enableIndicators || !this.debugOverlayIDs) {
+                return;
+            }
+            var ray = Camera.computePickRay(evt.x, evt.y),
+                hit = Overlays.findRayIntersection(ray, true, this.debugOverlayIDs);
+
+            hit.jointIndex = this.debugOverlayIDs.indexOf(hit.overlayID);
+            hit.jointName = this.jointNames[hit.jointIndex];
+            this.jointSelected(hit);
+        } else if (evt.isRightButton) {
+            if (evt.isShifted) {
+                this.enableIndicators = !this.enableIndicators;
+                if (!this.enableIndicators) {
+                    this.removeIndicators();
+                }
+            } else {
+                this.doppleganger.mirrored = !this.doppleganger.mirrored;
+            }
+        }
+    },
+
+    _initialize: function() {
+        if ('$debugControls' in this.doppleganger) {
+            throw new Error('only one set of debug controls can be added per doppleganger');
+        }
+        this.doppleganger.$debugControls = this;
+
+        this.doppleganger.activeChanged.connect(this, function(active) {
+            if (active) {
+                this.start();
+            } else {
+                this.stop();
+            }
+        });
+
+        this.jointSelected.connect(this, function(hit) {
+            this.selectedJointName = hit.jointName;
+            if (hit.jointIndex < 0) {
+                return;
+            }
+            hit.mirroredJointName = modelHelper.deriveMirroredJointNames([hit.jointName])[0];
+            log('selected joint:', JSON.stringify(hit, 0, 2));
+        });
+
+        Script.scriptEnding.connect(this, 'removeIndicators');
+    },
+}; // DebugControls.prototype
+
+
+/***/ }),
+/* 6 */
+/***/ (function(module, exports) {
+
+module.exports = "data:image/svg+xml;xml,<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<!-- Generator: Adobe Illustrator 19.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\n\n<svg\n   xmlns:osb=\"http://www.openswatchbook.org/uri/2009/osb\"\n   xmlns:dc=\"http://purl.org/dc/elements/1.1/\"\n   xmlns:cc=\"http://creativecommons.org/ns#\"\n   xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:sodipodi=\"http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd\"\n   xmlns:inkscape=\"http://www.inkscape.org/namespaces/inkscape\"\n   version=\"1.1\"\n   x=\"0px\"\n   y=\"0px\"\n   viewBox=\"0 0 50 50\"\n   style=\"enable-background:new 0 0 50 50;\"\n   xml:space=\"preserve\"\n   id=\"svg2\"\n   inkscape:version=\"0.91 r13725\"\n   sodipodi:docname=\"doppleganger-i.svg\"><metadata\n     id=\"metadata36\"><rdf:RDF><cc:Work\n         rdf:about=\"\"><dc:format>image/svg+xml</dc:format><dc:type\n           rdf:resource=\"http://purl.org/dc/dcmitype/StillImage\" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs\n     id=\"defs34\"><linearGradient\n       id=\"linearGradient8353\"\n       osb:paint=\"solid\"><stop\n         style=\"stop-color:#000000;stop-opacity:1;\"\n         offset=\"0\"\n         id=\"stop8355\" /></linearGradient></defs><sodipodi:namedview\n     pagecolor=\"#ff4900\"\n     bordercolor=\"#666666\"\n     borderopacity=\"1\"\n     objecttolerance=\"10\"\n     gridtolerance=\"10\"\n     guidetolerance=\"10\"\n     inkscape:pageopacity=\"0\"\n     inkscape:pageshadow=\"2\"\n     inkscape:window-width=\"1920\"\n     inkscape:window-height=\"1004\"\n     id=\"namedview32\"\n     showgrid=\"false\"\n     inkscape:zoom=\"9.44\"\n     inkscape:cx=\"-3.2806499\"\n     inkscape:cy=\"20.640561\"\n     inkscape:window-x=\"0\"\n     inkscape:window-y=\"24\"\n     inkscape:window-maximized=\"1\"\n     inkscape:current-layer=\"g4308\" /><style\n     type=\"text/css\"\n     id=\"style4\">\n\t.st0{fill:#FFFFFF;}\n</style><g\n     id=\"Layer_2\" /><g\n     id=\"Layer_1\"\n     style=\"fill:#000000;fill-opacity:1\"><g\n       id=\"g8375\"\n       transform=\"matrix(1.0667546,0,0,1.0667546,-2.1894733,-1.7818707)\"><g\n         id=\"g4308\"\n         transform=\"translate(1.0333645e-6,0)\"><g\n           id=\"g8\"\n           style=\"fill:#ffffff;fill-opacity:1\"\n           transform=\"matrix(1.1059001,0,0,1.1059001,-17.342989,-7.9561147)\"><path\n             class=\"st0\"\n             d=\"m 23.2,24.1 c -0.8,0.9 -1.5,1.8 -2.2,2.6 -0.1,0.2 -0.1,0.5 -0.1,0.7 0.1,1.7 0.2,3.4 0.2,5.1 0,0.8 -0.4,1.2 -1.1,1.3 -0.7,0.1 -1.3,-0.4 -1.4,-1.1 -0.2,-2.2 -0.3,-4.3 -0.5,-6.5 0,-0.3 0.1,-0.7 0.4,-1 1.1,-1.5 2.3,-3 3.4,-4.5 0.6,-0.7 1.6,-1.6 2.6,-1.6 0.3,0 1.1,0 1.4,0 0.8,-0.1 1.3,0.1 1.9,0.9 1,1.2 1.5,2.3 2.4,3.6 0.7,1.1 1.4,1.6 2.9,1.9 1.1,0.2 2.2,0.5 3.3,0.8 0.3,0.1 0.6,0.2 0.8,0.3 0.5,0.3 0.7,0.8 0.6,1.3 -0.1,0.5 -0.5,0.7 -1,0.8 -0.4,0 -0.9,0 -1.3,-0.1 -1.4,-0.3 -2.7,-0.6 -4.1,-0.9 -0.8,-0.2 -1.5,-0.6 -2.1,-1.1 -0.3,-0.3 -0.6,-0.5 -0.9,-0.8 0,0.3 0,0.5 0,0.7 0,1.2 0,2.4 0,3.6 0,0.4 -0.3,12.6 -0.1,16.8 0,0.5 -0.1,1 -0.2,1.5 -0.2,0.7 -0.6,1 -1.4,1.1 -0.8,0 -1.4,-0.3 -1.7,-1 C 24.8,48 24.7,47.4 24.6,46.9 24.2,42.3 23.7,34 23.5,33.1 23.4,32.3 23.3,32 23.2,31 c -0.1,-0.5 -0.1,-0.9 -0.1,-1.3 0.2,-1.8 0.1,-3.6 0.1,-5.6 z\"\n             id=\"path10\"\n             style=\"fill:#ffffff;fill-opacity:1\"\n             inkscape:connector-curvature=\"0\" /><path\n             class=\"st0\"\n             d=\"m 28.2,14.6 c 0,1.4 -1.1,2.6 -2.6,2.6 l 0,0 C 24.2,17.2 23,16.1 23,14.6 L 23,13 c 0,-1.4 1.1,-2.6 2.6,-2.6 l 0,0 c 1.4,0 2.6,1.1 2.6,2.6 l 0,1.6 z\"\n             id=\"path12\"\n             style=\"fill:#ffffff;fill-opacity:1\"\n             inkscape:connector-curvature=\"0\" /></g><g\n           id=\"g8-3\"\n           style=\"opacity:0.5;fill:#808080;fill-opacity:1;stroke:#ffffff;stroke-width:0.59335912;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:0.29667956, 0.29667956000000001;stroke-dashoffset:0;stroke-opacity:1\"\n           transform=\"matrix(-1.1059001,0,0,1.1059001,67.821392,-7.9561147)\"><path\n             class=\"st0\"\n             d=\"m 23.2,24.1 c -0.8,0.9 -1.5,1.8 -2.2,2.6 -0.1,0.2 -0.1,0.5 -0.1,0.7 0.1,1.7 0.2,3.4 0.2,5.1 0,0.8 -0.4,1.2 -1.1,1.3 -0.7,0.1 -1.3,-0.4 -1.4,-1.1 -0.2,-2.2 -0.3,-4.3 -0.5,-6.5 0,-0.3 0.1,-0.7 0.4,-1 1.1,-1.5 2.3,-3 3.4,-4.5 0.6,-0.7 1.6,-1.6 2.6,-1.6 0.3,0 1.1,0 1.4,0 0.8,-0.1 1.3,0.1 1.9,0.9 1,1.2 1.5,2.3 2.4,3.6 0.7,1.1 1.4,1.6 2.9,1.9 1.1,0.2 2.2,0.5 3.3,0.8 0.3,0.1 0.6,0.2 0.8,0.3 0.5,0.3 0.7,0.8 0.6,1.3 -0.1,0.5 -0.5,0.7 -1,0.8 -0.4,0 -0.9,0 -1.3,-0.1 -1.4,-0.3 -2.7,-0.6 -4.1,-0.9 -0.8,-0.2 -1.5,-0.6 -2.1,-1.1 -0.3,-0.3 -0.6,-0.5 -0.9,-0.8 0,0.3 0,0.5 0,0.7 0,1.2 0,2.4 0,3.6 0,0.4 -0.3,12.6 -0.1,16.8 0,0.5 -0.1,1 -0.2,1.5 -0.2,0.7 -0.6,1 -1.4,1.1 -0.8,0 -1.4,-0.3 -1.7,-1 C 24.8,48 24.7,47.4 24.6,46.9 24.2,42.3 23.7,34 23.5,33.1 23.4,32.3 23.3,32 23.2,31 c -0.1,-0.5 -0.1,-0.9 -0.1,-1.3 0.2,-1.8 0.1,-3.6 0.1,-5.6 z\"\n             id=\"path10-6\"\n             style=\"fill:#808080;fill-opacity:1;stroke:#ffffff;stroke-width:0.59335912;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:0.29667956, 0.29667956000000001;stroke-dashoffset:0;stroke-opacity:1\"\n             inkscape:connector-curvature=\"0\" /><path\n             class=\"st0\"\n             d=\"m 28.2,14.6 c 0,1.4 -1.1,2.6 -2.6,2.6 l 0,0 C 24.2,17.2 23,16.1 23,14.6 L 23,13 c 0,-1.4 1.1,-2.6 2.6,-2.6 l 0,0 c 1.4,0 2.6,1.1 2.6,2.6 l 0,1.6 z\"\n             id=\"path12-7\"\n             style=\"fill:#808080;fill-opacity:1;stroke:#ffffff;stroke-width:0.59335912;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:0.29667956, 0.29667956000000001;stroke-dashoffset:0;stroke-opacity:1\"\n             inkscape:connector-curvature=\"0\" /></g></g><rect\n         style=\"opacity:0.5;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.15729524;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:0.62918094, 1.25836187000000010;stroke-dashoffset:0;stroke-opacity:1\"\n         id=\"rect4306\"\n         width=\"0.12393159\"\n         height=\"46.498554\"\n         x=\"25.227457\"\n         y=\"1.8070068\"\n         rx=\"0\"\n         ry=\"0.9407174\" /></g></g></svg>"
+
+/***/ }),
+/* 7 */
+/***/ (function(module, exports) {
+
+module.exports = "data:image/svg+xml;xml,<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<!-- Generator: Adobe Illustrator 19.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\n\n<svg\n   xmlns:osb=\"http://www.openswatchbook.org/uri/2009/osb\"\n   xmlns:dc=\"http://purl.org/dc/elements/1.1/\"\n   xmlns:cc=\"http://creativecommons.org/ns#\"\n   xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:sodipodi=\"http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd\"\n   xmlns:inkscape=\"http://www.inkscape.org/namespaces/inkscape\"\n   version=\"1.1\"\n   x=\"0px\"\n   y=\"0px\"\n   viewBox=\"0 0 50 50\"\n   style=\"enable-background:new 0 0 50 50;\"\n   xml:space=\"preserve\"\n   id=\"svg2\"\n   inkscape:version=\"0.91 r13725\"\n   sodipodi:docname=\"doppleganger-a.svg\"><metadata\n     id=\"metadata36\"><rdf:RDF><cc:Work\n         rdf:about=\"\"><dc:format>image/svg+xml</dc:format><dc:type\n           rdf:resource=\"http://purl.org/dc/dcmitype/StillImage\" /><dc:title /></cc:Work></rdf:RDF></metadata><defs\n     id=\"defs34\"><linearGradient\n       id=\"linearGradient8353\"\n       osb:paint=\"solid\"><stop\n         style=\"stop-color:#000000;stop-opacity:1;\"\n         offset=\"0\"\n         id=\"stop8355\" /></linearGradient></defs><sodipodi:namedview\n     pagecolor=\"#ff4900\"\n     bordercolor=\"#666666\"\n     borderopacity=\"1\"\n     objecttolerance=\"10\"\n     gridtolerance=\"10\"\n     guidetolerance=\"10\"\n     inkscape:pageopacity=\"0\"\n     inkscape:pageshadow=\"2\"\n     inkscape:window-width=\"1920\"\n     inkscape:window-height=\"1004\"\n     id=\"namedview32\"\n     showgrid=\"false\"\n     inkscape:zoom=\"9.44\"\n     inkscape:cx=\"-3.2806499\"\n     inkscape:cy=\"20.640561\"\n     inkscape:window-x=\"0\"\n     inkscape:window-y=\"24\"\n     inkscape:window-maximized=\"1\"\n     inkscape:current-layer=\"g4308\" /><style\n     type=\"text/css\"\n     id=\"style4\">\n\t.st0{fill:#FFFFFF;}\n</style><g\n     id=\"Layer_2\" /><g\n     id=\"Layer_1\"\n     style=\"fill:#000000;fill-opacity:1\"><g\n       id=\"g8375\"\n       transform=\"matrix(1.0667546,0,0,1.0667546,-2.1894733,-1.7818707)\"><g\n         id=\"g4308\"\n         transform=\"translate(1.0333645e-6,0)\"><g\n           id=\"g8\"\n           style=\"fill:#000000;fill-opacity:1\"\n           transform=\"matrix(1.1059001,0,0,1.1059001,-17.342989,-7.9561147)\"><path\n             class=\"st0\"\n             d=\"m 23.2,24.1 c -0.8,0.9 -1.5,1.8 -2.2,2.6 -0.1,0.2 -0.1,0.5 -0.1,0.7 0.1,1.7 0.2,3.4 0.2,5.1 0,0.8 -0.4,1.2 -1.1,1.3 -0.7,0.1 -1.3,-0.4 -1.4,-1.1 -0.2,-2.2 -0.3,-4.3 -0.5,-6.5 0,-0.3 0.1,-0.7 0.4,-1 1.1,-1.5 2.3,-3 3.4,-4.5 0.6,-0.7 1.6,-1.6 2.6,-1.6 0.3,0 1.1,0 1.4,0 0.8,-0.1 1.3,0.1 1.9,0.9 1,1.2 1.5,2.3 2.4,3.6 0.7,1.1 1.4,1.6 2.9,1.9 1.1,0.2 2.2,0.5 3.3,0.8 0.3,0.1 0.6,0.2 0.8,0.3 0.5,0.3 0.7,0.8 0.6,1.3 -0.1,0.5 -0.5,0.7 -1,0.8 -0.4,0 -0.9,0 -1.3,-0.1 -1.4,-0.3 -2.7,-0.6 -4.1,-0.9 -0.8,-0.2 -1.5,-0.6 -2.1,-1.1 -0.3,-0.3 -0.6,-0.5 -0.9,-0.8 0,0.3 0,0.5 0,0.7 0,1.2 0,2.4 0,3.6 0,0.4 -0.3,12.6 -0.1,16.8 0,0.5 -0.1,1 -0.2,1.5 -0.2,0.7 -0.6,1 -1.4,1.1 -0.8,0 -1.4,-0.3 -1.7,-1 C 24.8,48 24.7,47.4 24.6,46.9 24.2,42.3 23.7,34 23.5,33.1 23.4,32.3 23.3,32 23.2,31 c -0.1,-0.5 -0.1,-0.9 -0.1,-1.3 0.2,-1.8 0.1,-3.6 0.1,-5.6 z\"\n             id=\"path10\"\n             style=\"fill:#000000;fill-opacity:1\"\n             inkscape:connector-curvature=\"0\" /><path\n             class=\"st0\"\n             d=\"m 28.2,14.6 c 0,1.4 -1.1,2.6 -2.6,2.6 l 0,0 C 24.2,17.2 23,16.1 23,14.6 L 23,13 c 0,-1.4 1.1,-2.6 2.6,-2.6 l 0,0 c 1.4,0 2.6,1.1 2.6,2.6 l 0,1.6 z\"\n             id=\"path12\"\n             style=\"fill:#000000;fill-opacity:1\"\n             inkscape:connector-curvature=\"0\" /></g><g\n           id=\"g8-3\"\n           style=\"opacity:0.5;fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.59335912;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:0.29667956,0.29667956;stroke-dashoffset:0;stroke-opacity:1\"\n           transform=\"matrix(-1.1059001,0,0,1.1059001,67.821392,-7.9561147)\"><path\n             class=\"st0\"\n             d=\"m 23.2,24.1 c -0.8,0.9 -1.5,1.8 -2.2,2.6 -0.1,0.2 -0.1,0.5 -0.1,0.7 0.1,1.7 0.2,3.4 0.2,5.1 0,0.8 -0.4,1.2 -1.1,1.3 -0.7,0.1 -1.3,-0.4 -1.4,-1.1 -0.2,-2.2 -0.3,-4.3 -0.5,-6.5 0,-0.3 0.1,-0.7 0.4,-1 1.1,-1.5 2.3,-3 3.4,-4.5 0.6,-0.7 1.6,-1.6 2.6,-1.6 0.3,0 1.1,0 1.4,0 0.8,-0.1 1.3,0.1 1.9,0.9 1,1.2 1.5,2.3 2.4,3.6 0.7,1.1 1.4,1.6 2.9,1.9 1.1,0.2 2.2,0.5 3.3,0.8 0.3,0.1 0.6,0.2 0.8,0.3 0.5,0.3 0.7,0.8 0.6,1.3 -0.1,0.5 -0.5,0.7 -1,0.8 -0.4,0 -0.9,0 -1.3,-0.1 -1.4,-0.3 -2.7,-0.6 -4.1,-0.9 -0.8,-0.2 -1.5,-0.6 -2.1,-1.1 -0.3,-0.3 -0.6,-0.5 -0.9,-0.8 0,0.3 0,0.5 0,0.7 0,1.2 0,2.4 0,3.6 0,0.4 -0.3,12.6 -0.1,16.8 0,0.5 -0.1,1 -0.2,1.5 -0.2,0.7 -0.6,1 -1.4,1.1 -0.8,0 -1.4,-0.3 -1.7,-1 C 24.8,48 24.7,47.4 24.6,46.9 24.2,42.3 23.7,34 23.5,33.1 23.4,32.3 23.3,32 23.2,31 c -0.1,-0.5 -0.1,-0.9 -0.1,-1.3 0.2,-1.8 0.1,-3.6 0.1,-5.6 z\"\n             id=\"path10-6\"\n             style=\"fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.59335912;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:0.29667956,0.29667956;stroke-dashoffset:0;stroke-opacity:1\"\n             inkscape:connector-curvature=\"0\" /><path\n             class=\"st0\"\n             d=\"m 28.2,14.6 c 0,1.4 -1.1,2.6 -2.6,2.6 l 0,0 C 24.2,17.2 23,16.1 23,14.6 L 23,13 c 0,-1.4 1.1,-2.6 2.6,-2.6 l 0,0 c 1.4,0 2.6,1.1 2.6,2.6 l 0,1.6 z\"\n             id=\"path12-7\"\n             style=\"fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.59335912;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:0.29667956,0.29667956;stroke-dashoffset:0;stroke-opacity:1\"\n             inkscape:connector-curvature=\"0\" /></g></g><rect\n         style=\"opacity:0.5;fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.15729524;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:0.62918094, 1.25836187;stroke-dashoffset:0;stroke-opacity:1\"\n         id=\"rect4306\"\n         width=\"0.12393159\"\n         height=\"46.498554\"\n         x=\"25.227457\"\n         y=\"1.8070068\"\n         rx=\"0\"\n         ry=\"0.9407174\" /></g></g></svg>"
+
+/***/ })
+/******/ ]);
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/doppleganger-attachments/doppleganger-attachments.js b/unpublishedScripts/marketplace/doppleganger-attachments/doppleganger-attachments.js
index a3b3873c2d..7526f56511 100644
--- a/unpublishedScripts/marketplace/doppleganger-attachments/doppleganger-attachments.js
+++ b/unpublishedScripts/marketplace/doppleganger-attachments/doppleganger-attachments.js
@@ -1,10 +1,12 @@
 "use strict";
 /* eslint-env commonjs */
 /* eslint-disable comma-dangle */
+/* global console */
 
+// var require = function(id) { return Script.require(id + '?'+new Date().getTime().toString(36)); }
 module.exports = DopplegangerAttachments;
 
-DopplegangerAttachments.version = '0.0.0';
+DopplegangerAttachments.version = '0.0.1b';
 DopplegangerAttachments.WANT_DEBUG = false;
 
 var _modelHelper = require('./model-helper.js'),
@@ -13,8 +15,10 @@ var _modelHelper = require('./model-helper.js'),
     utils = require('./utils.js');
 
 function log() {
-    print('doppleganger-attachments | ' + [].slice.call(arguments).join(' '));
+    // eslint-disable-next-line no-console
+    (typeof console === 'object' ? console.log : print)('doppleganger-attachments | ' + [].slice.call(arguments).join(' '));
 }
+log(DopplegangerAttachments.version);
 
 function debugPrint() {
     DopplegangerAttachments.WANT_DEBUG && log.apply(this, arguments);
@@ -61,6 +65,9 @@ DopplegangerAttachments.prototype = {
     },
     // compare before / after attachment sets to determine which ones need to be (re)created
     refreshAttachments: function() {
+        if (!this.doppleganger.objectID) {
+            return log('refreshAttachments -- canceling; !this.doppleganger.objectID');
+        }
         var before = this.attachments || [],
             beforeIndex = before.reduce(function(out, att, index) {
                 out[att.$hash] = index; return out;
@@ -90,18 +97,19 @@ DopplegangerAttachments.prototype = {
             var attachments = this.attachments,
                 parentID = this.doppleganger.objectID,
                 jointNames = this.doppleganger.jointNames,
-                properties = modelHelper.getProperties(this.doppleganger.objectID);
-
+                properties = modelHelper.getProperties(this.doppleganger.objectID),
+                modelType = properties && properties.type;
+            utils.assert(modelType === 'model' || modelType === 'Model', 'unrecognized doppleganger modelType:' + modelType);
             debugPrint('DopplegangerAttachments..._createAttachmentObjects', JSON.stringify({
-                type: properties.type,
+                modelType: modelType,
                 attachments: attachments.length,
                 parentID: parentID,
                 jointNames: jointNames.join(' | '),
             },0,2));
             return attachments.map(utils.bind(this, function(attachment, i) {
-                var type = modelHelper.type(attachment.properties && attachment.properties.objectID);
-                if (type === 'overlay') {
-                    debugPrint('skipping already-provisioned attachment object', type, attachment.properties && attachment.properties.name);
+                var objectType = modelHelper.type(attachment.properties && attachment.properties.objectID);
+                if (objectType === 'overlay') {
+                    debugPrint('skipping already-provisioned attachment object', objectType, attachment.properties && attachment.properties.name);
                     return attachment;
                 }
                 var jointIndex = attachment.$jointIndex, // jointNames.indexOf(attachment.jointName),
@@ -109,7 +117,7 @@ DopplegangerAttachments.prototype = {
 
                 attachment.properties = utils.assign({
                     name: attachment.toString(),
-                    type: properties.type,
+                    type: modelType,
                     modelURL: attachment.modelUrl,
                     scale: scale,
                     dimensions: modelHelper.type(parentID) === 'entity' ?
@@ -119,14 +127,16 @@ DopplegangerAttachments.prototype = {
                     dynamic: false,
                     shapeType: 'none',
                     lifetime: 60,
-                    grabbable: true,
                 }, !this.manualJointSync && {
                     parentID: parentID,
                     parentJointIndex: jointIndex,
+                    localPosition: attachment.translation,
+                    localRotation: Quat.fromVec3Degrees(attachment.rotation),
                 });
                 var objectID = attachment.properties.objectID = modelHelper.addObject(attachment.properties);
+                utils.assert(!Uuid.isNull(objectID), 'could not create attachment: ' + [objectID, JSON.stringify(attachment.properties,0,2)]);
                 attachment._resource = ModelCache.prefetch(attachment.properties.modelURL);
-                attachment._modelReadier = new ModelReadyWatcher( {
+                attachment._modelReadier = new ModelReadyWatcher({
                     resource: attachment._resource,
                     objectID: objectID,
                 });
@@ -134,21 +144,23 @@ DopplegangerAttachments.prototype = {
 
                 attachment._modelReadier.modelReady.connect(this, function(err, result) {
                     if (err) {
-                        log('>>>>> modelReady ERROR <<<<<: ' + err, attachment.modelUrl);
+                        log('>>>>> modelReady ERROR <<<<<: ' + err, attachment.properties.modelURL);
                         modelHelper.deleteObject(objectID);
                         return objectID = null;
                     }
                     debugPrint('attachment model ('+modelHelper.type(result.objectID)+') is ready; # joints ==',
-                        result.jointNames && result.jointNames.length, result.naturalDimensions, result.objectID);
+                        result.jointNames && result.jointNames.length, JSON.stringify(result.naturalDimensions), result.objectID);
                     var properties = modelHelper.getProperties(result.objectID),
-                        naturalDimensions = attachment.properties.naturalDimensions = properties.naturalDimensions;
-                    modelHelper.editObject(result.objectID, {
+                        naturalDimensions = attachment.properties.naturalDimensions = properties.naturalDimensions || result.naturalDimensions;
+                    modelHelper.editObject(objectID, {
                         dimensions: naturalDimensions ? Vec3.multiply(attachment.scale, naturalDimensions) : undefined,
+                        localRotation: Quat.normalize({}),
+                        localPosition: Vec3.ZERO,
                     });
                     this.onJointsUpdated(parentID); // trigger once to initialize position/rotation
                     // give time for model overlay to "settle", then make it visible
                     Script.setTimeout(utils.bind(this, function() {
-                        modelHelper.editObject(result.objectID, {
+                        modelHelper.editObject(objectID, {
                             visible: true,
                         });
                         attachment._loaded = true;
@@ -175,7 +187,7 @@ DopplegangerAttachments.prototype = {
         }
     },
 
-    onJointsUpdated: function onJointsUpdated(objectID) {
+    onJointsUpdated: function onJointsUpdated(objectID, jointUpdates) {
         var jointOrientations = modelHelper.getJointOrientations(objectID),
             jointPositions = modelHelper.getJointPositions(objectID),
             parentID = objectID,
@@ -195,8 +207,9 @@ DopplegangerAttachments.prototype = {
                 jointPosition = jointPositions[jointIndex];
 
             var translation = Vec3.multiply(avatarScale, attachment.translation),
-                rotation = Quat.fromVec3Degrees(attachment.rotation),
-                localPosition = Vec3.multiplyQbyV(jointOrientation, translation),
+                rotation = Quat.fromVec3Degrees(attachment.rotation);
+
+            var localPosition = Vec3.multiplyQbyV(jointOrientation, translation),
                 localRotation = rotation;
 
             updates[objectID] = manualJointSync ? {
@@ -212,7 +225,6 @@ DopplegangerAttachments.prototype = {
                 localPosition: localPosition,
                 scale: attachment.scale,
             };
-            onJointsUpdated[objectID] = updates[objectID];
             return updates;
         }, {});
         modelHelper.editObjects(updatedObjects);
@@ -221,7 +233,7 @@ DopplegangerAttachments.prototype = {
     _initialize: function() {
         var doppleganger = this.doppleganger;
         if ('$attachmentControls' in doppleganger) {
-            throw new Error('only one set of debug controls can be added per doppleganger');
+            throw new Error('only one set of attachment controls can be added per doppleganger');
         }
         doppleganger.$attachmentControls = this;
         doppleganger.activeChanged.connect(this, function(active) {
diff --git a/unpublishedScripts/marketplace/doppleganger-attachments/doppleganger-debug.js b/unpublishedScripts/marketplace/doppleganger-attachments/doppleganger-debug.js
new file mode 100644
index 0000000000..b0a83117fb
--- /dev/null
+++ b/unpublishedScripts/marketplace/doppleganger-attachments/doppleganger-debug.js
@@ -0,0 +1,158 @@
+// -- ADVANCED DEBUGGING --
+// @function - Add debug joint indicators / extra debugging info.
+// @param {Doppleganger} - existing Doppleganger instance to add controls to
+//
+// @note:
+//   * rightclick toggles mirror mode on/off
+//   * shift-rightclick toggles the debug indicators on/off
+//   * clicking on an indicator displays the joint name and mirrored joint name in the debug log.
+//
+// Example use:
+//    var doppleganger = new DopplegangerClass();
+//    DopplegangerClass.addDebugControls(doppleganger);
+
+"use strict";
+/* eslint-env commonjs */
+/* eslint-disable comma-dangle */
+/* global console */
+
+var DopplegangerClass = require('./doppleganger.js'),
+    modelHelper = require('./model-helper.js').modelHelper,
+    utils = require('./utils.js');
+
+module.exports = DebugControls;
+// mixin addDebugControls to DopplegangerClass for backwards-compatibility
+DopplegangerClass.addDebugControls = function(doppleganger) {
+    new DebugControls(doppleganger);
+    return doppleganger;
+};
+
+DebugControls.version = '0.0.0';
+DebugControls.COLOR_DEFAULT = { red: 255, blue: 255, green: 255 };
+DebugControls.COLOR_SELECTED = { red: 0, blue: 255, green: 0 };
+
+function log() {
+    // eslint-disable-next-line no-console
+    (typeof console === 'object' ? console.log : print)('doppleganger-debug | ' + [].slice.call(arguments).join(' '));
+}
+
+function DebugControls(doppleganger) {
+    this.enableIndicators = true;
+    this.selectedJointName = null;
+    this.debugOverlayIDs = undefined;
+    this.jointSelected = utils.signal(function(result) {});
+    this.doppleganger = doppleganger;
+    this._initialize();
+}
+DebugControls.prototype = {
+    start: function() {
+        if (!this.onMousePressEvent) {
+            this.onMousePressEvent = this._onMousePressEvent;
+            Controller.mousePressEvent.connect(this, 'onMousePressEvent');
+            this.doppleganger.jointsUpdated.connect(this, 'onJointsUpdated');
+        }
+    },
+
+    stop: function() {
+        this.removeIndicators();
+        if (this.onMousePressEvent) {
+            this.doppleganger.jointsUpdated.disconnect(this, 'onJointsUpdated');
+            Controller.mousePressEvent.disconnect(this, 'onMousePressEvent');
+            delete this.onMousePressEvent;
+        }
+    },
+
+    createIndicators: function(jointNames) {
+        this.jointNames = jointNames;
+        return jointNames.map(function(name, i) {
+            return Overlays.addOverlay('shape', {
+                shape: 'Icosahedron',
+                scale: 0.1,
+                solid: false,
+                alpha: 0.5
+            });
+        });
+    },
+
+    removeIndicators: function() {
+        if (this.debugOverlayIDs) {
+            this.debugOverlayIDs.forEach(Overlays.deleteOverlay);
+            this.debugOverlayIDs = undefined;
+        }
+    },
+
+    onJointsUpdated: function(overlayID) {
+        if (!this.enableIndicators) {
+            return;
+        }
+        var jointNames = Overlays.getProperty(overlayID, 'jointNames'),
+            jointOrientations = Overlays.getProperty(overlayID, 'jointOrientations'),
+            jointPositions = Overlays.getProperty(overlayID, 'jointPositions'),
+            selectedIndex = jointNames.indexOf(this.selectedJointName);
+
+        if (!this.debugOverlayIDs) {
+            this.debugOverlayIDs = this.createIndicators(jointNames);
+        }
+
+        // batch all updates into a single call (using the editOverlays({ id: {props...}, ... }) API)
+        var updatedOverlays = this.debugOverlayIDs.reduce(function(updates, id, i) {
+            updates[id] = {
+                position: jointPositions[i],
+                rotation: jointOrientations[i],
+                color: i === selectedIndex ? DebugControls.COLOR_SELECTED : DebugControls.COLOR_DEFAULT,
+                solid: i === selectedIndex
+            };
+            return updates;
+        }, {});
+        Overlays.editOverlays(updatedOverlays);
+    },
+
+    _onMousePressEvent: function(evt) {
+        if (evt.isLeftButton) {
+            if (!this.enableIndicators || !this.debugOverlayIDs) {
+                return;
+            }
+            var ray = Camera.computePickRay(evt.x, evt.y),
+                hit = Overlays.findRayIntersection(ray, true, this.debugOverlayIDs);
+
+            hit.jointIndex = this.debugOverlayIDs.indexOf(hit.overlayID);
+            hit.jointName = this.jointNames[hit.jointIndex];
+            this.jointSelected(hit);
+        } else if (evt.isRightButton) {
+            if (evt.isShifted) {
+                this.enableIndicators = !this.enableIndicators;
+                if (!this.enableIndicators) {
+                    this.removeIndicators();
+                }
+            } else {
+                this.doppleganger.mirrored = !this.doppleganger.mirrored;
+            }
+        }
+    },
+
+    _initialize: function() {
+        if ('$debugControls' in this.doppleganger) {
+            throw new Error('only one set of debug controls can be added per doppleganger');
+        }
+        this.doppleganger.$debugControls = this;
+
+        this.doppleganger.activeChanged.connect(this, function(active) {
+            if (active) {
+                this.start();
+            } else {
+                this.stop();
+            }
+        });
+
+        this.jointSelected.connect(this, function(hit) {
+            this.selectedJointName = hit.jointName;
+            if (hit.jointIndex < 0) {
+                return;
+            }
+            hit.mirroredJointName = modelHelper.deriveMirroredJointNames([hit.jointName])[0];
+            log('selected joint:', JSON.stringify(hit, 0, 2));
+        });
+
+        Script.scriptEnding.connect(this, 'removeIndicators');
+    },
+}; // DebugControls.prototype
diff --git a/unpublishedScripts/marketplace/doppleganger-attachments/doppleganger.js b/unpublishedScripts/marketplace/doppleganger-attachments/doppleganger.js
index bebd36df45..9e35d791d6 100644
--- a/unpublishedScripts/marketplace/doppleganger-attachments/doppleganger.js
+++ b/unpublishedScripts/marketplace/doppleganger-attachments/doppleganger.js
@@ -10,6 +10,7 @@
 //
 
 /* eslint-env commonjs */
+/* global console */
 // @module doppleganger
 //
 // This module contains the `Doppleganger` class implementation for creating an inspectable replica of
@@ -24,9 +25,13 @@
 
 module.exports = Doppleganger;
 
+Doppleganger.version = '0.0.1a';
+log(Doppleganger.version);
+
 var _modelHelper = require('./model-helper.js'),
     modelHelper = _modelHelper.modelHelper,
-    ModelReadyWatcher = _modelHelper.ModelReadyWatcher;
+    ModelReadyWatcher = _modelHelper.ModelReadyWatcher,
+    utils = require('./utils.js');
 
 // @property {bool} - toggle verbose debug logging on/off
 Doppleganger.WANT_DEBUG = false;
@@ -48,16 +53,16 @@ function Doppleganger(options) {
     this.autoUpdate = 'autoUpdate' in options ? options.autoUpdate : true;
 
     // @public
-    this.active = false;   // whether doppleganger is currently being displayed/updated
+    this.active = false; // whether doppleganger is currently being displayed/updated
     this.objectID = null; // current doppleganger's Overlay or Entity id
-    this.frame = 0;        // current joint update frame
+    this.frame = 0; // current joint update frame
 
     // @signal - emitted when .active state changes
-    this.activeChanged = signal(function(active, reason) {});
+    this.activeChanged = utils.signal(function(active, reason) {});
     // @signal - emitted once model is either loaded or errors out
-    this.modelLoaded = signal(function(error, result){});
+    this.modelLoaded = utils.signal(function(error, result){});
     // @signal - emitted each time the model's joint data has been synchronized
-    this.jointsUpdated = signal(function(objectID){});
+    this.jointsUpdated = utils.signal(function(objectID){});
 }
 
 Doppleganger.prototype = {
@@ -73,6 +78,20 @@ Doppleganger.prototype = {
         return this.active;
     },
 
+    // @private @method - get an avatar's "absolute joint translations in object frame" as local translations
+    // @param {AvatarData} - avatar to read translations from
+    // @return {glm::vec3[]} - the adapted translations
+    _getLocalAvatarJointTranslations: function(avatar) {
+        // NOTE: avatar.getJointTranslations() seems to return meters and avatar.getJointTranslation(jointIndex) centimeters...
+        //  adapting meters -> centimeters on this side seems to fix the "scrunching into ball" problem (~Beta 54)
+        //  and perform slightly faster than calling getJointTranslation(jointIndex) N times.
+        const CENTIMETERS_PER_METER = 100.0;
+        function scaleToMeters(v) {
+            return Vec3.multiply(CENTIMETERS_PER_METER, v);
+        }
+        return avatar.getJointTranslations().map(scaleToMeters);
+    },
+
     // @public @method - synchronize the joint data between Avatar / doppleganger
     update: function() {
         this.frame++;
@@ -86,7 +105,7 @@ Doppleganger.prototype = {
             }
 
             var rotations = this.avatar.getJointRotations();
-            var translations = this.avatar.getJointTranslations();
+            var translations = this._getLocalAvatarJointTranslations(this.avatar);
             var size = rotations.length;
 
             // note: this mismatch can happen when the avatar's model is actively changing
@@ -118,11 +137,12 @@ Doppleganger.prototype = {
                 rotations = outRotations;
                 translations = outTranslations;
             }
-            modelHelper.editObject(this.objectID, {
+            var jointUpdates = {
                 jointRotations: rotations,
                 jointTranslations: translations
-            });
-            this.jointsUpdated(this.objectID);
+            };
+            modelHelper.editObject(this.objectID, jointUpdates);
+            this.jointsUpdated(this.objectID, jointUpdates);
         } catch (e) {
             log('.update error: '+ e, index, e.stack);
             this.stop('update_error');
@@ -134,7 +154,7 @@ Doppleganger.prototype = {
     // @param {vec3} [options.position=(in front of avatar)] - starting position
     // @param {quat} [options.orientation=avatar.orientation] - starting orientation
     start: function(options) {
-        options = assign(this.options, options);
+        options = utils.assign(this.options, options);
         if (this.objectID) {
             log('start() called but object model already exists', this.objectID);
             return;
@@ -194,11 +214,11 @@ Doppleganger.prototype = {
                 return this.stop(error);
             }
             debugPrint('model ('+modelHelper.type(this.objectID)+')' + ' is ready; # joints == ' + result.jointNames.length);
-            var naturalDimensions = modelHelper.getProperties(this.objectID, ['naturalDimensions']).naturalDimensions;
+            var naturalDimensions = this.naturalDimensions = modelHelper.getProperties(this.objectID, ['naturalDimensions']).naturalDimensions;
             debugPrint('naturalDimensions:', JSON.stringify(naturalDimensions));
             var props = { visible: true };
             if (naturalDimensions) {
-                props.dimensions = Vec3.multiply(this.scale, naturalDimensions);
+                props.dimensions = this.dimensions = Vec3.multiply(this.scale, naturalDimensions);
             }
             debugPrint('scaledDimensions:', this.scale, JSON.stringify(props.dimensions));
             modelHelper.editObject(this.objectID, props);
@@ -296,220 +316,18 @@ Doppleganger.prototype = {
         } else {
             debugPrint('creating Script.setInterval thread @ ~', Doppleganger.TARGET_FPS +'fps');
             var timeout = 1000 / Doppleganger.TARGET_FPS;
-            this._interval = Script.setInterval(bind(this, 'update'), timeout);
+            this._interval = Script.setInterval(utils.bind(this, 'update'), timeout);
         }
     }
 
 };
 
-// @function - bind a function to a `this` context
-// @param {Object} - the `this` context
-// @param {Function|String} - function or method name
-function bind(thiz, method) {
-    method = thiz[method] || method;
-    return function() {
-        return method.apply(thiz, arguments);
-    };
-}
-
-// @function - Qt signal polyfill
-function signal(template) {
-    var callbacks = [];
-    return Object.defineProperties(function() {
-        var args = [].slice.call(arguments);
-        callbacks.forEach(function(obj) {
-            obj.handler.apply(obj.scope, args);
-        });
-    }, {
-        connect: { value: function(scope, handler) {
-            var callback = {scope: scope, handler: scope[handler] || handler || scope};
-            if (!callback.handler || !callback.handler.apply) {
-                throw new Error('invalid arguments to connect:' + [template, scope, handler]);
-            }
-            callbacks.push({scope: scope, handler: scope[handler] || handler || scope});
-        }},
-        disconnect: { value: function(scope, handler) {
-            var match = {scope: scope, handler: scope[handler] || handler || scope};
-            callbacks = callbacks.filter(function(obj) {
-                return !(obj.scope === match.scope && obj.handler === match.handler);
-            });
-        }}
-    });
-}
-
-// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/assign#Polyfill
-/* eslint-disable */
-function assign(target, varArgs) { // .length of function is 2
-    'use strict';
-    if (target == null) { // TypeError if undefined or null
-        throw new TypeError('Cannot convert undefined or null to object');
-    }
-
-    var to = Object(target);
-
-    for (var index = 1; index < arguments.length; index++) {
-        var nextSource = arguments[index];
-
-        if (nextSource != null) { // Skip over if undefined or null
-            for (var nextKey in nextSource) {
-                // Avoid bugs when hasOwnProperty is shadowed
-                if (Object.prototype.hasOwnProperty.call(nextSource, nextKey)) {
-                    to[nextKey] = nextSource[nextKey];
-                }
-            }
-        }
-    }
-    return to;
-}
-/* eslint-enable */
-// //https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/assign#Polyfill
-
 // @function - debug logging
 function log() {
-    print('doppleganger | ' + [].slice.call(arguments).join(' '));
+    // eslint-disable-next-line no-console
+    (typeof console === 'object' ? console.log : print)('doppleganger | ' + [].slice.call(arguments).join(' '));
 }
 
 function debugPrint() {
     Doppleganger.WANT_DEBUG && log.apply(this, arguments);
 }
-
-// -- ADVANCED DEBUGGING --
-// @function - Add debug joint indicators / extra debugging info.
-// @param {Doppleganger} - existing Doppleganger instance to add controls to
-//
-// @note:
-//   * rightclick toggles mirror mode on/off
-//   * shift-rightclick toggles the debug indicators on/off
-//   * clicking on an indicator displays the joint name and mirrored joint name in the debug log.
-//
-// Example use:
-//    var doppleganger = new Doppleganger();
-//    Doppleganger.addDebugControls(doppleganger);
-Doppleganger.addDebugControls = function(doppleganger) {
-    DebugControls.COLOR_DEFAULT = { red: 255, blue: 255, green: 255 };
-    DebugControls.COLOR_SELECTED = { red: 0, blue: 255, green: 0 };
-
-    function DebugControls() {
-        this.enableIndicators = true;
-        this.selectedJointName = null;
-        this.debugOverlayIDs = undefined;
-        this.jointSelected = signal(function(result) {});
-    }
-    DebugControls.prototype = {
-        start: function() {
-            if (!this.onMousePressEvent) {
-                this.onMousePressEvent = this._onMousePressEvent;
-                Controller.mousePressEvent.connect(this, 'onMousePressEvent');
-            }
-        },
-
-        stop: function() {
-            this.removeIndicators();
-            if (this.onMousePressEvent) {
-                Controller.mousePressEvent.disconnect(this, 'onMousePressEvent');
-                delete this.onMousePressEvent;
-            }
-        },
-
-        createIndicators: function(jointNames) {
-            this.jointNames = jointNames;
-            return jointNames.map(function(name, i) {
-                return Overlays.addOverlay('shape', {
-                    shape: 'Icosahedron',
-                    scale: 0.1,
-                    solid: false,
-                    alpha: 0.5
-                });
-            });
-        },
-
-        removeIndicators: function() {
-            if (this.debugOverlayIDs) {
-                this.debugOverlayIDs.forEach(Overlays.deleteOverlay);
-                this.debugOverlayIDs = undefined;
-            }
-        },
-
-        onJointsUpdated: function(overlayID) {
-            if (!this.enableIndicators) {
-                return;
-            }
-            var jointNames = Overlays.getProperty(overlayID, 'jointNames'),
-                jointOrientations = Overlays.getProperty(overlayID, 'jointOrientations'),
-                jointPositions = Overlays.getProperty(overlayID, 'jointPositions'),
-                selectedIndex = jointNames.indexOf(this.selectedJointName);
-
-            if (!this.debugOverlayIDs) {
-                this.debugOverlayIDs = this.createIndicators(jointNames);
-            }
-
-            // batch all updates into a single call (using the editOverlays({ id: {props...}, ... }) API)
-            var updatedOverlays = this.debugOverlayIDs.reduce(function(updates, id, i) {
-                updates[id] = {
-                    position: jointPositions[i],
-                    rotation: jointOrientations[i],
-                    color: i === selectedIndex ? DebugControls.COLOR_SELECTED : DebugControls.COLOR_DEFAULT,
-                    solid: i === selectedIndex
-                };
-                return updates;
-            }, {});
-            Overlays.editOverlays(updatedOverlays);
-        },
-
-        _onMousePressEvent: function(evt) {
-            if (!evt.isLeftButton || !this.enableIndicators || !this.debugOverlayIDs) {
-                return;
-            }
-            var ray = Camera.computePickRay(evt.x, evt.y),
-                hit = Overlays.findRayIntersection(ray, true, this.debugOverlayIDs);
-
-            hit.jointIndex = this.debugOverlayIDs.indexOf(hit.overlayID);
-            hit.jointName = this.jointNames[hit.jointIndex];
-            this.jointSelected(hit);
-        }
-    };
-
-    if ('$debugControls' in doppleganger) {
-        throw new Error('only one set of debug controls can be added per doppleganger');
-    }
-    var debugControls = new DebugControls();
-    doppleganger.$debugControls = debugControls;
-
-    function onMousePressEvent(evt) {
-        if (evt.isRightButton) {
-            if (evt.isShifted) {
-                debugControls.enableIndicators = !debugControls.enableIndicators;
-                if (!debugControls.enableIndicators) {
-                    debugControls.removeIndicators();
-                }
-            } else {
-                doppleganger.mirrored = !doppleganger.mirrored;
-            }
-        }
-    }
-
-    doppleganger.activeChanged.connect(function(active) {
-        if (active) {
-            debugControls.start();
-            doppleganger.jointsUpdated.connect(debugControls, 'onJointsUpdated');
-            Controller.mousePressEvent.connect(onMousePressEvent);
-        } else {
-            Controller.mousePressEvent.disconnect(onMousePressEvent);
-            doppleganger.jointsUpdated.disconnect(debugControls, 'onJointsUpdated');
-            debugControls.stop();
-        }
-    });
-
-    debugControls.jointSelected.connect(function(hit) {
-        debugControls.selectedJointName = hit.jointName;
-        if (hit.jointIndex < 0) {
-            return;
-        }
-        hit.mirroredJointName = modelHelper.deriveMirroredJointNames([hit.jointName])[0];
-        log('selected joint:', JSON.stringify(hit, 0, 2));
-    });
-
-    Script.scriptEnding.connect(debugControls, 'removeIndicators');
-
-    return doppleganger;
-};
diff --git a/unpublishedScripts/marketplace/doppleganger-attachments/makefile b/unpublishedScripts/marketplace/doppleganger-attachments/makefile
new file mode 100644
index 0000000000..eaf02dbed9
--- /dev/null
+++ b/unpublishedScripts/marketplace/doppleganger-attachments/makefile
@@ -0,0 +1,11 @@
+all:
+	@echo "make dist"
+
+dist: doppleganger-a.svg.json doppleganger-i.svg.json dist/app-doppleganger-marketplace.js
+	@echo "OK"
+
+%.svg.json: %.svg
+	cat $< | jq -sR '"data:image/svg+xml;xml,"+.' > $@
+
+dist/app-doppleganger-marketplace.js: *.js
+	./node_modules/.bin/webpack --verbose app-doppleganger-attachments.js $@
diff --git a/unpublishedScripts/marketplace/doppleganger-attachments/model-helper.js b/unpublishedScripts/marketplace/doppleganger-attachments/model-helper.js
index 2dda2c12ec..8edaf50cb7 100644
--- a/unpublishedScripts/marketplace/doppleganger-attachments/model-helper.js
+++ b/unpublishedScripts/marketplace/doppleganger-attachments/model-helper.js
@@ -8,6 +8,7 @@
 //
 
 /* eslint-env commonjs */
+/* global console */
 // @module model-helper
 //
 // This module provides ModelReadyWatcher (a helper class for knowing when a model becomes usable inworld) and
@@ -18,10 +19,16 @@ var utils = require('./utils.js'),
     assert = utils.assert;
 
 module.exports = {
-    version: '0.0.0',
+    version: '0.0.1',
     ModelReadyWatcher: ModelReadyWatcher
 };
 
+function log() {
+    // eslint-disable-next-line no-console
+    (typeof console === 'object' ? console.log : print)('model-helper | ' + [].slice.call(arguments).join(' '));
+}
+log(module.exports.version);
+
 var _objectDeleted = utils.signal(function objectDeleted(objectID){});
 // proxy for _objectDeleted that only binds deletion tracking if script actually connects to the unified signal
 var objectDeleted = utils.assign(function objectDeleted(objectID){}, {
diff --git a/unpublishedScripts/marketplace/doppleganger-attachments/package.json b/unpublishedScripts/marketplace/doppleganger-attachments/package.json
new file mode 100644
index 0000000000..f18136fc1b
--- /dev/null
+++ b/unpublishedScripts/marketplace/doppleganger-attachments/package.json
@@ -0,0 +1,5 @@
+{
+  "devDependencies": {
+    "webpack": "^3.0.0"
+  }
+}
diff --git a/unpublishedScripts/marketplace/doppleganger-attachments/readme.md b/unpublishedScripts/marketplace/doppleganger-attachments/readme.md
new file mode 100644
index 0000000000..d0ebf2d6e1
--- /dev/null
+++ b/unpublishedScripts/marketplace/doppleganger-attachments/readme.md
@@ -0,0 +1,4 @@
+note: to rebuild webpack version:
+* install `jq` https://stedolan.github.io/jq (used to encode the icon.svg's as Data URI JSON strings)
+* `npm install`
+* `make dist`
diff --git a/unpublishedScripts/marketplace/doppleganger-attachments/utils.js b/unpublishedScripts/marketplace/doppleganger-attachments/utils.js
index 76c6e1ef7f..b34af1e632 100644
--- a/unpublishedScripts/marketplace/doppleganger-attachments/utils.js
+++ b/unpublishedScripts/marketplace/doppleganger-attachments/utils.js
@@ -1,12 +1,20 @@
 /* eslint-env commonjs */
+/* global console */
 
 module.exports = {
+    version: '0.0.1',
     bind: bind,
     signal: signal,
     assign: assign,
     assert: assert
 };
 
+function log() {
+    // eslint-disable-next-line no-console
+    (typeof console === 'object' ? console.log : print)('utils | ' + [].slice.call(arguments).join(' '));
+}
+log(module.exports.version);
+
 // @function - bind a function to a `this` context
 // @param {Object} - the `this` context
 // @param {Function|String} - function or method name
diff --git a/unpublishedScripts/marketplace/emoji-tablet/emojiTablet.js b/unpublishedScripts/marketplace/emoji-tablet/emojiTablet.js
new file mode 100644
index 0000000000..b4d01e77cf
--- /dev/null
+++ b/unpublishedScripts/marketplace/emoji-tablet/emojiTablet.js
@@ -0,0 +1,72 @@
+///
+/// emojiTablet.js
+/// A tablet app for sending emojis to other users
+/// 
+/// Author: Elisa Lupin-Jimenez
+/// Copyright High Fidelity 2017
+///
+/// Licensed under the Apache 2.0 License
+/// See accompanying license file or http://apache.org/
+///
+/// All assets are under CC Attribution Non-Commerical
+/// http://creativecommons.org/licenses/
+///
+
+var lib = Script.require("https://hifi-content.s3.amazonaws.com/elisalj/emoji_scripts/emojiLib.js?" + Date.now());
+
+(function() {
+
+    var APP_NAME = "EMOJIS";
+    var APP_URL = "https://hifi-content.s3.amazonaws.com/elisalj/emoji_scripts/emojiTabletUI.html?" + Date.now();
+    var APP_ICON = "https://hifi-content.s3.amazonaws.com/elisalj/emoji_scripts/icons/emoji-i.svg";
+    var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
+
+    var button = tablet.addButton({
+        icon: APP_ICON,
+        text: APP_NAME
+    });
+
+    // Activates tablet UI when selected from menu
+    function onClicked() {
+        tablet.gotoWebScreen(APP_URL);
+    };
+    button.clicked.connect(onClicked);
+
+    // Gives position right in front of user's avatar
+    function getPositionToCreateEntity() {
+        var direction = Quat.getFront(MyAvatar.orientation);
+        var distance = 0.3;
+        var position = Vec3.sum(MyAvatar.position, Vec3.multiply(direction, distance));
+        position.y += 0.5;
+        return position;
+    };
+
+    var emojiJSON = null;
+
+    // Handles emoji button clicks to retrieve the link to the emoji JSON from emojiLib
+    function onWebEventReceived(event) {
+        var emojiName = (JSON.parse(event)).data;
+        var url = lib.getEmoji(emojiName, lib.emojiLib);
+        if (url != null) {
+            emojiJSON = Script.require(url);
+            create3DEmoji(emojiJSON, null);
+        } else {
+            print("Unable to create emoji");
+        }
+    };
+    tablet.webEventReceived.connect(onWebEventReceived);
+
+    function create3DEmoji(emojiJSON, userName) {
+        print("Creating " + emojiJSON.name + " emoji");
+        emojiJSON.position = getPositionToCreateEntity(emojiJSON.personified);
+        var newEmoji = Entities.addEntity(emojiJSON);
+    };
+
+    // When tablet UI is closed and app is removed from menu
+    function cleanup() {
+        tablet.removeButton(button);
+    };
+    Script.scriptEnding.connect(cleanup);
+
+}());
+
diff --git a/unpublishedScripts/marketplace/laser/laser-a.svg b/unpublishedScripts/marketplace/laser/laser-a.svg
new file mode 100644
index 0000000000..74033b3e7a
--- /dev/null
+++ b/unpublishedScripts/marketplace/laser/laser-a.svg
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="140mm"
+   height="140mm"
+   viewBox="0 0 140 140"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="laser-a.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="1038.9217"
+     inkscape:cy="879.1901"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     objecttolerance="3"
+     inkscape:window-width="2194"
+     inkscape:window-height="1171"
+     inkscape:window-x="2186"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:pagecheckerboard="true" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-157)">
+    <circle
+       id="path3680"
+       cx="53.672615"
+       cy="245.59525"
+       r="20.410715"
+       style="stroke-width:0.26458332;fill:#000000;stroke:#000000;stroke-opacity:1" />
+    <path
+       sodipodi:type="star"
+       id="path3684"
+       sodipodi:sides="5"
+       sodipodi:cx="48.380951"
+       sodipodi:cy="175.29166"
+       sodipodi:r1="47.150944"
+       sodipodi:r2="13.598276"
+       sodipodi:arg1="1.0897856"
+       sodipodi:arg2="1.6872054"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 70.196535,217.09228 46.801561,188.7979 15.367586,208.95661 35.047691,177.96323 6.161985,154.29712 l 35.557948,9.13941 13.581627,-34.78516 2.295916,36.64185 37.279613,2.16768 -34.138995,13.5065 z"
+       inkscape:transform-center-x="1.9762951"
+       inkscape:transform-center-y="1.2684232"
+       style="stroke-width:0.26458332;fill:#000000;stroke:#000000;stroke-opacity:1"
+       transform="matrix(0.75680215,0,0,0.80599932,17.17868,104.2376)" />
+    <path
+       sodipodi:type="star"
+       id="path3694"
+       sodipodi:sides="5"
+       sodipodi:cx="53.381914"
+       sodipodi:cy="244.31365"
+       sodipodi:r1="48.628967"
+       sodipodi:r2="10.608823"
+       sodipodi:arg1="1.7183633"
+       sodipodi:arg2="2.3466818"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 46.231899,292.4141 45.95204,251.88623 5.4261854,252.37744 43.883994,239.58748 30.893657,201.19689 54.941748,233.82012 87.439133,209.60223 63.843862,242.55446 96.918688,265.97757 58.287917,253.71993 Z"
+       inkscape:transform-center-x="3.6110896"
+       inkscape:transform-center-y="0.36477657"
+       style="stroke-width:0.26458332;fill:#000000;stroke:#000000;stroke-opacity:1" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:7.708;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 56.694008,239.30541 135.65246,167.44572"
+       id="path3702"
+       inkscape:connector-curvature="0"
+       inkscape:transform-center-x="-1.5119048"
+       inkscape:transform-center-y="23.434524" />
+  </g>
+</svg>
diff --git a/unpublishedScripts/marketplace/laser/laser.svg b/unpublishedScripts/marketplace/laser/laser.svg
new file mode 100644
index 0000000000..a1f8887e90
--- /dev/null
+++ b/unpublishedScripts/marketplace/laser/laser.svg
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="140mm"
+   height="140mm"
+   viewBox="0 0 140 140"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="laser.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="1523.2074"
+     inkscape:cy="879.1901"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     objecttolerance="3"
+     inkscape:window-width="2194"
+     inkscape:window-height="1171"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-157)">
+    <circle
+       id="path3680"
+       cx="53.672615"
+       cy="245.59525"
+       r="20.410715"
+       style="stroke-width:0.26458332;fill:#ffffff;stroke:#ffffff;stroke-opacity:1" />
+    <path
+       sodipodi:type="star"
+       id="path3684"
+       sodipodi:sides="5"
+       sodipodi:cx="48.380951"
+       sodipodi:cy="175.29166"
+       sodipodi:r1="47.150944"
+       sodipodi:r2="13.598276"
+       sodipodi:arg1="1.0897856"
+       sodipodi:arg2="1.6872054"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 70.196535,217.09228 46.801561,188.7979 15.367586,208.95661 35.047691,177.96323 6.161985,154.29712 l 35.557948,9.13941 13.581627,-34.78516 2.295916,36.64185 37.279613,2.16768 -34.138995,13.5065 z"
+       inkscape:transform-center-x="1.9762951"
+       inkscape:transform-center-y="1.2684232"
+       style="stroke-width:0.26458332;fill:#ffffff;stroke:#ffffff;stroke-opacity:1"
+       transform="matrix(0.75680215,0,0,0.80599932,17.17868,104.2376)" />
+    <path
+       sodipodi:type="star"
+       id="path3694"
+       sodipodi:sides="5"
+       sodipodi:cx="53.381914"
+       sodipodi:cy="244.31365"
+       sodipodi:r1="48.628967"
+       sodipodi:r2="10.608823"
+       sodipodi:arg1="1.7183633"
+       sodipodi:arg2="2.3466818"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 46.231899,292.4141 45.95204,251.88623 5.4261854,252.37744 43.883994,239.58748 30.893657,201.19689 54.941748,233.82012 87.439133,209.60223 63.843862,242.55446 96.918688,265.97757 58.287917,253.71993 Z"
+       inkscape:transform-center-x="3.6110896"
+       inkscape:transform-center-y="0.36477657"
+       style="stroke-width:0.26458332;fill:#ffffff;stroke:#ffffff;stroke-opacity:1" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:7.70800018;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 56.694008,239.30541 135.65246,167.44572"
+       id="path3702"
+       inkscape:connector-curvature="0"
+       inkscape:transform-center-x="-1.5119048"
+       inkscape:transform-center-y="23.434524" />
+  </g>
+</svg>
diff --git a/unpublishedScripts/marketplace/laser/laserPointerApp.js b/unpublishedScripts/marketplace/laser/laserPointerApp.js
new file mode 100644
index 0000000000..aa049ea470
--- /dev/null
+++ b/unpublishedScripts/marketplace/laser/laserPointerApp.js
@@ -0,0 +1,273 @@
+//
+// Created by Alan-Michael Moody on 6/4/2017
+//
+
+'use strict';
+
+(function () {
+    Script.include("/~/system/libraries/controllers.js");
+
+    var APP_NAME = 'LASER',
+        APP_ICON = Script.resolvePath('laser.svg'),
+        APP_ICON_ACTIVE = Script.resolvePath('laser-a.svg');
+
+    var POINT_INDEX_CHANNEL = "Hifi-Point-Index",
+        GRAB_DISABLE_CHANNEL = "Hifi-Grab-Disable",
+        POINTER_DISABLE_CHANNEL = "Hifi-Pointer-Disable";
+
+    var TRIGGER_PRESSURE = 0.95;
+
+    var tablet = Tablet.getTablet('com.highfidelity.interface.tablet.system');
+
+    var button = tablet.addButton({
+        icon: APP_ICON,
+        activeIcon: APP_ICON_ACTIVE,
+        text: APP_NAME
+    });
+
+    var laserEntities = {
+        left: {
+            beam: null,
+            sphere: null
+        },
+        right: {
+            beam: null,
+            sphere: null
+        }
+    };
+
+    var rayExclusionList = [];
+
+    function laser(hand) {
+
+        var PICK_MAX_DISTANCE = 500;
+        var FORWARD_OFFSET = 0.05;
+
+        var isNewEntityNeeded = (laserEntities[hand].beam === null);
+
+        var jointName = hand === 'right' ? 'RightHandIndex4' : 'LeftHandIndex4'; //'RightHand' : 'LeftHand';
+
+        var _hand = hand === 'right' ? Controller.Standard.RightHand : Controller.Standard.LeftHand;
+        var controllerLocation = getControllerWorldLocation(_hand, true);
+
+        var worldControllerPosition = controllerLocation.position;
+        var worldControllerRotation = controllerLocation.orientation;
+
+        var jointExists = (MyAvatar.getJointIndex(jointName) > 0) ;
+        var CONTROLLER_FORWARD_OFFSET = Vec3.multiply(Quat.getUp(worldControllerRotation), FORWARD_OFFSET);
+
+        var pickRay = {
+            origin: worldControllerPosition,
+            direction: Quat.getUp(worldControllerRotation),
+            length: PICK_MAX_DISTANCE
+        };
+
+        if (jointExists) {
+            pickRay.origin = MyAvatar.getJointPosition(jointName);
+            pickRay.direction = MyAvatar.jointToWorldDirection(Vec3.UP, MyAvatar.getJointIndex(jointName));
+        }
+
+        var ray = Entities.findRayIntersection(pickRay, true, [], rayExclusionList, true);
+        var avatarRay = AvatarManager.findRayIntersection(pickRay, true, [], rayExclusionList, true);
+
+        var dist = PICK_MAX_DISTANCE;
+        var intersection = null;
+
+        if (avatarRay.intersects) {
+            intersection = avatarRay.intersection;
+            dist = Vec3.distance(pickRay.origin, avatarRay.intersection);
+        } else if (ray.intersects) {
+            intersection = ray.intersection;
+            dist = Vec3.distance(pickRay.origin, ray.intersection);
+        }
+
+        var sphereSize = dist * 0.01;
+
+        if (isNewEntityNeeded) {
+
+            var sphere = {
+                lifetime: 360,
+                type: 'Sphere',
+                dimensions: {x: sphereSize, y: sphereSize, z: sphereSize},
+                color: {red: 0, green: 255, blue: 0},
+                position: intersection,
+                collisionless: true,
+                visible: false
+            };
+
+            var beam = {
+                lifetime: 360,
+                type: 'Line',
+                glow: 1.0,
+                alpha: 0.5,
+                ignoreRayIntersection: true,
+                drawInFront: true,
+                color: {red: 0, green: 255, blue: 0},
+                parentID: MyAvatar.sessionUUID,
+                dimensions: Vec3.multiply(PICK_MAX_DISTANCE * 2, Vec3.ONE),
+                linePoints: [Vec3.ZERO, {x: 0, y: dist - FORWARD_OFFSET, z: 0}]
+            };
+
+            if(jointExists) {
+                beam.parentJointIndex = MyAvatar.getJointIndex(jointName);
+                beam.localPosition = {x: 0, y: FORWARD_OFFSET, z: 0};
+                beam.localRotation = Quat.normalize({});
+            } else {
+                beam.position = Vec3.sum(pickRay.origin, CONTROLLER_FORWARD_OFFSET);
+                beam.rotation = worldControllerRotation;
+            }
+
+            laserEntities[hand].beam = Entities.addEntity(beam,true);
+            rayExclusionList.push(laserEntities[hand].beam);
+
+            laserEntities[hand].sphere = Entities.addEntity(sphere,true);
+            rayExclusionList.push(laserEntities[hand].sphere);
+
+            if (ray.intersects || avatarRay.intersects) {
+                Entities.editEntity(laserEntities[hand].sphere, {
+                    visible: true
+                });
+            }
+
+        } else {
+            if (ray.intersects || avatarRay.intersects) {
+                if(jointExists) {
+                    Entities.editEntity(laserEntities[hand].beam, {
+                        parentID: MyAvatar.sessionUUID,
+                        parentJointIndex: MyAvatar.getJointIndex(jointName),
+                        localPosition: {x: 0, y: FORWARD_OFFSET, z: 0},
+                        localRotation: Quat.normalize({}),
+                        dimensions: Vec3.multiply(PICK_MAX_DISTANCE * 2, Vec3.ONE),
+                        linePoints: [Vec3.ZERO, {x: 0, y: dist - FORWARD_OFFSET, z: 0}]
+                    });
+                } else {
+                    Entities.editEntity(laserEntities[hand].beam, {
+                        parentID: MyAvatar.sessionUUID,
+                        parentJointIndex: MyAvatar.getJointIndex(jointName),
+                        position: Vec3.sum(pickRay.origin, CONTROLLER_FORWARD_OFFSET),
+                        rotation: worldControllerRotation,
+                        dimensions: Vec3.multiply(PICK_MAX_DISTANCE * 2, Vec3.ONE),
+                        linePoints: [Vec3.ZERO, {x: 0, y: dist - FORWARD_OFFSET, z: 0}]
+                    });
+                }
+
+                Entities.editEntity(laserEntities[hand].sphere, {
+                    dimensions: {x: sphereSize, y: sphereSize, z: sphereSize},
+                    position: intersection,
+                    visible: true
+                });
+            } else {
+                if(jointExists) {
+                    Entities.editEntity(laserEntities[hand].beam, {
+                        parentID: MyAvatar.sessionUUID,
+                        parentJointIndex: MyAvatar.getJointIndex(jointName),
+                        localPosition: {x: 0, y: FORWARD_OFFSET, z: 0},
+                        localRotation: Quat.normalize({}),
+                        dimensions: Vec3.multiply(PICK_MAX_DISTANCE * 2, Vec3.ONE),
+                        linePoints: [Vec3.ZERO, {x: 0, y: dist - FORWARD_OFFSET, z: 0}]
+                    });
+                } else {
+                    Entities.editEntity(laserEntities[hand].beam, {
+                        parentID: MyAvatar.sessionUUID,
+                        parentJointIndex: MyAvatar.getJointIndex(jointName),
+                        position: Vec3.sum(pickRay.origin, CONTROLLER_FORWARD_OFFSET),
+                        rotation: worldControllerRotation,
+                        dimensions: Vec3.multiply(PICK_MAX_DISTANCE * 2, Vec3.ONE),
+                        linePoints: [Vec3.ZERO, {x: 0, y: dist - FORWARD_OFFSET, z: 0}]
+                    });
+                }
+
+                Entities.editEntity(laserEntities[hand].sphere, {
+                    visible: false
+                });
+            }
+
+        }
+
+    }
+
+    function triggerWatcher(deltaTime) {
+
+        var deleteBeamLeft = true,
+            deleteBeamRight = true;
+
+        if (Controller.getValue(Controller.Standard.LT) > TRIGGER_PRESSURE) {
+            deleteBeamLeft = false;
+            laser('left');
+        }
+
+        if (Controller.getValue(Controller.Standard.RT) > TRIGGER_PRESSURE) {
+            deleteBeamRight = false;
+            laser('right');
+        }
+
+        if (deleteBeamLeft && laserEntities.left.beam !== null) {
+            Entities.deleteEntity(laserEntities.left.beam);
+            Entities.deleteEntity(laserEntities.left.sphere);
+
+            laserEntities.left.beam = null;
+            laserEntities.left.sphere = null;
+
+        }
+        if (deleteBeamRight && laserEntities.right.beam !== null) {
+            Entities.deleteEntity(laserEntities.right.beam);
+            Entities.deleteEntity(laserEntities.right.sphere);
+
+            laserEntities.right.beam = null;
+            laserEntities.right.sphere = null;
+
+        }
+        if (deleteBeamRight && deleteBeamLeft) {
+            rayExclusionList = [];
+        }
+    }
+
+    function selectionBeamSwitch(bool) {
+        Messages.sendMessage(GRAB_DISABLE_CHANNEL, JSON.stringify({
+            holdEnabled: bool,
+            nearGrabEnabled: bool,
+            farGrabEnabled: bool
+        }), true);
+        Messages.sendMessage(POINTER_DISABLE_CHANNEL, JSON.stringify({
+            pointerEnabled: bool
+        }), true);
+        Messages.sendMessage(POINT_INDEX_CHANNEL, JSON.stringify({
+            pointIndex: !bool
+        }), true);
+    }
+
+    var _switch = true;
+
+    function buttonSwitch() {
+        if (_switch) {
+            Script.update.connect(triggerWatcher);
+            Messages.subscribe(POINT_INDEX_CHANNEL);
+            Messages.subscribe(GRAB_DISABLE_CHANNEL);
+            Messages.subscribe(POINTER_DISABLE_CHANNEL);
+        } else {
+            Script.update.disconnect(triggerWatcher);
+            Messages.unsubscribe(POINT_INDEX_CHANNEL);
+            Messages.unsubscribe(GRAB_DISABLE_CHANNEL);
+            Messages.unsubscribe(POINTER_DISABLE_CHANNEL);
+        }
+        button.editProperties({isActive: _switch});
+
+        selectionBeamSwitch(!_switch);
+
+        _switch = !_switch;
+    }
+
+    button.clicked.connect(buttonSwitch);
+
+    function clean() {
+        tablet.removeButton(button);
+        Script.update.disconnect(triggerWatcher);
+
+        Messages.unsubscribe(POINT_INDEX_CHANNEL);
+        Messages.unsubscribe(GRAB_DISABLE_CHANNEL);
+        Messages.unsubscribe(POINTER_DISABLE_CHANNEL);
+        rayExclusionList = [];
+    }
+
+    Script.scriptEnding.connect(clean);
+}());
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/record/record.js b/unpublishedScripts/marketplace/record/record.js
index 5439d68c9a..68c7ea3f5a 100644
--- a/unpublishedScripts/marketplace/record/record.js
+++ b/unpublishedScripts/marketplace/record/record.js
@@ -486,6 +486,15 @@
             return isFinishOnOpen;
         }
 
+        function onAssetsDirChanged(recording) {
+            Window.assetsDirChanged.disconnect(onAssetsDirChanged);
+            if (recording !== "") {
+                log("Load recording " + recording);
+                UserActivityLogger.logAction("record_load_recording", logDetails());
+                Player.playRecording("atp:" + recording, MyAvatar.position, MyAvatar.orientation);
+            }
+        }
+
         function onWebEventReceived(data) {
             var message,
                 recording;
@@ -520,12 +529,8 @@
                     break;
                 case LOAD_RECORDING_ACTION:
                     // User wants to select an ATP recording to play.
-                    recording = Window.browseAssets("Select Recording to Play", "recordings", "*.hfr");
-                    if (recording) {
-                        log("Load recording " + recording);
-                        UserActivityLogger.logAction("record_load_recording", logDetails());
-                        Player.playRecording("atp:" + recording, MyAvatar.position, MyAvatar.orientation);
-                    }
+                    Window.assetsDirChanged.connect(onAssetsDirChanged);
+                    Window.browseAssetsAsync("Select Recording to Play", "recordings", "*.hfr");
                     break;
                 case START_RECORDING_ACTION:
                     // Start making a recording.
@@ -571,7 +576,7 @@
 
     function onTabletScreenChanged(type, url) {
         // Opened/closed dialog in tablet or window.
-        var RECORD_URL = "/scripts/system/html/record.html";
+        var RECORD_URL = "/html/record.html";
 
         if (type === "Web" && url.slice(-RECORD_URL.length) === RECORD_URL) {
             if (Dialog.finishOnOpen()) {
diff --git a/unpublishedScripts/marketplace/rocketHands/rockethands.js b/unpublishedScripts/marketplace/rocketHands/rockethands.js
new file mode 100644
index 0000000000..672dcf2540
--- /dev/null
+++ b/unpublishedScripts/marketplace/rocketHands/rockethands.js
@@ -0,0 +1,59 @@
+"use strict";
+
+/*
+	rockethands.js
+	unpublishedScripts/marketplace/rocketHands/rockethands.js
+
+	Created by Cain Kilgore on 30/06/2017
+	Copyright 2017 High Fidelity, Inc.
+
+	Distributed under the Apache License, Version 2.0.
+	See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+*/
+
+(function() {
+	var isRocketing = false;
+	
+	function checkRocketing() {
+		if (HMD.active && (Controller.Hardware.Vive || Controller.Hardware.OculusTouch) && canRocket()) {
+			isRocketing = true;
+			MyAvatar.motorReferenceFrame = "world";
+			var moveVector = Vec3.multiply(Quat.getFront(Camera.getOrientation()), 10);
+			if (!MyAvatar.isFlying()) {
+				moveVector = Vec3.sum(moveVector, {x: 0, y: 1, z: 0});
+			}
+			MyAvatar.motorVelocity = moveVector;
+			MyAvatar.motorTimescale = 1.0;
+		} else {
+			checkCanStopRocketing();
+		}
+	};
+	
+	function checkCanStopRocketing() {
+		if (isRocketing) {
+			MyAvatar.motorVelocity = 0;
+			isRocketing = false;
+		}
+	}
+	
+	function canRocket() {
+		var leftHand = Controller.getPoseValue(Controller.Standard.LeftHand);
+		var rightHand = Controller.getPoseValue(Controller.Standard.RightHand);
+		var leftWorldControllerPos = Vec3.sum(MyAvatar.position, Vec3.multiplyQbyV(MyAvatar.orientation, leftHand.translation));
+		var rightWorldControllerPos = Vec3.sum(MyAvatar.position, Vec3.multiplyQbyV(MyAvatar.orientation, rightHand.translation));
+		var hipPosition = MyAvatar.getJointPosition("Hips");
+		var controllerHipThreshold = 0.1; // In Meters. Experimentally determined. Used to figure out if user's hands are "close enough" to their hips.
+		var controllerRotationThreshold = 0.25; // In Radians. Experimentally determined. Used to figure out if user's hands are within a rotation threshold.
+				
+		return ((leftWorldControllerPos.y > (hipPosition.y - controllerHipThreshold)) &&
+				(leftWorldControllerPos.y < (hipPosition.y + controllerHipThreshold)) &&
+				(rightWorldControllerPos.y > (hipPosition.y - controllerHipThreshold)) &&
+				(rightWorldControllerPos.y < (hipPosition.y + controllerHipThreshold)) &&
+				leftHand.rotation.y < controllerRotationThreshold &&
+				leftHand.rotation.y > -controllerRotationThreshold &&
+				rightHand.rotation.y < controllerRotationThreshold &&
+				rightHand.rotation.y > -controllerRotationThreshold);
+	}
+	
+	Script.update.connect(checkRocketing);
+}());
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/audio/clone.wav b/unpublishedScripts/marketplace/shapes/assets/audio/clone.wav
new file mode 100644
index 0000000000..2a0e21cdd2
Binary files /dev/null and b/unpublishedScripts/marketplace/shapes/assets/audio/clone.wav differ
diff --git a/unpublishedScripts/marketplace/shapes/assets/audio/create.wav b/unpublishedScripts/marketplace/shapes/assets/audio/create.wav
new file mode 100644
index 0000000000..9571c5cff7
Binary files /dev/null and b/unpublishedScripts/marketplace/shapes/assets/audio/create.wav differ
diff --git a/unpublishedScripts/marketplace/shapes/assets/audio/delete.wav b/unpublishedScripts/marketplace/shapes/assets/audio/delete.wav
new file mode 100644
index 0000000000..da93ca7e10
Binary files /dev/null and b/unpublishedScripts/marketplace/shapes/assets/audio/delete.wav differ
diff --git a/unpublishedScripts/marketplace/shapes/assets/audio/drop.wav b/unpublishedScripts/marketplace/shapes/assets/audio/drop.wav
new file mode 100644
index 0000000000..32d0e9f65a
Binary files /dev/null and b/unpublishedScripts/marketplace/shapes/assets/audio/drop.wav differ
diff --git a/unpublishedScripts/marketplace/shapes/assets/audio/equip.wav b/unpublishedScripts/marketplace/shapes/assets/audio/equip.wav
new file mode 100644
index 0000000000..32d0e9f65a
Binary files /dev/null and b/unpublishedScripts/marketplace/shapes/assets/audio/equip.wav differ
diff --git a/unpublishedScripts/marketplace/shapes/assets/audio/error.wav b/unpublishedScripts/marketplace/shapes/assets/audio/error.wav
new file mode 100644
index 0000000000..934a4d366b
Binary files /dev/null and b/unpublishedScripts/marketplace/shapes/assets/audio/error.wav differ
diff --git a/unpublishedScripts/marketplace/shapes/assets/audio/select.wav b/unpublishedScripts/marketplace/shapes/assets/audio/select.wav
new file mode 100644
index 0000000000..e97b5ea6d7
Binary files /dev/null and b/unpublishedScripts/marketplace/shapes/assets/audio/select.wav differ
diff --git a/unpublishedScripts/marketplace/shapes/assets/blue-header-bar.fbx b/unpublishedScripts/marketplace/shapes/assets/blue-header-bar.fbx
new file mode 100644
index 0000000000..951a6667e7
Binary files /dev/null and b/unpublishedScripts/marketplace/shapes/assets/blue-header-bar.fbx differ
diff --git a/unpublishedScripts/marketplace/shapes/assets/create/circle.fbx b/unpublishedScripts/marketplace/shapes/assets/create/circle.fbx
new file mode 100644
index 0000000000..db43fafab6
Binary files /dev/null and b/unpublishedScripts/marketplace/shapes/assets/create/circle.fbx differ
diff --git a/unpublishedScripts/marketplace/shapes/assets/create/cone.fbx b/unpublishedScripts/marketplace/shapes/assets/create/cone.fbx
new file mode 100644
index 0000000000..d590ee04be
Binary files /dev/null and b/unpublishedScripts/marketplace/shapes/assets/create/cone.fbx differ
diff --git a/unpublishedScripts/marketplace/shapes/assets/create/create-heading.svg b/unpublishedScripts/marketplace/shapes/assets/create/create-heading.svg
new file mode 100644
index 0000000000..fa2a096ede
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/create/create-heading.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="363px" height="82px" viewBox="0 0 363 82" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>CREATE</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Create-Palette" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Empty-Palette" transform="translate(-1019.000000, -200.000000)" fill="#FFFFFF">
+            <path d="M1053.612,200.704 C1034.236,200.704 1019.34,215.04 1019.34,241.136 C1019.34,267.568 1033.452,281.792 1054.06,281.792 C1064.812,281.792 1072.988,277.088 1077.916,272.048 L1070.3,262.304 C1065.82,265.776 1061.34,268.8 1054.844,268.8 C1044.204,268.8 1036.7,260.624 1036.7,241.136 C1036.7,220.976 1044.316,213.136 1054.62,213.136 C1059.996,213.136 1064.476,215.04 1068.732,218.736 L1077.02,209.104 C1070.636,203.728 1063.916,200.704 1053.612,200.704 Z M1112.076,249.648 L1103.676,249.648 L1103.676,280 L1087.212,280 L1087.212,202.496 L1111.404,202.496 C1132.124,202.496 1142.652,210 1142.652,225.68 C1142.652,235.984 1137.612,242.144 1127.308,246.624 L1147.356,280 L1128.652,280 L1112.076,249.648 Z M1103.676,238 L1112.3,238 C1120.924,238 1125.628,234.416 1125.628,225.68 C1125.628,217.728 1121.036,214.256 1111.068,214.256 L1103.676,214.256 L1103.676,238 Z M1200.444,214.48 L1202.236,202.496 L1155.98,202.496 L1155.98,280 L1202.46,280 L1202.46,267.904 L1172.444,267.904 L1172.444,246.512 L1196.86,246.512 L1196.86,234.64 L1172.444,234.64 L1172.444,214.48 L1200.444,214.48 Z M1251.74,262.64 L1227.436,262.64 L1223.068,280 L1205.932,280 L1229.788,202.496 L1249.836,202.496 L1273.58,280 L1256.108,280 L1251.74,262.64 Z M1248.604,250.432 L1239.532,214.704 L1230.572,250.432 L1248.604,250.432 Z M1324.764,215.376 L1305.164,215.376 L1305.164,280 L1288.7,280 L1288.7,215.376 L1268.092,215.376 L1268.092,202.496 L1326.556,202.496 L1324.764,215.376 Z M1379.42,214.48 L1381.212,202.496 L1334.956,202.496 L1334.956,280 L1381.436,280 L1381.436,267.904 L1351.42,267.904 L1351.42,246.512 L1375.836,246.512 L1375.836,234.64 L1351.42,234.64 L1351.42,214.48 L1379.42,214.48 Z" id="CREATE"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/create/cube.fbx b/unpublishedScripts/marketplace/shapes/assets/create/cube.fbx
new file mode 100644
index 0000000000..fa079219fe
Binary files /dev/null and b/unpublishedScripts/marketplace/shapes/assets/create/cube.fbx differ
diff --git a/unpublishedScripts/marketplace/shapes/assets/create/cylinder.fbx b/unpublishedScripts/marketplace/shapes/assets/create/cylinder.fbx
new file mode 100644
index 0000000000..319cbf0a6d
Binary files /dev/null and b/unpublishedScripts/marketplace/shapes/assets/create/cylinder.fbx differ
diff --git a/unpublishedScripts/marketplace/shapes/assets/create/dodecahedron.fbx b/unpublishedScripts/marketplace/shapes/assets/create/dodecahedron.fbx
new file mode 100644
index 0000000000..af2b7f3f55
Binary files /dev/null and b/unpublishedScripts/marketplace/shapes/assets/create/dodecahedron.fbx differ
diff --git a/unpublishedScripts/marketplace/shapes/assets/create/hexagon.fbx b/unpublishedScripts/marketplace/shapes/assets/create/hexagon.fbx
new file mode 100644
index 0000000000..ffb63fb64d
Binary files /dev/null and b/unpublishedScripts/marketplace/shapes/assets/create/hexagon.fbx differ
diff --git a/unpublishedScripts/marketplace/shapes/assets/create/icosahedron.fbx b/unpublishedScripts/marketplace/shapes/assets/create/icosahedron.fbx
new file mode 100644
index 0000000000..3103d6b2d6
Binary files /dev/null and b/unpublishedScripts/marketplace/shapes/assets/create/icosahedron.fbx differ
diff --git a/unpublishedScripts/marketplace/shapes/assets/create/octagon.fbx b/unpublishedScripts/marketplace/shapes/assets/create/octagon.fbx
new file mode 100644
index 0000000000..8de0f6f6f3
Binary files /dev/null and b/unpublishedScripts/marketplace/shapes/assets/create/octagon.fbx differ
diff --git a/unpublishedScripts/marketplace/shapes/assets/create/octahedron.fbx b/unpublishedScripts/marketplace/shapes/assets/create/octahedron.fbx
new file mode 100644
index 0000000000..6798566d3b
Binary files /dev/null and b/unpublishedScripts/marketplace/shapes/assets/create/octahedron.fbx differ
diff --git a/unpublishedScripts/marketplace/shapes/assets/create/prism.fbx b/unpublishedScripts/marketplace/shapes/assets/create/prism.fbx
new file mode 100644
index 0000000000..f1ddc4933e
Binary files /dev/null and b/unpublishedScripts/marketplace/shapes/assets/create/prism.fbx differ
diff --git a/unpublishedScripts/marketplace/shapes/assets/create/sphere.fbx b/unpublishedScripts/marketplace/shapes/assets/create/sphere.fbx
new file mode 100644
index 0000000000..43b077b225
Binary files /dev/null and b/unpublishedScripts/marketplace/shapes/assets/create/sphere.fbx differ
diff --git a/unpublishedScripts/marketplace/shapes/assets/create/tetrahedron.fbx b/unpublishedScripts/marketplace/shapes/assets/create/tetrahedron.fbx
new file mode 100644
index 0000000000..60dd70edb1
Binary files /dev/null and b/unpublishedScripts/marketplace/shapes/assets/create/tetrahedron.fbx differ
diff --git a/unpublishedScripts/marketplace/shapes/assets/gray-header.fbx b/unpublishedScripts/marketplace/shapes/assets/gray-header.fbx
new file mode 100644
index 0000000000..0f51d66f38
Binary files /dev/null and b/unpublishedScripts/marketplace/shapes/assets/gray-header.fbx differ
diff --git a/unpublishedScripts/marketplace/shapes/assets/green-header-bar.fbx b/unpublishedScripts/marketplace/shapes/assets/green-header-bar.fbx
new file mode 100644
index 0000000000..cf76830d8c
Binary files /dev/null and b/unpublishedScripts/marketplace/shapes/assets/green-header-bar.fbx differ
diff --git a/unpublishedScripts/marketplace/shapes/assets/green-header.fbx b/unpublishedScripts/marketplace/shapes/assets/green-header.fbx
new file mode 100644
index 0000000000..db77ecf0bd
Binary files /dev/null and b/unpublishedScripts/marketplace/shapes/assets/green-header.fbx differ
diff --git a/unpublishedScripts/marketplace/shapes/assets/horizontal-rule.svg b/unpublishedScripts/marketplace/shapes/assets/horizontal-rule.svg
new file mode 100644
index 0000000000..d7dc41f719
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/horizontal-rule.svg
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="10"
+   height="10"
+   viewBox="0 0 2.6458333 2.6458333"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="horizontal-rule.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8"
+     inkscape:cx="-0.6875"
+     inkscape:cy="-8.2596372"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="927"
+     inkscape:window-height="654"
+     inkscape:window-x="222"
+     inkscape:window-y="113"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-294.35417)">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke-width:0.08262138"
+       id="rect5036"
+       width="2.6458333"
+       height="0.52916664"
+       x="4.4408921e-016"
+       y="295.41251"
+       ry="0" />
+  </g>
+</svg>
diff --git a/unpublishedScripts/marketplace/shapes/assets/shapes-a.svg b/unpublishedScripts/marketplace/shapes/assets/shapes-a.svg
new file mode 100644
index 0000000000..07918ba294
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/shapes-a.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.1.0, 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 50 50" style="enable-background:new 0 0 50 50;" xml:space="preserve">
+<path d="M45.7,29.4c-1.1-1.9-2.9-2.7-4.8-2.4c0-0.2,0.1-0.4,0.1-0.6V15c0-0.8-0.4-1.5-1.1-1.9l-10.1-6c-0.9-0.5-1.9-0.5-2.8,0
+	l-9.9,6C16.4,13.5,16,14.2,16,15v9.8c-0.3,0,0.2,0-0.2,0c-3.8-0.1-7,1.3-9.8,3.9c-2.3,2.2-2.2,2-2.3,2.2c-0.5,0.5-0.5,1.3-0.1,1.7
+	c0.4,0.4,1,0.5,1.6,0c0.2-0.1,0,0,2.3-2.2c1.9-1.8,4-3.1,6.6-3.2c4.7-0.2,5.5-0.1,10.2-0.1c0.9,0,1.7,0.6,2.1,1
+	c0.6,0.7,0.7,2.1,0.3,3c-0.5,1.1-1.4,1.5-2.6,1.5c-0.2,0-7.3,0-8,0c-0.8,0-1.1,0.6-1.1,1.1c0,0.6,0.4,1.2,1.1,1.2c2.9,0,5.7,0,8.6,0
+	c2.6,0,5.1-0.3,7.5-1.4c2.8-1.2,5.3-2.9,8.1-4.2c0.4-0.2,0.9-0.3,1.3-0.3c1.2,0.1,2,1,2.3,2.2c0.2,1.2-0.3,2.3-1.5,2.9
+	c-4.1,2-7.9,4.1-12,6c-2.5,1.2-5.2,1.5-8,1.5c-4.2,0-12.7,0-12.8,0c-1.7,0.1-1.4,2.4,0,2.4c0.6,0,8.7-0.1,12.6,0
+	c3.8,0,6.8-0.6,9.9-2.1c2.6-1.3,5.1-2.6,7.7-3.9c1.5-0.7,2.9-1.4,4.3-2.3C46.5,34.5,47,31.6,45.7,29.4z M20.8,13.4l6.6-4
+	c0.6-0.4,1.4-0.4,2,0l9,5.3c0.3,0.2,0.5,0.6,0.5,1v10.6c0,0.8-0.4,1.4-1,1.8c0,0-4.5,2.6-4.9,2.8c-0.6,0.3-2.1,1-2.1,1
+	c-0.7,0.3-1.6-0.1-1.6-1l0-8.5c0-0.4,0.2-0.8,0.6-1l6.5-3.8c0.5-0.3,0.7-0.9,0.4-1.4c-0.3-0.5-0.9-0.7-1.4-0.4L29,19.3
+	c-0.2,0.1-0.4,0.2-0.6,0.2c-0.2,0-0.5-0.1-0.7-0.2l-7-4C20,14.9,20,13.8,20.8,13.4z"/>
+</svg>
diff --git a/unpublishedScripts/marketplace/shapes/assets/shapes-d.svg b/unpublishedScripts/marketplace/shapes/assets/shapes-d.svg
new file mode 100644
index 0000000000..fa64b519b9
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/shapes-d.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.1.0, 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 50 50" style="enable-background:new 0 0 50 50;" xml:space="preserve" opacity="0.33">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M45.7,29.4c-1.1-1.9-2.9-2.7-4.8-2.4c0-0.2,0.1-0.4,0.1-0.6V15c0-0.8-0.4-1.5-1.1-1.9l-10.1-6
+	c-0.9-0.5-1.9-0.5-2.8,0l-9.9,6C16.4,13.5,16,14.2,16,15v9.8c-0.3,0,0.2,0-0.2,0c-3.8-0.1-7,1.3-9.8,3.9c-2.3,2.2-2.2,2-2.3,2.2
+	c-0.5,0.5-0.5,1.3-0.1,1.7c0.4,0.4,1,0.5,1.6,0c0.2-0.1,0,0,2.3-2.2c1.9-1.8,4-3.1,6.6-3.2c4.7-0.2,5.5-0.1,10.2-0.1
+	c0.9,0,1.7,0.6,2.1,1c0.6,0.7,0.7,2.1,0.3,3c-0.5,1.1-1.4,1.5-2.6,1.5c-0.2,0-7.3,0-8,0c-0.8,0-1.1,0.6-1.1,1.1
+	c0,0.6,0.4,1.2,1.1,1.2c2.9,0,5.7,0,8.6,0c2.6,0,5.1-0.3,7.5-1.4c2.8-1.2,5.3-2.9,8.1-4.2c0.4-0.2,0.9-0.3,1.3-0.3
+	c1.2,0.1,2,1,2.3,2.2c0.2,1.2-0.3,2.3-1.5,2.9c-4.1,2-7.9,4.1-12,6c-2.5,1.2-5.2,1.5-8,1.5c-4.2,0-12.7,0-12.8,0
+	c-1.7,0.1-1.4,2.4,0,2.4c0.6,0,8.7-0.1,12.6,0c3.8,0,6.8-0.6,9.9-2.1c2.6-1.3,5.1-2.6,7.7-3.9c1.5-0.7,2.9-1.4,4.3-2.3
+	C46.5,34.5,47,31.6,45.7,29.4z M20.8,13.4l6.6-4c0.6-0.4,1.4-0.4,2,0l9,5.3c0.3,0.2,0.5,0.6,0.5,1v10.6c0,0.8-0.4,1.4-1,1.8
+	c0,0-4.5,2.6-4.9,2.8c-0.6,0.3-2.1,1-2.1,1c-0.7,0.3-1.6-0.1-1.6-1l0-8.5c0-0.4,0.2-0.8,0.6-1l6.5-3.8c0.5-0.3,0.7-0.9,0.4-1.4
+	c-0.3-0.5-0.9-0.7-1.4-0.4L29,19.3c-0.2,0.1-0.4,0.2-0.6,0.2c-0.2,0-0.5-0.1-0.7-0.2l-7-4C20,14.9,20,13.8,20.8,13.4z"/>
+</svg>
diff --git a/unpublishedScripts/marketplace/shapes/assets/shapes-i.svg b/unpublishedScripts/marketplace/shapes/assets/shapes-i.svg
new file mode 100644
index 0000000000..cc9df9e64a
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/shapes-i.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.1.0, 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 50 50" style="enable-background:new 0 0 50 50;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M45.7,29.4c-1.1-1.9-2.9-2.7-4.8-2.4c0-0.2,0.1-0.4,0.1-0.6V15c0-0.8-0.4-1.5-1.1-1.9l-10.1-6
+	c-0.9-0.5-1.9-0.5-2.8,0l-9.9,6C16.4,13.5,16,14.2,16,15v9.8c-0.3,0,0.2,0-0.2,0c-3.8-0.1-7,1.3-9.8,3.9c-2.3,2.2-2.2,2-2.3,2.2
+	c-0.5,0.5-0.5,1.3-0.1,1.7c0.4,0.4,1,0.5,1.6,0c0.2-0.1,0,0,2.3-2.2c1.9-1.8,4-3.1,6.6-3.2c4.7-0.2,5.5-0.1,10.2-0.1
+	c0.9,0,1.7,0.6,2.1,1c0.6,0.7,0.7,2.1,0.3,3c-0.5,1.1-1.4,1.5-2.6,1.5c-0.2,0-7.3,0-8,0c-0.8,0-1.1,0.6-1.1,1.1
+	c0,0.6,0.4,1.2,1.1,1.2c2.9,0,5.7,0,8.6,0c2.6,0,5.1-0.3,7.5-1.4c2.8-1.2,5.3-2.9,8.1-4.2c0.4-0.2,0.9-0.3,1.3-0.3
+	c1.2,0.1,2,1,2.3,2.2c0.2,1.2-0.3,2.3-1.5,2.9c-4.1,2-7.9,4.1-12,6c-2.5,1.2-5.2,1.5-8,1.5c-4.2,0-12.7,0-12.8,0
+	c-1.7,0.1-1.4,2.4,0,2.4c0.6,0,8.7-0.1,12.6,0c3.8,0,6.8-0.6,9.9-2.1c2.6-1.3,5.1-2.6,7.7-3.9c1.5-0.7,2.9-1.4,4.3-2.3
+	C46.5,34.5,47,31.6,45.7,29.4z M20.8,13.4l6.6-4c0.6-0.4,1.4-0.4,2,0l9,5.3c0.3,0.2,0.5,0.6,0.5,1v10.6c0,0.8-0.4,1.4-1,1.8
+	c0,0-4.5,2.6-4.9,2.8c-0.6,0.3-2.1,1-2.1,1c-0.7,0.3-1.6-0.1-1.6-1l0-8.5c0-0.4,0.2-0.8,0.6-1l6.5-3.8c0.5-0.3,0.7-0.9,0.4-1.4
+	c-0.3-0.5-0.9-0.7-1.4-0.4L29,19.3c-0.2,0.1-0.4,0.2-0.6,0.2c-0.2,0-0.5-0.1-0.7-0.2l-7-4C20,14.9,20,13.8,20.8,13.4z"/>
+</svg>
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/back-heading.svg b/unpublishedScripts/marketplace/shapes/assets/tools/back-heading.svg
new file mode 100644
index 0000000000..d70f315ea1
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/back-heading.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="256px" height="82px" viewBox="0 0 256 82" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>BACK</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Headers" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Header---Voxel-Paint---Hover-State" transform="translate(-1077.000000, -200.000000)" fill="#FFFFFF">
+            <path d="M1117.06,239.008 C1125.796,240.688 1134.644,244.832 1134.644,257.488 C1134.644,274.848 1120.644,280 1101.604,280 L1077.412,280 L1077.412,202.496 L1098.58,202.496 C1118.852,202.496 1131.284,207.984 1131.284,222.32 C1131.284,232.064 1124.228,237.328 1117.06,239.008 Z M1093.876,214.368 L1093.876,233.968 L1101.94,233.968 C1109.78,233.968 1114.484,230.72 1114.484,223.776 C1114.484,216.608 1109.668,214.368 1100.148,214.368 L1093.876,214.368 Z M1101.716,267.792 C1110.9,267.792 1117.508,266 1117.508,256.816 C1117.508,248.192 1111.46,245.168 1103.172,245.168 L1093.876,245.168 L1093.876,267.792 L1101.716,267.792 Z M1180.676,262.64 L1156.372,262.64 L1152.004,280 L1134.868,280 L1158.724,202.496 L1178.772,202.496 L1202.516,280 L1185.044,280 L1180.676,262.64 Z M1177.54,250.432 L1168.468,214.704 L1159.508,250.432 L1177.54,250.432 Z M1236.676,200.704 C1246.98,200.704 1253.7,203.728 1260.084,209.104 L1251.796,218.736 C1247.54,215.04 1243.06,213.136 1237.684,213.136 C1227.38,213.136 1219.764,220.976 1219.764,241.136 C1219.764,260.624 1227.268,268.8 1237.908,268.8 C1244.404,268.8 1248.884,265.776 1253.364,262.304 L1260.98,272.048 C1256.052,277.088 1247.876,281.792 1237.124,281.792 C1216.516,281.792 1202.404,267.568 1202.404,241.136 C1202.404,215.04 1217.3,200.704 1236.676,200.704 Z M1286.74,280 L1286.74,202.496 L1270.276,202.496 L1270.276,280 L1286.74,280 Z M1304.884,237.44 L1330.756,202.496 L1313.172,202.496 L1287.412,238.672 L1313.508,280 L1332.772,280 L1304.884,237.44 Z" id="BACK"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/back-icon.svg b/unpublishedScripts/marketplace/shapes/assets/tools/back-icon.svg
new file mode 100644
index 0000000000..7de1781804
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/back-icon.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="69px" height="107px" viewBox="0 0 69 107" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>back-icon</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Icons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Tool-Icons" transform="translate(-2009.000000, -1333.000000)" fill="#AFAFAF">
+            <g id="back-icon" transform="translate(2009.000000, 1333.000000)">
+                <path d="M11.3466431,106.742334 C8.54499352,106.742334 6.30370745,105.901851 4.62271767,104.220862 C-0.420251646,99.7382222 -0.420251646,94.9754893 4.62271767,89.93252 L39.9233264,54.6319113 L3.78222699,17.6503212 C-1.26074233,13.1676818 -1.26074233,8.40494887 3.78222699,3.36197955 C8.26486638,-1.12065985 13.0275993,-1.12065985 18.0705686,3.36197955 L68.5000097,54.6319113 L18.0705686,104.220862 C16.3895788,105.901851 14.1482928,106.742334 11.3466431,106.742334 Z" id="B" transform="translate(34.250005, 53.371167) rotate(180.000000) translate(-34.250005, -53.371167) "></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/clone-icon.svg b/unpublishedScripts/marketplace/shapes/assets/tools/clone-icon.svg
new file mode 100644
index 0000000000..324c7d57ba
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/clone-icon.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="154px" height="155px" viewBox="0 0 154 155" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>clone-icon</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Icons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Tool-Icons" transform="translate(-1406.000000, -749.000000)" fill="#AFAFAF">
+            <g id="clone-icon" transform="translate(1406.000000, 749.000000)">
+                <path d="M122.075169,32.1417731 C120.939532,30.995494 119.349099,30.2790696 117.607368,30.2799708 L42.7057314,30.2799708 L42.7057314,12.6892732 L141.374701,12.6892732 L141.374701,112.033459 L123.920467,112.033459 L123.920467,36.6241568 C123.921368,34.8813079 123.214409,33.2853487 122.075169,32.1417731 L122.075169,32.1417731 Z M12.6261995,142.311627 L111.294269,142.311627 L111.294269,42.9674416 L12.6261995,42.9674416 L12.6261995,142.311627 Z M152.154701,1.86270348 C151.019964,0.716424415 149.42773,0 147.6869,0 L36.392632,0 C34.6518016,0 33.0604683,0.715523252 31.9248309,1.86180232 C30.7864917,3.00537789 30.0786321,4.60133718 30.0795327,6.34508717 L30.0795327,30.2799708 L6.3131002,30.2799708 C4.57226981,30.2790696 2.9809365,30.995494 1.84529908,32.1417731 C0.706959915,33.2853487 -0.000899726469,34.8813079 8.58316089e-07,36.6241568 L8.58316089e-07,148.655813 C-0.000899726469,150.399563 0.706959915,151.995522 1.84529908,153.138197 C2.9809365,154.284476 4.57226981,155.0009 6.3131002,154.999999 L117.607368,154.999999 C119.349099,155.0009 120.939532,154.284476 122.075169,153.138197 C123.214409,151.994621 123.921368,150.398662 123.920467,148.655813 L123.920467,124.721831 L147.6869,124.721831 C149.42773,124.722732 151.019964,124.005406 152.154701,122.859127 C153.29304,121.716453 154.0009,120.120494 153.999999,118.377645 L153.999999,6.34508717 C154.0009,4.60133718 153.29304,3.00537789 152.154701,1.86270348 L152.154701,1.86270348 Z" id="Fill-1"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/clone-label.svg b/unpublishedScripts/marketplace/shapes/assets/tools/clone-label.svg
new file mode 100644
index 0000000000..1a141714e8
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/clone-label.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="231px" height="59px" viewBox="0 0 231 59" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>CLONE</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Tool-Palette" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Tool-Palette---Default" transform="translate(-1365.000000, -983.000000)" fill="#FFFFFF">
+            <path d="M1389.74,983.36 C1375.9,983.36 1365.26,993.6 1365.26,1012.24 C1365.26,1031.12 1375.34,1041.28 1390.06,1041.28 C1397.74,1041.28 1403.58,1037.92 1407.1,1034.32 L1401.66,1027.36 C1398.46,1029.84 1395.26,1032 1390.62,1032 C1383.02,1032 1377.66,1026.16 1377.66,1012.24 C1377.66,997.84 1383.1,992.24 1390.46,992.24 C1394.3,992.24 1397.5,993.6 1400.54,996.24 L1406.46,989.36 C1401.9,985.52 1397.1,983.36 1389.74,983.36 Z M1425.5,1030.56 L1425.5,984.64 L1413.74,984.64 L1413.74,1040 L1446.14,1040 L1447.42,1030.56 L1425.5,1030.56 Z M1475.5,983.36 C1490.7,983.36 1500.06,993.76 1500.06,1012.32 C1500.06,1030.48 1490.7,1041.28 1475.5,1041.28 C1460.3,1041.28 1450.86,1030.8 1450.86,1012.32 C1450.86,994.24 1460.3,983.36 1475.5,983.36 Z M1475.5,992.16 C1467.66,992.16 1463.26,997.84 1463.26,1012.32 C1463.26,1026.8 1467.82,1032.48 1475.5,1032.48 C1483.42,1032.48 1487.66,1026.8 1487.66,1012.32 C1487.66,997.84 1483.42,992.16 1475.5,992.16 Z M1550.7,1040 L1550.7,984.64 L1540.06,984.64 L1540.06,1008.96 C1540.06,1017.2 1541.1,1024.88 1541.66,1028.64 L1523.74,984.64 L1508.94,984.64 L1508.94,1040 L1519.58,1040 L1519.58,1018.48 C1519.58,1008.24 1518.62,1001.04 1517.98,996.08 L1535.58,1040 L1550.7,1040 Z M1594.14,993.2 L1595.42,984.64 L1562.38,984.64 L1562.38,1040 L1595.58,1040 L1595.58,1031.36 L1574.14,1031.36 L1574.14,1016.08 L1591.58,1016.08 L1591.58,1007.6 L1574.14,1007.6 L1574.14,993.2 L1594.14,993.2 Z" id="CLONE"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/clone-tool-heading.svg b/unpublishedScripts/marketplace/shapes/assets/tools/clone-tool-heading.svg
new file mode 100644
index 0000000000..6ab57cd0e1
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/clone-tool-heading.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="621px" height="82px" viewBox="0 0 621 82" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>CLONE TOOL</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Clone-Tool" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Clone---Default" transform="translate(-891.000000, -200.000000)" fill="#FFFFFF">
+            <path d="M925.932,200.704 C906.556,200.704 891.66,215.04 891.66,241.136 C891.66,267.568 905.772,281.792 926.38,281.792 C937.132,281.792 945.308,277.088 950.236,272.048 L942.62,262.304 C938.14,265.776 933.66,268.8 927.164,268.8 C916.524,268.8 909.02,260.624 909.02,241.136 C909.02,220.976 916.636,213.136 926.94,213.136 C932.316,213.136 936.796,215.04 941.052,218.736 L949.34,209.104 C942.956,203.728 936.236,200.704 925.932,200.704 Z M975.996,266.784 L975.996,202.496 L959.532,202.496 L959.532,280 L1004.892,280 L1006.684,266.784 L975.996,266.784 Z M1045.996,200.704 C1067.276,200.704 1080.38,215.264 1080.38,241.248 C1080.38,266.672 1067.276,281.792 1045.996,281.792 C1024.716,281.792 1011.5,267.12 1011.5,241.248 C1011.5,215.936 1024.716,200.704 1045.996,200.704 Z M1045.996,213.024 C1035.02,213.024 1028.86,220.976 1028.86,241.248 C1028.86,261.52 1035.244,269.472 1045.996,269.472 C1057.084,269.472 1063.02,261.52 1063.02,241.248 C1063.02,220.976 1057.084,213.024 1045.996,213.024 Z M1151.276,280 L1151.276,202.496 L1136.38,202.496 L1136.38,236.544 C1136.38,248.08 1137.836,258.832 1138.62,264.096 L1113.532,202.496 L1092.812,202.496 L1092.812,280 L1107.708,280 L1107.708,249.872 C1107.708,235.536 1106.364,225.456 1105.468,218.512 L1130.108,280 L1151.276,280 Z M1212.092,214.48 L1213.884,202.496 L1167.628,202.496 L1167.628,280 L1214.108,280 L1214.108,267.904 L1184.092,267.904 L1184.092,246.512 L1208.508,246.512 L1208.508,234.64 L1184.092,234.64 L1184.092,214.48 L1212.092,214.48 Z M1303.708,215.376 L1305.5,202.496 L1247.036,202.496 L1247.036,215.376 L1267.644,215.376 L1267.644,280 L1284.108,280 L1284.108,215.376 L1303.708,215.376 Z M1340.556,200.704 C1361.836,200.704 1374.94,215.264 1374.94,241.248 C1374.94,266.672 1361.836,281.792 1340.556,281.792 C1319.276,281.792 1306.06,267.12 1306.06,241.248 C1306.06,215.936 1319.276,200.704 1340.556,200.704 Z M1340.556,213.024 C1329.58,213.024 1323.42,220.976 1323.42,241.248 C1323.42,261.52 1329.804,269.472 1340.556,269.472 C1351.644,269.472 1357.58,261.52 1357.58,241.248 C1357.58,220.976 1351.644,213.024 1340.556,213.024 Z M1417.948,200.704 C1439.228,200.704 1452.332,215.264 1452.332,241.248 C1452.332,266.672 1439.228,281.792 1417.948,281.792 C1396.668,281.792 1383.452,267.12 1383.452,241.248 C1383.452,215.936 1396.668,200.704 1417.948,200.704 Z M1417.948,213.024 C1406.972,213.024 1400.812,220.976 1400.812,241.248 C1400.812,261.52 1407.196,269.472 1417.948,269.472 C1429.036,269.472 1434.972,261.52 1434.972,241.248 C1434.972,220.976 1429.036,213.024 1417.948,213.024 Z M1481.228,266.784 L1481.228,202.496 L1464.764,202.496 L1464.764,280 L1510.124,280 L1511.916,266.784 L1481.228,266.784 Z" id="CLONE-TOOL"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/color-icon.svg b/unpublishedScripts/marketplace/shapes/assets/tools/color-icon.svg
new file mode 100644
index 0000000000..9363b7607f
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/color-icon.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="165px" height="187px" viewBox="0 0 165 187" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>color-icon</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Icons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Tool-Icons" transform="translate(-278.000000, -720.000000)" fill="#AFAFAF">
+            <g id="color-icon" transform="translate(278.000000, 720.000000)">
+                <path d="M80.4482312,88.7139888 C82.1559958,88.9292465 83.7403722,89.8010403 84.8955722,91.0934836 C86.0632897,92.4011743 86.7812662,94.1106795 86.7812662,95.970865 C86.7821603,97.9252258 85.9622544,99.7396691 84.6389604,101.07337 C83.312984,102.406174 81.5104429,103.228638 79.5728901,103.227741 C77.6353373,103.228638 75.8319021,102.405277 74.5068198,101.072473 C73.1826317,99.7396691 72.36362,97.9252258 72.36362,95.970865 L72.36362,95.9358856 L72.3627258,95.9009063 C72.3555729,95.7762361 72.3528906,95.652463 72.3528906,95.5304836 C72.3528906,93.6559475 73.0994787,91.9563084 74.3172669,90.7158857 C75.5368433,89.4790506 77.207055,88.7148857 79.0847019,88.7139888 L80.0610783,88.7139888 L80.4482312,88.7139888 Z M64.5499263,161.539266 C59.8781619,161.53837 55.2215975,159.766081 51.69788,156.221504 L17.9869644,122.303164 C14.463247,118.75769 12.7000471,114.069556 12.6982589,109.366174 C12.7000471,104.662793 14.463247,99.9746588 17.9869644,96.4291846 L65.1606086,48.9657521 L73.8353375,57.6935561 L73.8353375,77.0183188 C69.9343025,78.2004425 66.5196674,80.5512363 64.0232911,83.6688858 C61.30875,87.0565043 59.666256,91.3482053 59.666256,95.970865 C59.6778796,106.80102 68.5555731,115.737803 79.328796,115.75036 C90.1020189,115.737803 98.9806066,106.80102 98.9904419,95.970865 C98.991336,91.5015764 97.5491243,87.4054012 95.1260657,84.1119579 C92.8943481,81.0777208 89.8257366,78.7296178 86.2877132,77.3456899 L86.2877132,70.2233498 L124.580982,108.751793 L77.4019726,156.221504 C73.8773611,159.766081 69.2207966,161.53837 64.5499263,161.539266 L64.5499263,161.539266 Z M141.416322,125.444133 L141.417216,125.444133 C142.627851,126.659442 144.198816,127.303421 145.774251,127.300731 C147.354157,127.303421 148.930486,126.655854 150.142909,125.431576 C151.359803,124.211782 152.002674,122.628741 151.999992,121.040318 C152.002674,119.452793 151.359803,117.869751 150.142909,116.649061 L86.2877132,52.4027005 L86.2877132,6.26041231 C86.2832427,2.8118041 83.4980664,0.00538144324 80.0610783,0 C76.6249844,0.00538144324 73.8398081,2.8118041 73.8353375,6.26041231 L73.8353375,39.8729068 L58.5369855,24.4819791 C57.3254562,23.2577008 55.7482327,22.60834 54.1674328,22.6119276 C52.5866329,22.60834 51.0103036,23.2577008 49.7978802,24.4819791 C48.5809861,25.7017729 47.9381156,27.2857111 47.9407979,28.8723399 C47.9381156,30.4598657 48.5809861,32.0438038 49.7978802,33.2635976 L56.1845621,39.6890408 L9.00018849,87.4045043 L9.00287084,87.4018136 C3.00423591,93.4371022 -0.00178743782,101.34603 7.97370429e-07,109.243298 C-0.00178743782,117.139669 3.00423591,125.049494 9.00287084,131.084782 L42.7137865,165.003122 C48.5961861,170.918225 56.5100209,173.999998 64.4274322,173.999998 C72.3493141,174.002689 80.0262077,170.903875 86.1205133,165.021957 L86.1303485,165.012091 L133.328134,117.526236 L141.416322,125.444133 Z" id="Fill-1"></path>
+                <path d="M149.915186,158.13214 C151.755104,160.051782 152.666532,162.486602 152.66743,164.929458 C152.666532,167.369635 151.757798,169.799098 149.923267,171.71874 C147.964819,173.635703 145.500819,174.576774 143.030534,174.57856 C140.553963,174.576774 138.083677,173.632132 136.123433,171.705347 C134.174862,169.773205 133.343351,167.530349 133.331678,164.929458 C133.332576,162.424102 134.384086,160.094639 136.162943,158.115176 L143.030534,151.358036 L149.915186,158.13214 Z M158.606531,180.576771 C162.866449,176.356237 165.000898,170.79374 165,165.24285 C165.000898,159.679461 162.858367,154.102678 158.578695,149.880359 L147.386533,138.830365 L146.43739,139.780364 L147.386533,138.830365 C146.175186,137.630365 144.604656,136.99733 143.030534,137.000008 C141.456411,136.99733 139.885881,137.630365 138.674534,138.830365 L127.481475,149.880359 C123.345475,153.954464 120.995517,159.363389 121.000006,165.24285 C120.995517,171.122312 123.345475,176.530344 127.481475,180.606235 C131.859923,184.93659 137.354535,187.007124 143.030534,186.999982 C148.687676,187.001767 154.402287,184.96784 158.578695,180.606235 C158.581388,180.603556 158.584082,180.599985 158.586776,180.597306 C158.59396,180.590164 158.601144,180.583914 158.608327,180.577664 L158.606531,180.576771 Z" id="Fill-4"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/color-label.svg b/unpublishedScripts/marketplace/shapes/assets/tools/color-label.svg
new file mode 100644
index 0000000000..008b7b963d
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/color-label.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="241px" height="59px" viewBox="0 0 241 59" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>COLOR</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Tool-Palette" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Tool-Palette---Default" transform="translate(-240.000000, -983.000000)" fill="#FFFFFF">
+            <path d="M264.68,983.36 C250.84,983.36 240.2,993.6 240.2,1012.24 C240.2,1031.12 250.28,1041.28 265,1041.28 C272.68,1041.28 278.52,1037.92 282.04,1034.32 L276.6,1027.36 C273.4,1029.84 270.2,1032 265.56,1032 C257.96,1032 252.6,1026.16 252.6,1012.24 C252.6,997.84 258.04,992.24 265.4,992.24 C269.24,992.24 272.44,993.6 275.48,996.24 L281.4,989.36 C276.84,985.52 272.04,983.36 264.68,983.36 Z M308.92,983.36 C324.12,983.36 333.48,993.76 333.48,1012.32 C333.48,1030.48 324.12,1041.28 308.92,1041.28 C293.72,1041.28 284.28,1030.8 284.28,1012.32 C284.28,994.24 293.72,983.36 308.92,983.36 Z M308.92,992.16 C301.08,992.16 296.68,997.84 296.68,1012.32 C296.68,1026.8 301.24,1032.48 308.92,1032.48 C316.84,1032.48 321.08,1026.8 321.08,1012.32 C321.08,997.84 316.84,992.16 308.92,992.16 Z M354.12,1030.56 L354.12,984.64 L342.36,984.64 L342.36,1040 L374.76,1040 L376.04,1030.56 L354.12,1030.56 Z M404.12,983.36 C419.32,983.36 428.68,993.76 428.68,1012.32 C428.68,1030.48 419.32,1041.28 404.12,1041.28 C388.92,1041.28 379.48,1030.8 379.48,1012.32 C379.48,994.24 388.92,983.36 404.12,983.36 Z M404.12,992.16 C396.28,992.16 391.88,997.84 391.88,1012.32 C391.88,1026.8 396.44,1032.48 404.12,1032.48 C412.04,1032.48 416.28,1026.8 416.28,1012.32 C416.28,997.84 412.04,992.16 404.12,992.16 Z M455.32,1018.32 L449.32,1018.32 L449.32,1040 L437.56,1040 L437.56,984.64 L454.84,984.64 C469.64,984.64 477.16,990 477.16,1001.2 C477.16,1008.56 473.56,1012.96 466.2,1016.16 L480.52,1040 L467.16,1040 L455.32,1018.32 Z M449.32,1010 L455.48,1010 C461.64,1010 465,1007.44 465,1001.2 C465,995.52 461.72,993.04 454.6,993.04 L449.32,993.04 L449.32,1010 Z" id="COLOR"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/color-tool-heading.svg b/unpublishedScripts/marketplace/shapes/assets/tools/color-tool-heading.svg
new file mode 100644
index 0000000000..5b1979e776
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/color-tool-heading.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="631px" height="82px" viewBox="0 0 631 82" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>COLOR TOOL</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Color-Tool" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Color-Tool---Default" transform="translate(-886.000000, -200.000000)" fill="#FFFFFF">
+            <path d="M920.528,200.704 C901.152,200.704 886.256,215.04 886.256,241.136 C886.256,267.568 900.368,281.792 920.976,281.792 C931.728,281.792 939.904,277.088 944.832,272.048 L937.216,262.304 C932.736,265.776 928.256,268.8 921.76,268.8 C911.12,268.8 903.616,260.624 903.616,241.136 C903.616,220.976 911.232,213.136 921.536,213.136 C926.912,213.136 931.392,215.04 935.648,218.736 L943.936,209.104 C937.552,203.728 930.832,200.704 920.528,200.704 Z M982.464,200.704 C1003.744,200.704 1016.848,215.264 1016.848,241.248 C1016.848,266.672 1003.744,281.792 982.464,281.792 C961.184,281.792 947.968,267.12 947.968,241.248 C947.968,215.936 961.184,200.704 982.464,200.704 Z M982.464,213.024 C971.488,213.024 965.328,220.976 965.328,241.248 C965.328,261.52 971.712,269.472 982.464,269.472 C993.552,269.472 999.488,261.52 999.488,241.248 C999.488,220.976 993.552,213.024 982.464,213.024 Z M1045.744,266.784 L1045.744,202.496 L1029.28,202.496 L1029.28,280 L1074.64,280 L1076.432,266.784 L1045.744,266.784 Z M1115.744,200.704 C1137.024,200.704 1150.128,215.264 1150.128,241.248 C1150.128,266.672 1137.024,281.792 1115.744,281.792 C1094.464,281.792 1081.248,267.12 1081.248,241.248 C1081.248,215.936 1094.464,200.704 1115.744,200.704 Z M1115.744,213.024 C1104.768,213.024 1098.608,220.976 1098.608,241.248 C1098.608,261.52 1104.992,269.472 1115.744,269.472 C1126.832,269.472 1132.768,261.52 1132.768,241.248 C1132.768,220.976 1126.832,213.024 1115.744,213.024 Z M1187.424,249.648 L1179.024,249.648 L1179.024,280 L1162.56,280 L1162.56,202.496 L1186.752,202.496 C1207.472,202.496 1218,210 1218,225.68 C1218,235.984 1212.96,242.144 1202.656,246.624 L1222.704,280 L1204,280 L1187.424,249.648 Z M1179.024,238 L1187.648,238 C1196.272,238 1200.976,234.416 1200.976,225.68 C1200.976,217.728 1196.384,214.256 1186.416,214.256 L1179.024,214.256 L1179.024,238 Z M1308.272,215.376 L1310.064,202.496 L1251.6,202.496 L1251.6,215.376 L1272.208,215.376 L1272.208,280 L1288.672,280 L1288.672,215.376 L1308.272,215.376 Z M1345.12,200.704 C1366.4,200.704 1379.504,215.264 1379.504,241.248 C1379.504,266.672 1366.4,281.792 1345.12,281.792 C1323.84,281.792 1310.624,267.12 1310.624,241.248 C1310.624,215.936 1323.84,200.704 1345.12,200.704 Z M1345.12,213.024 C1334.144,213.024 1327.984,220.976 1327.984,241.248 C1327.984,261.52 1334.368,269.472 1345.12,269.472 C1356.208,269.472 1362.144,261.52 1362.144,241.248 C1362.144,220.976 1356.208,213.024 1345.12,213.024 Z M1422.512,200.704 C1443.792,200.704 1456.896,215.264 1456.896,241.248 C1456.896,266.672 1443.792,281.792 1422.512,281.792 C1401.232,281.792 1388.016,267.12 1388.016,241.248 C1388.016,215.936 1401.232,200.704 1422.512,200.704 Z M1422.512,213.024 C1411.536,213.024 1405.376,220.976 1405.376,241.248 C1405.376,261.52 1411.76,269.472 1422.512,269.472 C1433.6,269.472 1439.536,261.52 1439.536,241.248 C1439.536,220.976 1433.6,213.024 1422.512,213.024 Z M1485.792,266.784 L1485.792,202.496 L1469.328,202.496 L1469.328,280 L1514.688,280 L1516.48,266.784 L1485.792,266.784 Z" id="COLOR-TOOL"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/color/color-circle-black.png b/unpublishedScripts/marketplace/shapes/assets/tools/color/color-circle-black.png
new file mode 100644
index 0000000000..4b62c28a4d
Binary files /dev/null and b/unpublishedScripts/marketplace/shapes/assets/tools/color/color-circle-black.png differ
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/color/color-circle.png b/unpublishedScripts/marketplace/shapes/assets/tools/color/color-circle.png
new file mode 100644
index 0000000000..8bf2613382
Binary files /dev/null and b/unpublishedScripts/marketplace/shapes/assets/tools/color/color-circle.png differ
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/color/pick-color-label.svg b/unpublishedScripts/marketplace/shapes/assets/tools/color/pick-color-label.svg
new file mode 100644
index 0000000000..6fa2997328
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/color/pick-color-label.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="120px" height="120px" viewBox="0 0 120 120" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>noun_792623</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Color-Tool" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Color-Tool---Default" transform="translate(-203.000000, -2070.000000)" fill-rule="nonzero" fill="#E3E3E3">
+            <g id="noun_792623" transform="translate(202.000000, 2070.000000)">
+                <path d="M82.9252,65.5368 C82.9852,65.598 83.0488,65.6556 83.1088,65.7132 L40.18,108.6432 C33.5008,115.32 19.054,114.1032 14.2552,118.9008 C9.46,123.6972 -2.6948,111.5316 2.098,106.7412 C6.8884,101.9496 4.672,88.5024 12.3544,80.8188 L55.282,37.89 C55.3408,37.9524 55.3996,38.0148 55.4596,38.0748 L82.9252,65.5368 Z M101.9548,49.4016 L114.7132,36.6432 C123.0952,28.2612 123.0952,14.67 114.712,6.2868 C106.3312,-2.0952 92.7376,-2.0952 84.3556,6.2868 L71.596,19.0452 C67.8832,15.54 62.0296,15.6024 58.3948,19.2384 C54.7588,22.8732 54.6976,28.7244 58.2028,32.4396 C58.2664,32.5068 88.492,62.7324 88.5604,62.796 C92.2756,66.3024 98.1268,66.2388 101.7628,62.604 C105.3976,58.9692 105.4612,53.1168 101.9548,49.4016 Z" id="Shape"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/color/slider-alpha.png b/unpublishedScripts/marketplace/shapes/assets/tools/color/slider-alpha.png
new file mode 100644
index 0000000000..e7693935b2
Binary files /dev/null and b/unpublishedScripts/marketplace/shapes/assets/tools/color/slider-alpha.png differ
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/color/slider-white.png b/unpublishedScripts/marketplace/shapes/assets/tools/color/slider-white.png
new file mode 100644
index 0000000000..048936b106
Binary files /dev/null and b/unpublishedScripts/marketplace/shapes/assets/tools/color/slider-white.png differ
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/color/swatches-label.svg b/unpublishedScripts/marketplace/shapes/assets/tools/color/swatches-label.svg
new file mode 100644
index 0000000000..76c9d6228f
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/color/swatches-label.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="345px" height="47px" viewBox="0 0 345 47" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>SWATCHES</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Color-Tool" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Color-Tool---Default" transform="translate(-120.000000, -714.000000)" fill="#FFFFFF">
+            <path d="M150.448,723.072 C149.167994,721.621326 147.450677,720.448004 145.296,719.552 C143.141323,718.655996 140.720013,718.208 138.032,718.208 C133.978646,718.208 131.034676,718.965326 129.2,720.48 C127.365324,721.994674 126.448,724.05332 126.448,726.656 C126.448,728.02134 126.693331,729.141329 127.184,730.016 C127.674669,730.890671 128.442661,731.647997 129.488,732.288 C130.533339,732.928003 131.855992,733.482664 133.456,733.952 C135.056008,734.421336 136.943989,734.890664 139.12,735.36 C141.552012,735.872003 143.72799,736.43733 145.648,737.056 C147.56801,737.67467 149.21066,738.463995 150.576,739.424 C151.94134,740.384005 152.986663,741.557326 153.712,742.944 C154.437337,744.330674 154.8,746.04799 154.8,748.096 C154.8,750.186677 154.394671,751.999992 153.584,753.536 C152.773329,755.072008 151.642674,756.351995 150.192,757.376 C148.741326,758.400005 147.013343,759.157331 145.008,759.648 C143.002657,760.138669 140.826678,760.384 138.48,760.384 C131.354631,760.384 125.274692,758.186689 120.24,753.792 L122.416,750.144 C124.080008,751.893342 126.319986,753.375994 129.136,754.592 C131.952014,755.808006 135.087983,756.416 138.544,756.416 C142.170685,756.416 145.00799,755.76534 147.056,754.464 C149.10401,753.16266 150.128,751.189347 150.128,748.544 C150.128,747.135993 149.840003,745.952005 149.264,744.992 C148.687997,744.031995 147.824006,743.200004 146.672,742.496 C145.519994,741.791996 144.080009,741.184003 142.352,740.672 C140.623991,740.159997 138.629345,739.648003 136.368,739.136 C133.978655,738.581331 131.888009,738.005336 130.096,737.408 C128.303991,736.810664 126.800006,736.064004 125.584,735.168 C124.367994,734.271996 123.45067,733.194673 122.832,731.936 C122.21333,730.677327 121.904,729.130676 121.904,727.296 C121.904,725.205323 122.298663,723.338675 123.088,721.696 C123.877337,720.053325 124.98666,718.688005 126.416,717.6 C127.84534,716.511995 129.55199,715.680003 131.536,715.104 C133.52001,714.527997 135.706655,714.24 138.096,714.24 C141.082682,714.24 143.759988,714.698662 146.128,715.616 C148.496012,716.533338 150.63999,717.823992 152.56,719.488 L150.448,723.072 Z M178.928,714.88 L183.216,714.88 L189.616,731.008 L196.08,714.88 L200.304,714.88 L192.368,734.272 L201.072,754.816 L217.52,714.56 L222.384,714.56 L203.184,760 L199.216,760 L189.68,737.536 L180.08,760 L176.112,760 L156.976,714.56 L161.712,714.56 L178.224,754.816 L186.864,734.272 L178.928,714.88 Z M220.528,760 L239.536,714.56 L243.184,714.56 L262.192,760 L257.392,760 L251.504,745.792 L231.088,745.792 L225.264,760 L220.528,760 Z M241.392,719.808 L232.048,742.272 L250.48,742.272 L241.392,719.808 Z M296.56,718.528 L280.368,718.528 L280.368,760 L275.888,760 L275.888,718.528 L259.696,718.528 L259.696,714.56 L296.56,714.56 L296.56,718.528 Z M300.592,736.96 C300.592,734.22932 301.071995,731.509347 302.032,728.8 C302.992005,726.090653 304.389324,723.669344 306.224,721.536 C308.058676,719.402656 310.319987,717.664007 313.008,716.32 C315.696013,714.975993 318.74665,714.304 322.16,714.304 C326.213354,714.304 329.669319,715.221324 332.528,717.056 C335.386681,718.890676 337.519993,721.279985 338.928,724.224 L335.344,726.4 C334.618663,724.906659 333.744005,723.648005 332.72,722.624 C331.695995,721.599995 330.586673,720.768003 329.392,720.128 C328.197327,719.487997 326.960006,719.029335 325.68,718.752 C324.399994,718.474665 323.14134,718.336 321.904,718.336 C319.17332,718.336 316.762677,718.890661 314.672,720 C312.581323,721.109339 310.82134,722.559991 309.392,724.352 C307.96266,726.144009 306.885337,728.159989 306.16,730.4 C305.434663,732.640011 305.072,734.911988 305.072,737.216 C305.072,739.733346 305.509329,742.143988 306.384,744.448 C307.258671,746.752012 308.453326,748.789324 309.968,750.56 C311.482674,752.330676 313.274656,753.738661 315.344,754.784 C317.413344,755.829339 319.663988,756.352 322.096,756.352 C323.376006,756.352 324.687993,756.192002 326.032,755.872 C327.376007,755.551998 328.677327,755.040004 329.936,754.336 C331.194673,753.631996 332.357328,752.757339 333.424,751.712 C334.490672,750.666661 335.386663,749.397341 336.112,747.904 L339.824,749.824 C339.098663,751.530675 338.074673,753.03466 336.752,754.336 C335.429327,755.63734 333.957341,756.735996 332.336,757.632 C330.714659,758.528004 328.997342,759.210664 327.184,759.68 C325.370658,760.149336 323.589342,760.384 321.84,760.384 C318.725318,760.384 315.86668,759.70134 313.264,758.336 C310.66132,756.97066 308.421343,755.189344 306.544,752.992 C304.666657,750.794656 303.205339,748.298681 302.16,745.504 C301.114661,742.709319 300.592,739.861348 300.592,736.96 Z M383.472,714.56 L383.472,760 L378.992,760 L378.992,738.752 L352.048,738.752 L352.048,760 L347.632,760 L347.632,714.56 L352.048,714.56 L352.048,734.784 L378.992,734.784 L378.992,714.56 L383.472,714.56 Z M425.456,756.032 L425.456,760 L394.928,760 L394.928,714.56 L424.88,714.56 L424.88,718.528 L399.344,718.528 L399.344,734.912 L421.616,734.912 L421.616,738.688 L399.344,738.688 L399.344,756.032 L425.456,756.032 Z M460.08,723.072 C458.799994,721.621326 457.082677,720.448004 454.928,719.552 C452.773323,718.655996 450.352013,718.208 447.664,718.208 C443.610646,718.208 440.666676,718.965326 438.832,720.48 C436.997324,721.994674 436.08,724.05332 436.08,726.656 C436.08,728.02134 436.325331,729.141329 436.816,730.016 C437.306669,730.890671 438.074661,731.647997 439.12,732.288 C440.165339,732.928003 441.487992,733.482664 443.088,733.952 C444.688008,734.421336 446.575989,734.890664 448.752,735.36 C451.184012,735.872003 453.35999,736.43733 455.28,737.056 C457.20001,737.67467 458.84266,738.463995 460.208,739.424 C461.57334,740.384005 462.618663,741.557326 463.344,742.944 C464.069337,744.330674 464.432,746.04799 464.432,748.096 C464.432,750.186677 464.026671,751.999992 463.216,753.536 C462.405329,755.072008 461.274674,756.351995 459.824,757.376 C458.373326,758.400005 456.645343,759.157331 454.64,759.648 C452.634657,760.138669 450.458678,760.384 448.112,760.384 C440.986631,760.384 434.906692,758.186689 429.872,753.792 L432.048,750.144 C433.712008,751.893342 435.951986,753.375994 438.768,754.592 C441.584014,755.808006 444.719983,756.416 448.176,756.416 C451.802685,756.416 454.63999,755.76534 456.688,754.464 C458.73601,753.16266 459.76,751.189347 459.76,748.544 C459.76,747.135993 459.472003,745.952005 458.896,744.992 C458.319997,744.031995 457.456006,743.200004 456.304,742.496 C455.151994,741.791996 453.712009,741.184003 451.984,740.672 C450.255991,740.159997 448.261345,739.648003 446,739.136 C443.610655,738.581331 441.520009,738.005336 439.728,737.408 C437.935991,736.810664 436.432006,736.064004 435.216,735.168 C433.999994,734.271996 433.08267,733.194673 432.464,731.936 C431.84533,730.677327 431.536,729.130676 431.536,727.296 C431.536,725.205323 431.930663,723.338675 432.72,721.696 C433.509337,720.053325 434.61866,718.688005 436.048,717.6 C437.47734,716.511995 439.18399,715.680003 441.168,715.104 C443.15201,714.527997 445.338655,714.24 447.728,714.24 C450.714682,714.24 453.391988,714.698662 455.76,715.616 C458.128012,716.533338 460.27199,717.823992 462.192,719.488 L460.08,723.072 Z" id="SWATCHES"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/common/actions-label.svg b/unpublishedScripts/marketplace/shapes/assets/tools/common/actions-label.svg
new file mode 100644
index 0000000000..d5428ae3f1
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/common/actions-label.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="276px" height="47px" viewBox="0 0 276 47" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>ACTIONS</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Clone-Tool" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Clone---Default" transform="translate(-121.000000, -714.000000)" fill="#FFFFFF">
+            <path d="M120.96,760 L139.968,714.56 L143.616,714.56 L162.624,760 L157.824,760 L151.936,745.792 L131.52,745.792 L125.696,760 L120.96,760 Z M141.824,719.808 L132.48,742.272 L150.912,742.272 L141.824,719.808 Z M166.272,736.96 C166.272,734.22932 166.751995,731.509347 167.712,728.8 C168.672005,726.090653 170.069324,723.669344 171.904,721.536 C173.738676,719.402656 175.999987,717.664007 178.688,716.32 C181.376013,714.975993 184.42665,714.304 187.84,714.304 C191.893354,714.304 195.349319,715.221324 198.208,717.056 C201.066681,718.890676 203.199993,721.279985 204.608,724.224 L201.024,726.4 C200.298663,724.906659 199.424005,723.648005 198.4,722.624 C197.375995,721.599995 196.266673,720.768003 195.072,720.128 C193.877327,719.487997 192.640006,719.029335 191.36,718.752 C190.079994,718.474665 188.82134,718.336 187.584,718.336 C184.85332,718.336 182.442677,718.890661 180.352,720 C178.261323,721.109339 176.50134,722.559991 175.072,724.352 C173.64266,726.144009 172.565337,728.159989 171.84,730.4 C171.114663,732.640011 170.752,734.911988 170.752,737.216 C170.752,739.733346 171.189329,742.143988 172.064,744.448 C172.938671,746.752012 174.133326,748.789324 175.648,750.56 C177.162674,752.330676 178.954656,753.738661 181.024,754.784 C183.093344,755.829339 185.343988,756.352 187.776,756.352 C189.056006,756.352 190.367993,756.192002 191.712,755.872 C193.056007,755.551998 194.357327,755.040004 195.616,754.336 C196.874673,753.631996 198.037328,752.757339 199.104,751.712 C200.170672,750.666661 201.066663,749.397341 201.792,747.904 L205.504,749.824 C204.778663,751.530675 203.754673,753.03466 202.432,754.336 C201.109327,755.63734 199.637341,756.735996 198.016,757.632 C196.394659,758.528004 194.677342,759.210664 192.864,759.68 C191.050658,760.149336 189.269342,760.384 187.52,760.384 C184.405318,760.384 181.54668,759.70134 178.944,758.336 C176.34132,756.97066 174.101343,755.189344 172.224,752.992 C170.346657,750.794656 168.885339,748.298681 167.84,745.504 C166.794661,742.709319 166.272,739.861348 166.272,736.96 Z M245.12,718.528 L228.928,718.528 L228.928,760 L224.448,760 L224.448,718.528 L208.256,718.528 L208.256,714.56 L245.12,714.56 L245.12,718.528 Z M252.096,760 L252.096,714.624 L256.512,714.624 L256.512,760 L252.096,760 Z M286.464,760.32 C283.306651,760.32 280.416013,759.66934 277.792,758.368 C275.167987,757.06666 272.917343,755.338677 271.04,753.184 C269.162657,751.029323 267.712005,748.565347 266.688,745.792 C265.663995,743.018653 265.152,740.181348 265.152,737.28 C265.152,734.250652 265.695995,731.349347 266.784,728.576 C267.872005,725.802653 269.37599,723.349344 271.296,721.216 C273.21601,719.082656 275.47732,717.386673 278.08,716.128 C280.68268,714.869327 283.498652,714.24 286.528,714.24 C289.685349,714.24 292.575987,714.911993 295.2,716.256 C297.824013,717.600007 300.063991,719.359989 301.92,721.536 C303.776009,723.712011 305.215995,726.175986 306.24,728.928 C307.264005,731.680014 307.776,734.485319 307.776,737.344 C307.776,740.373348 307.232005,743.274653 306.144,746.048 C305.055995,748.821347 303.562676,751.263989 301.664,753.376 C299.765324,755.488011 297.51468,757.173327 294.912,758.432 C292.30932,759.690673 289.493348,760.32 286.464,760.32 Z M269.632,737.28 C269.632,739.754679 270.037329,742.133322 270.848,744.416 C271.658671,746.698678 272.810659,748.725324 274.304,750.496 C275.797341,752.266676 277.56799,753.674661 279.616,754.72 C281.66401,755.765339 283.946654,756.288 286.464,756.288 C289.024013,756.288 291.349323,755.733339 293.44,754.624 C295.530677,753.514661 297.301326,752.064009 298.752,750.272 C300.202674,748.479991 301.322663,746.453345 302.112,744.192 C302.901337,741.930655 303.296,739.626678 303.296,737.28 C303.296,734.805321 302.880004,732.426678 302.048,730.144 C301.215996,727.861322 300.053341,725.845342 298.56,724.096 C297.066659,722.346658 295.29601,720.949339 293.248,719.904 C291.19999,718.858661 288.938679,718.336 286.464,718.336 C283.903987,718.336 281.578677,718.879995 279.488,719.968 C277.397323,721.056005 275.626674,722.495991 274.176,724.288 C272.725326,726.080009 271.605337,728.106655 270.816,730.368 C270.026663,732.629345 269.632,734.933322 269.632,737.28 Z M320.832,722.88 L320.832,760 L316.416,760 L316.416,714.56 L319.872,714.56 L349.952,752.384 L349.952,714.624 L354.368,714.624 L354.368,760 L350.528,760 L320.832,722.88 Z M392.576,723.072 C391.295994,721.621326 389.578677,720.448004 387.424,719.552 C385.269323,718.655996 382.848013,718.208 380.16,718.208 C376.106646,718.208 373.162676,718.965326 371.328,720.48 C369.493324,721.994674 368.576,724.05332 368.576,726.656 C368.576,728.02134 368.821331,729.141329 369.312,730.016 C369.802669,730.890671 370.570661,731.647997 371.616,732.288 C372.661339,732.928003 373.983992,733.482664 375.584,733.952 C377.184008,734.421336 379.071989,734.890664 381.248,735.36 C383.680012,735.872003 385.85599,736.43733 387.776,737.056 C389.69601,737.67467 391.33866,738.463995 392.704,739.424 C394.06934,740.384005 395.114663,741.557326 395.84,742.944 C396.565337,744.330674 396.928,746.04799 396.928,748.096 C396.928,750.186677 396.522671,751.999992 395.712,753.536 C394.901329,755.072008 393.770674,756.351995 392.32,757.376 C390.869326,758.400005 389.141343,759.157331 387.136,759.648 C385.130657,760.138669 382.954678,760.384 380.608,760.384 C373.482631,760.384 367.402692,758.186689 362.368,753.792 L364.544,750.144 C366.208008,751.893342 368.447986,753.375994 371.264,754.592 C374.080014,755.808006 377.215983,756.416 380.672,756.416 C384.298685,756.416 387.13599,755.76534 389.184,754.464 C391.23201,753.16266 392.256,751.189347 392.256,748.544 C392.256,747.135993 391.968003,745.952005 391.392,744.992 C390.815997,744.031995 389.952006,743.200004 388.8,742.496 C387.647994,741.791996 386.208009,741.184003 384.48,740.672 C382.751991,740.159997 380.757345,739.648003 378.496,739.136 C376.106655,738.581331 374.016009,738.005336 372.224,737.408 C370.431991,736.810664 368.928006,736.064004 367.712,735.168 C366.495994,734.271996 365.57867,733.194673 364.96,731.936 C364.34133,730.677327 364.032,729.130676 364.032,727.296 C364.032,725.205323 364.426663,723.338675 365.216,721.696 C366.005337,720.053325 367.11466,718.688005 368.544,717.6 C369.97334,716.511995 371.67999,715.680003 373.664,715.104 C375.64801,714.527997 377.834655,714.24 380.224,714.24 C383.210682,714.24 385.887988,714.698662 388.256,715.616 C390.624012,716.533338 392.76799,717.823992 394.688,719.488 L392.576,723.072 Z" id="ACTIONS"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/common/down-arrow.svg b/unpublishedScripts/marketplace/shapes/assets/tools/common/down-arrow.svg
new file mode 100644
index 0000000000..352b830aad
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/common/down-arrow.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="80px" height="52px" viewBox="0 0 80 52" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>5</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Physics-Tool" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Physics---Default" transform="translate(-2095.000000, -1000.000000)" fill="#575757">
+            <polygon id="5" points="2135 1051.16279 2095 1000 2175 1000"></polygon>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/common/finish-label.svg b/unpublishedScripts/marketplace/shapes/assets/tools/common/finish-label.svg
new file mode 100644
index 0000000000..58120a337a
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/common/finish-label.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="318px" height="82px" viewBox="0 0 318 82" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>FINISH</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Stretch-Tool" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Stretch---Default" transform="translate(-1041.000000, -1260.000000)" fill="#FFFFFF">
+            <path d="M1084.64,1274.48 L1086.432,1262.496 L1041.408,1262.496 L1041.408,1340 L1057.872,1340 L1057.872,1308.416 L1081.168,1308.416 L1081.168,1296.432 L1057.872,1296.432 L1057.872,1274.48 L1084.64,1274.48 Z M1112.64,1340 L1112.64,1262.496 L1096.064,1262.496 L1096.064,1340 L1112.64,1340 Z M1187.456,1340 L1187.456,1262.496 L1172.56,1262.496 L1172.56,1296.544 C1172.56,1308.08 1174.016,1318.832 1174.8,1324.096 L1149.712,1262.496 L1128.992,1262.496 L1128.992,1340 L1143.888,1340 L1143.888,1309.872 C1143.888,1295.536 1142.544,1285.456 1141.648,1278.512 L1166.288,1340 L1187.456,1340 Z M1220.384,1340 L1220.384,1262.496 L1203.808,1262.496 L1203.808,1340 L1220.384,1340 Z M1260.368,1260.704 C1244.688,1260.704 1233.264,1269.328 1233.264,1282.544 C1233.264,1294.304 1239.984,1301.024 1256.784,1306.288 C1268.544,1309.872 1271.568,1312.56 1271.568,1318.72 C1271.568,1325.552 1266.192,1329.36 1258.24,1329.36 C1250.288,1329.36 1244.016,1326.448 1238.64,1321.52 L1230.016,1330.928 C1236.4,1337.2 1245.808,1341.792 1258.688,1341.792 C1277.504,1341.792 1288.704,1331.824 1288.704,1317.6 C1288.704,1303.264 1279.744,1297.44 1265.744,1292.96 C1253.088,1289.04 1250.176,1286.8 1250.176,1281.424 C1250.176,1275.936 1254.768,1273.024 1261.488,1273.024 C1267.76,1273.024 1273.136,1275.04 1278.512,1279.632 L1286.464,1270.448 C1279.744,1264.176 1271.904,1260.704 1260.368,1260.704 Z M1342.128,1306.064 L1342.128,1340 L1358.592,1340 L1358.592,1262.496 L1342.128,1262.496 L1342.128,1293.072 L1316.48,1293.072 L1316.48,1262.496 L1300.016,1262.496 L1300.016,1340 L1316.48,1340 L1316.48,1306.064 L1342.128,1306.064 Z" id="FINISH"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/common/info-icon.svg b/unpublishedScripts/marketplace/shapes/assets/tools/common/info-icon.svg
new file mode 100644
index 0000000000..ef2495b728
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/common/info-icon.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="321px" height="320px" viewBox="0 0 321 320" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>[</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Stretch-Tool" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Stretch---Default" transform="translate(-118.000000, -1880.000000)" fill="#6A6A6A">
+            <path d="M299.333333,1997.33333 L286,2090.66667 C285.111107,2099.5556 288.222187,2104 295.333333,2104 L306,2104 L302,2124 C293.99996,2127.55557 286.00004,2129.33333 278,2129.33333 C257.555453,2129.33333 249.111093,2118.66677 252.666667,2097.33333 L263.333333,2022.66667 C260.666653,2022.66667 255.777813,2021.77779 248.666667,2020 L251.333333,1997.33333 L299.333333,1997.33333 Z M306,1965.33333 C304.222213,1975.11116 297.555613,1980 286,1980 C280.66664,1980 276.22224,1978.22224 272.666667,1974.66667 C269.111093,1971.11109 267.777773,1966.66669 268.666667,1961.33333 C270.444453,1951.55551 277.111053,1946.66667 288.666667,1946.66667 C302.000067,1946.66667 307.777787,1952.88883 306,1965.33333 Z M392.666667,1926.66667 C424.666827,1959.55572 439.777787,1997.33312 438,2040 C438,2084.44467 422.4446,2122.22207 391.333333,2153.33333 C361.999853,2184.4446 324.222453,2200 278,2200 C233.555333,2200 195.777933,2184.4446 164.666667,2153.33333 C133.5554,2123.99985 118,2086.22245 118,2040 C118,1995.55533 133.5554,1957.77793 164.666667,1926.66667 C195.777933,1895.5554 233.999773,1880 279.333333,1880 C323.778,1880 361.5554,1895.5554 392.666667,1926.66667 Z M416.666667,2040 C416.666667,2002.66648 402.889027,1970.22236 375.333333,1942.66667 C349.555427,1915.11097 317.111307,1901.33333 278,1901.33333 C238.888693,1901.33333 206.444573,1915.11097 180.666667,1942.66667 C153.110973,1970.22236 139.333333,2002.66648 139.333333,2040 C139.333333,2079.11131 153.110973,2111.55543 180.666667,2137.33333 C206.444573,2164.88903 238.888693,2178.66667 278,2178.66667 C317.111307,2178.66667 349.555427,2164.88903 375.333333,2137.33333 C402.889027,2112.44432 416.666667,2080.0002 416.666667,2040 Z" id="["></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/common/up-arrow.svg b/unpublishedScripts/marketplace/shapes/assets/tools/common/up-arrow.svg
new file mode 100644
index 0000000000..da80a4e9ce
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/common/up-arrow.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="80px" height="52px" viewBox="0 0 80 52" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>5 copy</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Physics-Tool" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Dropdown---Click" transform="translate(-1720.000000, -1920.000000)" fill="#575757">
+            <polygon id="5-copy" transform="translate(1760.000000, 1945.581395) scale(1, -1) translate(-1760.000000, -1945.581395) " points="1760 1971.16279 1720 1920 1800 1920"></polygon>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/delete-icon.svg b/unpublishedScripts/marketplace/shapes/assets/tools/delete-icon.svg
new file mode 100644
index 0000000000..f77d40f1e6
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/delete-icon.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="161px" height="161px" viewBox="0 0 161 161" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>delete-icon</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Icons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Tool-Icons" transform="translate(-1402.000000, -1306.000000)" fill-rule="nonzero" fill="#AFAFAF">
+            <g id="delete-icon" transform="translate(1402.000000, 1306.000000)">
+                <path d="M151.781331,0 C149.423978,0 147.067406,0.900440203 145.265587,2.70210224 L80.4954354,67.4691188 L15.7350484,2.71206805 C12.1312136,-0.891451434 6.30583152,-0.891451434 2.70258297,2.71206805 C-0.900860989,6.31539213 -0.900860989,12.1393331 2.70258297,15.7428525 L67.4629641,80.5002941 L2.70258297,145.25832 C-0.900860989,148.861644 -0.900860989,154.686757 2.70258297,158.290277 C4.49990835,160.08764 6.85921546,160.99023 9.21871797,160.99023 C11.5778297,160.99023 13.937723,160.08764 15.7350484,158.290277 L80.4954354,93.5324464 L145.265587,158.299461 C147.062717,160.096824 149.422024,161 151.781331,161 C154.140638,161 156.490761,160.096824 158.29727,158.299461 C161.90091,154.695942 161.90091,148.87161 158.29727,145.268286 L93.5279008,80.5010757 L158.29727,15.7340592 C161.90091,12.1305397 161.90091,6.30562173 158.29727,2.70210224 C156.495451,0.900440203 154.137902,0 151.781331,0 Z" id="Shape"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/delete-label.svg b/unpublishedScripts/marketplace/shapes/assets/tools/delete-label.svg
new file mode 100644
index 0000000000..e63000e209
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/delete-label.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="254px" height="56px" viewBox="0 0 254 56" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>DELETE</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Tool-Palette" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Tool-Palette---Default" transform="translate(-1355.000000, -1544.000000)" fill="#FFFFFF">
+            <path d="M1369.74,1544.64 C1384.38,1544.64 1398.3,1549.2 1398.3,1572.08 C1398.3,1594.4 1384.7,1600 1371.1,1600 L1355.26,1600 L1355.26,1544.64 L1369.74,1544.64 Z M1367.02,1553.28 L1367.02,1591.36 L1371.82,1591.36 C1379.9,1591.36 1386.06,1587.6 1386.06,1572.08 C1386.06,1556.24 1379.58,1553.28 1371.58,1553.28 L1367.02,1553.28 Z M1439.02,1553.2 L1440.3,1544.64 L1407.26,1544.64 L1407.26,1600 L1440.46,1600 L1440.46,1591.36 L1419.02,1591.36 L1419.02,1576.08 L1436.46,1576.08 L1436.46,1567.6 L1419.02,1567.6 L1419.02,1553.2 L1439.02,1553.2 Z M1461.26,1590.56 L1461.26,1544.64 L1449.5,1544.64 L1449.5,1600 L1481.9,1600 L1483.18,1590.56 L1461.26,1590.56 Z M1521.98,1553.2 L1523.26,1544.64 L1490.22,1544.64 L1490.22,1600 L1523.42,1600 L1523.42,1591.36 L1501.98,1591.36 L1501.98,1576.08 L1519.42,1576.08 L1519.42,1567.6 L1501.98,1567.6 L1501.98,1553.2 L1521.98,1553.2 Z M1567.9,1553.84 L1569.18,1544.64 L1527.42,1544.64 L1527.42,1553.84 L1542.14,1553.84 L1542.14,1600 L1553.9,1600 L1553.9,1553.84 L1567.9,1553.84 Z M1606.94,1553.2 L1608.22,1544.64 L1575.18,1544.64 L1575.18,1600 L1608.38,1600 L1608.38,1591.36 L1586.94,1591.36 L1586.94,1576.08 L1604.38,1576.08 L1604.38,1567.6 L1586.94,1567.6 L1586.94,1553.2 L1606.94,1553.2 Z" id="DELETE"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/delete-tool-heading.svg b/unpublishedScripts/marketplace/shapes/assets/tools/delete-tool-heading.svg
new file mode 100644
index 0000000000..e92e3c1d00
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/delete-tool-heading.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="653px" height="82px" viewBox="0 0 653 82" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>DELETE TOOL</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Delete-Tool" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Delete---Default" transform="translate(-877.000000, -200.000000)" fill="#FFFFFF">
+            <path d="M897.932,202.496 C918.428,202.496 937.916,208.88 937.916,240.912 C937.916,272.16 918.876,280 899.836,280 L877.66,280 L877.66,202.496 L897.932,202.496 Z M894.124,214.592 L894.124,267.904 L900.844,267.904 C912.156,267.904 920.78,262.64 920.78,240.912 C920.78,218.736 911.708,214.592 900.508,214.592 L894.124,214.592 Z M994.924,214.48 L996.716,202.496 L950.46,202.496 L950.46,280 L996.94,280 L996.94,267.904 L966.924,267.904 L966.924,246.512 L991.34,246.512 L991.34,234.64 L966.924,234.64 L966.924,214.48 L994.924,214.48 Z M1026.06,266.784 L1026.06,202.496 L1009.596,202.496 L1009.596,280 L1054.956,280 L1056.748,266.784 L1026.06,266.784 Z M1111.068,214.48 L1112.86,202.496 L1066.604,202.496 L1066.604,280 L1113.084,280 L1113.084,267.904 L1083.068,267.904 L1083.068,246.512 L1107.484,246.512 L1107.484,234.64 L1083.068,234.64 L1083.068,214.48 L1111.068,214.48 Z M1175.356,215.376 L1177.148,202.496 L1118.684,202.496 L1118.684,215.376 L1139.292,215.376 L1139.292,280 L1155.756,280 L1155.756,215.376 L1175.356,215.376 Z M1230.012,214.48 L1231.804,202.496 L1185.548,202.496 L1185.548,280 L1232.028,280 L1232.028,267.904 L1202.012,267.904 L1202.012,246.512 L1226.428,246.512 L1226.428,234.64 L1202.012,234.64 L1202.012,214.48 L1230.012,214.48 Z M1321.628,215.376 L1323.42,202.496 L1264.956,202.496 L1264.956,215.376 L1285.564,215.376 L1285.564,280 L1302.028,280 L1302.028,215.376 L1321.628,215.376 Z M1358.476,200.704 C1379.756,200.704 1392.86,215.264 1392.86,241.248 C1392.86,266.672 1379.756,281.792 1358.476,281.792 C1337.196,281.792 1323.98,267.12 1323.98,241.248 C1323.98,215.936 1337.196,200.704 1358.476,200.704 Z M1358.476,213.024 C1347.5,213.024 1341.34,220.976 1341.34,241.248 C1341.34,261.52 1347.724,269.472 1358.476,269.472 C1369.564,269.472 1375.5,261.52 1375.5,241.248 C1375.5,220.976 1369.564,213.024 1358.476,213.024 Z M1435.868,200.704 C1457.148,200.704 1470.252,215.264 1470.252,241.248 C1470.252,266.672 1457.148,281.792 1435.868,281.792 C1414.588,281.792 1401.372,267.12 1401.372,241.248 C1401.372,215.936 1414.588,200.704 1435.868,200.704 Z M1435.868,213.024 C1424.892,213.024 1418.732,220.976 1418.732,241.248 C1418.732,261.52 1425.116,269.472 1435.868,269.472 C1446.956,269.472 1452.892,261.52 1452.892,241.248 C1452.892,220.976 1446.956,213.024 1435.868,213.024 Z M1499.148,266.784 L1499.148,202.496 L1482.684,202.496 L1482.684,280 L1528.044,280 L1529.836,266.784 L1499.148,266.784 Z" id="DELETE-TOOL"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/delete/info-text.svg b/unpublishedScripts/marketplace/shapes/assets/tools/delete/info-text.svg
new file mode 100644
index 0000000000..4148bd8525
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/delete/info-text.svg
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="1416" height="320" viewBox="0 0 1416.00 320.00" enable-background="new 0 0 1416.00 320.00" xml:space="preserve">
+	<g>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 5.82151,17.2876L 18.8269,41.4828L 31.9461,17.2876L 36.2024,17.2876L 20.7886,45.5302L 20.7886,62.2542L 16.8651,62.2542L 16.8651,45.4115L 1.50391,17.2876L 5.82151,17.2876 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 53.6917,62.8875C 51.5606,62.8875 49.6164,62.434 47.859,61.5269C 46.1016,60.6198 44.5792,59.3844 43.2918,57.8209C 42.0044,56.2574 41.006,54.4414 40.2966,52.3732C 39.5873,50.305 39.2326,48.1295 39.2326,45.8469C 39.2326,43.5247 39.596,41.3295 40.3229,39.2613C 41.0498,37.193 42.0584,35.3788 43.3487,33.8185C 44.6391,32.2583 46.1615,31.0131 47.9159,30.0829C 49.6704,29.1526 51.5957,28.6875 53.6917,28.6875C 55.7819,28.6875 57.7145,29.1526 59.4894,30.0829C 61.2643,31.0131 62.7969,32.2583 64.0872,33.8185C 65.3776,35.3788 66.3862,37.193 67.1131,39.2613C 67.84,41.3295 68.2034,43.5247 68.2034,45.8469C 68.2034,48.1295 67.8487,50.305 67.1393,52.3732C 66.4299,54.4414 65.4316,56.2574 64.1442,57.8209C 62.8568,59.3844 61.3256,60.6198 59.5507,61.5269C 57.7758,62.434 55.8228,62.8875 53.6917,62.8875 Z M 43.0948,45.9162C 43.0948,47.77 43.375,49.4886 43.9355,51.0719C 44.496,52.6552 45.2536,54.0489 46.2082,55.2529C 47.1628,56.4569 48.2838,57.397 49.5712,58.0732C 50.8586,58.7494 52.2321,59.0876 53.6917,59.0876C 55.1455,59.0876 56.5176,58.7395 57.8079,58.0435C 59.0982,57.3475 60.2294,56.3975 61.2015,55.1935C 62.1736,53.9895 62.94,52.586 63.5005,50.9828C 64.061,49.3797 64.3412,47.648 64.3412,45.7875C 64.3412,43.9733 64.061,42.2531 63.5005,40.6269C 62.94,39.0006 62.1736,37.5855 61.2015,36.3816C 60.2294,35.1776 59.0982,34.2276 57.8079,33.5316C 56.5176,32.8355 55.1455,32.4875 53.6917,32.4875C 52.2321,32.4875 50.8673,32.8355 49.5974,33.5316C 48.3275,34.2276 47.2066,35.1875 46.2344,36.4113C 45.2623,37.635 44.496,39.06 43.9355,40.6862C 43.375,42.3125 43.0948,44.0558 43.0948,45.9162 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 84.0113,62.8875C 80.8351,62.8875 78.4719,61.6951 76.9218,59.3102C 75.3717,56.9253 74.5966,53.3678 74.5966,48.6375L 74.5966,29.2615L 78.4063,29.2615L 78.4063,47.8756C 78.4063,55.3502 80.6687,59.0876 85.1936,59.0876C 86.3146,59.0876 87.4166,58.8764 88.4996,58.4542C 89.5827,58.032 90.5811,57.4201 91.4948,56.6185C 92.4085,55.817 93.2303,54.867 93.9601,53.7685C 94.6899,52.6701 95.2796,51.4249 95.7292,50.0329L 95.7292,29.2615L 99.5388,29.2615L 99.5388,56.6829C 99.5388,57.8638 99.9884,58.4542 100.888,58.4542L 100.888,62.2542C 100.438,62.34 100.073,62.3828 99.7928,62.3828C 99.5126,62.3828 99.317,62.3828 99.2061,62.3828C 98.3069,62.3367 97.5771,61.9771 97.0166,61.3042C 96.4561,60.6313 96.1758,59.7242 96.1758,58.5829L 96.1758,54.7829C 94.903,57.3558 93.1748,59.3498 90.9912,60.7649C 88.8076,62.18 86.481,62.8875 84.0113,62.8875 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 120.505,45.6589C 120.505,43.3367 120.86,41.1414 121.569,39.0732C 122.279,37.005 123.277,35.2007 124.564,33.6602C 125.852,32.1198 127.393,30.9059 129.188,30.0185C 130.984,29.1312 132.965,28.6875 135.131,28.6875C 137.898,28.6875 140.309,29.3951 142.365,30.8102C 144.42,32.2253 145.97,34.1368 147.015,36.5448L 143.31,37.8709C 142.493,36.182 141.346,34.8625 139.869,33.9126C 138.391,32.9626 136.757,32.4875 134.964,32.4875C 133.47,32.4875 132.077,32.8257 130.787,33.5019C 129.496,34.1781 128.375,35.0967 127.424,36.2578C 126.472,37.419 125.725,38.8011 125.182,40.4042C 124.639,42.0074 124.367,43.7589 124.367,45.6589C 124.367,47.5193 124.647,49.2725 125.208,50.9185C 125.769,52.5645 126.535,53.9895 127.507,55.1935C 128.479,56.3975 129.61,57.3475 130.901,58.0435C 132.191,58.7395 133.563,59.0876 135.017,59.0876C 135.951,59.0876 136.876,58.9391 137.793,58.6422C 138.71,58.3454 139.561,57.933 140.346,57.4052C 141.131,56.8775 141.804,56.2771 142.365,55.6042C 142.925,54.9313 143.316,54.2122 143.538,53.4469L 147.295,54.7136C 146.881,55.9011 146.282,56.9896 145.5,57.9792C 144.717,58.9688 143.794,59.833 142.728,60.5719C 141.662,61.3108 140.485,61.8815 139.194,62.2839C 137.904,62.6863 136.567,62.8875 135.183,62.8875C 133.058,62.8875 131.098,62.434 129.302,61.5269C 127.507,60.6198 125.955,59.3745 124.647,57.7912C 123.34,56.2079 122.322,54.3821 121.595,52.3138C 120.869,50.2456 120.505,48.0273 120.505,45.6589 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 160.686,62.8875C 159.308,62.8875 158.029,62.6237 156.85,62.0959C 155.671,61.5681 154.643,60.8391 153.767,59.9089C 152.891,58.9787 152.21,57.8918 151.722,56.6482C 151.235,55.4046 150.991,54.0638 150.991,52.6256C 150.991,51.194 151.29,49.8646 151.889,48.6375C 152.487,47.4105 153.328,46.3549 154.411,45.4709C 155.494,44.5869 156.783,43.9007 158.277,43.4125C 159.772,42.9243 161.416,42.6803 163.208,42.6803C 164.703,42.6803 166.216,42.8287 167.749,43.1256C 169.282,43.4225 170.646,43.8447 171.843,44.3922L 171.843,41.4136C 171.843,38.5042 171.115,36.1935 169.658,34.4816C 168.202,32.7696 166.183,31.9136 163.602,31.9136C 162.108,31.9136 160.576,32.2517 159.009,32.9279C 157.441,33.6041 155.852,34.5756 154.24,35.8423L 152.9,32.9922C 156.672,30.1224 160.333,28.6875 163.882,28.6875C 167.543,28.6875 170.42,29.8487 172.513,32.1709C 174.606,34.4931 175.653,37.7027 175.653,41.7995L 175.653,56.6829C 175.653,57.8638 176.12,58.4542 177.054,58.4542L 177.054,62.2542C 176.418,62.3795 175.933,62.4422 175.6,62.4422C 174.625,62.4422 173.868,62.1685 173.328,61.6209C 172.788,61.0733 172.497,60.3146 172.456,59.3448L 172.351,56.7422C 171.003,58.728 169.311,60.2487 167.276,61.3042C 165.241,62.3598 163.045,62.8875 160.686,62.8875 Z M 161.588,59.5922C 163.567,59.5922 165.389,59.17 167.053,58.3256C 168.717,57.4811 169.978,56.3629 170.836,54.9709C 171.169,54.5882 171.42,54.1759 171.589,53.7339C 171.759,53.2919 171.843,52.8795 171.843,52.4969L 171.843,47.1136C 170.571,46.566 169.252,46.1454 167.889,45.8519C 166.526,45.5583 165.135,45.4115 163.716,45.4115C 161.025,45.4115 158.838,46.0448 157.156,47.3115C 155.475,48.5782 154.634,50.244 154.634,52.3089C 154.634,53.3249 154.812,54.2765 155.168,55.1638C 155.525,56.0512 156.011,56.8214 156.627,57.4745C 157.243,58.1277 157.98,58.6439 158.838,59.0232C 159.696,59.4026 160.613,59.5922 161.588,59.5922 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 208.722,62.2542L 204.913,62.2542L 204.913,43.8282C 204.913,39.8962 204.399,37.0446 203.371,35.2732C 202.344,33.5019 200.765,32.6162 198.633,32.6162C 197.512,32.6162 196.391,32.8487 195.27,33.3138C 194.149,33.779 193.113,34.4337 192.161,35.2782C 191.21,36.1226 190.36,37.1254 189.613,38.2865C 188.866,39.4476 188.323,40.7011 187.984,42.0469L 187.984,62.2542L 184.174,62.2542L 184.174,29.2615L 187.651,29.2615L 187.651,36.7329C 188.848,34.3249 190.557,32.382 192.779,30.9042C 195,29.4264 197.419,28.6875 200.035,28.6875C 201.64,28.6875 203.004,29.0257 204.125,29.7019C 205.246,30.3781 206.143,31.3281 206.818,32.5519C 207.492,33.7757 207.978,35.2749 208.276,37.0495C 208.574,38.8242 208.722,40.7868 208.722,42.9375L 208.722,62.2542 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 238.595,62.8875C 237.217,62.8875 235.939,62.6237 234.759,62.0959C 233.58,61.5681 232.552,60.8391 231.677,59.9089C 230.801,58.9787 230.119,57.8918 229.632,56.6482C 229.144,55.4046 228.9,54.0638 228.9,52.6256C 228.9,51.194 229.2,49.8646 229.798,48.6375C 230.397,47.4105 231.237,46.3549 232.32,45.4709C 233.403,44.5869 234.692,43.9007 236.187,43.4125C 237.682,42.9243 239.325,42.6803 241.118,42.6803C 242.612,42.6803 244.126,42.8287 245.659,43.1256C 247.191,43.4225 248.556,43.8447 249.753,44.3922L 249.753,41.4136C 249.753,38.5042 249.024,36.1935 247.568,34.4816C 246.111,32.7696 244.092,31.9136 241.512,31.9136C 240.017,31.9136 238.486,32.2517 236.918,32.9279C 235.351,33.6041 233.761,34.5756 232.15,35.8423L 230.81,32.9922C 234.581,30.1224 238.242,28.6875 241.792,28.6875C 245.453,28.6875 248.33,29.8487 250.423,32.1709C 252.516,34.4931 253.563,37.7027 253.563,41.7995L 253.563,56.6829C 253.563,57.8638 254.03,58.4542 254.964,58.4542L 254.964,62.2542C 254.327,62.3795 253.843,62.4422 253.51,62.4422C 252.535,62.4422 251.777,62.1685 251.237,61.6209C 250.697,61.0733 250.407,60.3146 250.366,59.3448L 250.261,56.7422C 248.912,58.728 247.22,60.2487 245.186,61.3042C 243.151,62.3598 240.954,62.8875 238.595,62.8875 Z M 239.497,59.5922C 241.477,59.5922 243.298,59.17 244.962,58.3256C 246.626,57.4811 247.887,56.3629 248.746,54.9709C 249.078,54.5882 249.33,54.1759 249.499,53.7339C 249.668,53.2919 249.753,52.8795 249.753,52.4969L 249.753,47.1136C 248.48,46.566 247.162,46.1454 245.799,45.8519C 244.435,45.5583 243.044,45.4115 241.626,45.4115C 238.934,45.4115 236.747,46.0448 235.066,47.3115C 233.385,48.5782 232.544,50.244 232.544,52.3089C 232.544,53.3249 232.722,54.2765 233.078,55.1638C 233.434,56.0512 233.92,56.8214 234.536,57.4745C 235.152,58.1277 235.889,58.6439 236.747,59.0232C 237.606,59.4026 238.522,59.5922 239.497,59.5922 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 262.25,16.0209L 266.06,16.0209L 266.06,54.7829C 266.06,56.0033 266.359,56.9632 266.958,57.6625C 267.556,58.3618 268.398,58.7115 269.484,58.7115C 269.893,58.7115 270.377,58.6472 270.938,58.5185C 271.499,58.3899 272.021,58.22 272.506,58.0089L 273.18,61.4922C 272.474,61.8287 271.607,62.1025 270.579,62.3136C 269.551,62.5247 268.664,62.6302 267.917,62.6302C 266.159,62.6302 264.775,62.0711 263.765,60.9529C 262.755,59.8347 262.25,58.2629 262.25,56.2375L 262.25,16.0209 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 286.912,62.8875C 284.635,62.8875 282.412,62.4653 280.243,61.6209C 278.074,60.7764 276.207,59.5526 274.643,57.9495L 276.377,55.0302C 278.023,56.5542 279.696,57.6955 281.395,58.4542C 283.094,59.2129 284.915,59.5922 286.86,59.5922C 289.213,59.5922 291.09,59.0546 292.491,57.9792C 293.892,56.9039 294.593,55.3733 294.593,53.3875C 294.593,52.4573 294.406,51.6871 294.032,51.0769C 293.659,50.4666 293.107,49.929 292.377,49.4638C 291.647,48.9987 290.732,48.5864 289.632,48.2269C 288.531,47.8673 287.251,47.4962 285.791,47.1136C 284.11,46.6518 282.653,46.1883 281.421,45.7232C 280.189,45.2581 279.172,44.7303 278.369,44.1399C 277.566,43.5494 276.968,42.8221 276.574,41.9579C 276.18,41.0936 275.983,40.0051 275.983,38.6922C 275.983,37.0495 276.273,35.5948 276.854,34.3282C 277.435,33.0615 278.22,32.0158 279.21,31.1912C 280.199,30.3665 281.357,29.7431 282.682,29.3209C 284.008,28.8987 285.418,28.6875 286.912,28.6875C 289.154,28.6875 291.19,29.0999 293.021,29.9245C 294.851,30.7492 296.327,31.8344 297.448,33.1803L 295.6,35.7136C 294.52,34.4469 293.203,33.4969 291.65,32.8636C 290.097,32.2303 288.48,31.9136 286.798,31.9136C 285.794,31.9136 284.861,32.0307 284,32.2649C 283.139,32.4991 282.382,32.8685 281.728,33.3732C 281.074,33.8779 280.56,34.5211 280.186,35.3029C 279.813,36.0847 279.626,37.0033 279.626,38.0589C 279.626,38.9495 279.757,39.6686 280.02,40.2162C 280.283,40.7638 280.713,41.2388 281.312,41.6412C 281.91,42.0436 282.666,42.4032 283.58,42.7198C 284.494,43.0365 285.604,43.3631 286.912,43.6995C 288.781,44.2075 290.426,44.7138 291.847,45.2185C 293.269,45.7232 294.456,46.3137 295.407,46.9899C 296.359,47.6661 297.077,48.4891 297.562,49.4589C 298.046,50.4287 298.289,51.6129 298.289,53.0115C 298.289,56.0462 297.261,58.4509 295.206,60.2256C 293.151,62.0002 290.386,62.8875 286.912,62.8875 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 317.127,62.8875C 314.996,62.8875 313.051,62.434 311.294,61.5269C 309.537,60.6198 308.014,59.3844 306.727,57.8209C 305.439,56.2574 304.441,54.4414 303.732,52.3732C 303.022,50.305 302.668,48.1295 302.668,45.8469C 302.668,43.5247 303.031,41.3295 303.758,39.2613C 304.485,37.193 305.493,35.3788 306.784,33.8185C 308.074,32.2583 309.596,31.0131 311.351,30.0829C 313.105,29.1526 315.031,28.6875 317.127,28.6875C 319.217,28.6875 321.149,29.1526 322.924,30.0829C 324.699,31.0131 326.232,32.2583 327.522,33.8185C 328.813,35.3788 329.821,37.193 330.548,39.2613C 331.275,41.3295 331.638,43.5247 331.638,45.8469C 331.638,48.1295 331.284,50.305 330.574,52.3732C 329.865,54.4414 328.867,56.2574 327.579,57.8209C 326.292,59.3844 324.761,60.6198 322.986,61.5269C 321.211,62.434 319.258,62.8875 317.127,62.8875 Z M 306.53,45.9162C 306.53,47.77 306.81,49.4886 307.37,51.0719C 307.931,52.6552 308.689,54.0489 309.643,55.2529C 310.598,56.4569 311.719,57.397 313.006,58.0732C 314.294,58.7494 315.667,59.0876 317.127,59.0876C 318.58,59.0876 319.953,58.7395 321.243,58.0435C 322.533,57.3475 323.664,56.3975 324.637,55.1935C 325.609,53.9895 326.375,52.586 326.935,50.9828C 327.496,49.3797 327.776,47.648 327.776,45.7875C 327.776,43.9733 327.496,42.2531 326.935,40.6269C 326.375,39.0006 325.609,37.5855 324.637,36.3816C 323.664,35.1776 322.533,34.2276 321.243,33.5316C 319.953,32.8355 318.58,32.4875 317.127,32.4875C 315.667,32.4875 314.302,32.8355 313.032,33.5316C 311.763,34.2276 310.642,35.1875 309.669,36.4113C 308.697,37.635 307.931,39.06 307.37,40.6862C 306.81,42.3125 306.53,44.0558 306.53,45.9162 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 364.883,62.8875C 362.863,62.8875 360.993,62.4125 359.274,61.4626C 357.554,60.5125 356.078,59.2558 354.847,57.6922C 353.615,56.1287 352.653,54.3243 351.961,52.2792C 351.269,50.2341 350.923,48.09 350.923,45.8469C 350.923,43.5247 351.259,41.3196 351.93,39.2316C 352.602,37.1435 353.527,35.3177 354.706,33.7542C 355.886,32.1907 357.287,30.9554 358.91,30.0482C 360.533,29.1411 362.317,28.6875 364.261,28.6875C 366.731,28.6875 368.917,29.4165 370.821,30.8745C 372.724,32.3325 374.219,34.094 375.305,36.1589L 375.305,16.0209L 379.114,16.0209L 379.114,56.6829C 379.114,57.8638 379.564,58.4542 380.463,58.4542L 380.463,62.2542C 379.903,62.3795 379.453,62.4422 379.114,62.4422C 378.221,62.4422 377.437,62.1157 376.763,61.4626C 376.089,60.8094 375.751,60.0178 375.751,59.0876L 375.751,55.8615C 374.595,58.0122 373.026,59.7209 371.044,60.9875C 369.062,62.2542 367.008,62.8875 364.883,62.8875 Z M 365.724,59.0876C 366.658,59.0876 367.656,58.8764 368.719,58.4542C 369.782,58.032 370.78,57.4514 371.714,56.7126C 372.648,55.9737 373.442,55.1078 374.096,54.1149C 374.75,53.122 375.153,52.0549 375.305,50.9136L 375.305,40.7209C 374.931,39.5796 374.39,38.5125 373.68,37.5196C 372.971,36.5267 372.158,35.6509 371.241,34.8922C 370.324,34.1335 369.344,33.5431 368.299,33.1209C 367.253,32.6986 366.226,32.4875 365.216,32.4875C 363.645,32.4875 362.225,32.8669 360.955,33.6256C 359.685,34.3842 358.592,35.387 357.675,36.6339C 356.759,37.8808 356.058,39.3058 355.573,40.9089C 355.089,42.512 354.847,44.1581 354.847,45.8469C 354.847,47.6216 355.127,49.3121 355.687,50.9185C 356.248,52.525 357.014,53.9285 357.986,55.1292C 358.958,56.3299 360.107,57.2898 361.432,58.0089C 362.758,58.728 364.188,59.0876 365.724,59.0876 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 400.247,62.8875C 398.116,62.8875 396.163,62.434 394.388,61.5269C 392.613,60.6198 391.072,59.3745 389.764,57.7912C 388.456,56.2079 387.439,54.3821 386.712,52.3138C 385.985,50.2456 385.621,48.0273 385.621,45.6589C 385.621,43.3367 385.985,41.1513 386.712,39.1029C 387.439,37.0545 388.447,35.26 389.738,33.7196C 391.028,32.1791 392.569,30.9554 394.362,30.0482C 396.154,29.1411 398.098,28.6875 400.194,28.6875C 402.32,28.6875 404.27,29.1411 406.045,30.0482C 407.82,30.9554 409.343,32.1907 410.616,33.7542C 411.889,35.3177 412.88,37.1122 413.59,39.1375C 414.299,41.1629 414.654,43.3169 414.654,45.5995C 414.654,45.936 414.654,46.2724 414.654,46.6089C 414.654,46.9453 414.633,47.1796 414.592,47.3115L 389.598,47.3115C 389.708,49.0796 390.072,50.714 390.688,52.2149C 391.304,53.7158 392.098,55.0154 393.07,56.1139C 394.042,57.2123 395.154,58.0666 396.407,58.6768C 397.659,59.2871 398.995,59.5922 400.413,59.5922C 401.348,59.5922 402.282,59.4454 403.216,59.1519C 404.15,58.8583 405.01,58.4575 405.795,57.9495C 406.58,57.4415 407.291,56.8181 407.928,56.0792C 408.564,55.3403 409.049,54.5289 409.381,53.6448L 412.692,54.6542C 412.242,55.8813 411.606,56.9896 410.783,57.9792C 409.959,58.9688 409.006,59.833 407.923,60.5719C 406.84,61.3108 405.645,61.8815 404.337,62.2839C 403.029,62.6863 401.666,62.8875 400.247,62.8875 Z M 411.01,44.0162C 410.899,42.2415 410.535,40.6252 409.916,39.1672C 409.297,37.7093 408.511,36.4525 407.56,35.3969C 406.608,34.3414 405.506,33.5183 404.254,32.9279C 403.001,32.3375 401.666,32.0422 400.247,32.0422C 398.828,32.0422 397.484,32.3375 396.214,32.9279C 394.944,33.5183 393.832,34.3414 392.877,35.3969C 391.923,36.4525 391.156,37.7191 390.578,39.1969C 390,40.6747 389.656,42.2811 389.545,44.0162L 411.01,44.0162 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 420.872,16.0209L 424.681,16.0209L 424.681,54.7829C 424.681,56.0033 424.981,56.9632 425.579,57.6625C 426.177,58.3618 427.02,58.7115 428.106,58.7115C 428.514,58.7115 428.999,58.6472 429.559,58.5185C 430.12,58.3899 430.642,58.22 431.127,58.0089L 431.801,61.4922C 431.095,61.8287 430.228,62.1025 429.2,62.3136C 428.173,62.5247 427.285,62.6302 426.538,62.6302C 424.781,62.6302 423.397,62.0711 422.387,60.9529C 421.377,59.8347 420.872,58.2629 420.872,56.2375L 420.872,16.0209 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 448.45,62.8875C 446.319,62.8875 444.366,62.434 442.591,61.5269C 440.816,60.6198 439.275,59.3745 437.967,57.7912C 436.659,56.2079 435.642,54.3821 434.915,52.3138C 434.188,50.2456 433.824,48.0273 433.824,45.6589C 433.824,43.3367 434.188,41.1513 434.915,39.1029C 435.642,37.0545 436.65,35.26 437.941,33.7196C 439.231,32.1791 440.772,30.9554 442.565,30.0482C 444.357,29.1411 446.301,28.6875 448.397,28.6875C 450.523,28.6875 452.473,29.1411 454.248,30.0482C 456.023,30.9554 457.546,32.1907 458.819,33.7542C 460.092,35.3177 461.083,37.1122 461.793,39.1375C 462.502,41.1629 462.857,43.3169 462.857,45.5995C 462.857,45.936 462.857,46.2724 462.857,46.6089C 462.857,46.9453 462.836,47.1796 462.795,47.3115L 437.801,47.3115C 437.911,49.0796 438.275,50.714 438.891,52.2149C 439.507,53.7158 440.301,55.0154 441.273,56.1139C 442.245,57.2123 443.357,58.0666 444.61,58.6768C 445.862,59.2871 447.198,59.5922 448.616,59.5922C 449.551,59.5922 450.485,59.4454 451.419,59.1519C 452.353,58.8583 453.213,58.4575 453.998,57.9495C 454.783,57.4415 455.494,56.8181 456.131,56.0792C 456.767,55.3403 457.252,54.5289 457.584,53.6448L 460.895,54.6542C 460.445,55.8813 459.809,56.9896 458.986,57.9792C 458.162,58.9688 457.209,59.833 456.126,60.5719C 455.043,61.3108 453.848,61.8815 452.54,62.2839C 451.232,62.6863 449.869,62.8875 448.45,62.8875 Z M 459.213,44.0162C 459.102,42.2415 458.738,40.6252 458.119,39.1672C 457.5,37.7093 456.714,36.4525 455.763,35.3969C 454.811,34.3414 453.709,33.5183 452.457,32.9279C 451.204,32.3375 449.869,32.0422 448.45,32.0422C 447.031,32.0422 445.687,32.3375 444.417,32.9279C 443.147,33.5183 442.035,34.3414 441.08,35.3969C 440.126,36.4525 439.359,37.7191 438.781,39.1969C 438.203,40.6747 437.859,42.2811 437.748,44.0162L 459.213,44.0162 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 482.921,60.6709C 482.699,60.7962 482.372,60.9644 481.94,61.1756C 481.508,61.3867 481.012,61.5978 480.451,61.8089C 479.891,62.02 479.256,62.2097 478.546,62.3779C 477.837,62.5461 477.091,62.6302 476.309,62.6302C 475.485,62.6302 474.7,62.5049 473.953,62.2542C 473.205,62.0035 472.552,61.6143 471.991,61.0865C 471.431,60.5587 470.982,59.8924 470.647,59.0876C 470.311,58.2827 470.143,57.3525 470.143,56.2969L 470.143,32.6756L 466.106,32.6756L 466.106,29.2615L 470.143,29.2615L 470.143,18.1089L 473.953,18.1089L 473.953,29.2615L 480.679,29.2615L 480.679,32.6756L 473.953,32.6756L 473.953,55.0995C 474.029,56.32 474.413,57.2156 475.104,57.7862C 475.796,58.3569 476.589,58.6422 477.482,58.6422C 478.568,58.6422 479.521,58.4427 480.342,58.0435C 481.162,57.6444 481.686,57.3591 481.914,57.1875L 482.921,60.6709 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 500.577,62.8875C 498.445,62.8875 496.492,62.434 494.718,61.5269C 492.943,60.6198 491.401,59.3745 490.093,57.7912C 488.786,56.2079 487.768,54.3821 487.041,52.3138C 486.314,50.2456 485.951,48.0273 485.951,45.6589C 485.951,43.3367 486.314,41.1513 487.041,39.1029C 487.768,37.0545 488.777,35.26 490.067,33.7196C 491.357,32.1791 492.899,30.9554 494.691,30.0482C 496.484,29.1411 498.428,28.6875 500.524,28.6875C 502.649,28.6875 504.599,29.1411 506.374,30.0482C 508.149,30.9554 509.673,32.1907 510.946,33.7542C 512.219,35.3177 513.21,37.1122 513.919,39.1375C 514.628,41.1629 514.983,43.3169 514.983,45.5995C 514.983,45.936 514.983,46.2724 514.983,46.6089C 514.983,46.9453 514.963,47.1796 514.922,47.3115L 489.927,47.3115C 490.038,49.0796 490.401,50.714 491.017,52.2149C 491.633,53.7158 492.427,55.0154 493.4,56.1139C 494.372,57.2123 495.484,58.0666 496.736,58.6768C 497.989,59.2871 499.324,59.5922 500.743,59.5922C 501.677,59.5922 502.611,59.4454 503.545,59.1519C 504.48,58.8583 505.339,58.4575 506.125,57.9495C 506.91,57.4415 507.621,56.8181 508.257,56.0792C 508.894,55.3403 509.378,54.5289 509.711,53.6448L 513.021,54.6542C 512.572,55.8813 511.935,56.9896 511.112,57.9792C 510.289,58.9688 509.336,59.833 508.253,60.5719C 507.17,61.3108 505.974,61.8815 504.666,62.2839C 503.359,62.6863 501.995,62.8875 500.577,62.8875 Z M 511.34,44.0162C 511.229,42.2415 510.864,40.6252 510.245,39.1672C 509.626,37.7093 508.841,36.4525 507.889,35.3969C 506.938,34.3414 505.836,33.5183 504.583,32.9279C 503.331,32.3375 501.995,32.0422 500.577,32.0422C 499.158,32.0422 497.813,32.3375 496.544,32.9279C 495.274,33.5183 494.161,34.3414 493.207,35.3969C 492.252,36.4525 491.486,37.7191 490.908,39.1969C 490.33,40.6747 489.985,42.2811 489.875,44.0162L 511.34,44.0162 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 548.219,62.8875C 546.088,62.8875 544.135,62.434 542.36,61.5269C 540.585,60.6198 539.044,59.3745 537.736,57.7912C 536.428,56.2079 535.411,54.3821 534.684,52.3138C 533.957,50.2456 533.594,48.0273 533.594,45.6589C 533.594,43.3367 533.957,41.1513 534.684,39.1029C 535.411,37.0545 536.419,35.26 537.71,33.7196C 539,32.1791 540.541,30.9554 542.334,30.0482C 544.126,29.1411 546.07,28.6875 548.167,28.6875C 550.292,28.6875 552.242,29.1411 554.017,30.0482C 555.792,30.9554 557.315,32.1907 558.588,33.7542C 559.861,35.3177 560.852,37.1122 561.562,39.1375C 562.271,41.1629 562.626,43.3169 562.626,45.5995C 562.626,45.936 562.626,46.2724 562.626,46.6089C 562.626,46.9453 562.605,47.1796 562.564,47.3115L 537.57,47.3115C 537.68,49.0796 538.044,50.714 538.66,52.2149C 539.276,53.7158 540.07,55.0154 541.042,56.1139C 542.014,57.2123 543.126,58.0666 544.379,58.6768C 545.631,59.2871 546.967,59.5922 548.385,59.5922C 549.32,59.5922 550.254,59.4454 551.188,59.1519C 552.122,58.8583 552.982,58.4575 553.767,57.9495C 554.552,57.4415 555.263,56.8181 555.9,56.0792C 556.536,55.3403 557.021,54.5289 557.353,53.6448L 560.664,54.6542C 560.214,55.8813 559.578,56.9896 558.755,57.9792C 557.931,58.9688 556.978,59.833 555.895,60.5719C 554.812,61.3108 553.617,61.8815 552.309,62.2839C 551.001,62.6863 549.638,62.8875 548.219,62.8875 Z M 558.982,44.0162C 558.871,42.2415 558.507,40.6252 557.888,39.1672C 557.269,37.7093 556.483,36.4525 555.532,35.3969C 554.58,34.3414 553.478,33.5183 552.226,32.9279C 550.973,32.3375 549.638,32.0422 548.219,32.0422C 546.8,32.0422 545.456,32.3375 544.186,32.9279C 542.916,33.5183 541.804,34.3414 540.849,35.3969C 539.895,36.4525 539.128,37.7191 538.55,39.1969C 537.972,40.6747 537.628,42.2811 537.517,44.0162L 558.982,44.0162 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 593.225,62.2542L 589.416,62.2542L 589.416,43.8282C 589.416,39.8962 588.902,37.0446 587.874,35.2732C 586.847,33.5019 585.268,32.6162 583.136,32.6162C 582.015,32.6162 580.894,32.8487 579.773,33.3138C 578.652,33.779 577.616,34.4337 576.664,35.2782C 575.713,36.1226 574.863,37.1254 574.116,38.2865C 573.369,39.4476 572.826,40.7011 572.487,42.0469L 572.487,62.2542L 568.677,62.2542L 568.677,29.2615L 572.154,29.2615L 572.154,36.7329C 573.351,34.3249 575.06,32.382 577.282,30.9042C 579.503,29.4264 581.922,28.6875 584.538,28.6875C 586.143,28.6875 587.507,29.0257 588.628,29.7019C 589.749,30.3781 590.646,31.3281 591.321,32.5519C 591.995,33.7757 592.481,35.2749 592.779,37.0495C 593.077,38.8242 593.225,40.7868 593.225,42.9375L 593.225,62.2542 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 615.199,60.6709C 614.977,60.7962 614.65,60.9644 614.218,61.1756C 613.786,61.3867 613.29,61.5978 612.729,61.8089C 612.169,62.02 611.534,62.2097 610.824,62.3779C 610.115,62.5461 609.369,62.6302 608.587,62.6302C 607.763,62.6302 606.978,62.5049 606.231,62.2542C 605.483,62.0035 604.83,61.6143 604.269,61.0865C 603.709,60.5587 603.26,59.8924 602.925,59.0876C 602.589,58.2827 602.421,57.3525 602.421,56.2969L 602.421,32.6756L 598.384,32.6756L 598.384,29.2615L 602.421,29.2615L 602.421,18.1089L 606.231,18.1089L 606.231,29.2615L 612.957,29.2615L 612.957,32.6756L 606.231,32.6756L 606.231,55.0995C 606.307,56.32 606.691,57.2156 607.382,57.7862C 608.074,58.3569 608.867,58.6422 609.76,58.6422C 610.846,58.6422 611.799,58.4427 612.62,58.0435C 613.44,57.6444 613.964,57.3591 614.192,57.1875L 615.199,60.6709 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 620.243,62.2542L 620.243,29.2615L 624.053,29.2615L 624.053,62.2542L 620.243,62.2542 Z M 620.243,22.3542L 620.243,16.0209L 624.053,16.0209L 624.053,22.3542L 620.243,22.3542 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 646.587,60.6709C 646.365,60.7962 646.038,60.9644 645.606,61.1756C 645.174,61.3867 644.678,61.5978 644.117,61.8089C 643.557,62.02 642.922,62.2097 642.212,62.3779C 641.503,62.5461 640.757,62.6302 639.975,62.6302C 639.151,62.6302 638.366,62.5049 637.619,62.2542C 636.872,62.0035 636.218,61.6143 635.657,61.0865C 635.097,60.5587 634.648,59.8924 634.313,59.0876C 633.977,58.2827 633.809,57.3525 633.809,56.2969L 633.809,32.6756L 629.772,32.6756L 629.772,29.2615L 633.809,29.2615L 633.809,18.1089L 637.619,18.1089L 637.619,29.2615L 644.345,29.2615L 644.345,32.6756L 637.619,32.6756L 637.619,55.0995C 637.695,56.32 638.079,57.2156 638.77,57.7862C 639.462,58.3569 640.255,58.6422 641.148,58.6422C 642.234,58.6422 643.187,58.4427 644.008,58.0435C 644.828,57.6444 645.352,57.3591 645.58,57.1875L 646.587,60.6709 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 651.631,62.2542L 651.631,29.2615L 655.441,29.2615L 655.441,62.2542L 651.631,62.2542 Z M 651.631,22.3542L 651.631,16.0209L 655.441,16.0209L 655.441,22.3542L 651.631,22.3542 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 676.574,62.8875C 674.443,62.8875 672.49,62.434 670.715,61.5269C 668.94,60.6198 667.398,59.3745 666.09,57.7912C 664.783,56.2079 663.765,54.3821 663.038,52.3138C 662.311,50.2456 661.948,48.0273 661.948,45.6589C 661.948,43.3367 662.311,41.1513 663.038,39.1029C 663.765,37.0545 664.774,35.26 666.064,33.7196C 667.354,32.1791 668.896,30.9554 670.688,30.0482C 672.481,29.1411 674.425,28.6875 676.521,28.6875C 678.646,28.6875 680.596,29.1411 682.371,30.0482C 684.146,30.9554 685.67,32.1907 686.943,33.7542C 688.216,35.3177 689.207,37.1122 689.916,39.1375C 690.625,41.1629 690.98,43.3169 690.98,45.5995C 690.98,45.936 690.98,46.2724 690.98,46.6089C 690.98,46.9453 690.96,47.1796 690.919,47.3115L 665.924,47.3115C 666.035,49.0796 666.398,50.714 667.014,52.2149C 667.63,53.7158 668.424,55.0154 669.397,56.1139C 670.369,57.2123 671.481,58.0666 672.733,58.6768C 673.986,59.2871 675.321,59.5922 676.74,59.5922C 677.674,59.5922 678.608,59.4454 679.542,59.1519C 680.477,58.8583 681.336,58.4575 682.122,57.9495C 682.907,57.4415 683.618,56.8181 684.254,56.0792C 684.891,55.3403 685.375,54.5289 685.708,53.6448L 689.018,54.6542C 688.569,55.8813 687.932,56.9896 687.109,57.9792C 686.286,58.9688 685.333,59.833 684.25,60.5719C 683.167,61.3108 681.971,61.8815 680.663,62.2839C 679.356,62.6863 677.992,62.8875 676.574,62.8875 Z M 687.337,44.0162C 687.226,42.2415 686.861,40.6252 686.242,39.1672C 685.623,37.7093 684.838,36.4525 683.886,35.3969C 682.935,34.3414 681.833,33.5183 680.58,32.9279C 679.328,32.3375 677.992,32.0422 676.574,32.0422C 675.155,32.0422 673.81,32.3375 672.541,32.9279C 671.271,33.5183 670.159,34.3414 669.204,35.3969C 668.249,36.4525 667.483,37.7191 666.905,39.1969C 666.327,40.6747 665.982,42.2811 665.872,44.0162L 687.337,44.0162 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 706.727,62.8875C 704.45,62.8875 702.227,62.4653 700.058,61.6209C 697.889,60.7764 696.022,59.5526 694.457,57.9495L 696.191,55.0302C 697.837,56.5542 699.51,57.6955 701.209,58.4542C 702.908,59.2129 704.73,59.5922 706.674,59.5922C 709.027,59.5922 710.904,59.0546 712.305,57.9792C 713.707,56.9039 714.407,55.3733 714.407,53.3875C 714.407,52.4573 714.22,51.6871 713.847,51.0769C 713.473,50.4666 712.921,49.929 712.192,49.4638C 711.462,48.9987 710.547,48.5864 709.446,48.2269C 708.345,47.8673 707.065,47.4962 705.606,47.1136C 703.924,46.6518 702.467,46.1883 701.236,45.7232C 700.004,45.2581 698.986,44.7303 698.183,44.1399C 697.381,43.5494 696.782,42.8221 696.388,41.9579C 695.994,41.0936 695.797,40.0051 695.797,38.6922C 695.797,37.0495 696.087,35.5948 696.668,34.3282C 697.249,33.0615 698.035,32.0158 699.024,31.1912C 700.014,30.3665 701.171,29.7431 702.497,29.3209C 703.822,28.8987 705.232,28.6875 706.727,28.6875C 708.969,28.6875 711.005,29.0999 712.835,29.9245C 714.666,30.7492 716.141,31.8344 717.262,33.1803L 715.414,35.7136C 714.334,34.4469 713.018,33.4969 711.465,32.8636C 709.912,32.2303 708.294,31.9136 706.613,31.9136C 705.609,31.9136 704.676,32.0307 703.815,32.2649C 702.954,32.4991 702.196,32.8685 701.542,33.3732C 700.888,33.8779 700.374,34.5211 700.001,35.3029C 699.627,36.0847 699.44,37.0033 699.44,38.0589C 699.44,38.9495 699.572,39.6686 699.834,40.2162C 700.097,40.7638 700.528,41.2388 701.126,41.6412C 701.725,42.0436 702.481,42.4032 703.394,42.7198C 704.308,43.0365 705.419,43.3631 706.727,43.6995C 708.595,44.2075 710.24,44.7138 711.662,45.2185C 713.083,45.7232 714.27,46.3137 715.222,46.9899C 716.173,47.6661 716.892,48.4891 717.376,49.4589C 717.861,50.4287 718.103,51.6129 718.103,53.0115C 718.103,56.0462 717.076,58.4509 715.02,60.2256C 712.965,62.0002 710.201,62.8875 706.727,62.8875 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 753.362,62.8875C 751.044,62.8875 748.923,62.2328 747,60.9232C 745.076,59.6137 743.571,57.9264 742.485,55.8615L 742.485,62.2542L 739.069,62.2542L 739.069,16.0209L 742.879,16.0209L 742.879,36.1589C 744.187,33.9225 745.756,32.1181 747.586,30.7459C 749.417,29.3737 751.546,28.6875 753.975,28.6875C 756.03,28.6875 757.871,29.1725 759.497,30.1422C 761.123,31.112 762.507,32.41 763.648,34.0363C 764.79,35.6624 765.668,37.4998 766.284,39.5482C 766.9,41.5966 767.208,43.6962 767.208,45.8469C 767.208,48.1692 766.853,50.366 766.144,52.4375C 765.435,54.5091 764.463,56.3151 763.228,57.8555C 761.993,59.396 760.526,60.6198 758.827,61.5269C 757.128,62.434 755.306,62.8875 753.362,62.8875 Z M 752.469,59.0876C 754.074,59.0876 755.54,58.7181 756.865,57.9792C 758.19,57.2403 759.331,56.2474 760.285,55.0006C 761.24,53.7537 761.987,52.3386 762.527,50.7552C 763.067,49.1719 763.337,47.5358 763.337,45.8469C 763.337,44.1184 763.085,42.4527 762.58,40.8495C 762.075,39.2464 761.365,37.8214 760.451,36.5745C 759.538,35.3277 758.436,34.3347 757.145,33.5959C 755.855,32.857 754.445,32.4875 752.915,32.4875C 751.753,32.4875 750.669,32.7086 749.662,33.1506C 748.655,33.5926 747.721,34.1946 746.859,34.9566C 745.998,35.7185 745.232,36.596 744.56,37.5888C 743.889,38.5817 743.329,39.6257 742.879,40.7209L 742.879,50.9828C 743.031,52.1242 743.434,53.1896 744.087,54.1792C 744.741,55.1688 745.525,56.0231 746.439,56.7422C 747.353,57.4613 748.342,58.032 749.408,58.4542C 750.473,58.8764 751.494,59.0876 752.469,59.0876 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 775.502,72.3876C 775.8,72.4271 776.089,72.4585 776.369,72.4816C 776.649,72.5046 776.921,72.5162 777.183,72.5162C 777.855,72.5162 778.388,72.4106 778.782,72.1995C 779.176,71.9884 779.56,71.5233 779.933,70.8042C 780.307,70.0851 780.727,69.051 781.194,67.7019C 781.661,66.3527 782.324,64.5368 783.182,62.2542L 770.457,29.2615L 774.381,29.2615L 785.197,58.2662L 795.233,29.2615L 798.876,29.2615L 783.743,71.8136C 783.328,73.0407 782.645,74.1078 781.694,75.0149C 780.742,75.922 779.443,76.3756 777.796,76.3756C 777.423,76.3756 777.068,76.3657 776.732,76.3459C 776.397,76.3261 775.986,76.2733 775.502,76.1875L 775.502,72.3876 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 830.378,62.6995C 828.358,62.6995 826.516,62.2245 824.852,61.2745C 823.188,60.3245 821.749,59.0677 820.534,57.5042C 819.32,55.9407 818.377,54.1462 817.706,52.1209C 817.034,50.0956 816.698,48.0042 816.698,45.8469C 816.698,43.5709 817.025,41.3872 817.679,39.2959C 818.333,37.2046 819.259,35.3788 820.456,33.8185C 821.653,32.2583 823.082,31.0131 824.743,30.0829C 826.404,29.1526 828.244,28.6875 830.264,28.6875C 832.769,28.6875 834.937,29.3951 836.767,30.8102C 838.597,32.2253 840.167,34.0082 841.474,36.1589L 841.474,29.2615L 844.89,29.2615L 844.89,62.3828C 844.89,64.6589 844.508,66.6744 843.743,68.4292C 842.978,70.1841 841.95,71.652 840.66,72.8329C 839.37,74.0137 837.856,74.8994 836.119,75.4899C 834.382,76.0803 832.541,76.3756 830.597,76.3756C 827.234,76.3756 824.525,75.701 822.47,74.3519C 820.415,73.0027 818.754,71.1868 817.487,68.9042L 819.834,66.8162C 820.996,68.9273 822.53,70.4793 824.436,71.4722C 826.342,72.4651 828.396,72.9615 830.597,72.9615C 832.016,72.9615 833.362,72.7388 834.635,72.2935C 835.907,71.8482 837.02,71.1934 837.971,70.3292C 838.923,69.465 839.679,68.3682 840.24,67.0388C 840.8,65.7095 841.08,64.1575 841.08,62.3828L 841.08,55.8615C 839.959,57.9726 838.427,59.64 836.482,60.8639C 834.538,62.0876 832.503,62.6995 830.378,62.6995 Z M 831.438,59.0876C 832.559,59.0876 833.661,58.855 834.744,58.3899C 835.827,57.9248 836.808,57.3014 837.687,56.5196C 838.565,55.7378 839.304,54.862 839.902,53.8922C 840.501,52.9225 840.893,51.9296 841.08,50.9136L 841.08,40.7209C 840.672,39.54 840.111,38.4432 839.399,37.4305C 838.686,36.4178 837.882,35.552 836.986,34.8329C 836.09,34.1138 835.128,33.5431 834.1,33.1209C 833.073,32.6986 832.036,32.4875 830.991,32.4875C 829.345,32.4875 827.878,32.8784 826.591,33.6602C 825.303,34.442 824.211,35.4662 823.315,36.7329C 822.419,37.9995 821.737,39.4344 821.27,41.0375C 820.803,42.6407 820.57,44.2669 820.57,45.9162C 820.57,47.6908 820.85,49.3797 821.41,50.9828C 821.971,52.586 822.746,53.9895 823.735,55.1935C 824.725,56.3975 825.874,57.3475 827.182,58.0435C 828.489,58.7395 829.908,59.0876 831.438,59.0876 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 867.984,33.0615C 865.404,33.1407 863.162,33.9406 861.258,35.4612C 859.355,36.9819 858.009,39.0716 857.221,41.7303L 857.221,62.2542L 853.411,62.2542L 853.411,29.2615L 857.002,29.2615L 857.002,37.1782C 858.082,34.6448 859.537,32.6591 861.368,31.2209C 863.198,29.7827 865.161,29.0636 867.257,29.0636C 867.555,29.0636 867.797,29.0867 867.984,29.1328L 867.984,33.0615 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 880.368,62.8875C 878.99,62.8875 877.711,62.6237 876.532,62.0959C 875.353,61.5681 874.325,60.8391 873.449,59.9089C 872.573,58.9787 871.892,57.8918 871.404,56.6482C 870.917,55.4046 870.673,54.0638 870.673,52.6256C 870.673,51.194 870.972,49.8646 871.571,48.6375C 872.169,47.4105 873.01,46.3549 874.093,45.4709C 875.176,44.5869 876.465,43.9007 877.959,43.4125C 879.454,42.9243 881.098,42.6803 882.89,42.6803C 884.385,42.6803 885.898,42.8287 887.431,43.1256C 888.964,43.4225 890.328,43.8447 891.525,44.3922L 891.525,41.4136C 891.525,38.5042 890.797,36.1935 889.34,34.4816C 887.884,32.7696 885.865,31.9136 883.284,31.9136C 881.79,31.9136 880.258,32.2517 878.691,32.9279C 877.123,33.6041 875.534,34.5756 873.922,35.8423L 872.582,32.9922C 876.354,30.1224 880.015,28.6875 883.564,28.6875C 887.225,28.6875 890.102,29.8487 892.195,32.1709C 894.288,34.4931 895.335,37.7027 895.335,41.7995L 895.335,56.6829C 895.335,57.8638 895.802,58.4542 896.736,58.4542L 896.736,62.2542C 896.1,62.3795 895.615,62.4422 895.282,62.4422C 894.307,62.4422 893.55,62.1685 893.01,61.6209C 892.47,61.0733 892.179,60.3146 892.138,59.3448L 892.033,56.7422C 890.685,58.728 888.993,60.2487 886.958,61.3042C 884.923,62.3598 882.727,62.8875 880.368,62.8875 Z M 881.27,59.5922C 883.249,59.5922 885.071,59.17 886.735,58.3256C 888.399,57.4811 889.66,56.3629 890.518,54.9709C 890.851,54.5882 891.102,54.1759 891.271,53.7339C 891.441,53.2919 891.525,52.8795 891.525,52.4969L 891.525,47.1136C 890.253,46.566 888.935,46.1454 887.571,45.8519C 886.208,45.5583 884.817,45.4115 883.398,45.4115C 880.706,45.4115 878.52,46.0448 876.838,47.3115C 875.157,48.5782 874.316,50.244 874.316,52.3089C 874.316,53.3249 874.494,54.2765 874.85,55.1638C 875.207,56.0512 875.693,56.8214 876.309,57.4745C 876.925,58.1277 877.662,58.6439 878.52,59.0232C 879.378,59.4026 880.295,59.5922 881.27,59.5922 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 918.149,62.8875C 915.831,62.8875 913.71,62.2328 911.786,60.9232C 909.863,59.6137 908.358,57.9264 907.272,55.8615L 907.272,62.2542L 903.856,62.2542L 903.856,16.0209L 907.666,16.0209L 907.666,36.1589C 908.974,33.9225 910.543,32.1181 912.373,30.7459C 914.204,29.3737 916.333,28.6875 918.762,28.6875C 920.817,28.6875 922.658,29.1725 924.284,30.1422C 925.91,31.112 927.294,32.41 928.435,34.0363C 929.576,35.6624 930.455,37.4998 931.071,39.5482C 931.687,41.5966 931.995,43.6962 931.995,45.8469C 931.995,48.1692 931.64,50.366 930.931,52.4375C 930.222,54.5091 929.25,56.3151 928.015,57.8555C 926.78,59.396 925.313,60.6198 923.614,61.5269C 921.915,62.434 920.093,62.8875 918.149,62.8875 Z M 917.256,59.0876C 918.861,59.0876 920.327,58.7181 921.652,57.9792C 922.977,57.2403 924.117,56.2474 925.072,55.0006C 926.027,53.7537 926.774,52.3386 927.314,50.7552C 927.854,49.1719 928.124,47.5358 928.124,45.8469C 928.124,44.1184 927.872,42.4527 927.367,40.8495C 926.862,39.2464 926.152,37.8214 925.238,36.5745C 924.325,35.3277 923.223,34.3347 921.932,33.5959C 920.642,32.857 919.232,32.4875 917.702,32.4875C 916.54,32.4875 915.456,32.7086 914.449,33.1506C 913.442,33.5926 912.508,34.1946 911.646,34.9566C 910.785,35.7185 910.019,36.596 909.347,37.5888C 908.676,38.5817 908.115,39.6257 907.666,40.7209L 907.666,50.9828C 907.818,52.1242 908.221,53.1896 908.874,54.1792C 909.528,55.1688 910.312,56.0231 911.226,56.7422C 912.14,57.4613 913.129,58.032 914.195,58.4542C 915.26,58.8764 916.281,59.0876 917.256,59.0876 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 952.9,62.8875C 950.582,62.8875 948.461,62.2328 946.537,60.9232C 944.614,59.6137 943.109,57.9264 942.023,55.8615L 942.023,62.2542L 938.607,62.2542L 938.607,16.0209L 942.417,16.0209L 942.417,36.1589C 943.725,33.9225 945.294,32.1181 947.124,30.7459C 948.955,29.3737 951.084,28.6875 953.513,28.6875C 955.568,28.6875 957.409,29.1725 959.035,30.1422C 960.661,31.112 962.045,32.41 963.186,34.0363C 964.327,35.6624 965.206,37.4998 965.822,39.5482C 966.438,41.5966 966.746,43.6962 966.746,45.8469C 966.746,48.1692 966.391,50.366 965.682,52.4375C 964.973,54.5091 964,56.3151 962.766,57.8555C 961.531,59.396 960.064,60.6198 958.365,61.5269C 956.666,62.434 954.844,62.8875 952.9,62.8875 Z M 952.007,59.0876C 953.612,59.0876 955.078,58.7181 956.403,57.9792C 957.728,57.2403 958.868,56.2474 959.823,55.0006C 960.778,53.7537 961.525,52.3386 962.065,50.7552C 962.605,49.1719 962.875,47.5358 962.875,45.8469C 962.875,44.1184 962.623,42.4527 962.118,40.8495C 961.613,39.2464 960.903,37.8214 959.989,36.5745C 959.076,35.3277 957.974,34.3347 956.683,33.5959C 955.393,32.857 953.983,32.4875 952.453,32.4875C 951.291,32.4875 950.207,32.7086 949.2,33.1506C 948.193,33.5926 947.258,34.1946 946.397,34.9566C 945.536,35.7185 944.77,36.596 944.098,37.5888C 943.427,38.5817 942.866,39.6257 942.417,40.7209L 942.417,50.9828C 942.569,52.1242 942.971,53.1896 943.625,54.1792C 944.279,55.1688 945.063,56.0231 945.977,56.7422C 946.891,57.4613 947.88,58.032 948.946,58.4542C 950.011,58.8764 951.032,59.0876 952.007,59.0876 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 973.358,62.2542L 973.358,29.2615L 977.168,29.2615L 977.168,62.2542L 973.358,62.2542 Z M 973.358,22.3542L 973.358,16.0209L 977.168,16.0209L 977.168,22.3542L 973.358,22.3542 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 1010.24,62.2542L 1006.43,62.2542L 1006.43,43.8282C 1006.43,39.8962 1005.91,37.0446 1004.89,35.2732C 1003.86,33.5019 1002.28,32.6162 1000.15,32.6162C 999.027,32.6162 997.906,32.8487 996.785,33.3138C 995.664,33.779 994.628,34.4337 993.676,35.2782C 992.725,36.1226 991.875,37.1254 991.128,38.2865C 990.38,39.4476 989.837,40.7011 989.499,42.0469L 989.499,62.2542L 985.689,62.2542L 985.689,29.2615L 989.166,29.2615L 989.166,36.7329C 990.363,34.3249 992.072,32.382 994.294,30.9042C 996.515,29.4264 998.934,28.6875 1001.55,28.6875C 1003.16,28.6875 1004.52,29.0257 1005.64,29.7019C 1006.76,30.3781 1007.66,31.3281 1008.33,32.5519C 1009.01,33.7757 1009.49,35.2749 1009.79,37.0495C 1010.09,38.8242 1010.24,40.7868 1010.24,42.9375L 1010.24,62.2542 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 1029.92,62.6995C 1027.9,62.6995 1026.05,62.2245 1024.39,61.2745C 1022.73,60.3245 1021.29,59.0677 1020.07,57.5042C 1018.86,55.9407 1017.92,54.1462 1017.24,52.1209C 1016.57,50.0956 1016.24,48.0042 1016.24,45.8469C 1016.24,43.5709 1016.56,41.3872 1017.22,39.2959C 1017.87,37.2046 1018.8,35.3788 1019.99,33.8185C 1021.19,32.2583 1022.62,31.0131 1024.28,30.0829C 1025.94,29.1526 1027.78,28.6875 1029.8,28.6875C 1032.31,28.6875 1034.47,29.3951 1036.3,30.8102C 1038.14,32.2253 1039.7,34.0082 1041.01,36.1589L 1041.01,29.2615L 1044.43,29.2615L 1044.43,62.3828C 1044.43,64.6589 1044.05,66.6744 1043.28,68.4292C 1042.52,70.1841 1041.49,71.652 1040.2,72.8329C 1038.91,74.0137 1037.39,74.8994 1035.66,75.4899C 1033.92,76.0803 1032.08,76.3756 1030.14,76.3756C 1026.77,76.3756 1024.06,75.701 1022.01,74.3519C 1019.95,73.0027 1018.29,71.1868 1017.02,68.9042L 1019.37,66.8162C 1020.53,68.9273 1022.07,70.4793 1023.97,71.4722C 1025.88,72.4651 1027.93,72.9615 1030.14,72.9615C 1031.55,72.9615 1032.9,72.7388 1034.17,72.2935C 1035.45,71.8482 1036.56,71.1934 1037.51,70.3292C 1038.46,69.465 1039.22,68.3682 1039.78,67.0388C 1040.34,65.7095 1040.62,64.1575 1040.62,62.3828L 1040.62,55.8615C 1039.5,57.9726 1037.96,59.64 1036.02,60.8639C 1034.08,62.0876 1032.04,62.6995 1029.92,62.6995 Z M 1030.98,59.0876C 1032.1,59.0876 1033.2,58.855 1034.28,58.3899C 1035.36,57.9248 1036.35,57.3014 1037.22,56.5196C 1038.1,55.7378 1038.84,54.862 1039.44,53.8922C 1040.04,52.9225 1040.43,51.9296 1040.62,50.9136L 1040.62,40.7209C 1040.21,39.54 1039.65,38.4432 1038.94,37.4305C 1038.22,36.4178 1037.42,35.552 1036.52,34.8329C 1035.63,34.1138 1034.67,33.5431 1033.64,33.1209C 1032.61,32.6986 1031.57,32.4875 1030.53,32.4875C 1028.88,32.4875 1027.42,32.8784 1026.13,33.6602C 1024.84,34.442 1023.75,35.4662 1022.85,36.7329C 1021.96,37.9995 1021.28,39.4344 1020.81,41.0375C 1020.34,42.6407 1020.11,44.2669 1020.11,45.9162C 1020.11,47.6908 1020.39,49.3797 1020.95,50.9828C 1021.51,52.586 1022.28,53.9895 1023.27,55.1935C 1024.26,56.3975 1025.41,57.3475 1026.72,58.0435C 1028.03,58.7395 1029.45,59.0876 1030.98,59.0876 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 1081.53,60.6709C 1081.31,60.7962 1080.99,60.9644 1080.55,61.1756C 1080.12,61.3867 1079.63,61.5978 1079.07,61.8089C 1078.5,62.02 1077.87,62.2097 1077.16,62.3779C 1076.45,62.5461 1075.7,62.6302 1074.92,62.6302C 1074.1,62.6302 1073.31,62.5049 1072.57,62.2542C 1071.82,62.0035 1071.17,61.6143 1070.6,61.0865C 1070.04,60.5587 1069.6,59.8924 1069.26,59.0876C 1068.92,58.2827 1068.76,57.3525 1068.76,56.2969L 1068.76,32.6756L 1064.72,32.6756L 1064.72,29.2615L 1068.76,29.2615L 1068.76,18.1089L 1072.57,18.1089L 1072.57,29.2615L 1079.29,29.2615L 1079.29,32.6756L 1072.57,32.6756L 1072.57,55.0995C 1072.64,56.32 1073.03,57.2156 1073.72,57.7862C 1074.41,58.3569 1075.2,58.6422 1076.1,58.6422C 1077.18,58.6422 1078.14,58.4427 1078.96,58.0435C 1079.78,57.6444 1080.3,57.3591 1080.53,57.1875L 1081.53,60.6709 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 1111.13,62.2542L 1107.32,62.2542L 1107.32,43.8282C 1107.32,40.0677 1106.75,37.259 1105.61,35.4019C 1104.47,33.5448 1102.8,32.6162 1100.59,32.6162C 1099.51,32.6162 1098.43,32.8586 1097.37,33.3435C 1096.31,33.8284 1095.31,34.4931 1094.37,35.3376C 1093.44,36.182 1092.63,37.1749 1091.93,38.3162C 1091.24,39.4575 1090.73,40.7011 1090.39,42.0469L 1090.39,62.2542L 1086.58,62.2542L 1086.58,16.0209L 1090.39,16.0209L 1090.39,36.7329C 1091.55,34.2391 1093.16,32.2748 1095.21,30.8399C 1097.27,29.405 1099.49,28.6875 1101.88,28.6875C 1103.56,28.6875 1104.98,29.0356 1106.14,29.7316C 1107.3,30.4276 1108.25,31.399 1109,32.6459C 1109.75,33.8928 1110.29,35.392 1110.62,37.1435C 1110.96,38.8951 1111.13,40.8264 1111.13,42.9375L 1111.13,62.2542 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 1131.7,62.8875C 1129.57,62.8875 1127.62,62.434 1125.84,61.5269C 1124.07,60.6198 1122.52,59.3745 1121.22,57.7912C 1119.91,56.2079 1118.89,54.3821 1118.16,52.3138C 1117.44,50.2456 1117.07,48.0273 1117.07,45.6589C 1117.07,43.3367 1117.44,41.1513 1118.16,39.1029C 1118.89,37.0545 1119.9,35.26 1121.19,33.7196C 1122.48,32.1791 1124.02,30.9554 1125.81,30.0482C 1127.61,29.1411 1129.55,28.6875 1131.65,28.6875C 1133.77,28.6875 1135.72,29.1411 1137.5,30.0482C 1139.27,30.9554 1140.8,32.1907 1142.07,33.7542C 1143.34,35.3177 1144.33,37.1122 1145.04,39.1375C 1145.75,41.1629 1146.11,43.3169 1146.11,45.5995C 1146.11,45.936 1146.11,46.2724 1146.11,46.6089C 1146.11,46.9453 1146.09,47.1796 1146.04,47.3115L 1121.05,47.3115C 1121.16,49.0796 1121.52,50.714 1122.14,52.2149C 1122.76,53.7158 1123.55,55.0154 1124.52,56.1139C 1125.49,57.2123 1126.61,58.0666 1127.86,58.6768C 1129.11,59.2871 1130.45,59.5922 1131.87,59.5922C 1132.8,59.5922 1133.73,59.4454 1134.67,59.1519C 1135.6,58.8583 1136.46,58.4575 1137.25,57.9495C 1138.03,57.4415 1138.74,56.8181 1139.38,56.0792C 1140.02,55.3403 1140.5,54.5289 1140.83,53.6448L 1144.14,54.6542C 1143.69,55.8813 1143.06,56.9896 1142.24,57.9792C 1141.41,58.9688 1140.46,59.833 1139.38,60.5719C 1138.29,61.3108 1137.1,61.8815 1135.79,62.2839C 1134.48,62.6863 1133.12,62.8875 1131.7,62.8875 Z M 1142.46,44.0162C 1142.35,42.2415 1141.99,40.6252 1141.37,39.1672C 1140.75,37.7093 1139.96,36.4525 1139.01,35.3969C 1138.06,34.3414 1136.96,33.5183 1135.71,32.9279C 1134.45,32.3375 1133.12,32.0422 1131.7,32.0422C 1130.28,32.0422 1128.94,32.3375 1127.67,32.9279C 1126.4,33.5183 1125.28,34.3414 1124.33,35.3969C 1123.38,36.4525 1122.61,37.7191 1122.03,39.1969C 1121.45,40.6747 1121.11,42.2811 1121,44.0162L 1142.46,44.0162 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 1195.6,62.2542L 1191.79,62.2542L 1191.79,43.8282C 1191.79,39.982 1191.25,37.1518 1190.16,35.3376C 1189.08,33.5233 1187.47,32.6162 1185.34,32.6162C 1184.22,32.6162 1183.16,32.8487 1182.18,33.3138C 1181.19,33.779 1180.27,34.4337 1179.43,35.2782C 1178.59,36.1226 1177.85,37.1254 1177.21,38.2865C 1176.58,39.4476 1176.09,40.7242 1175.75,42.1162L 1175.75,62.2542L 1171.94,62.2542L 1171.94,43.8282C 1171.94,39.8962 1171.42,37.0446 1170.37,35.2732C 1169.33,33.5019 1167.72,32.6162 1165.56,32.6162C 1163.35,32.6162 1161.39,33.4821 1159.67,35.2138C 1157.95,36.9456 1156.71,39.2233 1155.97,42.0469L 1155.97,62.2542L 1152.16,62.2542L 1152.16,29.2615L 1155.63,29.2615L 1155.63,36.7329C 1156.83,34.1995 1158.4,32.2253 1160.34,30.8102C 1162.28,29.3951 1164.43,28.6875 1166.78,28.6875C 1169.25,28.6875 1171.22,29.4693 1172.7,31.0329C 1174.17,32.5964 1175.08,34.6448 1175.42,37.1782C 1178.15,31.5178 1181.9,28.6875 1186.68,28.6875C 1188.33,28.6875 1189.72,29.0257 1190.86,29.7019C 1192,30.3781 1192.91,31.338 1193.6,32.5816C 1194.3,33.8251 1194.8,35.3243 1195.12,37.0792C 1195.44,38.8341 1195.6,40.7868 1195.6,42.9375L 1195.6,62.2542 Z "/>
+	</g>
+	<g>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 11.5428,143.93C 10.1649,143.93 8.88626,143.666 7.70687,143.138C 6.52749,142.61 5.49991,141.881 4.62412,140.951C 3.74834,140.021 3.06669,138.934 2.57917,137.691C 2.09166,136.447 1.8479,135.106 1.8479,133.668C 1.8479,132.236 2.14712,130.907 2.74557,129.68C 3.34402,128.453 4.18477,127.397 5.26782,126.513C 6.35087,125.629 7.63973,124.943 9.1344,124.455C 10.6291,123.967 12.2726,123.723 14.065,123.723C 15.5597,123.723 17.0734,123.871 18.606,124.168C 20.1386,124.465 21.5033,124.887 22.7002,125.435L 22.7002,122.456C 22.7002,119.547 21.9719,117.236 20.5152,115.524C 19.0585,113.812 17.0398,112.956 14.4591,112.956C 12.9645,112.956 11.4333,113.294 9.86567,113.97C 8.29803,114.646 6.70848,115.618 5.09705,116.885L 3.7571,114.035C 7.5288,111.165 11.1896,109.73 14.7394,109.73C 18.4002,109.73 21.2771,110.891 23.3702,113.213C 25.4633,115.535 26.5099,118.745 26.5099,122.842L 26.5099,137.725C 26.5099,138.906 26.977,139.497 27.9111,139.497L 27.9111,143.297C 27.2747,143.422 26.7901,143.485 26.4573,143.485C 25.4823,143.485 24.7248,143.211 24.1847,142.663C 23.6446,142.116 23.3542,141.357 23.3133,140.387L 23.2082,137.785C 21.8595,139.77 20.1678,141.291 18.133,142.347C 16.0983,143.402 13.9016,143.93 11.5428,143.93 Z M 12.4448,140.635C 14.4241,140.635 16.2457,140.212 17.9097,139.368C 19.5737,138.523 20.8348,137.405 21.6931,136.013C 22.0259,135.631 22.277,135.218 22.4463,134.776C 22.6156,134.334 22.7002,133.922 22.7002,133.539L 22.7002,128.156C 21.4274,127.608 20.1094,127.188 18.7461,126.894C 17.3828,126.601 15.9918,126.454 14.573,126.454C 11.8814,126.454 9.6949,127.087 8.0134,128.354C 6.3319,129.62 5.49115,131.286 5.49115,133.351C 5.49115,134.367 5.66922,135.319 6.02537,136.206C 6.38153,137.093 6.86758,137.864 7.48355,138.517C 8.09952,139.17 8.83663,139.686 9.6949,140.066C 10.5532,140.445 11.4698,140.635 12.4448,140.635 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 59.5794,143.297L 55.7697,143.297L 55.7697,124.87C 55.7697,120.939 55.256,118.087 54.2284,116.316C 53.2008,114.544 51.6215,113.658 49.4904,113.658C 48.3694,113.658 47.2484,113.891 46.1274,114.356C 45.0064,114.821 43.9701,115.476 43.0184,116.32C 42.0667,117.165 41.2172,118.168 40.4698,119.329C 39.7225,120.49 39.1795,121.743 38.8409,123.089L 38.8409,143.297L 35.0312,143.297L 35.0312,110.304L 38.5081,110.304L 38.5081,117.775C 39.705,115.367 41.4142,113.424 43.6358,111.947C 45.8574,110.469 48.276,109.73 50.8916,109.73C 52.4972,109.73 53.8605,110.068 54.9815,110.744C 56.1025,111.42 57.0002,112.37 57.6746,113.594C 58.3489,114.818 58.835,116.317 59.1327,118.092C 59.4305,119.866 59.5794,121.829 59.5794,123.98L 59.5794,143.297 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 79.5384,143.93C 77.5183,143.93 75.6485,143.455 73.9291,142.505C 72.2096,141.555 70.7339,140.298 69.502,138.735C 68.2701,137.171 67.3082,135.367 66.6163,133.322C 65.9244,131.276 65.5785,129.132 65.5785,126.889C 65.5785,124.567 65.9142,122.362 66.5856,120.274C 67.2571,118.186 68.1825,116.36 69.3619,114.797C 70.5413,113.233 71.9425,111.998 73.5656,111.091C 75.1887,110.183 76.9724,109.73 78.9166,109.73C 81.3863,109.73 83.5729,110.459 85.4762,111.917C 87.3796,113.375 88.8743,115.136 89.9602,117.201L 89.9602,97.0632L 93.7699,97.0632L 93.7699,137.725C 93.7699,138.906 94.2195,139.497 95.1186,139.497L 95.1186,143.297C 94.5581,143.422 94.1085,143.485 93.7699,143.485C 92.8766,143.485 92.0928,143.158 91.4184,142.505C 90.7441,141.852 90.4069,141.06 90.4069,140.13L 90.4069,136.904C 89.2509,139.055 87.6818,140.763 85.6996,142.03C 83.7174,143.297 81.6637,143.93 79.5384,143.93 Z M 80.3792,140.13C 81.3134,140.13 82.3118,139.919 83.3744,139.497C 84.437,139.074 85.4354,138.494 86.3695,137.755C 87.3037,137.016 88.0977,136.15 88.7517,135.157C 89.4056,134.164 89.8084,133.097 89.9602,131.956L 89.9602,121.763C 89.5866,120.622 89.0451,119.555 88.3357,118.562C 87.6263,117.569 86.8133,116.693 85.8966,115.935C 84.98,115.176 83.9991,114.585 82.954,114.163C 81.9089,113.741 80.8813,113.53 79.8712,113.53C 78.3007,113.53 76.8805,113.909 75.6106,114.668C 74.3407,115.427 73.2474,116.429 72.3308,117.676C 71.4141,118.923 70.7135,120.348 70.2289,121.951C 69.7443,123.554 69.502,125.2 69.502,126.889C 69.502,128.664 69.7822,130.354 70.3427,131.961C 70.9032,133.567 71.6695,134.971 72.6417,136.172C 73.6138,137.372 74.7625,138.332 76.0879,139.051C 77.4132,139.77 78.8437,140.13 80.3792,140.13 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 131.77,143.93C 129.306,143.93 127.131,143.222 125.245,141.807C 123.36,140.392 121.836,138.609 120.674,136.458L 120.674,156.785L 116.864,156.785L 116.864,110.304L 120.28,110.304L 120.28,116.697C 121.477,114.625 123.028,112.946 124.935,111.66C 126.841,110.373 128.915,109.73 131.157,109.73C 133.177,109.73 135.028,110.205 136.709,111.155C 138.391,112.105 139.848,113.372 141.08,114.955C 142.312,116.538 143.273,118.364 143.965,120.432C 144.657,122.5 145.003,124.633 145.003,126.83C 145.003,129.152 144.685,131.347 144.048,133.416C 143.412,135.484 142.506,137.3 141.329,138.863C 140.153,140.427 138.751,141.662 137.125,142.569C 135.499,143.476 133.714,143.93 131.77,143.93 Z M 130.71,140.13C 132.281,140.13 133.71,139.751 134.997,138.992C 136.285,138.233 137.387,137.23 138.303,135.983C 139.22,134.737 139.921,133.322 140.405,131.738C 140.89,130.155 141.132,128.519 141.132,126.83C 141.132,125.055 140.852,123.366 140.291,121.763C 139.731,120.16 138.965,118.747 137.992,117.523C 137.02,116.299 135.872,115.328 134.546,114.609C 133.221,113.889 131.793,113.53 130.264,113.53C 129.289,113.53 128.268,113.751 127.203,114.193C 126.137,114.635 125.148,115.225 124.234,115.964C 123.32,116.703 122.536,117.569 121.882,118.562C 121.229,119.555 120.826,120.602 120.674,121.704L 120.674,131.837C 121.123,133.018 121.694,134.115 122.386,135.128C 123.078,136.14 123.863,137.016 124.742,137.755C 125.621,138.494 126.564,139.074 127.571,139.497C 128.578,139.919 129.624,140.13 130.71,140.13 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 166.188,114.104C 163.608,114.183 161.366,114.983 159.462,116.504C 157.559,118.024 156.213,120.114 155.425,122.773L 155.425,143.297L 151.615,143.297L 151.615,110.304L 155.206,110.304L 155.206,118.22C 156.286,115.687 157.741,113.701 159.572,112.263C 161.402,110.825 163.365,110.106 165.461,110.106C 165.759,110.106 166.001,110.129 166.188,110.175L 166.188,114.104 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 183.844,143.93C 181.713,143.93 179.76,143.476 177.985,142.569C 176.21,141.662 174.669,140.417 173.361,138.833C 172.053,137.25 171.036,135.424 170.309,133.356C 169.582,131.288 169.218,129.07 169.218,126.701C 169.218,124.379 169.582,122.194 170.309,120.145C 171.036,118.097 172.044,116.302 173.335,114.762C 174.625,113.221 176.166,111.998 177.959,111.091C 179.751,110.183 181.695,109.73 183.791,109.73C 185.917,109.73 187.867,110.183 189.642,111.091C 191.417,111.998 192.94,113.233 194.213,114.797C 195.486,116.36 196.477,118.154 197.187,120.18C 197.896,122.205 198.251,124.359 198.251,126.642C 198.251,126.978 198.251,127.315 198.251,127.651C 198.251,127.988 198.23,128.222 198.189,128.354L 173.194,128.354C 173.305,130.122 173.669,131.756 174.285,133.257C 174.901,134.758 175.695,136.058 176.667,137.156C 177.639,138.255 178.751,139.109 180.004,139.719C 181.256,140.329 182.592,140.635 184.01,140.635C 184.945,140.635 185.879,140.488 186.813,140.194C 187.747,139.901 188.607,139.5 189.392,138.992C 190.177,138.484 190.888,137.86 191.525,137.122C 192.161,136.383 192.646,135.571 192.978,134.687L 196.289,135.697C 195.839,136.924 195.203,138.032 194.38,139.021C 193.556,140.011 192.603,140.875 191.52,141.614C 190.437,142.353 189.242,142.924 187.934,143.326C 186.626,143.729 185.263,143.93 183.844,143.93 Z M 194.607,125.058C 194.496,123.284 194.131,121.668 193.513,120.21C 192.894,118.752 192.108,117.495 191.157,116.439C 190.205,115.384 189.103,114.561 187.851,113.97C 186.598,113.38 185.263,113.085 183.844,113.085C 182.425,113.085 181.081,113.38 179.811,113.97C 178.541,114.561 177.429,115.384 176.474,116.439C 175.52,117.495 174.753,118.761 174.175,120.239C 173.597,121.717 173.253,123.323 173.142,125.058L 194.607,125.058 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 213.997,143.93C 211.72,143.93 209.497,143.508 207.328,142.663C 205.159,141.819 203.292,140.595 201.727,138.992L 203.461,136.073C 205.108,137.597 206.781,138.738 208.48,139.497C 210.179,140.255 212,140.635 213.945,140.635C 216.298,140.635 218.175,140.097 219.576,139.021C 220.977,137.946 221.678,136.416 221.678,134.43C 221.678,133.5 221.491,132.729 221.117,132.119C 220.744,131.509 220.192,130.971 219.462,130.506C 218.732,130.041 217.817,129.629 216.716,129.269C 215.616,128.91 214.336,128.539 212.876,128.156C 211.195,127.694 209.738,127.231 208.506,126.766C 207.274,126.3 206.257,125.773 205.454,125.182C 204.651,124.592 204.053,123.864 203.659,123C 203.264,122.136 203.067,121.047 203.067,119.735C 203.067,118.092 203.358,116.637 203.939,115.37C 204.52,114.104 205.305,113.058 206.295,112.234C 207.284,111.409 208.442,110.785 209.767,110.363C 211.092,109.941 212.502,109.73 213.997,109.73C 216.239,109.73 218.275,110.142 220.106,110.967C 221.936,111.791 223.412,112.877 224.533,114.223L 222.685,116.756C 221.605,115.489 220.288,114.539 218.735,113.906C 217.182,113.273 215.565,112.956 213.883,112.956C 212.879,112.956 211.946,113.073 211.085,113.307C 210.224,113.541 209.466,113.911 208.813,114.416C 208.159,114.92 207.645,115.563 207.271,116.345C 206.897,117.127 206.711,118.046 206.711,119.101C 206.711,119.992 206.842,120.711 207.105,121.258C 207.367,121.806 207.798,122.281 208.396,122.683C 208.995,123.086 209.751,123.445 210.665,123.762C 211.579,124.079 212.689,124.405 213.997,124.742C 215.865,125.25 217.51,125.756 218.932,126.261C 220.354,126.766 221.541,127.356 222.492,128.032C 223.444,128.708 224.162,129.531 224.647,130.501C 225.131,131.471 225.374,132.655 225.374,134.054C 225.374,137.089 224.346,139.493 222.291,141.268C 220.236,143.043 217.471,143.93 213.997,143.93 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 241.462,143.93C 239.185,143.93 236.962,143.508 234.793,142.663C 232.624,141.819 230.757,140.595 229.192,138.992L 230.926,136.073C 232.572,137.597 234.245,138.738 235.944,139.497C 237.643,140.255 239.465,140.635 241.409,140.635C 243.762,140.635 245.639,140.097 247.04,139.021C 248.442,137.946 249.142,136.416 249.142,134.43C 249.142,133.5 248.955,132.729 248.582,132.119C 248.208,131.509 247.656,130.971 246.926,130.506C 246.197,130.041 245.281,129.629 244.181,129.269C 243.08,128.91 241.8,128.539 240.341,128.156C 238.659,127.694 237.202,127.231 235.97,126.766C 234.739,126.3 233.721,125.773 232.918,125.182C 232.116,124.592 231.517,123.864 231.123,123C 230.729,122.136 230.532,121.047 230.532,119.735C 230.532,118.092 230.822,116.637 231.403,115.37C 231.984,114.104 232.769,113.058 233.759,112.234C 234.749,111.409 235.906,110.785 237.232,110.363C 238.557,109.941 239.967,109.73 241.462,109.73C 243.704,109.73 245.74,110.142 247.57,110.967C 249.401,111.791 250.876,112.877 251.997,114.223L 250.149,116.756C 249.069,115.489 247.753,114.539 246.2,113.906C 244.647,113.273 243.029,112.956 241.348,112.956C 240.344,112.956 239.411,113.073 238.55,113.307C 237.688,113.541 236.931,113.911 236.277,114.416C 235.623,114.92 235.109,115.563 234.736,116.345C 234.362,117.127 234.175,118.046 234.175,119.101C 234.175,119.992 234.307,120.711 234.569,121.258C 234.832,121.806 235.263,122.281 235.861,122.683C 236.459,123.086 237.216,123.445 238.129,123.762C 239.043,124.079 240.154,124.405 241.462,124.742C 243.33,125.25 244.975,125.756 246.397,126.261C 247.818,126.766 249.005,127.356 249.957,128.032C 250.908,128.708 251.627,129.531 252.111,130.501C 252.596,131.471 252.838,132.655 252.838,134.054C 252.838,137.089 251.81,139.493 249.755,141.268C 247.7,143.043 244.936,143.93 241.462,143.93 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 259.231,143.297L 259.231,110.304L 263.041,110.304L 263.041,143.297L 259.231,143.297 Z M 259.231,103.396L 259.231,97.0632L 263.041,97.0632L 263.041,103.396L 259.231,103.396 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 296.11,143.297L 292.301,143.297L 292.301,124.87C 292.301,120.939 291.787,118.087 290.759,116.316C 289.732,114.544 288.152,113.658 286.021,113.658C 284.9,113.658 283.779,113.891 282.658,114.356C 281.537,114.821 280.501,115.476 279.549,116.32C 278.598,117.165 277.748,118.168 277.001,119.329C 276.253,120.49 275.71,121.743 275.372,123.089L 275.372,143.297L 271.562,143.297L 271.562,110.304L 275.039,110.304L 275.039,117.775C 276.236,115.367 277.945,113.424 280.167,111.947C 282.388,110.469 284.807,109.73 287.423,109.73C 289.028,109.73 290.392,110.068 291.512,110.744C 292.634,111.42 293.531,112.37 294.206,113.594C 294.88,114.818 295.366,116.317 295.664,118.092C 295.961,119.866 296.11,121.829 296.11,123.98L 296.11,143.297 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 315.789,143.742C 313.769,143.742 311.927,143.267 310.263,142.317C 308.599,141.367 307.16,140.11 305.945,138.547C 304.731,136.983 303.788,135.189 303.117,133.163C 302.445,131.138 302.109,129.047 302.109,126.889C 302.109,124.613 302.436,122.43 303.09,120.338C 303.744,118.247 304.67,116.421 305.867,114.861C 307.063,113.301 308.492,112.055 310.154,111.125C 311.815,110.195 313.655,109.73 315.675,109.73C 318.18,109.73 320.348,110.437 322.178,111.852C 324.008,113.268 325.577,115.05 326.885,117.201L 326.885,110.304L 330.301,110.304L 330.301,143.425C 330.301,145.701 329.918,147.717 329.154,149.472C 328.389,151.226 327.361,152.694 326.071,153.875C 324.78,155.056 323.267,155.942 321.53,156.532C 319.793,157.123 317.952,157.418 316.008,157.418C 312.645,157.418 309.936,156.743 307.881,155.394C 305.826,154.045 304.165,152.229 302.898,149.947L 305.245,147.858C 306.407,149.97 307.941,151.522 309.847,152.514C 311.753,153.507 313.807,154.004 316.008,154.004C 317.427,154.004 318.773,153.781 320.045,153.336C 321.318,152.891 322.431,152.236 323.382,151.372C 324.334,150.507 325.09,149.41 325.65,148.081C 326.211,146.752 326.491,145.2 326.491,143.425L 326.491,136.904C 325.37,139.015 323.838,140.682 321.893,141.906C 319.949,143.13 317.914,143.742 315.789,143.742 Z M 316.849,140.13C 317.97,140.13 319.072,139.897 320.155,139.432C 321.238,138.967 322.219,138.344 323.098,137.562C 323.976,136.78 324.715,135.904 325.313,134.935C 325.912,133.965 326.304,132.972 326.491,131.956L 326.491,121.763C 326.082,120.582 325.522,119.485 324.81,118.473C 324.097,117.46 323.293,116.594 322.397,115.875C 321.501,115.156 320.539,114.585 319.511,114.163C 318.484,113.741 317.447,113.53 316.402,113.53C 314.756,113.53 313.289,113.921 312.001,114.702C 310.714,115.484 309.622,116.508 308.726,117.775C 307.83,119.042 307.148,120.477 306.681,122.08C 306.214,123.683 305.98,125.309 305.98,126.958C 305.98,128.733 306.261,130.422 306.821,132.025C 307.382,133.628 308.157,135.032 309.146,136.236C 310.136,137.44 311.285,138.39 312.593,139.086C 313.9,139.782 315.319,140.13 316.849,140.13 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 367.408,141.713C 367.186,141.839 366.859,142.007 366.427,142.218C 365.995,142.429 365.499,142.64 364.938,142.851C 364.377,143.062 363.743,143.252 363.033,143.42C 362.324,143.588 361.578,143.673 360.796,143.673C 359.972,143.673 359.187,143.547 358.44,143.297C 357.692,143.046 357.038,142.657 356.478,142.129C 355.917,141.601 355.469,140.935 355.134,140.13C 354.798,139.325 354.63,138.395 354.63,137.339L 354.63,113.718L 350.593,113.718L 350.593,110.304L 354.63,110.304L 354.63,99.1512L 358.44,99.1512L 358.44,110.304L 365.166,110.304L 365.166,113.718L 358.44,113.718L 358.44,136.142C 358.516,137.362 358.9,138.258 359.591,138.829C 360.283,139.399 361.076,139.685 361.969,139.685C 363.055,139.685 364.008,139.485 364.829,139.086C 365.649,138.687 366.173,138.401 366.401,138.23L 367.408,141.713 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 397,143.297L 393.191,143.297L 393.191,124.87C 393.191,121.11 392.621,118.301 391.483,116.444C 390.344,114.587 388.672,113.658 386.465,113.658C 385.379,113.658 384.304,113.901 383.242,114.386C 382.179,114.871 381.181,115.535 380.247,116.38C 379.313,117.224 378.499,118.217 377.808,119.359C 377.116,120.5 376.6,121.743 376.262,123.089L 376.262,143.297L 372.452,143.297L 372.452,97.0632L 376.262,97.0632L 376.262,117.775C 377.424,115.281 379.032,113.317 381.087,111.882C 383.143,110.447 385.364,109.73 387.752,109.73C 389.434,109.73 390.854,110.078 392.013,110.774C 393.172,111.47 394.125,112.441 394.872,113.688C 395.62,114.935 396.161,116.434 396.497,118.186C 396.833,119.937 397,121.869 397,123.98L 397,143.297 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 417.572,143.93C 415.441,143.93 413.488,143.476 411.713,142.569C 409.939,141.662 408.397,140.417 407.089,138.833C 405.781,137.25 404.764,135.424 404.037,133.356C 403.31,131.288 402.947,129.07 402.947,126.701C 402.947,124.379 403.31,122.194 404.037,120.145C 404.764,118.097 405.773,116.302 407.063,114.762C 408.353,113.221 409.895,111.998 411.687,111.091C 413.48,110.183 415.424,109.73 417.52,109.73C 419.645,109.73 421.595,110.183 423.37,111.091C 425.145,111.998 426.669,113.233 427.942,114.797C 429.214,116.36 430.206,118.154 430.915,120.18C 431.624,122.205 431.979,124.359 431.979,126.642C 431.979,126.978 431.979,127.315 431.979,127.651C 431.979,127.988 431.959,128.222 431.918,128.354L 406.923,128.354C 407.034,130.122 407.397,131.756 408.013,133.257C 408.629,134.758 409.423,136.058 410.395,137.156C 411.368,138.255 412.48,139.109 413.732,139.719C 414.984,140.329 416.32,140.635 417.739,140.635C 418.673,140.635 419.607,140.488 420.541,140.194C 421.475,139.901 422.335,139.5 423.12,138.992C 423.906,138.484 424.617,137.86 425.253,137.122C 425.889,136.383 426.374,135.571 426.707,134.687L 430.017,135.697C 429.568,136.924 428.931,138.032 428.108,139.021C 427.285,140.011 426.332,140.875 425.249,141.614C 424.166,142.353 422.97,142.924 421.662,143.326C 420.354,143.729 418.991,143.93 417.572,143.93 Z M 428.336,125.058C 428.225,123.284 427.86,121.668 427.241,120.21C 426.622,118.752 425.837,117.495 424.885,116.439C 423.934,115.384 422.832,114.561 421.579,113.97C 420.327,113.38 418.991,113.085 417.572,113.085C 416.154,113.085 414.809,113.38 413.539,113.97C 412.27,114.561 411.157,115.384 410.203,116.439C 409.248,117.495 408.482,118.761 407.904,120.239C 407.326,121.717 406.981,123.323 406.87,125.058L 428.336,125.058 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 464.322,143.742C 462.302,143.742 460.459,143.267 458.796,142.317C 457.132,141.367 455.692,140.11 454.478,138.547C 453.263,136.983 452.321,135.189 451.649,133.163C 450.978,131.138 450.642,129.047 450.642,126.889C 450.642,124.613 450.969,122.43 451.623,120.338C 452.277,118.247 453.202,116.421 454.399,114.861C 455.596,113.301 457.025,112.055 458.686,111.125C 460.347,110.195 462.188,109.73 464.208,109.73C 466.713,109.73 468.88,110.437 470.71,111.852C 472.541,113.268 474.11,115.05 475.418,117.201L 475.418,110.304L 478.833,110.304L 478.833,143.425C 478.833,145.701 478.451,147.717 477.686,149.472C 476.921,151.226 475.894,152.694 474.603,153.875C 473.313,155.056 471.799,155.942 470.062,156.532C 468.325,157.123 466.485,157.418 464.541,157.418C 461.178,157.418 458.469,156.743 456.413,155.394C 454.358,154.045 452.697,152.229 451.43,149.947L 453.777,147.858C 454.939,149.97 456.473,151.522 458.379,152.514C 460.286,153.507 462.339,154.004 464.541,154.004C 465.959,154.004 467.305,153.781 468.578,153.336C 469.851,152.891 470.963,152.236 471.915,151.372C 472.866,150.507 473.622,149.41 474.183,148.081C 474.743,146.752 475.024,145.2 475.024,143.425L 475.024,136.904C 473.903,139.015 472.37,140.682 470.426,141.906C 468.482,143.13 466.447,143.742 464.322,143.742 Z M 465.381,140.13C 466.502,140.13 467.604,139.897 468.687,139.432C 469.77,138.967 470.751,138.344 471.63,137.562C 472.509,136.78 473.247,135.904 473.846,134.935C 474.444,133.965 474.837,132.972 475.024,131.956L 475.024,121.763C 474.615,120.582 474.055,119.485 473.342,118.473C 472.63,117.46 471.826,116.594 470.929,115.875C 470.033,115.156 469.071,114.585 468.044,114.163C 467.016,113.741 465.98,113.53 464.935,113.53C 463.288,113.53 461.821,113.921 460.534,114.702C 459.246,115.484 458.155,116.508 457.259,117.775C 456.362,119.042 455.681,120.477 455.214,122.08C 454.746,123.683 454.513,125.309 454.513,126.958C 454.513,128.733 454.793,130.422 455.354,132.025C 455.914,133.628 456.689,135.032 457.679,136.236C 458.668,137.44 459.817,138.39 461.125,139.086C 462.433,139.782 463.852,140.13 465.381,140.13 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 501.928,114.104C 499.347,114.183 497.105,114.983 495.202,116.504C 493.298,118.024 491.953,120.114 491.164,122.773L 491.164,143.297L 487.355,143.297L 487.355,110.304L 490.945,110.304L 490.945,118.22C 492.026,115.687 493.481,113.701 495.311,112.263C 497.142,110.825 499.105,110.106 501.201,110.106C 501.499,110.106 501.741,110.129 501.928,110.175L 501.928,114.104 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 506.972,143.297L 506.972,110.304L 510.782,110.304L 510.782,143.297L 506.972,143.297 Z M 506.972,103.396L 506.972,97.0632L 510.782,97.0632L 510.782,103.396L 506.972,103.396 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 534.209,143.93C 531.745,143.93 529.57,143.222 527.685,141.807C 525.799,140.392 524.275,138.609 523.113,136.458L 523.113,156.785L 519.303,156.785L 519.303,110.304L 522.719,110.304L 522.719,116.697C 523.916,114.625 525.467,112.946 527.374,111.66C 529.28,110.373 531.354,109.73 533.596,109.73C 535.616,109.73 537.467,110.205 539.148,111.155C 540.83,112.105 542.287,113.372 543.519,114.955C 544.751,116.538 545.712,118.364 546.404,120.432C 547.096,122.5 547.442,124.633 547.442,126.83C 547.442,129.152 547.124,131.347 546.487,133.416C 545.851,135.484 544.945,137.3 543.768,138.863C 542.592,140.427 541.19,141.662 539.564,142.569C 537.938,143.476 536.153,143.93 534.209,143.93 Z M 533.149,140.13C 534.72,140.13 536.149,139.751 537.436,138.992C 538.724,138.233 539.826,137.23 540.742,135.983C 541.659,134.737 542.36,133.322 542.844,131.738C 543.329,130.155 543.571,128.519 543.571,126.83C 543.571,125.055 543.291,123.366 542.73,121.763C 542.17,120.16 541.404,118.747 540.431,117.523C 539.459,116.299 538.311,115.328 536.985,114.609C 535.66,113.889 534.232,113.53 532.703,113.53C 531.728,113.53 530.707,113.751 529.642,114.193C 528.576,114.635 527.587,115.225 526.673,115.964C 525.759,116.703 524.975,117.569 524.321,118.562C 523.668,119.555 523.265,120.602 523.113,121.704L 523.113,131.837C 523.562,133.018 524.133,134.115 524.825,135.128C 525.517,136.14 526.302,137.016 527.181,137.755C 528.06,138.494 529.003,139.074 530.01,139.497C 531.017,139.919 532.063,140.13 533.149,140.13 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 582.64,141.713C 582.418,141.839 582.091,142.007 581.659,142.218C 581.227,142.429 580.731,142.64 580.17,142.851C 579.61,143.062 578.975,143.252 578.265,143.42C 577.556,143.588 576.81,143.673 576.028,143.673C 575.204,143.673 574.419,143.547 573.672,143.297C 572.924,143.046 572.271,142.657 571.71,142.129C 571.149,141.601 570.701,140.935 570.366,140.13C 570.03,139.325 569.862,138.395 569.862,137.339L 569.862,113.718L 565.825,113.718L 565.825,110.304L 569.862,110.304L 569.862,99.1512L 573.672,99.1512L 573.672,110.304L 580.398,110.304L 580.398,113.718L 573.672,113.718L 573.672,136.142C 573.748,137.362 574.132,138.258 574.823,138.829C 575.515,139.399 576.308,139.685 577.201,139.685C 578.287,139.685 579.24,139.485 580.061,139.086C 580.881,138.687 581.405,138.401 581.633,138.23L 582.64,141.713 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 602.257,114.104C 599.677,114.183 597.435,114.983 595.531,116.504C 593.628,118.024 592.282,120.114 591.494,122.773L 591.494,143.297L 587.684,143.297L 587.684,110.304L 591.275,110.304L 591.275,118.22C 592.355,115.687 593.81,113.701 595.641,112.263C 597.471,110.825 599.434,110.106 601.53,110.106C 601.828,110.106 602.07,110.129 602.257,110.175L 602.257,114.104 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 607.302,143.297L 607.302,110.304L 611.111,110.304L 611.111,143.297L 607.302,143.297 Z M 607.302,103.396L 607.302,97.0632L 611.111,97.0632L 611.111,103.396L 607.302,103.396 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 631.351,143.742C 629.331,143.742 627.489,143.267 625.825,142.317C 624.161,141.367 622.721,140.11 621.507,138.547C 620.293,136.983 619.35,135.189 618.678,133.163C 618.007,131.138 617.671,129.047 617.671,126.889C 617.671,124.613 617.998,122.43 618.652,120.338C 619.306,118.247 620.231,116.421 621.428,114.861C 622.625,113.301 624.054,112.055 625.715,111.125C 627.376,110.195 629.217,109.73 631.237,109.73C 633.742,109.73 635.909,110.437 637.74,111.852C 639.57,113.268 641.139,115.05 642.447,117.201L 642.447,110.304L 645.862,110.304L 645.862,143.425C 645.862,145.701 645.48,147.717 644.715,149.472C 643.95,151.226 642.923,152.694 641.632,153.875C 640.342,155.056 638.828,155.942 637.091,156.532C 635.355,157.123 633.514,157.418 631.57,157.418C 628.207,157.418 625.498,156.743 623.442,155.394C 621.387,154.045 619.726,152.229 618.459,149.947L 620.806,147.858C 621.968,149.97 623.502,151.522 625.409,152.514C 627.315,153.507 629.369,154.004 631.57,154.004C 632.988,154.004 634.334,153.781 635.607,153.336C 636.88,152.891 637.992,152.236 638.944,151.372C 639.895,150.507 640.652,149.41 641.212,148.081C 641.773,146.752 642.053,145.2 642.053,143.425L 642.053,136.904C 640.932,139.015 639.399,140.682 637.455,141.906C 635.511,143.13 633.476,143.742 631.351,143.742 Z M 632.41,140.13C 633.531,140.13 634.633,139.897 635.716,139.432C 636.8,138.967 637.78,138.344 638.659,137.562C 639.538,136.78 640.276,135.904 640.875,134.935C 641.473,133.965 641.866,132.972 642.053,131.956L 642.053,121.763C 641.644,120.582 641.084,119.485 640.371,118.473C 639.659,117.46 638.855,116.594 637.959,115.875C 637.062,115.156 636.1,114.585 635.073,114.163C 634.045,113.741 633.009,113.53 631.964,113.53C 630.317,113.53 628.85,113.921 627.563,114.702C 626.276,115.484 625.184,116.508 624.288,117.775C 623.391,119.042 622.71,120.477 622.243,122.08C 621.776,123.683 621.542,125.309 621.542,126.958C 621.542,128.733 621.822,130.422 622.383,132.025C 622.943,133.628 623.718,135.032 624.708,136.236C 625.698,137.44 626.846,138.39 628.154,139.086C 629.462,139.782 630.881,140.13 632.41,140.13 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 666.102,143.742C 664.082,143.742 662.24,143.267 660.576,142.317C 658.912,141.367 657.472,140.11 656.258,138.547C 655.044,136.983 654.101,135.189 653.429,133.163C 652.758,131.138 652.422,129.047 652.422,126.889C 652.422,124.613 652.749,122.43 653.403,120.338C 654.057,118.247 654.982,116.421 656.179,114.861C 657.376,113.301 658.805,112.055 660.466,111.125C 662.127,110.195 663.968,109.73 665.988,109.73C 668.493,109.73 670.66,110.437 672.491,111.852C 674.321,113.268 675.89,115.05 677.198,117.201L 677.198,110.304L 680.613,110.304L 680.613,143.425C 680.613,145.701 680.231,147.717 679.466,149.472C 678.701,151.226 677.674,152.694 676.383,153.875C 675.093,155.056 673.579,155.942 671.843,156.532C 670.106,157.123 668.265,157.418 666.321,157.418C 662.958,157.418 660.249,156.743 658.193,155.394C 656.138,154.045 654.477,152.229 653.21,149.947L 655.557,147.858C 656.719,149.97 658.253,151.522 660.16,152.514C 662.066,153.507 664.12,154.004 666.321,154.004C 667.74,154.004 669.085,153.781 670.358,153.336C 671.631,152.891 672.743,152.236 673.695,151.372C 674.646,150.507 675.403,149.41 675.963,148.081C 676.524,146.752 676.804,145.2 676.804,143.425L 676.804,136.904C 675.683,139.015 674.15,140.682 672.206,141.906C 670.262,143.13 668.227,143.742 666.102,143.742 Z M 667.161,140.13C 668.282,140.13 669.384,139.897 670.468,139.432C 671.551,138.967 672.531,138.344 673.41,137.562C 674.289,136.78 675.027,135.904 675.626,134.935C 676.224,133.965 676.617,132.972 676.804,131.956L 676.804,121.763C 676.395,120.582 675.835,119.485 675.122,118.473C 674.41,117.46 673.606,116.594 672.71,115.875C 671.813,115.156 670.851,114.585 669.824,114.163C 668.796,113.741 667.76,113.53 666.715,113.53C 665.068,113.53 663.601,113.921 662.314,114.702C 661.027,115.484 659.935,116.508 659.039,117.775C 658.142,119.042 657.461,120.477 656.994,122.08C 656.527,123.683 656.293,125.309 656.293,126.958C 656.293,128.733 656.573,130.422 657.134,132.025C 657.694,133.628 658.469,135.032 659.459,136.236C 660.449,137.44 661.597,138.39 662.905,139.086C 664.213,139.782 665.632,140.13 667.161,140.13 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 701.746,143.93C 699.615,143.93 697.662,143.476 695.887,142.569C 694.112,141.662 692.571,140.417 691.263,138.833C 689.955,137.25 688.938,135.424 688.211,133.356C 687.484,131.288 687.12,129.07 687.12,126.701C 687.12,124.379 687.484,122.194 688.211,120.145C 688.938,118.097 689.946,116.302 691.237,114.762C 692.527,113.221 694.068,111.998 695.861,111.091C 697.653,110.183 699.597,109.73 701.693,109.73C 703.819,109.73 705.769,110.183 707.544,111.091C 709.319,111.998 710.842,113.233 712.115,114.797C 713.388,116.36 714.379,118.154 715.089,120.18C 715.798,122.205 716.153,124.359 716.153,126.642C 716.153,126.978 716.153,127.315 716.153,127.651C 716.153,127.988 716.132,128.222 716.091,128.354L 691.096,128.354C 691.207,130.122 691.571,131.756 692.187,133.257C 692.803,134.758 693.597,136.058 694.569,137.156C 695.541,138.255 696.653,139.109 697.906,139.719C 699.158,140.329 700.494,140.635 701.912,140.635C 702.847,140.635 703.781,140.488 704.715,140.194C 705.649,139.901 706.509,139.5 707.294,138.992C 708.079,138.484 708.79,137.86 709.427,137.122C 710.063,136.383 710.548,135.571 710.88,134.687L 714.191,135.697C 713.741,136.924 713.105,138.032 712.282,139.021C 711.458,140.011 710.505,140.875 709.422,141.614C 708.339,142.353 707.144,142.924 705.836,143.326C 704.528,143.729 703.165,143.93 701.746,143.93 Z M 712.509,125.058C 712.398,123.284 712.034,121.668 711.415,120.21C 710.796,118.752 710.01,117.495 709.059,116.439C 708.107,115.384 707.005,114.561 705.753,113.97C 704.5,113.38 703.165,113.085 701.746,113.085C 700.327,113.085 698.983,113.38 697.713,113.97C 696.443,114.561 695.331,115.384 694.376,116.439C 693.422,117.495 692.655,118.761 692.077,120.239C 691.499,121.717 691.155,123.323 691.044,125.058L 712.509,125.058 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 736.777,114.104C 734.197,114.183 731.955,114.983 730.051,116.504C 728.148,118.024 726.802,120.114 726.014,122.773L 726.014,143.297L 722.204,143.297L 722.204,110.304L 725.795,110.304L 725.795,118.22C 726.875,115.687 728.33,113.701 730.161,112.263C 731.991,110.825 733.954,110.106 736.05,110.106C 736.348,110.106 736.59,110.129 736.777,110.175L 736.777,114.104 Z "/>
+		<rect x="741.261" y="137.092" fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" width="3.31049" height="6.2047"/>
+	</g>
+	<g>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 35.2359,181.755L 21.057,181.755L 21.057,222.793L 17.1335,222.793L 17.1335,181.755L 2.9546,181.755L 2.9546,177.826L 35.2359,177.826L 35.2359,181.755 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 54.9672,193.6C 52.3866,193.679 50.1446,194.479 48.2412,196C 46.3379,197.52 44.9921,199.61 44.2039,202.269L 44.2039,222.793L 40.3942,222.793L 40.3942,189.8L 43.9849,189.8L 43.9849,197.716C 45.0651,195.183 46.5203,193.197 48.3507,191.759C 50.1811,190.321 52.1443,189.602 54.2403,189.602C 54.5381,189.602 54.7804,189.625 54.9672,189.671L 54.9672,193.6 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 61.6932,232.926C 61.991,232.965 62.28,232.997 62.5603,233.02C 62.8405,233.043 63.112,233.055 63.3747,233.055C 64.0462,233.055 64.5789,232.949 64.973,232.738C 65.3671,232.527 65.751,232.062 66.1247,231.342C 66.4984,230.623 66.9187,229.589 67.3858,228.24C 67.8529,226.891 68.5156,225.075 69.3738,222.793L 56.6487,189.8L 60.5722,189.8L 71.3881,218.805L 81.4246,189.8L 85.0678,189.8L 69.9343,232.352C 69.5198,233.579 68.8367,234.646 67.885,235.553C 66.9333,236.46 65.6343,236.914 63.9878,236.914C 63.6141,236.914 63.2594,236.904 62.9237,236.884C 62.588,236.864 62.1778,236.812 61.6932,236.726L 61.6932,232.926 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 104.852,222.793L 104.852,189.8L 108.661,189.8L 108.661,222.793L 104.852,222.793 Z M 104.852,182.893L 104.852,176.559L 108.661,176.559L 108.661,182.893L 104.852,182.893 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 131.195,221.209C 130.973,221.335 130.646,221.503 130.214,221.714C 129.782,221.925 129.286,222.136 128.726,222.347C 128.165,222.558 127.53,222.748 126.821,222.916C 126.111,223.084 125.365,223.169 124.583,223.169C 123.76,223.169 122.975,223.043 122.227,222.793C 121.48,222.542 120.826,222.153 120.265,221.625C 119.705,221.097 119.257,220.431 118.921,219.626C 118.585,218.821 118.418,217.891 118.418,216.835L 118.418,193.214L 114.38,193.214L 114.38,189.8L 118.418,189.8L 118.418,178.647L 122.227,178.647L 122.227,189.8L 128.953,189.8L 128.953,193.214L 122.227,193.214L 122.227,215.638C 122.303,216.858 122.687,217.754 123.379,218.325C 124.071,218.895 124.863,219.181 125.757,219.181C 126.843,219.181 127.796,218.981 128.616,218.582C 129.436,218.183 129.96,217.897 130.188,217.726L 131.195,221.209 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 163.258,223.426C 161.127,223.426 159.182,222.972 157.425,222.065C 155.667,221.158 154.145,219.923 152.858,218.359C 151.57,216.796 150.572,214.98 149.863,212.912C 149.153,210.843 148.798,208.668 148.798,206.385C 148.798,204.063 149.162,201.868 149.889,199.8C 150.616,197.731 151.624,195.917 152.915,194.357C 154.205,192.797 155.727,191.551 157.482,190.621C 159.236,189.691 161.162,189.226 163.258,189.226C 165.348,189.226 167.28,189.691 169.055,190.621C 170.83,191.551 172.363,192.797 173.653,194.357C 174.943,195.917 175.952,197.731 176.679,199.8C 177.406,201.868 177.769,204.063 177.769,206.385C 177.769,208.668 177.415,210.843 176.705,212.912C 175.996,214.98 174.997,216.796 173.71,218.359C 172.423,219.923 170.891,221.158 169.117,222.065C 167.342,222.972 165.389,223.426 163.258,223.426 Z M 152.661,206.454C 152.661,208.308 152.941,210.027 153.501,211.61C 154.062,213.194 154.819,214.587 155.774,215.791C 156.729,216.995 157.85,217.935 159.137,218.612C 160.424,219.288 161.798,219.626 163.258,219.626C 164.711,219.626 166.083,219.278 167.374,218.582C 168.664,217.886 169.795,216.936 170.767,215.732C 171.74,214.528 172.506,213.124 173.066,211.521C 173.627,209.918 173.907,208.186 173.907,206.326C 173.907,204.512 173.627,202.791 173.066,201.165C 172.506,199.539 171.74,198.124 170.767,196.92C 169.795,195.716 168.664,194.766 167.374,194.07C 166.083,193.374 164.711,193.026 163.258,193.026C 161.798,193.026 160.433,193.374 159.163,194.07C 157.893,194.766 156.772,195.726 155.8,196.95C 154.828,198.173 154.062,199.598 153.501,201.225C 152.941,202.851 152.661,204.594 152.661,206.454 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 193.577,223.426C 190.401,223.426 188.038,222.233 186.488,219.849C 184.938,217.464 184.162,213.906 184.162,209.176L 184.162,189.8L 187.972,189.8L 187.972,208.414C 187.972,215.889 190.235,219.626 194.759,219.626C 195.88,219.626 196.982,219.415 198.066,218.993C 199.149,218.57 200.147,217.958 201.061,217.157C 201.974,216.355 202.796,215.405 203.526,214.307C 204.256,213.208 204.846,211.963 205.295,210.571L 205.295,189.8L 209.105,189.8L 209.105,217.221C 209.105,218.402 209.554,218.993 210.453,218.993L 210.453,222.793C 210.004,222.878 209.639,222.921 209.359,222.921C 209.078,222.921 208.883,222.921 208.772,222.921C 207.873,222.875 207.143,222.515 206.582,221.842C 206.022,221.17 205.742,220.262 205.742,219.121L 205.742,215.321C 204.469,217.894 202.741,219.888 200.557,221.303C 198.373,222.718 196.047,223.426 193.577,223.426 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 231.525,221.209C 231.303,221.335 230.976,221.503 230.544,221.714C 230.112,221.925 229.616,222.136 229.055,222.347C 228.495,222.558 227.86,222.748 227.15,222.916C 226.441,223.084 225.695,223.169 224.913,223.169C 224.089,223.169 223.304,223.043 222.557,222.793C 221.809,222.542 221.155,222.153 220.595,221.625C 220.034,221.097 219.586,220.431 219.251,219.626C 218.915,218.821 218.747,217.891 218.747,216.835L 218.747,193.214L 214.71,193.214L 214.71,189.8L 218.747,189.8L 218.747,178.647L 222.557,178.647L 222.557,189.8L 229.283,189.8L 229.283,193.214L 222.557,193.214L 222.557,215.638C 222.633,216.858 223.017,217.754 223.708,218.325C 224.4,218.895 225.193,219.181 226.086,219.181C 227.172,219.181 228.125,218.981 228.946,218.582C 229.766,218.183 230.29,217.897 230.518,217.726L 231.525,221.209 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 237.524,208.354L 237.524,177.381L 241.333,177.381L 241.333,208.354L 237.524,208.354 Z M 237.524,222.793L 237.524,215.697L 241.333,215.697L 241.333,222.793L 237.524,222.793 Z "/>
+	</g>
+</svg>
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/group-icon.svg b/unpublishedScripts/marketplace/shapes/assets/tools/group-icon.svg
new file mode 100644
index 0000000000..56abd0a30c
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/group-icon.svg
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="161px" height="114px" viewBox="0 0 161 114" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>group-icon</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Icons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Tool-Icons" transform="translate(-1963.000000, -770.000000)" fill-rule="nonzero" fill="#AFAFAF">
+            <g id="group-icon" transform="translate(1963.000000, 770.000000)">
+                <path d="M4.75,19 C7.3739,19 9.5,16.8739 9.5,14.25 L9.5,9.5 L14.25,9.5 C16.8739,9.5 19,7.3739 19,4.75 C19,2.1261 16.8739,0 14.25,0 L4.75,0 C2.1261,0 0,2.1261 0,4.75 L0,14.25 C0,16.8739 2.1261,19 4.75,19 Z" id="Shape"></path>
+                <path d="M27.75,10 L37.25,10 C39.8739,10 42,7.762 42,5 C42,2.238 39.8739,0 37.25,0 L27.75,0 C25.1261,0 23,2.238 23,5 C23,7.762 25.1261,10 27.75,10 Z" id="Shape"></path>
+                <path d="M51.75,10 L61.25,10 C63.8739,10 66,7.762 66,5 C66,2.238 63.8739,0 61.25,0 L51.75,0 C49.1261,0 47,2.238 47,5 C47,7.762 49.1261,10 51.75,10 Z" id="Shape"></path>
+                <path d="M98.75,10 L108.25,10 C110.8739,10 113,7.762 113,5 C113,2.238 110.8739,0 108.25,0 L98.75,0 C96.1261,0 94,2.238 94,5 C94,7.762 96.1261,10 98.75,10 Z" id="Shape"></path>
+                <path d="M121.75,10 L131.25,10 C133.8739,10 136,7.762 136,5 C136,2.238 133.8739,0 131.25,0 L121.75,0 C119.1261,0 117,2.238 117,5 C117,7.762 119.1261,10 121.75,10 Z" id="Shape"></path>
+                <path d="M74.75,10 L84.25,10 C86.8739,10 89,7.762 89,5 C89,2.238 86.8739,0 84.25,0 L74.75,0 C72.1261,0 70,2.238 70,5 C70,7.762 72.1261,10 74.75,10 Z" id="Shape"></path>
+                <path d="M160,4.75 C160,2.1261 157.8739,0 155.25,0 L145.75,0 C143.1261,0 141,2.1261 141,4.75 C141,7.3739 143.1261,9.5 145.75,9.5 L150.5,9.5 L150.5,14.25 C150.5,16.8739 152.6261,19 155.25,19 C157.8739,19 160,16.8739 160,14.25 L160,4.75 Z" id="Shape"></path>
+                <path d="M161,27.75 C161,25.1261 158.762,23 156,23 C153.238,23 151,25.1261 151,27.75 L151,37.25 C151,39.8739 153.238,42 156,42 C158.762,42 161,39.8739 161,37.25 L161,27.75 Z" id="Shape"></path>
+                <path d="M161,51.75 C161,49.1261 158.762,47 156,47 C153.238,47 151,49.1261 151,51.75 L151,61.25 C151,63.8739 153.238,66 156,66 C158.762,66 161,63.8739 161,61.25 L161,51.75 Z" id="Shape"></path>
+                <path d="M156,71 C153.238,71 151,73.1261 151,75.75 L151,85.25 C151,87.8739 153.238,90 156,90 C158.762,90 161,87.8739 161,85.25 L161,75.75 C161,73.1261 158.762,71 156,71 Z" id="Shape"></path>
+                <path d="M145.75,113 L155.25,113 C157.8739,113 160,110.8739 160,108.25 L160,98.75 C160,96.1261 157.8739,94 155.25,94 C152.6261,94 150.5,96.1261 150.5,98.75 L150.5,103.5 L145.75,103.5 C143.1261,103.5 141,105.6261 141,108.25 C141,110.8739 143.1261,113 145.75,113 Z" id="Shape"></path>
+                <path d="M121.75,114 L131.25,114 C133.8739,114 136,111.762 136,109 C136,106.238 133.8739,104 131.25,104 L121.75,104 C119.1261,104 117,106.238 117,109 C117,111.762 119.1261,114 121.75,114 Z" id="Shape"></path>
+                <path d="M98.75,114 L108.25,114 C110.8739,114 113,111.762 113,109 C113,106.238 110.8739,104 108.25,104 L98.75,104 C96.1261,104 94,106.238 94,109 C94,111.762 96.1261,114 98.75,114 Z" id="Shape"></path>
+                <path d="M51.75,114 L61.25,114 C63.8739,114 66,111.762 66,109 C66,106.238 63.8739,104 61.25,104 L51.75,104 C49.1261,104 47,106.238 47,109 C47,111.762 49.1261,114 51.75,114 Z" id="Shape"></path>
+                <path d="M27.75,114 L37.25,114 C39.8739,114 42,111.762 42,109 C42,106.238 39.8739,104 37.25,104 L27.75,104 C25.1261,104 23,106.238 23,109 C23,111.762 25.1261,114 27.75,114 Z" id="Shape"></path>
+                <path d="M74.75,114 L84.25,114 C86.8739,114 89,111.762 89,109 C89,106.238 86.8739,104 84.25,104 L74.75,104 C72.1261,104 70,106.238 70,109 C70,111.762 72.1261,114 74.75,114 Z" id="Shape"></path>
+                <path d="M0,108.25 C0,110.8739 2.1261,113 4.75,113 L14.25,113 C16.8739,113 19,110.8739 19,108.25 C19,105.6261 16.8739,103.5 14.25,103.5 L9.5,103.5 L9.5,98.75 C9.5,96.1261 7.3739,94 4.75,94 C2.1261,94 0,96.1261 0,98.75 L0,108.25 Z" id="Shape"></path>
+                <path d="M0,85.25 C0,87.8739 2.238,90 5,90 C7.762,90 10,87.8739 10,85.25 L10,75.75 C10,73.1261 7.762,71 5,71 C2.238,71 0,73.1261 0,75.75 L0,85.25 Z" id="Shape"></path>
+                <path d="M0,61.25 C0,63.8739 2.238,66 5,66 C7.762,66 10,63.8739 10,61.25 L10,51.75 C10,49.1261 7.762,47 5,47 C2.238,47 0,49.1261 0,51.75 L0,61.25 Z" id="Shape"></path>
+                <path d="M0,37.25 C0,39.8739 2.238,42 5,42 C7.762,42 10,39.8739 10,37.25 L10,27.75 C10,25.1261 7.762,23 5,23 C2.238,23 0,25.1261 0,27.75 L0,37.25 Z" id="Shape"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/group-label.svg b/unpublishedScripts/marketplace/shapes/assets/tools/group-label.svg
new file mode 100644
index 0000000000..001ce5b953
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/group-label.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="250px" height="59px" viewBox="0 0 250 59" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>GROUP</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Tool-Palette" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Tool-Palette---Default" transform="translate(-1917.000000, -983.000000)" fill="#FFFFFF">
+            <path d="M1942.98,983.36 C1928.82,983.36 1917.14,993.52 1917.14,1012.24 C1917.14,1031.28 1925.7,1041.28 1941.7,1041.28 C1949.14,1041.28 1955.94,1039.12 1961.46,1035.68 L1961.46,1008.4 L1941.06,1008.4 L1942.26,1016.96 L1950.02,1016.96 L1950.02,1030.48 C1947.54,1031.84 1944.74,1032.48 1941.78,1032.48 C1933.62,1032.48 1929.46,1027.12 1929.46,1012.32 C1929.46,997.92 1935.7,992.08 1943.54,992.08 C1948.1,992.08 1951.22,993.52 1954.82,996.48 L1961.14,990 C1956.5,986 1950.9,983.36 1942.98,983.36 Z M1988.98,1018.32 L1982.98,1018.32 L1982.98,1040 L1971.22,1040 L1971.22,984.64 L1988.5,984.64 C2003.3,984.64 2010.82,990 2010.82,1001.2 C2010.82,1008.56 2007.22,1012.96 1999.86,1016.16 L2014.18,1040 L2000.82,1040 L1988.98,1018.32 Z M1982.98,1010 L1989.14,1010 C1995.3,1010 1998.66,1007.44 1998.66,1001.2 C1998.66,995.52 1995.38,993.04 1988.26,993.04 L1982.98,993.04 L1982.98,1010 Z M2041.38,983.36 C2056.58,983.36 2065.94,993.76 2065.94,1012.32 C2065.94,1030.48 2056.58,1041.28 2041.38,1041.28 C2026.18,1041.28 2016.74,1030.8 2016.74,1012.32 C2016.74,994.24 2026.18,983.36 2041.38,983.36 Z M2041.38,992.16 C2033.54,992.16 2029.14,997.84 2029.14,1012.32 C2029.14,1026.8 2033.7,1032.48 2041.38,1032.48 C2049.3,1032.48 2053.54,1026.8 2053.54,1012.32 C2053.54,997.84 2049.3,992.16 2041.38,992.16 Z M2116.18,1021.76 L2116.18,984.64 L2104.42,984.64 L2104.42,1021.2 C2104.42,1028.64 2101.54,1032.32 2095.06,1032.32 C2088.66,1032.32 2085.78,1028.64 2085.78,1021.2 L2085.78,984.64 L2074.02,984.64 L2074.02,1021.76 C2074.02,1033.28 2081.06,1041.28 2095.06,1041.28 C2109.06,1041.28 2116.18,1032.88 2116.18,1021.76 Z M2144.26,984.64 C2158.34,984.64 2166.98,990.4 2166.98,1002.48 C2166.98,1015.28 2157.86,1021.12 2145.22,1021.12 L2138.9,1021.12 L2138.9,1040 L2127.14,1040 L2127.14,984.64 L2144.26,984.64 Z M2144.26,1012.48 C2150.74,1012.48 2154.82,1010 2154.82,1002.48 C2154.82,996 2150.98,993.12 2144.1,993.12 L2138.9,993.12 L2138.9,1012.48 L2144.26,1012.48 Z" id="GROUP"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/group-tool-heading.svg b/unpublishedScripts/marketplace/shapes/assets/tools/group-tool-heading.svg
new file mode 100644
index 0000000000..e1942213e2
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/group-tool-heading.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="647px" height="82px" viewBox="0 0 647 82" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>GROUP TOOL</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Group-Tool" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Group---Default---Locked-Buttons" transform="translate(-878.000000, -200.000000)" fill="#FFFFFF">
+            <path d="M915.068,200.704 C895.244,200.704 878.892,214.928 878.892,241.136 C878.892,267.792 890.876,281.792 913.276,281.792 C923.692,281.792 933.212,278.768 940.94,273.952 L940.94,235.76 L912.38,235.76 L914.06,247.744 L924.924,247.744 L924.924,266.672 C921.452,268.576 917.532,269.472 913.388,269.472 C901.964,269.472 896.14,261.968 896.14,241.248 C896.14,221.088 904.876,212.912 915.852,212.912 C922.236,212.912 926.604,214.928 931.644,219.072 L940.492,210 C933.996,204.4 926.156,200.704 915.068,200.704 Z M979.468,249.648 L971.068,249.648 L971.068,280 L954.604,280 L954.604,202.496 L978.796,202.496 C999.516,202.496 1010.044,210 1010.044,225.68 C1010.044,235.984 1005.004,242.144 994.7,246.624 L1014.748,280 L996.044,280 L979.468,249.648 Z M971.068,238 L979.692,238 C988.316,238 993.02,234.416 993.02,225.68 C993.02,217.728 988.428,214.256 978.46,214.256 L971.068,214.256 L971.068,238 Z M1052.828,200.704 C1074.108,200.704 1087.212,215.264 1087.212,241.248 C1087.212,266.672 1074.108,281.792 1052.828,281.792 C1031.548,281.792 1018.332,267.12 1018.332,241.248 C1018.332,215.936 1031.548,200.704 1052.828,200.704 Z M1052.828,213.024 C1041.852,213.024 1035.692,220.976 1035.692,241.248 C1035.692,261.52 1042.076,269.472 1052.828,269.472 C1063.916,269.472 1069.852,261.52 1069.852,241.248 C1069.852,220.976 1063.916,213.024 1052.828,213.024 Z M1157.548,254.464 L1157.548,202.496 L1141.084,202.496 L1141.084,253.68 C1141.084,264.096 1137.052,269.248 1127.98,269.248 C1119.02,269.248 1114.988,264.096 1114.988,253.68 L1114.988,202.496 L1098.524,202.496 L1098.524,254.464 C1098.524,270.592 1108.38,281.792 1127.98,281.792 C1147.58,281.792 1157.548,270.032 1157.548,254.464 Z M1196.86,202.496 C1216.572,202.496 1228.668,210.56 1228.668,227.472 C1228.668,245.392 1215.9,253.568 1198.204,253.568 L1189.356,253.568 L1189.356,280 L1172.892,280 L1172.892,202.496 L1196.86,202.496 Z M1196.86,241.472 C1205.932,241.472 1211.644,238 1211.644,227.472 C1211.644,218.4 1206.268,214.368 1196.636,214.368 L1189.356,214.368 L1189.356,241.472 L1196.86,241.472 Z M1316.476,215.376 L1318.268,202.496 L1259.804,202.496 L1259.804,215.376 L1280.412,215.376 L1280.412,280 L1296.876,280 L1296.876,215.376 L1316.476,215.376 Z M1353.324,200.704 C1374.604,200.704 1387.708,215.264 1387.708,241.248 C1387.708,266.672 1374.604,281.792 1353.324,281.792 C1332.044,281.792 1318.828,267.12 1318.828,241.248 C1318.828,215.936 1332.044,200.704 1353.324,200.704 Z M1353.324,213.024 C1342.348,213.024 1336.188,220.976 1336.188,241.248 C1336.188,261.52 1342.572,269.472 1353.324,269.472 C1364.412,269.472 1370.348,261.52 1370.348,241.248 C1370.348,220.976 1364.412,213.024 1353.324,213.024 Z M1430.716,200.704 C1451.996,200.704 1465.1,215.264 1465.1,241.248 C1465.1,266.672 1451.996,281.792 1430.716,281.792 C1409.436,281.792 1396.22,267.12 1396.22,241.248 C1396.22,215.936 1409.436,200.704 1430.716,200.704 Z M1430.716,213.024 C1419.74,213.024 1413.58,220.976 1413.58,241.248 C1413.58,261.52 1419.964,269.472 1430.716,269.472 C1441.804,269.472 1447.74,261.52 1447.74,241.248 C1447.74,220.976 1441.804,213.024 1430.716,213.024 Z M1493.996,266.784 L1493.996,202.496 L1477.532,202.496 L1477.532,280 L1522.892,280 L1524.684,266.784 L1493.996,266.784 Z" id="GROUP-TOOL"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/group/clear-label.svg b/unpublishedScripts/marketplace/shapes/assets/tools/group/clear-label.svg
new file mode 100644
index 0000000000..8bc5daa8b4
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/group/clear-label.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="314" height="82" viewBox="0 0 314.00 82.00" enable-background="new 0 0 314.00 82.00" xml:space="preserve">
+	<g>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 36.1731,0.487495C 41.0867,0.487495 45.3687,1.1525 49.019,2.4825C 52.6693,3.8125 56.1712,5.8425 59.5246,8.5725L 51.2633,18.775C 46.9319,14.5517 42.2336,12.44 37.1686,12.44C 31.6611,12.44 27.3035,14.7121 24.0956,19.2562C 20.8878,23.8004 19.2838,30.92 19.2838,40.615C 19.2838,49.995 20.9052,56.9775 24.148,61.5625C 27.3908,66.1475 31.8067,68.44 37.3957,68.44C 40.3066,68.44 42.9148,67.8858 45.2202,66.7775C 47.5257,65.6692 50.0582,64.0767 52.8178,62L 60.4153,71.9575C 57.6674,74.8508 54.2616,77.2279 50.1979,79.0887C 46.1343,80.9496 41.6049,81.88 36.6097,81.88C 29.6817,81.88 23.6095,80.305 18.3931,77.155C 13.1767,74.005 9.13343,69.3762 6.26325,63.2687C 3.39307,57.1612 1.95798,49.7617 1.95798,41.07C 1.95798,32.6 3.44838,25.3112 6.42917,19.2037C 9.40997,13.0962 13.4707,8.45 18.6114,5.265C 23.7521,2.07999 29.606,0.487495 36.1731,0.487495 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 86.0198,66.2L 116.654,66.2L 114.856,79.64L 69.5847,79.64L 69.5847,1.8L 86.0198,1.8L 86.0198,66.2 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 170.972,13.56L 143.028,13.56L 143.028,34.0875L 167.392,34.0875L 167.392,46.04L 143.028,46.04L 143.028,67.6875L 172.981,67.6875L 172.981,79.64L 126.592,79.64L 126.592,1.6075L 172.754,1.6075L 170.972,13.56 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 222.391,61.72L 198.131,61.72L 193.783,79.0625L 176.666,79.0625L 200.489,1.24L 220.487,1.24L 244.188,79.0625L 226.758,79.0625L 222.391,61.72 Z M 219.265,49.7675L 210.2,13.7875L 201.153,49.7675L 219.265,49.7675 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 276.604,49.4L 268.221,49.4L 268.221,80.1825L 251.786,80.1825L 251.786,1.6075L 275.941,1.6075C 286.292,1.6075 294.076,3.55291 299.292,7.44375C 304.509,11.3346 307.117,17.2117 307.117,25.075C 307.117,30.29 305.888,34.5629 303.431,37.8937C 300.975,41.2246 297.138,44.0217 291.922,46.285L 311.815,80.1825L 293.144,80.1825L 276.604,49.4 Z M 268.221,37.4475L 276.831,37.4475C 281.221,37.4475 284.534,36.4529 286.769,34.4637C 289.005,32.4746 290.123,29.3392 290.123,25.0575C 290.123,21.0675 288.95,18.1537 286.603,16.3162C 284.257,14.4787 280.586,13.56 275.591,13.56L 268.221,13.56L 268.221,37.4475 Z "/>
+	</g>
+</svg>
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/group/group-label.svg b/unpublishedScripts/marketplace/shapes/assets/tools/group/group-label.svg
new file mode 100644
index 0000000000..b2f15b4b22
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/group/group-label.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="351px" height="82px" viewBox="0 0 351 82" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>GROUP</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Group-Tool" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Group---Default---Locked-Buttons" transform="translate(-1026.000000, -1040.000000)" fill="#ffffff">
+            <path d="M1062.572,1040.704 C1042.748,1040.704 1026.396,1054.928 1026.396,1081.136 C1026.396,1107.792 1038.38,1121.792 1060.78,1121.792 C1071.196,1121.792 1080.716,1118.768 1088.444,1113.952 L1088.444,1075.76 L1059.884,1075.76 L1061.564,1087.744 L1072.428,1087.744 L1072.428,1106.672 C1068.956,1108.576 1065.036,1109.472 1060.892,1109.472 C1049.468,1109.472 1043.644,1101.968 1043.644,1081.248 C1043.644,1061.088 1052.38,1052.912 1063.356,1052.912 C1069.74,1052.912 1074.108,1054.928 1079.148,1059.072 L1087.996,1050 C1081.5,1044.4 1073.66,1040.704 1062.572,1040.704 Z M1126.972,1089.648 L1118.572,1089.648 L1118.572,1120 L1102.108,1120 L1102.108,1042.496 L1126.3,1042.496 C1147.02,1042.496 1157.548,1050 1157.548,1065.68 C1157.548,1075.984 1152.508,1082.144 1142.204,1086.624 L1162.252,1120 L1143.548,1120 L1126.972,1089.648 Z M1118.572,1078 L1127.196,1078 C1135.82,1078 1140.524,1074.416 1140.524,1065.68 C1140.524,1057.728 1135.932,1054.256 1125.964,1054.256 L1118.572,1054.256 L1118.572,1078 Z M1200.332,1040.704 C1221.612,1040.704 1234.716,1055.264 1234.716,1081.248 C1234.716,1106.672 1221.612,1121.792 1200.332,1121.792 C1179.052,1121.792 1165.836,1107.12 1165.836,1081.248 C1165.836,1055.936 1179.052,1040.704 1200.332,1040.704 Z M1200.332,1053.024 C1189.356,1053.024 1183.196,1060.976 1183.196,1081.248 C1183.196,1101.52 1189.58,1109.472 1200.332,1109.472 C1211.42,1109.472 1217.356,1101.52 1217.356,1081.248 C1217.356,1060.976 1211.42,1053.024 1200.332,1053.024 Z M1305.052,1094.464 L1305.052,1042.496 L1288.588,1042.496 L1288.588,1093.68 C1288.588,1104.096 1284.556,1109.248 1275.484,1109.248 C1266.524,1109.248 1262.492,1104.096 1262.492,1093.68 L1262.492,1042.496 L1246.028,1042.496 L1246.028,1094.464 C1246.028,1110.592 1255.884,1121.792 1275.484,1121.792 C1295.084,1121.792 1305.052,1110.032 1305.052,1094.464 Z M1344.364,1042.496 C1364.076,1042.496 1376.172,1050.56 1376.172,1067.472 C1376.172,1085.392 1363.404,1093.568 1345.708,1093.568 L1336.86,1093.568 L1336.86,1120 L1320.396,1120 L1320.396,1042.496 L1344.364,1042.496 Z M1344.364,1081.472 C1353.436,1081.472 1359.148,1078 1359.148,1067.472 C1359.148,1058.4 1353.772,1054.368 1344.14,1054.368 L1336.86,1054.368 L1336.86,1081.472 L1344.364,1081.472 Z" id="GROUP"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/group/selection-box-label.svg b/unpublishedScripts/marketplace/shapes/assets/tools/group/selection-box-label.svg
new file mode 100644
index 0000000000..21bed98a90
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/group/selection-box-label.svg
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="161px" height="114px" viewBox="0 0 161 114" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>group-icon</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Group-Tool" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Group---Default---Locked-Buttons" transform="translate(-2121.000000, -183.000000)" fill-rule="nonzero" fill="#E3E3E3">
+            <g id="group-icon" transform="translate(2121.000000, 183.000000)">
+                <path d="M4.75,19 C7.3739,19 9.5,16.8739 9.5,14.25 L9.5,9.5 L14.25,9.5 C16.8739,9.5 19,7.3739 19,4.75 C19,2.1261 16.8739,0 14.25,0 L4.75,0 C2.1261,0 0,2.1261 0,4.75 L0,14.25 C0,16.8739 2.1261,19 4.75,19 Z" id="Shape"></path>
+                <path d="M27.75,10 L37.25,10 C39.8739,10 42,7.762 42,5 C42,2.238 39.8739,0 37.25,0 L27.75,0 C25.1261,0 23,2.238 23,5 C23,7.762 25.1261,10 27.75,10 Z" id="Shape"></path>
+                <path d="M51.75,10 L61.25,10 C63.8739,10 66,7.762 66,5 C66,2.238 63.8739,0 61.25,0 L51.75,0 C49.1261,0 47,2.238 47,5 C47,7.762 49.1261,10 51.75,10 Z" id="Shape"></path>
+                <path d="M98.75,10 L108.25,10 C110.8739,10 113,7.762 113,5 C113,2.238 110.8739,0 108.25,0 L98.75,0 C96.1261,0 94,2.238 94,5 C94,7.762 96.1261,10 98.75,10 Z" id="Shape"></path>
+                <path d="M121.75,10 L131.25,10 C133.8739,10 136,7.762 136,5 C136,2.238 133.8739,0 131.25,0 L121.75,0 C119.1261,0 117,2.238 117,5 C117,7.762 119.1261,10 121.75,10 Z" id="Shape"></path>
+                <path d="M74.75,10 L84.25,10 C86.8739,10 89,7.762 89,5 C89,2.238 86.8739,0 84.25,0 L74.75,0 C72.1261,0 70,2.238 70,5 C70,7.762 72.1261,10 74.75,10 Z" id="Shape"></path>
+                <path d="M160,4.75 C160,2.1261 157.8739,0 155.25,0 L145.75,0 C143.1261,0 141,2.1261 141,4.75 C141,7.3739 143.1261,9.5 145.75,9.5 L150.5,9.5 L150.5,14.25 C150.5,16.8739 152.6261,19 155.25,19 C157.8739,19 160,16.8739 160,14.25 L160,4.75 Z" id="Shape"></path>
+                <path d="M161,27.75 C161,25.1261 158.762,23 156,23 C153.238,23 151,25.1261 151,27.75 L151,37.25 C151,39.8739 153.238,42 156,42 C158.762,42 161,39.8739 161,37.25 L161,27.75 Z" id="Shape"></path>
+                <path d="M161,51.75 C161,49.1261 158.762,47 156,47 C153.238,47 151,49.1261 151,51.75 L151,61.25 C151,63.8739 153.238,66 156,66 C158.762,66 161,63.8739 161,61.25 L161,51.75 Z" id="Shape"></path>
+                <path d="M156,71 C153.238,71 151,73.1261 151,75.75 L151,85.25 C151,87.8739 153.238,90 156,90 C158.762,90 161,87.8739 161,85.25 L161,75.75 C161,73.1261 158.762,71 156,71 Z" id="Shape"></path>
+                <path d="M145.75,113 L155.25,113 C157.8739,113 160,110.8739 160,108.25 L160,98.75 C160,96.1261 157.8739,94 155.25,94 C152.6261,94 150.5,96.1261 150.5,98.75 L150.5,103.5 L145.75,103.5 C143.1261,103.5 141,105.6261 141,108.25 C141,110.8739 143.1261,113 145.75,113 Z" id="Shape"></path>
+                <path d="M121.75,114 L131.25,114 C133.8739,114 136,111.762 136,109 C136,106.238 133.8739,104 131.25,104 L121.75,104 C119.1261,104 117,106.238 117,109 C117,111.762 119.1261,114 121.75,114 Z" id="Shape"></path>
+                <path d="M98.75,114 L108.25,114 C110.8739,114 113,111.762 113,109 C113,106.238 110.8739,104 108.25,104 L98.75,104 C96.1261,104 94,106.238 94,109 C94,111.762 96.1261,114 98.75,114 Z" id="Shape"></path>
+                <path d="M51.75,114 L61.25,114 C63.8739,114 66,111.762 66,109 C66,106.238 63.8739,104 61.25,104 L51.75,104 C49.1261,104 47,106.238 47,109 C47,111.762 49.1261,114 51.75,114 Z" id="Shape"></path>
+                <path d="M27.75,114 L37.25,114 C39.8739,114 42,111.762 42,109 C42,106.238 39.8739,104 37.25,104 L27.75,104 C25.1261,104 23,106.238 23,109 C23,111.762 25.1261,114 27.75,114 Z" id="Shape"></path>
+                <path d="M74.75,114 L84.25,114 C86.8739,114 89,111.762 89,109 C89,106.238 86.8739,104 84.25,104 L74.75,104 C72.1261,104 70,106.238 70,109 C70,111.762 72.1261,114 74.75,114 Z" id="Shape"></path>
+                <path d="M0,108.25 C0,110.8739 2.1261,113 4.75,113 L14.25,113 C16.8739,113 19,110.8739 19,108.25 C19,105.6261 16.8739,103.5 14.25,103.5 L9.5,103.5 L9.5,98.75 C9.5,96.1261 7.3739,94 4.75,94 C2.1261,94 0,96.1261 0,98.75 L0,108.25 Z" id="Shape"></path>
+                <path d="M0,85.25 C0,87.8739 2.238,90 5,90 C7.762,90 10,87.8739 10,85.25 L10,75.75 C10,73.1261 7.762,71 5,71 C2.238,71 0,73.1261 0,75.75 L0,85.25 Z" id="Shape"></path>
+                <path d="M0,61.25 C0,63.8739 2.238,66 5,66 C7.762,66 10,63.8739 10,61.25 L10,51.75 C10,49.1261 7.762,47 5,47 C2.238,47 0,49.1261 0,51.75 L0,61.25 Z" id="Shape"></path>
+                <path d="M0,37.25 C0,39.8739 2.238,42 5,42 C7.762,42 10,39.8739 10,37.25 L10,27.75 C10,25.1261 7.762,23 5,23 C2.238,23 0,25.1261 0,27.75 L0,37.25 Z" id="Shape"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/group/ungroup-label.svg b/unpublishedScripts/marketplace/shapes/assets/tools/group/ungroup-label.svg
new file mode 100644
index 0000000000..ec246359b5
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/group/ungroup-label.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="496px" height="82px" viewBox="0 0 496 82" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>UNGROUP</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Group-Tool" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Group---Default---Locked-Buttons" transform="translate(-955.000000, -1480.000000)" fill="#ffffff">
+            <path d="M1014.188,1534.464 L1014.188,1482.496 L997.724,1482.496 L997.724,1533.68 C997.724,1544.096 993.692,1549.248 984.62,1549.248 C975.66,1549.248 971.628,1544.096 971.628,1533.68 L971.628,1482.496 L955.164,1482.496 L955.164,1534.464 C955.164,1550.592 965.02,1561.792 984.62,1561.792 C1004.22,1561.792 1014.188,1550.032 1014.188,1534.464 Z M1087.996,1560 L1087.996,1482.496 L1073.1,1482.496 L1073.1,1516.544 C1073.1,1528.08 1074.556,1538.832 1075.34,1544.096 L1050.252,1482.496 L1029.532,1482.496 L1029.532,1560 L1044.428,1560 L1044.428,1529.872 C1044.428,1515.536 1043.084,1505.456 1042.188,1498.512 L1066.828,1560 L1087.996,1560 Z M1136.604,1480.704 C1116.78,1480.704 1100.428,1494.928 1100.428,1521.136 C1100.428,1547.792 1112.412,1561.792 1134.812,1561.792 C1145.228,1561.792 1154.748,1558.768 1162.476,1553.952 L1162.476,1515.76 L1133.916,1515.76 L1135.596,1527.744 L1146.46,1527.744 L1146.46,1546.672 C1142.988,1548.576 1139.068,1549.472 1134.924,1549.472 C1123.5,1549.472 1117.676,1541.968 1117.676,1521.248 C1117.676,1501.088 1126.412,1492.912 1137.388,1492.912 C1143.772,1492.912 1148.14,1494.928 1153.18,1499.072 L1162.028,1490 C1155.532,1484.4 1147.692,1480.704 1136.604,1480.704 Z M1201.004,1529.648 L1192.604,1529.648 L1192.604,1560 L1176.14,1560 L1176.14,1482.496 L1200.332,1482.496 C1221.052,1482.496 1231.58,1490 1231.58,1505.68 C1231.58,1515.984 1226.54,1522.144 1216.236,1526.624 L1236.284,1560 L1217.58,1560 L1201.004,1529.648 Z M1192.604,1518 L1201.228,1518 C1209.852,1518 1214.556,1514.416 1214.556,1505.68 C1214.556,1497.728 1209.964,1494.256 1199.996,1494.256 L1192.604,1494.256 L1192.604,1518 Z M1274.364,1480.704 C1295.644,1480.704 1308.748,1495.264 1308.748,1521.248 C1308.748,1546.672 1295.644,1561.792 1274.364,1561.792 C1253.084,1561.792 1239.868,1547.12 1239.868,1521.248 C1239.868,1495.936 1253.084,1480.704 1274.364,1480.704 Z M1274.364,1493.024 C1263.388,1493.024 1257.228,1500.976 1257.228,1521.248 C1257.228,1541.52 1263.612,1549.472 1274.364,1549.472 C1285.452,1549.472 1291.388,1541.52 1291.388,1521.248 C1291.388,1500.976 1285.452,1493.024 1274.364,1493.024 Z M1379.084,1534.464 L1379.084,1482.496 L1362.62,1482.496 L1362.62,1533.68 C1362.62,1544.096 1358.588,1549.248 1349.516,1549.248 C1340.556,1549.248 1336.524,1544.096 1336.524,1533.68 L1336.524,1482.496 L1320.06,1482.496 L1320.06,1534.464 C1320.06,1550.592 1329.916,1561.792 1349.516,1561.792 C1369.116,1561.792 1379.084,1550.032 1379.084,1534.464 Z M1418.396,1482.496 C1438.108,1482.496 1450.204,1490.56 1450.204,1507.472 C1450.204,1525.392 1437.436,1533.568 1419.74,1533.568 L1410.892,1533.568 L1410.892,1560 L1394.428,1560 L1394.428,1482.496 L1418.396,1482.496 Z M1418.396,1521.472 C1427.468,1521.472 1433.18,1518 1433.18,1507.472 C1433.18,1498.4 1427.804,1494.368 1418.172,1494.368 L1410.892,1494.368 L1410.892,1521.472 L1418.396,1521.472 Z" id="UNGROUP"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/physics-icon.svg b/unpublishedScripts/marketplace/shapes/assets/tools/physics-icon.svg
new file mode 100644
index 0000000000..ef2635c312
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/physics-icon.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="180px" height="198px" viewBox="0 0 180 198" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>physics-icon</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Icons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Tool-Icons" transform="translate(-271.000000, -1288.000000)" fill="#AFAFAF">
+            <g id="physics-icon" transform="translate(271.000000, 1288.000000)">
+                <path d="M132.009431,123.008722 C139.271057,117.895835 145.810909,112.592751 151.635816,107.102397 C160.130308,116.149924 165.795254,124.94288 167.729412,132.307894 C168.251234,134.30155 168.501904,136.073796 168.500929,137.631461 C168.498978,139.713875 168.067865,141.403215 167.238801,142.852614 C165.843047,145.23349 163.538249,146.999884 160.312702,148.207392 C157.093008,149.410998 152.984752,150.008899 148.238604,150.006949 C142.30153,150.007924 135.367628,149.070594 127.917757,147.357845 C129.645136,139.813362 131.008702,131.594899 132.009431,123.008722 M133.07551,90.2909288 C136.802397,93.1653426 140.365422,96.1343672 143.589993,99.1053426 C140.365422,102.077293 136.802397,105.045343 133.07551,107.920732 C133.160367,105.022909 133.161343,102.058761 133.161343,99.1053426 C133.161343,96.1528993 133.160367,93.1887515 133.07551,90.2909288 M167.238801,55.359047 C168.067865,56.8084461 168.498978,58.497786 168.500929,60.5792244 C168.501904,62.1388402 168.251234,63.9101111 167.729412,65.9037663 C165.794279,73.2717071 160.122505,82.0714904 151.619234,91.1248697 C145.788476,85.8013032 139.100367,80.3402096 132.023087,75.2214707 C131.196949,66.6021308 129.665619,58.3748894 127.921658,50.8528402 C135.369579,49.1400914 142.302505,48.2037367 148.238604,48.2047121 C152.984752,48.2027613 157.093008,48.7996874 160.312702,50.0032934 C163.538249,51.2117761 165.843047,52.9781702 167.238801,55.359047 M47.9842787,75.2019633 C40.7226531,80.3158254 34.1828009,85.6179337 28.3578944,91.1082884 C19.8634018,82.0617367 14.198456,73.2668303 12.2642984,65.9037663 C11.7415004,63.9091357 11.4918058,62.1368894 11.4918058,60.5772737 C11.4947319,58.4958352 11.9268206,56.80552 12.7558846,55.3561209 C13.4522984,54.1573919 14.3759733,53.1283771 15.5376383,52.2407909 C17.2786728,50.910387 19.5668895,49.9038057 22.3330373,49.2395791 C25.0972343,48.5743771 28.3305841,48.2515298 31.9131161,48.2525052 C37.7594807,48.2505544 44.7948206,49.1791062 52.0759536,50.8528402 C50.3485743,58.3973229 48.9850077,66.6167613 47.9842787,75.2019633 M46.9191752,107.920732 C43.1913132,105.045343 39.6282885,102.077293 36.4027417,99.1053426 C39.6282885,96.1343672 43.1913132,93.1653426 46.9191752,90.2909288 C46.8343181,93.1887515 46.8323674,96.1528993 46.8323674,99.1053426 C46.8323674,102.058761 46.8343181,105.022909 46.9191752,107.920732 M12.7549092,142.852614 C11.867323,141.303727 11.3581802,139.383224 11.3572048,137.127195 C11.3572048,135.657313 11.5747122,134.046978 12.0477664,132.322525 L12.0497171,132.315697 L12.0516678,132.30887 C13.9858255,124.939953 19.6575989,116.14017 28.1608698,107.086791 C33.9926038,112.410357 40.6816876,117.870476 47.757993,122.989215 C48.5841309,131.60953 50.1164363,139.838722 51.8594215,147.361747 C44.492456,149.072545 37.6131752,150.007924 31.7092639,150.006949 C26.9875004,150.008899 22.8899733,149.410998 19.6761309,148.208367 C16.4564363,147.00086 14.1496876,145.23349 12.7549092,142.852614 M120.940939,116.701008 C116.031904,119.958742 111.144328,123.176485 105.900742,125.986525 L105.890988,125.992377 L105.880259,125.997254 C100.76152,128.851185 95.4633132,131.683658 89.9963674,134.135737 C84.533323,131.684633 79.2380422,128.854111 74.1212541,126.002131 C68.8328009,122.963855 63.9374215,119.923628 59.0527713,116.696131 C58.4743772,110.84684 58.2685743,104.98487 58.2685743,99.1053426 C58.2685743,93.2248402 58.4743772,87.3599436 59.0527713,81.5096776 C63.9608304,78.252919 68.8484068,75.0351751 74.0929683,72.2251357 L74.102722,72.2192835 L74.1144265,72.2134313 C79.23219,69.3595003 84.5303969,66.5280027 89.9963674,64.0749485 C95.4603871,66.5270273 100.755668,69.3565741 105.872456,72.2095298 C111.160909,75.2468303 116.056289,78.2880323 120.940939,81.5145544 C121.518358,87.3638451 121.72416,93.2258155 121.72416,99.1053426 C121.72416,104.98682 121.518358,110.850742 120.940939,116.701008 M104.008525,140.229845 C106.53083,138.930653 109.099954,137.556357 111.562761,136.177185 L111.591047,136.160604 L111.620308,136.143047 C114.078239,134.613668 116.662968,133.073559 119.137481,131.521747 C118.453747,135.968456 117.629559,140.290318 116.596643,144.486357 C112.393776,143.218377 108.197737,141.824574 104.008525,140.229845 M68.4309486,135.96553 C70.9571555,137.379816 73.5867516,138.788249 76.1490472,140.187904 C71.8701013,141.846032 67.5443378,143.345175 63.4341309,144.512692 C62.4948501,140.263008 61.591658,135.915786 60.8689092,131.470052 C63.3795102,133.020889 65.8988895,134.548318 68.4309486,135.96553 M75.9861605,57.9818155 C73.4628797,59.2800323 70.8937565,60.6553032 68.4309486,62.0335003 L68.4026629,62.0500815 L68.3734018,62.0686136 C65.9154708,63.5979929 63.3307417,65.1371259 60.8572048,66.689914 C61.538988,62.2422293 62.3641506,57.922318 63.3970669,53.7253032 C67.5999339,54.9932835 71.7959733,56.3870865 75.9861605,57.9818155 M111.561786,62.2461308 C109.092151,60.8620815 106.514249,59.4838845 103.985116,58.1807909 C108.217244,56.5441209 112.493264,55.0654608 116.558604,53.909648 C117.484229,58.0949584 118.375717,62.3739042 119.092614,66.750387 C116.613224,65.1283475 114.026545,63.6262786 111.561786,62.2461308 M83.1678058,13.64152 C85.4082294,12.1540815 87.6632836,11.4001209 89.9963674,11.3981702 C92.3304265,11.4001209 94.5845053,12.1540815 96.8259043,13.64152 C100.1802,15.8673131 103.433057,19.77952 106.363067,24.9684855 C109.105806,29.8141209 111.569589,35.7677761 113.68419,42.4246727 C106.131904,44.6787515 98.2421408,47.6341209 90.0022196,51.1308204 C81.9271358,47.6282687 73.8715595,44.6738746 66.3046432,42.4217466 C69.1732048,33.3878746 72.6991654,25.6648993 76.6591654,20.220387 C78.7386531,17.3567022 80.932259,15.127983 83.1678058,13.64152 M96.8259043,184.569165 C94.5845053,186.057579 92.3304265,186.81154 89.9963674,186.81349 C87.6632836,186.81154 85.4082294,186.057579 83.1678058,184.569165 C79.8125348,182.344348 76.5596777,178.431165 73.6296678,173.2422 C70.8879043,168.396564 68.424121,162.44486 66.3095201,155.786013 C73.8618058,153.531934 81.7515693,150.57754 89.9914905,147.08084 C98.0655989,150.583392 106.122151,153.536811 113.689067,155.788939 C110.820505,164.822811 107.294545,172.545786 103.334545,177.991274 C101.255057,180.854958 99.0614511,183.083678 96.8259043,184.569165 M178.863254,129.259865 L178.858377,129.240357 L178.852525,129.218899 C176.267796,119.826091 169.464594,109.480348 159.869885,99.1150963 C169.661619,88.7400914 176.276574,78.3602096 178.8535,68.7772047 C179.613313,66.0042293 179.993707,63.3356185 179.993707,60.7957564 C179.995658,56.6835988 178.986151,52.9040421 177.0042,49.6550865 L177.005175,49.6550865 C177.002249,49.651185 177.000298,49.6472835 176.997372,49.6443574 C176.994446,49.6385052 176.99152,49.632653 176.987619,49.6268007 L176.986643,49.6277761 C174.454584,45.2834805 170.391195,42.0920717 165.25685,40.0233131 C160.106899,37.9467515 153.867461,36.9577269 146.798958,36.9557761 C140.142062,36.9567515 132.738032,37.8482392 124.816082,39.5726924 C121.097973,27.9414116 116.244535,18.2803771 110.509362,11.3825643 C107.535461,7.8088106 104.319668,4.97243621 100.882466,3.01779582 C97.44819,1.06315542 93.7817762,-0.0019480244 89.9963674,2.71451705e-06 C86.2158353,-0.0019480244 82.5503969,1.04754951 79.116121,2.98463326 C73.9593427,5.89416035 69.2990275,10.7680815 65.2073526,17.1938155 C61.3088009,23.3201111 57.9330472,30.8850766 55.1795792,39.5726924 C47.2566531,37.8482392 39.8526235,36.9567515 33.1947516,36.9557761 C26.1262491,36.9577269 19.8868107,37.9467515 14.73686,40.0233131 C9.59373681,42.0949978 5.52156932,45.2961603 2.99048558,49.6531357 C1.01536243,53.0191357 0.0907121813,56.8260027 0.0936382897,60.9176776 C0.0936382897,63.4838746 0.451598881,66.1651653 1.13045602,68.9517958 L1.13533287,68.9722786 L1.14118509,68.9927613 C3.72688952,78.3855692 10.5291161,88.7313131 20.1238255,99.0955889 C10.3320915,109.471569 3.71713583,119.851451 1.14020972,129.434456 C0.38039691,132.207431 2.82173939e-06,134.876042 2.82173939e-06,137.415904 C-0.00194791718,141.528062 1.00755947,145.306643 2.99048558,148.556574 L2.98951021,148.556574 C2.99146095,148.560476 2.99438706,148.564377 2.9963378,148.568279 C3.00023927,148.574131 3.00219001,148.579983 3.00609149,148.58486 L3.00706686,148.58486 C5.53132302,152.9155 9.55179593,156.085451 14.6383476,158.127875 C19.7414807,160.179077 25.9282491,161.143717 32.9762688,161.145668 C39.7755693,161.144692 47.1161999,160.165421 55.173727,158.426338 C58.8918353,170.156131 63.7481999,179.822042 69.4862984,186.699372 C72.4611752,190.260446 75.6789191,193.077313 79.116121,195.014397 C82.5503969,196.952456 86.21486,198.001953 89.9963674,198.000003 C93.7778747,198.001953 97.4433132,196.952456 100.877589,195.014397 C106.034367,192.105845 110.693707,187.231924 114.787333,180.80619 C118.684909,174.678919 122.060663,167.113953 124.814131,158.425362 C132.873609,160.164446 140.217165,161.144692 147.017441,161.145668 C154.065461,161.143717 160.252229,160.179077 165.355362,158.127875 C170.451668,156.080574 174.479944,152.903796 177.003224,148.558525 C178.978348,145.19155 179.902998,141.384683 179.901047,137.293983 C179.901047,134.727786 179.541136,132.046495 178.863254,129.259865" id="Fill-9"></path>
+                <path d="M94.8987488,103.898749 C93.6200394,105.175507 91.8770542,105.96068 89.9692315,105.96068 C88.0623842,105.96068 86.319399,105.175507 85.0406897,103.898749 C83.7649064,102.620039 82.9787586,100.877054 82.9787586,98.9692315 C82.9787586,97.0623842 83.7649064,95.319399 85.0406897,94.0406897 C86.319399,92.7649064 88.0623842,91.9787586 89.9692315,91.9787586 C91.8770542,91.9787586 93.6200394,92.7649064 94.8987488,94.0406897 C96.1755074,95.319399 96.9606798,97.0623842 96.9606798,98.9692315 C96.9606798,100.877054 96.1755074,102.620039 94.8987488,103.898749 M89.9692315,81 C80.0936158,81.0087783 72.0087783,89.0936158 72,98.9692315 C72.0087783,108.844847 80.0936158,116.93066 89.9692315,116.938463 C99.8448473,116.93066 107.93066,108.844847 107.938463,98.9692315 C107.93066,89.0936158 99.8448473,81.0087783 89.9692315,81" id="Fill-12"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/physics-label.svg b/unpublishedScripts/marketplace/shapes/assets/tools/physics-label.svg
new file mode 100644
index 0000000000..27006f62b8
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/physics-label.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="297px" height="59px" viewBox="0 0 297 59" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>PHYSICS</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Tool-Palette" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Tool-Palette---Default" transform="translate(-212.000000, -1543.000000)" fill="#FFFFFF">
+            <path d="M229.38,1544.64 C243.46,1544.64 252.1,1550.4 252.1,1562.48 C252.1,1575.28 242.98,1581.12 230.34,1581.12 L224.02,1581.12 L224.02,1600 L212.26,1600 L212.26,1544.64 L229.38,1544.64 Z M229.38,1572.48 C235.86,1572.48 239.94,1570 239.94,1562.48 C239.94,1556 236.1,1553.12 229.22,1553.12 L224.02,1553.12 L224.02,1572.48 L229.38,1572.48 Z M289.94,1575.76 L289.94,1600 L301.7,1600 L301.7,1544.64 L289.94,1544.64 L289.94,1566.48 L271.62,1566.48 L271.62,1544.64 L259.86,1544.64 L259.86,1600 L271.62,1600 L271.62,1575.76 L289.94,1575.76 Z M336.74,1579.12 L336.74,1600 L324.98,1600 L324.98,1579.2 L307.22,1544.64 L320.1,1544.64 L331.14,1569.76 L342.1,1544.64 L354.5,1544.64 L336.74,1579.12 Z M373.7,1543.36 C381.94,1543.36 387.54,1545.84 392.34,1550.32 L386.66,1556.88 C382.82,1553.6 378.98,1552.16 374.5,1552.16 C369.7,1552.16 366.42,1554.24 366.42,1558.16 C366.42,1562 368.5,1563.6 377.54,1566.4 C387.54,1569.6 393.94,1573.76 393.94,1584 C393.94,1594.16 385.94,1601.28 372.5,1601.28 C363.3,1601.28 356.58,1598 352.02,1593.52 L358.18,1586.8 C362.02,1590.32 366.5,1592.4 372.18,1592.4 C377.86,1592.4 381.7,1589.68 381.7,1584.8 C381.7,1580.4 379.54,1578.48 371.14,1575.92 C359.14,1572.16 354.34,1567.36 354.34,1558.96 C354.34,1549.52 362.5,1543.36 373.7,1543.36 Z M413.86,1600 L413.86,1544.64 L402.02,1544.64 L402.02,1600 L413.86,1600 Z M447.22,1543.36 C433.38,1543.36 422.74,1553.6 422.74,1572.24 C422.74,1591.12 432.82,1601.28 447.54,1601.28 C455.22,1601.28 461.06,1597.92 464.58,1594.32 L459.14,1587.36 C455.94,1589.84 452.74,1592 448.1,1592 C440.5,1592 435.14,1586.16 435.14,1572.24 C435.14,1557.84 440.58,1552.24 447.94,1552.24 C451.78,1552.24 454.98,1553.6 458.02,1556.24 L463.94,1549.36 C459.38,1545.52 454.58,1543.36 447.22,1543.36 Z M488.1,1543.36 C476.9,1543.36 468.74,1549.52 468.74,1558.96 C468.74,1567.36 473.54,1572.16 485.54,1575.92 C493.94,1578.48 496.1,1580.4 496.1,1584.8 C496.1,1589.68 492.26,1592.4 486.58,1592.4 C480.9,1592.4 476.42,1590.32 472.58,1586.8 L466.42,1593.52 C470.98,1598 477.7,1601.28 486.9,1601.28 C500.34,1601.28 508.34,1594.16 508.34,1584 C508.34,1573.76 501.94,1569.6 491.94,1566.4 C482.9,1563.6 480.82,1562 480.82,1558.16 C480.82,1554.24 484.1,1552.16 488.9,1552.16 C493.38,1552.16 497.22,1553.6 501.06,1556.88 L506.74,1550.32 C501.94,1545.84 496.34,1543.36 488.1,1543.36 Z" id="PHYSICS"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/physics-tool-heading.svg b/unpublishedScripts/marketplace/shapes/assets/tools/physics-tool-heading.svg
new file mode 100644
index 0000000000..fb5d696111
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/physics-tool-heading.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="712px" height="82px" viewBox="0 0 712 82" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>PHYSICS TOOL</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Physics-Tool" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Physics---Default" transform="translate(-848.000000, -200.000000)" fill="#FFFFFF">
+            <path d="M872.228,202.496 C891.94,202.496 904.036,210.56 904.036,227.472 C904.036,245.392 891.268,253.568 873.572,253.568 L864.724,253.568 L864.724,280 L848.26,280 L848.26,202.496 L872.228,202.496 Z M872.228,241.472 C881.3,241.472 887.012,238 887.012,227.472 C887.012,218.4 881.636,214.368 872.004,214.368 L864.724,214.368 L864.724,241.472 L872.228,241.472 Z M957.012,246.064 L957.012,280 L973.476,280 L973.476,202.496 L957.012,202.496 L957.012,233.072 L931.364,233.072 L931.364,202.496 L914.9,202.496 L914.9,280 L931.364,280 L931.364,246.064 L957.012,246.064 Z M1022.532,250.768 L1022.532,280 L1006.068,280 L1006.068,250.88 L981.204,202.496 L999.236,202.496 L1014.692,237.664 L1030.036,202.496 L1047.396,202.496 L1022.532,250.768 Z M1074.276,200.704 C1085.812,200.704 1093.652,204.176 1100.372,210.448 L1092.42,219.632 C1087.044,215.04 1081.668,213.024 1075.396,213.024 C1068.676,213.024 1064.084,215.936 1064.084,221.424 C1064.084,226.8 1066.996,229.04 1079.652,232.96 C1093.652,237.44 1102.612,243.264 1102.612,257.6 C1102.612,271.824 1091.412,281.792 1072.596,281.792 C1059.716,281.792 1050.308,277.2 1043.924,270.928 L1052.548,261.52 C1057.924,266.448 1064.196,269.36 1072.148,269.36 C1080.1,269.36 1085.476,265.552 1085.476,258.72 C1085.476,252.56 1082.452,249.872 1070.692,246.288 C1053.892,241.024 1047.172,234.304 1047.172,222.544 C1047.172,209.328 1058.596,200.704 1074.276,200.704 Z M1130.5,280 L1130.5,202.496 L1113.924,202.496 L1113.924,280 L1130.5,280 Z M1177.204,200.704 C1157.828,200.704 1142.932,215.04 1142.932,241.136 C1142.932,267.568 1157.044,281.792 1177.652,281.792 C1188.404,281.792 1196.58,277.088 1201.508,272.048 L1193.892,262.304 C1189.412,265.776 1184.932,268.8 1178.436,268.8 C1167.796,268.8 1160.292,260.624 1160.292,241.136 C1160.292,220.976 1167.908,213.136 1178.212,213.136 C1183.588,213.136 1188.068,215.04 1192.324,218.736 L1200.612,209.104 C1194.228,203.728 1187.508,200.704 1177.204,200.704 Z M1234.436,200.704 C1218.756,200.704 1207.332,209.328 1207.332,222.544 C1207.332,234.304 1214.052,241.024 1230.852,246.288 C1242.612,249.872 1245.636,252.56 1245.636,258.72 C1245.636,265.552 1240.26,269.36 1232.308,269.36 C1224.356,269.36 1218.084,266.448 1212.708,261.52 L1204.084,270.928 C1210.468,277.2 1219.876,281.792 1232.756,281.792 C1251.572,281.792 1262.772,271.824 1262.772,257.6 C1262.772,243.264 1253.812,237.44 1239.812,232.96 C1227.156,229.04 1224.244,226.8 1224.244,221.424 C1224.244,215.936 1228.836,213.024 1235.556,213.024 C1241.828,213.024 1247.204,215.04 1252.58,219.632 L1260.532,210.448 C1253.812,204.176 1245.972,200.704 1234.436,200.704 Z M1351.028,215.376 L1352.82,202.496 L1294.356,202.496 L1294.356,215.376 L1314.964,215.376 L1314.964,280 L1331.428,280 L1331.428,215.376 L1351.028,215.376 Z M1387.876,200.704 C1409.156,200.704 1422.26,215.264 1422.26,241.248 C1422.26,266.672 1409.156,281.792 1387.876,281.792 C1366.596,281.792 1353.38,267.12 1353.38,241.248 C1353.38,215.936 1366.596,200.704 1387.876,200.704 Z M1387.876,213.024 C1376.9,213.024 1370.74,220.976 1370.74,241.248 C1370.74,261.52 1377.124,269.472 1387.876,269.472 C1398.964,269.472 1404.9,261.52 1404.9,241.248 C1404.9,220.976 1398.964,213.024 1387.876,213.024 Z M1465.268,200.704 C1486.548,200.704 1499.652,215.264 1499.652,241.248 C1499.652,266.672 1486.548,281.792 1465.268,281.792 C1443.988,281.792 1430.772,267.12 1430.772,241.248 C1430.772,215.936 1443.988,200.704 1465.268,200.704 Z M1465.268,213.024 C1454.292,213.024 1448.132,220.976 1448.132,241.248 C1448.132,261.52 1454.516,269.472 1465.268,269.472 C1476.356,269.472 1482.292,261.52 1482.292,241.248 C1482.292,220.976 1476.356,213.024 1465.268,213.024 Z M1528.548,266.784 L1528.548,202.496 L1512.084,202.496 L1512.084,280 L1557.444,280 L1559.236,266.784 L1528.548,266.784 Z" id="PHYSICS-TOOL"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/physics/buttons/collisions-label.svg b/unpublishedScripts/marketplace/shapes/assets/tools/physics/buttons/collisions-label.svg
new file mode 100644
index 0000000000..ff3cb0dff3
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/physics/buttons/collisions-label.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="338px" height="48px" viewBox="0 0 338 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>COLLISIONS</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Physics-Tool" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Physics---Default" transform="translate(-283.000000, -1323.000000)" fill="#FFFFFF">
+            <path d="M303.232,1323.688 C292.16,1323.688 283.648,1331.88 283.648,1346.792 C283.648,1361.896 291.712,1370.024 303.488,1370.024 C309.632,1370.024 314.304,1367.336 317.12,1364.456 L312.768,1358.888 C310.208,1360.872 307.648,1362.6 303.936,1362.6 C297.856,1362.6 293.568,1357.928 293.568,1346.792 C293.568,1335.272 297.92,1330.792 303.808,1330.792 C306.88,1330.792 309.44,1331.88 311.872,1333.992 L316.608,1328.488 C312.96,1325.416 309.12,1323.688 303.232,1323.688 Z M338.624,1323.688 C350.784,1323.688 358.272,1332.008 358.272,1346.856 C358.272,1361.384 350.784,1370.024 338.624,1370.024 C326.464,1370.024 318.912,1361.64 318.912,1346.856 C318.912,1332.392 326.464,1323.688 338.624,1323.688 Z M338.624,1330.728 C332.352,1330.728 328.832,1335.272 328.832,1346.856 C328.832,1358.44 332.48,1362.984 338.624,1362.984 C344.96,1362.984 348.352,1358.44 348.352,1346.856 C348.352,1335.272 344.96,1330.728 338.624,1330.728 Z M374.784,1361.448 L374.784,1324.712 L365.376,1324.712 L365.376,1369 L391.296,1369 L392.32,1361.448 L374.784,1361.448 Z M407.36,1361.448 L407.36,1324.712 L397.952,1324.712 L397.952,1369 L423.872,1369 L424.896,1361.448 L407.36,1361.448 Z M440,1369 L440,1324.712 L430.528,1324.712 L430.528,1369 L440,1369 Z M462.848,1323.688 C453.888,1323.688 447.36,1328.616 447.36,1336.168 C447.36,1342.888 451.2,1346.728 460.8,1349.736 C467.52,1351.784 469.248,1353.32 469.248,1356.84 C469.248,1360.744 466.176,1362.92 461.632,1362.92 C457.088,1362.92 453.504,1361.256 450.432,1358.44 L445.504,1363.816 C449.152,1367.4 454.528,1370.024 461.888,1370.024 C472.64,1370.024 479.04,1364.328 479.04,1356.2 C479.04,1348.008 473.92,1344.68 465.92,1342.12 C458.688,1339.88 457.024,1338.6 457.024,1335.528 C457.024,1332.392 459.648,1330.728 463.488,1330.728 C467.072,1330.728 470.144,1331.88 473.216,1334.504 L477.76,1329.256 C473.92,1325.672 469.44,1323.688 462.848,1323.688 Z M494.976,1369 L494.976,1324.712 L485.504,1324.712 L485.504,1369 L494.976,1369 Z M521.792,1323.688 C533.952,1323.688 541.44,1332.008 541.44,1346.856 C541.44,1361.384 533.952,1370.024 521.792,1370.024 C509.632,1370.024 502.08,1361.64 502.08,1346.856 C502.08,1332.392 509.632,1323.688 521.792,1323.688 Z M521.792,1330.728 C515.52,1330.728 512,1335.272 512,1346.856 C512,1358.44 515.648,1362.984 521.792,1362.984 C528.128,1362.984 531.52,1358.44 531.52,1346.856 C531.52,1335.272 528.128,1330.728 521.792,1330.728 Z M581.952,1369 L581.952,1324.712 L573.44,1324.712 L573.44,1344.168 C573.44,1350.76 574.272,1356.904 574.72,1359.912 L560.384,1324.712 L548.544,1324.712 L548.544,1369 L557.056,1369 L557.056,1351.784 C557.056,1343.592 556.288,1337.832 555.776,1333.864 L569.856,1369 L581.952,1369 Z M604.8,1323.688 C595.84,1323.688 589.312,1328.616 589.312,1336.168 C589.312,1342.888 593.152,1346.728 602.752,1349.736 C609.472,1351.784 611.2,1353.32 611.2,1356.84 C611.2,1360.744 608.128,1362.92 603.584,1362.92 C599.04,1362.92 595.456,1361.256 592.384,1358.44 L587.456,1363.816 C591.104,1367.4 596.48,1370.024 603.84,1370.024 C614.592,1370.024 620.992,1364.328 620.992,1356.2 C620.992,1348.008 615.872,1344.68 607.872,1342.12 C600.64,1339.88 598.976,1338.6 598.976,1335.528 C598.976,1332.392 601.6,1330.728 605.44,1330.728 C609.024,1330.728 612.096,1331.88 615.168,1334.504 L619.712,1329.256 C615.872,1325.672 611.392,1323.688 604.8,1323.688 Z" id="COLLISIONS"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/physics/buttons/grabbable-label.svg b/unpublishedScripts/marketplace/shapes/assets/tools/physics/buttons/grabbable-label.svg
new file mode 100644
index 0000000000..5b1b797540
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/physics/buttons/grabbable-label.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="334px" height="48px" viewBox="0 0 334 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>GRABBABLE</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Physics-Tool" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Physics---Default" transform="translate(-285.000000, -1683.000000)" fill="#FFFFFF">
+            <path d="M305.856,1683.688 C294.528,1683.688 285.184,1691.816 285.184,1706.792 C285.184,1722.024 292.032,1730.024 304.832,1730.024 C310.784,1730.024 316.224,1728.296 320.64,1725.544 L320.64,1703.72 L304.32,1703.72 L305.28,1710.568 L311.488,1710.568 L311.488,1721.384 C309.504,1722.472 307.264,1722.984 304.896,1722.984 C298.368,1722.984 295.04,1718.696 295.04,1706.856 C295.04,1695.336 300.032,1690.664 306.304,1690.664 C309.952,1690.664 312.448,1691.816 315.328,1694.184 L320.384,1689 C316.672,1685.8 312.192,1683.688 305.856,1683.688 Z M342.656,1711.656 L337.856,1711.656 L337.856,1729 L328.448,1729 L328.448,1684.712 L342.272,1684.712 C354.112,1684.712 360.128,1689 360.128,1697.96 C360.128,1703.848 357.248,1707.368 351.36,1709.928 L362.816,1729 L352.128,1729 L342.656,1711.656 Z M337.856,1705 L342.784,1705 C347.712,1705 350.4,1702.952 350.4,1697.96 C350.4,1693.416 347.776,1691.432 342.08,1691.432 L337.856,1691.432 L337.856,1705 Z M388.672,1719.08 L374.784,1719.08 L372.288,1729 L362.496,1729 L376.128,1684.712 L387.584,1684.712 L401.152,1729 L391.168,1729 L388.672,1719.08 Z M386.88,1712.104 L381.696,1691.688 L376.576,1712.104 L386.88,1712.104 Z M427.904,1705.576 C432.896,1706.536 437.952,1708.904 437.952,1716.136 C437.952,1726.056 429.952,1729 419.072,1729 L405.248,1729 L405.248,1684.712 L417.344,1684.712 C428.928,1684.712 436.032,1687.848 436.032,1696.04 C436.032,1701.608 432,1704.616 427.904,1705.576 Z M414.656,1691.496 L414.656,1702.696 L419.264,1702.696 C423.744,1702.696 426.432,1700.84 426.432,1696.872 C426.432,1692.776 423.68,1691.496 418.24,1691.496 L414.656,1691.496 Z M419.136,1722.024 C424.384,1722.024 428.16,1721 428.16,1715.752 C428.16,1710.824 424.704,1709.096 419.968,1709.096 L414.656,1709.096 L414.656,1722.024 L419.136,1722.024 Z M467.264,1705.576 C472.256,1706.536 477.312,1708.904 477.312,1716.136 C477.312,1726.056 469.312,1729 458.432,1729 L444.608,1729 L444.608,1684.712 L456.704,1684.712 C468.288,1684.712 475.392,1687.848 475.392,1696.04 C475.392,1701.608 471.36,1704.616 467.264,1705.576 Z M454.016,1691.496 L454.016,1702.696 L458.624,1702.696 C463.104,1702.696 465.792,1700.84 465.792,1696.872 C465.792,1692.776 463.04,1691.496 457.6,1691.496 L454.016,1691.496 Z M458.496,1722.024 C463.744,1722.024 467.52,1721 467.52,1715.752 C467.52,1710.824 464.064,1709.096 459.328,1709.096 L454.016,1709.096 L454.016,1722.024 L458.496,1722.024 Z M503.616,1719.08 L489.728,1719.08 L487.232,1729 L477.44,1729 L491.072,1684.712 L502.528,1684.712 L516.096,1729 L506.112,1729 L503.616,1719.08 Z M501.824,1712.104 L496.64,1691.688 L491.52,1712.104 L501.824,1712.104 Z M542.848,1705.576 C547.84,1706.536 552.896,1708.904 552.896,1716.136 C552.896,1726.056 544.896,1729 534.016,1729 L520.192,1729 L520.192,1684.712 L532.288,1684.712 C543.872,1684.712 550.976,1687.848 550.976,1696.04 C550.976,1701.608 546.944,1704.616 542.848,1705.576 Z M529.6,1691.496 L529.6,1702.696 L534.208,1702.696 C538.688,1702.696 541.376,1700.84 541.376,1696.872 C541.376,1692.776 538.624,1691.496 533.184,1691.496 L529.6,1691.496 Z M534.08,1722.024 C539.328,1722.024 543.104,1721 543.104,1715.752 C543.104,1710.824 539.648,1709.096 534.912,1709.096 L529.6,1709.096 L529.6,1722.024 L534.08,1722.024 Z M568.96,1721.448 L568.96,1684.712 L559.552,1684.712 L559.552,1729 L585.472,1729 L586.496,1721.448 L568.96,1721.448 Z M617.536,1691.56 L618.56,1684.712 L592.128,1684.712 L592.128,1729 L618.688,1729 L618.688,1722.088 L601.536,1722.088 L601.536,1709.864 L615.488,1709.864 L615.488,1703.08 L601.536,1703.08 L601.536,1691.56 L617.536,1691.56 Z" id="GRABBABLE"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/physics/buttons/gravity-label.svg b/unpublishedScripts/marketplace/shapes/assets/tools/physics/buttons/gravity-label.svg
new file mode 100644
index 0000000000..6c92a792ef
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/physics/buttons/gravity-label.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="240px" height="48px" viewBox="0 0 240 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>GRAVITY Copy</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Physics-Tool" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Physics---Default" transform="translate(-333.000000, -963.000000)" fill="#FFFFFF">
+            <path d="M354.336,963.688 C343.008,963.688 333.664,971.816 333.664,986.792 C333.664,1002.024 340.512,1010.024 353.312,1010.024 C359.264,1010.024 364.704,1008.296 369.12,1005.544 L369.12,983.72 L352.8,983.72 L353.76,990.568 L359.968,990.568 L359.968,1001.384 C357.984,1002.472 355.744,1002.984 353.376,1002.984 C346.848,1002.984 343.52,998.696 343.52,986.856 C343.52,975.336 348.512,970.664 354.784,970.664 C358.432,970.664 360.928,971.816 363.808,974.184 L368.864,969 C365.152,965.8 360.672,963.688 354.336,963.688 Z M391.136,991.656 L386.336,991.656 L386.336,1009 L376.928,1009 L376.928,964.712 L390.752,964.712 C402.592,964.712 408.608,969 408.608,977.96 C408.608,983.848 405.728,987.368 399.84,989.928 L411.296,1009 L400.608,1009 L391.136,991.656 Z M386.336,985 L391.264,985 C396.192,985 398.88,982.952 398.88,977.96 C398.88,973.416 396.256,971.432 390.56,971.432 L386.336,971.432 L386.336,985 Z M437.152,999.08 L423.264,999.08 L420.768,1009 L410.976,1009 L424.608,964.712 L436.064,964.712 L449.632,1009 L439.648,1009 L437.152,999.08 Z M435.36,992.104 L430.176,971.688 L425.056,992.104 L435.36,992.104 Z M470.24,1009 L458.784,1009 L445.6,964.712 L455.648,964.712 L464.672,1001.192 L473.376,964.712 L482.976,964.712 L470.24,1009 Z M496.608,1009 L496.608,964.712 L487.136,964.712 L487.136,1009 L496.608,1009 Z M534.304,972.072 L523.104,972.072 L523.104,1009 L513.696,1009 L513.696,972.072 L501.92,972.072 L501.92,964.712 L535.328,964.712 L534.304,972.072 Z M558.816,992.296 L558.816,1009 L549.408,1009 L549.408,992.36 L535.2,964.712 L545.504,964.712 L554.336,984.808 L563.104,964.712 L573.024,964.712 L558.816,992.296 Z" id="GRAVITY-Copy"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/physics/buttons/off-label.svg b/unpublishedScripts/marketplace/shapes/assets/tools/physics/buttons/off-label.svg
new file mode 100644
index 0000000000..0299aa9864
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/physics/buttons/off-label.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="104px" height="48px" viewBox="0 0 104 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>OFF</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Physics-Tool" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Physics---Default" transform="translate(-401.000000, -1031.000000)" fill="#575757">
+            <path d="M421.3,1031.688 C433.46,1031.688 440.948,1040.008 440.948,1054.856 C440.948,1069.384 433.46,1078.024 421.3,1078.024 C409.14,1078.024 401.588,1069.64 401.588,1054.856 C401.588,1040.392 409.14,1031.688 421.3,1031.688 Z M421.3,1038.728 C415.028,1038.728 411.508,1043.272 411.508,1054.856 C411.508,1066.44 415.156,1070.984 421.3,1070.984 C427.636,1070.984 431.028,1066.44 431.028,1054.856 C431.028,1043.272 427.636,1038.728 421.3,1038.728 Z M472.756,1039.56 L473.78,1032.712 L448.052,1032.712 L448.052,1077 L457.46,1077 L457.46,1058.952 L470.772,1058.952 L470.772,1052.104 L457.46,1052.104 L457.46,1039.56 L472.756,1039.56 Z M503.988,1039.56 L505.012,1032.712 L479.284,1032.712 L479.284,1077 L488.692,1077 L488.692,1058.952 L502.004,1058.952 L502.004,1052.104 L488.692,1052.104 L488.692,1039.56 L503.988,1039.56 Z" id="OFF"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/physics/buttons/on-label.svg b/unpublishedScripts/marketplace/shapes/assets/tools/physics/buttons/on-label.svg
new file mode 100644
index 0000000000..a17a5091ad
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/physics/buttons/on-label.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="81px" height="48px" viewBox="0 0 81 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>ON</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Physics-Tool" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Physics---Default" transform="translate(-411.000000, -1391.000000)" fill="#575757">
+            <path d="M431.156,1391.688 C443.316,1391.688 450.804,1400.008 450.804,1414.856 C450.804,1429.384 443.316,1438.024 431.156,1438.024 C418.996,1438.024 411.444,1429.64 411.444,1414.856 C411.444,1400.392 418.996,1391.688 431.156,1391.688 Z M431.156,1398.728 C424.884,1398.728 421.364,1403.272 421.364,1414.856 C421.364,1426.44 425.012,1430.984 431.156,1430.984 C437.492,1430.984 440.884,1426.44 440.884,1414.856 C440.884,1403.272 437.492,1398.728 431.156,1398.728 Z M491.316,1437 L491.316,1392.712 L482.804,1392.712 L482.804,1412.168 C482.804,1418.76 483.636,1424.904 484.084,1427.912 L469.748,1392.712 L457.908,1392.712 L457.908,1437 L466.42,1437 L466.42,1419.784 C466.42,1411.592 465.652,1405.832 465.14,1401.864 L479.22,1437 L491.316,1437 Z" id="ON"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/physics/presets-label.svg b/unpublishedScripts/marketplace/shapes/assets/tools/physics/presets-label.svg
new file mode 100644
index 0000000000..abe9c5c084
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/physics/presets-label.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="270px" height="47px" viewBox="0 0 270 47" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>PRESETS</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Physics-Tool" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Physics---Default" transform="translate(-871.000000, -714.000000)" fill="#FFFFFF">
+            <path d="M871.76,760 L871.76,714.56 L890.576,714.56 C892.538676,714.56 894.341325,714.975996 895.984,715.808 C897.626675,716.640004 899.045327,717.727993 900.24,719.072 C901.434673,720.416007 902.362663,721.941325 903.024,723.648 C903.685337,725.354675 904.016,727.082658 904.016,728.832 C904.016,730.709343 903.70667,732.511991 903.088,734.24 C902.46933,735.968009 901.584006,737.493327 900.432,738.816 C899.279994,740.138673 897.904008,741.205329 896.304,742.016 C894.703992,742.826671 892.922676,743.232 890.96,743.232 L876.176,743.232 L876.176,760 L871.76,760 Z M876.176,739.264 L890.704,739.264 C892.026673,739.264 893.231995,738.976003 894.32,738.4 C895.408005,737.823997 896.335996,737.056005 897.104,736.096 C897.872004,735.135995 898.469331,734.026673 898.896,732.768 C899.322669,731.509327 899.536,730.19734 899.536,728.832 C899.536,727.423993 899.290669,726.090673 898.8,724.832 C898.309331,723.573327 897.648004,722.474671 896.816,721.536 C895.983996,720.597329 895.002672,719.861336 893.872,719.328 C892.741328,718.794664 891.55734,718.528 890.32,718.528 L876.176,718.528 L876.176,739.264 Z M911.504,760 L911.504,714.56 L930.64,714.56 C932.602676,714.56 934.415992,714.975996 936.08,715.808 C937.744008,716.640004 939.173327,717.727993 940.368,719.072 C941.562673,720.416007 942.490663,721.941325 943.152,723.648 C943.813337,725.354675 944.144,727.082658 944.144,728.832 C944.144,730.496008 943.898669,732.085326 943.408,733.6 C942.917331,735.114674 942.224004,736.479994 941.328,737.696 C940.431996,738.912006 939.36534,739.935996 938.128,740.768 C936.89066,741.600004 935.504008,742.165332 933.968,742.464 L945.168,760 L940.112,760 L929.36,743.232 L915.92,743.232 L915.92,760 L911.504,760 Z M915.92,739.264 L930.832,739.264 C932.154673,739.264 933.359995,738.976003 934.448,738.4 C935.536005,737.823997 936.463996,737.045338 937.232,736.064 C938.000004,735.082662 938.597331,733.97334 939.024,732.736 C939.450669,731.49866 939.664,730.19734 939.664,728.832 C939.664,727.46666 939.418669,726.154673 938.928,724.896 C938.437331,723.637327 937.776004,722.538671 936.944,721.6 C936.111996,720.661329 935.130672,719.914669 934,719.36 C932.869328,718.805331 931.68534,718.528 930.448,718.528 L915.92,718.528 L915.92,739.264 Z M984.272,756.032 L984.272,760 L953.744,760 L953.744,714.56 L983.696,714.56 L983.696,718.528 L958.16,718.528 L958.16,734.912 L980.432,734.912 L980.432,738.688 L958.16,738.688 L958.16,756.032 L984.272,756.032 Z M1018.896,723.072 C1017.61599,721.621326 1015.89868,720.448004 1013.744,719.552 C1011.58932,718.655996 1009.16801,718.208 1006.48,718.208 C1002.42665,718.208 999.482676,718.965326 997.648,720.48 C995.813324,721.994674 994.896,724.05332 994.896,726.656 C994.896,728.02134 995.141331,729.141329 995.632,730.016 C996.122669,730.890671 996.890661,731.647997 997.936,732.288 C998.981339,732.928003 1000.30399,733.482664 1001.904,733.952 C1003.50401,734.421336 1005.39199,734.890664 1007.568,735.36 C1010.00001,735.872003 1012.17599,736.43733 1014.096,737.056 C1016.01601,737.67467 1017.65866,738.463995 1019.024,739.424 C1020.38934,740.384005 1021.43466,741.557326 1022.16,742.944 C1022.88534,744.330674 1023.248,746.04799 1023.248,748.096 C1023.248,750.186677 1022.84267,751.999992 1022.032,753.536 C1021.22133,755.072008 1020.09067,756.351995 1018.64,757.376 C1017.18933,758.400005 1015.46134,759.157331 1013.456,759.648 C1011.45066,760.138669 1009.27468,760.384 1006.928,760.384 C999.802631,760.384 993.722692,758.186689 988.688,753.792 L990.864,750.144 C992.528008,751.893342 994.767986,753.375994 997.584,754.592 C1000.40001,755.808006 1003.53598,756.416 1006.992,756.416 C1010.61868,756.416 1013.45599,755.76534 1015.504,754.464 C1017.55201,753.16266 1018.576,751.189347 1018.576,748.544 C1018.576,747.135993 1018.288,745.952005 1017.712,744.992 C1017.136,744.031995 1016.27201,743.200004 1015.12,742.496 C1013.96799,741.791996 1012.52801,741.184003 1010.8,740.672 C1009.07199,740.159997 1007.07734,739.648003 1004.816,739.136 C1002.42665,738.581331 1000.33601,738.005336 998.544,737.408 C996.751991,736.810664 995.248006,736.064004 994.032,735.168 C992.815994,734.271996 991.89867,733.194673 991.28,731.936 C990.66133,730.677327 990.352,729.130676 990.352,727.296 C990.352,725.205323 990.746663,723.338675 991.536,721.696 C992.325337,720.053325 993.43466,718.688005 994.864,717.6 C996.29334,716.511995 997.99999,715.680003 999.984,715.104 C1001.96801,714.527997 1004.15465,714.24 1006.544,714.24 C1009.53068,714.24 1012.20799,714.698662 1014.576,715.616 C1016.94401,716.533338 1019.08799,717.823992 1021.008,719.488 L1018.896,723.072 Z M1061.904,756.032 L1061.904,760 L1031.376,760 L1031.376,714.56 L1061.328,714.56 L1061.328,718.528 L1035.792,718.528 L1035.792,734.912 L1058.064,734.912 L1058.064,738.688 L1035.792,738.688 L1035.792,756.032 L1061.904,756.032 Z M1102.928,718.528 L1086.736,718.528 L1086.736,760 L1082.256,760 L1082.256,718.528 L1066.064,718.528 L1066.064,714.56 L1102.928,714.56 L1102.928,718.528 Z M1136.016,723.072 C1134.73599,721.621326 1133.01868,720.448004 1130.864,719.552 C1128.70932,718.655996 1126.28801,718.208 1123.6,718.208 C1119.54665,718.208 1116.60268,718.965326 1114.768,720.48 C1112.93332,721.994674 1112.016,724.05332 1112.016,726.656 C1112.016,728.02134 1112.26133,729.141329 1112.752,730.016 C1113.24267,730.890671 1114.01066,731.647997 1115.056,732.288 C1116.10134,732.928003 1117.42399,733.482664 1119.024,733.952 C1120.62401,734.421336 1122.51199,734.890664 1124.688,735.36 C1127.12001,735.872003 1129.29599,736.43733 1131.216,737.056 C1133.13601,737.67467 1134.77866,738.463995 1136.144,739.424 C1137.50934,740.384005 1138.55466,741.557326 1139.28,742.944 C1140.00534,744.330674 1140.368,746.04799 1140.368,748.096 C1140.368,750.186677 1139.96267,751.999992 1139.152,753.536 C1138.34133,755.072008 1137.21067,756.351995 1135.76,757.376 C1134.30933,758.400005 1132.58134,759.157331 1130.576,759.648 C1128.57066,760.138669 1126.39468,760.384 1124.048,760.384 C1116.92263,760.384 1110.84269,758.186689 1105.808,753.792 L1107.984,750.144 C1109.64801,751.893342 1111.88799,753.375994 1114.704,754.592 C1117.52001,755.808006 1120.65598,756.416 1124.112,756.416 C1127.73868,756.416 1130.57599,755.76534 1132.624,754.464 C1134.67201,753.16266 1135.696,751.189347 1135.696,748.544 C1135.696,747.135993 1135.408,745.952005 1134.832,744.992 C1134.256,744.031995 1133.39201,743.200004 1132.24,742.496 C1131.08799,741.791996 1129.64801,741.184003 1127.92,740.672 C1126.19199,740.159997 1124.19734,739.648003 1121.936,739.136 C1119.54665,738.581331 1117.45601,738.005336 1115.664,737.408 C1113.87199,736.810664 1112.36801,736.064004 1111.152,735.168 C1109.93599,734.271996 1109.01867,733.194673 1108.4,731.936 C1107.78133,730.677327 1107.472,729.130676 1107.472,727.296 C1107.472,725.205323 1107.86666,723.338675 1108.656,721.696 C1109.44534,720.053325 1110.55466,718.688005 1111.984,717.6 C1113.41334,716.511995 1115.11999,715.680003 1117.104,715.104 C1119.08801,714.527997 1121.27465,714.24 1123.664,714.24 C1126.65068,714.24 1129.32799,714.698662 1131.696,715.616 C1134.06401,716.533338 1136.20799,717.823992 1138.128,719.488 L1136.016,723.072 Z" id="PRESETS"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/physics/presets/balloon-label.svg b/unpublishedScripts/marketplace/shapes/assets/tools/physics/presets/balloon-label.svg
new file mode 100644
index 0000000000..920e5f3c51
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/physics/presets/balloon-label.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="459px" height="82px" viewBox="0 0 459 82" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>BALLOON</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Physics-Tool" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Just-Text" transform="translate(-1554.000000, -1340.000000)" fill="#FFFFFF">
+            <path d="M1593.824,1379.008 C1602.56,1380.688 1611.408,1384.832 1611.408,1397.488 C1611.408,1414.848 1597.408,1420 1578.368,1420 L1554.176,1420 L1554.176,1342.496 L1575.344,1342.496 C1595.616,1342.496 1608.048,1347.984 1608.048,1362.32 C1608.048,1372.064 1600.992,1377.328 1593.824,1379.008 Z M1570.64,1354.368 L1570.64,1373.968 L1578.704,1373.968 C1586.544,1373.968 1591.248,1370.72 1591.248,1363.776 C1591.248,1356.608 1586.432,1354.368 1576.912,1354.368 L1570.64,1354.368 Z M1578.48,1407.792 C1587.664,1407.792 1594.272,1406 1594.272,1396.816 C1594.272,1388.192 1588.224,1385.168 1579.936,1385.168 L1570.64,1385.168 L1570.64,1407.792 L1578.48,1407.792 Z M1657.44,1402.64 L1633.136,1402.64 L1628.768,1420 L1611.632,1420 L1635.488,1342.496 L1655.536,1342.496 L1679.28,1420 L1661.808,1420 L1657.44,1402.64 Z M1654.304,1390.432 L1645.232,1354.704 L1636.272,1390.432 L1654.304,1390.432 Z M1702.912,1406.784 L1702.912,1342.496 L1686.448,1342.496 L1686.448,1420 L1731.808,1420 L1733.6,1406.784 L1702.912,1406.784 Z M1759.92,1406.784 L1759.92,1342.496 L1743.456,1342.496 L1743.456,1420 L1788.816,1420 L1790.608,1406.784 L1759.92,1406.784 Z M1829.92,1340.704 C1851.2,1340.704 1864.304,1355.264 1864.304,1381.248 C1864.304,1406.672 1851.2,1421.792 1829.92,1421.792 C1808.64,1421.792 1795.424,1407.12 1795.424,1381.248 C1795.424,1355.936 1808.64,1340.704 1829.92,1340.704 Z M1829.92,1353.024 C1818.944,1353.024 1812.784,1360.976 1812.784,1381.248 C1812.784,1401.52 1819.168,1409.472 1829.92,1409.472 C1841.008,1409.472 1846.944,1401.52 1846.944,1381.248 C1846.944,1360.976 1841.008,1353.024 1829.92,1353.024 Z M1907.312,1340.704 C1928.592,1340.704 1941.696,1355.264 1941.696,1381.248 C1941.696,1406.672 1928.592,1421.792 1907.312,1421.792 C1886.032,1421.792 1872.816,1407.12 1872.816,1381.248 C1872.816,1355.936 1886.032,1340.704 1907.312,1340.704 Z M1907.312,1353.024 C1896.336,1353.024 1890.176,1360.976 1890.176,1381.248 C1890.176,1401.52 1896.56,1409.472 1907.312,1409.472 C1918.4,1409.472 1924.336,1401.52 1924.336,1381.248 C1924.336,1360.976 1918.4,1353.024 1907.312,1353.024 Z M2012.592,1420 L2012.592,1342.496 L1997.696,1342.496 L1997.696,1376.544 C1997.696,1388.08 1999.152,1398.832 1999.936,1404.096 L1974.848,1342.496 L1954.128,1342.496 L1954.128,1420 L1969.024,1420 L1969.024,1389.872 C1969.024,1375.536 1967.68,1365.456 1966.784,1358.512 L1991.424,1420 L2012.592,1420 Z" id="BALLOON"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/physics/presets/cotton-label.svg b/unpublishedScripts/marketplace/shapes/assets/tools/physics/presets/cotton-label.svg
new file mode 100644
index 0000000000..abc77ae8f3
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/physics/presets/cotton-label.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="393px" height="82px" viewBox="0 0 393 82" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>COTTON</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Physics-Tool" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Just-Text" transform="translate(-1550.000000, -500.000000)" fill="#FFFFFF">
+            <path d="M1584.528,500.704 C1565.152,500.704 1550.256,515.04 1550.256,541.136 C1550.256,567.568 1564.368,581.792 1584.976,581.792 C1595.728,581.792 1603.904,577.088 1608.832,572.048 L1601.216,562.304 C1596.736,565.776 1592.256,568.8 1585.76,568.8 C1575.12,568.8 1567.616,560.624 1567.616,541.136 C1567.616,520.976 1575.232,513.136 1585.536,513.136 C1590.912,513.136 1595.392,515.04 1599.648,518.736 L1607.936,509.104 C1601.552,503.728 1594.832,500.704 1584.528,500.704 Z M1646.464,500.704 C1667.744,500.704 1680.848,515.264 1680.848,541.248 C1680.848,566.672 1667.744,581.792 1646.464,581.792 C1625.184,581.792 1611.968,567.12 1611.968,541.248 C1611.968,515.936 1625.184,500.704 1646.464,500.704 Z M1646.464,513.024 C1635.488,513.024 1629.328,520.976 1629.328,541.248 C1629.328,561.52 1635.712,569.472 1646.464,569.472 C1657.552,569.472 1663.488,561.52 1663.488,541.248 C1663.488,520.976 1657.552,513.024 1646.464,513.024 Z M1740.656,515.376 L1742.448,502.496 L1683.984,502.496 L1683.984,515.376 L1704.592,515.376 L1704.592,580 L1721.056,580 L1721.056,515.376 L1740.656,515.376 Z M1800.464,515.376 L1802.256,502.496 L1743.792,502.496 L1743.792,515.376 L1764.4,515.376 L1764.4,580 L1780.864,580 L1780.864,515.376 L1800.464,515.376 Z M1837.312,500.704 C1858.592,500.704 1871.696,515.264 1871.696,541.248 C1871.696,566.672 1858.592,581.792 1837.312,581.792 C1816.032,581.792 1802.816,567.12 1802.816,541.248 C1802.816,515.936 1816.032,500.704 1837.312,500.704 Z M1837.312,513.024 C1826.336,513.024 1820.176,520.976 1820.176,541.248 C1820.176,561.52 1826.56,569.472 1837.312,569.472 C1848.4,569.472 1854.336,561.52 1854.336,541.248 C1854.336,520.976 1848.4,513.024 1837.312,513.024 Z M1942.592,580 L1942.592,502.496 L1927.696,502.496 L1927.696,536.544 C1927.696,548.08 1929.152,558.832 1929.936,564.096 L1904.848,502.496 L1884.128,502.496 L1884.128,580 L1899.024,580 L1899.024,549.872 C1899.024,535.536 1897.68,525.456 1896.784,518.512 L1921.424,580 L1942.592,580 Z" id="COTTON"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/physics/presets/custom-label.svg b/unpublishedScripts/marketplace/shapes/assets/tools/physics/presets/custom-label.svg
new file mode 100644
index 0000000000..7081e5b35d
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/physics/presets/custom-label.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="522px" height="82px" viewBox="0 0 522 82" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>CUSTOM …</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Physics-Tool" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Just-Text" transform="translate(-603.000000, -1620.000000)" fill="#FFFFFF">
+            <path d="M637.528,1620.704 C618.152,1620.704 603.256,1635.04 603.256,1661.136 C603.256,1687.568 617.368,1701.792 637.976,1701.792 C648.728,1701.792 656.904,1697.088 661.832,1692.048 L654.216,1682.304 C649.736,1685.776 645.256,1688.8 638.76,1688.8 C628.12,1688.8 620.616,1680.624 620.616,1661.136 C620.616,1640.976 628.232,1633.136 638.536,1633.136 C643.912,1633.136 648.392,1635.04 652.648,1638.736 L660.936,1629.104 C654.552,1623.728 647.832,1620.704 637.528,1620.704 Z M729.032,1674.464 L729.032,1622.496 L712.568,1622.496 L712.568,1673.68 C712.568,1684.096 708.536,1689.248 699.464,1689.248 C690.504,1689.248 686.472,1684.096 686.472,1673.68 L686.472,1622.496 L670.008,1622.496 L670.008,1674.464 C670.008,1690.592 679.864,1701.792 699.464,1701.792 C719.064,1701.792 729.032,1690.032 729.032,1674.464 Z M768.008,1620.704 C752.328,1620.704 740.904,1629.328 740.904,1642.544 C740.904,1654.304 747.624,1661.024 764.424,1666.288 C776.184,1669.872 779.208,1672.56 779.208,1678.72 C779.208,1685.552 773.832,1689.36 765.88,1689.36 C757.928,1689.36 751.656,1686.448 746.28,1681.52 L737.656,1690.928 C744.04,1697.2 753.448,1701.792 766.328,1701.792 C785.144,1701.792 796.344,1691.824 796.344,1677.6 C796.344,1663.264 787.384,1657.44 773.384,1652.96 C760.728,1649.04 757.816,1646.8 757.816,1641.424 C757.816,1635.936 762.408,1633.024 769.128,1633.024 C775.4,1633.024 780.776,1635.04 786.152,1639.632 L794.104,1630.448 C787.384,1624.176 779.544,1620.704 768.008,1620.704 Z M856.152,1635.376 L857.944,1622.496 L799.48,1622.496 L799.48,1635.376 L820.088,1635.376 L820.088,1700 L836.552,1700 L836.552,1635.376 L856.152,1635.376 Z M893,1620.704 C914.28,1620.704 927.384,1635.264 927.384,1661.248 C927.384,1686.672 914.28,1701.792 893,1701.792 C871.72,1701.792 858.504,1687.12 858.504,1661.248 C858.504,1635.936 871.72,1620.704 893,1620.704 Z M893,1633.024 C882.024,1633.024 875.864,1640.976 875.864,1661.248 C875.864,1681.52 882.248,1689.472 893,1689.472 C904.088,1689.472 910.024,1681.52 910.024,1661.248 C910.024,1640.976 904.088,1633.024 893,1633.024 Z M1013.848,1700 L1007.912,1622.496 L986.744,1622.496 L974.76,1675.92 L961.992,1622.496 L941.048,1622.496 L935,1700 L951.016,1700 L952.696,1668.864 C953.256,1658 953.368,1647.696 952.696,1636.832 L966.696,1691.712 L982.264,1691.712 L995.368,1636.944 C995.032,1645.792 995.368,1657.44 996.04,1668.528 L997.72,1700 L1013.848,1700 Z M1060.104,1682.64 C1054.84,1682.64 1050.584,1687.008 1050.584,1692.16 C1050.584,1697.424 1054.84,1701.792 1060.104,1701.792 C1065.48,1701.792 1069.736,1697.424 1069.736,1692.16 C1069.736,1687.008 1065.48,1682.64 1060.104,1682.64 Z M1087.544,1682.64 C1082.28,1682.64 1078.024,1687.008 1078.024,1692.16 C1078.024,1697.424 1082.28,1701.792 1087.544,1701.792 C1092.92,1701.792 1097.176,1697.424 1097.176,1692.16 C1097.176,1687.008 1092.92,1682.64 1087.544,1682.64 Z M1114.984,1682.64 C1109.608,1682.64 1105.464,1687.008 1105.464,1692.16 C1105.464,1697.424 1109.608,1701.792 1114.984,1701.792 C1120.36,1701.792 1124.616,1697.424 1124.616,1692.16 C1124.616,1687.008 1120.36,1682.64 1114.984,1682.64 Z" id="CUSTOM-…"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/physics/presets/default-label.svg b/unpublishedScripts/marketplace/shapes/assets/tools/physics/presets/default-label.svg
new file mode 100644
index 0000000000..24b053750d
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/physics/presets/default-label.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="436" height="80" viewBox="0 0 436.00 80.00" enable-background="new 0 0 436.00 80.00" xml:space="preserve">
+	<g>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 21.7221,2.04751C 33.7849,2.04751 43.4492,4.80959 50.7149,10.3338C 57.9806,15.8579 61.6134,25.9875 61.6134,40.7225C 61.6134,55.1542 58.0562,65.3217 50.9419,71.225C 43.8276,77.1283 34.7164,80.08 23.6083,80.08L 1.47947,80.08L 1.47947,2.04751L 21.7221,2.04751 Z M 17.9146,14L 17.9146,68.1275L 24.6213,68.1275C 30.9555,68.1275 35.8546,66.1383 39.3186,62.16C 42.7826,58.1817 44.5146,51.0358 44.5146,40.7225C 44.5146,33.5942 43.6384,28.0583 41.886,24.115C 40.1337,20.1717 37.8049,17.5 34.8998,16.1C 31.9947,14.7 28.4579,14 24.2895,14L 17.9146,14 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 118.516,14L 90.5713,14L 90.5713,34.5275L 114.936,34.5275L 114.936,46.48L 90.5713,46.48L 90.5713,68.1275L 120.525,68.1275L 120.525,80.08L 74.1362,80.08L 74.1362,2.04751L 120.298,2.04751L 118.516,14 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 176.537,14.7525L 149.814,14.7525L 149.814,36.7675L 173.061,36.7675L 173.061,48.72L 149.814,48.72L 149.814,80.6225L 133.379,80.6225L 133.379,2.80001L 178.318,2.80001L 176.537,14.7525 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 224.707,62.16L 200.447,62.16L 196.098,79.5025L 178.982,79.5025L 202.805,1.68001L 222.803,1.68001L 246.504,79.5025L 229.073,79.5025L 224.707,62.16 Z M 221.58,50.2075L 212.516,14.2275L 203.469,50.2075L 221.58,50.2075 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 311.895,54.7225C 311.895,60.0775 310.777,64.8288 308.542,68.9762C 306.306,73.1237 302.97,76.3846 298.534,78.7588C 294.097,81.1329 288.712,82.32 282.378,82.32C 272.842,82.32 265.559,79.8117 260.529,74.795C 255.499,69.7783 252.984,63.0875 252.984,54.7225L 252.984,2.24001L 269.419,2.24001L 269.419,54.4775C 269.419,59.8092 270.461,63.7904 272.545,66.4212C 274.629,69.0521 277.907,70.3675 282.378,70.3675C 286.849,70.3675 290.147,69.0521 292.272,66.4212C 294.397,63.7904 295.46,59.8092 295.46,54.4775L 295.46,2.24001L 311.895,2.24001L 311.895,54.7225 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 343.193,66.64L 373.828,66.64L 372.029,80.08L 326.758,80.08L 326.758,2.24001L 343.193,2.24001L 343.193,66.64 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 433.281,15.12L 413.719,15.12L 413.719,80.0625L 397.301,80.0625L 397.301,15.12L 376.727,15.12L 376.727,1.68001L 435.079,1.68001L 433.281,15.12 Z "/>
+	</g>
+</svg>
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/physics/presets/ice-label.svg b/unpublishedScripts/marketplace/shapes/assets/tools/physics/presets/ice-label.svg
new file mode 100644
index 0000000000..b919283e9f
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/physics/presets/ice-label.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="144px" height="82px" viewBox="0 0 144 82" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>ICE</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Physics-Tool" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Just-Text" transform="translate(-607.000000, -1060.000000)" fill="#FFFFFF">
+            <path d="M623.752,1140 L623.752,1062.496 L607.176,1062.496 L607.176,1140 L623.752,1140 Z M670.456,1060.704 C651.08,1060.704 636.184,1075.04 636.184,1101.136 C636.184,1127.568 650.296,1141.792 670.904,1141.792 C681.656,1141.792 689.832,1137.088 694.76,1132.048 L687.144,1122.304 C682.664,1125.776 678.184,1128.8 671.688,1128.8 C661.048,1128.8 653.544,1120.624 653.544,1101.136 C653.544,1080.976 661.16,1073.136 671.464,1073.136 C676.84,1073.136 681.32,1075.04 685.576,1078.736 L693.864,1069.104 C687.48,1063.728 680.76,1060.704 670.456,1060.704 Z M748.52,1074.48 L750.312,1062.496 L704.056,1062.496 L704.056,1140 L750.536,1140 L750.536,1127.904 L720.52,1127.904 L720.52,1106.512 L744.936,1106.512 L744.936,1094.64 L720.52,1094.64 L720.52,1074.48 L748.52,1074.48 Z" id="ICE"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/physics/presets/lead-label.svg b/unpublishedScripts/marketplace/shapes/assets/tools/physics/presets/lead-label.svg
new file mode 100644
index 0000000000..a2119fb8f0
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/physics/presets/lead-label.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="243px" height="78px" viewBox="0 0 243 78" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>LEAD Copy</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Physics-Tool" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Just-Text" transform="translate(-607.000000, -502.000000)" fill="#FFFFFF">
+            <path d="M623.64,566.784 L623.64,502.496 L607.176,502.496 L607.176,580 L652.536,580 L654.328,566.784 L623.64,566.784 Z M708.648,514.48 L710.44,502.496 L664.184,502.496 L664.184,580 L710.664,580 L710.664,567.904 L680.648,567.904 L680.648,546.512 L705.064,546.512 L705.064,534.64 L680.648,534.64 L680.648,514.48 L708.648,514.48 Z M759.944,562.64 L735.64,562.64 L731.272,580 L714.136,580 L737.992,502.496 L758.04,502.496 L781.784,580 L764.312,580 L759.944,562.64 Z M756.808,550.432 L747.736,514.704 L738.776,550.432 L756.808,550.432 Z M809.224,502.496 C829.72,502.496 849.208,508.88 849.208,540.912 C849.208,572.16 830.168,580 811.128,580 L788.952,580 L788.952,502.496 L809.224,502.496 Z M805.416,514.592 L805.416,567.904 L812.136,567.904 C823.448,567.904 832.072,562.64 832.072,540.912 C832.072,518.736 823,514.592 811.8,514.592 L805.416,514.592 Z" id="LEAD-Copy"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/physics/presets/rubber-label.svg b/unpublishedScripts/marketplace/shapes/assets/tools/physics/presets/rubber-label.svg
new file mode 100644
index 0000000000..5b4ed55053
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/physics/presets/rubber-label.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="400px" height="80px" viewBox="0 0 400 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>RUBBER</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Physics-Tool" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Just-Text" transform="translate(-607.000000, -1342.000000)" fill="#FFFFFF">
+            <path d="M632.04,1389.648 L623.64,1389.648 L623.64,1420 L607.176,1420 L607.176,1342.496 L631.368,1342.496 C652.088,1342.496 662.616,1350 662.616,1365.68 C662.616,1375.984 657.576,1382.144 647.272,1386.624 L667.32,1420 L648.616,1420 L632.04,1389.648 Z M623.64,1378 L632.264,1378 C640.888,1378 645.592,1374.416 645.592,1365.68 C645.592,1357.728 641,1354.256 631.032,1354.256 L623.64,1354.256 L623.64,1378 Z M733.848,1394.464 L733.848,1342.496 L717.384,1342.496 L717.384,1393.68 C717.384,1404.096 713.352,1409.248 704.28,1409.248 C695.32,1409.248 691.288,1404.096 691.288,1393.68 L691.288,1342.496 L674.824,1342.496 L674.824,1394.464 C674.824,1410.592 684.68,1421.792 704.28,1421.792 C723.88,1421.792 733.848,1410.032 733.848,1394.464 Z M788.84,1379.008 C797.576,1380.688 806.424,1384.832 806.424,1397.488 C806.424,1414.848 792.424,1420 773.384,1420 L749.192,1420 L749.192,1342.496 L770.36,1342.496 C790.632,1342.496 803.064,1347.984 803.064,1362.32 C803.064,1372.064 796.008,1377.328 788.84,1379.008 Z M765.656,1354.368 L765.656,1373.968 L773.72,1373.968 C781.56,1373.968 786.264,1370.72 786.264,1363.776 C786.264,1356.608 781.448,1354.368 771.928,1354.368 L765.656,1354.368 Z M773.496,1407.792 C782.68,1407.792 789.288,1406 789.288,1396.816 C789.288,1388.192 783.24,1385.168 774.952,1385.168 L765.656,1385.168 L765.656,1407.792 L773.496,1407.792 Z M857.72,1379.008 C866.456,1380.688 875.304,1384.832 875.304,1397.488 C875.304,1414.848 861.304,1420 842.264,1420 L818.072,1420 L818.072,1342.496 L839.24,1342.496 C859.512,1342.496 871.944,1347.984 871.944,1362.32 C871.944,1372.064 864.888,1377.328 857.72,1379.008 Z M834.536,1354.368 L834.536,1373.968 L842.6,1373.968 C850.44,1373.968 855.144,1370.72 855.144,1363.776 C855.144,1356.608 850.328,1354.368 840.808,1354.368 L834.536,1354.368 Z M842.376,1407.792 C851.56,1407.792 858.168,1406 858.168,1396.816 C858.168,1388.192 852.12,1385.168 843.832,1385.168 L834.536,1385.168 L834.536,1407.792 L842.376,1407.792 Z M931.416,1354.48 L933.208,1342.496 L886.952,1342.496 L886.952,1420 L933.432,1420 L933.432,1407.904 L903.416,1407.904 L903.416,1386.512 L927.832,1386.512 L927.832,1374.64 L903.416,1374.64 L903.416,1354.48 L931.416,1354.48 Z M970.952,1389.648 L962.552,1389.648 L962.552,1420 L946.088,1420 L946.088,1342.496 L970.28,1342.496 C991,1342.496 1001.528,1350 1001.528,1365.68 C1001.528,1375.984 996.488,1382.144 986.184,1386.624 L1006.232,1420 L987.528,1420 L970.952,1389.648 Z M962.552,1378 L971.176,1378 C979.8,1378 984.504,1374.416 984.504,1365.68 C984.504,1357.728 979.912,1354.256 969.944,1354.256 L962.552,1354.256 L962.552,1378 Z" id="RUBBER"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/physics/presets/tumbleweed-label.svg b/unpublishedScripts/marketplace/shapes/assets/tools/physics/presets/tumbleweed-label.svg
new file mode 100644
index 0000000000..ecd824257e
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/physics/presets/tumbleweed-label.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="687px" height="80px" viewBox="0 0 687 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>TUMBLEWEED</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Physics-Tool" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Just-Text" transform="translate(-1547.000000, -782.000000)" fill="#FFFFFF">
+            <path d="M1603.792,795.376 L1605.584,782.496 L1547.12,782.496 L1547.12,795.376 L1567.728,795.376 L1567.728,860 L1584.192,860 L1584.192,795.376 L1603.792,795.376 Z M1671.888,834.464 L1671.888,782.496 L1655.424,782.496 L1655.424,833.68 C1655.424,844.096 1651.392,849.248 1642.32,849.248 C1633.36,849.248 1629.328,844.096 1629.328,833.68 L1629.328,782.496 L1612.864,782.496 L1612.864,834.464 C1612.864,850.592 1622.72,861.792 1642.32,861.792 C1661.92,861.792 1671.888,850.032 1671.888,834.464 Z M1761.824,860 L1755.888,782.496 L1734.72,782.496 L1722.736,835.92 L1709.968,782.496 L1689.024,782.496 L1682.976,860 L1698.992,860 L1700.672,828.864 C1701.232,818 1701.344,807.696 1700.672,796.832 L1714.672,851.712 L1730.24,851.712 L1743.344,796.944 C1743.008,805.792 1743.344,817.44 1744.016,828.528 L1745.696,860 L1761.824,860 Z M1815.248,819.008 C1823.984,820.688 1832.832,824.832 1832.832,837.488 C1832.832,854.848 1818.832,860 1799.792,860 L1775.6,860 L1775.6,782.496 L1796.768,782.496 C1817.04,782.496 1829.472,787.984 1829.472,802.32 C1829.472,812.064 1822.416,817.328 1815.248,819.008 Z M1792.064,794.368 L1792.064,813.968 L1800.128,813.968 C1807.968,813.968 1812.672,810.72 1812.672,803.776 C1812.672,796.608 1807.856,794.368 1798.336,794.368 L1792.064,794.368 Z M1799.904,847.792 C1809.088,847.792 1815.696,846 1815.696,836.816 C1815.696,828.192 1809.648,825.168 1801.36,825.168 L1792.064,825.168 L1792.064,847.792 L1799.904,847.792 Z M1860.944,846.784 L1860.944,782.496 L1844.48,782.496 L1844.48,860 L1889.84,860 L1891.632,846.784 L1860.944,846.784 Z M1945.952,794.48 L1947.744,782.496 L1901.488,782.496 L1901.488,860 L1947.968,860 L1947.968,847.904 L1917.952,847.904 L1917.952,826.512 L1942.368,826.512 L1942.368,814.64 L1917.952,814.64 L1917.952,794.48 L1945.952,794.48 Z M2031.632,860 L2045.184,782.496 L2029.616,782.496 L2019.648,847.232 L2008.336,782.496 L1990.976,782.496 L1979.216,847.232 L1970.368,782.496 L1953.904,782.496 L1967.344,860 L1988.176,860 L1999.488,799.408 L2010.24,860 L2031.632,860 Z M2099.392,794.48 L2101.184,782.496 L2054.928,782.496 L2054.928,860 L2101.408,860 L2101.408,847.904 L2071.392,847.904 L2071.392,826.512 L2095.808,826.512 L2095.808,814.64 L2071.392,814.64 L2071.392,794.48 L2099.392,794.48 Z M2158.528,794.48 L2160.32,782.496 L2114.064,782.496 L2114.064,860 L2160.544,860 L2160.544,847.904 L2130.528,847.904 L2130.528,826.512 L2154.944,826.512 L2154.944,814.64 L2130.528,814.64 L2130.528,794.48 L2158.528,794.48 Z M2193.472,782.496 C2213.968,782.496 2233.456,788.88 2233.456,820.912 C2233.456,852.16 2214.416,860 2195.376,860 L2173.2,860 L2173.2,782.496 L2193.472,782.496 Z M2189.664,794.592 L2189.664,847.904 L2196.384,847.904 C2207.696,847.904 2216.32,842.64 2216.32,820.912 C2216.32,798.736 2207.248,794.592 2196.048,794.592 L2189.664,794.592 Z" id="TUMBLEWEED"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/physics/presets/wood-label.svg b/unpublishedScripts/marketplace/shapes/assets/tools/physics/presets/wood-label.svg
new file mode 100644
index 0000000000..59c348fd52
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/physics/presets/wood-label.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="316px" height="82px" viewBox="0 0 316 82" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>WOOD</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Physics-Tool" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Just-Text" transform="translate(-600.000000, -780.000000)" fill="#FFFFFF">
+            <path d="M678.184,860 L691.736,782.496 L676.168,782.496 L666.2,847.232 L654.888,782.496 L637.528,782.496 L625.768,847.232 L616.92,782.496 L600.456,782.496 L613.896,860 L634.728,860 L646.04,799.408 L656.792,860 L678.184,860 Z M730.936,780.704 C752.216,780.704 765.32,795.264 765.32,821.248 C765.32,846.672 752.216,861.792 730.936,861.792 C709.656,861.792 696.44,847.12 696.44,821.248 C696.44,795.936 709.656,780.704 730.936,780.704 Z M730.936,793.024 C719.96,793.024 713.8,800.976 713.8,821.248 C713.8,841.52 720.184,849.472 730.936,849.472 C742.024,849.472 747.96,841.52 747.96,821.248 C747.96,800.976 742.024,793.024 730.936,793.024 Z M808.328,780.704 C829.608,780.704 842.712,795.264 842.712,821.248 C842.712,846.672 829.608,861.792 808.328,861.792 C787.048,861.792 773.832,847.12 773.832,821.248 C773.832,795.936 787.048,780.704 808.328,780.704 Z M808.328,793.024 C797.352,793.024 791.192,800.976 791.192,821.248 C791.192,841.52 797.576,849.472 808.328,849.472 C819.416,849.472 825.352,841.52 825.352,821.248 C825.352,800.976 819.416,793.024 808.328,793.024 Z M875.416,782.496 C895.912,782.496 915.4,788.88 915.4,820.912 C915.4,852.16 896.36,860 877.32,860 L855.144,860 L855.144,782.496 L875.416,782.496 Z M871.608,794.592 L871.608,847.904 L878.328,847.904 C889.64,847.904 898.264,842.64 898.264,820.912 C898.264,798.736 889.192,794.592 877.992,794.592 L871.608,794.592 Z" id="WOOD"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/physics/presets/zero-g-label.svg b/unpublishedScripts/marketplace/shapes/assets/tools/physics/presets/zero-g-label.svg
new file mode 100644
index 0000000000..a1a349b8c5
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/physics/presets/zero-g-label.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="375px" height="82px" viewBox="0 0 375 82" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>ZERO-G</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Physics-Tool" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Just-Text" transform="translate(-1548.000000, -1060.000000)" fill="#FFFFFF">
+            <path d="M1602.336,1075.152 L1602.336,1062.496 L1551.936,1062.496 L1551.936,1075.488 L1583.744,1075.488 L1548.352,1127.568 L1548.352,1140 L1601.104,1140 L1602.896,1126.672 L1567.616,1126.672 L1602.336,1075.152 Z M1659.008,1074.48 L1660.8,1062.496 L1614.544,1062.496 L1614.544,1140 L1661.024,1140 L1661.024,1127.904 L1631.008,1127.904 L1631.008,1106.512 L1655.424,1106.512 L1655.424,1094.64 L1631.008,1094.64 L1631.008,1074.48 L1659.008,1074.48 Z M1698.544,1109.648 L1690.144,1109.648 L1690.144,1140 L1673.68,1140 L1673.68,1062.496 L1697.872,1062.496 C1718.592,1062.496 1729.12,1070 1729.12,1085.68 C1729.12,1095.984 1724.08,1102.144 1713.776,1106.624 L1733.824,1140 L1715.12,1140 L1698.544,1109.648 Z M1690.144,1098 L1698.768,1098 C1707.392,1098 1712.096,1094.416 1712.096,1085.68 C1712.096,1077.728 1707.504,1074.256 1697.536,1074.256 L1690.144,1074.256 L1690.144,1098 Z M1771.904,1060.704 C1793.184,1060.704 1806.288,1075.264 1806.288,1101.248 C1806.288,1126.672 1793.184,1141.792 1771.904,1141.792 C1750.624,1141.792 1737.408,1127.12 1737.408,1101.248 C1737.408,1075.936 1750.624,1060.704 1771.904,1060.704 Z M1771.904,1073.024 C1760.928,1073.024 1754.768,1080.976 1754.768,1101.248 C1754.768,1121.52 1761.152,1129.472 1771.904,1129.472 C1782.992,1129.472 1788.928,1121.52 1788.928,1101.248 C1788.928,1080.976 1782.992,1073.024 1771.904,1073.024 Z M1815.92,1098.672 L1815.92,1111.216 L1850.64,1111.216 L1850.64,1098.672 L1815.92,1098.672 Z M1896.448,1060.704 C1876.624,1060.704 1860.272,1074.928 1860.272,1101.136 C1860.272,1127.792 1872.256,1141.792 1894.656,1141.792 C1905.072,1141.792 1914.592,1138.768 1922.32,1133.952 L1922.32,1095.76 L1893.76,1095.76 L1895.44,1107.744 L1906.304,1107.744 L1906.304,1126.672 C1902.832,1128.576 1898.912,1129.472 1894.768,1129.472 C1883.344,1129.472 1877.52,1121.968 1877.52,1101.248 C1877.52,1081.088 1886.256,1072.912 1897.232,1072.912 C1903.616,1072.912 1907.984,1074.928 1913.024,1079.072 L1921.872,1070 C1915.376,1064.4 1907.536,1060.704 1896.448,1060.704 Z" id="ZERO-G"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/physics/properties-label.svg b/unpublishedScripts/marketplace/shapes/assets/tools/physics/properties-label.svg
new file mode 100644
index 0000000000..25198edb62
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/physics/properties-label.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="376px" height="47px" viewBox="0 0 376 47" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>PROPERTIES</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Physics-Tool" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Physics---Default" transform="translate(-123.000000, -714.000000)" fill="#FFFFFF">
+            <path d="M123.76,760 L123.76,714.56 L142.576,714.56 C144.538676,714.56 146.341325,714.975996 147.984,715.808 C149.626675,716.640004 151.045327,717.727993 152.24,719.072 C153.434673,720.416007 154.362663,721.941325 155.024,723.648 C155.685337,725.354675 156.016,727.082658 156.016,728.832 C156.016,730.709343 155.70667,732.511991 155.088,734.24 C154.46933,735.968009 153.584006,737.493327 152.432,738.816 C151.279994,740.138673 149.904008,741.205329 148.304,742.016 C146.703992,742.826671 144.922676,743.232 142.96,743.232 L128.176,743.232 L128.176,760 L123.76,760 Z M128.176,739.264 L142.704,739.264 C144.026673,739.264 145.231995,738.976003 146.32,738.4 C147.408005,737.823997 148.335996,737.056005 149.104,736.096 C149.872004,735.135995 150.469331,734.026673 150.896,732.768 C151.322669,731.509327 151.536,730.19734 151.536,728.832 C151.536,727.423993 151.290669,726.090673 150.8,724.832 C150.309331,723.573327 149.648004,722.474671 148.816,721.536 C147.983996,720.597329 147.002672,719.861336 145.872,719.328 C144.741328,718.794664 143.55734,718.528 142.32,718.528 L128.176,718.528 L128.176,739.264 Z M163.504,760 L163.504,714.56 L182.64,714.56 C184.602676,714.56 186.415992,714.975996 188.08,715.808 C189.744008,716.640004 191.173327,717.727993 192.368,719.072 C193.562673,720.416007 194.490663,721.941325 195.152,723.648 C195.813337,725.354675 196.144,727.082658 196.144,728.832 C196.144,730.496008 195.898669,732.085326 195.408,733.6 C194.917331,735.114674 194.224004,736.479994 193.328,737.696 C192.431996,738.912006 191.36534,739.935996 190.128,740.768 C188.89066,741.600004 187.504008,742.165332 185.968,742.464 L197.168,760 L192.112,760 L181.36,743.232 L167.92,743.232 L167.92,760 L163.504,760 Z M167.92,739.264 L182.832,739.264 C184.154673,739.264 185.359995,738.976003 186.448,738.4 C187.536005,737.823997 188.463996,737.045338 189.232,736.064 C190.000004,735.082662 190.597331,733.97334 191.024,732.736 C191.450669,731.49866 191.664,730.19734 191.664,728.832 C191.664,727.46666 191.418669,726.154673 190.928,724.896 C190.437331,723.637327 189.776004,722.538671 188.944,721.6 C188.111996,720.661329 187.130672,719.914669 186,719.36 C184.869328,718.805331 183.68534,718.528 182.448,718.528 L167.92,718.528 L167.92,739.264 Z M223.92,760.32 C220.762651,760.32 217.872013,759.66934 215.248,758.368 C212.623987,757.06666 210.373343,755.338677 208.496,753.184 C206.618657,751.029323 205.168005,748.565347 204.144,745.792 C203.119995,743.018653 202.608,740.181348 202.608,737.28 C202.608,734.250652 203.151995,731.349347 204.24,728.576 C205.328005,725.802653 206.83199,723.349344 208.752,721.216 C210.67201,719.082656 212.93332,717.386673 215.536,716.128 C218.13868,714.869327 220.954652,714.24 223.984,714.24 C227.141349,714.24 230.031987,714.911993 232.656,716.256 C235.280013,717.600007 237.519991,719.359989 239.376,721.536 C241.232009,723.712011 242.671995,726.175986 243.696,728.928 C244.720005,731.680014 245.232,734.485319 245.232,737.344 C245.232,740.373348 244.688005,743.274653 243.6,746.048 C242.511995,748.821347 241.018676,751.263989 239.12,753.376 C237.221324,755.488011 234.97068,757.173327 232.368,758.432 C229.76532,759.690673 226.949348,760.32 223.92,760.32 Z M207.088,737.28 C207.088,739.754679 207.493329,742.133322 208.304,744.416 C209.114671,746.698678 210.266659,748.725324 211.76,750.496 C213.253341,752.266676 215.02399,753.674661 217.072,754.72 C219.12001,755.765339 221.402654,756.288 223.92,756.288 C226.480013,756.288 228.805323,755.733339 230.896,754.624 C232.986677,753.514661 234.757326,752.064009 236.208,750.272 C237.658674,748.479991 238.778663,746.453345 239.568,744.192 C240.357337,741.930655 240.752,739.626678 240.752,737.28 C240.752,734.805321 240.336004,732.426678 239.504,730.144 C238.671996,727.861322 237.509341,725.845342 236.016,724.096 C234.522659,722.346658 232.75201,720.949339 230.704,719.904 C228.65599,718.858661 226.394679,718.336 223.92,718.336 C221.359987,718.336 219.034677,718.879995 216.944,719.968 C214.853323,721.056005 213.082674,722.495991 211.632,724.288 C210.181326,726.080009 209.061337,728.106655 208.272,730.368 C207.482663,732.629345 207.088,734.933322 207.088,737.28 Z M253.872,760 L253.872,714.56 L272.688,714.56 C274.650676,714.56 276.453325,714.975996 278.096,715.808 C279.738675,716.640004 281.157327,717.727993 282.352,719.072 C283.546673,720.416007 284.474663,721.941325 285.136,723.648 C285.797337,725.354675 286.128,727.082658 286.128,728.832 C286.128,730.709343 285.81867,732.511991 285.2,734.24 C284.58133,735.968009 283.696006,737.493327 282.544,738.816 C281.391994,740.138673 280.016008,741.205329 278.416,742.016 C276.815992,742.826671 275.034676,743.232 273.072,743.232 L258.288,743.232 L258.288,760 L253.872,760 Z M258.288,739.264 L272.816,739.264 C274.138673,739.264 275.343995,738.976003 276.432,738.4 C277.520005,737.823997 278.447996,737.056005 279.216,736.096 C279.984004,735.135995 280.581331,734.026673 281.008,732.768 C281.434669,731.509327 281.648,730.19734 281.648,728.832 C281.648,727.423993 281.402669,726.090673 280.912,724.832 C280.421331,723.573327 279.760004,722.474671 278.928,721.536 C278.095996,720.597329 277.114672,719.861336 275.984,719.328 C274.853328,718.794664 273.66934,718.528 272.432,718.528 L258.288,718.528 L258.288,739.264 Z M324.144,756.032 L324.144,760 L293.616,760 L293.616,714.56 L323.568,714.56 L323.568,718.528 L298.032,718.528 L298.032,734.912 L320.304,734.912 L320.304,738.688 L298.032,738.688 L298.032,756.032 L324.144,756.032 Z M332.848,760 L332.848,714.56 L351.984,714.56 C353.946676,714.56 355.759992,714.975996 357.424,715.808 C359.088008,716.640004 360.517327,717.727993 361.712,719.072 C362.906673,720.416007 363.834663,721.941325 364.496,723.648 C365.157337,725.354675 365.488,727.082658 365.488,728.832 C365.488,730.496008 365.242669,732.085326 364.752,733.6 C364.261331,735.114674 363.568004,736.479994 362.672,737.696 C361.775996,738.912006 360.70934,739.935996 359.472,740.768 C358.23466,741.600004 356.848008,742.165332 355.312,742.464 L366.512,760 L361.456,760 L350.704,743.232 L337.264,743.232 L337.264,760 L332.848,760 Z M337.264,739.264 L352.176,739.264 C353.498673,739.264 354.703995,738.976003 355.792,738.4 C356.880005,737.823997 357.807996,737.045338 358.576,736.064 C359.344004,735.082662 359.941331,733.97334 360.368,732.736 C360.794669,731.49866 361.008,730.19734 361.008,728.832 C361.008,727.46666 360.762669,726.154673 360.272,724.896 C359.781331,723.637327 359.120004,722.538671 358.288,721.6 C357.455996,720.661329 356.474672,719.914669 355.344,719.36 C354.213328,718.805331 353.02934,718.528 351.792,718.528 L337.264,718.528 L337.264,739.264 Z M406.32,718.528 L390.128,718.528 L390.128,760 L385.648,760 L385.648,718.528 L369.456,718.528 L369.456,714.56 L406.32,714.56 L406.32,718.528 Z M413.296,760 L413.296,714.624 L417.712,714.624 L417.712,760 L413.296,760 Z M459.76,756.032 L459.76,760 L429.232,760 L429.232,714.56 L459.184,714.56 L459.184,718.528 L433.648,718.528 L433.648,734.912 L455.92,734.912 L455.92,738.688 L433.648,738.688 L433.648,756.032 L459.76,756.032 Z M494.384,723.072 C493.103994,721.621326 491.386677,720.448004 489.232,719.552 C487.077323,718.655996 484.656013,718.208 481.968,718.208 C477.914646,718.208 474.970676,718.965326 473.136,720.48 C471.301324,721.994674 470.384,724.05332 470.384,726.656 C470.384,728.02134 470.629331,729.141329 471.12,730.016 C471.610669,730.890671 472.378661,731.647997 473.424,732.288 C474.469339,732.928003 475.791992,733.482664 477.392,733.952 C478.992008,734.421336 480.879989,734.890664 483.056,735.36 C485.488012,735.872003 487.66399,736.43733 489.584,737.056 C491.50401,737.67467 493.14666,738.463995 494.512,739.424 C495.87734,740.384005 496.922663,741.557326 497.648,742.944 C498.373337,744.330674 498.736,746.04799 498.736,748.096 C498.736,750.186677 498.330671,751.999992 497.52,753.536 C496.709329,755.072008 495.578674,756.351995 494.128,757.376 C492.677326,758.400005 490.949343,759.157331 488.944,759.648 C486.938657,760.138669 484.762678,760.384 482.416,760.384 C475.290631,760.384 469.210692,758.186689 464.176,753.792 L466.352,750.144 C468.016008,751.893342 470.255986,753.375994 473.072,754.592 C475.888014,755.808006 479.023983,756.416 482.48,756.416 C486.106685,756.416 488.94399,755.76534 490.992,754.464 C493.04001,753.16266 494.064,751.189347 494.064,748.544 C494.064,747.135993 493.776003,745.952005 493.2,744.992 C492.623997,744.031995 491.760006,743.200004 490.608,742.496 C489.455994,741.791996 488.016009,741.184003 486.288,740.672 C484.559991,740.159997 482.565345,739.648003 480.304,739.136 C477.914655,738.581331 475.824009,738.005336 474.032,737.408 C472.239991,736.810664 470.736006,736.064004 469.52,735.168 C468.303994,734.271996 467.38667,733.194673 466.768,731.936 C466.14933,730.677327 465.84,729.130676 465.84,727.296 C465.84,725.205323 466.234663,723.338675 467.024,721.696 C467.813337,720.053325 468.92266,718.688005 470.352,717.6 C471.78134,716.511995 473.48799,715.680003 475.472,715.104 C477.45601,714.527997 479.642655,714.24 482.032,714.24 C485.018682,714.24 487.695988,714.698662 490.064,715.616 C492.432012,716.533338 494.57599,717.823992 496.496,719.488 L494.384,723.072 Z" id="PROPERTIES"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/physics/sliders/bounce-label.svg b/unpublishedScripts/marketplace/shapes/assets/tools/physics/sliders/bounce-label.svg
new file mode 100644
index 0000000000..a997fa80a2
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/physics/sliders/bounce-label.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="233px" height="48px" viewBox="0 0 233 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>BOUNCE</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Physics-Tool" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Physics---Default" transform="translate(-1272.000000, -2154.000000)" fill="#FFFFFF">
+            <path d="M1295.564,2176.576 C1300.556,2177.536 1305.612,2179.904 1305.612,2187.136 C1305.612,2197.056 1297.612,2200 1286.732,2200 L1272.908,2200 L1272.908,2155.712 L1285.004,2155.712 C1296.588,2155.712 1303.692,2158.848 1303.692,2167.04 C1303.692,2172.608 1299.66,2175.616 1295.564,2176.576 Z M1282.316,2162.496 L1282.316,2173.696 L1286.924,2173.696 C1291.404,2173.696 1294.092,2171.84 1294.092,2167.872 C1294.092,2163.776 1291.34,2162.496 1285.9,2162.496 L1282.316,2162.496 Z M1286.796,2193.024 C1292.044,2193.024 1295.82,2192 1295.82,2186.752 C1295.82,2181.824 1292.364,2180.096 1287.628,2180.096 L1282.316,2180.096 L1282.316,2193.024 L1286.796,2193.024 Z M1329.74,2154.688 C1341.9,2154.688 1349.388,2163.008 1349.388,2177.856 C1349.388,2192.384 1341.9,2201.024 1329.74,2201.024 C1317.58,2201.024 1310.028,2192.64 1310.028,2177.856 C1310.028,2163.392 1317.58,2154.688 1329.74,2154.688 Z M1329.74,2161.728 C1323.468,2161.728 1319.948,2166.272 1319.948,2177.856 C1319.948,2189.44 1323.596,2193.984 1329.74,2193.984 C1336.076,2193.984 1339.468,2189.44 1339.468,2177.856 C1339.468,2166.272 1336.076,2161.728 1329.74,2161.728 Z M1389.58,2185.408 L1389.58,2155.712 L1380.172,2155.712 L1380.172,2184.96 C1380.172,2190.912 1377.868,2193.856 1372.684,2193.856 C1367.564,2193.856 1365.26,2190.912 1365.26,2184.96 L1365.26,2155.712 L1355.852,2155.712 L1355.852,2185.408 C1355.852,2194.624 1361.484,2201.024 1372.684,2201.024 C1383.884,2201.024 1389.58,2194.304 1389.58,2185.408 Z M1431.756,2200 L1431.756,2155.712 L1423.244,2155.712 L1423.244,2175.168 C1423.244,2181.76 1424.076,2187.904 1424.524,2190.912 L1410.188,2155.712 L1398.348,2155.712 L1398.348,2200 L1406.86,2200 L1406.86,2182.784 C1406.86,2174.592 1406.092,2168.832 1405.58,2164.864 L1419.66,2200 L1431.756,2200 Z M1458.444,2154.688 C1447.372,2154.688 1438.86,2162.88 1438.86,2177.792 C1438.86,2192.896 1446.924,2201.024 1458.7,2201.024 C1464.844,2201.024 1469.516,2198.336 1472.332,2195.456 L1467.98,2189.888 C1465.42,2191.872 1462.86,2193.6 1459.148,2193.6 C1453.068,2193.6 1448.78,2188.928 1448.78,2177.792 C1448.78,2166.272 1453.132,2161.792 1459.02,2161.792 C1462.092,2161.792 1464.652,2162.88 1467.084,2164.992 L1471.82,2159.488 C1468.172,2156.416 1464.332,2154.688 1458.444,2154.688 Z M1503.052,2162.56 L1504.076,2155.712 L1477.644,2155.712 L1477.644,2200 L1504.204,2200 L1504.204,2193.088 L1487.052,2193.088 L1487.052,2180.864 L1501.004,2180.864 L1501.004,2174.08 L1487.052,2174.08 L1487.052,2162.56 L1503.052,2162.56 Z" id="BOUNCE"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/physics/sliders/density-label.svg b/unpublishedScripts/marketplace/shapes/assets/tools/physics/sliders/density-label.svg
new file mode 100644
index 0000000000..ec5fd5cf98
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/physics/sliders/density-label.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="241px" height="48px" viewBox="0 0 241 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>DENSITY</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Physics-Tool" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Physics---Default" transform="translate(-2016.000000, -2154.000000)" fill="#FFFFFF">
+            <path d="M2028.452,2155.712 C2040.164,2155.712 2051.3,2159.36 2051.3,2177.664 C2051.3,2195.52 2040.42,2200 2029.54,2200 L2016.868,2200 L2016.868,2155.712 L2028.452,2155.712 Z M2026.276,2162.624 L2026.276,2193.088 L2030.116,2193.088 C2036.58,2193.088 2041.508,2190.08 2041.508,2177.664 C2041.508,2164.992 2036.324,2162.624 2029.924,2162.624 L2026.276,2162.624 Z M2083.876,2162.56 L2084.9,2155.712 L2058.468,2155.712 L2058.468,2200 L2085.028,2200 L2085.028,2193.088 L2067.876,2193.088 L2067.876,2180.864 L2081.828,2180.864 L2081.828,2174.08 L2067.876,2174.08 L2067.876,2162.56 L2083.876,2162.56 Z M2125.668,2200 L2125.668,2155.712 L2117.156,2155.712 L2117.156,2175.168 C2117.156,2181.76 2117.988,2187.904 2118.436,2190.912 L2104.1,2155.712 L2092.26,2155.712 L2092.26,2200 L2100.772,2200 L2100.772,2182.784 C2100.772,2174.592 2100.004,2168.832 2099.492,2164.864 L2113.572,2200 L2125.668,2200 Z M2148.516,2154.688 C2139.556,2154.688 2133.028,2159.616 2133.028,2167.168 C2133.028,2173.888 2136.868,2177.728 2146.468,2180.736 C2153.188,2182.784 2154.916,2184.32 2154.916,2187.84 C2154.916,2191.744 2151.844,2193.92 2147.3,2193.92 C2142.756,2193.92 2139.172,2192.256 2136.1,2189.44 L2131.172,2194.816 C2134.82,2198.4 2140.196,2201.024 2147.556,2201.024 C2158.308,2201.024 2164.708,2195.328 2164.708,2187.2 C2164.708,2179.008 2159.588,2175.68 2151.588,2173.12 C2144.356,2170.88 2142.692,2169.6 2142.692,2166.528 C2142.692,2163.392 2145.316,2161.728 2149.156,2161.728 C2152.74,2161.728 2155.812,2162.88 2158.884,2165.504 L2163.428,2160.256 C2159.588,2156.672 2155.108,2154.688 2148.516,2154.688 Z M2180.644,2200 L2180.644,2155.712 L2171.172,2155.712 L2171.172,2200 L2180.644,2200 Z M2218.34,2163.072 L2207.14,2163.072 L2207.14,2200 L2197.732,2200 L2197.732,2163.072 L2185.956,2163.072 L2185.956,2155.712 L2219.364,2155.712 L2218.34,2163.072 Z M2242.852,2183.296 L2242.852,2200 L2233.444,2200 L2233.444,2183.36 L2219.236,2155.712 L2229.54,2155.712 L2238.372,2175.808 L2247.14,2155.712 L2257.06,2155.712 L2242.852,2183.296 Z" id="DENSITY"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/physics/sliders/friction-label.svg b/unpublishedScripts/marketplace/shapes/assets/tools/physics/sliders/friction-label.svg
new file mode 100644
index 0000000000..2ff20a71cb
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/physics/sliders/friction-label.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="258px" height="48px" viewBox="0 0 258 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>FRICTION</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Physics-Tool" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Physics---Default" transform="translate(-1632.000000, -2154.000000)" fill="#FFFFFF">
+            <path d="M1657.448,2162.56 L1658.472,2155.712 L1632.744,2155.712 L1632.744,2200 L1642.152,2200 L1642.152,2181.952 L1655.464,2181.952 L1655.464,2175.104 L1642.152,2175.104 L1642.152,2162.56 L1657.448,2162.56 Z M1678.184,2182.656 L1673.384,2182.656 L1673.384,2200 L1663.976,2200 L1663.976,2155.712 L1677.8,2155.712 C1689.64,2155.712 1695.656,2160 1695.656,2168.96 C1695.656,2174.848 1692.776,2178.368 1686.888,2180.928 L1698.344,2200 L1687.656,2200 L1678.184,2182.656 Z M1673.384,2176 L1678.312,2176 C1683.24,2176 1685.928,2173.952 1685.928,2168.96 C1685.928,2164.416 1683.304,2162.432 1677.608,2162.432 L1673.384,2162.432 L1673.384,2176 Z M1712.744,2200 L1712.744,2155.712 L1703.272,2155.712 L1703.272,2200 L1712.744,2200 Z M1739.432,2154.688 C1728.36,2154.688 1719.848,2162.88 1719.848,2177.792 C1719.848,2192.896 1727.912,2201.024 1739.688,2201.024 C1745.832,2201.024 1750.504,2198.336 1753.32,2195.456 L1748.968,2189.888 C1746.408,2191.872 1743.848,2193.6 1740.136,2193.6 C1734.056,2193.6 1729.768,2188.928 1729.768,2177.792 C1729.768,2166.272 1734.12,2161.792 1740.008,2161.792 C1743.08,2161.792 1745.64,2162.88 1748.072,2164.992 L1752.808,2159.488 C1749.16,2156.416 1745.32,2154.688 1739.432,2154.688 Z M1786.984,2163.072 L1788.008,2155.712 L1754.6,2155.712 L1754.6,2163.072 L1766.376,2163.072 L1766.376,2200 L1775.784,2200 L1775.784,2163.072 L1786.984,2163.072 Z M1802.28,2200 L1802.28,2155.712 L1792.808,2155.712 L1792.808,2200 L1802.28,2200 Z M1829.096,2154.688 C1841.256,2154.688 1848.744,2163.008 1848.744,2177.856 C1848.744,2192.384 1841.256,2201.024 1829.096,2201.024 C1816.936,2201.024 1809.384,2192.64 1809.384,2177.856 C1809.384,2163.392 1816.936,2154.688 1829.096,2154.688 Z M1829.096,2161.728 C1822.824,2161.728 1819.304,2166.272 1819.304,2177.856 C1819.304,2189.44 1822.952,2193.984 1829.096,2193.984 C1835.432,2193.984 1838.824,2189.44 1838.824,2177.856 C1838.824,2166.272 1835.432,2161.728 1829.096,2161.728 Z M1889.256,2200 L1889.256,2155.712 L1880.744,2155.712 L1880.744,2175.168 C1880.744,2181.76 1881.576,2187.904 1882.024,2190.912 L1867.688,2155.712 L1855.848,2155.712 L1855.848,2200 L1864.36,2200 L1864.36,2182.784 C1864.36,2174.592 1863.592,2168.832 1863.08,2164.864 L1877.16,2200 L1889.256,2200 Z" id="FRICTION"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/physics/sliders/gravity-label.svg b/unpublishedScripts/marketplace/shapes/assets/tools/physics/sliders/gravity-label.svg
new file mode 100644
index 0000000000..692a4ebf79
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/physics/sliders/gravity-label.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="240px" height="48px" viewBox="0 0 240 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>GRAVITY</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Physics-Tool" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Physics---Default" transform="translate(-894.000000, -2154.000000)" fill="#FFFFFF">
+            <path d="M915.336,2154.688 C904.008,2154.688 894.664,2162.816 894.664,2177.792 C894.664,2193.024 901.512,2201.024 914.312,2201.024 C920.264,2201.024 925.704,2199.296 930.12,2196.544 L930.12,2174.72 L913.8,2174.72 L914.76,2181.568 L920.968,2181.568 L920.968,2192.384 C918.984,2193.472 916.744,2193.984 914.376,2193.984 C907.848,2193.984 904.52,2189.696 904.52,2177.856 C904.52,2166.336 909.512,2161.664 915.784,2161.664 C919.432,2161.664 921.928,2162.816 924.808,2165.184 L929.864,2160 C926.152,2156.8 921.672,2154.688 915.336,2154.688 Z M952.136,2182.656 L947.336,2182.656 L947.336,2200 L937.928,2200 L937.928,2155.712 L951.752,2155.712 C963.592,2155.712 969.608,2160 969.608,2168.96 C969.608,2174.848 966.728,2178.368 960.84,2180.928 L972.296,2200 L961.608,2200 L952.136,2182.656 Z M947.336,2176 L952.264,2176 C957.192,2176 959.88,2173.952 959.88,2168.96 C959.88,2164.416 957.256,2162.432 951.56,2162.432 L947.336,2162.432 L947.336,2176 Z M998.152,2190.08 L984.264,2190.08 L981.768,2200 L971.976,2200 L985.608,2155.712 L997.064,2155.712 L1010.632,2200 L1000.648,2200 L998.152,2190.08 Z M996.36,2183.104 L991.176,2162.688 L986.056,2183.104 L996.36,2183.104 Z M1031.24,2200 L1019.784,2200 L1006.6,2155.712 L1016.648,2155.712 L1025.672,2192.192 L1034.376,2155.712 L1043.976,2155.712 L1031.24,2200 Z M1057.608,2200 L1057.608,2155.712 L1048.136,2155.712 L1048.136,2200 L1057.608,2200 Z M1095.304,2163.072 L1084.104,2163.072 L1084.104,2200 L1074.696,2200 L1074.696,2163.072 L1062.92,2163.072 L1062.92,2155.712 L1096.328,2155.712 L1095.304,2163.072 Z M1119.816,2183.296 L1119.816,2200 L1110.408,2200 L1110.408,2183.36 L1096.2,2155.712 L1106.504,2155.712 L1115.336,2175.808 L1124.104,2155.712 L1134.024,2155.712 L1119.816,2183.296 Z" id="GRAVITY"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/redo-icon.svg b/unpublishedScripts/marketplace/shapes/assets/tools/redo-icon.svg
new file mode 100644
index 0000000000..bd0cea1330
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/redo-icon.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="180" height="186" viewBox="0 0 180.00 186.00" enable-background="new 0 0 180.00 186.00" xml:space="preserve">
+	<g>
+		<path fill="#AFAFAF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 37.7352,146.571C 43.834,141.827 44.3355,136.23 39.2396,129.779C 28.7497,117.229 23.9249,102.741 24.7652,86.3146C 25.6054,69.8885 31.9617,55.7393 43.834,43.867C 56.3569,31.3442 71.4277,25.0828 89.0464,25.0828C 106.665,25.0828 121.749,31.3577 134.299,43.9077C 148.177,57.7858 154.954,73.0192 154.629,89.6079C 154.276,104.868 146.998,120.63 132.795,136.894L 132.266,121.159C 132.266,113.678 128.201,109.612 120.069,108.961C 117.033,109.287 114.322,110.642 111.937,113.027C 109.227,115.738 108.034,118.611 108.359,121.647L 108.888,165.843C 108.888,167.198 109.227,168.892 109.904,170.925C 111.937,175.669 115.664,178.04 121.085,178.04L 165.81,178.04C 168.52,178.04 171.061,176.854 173.433,174.483C 175.805,172.111 177.153,169.407 177.479,166.371C 177.479,158.24 173.413,154.174 165.281,154.174L 150.075,154.174C 168.696,133.492 178.17,112.146 178.495,90.1365C 179.525,66.7713 170.716,45.7644 152.067,27.1157C 134.801,9.84937 113.97,1.21619 89.5749,1.21619C 65.1798,1.21619 44.349,9.84935 27.0827,27.1157C 10.8193,43.3791 2.17256,62.6919 1.14254,85.0541C 0.112521,107.416 6.72631,127.407 20.9839,145.026C 22.9897,147.736 25.6935,149.261 29.0953,149.6C 32.4971,149.938 35.377,148.929 37.7352,146.571 Z "/>
+	</g>
+</svg>
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/redo-label.svg b/unpublishedScripts/marketplace/shapes/assets/tools/redo-label.svg
new file mode 100644
index 0000000000..19ae558bb9
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/redo-label.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="192" height="59" viewBox="0 0 192.00 59.00" enable-background="new 0 0 192.00 59.00" xml:space="preserve">
+	<g>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 19.9033,35.58L 13.9533,35.58L 13.9533,57.3843L 2.28885,57.3843L 2.28885,1.72698L 19.4323,1.72698C 26.7789,1.72698 32.3033,3.10498 36.0055,5.86099C 39.7077,8.61699 41.5589,12.7799 41.5589,18.3498C 41.5589,22.0438 40.687,25.0704 38.9433,27.4297C 37.1996,29.7891 34.4767,31.7703 30.7745,33.3735L 44.8933,57.3843L 31.6422,57.3843L 19.9033,35.58 Z M 13.9533,27.1136L 20.0645,27.1136C 23.18,27.1136 25.531,26.4091 27.1177,25.0002C 28.7044,23.5912 29.4977,21.3702 29.4977,18.3374C 29.4977,15.5112 28.6651,13.4472 26.9999,12.1457C 25.3348,10.8441 22.7296,10.1933 19.1844,10.1933L 13.9533,10.1933L 13.9533,27.1136 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 82.18,10.1933L 62.3467,10.1933L 62.3467,24.7336L 79.6388,24.7336L 79.6388,33.2L 62.3467,33.2L 62.3467,48.5336L 83.6055,48.5336L 83.6055,57L 50.6822,57L 50.6822,1.72698L 83.4444,1.72698L 82.18,10.1933 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 107.096,1.72698C 115.657,1.72698 122.516,3.68346 127.673,7.59641C 132.829,11.5094 135.408,18.6845 135.408,29.1218C 135.408,39.3442 132.883,46.5462 127.834,50.7277C 122.785,54.9092 116.318,57 108.434,57L 92.7289,57L 92.7289,1.72698L 107.096,1.72698 Z M 104.393,10.1933L 104.393,48.5336L 109.153,48.5336C 113.649,48.5336 117.126,47.1247 119.584,44.3067C 122.043,41.4887 123.272,36.427 123.272,29.1218C 123.272,24.0725 122.65,20.1513 121.407,17.3581C 120.163,14.5649 118.51,12.6725 116.448,11.6808C 114.386,10.6892 111.876,10.1933 108.918,10.1933L 104.393,10.1933 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 165.951,0.933643C 170.975,0.933643 175.314,2.06166 178.967,4.31771C 182.619,6.57375 185.423,9.85245 187.377,14.1538C 189.332,18.4552 190.309,23.6552 190.309,29.754C 190.309,35.7535 189.332,40.9185 187.377,45.2487C 185.423,49.579 182.619,52.8846 178.967,55.1654C 175.314,57.4463 170.975,58.5867 165.951,58.5867C 160.927,58.5867 156.578,57.4586 152.904,55.2026C 149.231,52.9466 146.415,49.6555 144.457,45.3293C 142.498,41.0032 141.519,35.8114 141.519,29.754C 141.519,23.8122 142.511,18.6783 144.494,14.3521C 146.477,10.026 149.308,6.70804 152.985,4.39828C 156.662,2.08852 160.984,0.933643 165.951,0.933643 Z M 165.951,9.4C 161.935,9.4 158.908,11.0156 156.871,14.2468C 154.834,17.478 153.816,22.647 153.816,29.754C 153.816,36.8692 154.846,42.0424 156.908,45.2735C 158.97,48.5047 161.984,50.1203 165.951,50.1203C 169.976,50.1203 172.992,48.5171 175,45.3107C 177.008,42.1043 178.012,36.9188 178.012,29.754C 178.012,22.5974 177.008,17.416 175,14.2096C 172.992,11.0032 169.976,9.4 165.951,9.4 Z "/>
+	</g>
+</svg>
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/stretch-icon.svg b/unpublishedScripts/marketplace/shapes/assets/tools/stretch-icon.svg
new file mode 100644
index 0000000000..dc0547b813
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/stretch-icon.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="167px" height="167px" viewBox="0 0 167 167" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>stretch-icon</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Icons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Tool-Icons" transform="translate(-838.000000, -743.000000)" fill-rule="nonzero" fill="#AFAFAF">
+            <g id="stretch-icon" transform="translate(838.000000, 743.000000)">
+                <path d="M146.5,32 C140.572581,32 136,27.4274194 136,21.5 C136,15.5725806 140.572581,11 146.5,11 C152.427419,11 157,15.5725806 157,21.5 C157,27.4274194 152.427419,32 146.5,32 Z M139,70 L153,70 L153,35 L139,35 L139,70 Z M97,28 L132,28 L132,14 L97,14 L97,28 Z M146.5,94 C140.572581,94 136,89.4274194 136,83.5 C136,77.5725806 140.572581,73 146.5,73 C152.427419,73 157,77.5725806 157,83.5 C157,89.4274194 152.427419,94 146.5,94 Z M146.5,104 C157.98,104 167,94.76 167,83 C167,71.24 157.98,62 146.5,62 C135.02,62 126,71.24 126,83 C126,94.76 135.02,104 146.5,104 Z M83.5,32 C77.5725806,32 73,27.4274194 73,21.5 C73,15.5725806 77.5725806,11 83.5,11 C89.4274194,11 94,15.5725806 94,21.5 C94,27.4274194 89.4274194,32 83.5,32 Z M83,41 C94.76,41 104,31.98 104,20.5 C104,9.02 94.76,0 83,0 C71.24,0 62,9.02 62,20.5 C62,31.98 71.24,41 83,41 Z M139,132 L153,132 L153,97 L139,97 L139,132 Z M35,28 L70,28 L70,14 L35,14 L35,28 Z M83.5,94 C77.5725806,94 73,89.4274194 73,83.5 C73,77.5725806 77.5725806,73 83.5,73 C89.4274194,73 94,77.5725806 94,83.5 C94,89.4274194 89.4274194,94 83.5,94 Z M83,104 C94.76,104 104,94.76 104,83 C104,71.24 94.76,62 83,62 C71.24,62 62,71.24 62,83 C62,94.76 71.24,104 83,104 Z M20.5,32 C14.5725806,32 10,27.4274194 10,21.5 C10,15.5725806 14.5725806,11 20.5,11 C26.4274194,11 31,15.5725806 31,21.5 C31,27.4274194 26.4274194,32 20.5,32 Z M20.5,41 C31.98,41 41,31.98 41,20.5 C41,9.02 31.98,0 20.5,0 C9.02,0 0,9.02 0,20.5 C0,31.98 9.02,41 20.5,41 Z M146.5,167 C157.98,167 167,157.98 167,146.5 C167,135.02 157.98,126 146.5,126 C135.02,126 126,135.02 126,146.5 C126,157.98 135.02,167 146.5,167 Z M97,153 L132,153 L132,139 L97,139 L97,153 Z M14,70 L28,70 L28,35 L14,35 L14,70 Z M83.5,157 C77.5725806,157 73,152.427419 73,146.5 C73,140.572581 77.5725806,136 83.5,136 C89.4274194,136 94,140.572581 94,146.5 C94,152.427419 89.4274194,157 83.5,157 Z M83,167 C94.76,167 104,157.98 104,146.5 C104,135.02 94.76,126 83,126 C71.24,126 62,135.02 62,146.5 C62,157.98 71.24,167 83,167 Z M20.5,94 C14.5725806,94 10,89.4274194 10,83.5 C10,77.5725806 14.5725806,73 20.5,73 C26.4274194,73 31,77.5725806 31,83.5 C31,89.4274194 26.4274194,94 20.5,94 Z M20.5,104 C31.98,104 41,94.76 41,83 C41,71.24 31.98,62 20.5,62 C9.02,62 0,71.24 0,83 C0,94.76 9.02,104 20.5,104 Z M35,153 L70,153 L70,139 L35,139 L35,153 Z M14,132 L28,132 L28,97 L14,97 L14,132 Z M20.5,157 C14.5725806,157 10,152.427419 10,146.5 C10,140.572581 14.5725806,136 20.5,136 C26.4274194,136 31,140.572581 31,146.5 C31,152.427419 26.4274194,157 20.5,157 Z M20.5,167 C31.98,167 41,157.98 41,146.5 C41,135.02 31.98,126 20.5,126 C9.02,126 0,135.02 0,146.5 C0,157.98 9.02,167 20.5,167 Z M146.5,41 C157.98,41 167,31.98 167,20.5 C167,9.02 157.98,0 146.5,0 C135.02,0 126,9.02 126,20.5 C126,31.98 135.02,41 146.5,41 Z"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/stretch-label.svg b/unpublishedScripts/marketplace/shapes/assets/tools/stretch-label.svg
new file mode 100644
index 0000000000..0aecd01a84
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/stretch-label.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="311px" height="59px" viewBox="0 0 311 59" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>STRETCH</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Tool-Palette" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Tool-Palette---Default" transform="translate(-762.000000, -983.000000)" fill="#FFFFFF">
+            <path d="M783.92,983.36 C772.72,983.36 764.56,989.52 764.56,998.96 C764.56,1007.36 769.36,1012.16 781.36,1015.92 C789.76,1018.48 791.92,1020.4 791.92,1024.8 C791.92,1029.68 788.08,1032.4 782.4,1032.4 C776.72,1032.4 772.24,1030.32 768.4,1026.8 L762.24,1033.52 C766.8,1038 773.52,1041.28 782.72,1041.28 C796.16,1041.28 804.16,1034.16 804.16,1024 C804.16,1013.76 797.76,1009.6 787.76,1006.4 C778.72,1003.6 776.64,1002 776.64,998.16 C776.64,994.24 779.92,992.16 784.72,992.16 C789.2,992.16 793.04,993.6 796.88,996.88 L802.56,990.32 C797.76,985.84 792.16,983.36 783.92,983.36 Z M846.88,993.84 L848.16,984.64 L806.4,984.64 L806.4,993.84 L821.12,993.84 L821.12,1040 L832.88,1040 L832.88,993.84 L846.88,993.84 Z M871.92,1018.32 L865.92,1018.32 L865.92,1040 L854.16,1040 L854.16,984.64 L871.44,984.64 C886.24,984.64 893.76,990 893.76,1001.2 C893.76,1008.56 890.16,1012.96 882.8,1016.16 L897.12,1040 L883.76,1040 L871.92,1018.32 Z M865.92,1010 L872.08,1010 C878.24,1010 881.6,1007.44 881.6,1001.2 C881.6,995.52 878.32,993.04 871.2,993.04 L865.92,993.04 L865.92,1010 Z M935.04,993.2 L936.32,984.64 L903.28,984.64 L903.28,1040 L936.48,1040 L936.48,1031.36 L915.04,1031.36 L915.04,1016.08 L932.48,1016.08 L932.48,1007.6 L915.04,1007.6 L915.04,993.2 L935.04,993.2 Z M980.96,993.84 L982.24,984.64 L940.48,984.64 L940.48,993.84 L955.2,993.84 L955.2,1040 L966.96,1040 L966.96,993.84 L980.96,993.84 Z M1007.12,983.36 C993.28,983.36 982.64,993.6 982.64,1012.24 C982.64,1031.12 992.72,1041.28 1007.44,1041.28 C1015.12,1041.28 1020.96,1037.92 1024.48,1034.32 L1019.04,1027.36 C1015.84,1029.84 1012.64,1032 1008,1032 C1000.4,1032 995.04,1026.16 995.04,1012.24 C995.04,997.84 1000.48,992.24 1007.84,992.24 C1011.68,992.24 1014.88,993.6 1017.92,996.24 L1023.84,989.36 C1019.28,985.52 1014.48,983.36 1007.12,983.36 Z M1061.2,1015.76 L1061.2,1040 L1072.96,1040 L1072.96,984.64 L1061.2,984.64 L1061.2,1006.48 L1042.88,1006.48 L1042.88,984.64 L1031.12,984.64 L1031.12,1040 L1042.88,1040 L1042.88,1015.76 L1061.2,1015.76 Z" id="STRETCH"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/stretch-tool-heading.svg b/unpublishedScripts/marketplace/shapes/assets/tools/stretch-tool-heading.svg
new file mode 100644
index 0000000000..0d3fde298c
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/stretch-tool-heading.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="737px" height="82px" viewBox="0 0 737 82" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>STRETCH TOOL</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Stretch-Tool" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Stretch---Default" transform="translate(-832.000000, -200.000000)" fill="#FFFFFF">
+            <path d="M862.484,200.704 C846.804,200.704 835.38,209.328 835.38,222.544 C835.38,234.304 842.1,241.024 858.9,246.288 C870.66,249.872 873.684,252.56 873.684,258.72 C873.684,265.552 868.308,269.36 860.356,269.36 C852.404,269.36 846.132,266.448 840.756,261.52 L832.132,270.928 C838.516,277.2 847.924,281.792 860.804,281.792 C879.62,281.792 890.82,271.824 890.82,257.6 C890.82,243.264 881.86,237.44 867.86,232.96 C855.204,229.04 852.292,226.8 852.292,221.424 C852.292,215.936 856.884,213.024 863.604,213.024 C869.876,213.024 875.252,215.04 880.628,219.632 L888.58,210.448 C881.86,204.176 874.02,200.704 862.484,200.704 Z M950.628,215.376 L952.42,202.496 L893.956,202.496 L893.956,215.376 L914.564,215.376 L914.564,280 L931.028,280 L931.028,215.376 L950.628,215.376 Z M985.684,249.648 L977.284,249.648 L977.284,280 L960.82,280 L960.82,202.496 L985.012,202.496 C1005.732,202.496 1016.26,210 1016.26,225.68 C1016.26,235.984 1011.22,242.144 1000.916,246.624 L1020.964,280 L1002.26,280 L985.684,249.648 Z M977.284,238 L985.908,238 C994.532,238 999.236,234.416 999.236,225.68 C999.236,217.728 994.644,214.256 984.676,214.256 L977.284,214.256 L977.284,238 Z M1074.052,214.48 L1075.844,202.496 L1029.588,202.496 L1029.588,280 L1076.068,280 L1076.068,267.904 L1046.052,267.904 L1046.052,246.512 L1070.468,246.512 L1070.468,234.64 L1046.052,234.64 L1046.052,214.48 L1074.052,214.48 Z M1138.34,215.376 L1140.132,202.496 L1081.668,202.496 L1081.668,215.376 L1102.276,215.376 L1102.276,280 L1118.74,280 L1118.74,215.376 L1138.34,215.376 Z M1174.964,200.704 C1155.588,200.704 1140.692,215.04 1140.692,241.136 C1140.692,267.568 1154.804,281.792 1175.412,281.792 C1186.164,281.792 1194.34,277.088 1199.268,272.048 L1191.652,262.304 C1187.172,265.776 1182.692,268.8 1176.196,268.8 C1165.556,268.8 1158.052,260.624 1158.052,241.136 C1158.052,220.976 1165.668,213.136 1175.972,213.136 C1181.348,213.136 1185.828,215.04 1190.084,218.736 L1198.372,209.104 C1191.988,203.728 1185.268,200.704 1174.964,200.704 Z M1250.676,246.064 L1250.676,280 L1267.14,280 L1267.14,202.496 L1250.676,202.496 L1250.676,233.072 L1225.028,233.072 L1225.028,202.496 L1208.564,202.496 L1208.564,280 L1225.028,280 L1225.028,246.064 L1250.676,246.064 Z M1360.436,215.376 L1362.228,202.496 L1303.764,202.496 L1303.764,215.376 L1324.372,215.376 L1324.372,280 L1340.836,280 L1340.836,215.376 L1360.436,215.376 Z M1397.284,200.704 C1418.564,200.704 1431.668,215.264 1431.668,241.248 C1431.668,266.672 1418.564,281.792 1397.284,281.792 C1376.004,281.792 1362.788,267.12 1362.788,241.248 C1362.788,215.936 1376.004,200.704 1397.284,200.704 Z M1397.284,213.024 C1386.308,213.024 1380.148,220.976 1380.148,241.248 C1380.148,261.52 1386.532,269.472 1397.284,269.472 C1408.372,269.472 1414.308,261.52 1414.308,241.248 C1414.308,220.976 1408.372,213.024 1397.284,213.024 Z M1474.676,200.704 C1495.956,200.704 1509.06,215.264 1509.06,241.248 C1509.06,266.672 1495.956,281.792 1474.676,281.792 C1453.396,281.792 1440.18,267.12 1440.18,241.248 C1440.18,215.936 1453.396,200.704 1474.676,200.704 Z M1474.676,213.024 C1463.7,213.024 1457.54,220.976 1457.54,241.248 C1457.54,261.52 1463.924,269.472 1474.676,269.472 C1485.764,269.472 1491.7,261.52 1491.7,241.248 C1491.7,220.976 1485.764,213.024 1474.676,213.024 Z M1537.956,266.784 L1537.956,202.496 L1521.492,202.496 L1521.492,280 L1566.852,280 L1568.644,266.784 L1537.956,266.784 Z" id="STRETCH-TOOL"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/stretch/info-text.svg b/unpublishedScripts/marketplace/shapes/assets/tools/stretch/info-text.svg
new file mode 100644
index 0000000000..4bd23f7b7f
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/stretch/info-text.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="1340px" height="301px" viewBox="0 0 1340 301" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>Stretch objects by g</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Stretch-Tool" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Stretch---Default" transform="translate(-681.000000, -1873.000000)" fill="#FFFFFF">
+            <path d="M711.448,1883.072 C710.167994,1881.62133 708.450677,1880.448 706.296,1879.552 C704.141323,1878.656 701.720013,1878.208 699.032,1878.208 C694.978646,1878.208 692.034676,1878.96533 690.2,1880.48 C688.365324,1881.99467 687.448,1884.05332 687.448,1886.656 C687.448,1888.02134 687.693331,1889.14133 688.184,1890.016 C688.674669,1890.89067 689.442661,1891.648 690.488,1892.288 C691.533339,1892.928 692.855992,1893.48266 694.456,1893.952 C696.056008,1894.42134 697.943989,1894.89066 700.12,1895.36 C702.552012,1895.872 704.72799,1896.43733 706.648,1897.056 C708.56801,1897.67467 710.21066,1898.464 711.576,1899.424 C712.94134,1900.384 713.986663,1901.55733 714.712,1902.944 C715.437337,1904.33067 715.8,1906.04799 715.8,1908.096 C715.8,1910.18668 715.394671,1911.99999 714.584,1913.536 C713.773329,1915.07201 712.642674,1916.35199 711.192,1917.376 C709.741326,1918.40001 708.013343,1919.15733 706.008,1919.648 C704.002657,1920.13867 701.826678,1920.384 699.48,1920.384 C692.354631,1920.384 686.274692,1918.18669 681.24,1913.792 L683.416,1910.144 C685.080008,1911.89334 687.319986,1913.37599 690.136,1914.592 C692.952014,1915.80801 696.087983,1916.416 699.544,1916.416 C703.170685,1916.416 706.00799,1915.76534 708.056,1914.464 C710.10401,1913.16266 711.128,1911.18935 711.128,1908.544 C711.128,1907.13599 710.840003,1905.952 710.264,1904.992 C709.687997,1904.032 708.824006,1903.2 707.672,1902.496 C706.519994,1901.792 705.080009,1901.184 703.352,1900.672 C701.623991,1900.16 699.629345,1899.648 697.368,1899.136 C694.978655,1898.58133 692.888009,1898.00534 691.096,1897.408 C689.303991,1896.81066 687.800006,1896.064 686.584,1895.168 C685.367994,1894.272 684.45067,1893.19467 683.832,1891.936 C683.21333,1890.67733 682.904,1889.13068 682.904,1887.296 C682.904,1885.20532 683.298663,1883.33867 684.088,1881.696 C684.877337,1880.05333 685.98666,1878.68801 687.416,1877.6 C688.84534,1876.51199 690.55199,1875.68 692.536,1875.104 C694.52001,1874.528 696.706655,1874.24 699.096,1874.24 C702.082682,1874.24 704.759988,1874.69866 707.128,1875.616 C709.496012,1876.53334 711.63999,1877.82399 713.56,1879.488 L711.448,1883.072 Z M738.264,1918.4 C738.007999,1918.528 737.634669,1918.69867 737.144,1918.912 C736.653331,1919.12533 736.088003,1919.33867 735.448,1919.552 C734.807997,1919.76533 734.082671,1919.95733 733.272,1920.128 C732.461329,1920.29867 731.608004,1920.384 730.712,1920.384 C729.773329,1920.384 728.877338,1920.256 728.024,1920 C727.170662,1919.744 726.424003,1919.34934 725.784,1918.816 C725.143997,1918.28266 724.632002,1917.61067 724.248,1916.8 C723.863998,1915.98933 723.672,1915.05067 723.672,1913.984 L723.672,1890.112 L719.064,1890.112 L719.064,1886.656 L723.672,1886.656 L723.672,1875.392 L728.024,1875.392 L728.024,1886.656 L735.704,1886.656 L735.704,1890.112 L728.024,1890.112 L728.024,1912.768 C728.109334,1914.00534 728.535996,1914.912 729.304,1915.488 C730.072004,1916.064 730.989328,1916.352 732.056,1916.352 C733.29334,1916.352 734.381329,1916.14934 735.32,1915.744 C736.258671,1915.33866 736.855999,1915.05067 737.112,1914.88 L738.264,1918.4 Z M760.024,1890.496 C757.079985,1890.58133 754.520011,1891.39199 752.344,1892.928 C750.167989,1894.46401 748.632004,1896.57599 747.736,1899.264 L747.736,1920 L743.384,1920 L743.384,1886.656 L747.48,1886.656 L747.48,1894.656 C748.632006,1892.30932 750.146657,1890.35734 752.024,1888.8 C753.901343,1887.24266 755.927989,1886.464 758.104,1886.464 L759.192,1886.464 C759.533335,1886.464 759.810666,1886.48533 760.024,1886.528 L760.024,1890.496 Z M780.44,1920.64 C778.007988,1920.64 775.76801,1920.18134 773.72,1919.264 C771.67199,1918.34666 769.901341,1917.08801 768.408,1915.488 C766.914659,1913.88799 765.752004,1912.04268 764.92,1909.952 C764.087996,1907.86132 763.672,1905.62135 763.672,1903.232 C763.672,1900.88532 764.087996,1898.67734 764.92,1896.608 C765.752004,1894.53866 766.914659,1892.72534 768.408,1891.168 C769.901341,1889.61066 771.661323,1888.37334 773.688,1887.456 C775.714677,1886.53866 777.943988,1886.08 780.376,1886.08 C782.808012,1886.08 785.037323,1886.53866 787.064,1887.456 C789.090677,1888.37334 790.829326,1889.62133 792.28,1891.2 C793.730674,1892.77867 794.861329,1894.59199 795.672,1896.64 C796.482671,1898.68801 796.888,1900.86399 796.888,1903.168 C796.888,1903.50934 796.877333,1903.85066 796.856,1904.192 C796.834667,1904.53334 796.802667,1904.768 796.76,1904.896 L768.28,1904.896 C768.408001,1906.68801 768.823996,1908.34133 769.528,1909.856 C770.232004,1911.37067 771.127995,1912.68266 772.216,1913.792 C773.304005,1914.90134 774.56266,1915.76533 775.992,1916.384 C777.42134,1917.00267 778.946659,1917.312 780.568,1917.312 C781.677339,1917.312 782.765328,1917.16267 783.832,1916.864 C784.898672,1916.56533 785.879996,1916.16 786.776,1915.648 C787.672004,1915.136 788.471996,1914.50667 789.176,1913.76 C789.880004,1913.01333 790.423998,1912.192 790.808,1911.296 L794.584,1912.32 C794.071997,1913.55734 793.346671,1914.67733 792.408,1915.68 C791.469329,1916.68267 790.38134,1917.55733 789.144,1918.304 C787.90666,1919.05067 786.541341,1919.62666 785.048,1920.032 C783.554659,1920.43734 782.018675,1920.64 780.44,1920.64 Z M792.728,1901.568 C792.599999,1899.77599 792.184004,1898.14401 791.48,1896.672 C790.775996,1895.19999 789.880005,1893.93067 788.792,1892.864 C787.703995,1891.79733 786.434674,1890.96534 784.984,1890.368 C783.533326,1889.77066 781.997341,1889.472 780.376,1889.472 C778.754659,1889.472 777.218674,1889.77066 775.768,1890.368 C774.317326,1890.96534 773.048005,1891.79733 771.96,1892.864 C770.871995,1893.93067 769.997337,1895.21066 769.336,1896.704 C768.674663,1898.19734 768.280001,1899.81866 768.152,1901.568 L792.728,1901.568 Z M819.224,1918.4 C818.967999,1918.528 818.594669,1918.69867 818.104,1918.912 C817.613331,1919.12533 817.048003,1919.33867 816.408,1919.552 C815.767997,1919.76533 815.042671,1919.95733 814.232,1920.128 C813.421329,1920.29867 812.568004,1920.384 811.672,1920.384 C810.733329,1920.384 809.837338,1920.256 808.984,1920 C808.130662,1919.744 807.384003,1919.34934 806.744,1918.816 C806.103997,1918.28266 805.592002,1917.61067 805.208,1916.8 C804.823998,1915.98933 804.632,1915.05067 804.632,1913.984 L804.632,1890.112 L800.024,1890.112 L800.024,1886.656 L804.632,1886.656 L804.632,1875.392 L808.984,1875.392 L808.984,1886.656 L816.664,1886.656 L816.664,1890.112 L808.984,1890.112 L808.984,1912.768 C809.069334,1914.00534 809.495996,1914.912 810.264,1915.488 C811.032004,1916.064 811.949328,1916.352 813.016,1916.352 C814.25334,1916.352 815.341329,1916.14934 816.28,1915.744 C817.218671,1915.33866 817.815999,1915.05067 818.072,1914.88 L819.224,1918.4 Z M822.168,1903.232 C822.168,1900.88532 822.573329,1898.66668 823.384,1896.576 C824.194671,1894.48532 825.335993,1892.66134 826.808,1891.104 C828.280007,1889.54666 830.03999,1888.32 832.088,1887.424 C834.13601,1886.528 836.397321,1886.08 838.872,1886.08 C842.029349,1886.08 844.781322,1886.79466 847.128,1888.224 C849.474678,1889.65334 851.245327,1891.58399 852.44,1894.016 L848.216,1895.36 C847.277329,1893.65332 845.976008,1892.32 844.312,1891.36 C842.647992,1890.4 840.79201,1889.92 838.744,1889.92 C837.037325,1889.92 835.448007,1890.26133 833.976,1890.944 C832.503993,1891.62667 831.224005,1892.55466 830.136,1893.728 C829.047995,1894.90134 828.19467,1896.29866 827.576,1897.92 C826.95733,1899.54134 826.648,1901.31199 826.648,1903.232 C826.648,1905.10934 826.967997,1906.87999 827.608,1908.544 C828.248003,1910.20801 829.122661,1911.64799 830.232,1912.864 C831.341339,1914.08001 832.631993,1915.04 834.104,1915.744 C835.576007,1916.448 837.143992,1916.8 838.808,1916.8 C839.874672,1916.8 840.930661,1916.65067 841.976,1916.352 C843.021339,1916.05333 843.991996,1915.63734 844.888,1915.104 C845.784004,1914.57066 846.551997,1913.96267 847.192,1913.28 C847.832003,1912.59733 848.279999,1911.872 848.536,1911.104 L852.76,1912.384 C852.290664,1913.57867 851.608004,1914.67733 850.712,1915.68 C849.815996,1916.68267 848.760006,1917.55733 847.544,1918.304 C846.327994,1919.05067 844.984007,1919.62666 843.512,1920.032 C842.039993,1920.43734 840.514675,1920.64 838.936,1920.64 C836.503988,1920.64 834.26401,1920.18134 832.216,1919.264 C830.16799,1918.34666 828.397341,1917.08801 826.904,1915.488 C825.410659,1913.88799 824.248004,1912.04268 823.416,1909.952 C822.583996,1907.86132 822.168,1905.62135 822.168,1903.232 Z M887.576,1920 L883.224,1920 L883.224,1901.376 C883.224,1897.57865 882.57334,1894.74134 881.272,1892.864 C879.97066,1890.98666 878.061346,1890.048 875.544,1890.048 C874.30666,1890.048 873.080006,1890.29333 871.864,1890.784 C870.647994,1891.27467 869.506672,1891.94666 868.44,1892.8 C867.373328,1893.65334 866.445337,1894.65599 865.656,1895.808 C864.866663,1896.96001 864.280002,1898.21866 863.896,1899.584 L863.896,1920 L859.544,1920 L859.544,1873.28 L863.896,1873.28 L863.896,1894.208 C865.26134,1891.69065 867.117322,1889.70667 869.464,1888.256 C871.810678,1886.80533 874.327987,1886.08 877.016,1886.08 C878.93601,1886.08 880.567993,1886.432 881.912,1887.136 C883.256007,1887.84 884.343996,1888.82133 885.176,1890.08 C886.008004,1891.33867 886.615998,1892.85332 887,1894.624 C887.384002,1896.39468 887.576,1898.34666 887.576,1900.48 L887.576,1920 Z M927.384,1920.64 C924.951988,1920.64 922.722677,1920.18134 920.696,1919.264 C918.669323,1918.34666 916.920007,1917.09867 915.448,1915.52 C913.975993,1913.94133 912.834671,1912.10668 912.024,1910.016 C911.213329,1907.92532 910.808,1905.72801 910.808,1903.424 C910.808,1901.07732 911.223996,1898.85868 912.056,1896.768 C912.888004,1894.67732 914.039993,1892.84267 915.512,1891.264 C916.984007,1889.68533 918.733323,1888.42667 920.76,1887.488 C922.786677,1886.54933 924.994655,1886.08 927.384,1886.08 C929.773345,1886.08 931.981323,1886.54933 934.008,1887.488 C936.034677,1888.42667 937.783993,1889.68533 939.256,1891.264 C940.728007,1892.84267 941.879996,1894.67732 942.712,1896.768 C943.544004,1898.85868 943.96,1901.07732 943.96,1903.424 C943.96,1905.72801 943.544004,1907.92532 942.712,1910.016 C941.879996,1912.10668 940.728007,1913.94133 939.256,1915.52 C937.783993,1917.09867 936.034677,1918.34666 934.008,1919.264 C931.981323,1920.18134 929.773345,1920.64 927.384,1920.64 Z M915.288,1903.488 C915.288,1905.36534 915.59733,1907.10399 916.216,1908.704 C916.83467,1910.30401 917.687995,1911.71199 918.776,1912.928 C919.864005,1914.14401 921.143993,1915.09333 922.616,1915.776 C924.088007,1916.45867 925.655992,1916.8 927.32,1916.8 C928.984008,1916.8 930.551993,1916.448 932.024,1915.744 C933.496007,1915.04 934.786661,1914.08001 935.896,1912.864 C937.005339,1911.64799 937.879997,1910.22934 938.52,1908.608 C939.160003,1906.98666 939.48,1905.23734 939.48,1903.36 C939.48,1901.52532 939.160003,1899.78667 938.52,1898.144 C937.879997,1896.50133 937.005339,1895.07201 935.896,1893.856 C934.786661,1892.63999 933.506674,1891.68 932.056,1890.976 C930.605326,1890.272 929.048008,1889.92 927.384,1889.92 C925.719992,1889.92 924.152007,1890.272 922.68,1890.976 C921.207993,1891.68 919.928005,1892.65066 918.84,1893.888 C917.751995,1895.12534 916.888003,1896.56533 916.248,1898.208 C915.607997,1899.85067 915.288,1901.61066 915.288,1903.488 Z M967.384,1920.64 C964.78132,1920.64 962.370678,1919.97867 960.152,1918.656 C957.933322,1917.33333 956.20534,1915.62668 954.968,1913.536 L954.968,1920 L951.064,1920 L951.064,1873.28 L955.416,1873.28 L955.416,1893.632 C956.909341,1891.37066 958.701323,1889.54667 960.792,1888.16 C962.882677,1886.77333 965.335986,1886.08 968.152,1886.08 C970.456012,1886.08 972.546657,1886.57066 974.424,1887.552 C976.301343,1888.53334 977.89066,1889.84533 979.192,1891.488 C980.49334,1893.13067 981.495996,1894.98666 982.2,1897.056 C982.904004,1899.12534 983.256,1901.24799 983.256,1903.424 C983.256,1905.77068 982.850671,1907.98932 982.04,1910.08 C981.229329,1912.17068 980.10934,1913.99466 978.68,1915.552 C977.25066,1917.10934 975.565343,1918.34666 973.624,1919.264 C971.682657,1920.18134 969.602678,1920.64 967.384,1920.64 Z M966.36,1916.8 C968.194676,1916.8 969.869326,1916.42667 971.384,1915.68 C972.898674,1914.93333 974.199995,1913.93067 975.288,1912.672 C976.376005,1911.41333 977.22933,1909.98401 977.848,1908.384 C978.46667,1906.78399 978.776,1905.13068 978.776,1903.424 C978.776,1901.67466 978.488003,1899.98934 977.912,1898.368 C977.335997,1896.74666 976.525339,1895.30667 975.48,1894.048 C974.434661,1892.78933 973.186674,1891.78667 971.736,1891.04 C970.285326,1890.29333 968.685342,1889.92 966.936,1889.92 C965.613327,1889.92 964.376006,1890.144 963.224,1890.592 C962.071994,1891.04 961.005338,1891.648 960.024,1892.416 C959.042662,1893.184 958.157337,1894.06933 957.368,1895.072 C956.578663,1896.07467 955.928003,1897.13066 955.416,1898.24 L955.416,1908.608 C955.586668,1909.76001 956.04533,1910.83733 956.792,1911.84 C957.53867,1912.84267 958.445328,1913.70666 959.512,1914.432 C960.578672,1915.15734 961.709327,1915.73333 962.904,1916.16 C964.098673,1916.58667 965.250661,1916.8 966.36,1916.8 Z M985.048,1931.584 C983.639993,1931.584 982.31734,1931.392 981.08,1931.008 C979.84266,1930.624 978.733338,1929.984 977.752,1929.088 L979.864,1926.144 C980.54667,1926.74134 981.293329,1927.14667 982.104,1927.36 C982.914671,1927.57333 983.725329,1927.68 984.536,1927.68 C985.304004,1927.68 986.039996,1927.53067 986.744,1927.232 C987.448004,1926.93333 988.077331,1926.51734 988.632,1925.984 C989.186669,1925.45066 989.634665,1924.82134 989.976,1924.096 C990.317335,1923.37066 990.488,1922.58134 990.488,1921.728 L990.488,1886.656 L994.84,1886.656 L994.84,1921.472 C994.84,1922.96534 994.562669,1924.33066 994.008,1925.568 C993.453331,1926.80534 992.717338,1927.872 991.8,1928.768 C990.882662,1929.664 989.837339,1930.35733 988.664,1930.848 C987.490661,1931.33867 986.28534,1931.584 985.048,1931.584 Z M990.488,1879.68 L990.488,1873.28 L994.84,1873.28 L994.84,1879.68 L990.488,1879.68 Z M1018.776,1920.64 C1016.34399,1920.64 1014.10401,1920.18134 1012.056,1919.264 C1010.00799,1918.34666 1008.23734,1917.08801 1006.744,1915.488 C1005.25066,1913.88799 1004.088,1912.04268 1003.256,1909.952 C1002.424,1907.86132 1002.008,1905.62135 1002.008,1903.232 C1002.008,1900.88532 1002.424,1898.67734 1003.256,1896.608 C1004.088,1894.53866 1005.25066,1892.72534 1006.744,1891.168 C1008.23734,1889.61066 1009.99732,1888.37334 1012.024,1887.456 C1014.05068,1886.53866 1016.27999,1886.08 1018.712,1886.08 C1021.14401,1886.08 1023.37332,1886.53866 1025.4,1887.456 C1027.42668,1888.37334 1029.16533,1889.62133 1030.616,1891.2 C1032.06667,1892.77867 1033.19733,1894.59199 1034.008,1896.64 C1034.81867,1898.68801 1035.224,1900.86399 1035.224,1903.168 C1035.224,1903.50934 1035.21333,1903.85066 1035.192,1904.192 C1035.17067,1904.53334 1035.13867,1904.768 1035.096,1904.896 L1006.616,1904.896 C1006.744,1906.68801 1007.16,1908.34133 1007.864,1909.856 C1008.568,1911.37067 1009.46399,1912.68266 1010.552,1913.792 C1011.64001,1914.90134 1012.89866,1915.76533 1014.328,1916.384 C1015.75734,1917.00267 1017.28266,1917.312 1018.904,1917.312 C1020.01334,1917.312 1021.10133,1917.16267 1022.168,1916.864 C1023.23467,1916.56533 1024.216,1916.16 1025.112,1915.648 C1026.008,1915.136 1026.808,1914.50667 1027.512,1913.76 C1028.216,1913.01333 1028.76,1912.192 1029.144,1911.296 L1032.92,1912.32 C1032.408,1913.55734 1031.68267,1914.67733 1030.744,1915.68 C1029.80533,1916.68267 1028.71734,1917.55733 1027.48,1918.304 C1026.24266,1919.05067 1024.87734,1919.62666 1023.384,1920.032 C1021.89066,1920.43734 1020.35467,1920.64 1018.776,1920.64 Z M1031.064,1901.568 C1030.936,1899.77599 1030.52,1898.14401 1029.816,1896.672 C1029.112,1895.19999 1028.21601,1893.93067 1027.128,1892.864 C1026.03999,1891.79733 1024.77067,1890.96534 1023.32,1890.368 C1021.86933,1889.77066 1020.33334,1889.472 1018.712,1889.472 C1017.09066,1889.472 1015.55467,1889.77066 1014.104,1890.368 C1012.65333,1890.96534 1011.38401,1891.79733 1010.296,1892.864 C1009.20799,1893.93067 1008.33334,1895.21066 1007.672,1896.704 C1007.01066,1898.19734 1006.616,1899.81866 1006.488,1901.568 L1031.064,1901.568 Z M1039.576,1903.232 C1039.576,1900.88532 1039.98133,1898.66668 1040.792,1896.576 C1041.60267,1894.48532 1042.74399,1892.66134 1044.216,1891.104 C1045.68801,1889.54666 1047.44799,1888.32 1049.496,1887.424 C1051.54401,1886.528 1053.80532,1886.08 1056.28,1886.08 C1059.43735,1886.08 1062.18932,1886.79466 1064.536,1888.224 C1066.88268,1889.65334 1068.65333,1891.58399 1069.848,1894.016 L1065.624,1895.36 C1064.68533,1893.65332 1063.38401,1892.32 1061.72,1891.36 C1060.05599,1890.4 1058.20001,1889.92 1056.152,1889.92 C1054.44532,1889.92 1052.85601,1890.26133 1051.384,1890.944 C1049.91199,1891.62667 1048.63201,1892.55466 1047.544,1893.728 C1046.45599,1894.90134 1045.60267,1896.29866 1044.984,1897.92 C1044.36533,1899.54134 1044.056,1901.31199 1044.056,1903.232 C1044.056,1905.10934 1044.376,1906.87999 1045.016,1908.544 C1045.656,1910.20801 1046.53066,1911.64799 1047.64,1912.864 C1048.74934,1914.08001 1050.03999,1915.04 1051.512,1915.744 C1052.98401,1916.448 1054.55199,1916.8 1056.216,1916.8 C1057.28267,1916.8 1058.33866,1916.65067 1059.384,1916.352 C1060.42934,1916.05333 1061.4,1915.63734 1062.296,1915.104 C1063.192,1914.57066 1063.96,1913.96267 1064.6,1913.28 C1065.24,1912.59733 1065.688,1911.872 1065.944,1911.104 L1070.168,1912.384 C1069.69866,1913.57867 1069.016,1914.67733 1068.12,1915.68 C1067.224,1916.68267 1066.16801,1917.55733 1064.952,1918.304 C1063.73599,1919.05067 1062.39201,1919.62666 1060.92,1920.032 C1059.44799,1920.43734 1057.92267,1920.64 1056.344,1920.64 C1053.91199,1920.64 1051.67201,1920.18134 1049.624,1919.264 C1047.57599,1918.34666 1045.80534,1917.08801 1044.312,1915.488 C1042.81866,1913.88799 1041.656,1912.04268 1040.824,1909.952 C1039.992,1907.86132 1039.576,1905.62135 1039.576,1903.232 Z M1093.08,1918.4 C1092.824,1918.528 1092.45067,1918.69867 1091.96,1918.912 C1091.46933,1919.12533 1090.904,1919.33867 1090.264,1919.552 C1089.624,1919.76533 1088.89867,1919.95733 1088.088,1920.128 C1087.27733,1920.29867 1086.424,1920.384 1085.528,1920.384 C1084.58933,1920.384 1083.69334,1920.256 1082.84,1920 C1081.98666,1919.744 1081.24,1919.34934 1080.6,1918.816 C1079.96,1918.28266 1079.448,1917.61067 1079.064,1916.8 C1078.68,1915.98933 1078.488,1915.05067 1078.488,1913.984 L1078.488,1890.112 L1073.88,1890.112 L1073.88,1886.656 L1078.488,1886.656 L1078.488,1875.392 L1082.84,1875.392 L1082.84,1886.656 L1090.52,1886.656 L1090.52,1890.112 L1082.84,1890.112 L1082.84,1912.768 C1082.92533,1914.00534 1083.352,1914.912 1084.12,1915.488 C1084.888,1916.064 1085.80533,1916.352 1086.872,1916.352 C1088.10934,1916.352 1089.19733,1916.14934 1090.136,1915.744 C1091.07467,1915.33866 1091.672,1915.05067 1091.928,1914.88 L1093.08,1918.4 Z M1109.4,1920.64 C1106.79732,1920.64 1104.25868,1920.21334 1101.784,1919.36 C1099.30932,1918.50666 1097.17601,1917.26934 1095.384,1915.648 L1097.368,1912.704 C1099.24534,1914.24001 1101.15466,1915.392 1103.096,1916.16 C1105.03734,1916.928 1107.11732,1917.312 1109.336,1917.312 C1112.02401,1917.312 1114.16799,1916.76801 1115.768,1915.68 C1117.36801,1914.59199 1118.168,1913.04534 1118.168,1911.04 C1118.168,1910.10133 1117.95467,1909.32267 1117.528,1908.704 C1117.10133,1908.08533 1116.472,1907.54134 1115.64,1907.072 C1114.808,1906.60266 1113.76267,1906.18667 1112.504,1905.824 C1111.24533,1905.46133 1109.78401,1905.088 1108.12,1904.704 C1106.19999,1904.23466 1104.53601,1903.76534 1103.128,1903.296 C1101.71999,1902.82666 1100.55734,1902.29334 1099.64,1901.696 C1098.72266,1901.09866 1098.04,1900.36267 1097.592,1899.488 C1097.144,1898.61333 1096.92,1897.51467 1096.92,1896.192 C1096.92,1894.52799 1097.25066,1893.05601 1097.912,1891.776 C1098.57334,1890.49599 1099.46933,1889.44 1100.6,1888.608 C1101.73067,1887.776 1103.05333,1887.14667 1104.568,1886.72 C1106.08267,1886.29333 1107.69332,1886.08 1109.4,1886.08 C1111.96001,1886.08 1114.28532,1886.496 1116.376,1887.328 C1118.46668,1888.16 1120.15199,1889.25866 1121.432,1890.624 L1119.32,1893.184 C1118.08266,1891.90399 1116.57868,1890.944 1114.808,1890.304 C1113.03732,1889.664 1111.19201,1889.344 1109.272,1889.344 C1108.11999,1889.344 1107.05334,1889.46133 1106.072,1889.696 C1105.09066,1889.93067 1104.22667,1890.304 1103.48,1890.816 C1102.73333,1891.328 1102.14667,1891.97866 1101.72,1892.768 C1101.29333,1893.55734 1101.08,1894.48533 1101.08,1895.552 C1101.08,1896.448 1101.22933,1897.17333 1101.528,1897.728 C1101.82667,1898.28267 1102.31733,1898.76266 1103,1899.168 C1103.68267,1899.57334 1104.54666,1899.936 1105.592,1900.256 C1106.63734,1900.576 1107.90666,1900.90666 1109.4,1901.248 C1111.53334,1901.76 1113.41066,1902.272 1115.032,1902.784 C1116.65334,1903.296 1118.00799,1903.89333 1119.096,1904.576 C1120.18401,1905.25867 1121.00533,1906.09066 1121.56,1907.072 C1122.11467,1908.05334 1122.392,1909.24799 1122.392,1910.656 C1122.392,1913.72802 1121.21868,1916.15999 1118.872,1917.952 C1116.52532,1919.74401 1113.36802,1920.64 1109.4,1920.64 Z M1162.072,1920.64 C1159.46932,1920.64 1157.05868,1919.97867 1154.84,1918.656 C1152.62132,1917.33333 1150.89334,1915.62668 1149.656,1913.536 L1149.656,1920 L1145.752,1920 L1145.752,1873.28 L1150.104,1873.28 L1150.104,1893.632 C1151.59734,1891.37066 1153.38932,1889.54667 1155.48,1888.16 C1157.57068,1886.77333 1160.02399,1886.08 1162.84,1886.08 C1165.14401,1886.08 1167.23466,1886.57066 1169.112,1887.552 C1170.98934,1888.53334 1172.57866,1889.84533 1173.88,1891.488 C1175.18134,1893.13067 1176.184,1894.98666 1176.888,1897.056 C1177.592,1899.12534 1177.944,1901.24799 1177.944,1903.424 C1177.944,1905.77068 1177.53867,1907.98932 1176.728,1910.08 C1175.91733,1912.17068 1174.79734,1913.99466 1173.368,1915.552 C1171.93866,1917.10934 1170.25334,1918.34666 1168.312,1919.264 C1166.37066,1920.18134 1164.29068,1920.64 1162.072,1920.64 Z M1161.048,1916.8 C1162.88268,1916.8 1164.55733,1916.42667 1166.072,1915.68 C1167.58667,1914.93333 1168.88799,1913.93067 1169.976,1912.672 C1171.06401,1911.41333 1171.91733,1909.98401 1172.536,1908.384 C1173.15467,1906.78399 1173.464,1905.13068 1173.464,1903.424 C1173.464,1901.67466 1173.176,1899.98934 1172.6,1898.368 C1172.024,1896.74666 1171.21334,1895.30667 1170.168,1894.048 C1169.12266,1892.78933 1167.87467,1891.78667 1166.424,1891.04 C1164.97333,1890.29333 1163.37334,1889.92 1161.624,1889.92 C1160.30133,1889.92 1159.06401,1890.144 1157.912,1890.592 C1156.75999,1891.04 1155.69334,1891.648 1154.712,1892.416 C1153.73066,1893.184 1152.84534,1894.06933 1152.056,1895.072 C1151.26666,1896.07467 1150.616,1897.13066 1150.104,1898.24 L1150.104,1908.608 C1150.27467,1909.76001 1150.73333,1910.83733 1151.48,1911.84 C1152.22667,1912.84267 1153.13333,1913.70666 1154.2,1914.432 C1155.26667,1915.15734 1156.39733,1915.73333 1157.592,1916.16 C1158.78667,1916.58667 1159.93866,1916.8 1161.048,1916.8 Z M1185.944,1930.304 C1186.15733,1930.34667 1186.37067,1930.37867 1186.584,1930.4 C1186.79733,1930.42133 1187.01067,1930.432 1187.224,1930.432 C1187.65067,1930.432 1188.10933,1930.38933 1188.6,1930.304 C1189.09067,1930.21867 1189.44267,1930.13333 1189.656,1930.048 C1189.86933,1929.96267 1190.09333,1929.78133 1190.328,1929.504 C1190.56267,1929.22667 1190.86133,1928.736 1191.224,1928.032 C1191.58667,1927.328 1192.04533,1926.34667 1192.6,1925.088 C1193.15467,1923.82933 1193.85866,1922.13334 1194.712,1920 L1180.184,1886.656 L1184.728,1886.656 L1197.08,1915.968 L1208.472,1886.656 L1212.632,1886.656 L1195.288,1929.664 C1194.648,1931.24267 1193.78401,1932.416 1192.696,1933.184 C1191.60799,1933.952 1190.08268,1934.336 1188.12,1934.336 C1187.30933,1934.336 1186.584,1934.272 1185.944,1934.144 L1185.944,1930.304 Z M1246.872,1920.448 C1244.56799,1920.448 1242.46668,1919.968 1240.568,1919.008 C1238.66932,1918.048 1237.02667,1916.77867 1235.64,1915.2 C1234.25333,1913.62133 1233.176,1911.80801 1232.408,1909.76 C1231.64,1907.71199 1231.256,1905.60001 1231.256,1903.424 C1231.256,1901.11999 1231.62933,1898.91201 1232.376,1896.8 C1233.12267,1894.68799 1234.17866,1892.84267 1235.544,1891.264 C1236.90934,1889.68533 1238.54132,1888.42667 1240.44,1887.488 C1242.33868,1886.54933 1244.43999,1886.08 1246.744,1886.08 C1249.60268,1886.08 1252.07732,1886.79466 1254.168,1888.224 C1256.25868,1889.65334 1258.05066,1891.45599 1259.544,1893.632 L1259.544,1886.656 L1263.448,1886.656 L1263.448,1920.128 C1263.448,1922.43201 1263.01067,1924.46932 1262.136,1926.24 C1261.26133,1928.01068 1260.08801,1929.49333 1258.616,1930.688 C1257.14399,1931.88267 1255.40534,1932.77866 1253.4,1933.376 C1251.39466,1933.97334 1249.28268,1934.272 1247.064,1934.272 C1243.26665,1934.272 1240.19468,1933.58934 1237.848,1932.224 C1235.50132,1930.85866 1233.60267,1929.02401 1232.152,1926.72 L1234.84,1924.608 C1236.16267,1926.74134 1237.91199,1928.30933 1240.088,1929.312 C1242.26401,1930.31467 1244.58932,1930.816 1247.064,1930.816 C1248.68534,1930.816 1250.23199,1930.592 1251.704,1930.144 C1253.17601,1929.696 1254.45599,1929.03467 1255.544,1928.16 C1256.63201,1927.28533 1257.496,1926.17601 1258.136,1924.832 C1258.776,1923.48799 1259.096,1921.92001 1259.096,1920.128 L1259.096,1913.536 C1257.77333,1915.66934 1256.01334,1917.35466 1253.816,1918.592 C1251.61866,1919.82934 1249.30401,1920.448 1246.872,1920.448 Z M1248.088,1916.8 C1249.36801,1916.8 1250.62666,1916.56534 1251.864,1916.096 C1253.10134,1915.62666 1254.22133,1914.99734 1255.224,1914.208 C1256.22667,1913.41866 1257.06933,1912.53334 1257.752,1911.552 C1258.43467,1910.57066 1258.88267,1909.56801 1259.096,1908.544 L1259.096,1898.24 C1258.62666,1897.04533 1257.976,1895.93601 1257.144,1894.912 C1256.312,1893.88799 1255.38401,1893.01334 1254.36,1892.288 C1253.33599,1891.56266 1252.23734,1890.98667 1251.064,1890.56 C1249.89066,1890.13333 1248.70667,1889.92 1247.512,1889.92 C1245.63466,1889.92 1243.97067,1890.31466 1242.52,1891.104 C1241.06933,1891.89334 1239.83201,1892.92799 1238.808,1894.208 C1237.78399,1895.48801 1237.00534,1896.93866 1236.472,1898.56 C1235.93866,1900.18134 1235.672,1901.82399 1235.672,1903.488 C1235.672,1905.28001 1235.992,1906.98666 1236.632,1908.608 C1237.272,1910.22934 1238.14666,1911.64799 1239.256,1912.864 C1240.36534,1914.08001 1241.67733,1915.04 1243.192,1915.744 C1244.70667,1916.448 1246.33866,1916.8 1248.088,1916.8 Z M1289.432,1890.496 C1286.48799,1890.58133 1283.92801,1891.39199 1281.752,1892.928 C1279.57599,1894.46401 1278.04,1896.57599 1277.144,1899.264 L1277.144,1920 L1272.792,1920 L1272.792,1886.656 L1276.888,1886.656 L1276.888,1894.656 C1278.04001,1892.30932 1279.55466,1890.35734 1281.432,1888.8 C1283.30934,1887.24266 1285.33599,1886.464 1287.512,1886.464 L1288.6,1886.464 C1288.94134,1886.464 1289.21867,1886.48533 1289.432,1886.528 L1289.432,1890.496 Z M1303.448,1920.64 C1301.74132,1920.64 1300.18401,1920.37334 1298.776,1919.84 C1297.36799,1919.30666 1296.16267,1918.57067 1295.16,1917.632 C1294.15733,1916.69333 1293.37867,1915.60534 1292.824,1914.368 C1292.26933,1913.13066 1291.992,1911.82934 1291.992,1910.464 C1291.992,1908.92799 1292.33333,1907.53067 1293.016,1906.272 C1293.69867,1905.01333 1294.65866,1903.936 1295.896,1903.04 C1297.13334,1902.144 1298.61599,1901.45067 1300.344,1900.96 C1302.07201,1900.46933 1303.98132,1900.224 1306.072,1900.224 C1307.73601,1900.224 1309.44266,1900.37333 1311.192,1900.672 C1312.94134,1900.97067 1314.49866,1901.39733 1315.864,1901.952 L1315.864,1898.944 C1315.864,1895.99999 1315.02134,1893.66401 1313.336,1891.936 C1311.65066,1890.20799 1309.37868,1889.344 1306.52,1889.344 C1304.72799,1889.344 1302.94668,1889.68533 1301.176,1890.368 C1299.40532,1891.05067 1297.60268,1892.03199 1295.768,1893.312 L1294.232,1890.432 C1296.40801,1888.98133 1298.51999,1887.89334 1300.568,1887.168 C1302.61601,1886.44266 1304.74932,1886.08 1306.968,1886.08 C1311.02135,1886.08 1314.24265,1887.25332 1316.632,1889.6 C1319.02135,1891.94668 1320.216,1895.18931 1320.216,1899.328 L1320.216,1914.368 C1320.216,1915.56267 1320.72799,1916.16 1321.752,1916.16 L1321.752,1920 C1321.41066,1920.04267 1321.09067,1920.07467 1320.792,1920.096 C1320.49333,1920.11733 1320.23733,1920.128 1320.024,1920.128 C1319.17066,1920.128 1318.392,1919.872 1317.688,1919.36 C1316.984,1918.848 1316.58933,1918.08001 1316.504,1917.056 L1316.376,1914.432 C1314.92533,1916.39468 1313.01601,1917.91999 1310.648,1919.008 C1308.27999,1920.09601 1305.88001,1920.64 1303.448,1920.64 Z M1304.536,1917.312 C1306.45601,1917.312 1308.36532,1916.896 1310.264,1916.064 C1312.16268,1915.232 1313.66666,1914.09067 1314.776,1912.64 C1315.07467,1912.256 1315.33067,1911.84 1315.544,1911.392 C1315.75733,1910.944 1315.864,1910.528 1315.864,1910.144 L1315.864,1904.704 C1314.41333,1904.14933 1312.89867,1903.72267 1311.32,1903.424 C1309.74133,1903.12533 1308.20534,1902.976 1306.712,1902.976 C1303.59732,1902.976 1301.06934,1903.60533 1299.128,1904.864 C1297.18666,1906.12267 1296.216,1907.86132 1296.216,1910.08 C1296.216,1910.976 1296.38666,1911.85066 1296.728,1912.704 C1297.06934,1913.55734 1297.592,1914.32533 1298.296,1915.008 C1299,1915.69067 1299.86399,1916.24533 1300.888,1916.672 C1301.91201,1917.09867 1303.12799,1917.312 1304.536,1917.312 Z M1346.008,1920.64 C1343.40532,1920.64 1340.99468,1919.97867 1338.776,1918.656 C1336.55732,1917.33333 1334.82934,1915.62668 1333.592,1913.536 L1333.592,1920 L1329.688,1920 L1329.688,1873.28 L1334.04,1873.28 L1334.04,1893.632 C1335.53334,1891.37066 1337.32532,1889.54667 1339.416,1888.16 C1341.50668,1886.77333 1343.95999,1886.08 1346.776,1886.08 C1349.08001,1886.08 1351.17066,1886.57066 1353.048,1887.552 C1354.92534,1888.53334 1356.51466,1889.84533 1357.816,1891.488 C1359.11734,1893.13067 1360.12,1894.98666 1360.824,1897.056 C1361.528,1899.12534 1361.88,1901.24799 1361.88,1903.424 C1361.88,1905.77068 1361.47467,1907.98932 1360.664,1910.08 C1359.85333,1912.17068 1358.73334,1913.99466 1357.304,1915.552 C1355.87466,1917.10934 1354.18934,1918.34666 1352.248,1919.264 C1350.30666,1920.18134 1348.22668,1920.64 1346.008,1920.64 Z M1344.984,1916.8 C1346.81868,1916.8 1348.49333,1916.42667 1350.008,1915.68 C1351.52267,1914.93333 1352.82399,1913.93067 1353.912,1912.672 C1355.00001,1911.41333 1355.85333,1909.98401 1356.472,1908.384 C1357.09067,1906.78399 1357.4,1905.13068 1357.4,1903.424 C1357.4,1901.67466 1357.112,1899.98934 1356.536,1898.368 C1355.96,1896.74666 1355.14934,1895.30667 1354.104,1894.048 C1353.05866,1892.78933 1351.81067,1891.78667 1350.36,1891.04 C1348.90933,1890.29333 1347.30934,1889.92 1345.56,1889.92 C1344.23733,1889.92 1343.00001,1890.144 1341.848,1890.592 C1340.69599,1891.04 1339.62934,1891.648 1338.648,1892.416 C1337.66666,1893.184 1336.78134,1894.06933 1335.992,1895.072 C1335.20266,1896.07467 1334.552,1897.13066 1334.04,1898.24 L1334.04,1908.608 C1334.21067,1909.76001 1334.66933,1910.83733 1335.416,1911.84 C1336.16267,1912.84267 1337.06933,1913.70666 1338.136,1914.432 C1339.20267,1915.15734 1340.33333,1915.73333 1341.528,1916.16 C1342.72267,1916.58667 1343.87466,1916.8 1344.984,1916.8 Z M1385.432,1920.64 C1382.82932,1920.64 1380.41868,1919.97867 1378.2,1918.656 C1375.98132,1917.33333 1374.25334,1915.62668 1373.016,1913.536 L1373.016,1920 L1369.112,1920 L1369.112,1873.28 L1373.464,1873.28 L1373.464,1893.632 C1374.95734,1891.37066 1376.74932,1889.54667 1378.84,1888.16 C1380.93068,1886.77333 1383.38399,1886.08 1386.2,1886.08 C1388.50401,1886.08 1390.59466,1886.57066 1392.472,1887.552 C1394.34934,1888.53334 1395.93866,1889.84533 1397.24,1891.488 C1398.54134,1893.13067 1399.544,1894.98666 1400.248,1897.056 C1400.952,1899.12534 1401.304,1901.24799 1401.304,1903.424 C1401.304,1905.77068 1400.89867,1907.98932 1400.088,1910.08 C1399.27733,1912.17068 1398.15734,1913.99466 1396.728,1915.552 C1395.29866,1917.10934 1393.61334,1918.34666 1391.672,1919.264 C1389.73066,1920.18134 1387.65068,1920.64 1385.432,1920.64 Z M1384.408,1916.8 C1386.24268,1916.8 1387.91733,1916.42667 1389.432,1915.68 C1390.94667,1914.93333 1392.24799,1913.93067 1393.336,1912.672 C1394.42401,1911.41333 1395.27733,1909.98401 1395.896,1908.384 C1396.51467,1906.78399 1396.824,1905.13068 1396.824,1903.424 C1396.824,1901.67466 1396.536,1899.98934 1395.96,1898.368 C1395.384,1896.74666 1394.57334,1895.30667 1393.528,1894.048 C1392.48266,1892.78933 1391.23467,1891.78667 1389.784,1891.04 C1388.33333,1890.29333 1386.73334,1889.92 1384.984,1889.92 C1383.66133,1889.92 1382.42401,1890.144 1381.272,1890.592 C1380.11999,1891.04 1379.05334,1891.648 1378.072,1892.416 C1377.09066,1893.184 1376.20534,1894.06933 1375.416,1895.072 C1374.62666,1896.07467 1373.976,1897.13066 1373.464,1898.24 L1373.464,1908.608 C1373.63467,1909.76001 1374.09333,1910.83733 1374.84,1911.84 C1375.58667,1912.84267 1376.49333,1913.70666 1377.56,1914.432 C1378.62667,1915.15734 1379.75733,1915.73333 1380.952,1916.16 C1382.14667,1916.58667 1383.29866,1916.8 1384.408,1916.8 Z M1408.536,1920 L1408.536,1886.656 L1412.888,1886.656 L1412.888,1920 L1408.536,1920 Z M1408.536,1879.68 L1408.536,1873.28 L1412.888,1873.28 L1412.888,1879.68 L1408.536,1879.68 Z M1450.264,1920 L1445.912,1920 L1445.912,1901.376 C1445.912,1897.40798 1445.33601,1894.52801 1444.184,1892.736 C1443.03199,1890.94399 1441.24001,1890.048 1438.808,1890.048 C1437.52799,1890.048 1436.24801,1890.28266 1434.968,1890.752 C1433.68799,1891.22134 1432.49334,1891.88266 1431.384,1892.736 C1430.27466,1893.58934 1429.304,1894.60266 1428.472,1895.776 C1427.64,1896.94934 1427.01067,1898.21866 1426.584,1899.584 L1426.584,1920 L1422.232,1920 L1422.232,1886.656 L1426.2,1886.656 L1426.2,1894.208 C1426.88267,1893.01333 1427.72533,1891.91467 1428.728,1890.912 C1429.73067,1889.90933 1430.85066,1889.04534 1432.088,1888.32 C1433.32534,1887.59466 1434.63733,1887.04 1436.024,1886.656 C1437.41067,1886.272 1438.85066,1886.08 1440.344,1886.08 C1442.22134,1886.08 1443.78933,1886.42133 1445.048,1887.104 C1446.30667,1887.78667 1447.32,1888.74666 1448.088,1889.984 C1448.856,1891.22134 1449.41066,1892.73599 1449.752,1894.528 C1450.09334,1896.32001 1450.264,1898.30399 1450.264,1900.48 L1450.264,1920 Z M1472.792,1920.448 C1470.48799,1920.448 1468.38668,1919.968 1466.488,1919.008 C1464.58932,1918.048 1462.94667,1916.77867 1461.56,1915.2 C1460.17333,1913.62133 1459.096,1911.80801 1458.328,1909.76 C1457.56,1907.71199 1457.176,1905.60001 1457.176,1903.424 C1457.176,1901.11999 1457.54933,1898.91201 1458.296,1896.8 C1459.04267,1894.68799 1460.09866,1892.84267 1461.464,1891.264 C1462.82934,1889.68533 1464.46132,1888.42667 1466.36,1887.488 C1468.25868,1886.54933 1470.35999,1886.08 1472.664,1886.08 C1475.52268,1886.08 1477.99732,1886.79466 1480.088,1888.224 C1482.17868,1889.65334 1483.97066,1891.45599 1485.464,1893.632 L1485.464,1886.656 L1489.368,1886.656 L1489.368,1920.128 C1489.368,1922.43201 1488.93067,1924.46932 1488.056,1926.24 C1487.18133,1928.01068 1486.00801,1929.49333 1484.536,1930.688 C1483.06399,1931.88267 1481.32534,1932.77866 1479.32,1933.376 C1477.31466,1933.97334 1475.20268,1934.272 1472.984,1934.272 C1469.18665,1934.272 1466.11468,1933.58934 1463.768,1932.224 C1461.42132,1930.85866 1459.52267,1929.02401 1458.072,1926.72 L1460.76,1924.608 C1462.08267,1926.74134 1463.83199,1928.30933 1466.008,1929.312 C1468.18401,1930.31467 1470.50932,1930.816 1472.984,1930.816 C1474.60534,1930.816 1476.15199,1930.592 1477.624,1930.144 C1479.09601,1929.696 1480.37599,1929.03467 1481.464,1928.16 C1482.55201,1927.28533 1483.416,1926.17601 1484.056,1924.832 C1484.696,1923.48799 1485.016,1921.92001 1485.016,1920.128 L1485.016,1913.536 C1483.69333,1915.66934 1481.93334,1917.35466 1479.736,1918.592 C1477.53866,1919.82934 1475.22401,1920.448 1472.792,1920.448 Z M1474.008,1916.8 C1475.28801,1916.8 1476.54666,1916.56534 1477.784,1916.096 C1479.02134,1915.62666 1480.14133,1914.99734 1481.144,1914.208 C1482.14667,1913.41866 1482.98933,1912.53334 1483.672,1911.552 C1484.35467,1910.57066 1484.80267,1909.56801 1485.016,1908.544 L1485.016,1898.24 C1484.54666,1897.04533 1483.896,1895.93601 1483.064,1894.912 C1482.232,1893.88799 1481.30401,1893.01334 1480.28,1892.288 C1479.25599,1891.56266 1478.15734,1890.98667 1476.984,1890.56 C1475.81066,1890.13333 1474.62667,1889.92 1473.432,1889.92 C1471.55466,1889.92 1469.89067,1890.31466 1468.44,1891.104 C1466.98933,1891.89334 1465.75201,1892.92799 1464.728,1894.208 C1463.70399,1895.48801 1462.92534,1896.93866 1462.392,1898.56 C1461.85866,1900.18134 1461.592,1901.82399 1461.592,1903.488 C1461.592,1905.28001 1461.912,1906.98666 1462.552,1908.608 C1463.192,1910.22934 1464.06666,1911.64799 1465.176,1912.864 C1466.28534,1914.08001 1467.59733,1915.04 1469.112,1915.744 C1470.62667,1916.448 1472.25866,1916.8 1474.008,1916.8 Z M1523.928,1920.64 C1522.22132,1920.64 1520.66401,1920.37334 1519.256,1919.84 C1517.84799,1919.30666 1516.64267,1918.57067 1515.64,1917.632 C1514.63733,1916.69333 1513.85867,1915.60534 1513.304,1914.368 C1512.74933,1913.13066 1512.472,1911.82934 1512.472,1910.464 C1512.472,1908.92799 1512.81333,1907.53067 1513.496,1906.272 C1514.17867,1905.01333 1515.13866,1903.936 1516.376,1903.04 C1517.61334,1902.144 1519.09599,1901.45067 1520.824,1900.96 C1522.55201,1900.46933 1524.46132,1900.224 1526.552,1900.224 C1528.21601,1900.224 1529.92266,1900.37333 1531.672,1900.672 C1533.42134,1900.97067 1534.97866,1901.39733 1536.344,1901.952 L1536.344,1898.944 C1536.344,1895.99999 1535.50134,1893.66401 1533.816,1891.936 C1532.13066,1890.20799 1529.85868,1889.344 1527,1889.344 C1525.20799,1889.344 1523.42668,1889.68533 1521.656,1890.368 C1519.88532,1891.05067 1518.08268,1892.03199 1516.248,1893.312 L1514.712,1890.432 C1516.88801,1888.98133 1518.99999,1887.89334 1521.048,1887.168 C1523.09601,1886.44266 1525.22932,1886.08 1527.448,1886.08 C1531.50135,1886.08 1534.72265,1887.25332 1537.112,1889.6 C1539.50135,1891.94668 1540.696,1895.18931 1540.696,1899.328 L1540.696,1914.368 C1540.696,1915.56267 1541.20799,1916.16 1542.232,1916.16 L1542.232,1920 C1541.89066,1920.04267 1541.57067,1920.07467 1541.272,1920.096 C1540.97333,1920.11733 1540.71733,1920.128 1540.504,1920.128 C1539.65066,1920.128 1538.872,1919.872 1538.168,1919.36 C1537.464,1918.848 1537.06933,1918.08001 1536.984,1917.056 L1536.856,1914.432 C1535.40533,1916.39468 1533.49601,1917.91999 1531.128,1919.008 C1528.75999,1920.09601 1526.36001,1920.64 1523.928,1920.64 Z M1525.016,1917.312 C1526.93601,1917.312 1528.84532,1916.896 1530.744,1916.064 C1532.64268,1915.232 1534.14666,1914.09067 1535.256,1912.64 C1535.55467,1912.256 1535.81067,1911.84 1536.024,1911.392 C1536.23733,1910.944 1536.344,1910.528 1536.344,1910.144 L1536.344,1904.704 C1534.89333,1904.14933 1533.37867,1903.72267 1531.8,1903.424 C1530.22133,1903.12533 1528.68534,1902.976 1527.192,1902.976 C1524.07732,1902.976 1521.54934,1903.60533 1519.608,1904.864 C1517.66666,1906.12267 1516.696,1907.86132 1516.696,1910.08 C1516.696,1910.976 1516.86666,1911.85066 1517.208,1912.704 C1517.54934,1913.55734 1518.072,1914.32533 1518.776,1915.008 C1519.48,1915.69067 1520.34399,1916.24533 1521.368,1916.672 C1522.39201,1917.09867 1523.60799,1917.312 1525.016,1917.312 Z M1578.2,1920 L1573.848,1920 L1573.848,1901.376 C1573.848,1897.40798 1573.27201,1894.52801 1572.12,1892.736 C1570.96799,1890.94399 1569.17601,1890.048 1566.744,1890.048 C1565.46399,1890.048 1564.18401,1890.28266 1562.904,1890.752 C1561.62399,1891.22134 1560.42934,1891.88266 1559.32,1892.736 C1558.21066,1893.58934 1557.24,1894.60266 1556.408,1895.776 C1555.576,1896.94934 1554.94667,1898.21866 1554.52,1899.584 L1554.52,1920 L1550.168,1920 L1550.168,1886.656 L1554.136,1886.656 L1554.136,1894.208 C1554.81867,1893.01333 1555.66133,1891.91467 1556.664,1890.912 C1557.66667,1889.90933 1558.78666,1889.04534 1560.024,1888.32 C1561.26134,1887.59466 1562.57333,1887.04 1563.96,1886.656 C1565.34667,1886.272 1566.78666,1886.08 1568.28,1886.08 C1570.15734,1886.08 1571.72533,1886.42133 1572.984,1887.104 C1574.24267,1887.78667 1575.256,1888.74666 1576.024,1889.984 C1576.792,1891.22134 1577.34666,1892.73599 1577.688,1894.528 C1578.02934,1896.32001 1578.2,1898.30399 1578.2,1900.48 L1578.2,1920 Z M1601.048,1920.64 C1598.74399,1920.64 1596.61068,1920.16 1594.648,1919.2 C1592.68532,1918.24 1590.98934,1916.97067 1589.56,1915.392 C1588.13066,1913.81333 1587.02134,1911.98934 1586.232,1909.92 C1585.44266,1907.85066 1585.048,1905.68534 1585.048,1903.424 C1585.048,1901.07732 1585.432,1898.84801 1586.2,1896.736 C1586.968,1894.62399 1588.02399,1892.77867 1589.368,1891.2 C1590.71201,1889.62133 1592.31199,1888.37334 1594.168,1887.456 C1596.02401,1886.53866 1598.06132,1886.08 1600.28,1886.08 C1603.09601,1886.08 1605.59199,1886.81599 1607.768,1888.288 C1609.94401,1889.76001 1611.67199,1891.54132 1612.952,1893.632 L1612.952,1873.28 L1617.304,1873.28 L1617.304,1914.368 C1617.304,1915.56267 1617.81599,1916.16 1618.84,1916.16 L1618.84,1920 C1618.11466,1920.128 1617.53867,1920.192 1617.112,1920.192 C1616.04533,1920.192 1615.17067,1919.88267 1614.488,1919.264 C1613.80533,1918.64533 1613.464,1917.90934 1613.464,1917.056 L1613.464,1913.536 C1612.09866,1915.71201 1610.29601,1917.43999 1608.056,1918.72 C1605.81599,1920.00001 1603.48001,1920.64 1601.048,1920.64 Z M1601.944,1916.8 C1603.05334,1916.8 1604.21599,1916.58667 1605.432,1916.16 C1606.64801,1915.73333 1607.77866,1915.14667 1608.824,1914.4 C1609.86934,1913.65333 1610.776,1912.77867 1611.544,1911.776 C1612.312,1910.77333 1612.78133,1909.69601 1612.952,1908.544 L1612.952,1898.24 C1612.52533,1897.08799 1611.896,1896.01067 1611.064,1895.008 C1610.232,1894.00533 1609.29334,1893.12 1608.248,1892.352 C1607.20266,1891.584 1606.09334,1890.98667 1604.92,1890.56 C1603.74666,1890.13333 1602.58401,1889.92 1601.432,1889.92 C1599.63999,1889.92 1598.00801,1890.304 1596.536,1891.072 C1595.06399,1891.84 1593.81601,1892.85333 1592.792,1894.112 C1591.76799,1895.37067 1590.968,1896.81066 1590.392,1898.432 C1589.816,1900.05334 1589.528,1901.71732 1589.528,1903.424 C1589.528,1905.21601 1589.848,1906.92266 1590.488,1908.544 C1591.128,1910.16534 1592.00266,1911.58399 1593.112,1912.8 C1594.22134,1914.01601 1595.53333,1914.98666 1597.048,1915.712 C1598.56267,1916.43734 1600.19466,1916.8 1601.944,1916.8 Z M1660.568,1920.64 C1657.75199,1920.64 1655.25601,1919.92534 1653.08,1918.496 C1650.90399,1917.06666 1649.15467,1915.26401 1647.832,1913.088 L1647.832,1933.632 L1643.48,1933.632 L1643.48,1886.656 L1647.384,1886.656 L1647.384,1893.12 C1648.74934,1891.02932 1650.51999,1889.33334 1652.696,1888.032 C1654.87201,1886.73066 1657.23999,1886.08 1659.8,1886.08 C1662.10401,1886.08 1664.22666,1886.56 1666.168,1887.52 C1668.10934,1888.48 1669.78399,1889.75999 1671.192,1891.36 C1672.60001,1892.96001 1673.69866,1894.80532 1674.488,1896.896 C1675.27734,1898.98668 1675.672,1901.14132 1675.672,1903.36 C1675.672,1905.70668 1675.30934,1907.92532 1674.584,1910.016 C1673.85866,1912.10668 1672.82401,1913.94133 1671.48,1915.52 C1670.13599,1917.09867 1668.53601,1918.34666 1666.68,1919.264 C1664.82399,1920.18134 1662.78668,1920.64 1660.568,1920.64 Z M1659.352,1916.8 C1661.14401,1916.8 1662.76533,1916.416 1664.216,1915.648 C1665.66667,1914.88 1666.91466,1913.86667 1667.96,1912.608 C1669.00534,1911.34933 1669.80533,1909.92001 1670.36,1908.32 C1670.91467,1906.71999 1671.192,1905.06668 1671.192,1903.36 C1671.192,1901.56799 1670.872,1899.86134 1670.232,1898.24 C1669.592,1896.61866 1668.71734,1895.18934 1667.608,1893.952 C1666.49866,1892.71466 1665.18667,1891.73334 1663.672,1891.008 C1662.15733,1890.28266 1660.52534,1889.92 1658.776,1889.92 C1657.66666,1889.92 1656.51467,1890.144 1655.32,1890.592 C1654.12533,1891.04 1652.99467,1891.63733 1651.928,1892.384 C1650.86133,1893.13067 1649.95467,1894.00533 1649.208,1895.008 C1648.46133,1896.01067 1648.00267,1897.06666 1647.832,1898.176 L1647.832,1908.416 C1648.344,1909.61067 1648.99466,1910.71999 1649.784,1911.744 C1650.57334,1912.76801 1651.46933,1913.65333 1652.472,1914.4 C1653.47467,1915.14667 1654.56266,1915.73333 1655.736,1916.16 C1656.90934,1916.58667 1658.11466,1916.8 1659.352,1916.8 Z M1693.144,1920.64 C1689.64532,1920.64 1687.00001,1919.43468 1685.208,1917.024 C1683.41599,1914.61332 1682.52,1911.01869 1682.52,1906.24 L1682.52,1886.656 L1686.872,1886.656 L1686.872,1905.472 C1686.872,1913.02404 1689.45331,1916.8 1694.616,1916.8 C1695.89601,1916.8 1697.15466,1916.58667 1698.392,1916.16 C1699.62934,1915.73333 1700.77066,1915.11467 1701.816,1914.304 C1702.86134,1913.49333 1703.8,1912.53334 1704.632,1911.424 C1705.464,1910.31466 1706.136,1909.05601 1706.648,1907.648 L1706.648,1886.656 L1711,1886.656 L1711,1914.368 C1711,1915.56267 1711.53333,1916.16 1712.6,1916.16 L1712.6,1920 C1711.74666,1920.128 1711.14934,1920.192 1710.808,1920.192 C1709.82666,1920.192 1708.984,1919.89334 1708.28,1919.296 C1707.576,1918.69866 1707.224,1917.952 1707.224,1917.056 L1707.224,1912.448 C1705.73066,1915.05068 1703.74668,1917.06666 1701.272,1918.496 C1698.79732,1919.92534 1696.08801,1920.64 1693.144,1920.64 Z M1721.048,1873.28 L1725.4,1873.28 L1725.4,1912.448 C1725.4,1913.68534 1725.74133,1914.656 1726.424,1915.36 C1727.10667,1916.064 1728.06666,1916.416 1729.304,1916.416 C1729.77334,1916.416 1730.328,1916.352 1730.968,1916.224 C1731.608,1916.096 1732.20533,1915.92533 1732.76,1915.712 L1733.528,1919.232 C1732.71733,1919.57334 1731.72534,1919.85067 1730.552,1920.064 C1729.37866,1920.27733 1728.36534,1920.384 1727.512,1920.384 C1725.50666,1920.384 1723.92801,1919.81867 1722.776,1918.688 C1721.62399,1917.55733 1721.048,1915.96801 1721.048,1913.92 L1721.048,1873.28 Z M1737.944,1873.28 L1742.296,1873.28 L1742.296,1912.448 C1742.296,1913.68534 1742.63733,1914.656 1743.32,1915.36 C1744.00267,1916.064 1744.96266,1916.416 1746.2,1916.416 C1746.66934,1916.416 1747.224,1916.352 1747.864,1916.224 C1748.504,1916.096 1749.10133,1915.92533 1749.656,1915.712 L1750.424,1919.232 C1749.61333,1919.57334 1748.62134,1919.85067 1747.448,1920.064 C1746.27466,1920.27733 1745.26134,1920.384 1744.408,1920.384 C1742.40266,1920.384 1740.82401,1919.81867 1739.672,1918.688 C1738.51999,1917.55733 1737.944,1915.96801 1737.944,1913.92 L1737.944,1873.28 Z M1754.648,1920 L1754.648,1886.656 L1759,1886.656 L1759,1920 L1754.648,1920 Z M1754.648,1879.68 L1754.648,1873.28 L1759,1873.28 L1759,1879.68 L1754.648,1879.68 Z M1796.376,1920 L1792.024,1920 L1792.024,1901.376 C1792.024,1897.40798 1791.44801,1894.52801 1790.296,1892.736 C1789.14399,1890.94399 1787.35201,1890.048 1784.92,1890.048 C1783.63999,1890.048 1782.36001,1890.28266 1781.08,1890.752 C1779.79999,1891.22134 1778.60534,1891.88266 1777.496,1892.736 C1776.38666,1893.58934 1775.416,1894.60266 1774.584,1895.776 C1773.752,1896.94934 1773.12267,1898.21866 1772.696,1899.584 L1772.696,1920 L1768.344,1920 L1768.344,1886.656 L1772.312,1886.656 L1772.312,1894.208 C1772.99467,1893.01333 1773.83733,1891.91467 1774.84,1890.912 C1775.84267,1889.90933 1776.96266,1889.04534 1778.2,1888.32 C1779.43734,1887.59466 1780.74933,1887.04 1782.136,1886.656 C1783.52267,1886.272 1784.96266,1886.08 1786.456,1886.08 C1788.33334,1886.08 1789.90133,1886.42133 1791.16,1887.104 C1792.41867,1887.78667 1793.432,1888.74666 1794.2,1889.984 C1794.968,1891.22134 1795.52266,1892.73599 1795.864,1894.528 C1796.20534,1896.32001 1796.376,1898.30399 1796.376,1900.48 L1796.376,1920 Z M1818.904,1920.448 C1816.59999,1920.448 1814.49868,1919.968 1812.6,1919.008 C1810.70132,1918.048 1809.05867,1916.77867 1807.672,1915.2 C1806.28533,1913.62133 1805.208,1911.80801 1804.44,1909.76 C1803.672,1907.71199 1803.288,1905.60001 1803.288,1903.424 C1803.288,1901.11999 1803.66133,1898.91201 1804.408,1896.8 C1805.15467,1894.68799 1806.21066,1892.84267 1807.576,1891.264 C1808.94134,1889.68533 1810.57332,1888.42667 1812.472,1887.488 C1814.37068,1886.54933 1816.47199,1886.08 1818.776,1886.08 C1821.63468,1886.08 1824.10932,1886.79466 1826.2,1888.224 C1828.29068,1889.65334 1830.08266,1891.45599 1831.576,1893.632 L1831.576,1886.656 L1835.48,1886.656 L1835.48,1920.128 C1835.48,1922.43201 1835.04267,1924.46932 1834.168,1926.24 C1833.29333,1928.01068 1832.12001,1929.49333 1830.648,1930.688 C1829.17599,1931.88267 1827.43734,1932.77866 1825.432,1933.376 C1823.42666,1933.97334 1821.31468,1934.272 1819.096,1934.272 C1815.29865,1934.272 1812.22668,1933.58934 1809.88,1932.224 C1807.53332,1930.85866 1805.63467,1929.02401 1804.184,1926.72 L1806.872,1924.608 C1808.19467,1926.74134 1809.94399,1928.30933 1812.12,1929.312 C1814.29601,1930.31467 1816.62132,1930.816 1819.096,1930.816 C1820.71734,1930.816 1822.26399,1930.592 1823.736,1930.144 C1825.20801,1929.696 1826.48799,1929.03467 1827.576,1928.16 C1828.66401,1927.28533 1829.528,1926.17601 1830.168,1924.832 C1830.808,1923.48799 1831.128,1921.92001 1831.128,1920.128 L1831.128,1913.536 C1829.80533,1915.66934 1828.04534,1917.35466 1825.848,1918.592 C1823.65066,1919.82934 1821.33601,1920.448 1818.904,1920.448 Z M1820.12,1916.8 C1821.40001,1916.8 1822.65866,1916.56534 1823.896,1916.096 C1825.13334,1915.62666 1826.25333,1914.99734 1827.256,1914.208 C1828.25867,1913.41866 1829.10133,1912.53334 1829.784,1911.552 C1830.46667,1910.57066 1830.91467,1909.56801 1831.128,1908.544 L1831.128,1898.24 C1830.65866,1897.04533 1830.008,1895.93601 1829.176,1894.912 C1828.344,1893.88799 1827.41601,1893.01334 1826.392,1892.288 C1825.36799,1891.56266 1824.26934,1890.98667 1823.096,1890.56 C1821.92266,1890.13333 1820.73867,1889.92 1819.544,1889.92 C1817.66666,1889.92 1816.00267,1890.31466 1814.552,1891.104 C1813.10133,1891.89334 1811.86401,1892.92799 1810.84,1894.208 C1809.81599,1895.48801 1809.03734,1896.93866 1808.504,1898.56 C1807.97066,1900.18134 1807.704,1901.82399 1807.704,1903.488 C1807.704,1905.28001 1808.024,1906.98666 1808.664,1908.608 C1809.304,1910.22934 1810.17866,1911.64799 1811.288,1912.864 C1812.39734,1914.08001 1813.70933,1915.04 1815.224,1915.744 C1816.73867,1916.448 1818.37066,1916.8 1820.12,1916.8 Z M1877.336,1918.4 C1877.08,1918.528 1876.70667,1918.69867 1876.216,1918.912 C1875.72533,1919.12533 1875.16,1919.33867 1874.52,1919.552 C1873.88,1919.76533 1873.15467,1919.95733 1872.344,1920.128 C1871.53333,1920.29867 1870.68,1920.384 1869.784,1920.384 C1868.84533,1920.384 1867.94934,1920.256 1867.096,1920 C1866.24266,1919.744 1865.496,1919.34934 1864.856,1918.816 C1864.216,1918.28266 1863.704,1917.61067 1863.32,1916.8 C1862.936,1915.98933 1862.744,1915.05067 1862.744,1913.984 L1862.744,1890.112 L1858.136,1890.112 L1858.136,1886.656 L1862.744,1886.656 L1862.744,1875.392 L1867.096,1875.392 L1867.096,1886.656 L1874.776,1886.656 L1874.776,1890.112 L1867.096,1890.112 L1867.096,1912.768 C1867.18133,1914.00534 1867.608,1914.912 1868.376,1915.488 C1869.144,1916.064 1870.06133,1916.352 1871.128,1916.352 C1872.36534,1916.352 1873.45333,1916.14934 1874.392,1915.744 C1875.33067,1915.33866 1875.928,1915.05067 1876.184,1914.88 L1877.336,1918.4 Z M1910.488,1920 L1906.136,1920 L1906.136,1901.376 C1906.136,1897.57865 1905.48534,1894.74134 1904.184,1892.864 C1902.88266,1890.98666 1900.97335,1890.048 1898.456,1890.048 C1897.21866,1890.048 1895.99201,1890.29333 1894.776,1890.784 C1893.55999,1891.27467 1892.41867,1891.94666 1891.352,1892.8 C1890.28533,1893.65334 1889.35734,1894.65599 1888.568,1895.808 C1887.77866,1896.96001 1887.192,1898.21866 1886.808,1899.584 L1886.808,1920 L1882.456,1920 L1882.456,1873.28 L1886.808,1873.28 L1886.808,1894.208 C1888.17334,1891.69065 1890.02932,1889.70667 1892.376,1888.256 C1894.72268,1886.80533 1897.23999,1886.08 1899.928,1886.08 C1901.84801,1886.08 1903.47999,1886.432 1904.824,1887.136 C1906.16801,1887.84 1907.256,1888.82133 1908.088,1890.08 C1908.92,1891.33867 1909.528,1892.85332 1909.912,1894.624 C1910.296,1896.39468 1910.488,1898.34666 1910.488,1900.48 L1910.488,1920 Z M1934.104,1920.64 C1931.67199,1920.64 1929.43201,1920.18134 1927.384,1919.264 C1925.33599,1918.34666 1923.56534,1917.08801 1922.072,1915.488 C1920.57866,1913.88799 1919.416,1912.04268 1918.584,1909.952 C1917.752,1907.86132 1917.336,1905.62135 1917.336,1903.232 C1917.336,1900.88532 1917.752,1898.67734 1918.584,1896.608 C1919.416,1894.53866 1920.57866,1892.72534 1922.072,1891.168 C1923.56534,1889.61066 1925.32532,1888.37334 1927.352,1887.456 C1929.37868,1886.53866 1931.60799,1886.08 1934.04,1886.08 C1936.47201,1886.08 1938.70132,1886.53866 1940.728,1887.456 C1942.75468,1888.37334 1944.49333,1889.62133 1945.944,1891.2 C1947.39467,1892.77867 1948.52533,1894.59199 1949.336,1896.64 C1950.14667,1898.68801 1950.552,1900.86399 1950.552,1903.168 C1950.552,1903.50934 1950.54133,1903.85066 1950.52,1904.192 C1950.49867,1904.53334 1950.46667,1904.768 1950.424,1904.896 L1921.944,1904.896 C1922.072,1906.68801 1922.488,1908.34133 1923.192,1909.856 C1923.896,1911.37067 1924.79199,1912.68266 1925.88,1913.792 C1926.96801,1914.90134 1928.22666,1915.76533 1929.656,1916.384 C1931.08534,1917.00267 1932.61066,1917.312 1934.232,1917.312 C1935.34134,1917.312 1936.42933,1917.16267 1937.496,1916.864 C1938.56267,1916.56533 1939.544,1916.16 1940.44,1915.648 C1941.336,1915.136 1942.136,1914.50667 1942.84,1913.76 C1943.544,1913.01333 1944.088,1912.192 1944.472,1911.296 L1948.248,1912.32 C1947.736,1913.55734 1947.01067,1914.67733 1946.072,1915.68 C1945.13333,1916.68267 1944.04534,1917.55733 1942.808,1918.304 C1941.57066,1919.05067 1940.20534,1919.62666 1938.712,1920.032 C1937.21866,1920.43734 1935.68267,1920.64 1934.104,1920.64 Z M1946.392,1901.568 C1946.264,1899.77599 1945.848,1898.14401 1945.144,1896.672 C1944.44,1895.19999 1943.54401,1893.93067 1942.456,1892.864 C1941.36799,1891.79733 1940.09867,1890.96534 1938.648,1890.368 C1937.19733,1889.77066 1935.66134,1889.472 1934.04,1889.472 C1932.41866,1889.472 1930.88267,1889.77066 1929.432,1890.368 C1927.98133,1890.96534 1926.71201,1891.79733 1925.624,1892.864 C1924.53599,1893.93067 1923.66134,1895.21066 1923,1896.704 C1922.33866,1898.19734 1921.944,1899.81866 1921.816,1901.568 L1946.392,1901.568 Z M1957.08,1920 L1957.08,1886.656 L1961.432,1886.656 L1961.432,1920 L1957.08,1920 Z M1957.08,1879.68 L1957.08,1873.28 L1961.432,1873.28 L1961.432,1879.68 L1957.08,1879.68 Z M1987.416,1890.496 C1984.47199,1890.58133 1981.91201,1891.39199 1979.736,1892.928 C1977.55999,1894.46401 1976.024,1896.57599 1975.128,1899.264 L1975.128,1920 L1970.776,1920 L1970.776,1886.656 L1974.872,1886.656 L1974.872,1894.656 C1976.02401,1892.30932 1977.53866,1890.35734 1979.416,1888.8 C1981.29334,1887.24266 1983.31999,1886.464 1985.496,1886.464 L1986.584,1886.464 C1986.92534,1886.464 1987.20267,1886.48533 1987.416,1886.528 L1987.416,1890.496 Z M711.704,2000 L707.352,2000 L707.352,1981.376 C707.352,1977.57865 706.70134,1974.74134 705.4,1972.864 C704.09866,1970.98666 702.189346,1970.048 699.672,1970.048 C698.43466,1970.048 697.208006,1970.29333 695.992,1970.784 C694.775994,1971.27467 693.634672,1971.94666 692.568,1972.8 C691.501328,1973.65334 690.573337,1974.65599 689.784,1975.808 C688.994663,1976.96001 688.408002,1978.21866 688.024,1979.584 L688.024,2000 L683.672,2000 L683.672,1953.28 L688.024,1953.28 L688.024,1974.208 C689.38934,1971.69065 691.245322,1969.70667 693.592,1968.256 C695.938678,1966.80533 698.455987,1966.08 701.144,1966.08 C703.06401,1966.08 704.695993,1966.432 706.04,1967.136 C707.384007,1967.84 708.471996,1968.82133 709.304,1970.08 C710.136004,1971.33867 710.743998,1972.85332 711.128,1974.624 C711.512002,1976.39468 711.704,1978.34666 711.704,1980.48 L711.704,2000 Z M729.56,2000.64 C727.853325,2000.64 726.296007,2000.37334 724.888,1999.84 C723.479993,1999.30666 722.274672,1998.57067 721.272,1997.632 C720.269328,1996.69333 719.490669,1995.60534 718.936,1994.368 C718.381331,1993.13066 718.104,1991.82934 718.104,1990.464 C718.104,1988.92799 718.44533,1987.53067 719.128,1986.272 C719.81067,1985.01333 720.77066,1983.936 722.008,1983.04 C723.24534,1982.144 724.727991,1981.45067 726.456,1980.96 C728.184009,1980.46933 730.093323,1980.224 732.184,1980.224 C733.848008,1980.224 735.554658,1980.37333 737.304,1980.672 C739.053342,1980.97067 740.61066,1981.39733 741.976,1981.952 L741.976,1978.944 C741.976,1975.99999 741.133342,1973.66401 739.448,1971.936 C737.762658,1970.20799 735.490681,1969.344 732.632,1969.344 C730.839991,1969.344 729.058676,1969.68533 727.288,1970.368 C725.517324,1971.05067 723.714676,1972.03199 721.88,1973.312 L720.344,1970.432 C722.520011,1968.98133 724.63199,1967.89334 726.68,1967.168 C728.72801,1966.44266 730.861322,1966.08 733.08,1966.08 C737.133354,1966.08 740.354655,1967.25332 742.744,1969.6 C745.133345,1971.94668 746.328,1975.18931 746.328,1979.328 L746.328,1994.368 C746.328,1995.56267 746.839995,1996.16 747.864,1996.16 L747.864,2000 C747.522665,2000.04267 747.202668,2000.07467 746.904,2000.096 C746.605332,2000.11733 746.349334,2000.128 746.136,2000.128 C745.282662,2000.128 744.504004,1999.872 743.8,1999.36 C743.095996,1998.848 742.701334,1998.08001 742.616,1997.056 L742.488,1994.432 C741.037326,1996.39468 739.128012,1997.91999 736.76,1999.008 C734.391988,2000.09601 731.992012,2000.64 729.56,2000.64 Z M730.648,1997.312 C732.56801,1997.312 734.477324,1996.896 736.376,1996.064 C738.274676,1995.232 739.778661,1994.09067 740.888,1992.64 C741.186668,1992.256 741.442666,1991.84 741.656,1991.392 C741.869334,1990.944 741.976,1990.528 741.976,1990.144 L741.976,1984.704 C740.525326,1984.14933 739.010675,1983.72267 737.432,1983.424 C735.853325,1983.12533 734.317341,1982.976 732.824,1982.976 C729.709318,1982.976 727.181343,1983.60533 725.24,1984.864 C723.298657,1986.12267 722.328,1987.86132 722.328,1990.08 C722.328,1990.976 722.498665,1991.85066 722.84,1992.704 C723.181335,1993.55734 723.703996,1994.32533 724.408,1995.008 C725.112004,1995.69067 725.975995,1996.24533 727,1996.672 C728.024005,1997.09867 729.239993,1997.312 730.648,1997.312 Z M783.832,2000 L779.48,2000 L779.48,1981.376 C779.48,1977.40798 778.904006,1974.52801 777.752,1972.736 C776.599994,1970.94399 774.808012,1970.048 772.376,1970.048 C771.095994,1970.048 769.816006,1970.28266 768.536,1970.752 C767.255994,1971.22134 766.061339,1971.88266 764.952,1972.736 C763.842661,1973.58934 762.872004,1974.60266 762.04,1975.776 C761.207996,1976.94934 760.578669,1978.21866 760.152,1979.584 L760.152,2000 L755.8,2000 L755.8,1966.656 L759.768,1966.656 L759.768,1974.208 C760.45067,1973.01333 761.293328,1971.91467 762.296,1970.912 C763.298672,1969.90933 764.41866,1969.04534 765.656,1968.32 C766.89334,1967.59466 768.205326,1967.04 769.592,1966.656 C770.978674,1966.272 772.418659,1966.08 773.912,1966.08 C775.789343,1966.08 777.357327,1966.42133 778.616,1967.104 C779.874673,1967.78667 780.887996,1968.74666 781.656,1969.984 C782.424004,1971.22134 782.978665,1972.73599 783.32,1974.528 C783.661335,1976.32001 783.832,1978.30399 783.832,1980.48 L783.832,2000 Z M806.68,2000.64 C804.375988,2000.64 802.242676,2000.16 800.28,1999.2 C798.317324,1998.24 796.62134,1996.97067 795.192,1995.392 C793.76266,1993.81333 792.653337,1991.98934 791.864,1989.92 C791.074663,1987.85066 790.68,1985.68534 790.68,1983.424 C790.68,1981.07732 791.063996,1978.84801 791.832,1976.736 C792.600004,1974.62399 793.655993,1972.77867 795,1971.2 C796.344007,1969.62133 797.943991,1968.37334 799.8,1967.456 C801.656009,1966.53866 803.693322,1966.08 805.912,1966.08 C808.728014,1966.08 811.223989,1966.81599 813.4,1968.288 C815.576011,1969.76001 817.303994,1971.54132 818.584,1973.632 L818.584,1953.28 L822.936,1953.28 L822.936,1994.368 C822.936,1995.56267 823.447995,1996.16 824.472,1996.16 L824.472,2000 C823.746663,2000.128 823.170669,2000.192 822.744,2000.192 C821.677328,2000.192 820.80267,1999.88267 820.12,1999.264 C819.43733,1998.64533 819.096,1997.90934 819.096,1997.056 L819.096,1993.536 C817.73066,1995.71201 815.928011,1997.43999 813.688,1998.72 C811.447989,2000.00001 809.112012,2000.64 806.68,2000.64 Z M807.576,1996.8 C808.685339,1996.8 809.847994,1996.58667 811.064,1996.16 C812.280006,1995.73333 813.410661,1995.14667 814.456,1994.4 C815.501339,1993.65333 816.407996,1992.77867 817.176,1991.776 C817.944004,1990.77333 818.413332,1989.69601 818.584,1988.544 L818.584,1978.24 C818.157331,1977.08799 817.528004,1976.01067 816.696,1975.008 C815.863996,1974.00533 814.925339,1973.12 813.88,1972.352 C812.834661,1971.584 811.725339,1970.98667 810.552,1970.56 C809.378661,1970.13333 808.216006,1969.92 807.064,1969.92 C805.271991,1969.92 803.640007,1970.304 802.168,1971.072 C800.695993,1971.84 799.448005,1972.85333 798.424,1974.112 C797.399995,1975.37067 796.600003,1976.81066 796.024,1978.432 C795.447997,1980.05334 795.16,1981.71732 795.16,1983.424 C795.16,1985.21601 795.479997,1986.92266 796.12,1988.544 C796.760003,1990.16534 797.634661,1991.58399 798.744,1992.8 C799.853339,1994.01601 801.165326,1994.98666 802.68,1995.712 C804.194674,1996.43734 805.826658,1996.8 807.576,1996.8 Z M832.92,1953.28 L837.272,1953.28 L837.272,1992.448 C837.272,1993.68534 837.61333,1994.656 838.296,1995.36 C838.97867,1996.064 839.93866,1996.416 841.176,1996.416 C841.645336,1996.416 842.199997,1996.352 842.84,1996.224 C843.480003,1996.096 844.077331,1995.92533 844.632,1995.712 L845.4,1999.232 C844.589329,1999.57334 843.597339,1999.85067 842.424,2000.064 C841.250661,2000.27733 840.237338,2000.384 839.384,2000.384 C837.378657,2000.384 835.800006,1999.81867 834.648,1998.688 C833.495994,1997.55733 832.92,1995.96801 832.92,1993.92 L832.92,1953.28 Z M864.216,2000.64 C861.783988,2000.64 859.54401,2000.18134 857.496,1999.264 C855.44799,1998.34666 853.677341,1997.08801 852.184,1995.488 C850.690659,1993.88799 849.528004,1992.04268 848.696,1989.952 C847.863996,1987.86132 847.448,1985.62135 847.448,1983.232 C847.448,1980.88532 847.863996,1978.67734 848.696,1976.608 C849.528004,1974.53866 850.690659,1972.72534 852.184,1971.168 C853.677341,1969.61066 855.437323,1968.37334 857.464,1967.456 C859.490677,1966.53866 861.719988,1966.08 864.152,1966.08 C866.584012,1966.08 868.813323,1966.53866 870.84,1967.456 C872.866677,1968.37334 874.605326,1969.62133 876.056,1971.2 C877.506674,1972.77867 878.637329,1974.59199 879.448,1976.64 C880.258671,1978.68801 880.664,1980.86399 880.664,1983.168 C880.664,1983.50934 880.653333,1983.85066 880.632,1984.192 C880.610667,1984.53334 880.578667,1984.768 880.536,1984.896 L852.056,1984.896 C852.184001,1986.68801 852.599996,1988.34133 853.304,1989.856 C854.008004,1991.37067 854.903995,1992.68266 855.992,1993.792 C857.080005,1994.90134 858.33866,1995.76533 859.768,1996.384 C861.19734,1997.00267 862.722659,1997.312 864.344,1997.312 C865.453339,1997.312 866.541328,1997.16267 867.608,1996.864 C868.674672,1996.56533 869.655996,1996.16 870.552,1995.648 C871.448004,1995.136 872.247996,1994.50667 872.952,1993.76 C873.656004,1993.01333 874.199998,1992.192 874.584,1991.296 L878.36,1992.32 C877.847997,1993.55734 877.122671,1994.67733 876.184,1995.68 C875.245329,1996.68267 874.15734,1997.55733 872.92,1998.304 C871.68266,1999.05067 870.317341,1999.62666 868.824,2000.032 C867.330659,2000.43734 865.794675,2000.64 864.216,2000.64 Z M876.504,1981.568 C876.375999,1979.77599 875.960004,1978.14401 875.256,1976.672 C874.551996,1975.19999 873.656005,1973.93067 872.568,1972.864 C871.479995,1971.79733 870.210674,1970.96534 868.76,1970.368 C867.309326,1969.77066 865.773341,1969.472 864.152,1969.472 C862.530659,1969.472 860.994674,1969.77066 859.544,1970.368 C858.093326,1970.96534 856.824005,1971.79733 855.736,1972.864 C854.647995,1973.93067 853.773337,1975.21066 853.112,1976.704 C852.450663,1978.19734 852.056001,1979.81866 851.928,1981.568 L876.504,1981.568 Z M898.392,2000.64 C895.78932,2000.64 893.250679,2000.21334 890.776,1999.36 C888.301321,1998.50666 886.168009,1997.26934 884.376,1995.648 L886.36,1992.704 C888.237343,1994.24001 890.146657,1995.392 892.088,1996.16 C894.029343,1996.928 896.109322,1997.312 898.328,1997.312 C901.016013,1997.312 903.159992,1996.76801 904.76,1995.68 C906.360008,1994.59199 907.16,1993.04534 907.16,1991.04 C907.16,1990.10133 906.946669,1989.32267 906.52,1988.704 C906.093331,1988.08533 905.464004,1987.54134 904.632,1987.072 C903.799996,1986.60266 902.754673,1986.18667 901.496,1985.824 C900.237327,1985.46133 898.776008,1985.088 897.112,1984.704 C895.19199,1984.23466 893.528007,1983.76534 892.12,1983.296 C890.711993,1982.82666 889.549338,1982.29334 888.632,1981.696 C887.714662,1981.09866 887.032002,1980.36267 886.584,1979.488 C886.135998,1978.61333 885.912,1977.51467 885.912,1976.192 C885.912,1974.52799 886.242663,1973.05601 886.904,1971.776 C887.565337,1970.49599 888.461328,1969.44 889.592,1968.608 C890.722672,1967.776 892.045326,1967.14667 893.56,1966.72 C895.074674,1966.29333 896.685325,1966.08 898.392,1966.08 C900.952013,1966.08 903.277323,1966.496 905.368,1967.328 C907.458677,1968.16 909.143994,1969.25866 910.424,1970.624 L908.312,1973.184 C907.07466,1971.90399 905.570676,1970.944 903.8,1970.304 C902.029324,1969.664 900.18401,1969.344 898.264,1969.344 C897.111994,1969.344 896.045338,1969.46133 895.064,1969.696 C894.082662,1969.93067 893.21867,1970.304 892.472,1970.816 C891.72533,1971.328 891.138669,1971.97866 890.712,1972.768 C890.285331,1973.55734 890.072,1974.48533 890.072,1975.552 C890.072,1976.448 890.221332,1977.17333 890.52,1977.728 C890.818668,1978.28267 891.30933,1978.76266 891.992,1979.168 C892.67467,1979.57334 893.538661,1979.936 894.584,1980.256 C895.629339,1980.576 896.898659,1980.90666 898.392,1981.248 C900.525344,1981.76 902.402659,1982.272 904.024,1982.784 C905.645341,1983.296 906.999995,1983.89333 908.088,1984.576 C909.176005,1985.25867 909.997331,1986.09066 910.552,1987.072 C911.106669,1988.05334 911.384,1989.24799 911.384,1990.656 C911.384,1993.72802 910.210678,1996.15999 907.864,1997.952 C905.517322,1999.74401 902.36002,2000.64 898.392,2000.64 Z M917.912,2000 L917.912,1993.728 L921.624,1993.728 L921.624,2000 L917.912,2000 Z M945.176,1954.56 L960.088,1979.008 L975.064,1954.56 L979.928,1954.56 L962.264,1983.104 L962.264,2000 L957.848,2000 L957.848,1982.976 L940.312,1954.56 L945.176,1954.56 Z M993.88,2000.64 C991.447988,2000.64 989.218677,2000.18134 987.192,1999.264 C985.165323,1998.34666 983.416007,1997.09867 981.944,1995.52 C980.471993,1993.94133 979.330671,1992.10668 978.52,1990.016 C977.709329,1987.92532 977.304,1985.72801 977.304,1983.424 C977.304,1981.07732 977.719996,1978.85868 978.552,1976.768 C979.384004,1974.67732 980.535993,1972.84267 982.008,1971.264 C983.480007,1969.68533 985.229323,1968.42667 987.256,1967.488 C989.282677,1966.54933 991.490655,1966.08 993.88,1966.08 C996.269345,1966.08 998.477323,1966.54933 1000.504,1967.488 C1002.53068,1968.42667 1004.27999,1969.68533 1005.752,1971.264 C1007.22401,1972.84267 1008.376,1974.67732 1009.208,1976.768 C1010.04,1978.85868 1010.456,1981.07732 1010.456,1983.424 C1010.456,1985.72801 1010.04,1987.92532 1009.208,1990.016 C1008.376,1992.10668 1007.22401,1993.94133 1005.752,1995.52 C1004.27999,1997.09867 1002.53068,1998.34666 1000.504,1999.264 C998.477323,2000.18134 996.269345,2000.64 993.88,2000.64 Z M981.784,1983.488 C981.784,1985.36534 982.09333,1987.10399 982.712,1988.704 C983.33067,1990.30401 984.183995,1991.71199 985.272,1992.928 C986.360005,1994.14401 987.639993,1995.09333 989.112,1995.776 C990.584007,1996.45867 992.151992,1996.8 993.816,1996.8 C995.480008,1996.8 997.047993,1996.448 998.52,1995.744 C999.992007,1995.04 1001.28266,1994.08001 1002.392,1992.864 C1003.50134,1991.64799 1004.376,1990.22934 1005.016,1988.608 C1005.656,1986.98666 1005.976,1985.23734 1005.976,1983.36 C1005.976,1981.52532 1005.656,1979.78667 1005.016,1978.144 C1004.376,1976.50133 1003.50134,1975.07201 1002.392,1973.856 C1001.28266,1972.63999 1000.00267,1971.68 998.552,1970.976 C997.101326,1970.272 995.544008,1969.92 993.88,1969.92 C992.215992,1969.92 990.648007,1970.272 989.176,1970.976 C987.703993,1971.68 986.424005,1972.65066 985.336,1973.888 C984.247995,1975.12534 983.384003,1976.56533 982.744,1978.208 C982.103997,1979.85067 981.784,1981.61066 981.784,1983.488 Z M1027.864,2000.64 C1024.36532,2000.64 1021.72001,1999.43468 1019.928,1997.024 C1018.13599,1994.61332 1017.24,1991.01869 1017.24,1986.24 L1017.24,1966.656 L1021.592,1966.656 L1021.592,1985.472 C1021.592,1993.02404 1024.17331,1996.8 1029.336,1996.8 C1030.61601,1996.8 1031.87466,1996.58667 1033.112,1996.16 C1034.34934,1995.73333 1035.49066,1995.11467 1036.536,1994.304 C1037.58134,1993.49333 1038.52,1992.53334 1039.352,1991.424 C1040.184,1990.31466 1040.856,1989.05601 1041.368,1987.648 L1041.368,1966.656 L1045.72,1966.656 L1045.72,1994.368 C1045.72,1995.56267 1046.25333,1996.16 1047.32,1996.16 L1047.32,2000 C1046.46666,2000.128 1045.86934,2000.192 1045.528,2000.192 C1044.54666,2000.192 1043.704,1999.89334 1043,1999.296 C1042.296,1998.69866 1041.944,1997.952 1041.944,1997.056 L1041.944,1992.448 C1040.45066,1995.05068 1038.46668,1997.06666 1035.992,1998.496 C1033.51732,1999.92534 1030.80801,2000.64 1027.864,2000.64 Z M1069.784,1983.232 C1069.784,1980.88532 1070.18933,1978.66668 1071,1976.576 C1071.81067,1974.48532 1072.95199,1972.66134 1074.424,1971.104 C1075.89601,1969.54666 1077.65599,1968.32 1079.704,1967.424 C1081.75201,1966.528 1084.01332,1966.08 1086.488,1966.08 C1089.64535,1966.08 1092.39732,1966.79466 1094.744,1968.224 C1097.09068,1969.65334 1098.86133,1971.58399 1100.056,1974.016 L1095.832,1975.36 C1094.89333,1973.65332 1093.59201,1972.32 1091.928,1971.36 C1090.26399,1970.4 1088.40801,1969.92 1086.36,1969.92 C1084.65332,1969.92 1083.06401,1970.26133 1081.592,1970.944 C1080.11999,1971.62667 1078.84001,1972.55466 1077.752,1973.728 C1076.66399,1974.90134 1075.81067,1976.29866 1075.192,1977.92 C1074.57333,1979.54134 1074.264,1981.31199 1074.264,1983.232 C1074.264,1985.10934 1074.584,1986.87999 1075.224,1988.544 C1075.864,1990.20801 1076.73866,1991.64799 1077.848,1992.864 C1078.95734,1994.08001 1080.24799,1995.04 1081.72,1995.744 C1083.19201,1996.448 1084.75999,1996.8 1086.424,1996.8 C1087.49067,1996.8 1088.54666,1996.65067 1089.592,1996.352 C1090.63734,1996.05333 1091.608,1995.63734 1092.504,1995.104 C1093.4,1994.57066 1094.168,1993.96267 1094.808,1993.28 C1095.448,1992.59733 1095.896,1991.872 1096.152,1991.104 L1100.376,1992.384 C1099.90666,1993.57867 1099.224,1994.67733 1098.328,1995.68 C1097.432,1996.68267 1096.37601,1997.55733 1095.16,1998.304 C1093.94399,1999.05067 1092.60001,1999.62666 1091.128,2000.032 C1089.65599,2000.43734 1088.13067,2000.64 1086.552,2000.64 C1084.11999,2000.64 1081.88001,2000.18134 1079.832,1999.264 C1077.78399,1998.34666 1076.01334,1997.08801 1074.52,1995.488 C1073.02666,1993.88799 1071.864,1992.04268 1071.032,1989.952 C1070.2,1987.86132 1069.784,1985.62135 1069.784,1983.232 Z M1115.992,2000.64 C1114.28532,2000.64 1112.72801,2000.37334 1111.32,1999.84 C1109.91199,1999.30666 1108.70667,1998.57067 1107.704,1997.632 C1106.70133,1996.69333 1105.92267,1995.60534 1105.368,1994.368 C1104.81333,1993.13066 1104.536,1991.82934 1104.536,1990.464 C1104.536,1988.92799 1104.87733,1987.53067 1105.56,1986.272 C1106.24267,1985.01333 1107.20266,1983.936 1108.44,1983.04 C1109.67734,1982.144 1111.15999,1981.45067 1112.888,1980.96 C1114.61601,1980.46933 1116.52532,1980.224 1118.616,1980.224 C1120.28001,1980.224 1121.98666,1980.37333 1123.736,1980.672 C1125.48534,1980.97067 1127.04266,1981.39733 1128.408,1981.952 L1128.408,1978.944 C1128.408,1975.99999 1127.56534,1973.66401 1125.88,1971.936 C1124.19466,1970.20799 1121.92268,1969.344 1119.064,1969.344 C1117.27199,1969.344 1115.49068,1969.68533 1113.72,1970.368 C1111.94932,1971.05067 1110.14668,1972.03199 1108.312,1973.312 L1106.776,1970.432 C1108.95201,1968.98133 1111.06399,1967.89334 1113.112,1967.168 C1115.16001,1966.44266 1117.29332,1966.08 1119.512,1966.08 C1123.56535,1966.08 1126.78665,1967.25332 1129.176,1969.6 C1131.56535,1971.94668 1132.76,1975.18931 1132.76,1979.328 L1132.76,1994.368 C1132.76,1995.56267 1133.27199,1996.16 1134.296,1996.16 L1134.296,2000 C1133.95466,2000.04267 1133.63467,2000.07467 1133.336,2000.096 C1133.03733,2000.11733 1132.78133,2000.128 1132.568,2000.128 C1131.71466,2000.128 1130.936,1999.872 1130.232,1999.36 C1129.528,1998.848 1129.13333,1998.08001 1129.048,1997.056 L1128.92,1994.432 C1127.46933,1996.39468 1125.56001,1997.91999 1123.192,1999.008 C1120.82399,2000.09601 1118.42401,2000.64 1115.992,2000.64 Z M1117.08,1997.312 C1119.00001,1997.312 1120.90932,1996.896 1122.808,1996.064 C1124.70668,1995.232 1126.21066,1994.09067 1127.32,1992.64 C1127.61867,1992.256 1127.87467,1991.84 1128.088,1991.392 C1128.30133,1990.944 1128.408,1990.528 1128.408,1990.144 L1128.408,1984.704 C1126.95733,1984.14933 1125.44267,1983.72267 1123.864,1983.424 C1122.28533,1983.12533 1120.74934,1982.976 1119.256,1982.976 C1116.14132,1982.976 1113.61334,1983.60533 1111.672,1984.864 C1109.73066,1986.12267 1108.76,1987.86132 1108.76,1990.08 C1108.76,1990.976 1108.93066,1991.85066 1109.272,1992.704 C1109.61334,1993.55734 1110.136,1994.32533 1110.84,1995.008 C1111.544,1995.69067 1112.40799,1996.24533 1113.432,1996.672 C1114.45601,1997.09867 1115.67199,1997.312 1117.08,1997.312 Z M1170.264,2000 L1165.912,2000 L1165.912,1981.376 C1165.912,1977.40798 1165.33601,1974.52801 1164.184,1972.736 C1163.03199,1970.94399 1161.24001,1970.048 1158.808,1970.048 C1157.52799,1970.048 1156.24801,1970.28266 1154.968,1970.752 C1153.68799,1971.22134 1152.49334,1971.88266 1151.384,1972.736 C1150.27466,1973.58934 1149.304,1974.60266 1148.472,1975.776 C1147.64,1976.94934 1147.01067,1978.21866 1146.584,1979.584 L1146.584,2000 L1142.232,2000 L1142.232,1966.656 L1146.2,1966.656 L1146.2,1974.208 C1146.88267,1973.01333 1147.72533,1971.91467 1148.728,1970.912 C1149.73067,1969.90933 1150.85066,1969.04534 1152.088,1968.32 C1153.32534,1967.59466 1154.63733,1967.04 1156.024,1966.656 C1157.41067,1966.272 1158.85066,1966.08 1160.344,1966.08 C1162.22134,1966.08 1163.78933,1966.42133 1165.048,1967.104 C1166.30667,1967.78667 1167.32,1968.74666 1168.088,1969.984 C1168.856,1971.22134 1169.41066,1972.73599 1169.752,1974.528 C1170.09334,1976.32001 1170.264,1978.30399 1170.264,1980.48 L1170.264,2000 Z M1206.872,2000.64 C1204.26932,2000.64 1201.73068,2000.21334 1199.256,1999.36 C1196.78132,1998.50666 1194.64801,1997.26934 1192.856,1995.648 L1194.84,1992.704 C1196.71734,1994.24001 1198.62666,1995.392 1200.568,1996.16 C1202.50934,1996.928 1204.58932,1997.312 1206.808,1997.312 C1209.49601,1997.312 1211.63999,1996.76801 1213.24,1995.68 C1214.84001,1994.59199 1215.64,1993.04534 1215.64,1991.04 C1215.64,1990.10133 1215.42667,1989.32267 1215,1988.704 C1214.57333,1988.08533 1213.944,1987.54134 1213.112,1987.072 C1212.28,1986.60266 1211.23467,1986.18667 1209.976,1985.824 C1208.71733,1985.46133 1207.25601,1985.088 1205.592,1984.704 C1203.67199,1984.23466 1202.00801,1983.76534 1200.6,1983.296 C1199.19199,1982.82666 1198.02934,1982.29334 1197.112,1981.696 C1196.19466,1981.09866 1195.512,1980.36267 1195.064,1979.488 C1194.616,1978.61333 1194.392,1977.51467 1194.392,1976.192 C1194.392,1974.52799 1194.72266,1973.05601 1195.384,1971.776 C1196.04534,1970.49599 1196.94133,1969.44 1198.072,1968.608 C1199.20267,1967.776 1200.52533,1967.14667 1202.04,1966.72 C1203.55467,1966.29333 1205.16532,1966.08 1206.872,1966.08 C1209.43201,1966.08 1211.75732,1966.496 1213.848,1967.328 C1215.93868,1968.16 1217.62399,1969.25866 1218.904,1970.624 L1216.792,1973.184 C1215.55466,1971.90399 1214.05068,1970.944 1212.28,1970.304 C1210.50932,1969.664 1208.66401,1969.344 1206.744,1969.344 C1205.59199,1969.344 1204.52534,1969.46133 1203.544,1969.696 C1202.56266,1969.93067 1201.69867,1970.304 1200.952,1970.816 C1200.20533,1971.328 1199.61867,1971.97866 1199.192,1972.768 C1198.76533,1973.55734 1198.552,1974.48533 1198.552,1975.552 C1198.552,1976.448 1198.70133,1977.17333 1199,1977.728 C1199.29867,1978.28267 1199.78933,1978.76266 1200.472,1979.168 C1201.15467,1979.57334 1202.01866,1979.936 1203.064,1980.256 C1204.10934,1980.576 1205.37866,1980.90666 1206.872,1981.248 C1209.00534,1981.76 1210.88266,1982.272 1212.504,1982.784 C1214.12534,1983.296 1215.47999,1983.89333 1216.568,1984.576 C1217.65601,1985.25867 1218.47733,1986.09066 1219.032,1987.072 C1219.58667,1988.05334 1219.864,1989.24799 1219.864,1990.656 C1219.864,1993.72802 1218.69068,1996.15999 1216.344,1997.952 C1213.99732,1999.74401 1210.84002,2000.64 1206.872,2000.64 Z M1242.904,1998.4 C1242.648,1998.528 1242.27467,1998.69867 1241.784,1998.912 C1241.29333,1999.12533 1240.728,1999.33867 1240.088,1999.552 C1239.448,1999.76533 1238.72267,1999.95733 1237.912,2000.128 C1237.10133,2000.29867 1236.248,2000.384 1235.352,2000.384 C1234.41333,2000.384 1233.51734,2000.256 1232.664,2000 C1231.81066,1999.744 1231.064,1999.34934 1230.424,1998.816 C1229.784,1998.28266 1229.272,1997.61067 1228.888,1996.8 C1228.504,1995.98933 1228.312,1995.05067 1228.312,1993.984 L1228.312,1970.112 L1223.704,1970.112 L1223.704,1966.656 L1228.312,1966.656 L1228.312,1955.392 L1232.664,1955.392 L1232.664,1966.656 L1240.344,1966.656 L1240.344,1970.112 L1232.664,1970.112 L1232.664,1992.768 C1232.74933,1994.00534 1233.176,1994.912 1233.944,1995.488 C1234.712,1996.064 1235.62933,1996.352 1236.696,1996.352 C1237.93334,1996.352 1239.02133,1996.14934 1239.96,1995.744 C1240.89867,1995.33866 1241.496,1995.05067 1241.752,1994.88 L1242.904,1998.4 Z M1264.664,1970.496 C1261.71999,1970.58133 1259.16001,1971.39199 1256.984,1972.928 C1254.80799,1974.46401 1253.272,1976.57599 1252.376,1979.264 L1252.376,2000 L1248.024,2000 L1248.024,1966.656 L1252.12,1966.656 L1252.12,1974.656 C1253.27201,1972.30932 1254.78666,1970.35734 1256.664,1968.8 C1258.54134,1967.24266 1260.56799,1966.464 1262.744,1966.464 L1263.832,1966.464 C1264.17334,1966.464 1264.45067,1966.48533 1264.664,1966.528 L1264.664,1970.496 Z M1285.08,2000.64 C1282.64799,2000.64 1280.40801,2000.18134 1278.36,1999.264 C1276.31199,1998.34666 1274.54134,1997.08801 1273.048,1995.488 C1271.55466,1993.88799 1270.392,1992.04268 1269.56,1989.952 C1268.728,1987.86132 1268.312,1985.62135 1268.312,1983.232 C1268.312,1980.88532 1268.728,1978.67734 1269.56,1976.608 C1270.392,1974.53866 1271.55466,1972.72534 1273.048,1971.168 C1274.54134,1969.61066 1276.30132,1968.37334 1278.328,1967.456 C1280.35468,1966.53866 1282.58399,1966.08 1285.016,1966.08 C1287.44801,1966.08 1289.67732,1966.53866 1291.704,1967.456 C1293.73068,1968.37334 1295.46933,1969.62133 1296.92,1971.2 C1298.37067,1972.77867 1299.50133,1974.59199 1300.312,1976.64 C1301.12267,1978.68801 1301.528,1980.86399 1301.528,1983.168 C1301.528,1983.50934 1301.51733,1983.85066 1301.496,1984.192 C1301.47467,1984.53334 1301.44267,1984.768 1301.4,1984.896 L1272.92,1984.896 C1273.048,1986.68801 1273.464,1988.34133 1274.168,1989.856 C1274.872,1991.37067 1275.76799,1992.68266 1276.856,1993.792 C1277.94401,1994.90134 1279.20266,1995.76533 1280.632,1996.384 C1282.06134,1997.00267 1283.58666,1997.312 1285.208,1997.312 C1286.31734,1997.312 1287.40533,1997.16267 1288.472,1996.864 C1289.53867,1996.56533 1290.52,1996.16 1291.416,1995.648 C1292.312,1995.136 1293.112,1994.50667 1293.816,1993.76 C1294.52,1993.01333 1295.064,1992.192 1295.448,1991.296 L1299.224,1992.32 C1298.712,1993.55734 1297.98667,1994.67733 1297.048,1995.68 C1296.10933,1996.68267 1295.02134,1997.55733 1293.784,1998.304 C1292.54666,1999.05067 1291.18134,1999.62666 1289.688,2000.032 C1288.19466,2000.43734 1286.65867,2000.64 1285.08,2000.64 Z M1297.368,1981.568 C1297.24,1979.77599 1296.824,1978.14401 1296.12,1976.672 C1295.416,1975.19999 1294.52001,1973.93067 1293.432,1972.864 C1292.34399,1971.79733 1291.07467,1970.96534 1289.624,1970.368 C1288.17333,1969.77066 1286.63734,1969.472 1285.016,1969.472 C1283.39466,1969.472 1281.85867,1969.77066 1280.408,1970.368 C1278.95733,1970.96534 1277.68801,1971.79733 1276.6,1972.864 C1275.51199,1973.93067 1274.63734,1975.21066 1273.976,1976.704 C1273.31466,1978.19734 1272.92,1979.81866 1272.792,1981.568 L1297.368,1981.568 Z M1323.864,1998.4 C1323.608,1998.528 1323.23467,1998.69867 1322.744,1998.912 C1322.25333,1999.12533 1321.688,1999.33867 1321.048,1999.552 C1320.408,1999.76533 1319.68267,1999.95733 1318.872,2000.128 C1318.06133,2000.29867 1317.208,2000.384 1316.312,2000.384 C1315.37333,2000.384 1314.47734,2000.256 1313.624,2000 C1312.77066,1999.744 1312.024,1999.34934 1311.384,1998.816 C1310.744,1998.28266 1310.232,1997.61067 1309.848,1996.8 C1309.464,1995.98933 1309.272,1995.05067 1309.272,1993.984 L1309.272,1970.112 L1304.664,1970.112 L1304.664,1966.656 L1309.272,1966.656 L1309.272,1955.392 L1313.624,1955.392 L1313.624,1966.656 L1321.304,1966.656 L1321.304,1970.112 L1313.624,1970.112 L1313.624,1992.768 C1313.70933,1994.00534 1314.136,1994.912 1314.904,1995.488 C1315.672,1996.064 1316.58933,1996.352 1317.656,1996.352 C1318.89334,1996.352 1319.98133,1996.14934 1320.92,1995.744 C1321.85867,1995.33866 1322.456,1995.05067 1322.712,1994.88 L1323.864,1998.4 Z M1326.808,1983.232 C1326.808,1980.88532 1327.21333,1978.66668 1328.024,1976.576 C1328.83467,1974.48532 1329.97599,1972.66134 1331.448,1971.104 C1332.92001,1969.54666 1334.67999,1968.32 1336.728,1967.424 C1338.77601,1966.528 1341.03732,1966.08 1343.512,1966.08 C1346.66935,1966.08 1349.42132,1966.79466 1351.768,1968.224 C1354.11468,1969.65334 1355.88533,1971.58399 1357.08,1974.016 L1352.856,1975.36 C1351.91733,1973.65332 1350.61601,1972.32 1348.952,1971.36 C1347.28799,1970.4 1345.43201,1969.92 1343.384,1969.92 C1341.67732,1969.92 1340.08801,1970.26133 1338.616,1970.944 C1337.14399,1971.62667 1335.86401,1972.55466 1334.776,1973.728 C1333.68799,1974.90134 1332.83467,1976.29866 1332.216,1977.92 C1331.59733,1979.54134 1331.288,1981.31199 1331.288,1983.232 C1331.288,1985.10934 1331.608,1986.87999 1332.248,1988.544 C1332.888,1990.20801 1333.76266,1991.64799 1334.872,1992.864 C1335.98134,1994.08001 1337.27199,1995.04 1338.744,1995.744 C1340.21601,1996.448 1341.78399,1996.8 1343.448,1996.8 C1344.51467,1996.8 1345.57066,1996.65067 1346.616,1996.352 C1347.66134,1996.05333 1348.632,1995.63734 1349.528,1995.104 C1350.424,1994.57066 1351.192,1993.96267 1351.832,1993.28 C1352.472,1992.59733 1352.92,1991.872 1353.176,1991.104 L1357.4,1992.384 C1356.93066,1993.57867 1356.248,1994.67733 1355.352,1995.68 C1354.456,1996.68267 1353.40001,1997.55733 1352.184,1998.304 C1350.96799,1999.05067 1349.62401,1999.62666 1348.152,2000.032 C1346.67999,2000.43734 1345.15467,2000.64 1343.576,2000.64 C1341.14399,2000.64 1338.90401,2000.18134 1336.856,1999.264 C1334.80799,1998.34666 1333.03734,1997.08801 1331.544,1995.488 C1330.05066,1993.88799 1328.888,1992.04268 1328.056,1989.952 C1327.224,1987.86132 1326.808,1985.62135 1326.808,1983.232 Z M1392.216,2000 L1387.864,2000 L1387.864,1981.376 C1387.864,1977.57865 1387.21334,1974.74134 1385.912,1972.864 C1384.61066,1970.98666 1382.70135,1970.048 1380.184,1970.048 C1378.94666,1970.048 1377.72001,1970.29333 1376.504,1970.784 C1375.28799,1971.27467 1374.14667,1971.94666 1373.08,1972.8 C1372.01333,1973.65334 1371.08534,1974.65599 1370.296,1975.808 C1369.50666,1976.96001 1368.92,1978.21866 1368.536,1979.584 L1368.536,2000 L1364.184,2000 L1364.184,1953.28 L1368.536,1953.28 L1368.536,1974.208 C1369.90134,1971.69065 1371.75732,1969.70667 1374.104,1968.256 C1376.45068,1966.80533 1378.96799,1966.08 1381.656,1966.08 C1383.57601,1966.08 1385.20799,1966.432 1386.552,1967.136 C1387.89601,1967.84 1388.984,1968.82133 1389.816,1970.08 C1390.648,1971.33867 1391.256,1972.85332 1391.64,1974.624 C1392.024,1976.39468 1392.216,1978.34666 1392.216,1980.48 L1392.216,2000 Z M1428.824,2000.64 C1426.22132,2000.64 1423.68268,2000.21334 1421.208,1999.36 C1418.73332,1998.50666 1416.60001,1997.26934 1414.808,1995.648 L1416.792,1992.704 C1418.66934,1994.24001 1420.57866,1995.392 1422.52,1996.16 C1424.46134,1996.928 1426.54132,1997.312 1428.76,1997.312 C1431.44801,1997.312 1433.59199,1996.76801 1435.192,1995.68 C1436.79201,1994.59199 1437.592,1993.04534 1437.592,1991.04 C1437.592,1990.10133 1437.37867,1989.32267 1436.952,1988.704 C1436.52533,1988.08533 1435.896,1987.54134 1435.064,1987.072 C1434.232,1986.60266 1433.18667,1986.18667 1431.928,1985.824 C1430.66933,1985.46133 1429.20801,1985.088 1427.544,1984.704 C1425.62399,1984.23466 1423.96001,1983.76534 1422.552,1983.296 C1421.14399,1982.82666 1419.98134,1982.29334 1419.064,1981.696 C1418.14666,1981.09866 1417.464,1980.36267 1417.016,1979.488 C1416.568,1978.61333 1416.344,1977.51467 1416.344,1976.192 C1416.344,1974.52799 1416.67466,1973.05601 1417.336,1971.776 C1417.99734,1970.49599 1418.89333,1969.44 1420.024,1968.608 C1421.15467,1967.776 1422.47733,1967.14667 1423.992,1966.72 C1425.50667,1966.29333 1427.11732,1966.08 1428.824,1966.08 C1431.38401,1966.08 1433.70932,1966.496 1435.8,1967.328 C1437.89068,1968.16 1439.57599,1969.25866 1440.856,1970.624 L1438.744,1973.184 C1437.50666,1971.90399 1436.00268,1970.944 1434.232,1970.304 C1432.46132,1969.664 1430.61601,1969.344 1428.696,1969.344 C1427.54399,1969.344 1426.47734,1969.46133 1425.496,1969.696 C1424.51466,1969.93067 1423.65067,1970.304 1422.904,1970.816 C1422.15733,1971.328 1421.57067,1971.97866 1421.144,1972.768 C1420.71733,1973.55734 1420.504,1974.48533 1420.504,1975.552 C1420.504,1976.448 1420.65333,1977.17333 1420.952,1977.728 C1421.25067,1978.28267 1421.74133,1978.76266 1422.424,1979.168 C1423.10667,1979.57334 1423.97066,1979.936 1425.016,1980.256 C1426.06134,1980.576 1427.33066,1980.90666 1428.824,1981.248 C1430.95734,1981.76 1432.83466,1982.272 1434.456,1982.784 C1436.07734,1983.296 1437.43199,1983.89333 1438.52,1984.576 C1439.60801,1985.25867 1440.42933,1986.09066 1440.984,1987.072 C1441.53867,1988.05334 1441.816,1989.24799 1441.816,1990.656 C1441.816,1993.72802 1440.64268,1996.15999 1438.296,1997.952 C1435.94932,1999.74401 1432.79202,2000.64 1428.824,2000.64 Z M1448.792,2000 L1448.792,1966.656 L1453.144,1966.656 L1453.144,2000 L1448.792,2000 Z M1448.792,1959.68 L1448.792,1953.28 L1453.144,1953.28 L1453.144,1959.68 L1448.792,1959.68 Z M1490.52,2000 L1486.168,2000 L1486.168,1981.376 C1486.168,1977.40798 1485.59201,1974.52801 1484.44,1972.736 C1483.28799,1970.94399 1481.49601,1970.048 1479.064,1970.048 C1477.78399,1970.048 1476.50401,1970.28266 1475.224,1970.752 C1473.94399,1971.22134 1472.74934,1971.88266 1471.64,1972.736 C1470.53066,1973.58934 1469.56,1974.60266 1468.728,1975.776 C1467.896,1976.94934 1467.26667,1978.21866 1466.84,1979.584 L1466.84,2000 L1462.488,2000 L1462.488,1966.656 L1466.456,1966.656 L1466.456,1974.208 C1467.13867,1973.01333 1467.98133,1971.91467 1468.984,1970.912 C1469.98667,1969.90933 1471.10666,1969.04534 1472.344,1968.32 C1473.58134,1967.59466 1474.89333,1967.04 1476.28,1966.656 C1477.66667,1966.272 1479.10666,1966.08 1480.6,1966.08 C1482.47734,1966.08 1484.04533,1966.42133 1485.304,1967.104 C1486.56267,1967.78667 1487.576,1968.74666 1488.344,1969.984 C1489.112,1971.22134 1489.66666,1972.73599 1490.008,1974.528 C1490.34934,1976.32001 1490.52,1978.30399 1490.52,1980.48 L1490.52,2000 Z M1513.048,2000.448 C1510.74399,2000.448 1508.64268,1999.968 1506.744,1999.008 C1504.84532,1998.048 1503.20267,1996.77867 1501.816,1995.2 C1500.42933,1993.62133 1499.352,1991.80801 1498.584,1989.76 C1497.816,1987.71199 1497.432,1985.60001 1497.432,1983.424 C1497.432,1981.11999 1497.80533,1978.91201 1498.552,1976.8 C1499.29867,1974.68799 1500.35466,1972.84267 1501.72,1971.264 C1503.08534,1969.68533 1504.71732,1968.42667 1506.616,1967.488 C1508.51468,1966.54933 1510.61599,1966.08 1512.92,1966.08 C1515.77868,1966.08 1518.25332,1966.79466 1520.344,1968.224 C1522.43468,1969.65334 1524.22666,1971.45599 1525.72,1973.632 L1525.72,1966.656 L1529.624,1966.656 L1529.624,2000.128 C1529.624,2002.43201 1529.18667,2004.46932 1528.312,2006.24 C1527.43733,2008.01068 1526.26401,2009.49333 1524.792,2010.688 C1523.31999,2011.88267 1521.58134,2012.77866 1519.576,2013.376 C1517.57066,2013.97334 1515.45868,2014.272 1513.24,2014.272 C1509.44265,2014.272 1506.37068,2013.58934 1504.024,2012.224 C1501.67732,2010.85866 1499.77867,2009.02401 1498.328,2006.72 L1501.016,2004.608 C1502.33867,2006.74134 1504.08799,2008.30933 1506.264,2009.312 C1508.44001,2010.31467 1510.76532,2010.816 1513.24,2010.816 C1514.86134,2010.816 1516.40799,2010.592 1517.88,2010.144 C1519.35201,2009.696 1520.63199,2009.03467 1521.72,2008.16 C1522.80801,2007.28533 1523.672,2006.17601 1524.312,2004.832 C1524.952,2003.48799 1525.272,2001.92001 1525.272,2000.128 L1525.272,1993.536 C1523.94933,1995.66934 1522.18934,1997.35466 1519.992,1998.592 C1517.79466,1999.82934 1515.48001,2000.448 1513.048,2000.448 Z M1514.264,1996.8 C1515.54401,1996.8 1516.80266,1996.56534 1518.04,1996.096 C1519.27734,1995.62666 1520.39733,1994.99734 1521.4,1994.208 C1522.40267,1993.41866 1523.24533,1992.53334 1523.928,1991.552 C1524.61067,1990.57066 1525.05867,1989.56801 1525.272,1988.544 L1525.272,1978.24 C1524.80266,1977.04533 1524.152,1975.93601 1523.32,1974.912 C1522.488,1973.88799 1521.56001,1973.01334 1520.536,1972.288 C1519.51199,1971.56266 1518.41334,1970.98667 1517.24,1970.56 C1516.06666,1970.13333 1514.88267,1969.92 1513.688,1969.92 C1511.81066,1969.92 1510.14667,1970.31466 1508.696,1971.104 C1507.24533,1971.89334 1506.00801,1972.92799 1504.984,1974.208 C1503.95999,1975.48801 1503.18134,1976.93866 1502.648,1978.56 C1502.11466,1980.18134 1501.848,1981.82399 1501.848,1983.488 C1501.848,1985.28001 1502.168,1986.98666 1502.808,1988.608 C1503.448,1990.22934 1504.32266,1991.64799 1505.432,1992.864 C1506.54134,1994.08001 1507.85333,1995.04 1509.368,1995.744 C1510.88267,1996.448 1512.51466,1996.8 1514.264,1996.8 Z M1539.16,1953.28 L1543.512,1953.28 L1543.512,1992.448 C1543.512,1993.68534 1543.85333,1994.656 1544.536,1995.36 C1545.21867,1996.064 1546.17866,1996.416 1547.416,1996.416 C1547.88534,1996.416 1548.44,1996.352 1549.08,1996.224 C1549.72,1996.096 1550.31733,1995.92533 1550.872,1995.712 L1551.64,1999.232 C1550.82933,1999.57334 1549.83734,1999.85067 1548.664,2000.064 C1547.49066,2000.27733 1546.47734,2000.384 1545.624,2000.384 C1543.61866,2000.384 1542.04001,1999.81867 1540.888,1998.688 C1539.73599,1997.55733 1539.16,1995.96801 1539.16,1993.92 L1539.16,1953.28 Z M1570.456,2000.64 C1568.02399,2000.64 1565.78401,2000.18134 1563.736,1999.264 C1561.68799,1998.34666 1559.91734,1997.08801 1558.424,1995.488 C1556.93066,1993.88799 1555.768,1992.04268 1554.936,1989.952 C1554.104,1987.86132 1553.688,1985.62135 1553.688,1983.232 C1553.688,1980.88532 1554.104,1978.67734 1554.936,1976.608 C1555.768,1974.53866 1556.93066,1972.72534 1558.424,1971.168 C1559.91734,1969.61066 1561.67732,1968.37334 1563.704,1967.456 C1565.73068,1966.53866 1567.95999,1966.08 1570.392,1966.08 C1572.82401,1966.08 1575.05332,1966.53866 1577.08,1967.456 C1579.10668,1968.37334 1580.84533,1969.62133 1582.296,1971.2 C1583.74667,1972.77867 1584.87733,1974.59199 1585.688,1976.64 C1586.49867,1978.68801 1586.904,1980.86399 1586.904,1983.168 C1586.904,1983.50934 1586.89333,1983.85066 1586.872,1984.192 C1586.85067,1984.53334 1586.81867,1984.768 1586.776,1984.896 L1558.296,1984.896 C1558.424,1986.68801 1558.84,1988.34133 1559.544,1989.856 C1560.248,1991.37067 1561.14399,1992.68266 1562.232,1993.792 C1563.32001,1994.90134 1564.57866,1995.76533 1566.008,1996.384 C1567.43734,1997.00267 1568.96266,1997.312 1570.584,1997.312 C1571.69334,1997.312 1572.78133,1997.16267 1573.848,1996.864 C1574.91467,1996.56533 1575.896,1996.16 1576.792,1995.648 C1577.688,1995.136 1578.488,1994.50667 1579.192,1993.76 C1579.896,1993.01333 1580.44,1992.192 1580.824,1991.296 L1584.6,1992.32 C1584.088,1993.55734 1583.36267,1994.67733 1582.424,1995.68 C1581.48533,1996.68267 1580.39734,1997.55733 1579.16,1998.304 C1577.92266,1999.05067 1576.55734,1999.62666 1575.064,2000.032 C1573.57066,2000.43734 1572.03467,2000.64 1570.456,2000.64 Z M1582.744,1981.568 C1582.616,1979.77599 1582.2,1978.14401 1581.496,1976.672 C1580.792,1975.19999 1579.89601,1973.93067 1578.808,1972.864 C1577.71999,1971.79733 1576.45067,1970.96534 1575,1970.368 C1573.54933,1969.77066 1572.01334,1969.472 1570.392,1969.472 C1568.77066,1969.472 1567.23467,1969.77066 1565.784,1970.368 C1564.33333,1970.96534 1563.06401,1971.79733 1561.976,1972.864 C1560.88799,1973.93067 1560.01334,1975.21066 1559.352,1976.704 C1558.69066,1978.19734 1558.296,1979.81866 1558.168,1981.568 L1582.744,1981.568 Z M1624.408,2000.64 C1621.97599,2000.64 1619.73601,2000.18134 1617.688,1999.264 C1615.63999,1998.34666 1613.86934,1997.08801 1612.376,1995.488 C1610.88266,1993.88799 1609.72,1992.04268 1608.888,1989.952 C1608.056,1987.86132 1607.64,1985.62135 1607.64,1983.232 C1607.64,1980.88532 1608.056,1978.67734 1608.888,1976.608 C1609.72,1974.53866 1610.88266,1972.72534 1612.376,1971.168 C1613.86934,1969.61066 1615.62932,1968.37334 1617.656,1967.456 C1619.68268,1966.53866 1621.91199,1966.08 1624.344,1966.08 C1626.77601,1966.08 1629.00532,1966.53866 1631.032,1967.456 C1633.05868,1968.37334 1634.79733,1969.62133 1636.248,1971.2 C1637.69867,1972.77867 1638.82933,1974.59199 1639.64,1976.64 C1640.45067,1978.68801 1640.856,1980.86399 1640.856,1983.168 C1640.856,1983.50934 1640.84533,1983.85066 1640.824,1984.192 C1640.80267,1984.53334 1640.77067,1984.768 1640.728,1984.896 L1612.248,1984.896 C1612.376,1986.68801 1612.792,1988.34133 1613.496,1989.856 C1614.2,1991.37067 1615.09599,1992.68266 1616.184,1993.792 C1617.27201,1994.90134 1618.53066,1995.76533 1619.96,1996.384 C1621.38934,1997.00267 1622.91466,1997.312 1624.536,1997.312 C1625.64534,1997.312 1626.73333,1997.16267 1627.8,1996.864 C1628.86667,1996.56533 1629.848,1996.16 1630.744,1995.648 C1631.64,1995.136 1632.44,1994.50667 1633.144,1993.76 C1633.848,1993.01333 1634.392,1992.192 1634.776,1991.296 L1638.552,1992.32 C1638.04,1993.55734 1637.31467,1994.67733 1636.376,1995.68 C1635.43733,1996.68267 1634.34934,1997.55733 1633.112,1998.304 C1631.87466,1999.05067 1630.50934,1999.62666 1629.016,2000.032 C1627.52266,2000.43734 1625.98667,2000.64 1624.408,2000.64 Z M1636.696,1981.568 C1636.568,1979.77599 1636.152,1978.14401 1635.448,1976.672 C1634.744,1975.19999 1633.84801,1973.93067 1632.76,1972.864 C1631.67199,1971.79733 1630.40267,1970.96534 1628.952,1970.368 C1627.50133,1969.77066 1625.96534,1969.472 1624.344,1969.472 C1622.72266,1969.472 1621.18667,1969.77066 1619.736,1970.368 C1618.28533,1970.96534 1617.01601,1971.79733 1615.928,1972.864 C1614.83999,1973.93067 1613.96534,1975.21066 1613.304,1976.704 C1612.64266,1978.19734 1612.248,1979.81866 1612.12,1981.568 L1636.696,1981.568 Z M1675.416,2000 L1671.064,2000 L1671.064,1981.376 C1671.064,1977.40798 1670.48801,1974.52801 1669.336,1972.736 C1668.18399,1970.94399 1666.39201,1970.048 1663.96,1970.048 C1662.67999,1970.048 1661.40001,1970.28266 1660.12,1970.752 C1658.83999,1971.22134 1657.64534,1971.88266 1656.536,1972.736 C1655.42666,1973.58934 1654.456,1974.60266 1653.624,1975.776 C1652.792,1976.94934 1652.16267,1978.21866 1651.736,1979.584 L1651.736,2000 L1647.384,2000 L1647.384,1966.656 L1651.352,1966.656 L1651.352,1974.208 C1652.03467,1973.01333 1652.87733,1971.91467 1653.88,1970.912 C1654.88267,1969.90933 1656.00266,1969.04534 1657.24,1968.32 C1658.47734,1967.59466 1659.78933,1967.04 1661.176,1966.656 C1662.56267,1966.272 1664.00266,1966.08 1665.496,1966.08 C1667.37334,1966.08 1668.94133,1966.42133 1670.2,1967.104 C1671.45867,1967.78667 1672.472,1968.74666 1673.24,1969.984 C1674.008,1971.22134 1674.56266,1972.73599 1674.904,1974.528 C1675.24534,1976.32001 1675.416,1978.30399 1675.416,1980.48 L1675.416,2000 Z M1700.312,1998.4 C1700.056,1998.528 1699.68267,1998.69867 1699.192,1998.912 C1698.70133,1999.12533 1698.136,1999.33867 1697.496,1999.552 C1696.856,1999.76533 1696.13067,1999.95733 1695.32,2000.128 C1694.50933,2000.29867 1693.656,2000.384 1692.76,2000.384 C1691.82133,2000.384 1690.92534,2000.256 1690.072,2000 C1689.21866,1999.744 1688.472,1999.34934 1687.832,1998.816 C1687.192,1998.28266 1686.68,1997.61067 1686.296,1996.8 C1685.912,1995.98933 1685.72,1995.05067 1685.72,1993.984 L1685.72,1970.112 L1681.112,1970.112 L1681.112,1966.656 L1685.72,1966.656 L1685.72,1955.392 L1690.072,1955.392 L1690.072,1966.656 L1697.752,1966.656 L1697.752,1970.112 L1690.072,1970.112 L1690.072,1992.768 C1690.15733,1994.00534 1690.584,1994.912 1691.352,1995.488 C1692.12,1996.064 1693.03733,1996.352 1694.104,1996.352 C1695.34134,1996.352 1696.42933,1996.14934 1697.368,1995.744 C1698.30667,1995.33866 1698.904,1995.05067 1699.16,1994.88 L1700.312,1998.4 Z M1705.432,2000 L1705.432,1966.656 L1709.784,1966.656 L1709.784,2000 L1705.432,2000 Z M1705.432,1959.68 L1705.432,1953.28 L1709.784,1953.28 L1709.784,1959.68 L1705.432,1959.68 Z M1735.256,1998.4 C1735,1998.528 1734.62667,1998.69867 1734.136,1998.912 C1733.64533,1999.12533 1733.08,1999.33867 1732.44,1999.552 C1731.8,1999.76533 1731.07467,1999.95733 1730.264,2000.128 C1729.45333,2000.29867 1728.6,2000.384 1727.704,2000.384 C1726.76533,2000.384 1725.86934,2000.256 1725.016,2000 C1724.16266,1999.744 1723.416,1999.34934 1722.776,1998.816 C1722.136,1998.28266 1721.624,1997.61067 1721.24,1996.8 C1720.856,1995.98933 1720.664,1995.05067 1720.664,1993.984 L1720.664,1970.112 L1716.056,1970.112 L1716.056,1966.656 L1720.664,1966.656 L1720.664,1955.392 L1725.016,1955.392 L1725.016,1966.656 L1732.696,1966.656 L1732.696,1970.112 L1725.016,1970.112 L1725.016,1992.768 C1725.10133,1994.00534 1725.528,1994.912 1726.296,1995.488 C1727.064,1996.064 1727.98133,1996.352 1729.048,1996.352 C1730.28534,1996.352 1731.37333,1996.14934 1732.312,1995.744 C1733.25067,1995.33866 1733.848,1995.05067 1734.104,1994.88 L1735.256,1998.4 Z M1740.376,2000 L1740.376,1966.656 L1744.728,1966.656 L1744.728,2000 L1740.376,2000 Z M1740.376,1959.68 L1740.376,1953.28 L1744.728,1953.28 L1744.728,1959.68 L1740.376,1959.68 Z M1768.664,2000.64 C1766.23199,2000.64 1763.99201,2000.18134 1761.944,1999.264 C1759.89599,1998.34666 1758.12534,1997.08801 1756.632,1995.488 C1755.13866,1993.88799 1753.976,1992.04268 1753.144,1989.952 C1752.312,1987.86132 1751.896,1985.62135 1751.896,1983.232 C1751.896,1980.88532 1752.312,1978.67734 1753.144,1976.608 C1753.976,1974.53866 1755.13866,1972.72534 1756.632,1971.168 C1758.12534,1969.61066 1759.88532,1968.37334 1761.912,1967.456 C1763.93868,1966.53866 1766.16799,1966.08 1768.6,1966.08 C1771.03201,1966.08 1773.26132,1966.53866 1775.288,1967.456 C1777.31468,1968.37334 1779.05333,1969.62133 1780.504,1971.2 C1781.95467,1972.77867 1783.08533,1974.59199 1783.896,1976.64 C1784.70667,1978.68801 1785.112,1980.86399 1785.112,1983.168 C1785.112,1983.50934 1785.10133,1983.85066 1785.08,1984.192 C1785.05867,1984.53334 1785.02667,1984.768 1784.984,1984.896 L1756.504,1984.896 C1756.632,1986.68801 1757.048,1988.34133 1757.752,1989.856 C1758.456,1991.37067 1759.35199,1992.68266 1760.44,1993.792 C1761.52801,1994.90134 1762.78666,1995.76533 1764.216,1996.384 C1765.64534,1997.00267 1767.17066,1997.312 1768.792,1997.312 C1769.90134,1997.312 1770.98933,1997.16267 1772.056,1996.864 C1773.12267,1996.56533 1774.104,1996.16 1775,1995.648 C1775.896,1995.136 1776.696,1994.50667 1777.4,1993.76 C1778.104,1993.01333 1778.648,1992.192 1779.032,1991.296 L1782.808,1992.32 C1782.296,1993.55734 1781.57067,1994.67733 1780.632,1995.68 C1779.69333,1996.68267 1778.60534,1997.55733 1777.368,1998.304 C1776.13066,1999.05067 1774.76534,1999.62666 1773.272,2000.032 C1771.77866,2000.43734 1770.24267,2000.64 1768.664,2000.64 Z M1780.952,1981.568 C1780.824,1979.77599 1780.408,1978.14401 1779.704,1976.672 C1779,1975.19999 1778.10401,1973.93067 1777.016,1972.864 C1775.92799,1971.79733 1774.65867,1970.96534 1773.208,1970.368 C1771.75733,1969.77066 1770.22134,1969.472 1768.6,1969.472 C1766.97866,1969.472 1765.44267,1969.77066 1763.992,1970.368 C1762.54133,1970.96534 1761.27201,1971.79733 1760.184,1972.864 C1759.09599,1973.93067 1758.22134,1975.21066 1757.56,1976.704 C1756.89866,1978.19734 1756.504,1979.81866 1756.376,1981.568 L1780.952,1981.568 Z M1802.84,2000.64 C1800.23732,2000.64 1797.69868,2000.21334 1795.224,1999.36 C1792.74932,1998.50666 1790.61601,1997.26934 1788.824,1995.648 L1790.808,1992.704 C1792.68534,1994.24001 1794.59466,1995.392 1796.536,1996.16 C1798.47734,1996.928 1800.55732,1997.312 1802.776,1997.312 C1805.46401,1997.312 1807.60799,1996.76801 1809.208,1995.68 C1810.80801,1994.59199 1811.608,1993.04534 1811.608,1991.04 C1811.608,1990.10133 1811.39467,1989.32267 1810.968,1988.704 C1810.54133,1988.08533 1809.912,1987.54134 1809.08,1987.072 C1808.248,1986.60266 1807.20267,1986.18667 1805.944,1985.824 C1804.68533,1985.46133 1803.22401,1985.088 1801.56,1984.704 C1799.63999,1984.23466 1797.97601,1983.76534 1796.568,1983.296 C1795.15999,1982.82666 1793.99734,1982.29334 1793.08,1981.696 C1792.16266,1981.09866 1791.48,1980.36267 1791.032,1979.488 C1790.584,1978.61333 1790.36,1977.51467 1790.36,1976.192 C1790.36,1974.52799 1790.69066,1973.05601 1791.352,1971.776 C1792.01334,1970.49599 1792.90933,1969.44 1794.04,1968.608 C1795.17067,1967.776 1796.49333,1967.14667 1798.008,1966.72 C1799.52267,1966.29333 1801.13332,1966.08 1802.84,1966.08 C1805.40001,1966.08 1807.72532,1966.496 1809.816,1967.328 C1811.90668,1968.16 1813.59199,1969.25866 1814.872,1970.624 L1812.76,1973.184 C1811.52266,1971.90399 1810.01868,1970.944 1808.248,1970.304 C1806.47732,1969.664 1804.63201,1969.344 1802.712,1969.344 C1801.55999,1969.344 1800.49334,1969.46133 1799.512,1969.696 C1798.53066,1969.93067 1797.66667,1970.304 1796.92,1970.816 C1796.17333,1971.328 1795.58667,1971.97866 1795.16,1972.768 C1794.73333,1973.55734 1794.52,1974.48533 1794.52,1975.552 C1794.52,1976.448 1794.66933,1977.17333 1794.968,1977.728 C1795.26667,1978.28267 1795.75733,1978.76266 1796.44,1979.168 C1797.12267,1979.57334 1797.98666,1979.936 1799.032,1980.256 C1800.07734,1980.576 1801.34666,1980.90666 1802.84,1981.248 C1804.97334,1981.76 1806.85066,1982.272 1808.472,1982.784 C1810.09334,1983.296 1811.44799,1983.89333 1812.536,1984.576 C1813.62401,1985.25867 1814.44533,1986.09066 1815,1987.072 C1815.55467,1988.05334 1815.832,1989.24799 1815.832,1990.656 C1815.832,1993.72802 1814.65868,1996.15999 1812.312,1997.952 C1809.96532,1999.74401 1806.80802,2000.64 1802.84,2000.64 Z M1839.192,2000 L1839.192,1966.656 L1843.544,1966.656 L1843.544,2000 L1839.192,2000 Z M1839.192,1959.68 L1839.192,1953.28 L1843.544,1953.28 L1843.544,1959.68 L1839.192,1959.68 Z M1880.92,2000 L1876.568,2000 L1876.568,1981.376 C1876.568,1977.40798 1875.99201,1974.52801 1874.84,1972.736 C1873.68799,1970.94399 1871.89601,1970.048 1869.464,1970.048 C1868.18399,1970.048 1866.90401,1970.28266 1865.624,1970.752 C1864.34399,1971.22134 1863.14934,1971.88266 1862.04,1972.736 C1860.93066,1973.58934 1859.96,1974.60266 1859.128,1975.776 C1858.296,1976.94934 1857.66667,1978.21866 1857.24,1979.584 L1857.24,2000 L1852.888,2000 L1852.888,1966.656 L1856.856,1966.656 L1856.856,1974.208 C1857.53867,1973.01333 1858.38133,1971.91467 1859.384,1970.912 C1860.38667,1969.90933 1861.50666,1969.04534 1862.744,1968.32 C1863.98134,1967.59466 1865.29333,1967.04 1866.68,1966.656 C1868.06667,1966.272 1869.50666,1966.08 1871,1966.08 C1872.87734,1966.08 1874.44533,1966.42133 1875.704,1967.104 C1876.96267,1967.78667 1877.976,1968.74666 1878.744,1969.984 C1879.512,1971.22134 1880.06666,1972.73599 1880.408,1974.528 C1880.74934,1976.32001 1880.92,1978.30399 1880.92,1980.48 L1880.92,2000 Z M1915.16,2000.64 C1913.45332,2000.64 1911.89601,2000.37334 1910.488,1999.84 C1909.07999,1999.30666 1907.87467,1998.57067 1906.872,1997.632 C1905.86933,1996.69333 1905.09067,1995.60534 1904.536,1994.368 C1903.98133,1993.13066 1903.704,1991.82934 1903.704,1990.464 C1903.704,1988.92799 1904.04533,1987.53067 1904.728,1986.272 C1905.41067,1985.01333 1906.37066,1983.936 1907.608,1983.04 C1908.84534,1982.144 1910.32799,1981.45067 1912.056,1980.96 C1913.78401,1980.46933 1915.69332,1980.224 1917.784,1980.224 C1919.44801,1980.224 1921.15466,1980.37333 1922.904,1980.672 C1924.65334,1980.97067 1926.21066,1981.39733 1927.576,1981.952 L1927.576,1978.944 C1927.576,1975.99999 1926.73334,1973.66401 1925.048,1971.936 C1923.36266,1970.20799 1921.09068,1969.344 1918.232,1969.344 C1916.43999,1969.344 1914.65868,1969.68533 1912.888,1970.368 C1911.11732,1971.05067 1909.31468,1972.03199 1907.48,1973.312 L1905.944,1970.432 C1908.12001,1968.98133 1910.23199,1967.89334 1912.28,1967.168 C1914.32801,1966.44266 1916.46132,1966.08 1918.68,1966.08 C1922.73335,1966.08 1925.95465,1967.25332 1928.344,1969.6 C1930.73335,1971.94668 1931.928,1975.18931 1931.928,1979.328 L1931.928,1994.368 C1931.928,1995.56267 1932.43999,1996.16 1933.464,1996.16 L1933.464,2000 C1933.12266,2000.04267 1932.80267,2000.07467 1932.504,2000.096 C1932.20533,2000.11733 1931.94933,2000.128 1931.736,2000.128 C1930.88266,2000.128 1930.104,1999.872 1929.4,1999.36 C1928.696,1998.848 1928.30133,1998.08001 1928.216,1997.056 L1928.088,1994.432 C1926.63733,1996.39468 1924.72801,1997.91999 1922.36,1999.008 C1919.99199,2000.09601 1917.59201,2000.64 1915.16,2000.64 Z M1916.248,1997.312 C1918.16801,1997.312 1920.07732,1996.896 1921.976,1996.064 C1923.87468,1995.232 1925.37866,1994.09067 1926.488,1992.64 C1926.78667,1992.256 1927.04267,1991.84 1927.256,1991.392 C1927.46933,1990.944 1927.576,1990.528 1927.576,1990.144 L1927.576,1984.704 C1926.12533,1984.14933 1924.61067,1983.72267 1923.032,1983.424 C1921.45333,1983.12533 1919.91734,1982.976 1918.424,1982.976 C1915.30932,1982.976 1912.78134,1983.60533 1910.84,1984.864 C1908.89866,1986.12267 1907.928,1987.86132 1907.928,1990.08 C1907.928,1990.976 1908.09866,1991.85066 1908.44,1992.704 C1908.78134,1993.55734 1909.304,1994.32533 1910.008,1995.008 C1910.712,1995.69067 1911.57599,1996.24533 1912.6,1996.672 C1913.62401,1997.09867 1914.83999,1997.312 1916.248,1997.312 Z M1969.432,2000 L1965.08,2000 L1965.08,1981.376 C1965.08,1977.40798 1964.50401,1974.52801 1963.352,1972.736 C1962.19999,1970.94399 1960.40801,1970.048 1957.976,1970.048 C1956.69599,1970.048 1955.41601,1970.28266 1954.136,1970.752 C1952.85599,1971.22134 1951.66134,1971.88266 1950.552,1972.736 C1949.44266,1973.58934 1948.472,1974.60266 1947.64,1975.776 C1946.808,1976.94934 1946.17867,1978.21866 1945.752,1979.584 L1945.752,2000 L1941.4,2000 L1941.4,1966.656 L1945.368,1966.656 L1945.368,1974.208 C1946.05067,1973.01333 1946.89333,1971.91467 1947.896,1970.912 C1948.89867,1969.90933 1950.01866,1969.04534 1951.256,1968.32 C1952.49334,1967.59466 1953.80533,1967.04 1955.192,1966.656 C1956.57867,1966.272 1958.01866,1966.08 1959.512,1966.08 C1961.38934,1966.08 1962.95733,1966.42133 1964.216,1967.104 C1965.47467,1967.78667 1966.488,1968.74666 1967.256,1969.984 C1968.024,1971.22134 1968.57866,1972.73599 1968.92,1974.528 C1969.26134,1976.32001 1969.432,1978.30399 1969.432,1980.48 L1969.432,2000 Z M1979.736,2010.304 C1979.94933,2010.34667 1980.16267,2010.37867 1980.376,2010.4 C1980.58933,2010.42133 1980.80267,2010.432 1981.016,2010.432 C1981.44267,2010.432 1981.90133,2010.38933 1982.392,2010.304 C1982.88267,2010.21867 1983.23467,2010.13333 1983.448,2010.048 C1983.66133,2009.96267 1983.88533,2009.78133 1984.12,2009.504 C1984.35467,2009.22667 1984.65333,2008.736 1985.016,2008.032 C1985.37867,2007.328 1985.83733,2006.34667 1986.392,2005.088 C1986.94667,2003.82933 1987.65066,2002.13334 1988.504,2000 L1973.976,1966.656 L1978.52,1966.656 L1990.872,1995.968 L2002.264,1966.656 L2006.424,1966.656 L1989.08,2009.664 C1988.44,2011.24267 1987.57601,2012.416 1986.488,2013.184 C1985.39999,2013.952 1983.87468,2014.336 1981.912,2014.336 C1981.10133,2014.336 1980.376,2014.272 1979.736,2014.144 L1979.736,2010.304 Z M697.496,2080.64 C695.191988,2080.64 693.058676,2080.16 691.096,2079.2 C689.133324,2078.24 687.43734,2076.97067 686.008,2075.392 C684.57866,2073.81333 683.469337,2071.98934 682.68,2069.92 C681.890663,2067.85066 681.496,2065.68534 681.496,2063.424 C681.496,2061.07732 681.879996,2058.84801 682.648,2056.736 C683.416004,2054.62399 684.471993,2052.77867 685.816,2051.2 C687.160007,2049.62133 688.759991,2048.37334 690.616,2047.456 C692.472009,2046.53866 694.509322,2046.08 696.728,2046.08 C699.544014,2046.08 702.039989,2046.81599 704.216,2048.288 C706.392011,2049.76001 708.119994,2051.54132 709.4,2053.632 L709.4,2033.28 L713.752,2033.28 L713.752,2074.368 C713.752,2075.56267 714.263995,2076.16 715.288,2076.16 L715.288,2080 C714.562663,2080.128 713.986669,2080.192 713.56,2080.192 C712.493328,2080.192 711.61867,2079.88267 710.936,2079.264 C710.25333,2078.64533 709.912,2077.90934 709.912,2077.056 L709.912,2073.536 C708.54666,2075.71201 706.744011,2077.43999 704.504,2078.72 C702.263989,2080.00001 699.928012,2080.64 697.496,2080.64 Z M698.392,2076.8 C699.501339,2076.8 700.663994,2076.58667 701.88,2076.16 C703.096006,2075.73333 704.226661,2075.14667 705.272,2074.4 C706.317339,2073.65333 707.223996,2072.77867 707.992,2071.776 C708.760004,2070.77333 709.229332,2069.69601 709.4,2068.544 L709.4,2058.24 C708.973331,2057.08799 708.344004,2056.01067 707.512,2055.008 C706.679996,2054.00533 705.741339,2053.12 704.696,2052.352 C703.650661,2051.584 702.541339,2050.98667 701.368,2050.56 C700.194661,2050.13333 699.032006,2049.92 697.88,2049.92 C696.087991,2049.92 694.456007,2050.304 692.984,2051.072 C691.511993,2051.84 690.264005,2052.85333 689.24,2054.112 C688.215995,2055.37067 687.416003,2056.81066 686.84,2058.432 C686.263997,2060.05334 685.976,2061.71732 685.976,2063.424 C685.976,2065.21601 686.295997,2066.92266 686.936,2068.544 C687.576003,2070.16534 688.450661,2071.58399 689.56,2072.8 C690.669339,2074.01601 691.981326,2074.98666 693.496,2075.712 C695.010674,2076.43734 696.642658,2076.8 698.392,2076.8 Z M723.544,2080 L723.544,2046.656 L727.896,2046.656 L727.896,2080 L723.544,2080 Z M723.544,2039.68 L723.544,2033.28 L727.896,2033.28 L727.896,2039.68 L723.544,2039.68 Z M753.88,2050.496 C750.935985,2050.58133 748.376011,2051.39199 746.2,2052.928 C744.023989,2054.46401 742.488004,2056.57599 741.592,2059.264 L741.592,2080 L737.24,2080 L737.24,2046.656 L741.336,2046.656 L741.336,2054.656 C742.488006,2052.30932 744.002657,2050.35734 745.88,2048.8 C747.757343,2047.24266 749.783989,2046.464 751.96,2046.464 L753.048,2046.464 C753.389335,2046.464 753.666666,2046.48533 753.88,2046.528 L753.88,2050.496 Z M774.296,2080.64 C771.863988,2080.64 769.62401,2080.18134 767.576,2079.264 C765.52799,2078.34666 763.757341,2077.08801 762.264,2075.488 C760.770659,2073.88799 759.608004,2072.04268 758.776,2069.952 C757.943996,2067.86132 757.528,2065.62135 757.528,2063.232 C757.528,2060.88532 757.943996,2058.67734 758.776,2056.608 C759.608004,2054.53866 760.770659,2052.72534 762.264,2051.168 C763.757341,2049.61066 765.517323,2048.37334 767.544,2047.456 C769.570677,2046.53866 771.799988,2046.08 774.232,2046.08 C776.664012,2046.08 778.893323,2046.53866 780.92,2047.456 C782.946677,2048.37334 784.685326,2049.62133 786.136,2051.2 C787.586674,2052.77867 788.717329,2054.59199 789.528,2056.64 C790.338671,2058.68801 790.744,2060.86399 790.744,2063.168 C790.744,2063.50934 790.733333,2063.85066 790.712,2064.192 C790.690667,2064.53334 790.658667,2064.768 790.616,2064.896 L762.136,2064.896 C762.264001,2066.68801 762.679996,2068.34133 763.384,2069.856 C764.088004,2071.37067 764.983995,2072.68266 766.072,2073.792 C767.160005,2074.90134 768.41866,2075.76533 769.848,2076.384 C771.27734,2077.00267 772.802659,2077.312 774.424,2077.312 C775.533339,2077.312 776.621328,2077.16267 777.688,2076.864 C778.754672,2076.56533 779.735996,2076.16 780.632,2075.648 C781.528004,2075.136 782.327996,2074.50667 783.032,2073.76 C783.736004,2073.01333 784.279998,2072.192 784.664,2071.296 L788.44,2072.32 C787.927997,2073.55734 787.202671,2074.67733 786.264,2075.68 C785.325329,2076.68267 784.23734,2077.55733 783,2078.304 C781.76266,2079.05067 780.397341,2079.62666 778.904,2080.032 C777.410659,2080.43734 775.874675,2080.64 774.296,2080.64 Z M786.584,2061.568 C786.455999,2059.77599 786.040004,2058.14401 785.336,2056.672 C784.631996,2055.19999 783.736005,2053.93067 782.648,2052.864 C781.559995,2051.79733 780.290674,2050.96534 778.84,2050.368 C777.389326,2049.77066 775.853341,2049.472 774.232,2049.472 C772.610659,2049.472 771.074674,2049.77066 769.624,2050.368 C768.173326,2050.96534 766.904005,2051.79733 765.816,2052.864 C764.727995,2053.93067 763.853337,2055.21066 763.192,2056.704 C762.530663,2058.19734 762.136001,2059.81866 762.008,2061.568 L786.584,2061.568 Z M795.096,2063.232 C795.096,2060.88532 795.501329,2058.66668 796.312,2056.576 C797.122671,2054.48532 798.263993,2052.66134 799.736,2051.104 C801.208007,2049.54666 802.96799,2048.32 805.016,2047.424 C807.06401,2046.528 809.325321,2046.08 811.8,2046.08 C814.957349,2046.08 817.709322,2046.79466 820.056,2048.224 C822.402678,2049.65334 824.173327,2051.58399 825.368,2054.016 L821.144,2055.36 C820.205329,2053.65332 818.904008,2052.32 817.24,2051.36 C815.575992,2050.4 813.72001,2049.92 811.672,2049.92 C809.965325,2049.92 808.376007,2050.26133 806.904,2050.944 C805.431993,2051.62667 804.152005,2052.55466 803.064,2053.728 C801.975995,2054.90134 801.12267,2056.29866 800.504,2057.92 C799.88533,2059.54134 799.576,2061.31199 799.576,2063.232 C799.576,2065.10934 799.895997,2066.87999 800.536,2068.544 C801.176003,2070.20801 802.050661,2071.64799 803.16,2072.864 C804.269339,2074.08001 805.559993,2075.04 807.032,2075.744 C808.504007,2076.448 810.071992,2076.8 811.736,2076.8 C812.802672,2076.8 813.858661,2076.65067 814.904,2076.352 C815.949339,2076.05333 816.919996,2075.63734 817.816,2075.104 C818.712004,2074.57066 819.479997,2073.96267 820.12,2073.28 C820.760003,2072.59733 821.207999,2071.872 821.464,2071.104 L825.688,2072.384 C825.218664,2073.57867 824.536004,2074.67733 823.64,2075.68 C822.743996,2076.68267 821.688006,2077.55733 820.472,2078.304 C819.255994,2079.05067 817.912007,2079.62666 816.44,2080.032 C814.967993,2080.43734 813.442675,2080.64 811.864,2080.64 C809.431988,2080.64 807.19201,2080.18134 805.144,2079.264 C803.09599,2078.34666 801.325341,2077.08801 799.832,2075.488 C798.338659,2073.88799 797.176004,2072.04268 796.344,2069.952 C795.511996,2067.86132 795.096,2065.62135 795.096,2063.232 Z M848.6,2078.4 C848.343999,2078.528 847.970669,2078.69867 847.48,2078.912 C846.989331,2079.12533 846.424003,2079.33867 845.784,2079.552 C845.143997,2079.76533 844.418671,2079.95733 843.608,2080.128 C842.797329,2080.29867 841.944004,2080.384 841.048,2080.384 C840.109329,2080.384 839.213338,2080.256 838.36,2080 C837.506662,2079.744 836.760003,2079.34934 836.12,2078.816 C835.479997,2078.28266 834.968002,2077.61067 834.584,2076.8 C834.199998,2075.98933 834.008,2075.05067 834.008,2073.984 L834.008,2050.112 L829.4,2050.112 L829.4,2046.656 L834.008,2046.656 L834.008,2035.392 L838.36,2035.392 L838.36,2046.656 L846.04,2046.656 L846.04,2050.112 L838.36,2050.112 L838.36,2072.768 C838.445334,2074.00534 838.871996,2074.912 839.64,2075.488 C840.408004,2076.064 841.325328,2076.352 842.392,2076.352 C843.62934,2076.352 844.717329,2076.14934 845.656,2075.744 C846.594671,2075.33866 847.191999,2075.05067 847.448,2074.88 L848.6,2078.4 Z M853.72,2080 L853.72,2046.656 L858.072,2046.656 L858.072,2080 L853.72,2080 Z M853.72,2039.68 L853.72,2033.28 L858.072,2033.28 L858.072,2039.68 L853.72,2039.68 Z M881.816,2080.64 C879.383988,2080.64 877.154677,2080.18134 875.128,2079.264 C873.101323,2078.34666 871.352007,2077.09867 869.88,2075.52 C868.407993,2073.94133 867.266671,2072.10668 866.456,2070.016 C865.645329,2067.92532 865.24,2065.72801 865.24,2063.424 C865.24,2061.07732 865.655996,2058.85868 866.488,2056.768 C867.320004,2054.67732 868.471993,2052.84267 869.944,2051.264 C871.416007,2049.68533 873.165323,2048.42667 875.192,2047.488 C877.218677,2046.54933 879.426655,2046.08 881.816,2046.08 C884.205345,2046.08 886.413323,2046.54933 888.44,2047.488 C890.466677,2048.42667 892.215993,2049.68533 893.688,2051.264 C895.160007,2052.84267 896.311996,2054.67732 897.144,2056.768 C897.976004,2058.85868 898.392,2061.07732 898.392,2063.424 C898.392,2065.72801 897.976004,2067.92532 897.144,2070.016 C896.311996,2072.10668 895.160007,2073.94133 893.688,2075.52 C892.215993,2077.09867 890.466677,2078.34666 888.44,2079.264 C886.413323,2080.18134 884.205345,2080.64 881.816,2080.64 Z M869.72,2063.488 C869.72,2065.36534 870.02933,2067.10399 870.648,2068.704 C871.26667,2070.30401 872.119995,2071.71199 873.208,2072.928 C874.296005,2074.14401 875.575993,2075.09333 877.048,2075.776 C878.520007,2076.45867 880.087992,2076.8 881.752,2076.8 C883.416008,2076.8 884.983993,2076.448 886.456,2075.744 C887.928007,2075.04 889.218661,2074.08001 890.328,2072.864 C891.437339,2071.64799 892.311997,2070.22934 892.952,2068.608 C893.592003,2066.98666 893.912,2065.23734 893.912,2063.36 C893.912,2061.52532 893.592003,2059.78667 892.952,2058.144 C892.311997,2056.50133 891.437339,2055.07201 890.328,2053.856 C889.218661,2052.63999 887.938674,2051.68 886.488,2050.976 C885.037326,2050.272 883.480008,2049.92 881.816,2049.92 C880.151992,2049.92 878.584007,2050.272 877.112,2050.976 C875.639993,2051.68 874.360005,2052.65066 873.272,2053.888 C872.183995,2055.12534 871.320003,2056.56533 870.68,2058.208 C870.039997,2059.85067 869.72,2061.61066 869.72,2063.488 Z M933.528,2080 L929.176,2080 L929.176,2061.376 C929.176,2057.40798 928.600006,2054.52801 927.448,2052.736 C926.295994,2050.94399 924.504012,2050.048 922.072,2050.048 C920.791994,2050.048 919.512006,2050.28266 918.232,2050.752 C916.951994,2051.22134 915.757339,2051.88266 914.648,2052.736 C913.538661,2053.58934 912.568004,2054.60266 911.736,2055.776 C910.903996,2056.94934 910.274669,2058.21866 909.848,2059.584 L909.848,2080 L905.496,2080 L905.496,2046.656 L909.464,2046.656 L909.464,2054.208 C910.14667,2053.01333 910.989328,2051.91467 911.992,2050.912 C912.994672,2049.90933 914.11466,2049.04534 915.352,2048.32 C916.58934,2047.59466 917.901326,2047.04 919.288,2046.656 C920.674674,2046.272 922.114659,2046.08 923.608,2046.08 C925.485343,2046.08 927.053327,2046.42133 928.312,2047.104 C929.570673,2047.78667 930.583996,2048.74666 931.352,2049.984 C932.120004,2051.22134 932.674665,2052.73599 933.016,2054.528 C933.357335,2056.32001 933.528,2058.30399 933.528,2060.48 L933.528,2080 Z M942.104,2080 L942.104,2073.728 L945.816,2073.728 L945.816,2080 L942.104,2080 Z M969.368,2034.56 L984.28,2059.008 L999.256,2034.56 L1004.12,2034.56 L986.456,2063.104 L986.456,2080 L982.04,2080 L982.04,2062.976 L964.504,2034.56 L969.368,2034.56 Z M1018.072,2080.64 C1015.63999,2080.64 1013.41068,2080.18134 1011.384,2079.264 C1009.35732,2078.34666 1007.60801,2077.09867 1006.136,2075.52 C1004.66399,2073.94133 1003.52267,2072.10668 1002.712,2070.016 C1001.90133,2067.92532 1001.496,2065.72801 1001.496,2063.424 C1001.496,2061.07732 1001.912,2058.85868 1002.744,2056.768 C1003.576,2054.67732 1004.72799,2052.84267 1006.2,2051.264 C1007.67201,2049.68533 1009.42132,2048.42667 1011.448,2047.488 C1013.47468,2046.54933 1015.68265,2046.08 1018.072,2046.08 C1020.46135,2046.08 1022.66932,2046.54933 1024.696,2047.488 C1026.72268,2048.42667 1028.47199,2049.68533 1029.944,2051.264 C1031.41601,2052.84267 1032.568,2054.67732 1033.4,2056.768 C1034.232,2058.85868 1034.648,2061.07732 1034.648,2063.424 C1034.648,2065.72801 1034.232,2067.92532 1033.4,2070.016 C1032.568,2072.10668 1031.41601,2073.94133 1029.944,2075.52 C1028.47199,2077.09867 1026.72268,2078.34666 1024.696,2079.264 C1022.66932,2080.18134 1020.46135,2080.64 1018.072,2080.64 Z M1005.976,2063.488 C1005.976,2065.36534 1006.28533,2067.10399 1006.904,2068.704 C1007.52267,2070.30401 1008.37599,2071.71199 1009.464,2072.928 C1010.55201,2074.14401 1011.83199,2075.09333 1013.304,2075.776 C1014.77601,2076.45867 1016.34399,2076.8 1018.008,2076.8 C1019.67201,2076.8 1021.23999,2076.448 1022.712,2075.744 C1024.18401,2075.04 1025.47466,2074.08001 1026.584,2072.864 C1027.69334,2071.64799 1028.568,2070.22934 1029.208,2068.608 C1029.848,2066.98666 1030.168,2065.23734 1030.168,2063.36 C1030.168,2061.52532 1029.848,2059.78667 1029.208,2058.144 C1028.568,2056.50133 1027.69334,2055.07201 1026.584,2053.856 C1025.47466,2052.63999 1024.19467,2051.68 1022.744,2050.976 C1021.29333,2050.272 1019.73601,2049.92 1018.072,2049.92 C1016.40799,2049.92 1014.84001,2050.272 1013.368,2050.976 C1011.89599,2051.68 1010.61601,2052.65066 1009.528,2053.888 C1008.43999,2055.12534 1007.576,2056.56533 1006.936,2058.208 C1006.296,2059.85067 1005.976,2061.61066 1005.976,2063.488 Z M1052.056,2080.64 C1048.55732,2080.64 1045.91201,2079.43468 1044.12,2077.024 C1042.32799,2074.61332 1041.432,2071.01869 1041.432,2066.24 L1041.432,2046.656 L1045.784,2046.656 L1045.784,2065.472 C1045.784,2073.02404 1048.36531,2076.8 1053.528,2076.8 C1054.80801,2076.8 1056.06666,2076.58667 1057.304,2076.16 C1058.54134,2075.73333 1059.68266,2075.11467 1060.728,2074.304 C1061.77334,2073.49333 1062.712,2072.53334 1063.544,2071.424 C1064.376,2070.31466 1065.048,2069.05601 1065.56,2067.648 L1065.56,2046.656 L1069.912,2046.656 L1069.912,2074.368 C1069.912,2075.56267 1070.44533,2076.16 1071.512,2076.16 L1071.512,2080 C1070.65866,2080.128 1070.06134,2080.192 1069.72,2080.192 C1068.73866,2080.192 1067.896,2079.89334 1067.192,2079.296 C1066.488,2078.69866 1066.136,2077.952 1066.136,2077.056 L1066.136,2072.448 C1064.64266,2075.05068 1062.65868,2077.06666 1060.184,2078.496 C1057.70932,2079.92534 1055.00001,2080.64 1052.056,2080.64 Z M1093.976,2063.232 C1093.976,2060.88532 1094.38133,2058.66668 1095.192,2056.576 C1096.00267,2054.48532 1097.14399,2052.66134 1098.616,2051.104 C1100.08801,2049.54666 1101.84799,2048.32 1103.896,2047.424 C1105.94401,2046.528 1108.20532,2046.08 1110.68,2046.08 C1113.83735,2046.08 1116.58932,2046.79466 1118.936,2048.224 C1121.28268,2049.65334 1123.05333,2051.58399 1124.248,2054.016 L1120.024,2055.36 C1119.08533,2053.65332 1117.78401,2052.32 1116.12,2051.36 C1114.45599,2050.4 1112.60001,2049.92 1110.552,2049.92 C1108.84532,2049.92 1107.25601,2050.26133 1105.784,2050.944 C1104.31199,2051.62667 1103.03201,2052.55466 1101.944,2053.728 C1100.85599,2054.90134 1100.00267,2056.29866 1099.384,2057.92 C1098.76533,2059.54134 1098.456,2061.31199 1098.456,2063.232 C1098.456,2065.10934 1098.776,2066.87999 1099.416,2068.544 C1100.056,2070.20801 1100.93066,2071.64799 1102.04,2072.864 C1103.14934,2074.08001 1104.43999,2075.04 1105.912,2075.744 C1107.38401,2076.448 1108.95199,2076.8 1110.616,2076.8 C1111.68267,2076.8 1112.73866,2076.65067 1113.784,2076.352 C1114.82934,2076.05333 1115.8,2075.63734 1116.696,2075.104 C1117.592,2074.57066 1118.36,2073.96267 1119,2073.28 C1119.64,2072.59733 1120.088,2071.872 1120.344,2071.104 L1124.568,2072.384 C1124.09866,2073.57867 1123.416,2074.67733 1122.52,2075.68 C1121.624,2076.68267 1120.56801,2077.55733 1119.352,2078.304 C1118.13599,2079.05067 1116.79201,2079.62666 1115.32,2080.032 C1113.84799,2080.43734 1112.32267,2080.64 1110.744,2080.64 C1108.31199,2080.64 1106.07201,2080.18134 1104.024,2079.264 C1101.97599,2078.34666 1100.20534,2077.08801 1098.712,2075.488 C1097.21866,2073.88799 1096.056,2072.04268 1095.224,2069.952 C1094.392,2067.86132 1093.976,2065.62135 1093.976,2063.232 Z M1140.184,2080.64 C1138.47732,2080.64 1136.92001,2080.37334 1135.512,2079.84 C1134.10399,2079.30666 1132.89867,2078.57067 1131.896,2077.632 C1130.89333,2076.69333 1130.11467,2075.60534 1129.56,2074.368 C1129.00533,2073.13066 1128.728,2071.82934 1128.728,2070.464 C1128.728,2068.92799 1129.06933,2067.53067 1129.752,2066.272 C1130.43467,2065.01333 1131.39466,2063.936 1132.632,2063.04 C1133.86934,2062.144 1135.35199,2061.45067 1137.08,2060.96 C1138.80801,2060.46933 1140.71732,2060.224 1142.808,2060.224 C1144.47201,2060.224 1146.17866,2060.37333 1147.928,2060.672 C1149.67734,2060.97067 1151.23466,2061.39733 1152.6,2061.952 L1152.6,2058.944 C1152.6,2055.99999 1151.75734,2053.66401 1150.072,2051.936 C1148.38666,2050.20799 1146.11468,2049.344 1143.256,2049.344 C1141.46399,2049.344 1139.68268,2049.68533 1137.912,2050.368 C1136.14132,2051.05067 1134.33868,2052.03199 1132.504,2053.312 L1130.968,2050.432 C1133.14401,2048.98133 1135.25599,2047.89334 1137.304,2047.168 C1139.35201,2046.44266 1141.48532,2046.08 1143.704,2046.08 C1147.75735,2046.08 1150.97865,2047.25332 1153.368,2049.6 C1155.75735,2051.94668 1156.952,2055.18931 1156.952,2059.328 L1156.952,2074.368 C1156.952,2075.56267 1157.46399,2076.16 1158.488,2076.16 L1158.488,2080 C1158.14666,2080.04267 1157.82667,2080.07467 1157.528,2080.096 C1157.22933,2080.11733 1156.97333,2080.128 1156.76,2080.128 C1155.90666,2080.128 1155.128,2079.872 1154.424,2079.36 C1153.72,2078.848 1153.32533,2078.08001 1153.24,2077.056 L1153.112,2074.432 C1151.66133,2076.39468 1149.75201,2077.91999 1147.384,2079.008 C1145.01599,2080.09601 1142.61601,2080.64 1140.184,2080.64 Z M1141.272,2077.312 C1143.19201,2077.312 1145.10132,2076.896 1147,2076.064 C1148.89868,2075.232 1150.40266,2074.09067 1151.512,2072.64 C1151.81067,2072.256 1152.06667,2071.84 1152.28,2071.392 C1152.49333,2070.944 1152.6,2070.528 1152.6,2070.144 L1152.6,2064.704 C1151.14933,2064.14933 1149.63467,2063.72267 1148.056,2063.424 C1146.47733,2063.12533 1144.94134,2062.976 1143.448,2062.976 C1140.33332,2062.976 1137.80534,2063.60533 1135.864,2064.864 C1133.92266,2066.12267 1132.952,2067.86132 1132.952,2070.08 C1132.952,2070.976 1133.12266,2071.85066 1133.464,2072.704 C1133.80534,2073.55734 1134.328,2074.32533 1135.032,2075.008 C1135.736,2075.69067 1136.59999,2076.24533 1137.624,2076.672 C1138.64801,2077.09867 1139.86399,2077.312 1141.272,2077.312 Z M1194.456,2080 L1190.104,2080 L1190.104,2061.376 C1190.104,2057.40798 1189.52801,2054.52801 1188.376,2052.736 C1187.22399,2050.94399 1185.43201,2050.048 1183,2050.048 C1181.71999,2050.048 1180.44001,2050.28266 1179.16,2050.752 C1177.87999,2051.22134 1176.68534,2051.88266 1175.576,2052.736 C1174.46666,2053.58934 1173.496,2054.60266 1172.664,2055.776 C1171.832,2056.94934 1171.20267,2058.21866 1170.776,2059.584 L1170.776,2080 L1166.424,2080 L1166.424,2046.656 L1170.392,2046.656 L1170.392,2054.208 C1171.07467,2053.01333 1171.91733,2051.91467 1172.92,2050.912 C1173.92267,2049.90933 1175.04266,2049.04534 1176.28,2048.32 C1177.51734,2047.59466 1178.82933,2047.04 1180.216,2046.656 C1181.60267,2046.272 1183.04266,2046.08 1184.536,2046.08 C1186.41334,2046.08 1187.98133,2046.42133 1189.24,2047.104 C1190.49867,2047.78667 1191.512,2048.74666 1192.28,2049.984 C1193.048,2051.22134 1193.60266,2052.73599 1193.944,2054.528 C1194.28534,2056.32001 1194.456,2058.30399 1194.456,2060.48 L1194.456,2080 Z M1234.264,2080.64 C1231.83199,2080.64 1229.60268,2080.18134 1227.576,2079.264 C1225.54932,2078.34666 1223.80001,2077.09867 1222.328,2075.52 C1220.85599,2073.94133 1219.71467,2072.10668 1218.904,2070.016 C1218.09333,2067.92532 1217.688,2065.72801 1217.688,2063.424 C1217.688,2061.07732 1218.104,2058.85868 1218.936,2056.768 C1219.768,2054.67732 1220.91999,2052.84267 1222.392,2051.264 C1223.86401,2049.68533 1225.61332,2048.42667 1227.64,2047.488 C1229.66668,2046.54933 1231.87465,2046.08 1234.264,2046.08 C1236.65335,2046.08 1238.86132,2046.54933 1240.888,2047.488 C1242.91468,2048.42667 1244.66399,2049.68533 1246.136,2051.264 C1247.60801,2052.84267 1248.76,2054.67732 1249.592,2056.768 C1250.424,2058.85868 1250.84,2061.07732 1250.84,2063.424 C1250.84,2065.72801 1250.424,2067.92532 1249.592,2070.016 C1248.76,2072.10668 1247.60801,2073.94133 1246.136,2075.52 C1244.66399,2077.09867 1242.91468,2078.34666 1240.888,2079.264 C1238.86132,2080.18134 1236.65335,2080.64 1234.264,2080.64 Z M1222.168,2063.488 C1222.168,2065.36534 1222.47733,2067.10399 1223.096,2068.704 C1223.71467,2070.30401 1224.56799,2071.71199 1225.656,2072.928 C1226.74401,2074.14401 1228.02399,2075.09333 1229.496,2075.776 C1230.96801,2076.45867 1232.53599,2076.8 1234.2,2076.8 C1235.86401,2076.8 1237.43199,2076.448 1238.904,2075.744 C1240.37601,2075.04 1241.66666,2074.08001 1242.776,2072.864 C1243.88534,2071.64799 1244.76,2070.22934 1245.4,2068.608 C1246.04,2066.98666 1246.36,2065.23734 1246.36,2063.36 C1246.36,2061.52532 1246.04,2059.78667 1245.4,2058.144 C1244.76,2056.50133 1243.88534,2055.07201 1242.776,2053.856 C1241.66666,2052.63999 1240.38667,2051.68 1238.936,2050.976 C1237.48533,2050.272 1235.92801,2049.92 1234.264,2049.92 C1232.59999,2049.92 1231.03201,2050.272 1229.56,2050.976 C1228.08799,2051.68 1226.80801,2052.65066 1225.72,2053.888 C1224.63199,2055.12534 1223.768,2056.56533 1223.128,2058.208 C1222.488,2059.85067 1222.168,2061.61066 1222.168,2063.488 Z M1285.976,2080 L1281.624,2080 L1281.624,2061.376 C1281.624,2057.40798 1281.04801,2054.52801 1279.896,2052.736 C1278.74399,2050.94399 1276.95201,2050.048 1274.52,2050.048 C1273.23999,2050.048 1271.96001,2050.28266 1270.68,2050.752 C1269.39999,2051.22134 1268.20534,2051.88266 1267.096,2052.736 C1265.98666,2053.58934 1265.016,2054.60266 1264.184,2055.776 C1263.352,2056.94934 1262.72267,2058.21866 1262.296,2059.584 L1262.296,2080 L1257.944,2080 L1257.944,2046.656 L1261.912,2046.656 L1261.912,2054.208 C1262.59467,2053.01333 1263.43733,2051.91467 1264.44,2050.912 C1265.44267,2049.90933 1266.56266,2049.04534 1267.8,2048.32 C1269.03734,2047.59466 1270.34933,2047.04 1271.736,2046.656 C1273.12267,2046.272 1274.56266,2046.08 1276.056,2046.08 C1277.93334,2046.08 1279.50133,2046.42133 1280.76,2047.104 C1282.01867,2047.78667 1283.032,2048.74666 1283.8,2049.984 C1284.568,2051.22134 1285.12266,2052.73599 1285.464,2054.528 C1285.80534,2056.32001 1285.976,2058.30399 1285.976,2060.48 L1285.976,2080 Z M1295.192,2033.28 L1299.544,2033.28 L1299.544,2072.448 C1299.544,2073.68534 1299.88533,2074.656 1300.568,2075.36 C1301.25067,2076.064 1302.21066,2076.416 1303.448,2076.416 C1303.91734,2076.416 1304.472,2076.352 1305.112,2076.224 C1305.752,2076.096 1306.34933,2075.92533 1306.904,2075.712 L1307.672,2079.232 C1306.86133,2079.57334 1305.86934,2079.85067 1304.696,2080.064 C1303.52266,2080.27733 1302.50934,2080.384 1301.656,2080.384 C1299.65066,2080.384 1298.07201,2079.81867 1296.92,2078.688 C1295.76799,2077.55733 1295.192,2075.96801 1295.192,2073.92 L1295.192,2033.28 Z M1312.792,2090.304 C1313.00533,2090.34667 1313.21867,2090.37867 1313.432,2090.4 C1313.64533,2090.42133 1313.85867,2090.432 1314.072,2090.432 C1314.49867,2090.432 1314.95733,2090.38933 1315.448,2090.304 C1315.93867,2090.21867 1316.29067,2090.13333 1316.504,2090.048 C1316.71733,2089.96267 1316.94133,2089.78133 1317.176,2089.504 C1317.41067,2089.22667 1317.70933,2088.736 1318.072,2088.032 C1318.43467,2087.328 1318.89333,2086.34667 1319.448,2085.088 C1320.00267,2083.82933 1320.70666,2082.13334 1321.56,2080 L1307.032,2046.656 L1311.576,2046.656 L1323.928,2075.968 L1335.32,2046.656 L1339.48,2046.656 L1322.136,2089.664 C1321.496,2091.24267 1320.63201,2092.416 1319.544,2093.184 C1318.45599,2093.952 1316.93068,2094.336 1314.968,2094.336 C1314.15733,2094.336 1313.432,2094.272 1312.792,2094.144 L1312.792,2090.304 Z M1371.416,2080.64 C1368.81332,2080.64 1366.27468,2080.21334 1363.8,2079.36 C1361.32532,2078.50666 1359.19201,2077.26934 1357.4,2075.648 L1359.384,2072.704 C1361.26134,2074.24001 1363.17066,2075.392 1365.112,2076.16 C1367.05334,2076.928 1369.13332,2077.312 1371.352,2077.312 C1374.04001,2077.312 1376.18399,2076.76801 1377.784,2075.68 C1379.38401,2074.59199 1380.184,2073.04534 1380.184,2071.04 C1380.184,2070.10133 1379.97067,2069.32267 1379.544,2068.704 C1379.11733,2068.08533 1378.488,2067.54134 1377.656,2067.072 C1376.824,2066.60266 1375.77867,2066.18667 1374.52,2065.824 C1373.26133,2065.46133 1371.80001,2065.088 1370.136,2064.704 C1368.21599,2064.23466 1366.55201,2063.76534 1365.144,2063.296 C1363.73599,2062.82666 1362.57334,2062.29334 1361.656,2061.696 C1360.73866,2061.09866 1360.056,2060.36267 1359.608,2059.488 C1359.16,2058.61333 1358.936,2057.51467 1358.936,2056.192 C1358.936,2054.52799 1359.26666,2053.05601 1359.928,2051.776 C1360.58934,2050.49599 1361.48533,2049.44 1362.616,2048.608 C1363.74667,2047.776 1365.06933,2047.14667 1366.584,2046.72 C1368.09867,2046.29333 1369.70932,2046.08 1371.416,2046.08 C1373.97601,2046.08 1376.30132,2046.496 1378.392,2047.328 C1380.48268,2048.16 1382.16799,2049.25866 1383.448,2050.624 L1381.336,2053.184 C1380.09866,2051.90399 1378.59468,2050.944 1376.824,2050.304 C1375.05332,2049.664 1373.20801,2049.344 1371.288,2049.344 C1370.13599,2049.344 1369.06934,2049.46133 1368.088,2049.696 C1367.10666,2049.93067 1366.24267,2050.304 1365.496,2050.816 C1364.74933,2051.328 1364.16267,2051.97866 1363.736,2052.768 C1363.30933,2053.55734 1363.096,2054.48533 1363.096,2055.552 C1363.096,2056.448 1363.24533,2057.17333 1363.544,2057.728 C1363.84267,2058.28267 1364.33333,2058.76266 1365.016,2059.168 C1365.69867,2059.57334 1366.56266,2059.936 1367.608,2060.256 C1368.65334,2060.576 1369.92266,2060.90666 1371.416,2061.248 C1373.54934,2061.76 1375.42666,2062.272 1377.048,2062.784 C1378.66934,2063.296 1380.02399,2063.89333 1381.112,2064.576 C1382.20001,2065.25867 1383.02133,2066.09066 1383.576,2067.072 C1384.13067,2068.05334 1384.408,2069.24799 1384.408,2070.656 C1384.408,2073.72802 1383.23468,2076.15999 1380.888,2077.952 C1378.54132,2079.74401 1375.38402,2080.64 1371.416,2080.64 Z M1389.208,2063.232 C1389.208,2060.88532 1389.61333,2058.66668 1390.424,2056.576 C1391.23467,2054.48532 1392.37599,2052.66134 1393.848,2051.104 C1395.32001,2049.54666 1397.07999,2048.32 1399.128,2047.424 C1401.17601,2046.528 1403.43732,2046.08 1405.912,2046.08 C1409.06935,2046.08 1411.82132,2046.79466 1414.168,2048.224 C1416.51468,2049.65334 1418.28533,2051.58399 1419.48,2054.016 L1415.256,2055.36 C1414.31733,2053.65332 1413.01601,2052.32 1411.352,2051.36 C1409.68799,2050.4 1407.83201,2049.92 1405.784,2049.92 C1404.07732,2049.92 1402.48801,2050.26133 1401.016,2050.944 C1399.54399,2051.62667 1398.26401,2052.55466 1397.176,2053.728 C1396.08799,2054.90134 1395.23467,2056.29866 1394.616,2057.92 C1393.99733,2059.54134 1393.688,2061.31199 1393.688,2063.232 C1393.688,2065.10934 1394.008,2066.87999 1394.648,2068.544 C1395.288,2070.20801 1396.16266,2071.64799 1397.272,2072.864 C1398.38134,2074.08001 1399.67199,2075.04 1401.144,2075.744 C1402.61601,2076.448 1404.18399,2076.8 1405.848,2076.8 C1406.91467,2076.8 1407.97066,2076.65067 1409.016,2076.352 C1410.06134,2076.05333 1411.032,2075.63734 1411.928,2075.104 C1412.824,2074.57066 1413.592,2073.96267 1414.232,2073.28 C1414.872,2072.59733 1415.32,2071.872 1415.576,2071.104 L1419.8,2072.384 C1419.33066,2073.57867 1418.648,2074.67733 1417.752,2075.68 C1416.856,2076.68267 1415.80001,2077.55733 1414.584,2078.304 C1413.36799,2079.05067 1412.02401,2079.62666 1410.552,2080.032 C1409.07999,2080.43734 1407.55467,2080.64 1405.976,2080.64 C1403.54399,2080.64 1401.30401,2080.18134 1399.256,2079.264 C1397.20799,2078.34666 1395.43734,2077.08801 1393.944,2075.488 C1392.45066,2073.88799 1391.288,2072.04268 1390.456,2069.952 C1389.624,2067.86132 1389.208,2065.62135 1389.208,2063.232 Z M1435.416,2080.64 C1433.70932,2080.64 1432.15201,2080.37334 1430.744,2079.84 C1429.33599,2079.30666 1428.13067,2078.57067 1427.128,2077.632 C1426.12533,2076.69333 1425.34667,2075.60534 1424.792,2074.368 C1424.23733,2073.13066 1423.96,2071.82934 1423.96,2070.464 C1423.96,2068.92799 1424.30133,2067.53067 1424.984,2066.272 C1425.66667,2065.01333 1426.62666,2063.936 1427.864,2063.04 C1429.10134,2062.144 1430.58399,2061.45067 1432.312,2060.96 C1434.04001,2060.46933 1435.94932,2060.224 1438.04,2060.224 C1439.70401,2060.224 1441.41066,2060.37333 1443.16,2060.672 C1444.90934,2060.97067 1446.46666,2061.39733 1447.832,2061.952 L1447.832,2058.944 C1447.832,2055.99999 1446.98934,2053.66401 1445.304,2051.936 C1443.61866,2050.20799 1441.34668,2049.344 1438.488,2049.344 C1436.69599,2049.344 1434.91468,2049.68533 1433.144,2050.368 C1431.37332,2051.05067 1429.57068,2052.03199 1427.736,2053.312 L1426.2,2050.432 C1428.37601,2048.98133 1430.48799,2047.89334 1432.536,2047.168 C1434.58401,2046.44266 1436.71732,2046.08 1438.936,2046.08 C1442.98935,2046.08 1446.21065,2047.25332 1448.6,2049.6 C1450.98935,2051.94668 1452.184,2055.18931 1452.184,2059.328 L1452.184,2074.368 C1452.184,2075.56267 1452.69599,2076.16 1453.72,2076.16 L1453.72,2080 C1453.37866,2080.04267 1453.05867,2080.07467 1452.76,2080.096 C1452.46133,2080.11733 1452.20533,2080.128 1451.992,2080.128 C1451.13866,2080.128 1450.36,2079.872 1449.656,2079.36 C1448.952,2078.848 1448.55733,2078.08001 1448.472,2077.056 L1448.344,2074.432 C1446.89333,2076.39468 1444.98401,2077.91999 1442.616,2079.008 C1440.24799,2080.09601 1437.84801,2080.64 1435.416,2080.64 Z M1436.504,2077.312 C1438.42401,2077.312 1440.33332,2076.896 1442.232,2076.064 C1444.13068,2075.232 1445.63466,2074.09067 1446.744,2072.64 C1447.04267,2072.256 1447.29867,2071.84 1447.512,2071.392 C1447.72533,2070.944 1447.832,2070.528 1447.832,2070.144 L1447.832,2064.704 C1446.38133,2064.14933 1444.86667,2063.72267 1443.288,2063.424 C1441.70933,2063.12533 1440.17334,2062.976 1438.68,2062.976 C1435.56532,2062.976 1433.03734,2063.60533 1431.096,2064.864 C1429.15466,2066.12267 1428.184,2067.86132 1428.184,2070.08 C1428.184,2070.976 1428.35466,2071.85066 1428.696,2072.704 C1429.03734,2073.55734 1429.56,2074.32533 1430.264,2075.008 C1430.968,2075.69067 1431.83199,2076.24533 1432.856,2076.672 C1433.88001,2077.09867 1435.09599,2077.312 1436.504,2077.312 Z M1461.848,2033.28 L1466.2,2033.28 L1466.2,2072.448 C1466.2,2073.68534 1466.54133,2074.656 1467.224,2075.36 C1467.90667,2076.064 1468.86666,2076.416 1470.104,2076.416 C1470.57334,2076.416 1471.128,2076.352 1471.768,2076.224 C1472.408,2076.096 1473.00533,2075.92533 1473.56,2075.712 L1474.328,2079.232 C1473.51733,2079.57334 1472.52534,2079.85067 1471.352,2080.064 C1470.17866,2080.27733 1469.16534,2080.384 1468.312,2080.384 C1466.30666,2080.384 1464.72801,2079.81867 1463.576,2078.688 C1462.42399,2077.55733 1461.848,2075.96801 1461.848,2073.92 L1461.848,2033.28 Z M1493.144,2080.64 C1490.71199,2080.64 1488.47201,2080.18134 1486.424,2079.264 C1484.37599,2078.34666 1482.60534,2077.08801 1481.112,2075.488 C1479.61866,2073.88799 1478.456,2072.04268 1477.624,2069.952 C1476.792,2067.86132 1476.376,2065.62135 1476.376,2063.232 C1476.376,2060.88532 1476.792,2058.67734 1477.624,2056.608 C1478.456,2054.53866 1479.61866,2052.72534 1481.112,2051.168 C1482.60534,2049.61066 1484.36532,2048.37334 1486.392,2047.456 C1488.41868,2046.53866 1490.64799,2046.08 1493.08,2046.08 C1495.51201,2046.08 1497.74132,2046.53866 1499.768,2047.456 C1501.79468,2048.37334 1503.53333,2049.62133 1504.984,2051.2 C1506.43467,2052.77867 1507.56533,2054.59199 1508.376,2056.64 C1509.18667,2058.68801 1509.592,2060.86399 1509.592,2063.168 C1509.592,2063.50934 1509.58133,2063.85066 1509.56,2064.192 C1509.53867,2064.53334 1509.50667,2064.768 1509.464,2064.896 L1480.984,2064.896 C1481.112,2066.68801 1481.528,2068.34133 1482.232,2069.856 C1482.936,2071.37067 1483.83199,2072.68266 1484.92,2073.792 C1486.00801,2074.90134 1487.26666,2075.76533 1488.696,2076.384 C1490.12534,2077.00267 1491.65066,2077.312 1493.272,2077.312 C1494.38134,2077.312 1495.46933,2077.16267 1496.536,2076.864 C1497.60267,2076.56533 1498.584,2076.16 1499.48,2075.648 C1500.376,2075.136 1501.176,2074.50667 1501.88,2073.76 C1502.584,2073.01333 1503.128,2072.192 1503.512,2071.296 L1507.288,2072.32 C1506.776,2073.55734 1506.05067,2074.67733 1505.112,2075.68 C1504.17333,2076.68267 1503.08534,2077.55733 1501.848,2078.304 C1500.61066,2079.05067 1499.24534,2079.62666 1497.752,2080.032 C1496.25866,2080.43734 1494.72267,2080.64 1493.144,2080.64 Z M1505.432,2061.568 C1505.304,2059.77599 1504.888,2058.14401 1504.184,2056.672 C1503.48,2055.19999 1502.58401,2053.93067 1501.496,2052.864 C1500.40799,2051.79733 1499.13867,2050.96534 1497.688,2050.368 C1496.23733,2049.77066 1494.70134,2049.472 1493.08,2049.472 C1491.45866,2049.472 1489.92267,2049.77066 1488.472,2050.368 C1487.02133,2050.96534 1485.75201,2051.79733 1484.664,2052.864 C1483.57599,2053.93067 1482.70134,2055.21066 1482.04,2056.704 C1481.37866,2058.19734 1480.984,2059.81866 1480.856,2061.568 L1505.432,2061.568 Z M1546.008,2080.448 C1543.70399,2080.448 1541.60268,2079.968 1539.704,2079.008 C1537.80532,2078.048 1536.16267,2076.77867 1534.776,2075.2 C1533.38933,2073.62133 1532.312,2071.80801 1531.544,2069.76 C1530.776,2067.71199 1530.392,2065.60001 1530.392,2063.424 C1530.392,2061.11999 1530.76533,2058.91201 1531.512,2056.8 C1532.25867,2054.68799 1533.31466,2052.84267 1534.68,2051.264 C1536.04534,2049.68533 1537.67732,2048.42667 1539.576,2047.488 C1541.47468,2046.54933 1543.57599,2046.08 1545.88,2046.08 C1548.73868,2046.08 1551.21332,2046.79466 1553.304,2048.224 C1555.39468,2049.65334 1557.18666,2051.45599 1558.68,2053.632 L1558.68,2046.656 L1562.584,2046.656 L1562.584,2080.128 C1562.584,2082.43201 1562.14667,2084.46932 1561.272,2086.24 C1560.39733,2088.01068 1559.22401,2089.49333 1557.752,2090.688 C1556.27999,2091.88267 1554.54134,2092.77866 1552.536,2093.376 C1550.53066,2093.97334 1548.41868,2094.272 1546.2,2094.272 C1542.40265,2094.272 1539.33068,2093.58934 1536.984,2092.224 C1534.63732,2090.85866 1532.73867,2089.02401 1531.288,2086.72 L1533.976,2084.608 C1535.29867,2086.74134 1537.04799,2088.30933 1539.224,2089.312 C1541.40001,2090.31467 1543.72532,2090.816 1546.2,2090.816 C1547.82134,2090.816 1549.36799,2090.592 1550.84,2090.144 C1552.31201,2089.696 1553.59199,2089.03467 1554.68,2088.16 C1555.76801,2087.28533 1556.632,2086.17601 1557.272,2084.832 C1557.912,2083.48799 1558.232,2081.92001 1558.232,2080.128 L1558.232,2073.536 C1556.90933,2075.66934 1555.14934,2077.35466 1552.952,2078.592 C1550.75466,2079.82934 1548.44001,2080.448 1546.008,2080.448 Z M1547.224,2076.8 C1548.50401,2076.8 1549.76266,2076.56534 1551,2076.096 C1552.23734,2075.62666 1553.35733,2074.99734 1554.36,2074.208 C1555.36267,2073.41866 1556.20533,2072.53334 1556.888,2071.552 C1557.57067,2070.57066 1558.01867,2069.56801 1558.232,2068.544 L1558.232,2058.24 C1557.76266,2057.04533 1557.112,2055.93601 1556.28,2054.912 C1555.448,2053.88799 1554.52001,2053.01334 1553.496,2052.288 C1552.47199,2051.56266 1551.37334,2050.98667 1550.2,2050.56 C1549.02666,2050.13333 1547.84267,2049.92 1546.648,2049.92 C1544.77066,2049.92 1543.10667,2050.31466 1541.656,2051.104 C1540.20533,2051.89334 1538.96801,2052.92799 1537.944,2054.208 C1536.91999,2055.48801 1536.14134,2056.93866 1535.608,2058.56 C1535.07466,2060.18134 1534.808,2061.82399 1534.808,2063.488 C1534.808,2065.28001 1535.128,2066.98666 1535.768,2068.608 C1536.408,2070.22934 1537.28266,2071.64799 1538.392,2072.864 C1539.50134,2074.08001 1540.81333,2075.04 1542.328,2075.744 C1543.84267,2076.448 1545.47466,2076.8 1547.224,2076.8 Z M1588.568,2050.496 C1585.62399,2050.58133 1583.06401,2051.39199 1580.888,2052.928 C1578.71199,2054.46401 1577.176,2056.57599 1576.28,2059.264 L1576.28,2080 L1571.928,2080 L1571.928,2046.656 L1576.024,2046.656 L1576.024,2054.656 C1577.17601,2052.30932 1578.69066,2050.35734 1580.568,2048.8 C1582.44534,2047.24266 1584.47199,2046.464 1586.648,2046.464 L1587.736,2046.464 C1588.07734,2046.464 1588.35467,2046.48533 1588.568,2046.528 L1588.568,2050.496 Z M1607.256,2080.64 C1604.82399,2080.64 1602.59468,2080.18134 1600.568,2079.264 C1598.54132,2078.34666 1596.79201,2077.09867 1595.32,2075.52 C1593.84799,2073.94133 1592.70667,2072.10668 1591.896,2070.016 C1591.08533,2067.92532 1590.68,2065.72801 1590.68,2063.424 C1590.68,2061.07732 1591.096,2058.85868 1591.928,2056.768 C1592.76,2054.67732 1593.91199,2052.84267 1595.384,2051.264 C1596.85601,2049.68533 1598.60532,2048.42667 1600.632,2047.488 C1602.65868,2046.54933 1604.86665,2046.08 1607.256,2046.08 C1609.64535,2046.08 1611.85332,2046.54933 1613.88,2047.488 C1615.90668,2048.42667 1617.65599,2049.68533 1619.128,2051.264 C1620.60001,2052.84267 1621.752,2054.67732 1622.584,2056.768 C1623.416,2058.85868 1623.832,2061.07732 1623.832,2063.424 C1623.832,2065.72801 1623.416,2067.92532 1622.584,2070.016 C1621.752,2072.10668 1620.60001,2073.94133 1619.128,2075.52 C1617.65599,2077.09867 1615.90668,2078.34666 1613.88,2079.264 C1611.85332,2080.18134 1609.64535,2080.64 1607.256,2080.64 Z M1595.16,2063.488 C1595.16,2065.36534 1595.46933,2067.10399 1596.088,2068.704 C1596.70667,2070.30401 1597.55999,2071.71199 1598.648,2072.928 C1599.73601,2074.14401 1601.01599,2075.09333 1602.488,2075.776 C1603.96001,2076.45867 1605.52799,2076.8 1607.192,2076.8 C1608.85601,2076.8 1610.42399,2076.448 1611.896,2075.744 C1613.36801,2075.04 1614.65866,2074.08001 1615.768,2072.864 C1616.87734,2071.64799 1617.752,2070.22934 1618.392,2068.608 C1619.032,2066.98666 1619.352,2065.23734 1619.352,2063.36 C1619.352,2061.52532 1619.032,2059.78667 1618.392,2058.144 C1617.752,2056.50133 1616.87734,2055.07201 1615.768,2053.856 C1614.65866,2052.63999 1613.37867,2051.68 1611.928,2050.976 C1610.47733,2050.272 1608.92001,2049.92 1607.256,2049.92 C1605.59199,2049.92 1604.02401,2050.272 1602.552,2050.976 C1601.07999,2051.68 1599.80001,2052.65066 1598.712,2053.888 C1597.62399,2055.12534 1596.76,2056.56533 1596.12,2058.208 C1595.48,2059.85067 1595.16,2061.61066 1595.16,2063.488 Z M1641.24,2080.64 C1637.74132,2080.64 1635.09601,2079.43468 1633.304,2077.024 C1631.51199,2074.61332 1630.616,2071.01869 1630.616,2066.24 L1630.616,2046.656 L1634.968,2046.656 L1634.968,2065.472 C1634.968,2073.02404 1637.54931,2076.8 1642.712,2076.8 C1643.99201,2076.8 1645.25066,2076.58667 1646.488,2076.16 C1647.72534,2075.73333 1648.86666,2075.11467 1649.912,2074.304 C1650.95734,2073.49333 1651.896,2072.53334 1652.728,2071.424 C1653.56,2070.31466 1654.232,2069.05601 1654.744,2067.648 L1654.744,2046.656 L1659.096,2046.656 L1659.096,2074.368 C1659.096,2075.56267 1659.62933,2076.16 1660.696,2076.16 L1660.696,2080 C1659.84266,2080.128 1659.24534,2080.192 1658.904,2080.192 C1657.92266,2080.192 1657.08,2079.89334 1656.376,2079.296 C1655.672,2078.69866 1655.32,2077.952 1655.32,2077.056 L1655.32,2072.448 C1653.82666,2075.05068 1651.84268,2077.06666 1649.368,2078.496 C1646.89332,2079.92534 1644.18401,2080.64 1641.24,2080.64 Z M1686.04,2080.64 C1683.22399,2080.64 1680.72801,2079.92534 1678.552,2078.496 C1676.37599,2077.06666 1674.62667,2075.26401 1673.304,2073.088 L1673.304,2093.632 L1668.952,2093.632 L1668.952,2046.656 L1672.856,2046.656 L1672.856,2053.12 C1674.22134,2051.02932 1675.99199,2049.33334 1678.168,2048.032 C1680.34401,2046.73066 1682.71199,2046.08 1685.272,2046.08 C1687.57601,2046.08 1689.69866,2046.56 1691.64,2047.52 C1693.58134,2048.48 1695.25599,2049.75999 1696.664,2051.36 C1698.07201,2052.96001 1699.17066,2054.80532 1699.96,2056.896 C1700.74934,2058.98668 1701.144,2061.14132 1701.144,2063.36 C1701.144,2065.70668 1700.78134,2067.92532 1700.056,2070.016 C1699.33066,2072.10668 1698.29601,2073.94133 1696.952,2075.52 C1695.60799,2077.09867 1694.00801,2078.34666 1692.152,2079.264 C1690.29599,2080.18134 1688.25868,2080.64 1686.04,2080.64 Z M1684.824,2076.8 C1686.61601,2076.8 1688.23733,2076.416 1689.688,2075.648 C1691.13867,2074.88 1692.38666,2073.86667 1693.432,2072.608 C1694.47734,2071.34933 1695.27733,2069.92001 1695.832,2068.32 C1696.38667,2066.71999 1696.664,2065.06668 1696.664,2063.36 C1696.664,2061.56799 1696.344,2059.86134 1695.704,2058.24 C1695.064,2056.61866 1694.18934,2055.18934 1693.08,2053.952 C1691.97066,2052.71466 1690.65867,2051.73334 1689.144,2051.008 C1687.62933,2050.28266 1685.99734,2049.92 1684.248,2049.92 C1683.13866,2049.92 1681.98667,2050.144 1680.792,2050.592 C1679.59733,2051.04 1678.46667,2051.63733 1677.4,2052.384 C1676.33333,2053.13067 1675.42667,2054.00533 1674.68,2055.008 C1673.93333,2056.01067 1673.47467,2057.06666 1673.304,2058.176 L1673.304,2068.416 C1673.816,2069.61067 1674.46666,2070.71999 1675.256,2071.744 C1676.04534,2072.76801 1676.94133,2073.65333 1677.944,2074.4 C1678.94667,2075.14667 1680.03466,2075.73333 1681.208,2076.16 C1682.38134,2076.58667 1683.58666,2076.8 1684.824,2076.8 Z M1719.512,2080.64 C1716.90932,2080.64 1714.37068,2080.21334 1711.896,2079.36 C1709.42132,2078.50666 1707.28801,2077.26934 1705.496,2075.648 L1707.48,2072.704 C1709.35734,2074.24001 1711.26666,2075.392 1713.208,2076.16 C1715.14934,2076.928 1717.22932,2077.312 1719.448,2077.312 C1722.13601,2077.312 1724.27999,2076.76801 1725.88,2075.68 C1727.48001,2074.59199 1728.28,2073.04534 1728.28,2071.04 C1728.28,2070.10133 1728.06667,2069.32267 1727.64,2068.704 C1727.21333,2068.08533 1726.584,2067.54134 1725.752,2067.072 C1724.92,2066.60266 1723.87467,2066.18667 1722.616,2065.824 C1721.35733,2065.46133 1719.89601,2065.088 1718.232,2064.704 C1716.31199,2064.23466 1714.64801,2063.76534 1713.24,2063.296 C1711.83199,2062.82666 1710.66934,2062.29334 1709.752,2061.696 C1708.83466,2061.09866 1708.152,2060.36267 1707.704,2059.488 C1707.256,2058.61333 1707.032,2057.51467 1707.032,2056.192 C1707.032,2054.52799 1707.36266,2053.05601 1708.024,2051.776 C1708.68534,2050.49599 1709.58133,2049.44 1710.712,2048.608 C1711.84267,2047.776 1713.16533,2047.14667 1714.68,2046.72 C1716.19467,2046.29333 1717.80532,2046.08 1719.512,2046.08 C1722.07201,2046.08 1724.39732,2046.496 1726.488,2047.328 C1728.57868,2048.16 1730.26399,2049.25866 1731.544,2050.624 L1729.432,2053.184 C1728.19466,2051.90399 1726.69068,2050.944 1724.92,2050.304 C1723.14932,2049.664 1721.30401,2049.344 1719.384,2049.344 C1718.23199,2049.344 1717.16534,2049.46133 1716.184,2049.696 C1715.20266,2049.93067 1714.33867,2050.304 1713.592,2050.816 C1712.84533,2051.328 1712.25867,2051.97866 1711.832,2052.768 C1711.40533,2053.55734 1711.192,2054.48533 1711.192,2055.552 C1711.192,2056.448 1711.34133,2057.17333 1711.64,2057.728 C1711.93867,2058.28267 1712.42933,2058.76266 1713.112,2059.168 C1713.79467,2059.57334 1714.65866,2059.936 1715.704,2060.256 C1716.74934,2060.576 1718.01866,2060.90666 1719.512,2061.248 C1721.64534,2061.76 1723.52266,2062.272 1725.144,2062.784 C1726.76534,2063.296 1728.11999,2063.89333 1729.208,2064.576 C1730.29601,2065.25867 1731.11733,2066.09066 1731.672,2067.072 C1732.22667,2068.05334 1732.504,2069.24799 1732.504,2070.656 C1732.504,2073.72802 1731.33068,2076.15999 1728.984,2077.952 C1726.63732,2079.74401 1723.48002,2080.64 1719.512,2080.64 Z M1766.168,2080.64 C1762.66932,2080.64 1760.02401,2079.43468 1758.232,2077.024 C1756.43999,2074.61332 1755.544,2071.01869 1755.544,2066.24 L1755.544,2046.656 L1759.896,2046.656 L1759.896,2065.472 C1759.896,2073.02404 1762.47731,2076.8 1767.64,2076.8 C1768.92001,2076.8 1770.17866,2076.58667 1771.416,2076.16 C1772.65334,2075.73333 1773.79466,2075.11467 1774.84,2074.304 C1775.88534,2073.49333 1776.824,2072.53334 1777.656,2071.424 C1778.488,2070.31466 1779.16,2069.05601 1779.672,2067.648 L1779.672,2046.656 L1784.024,2046.656 L1784.024,2074.368 C1784.024,2075.56267 1784.55733,2076.16 1785.624,2076.16 L1785.624,2080 C1784.77066,2080.128 1784.17334,2080.192 1783.832,2080.192 C1782.85066,2080.192 1782.008,2079.89334 1781.304,2079.296 C1780.6,2078.69866 1780.248,2077.952 1780.248,2077.056 L1780.248,2072.448 C1778.75466,2075.05068 1776.77068,2077.06666 1774.296,2078.496 C1771.82132,2079.92534 1769.11201,2080.64 1766.168,2080.64 Z M1805.08,2080.64 C1802.47732,2080.64 1799.93868,2080.21334 1797.464,2079.36 C1794.98932,2078.50666 1792.85601,2077.26934 1791.064,2075.648 L1793.048,2072.704 C1794.92534,2074.24001 1796.83466,2075.392 1798.776,2076.16 C1800.71734,2076.928 1802.79732,2077.312 1805.016,2077.312 C1807.70401,2077.312 1809.84799,2076.76801 1811.448,2075.68 C1813.04801,2074.59199 1813.848,2073.04534 1813.848,2071.04 C1813.848,2070.10133 1813.63467,2069.32267 1813.208,2068.704 C1812.78133,2068.08533 1812.152,2067.54134 1811.32,2067.072 C1810.488,2066.60266 1809.44267,2066.18667 1808.184,2065.824 C1806.92533,2065.46133 1805.46401,2065.088 1803.8,2064.704 C1801.87999,2064.23466 1800.21601,2063.76534 1798.808,2063.296 C1797.39999,2062.82666 1796.23734,2062.29334 1795.32,2061.696 C1794.40266,2061.09866 1793.72,2060.36267 1793.272,2059.488 C1792.824,2058.61333 1792.6,2057.51467 1792.6,2056.192 C1792.6,2054.52799 1792.93066,2053.05601 1793.592,2051.776 C1794.25334,2050.49599 1795.14933,2049.44 1796.28,2048.608 C1797.41067,2047.776 1798.73333,2047.14667 1800.248,2046.72 C1801.76267,2046.29333 1803.37332,2046.08 1805.08,2046.08 C1807.64001,2046.08 1809.96532,2046.496 1812.056,2047.328 C1814.14668,2048.16 1815.83199,2049.25866 1817.112,2050.624 L1815,2053.184 C1813.76266,2051.90399 1812.25868,2050.944 1810.488,2050.304 C1808.71732,2049.664 1806.87201,2049.344 1804.952,2049.344 C1803.79999,2049.344 1802.73334,2049.46133 1801.752,2049.696 C1800.77066,2049.93067 1799.90667,2050.304 1799.16,2050.816 C1798.41333,2051.328 1797.82667,2051.97866 1797.4,2052.768 C1796.97333,2053.55734 1796.76,2054.48533 1796.76,2055.552 C1796.76,2056.448 1796.90933,2057.17333 1797.208,2057.728 C1797.50667,2058.28267 1797.99733,2058.76266 1798.68,2059.168 C1799.36267,2059.57334 1800.22666,2059.936 1801.272,2060.256 C1802.31734,2060.576 1803.58666,2060.90666 1805.08,2061.248 C1807.21334,2061.76 1809.09066,2062.272 1810.712,2062.784 C1812.33334,2063.296 1813.68799,2063.89333 1814.776,2064.576 C1815.86401,2065.25867 1816.68533,2066.09066 1817.24,2067.072 C1817.79467,2068.05334 1818.072,2069.24799 1818.072,2070.656 C1818.072,2073.72802 1816.89868,2076.15999 1814.552,2077.952 C1812.20532,2079.74401 1809.04802,2080.64 1805.08,2080.64 Z M1825.048,2080 L1825.048,2046.656 L1829.4,2046.656 L1829.4,2080 L1825.048,2080 Z M1825.048,2039.68 L1825.048,2033.28 L1829.4,2033.28 L1829.4,2039.68 L1825.048,2039.68 Z M1866.776,2080 L1862.424,2080 L1862.424,2061.376 C1862.424,2057.40798 1861.84801,2054.52801 1860.696,2052.736 C1859.54399,2050.94399 1857.75201,2050.048 1855.32,2050.048 C1854.03999,2050.048 1852.76001,2050.28266 1851.48,2050.752 C1850.19999,2051.22134 1849.00534,2051.88266 1847.896,2052.736 C1846.78666,2053.58934 1845.816,2054.60266 1844.984,2055.776 C1844.152,2056.94934 1843.52267,2058.21866 1843.096,2059.584 L1843.096,2080 L1838.744,2080 L1838.744,2046.656 L1842.712,2046.656 L1842.712,2054.208 C1843.39467,2053.01333 1844.23733,2051.91467 1845.24,2050.912 C1846.24267,2049.90933 1847.36266,2049.04534 1848.6,2048.32 C1849.83734,2047.59466 1851.14933,2047.04 1852.536,2046.656 C1853.92267,2046.272 1855.36266,2046.08 1856.856,2046.08 C1858.73334,2046.08 1860.30133,2046.42133 1861.56,2047.104 C1862.81867,2047.78667 1863.832,2048.74666 1864.6,2049.984 C1865.368,2051.22134 1865.92266,2052.73599 1866.264,2054.528 C1866.60534,2056.32001 1866.776,2058.30399 1866.776,2060.48 L1866.776,2080 Z M1889.304,2080.448 C1886.99999,2080.448 1884.89868,2079.968 1883,2079.008 C1881.10132,2078.048 1879.45867,2076.77867 1878.072,2075.2 C1876.68533,2073.62133 1875.608,2071.80801 1874.84,2069.76 C1874.072,2067.71199 1873.688,2065.60001 1873.688,2063.424 C1873.688,2061.11999 1874.06133,2058.91201 1874.808,2056.8 C1875.55467,2054.68799 1876.61066,2052.84267 1877.976,2051.264 C1879.34134,2049.68533 1880.97332,2048.42667 1882.872,2047.488 C1884.77068,2046.54933 1886.87199,2046.08 1889.176,2046.08 C1892.03468,2046.08 1894.50932,2046.79466 1896.6,2048.224 C1898.69068,2049.65334 1900.48266,2051.45599 1901.976,2053.632 L1901.976,2046.656 L1905.88,2046.656 L1905.88,2080.128 C1905.88,2082.43201 1905.44267,2084.46932 1904.568,2086.24 C1903.69333,2088.01068 1902.52001,2089.49333 1901.048,2090.688 C1899.57599,2091.88267 1897.83734,2092.77866 1895.832,2093.376 C1893.82666,2093.97334 1891.71468,2094.272 1889.496,2094.272 C1885.69865,2094.272 1882.62668,2093.58934 1880.28,2092.224 C1877.93332,2090.85866 1876.03467,2089.02401 1874.584,2086.72 L1877.272,2084.608 C1878.59467,2086.74134 1880.34399,2088.30933 1882.52,2089.312 C1884.69601,2090.31467 1887.02132,2090.816 1889.496,2090.816 C1891.11734,2090.816 1892.66399,2090.592 1894.136,2090.144 C1895.60801,2089.696 1896.88799,2089.03467 1897.976,2088.16 C1899.06401,2087.28533 1899.928,2086.17601 1900.568,2084.832 C1901.208,2083.48799 1901.528,2081.92001 1901.528,2080.128 L1901.528,2073.536 C1900.20533,2075.66934 1898.44534,2077.35466 1896.248,2078.592 C1894.05066,2079.82934 1891.73601,2080.448 1889.304,2080.448 Z M1890.52,2076.8 C1891.80001,2076.8 1893.05866,2076.56534 1894.296,2076.096 C1895.53334,2075.62666 1896.65333,2074.99734 1897.656,2074.208 C1898.65867,2073.41866 1899.50133,2072.53334 1900.184,2071.552 C1900.86667,2070.57066 1901.31467,2069.56801 1901.528,2068.544 L1901.528,2058.24 C1901.05866,2057.04533 1900.408,2055.93601 1899.576,2054.912 C1898.744,2053.88799 1897.81601,2053.01334 1896.792,2052.288 C1895.76799,2051.56266 1894.66934,2050.98667 1893.496,2050.56 C1892.32266,2050.13333 1891.13867,2049.92 1889.944,2049.92 C1888.06666,2049.92 1886.40267,2050.31466 1884.952,2051.104 C1883.50133,2051.89334 1882.26401,2052.92799 1881.24,2054.208 C1880.21599,2055.48801 1879.43734,2056.93866 1878.904,2058.56 C1878.37066,2060.18134 1878.104,2061.82399 1878.104,2063.488 C1878.104,2065.28001 1878.424,2066.98666 1879.064,2068.608 C1879.704,2070.22934 1880.57866,2071.64799 1881.688,2072.864 C1882.79734,2074.08001 1884.10933,2075.04 1885.624,2075.744 C1887.13867,2076.448 1888.77066,2076.8 1890.52,2076.8 Z M1947.736,2078.4 C1947.48,2078.528 1947.10667,2078.69867 1946.616,2078.912 C1946.12533,2079.12533 1945.56,2079.33867 1944.92,2079.552 C1944.28,2079.76533 1943.55467,2079.95733 1942.744,2080.128 C1941.93333,2080.29867 1941.08,2080.384 1940.184,2080.384 C1939.24533,2080.384 1938.34934,2080.256 1937.496,2080 C1936.64266,2079.744 1935.896,2079.34934 1935.256,2078.816 C1934.616,2078.28266 1934.104,2077.61067 1933.72,2076.8 C1933.336,2075.98933 1933.144,2075.05067 1933.144,2073.984 L1933.144,2050.112 L1928.536,2050.112 L1928.536,2046.656 L1933.144,2046.656 L1933.144,2035.392 L1937.496,2035.392 L1937.496,2046.656 L1945.176,2046.656 L1945.176,2050.112 L1937.496,2050.112 L1937.496,2072.768 C1937.58133,2074.00534 1938.008,2074.912 1938.776,2075.488 C1939.544,2076.064 1940.46133,2076.352 1941.528,2076.352 C1942.76534,2076.352 1943.85333,2076.14934 1944.792,2075.744 C1945.73067,2075.33866 1946.328,2075.05067 1946.584,2074.88 L1947.736,2078.4 Z M1980.888,2080 L1976.536,2080 L1976.536,2061.376 C1976.536,2057.57865 1975.88534,2054.74134 1974.584,2052.864 C1973.28266,2050.98666 1971.37335,2050.048 1968.856,2050.048 C1967.61866,2050.048 1966.39201,2050.29333 1965.176,2050.784 C1963.95999,2051.27467 1962.81867,2051.94666 1961.752,2052.8 C1960.68533,2053.65334 1959.75734,2054.65599 1958.968,2055.808 C1958.17866,2056.96001 1957.592,2058.21866 1957.208,2059.584 L1957.208,2080 L1952.856,2080 L1952.856,2033.28 L1957.208,2033.28 L1957.208,2054.208 C1958.57334,2051.69065 1960.42932,2049.70667 1962.776,2048.256 C1965.12268,2046.80533 1967.63999,2046.08 1970.328,2046.08 C1972.24801,2046.08 1973.87999,2046.432 1975.224,2047.136 C1976.56801,2047.84 1977.656,2048.82133 1978.488,2050.08 C1979.32,2051.33867 1979.928,2052.85332 1980.312,2054.624 C1980.696,2056.39468 1980.888,2058.34666 1980.888,2060.48 L1980.888,2080 Z M2004.504,2080.64 C2002.07199,2080.64 1999.83201,2080.18134 1997.784,2079.264 C1995.73599,2078.34666 1993.96534,2077.08801 1992.472,2075.488 C1990.97866,2073.88799 1989.816,2072.04268 1988.984,2069.952 C1988.152,2067.86132 1987.736,2065.62135 1987.736,2063.232 C1987.736,2060.88532 1988.152,2058.67734 1988.984,2056.608 C1989.816,2054.53866 1990.97866,2052.72534 1992.472,2051.168 C1993.96534,2049.61066 1995.72532,2048.37334 1997.752,2047.456 C1999.77868,2046.53866 2002.00799,2046.08 2004.44,2046.08 C2006.87201,2046.08 2009.10132,2046.53866 2011.128,2047.456 C2013.15468,2048.37334 2014.89333,2049.62133 2016.344,2051.2 C2017.79467,2052.77867 2018.92533,2054.59199 2019.736,2056.64 C2020.54667,2058.68801 2020.952,2060.86399 2020.952,2063.168 C2020.952,2063.50934 2020.94133,2063.85066 2020.92,2064.192 C2020.89867,2064.53334 2020.86667,2064.768 2020.824,2064.896 L1992.344,2064.896 C1992.472,2066.68801 1992.888,2068.34133 1993.592,2069.856 C1994.296,2071.37067 1995.19199,2072.68266 1996.28,2073.792 C1997.36801,2074.90134 1998.62666,2075.76533 2000.056,2076.384 C2001.48534,2077.00267 2003.01066,2077.312 2004.632,2077.312 C2005.74134,2077.312 2006.82933,2077.16267 2007.896,2076.864 C2008.96267,2076.56533 2009.944,2076.16 2010.84,2075.648 C2011.736,2075.136 2012.536,2074.50667 2013.24,2073.76 C2013.944,2073.01333 2014.488,2072.192 2014.872,2071.296 L2018.648,2072.32 C2018.136,2073.55734 2017.41067,2074.67733 2016.472,2075.68 C2015.53333,2076.68267 2014.44534,2077.55733 2013.208,2078.304 C2011.97066,2079.05067 2010.60534,2079.62666 2009.112,2080.032 C2007.61866,2080.43734 2006.08267,2080.64 2004.504,2080.64 Z M2016.792,2061.568 C2016.664,2059.77599 2016.248,2058.14401 2015.544,2056.672 C2014.84,2055.19999 2013.94401,2053.93067 2012.856,2052.864 C2011.76799,2051.79733 2010.49867,2050.96534 2009.048,2050.368 C2007.59733,2049.77066 2006.06134,2049.472 2004.44,2049.472 C2002.81866,2049.472 2001.28267,2049.77066 1999.832,2050.368 C1998.38133,2050.96534 1997.11201,2051.79733 1996.024,2052.864 C1994.93599,2053.93067 1994.06134,2055.21066 1993.4,2056.704 C1992.73866,2058.19734 1992.344,2059.81866 1992.216,2061.568 L2016.792,2061.568 Z M681.496,2143.232 C681.496,2140.88532 681.901329,2138.66668 682.712,2136.576 C683.522671,2134.48532 684.663993,2132.66134 686.136,2131.104 C687.608007,2129.54666 689.36799,2128.32 691.416,2127.424 C693.46401,2126.528 695.725321,2126.08 698.2,2126.08 C701.357349,2126.08 704.109322,2126.79466 706.456,2128.224 C708.802678,2129.65334 710.573327,2131.58399 711.768,2134.016 L707.544,2135.36 C706.605329,2133.65332 705.304008,2132.32 703.64,2131.36 C701.975992,2130.4 700.12001,2129.92 698.072,2129.92 C696.365325,2129.92 694.776007,2130.26133 693.304,2130.944 C691.831993,2131.62667 690.552005,2132.55466 689.464,2133.728 C688.375995,2134.90134 687.52267,2136.29866 686.904,2137.92 C686.28533,2139.54134 685.976,2141.31199 685.976,2143.232 C685.976,2145.10934 686.295997,2146.87999 686.936,2148.544 C687.576003,2150.20801 688.450661,2151.64799 689.56,2152.864 C690.669339,2154.08001 691.959993,2155.04 693.432,2155.744 C694.904007,2156.448 696.471992,2156.8 698.136,2156.8 C699.202672,2156.8 700.258661,2156.65067 701.304,2156.352 C702.349339,2156.05333 703.319996,2155.63734 704.216,2155.104 C705.112004,2154.57066 705.879997,2153.96267 706.52,2153.28 C707.160003,2152.59733 707.607999,2151.872 707.864,2151.104 L712.088,2152.384 C711.618664,2153.57867 710.936004,2154.67733 710.04,2155.68 C709.143996,2156.68267 708.088006,2157.55733 706.872,2158.304 C705.655994,2159.05067 704.312007,2159.62666 702.84,2160.032 C701.367993,2160.43734 699.842675,2160.64 698.264,2160.64 C695.831988,2160.64 693.59201,2160.18134 691.544,2159.264 C689.49599,2158.34666 687.725341,2157.08801 686.232,2155.488 C684.738659,2153.88799 683.576004,2152.04268 682.744,2149.952 C681.911996,2147.86132 681.496,2145.62135 681.496,2143.232 Z M732.888,2160.64 C730.455988,2160.64 728.226677,2160.18134 726.2,2159.264 C724.173323,2158.34666 722.424007,2157.09867 720.952,2155.52 C719.479993,2153.94133 718.338671,2152.10668 717.528,2150.016 C716.717329,2147.92532 716.312,2145.72801 716.312,2143.424 C716.312,2141.07732 716.727996,2138.85868 717.56,2136.768 C718.392004,2134.67732 719.543993,2132.84267 721.016,2131.264 C722.488007,2129.68533 724.237323,2128.42667 726.264,2127.488 C728.290677,2126.54933 730.498655,2126.08 732.888,2126.08 C735.277345,2126.08 737.485323,2126.54933 739.512,2127.488 C741.538677,2128.42667 743.287993,2129.68533 744.76,2131.264 C746.232007,2132.84267 747.383996,2134.67732 748.216,2136.768 C749.048004,2138.85868 749.464,2141.07732 749.464,2143.424 C749.464,2145.72801 749.048004,2147.92532 748.216,2150.016 C747.383996,2152.10668 746.232007,2153.94133 744.76,2155.52 C743.287993,2157.09867 741.538677,2158.34666 739.512,2159.264 C737.485323,2160.18134 735.277345,2160.64 732.888,2160.64 Z M720.792,2143.488 C720.792,2145.36534 721.10133,2147.10399 721.72,2148.704 C722.33867,2150.30401 723.191995,2151.71199 724.28,2152.928 C725.368005,2154.14401 726.647993,2155.09333 728.12,2155.776 C729.592007,2156.45867 731.159992,2156.8 732.824,2156.8 C734.488008,2156.8 736.055993,2156.448 737.528,2155.744 C739.000007,2155.04 740.290661,2154.08001 741.4,2152.864 C742.509339,2151.64799 743.383997,2150.22934 744.024,2148.608 C744.664003,2146.98666 744.984,2145.23734 744.984,2143.36 C744.984,2141.52532 744.664003,2139.78667 744.024,2138.144 C743.383997,2136.50133 742.509339,2135.07201 741.4,2133.856 C740.290661,2132.63999 739.010674,2131.68 737.56,2130.976 C736.109326,2130.272 734.552008,2129.92 732.888,2129.92 C731.223992,2129.92 729.656007,2130.272 728.184,2130.976 C726.711993,2131.68 725.432005,2132.65066 724.344,2133.888 C723.255995,2135.12534 722.392003,2136.56533 721.752,2138.208 C721.111997,2139.85067 720.792,2141.61066 720.792,2143.488 Z M773.208,2130.496 C770.263985,2130.58133 767.704011,2131.39199 765.528,2132.928 C763.351989,2134.46401 761.816004,2136.57599 760.92,2139.264 L760.92,2160 L756.568,2160 L756.568,2126.656 L760.664,2126.656 L760.664,2134.656 C761.816006,2132.30932 763.330657,2130.35734 765.208,2128.8 C767.085343,2127.24266 769.111989,2126.464 771.288,2126.464 L772.376,2126.464 C772.717335,2126.464 772.994666,2126.48533 773.208,2126.528 L773.208,2130.496 Z M807.064,2160 L802.712,2160 L802.712,2141.376 C802.712,2137.40798 802.136006,2134.52801 800.984,2132.736 C799.831994,2130.94399 798.040012,2130.048 795.608,2130.048 C794.327994,2130.048 793.048006,2130.28266 791.768,2130.752 C790.487994,2131.22134 789.293339,2131.88266 788.184,2132.736 C787.074661,2133.58934 786.104004,2134.60266 785.272,2135.776 C784.439996,2136.94934 783.810669,2138.21866 783.384,2139.584 L783.384,2160 L779.032,2160 L779.032,2126.656 L783,2126.656 L783,2134.208 C783.68267,2133.01333 784.525328,2131.91467 785.528,2130.912 C786.530672,2129.90933 787.65066,2129.04534 788.888,2128.32 C790.12534,2127.59466 791.437326,2127.04 792.824,2126.656 C794.210674,2126.272 795.650659,2126.08 797.144,2126.08 C799.021343,2126.08 800.589327,2126.42133 801.848,2127.104 C803.106673,2127.78667 804.119996,2128.74666 804.888,2129.984 C805.656004,2131.22134 806.210665,2132.73599 806.552,2134.528 C806.893335,2136.32001 807.064,2138.30399 807.064,2140.48 L807.064,2160 Z M830.68,2160.64 C828.247988,2160.64 826.00801,2160.18134 823.96,2159.264 C821.91199,2158.34666 820.141341,2157.08801 818.648,2155.488 C817.154659,2153.88799 815.992004,2152.04268 815.16,2149.952 C814.327996,2147.86132 813.912,2145.62135 813.912,2143.232 C813.912,2140.88532 814.327996,2138.67734 815.16,2136.608 C815.992004,2134.53866 817.154659,2132.72534 818.648,2131.168 C820.141341,2129.61066 821.901323,2128.37334 823.928,2127.456 C825.954677,2126.53866 828.183988,2126.08 830.616,2126.08 C833.048012,2126.08 835.277323,2126.53866 837.304,2127.456 C839.330677,2128.37334 841.069326,2129.62133 842.52,2131.2 C843.970674,2132.77867 845.101329,2134.59199 845.912,2136.64 C846.722671,2138.68801 847.128,2140.86399 847.128,2143.168 C847.128,2143.50934 847.117333,2143.85066 847.096,2144.192 C847.074667,2144.53334 847.042667,2144.768 847,2144.896 L818.52,2144.896 C818.648001,2146.68801 819.063996,2148.34133 819.768,2149.856 C820.472004,2151.37067 821.367995,2152.68266 822.456,2153.792 C823.544005,2154.90134 824.80266,2155.76533 826.232,2156.384 C827.66134,2157.00267 829.186659,2157.312 830.808,2157.312 C831.917339,2157.312 833.005328,2157.16267 834.072,2156.864 C835.138672,2156.56533 836.119996,2156.16 837.016,2155.648 C837.912004,2155.136 838.711996,2154.50667 839.416,2153.76 C840.120004,2153.01333 840.663998,2152.192 841.048,2151.296 L844.824,2152.32 C844.311997,2153.55734 843.586671,2154.67733 842.648,2155.68 C841.709329,2156.68267 840.62134,2157.55733 839.384,2158.304 C838.14666,2159.05067 836.781341,2159.62666 835.288,2160.032 C833.794659,2160.43734 832.258675,2160.64 830.68,2160.64 Z M842.968,2141.568 C842.839999,2139.77599 842.424004,2138.14401 841.72,2136.672 C841.015996,2135.19999 840.120005,2133.93067 839.032,2132.864 C837.943995,2131.79733 836.674674,2130.96534 835.224,2130.368 C833.773326,2129.77066 832.237341,2129.472 830.616,2129.472 C828.994659,2129.472 827.458674,2129.77066 826.008,2130.368 C824.557326,2130.96534 823.288005,2131.79733 822.2,2132.864 C821.111995,2133.93067 820.237337,2135.21066 819.576,2136.704 C818.914663,2138.19734 818.520001,2139.81866 818.392,2141.568 L842.968,2141.568 Z M870.296,2130.496 C867.351985,2130.58133 864.792011,2131.39199 862.616,2132.928 C860.439989,2134.46401 858.904004,2136.57599 858.008,2139.264 L858.008,2160 L853.656,2160 L853.656,2126.656 L857.752,2126.656 L857.752,2134.656 C858.904006,2132.30932 860.418657,2130.35734 862.296,2128.8 C864.173343,2127.24266 866.199989,2126.464 868.376,2126.464 L869.464,2126.464 C869.805335,2126.464 870.082666,2126.48533 870.296,2126.528 L870.296,2130.496 Z M919.128,2160 L914.776,2160 L914.776,2141.376 C914.776,2137.57865 914.12534,2134.74134 912.824,2132.864 C911.52266,2130.98666 909.613346,2130.048 907.096,2130.048 C905.85866,2130.048 904.632006,2130.29333 903.416,2130.784 C902.199994,2131.27467 901.058672,2131.94666 899.992,2132.8 C898.925328,2133.65334 897.997337,2134.65599 897.208,2135.808 C896.418663,2136.96001 895.832002,2138.21866 895.448,2139.584 L895.448,2160 L891.096,2160 L891.096,2113.28 L895.448,2113.28 L895.448,2134.208 C896.81334,2131.69065 898.669322,2129.70667 901.016,2128.256 C903.362678,2126.80533 905.879987,2126.08 908.568,2126.08 C910.48801,2126.08 912.119993,2126.432 913.464,2127.136 C914.808007,2127.84 915.895996,2128.82133 916.728,2130.08 C917.560004,2131.33867 918.167998,2132.85332 918.552,2134.624 C918.936002,2136.39468 919.128,2138.34666 919.128,2140.48 L919.128,2160 Z M936.984,2160.64 C935.277325,2160.64 933.720007,2160.37334 932.312,2159.84 C930.903993,2159.30666 929.698672,2158.57067 928.696,2157.632 C927.693328,2156.69333 926.914669,2155.60534 926.36,2154.368 C925.805331,2153.13066 925.528,2151.82934 925.528,2150.464 C925.528,2148.92799 925.86933,2147.53067 926.552,2146.272 C927.23467,2145.01333 928.19466,2143.936 929.432,2143.04 C930.66934,2142.144 932.151991,2141.45067 933.88,2140.96 C935.608009,2140.46933 937.517323,2140.224 939.608,2140.224 C941.272008,2140.224 942.978658,2140.37333 944.728,2140.672 C946.477342,2140.97067 948.03466,2141.39733 949.4,2141.952 L949.4,2138.944 C949.4,2135.99999 948.557342,2133.66401 946.872,2131.936 C945.186658,2130.20799 942.914681,2129.344 940.056,2129.344 C938.263991,2129.344 936.482676,2129.68533 934.712,2130.368 C932.941324,2131.05067 931.138676,2132.03199 929.304,2133.312 L927.768,2130.432 C929.944011,2128.98133 932.05599,2127.89334 934.104,2127.168 C936.15201,2126.44266 938.285322,2126.08 940.504,2126.08 C944.557354,2126.08 947.778655,2127.25332 950.168,2129.6 C952.557345,2131.94668 953.752,2135.18931 953.752,2139.328 L953.752,2154.368 C953.752,2155.56267 954.263995,2156.16 955.288,2156.16 L955.288,2160 C954.946665,2160.04267 954.626668,2160.07467 954.328,2160.096 C954.029332,2160.11733 953.773334,2160.128 953.56,2160.128 C952.706662,2160.128 951.928004,2159.872 951.224,2159.36 C950.519996,2158.848 950.125334,2158.08001 950.04,2157.056 L949.912,2154.432 C948.461326,2156.39468 946.552012,2157.91999 944.184,2159.008 C941.815988,2160.09601 939.416012,2160.64 936.984,2160.64 Z M938.072,2157.312 C939.99201,2157.312 941.901324,2156.896 943.8,2156.064 C945.698676,2155.232 947.202661,2154.09067 948.312,2152.64 C948.610668,2152.256 948.866666,2151.84 949.08,2151.392 C949.293334,2150.944 949.4,2150.528 949.4,2150.144 L949.4,2144.704 C947.949326,2144.14933 946.434675,2143.72267 944.856,2143.424 C943.277325,2143.12533 941.741341,2142.976 940.248,2142.976 C937.133318,2142.976 934.605343,2143.60533 932.664,2144.864 C930.722657,2146.12267 929.752,2147.86132 929.752,2150.08 C929.752,2150.976 929.922665,2151.85066 930.264,2152.704 C930.605335,2153.55734 931.127996,2154.32533 931.832,2155.008 C932.536004,2155.69067 933.399995,2156.24533 934.424,2156.672 C935.448005,2157.09867 936.663993,2157.312 938.072,2157.312 Z M991.256,2160 L986.904,2160 L986.904,2141.376 C986.904,2137.40798 986.328006,2134.52801 985.176,2132.736 C984.023994,2130.94399 982.232012,2130.048 979.8,2130.048 C978.519994,2130.048 977.240006,2130.28266 975.96,2130.752 C974.679994,2131.22134 973.485339,2131.88266 972.376,2132.736 C971.266661,2133.58934 970.296004,2134.60266 969.464,2135.776 C968.631996,2136.94934 968.002669,2138.21866 967.576,2139.584 L967.576,2160 L963.224,2160 L963.224,2126.656 L967.192,2126.656 L967.192,2134.208 C967.87467,2133.01333 968.717328,2131.91467 969.72,2130.912 C970.722672,2129.90933 971.84266,2129.04534 973.08,2128.32 C974.31734,2127.59466 975.629326,2127.04 977.016,2126.656 C978.402674,2126.272 979.842659,2126.08 981.336,2126.08 C983.213343,2126.08 984.781327,2126.42133 986.04,2127.104 C987.298673,2127.78667 988.311996,2128.74666 989.08,2129.984 C989.848004,2131.22134 990.402665,2132.73599 990.744,2134.528 C991.085335,2136.32001 991.256,2138.30399 991.256,2140.48 L991.256,2160 Z M1014.104,2160.64 C1011.79999,2160.64 1009.66668,2160.16 1007.704,2159.2 C1005.74132,2158.24 1004.04534,2156.97067 1002.616,2155.392 C1001.18666,2153.81333 1000.07734,2151.98934 999.288,2149.92 C998.498663,2147.85066 998.104,2145.68534 998.104,2143.424 C998.104,2141.07732 998.487996,2138.84801 999.256,2136.736 C1000.024,2134.62399 1001.07999,2132.77867 1002.424,2131.2 C1003.76801,2129.62133 1005.36799,2128.37334 1007.224,2127.456 C1009.08001,2126.53866 1011.11732,2126.08 1013.336,2126.08 C1016.15201,2126.08 1018.64799,2126.81599 1020.824,2128.288 C1023.00001,2129.76001 1024.72799,2131.54132 1026.008,2133.632 L1026.008,2113.28 L1030.36,2113.28 L1030.36,2154.368 C1030.36,2155.56267 1030.87199,2156.16 1031.896,2156.16 L1031.896,2160 C1031.17066,2160.128 1030.59467,2160.192 1030.168,2160.192 C1029.10133,2160.192 1028.22667,2159.88267 1027.544,2159.264 C1026.86133,2158.64533 1026.52,2157.90934 1026.52,2157.056 L1026.52,2153.536 C1025.15466,2155.71201 1023.35201,2157.43999 1021.112,2158.72 C1018.87199,2160.00001 1016.53601,2160.64 1014.104,2160.64 Z M1015,2156.8 C1016.10934,2156.8 1017.27199,2156.58667 1018.488,2156.16 C1019.70401,2155.73333 1020.83466,2155.14667 1021.88,2154.4 C1022.92534,2153.65333 1023.832,2152.77867 1024.6,2151.776 C1025.368,2150.77333 1025.83733,2149.69601 1026.008,2148.544 L1026.008,2138.24 C1025.58133,2137.08799 1024.952,2136.01067 1024.12,2135.008 C1023.288,2134.00533 1022.34934,2133.12 1021.304,2132.352 C1020.25866,2131.584 1019.14934,2130.98667 1017.976,2130.56 C1016.80266,2130.13333 1015.64001,2129.92 1014.488,2129.92 C1012.69599,2129.92 1011.06401,2130.304 1009.592,2131.072 C1008.11999,2131.84 1006.87201,2132.85333 1005.848,2134.112 C1004.82399,2135.37067 1004.024,2136.81066 1003.448,2138.432 C1002.872,2140.05334 1002.584,2141.71732 1002.584,2143.424 C1002.584,2145.21601 1002.904,2146.92266 1003.544,2148.544 C1004.184,2150.16534 1005.05866,2151.58399 1006.168,2152.8 C1007.27734,2154.01601 1008.58933,2154.98666 1010.104,2155.712 C1011.61867,2156.43734 1013.25066,2156.8 1015,2156.8 Z M1040.344,2113.28 L1044.696,2113.28 L1044.696,2152.448 C1044.696,2153.68534 1045.03733,2154.656 1045.72,2155.36 C1046.40267,2156.064 1047.36266,2156.416 1048.6,2156.416 C1049.06934,2156.416 1049.624,2156.352 1050.264,2156.224 C1050.904,2156.096 1051.50133,2155.92533 1052.056,2155.712 L1052.824,2159.232 C1052.01333,2159.57334 1051.02134,2159.85067 1049.848,2160.064 C1048.67466,2160.27733 1047.66134,2160.384 1046.808,2160.384 C1044.80266,2160.384 1043.22401,2159.81867 1042.072,2158.688 C1040.91999,2157.55733 1040.344,2155.96801 1040.344,2153.92 L1040.344,2113.28 Z M1071.64,2160.64 C1069.20799,2160.64 1066.96801,2160.18134 1064.92,2159.264 C1062.87199,2158.34666 1061.10134,2157.08801 1059.608,2155.488 C1058.11466,2153.88799 1056.952,2152.04268 1056.12,2149.952 C1055.288,2147.86132 1054.872,2145.62135 1054.872,2143.232 C1054.872,2140.88532 1055.288,2138.67734 1056.12,2136.608 C1056.952,2134.53866 1058.11466,2132.72534 1059.608,2131.168 C1061.10134,2129.61066 1062.86132,2128.37334 1064.888,2127.456 C1066.91468,2126.53866 1069.14399,2126.08 1071.576,2126.08 C1074.00801,2126.08 1076.23732,2126.53866 1078.264,2127.456 C1080.29068,2128.37334 1082.02933,2129.62133 1083.48,2131.2 C1084.93067,2132.77867 1086.06133,2134.59199 1086.872,2136.64 C1087.68267,2138.68801 1088.088,2140.86399 1088.088,2143.168 C1088.088,2143.50934 1088.07733,2143.85066 1088.056,2144.192 C1088.03467,2144.53334 1088.00267,2144.768 1087.96,2144.896 L1059.48,2144.896 C1059.608,2146.68801 1060.024,2148.34133 1060.728,2149.856 C1061.432,2151.37067 1062.32799,2152.68266 1063.416,2153.792 C1064.50401,2154.90134 1065.76266,2155.76533 1067.192,2156.384 C1068.62134,2157.00267 1070.14666,2157.312 1071.768,2157.312 C1072.87734,2157.312 1073.96533,2157.16267 1075.032,2156.864 C1076.09867,2156.56533 1077.08,2156.16 1077.976,2155.648 C1078.872,2155.136 1079.672,2154.50667 1080.376,2153.76 C1081.08,2153.01333 1081.624,2152.192 1082.008,2151.296 L1085.784,2152.32 C1085.272,2153.55734 1084.54667,2154.67733 1083.608,2155.68 C1082.66933,2156.68267 1081.58134,2157.55733 1080.344,2158.304 C1079.10666,2159.05067 1077.74134,2159.62666 1076.248,2160.032 C1074.75466,2160.43734 1073.21867,2160.64 1071.64,2160.64 Z M1083.928,2141.568 C1083.8,2139.77599 1083.384,2138.14401 1082.68,2136.672 C1081.976,2135.19999 1081.08001,2133.93067 1079.992,2132.864 C1078.90399,2131.79733 1077.63467,2130.96534 1076.184,2130.368 C1074.73333,2129.77066 1073.19734,2129.472 1071.576,2129.472 C1069.95466,2129.472 1068.41867,2129.77066 1066.968,2130.368 C1065.51733,2130.96534 1064.24801,2131.79733 1063.16,2132.864 C1062.07199,2133.93067 1061.19734,2135.21066 1060.536,2136.704 C1059.87466,2138.19734 1059.48,2139.81866 1059.352,2141.568 L1083.928,2141.568 Z M1105.816,2160.64 C1103.21332,2160.64 1100.67468,2160.21334 1098.2,2159.36 C1095.72532,2158.50666 1093.59201,2157.26934 1091.8,2155.648 L1093.784,2152.704 C1095.66134,2154.24001 1097.57066,2155.392 1099.512,2156.16 C1101.45334,2156.928 1103.53332,2157.312 1105.752,2157.312 C1108.44001,2157.312 1110.58399,2156.76801 1112.184,2155.68 C1113.78401,2154.59199 1114.584,2153.04534 1114.584,2151.04 C1114.584,2150.10133 1114.37067,2149.32267 1113.944,2148.704 C1113.51733,2148.08533 1112.888,2147.54134 1112.056,2147.072 C1111.224,2146.60266 1110.17867,2146.18667 1108.92,2145.824 C1107.66133,2145.46133 1106.20001,2145.088 1104.536,2144.704 C1102.61599,2144.23466 1100.95201,2143.76534 1099.544,2143.296 C1098.13599,2142.82666 1096.97334,2142.29334 1096.056,2141.696 C1095.13866,2141.09866 1094.456,2140.36267 1094.008,2139.488 C1093.56,2138.61333 1093.336,2137.51467 1093.336,2136.192 C1093.336,2134.52799 1093.66666,2133.05601 1094.328,2131.776 C1094.98934,2130.49599 1095.88533,2129.44 1097.016,2128.608 C1098.14667,2127.776 1099.46933,2127.14667 1100.984,2126.72 C1102.49867,2126.29333 1104.10932,2126.08 1105.816,2126.08 C1108.37601,2126.08 1110.70132,2126.496 1112.792,2127.328 C1114.88268,2128.16 1116.56799,2129.25866 1117.848,2130.624 L1115.736,2133.184 C1114.49866,2131.90399 1112.99468,2130.944 1111.224,2130.304 C1109.45332,2129.664 1107.60801,2129.344 1105.688,2129.344 C1104.53599,2129.344 1103.46934,2129.46133 1102.488,2129.696 C1101.50666,2129.93067 1100.64267,2130.304 1099.896,2130.816 C1099.14933,2131.328 1098.56267,2131.97866 1098.136,2132.768 C1097.70933,2133.55734 1097.496,2134.48533 1097.496,2135.552 C1097.496,2136.448 1097.64533,2137.17333 1097.944,2137.728 C1098.24267,2138.28267 1098.73333,2138.76266 1099.416,2139.168 C1100.09867,2139.57334 1100.96266,2139.936 1102.008,2140.256 C1103.05334,2140.576 1104.32266,2140.90666 1105.816,2141.248 C1107.94934,2141.76 1109.82666,2142.272 1111.448,2142.784 C1113.06934,2143.296 1114.42399,2143.89333 1115.512,2144.576 C1116.60001,2145.25867 1117.42133,2146.09066 1117.976,2147.072 C1118.53067,2148.05334 1118.808,2149.24799 1118.808,2150.656 C1118.808,2153.72802 1117.63468,2156.15999 1115.288,2157.952 C1112.94132,2159.74401 1109.78402,2160.64 1105.816,2160.64 Z M1124.632,2160.96 C1124.93067,2160.96 1125.22933,2160.87467 1125.528,2160.704 C1125.82667,2160.53333 1125.976,2160.17067 1125.976,2159.616 L1125.976,2153.728 L1129.688,2153.728 L1129.688,2160.256 C1129.688,2160.98134 1129.53867,2161.6 1129.24,2162.112 C1128.94133,2162.624 1128.54667,2163.04 1128.056,2163.36 C1127.56533,2163.68 1127.02134,2163.91467 1126.424,2164.064 C1125.82666,2164.21333 1125.22934,2164.288 1124.632,2164.288 L1124.632,2160.96 Z M1195.736,2126.656 L1199.96,2126.656 L1185.688,2160 L1182.04,2160 L1174.936,2142.976 L1167.832,2160 L1164.184,2160 L1149.912,2126.656 L1154.072,2126.656 L1166.232,2155.52 L1172.568,2140.288 L1166.872,2126.72 L1170.584,2126.72 L1174.936,2137.6 L1179.224,2126.72 L1182.936,2126.72 L1177.304,2140.288 L1183.64,2155.52 L1195.736,2126.656 Z M1233.688,2160 L1229.336,2160 L1229.336,2141.376 C1229.336,2137.57865 1228.68534,2134.74134 1227.384,2132.864 C1226.08266,2130.98666 1224.17335,2130.048 1221.656,2130.048 C1220.41866,2130.048 1219.19201,2130.29333 1217.976,2130.784 C1216.75999,2131.27467 1215.61867,2131.94666 1214.552,2132.8 C1213.48533,2133.65334 1212.55734,2134.65599 1211.768,2135.808 C1210.97866,2136.96001 1210.392,2138.21866 1210.008,2139.584 L1210.008,2160 L1205.656,2160 L1205.656,2113.28 L1210.008,2113.28 L1210.008,2134.208 C1211.37334,2131.69065 1213.22932,2129.70667 1215.576,2128.256 C1217.92268,2126.80533 1220.43999,2126.08 1223.128,2126.08 C1225.04801,2126.08 1226.67999,2126.432 1228.024,2127.136 C1229.36801,2127.84 1230.456,2128.82133 1231.288,2130.08 C1232.12,2131.33867 1232.728,2132.85332 1233.112,2134.624 C1233.496,2136.39468 1233.688,2138.34666 1233.688,2140.48 L1233.688,2160 Z M1242.712,2160 L1242.712,2126.656 L1247.064,2126.656 L1247.064,2160 L1242.712,2160 Z M1242.712,2119.68 L1242.712,2113.28 L1247.064,2113.28 L1247.064,2119.68 L1242.712,2119.68 Z M1254.232,2143.232 C1254.232,2140.88532 1254.63733,2138.66668 1255.448,2136.576 C1256.25867,2134.48532 1257.39999,2132.66134 1258.872,2131.104 C1260.34401,2129.54666 1262.10399,2128.32 1264.152,2127.424 C1266.20001,2126.528 1268.46132,2126.08 1270.936,2126.08 C1274.09335,2126.08 1276.84532,2126.79466 1279.192,2128.224 C1281.53868,2129.65334 1283.30933,2131.58399 1284.504,2134.016 L1280.28,2135.36 C1279.34133,2133.65332 1278.04001,2132.32 1276.376,2131.36 C1274.71199,2130.4 1272.85601,2129.92 1270.808,2129.92 C1269.10132,2129.92 1267.51201,2130.26133 1266.04,2130.944 C1264.56799,2131.62667 1263.28801,2132.55466 1262.2,2133.728 C1261.11199,2134.90134 1260.25867,2136.29866 1259.64,2137.92 C1259.02133,2139.54134 1258.712,2141.31199 1258.712,2143.232 C1258.712,2145.10934 1259.032,2146.87999 1259.672,2148.544 C1260.312,2150.20801 1261.18666,2151.64799 1262.296,2152.864 C1263.40534,2154.08001 1264.69599,2155.04 1266.168,2155.744 C1267.64001,2156.448 1269.20799,2156.8 1270.872,2156.8 C1271.93867,2156.8 1272.99466,2156.65067 1274.04,2156.352 C1275.08534,2156.05333 1276.056,2155.63734 1276.952,2155.104 C1277.848,2154.57066 1278.616,2153.96267 1279.256,2153.28 C1279.896,2152.59733 1280.344,2151.872 1280.6,2151.104 L1284.824,2152.384 C1284.35466,2153.57867 1283.672,2154.67733 1282.776,2155.68 C1281.88,2156.68267 1280.82401,2157.55733 1279.608,2158.304 C1278.39199,2159.05067 1277.04801,2159.62666 1275.576,2160.032 C1274.10399,2160.43734 1272.57867,2160.64 1271,2160.64 C1268.56799,2160.64 1266.32801,2160.18134 1264.28,2159.264 C1262.23199,2158.34666 1260.46134,2157.08801 1258.968,2155.488 C1257.47466,2153.88799 1256.312,2152.04268 1255.48,2149.952 C1254.648,2147.86132 1254.232,2145.62135 1254.232,2143.232 Z M1319.64,2160 L1315.288,2160 L1315.288,2141.376 C1315.288,2137.57865 1314.63734,2134.74134 1313.336,2132.864 C1312.03466,2130.98666 1310.12535,2130.048 1307.608,2130.048 C1306.37066,2130.048 1305.14401,2130.29333 1303.928,2130.784 C1302.71199,2131.27467 1301.57067,2131.94666 1300.504,2132.8 C1299.43733,2133.65334 1298.50934,2134.65599 1297.72,2135.808 C1296.93066,2136.96001 1296.344,2138.21866 1295.96,2139.584 L1295.96,2160 L1291.608,2160 L1291.608,2113.28 L1295.96,2113.28 L1295.96,2134.208 C1297.32534,2131.69065 1299.18132,2129.70667 1301.528,2128.256 C1303.87468,2126.80533 1306.39199,2126.08 1309.08,2126.08 C1311.00001,2126.08 1312.63199,2126.432 1313.976,2127.136 C1315.32001,2127.84 1316.408,2128.82133 1317.24,2130.08 C1318.072,2131.33867 1318.68,2132.85332 1319.064,2134.624 C1319.448,2136.39468 1319.64,2138.34666 1319.64,2140.48 L1319.64,2160 Z M1368.856,2160 L1356.568,2142.912 L1349.4,2149.568 L1349.4,2160 L1345.048,2160 L1345.048,2113.28 L1349.4,2113.28 L1349.4,2145.024 L1368.152,2126.72 L1373.08,2126.72 L1359.448,2140.352 L1373.592,2160 L1368.856,2160 Z M1393.368,2160.64 C1390.93599,2160.64 1388.69601,2160.18134 1386.648,2159.264 C1384.59999,2158.34666 1382.82934,2157.08801 1381.336,2155.488 C1379.84266,2153.88799 1378.68,2152.04268 1377.848,2149.952 C1377.016,2147.86132 1376.6,2145.62135 1376.6,2143.232 C1376.6,2140.88532 1377.016,2138.67734 1377.848,2136.608 C1378.68,2134.53866 1379.84266,2132.72534 1381.336,2131.168 C1382.82934,2129.61066 1384.58932,2128.37334 1386.616,2127.456 C1388.64268,2126.53866 1390.87199,2126.08 1393.304,2126.08 C1395.73601,2126.08 1397.96532,2126.53866 1399.992,2127.456 C1402.01868,2128.37334 1403.75733,2129.62133 1405.208,2131.2 C1406.65867,2132.77867 1407.78933,2134.59199 1408.6,2136.64 C1409.41067,2138.68801 1409.816,2140.86399 1409.816,2143.168 C1409.816,2143.50934 1409.80533,2143.85066 1409.784,2144.192 C1409.76267,2144.53334 1409.73067,2144.768 1409.688,2144.896 L1381.208,2144.896 C1381.336,2146.68801 1381.752,2148.34133 1382.456,2149.856 C1383.16,2151.37067 1384.05599,2152.68266 1385.144,2153.792 C1386.23201,2154.90134 1387.49066,2155.76533 1388.92,2156.384 C1390.34934,2157.00267 1391.87466,2157.312 1393.496,2157.312 C1394.60534,2157.312 1395.69333,2157.16267 1396.76,2156.864 C1397.82667,2156.56533 1398.808,2156.16 1399.704,2155.648 C1400.6,2155.136 1401.4,2154.50667 1402.104,2153.76 C1402.808,2153.01333 1403.352,2152.192 1403.736,2151.296 L1407.512,2152.32 C1407,2153.55734 1406.27467,2154.67733 1405.336,2155.68 C1404.39733,2156.68267 1403.30934,2157.55733 1402.072,2158.304 C1400.83466,2159.05067 1399.46934,2159.62666 1397.976,2160.032 C1396.48266,2160.43734 1394.94667,2160.64 1393.368,2160.64 Z M1405.656,2141.568 C1405.528,2139.77599 1405.112,2138.14401 1404.408,2136.672 C1403.704,2135.19999 1402.80801,2133.93067 1401.72,2132.864 C1400.63199,2131.79733 1399.36267,2130.96534 1397.912,2130.368 C1396.46133,2129.77066 1394.92534,2129.472 1393.304,2129.472 C1391.68266,2129.472 1390.14667,2129.77066 1388.696,2130.368 C1387.24533,2130.96534 1385.97601,2131.79733 1384.888,2132.864 C1383.79999,2133.93067 1382.92534,2135.21066 1382.264,2136.704 C1381.60266,2138.19734 1381.208,2139.81866 1381.08,2141.568 L1405.656,2141.568 Z M1430.936,2160.64 C1428.50399,2160.64 1426.26401,2160.18134 1424.216,2159.264 C1422.16799,2158.34666 1420.39734,2157.08801 1418.904,2155.488 C1417.41066,2153.88799 1416.248,2152.04268 1415.416,2149.952 C1414.584,2147.86132 1414.168,2145.62135 1414.168,2143.232 C1414.168,2140.88532 1414.584,2138.67734 1415.416,2136.608 C1416.248,2134.53866 1417.41066,2132.72534 1418.904,2131.168 C1420.39734,2129.61066 1422.15732,2128.37334 1424.184,2127.456 C1426.21068,2126.53866 1428.43999,2126.08 1430.872,2126.08 C1433.30401,2126.08 1435.53332,2126.53866 1437.56,2127.456 C1439.58668,2128.37334 1441.32533,2129.62133 1442.776,2131.2 C1444.22667,2132.77867 1445.35733,2134.59199 1446.168,2136.64 C1446.97867,2138.68801 1447.384,2140.86399 1447.384,2143.168 C1447.384,2143.50934 1447.37333,2143.85066 1447.352,2144.192 C1447.33067,2144.53334 1447.29867,2144.768 1447.256,2144.896 L1418.776,2144.896 C1418.904,2146.68801 1419.32,2148.34133 1420.024,2149.856 C1420.728,2151.37067 1421.62399,2152.68266 1422.712,2153.792 C1423.80001,2154.90134 1425.05866,2155.76533 1426.488,2156.384 C1427.91734,2157.00267 1429.44266,2157.312 1431.064,2157.312 C1432.17334,2157.312 1433.26133,2157.16267 1434.328,2156.864 C1435.39467,2156.56533 1436.376,2156.16 1437.272,2155.648 C1438.168,2155.136 1438.968,2154.50667 1439.672,2153.76 C1440.376,2153.01333 1440.92,2152.192 1441.304,2151.296 L1445.08,2152.32 C1444.568,2153.55734 1443.84267,2154.67733 1442.904,2155.68 C1441.96533,2156.68267 1440.87734,2157.55733 1439.64,2158.304 C1438.40266,2159.05067 1437.03734,2159.62666 1435.544,2160.032 C1434.05066,2160.43734 1432.51467,2160.64 1430.936,2160.64 Z M1443.224,2141.568 C1443.096,2139.77599 1442.68,2138.14401 1441.976,2136.672 C1441.272,2135.19999 1440.37601,2133.93067 1439.288,2132.864 C1438.19999,2131.79733 1436.93067,2130.96534 1435.48,2130.368 C1434.02933,2129.77066 1432.49334,2129.472 1430.872,2129.472 C1429.25066,2129.472 1427.71467,2129.77066 1426.264,2130.368 C1424.81333,2130.96534 1423.54401,2131.79733 1422.456,2132.864 C1421.36799,2133.93067 1420.49334,2135.21066 1419.832,2136.704 C1419.17066,2138.19734 1418.776,2139.81866 1418.648,2141.568 L1443.224,2141.568 Z M1471,2160.64 C1468.18399,2160.64 1465.68801,2159.92534 1463.512,2158.496 C1461.33599,2157.06666 1459.58667,2155.26401 1458.264,2153.088 L1458.264,2173.632 L1453.912,2173.632 L1453.912,2126.656 L1457.816,2126.656 L1457.816,2133.12 C1459.18134,2131.02932 1460.95199,2129.33334 1463.128,2128.032 C1465.30401,2126.73066 1467.67199,2126.08 1470.232,2126.08 C1472.53601,2126.08 1474.65866,2126.56 1476.6,2127.52 C1478.54134,2128.48 1480.21599,2129.75999 1481.624,2131.36 C1483.03201,2132.96001 1484.13066,2134.80532 1484.92,2136.896 C1485.70934,2138.98668 1486.104,2141.14132 1486.104,2143.36 C1486.104,2145.70668 1485.74134,2147.92532 1485.016,2150.016 C1484.29066,2152.10668 1483.25601,2153.94133 1481.912,2155.52 C1480.56799,2157.09867 1478.96801,2158.34666 1477.112,2159.264 C1475.25599,2160.18134 1473.21868,2160.64 1471,2160.64 Z M1469.784,2156.8 C1471.57601,2156.8 1473.19733,2156.416 1474.648,2155.648 C1476.09867,2154.88 1477.34666,2153.86667 1478.392,2152.608 C1479.43734,2151.34933 1480.23733,2149.92001 1480.792,2148.32 C1481.34667,2146.71999 1481.624,2145.06668 1481.624,2143.36 C1481.624,2141.56799 1481.304,2139.86134 1480.664,2138.24 C1480.024,2136.61866 1479.14934,2135.18934 1478.04,2133.952 C1476.93066,2132.71466 1475.61867,2131.73334 1474.104,2131.008 C1472.58933,2130.28266 1470.95734,2129.92 1469.208,2129.92 C1468.09866,2129.92 1466.94667,2130.144 1465.752,2130.592 C1464.55733,2131.04 1463.42667,2131.63733 1462.36,2132.384 C1461.29333,2133.13067 1460.38667,2134.00533 1459.64,2135.008 C1458.89333,2136.01067 1458.43467,2137.06666 1458.264,2138.176 L1458.264,2148.416 C1458.776,2149.61067 1459.42666,2150.71999 1460.216,2151.744 C1461.00534,2152.76801 1461.90133,2153.65333 1462.904,2154.4 C1463.90667,2155.14667 1464.99466,2155.73333 1466.168,2156.16 C1467.34134,2156.58667 1468.54666,2156.8 1469.784,2156.8 Z M1525.784,2158.4 C1525.528,2158.528 1525.15467,2158.69867 1524.664,2158.912 C1524.17333,2159.12533 1523.608,2159.33867 1522.968,2159.552 C1522.328,2159.76533 1521.60267,2159.95733 1520.792,2160.128 C1519.98133,2160.29867 1519.128,2160.384 1518.232,2160.384 C1517.29333,2160.384 1516.39734,2160.256 1515.544,2160 C1514.69066,2159.744 1513.944,2159.34934 1513.304,2158.816 C1512.664,2158.28266 1512.152,2157.61067 1511.768,2156.8 C1511.384,2155.98933 1511.192,2155.05067 1511.192,2153.984 L1511.192,2130.112 L1506.584,2130.112 L1506.584,2126.656 L1511.192,2126.656 L1511.192,2115.392 L1515.544,2115.392 L1515.544,2126.656 L1523.224,2126.656 L1523.224,2130.112 L1515.544,2130.112 L1515.544,2152.768 C1515.62933,2154.00534 1516.056,2154.912 1516.824,2155.488 C1517.592,2156.064 1518.50933,2156.352 1519.576,2156.352 C1520.81334,2156.352 1521.90133,2156.14934 1522.84,2155.744 C1523.77867,2155.33866 1524.376,2155.05067 1524.632,2154.88 L1525.784,2158.4 Z M1558.936,2160 L1554.584,2160 L1554.584,2141.376 C1554.584,2137.57865 1553.93334,2134.74134 1552.632,2132.864 C1551.33066,2130.98666 1549.42135,2130.048 1546.904,2130.048 C1545.66666,2130.048 1544.44001,2130.29333 1543.224,2130.784 C1542.00799,2131.27467 1540.86667,2131.94666 1539.8,2132.8 C1538.73333,2133.65334 1537.80534,2134.65599 1537.016,2135.808 C1536.22666,2136.96001 1535.64,2138.21866 1535.256,2139.584 L1535.256,2160 L1530.904,2160 L1530.904,2113.28 L1535.256,2113.28 L1535.256,2134.208 C1536.62134,2131.69065 1538.47732,2129.70667 1540.824,2128.256 C1543.17068,2126.80533 1545.68799,2126.08 1548.376,2126.08 C1550.29601,2126.08 1551.92799,2126.432 1553.272,2127.136 C1554.61601,2127.84 1555.704,2128.82133 1556.536,2130.08 C1557.368,2131.33867 1557.976,2132.85332 1558.36,2134.624 C1558.744,2136.39468 1558.936,2138.34666 1558.936,2140.48 L1558.936,2160 Z M1582.552,2160.64 C1580.11999,2160.64 1577.88001,2160.18134 1575.832,2159.264 C1573.78399,2158.34666 1572.01334,2157.08801 1570.52,2155.488 C1569.02666,2153.88799 1567.864,2152.04268 1567.032,2149.952 C1566.2,2147.86132 1565.784,2145.62135 1565.784,2143.232 C1565.784,2140.88532 1566.2,2138.67734 1567.032,2136.608 C1567.864,2134.53866 1569.02666,2132.72534 1570.52,2131.168 C1572.01334,2129.61066 1573.77332,2128.37334 1575.8,2127.456 C1577.82668,2126.53866 1580.05599,2126.08 1582.488,2126.08 C1584.92001,2126.08 1587.14932,2126.53866 1589.176,2127.456 C1591.20268,2128.37334 1592.94133,2129.62133 1594.392,2131.2 C1595.84267,2132.77867 1596.97333,2134.59199 1597.784,2136.64 C1598.59467,2138.68801 1599,2140.86399 1599,2143.168 C1599,2143.50934 1598.98933,2143.85066 1598.968,2144.192 C1598.94667,2144.53334 1598.91467,2144.768 1598.872,2144.896 L1570.392,2144.896 C1570.52,2146.68801 1570.936,2148.34133 1571.64,2149.856 C1572.344,2151.37067 1573.23999,2152.68266 1574.328,2153.792 C1575.41601,2154.90134 1576.67466,2155.76533 1578.104,2156.384 C1579.53334,2157.00267 1581.05866,2157.312 1582.68,2157.312 C1583.78934,2157.312 1584.87733,2157.16267 1585.944,2156.864 C1587.01067,2156.56533 1587.992,2156.16 1588.888,2155.648 C1589.784,2155.136 1590.584,2154.50667 1591.288,2153.76 C1591.992,2153.01333 1592.536,2152.192 1592.92,2151.296 L1596.696,2152.32 C1596.184,2153.55734 1595.45867,2154.67733 1594.52,2155.68 C1593.58133,2156.68267 1592.49334,2157.55733 1591.256,2158.304 C1590.01866,2159.05067 1588.65334,2159.62666 1587.16,2160.032 C1585.66666,2160.43734 1584.13067,2160.64 1582.552,2160.64 Z M1594.84,2141.568 C1594.712,2139.77599 1594.296,2138.14401 1593.592,2136.672 C1592.888,2135.19999 1591.99201,2133.93067 1590.904,2132.864 C1589.81599,2131.79733 1588.54667,2130.96534 1587.096,2130.368 C1585.64533,2129.77066 1584.10934,2129.472 1582.488,2129.472 C1580.86666,2129.472 1579.33067,2129.77066 1577.88,2130.368 C1576.42933,2130.96534 1575.16001,2131.79733 1574.072,2132.864 C1572.98399,2133.93067 1572.10934,2135.21066 1571.448,2136.704 C1570.78666,2138.19734 1570.392,2139.81866 1570.264,2141.568 L1594.84,2141.568 Z M1605.528,2160 L1605.528,2126.656 L1609.88,2126.656 L1609.88,2160 L1605.528,2160 Z M1605.528,2119.68 L1605.528,2113.28 L1609.88,2113.28 L1609.88,2119.68 L1605.528,2119.68 Z M1635.864,2130.496 C1632.91999,2130.58133 1630.36001,2131.39199 1628.184,2132.928 C1626.00799,2134.46401 1624.472,2136.57599 1623.576,2139.264 L1623.576,2160 L1619.224,2160 L1619.224,2126.656 L1623.32,2126.656 L1623.32,2134.656 C1624.47201,2132.30932 1625.98666,2130.35734 1627.864,2128.8 C1629.74134,2127.24266 1631.76799,2126.464 1633.944,2126.464 L1635.032,2126.464 C1635.37334,2126.464 1635.65067,2126.48533 1635.864,2126.528 L1635.864,2130.496 Z M1673.752,2160.64 C1670.93599,2160.64 1668.44001,2159.92534 1666.264,2158.496 C1664.08799,2157.06666 1662.33867,2155.26401 1661.016,2153.088 L1661.016,2173.632 L1656.664,2173.632 L1656.664,2126.656 L1660.568,2126.656 L1660.568,2133.12 C1661.93334,2131.02932 1663.70399,2129.33334 1665.88,2128.032 C1668.05601,2126.73066 1670.42399,2126.08 1672.984,2126.08 C1675.28801,2126.08 1677.41066,2126.56 1679.352,2127.52 C1681.29334,2128.48 1682.96799,2129.75999 1684.376,2131.36 C1685.78401,2132.96001 1686.88266,2134.80532 1687.672,2136.896 C1688.46134,2138.98668 1688.856,2141.14132 1688.856,2143.36 C1688.856,2145.70668 1688.49334,2147.92532 1687.768,2150.016 C1687.04266,2152.10668 1686.00801,2153.94133 1684.664,2155.52 C1683.31999,2157.09867 1681.72001,2158.34666 1679.864,2159.264 C1678.00799,2160.18134 1675.97068,2160.64 1673.752,2160.64 Z M1672.536,2156.8 C1674.32801,2156.8 1675.94933,2156.416 1677.4,2155.648 C1678.85067,2154.88 1680.09866,2153.86667 1681.144,2152.608 C1682.18934,2151.34933 1682.98933,2149.92001 1683.544,2148.32 C1684.09867,2146.71999 1684.376,2145.06668 1684.376,2143.36 C1684.376,2141.56799 1684.056,2139.86134 1683.416,2138.24 C1682.776,2136.61866 1681.90134,2135.18934 1680.792,2133.952 C1679.68266,2132.71466 1678.37067,2131.73334 1676.856,2131.008 C1675.34133,2130.28266 1673.70934,2129.92 1671.96,2129.92 C1670.85066,2129.92 1669.69867,2130.144 1668.504,2130.592 C1667.30933,2131.04 1666.17867,2131.63733 1665.112,2132.384 C1664.04533,2133.13067 1663.13867,2134.00533 1662.392,2135.008 C1661.64533,2136.01067 1661.18667,2137.06666 1661.016,2138.176 L1661.016,2148.416 C1661.528,2149.61067 1662.17866,2150.71999 1662.968,2151.744 C1663.75734,2152.76801 1664.65333,2153.65333 1665.656,2154.4 C1666.65867,2155.14667 1667.74666,2155.73333 1668.92,2156.16 C1670.09334,2156.58667 1671.29866,2156.8 1672.536,2156.8 Z M1712.664,2130.496 C1709.71999,2130.58133 1707.16001,2131.39199 1704.984,2132.928 C1702.80799,2134.46401 1701.272,2136.57599 1700.376,2139.264 L1700.376,2160 L1696.024,2160 L1696.024,2126.656 L1700.12,2126.656 L1700.12,2134.656 C1701.27201,2132.30932 1702.78666,2130.35734 1704.664,2128.8 C1706.54134,2127.24266 1708.56799,2126.464 1710.744,2126.464 L1711.832,2126.464 C1712.17334,2126.464 1712.45067,2126.48533 1712.664,2126.528 L1712.664,2130.496 Z M1731.352,2160.64 C1728.91999,2160.64 1726.69068,2160.18134 1724.664,2159.264 C1722.63732,2158.34666 1720.88801,2157.09867 1719.416,2155.52 C1717.94399,2153.94133 1716.80267,2152.10668 1715.992,2150.016 C1715.18133,2147.92532 1714.776,2145.72801 1714.776,2143.424 C1714.776,2141.07732 1715.192,2138.85868 1716.024,2136.768 C1716.856,2134.67732 1718.00799,2132.84267 1719.48,2131.264 C1720.95201,2129.68533 1722.70132,2128.42667 1724.728,2127.488 C1726.75468,2126.54933 1728.96265,2126.08 1731.352,2126.08 C1733.74135,2126.08 1735.94932,2126.54933 1737.976,2127.488 C1740.00268,2128.42667 1741.75199,2129.68533 1743.224,2131.264 C1744.69601,2132.84267 1745.848,2134.67732 1746.68,2136.768 C1747.512,2138.85868 1747.928,2141.07732 1747.928,2143.424 C1747.928,2145.72801 1747.512,2147.92532 1746.68,2150.016 C1745.848,2152.10668 1744.69601,2153.94133 1743.224,2155.52 C1741.75199,2157.09867 1740.00268,2158.34666 1737.976,2159.264 C1735.94932,2160.18134 1733.74135,2160.64 1731.352,2160.64 Z M1719.256,2143.488 C1719.256,2145.36534 1719.56533,2147.10399 1720.184,2148.704 C1720.80267,2150.30401 1721.65599,2151.71199 1722.744,2152.928 C1723.83201,2154.14401 1725.11199,2155.09333 1726.584,2155.776 C1728.05601,2156.45867 1729.62399,2156.8 1731.288,2156.8 C1732.95201,2156.8 1734.51999,2156.448 1735.992,2155.744 C1737.46401,2155.04 1738.75466,2154.08001 1739.864,2152.864 C1740.97334,2151.64799 1741.848,2150.22934 1742.488,2148.608 C1743.128,2146.98666 1743.448,2145.23734 1743.448,2143.36 C1743.448,2141.52532 1743.128,2139.78667 1742.488,2138.144 C1741.848,2136.50133 1740.97334,2135.07201 1739.864,2133.856 C1738.75466,2132.63999 1737.47467,2131.68 1736.024,2130.976 C1734.57333,2130.272 1733.01601,2129.92 1731.352,2129.92 C1729.68799,2129.92 1728.12001,2130.272 1726.648,2130.976 C1725.17599,2131.68 1723.89601,2132.65066 1722.808,2133.888 C1721.71999,2135.12534 1720.856,2136.56533 1720.216,2138.208 C1719.576,2139.85067 1719.256,2141.61066 1719.256,2143.488 Z M1772.12,2160.64 C1769.30399,2160.64 1766.80801,2159.92534 1764.632,2158.496 C1762.45599,2157.06666 1760.70667,2155.26401 1759.384,2153.088 L1759.384,2173.632 L1755.032,2173.632 L1755.032,2126.656 L1758.936,2126.656 L1758.936,2133.12 C1760.30134,2131.02932 1762.07199,2129.33334 1764.248,2128.032 C1766.42401,2126.73066 1768.79199,2126.08 1771.352,2126.08 C1773.65601,2126.08 1775.77866,2126.56 1777.72,2127.52 C1779.66134,2128.48 1781.33599,2129.75999 1782.744,2131.36 C1784.15201,2132.96001 1785.25066,2134.80532 1786.04,2136.896 C1786.82934,2138.98668 1787.224,2141.14132 1787.224,2143.36 C1787.224,2145.70668 1786.86134,2147.92532 1786.136,2150.016 C1785.41066,2152.10668 1784.37601,2153.94133 1783.032,2155.52 C1781.68799,2157.09867 1780.08801,2158.34666 1778.232,2159.264 C1776.37599,2160.18134 1774.33868,2160.64 1772.12,2160.64 Z M1770.904,2156.8 C1772.69601,2156.8 1774.31733,2156.416 1775.768,2155.648 C1777.21867,2154.88 1778.46666,2153.86667 1779.512,2152.608 C1780.55734,2151.34933 1781.35733,2149.92001 1781.912,2148.32 C1782.46667,2146.71999 1782.744,2145.06668 1782.744,2143.36 C1782.744,2141.56799 1782.424,2139.86134 1781.784,2138.24 C1781.144,2136.61866 1780.26934,2135.18934 1779.16,2133.952 C1778.05066,2132.71466 1776.73867,2131.73334 1775.224,2131.008 C1773.70933,2130.28266 1772.07734,2129.92 1770.328,2129.92 C1769.21866,2129.92 1768.06667,2130.144 1766.872,2130.592 C1765.67733,2131.04 1764.54667,2131.63733 1763.48,2132.384 C1762.41333,2133.13067 1761.50667,2134.00533 1760.76,2135.008 C1760.01333,2136.01067 1759.55467,2137.06666 1759.384,2138.176 L1759.384,2148.416 C1759.896,2149.61067 1760.54666,2150.71999 1761.336,2151.744 C1762.12534,2152.76801 1763.02133,2153.65333 1764.024,2154.4 C1765.02667,2155.14667 1766.11466,2155.73333 1767.288,2156.16 C1768.46134,2156.58667 1769.66666,2156.8 1770.904,2156.8 Z M1808.792,2160.64 C1806.35999,2160.64 1804.13068,2160.18134 1802.104,2159.264 C1800.07732,2158.34666 1798.32801,2157.09867 1796.856,2155.52 C1795.38399,2153.94133 1794.24267,2152.10668 1793.432,2150.016 C1792.62133,2147.92532 1792.216,2145.72801 1792.216,2143.424 C1792.216,2141.07732 1792.632,2138.85868 1793.464,2136.768 C1794.296,2134.67732 1795.44799,2132.84267 1796.92,2131.264 C1798.39201,2129.68533 1800.14132,2128.42667 1802.168,2127.488 C1804.19468,2126.54933 1806.40265,2126.08 1808.792,2126.08 C1811.18135,2126.08 1813.38932,2126.54933 1815.416,2127.488 C1817.44268,2128.42667 1819.19199,2129.68533 1820.664,2131.264 C1822.13601,2132.84267 1823.288,2134.67732 1824.12,2136.768 C1824.952,2138.85868 1825.368,2141.07732 1825.368,2143.424 C1825.368,2145.72801 1824.952,2147.92532 1824.12,2150.016 C1823.288,2152.10668 1822.13601,2153.94133 1820.664,2155.52 C1819.19199,2157.09867 1817.44268,2158.34666 1815.416,2159.264 C1813.38932,2160.18134 1811.18135,2160.64 1808.792,2160.64 Z M1796.696,2143.488 C1796.696,2145.36534 1797.00533,2147.10399 1797.624,2148.704 C1798.24267,2150.30401 1799.09599,2151.71199 1800.184,2152.928 C1801.27201,2154.14401 1802.55199,2155.09333 1804.024,2155.776 C1805.49601,2156.45867 1807.06399,2156.8 1808.728,2156.8 C1810.39201,2156.8 1811.95999,2156.448 1813.432,2155.744 C1814.90401,2155.04 1816.19466,2154.08001 1817.304,2152.864 C1818.41334,2151.64799 1819.288,2150.22934 1819.928,2148.608 C1820.568,2146.98666 1820.888,2145.23734 1820.888,2143.36 C1820.888,2141.52532 1820.568,2139.78667 1819.928,2138.144 C1819.288,2136.50133 1818.41334,2135.07201 1817.304,2133.856 C1816.19466,2132.63999 1814.91467,2131.68 1813.464,2130.976 C1812.01333,2130.272 1810.45601,2129.92 1808.792,2129.92 C1807.12799,2129.92 1805.56001,2130.272 1804.088,2130.976 C1802.61599,2131.68 1801.33601,2132.65066 1800.248,2133.888 C1799.15999,2135.12534 1798.296,2136.56533 1797.656,2138.208 C1797.016,2139.85067 1796.696,2141.61066 1796.696,2143.488 Z M1849.112,2130.496 C1846.16799,2130.58133 1843.60801,2131.39199 1841.432,2132.928 C1839.25599,2134.46401 1837.72,2136.57599 1836.824,2139.264 L1836.824,2160 L1832.472,2160 L1832.472,2126.656 L1836.568,2126.656 L1836.568,2134.656 C1837.72001,2132.30932 1839.23466,2130.35734 1841.112,2128.8 C1842.98934,2127.24266 1845.01599,2126.464 1847.192,2126.464 L1848.28,2126.464 C1848.62134,2126.464 1848.89867,2126.48533 1849.112,2126.528 L1849.112,2130.496 Z M1871.064,2158.4 C1870.808,2158.528 1870.43467,2158.69867 1869.944,2158.912 C1869.45333,2159.12533 1868.888,2159.33867 1868.248,2159.552 C1867.608,2159.76533 1866.88267,2159.95733 1866.072,2160.128 C1865.26133,2160.29867 1864.408,2160.384 1863.512,2160.384 C1862.57333,2160.384 1861.67734,2160.256 1860.824,2160 C1859.97066,2159.744 1859.224,2159.34934 1858.584,2158.816 C1857.944,2158.28266 1857.432,2157.61067 1857.048,2156.8 C1856.664,2155.98933 1856.472,2155.05067 1856.472,2153.984 L1856.472,2130.112 L1851.864,2130.112 L1851.864,2126.656 L1856.472,2126.656 L1856.472,2115.392 L1860.824,2115.392 L1860.824,2126.656 L1868.504,2126.656 L1868.504,2130.112 L1860.824,2130.112 L1860.824,2152.768 C1860.90933,2154.00534 1861.336,2154.912 1862.104,2155.488 C1862.872,2156.064 1863.78933,2156.352 1864.856,2156.352 C1866.09334,2156.352 1867.18133,2156.14934 1868.12,2155.744 C1869.05867,2155.33866 1869.656,2155.05067 1869.912,2154.88 L1871.064,2158.4 Z M1876.184,2160 L1876.184,2126.656 L1880.536,2126.656 L1880.536,2160 L1876.184,2160 Z M1876.184,2119.68 L1876.184,2113.28 L1880.536,2113.28 L1880.536,2119.68 L1876.184,2119.68 Z M1904.28,2160.64 C1901.84799,2160.64 1899.61868,2160.18134 1897.592,2159.264 C1895.56532,2158.34666 1893.81601,2157.09867 1892.344,2155.52 C1890.87199,2153.94133 1889.73067,2152.10668 1888.92,2150.016 C1888.10933,2147.92532 1887.704,2145.72801 1887.704,2143.424 C1887.704,2141.07732 1888.12,2138.85868 1888.952,2136.768 C1889.784,2134.67732 1890.93599,2132.84267 1892.408,2131.264 C1893.88001,2129.68533 1895.62932,2128.42667 1897.656,2127.488 C1899.68268,2126.54933 1901.89065,2126.08 1904.28,2126.08 C1906.66935,2126.08 1908.87732,2126.54933 1910.904,2127.488 C1912.93068,2128.42667 1914.67999,2129.68533 1916.152,2131.264 C1917.62401,2132.84267 1918.776,2134.67732 1919.608,2136.768 C1920.44,2138.85868 1920.856,2141.07732 1920.856,2143.424 C1920.856,2145.72801 1920.44,2147.92532 1919.608,2150.016 C1918.776,2152.10668 1917.62401,2153.94133 1916.152,2155.52 C1914.67999,2157.09867 1912.93068,2158.34666 1910.904,2159.264 C1908.87732,2160.18134 1906.66935,2160.64 1904.28,2160.64 Z M1892.184,2143.488 C1892.184,2145.36534 1892.49333,2147.10399 1893.112,2148.704 C1893.73067,2150.30401 1894.58399,2151.71199 1895.672,2152.928 C1896.76001,2154.14401 1898.03999,2155.09333 1899.512,2155.776 C1900.98401,2156.45867 1902.55199,2156.8 1904.216,2156.8 C1905.88001,2156.8 1907.44799,2156.448 1908.92,2155.744 C1910.39201,2155.04 1911.68266,2154.08001 1912.792,2152.864 C1913.90134,2151.64799 1914.776,2150.22934 1915.416,2148.608 C1916.056,2146.98666 1916.376,2145.23734 1916.376,2143.36 C1916.376,2141.52532 1916.056,2139.78667 1915.416,2138.144 C1914.776,2136.50133 1913.90134,2135.07201 1912.792,2133.856 C1911.68266,2132.63999 1910.40267,2131.68 1908.952,2130.976 C1907.50133,2130.272 1905.94401,2129.92 1904.28,2129.92 C1902.61599,2129.92 1901.04801,2130.272 1899.576,2130.976 C1898.10399,2131.68 1896.82401,2132.65066 1895.736,2133.888 C1894.64799,2135.12534 1893.784,2136.56533 1893.144,2138.208 C1892.504,2139.85067 1892.184,2141.61066 1892.184,2143.488 Z M1955.992,2160 L1951.64,2160 L1951.64,2141.376 C1951.64,2137.40798 1951.06401,2134.52801 1949.912,2132.736 C1948.75999,2130.94399 1946.96801,2130.048 1944.536,2130.048 C1943.25599,2130.048 1941.97601,2130.28266 1940.696,2130.752 C1939.41599,2131.22134 1938.22134,2131.88266 1937.112,2132.736 C1936.00266,2133.58934 1935.032,2134.60266 1934.2,2135.776 C1933.368,2136.94934 1932.73867,2138.21866 1932.312,2139.584 L1932.312,2160 L1927.96,2160 L1927.96,2126.656 L1931.928,2126.656 L1931.928,2134.208 C1932.61067,2133.01333 1933.45333,2131.91467 1934.456,2130.912 C1935.45867,2129.90933 1936.57866,2129.04534 1937.816,2128.32 C1939.05334,2127.59466 1940.36533,2127.04 1941.752,2126.656 C1943.13867,2126.272 1944.57866,2126.08 1946.072,2126.08 C1947.94934,2126.08 1949.51733,2126.42133 1950.776,2127.104 C1952.03467,2127.78667 1953.048,2128.74666 1953.816,2129.984 C1954.584,2131.22134 1955.13866,2132.73599 1955.48,2134.528 C1955.82134,2136.32001 1955.992,2138.30399 1955.992,2140.48 L1955.992,2160 Z M1976.216,2160.64 C1973.61332,2160.64 1971.07468,2160.21334 1968.6,2159.36 C1966.12532,2158.50666 1963.99201,2157.26934 1962.2,2155.648 L1964.184,2152.704 C1966.06134,2154.24001 1967.97066,2155.392 1969.912,2156.16 C1971.85334,2156.928 1973.93332,2157.312 1976.152,2157.312 C1978.84001,2157.312 1980.98399,2156.76801 1982.584,2155.68 C1984.18401,2154.59199 1984.984,2153.04534 1984.984,2151.04 C1984.984,2150.10133 1984.77067,2149.32267 1984.344,2148.704 C1983.91733,2148.08533 1983.288,2147.54134 1982.456,2147.072 C1981.624,2146.60266 1980.57867,2146.18667 1979.32,2145.824 C1978.06133,2145.46133 1976.60001,2145.088 1974.936,2144.704 C1973.01599,2144.23466 1971.35201,2143.76534 1969.944,2143.296 C1968.53599,2142.82666 1967.37334,2142.29334 1966.456,2141.696 C1965.53866,2141.09866 1964.856,2140.36267 1964.408,2139.488 C1963.96,2138.61333 1963.736,2137.51467 1963.736,2136.192 C1963.736,2134.52799 1964.06666,2133.05601 1964.728,2131.776 C1965.38934,2130.49599 1966.28533,2129.44 1967.416,2128.608 C1968.54667,2127.776 1969.86933,2127.14667 1971.384,2126.72 C1972.89867,2126.29333 1974.50932,2126.08 1976.216,2126.08 C1978.77601,2126.08 1981.10132,2126.496 1983.192,2127.328 C1985.28268,2128.16 1986.96799,2129.25866 1988.248,2130.624 L1986.136,2133.184 C1984.89866,2131.90399 1983.39468,2130.944 1981.624,2130.304 C1979.85332,2129.664 1978.00801,2129.344 1976.088,2129.344 C1974.93599,2129.344 1973.86934,2129.46133 1972.888,2129.696 C1971.90666,2129.93067 1971.04267,2130.304 1970.296,2130.816 C1969.54933,2131.328 1968.96267,2131.97866 1968.536,2132.768 C1968.10933,2133.55734 1967.896,2134.48533 1967.896,2135.552 C1967.896,2136.448 1968.04533,2137.17333 1968.344,2137.728 C1968.64267,2138.28267 1969.13333,2138.76266 1969.816,2139.168 C1970.49867,2139.57334 1971.36266,2139.936 1972.408,2140.256 C1973.45334,2140.576 1974.72266,2140.90666 1976.216,2141.248 C1978.34934,2141.76 1980.22666,2142.272 1981.848,2142.784 C1983.46934,2143.296 1984.82399,2143.89333 1985.912,2144.576 C1987.00001,2145.25867 1987.82133,2146.09066 1988.376,2147.072 C1988.93067,2148.05334 1989.208,2149.24799 1989.208,2150.656 C1989.208,2153.72802 1988.03468,2156.15999 1985.688,2157.952 C1983.34132,2159.74401 1980.18402,2160.64 1976.216,2160.64 Z M1995.736,2160 L1995.736,2153.728 L1999.448,2153.728 L1999.448,2160 L1995.736,2160 Z" id="Stretch-objects-by-g"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/tool-icon.fbx b/unpublishedScripts/marketplace/shapes/assets/tools/tool-icon.fbx
new file mode 100644
index 0000000000..b4a21c523b
Binary files /dev/null and b/unpublishedScripts/marketplace/shapes/assets/tools/tool-icon.fbx differ
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/tool-label.svg b/unpublishedScripts/marketplace/shapes/assets/tools/tool-label.svg
new file mode 100644
index 0000000000..bc8b059bdb
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/tool-label.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="152px" height="48px" viewBox="0 0 152 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>TOOL</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Tool-Palette" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Tool-Palette---Default" transform="translate(-282.000000, -1074.000000)" fill="#AFAFAF">
+            <path d="M315.044,1083.072 L316.068,1075.712 L282.66,1075.712 L282.66,1083.072 L294.436,1083.072 L294.436,1120 L303.844,1120 L303.844,1083.072 L315.044,1083.072 Z M336.1,1074.688 C348.26,1074.688 355.748,1083.008 355.748,1097.856 C355.748,1112.384 348.26,1121.024 336.1,1121.024 C323.94,1121.024 316.388,1112.64 316.388,1097.856 C316.388,1083.392 323.94,1074.688 336.1,1074.688 Z M336.1,1081.728 C329.828,1081.728 326.308,1086.272 326.308,1097.856 C326.308,1109.44 329.956,1113.984 336.1,1113.984 C342.436,1113.984 345.828,1109.44 345.828,1097.856 C345.828,1086.272 342.436,1081.728 336.1,1081.728 Z M380.324,1074.688 C392.484,1074.688 399.972,1083.008 399.972,1097.856 C399.972,1112.384 392.484,1121.024 380.324,1121.024 C368.164,1121.024 360.612,1112.64 360.612,1097.856 C360.612,1083.392 368.164,1074.688 380.324,1074.688 Z M380.324,1081.728 C374.052,1081.728 370.532,1086.272 370.532,1097.856 C370.532,1109.44 374.18,1113.984 380.324,1113.984 C386.66,1113.984 390.052,1109.44 390.052,1097.856 C390.052,1086.272 386.66,1081.728 380.324,1081.728 Z M416.484,1112.448 L416.484,1075.712 L407.076,1075.712 L407.076,1120 L432.996,1120 L434.02,1112.448 L416.484,1112.448 Z" id="TOOL"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/tools-heading.svg b/unpublishedScripts/marketplace/shapes/assets/tools/tools-heading.svg
new file mode 100644
index 0000000000..e180ae7251
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/tools-heading.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="327px" height="82px" viewBox="0 0 327 82" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 45.2 (43514) - http://www.bohemiancoding.com/sketch -->
+    <title>TOOLS</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Tool-Palette" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Tool-Palette---Default" transform="translate(-1036.000000, -200.000000)" fill="#FFFFFF">
+            <path d="M1092.812,215.376 L1094.604,202.496 L1036.14,202.496 L1036.14,215.376 L1056.748,215.376 L1056.748,280 L1073.212,280 L1073.212,215.376 L1092.812,215.376 Z M1129.66,200.704 C1150.94,200.704 1164.044,215.264 1164.044,241.248 C1164.044,266.672 1150.94,281.792 1129.66,281.792 C1108.38,281.792 1095.164,267.12 1095.164,241.248 C1095.164,215.936 1108.38,200.704 1129.66,200.704 Z M1129.66,213.024 C1118.684,213.024 1112.524,220.976 1112.524,241.248 C1112.524,261.52 1118.908,269.472 1129.66,269.472 C1140.748,269.472 1146.684,261.52 1146.684,241.248 C1146.684,220.976 1140.748,213.024 1129.66,213.024 Z M1207.052,200.704 C1228.332,200.704 1241.436,215.264 1241.436,241.248 C1241.436,266.672 1228.332,281.792 1207.052,281.792 C1185.772,281.792 1172.556,267.12 1172.556,241.248 C1172.556,215.936 1185.772,200.704 1207.052,200.704 Z M1207.052,213.024 C1196.076,213.024 1189.916,220.976 1189.916,241.248 C1189.916,261.52 1196.3,269.472 1207.052,269.472 C1218.14,269.472 1224.076,261.52 1224.076,241.248 C1224.076,220.976 1218.14,213.024 1207.052,213.024 Z M1270.332,266.784 L1270.332,202.496 L1253.868,202.496 L1253.868,280 L1299.228,280 L1301.02,266.784 L1270.332,266.784 Z M1334.508,200.704 C1318.828,200.704 1307.404,209.328 1307.404,222.544 C1307.404,234.304 1314.124,241.024 1330.924,246.288 C1342.684,249.872 1345.708,252.56 1345.708,258.72 C1345.708,265.552 1340.332,269.36 1332.38,269.36 C1324.428,269.36 1318.156,266.448 1312.78,261.52 L1304.156,270.928 C1310.54,277.2 1319.948,281.792 1332.828,281.792 C1351.644,281.792 1362.844,271.824 1362.844,257.6 C1362.844,243.264 1353.884,237.44 1339.884,232.96 C1327.228,229.04 1324.316,226.8 1324.316,221.424 C1324.316,215.936 1328.908,213.024 1335.628,213.024 C1341.9,213.024 1347.276,215.04 1352.652,219.632 L1360.604,210.448 C1353.884,204.176 1346.044,200.704 1334.508,200.704 Z" id="TOOLS"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/undo-icon.svg b/unpublishedScripts/marketplace/shapes/assets/tools/undo-icon.svg
new file mode 100644
index 0000000000..566de28906
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/undo-icon.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="180" height="186" viewBox="0 0 180.00 186.00" enable-background="new 0 0 180.00 186.00" xml:space="preserve">
+	<g>
+		<path fill="#AFAFAF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 142.265,146.571C 136.166,141.827 135.664,136.23 140.76,129.779C 151.25,117.229 156.075,102.741 155.235,86.3146C 154.395,69.8885 148.038,55.7393 136.166,43.867C 123.643,31.3442 108.572,25.0827 90.9536,25.0827C 73.3349,25.0827 58.2506,31.3577 45.7006,43.9077C 31.8225,57.7858 25.0461,73.0192 25.3713,89.6079C 25.7237,104.868 33.0016,120.63 47.205,136.894L 47.7335,121.159C 47.7335,113.678 51.7994,109.612 59.9311,108.961C 62.9669,109.287 65.6775,110.642 68.0628,113.027C 70.7734,115.738 71.966,118.611 71.6408,121.647L 71.1122,165.843C 71.1122,167.198 70.7734,168.892 70.0958,170.925C 68.0628,175.669 64.3358,178.04 58.9147,178.04L 14.1902,178.04C 11.4797,178.04 8.93849,176.854 6.56674,174.483C 4.19499,172.111 2.84649,169.407 2.52122,166.371C 2.52121,158.24 6.58708,154.174 14.7188,154.174L 29.9251,154.174C 11.3035,133.492 1.83001,112.146 1.50475,90.1365C 0.47474,66.7713 9.28409,45.7644 27.9328,27.1157C 45.1992,9.84935 66.0299,1.21617 90.425,1.21617C 114.82,1.21617 135.651,9.84935 152.917,27.1157C 169.181,43.3791 177.827,62.6919 178.857,85.0541C 179.887,107.416 173.274,127.407 159.016,145.026C 157.01,147.736 154.306,149.261 150.905,149.6C 147.503,149.938 144.623,148.929 142.265,146.571 Z "/>
+	</g>
+</svg>
diff --git a/unpublishedScripts/marketplace/shapes/assets/tools/undo-label.svg b/unpublishedScripts/marketplace/shapes/assets/tools/undo-label.svg
new file mode 100644
index 0000000000..ca749f2765
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/assets/tools/undo-label.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="205" height="59" viewBox="0 0 205.00 59.00" enable-background="new 0 0 205.00 59.00" xml:space="preserve">
+	<g>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-linejoin="round" d="M 43.3067,39.0384C 43.3067,42.8316 42.5133,46.197 40.9267,49.1348C 39.34,52.0727 36.9724,54.3824 33.8239,56.0641C 30.6753,57.7458 26.8533,58.5867 22.3577,58.5867C 15.5896,58.5867 10.4205,56.8099 6.85052,53.2565C 3.28052,49.703 1.49552,44.9636 1.49552,39.0384L 1.49552,1.86334L 13.16,1.86334L 13.16,38.8649C 13.16,42.6415 13.8996,45.4615 15.3789,47.3251C 16.8581,49.1886 19.1844,50.1203 22.3577,50.1203C 25.531,50.1203 27.8718,49.1886 29.3799,47.3251C 30.8881,45.4615 31.6422,42.6415 31.6422,38.8649L 31.6422,1.86334L 43.3067,1.86334L 43.3067,39.0384 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-linejoin="round" d="M 95.27,57L 80.271,57L 62.8177,13.1188C 63.297,16.9036 63.6813,20.4612 63.9705,23.7916C 64.2598,27.1219 64.4044,31.0225 64.4044,35.4932L 64.4044,57L 53.8555,57L 53.8555,1.46667L 68.5322,1.46667L 86.3078,45.6578C 85.25,38.4765 84.7212,31.886 84.7212,25.8865L 84.7212,1.46667L 95.27,1.46667L 95.27,57 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-linejoin="round" d="M 121.376,1.72699C 129.937,1.72699 136.796,3.68346 141.953,7.59641C 147.109,11.5094 149.688,18.6845 149.688,29.1218C 149.688,39.3442 147.163,46.5462 142.114,50.7277C 137.065,54.9092 130.598,57 122.714,57L 107.009,57L 107.009,1.72699L 121.376,1.72699 Z M 118.673,10.1933L 118.673,48.5336L 123.433,48.5336C 127.929,48.5336 131.406,47.1247 133.864,44.3067C 136.323,41.4887 137.552,36.427 137.552,29.1218C 137.552,24.0725 136.93,20.1513 135.687,17.3581C 134.443,14.5649 132.79,12.6725 130.728,11.6808C 128.666,10.6892 126.156,10.1933 123.198,10.1933L 118.673,10.1933 Z "/>
+		<path fill="#FFFFFF" fill-opacity="1" stroke-linejoin="round" d="M 180.231,0.933651C 185.255,0.933651 189.594,2.06167 193.247,4.31771C 196.899,6.57376 199.703,9.85245 201.657,14.1538C 203.612,18.4552 204.589,23.6552 204.589,29.754C 204.589,35.7535 203.612,40.9185 201.657,45.2488C 199.703,49.579 196.899,52.8846 193.247,55.1654C 189.594,57.4463 185.255,58.5867 180.231,58.5867C 175.207,58.5867 170.858,57.4586 167.184,55.2026C 163.511,52.9466 160.695,49.6555 158.737,45.3293C 156.778,41.0032 155.799,35.8114 155.799,29.754C 155.799,23.8122 156.79,18.6783 158.774,14.3521C 160.757,10.026 163.588,6.70804 167.265,4.39828C 170.942,2.08853 175.264,0.933651 180.231,0.933651 Z M 180.231,9.40001C 176.215,9.40001 173.188,11.0156 171.151,14.2468C 169.114,17.478 168.095,22.647 168.095,29.754C 168.095,36.8692 169.126,42.0424 171.188,45.2735C 173.25,48.5047 176.264,50.1203 180.231,50.1203C 184.256,50.1203 187.272,48.5171 189.28,45.3107C 191.288,42.1043 192.292,36.9188 192.292,29.754C 192.292,22.5974 191.288,17.416 189.28,14.2096C 187.272,11.0032 184.256,9.40001 180.231,9.40001 Z "/>
+	</g>
+</svg>
diff --git a/unpublishedScripts/marketplace/shapes/modules/createPalette.js b/unpublishedScripts/marketplace/shapes/modules/createPalette.js
new file mode 100644
index 0000000000..38dad5b827
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/modules/createPalette.js
@@ -0,0 +1,552 @@
+//
+//  createPalette.js
+//
+//  Created by David Rowe on 28 Jul 2017.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+/* global CreatePalette:true, App, Feedback, History, Preload, UIT */
+
+CreatePalette = function (side, leftInputs, rightInputs, uiCommandCallback) {
+    // Tool menu displayed on top of forearm.
+
+    "use strict";
+
+    var paletteOriginOverlay,
+        paletteHeaderHeadingOverlay,
+        paletteHeaderBarOverlay,
+        paletteTitleOverlay,
+        palettePanelOverlay,
+        paletteItemOverlays = [],
+        paletteItemPositions = [],
+        paletteItemHoverOverlays = [],
+        iconOverlays = [],
+        staticOverlays = [],
+
+        LEFT_HAND = 0,
+
+        controlJointName,
+
+        PALETTE_ORIGIN_POSITION = {
+            x: 0,
+            y: UIT.dimensions.handOffset,
+            z: UIT.dimensions.canvasSeparation + UIT.dimensions.canvas.x / 2
+        },
+        PALETTE_ORIGIN_ROTATION = Quat.ZERO,
+        paletteLateralOffset,
+
+        PALETTE_ORIGIN_PROPERTIES = {
+            dimensions: { x: 0.005, y: 0.005, z: 0.005 },
+            localPosition: PALETTE_ORIGIN_POSITION,
+            localRotation: PALETTE_ORIGIN_ROTATION,
+            color: { red: 255, blue: 0, green: 0 },
+            alpha: 1.0,
+            parentID: Uuid.SELF,
+            ignoreRayIntersection: true,
+            visible: false
+        },
+
+        PALETTE_HEADER_HEADING_PROPERTIES = {
+            url: Script.resolvePath("../assets/gray-header.fbx"),
+            dimensions: UIT.dimensions.headerHeading, // Model is in rotated coordinate system but can override.
+            localPosition: {
+                x: 0,
+                y: UIT.dimensions.canvas.y / 2 - UIT.dimensions.headerHeading.y / 2,
+                z: UIT.dimensions.headerHeading.z / 2
+            },
+            localRotation: Quat.ZERO,
+            alpha: 1.0,
+            solid: true,
+            ignoreRayIntersection: false,
+            visible: true
+        },
+
+        PALETTE_HEADER_BAR_PROPERTIES = {
+            url: Script.resolvePath("../assets/blue-header-bar.fbx"),
+            dimensions: UIT.dimensions.headerBar, // Model is in rotated coordinate system but can override.
+            localPosition: {
+                x: 0,
+                y: UIT.dimensions.canvas.y / 2 - UIT.dimensions.headerHeading.y - UIT.dimensions.headerBar.y / 2,
+                z: UIT.dimensions.headerBar.z / 2
+            },
+            localRotation: Quat.ZERO,
+            alpha: 1.0,
+            solid: true,
+            ignoreRayIntersection: false,
+            visible: true
+        },
+
+        PALETTE_TITLE_PROPERTIES = {
+            url: Script.resolvePath("../assets/create/create-heading.svg"),
+            scale: 0.0363,
+            localPosition: {
+                x: 0,
+                y: 0,
+                z: PALETTE_HEADER_HEADING_PROPERTIES.dimensions.z / 2 + UIT.dimensions.imageOverlayOffset
+            },
+            localRotation: Quat.ZERO,
+            color: UIT.colors.white,
+            alpha: 1.0,
+            emissive: true,
+            ignoreRayIntersection: true,
+            isFacingAvatar: false,
+            visible: true
+        },
+
+        PALETTE_PANEL_PROPERTIES = {
+            dimensions: UIT.dimensions.panel,
+            localPosition: { x: 0, y: (UIT.dimensions.panel.y - UIT.dimensions.canvas.y) / 2, z: UIT.dimensions.panel.z / 2 },
+            localRotation: Quat.ZERO,
+            color: UIT.colors.baseGray,
+            alpha: 1.0,
+            solid: true,
+            ignoreRayIntersection: false,
+            visible: true
+        },
+
+        ENTITY_CREATION_DIMENSIONS = { x: 0.2, y: 0.2, z: 0.2 },
+        ENTITY_CREATION_COLOR = { red: 192, green: 192, blue: 192 },
+
+        PALETTE_ITEM = {
+            overlay: "cube", // Invisible cube for hit area.
+            properties: {
+                dimensions: UIT.dimensions.itemCollisionZone,
+                localRotation: Quat.ZERO,
+                alpha: 0.0, // Invisible.
+                solid: true,
+                ignoreRayIntersection: false,
+                visible: true // So that laser intersects.
+            },
+            hoverButton: {
+                // Relative to root overlay.
+                overlay: "cube",
+                properties: {
+                    dimensions: UIT.dimensions.paletteItemButtonDimensions,
+                    localPosition: UIT.dimensions.paletteItemButtonOffset,
+                    localRotation: Quat.ZERO,
+                    color: UIT.colors.blueHighlight,
+                    alpha: 1.0,
+                    emissive: true, // TODO: This has no effect.
+                    solid: true,
+                    ignoreRayIntersection: true,
+                    visible: false
+                }
+            },
+            icon: {
+                // Relative to hoverButton.
+                overlay: "model",
+                properties: {
+                    dimensions: UIT.dimensions.paletteItemIconDimensions,
+                    localPosition: UIT.dimensions.paletteItemIconOffset,
+                    localRotation: Quat.ZERO,
+                    emissive: true, // TODO: This has no effect.
+                    ignoreRayIntersection: true
+                }
+            },
+            entity: {
+                dimensions: ENTITY_CREATION_DIMENSIONS
+            }
+        },
+
+        PALETTE_ITEMS = [
+            {
+                icon: {
+                    properties: {
+                        url: Script.resolvePath("../assets/create/cube.fbx")
+                    }
+                },
+                entity: {
+                    type: "Box",
+                    dimensions: ENTITY_CREATION_DIMENSIONS,
+                    color: ENTITY_CREATION_COLOR
+                }
+            },
+            {
+                icon: {
+                    properties: {
+                        url: Script.resolvePath("../assets/create/sphere.fbx")
+                    }
+                },
+                entity: {
+                    type: "Sphere",
+                    dimensions: ENTITY_CREATION_DIMENSIONS,
+                    color: ENTITY_CREATION_COLOR
+                }
+            },
+            {
+                icon: {
+                    properties: {
+                        url: Script.resolvePath("../assets/create/tetrahedron.fbx")
+                    }
+                },
+                entity: {
+                    type: "Shape",
+                    shape: "Tetrahedron",
+                    dimensions: ENTITY_CREATION_DIMENSIONS,
+                    color: ENTITY_CREATION_COLOR
+                }
+            },
+            {
+                icon: {
+                    properties: {
+                        url: Script.resolvePath("../assets/create/octahedron.fbx")
+                    }
+                },
+                entity: {
+                    type: "Shape",
+                    shape: "Octahedron",
+                    dimensions: ENTITY_CREATION_DIMENSIONS,
+                    color: ENTITY_CREATION_COLOR
+                }
+            },
+            {
+                icon: {
+                    properties: {
+                        url: Script.resolvePath("../assets/create/icosahedron.fbx")
+                    }
+                },
+                entity: {
+                    type: "Shape",
+                    shape: "Icosahedron",
+                    dimensions: ENTITY_CREATION_DIMENSIONS,
+                    color: ENTITY_CREATION_COLOR
+                }
+            },
+            {
+                icon: {
+                    properties: {
+                        url: Script.resolvePath("../assets/create/dodecahedron.fbx")
+                    }
+                },
+                entity: {
+                    type: "Shape",
+                    shape: "Dodecahedron",
+                    dimensions: ENTITY_CREATION_DIMENSIONS,
+                    color: ENTITY_CREATION_COLOR
+                }
+            },
+            {
+                icon: {
+                    properties: {
+                        url: Script.resolvePath("../assets/create/hexagon.fbx"),
+                        dimensions: { x: 0.02078, y: 0.024, z: 0.024 },
+                        localRotation: Quat.fromVec3Degrees({ x: 90, y: 0, z: 0 })
+                    }
+                },
+                entity: {
+                    type: "Shape",
+                    shape: "Hexagon",
+                    dimensions: ENTITY_CREATION_DIMENSIONS,
+                    color: ENTITY_CREATION_COLOR
+                }
+            },
+            {
+                icon: {
+                    properties: {
+                        url: Script.resolvePath("../assets/create/prism.fbx"),
+                        localRotation: Quat.fromVec3Degrees({ x: 90, y: 0, z: 0 })
+                    }
+                },
+                entity: {
+                    type: "Shape",
+                    shape: "Triangle",
+                    dimensions: ENTITY_CREATION_DIMENSIONS,
+                    color: ENTITY_CREATION_COLOR
+                }
+            },
+            {
+                icon: {
+                    properties: {
+                        url: Script.resolvePath("../assets/create/octagon.fbx"),
+                        dimensions: { x: 0.023805, y: 0.024, z: 0.024 },
+                        localRotation: Quat.fromVec3Degrees({ x: 90, y: 0, z: 0 })
+                    }
+                },
+                entity: {
+                    type: "Shape",
+                    shape: "Octagon",
+                    dimensions: ENTITY_CREATION_DIMENSIONS,
+                    color: ENTITY_CREATION_COLOR
+                }
+            },
+            {
+                icon: {
+                    properties: {
+                        url: Script.resolvePath("../assets/create/cylinder.fbx"),
+                        localRotation: Quat.fromVec3Degrees({ x: 90, y: 0, z: 0 })
+                    }
+                },
+                entity: {
+                    type: "Shape",
+                    shape: "Cylinder",
+                    dimensions: ENTITY_CREATION_DIMENSIONS,
+                    color: ENTITY_CREATION_COLOR
+                }
+            },
+            {
+                icon: {
+                    properties: {
+                        url: Script.resolvePath("../assets/create/cone.fbx"),
+                        localRotation: Quat.fromVec3Degrees({ x: 90, y: 0, z: 0 })
+                    }
+                },
+                entity: {
+                    type: "Shape",
+                    shape: "Cone",
+                    dimensions: ENTITY_CREATION_DIMENSIONS,
+                    color: ENTITY_CREATION_COLOR
+                }
+            },
+            {
+                icon: {
+                    properties: {
+                        url: Script.resolvePath("../assets/create/circle.fbx"),
+                        dimensions: { x: 0.024, y: 0.0005, z: 0.024 },
+                        localRotation: Quat.fromVec3Degrees({ x: 90, y: 0, z: 0 })
+                    }
+                },
+                entity: {
+                    type: "Shape",
+                    shape: "Circle",
+                    dimensions: ENTITY_CREATION_DIMENSIONS,
+                    color: ENTITY_CREATION_COLOR
+                }
+            }
+        ],
+
+        isDisplaying = false,
+
+        NONE = -1,
+        highlightedItem = NONE,
+        wasTriggerClicked = false,
+        otherSide,
+
+        // References.
+        controlHand;
+
+    if (!(this instanceof CreatePalette)) {
+        return new CreatePalette();
+    }
+
+
+    function getAssetURLs() {
+        return Preload.findURLs([PALETTE_HEADER_HEADING_PROPERTIES, PALETTE_HEADER_BAR_PROPERTIES, PALETTE_TITLE_PROPERTIES,
+            PALETTE_ITEMS]);
+    }
+
+    function setHand(hand) {
+        // Assumes UI is not displaying.
+        var NUMBER_OF_HANDS = 2;
+        side = hand;
+        otherSide = (side + 1) % NUMBER_OF_HANDS;
+        controlHand = side === LEFT_HAND ? rightInputs.hand() : leftInputs.hand();
+        controlJointName = side === LEFT_HAND ? "LeftHand" : "RightHand";
+        paletteLateralOffset = side === LEFT_HAND ? -UIT.dimensions.handLateralOffset : UIT.dimensions.handLateralOffset;
+    }
+
+    setHand(side);
+
+    function getOverlayIDs() {
+        return [palettePanelOverlay, paletteHeaderHeadingOverlay, paletteHeaderBarOverlay].concat(paletteItemOverlays);
+    }
+
+    function setVisible(visible) {
+        var i,
+            length;
+
+        for (i = 0, length = staticOverlays.length; i < length; i++) {
+            Overlays.editOverlay(staticOverlays[i], { visible: visible });
+        }
+
+        if (!visible) {
+            for (i = 0, length = paletteItemHoverOverlays.length; i < length; i++) {
+                Overlays.editOverlay(paletteItemHoverOverlays[i], { visible: false });
+            }
+        }
+    }
+
+    function update(intersectionOverlayID) {
+        var itemIndex,
+            isTriggerClicked,
+            properties,
+            CREATE_OFFSET = { x: 0, y: 0.05, z: -0.02 },
+            INVERSE_HAND_BASIS_ROTATION = Quat.fromVec3Degrees({ x: 0, y: 0, z: -90 }),
+            entityID;
+
+        itemIndex = paletteItemOverlays.indexOf(intersectionOverlayID);
+
+        // Unhighlight and lower old item.
+        if (highlightedItem !== NONE && (itemIndex === NONE || itemIndex !== highlightedItem)) {
+            Overlays.editOverlay(paletteItemHoverOverlays[highlightedItem], {
+                localPosition: UIT.dimensions.paletteItemButtonOffset,
+                visible: false
+            });
+            highlightedItem = NONE;
+        }
+
+        // Highlight and raise new item.
+        if (itemIndex !== NONE && highlightedItem !== itemIndex) {
+            Feedback.play(otherSide, Feedback.HOVER_BUTTON);
+            Overlays.editOverlay(paletteItemHoverOverlays[itemIndex], {
+                localPosition: UIT.dimensions.paletteItemButtonHoveredOffset,
+                visible: true
+            });
+            highlightedItem = itemIndex;
+        }
+
+        // Press item and create new entity.
+        isTriggerClicked = controlHand.triggerClicked();
+        if (highlightedItem !== NONE && isTriggerClicked && !wasTriggerClicked) {
+            // Create entity.
+            Feedback.play(otherSide, Feedback.CREATE_ENTITY);
+            properties = Object.clone(PALETTE_ITEMS[itemIndex].entity);
+            properties.position = Vec3.sum(controlHand.palmPosition(),
+                Vec3.multiplyQbyV(controlHand.orientation(),
+                    Vec3.sum({ x: 0, y: properties.dimensions.z / 2, z: 0 }, CREATE_OFFSET)));
+            properties.rotation = Quat.multiply(controlHand.orientation(), INVERSE_HAND_BASIS_ROTATION);
+            entityID = Entities.addEntity(properties);
+            if (entityID !== Uuid.NULL) {
+                History.prePush(
+                    otherSide,
+                    { deleteEntities: [{ entityID: entityID }] },
+                    { createEntities: [{ entityID: entityID, properties: properties }] }
+                );
+            } else {
+                Feedback.play(otherSide, Feedback.GENERAL_ERROR);
+            }
+
+            // Lower and unhighlight item.
+            Overlays.editOverlay(paletteItemHoverOverlays[itemIndex], {
+                localPosition: UIT.dimensions.paletteItemButtonOffset,
+                visible: false
+            });
+
+            uiCommandCallback("autoGrab");
+        }
+
+        wasTriggerClicked = isTriggerClicked;
+    }
+
+    function itemPosition(index) {
+        // Position relative to palette panel.
+        var ITEMS_PER_ROW = 4,
+            ROW_ZERO_Y_OFFSET = 0.0860,
+            ROW_SPACING = 0.0560,
+            COLUMN_ZERO_OFFSET = -0.08415,
+            COLUMN_SPACING = 0.0561,
+            row,
+            column;
+
+        row = Math.floor(index / ITEMS_PER_ROW);
+        column = index % ITEMS_PER_ROW;
+
+        return {
+            x: COLUMN_ZERO_OFFSET + column * COLUMN_SPACING,
+            y: ROW_ZERO_Y_OFFSET - row * ROW_SPACING,
+            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.itemCollisionZone.z / 2
+        };
+    }
+
+    function display() {
+        // Creates and shows menu entities.
+        var handJointIndex,
+            properties,
+            i,
+            length;
+
+        if (isDisplaying) {
+            return;
+        }
+
+        // Joint index.
+        handJointIndex = MyAvatar.getJointIndex(controlJointName);
+        if (handJointIndex === NONE) {
+            // Don't display if joint isn't available (yet) to attach to.
+            // User can clear this condition by toggling the app off and back on once avatar finishes loading.
+            App.log(side, "ERROR: CreatePalette: Hand joint index isn't available!");
+            return;
+        }
+
+        // Calculate position to put palette.
+        properties = Object.clone(PALETTE_ORIGIN_PROPERTIES);
+        properties.parentJointIndex = handJointIndex;
+        properties.localPosition = Vec3.sum(PALETTE_ORIGIN_POSITION, { x: paletteLateralOffset, y: 0, z: 0 });
+        paletteOriginOverlay = Overlays.addOverlay("sphere", properties);
+
+        // Header.
+        properties = Object.clone(PALETTE_HEADER_HEADING_PROPERTIES);
+        properties.parentID = paletteOriginOverlay;
+        paletteHeaderHeadingOverlay = Overlays.addOverlay("model", properties);
+        properties = Object.clone(PALETTE_HEADER_BAR_PROPERTIES);
+        properties.parentID = paletteOriginOverlay;
+        paletteHeaderBarOverlay = Overlays.addOverlay("model", properties);
+        properties = Object.clone(PALETTE_TITLE_PROPERTIES);
+        properties.parentID = paletteHeaderHeadingOverlay;
+        paletteTitleOverlay = Overlays.addOverlay("image3d", properties);
+
+        // Palette background.
+        properties = Object.clone(PALETTE_PANEL_PROPERTIES);
+        properties.parentID = paletteOriginOverlay;
+        palettePanelOverlay = Overlays.addOverlay("cube", properties);
+
+        // Palette items.
+        for (i = 0, length = PALETTE_ITEMS.length; i < length; i++) {
+            // Collision overlay.
+            properties = Object.clone(PALETTE_ITEM.properties);
+            properties.parentID = palettePanelOverlay;
+            properties.localPosition = itemPosition(i);
+            paletteItemOverlays[i] = Overlays.addOverlay(PALETTE_ITEM.overlay, properties);
+            paletteItemPositions[i] = properties.localPosition;
+
+            // Highlight overlay.
+            properties = Object.clone(PALETTE_ITEM.hoverButton.properties);
+            properties.parentID = paletteItemOverlays[i];
+            paletteItemHoverOverlays[i] = Overlays.addOverlay(PALETTE_ITEM.hoverButton.overlay, properties);
+
+            // Icon overlay.
+            properties = Object.clone(PALETTE_ITEM.icon.properties);
+            properties = Object.merge(properties, PALETTE_ITEMS[i].icon.properties);
+            properties.parentID = paletteItemHoverOverlays[i];
+            iconOverlays[i] = Overlays.addOverlay(PALETTE_ITEM.icon.overlay, properties);
+        }
+
+        // Always-visible overlays.
+        staticOverlays = [].concat(paletteHeaderHeadingOverlay, paletteHeaderBarOverlay, paletteTitleOverlay,
+            palettePanelOverlay, paletteItemOverlays, iconOverlays);
+
+        isDisplaying = true;
+    }
+
+    function clear() {
+        // Deletes menu entities.
+        if (!isDisplaying) {
+            return;
+        }
+        Overlays.deleteOverlay(paletteOriginOverlay); // Automatically deletes all other overlays because they're children.
+        paletteItemOverlays = [];
+        paletteItemHoverOverlays = [];
+        iconOverlays = [];
+        staticOverlays = [];
+        isDisplaying = false;
+    }
+
+    function destroy() {
+        clear();
+    }
+
+    return {
+        assetURLs: getAssetURLs,
+        setHand: setHand,
+        overlayIDs: getOverlayIDs,
+        setVisible: setVisible,
+        update: update,
+        display: display,
+        clear: clear,
+        destroy: destroy
+    };
+};
+
+CreatePalette.prototype = {};
diff --git a/unpublishedScripts/marketplace/shapes/modules/feedback.js b/unpublishedScripts/marketplace/shapes/modules/feedback.js
new file mode 100644
index 0000000000..0d45ae2019
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/modules/feedback.js
@@ -0,0 +1,80 @@
+//
+//  feedback.js
+//
+//  Created by David Rowe on 31 Aug 2017.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+/* global Feedback:true */
+
+Feedback = (function () {
+    // Provide audio and haptic user feedback. 
+    // Global object.
+
+    "use strict";
+
+    var DROP_SOUND = SoundCache.getSound(Script.resolvePath("../assets/audio/drop.wav")),
+        DELETE_SOUND = SoundCache.getSound(Script.resolvePath("../assets/audio/delete.wav")),
+        SELECT_SOUND = SoundCache.getSound(Script.resolvePath("../assets/audio/select.wav")),
+        CLONE_SOUND = SoundCache.getSound(Script.resolvePath("../assets/audio/clone.wav")),
+        CREATE_SOUND = SoundCache.getSound(Script.resolvePath("../assets/audio/create.wav")),
+        EQUIP_SOUND = SoundCache.getSound(Script.resolvePath("../assets/audio/equip.wav")),
+        ERROR_SOUND = SoundCache.getSound(Script.resolvePath("../assets/audio/error.wav")),
+        UNDO_SOUND = DROP_SOUND,
+        REDO_SOUND = DROP_SOUND,
+
+        FEEDBACK_PARAMETERS = {
+            DROP_TOOL:       { sound: DROP_SOUND, volume: 0.3, haptic: 0.75 },
+            DELETE_ENTITY:   { sound: DELETE_SOUND, volume: 0.5, haptic: 0.2 },
+            SELECT_ENTITY:   { sound: SELECT_SOUND, volume: 0.2, haptic: 0.1 }, // E.g., Group tool.
+            CLONE_ENTITY:    { sound: CLONE_SOUND, volume: 0.2, haptic: 0.1 },
+            CREATE_ENTITY:   { sound: CREATE_SOUND, volume: 0.4, haptic: 0.2 },
+            HOVER_MENU_ITEM: { sound: null, volume: 0, haptic: 0.1 }, // Tools menu.
+            HOVER_BUTTON:    { sound: null, volume: 0, haptic: 0.075 }, // Tools options and Create palette items.
+            EQUIP_TOOL:      { sound: EQUIP_SOUND, volume: 0.3, haptic: 0.6 },
+            APPLY_PROPERTY:  { sound: null, volume: 0, haptic: 0.3 },
+            APPLY_ERROR:     { sound: ERROR_SOUND, volume: 0.2, haptic: 0.7 },
+            UNDO_ACTION:     { sound: UNDO_SOUND, volume: 0.1, haptic: 0.2 },
+            REDO_ACTION:     { sound: REDO_SOUND, volume: 0.1, haptic: 0.2 },
+            GENERAL_ERROR:   { sound: ERROR_SOUND, volume: 0.2, haptic: 0.7 }
+        },
+
+        VOLUME_MULTPLIER = 0.5, // Resulting volume range should be within 0.0 - 1.0.
+        HAPTIC_STRENGTH_MULTIPLIER = 1.3, // Resulting strength range should be within 0.0 - 1.0.
+        HAPTIC_LENGTH_MULTIPLIER = 75.0; // Resulting length range should be within 0 - 50, say.
+
+    function play(side, item) {
+        var parameters = FEEDBACK_PARAMETERS[item];
+
+        if (parameters.sound) {
+            Audio.playSound(parameters.sound, {
+                position: side ? MyAvatar.getRightPalmPosition() : MyAvatar.getLeftPalmPosition(),
+                volume: parameters.volume * VOLUME_MULTPLIER,
+                localOnly: true
+            });
+        }
+
+        Controller.triggerHapticPulse(parameters.haptic * HAPTIC_STRENGTH_MULTIPLIER,
+            parameters.haptic * HAPTIC_LENGTH_MULTIPLIER, side);
+    }
+
+    return {
+        DROP_TOOL: "DROP_TOOL",
+        DELETE_ENTITY: "DELETE_ENTITY",
+        SELECT_ENTITY: "SELECT_ENTITY",
+        CLONE_ENTITY: "CLONE_ENTITY",
+        CREATE_ENTITY: "CREATE_ENTITY",
+        HOVER_MENU_ITEM: "HOVER_MENU_ITEM",
+        HOVER_BUTTON: "HOVER_BUTTON",
+        EQUIP_TOOL: "EQUIP_TOOL",
+        APPLY_PROPERTY: "APPLY_PROPERTY",
+        APPLY_ERROR: "APPLY_ERROR",
+        UNDO_ACTION: "UNDO_ACTION",
+        REDO_ACTION: "REDO_ACTION",
+        GENERAL_ERROR: "GENERAL_ERROR",
+        play: play
+    };
+}());
diff --git a/unpublishedScripts/marketplace/shapes/modules/groups.js b/unpublishedScripts/marketplace/shapes/modules/groups.js
new file mode 100644
index 0000000000..3153a622ee
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/modules/groups.js
@@ -0,0 +1,275 @@
+//
+//  groups.js
+//
+//  Created by David Rowe on 1 Aug 2017.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+/* global Groups:true, App, History */
+
+Groups = function () {
+    // Groups and ungroups trees of entities.
+
+    "use strict";
+
+    var rootEntityIDs = [],
+        selections = [],
+        entitiesSelectedCount = 0;
+
+    if (!(this instanceof Groups)) {
+        return new Groups();
+    }
+
+    function add(selection) {
+        rootEntityIDs.push(selection[0].id);
+        selections.push(Object.clone(selection));
+        entitiesSelectedCount += selection.length;
+    }
+
+    function remove(selection) {
+        var index = rootEntityIDs.indexOf(selection[0].id);
+
+        entitiesSelectedCount -= selections[index].length;
+        rootEntityIDs.splice(index, 1);
+        selections.splice(index, 1);
+    }
+
+    function toggle(selection) {
+        if (selection.length === 0) {
+            return;
+        }
+
+        if (rootEntityIDs.indexOf(selection[0].id) === -1) {
+            add(selection);
+        } else {
+            remove(selection);
+        }
+    }
+
+    function selection(excludes) {
+        var result = [],
+            i,
+            lengthI,
+            j,
+            lengthJ;
+
+        for (i = 0, lengthI = rootEntityIDs.length; i < lengthI; i++) {
+            if (excludes.indexOf(rootEntityIDs[i]) === -1) {
+                for (j = 0, lengthJ = selections[i].length; j < lengthJ; j++) {
+                    result.push(selections[i][j]);
+                }
+            }
+        }
+
+        return result;
+    }
+
+    function includes(rootEntityID) {
+        return rootEntityIDs.indexOf(rootEntityID) !== -1;
+    }
+
+    function getRootEntityIDs() {
+        return rootEntityIDs;
+    }
+
+    function groupsCount() {
+        return selections.length;
+    }
+
+    function entitiesCount() {
+        return entitiesSelectedCount;
+    }
+
+    function group() {
+        // Groups all selections into one.
+        var DYNAMIC_AND_COLLISIONLESS = { dynamic: true, collisionless: true },
+            rootID,
+            undoData = [],
+            redoData = [],
+            i,
+            lengthI,
+            j,
+            lengthJ;
+
+        // If the first group has physics (i.e., root entity is dynamic) make all entities in child groups dynamic and 
+        // collisionless. (Don't need to worry about other groups physics properties because only those of the first entity in
+        // the linkset are used by High Fidelity.) See Selection.applyPhysics().
+        if (selections[0][0].dynamic) {
+            for (i = 1, lengthI = selections.length; i < lengthI; i++) {
+                for (j = 0, lengthJ = selections[i].length; j < lengthJ; j++) {
+                    undoData.push({
+                        entityID: selections[i][j].id,
+                        properties: {
+                            dynamic: selections[i][j].dynamic,
+                            collisionless: selections[i][j].collisionless
+                        }
+                    });
+                    Entities.editEntity(selections[i][j].id, DYNAMIC_AND_COLLISIONLESS);
+                    selections[i][j].dynamic = true;
+                    selections[i][j].collisionless = true;
+                    redoData.push({
+                        entityID: selections[i][j].id,
+                        properties: DYNAMIC_AND_COLLISIONLESS
+                    });
+                }
+            }
+        }
+
+        // Make the first entity in the first group the root and link the first entities of all other groups to it.
+        rootID = rootEntityIDs[0];
+        for (i = 1, lengthI = rootEntityIDs.length; i < lengthI; i++) {
+            undoData.push({
+                entityID: rootEntityIDs[i],
+                properties: { parentID: Uuid.NULL }
+            });
+            Entities.editEntity(rootEntityIDs[i], {
+                parentID: rootID
+            });
+            redoData.push({
+                entityID: rootEntityIDs[i],
+                properties: { parentID: rootID }
+            });
+        }
+
+        // Update selection.
+        rootEntityIDs.splice(1, rootEntityIDs.length - 1);
+        for (i = 1, lengthI = selections.length; i < lengthI; i++) {
+            selections[i][0].parentID = rootID;
+            selections[0] = selections[0].concat(selections[i]);
+        }
+        selections.splice(1, selections.length - 1);
+
+        // Add history entry.
+        History.push(null, { setProperties: undoData }, { setProperties: redoData });
+    }
+
+    function ungroup() {
+        // Ungroups the first and assumed to be only selection.
+        // If the first entity in the selection has a mix of solo and group children then just the group children are unlinked,
+        // otherwise all are unlinked.
+        var rootID,
+            childrenIDs = [],
+            childrenIndexes = [],
+            childrenIndexIsGroup = [],
+            previousWasGroup,
+            hasSoloChildren = false,
+            hasGroupChildren = false,
+            isUngroupAll,
+            NONDYNAMIC_AND_NONCOLLISIONLESS = { dynamic: false, collisionless: false },
+            undoData = [],
+            redoData = [],
+            i,
+            lengthI,
+            j,
+            lengthJ;
+
+        function updateGroupInformation() {
+            var childrenIndexesLength = childrenIndexes.length;
+            if (childrenIndexesLength > 1) {
+                previousWasGroup = childrenIndexes[childrenIndexesLength - 2] < i - 1;
+                childrenIndexIsGroup.push(previousWasGroup);
+                if (previousWasGroup) {
+                    hasGroupChildren = true;
+                } else {
+                    hasSoloChildren = true;
+                }
+            }
+        }
+
+        if (entitiesSelectedCount === 0) {
+            App.log("ERROR: Groups: Nothing to ungroup!");
+            return;
+        }
+        if (entitiesSelectedCount === 1) {
+            App.log("ERROR: Groups: Cannot ungroup sole entity!");
+            return;
+        }
+
+        // Compile information on immediate children.
+        rootID = rootEntityIDs[0];
+        for (i = 1, lengthI = selections[0].length; i < lengthI; i++) {
+            if (selections[0][i].parentID === rootID) {
+                childrenIDs.push(selections[0][i].id);
+                childrenIndexes.push(i);
+                updateGroupInformation();
+            }
+        }
+        childrenIndexes.push(selections[0].length); // Special extra item at end to aid updating selection.
+        updateGroupInformation();
+
+        // Unlink children.
+        isUngroupAll = hasSoloChildren !== hasGroupChildren;
+        for (i = childrenIDs.length - 1; i >= 0; i--) {
+            if (isUngroupAll || childrenIndexIsGroup[i]) {
+                undoData.push({
+                    entityID: childrenIDs[i],
+                    properties: { parentID: selections[0][childrenIndexes[i]].parentID }
+                });
+                Entities.editEntity(childrenIDs[i], {
+                    parentID: Uuid.NULL
+                });
+                redoData.push({
+                    entityID: childrenIDs[i],
+                    properties: { parentID: Uuid.NULL }
+                });
+                rootEntityIDs.push(childrenIDs[i]);
+                selections[0][childrenIndexes[i]].parentID = Uuid.NULL;
+                selections.push(selections[0].splice(childrenIndexes[i], childrenIndexes[i + 1] - childrenIndexes[i]));
+            }
+        }
+
+        // If root group has physics, reset child groups to defaults for dynamic and collisionless. See 
+        // Selection.applyPhysics().
+        if (selections[0][0].dynamic) {
+            for (i = 1, lengthI = selections.length; i < lengthI; i++) {
+                for (j = 0, lengthJ = selections[i].length; j < lengthJ; j++) {
+                    undoData.push({
+                        entityID: selections[i][j].id,
+                        properties: {
+                            dynamic: selections[i][j].dynamic,
+                            collisionless: selections[i][j].collisionless
+                        }
+                    });
+                    Entities.editEntity(selections[i][j].id, NONDYNAMIC_AND_NONCOLLISIONLESS);
+                    selections[i][j].dynamic = false;
+                    selections[i][j].collisionless = false;
+                    redoData.push({
+                        entityID: selections[i][j].id,
+                        properties: NONDYNAMIC_AND_NONCOLLISIONLESS
+                    });
+                }
+            }
+        }
+
+        // Add history entry.
+        History.push(null, { setProperties: undoData }, { setProperties: redoData });
+    }
+
+    function clear() {
+        rootEntityIDs = [];
+        selections = [];
+        entitiesSelectedCount = 0;
+    }
+
+    function destroy() {
+        clear();
+    }
+
+    return {
+        toggle: toggle,
+        selection: selection,
+        includes: includes,
+        rootEntityIDs: getRootEntityIDs,
+        groupsCount: groupsCount,
+        entitiesCount: entitiesCount,
+        group: group,
+        ungroup: ungroup,
+        clear: clear,
+        destroy: destroy
+    };
+};
+
+Groups.prototype = {};
diff --git a/unpublishedScripts/marketplace/shapes/modules/hand.js b/unpublishedScripts/marketplace/shapes/modules/hand.js
new file mode 100644
index 0000000000..73efed8017
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/modules/hand.js
@@ -0,0 +1,250 @@
+//
+//  hand.js
+//
+//  Created by David Rowe on 21 Jul 2017.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+/* global Hand:true */
+
+Hand = function (side) {
+
+    "use strict";
+
+    // Hand controller input.
+    var handController,
+        controllerTrigger,
+        controllerTriggerClicked,
+        controllerGrip,
+
+        isGripClicked = false,
+        isGripClickedHandled = false,
+        GRIP_ON_VALUE = 0.99,
+        GRIP_OFF_VALUE = 0.95,
+
+        isTriggerPressed,
+        isTriggerClicked,
+        TRIGGER_ON_VALUE = 0.15, // Per controllerDispatcherUtils.js.
+        TRIGGER_OFF_VALUE = 0.1, // Per controllerDispatcherUtils.js.
+        TRIGGER_CLICKED_VALUE = 1.0,
+
+        NEAR_GRAB_RADIUS = 0.05, // Different from controllerDispatcherUtils.js.
+        NEAR_HOVER_RADIUS = 0.025,
+
+        LEFT_HAND = 0,
+        HALF_TREE_SCALE = 16384,
+
+        handPose,
+        handPosition,
+        handOrientation,
+        palmPosition,
+
+        handleOverlayIDs = [],
+        intersection = {};
+
+    if (!(this instanceof Hand)) {
+        return new Hand(side);
+    }
+
+    if (side === LEFT_HAND) {
+        handController = Controller.Standard.LeftHand;
+        controllerTrigger = Controller.Standard.LT;
+        controllerTriggerClicked = Controller.Standard.LTClick;
+        controllerGrip = Controller.Standard.LeftGrip;
+    } else {
+        handController = Controller.Standard.RightHand;
+        controllerTrigger = Controller.Standard.RT;
+        controllerTriggerClicked = Controller.Standard.RTClick;
+        controllerGrip = Controller.Standard.RightGrip;
+    }
+
+    function setHandleOverlays(overlayIDs) {
+        handleOverlayIDs = overlayIDs;
+    }
+
+    function valid() {
+        return handPose.valid;
+    }
+
+    function position() {
+        return handPosition;
+    }
+
+    function orientation() {
+        return handOrientation;
+    }
+
+    function getPalmPosition() {
+        return palmPosition;
+    }
+
+    function triggerPressed() {
+        return isTriggerPressed;
+    }
+
+    function triggerClicked() {
+        return isTriggerClicked;
+    }
+
+    function gripClicked() {
+        return isGripClicked;
+    }
+
+    function setGripClickedHandled() {
+        isGripClicked = false;
+        isGripClickedHandled = true;
+    }
+
+    function getIntersection() {
+        return intersection;
+    }
+
+    function getNearGrabRadius() {
+        return NEAR_GRAB_RADIUS;
+    }
+
+    function update() {
+        var gripValue,
+            overlayID,
+            overlayIDs,
+            overlayDistance,
+            intersectionPosition,
+            distance,
+            entityID,
+            entityIDs,
+            entitySize,
+            size,
+            i,
+            length;
+
+
+        // Hand pose.
+        handPose = Controller.getPoseValue(handController);
+        if (!handPose.valid) {
+            intersection = {};
+            return;
+        }
+        handPosition = Vec3.sum(Vec3.multiplyQbyV(MyAvatar.orientation, handPose.translation), MyAvatar.position);
+        handOrientation = Quat.multiply(MyAvatar.orientation, handPose.rotation);
+
+        // Controller trigger.
+        isTriggerPressed = Controller.getValue(controllerTrigger) > (isTriggerPressed
+            ? TRIGGER_OFF_VALUE : TRIGGER_ON_VALUE);
+        isTriggerClicked = Controller.getValue(controllerTriggerClicked) === TRIGGER_CLICKED_VALUE;
+
+        // Controller grip.
+        gripValue = Controller.getValue(controllerGrip);
+        if (isGripClicked) {
+            isGripClicked = gripValue > GRIP_OFF_VALUE;
+        } else {
+            isGripClicked = gripValue > GRIP_ON_VALUE;
+        }
+        // Grip clicked may be being handled by UI.
+        if (isGripClicked) {
+            isGripClicked = !isGripClickedHandled;
+        } else {
+            isGripClickedHandled = false;
+        }
+
+        // Hand-overlay intersection, if any handle overlays.
+        overlayID = null;
+        palmPosition = side === LEFT_HAND ? MyAvatar.getLeftPalmPosition() : MyAvatar.getRightPalmPosition();
+        if (handleOverlayIDs.length > 0) {
+            overlayIDs = Overlays.findOverlays(palmPosition, NEAR_HOVER_RADIUS);
+            if (overlayIDs.length > 0) {
+                // Typically, there will be only one overlay; optimize for that case.
+                overlayID = overlayIDs[0];
+                if (overlayIDs.length > 1) {
+                    // Find closest overlay.
+                    overlayDistance = Vec3.length(Vec3.subtract(Overlays.getProperty(overlayID, "position"), palmPosition));
+                    for (i = 1, length = overlayIDs.length; i < length; i++) {
+                        distance =
+                            Vec3.length(Vec3.subtract(Overlays.getProperty(overlayIDs[i], "position"), palmPosition));
+                        if (distance > overlayDistance) {
+                            overlayID = overlayIDs[i];
+                            overlayDistance = distance;
+                        }
+                    }
+                }
+            }
+            if (overlayID && handleOverlayIDs.indexOf(overlayID) === -1) {
+                overlayID = null;
+            }
+            if (overlayID) {
+                intersectionPosition = Overlays.getProperty(overlayID, "position");
+            }
+        }
+
+        // Hand-entity intersection, if any editable, if overlay not intersected.
+        entityID = null;
+        if (overlayID === null) {
+            // palmPosition is set above.
+            entityIDs = Entities.findEntities(palmPosition, NEAR_GRAB_RADIUS);
+            if (entityIDs.length > 0) {
+                // Typically, there will be only one entity; optimize for that case.
+                if (Entities.hasEditableRoot(entityIDs[0])) {
+                    entityID = entityIDs[0];
+                }
+                if (entityIDs.length > 1) {
+                    // Find smallest, editable entity.
+                    entitySize = HALF_TREE_SCALE;
+                    for (i = 0, length = entityIDs.length; i < length; i++) {
+                        if (Entities.hasEditableRoot(entityIDs[i])) {
+                            size = Vec3.length(Entities.getEntityProperties(entityIDs[i], "dimensions").dimensions);
+                            if (size < entitySize) {
+                                entityID = entityIDs[i];
+                                entitySize = size;
+                            }
+                        }
+                    }
+                }
+            }
+            if (entityID) {
+                intersectionPosition = Entities.getEntityProperties(entityID, "position").position;
+                if (Vec3.distance(palmPosition, intersectionPosition) > NEAR_GRAB_RADIUS) {
+                    intersectionPosition = Vec3.sum(palmPosition,
+                        Vec3.multiply(NEAR_GRAB_RADIUS, Vec3.normalize(Vec3.subtract(intersectionPosition, palmPosition))));
+                }
+            }
+        }
+
+        intersection = {
+            intersects: overlayID !== null || entityID !== null,
+            overlayID: overlayID,
+            entityID: entityID,
+            handIntersected: overlayID !== null || entityID !== null,
+            editableEntity: entityID !== null,
+            intersection: intersectionPosition
+        };
+    }
+
+    function clear() {
+        // Nothing to do.
+    }
+
+    function destroy() {
+        // Nothing to do.
+    }
+
+    return {
+        setHandleOverlays: setHandleOverlays,
+        valid: valid,
+        position: position,
+        orientation: orientation,
+        palmPosition: getPalmPosition,
+        triggerPressed: triggerPressed,
+        triggerClicked: triggerClicked,
+        gripClicked: gripClicked,
+        setGripClickedHandled: setGripClickedHandled,
+        intersection: getIntersection,
+        getNearGrabRadius: getNearGrabRadius,
+        update: update,
+        clear: clear,
+        destroy: destroy
+    };
+};
+
+Hand.prototype = {};
diff --git a/unpublishedScripts/marketplace/shapes/modules/handles.js b/unpublishedScripts/marketplace/shapes/modules/handles.js
new file mode 100644
index 0000000000..d7627e8626
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/modules/handles.js
@@ -0,0 +1,372 @@
+//
+//  handles.js
+//
+//  Created by David Rowe on 21 Jul 2017.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+/* global Handles:true */
+
+Handles = function (side) {
+    // Draws scaling handles.
+
+    "use strict";
+
+    var boundingBoxOverlay,
+        boundingBoxDimensions,
+        boundingBoxLocalCenter,
+        cornerIndexes = [],
+        cornerHandleOverlays = [],
+        faceHandleOverlays = [],
+        faceHandleOffsets,
+        BOUNDING_BOX_COLOR = { red: 0, green: 240, blue: 240 },
+        BOUNDING_BOX_ALPHA = 0.8,
+        HANDLE_NORMAL_COLOR = { red: 0, green: 240, blue: 240 },
+        HANDLE_HOVER_COLOR = { red: 0, green: 255, blue: 120 },
+        HANDLE_NORMAL_ALPHA = 0.7,
+        HANDLE_HOVER_ALPHA = 0.9,
+        NUM_CORNERS = 8,
+        NUM_CORNER_HANDLES = 2,
+        CORNER_HANDLE_OVERLAY_DIMENSIONS = { x: 0.1, y: 0.1, z: 0.1 },
+        CORNER_HANDLE_OVERLAY_AXES,
+        NUM_FACE_HANDLES = 6,
+        FACE_HANDLE_OVERLAY_DIMENSIONS = { x: 0.1, y: 0.12, z: 0.1 },
+        FACE_HANDLE_OVERLAY_AXES,
+        FACE_HANDLE_OVERLAY_OFFSETS,
+        FACE_HANDLE_OVERLAY_ROTATIONS,
+        FACE_HANDLE_OVERLAY_SCALE_AXES,
+        DISTANCE_MULTIPLIER_MULTIPLIER = 0.25,
+        hoveredOverlayID = null,
+        isVisible = false,
+
+        // Scaling.
+        scalingBoundingBoxDimensions,
+        scalingBoundingBoxLocalCenter,
+
+        i;
+
+    if (!(this instanceof Handles)) {
+        return new Handles(side);
+    }
+
+    CORNER_HANDLE_OVERLAY_AXES = [
+        // Ordered such that items 4 apart are opposite corners - used in display().
+        { x: -0.5, y: -0.5, z: -0.5 },
+        { x: -0.5, y: -0.5, z: 0.5 },
+        { x: -0.5, y: 0.5, z: -0.5 },
+        { x: -0.5, y: 0.5, z: 0.5 },
+        { x: 0.5, y: 0.5, z: 0.5 },
+        { x: 0.5, y: 0.5, z: -0.5 },
+        { x: 0.5, y: -0.5, z: 0.5 },
+        { x: 0.5, y: -0.5, z: -0.5 }
+    ];
+
+    FACE_HANDLE_OVERLAY_AXES = [
+        { x: -0.5, y: 0, z: 0 },
+        { x: 0.5, y: 0, z: 0 },
+        { x: 0, y: -0.5, z: 0 },
+        { x: 0, y: 0.5, z: 0 },
+        { x: 0, y: 0, z: -0.5 },
+        { x: 0, y: 0, z: 0.5 }
+    ];
+
+    FACE_HANDLE_OVERLAY_OFFSETS = {
+        x: FACE_HANDLE_OVERLAY_DIMENSIONS.y,
+        y: FACE_HANDLE_OVERLAY_DIMENSIONS.y,
+        z: FACE_HANDLE_OVERLAY_DIMENSIONS.y
+    };
+
+    FACE_HANDLE_OVERLAY_ROTATIONS = [
+        Quat.fromVec3Degrees({ x: 0, y: 0, z: 90 }),
+        Quat.fromVec3Degrees({ x: 0, y: 0, z: -90 }),
+        Quat.fromVec3Degrees({ x: 180, y: 0, z: 0 }),
+        Quat.fromVec3Degrees({ x: 0, y: 0, z: 0 }),
+        Quat.fromVec3Degrees({ x: -90, y: 0, z: 0 }),
+        Quat.fromVec3Degrees({ x: 90, y: 0, z: 0 })
+    ];
+
+    FACE_HANDLE_OVERLAY_SCALE_AXES = [
+        Vec3.UNIT_NEG_X,
+        Vec3.UNIT_X,
+        Vec3.UNIT_NEG_Y,
+        Vec3.UNIT_Y,
+        Vec3.UNIT_NEG_Z,
+        Vec3.UNIT_Z
+    ];
+
+    function isAxisHandle(overlayID) {
+        return faceHandleOverlays.indexOf(overlayID) !== -1;
+    }
+
+    function isCornerHandle(overlayID) {
+        return cornerHandleOverlays.indexOf(overlayID) !== -1;
+    }
+
+    function isHandle(overlayID) {
+        return isAxisHandle(overlayID) || isCornerHandle(overlayID);
+    }
+
+    function handleOffset(overlayID) {
+        // Distance from overlay position to entity surface.
+        if (isCornerHandle(overlayID)) {
+            return 0; // Corner overlays are centered on the corner.
+        }
+        return faceHandleOffsets.y / 2;
+    }
+
+    function getOverlays() {
+        return [].concat(cornerHandleOverlays, faceHandleOverlays);
+    }
+
+    function scalingAxis(overlayID) {
+        var axesIndex;
+        if (isCornerHandle(overlayID)) {
+            axesIndex = CORNER_HANDLE_OVERLAY_AXES[cornerIndexes[cornerHandleOverlays.indexOf(overlayID)]];
+            return Vec3.normalize(Vec3.multiplyVbyV(axesIndex, boundingBoxDimensions));
+        }
+        return FACE_HANDLE_OVERLAY_SCALE_AXES[faceHandleOverlays.indexOf(overlayID)];
+    }
+
+    function scalingDirections(overlayID) {
+        if (isCornerHandle(overlayID)) {
+            return Vec3.ONE;
+        }
+        return Vec3.abs(FACE_HANDLE_OVERLAY_SCALE_AXES[faceHandleOverlays.indexOf(overlayID)]);
+    }
+
+    function display(rootEntityID, boundingBox, isMultipleEntities, isSuppressZAxis) {
+        var boundingBoxCenter,
+            boundingBoxOrientation,
+            cameraPosition,
+            boundingBoxVector,
+            distanceMultiplier,
+            cameraUp,
+            cornerPosition,
+            cornerVector,
+            crossProductScale,
+            maxCrossProductScale,
+            rightCornerIndex,
+            leftCornerIndex,
+            cornerHandleDimensions,
+            faceHandleDimensions,
+            i;
+
+        isVisible = true;
+
+        boundingBoxDimensions = boundingBox.dimensions;
+        boundingBoxCenter = boundingBox.center;
+        boundingBoxLocalCenter = boundingBox.localCenter;
+        boundingBoxOrientation = boundingBox.orientation;
+
+        // Selection bounding box.
+        boundingBoxOverlay = Overlays.addOverlay("cube", {
+            parentID: rootEntityID,
+            localPosition: boundingBoxLocalCenter,
+            localRotation: Quat.ZERO,
+            dimensions: boundingBoxDimensions,
+            color: BOUNDING_BOX_COLOR,
+            alpha: BOUNDING_BOX_ALPHA,
+            solid: false,
+            drawInFront: true,
+            ignoreRayIntersection: true,
+            visible: true
+        });
+
+        // Somewhat maintain general angular size of scale handles per bounding box center but make more distance ones 
+        // display smaller in order to give comfortable depth cue.
+        cameraPosition = Camera.position;
+        boundingBoxVector = Vec3.subtract(boundingBox.center, Camera.position);
+        distanceMultiplier = Vec3.length(boundingBoxVector);
+        distanceMultiplier = DISTANCE_MULTIPLIER_MULTIPLIER
+            * (distanceMultiplier + (1 - Math.LOG10E * Math.log(distanceMultiplier + 1)));
+
+        // Corner scale handles.
+        // At right-most and opposite corners of bounding box.
+        cameraUp = Quat.getUp(Camera.orientation);
+        maxCrossProductScale = 0;
+        for (i = 0; i < NUM_CORNERS; i++) {
+            cornerPosition = Vec3.sum(boundingBoxCenter,
+                Vec3.multiplyQbyV(boundingBoxOrientation,
+                    Vec3.multiplyVbyV(CORNER_HANDLE_OVERLAY_AXES[i], boundingBoxDimensions)));
+            cornerVector = Vec3.subtract(cornerPosition, cameraPosition);
+            crossProductScale = Vec3.dot(Vec3.cross(cornerVector, boundingBoxVector), cameraUp);
+            if (crossProductScale > maxCrossProductScale) {
+                maxCrossProductScale = crossProductScale;
+                rightCornerIndex = i;
+            }
+        }
+        leftCornerIndex = (rightCornerIndex + 4) % NUM_CORNERS;
+        cornerIndexes[0] = leftCornerIndex;
+        cornerIndexes[1] = rightCornerIndex;
+        cornerHandleDimensions = Vec3.multiply(distanceMultiplier, CORNER_HANDLE_OVERLAY_DIMENSIONS);
+        for (i = 0; i < NUM_CORNER_HANDLES; i++) {
+            cornerHandleOverlays[i] = Overlays.addOverlay("sphere", {
+                parentID: rootEntityID,
+                localPosition: Vec3.sum(boundingBoxLocalCenter,
+                    Vec3.multiplyVbyV(CORNER_HANDLE_OVERLAY_AXES[cornerIndexes[i]], boundingBoxDimensions)),
+                localRotation: Quat.ZERO,
+                dimensions: cornerHandleDimensions,
+                color: HANDLE_NORMAL_COLOR,
+                alpha: HANDLE_NORMAL_ALPHA,
+                solid: true,
+                drawInFront: true,
+                ignoreRayIntersection: false,
+                visible: true
+            });
+        }
+
+        // Face scale handles.
+        // Only valid for a single entity because for multiple entities, some may be at an angle relative to the root entity
+        // which would necessitate a (non-existent) shear transform be applied to them when scaling a face of the set.
+        if (!isMultipleEntities) {
+            faceHandleDimensions = Vec3.multiply(distanceMultiplier, FACE_HANDLE_OVERLAY_DIMENSIONS);
+            faceHandleOffsets = Vec3.multiply(distanceMultiplier, FACE_HANDLE_OVERLAY_OFFSETS);
+            for (i = 0; i < NUM_FACE_HANDLES; i++) {
+                if (!isSuppressZAxis || FACE_HANDLE_OVERLAY_AXES[i].z === 0) {
+                    faceHandleOverlays[i] = Overlays.addOverlay("shape", {
+                        parentID: rootEntityID,
+                        localPosition: Vec3.sum(boundingBoxLocalCenter,
+                            Vec3.multiplyVbyV(FACE_HANDLE_OVERLAY_AXES[i], Vec3.sum(boundingBoxDimensions, faceHandleOffsets))),
+                        localRotation: FACE_HANDLE_OVERLAY_ROTATIONS[i],
+                        dimensions: faceHandleDimensions,
+                        shape: "Cone",
+                        color: HANDLE_NORMAL_COLOR,
+                        alpha: HANDLE_NORMAL_ALPHA,
+                        solid: true,
+                        drawInFront: true,
+                        ignoreRayIntersection: false,
+                        visible: true
+                    });
+                }
+            }
+        } else {
+            faceHandleOverlays = [];
+        }
+    }
+
+    function startScaling() {
+        // Nothing to do.
+    }
+
+    function scale(scale3D) {
+        // Scale relative to dimensions and positions at start of scaling.
+
+        // Selection bounding box.
+        scalingBoundingBoxDimensions = Vec3.multiplyVbyV(scale3D, boundingBoxLocalCenter);
+        scalingBoundingBoxLocalCenter = Vec3.multiplyVbyV(scale3D, boundingBoxDimensions);
+        Overlays.editOverlay(boundingBoxOverlay, {
+            localPosition: scalingBoundingBoxDimensions,
+            dimensions: scalingBoundingBoxLocalCenter
+        });
+
+        // Corner scale handles.
+        for (i = 0; i < NUM_CORNER_HANDLES; i++) {
+            Overlays.editOverlay(cornerHandleOverlays[i], {
+                localPosition: Vec3.sum(scalingBoundingBoxDimensions,
+                    Vec3.multiplyVbyV(CORNER_HANDLE_OVERLAY_AXES[cornerIndexes[i]], scalingBoundingBoxLocalCenter))
+            });
+        }
+
+        // Face scale handles.
+        if (faceHandleOverlays.length > 0) {
+            for (i = 0; i < NUM_FACE_HANDLES; i++) {
+                Overlays.editOverlay(faceHandleOverlays[i], {
+                    localPosition: Vec3.sum(scalingBoundingBoxDimensions,
+                        Vec3.multiplyVbyV(FACE_HANDLE_OVERLAY_AXES[i],
+                            Vec3.sum(scalingBoundingBoxLocalCenter, faceHandleOffsets)))
+                });
+            }
+        }
+    }
+
+    function finishScaling() {
+        // Adopt final scale.
+        boundingBoxLocalCenter = scalingBoundingBoxDimensions;
+        boundingBoxDimensions = scalingBoundingBoxLocalCenter;
+    }
+
+    function hover(overlayID) {
+        if (overlayID !== hoveredOverlayID) {
+            if (hoveredOverlayID !== null) {
+                Overlays.editOverlay(hoveredOverlayID, { color: HANDLE_NORMAL_COLOR });
+                hoveredOverlayID = null;
+            }
+
+            if (overlayID !== null
+                    && (faceHandleOverlays.indexOf(overlayID) !== -1 || cornerHandleOverlays.indexOf(overlayID) !== -1)) {
+                Overlays.editOverlay(overlayID, {
+                    color: HANDLE_HOVER_COLOR,
+                    alpha: HANDLE_HOVER_ALPHA
+                });
+                hoveredOverlayID = overlayID;
+            }
+        }
+    }
+
+    function grab(overlayID) {
+        var overlay,
+            isShowAll = overlayID === null,
+            color = isShowAll ? HANDLE_NORMAL_COLOR : HANDLE_HOVER_COLOR,
+            alpha = isShowAll ? HANDLE_NORMAL_ALPHA : HANDLE_HOVER_ALPHA,
+            i,
+            length;
+
+        for (i = 0, length = cornerHandleOverlays.length; i < length; i++) {
+            overlay = cornerHandleOverlays[i];
+            Overlays.editOverlay(overlay, {
+                visible: isVisible && (isShowAll || overlay === overlayID),
+                color: color,
+                alpha: alpha
+            });
+        }
+
+        for (i = 0, length = faceHandleOverlays.length; i < length; i++) {
+            overlay = faceHandleOverlays[i];
+            Overlays.editOverlay(overlay, {
+                visible: isVisible && (isShowAll || overlay === overlayID),
+                color: color,
+                alpha: alpha
+            });
+        }
+    }
+
+    function clear() {
+        var i,
+            length;
+
+        Overlays.deleteOverlay(boundingBoxOverlay);
+        for (i = 0; i < NUM_CORNER_HANDLES; i++) {
+            Overlays.deleteOverlay(cornerHandleOverlays[i]);
+        }
+        for (i = 0, length = faceHandleOverlays.length; i < length; i++) {
+            Overlays.deleteOverlay(faceHandleOverlays[i]);
+        }
+
+        isVisible = false;
+    }
+
+    function destroy() {
+        clear();
+    }
+
+    return {
+        display: display,
+        overlays: getOverlays,
+        isHandle: isHandle,
+        handleOffset: handleOffset,
+        scalingAxis: scalingAxis,
+        scalingDirections: scalingDirections,
+        startScaling: startScaling,
+        scale: scale,
+        finishScaling: finishScaling,
+        hover: hover,
+        grab: grab,
+        clear: clear,
+        destroy: destroy
+    };
+};
+
+Handles.prototype = {};
diff --git a/unpublishedScripts/marketplace/shapes/modules/highlights.js b/unpublishedScripts/marketplace/shapes/modules/highlights.js
new file mode 100644
index 0000000000..98c200a808
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/modules/highlights.js
@@ -0,0 +1,167 @@
+//
+//  highlights.js
+//
+//  Created by David Rowe on 21 Jul 2017.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+/* global Highlights: true */
+
+Highlights = function (side) {
+    // Draws highlights on selected entities.
+
+    "use strict";
+
+    var handOverlay,
+        entityOverlays = [],
+        boundingBoxOverlay,
+        isDisplayingBoundingBox = false,
+        HIGHLIGHT_COLOR = { red: 240, green: 240, blue: 0 },
+        SCALE_COLOR = { red: 0, green: 240, blue: 240 },
+        GROUP_COLOR = { red: 220, green: 60, blue: 220 },
+        HAND_HIGHLIGHT_ALPHA = 0.35,
+        ENTITY_HIGHLIGHT_ALPHA = 0.8,
+        BOUNDING_BOX_ALPHA = 0.8,
+        HAND_HIGHLIGHT_OFFSET = { x: 0.0, y: 0.11, z: 0.02 },
+        LEFT_HAND = 0;
+
+    if (!(this instanceof Highlights)) {
+        return new Highlights();
+    }
+
+    handOverlay = Overlays.addOverlay("sphere", {
+        dimension: Vec3.ZERO,
+        parentID: Uuid.SELF,
+        parentJointIndex: MyAvatar.getJointIndex(side === LEFT_HAND
+            ? "_CONTROLLER_LEFTHAND"
+            : "_CONTROLLER_RIGHTHAND"),
+        localPosition: HAND_HIGHLIGHT_OFFSET,
+        alpha: HAND_HIGHLIGHT_ALPHA,
+        solid: true,
+        drawInFront: true,
+        ignoreRayIntersection: true,
+        visible: false
+    });
+
+    boundingBoxOverlay = Overlays.addOverlay("cube", {
+        alpha: BOUNDING_BOX_ALPHA,
+        solid: false,
+        drawInFront: true,
+        ignoreRayIntersection: true,
+        visible: false
+    });
+
+    function setHandHighlightRadius(radius) {
+        var dimension = 2 * radius;
+        Overlays.editOverlay(handOverlay, {
+            dimensions: { x: dimension, y: dimension, z: dimension }
+        });
+    }
+
+    function maybeAddEntityOverlay(index) {
+        if (index >= entityOverlays.length) {
+            entityOverlays.push(Overlays.addOverlay("cube", {
+                alpha: ENTITY_HIGHLIGHT_ALPHA,
+                solid: false,
+                drawInFront: true,
+                ignoreRayIntersection: true,
+                visible: false
+            }));
+        }
+    }
+
+    function editEntityOverlay(index, details, overlayColor) {
+        var offset = Vec3.multiplyVbyV(Vec3.subtract(Vec3.HALF, details.registrationPoint), details.dimensions);
+
+        Overlays.editOverlay(entityOverlays[index], {
+            parentID: details.id,
+            localPosition: offset,
+            localRotation: Quat.ZERO,
+            dimensions: details.dimensions,
+            color: overlayColor,
+            visible: true
+        });
+    }
+
+    function display(handIntersected, selection, entityIndex, boundingBox, overlayColor) {
+        // Displays highlight for just entityIndex if non-null, otherwise highlights whole selection.
+        var i,
+            length;
+
+        // Show/hide hand overlay.
+        Overlays.editOverlay(handOverlay, {
+            color: overlayColor,
+            visible: handIntersected
+        });
+
+        // Display entity overlays.
+        if (entityIndex !== null) {
+            // Add/edit entity overlay for just entityIndex.
+            maybeAddEntityOverlay(0);
+            editEntityOverlay(0, selection[entityIndex], overlayColor);
+        } else {
+            // Add/edit entity overlays for all entities in selection.
+            for (i = 0, length = selection.length; i < length; i++) {
+                maybeAddEntityOverlay(i);
+                editEntityOverlay(i, selection[i], overlayColor);
+            }
+        }
+
+        // Delete extra entity overlays.
+        for (i = entityOverlays.length - 1, length = selection.length; i >= length; i--) {
+            Overlays.deleteOverlay(entityOverlays[i]);
+            entityOverlays.splice(i, 1);
+        }
+
+        // Update bounding box overlay.
+        if (boundingBox !== null) {
+            Overlays.editOverlay(boundingBoxOverlay, {
+                position: boundingBox.center,
+                rotation: boundingBox.orientation,
+                dimensions: boundingBox.dimensions,
+                color: overlayColor,
+                visible: true
+            });
+            isDisplayingBoundingBox = true;
+        } else if (isDisplayingBoundingBox) {
+            Overlays.editOverlay(boundingBoxOverlay, { visible: false });
+            isDisplayingBoundingBox = false;
+        }
+    }
+
+    function clear() {
+        var i,
+            length;
+
+        // Hide hand and bounding box overlays.
+        Overlays.editOverlay(handOverlay, { visible: false });
+        Overlays.editOverlay(boundingBoxOverlay, { visible: false });
+
+        // Delete entity overlays.
+        for (i = 0, length = entityOverlays.length; i < length; i++) {
+            Overlays.deleteOverlay(entityOverlays[i]);
+        }
+        entityOverlays = [];
+    }
+
+    function destroy() {
+        clear();
+        Overlays.deleteOverlay(handOverlay);
+        Overlays.deleteOverlay(boundingBoxOverlay);
+    }
+
+    return {
+        HIGHLIGHT_COLOR: HIGHLIGHT_COLOR,
+        SCALE_COLOR: SCALE_COLOR,
+        GROUP_COLOR: GROUP_COLOR,
+        setHandHighlightRadius: setHandHighlightRadius,
+        display: display,
+        clear: clear,
+        destroy: destroy
+    };
+};
+
+Highlights.prototype = {};
diff --git a/unpublishedScripts/marketplace/shapes/modules/history.js b/unpublishedScripts/marketplace/shapes/modules/history.js
new file mode 100644
index 0000000000..9f2c45046a
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/modules/history.js
@@ -0,0 +1,246 @@
+//
+//  history.js
+//
+//  Created by David Rowe on 12 Sep 2017.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+/* global History: true */
+
+History = (function () {
+    // Provides undo facility.
+    // Global object.
+
+    "use strict";
+
+    var history = [
+            /*
+            {
+                undoData: {
+                    setProperties: [
+                        {
+                            entityID: <entity ID>,
+                            properties: { <name>: <value>, <name>: <value>, ... }
+                        }
+                    ],
+                    createEntities: [
+                        {
+                            entityID: <entity ID>,
+                            properties: { <name>: <value>, <name>: <value>, ... }
+                        }
+                    ],
+                    deleteEntities: [
+                        {
+                            entityID: <entity ID>,
+                            properties: { <name>: <value>, <name>: <value>, ... }
+                        }
+                    ]
+                },
+                redoData: {
+                    ""
+                }
+            }
+            */
+        ],
+        MAX_HISTORY_ITEMS = 1000,
+        undoPosition = -1, // The next history item to undo; the next history item to redo = undoIndex + 1.
+        undoData = [{}, {}, {}], // Left side, right side, no side.
+        redoData = [{}, {}, {}],
+        NO_SIDE = 2;
+
+    function doKick(entityID) {
+        var properties,
+            NO_KICK_ENTITY_TYPES = ["Text", "Web", "PolyLine", "ParticleEffect"], // Don't respond to gravity so don't kick.
+            DYNAMIC_VELOCITY_THRESHOLD = 0.05, // See EntityMotionState.cpp DYNAMIC_LINEAR_VELOCITY_THRESHOLD
+            DYNAMIC_VELOCITY_KICK = { x: 0, y: 0.1, z: 0 };
+
+        properties = Entities.getEntityProperties(entityID, ["type", "dynamic", "gravity", "velocity"]);
+        if (NO_KICK_ENTITY_TYPES.indexOf(properties.type) === -1 && properties.dynamic
+                && Vec3.length(properties.gravity) > 0 && Vec3.length(properties.velocity) < DYNAMIC_VELOCITY_THRESHOLD) {
+            Entities.editEntity(entityID, { velocity: DYNAMIC_VELOCITY_KICK });
+        }
+    }
+
+    function kickPhysics(entityID) {
+        // Gives entities a small kick to start off physics, if necessary.
+        var KICK_DELAY = 750; // ms
+
+        // Give physics a chance to catch up. Avoids some erratic behavior.
+        Script.setTimeout(function () { 
+            doKick(entityID);
+        }, KICK_DELAY);
+    }
+
+    function prePush(side, undo, redo) {
+        // Stores undo and redo data to include in the next history entry generated for the side.
+        undoData[side] = undo;
+        redoData[side] = redo;
+    }
+
+    function push(side, undo, redo) {
+        // Add a history entry.
+        if (side === null) {
+            side = NO_SIDE;
+        }
+        undoData[side] = Object.merge(undoData[side], undo);
+        redoData[side] = Object.merge(redoData[side], redo);
+
+        // Wipe any redo history after current undo position.
+        if (undoPosition < history.length - 1) {
+            history.splice(undoPosition + 1, history.length - undoPosition - 1);
+        }
+
+        // Limit the number of history items.
+        if (history.length >= MAX_HISTORY_ITEMS) {
+            history.splice(0, history.length - MAX_HISTORY_ITEMS + 1);
+            undoPosition = history.length - 1;
+        }
+
+        history.push({ undoData: undoData[side], redoData: redoData[side] });
+        undoPosition++;
+
+        undoData[side] = {};
+        redoData[side] = {};
+    }
+
+    function updateEntityIDs(oldEntityID, newEntityID) {
+        // Replace oldEntityID value with newEntityID in history.
+        var i,
+            length;
+
+        function updateEntityIDsInProperty(properties) {
+            var i,
+                length;
+
+            if (properties) {
+                for (i = 0, length = properties.length; i < length; i++) {
+                    if (properties[i].entityID === oldEntityID) {
+                        properties[i].entityID = newEntityID;
+                    }
+                    if (properties[i].properties && properties[i].properties.parentID === oldEntityID) {
+                        properties[i].properties.parentID = newEntityID;
+                    }
+                }
+            }
+        }
+
+        for (i = 0, length = history.length; i < length; i++) {
+            if (history[i].undoData) {
+                updateEntityIDsInProperty(history[i].undoData.setProperties);
+                updateEntityIDsInProperty(history[i].undoData.createEntities);
+                updateEntityIDsInProperty(history[i].undoData.deleteEntities);
+            }
+            if (history[i].redoData) {
+                updateEntityIDsInProperty(history[i].redoData.setProperties);
+                updateEntityIDsInProperty(history[i].redoData.createEntities);
+                updateEntityIDsInProperty(history[i].redoData.deleteEntities);
+            }
+        }
+    }
+
+    function hasUndo() {
+        return undoPosition > -1;
+    }
+
+    function hasRedo() {
+        return undoPosition < history.length - 1;
+    }
+
+    function undoSetProperties(entityID, properties) {
+        Entities.editEntity(entityID, properties);
+        if (properties.gravity) {
+            kickPhysics(entityID);
+        }
+    }
+
+    function undo() {
+        var undoData,
+            entityID,
+            REPEAT_UNDO_DELAY = 500, // ms
+            i,
+            length;
+
+        if (undoPosition > -1) {
+            undoData = history[undoPosition].undoData;
+
+            if (undoData.createEntities) {
+                for (i = 0, length = undoData.createEntities.length; i < length; i++) {
+                    entityID = Entities.addEntity(undoData.createEntities[i].properties);
+                    updateEntityIDs(undoData.createEntities[i].entityID, entityID);
+                }
+            }
+
+            if (undoData.setProperties) {
+                for (i = 0, length = undoData.setProperties.length; i < length; i++) {
+                    undoSetProperties(undoData.setProperties[i].entityID, undoData.setProperties[i].properties);
+                    if (undoData.setProperties[i].properties.velocity
+                        && Vec3.equal(undoData.setProperties[i].properties.velocity, Vec3.ZERO)
+                        && undoData.setProperties[i].properties.angularVelocity
+                        && Vec3.equal(undoData.setProperties[i].properties.angularVelocity, Vec3.ZERO)) {
+                        // Work around physics bug wherein the entity doesn't always end up at the correct position.
+                        Script.setTimeout(
+                            undoSetProperties(undoData.setProperties[i].entityID, undoData.setProperties[i].properties),
+                            REPEAT_UNDO_DELAY
+                        );
+                    }
+                }
+            }
+
+            if (undoData.deleteEntities) {
+                for (i = 0, length = undoData.deleteEntities.length; i < length; i++) {
+                    Entities.deleteEntity(undoData.deleteEntities[i].entityID);
+                }
+            }
+
+            undoPosition--;
+        }
+    }
+
+    function redo() {
+        var redoData,
+            entityID,
+            i,
+            length;
+
+
+        if (undoPosition < history.length - 1) {
+            redoData = history[undoPosition + 1].redoData;
+
+            if (redoData.createEntities) {
+                for (i = 0, length = redoData.createEntities.length; i < length; i++) {
+                    entityID = Entities.addEntity(redoData.createEntities[i].properties);
+                    updateEntityIDs(redoData.createEntities[i].entityID, entityID);
+                }
+            }
+
+            if (redoData.setProperties) {
+                for (i = 0, length = redoData.setProperties.length; i < length; i++) {
+                    Entities.editEntity(redoData.setProperties[i].entityID, redoData.setProperties[i].properties);
+                    if (redoData.setProperties[i].properties.gravity) {
+                        kickPhysics(redoData.setProperties[i].entityID);
+                    }
+                }
+            }
+
+            if (redoData.deleteEntities) {
+                for (i = 0, length = redoData.deleteEntities.length; i < length; i++) {
+                    Entities.deleteEntity(redoData.deleteEntities[i].entityID);
+                }
+            }
+
+            undoPosition++;
+        }
+    }
+
+    return {
+        prePush: prePush,
+        push: push,
+        hasUndo: hasUndo,
+        hasRedo: hasRedo,
+        undo: undo,
+        redo: redo
+    };
+}());
diff --git a/unpublishedScripts/marketplace/shapes/modules/laser.js b/unpublishedScripts/marketplace/shapes/modules/laser.js
new file mode 100644
index 0000000000..d5feda0e1f
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/modules/laser.js
@@ -0,0 +1,286 @@
+//
+//  laser.js
+//
+//  Created by David Rowe on 21 Jul 2017.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+/* global Laser:true */
+
+Laser = function (side) {
+    // Draws hand lasers.
+    // May intersect with overlays or entities, or bounding box of other hand's selection.
+    // Laser dot is always drawn on UI entities.
+
+    "use strict";
+
+    var isLaserEnabled = true,
+        isLaserOn = false,
+
+        laserLine = null,
+        laserSphere = null,
+
+        searchDistance = 0.0,
+
+        SEARCH_SPHERE_SIZE = 0.013, // Per farActionGrabEntity.js multiplied by 1.2 per farActionGrabEntity.js.
+        MINUMUM_SEARCH_SPHERE_SIZE = 0.006,
+        SEARCH_SPHERE_FOLLOW_RATE = 0.5,
+        COLORS_GRAB_SEARCHING_HALF_SQUEEZE = { red: 10, green: 10, blue: 255 }, // Per controllerDispatcherUtils.js.
+        COLORS_GRAB_SEARCHING_FULL_SQUEEZE = { red: 250, green: 10, blue: 10 }, // Per controllerDispatcherUtils.js.
+        COLORS_GRAB_SEARCHING_HALF_SQUEEZE_BRIGHT,
+        COLORS_GRAB_SEARCHING_FULL_SQUEEZE_BRIGHT,
+        BRIGHT_POW = 0.06, // Per old handControllerGrab.js.
+
+        GRAB_POINT_SPHERE_OFFSET = { x: 0.04, y: 0.13, z: 0.039 }, // Per HmdDisplayPlugin.cpp and controllers.js.
+
+        PICK_MAX_DISTANCE = 500, // Per controllerDispatcherUtils.js.
+        PRECISION_PICKING = true,
+        NO_INCLUDE_IDS = [],
+        NO_EXCLUDE_IDS = [],
+        VISIBLE_ONLY = true,
+
+        laserLength,
+        specifiedLaserLength = null,
+        laserSphereSize = 0,
+
+        LEFT_HAND = 0,
+
+        uiOverlayIDs = [],
+
+        intersection;
+
+    if (!(this instanceof Laser)) {
+        return new Laser(side);
+    }
+
+    function colorPow(color, power) { // Per old handControllerGrab.js.
+        return {
+            red: Math.pow(color.red / 255, power) * 255,
+            green: Math.pow(color.green / 255, power) * 255,
+            blue: Math.pow(color.blue / 255, power) * 255
+        };
+    }
+
+    COLORS_GRAB_SEARCHING_HALF_SQUEEZE_BRIGHT = colorPow(COLORS_GRAB_SEARCHING_HALF_SQUEEZE, BRIGHT_POW);
+    COLORS_GRAB_SEARCHING_FULL_SQUEEZE_BRIGHT = colorPow(COLORS_GRAB_SEARCHING_FULL_SQUEEZE, BRIGHT_POW);
+
+    if (side === LEFT_HAND) {
+        GRAB_POINT_SPHERE_OFFSET.x = -GRAB_POINT_SPHERE_OFFSET.x;
+    }
+
+    laserLine = Overlays.addOverlay("line3d", {
+        alpha: 1.0,
+        glow: 1.0,
+        ignoreRayIntersection: true,
+        drawInFront: true,
+        parentID: Uuid.SELF,
+        parentJointIndex: MyAvatar.getJointIndex(side === LEFT_HAND
+            ? "_CAMERA_RELATIVE_CONTROLLER_LEFTHAND"
+            : "_CAMERA_RELATIVE_CONTROLLER_RIGHTHAND"),
+        visible: false
+    });
+    laserSphere = Overlays.addOverlay("circle3d", {
+        innerAlpha: 1.0,
+        outerAlpha: 0.0,
+        solid: true,
+        ignoreRayIntersection: true,
+        drawInFront: true,
+        visible: false
+    });
+
+    function updateLine(start, end, color) {
+        Overlays.editOverlay(laserLine, {
+            start: start,
+            end: end,
+            color: color,
+            visible: true
+        });
+    }
+
+    function updateSphere(location, size, color, brightColor) {
+        var rotation;
+
+        rotation = Quat.lookAt(location, Camera.getPosition(), Vec3.UP);
+
+        Overlays.editOverlay(laserSphere, {
+            position: location,
+            rotation: rotation,
+            innerColor: brightColor,
+            outerColor: color,
+            outerRadius: size,
+            visible: true
+        });
+    }
+
+    function display(origin, direction, distance, isPressed, isClicked) {
+        var searchTarget,
+            sphereSize,
+            color,
+            brightColor;
+
+        searchDistance = SEARCH_SPHERE_FOLLOW_RATE * searchDistance + (1.0 - SEARCH_SPHERE_FOLLOW_RATE) * distance;
+        searchTarget = Vec3.sum(origin, Vec3.multiply(searchDistance, direction));
+        sphereSize = Math.max(SEARCH_SPHERE_SIZE * searchDistance, MINUMUM_SEARCH_SPHERE_SIZE);
+        color = isClicked ? COLORS_GRAB_SEARCHING_FULL_SQUEEZE : COLORS_GRAB_SEARCHING_HALF_SQUEEZE;
+        brightColor = isClicked ? COLORS_GRAB_SEARCHING_FULL_SQUEEZE_BRIGHT : COLORS_GRAB_SEARCHING_HALF_SQUEEZE_BRIGHT;
+
+        if (isPressed) {
+            updateLine(origin, searchTarget, color);
+        } else {
+            Overlays.editOverlay(laserLine, { visible: false });
+        }
+        // Avoid flash from large laser sphere when turn on or suddenly increase distance. Rendering seems to update overlay 
+        // position one frame behind so use sphere size from preceding frame.
+        updateSphere(searchTarget, laserSphereSize, color, brightColor);
+        laserSphereSize = sphereSize;
+    }
+
+    function hide() {
+        Overlays.editOverlay(laserLine, { visible: false });
+        Overlays.editOverlay(laserSphere, { visible: false });
+        laserSphereSize = 0;
+    }
+
+    function setUIOverlays(overlayIDs) {
+        uiOverlayIDs = overlayIDs;
+    }
+
+    function update(hand) {
+        var handPosition,
+            handOrientation,
+            deltaOrigin,
+            pickRay;
+
+        if (!isLaserEnabled) {
+            intersection = {};
+            return;
+        }
+
+        handPosition = hand.position();
+        handOrientation = hand.orientation();
+        deltaOrigin = Vec3.multiplyQbyV(handOrientation, GRAB_POINT_SPHERE_OFFSET);
+        pickRay = {
+            origin: Vec3.sum(handPosition, deltaOrigin),
+            direction: Quat.getUp(handOrientation),
+            length: PICK_MAX_DISTANCE
+        };
+
+        if (hand.triggerPressed()) {
+
+            // Normal laser operation with trigger.
+            intersection = Overlays.findRayIntersection(pickRay, PRECISION_PICKING, NO_INCLUDE_IDS, NO_EXCLUDE_IDS,
+                VISIBLE_ONLY);
+            if (Reticle.pointingAtSystemOverlay || (intersection.overlayID
+                    && [HMD.tabletID, HMD.tabletScreenID, HMD.homeButtonID].indexOf(intersection.overlayID) !== -1)) {
+                // No laser if pointing at HUD overlay or tablet; system provides lasers for these cases.
+                if (isLaserOn) {
+                    isLaserOn = false;
+                    hide();
+                }
+            } else {
+                if (!intersection.intersects) {
+                    intersection = Entities.findRayIntersection(pickRay, PRECISION_PICKING, NO_INCLUDE_IDS, NO_EXCLUDE_IDS,
+                        VISIBLE_ONLY);
+                    intersection.editableEntity = intersection.intersects && Entities.hasEditableRoot(intersection.entityID);
+                    intersection.overlayID = null;
+                }
+                intersection.laserIntersected = intersection.intersects;
+                laserLength = (specifiedLaserLength !== null)
+                    ? specifiedLaserLength
+                    : (intersection.intersects ? intersection.distance : PICK_MAX_DISTANCE);
+                isLaserOn = true;
+                display(pickRay.origin, pickRay.direction, laserLength, true, hand.triggerClicked());
+            }
+
+        } else if (uiOverlayIDs.length > 0) {
+
+            // Special UI cursor.
+            intersection = Overlays.findRayIntersection(pickRay, PRECISION_PICKING, uiOverlayIDs, NO_EXCLUDE_IDS,
+                VISIBLE_ONLY);
+            if (intersection.intersects) {
+                intersection.laserIntersected = true;
+                laserLength = (specifiedLaserLength !== null)
+                    ? specifiedLaserLength
+                    : (intersection.intersects ? intersection.distance : PICK_MAX_DISTANCE);
+                if (!isLaserOn) {
+                    // Start laser dot at UI distance.
+                    searchDistance = laserLength;
+                }
+                isLaserOn = true;
+                display(pickRay.origin, pickRay.direction, laserLength, false, false);
+            } else if (isLaserOn) {
+                isLaserOn = false;
+                hide();
+            }
+
+        } else {
+            intersection = { intersects: false };
+            if (isLaserOn) {
+                isLaserOn = false;
+                hide();
+            }
+        }
+    }
+
+    function getIntersection() {
+        return intersection;
+    }
+
+    function setLength(length) {
+        specifiedLaserLength = length;
+        laserLength = length;
+    }
+
+    function clearLength() {
+        specifiedLaserLength = null;
+    }
+
+    function getLength() {
+        return laserLength;
+    }
+
+    function handOffset() {
+        return GRAB_POINT_SPHERE_OFFSET;
+    }
+
+    function clear() {
+        isLaserOn = false;
+        hide();
+    }
+
+    function enable() {
+        isLaserEnabled = true;
+    }
+
+    function disable() {
+        isLaserEnabled = false;
+        if (isLaserOn) {
+            hide();
+        }
+        isLaserOn = false;
+    }
+
+    function destroy() {
+        Overlays.deleteOverlay(laserLine);
+        Overlays.deleteOverlay(laserSphere);
+    }
+
+    return {
+        setUIOverlays: setUIOverlays,
+        update: update,
+        intersection: getIntersection,
+        setLength: setLength,
+        clearLength: clearLength,
+        length: getLength,
+        enable: enable,
+        disable: disable,
+        handOffset: handOffset,
+        clear: clear,
+        destroy: destroy
+    };
+};
+
+Laser.prototype = {};
diff --git a/unpublishedScripts/marketplace/shapes/modules/preload.js b/unpublishedScripts/marketplace/shapes/modules/preload.js
new file mode 100644
index 0000000000..e93ef9ac71
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/modules/preload.js
@@ -0,0 +1,175 @@
+//
+//  preload.js
+//
+//  Created by David Rowe on 11 Oct 2017.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+/* global Preload:true, App */
+
+Preload = (function () {
+    // Provide facility to preload asset files so that they are in disk cache.
+    // Global object.
+
+    "use strict";
+
+    var loadTimer = null,
+        urlsToLoad = [],
+        nextURLToLoad = 0,
+        LOAD_INTERVAL = 50, // ms
+        overlays = [],
+        deleteTimer = null,
+        DELETE_INTERVAL = LOAD_INTERVAL; // ms
+
+    function findURLs(items) {
+        var urls = [],
+            i,
+            length;
+
+        function findURLsInObject(item) {
+            var property;
+
+            for (property in item) {
+                if (item.hasOwnProperty(property)) {
+                    if (property === "url" || property === "imageURL" || property === "imageOverlayURL") {
+                        if (item[property]) {
+                            urls.push(item[property]);
+                        }
+                    } else if (typeof item[property] === "object") {
+                        findURLsInObject(item[property]);
+                    }
+                }
+            }
+        }
+
+        for (i = 0, length = items.length; i < length; i++) {
+            switch (typeof items[i]) {
+                case "string":
+                    urls.push(items[i]);
+                    break;
+                case "object":
+                    findURLsInObject(items[i]);
+                    break;
+                default:
+                    App.log("ERROR: Cannot find URL in item type " + (typeof items[i]));
+            }
+        }
+
+        return urls;
+    }
+
+    function deleteOverlay() {
+        if (overlays.length === 0) { // Just in case.
+            deleteTimer = null;
+            return;
+        }
+
+        Overlays.deleteOverlay(overlays[0]);
+        overlays.shift();
+
+        if (overlays.length > 0) {
+            deleteTimer = Script.setTimeout(deleteOverlay, DELETE_INTERVAL);
+        } else {
+            deleteTimer = null;
+        }
+    }
+
+    function loadNextURL() {
+
+        function loadURL(url) {
+            var DOMAIN_CORNER = { x: -16382, y: -16382, z: -16382 }, // Near but not right on domain corner.
+                DUMMY_OVERLAY_PROPERTIES = {
+                    fbx: {
+                        overlay: "model",
+                        dimensions: { x: 0.001, y: 0.001, z: 0.001 },
+                        position: DOMAIN_CORNER,
+                        ignoreRayIntersection: false,
+                        alpha: 0.0,
+                        visible: false
+                    },
+                    svg: {
+                        overlay: "image3d",
+                        scale: 0.001,
+                        position: DOMAIN_CORNER,
+                        ignoreRayIntersection: true,
+                        alpha: 0.0,
+                        visible: false
+                    },
+                    png: {
+                        overlay: "image3d",
+                        scale: 0.001,
+                        position: DOMAIN_CORNER,
+                        ignoreRayIntersection: true,
+                        alpha: 0.0,
+                        visible: false
+                    }
+                },
+                fileType,
+                properties;
+
+            fileType = url.slice(-3);
+            if (DUMMY_OVERLAY_PROPERTIES.hasOwnProperty(fileType)) {
+                properties = Object.clone(DUMMY_OVERLAY_PROPERTIES[fileType]);
+                properties.url = url;
+                overlays.push(Overlays.addOverlay(properties.overlay, properties));
+                if (deleteTimer === null) {
+                    // Can't delete overlay straight away otherwise asset load is abandoned.
+                    deleteTimer = Script.setTimeout(deleteOverlay, DELETE_INTERVAL);
+                }
+            } else {
+                App.log("ERROR: Cannot preload asset " + url);
+            }
+        }
+
+        // Find next URL that hasn't already been loaded;
+        while (nextURLToLoad < urlsToLoad.length && urlsToLoad.indexOf(urlsToLoad[nextURLToLoad]) < nextURLToLoad) {
+            nextURLToLoad += 1;
+        }
+
+        // Load the URL if there's one to load.
+        if (nextURLToLoad < urlsToLoad.length) {
+            // Load the URL.
+            loadURL(urlsToLoad[nextURLToLoad]);
+            nextURLToLoad += 1;
+
+            // Load the next, if any, after a short delay.
+            loadTimer = Script.setTimeout(loadNextURL, LOAD_INTERVAL);
+        } else {
+            loadTimer = null;
+        }
+    }
+
+    function load(urls) {
+        urlsToLoad = urlsToLoad.concat(urls);
+        if (loadTimer === null) {
+            loadNextURL();
+        }
+    }
+
+    function tearDown() {
+        var i,
+            length;
+
+        if (loadTimer) {
+            Script.clearTimeout(loadTimer);
+        }
+
+        if (deleteTimer) {
+            Script.clearTimeout(deleteTimer);
+            for (i = 0, length = overlays.length; i < length; i++) {
+                Overlays.deleteOverlay(overlays[i]);
+            }
+        }
+    }
+
+    Script.scriptEnding.connect(tearDown);
+
+    return {
+        findURLs: findURLs,
+        load: load
+    };
+
+}());
diff --git a/unpublishedScripts/marketplace/shapes/modules/selection.js b/unpublishedScripts/marketplace/shapes/modules/selection.js
new file mode 100644
index 0000000000..955cde6bda
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/modules/selection.js
@@ -0,0 +1,795 @@
+//
+//  selection.js
+//
+//  Created by David Rowe on 21 Jul 2017.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+/* global SelectionManager:true, App, History */
+
+SelectionManager = function (side) {
+    // Manages set of selected entities. Currently supports just one set of linked entities.
+
+    "use strict";
+
+    var selection = [], // Subset of properties to provide externally.
+        selectionIDs = [],
+        selectionProperties = [], // Full set of properties for history.
+        intersectedEntityID = null,
+        intersectedEntityIndex,
+        rootEntityID = null,
+        rootPosition,
+        rootOrientation,
+        scaleFactor,
+        scaleRootOffset,
+        scaleRootOrientation,
+        startPosition,
+        startOrientation,
+        isEditing = false,
+        ENTITY_TYPE = "entity",
+        ENTITY_TYPES_WITH_COLOR = ["Box", "Sphere", "Shape", "PolyLine"],
+        ENTITY_TYPES_2D = ["Text", "Web"],
+        MIN_HISTORY_MOVE_DISTANCE = 0.005,
+        MIN_HISTORY_ROTATE_ANGLE = 0.017453; // Radians = 1 degree.
+
+    if (!(this instanceof SelectionManager)) {
+        return new SelectionManager(side);
+    }
+
+    function traverseEntityTree(id, selection, selectionIDs, selectionProperties) {
+        // Recursively traverses tree of entities and their children, gather IDs and properties.
+        // The root entity is always the first entry.
+        var children,
+            properties,
+            i,
+            length;
+
+        properties = Entities.getEntityProperties(id);
+        delete properties.entityID;
+        selection.push({
+            id: id,
+            type: properties.type,
+            position: properties.position,
+            parentID: properties.parentID,
+            localPosition: properties.localPosition,
+            localRotation: properties.localRotation,
+            registrationPoint: properties.registrationPoint,
+            rotation: properties.rotation,
+            dimensions: properties.dimensions,
+            dynamic: properties.dynamic,
+            collisionless: properties.collisionless,
+            userData: properties.userData
+        });
+        selectionIDs.push(id);
+        selectionProperties.push({ entityID: id, properties: properties });
+
+        if (id === intersectedEntityID) {
+            intersectedEntityIndex = selection.length - 1;
+        }
+
+        children = Entities.getChildrenIDs(id);
+        for (i = 0, length = children.length; i < length; i++) {
+            if (Entities.getNestableType(children[i]) === ENTITY_TYPE) {
+                traverseEntityTree(children[i], selection, selectionIDs, selectionProperties);
+            }
+        }
+    }
+
+    function select(intersectionEntityID) {
+        var entityProperties,
+            PARENT_PROPERTIES = ["parentID", "position", "rotation", "dymamic", "collisionless"];
+
+        intersectedEntityID = intersectionEntityID;
+
+        // Find root parent.
+        rootEntityID = Entities.rootOf(intersectedEntityID);
+
+        // Selection position and orientation is that of the root entity.
+        entityProperties = Entities.getEntityProperties(rootEntityID, PARENT_PROPERTIES);
+        rootPosition = entityProperties.position;
+        rootOrientation = entityProperties.rotation;
+
+        // Find all children.
+        selection = [];
+        selectionIDs = [];
+        selectionProperties = [];
+        traverseEntityTree(rootEntityID, selection, selectionIDs, selectionProperties);
+    }
+
+    function append(rootEntityID) {
+        // Add further entities to the selection.
+        // Assumes that rootEntityID is not already in the selection.
+        traverseEntityTree(rootEntityID, selection, selectionIDs, selectionProperties);
+    }
+
+    function getIntersectedEntityID() {
+        return intersectedEntityID;
+    }
+
+    function getIntersectedEntityIndex() {
+        return intersectedEntityIndex;
+    }
+
+    function getRootEntityID() {
+        return rootEntityID;
+    }
+
+    function getSelection() {
+        return selection;
+    }
+
+    function contains(entityID) {
+        return selectionIDs.indexOf(entityID) !== -1;
+    }
+
+    function count() {
+        return selection.length;
+    }
+
+    function getBoundingBox() {
+        var center,
+            localCenter,
+            orientation,
+            inverseOrientation,
+            dimensions,
+            min,
+            max,
+            i,
+            j,
+            length,
+            registration,
+            position,
+            rotation,
+            corners = [],
+            NUM_CORNERS = 8;
+
+        if (selection.length === 1) {
+            if (Vec3.equal(selection[0].registrationPoint, Vec3.HALF)) {
+                center = rootPosition;
+            } else {
+                center = Vec3.sum(rootPosition,
+                    Vec3.multiplyQbyV(rootOrientation,
+                        Vec3.multiplyVbyV(selection[0].dimensions,
+                            Vec3.subtract(Vec3.HALF, selection[0].registrationPoint))));
+            }
+            localCenter = Vec3.multiplyQbyV(Quat.inverse(rootOrientation), Vec3.subtract(center, rootPosition));
+            orientation = rootOrientation;
+            dimensions = selection[0].dimensions;
+        } else if (selection.length > 1) {
+            // Find min & max x, y, z values of entities' dimension box corners in root entity coordinate system.
+            // Note: Don't use entities' bounding boxes because they're in world coordinates and may make the calculated
+            // bounding box be larger than necessary.
+            min = Vec3.multiplyVbyV(Vec3.subtract(Vec3.ZERO, selection[0].registrationPoint), selection[0].dimensions);
+            max = Vec3.multiplyVbyV(Vec3.subtract(Vec3.ONE, selection[0].registrationPoint), selection[0].dimensions);
+            inverseOrientation = Quat.inverse(rootOrientation);
+            for (i = 1, length = selection.length; i < length; i++) {
+
+                registration = selection[i].registrationPoint;
+                corners = [
+                    { x: -registration.x, y: -registration.y, z: -registration.z },
+                    { x: -registration.x, y: -registration.y, z: 1.0 - registration.z },
+                    { x: -registration.x, y: 1.0 - registration.y, z: -registration.z },
+                    { x: -registration.x, y: 1.0 - registration.y, z: 1.0 - registration.z },
+                    { x: 1.0 - registration.x, y: -registration.y, z: -registration.z },
+                    { x: 1.0 - registration.x, y: -registration.y, z: 1.0 - registration.z },
+                    { x: 1.0 - registration.x, y: 1.0 - registration.y, z: -registration.z },
+                    { x: 1.0 - registration.x, y: 1.0 - registration.y, z: 1.0 - registration.z }
+                ];
+
+                position = selection[i].position;
+                rotation = selection[i].rotation;
+                dimensions = selection[i].dimensions;
+
+                for (j = 0; j < NUM_CORNERS; j++) {
+                    // Corner position in world coordinates.
+                    corners[j] = Vec3.sum(position, Vec3.multiplyQbyV(rotation, Vec3.multiplyVbyV(corners[j], dimensions)));
+                    // Corner position in root entity coordinates.
+                    corners[j] = Vec3.multiplyQbyV(inverseOrientation, Vec3.subtract(corners[j], rootPosition));
+                    // Update min & max.
+                    min = Vec3.min(corners[j], min);
+                    max = Vec3.max(corners[j], max);
+                }
+            }
+
+            // Calculate bounding box.
+            center = Vec3.sum(rootPosition,
+                Vec3.multiplyQbyV(rootOrientation, Vec3.multiply(0.5, Vec3.sum(min, max))));
+            localCenter = Vec3.multiply(0.5, Vec3.sum(min, max));
+            orientation = rootOrientation;
+            dimensions = Vec3.subtract(max, min);
+        }
+
+        return {
+            center: center,
+            localCenter: localCenter,
+            orientation: orientation,
+            dimensions: dimensions
+        };
+    }
+
+    function is2D() {
+        return selection.length === 1 && ENTITY_TYPES_2D.indexOf(selection[0].type) !== -1;
+    }
+
+    function doKick(entityID) {
+        var properties,
+            NO_KICK_ENTITY_TYPES = ["Text", "Web", "PolyLine", "ParticleEffect"], // Don't respond to gravity so don't kick.
+            DYNAMIC_VELOCITY_THRESHOLD = 0.05, // See EntityMotionState.cpp DYNAMIC_LINEAR_VELOCITY_THRESHOLD
+            DYNAMIC_VELOCITY_KICK = { x: 0, y: 0.1, z: 0 };
+
+        if (entityID === rootEntityID && isEditing) {
+            // Don't kick if have started editing entity again.
+            return;
+        }
+
+        properties = Entities.getEntityProperties(entityID, ["type", "velocity", "gravity"]);
+        if (NO_KICK_ENTITY_TYPES.indexOf(properties.type) === -1
+                && Vec3.length(properties.gravity) > 0 && Vec3.length(properties.velocity) < DYNAMIC_VELOCITY_THRESHOLD) {
+            Entities.editEntity(entityID, { velocity: DYNAMIC_VELOCITY_KICK });
+        }
+    }
+
+    function kickPhysics(entityID) {
+        // Gives entities a small kick to start off physics, if necessary.
+        var KICK_DELAY = 750; // ms
+
+        // Give physics a chance to catch up. Avoids some erratic behavior.
+        Script.setTimeout(function () {
+            doKick(entityID);
+        }, KICK_DELAY);
+    }
+
+    function startEditing() {
+        var i;
+
+        // Remember start properties for history entry.
+        startPosition = selection[0].position;
+        startOrientation = selection[0].rotation;
+
+        // Disable entity set's physics.
+        for (i = selection.length - 1; i >= 0; i--) {
+            Entities.editEntity(selection[i].id, {
+                dynamic: false, // So that gravity doesn't fight with us trying to hold the entity in place.
+                collisionless: true, // So that entity doesn't bump us about as we resize the entity.
+                velocity: Vec3.ZERO, // So that entity doesn't drift if we've grabbed a set while it was moving.
+                angularVelocity: Vec3.ZERO // ""
+            });
+        }
+
+        // Stop moving.
+        Entities.editEntity(rootEntityID, { velocity: Vec3.ZERO, angularVelocity: Vec3.ZERO });
+
+        isEditing = true;
+    }
+
+    function finishEditing() {
+        var i;
+
+        // Restore entity set's physics.
+        // Note: Need to apply children-first in order to avoid children's relative positions sometimes drifting.
+        for (i = selection.length - 1; i >= 0; i--) {
+            Entities.editEntity(selection[i].id, {
+                dynamic: selection[i].dynamic,
+                collisionless: selection[i].collisionless
+            });
+        }
+
+        // Add history entry.
+        if (selection.length > 0
+                && (!Vec3.equal(startPosition, rootPosition) || !Quat.equal(startOrientation, rootOrientation))) {
+            // Positions and orientations can be identical if change grabbing hands when finish scaling.
+            History.push(
+                side,
+                {
+                    setProperties: [
+                        { entityID: rootEntityID, properties: { position: startPosition, rotation: startOrientation } }
+                    ]
+                },
+                {
+                    setProperties: [
+                        { entityID: rootEntityID, properties: { position: rootPosition, rotation: rootOrientation } }
+                    ]
+                }
+            );
+        }
+
+        // Kick off physics if necessary.
+        if (selection.length > 0 && selection[0].dynamic) {
+            kickPhysics(selection[0].id);
+        }
+
+        isEditing = false;
+    }
+
+    function getPositionAndOrientation() {
+        // Position and orientation of root entity.
+        return {
+            position: rootPosition,
+            orientation: rootOrientation
+        };
+    }
+
+    function setPositionAndOrientation(position, orientation) {
+        // Position and orientation of root entity.
+        rootPosition = position;
+        rootOrientation = orientation;
+        Entities.editEntity(rootEntityID, {
+            position: position,
+            rotation: orientation
+        });
+    }
+
+    function startDirectScaling(center) {
+        // Save initial position and orientation so that can scale relative to these without accumulating float errors.
+        scaleRootOffset = Vec3.subtract(rootPosition, center);
+        scaleRootOrientation = rootOrientation;
+
+        // User is grabbing entity; add a history entry for movement up until the start of scaling and update start position and
+        // orientation; unless very small movement.
+        if (Vec3.distance(startPosition, rootPosition) >= MIN_HISTORY_MOVE_DISTANCE
+                || Quat.rotationBetween(startOrientation, rootOrientation) >= MIN_HISTORY_ROTATE_ANGLE) {
+            History.push(
+                side,
+                {
+                    setProperties: [
+                        { entityID: rootEntityID, properties: { position: startPosition, rotation: startOrientation } }
+                    ]
+                },
+                {
+                    setProperties: [
+                        { entityID: rootEntityID, properties: { position: rootPosition, rotation: rootOrientation } }
+                    ]
+                }
+            );
+            startPosition = rootPosition;
+            startOrientation = rootOrientation;
+        }
+    }
+
+    function directScale(factor, rotation, center) {
+        // Scale, position, and rotate selection.
+        // We can get away with scaling the z size of 2D entities - incongruities are barely noticeable and things recover.
+        var i,
+            length;
+
+        // Scale, position, and orient root.
+        rootPosition = Vec3.sum(center, Vec3.multiply(factor, Vec3.multiplyQbyV(rotation, scaleRootOffset)));
+        rootOrientation = Quat.multiply(rotation, scaleRootOrientation);
+        Entities.editEntity(selection[0].id, {
+            dimensions: Vec3.multiply(factor, selection[0].dimensions),
+            position: rootPosition,
+            rotation: rootOrientation
+        });
+
+        // Scale and position children.
+        for (i = 1, length = selection.length; i < length; i++) {
+            Entities.editEntity(selection[i].id, {
+                dimensions: Vec3.multiply(factor, selection[i].dimensions),
+                localPosition: Vec3.multiply(factor, selection[i].localPosition),
+                localRotation: selection[i].localRotation // Always specify localRotation otherwise rotations can drift.
+            });
+        }
+
+        // Save most recent scale factor.
+        scaleFactor = factor;
+    }
+
+    function finishDirectScaling() {
+        // Update selection with final entity properties.
+        var undoData = [],
+            redoData = [],
+            i,
+            length;
+
+        // Final scale, position, and orientation of root.
+        undoData.push({
+            entityID: selection[0].id,
+            properties: {
+                dimensions: selection[0].dimensions,
+                position: startPosition,
+                rotation: startOrientation
+            }
+        });
+        selection[0].dimensions = Vec3.multiply(scaleFactor, selection[0].dimensions);
+        selection[0].position = rootPosition;
+        selection[0].rotation = rootOrientation;
+        redoData.push({
+            entityID: selection[0].id,
+            properties: {
+                dimensions: selection[0].dimensions,
+                position: selection[0].position,
+                rotation: selection[0].rotation
+            }
+        });
+
+        // Final scale and position of children.
+        for (i = 1, length = selection.length; i < length; i++) {
+            undoData.push({
+                entityID: selection[i].id,
+                properties: {
+                    dimensions: selection[i].dimensions,
+                    localPosition: selection[i].localPosition,
+                    localRotation: selection[i].localRotation
+                }
+            });
+            selection[i].dimensions = Vec3.multiply(scaleFactor, selection[i].dimensions);
+            selection[i].localPosition = Vec3.multiply(scaleFactor, selection[i].localPosition);
+            redoData.push({
+                entityID: selection[i].id,
+                properties: {
+                    dimensions: selection[i].dimensions,
+                    localPosition: selection[i].localPosition,
+                    localRotation: selection[i].localRotation
+                }
+            });
+        }
+
+        // Add history entry.
+        History.push(side, { setProperties: undoData }, { setProperties: redoData });
+
+        // Update grab start data for its undo.
+        startPosition = rootPosition;
+        startOrientation = rootOrientation;
+    }
+
+    function startHandleScaling(position) {
+        // Save initial offset from hand position to root position so that can scale without accumulating float errors.
+        scaleRootOffset = Vec3.multiplyQbyV(Quat.inverse(rootOrientation), Vec3.subtract(rootPosition, position));
+
+        // User is grabbing entity; add a history entry for movement up until the start of scaling and update start position and
+        // orientation; unless very small movement.
+        if (Vec3.distance(startPosition, rootPosition) >= MIN_HISTORY_MOVE_DISTANCE
+                || Quat.rotationBetween(startOrientation, rootOrientation) >= MIN_HISTORY_ROTATE_ANGLE) {
+            History.push(
+                side,
+                {
+                    setProperties: [
+                        { entityID: rootEntityID, properties: { position: startPosition, rotation: startOrientation } }
+                    ]
+                },
+                {
+                    setProperties: [
+                        { entityID: rootEntityID, properties: { position: rootPosition, rotation: rootOrientation } }
+                    ]
+                }
+            );
+            startPosition = rootPosition;
+            startOrientation = rootOrientation;
+        }
+    }
+
+    function handleScale(factor, position, orientation) {
+        // Scale and reposition and orient selection.
+        // We can get away with scaling the z size of 2D entities - incongruities are barely noticeable and things recover.
+        var i,
+            length;
+
+        // Scale and position root.
+        rootPosition = Vec3.sum(Vec3.multiplyQbyV(orientation, Vec3.multiplyVbyV(factor, scaleRootOffset)), position);
+        rootOrientation = orientation;
+        Entities.editEntity(selection[0].id, {
+            dimensions: Vec3.multiplyVbyV(factor, selection[0].dimensions),
+            position: rootPosition,
+            rotation: rootOrientation
+        });
+
+        // Scale and position children.
+        // Only corner handles are used for scaling multiple entities so scale factor is the same in all dimensions.
+        // Therefore don't need to take into account orientation relative to parent when scaling local position.
+        for (i = 1, length = selection.length; i < length; i++) {
+            Entities.editEntity(selection[i].id, {
+                dimensions: Vec3.multiplyVbyV(factor, selection[i].dimensions),
+                localPosition: Vec3.multiplyVbyV(factor, selection[i].localPosition),
+                localRotation: selection[i].localRotation // Always specify localRotation otherwise rotations can drift.
+            });
+        }
+
+        // Save most recent scale factor.
+        scaleFactor = factor;
+    }
+
+    function finishHandleScaling() {
+        // Update selection with final entity properties.
+        var undoData = [],
+            redoData = [],
+            i,
+            length;
+
+        // Final scale and position of root.
+        undoData.push({
+            entityID: selection[0].id,
+            properties: {
+                dimensions: selection[0].dimensions,
+                position: startPosition,
+                rotation: startOrientation
+            }
+        });
+        selection[0].dimensions = Vec3.multiplyVbyV(scaleFactor, selection[0].dimensions);
+        selection[0].position = rootPosition;
+        selection[0].rotation = rootOrientation;
+        redoData.push({
+            entityID: selection[0].id,
+            properties: {
+                dimensions: selection[0].dimensions,
+                position: selection[0].position,
+                rotation: selection[0].rotation
+            }
+        });
+
+        // Final scale and position of children.
+        for (i = 1, length = selection.length; i < length; i++) {
+            undoData.push({
+                entityID: selection[i].id,
+                properties: {
+                    dimensions: selection[i].dimensions,
+                    localPosition: selection[i].localPosition,
+                    localRotation: selection[i].localRotation
+                }
+            });
+            selection[i].dimensions = Vec3.multiplyVbyV(scaleFactor, selection[i].dimensions);
+            selection[i].localPosition = Vec3.multiplyVbyV(scaleFactor, selection[i].localPosition);
+            redoData.push({
+                entityID: selection[i].id,
+                properties: {
+                    dimensions: selection[i].dimensions,
+                    localPosition: selection[i].localPosition,
+                    localRotation: selection[i].localRotation
+                }
+            });
+        }
+
+        // Add history entry.
+        History.push(side, { setProperties: undoData }, { setProperties: redoData });
+
+        // Update grab start data for its undo.
+        startPosition = rootPosition;
+        startOrientation = rootOrientation;
+    }
+
+    function cloneEntities() {
+        var parentIDIndexes = [],
+            intersectedEntityIndex = 0,
+            parentID,
+            properties,
+            undoData = [],
+            redoData = [],
+            i,
+            j,
+            length;
+
+        // Map parent IDs; find intersectedEntityID's index.
+        for (i = 1, length = selection.length; i < length; i++) {
+            if (selection[i].id === intersectedEntityID) {
+                intersectedEntityIndex = i;
+            }
+            parentID = selection[i].parentID;
+            for (j = 0; j < i; j++) {
+                if (parentID === selection[j].id) {
+                    parentIDIndexes[i] = j;
+                    break;
+                }
+            }
+        }
+
+        // Clone entities.
+        for (i = 0, length = selection.length; i < length; i++) {
+            properties = Entities.getEntityProperties(selection[i].id);
+            if (i > 0) {
+                properties.parentID = selection[parentIDIndexes[i]].id;
+            }
+            selection[i].id = Entities.addEntity(properties);
+            undoData.push({ entityID: selection[i].id });
+            redoData.push({ entityID: selection[i].id, properties: properties });
+        }
+
+        // Update selection info.
+        intersectedEntityID = selection[intersectedEntityIndex].id;
+        rootEntityID = selection[0].id;
+
+        // Add history entry.
+        History.prePush(side, { deleteEntities: undoData }, { createEntities: redoData });
+    }
+
+    function applyColor(color, isApplyToAll) {
+        // Entities without a color property simply ignore the edit.
+        var properties,
+            isOK = false,
+            undoData = [],
+            redoData = [],
+            i,
+            length;
+
+        if (isApplyToAll) {
+            for (i = 0, length = selection.length; i < length; i++) {
+                properties = Entities.getEntityProperties(selection[i].id, ["type", "color"]);
+                if (ENTITY_TYPES_WITH_COLOR.indexOf(properties.type) !== -1) {
+                    Entities.editEntity(selection[i].id, {
+                        color: color
+                    });
+                    undoData.push({ entityID: intersectedEntityID, properties: { color: properties.color } });
+                    redoData.push({ entityID: intersectedEntityID, properties: { color: color } });
+                    isOK = true;
+                }
+            }
+            if (undoData.length > 0) {
+                History.push(side, { setProperties: undoData }, { setProperties: redoData });
+            }
+        } else {
+            properties = Entities.getEntityProperties(intersectedEntityID, ["type", "color"]);
+            if (ENTITY_TYPES_WITH_COLOR.indexOf(properties.type) !== -1) {
+                Entities.editEntity(intersectedEntityID, {
+                    color: color
+                });
+                History.push(
+                    side,
+                    { setProperties: [{ entityID: intersectedEntityID, properties: { color: properties.color } }] },
+                    { setProperties: [{ entityID: intersectedEntityID, properties: { color: color } }] }
+                );
+                isOK = true;
+            }
+        }
+
+        return isOK;
+    }
+
+    function getColor(entityID) {
+        var properties;
+
+        properties = Entities.getEntityProperties(entityID, "color");
+        if (ENTITY_TYPES_WITH_COLOR.indexOf(properties.type) === -1) {
+            // Some entities don't have a color property.
+            return null;
+        }
+
+        return properties.color;
+    }
+
+    function updatePhysicsUserData(userDataString, physicsUserData) {
+        var userData = {};
+
+        if (userDataString !== "") {
+            try {
+                userData = JSON.parse(userDataString);
+            } catch (e) {
+                App.log(side, "ERROR: Invalid userData in entity being updated! " + userDataString);
+            }
+        }
+
+        if (!userData.hasOwnProperty("grabbableKey")) {
+            userData.grabbableKey = {};
+        }
+        userData.grabbableKey.grabbable = physicsUserData.grabbableKey.grabbable;
+
+        return JSON.stringify(userData);
+    }
+
+    function applyPhysics(physicsProperties) {
+        // Regarding trees of entities, when physics is to be enabled the physics engine currently:
+        // - Only works with physics applied to the root entity; i.e., child entities are ignored for collisions.
+        // - Requires child entities to be dynamic if the root entity is dynamic, otherwise child entities can drift.
+        // - Requires child entities to be collisionless, otherwise the entity tree can become self-propelled.
+        // See also: Groups.group() and ungroup().
+        var properties,
+            property,
+            undoData = [],
+            redoData = [],
+            i,
+            length;
+
+        // Make children cater to physicsProperties.
+        properties = {
+            dynamic: physicsProperties.dynamic,
+            collisionless: physicsProperties.dynamic || physicsProperties.collisionless
+        };
+        for (i = 1, length = selection.length; i < length; i++) {
+            undoData.push({
+                entityID: selection[i].id,
+                properties: {
+                    dynamic: selection[i].dynamic,
+                    collisionless: selection[i].collisionless
+                }
+            });
+            Entities.editEntity(selection[i].id, properties);
+            undoData.push({
+                entityID: selection[i].id,
+                properties: properties
+            });
+        }
+
+        // Undo data.
+        properties = {
+            position: selection[0].position,
+            rotation: selection[0].rotation,
+            velocity: Vec3.ZERO,
+            angularVelocity: Vec3.ZERO
+        };
+        for (property in physicsProperties) {
+            if (physicsProperties.hasOwnProperty(property)) {
+                properties[property] = selectionProperties[0].properties[property];
+            }
+        }
+        if (properties.userData === undefined) {
+            properties.userData = "";
+        }
+        undoData.push({
+            entityID: selection[0].id,
+            properties: properties
+        });
+
+        // Set root per physicsProperties.
+        properties = Object.clone(physicsProperties);
+        properties.userData = updatePhysicsUserData(selection[intersectedEntityIndex].userData, physicsProperties.userData);
+        Entities.editEntity(rootEntityID, properties);
+
+        // Redo data.
+        properties.position = selection[0].position;
+        properties.rotation = selection[0].rotation;
+        properties.velocity = Vec3.ZERO;
+        properties.angularVelocity = Vec3.ZERO;
+        redoData.push({
+            entityID: selection[0].id,
+            properties: properties
+        });
+
+        // Add history entry.
+        History.push(side, { setProperties: undoData }, { setProperties: redoData });
+
+        // Kick off physics if necessary.
+        if (physicsProperties.dynamic) {
+            kickPhysics(rootEntityID);
+        }
+    }
+
+    function clear() {
+        selection = [];
+        intersectedEntityID = null;
+        rootEntityID = null;
+    }
+
+    function deleteEntities() {
+        if (rootEntityID) {
+            History.push(side, { createEntities: selectionProperties }, { deleteEntities: [{ entityID: rootEntityID }] });
+            Entities.deleteEntity(rootEntityID); // Children are automatically deleted.
+            clear();
+        }
+    }
+
+    function destroy() {
+        clear();
+    }
+
+    return {
+        select: select,
+        append: append,
+        selection: getSelection,
+        contains: contains,
+        count: count,
+        intersectedEntityID: getIntersectedEntityID,
+        intersectedEntityIndex: getIntersectedEntityIndex,
+        rootEntityID: getRootEntityID,
+        boundingBox: getBoundingBox,
+        is2D: is2D,
+        getPositionAndOrientation: getPositionAndOrientation,
+        setPositionAndOrientation: setPositionAndOrientation,
+        startEditing: startEditing,
+        startDirectScaling: startDirectScaling,
+        directScale: directScale,
+        finishDirectScaling: finishDirectScaling,
+        startHandleScaling: startHandleScaling,
+        handleScale: handleScale,
+        finishHandleScaling: finishHandleScaling,
+        finishEditing: finishEditing,
+        cloneEntities: cloneEntities,
+        applyColor: applyColor,
+        getColor: getColor,
+        applyPhysics: applyPhysics,
+        deleteEntities: deleteEntities,
+        clear: clear,
+        destroy: destroy
+    };
+};
+
+SelectionManager.prototype = {};
diff --git a/unpublishedScripts/marketplace/shapes/modules/toolIcon.js b/unpublishedScripts/marketplace/shapes/modules/toolIcon.js
new file mode 100644
index 0000000000..143d768466
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/modules/toolIcon.js
@@ -0,0 +1,169 @@
+//
+//  toolIcon.js
+//
+//  Created by David Rowe on 28 Jul 2017.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+/* global ToolIcon:true, App, UIT */
+
+ToolIcon = function (side) {
+    // Tool icon displayed on non-dominant hand.
+
+    "use strict";
+
+    var LEFT_HAND = 0,
+
+        MODEL_DIMENSIONS = { x: 0.1944, y: 0.1928, z: 0.1928 }, // Raw FBX dimensions.
+        MODEL_SCALE = 0.7, // Adjust icon dimensions so that the green bar matches that of the Tools header.
+        MODEL_POSITION_LEFT_HAND = { x: -0.025, y: 0.03, z: 0 }, // x raises in thumb direction; y moves in fingers direction.
+        MODEL_POSITION_RIGHT_HAND = { x: 0.025, y: 0.03, z: 0 }, // ""
+        MODEL_ROTATION_LEFT_HAND = Quat.fromVec3Degrees({ x: 0, y: 0, z: 100 }),
+        MODEL_ROTATION_RIGHT_HAND = Quat.fromVec3Degrees({ x: 0, y: 180, z: -100 }),
+
+        MODEL_TYPE = "model",
+        MODEL_PROPERTIES = {
+            url: Script.resolvePath("../assets/tools/tool-icon.fbx"),
+            dimensions: Vec3.multiply(MODEL_SCALE, MODEL_DIMENSIONS),
+            solid: true,
+            alpha: 1.0,
+            parentID: Uuid.SELF,
+            ignoreRayIntersection: true,
+            visible: true
+        },
+
+        IMAGE_TYPE = "image3d",
+        IMAGE_PROPERTIES = {
+            localRotation: Quat.fromVec3Degrees({ x: -90, y: -90, z: 0 }),
+            alpha: 1.0,
+            emissive: true,
+            ignoreRayIntersection: true,
+            isFacingAvatar: false,
+            visible: true
+        },
+
+        ICON_PROPERTIES = {
+            // Relative to model overlay. x is in fingers direction; y is in thumb direction.
+            localPosition: { x: 0.020, y: 0.069, z: 0 },
+            color: UIT.colors.lightGrayText
+        },
+        LABEL_PROPERTIES = {
+            localPosition: { x: -0.040, y: 0.067, z: 0 },
+            color: UIT.colors.white
+        },
+        SUBLABEL_PROPERTIES = {
+            localPosition: { x: -0.055, y: 0.067, z: 0 },
+            color: UIT.colors.lightGrayText
+        },
+
+        ICON_SCALE_FACTOR = 3.0,
+        LABEL_SCALE_FACTOR = 1.8,
+
+        handJointName,
+        localPosition,
+        localRotation,
+
+        modelOverlay = null;
+
+    if (!(this instanceof ToolIcon)) {
+        return new ToolIcon();
+    }
+
+    function getAssetURLs() {
+        return [MODEL_PROPERTIES.url];
+    }
+
+    function setHand(side) {
+        // Assumes UI is not displaying.
+        if (side === LEFT_HAND) {
+            handJointName = "LeftHand";
+            localPosition = MODEL_POSITION_LEFT_HAND;
+            localRotation = MODEL_ROTATION_LEFT_HAND;
+        } else {
+            handJointName = "RightHand";
+            localPosition = MODEL_POSITION_RIGHT_HAND;
+            localRotation = MODEL_ROTATION_RIGHT_HAND;
+        }
+    }
+
+    setHand(side);
+
+    function clear() {
+        // Deletes current tool model.
+        if (modelOverlay) {
+            Overlays.deleteOverlay(modelOverlay); // Child overlays are automatically deleted.
+            modelOverlay = null;
+        }
+    }
+
+    function display(iconInfo) {
+        // Displays icon on hand.
+        var handJointIndex,
+            properties;
+
+        handJointIndex = MyAvatar.getJointIndex(handJointName);
+        if (handJointIndex === -1) {
+            // Don't display if joint isn't available (yet) to attach to.
+            // User can clear this condition by toggling the app off and back on once avatar finishes loading.
+            App.log(side, "ERROR: ToolIcon: Hand joint index isn't available!");
+            return;
+        }
+
+        if (modelOverlay !== null) {
+            // Should never happen because tool needs to be cleared in order for user to return to Tools menu.
+            clear();
+        }
+
+        // Model.
+        properties = Object.clone(MODEL_PROPERTIES);
+        properties.parentJointIndex = handJointIndex;
+        properties.localPosition = localPosition;
+        properties.localRotation = localRotation;
+        modelOverlay = Overlays.addOverlay(MODEL_TYPE, properties);
+
+        // Icon.
+        properties = Object.clone(IMAGE_PROPERTIES);
+        properties = Object.merge(properties, ICON_PROPERTIES);
+        properties.parentID = modelOverlay;
+        properties.url = iconInfo.icon.properties.url;
+        properties.dimensions = {
+            x: ICON_SCALE_FACTOR * iconInfo.icon.properties.dimensions.x,
+            y: ICON_SCALE_FACTOR * iconInfo.icon.properties.dimensions.y
+        };
+        properties.localPosition.y += ICON_SCALE_FACTOR * iconInfo.icon.headerOffset.y;
+        Overlays.addOverlay(IMAGE_TYPE, properties);
+
+        // Label.
+        properties = Object.clone(IMAGE_PROPERTIES);
+        properties = Object.merge(properties, LABEL_PROPERTIES);
+        properties.parentID = modelOverlay;
+        properties.url = iconInfo.label.properties.url;
+        properties.scale = LABEL_SCALE_FACTOR * iconInfo.label.properties.scale;
+        Overlays.addOverlay(IMAGE_TYPE, properties);
+
+        // Sublabel.
+        properties = Object.clone(IMAGE_PROPERTIES);
+        properties = Object.merge(properties, SUBLABEL_PROPERTIES);
+        properties.parentID = modelOverlay;
+        properties.url = iconInfo.sublabel.properties.url;
+        properties.scale = LABEL_SCALE_FACTOR * iconInfo.sublabel.properties.scale;
+        Overlays.addOverlay(IMAGE_TYPE, properties);
+    }
+
+    function destroy() {
+        clear();
+    }
+
+    return {
+        assetURLs: getAssetURLs,
+        setHand: setHand,
+        display: display,
+        clear: clear,
+        destroy: destroy
+    };
+};
+
+ToolIcon.prototype = {};
diff --git a/unpublishedScripts/marketplace/shapes/modules/toolsMenu.js b/unpublishedScripts/marketplace/shapes/modules/toolsMenu.js
new file mode 100644
index 0000000000..04bb88d040
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/modules/toolsMenu.js
@@ -0,0 +1,3701 @@
+//
+//  toolsMenu.js
+//
+//  Created by David Rowe on 22 Jul 2017.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+/* global ToolsMenu:true, App, Feedback, Preload, UIT */
+
+ToolsMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
+    // Tool menu displayed on top of forearm.
+
+    "use strict";
+
+    var attachmentJointName,
+
+        menuOriginLocalPosition,
+        menuOriginLocalRotation,
+
+        menuOriginOverlay,
+        menuHeaderOverlay,
+        menuHeaderHeadingOverlay,
+        menuHeaderBarOverlay,
+        menuHeaderBackOverlay,
+        menuHeaderTitleOverlay,
+        menuHeaderIconOverlay,
+        menuPanelOverlay,
+
+        menuOverlays = [],
+        menuHoverOverlays = [],
+        menuIconOverlays = [],
+        menuLabelOverlays = [],
+        menuEnabled = [],
+
+        optionsOverlays = [],
+        optionsOverlaysIDs = [], // Text ids (names) of options overlays.
+        optionsOverlaysLabels = [], // Overlay IDs of labels for optionsOverlays.
+        optionsOverlaysSublabels = [], // Overlay IDs of sublabels for optionsOverlays.
+        optionsSliderData = [], // Uses same index values as optionsOverlays.
+        optionsColorData = [], // Uses same index values as optionsOverlays.
+        optionsExtraOverlays = [],
+        optionsEnabled = [],
+        optionsSettings = {
+            //  <option item id>: { 
+            //      key: <Settings key to store value in>
+            //      value: <current value>
+            //  }
+            //  For reliable access, use the values from optionsSettings rather than doing Settings.getValue() - Settings values
+            //  are not necessarily updated instantaneously.
+        },
+        optionsToggles = {}, // Cater for toggle buttons without a setting.
+
+        footerOverlays = [],
+        footerHoverOverlays = [],
+        footerIconOverlays = [],
+        footerLabelOverlays = [],
+        footerEnabled = [],
+
+        swatchHighlightOverlay = null,
+
+        staticOverlays = [],
+
+        LEFT_HAND = 0,
+        PANEL_ORIGIN_POSITION_LEFT_HAND = {
+            x: -UIT.dimensions.canvasSeparation - UIT.dimensions.canvas.x / 2,
+            y: UIT.dimensions.handOffset,
+            z: 0
+        },
+        PANEL_ORIGIN_POSITION_RIGHT_HAND = {
+            x: UIT.dimensions.canvasSeparation + UIT.dimensions.canvas.x / 2,
+            y: UIT.dimensions.handOffset,
+            z: 0
+        },
+        PANEL_ORIGIN_ROTATION_LEFT_HAND = Quat.fromVec3Degrees({ x: 0, y: -90, z: 0 }),
+        PANEL_ORIGIN_ROTATION_RIGHT_HAND = Quat.fromVec3Degrees({ x: 0, y: 90, z: 0 }),
+        panelLateralOffset,
+
+        MENU_ORIGIN_PROPERTIES = {
+            dimensions: { x: 0.005, y: 0.005, z: 0.005 },
+            color: { red: 255, blue: 0, green: 0 },
+            alpha: 1.0,
+            parentID: Uuid.SELF,
+            ignoreRayIntersection: true,
+            visible: false,
+            displayInFront: true
+        },
+
+        MENU_HEADER_HOVER_OFFSET = { x: 0, y: 0, z: 0.0040 },
+
+        MENU_HEADER_PROPERTIES = {
+            // Invisible box to catch laser intersections while menu heading and bar move inside.
+            dimensions: Vec3.sum(UIT.dimensions.header, MENU_HEADER_HOVER_OFFSET), // Keep the laser on top when hover.
+            localPosition: {
+                x: 0,
+                y: UIT.dimensions.canvas.y / 2 - UIT.dimensions.header.y / 2,
+                z: UIT.dimensions.header.z / 2 + MENU_HEADER_HOVER_OFFSET.z / 2
+            },
+            localRotation: Quat.ZERO,
+            alpha: 0.0, // Invisible
+            solid: true,
+            ignoreRayIntersection: false,
+            visible: true // Catch laser intersections.
+        },
+
+        MENU_HEADER_HEADING_PROPERTIES = {
+            url: Script.resolvePath("../assets/gray-header.fbx"),
+            highlightURL: Script.resolvePath("../assets/green-header.fbx"),
+            dimensions: UIT.dimensions.headerHeading, // Model is in rotated coordinate system but can override.
+            localPosition: { x: 0, y: UIT.dimensions.headerBar.y / 2, z: -MENU_HEADER_HOVER_OFFSET.z / 2 },
+            localRotation: Quat.ZERO,
+            alpha: 1.0,
+            solid: true,
+            ignoreRayIntersection: true,
+            visible: true
+        },
+
+        MENU_HEADER_BAR_PROPERTIES = {
+            url: Script.resolvePath("../assets/green-header-bar.fbx"),
+            dimensions: UIT.dimensions.headerBar, // Model is in rotated coordinate system but can override.
+            localPosition: { x: 0, y: -UIT.dimensions.headerHeading.y / 2 - UIT.dimensions.headerBar.y / 2, z: 0 },
+            localRotation: Quat.ZERO,
+            alpha: 1.0,
+            solid: true,
+            ignoreRayIntersection: true,
+            visible: true
+        },
+
+        MENU_HEADER_BACK_PROPERTIES = {
+            // Magic numbers per UI design spec.
+            url: Script.resolvePath("../assets/tools/back-icon.svg"),
+            dimensions: { x: 0.0069, y: 0.0107 },
+            localPosition: {
+                x: -MENU_HEADER_HEADING_PROPERTIES.dimensions.x / 2 + 0.0118 + 0.0069 / 2,
+                y: 0,
+                z: MENU_HEADER_HEADING_PROPERTIES.dimensions.z / 2 + UIT.dimensions.imageOverlayOffset
+            },
+            localRotation: Quat.ZERO,
+            color: UIT.colors.lightGrayText,
+            alpha: 1.0,
+            emissive: true,
+            ignoreRayIntersection: true,
+            isFacingAvatar: false,
+            visible: true
+        },
+
+        MENU_HEADER_TITLE_PROPERTIES = {
+            url: Script.resolvePath("../assets/tools/tools-heading.svg"),
+            scale: 0.0327,
+            localPosition: {
+                x: 0,
+                y: 0,
+                z: MENU_HEADER_HEADING_PROPERTIES.dimensions.z / 2 + UIT.dimensions.imageOverlayOffset
+            },
+            localRotation: Quat.ZERO,
+            color: UIT.colors.white,
+            alpha: 1.0,
+            emissive: true,
+            ignoreRayIntersection: true,
+            isFacingAvatar: false,
+            visible: true
+        },
+
+        MENU_HEADER_TITLE_BACK_URL = Script.resolvePath("../assets/tools/back-heading.svg"),
+        MENU_HEADER_TITLE_BACK_SCALE = 0.0256,
+
+        MENU_HEADER_ICON_OFFSET = {
+            // Default right center position for header tool icons.
+            x: MENU_HEADER_HEADING_PROPERTIES.dimensions.x / 2 - 0.0118,
+            y: 0,
+            z: MENU_HEADER_HEADING_PROPERTIES.dimensions.z / 2 + UIT.dimensions.imageOverlayOffset
+        },
+
+        MENU_HEADER_ICON_PROPERTIES = {
+            url: Script.resolvePath("../assets/tools/color-icon.svg"), // Initial value so that the overlay is initialized OK.
+            dimensions: { x: 0.01, y: 0.01 }, // Ditto.
+            localPosition: Vec3.ZERO, // Ditto.
+            localRotation: Quat.ZERO,
+            color: UIT.colors.lightGrayText,
+            alpha: 1.0,
+            emissive: true,
+            ignoreRayIntersection: true,
+            isFacingAvatar: false,
+            visible: false
+        },
+
+        MENU_PANEL_PROPERTIES = {
+            dimensions: UIT.dimensions.panel,
+            localPosition: { x: 0, y: (UIT.dimensions.panel.y - UIT.dimensions.canvas.y) / 2, z: UIT.dimensions.panel.z / 2 },
+            localRotation: Quat.ZERO,
+            color: UIT.colors.baseGray,
+            alpha: 1.0,
+            solid: true,
+            ignoreRayIntersection: false,
+            visible: true
+        },
+
+        EMPTY_SWATCH_COLOR = UIT.colors.baseGrayShadow,
+        SWATCH_HIGHLIGHT_DELTA = 0.0020,
+
+        UI_ELEMENTS = {
+            // Magic numbers per UI design spec.
+            menuButton: {
+                overlay: "cube", // Invisible cube for hit area.
+                properties: {
+                    dimensions: UIT.dimensions.itemCollisionZone,
+                    localRotation: Quat.ZERO,
+                    alpha: 0.0, // Invisible.
+                    solid: true,
+                    ignoreRayIntersection: false,
+                    visible: true // So that laser intersects.
+                },
+                hoverButton: {
+                    overlay: "shape",
+                    properties: {
+                        shape: "Cylinder",
+                        dimensions: {
+                            x: UIT.dimensions.menuButtonDimensions.x,
+                            y: UIT.dimensions.menuButtonDimensions.z,
+                            z: UIT.dimensions.menuButtonDimensions.y
+                        },
+                        localPosition: UIT.dimensions.menuButtonIconOffset,
+                        localRotation: Quat.fromVec3Degrees({ x: 90, y: 0, z: -90 }),
+                        color: UIT.colors.greenHighlight,
+                        alpha: 1.0,
+                        emissive: true, // TODO: This has no effect.
+                        solid: true,
+                        ignoreRayIntersection: true,
+                        visible: false
+                    }
+                },
+                icon: {
+                    // Relative to hoverButton.
+                    type: "image",
+                    properties: {
+                        localPosition: {
+                            x: 0,
+                            y: UIT.dimensions.menuButtonDimensions.z / 2 + UIT.dimensions.imageOverlayOffset,
+                            z: 0
+                        },
+                        localRotation: Quat.fromVec3Degrees({ x: -90, y: 90, z: 0 }),
+                        color: UIT.colors.lightGrayText
+                    },
+                    highlightColor: UIT.colors.darkGray
+                },
+                label: {
+                    // Relative to menuButton.
+                    type: "image",
+                    properties: {
+                        localPosition: {
+                            x: 0,
+                            y: UIT.dimensions.menuButtonLabelYOffset,
+                            z: -UIT.dimensions.itemCollisionZone.z / 2 + UIT.dimensions.imageOverlayOffset
+                        },
+                        color: UIT.colors.white
+                    }
+                },
+                sublabel: {
+                    // Relative to menuButton.
+                    type: "image",
+                    properties: {
+                        localPosition: {
+                            x: 0,
+                            y: UIT.dimensions.menuButtonSublabelYOffset,
+                            z: -UIT.dimensions.itemCollisionZone.z / 2 + UIT.dimensions.imageOverlayOffset
+                        },
+                        color: UIT.colors.lightGrayText
+                    }
+                }
+            },
+            button: {
+                overlay: "cube",
+                properties: {
+                    dimensions: UIT.dimensions.buttonDimensions,
+                    localRotation: Quat.ZERO,
+                    color: UIT.colors.baseGrayShadow,
+                    alpha: 1.0,
+                    solid: true,
+                    ignoreRayIntersection: false,
+                    visible: true
+                },
+                label: {
+                    // Relative to button.
+                    localPosition: {
+                        x: 0,
+                        y: 0,
+                        z: UIT.dimensions.buttonDimensions.z / 2 + UIT.dimensions.imageOverlayOffset
+                    },
+                    color: UIT.colors.white
+                }
+            },
+            toggleButton: {
+                overlay: "cube",
+                properties: {
+                    dimensions: UIT.dimensions.buttonDimensions,
+                    localRotation: Quat.ZERO,
+                    color: UIT.colors.baseGrayShadow,
+                    alpha: 1.0,
+                    solid: true,
+                    ignoreRayIntersection: false,
+                    visible: true
+                },
+                onColor: UIT.colors.greenHighlight,
+                offColor: UIT.colors.baseGrayShadow,
+                onHoverColor: UIT.colors.greenShadow,
+                offHoverColor: UIT.colors.darkGray,
+                label: {
+                    // Relative to toggleButton.
+                    localPosition: {
+                        x: 0,
+                        y: 0,
+                        z: UIT.dimensions.buttonDimensions.z / 2 + UIT.dimensions.imageOverlayOffset
+                    },
+                    color: UIT.colors.white
+                },
+                sublabel: {
+                    // Relative to toggleButton.
+                    localPosition: {
+                        x: 0,
+                        y: 0,
+                        z: UIT.dimensions.buttonDimensions.z / 2 + UIT.dimensions.imageOverlayOffset
+                    },
+                    color: UIT.colors.lightGray
+                }
+                /*
+                onSublabel: { }  // Optional properties to update sublabel with.
+                offSublabel: { }  // Optional properties to update sublabel with.
+                */
+            },
+            swatch: {
+                overlay: "shape",
+                properties: {
+                    shape: "Cylinder",
+                    dimensions: { x: 0.0294, y: UIT.dimensions.buttonDimensions.z, z: 0.0294 },
+                    localRotation: Quat.fromVec3Degrees({ x: 90, y: 0, z: -90 }),
+                    color: EMPTY_SWATCH_COLOR,
+                    emissive: true, // TODO: This has no effect.
+                    alpha: 1.0,
+                    solid: true,
+                    ignoreRayIntersection: false,
+                    visible: true
+                }
+                // Must have a setting property in order to function property.
+                // Setting property may optionally include a defaultValue.
+                // A setting value of "" means that the swatch is unpopulated.
+            },
+            swatchHighlight: {
+                overlay: "shape",
+                properties: {
+                    shape: "Cylinder",
+                    dimensions: {
+                        x: 0.0294 + SWATCH_HIGHLIGHT_DELTA,
+                        y: UIT.dimensions.buttonDimensions.z,
+                        z: 0.0294 + SWATCH_HIGHLIGHT_DELTA
+                    },
+                    localRotation: Quat.ZERO, // Relative to swatch.
+                    localPosition: { x: 0, y: -0.0001, z: 0 },
+                    color: UIT.colors.faintGray,
+                    emissive: true, // TODO: This has no effect.
+                    alpha: 1.0,
+                    solid: true,
+                    ignoreRayIntersection: true,
+                    visible: false
+                }
+
+            },
+            square: {
+                overlay: "cube", // Emulate a 2D square with a cube.
+                properties: {
+                    localRotation: Quat.ZERO,
+                    color: UIT.colors.baseGrayShadow,
+                    alpha: 1.0,
+                    solid: true,
+                    ignoreRayIntersection: true,
+                    visible: true
+                }
+            },
+            image: {
+                overlay: "image3d",
+                properties: {
+                    localPosition: { x: 0, y: 0, z: 0 },
+                    localRotation: Quat.ZERO,
+                    alpha: 1.0,
+                    emissive: true,
+                    ignoreRayIntersection: true,
+                    isFacingAvatar: false,
+                    visible: true
+                }
+            },
+            horizontalRule: {
+                overlay: "image3d",
+                properties: {
+                    url: Script.resolvePath("../assets/horizontal-rule.svg"),
+                    dimensions: { x: UIT.dimensions.panel.x - 2 * UIT.dimensions.leftMargin, y: 0.001 },
+                    localRotation: Quat.ZERO,
+                    color: UIT.colors.baseGrayShadow,
+                    alpha: 1.0,
+                    solid: true,
+                    ignoreRayIntersection: true,
+                    isFacingAvatar: false,
+                    visible: true
+                }
+            },
+            sphere: {
+                overlay: "sphere",
+                properties: {
+                    dimensions: { x: 0.01, y: 0.01, z: 0.01 },
+                    localRotation: Quat.ZERO,
+                    color: { red: 192, green: 192, blue: 192 },
+                    alpha: 1.0,
+                    solid: true,
+                    ignoreRayIntersection: true,
+                    visible: true
+                }
+            },
+            barSlider: {
+                // Invisible cube to catch laser intersections; value and remainder entities move inside.
+                // Values range between 0.0 and 1.0.
+                overlay: "cube",
+                properties: {
+                    dimensions: { x: 0.02, y: 0.1, z: 0.01 },
+                    localRotation: Quat.ZERO,
+                    alpha: 0.0, // Invisible.
+                    solid: true,
+                    ignoreRayIntersection: false,
+                    visible: true // Catch laser intersections.
+                },
+                label: {
+                    // Relative to barSlider.
+                    color: UIT.colors.white
+                },
+                zeroIndicator: {
+                    overlay: "image3d",
+                    properties: {
+                        url: Script.resolvePath("../assets/horizontal-rule.svg"),
+                        dimensions: { x: 0.02, y: 0.001 },
+                        localRotation: Quat.ZERO,
+                        color: UIT.colors.lightGrayText,
+                        alpha: 1.0,
+                        solid: true,
+                        ignoreRayIntersection: true,
+                        isFacingAvatar: false,
+                        visible: true
+                    }
+                },
+                sliderValue: {
+                    overlay: "cube",
+                    properties: {
+                        dimensions: { x: 0.02, y: 0.03, z: 0.01 },
+                        localPosition: { x: 0, y: 0.035, z: 0 },
+                        localRotation: Quat.ZERO,
+                        color: UIT.colors.greenHighlight,
+                        alpha: 1.0,
+                        solid: true,
+                        ignoreRayIntersection: true,
+                        visible: true
+                    }
+                },
+                sliderRemainder: {
+                    overlay: "cube",
+                    properties: {
+                        dimensions: { x: 0.02, y: 0.07, z: 0.01 },
+                        localPosition: { x: 0, y: -0.015, z: 0 },
+                        localRotation: Quat.ZERO,
+                        color: UIT.colors.baseGrayShadow,
+                        alpha: 1.0,
+                        solid: true,
+                        ignoreRayIntersection: true,
+                        visible: true
+                    }
+                }
+            },
+            imageSlider: { // Values range between 0.0 and 1.0.
+                overlay: "cube",
+                properties: {
+                    dimensions: { x: 0.0160, y: 0.1229, z: UIT.dimensions.buttonDimensions.z },
+                    localRotation: Quat.ZERO,
+                    color: { red: 128, green: 128, blue: 128 },
+                    alpha: 1.0,
+                    solid: true,
+                    ignoreRayIntersection: false,
+                    visible: true
+                },
+                useBaseColor: false,
+                imageURL: null,
+                imageOverlayURL: null
+            },
+            sliderPointer: {
+                overlay: "shape",
+                properties: {
+                    shape: "Cone",
+                    dimensions: { x: 0.005, y: 0.005, z: 0.005 },
+                    localRotation: Quat.fromVec3Degrees({ x: 0, y: 0, z: -90 }),
+                    color: { red: 180, green: 180, blue: 180 },
+                    alpha: 1.0,
+                    solid: true,
+                    ignoreRayIntersection: true,
+                    visible: true
+                }
+            },
+            colorCircle: {
+                overlay: "shape",
+                properties: {
+                    shape: "Cylinder",
+                    dimensions: { x: 0.1229, y: UIT.dimensions.buttonDimensions.z, z: 0.1229 },
+                    localRotation: Quat.fromVec3Degrees({ x: 90, y: 0, z: -90 }),
+                    color: { red: 128, green: 128, blue: 128 },
+                    alpha: 1.0,
+                    solid: true,
+                    ignoreRayIntersection: false,
+                    visible: true
+                },
+                imageURL: null,
+                imageOverlayURL: null
+            },
+            circlePointer: {
+                overlay: "shape",
+                properties: {
+                    shape: "Cone",
+                    dimensions: { x: 0.005, y: 0.005, z: 0.005 },
+                    localRotation: Quat.fromVec3Degrees({ x: 0, y: 0, z: -90 }),
+                    color: { red: 180, green: 180, blue: 180 },
+                    alpha: 1.0,
+                    solid: true,
+                    ignoreRayIntersection: true,
+                    visible: true
+                }
+            },
+            picklist: {
+                overlay: "cube",
+                properties: {
+                    dimensions: { x: 0.06, y: 0.02, z: 0.01 },
+                    localRotation: Quat.ZERO,
+                    color: UIT.colors.baseGrayShadow,
+                    alpha: 1.0,
+                    solid: true,
+                    ignoreRayIntersection: false,
+                    visible: true
+                },
+                label: {
+                    // Relative to picklist.
+                    color: UIT.colors.white
+                }
+            },
+            picklistItem: { // Note: When using, declare before picklist item that it's being used in.
+                overlay: "cube",
+                properties: {
+                    dimensions: { x: 0.1416, y: 0.0280, z: UIT.dimensions.buttonDimensions.z },
+                    localPosition: Vec3.ZERO,
+                    localRotation: Quat.ZERO,
+                    color: UIT.colors.baseGrayShadow,
+                    alpha: 1.0,
+                    solid: true,
+                    ignoreRayIntersection: false,
+                    visible: false
+                },
+                label: {
+                    // Relative to picklistItem.
+                    color: UIT.colors.white
+                }
+            }
+        },
+
+        PICKLIST_UP_ARROW = Script.resolvePath("../assets/tools/common/up-arrow.svg"),
+        PICKLIST_DOWN_ARROW = Script.resolvePath("../assets/tools/common/down-arrow.svg"),
+
+        BUTTON_UI_ELEMENTS = ["button", "menuButton", "toggleButton", "swatch"],
+
+        MENU_HOVER_DELTA = { x: 0, y: 0, z: 0.006 },
+        OPTION_HOVER_DELTA = { x: 0, y: 0, z: 0.002 },
+        PICKLIST_HOVER_DELTA = { x: 0, y: 0, z: 0.006 },
+        BUTTON_PRESS_DELTA = { x: 0, y: 0, z: -0.002 },
+
+        MIN_BAR_SLIDER_DIMENSION = 0.0001, // Avoid visual artifact for 0 slider values.
+
+        PHYSICS_SLIDER_PRESETS = {
+            // Slider values in the range 0.0 to 1.0.
+            // Note: Friction values give the desired linear and angular damping values but friction values are a somewhat out,
+            // especially for the balloon.
+            presetDefault:    { gravity: 0.5, bounce: 0.5, friction: 0.5, density: 0.5 },
+            presetLead:       { gravity: 0.5, bounce: 0.0, friction: 0.5, density: 1.0 },
+            presetWood:       { gravity: 0.5, bounce: 0.4, friction: 0.5, density: 0.5 },
+            presetIce:        { gravity: 0.5, bounce: 0.99, friction: 0.151004, density: 0.349485 },
+            presetRubber:     { gravity: 0.5, bounce: 0.99, friction: 0.5, density: 0.5 },
+            presetCotton:     { gravity: 0.587303, bounce: 0.0, friction: 0.931878, density: 0.0 },
+            presetTumbleweed: { gravity: 0.595893, bounce: 0.7, friction: 0.5, density: 0.0 },
+            presetZeroG:      { gravity: 0.596844, bounce: 0.5, friction: 0.5, density: 0.5 },
+            presetBalloon:    { gravity: 0.606313, bounce: 0.99, friction: 0.151004, density: 0.0 }
+        },
+
+        OPTONS_PANELS = {
+            // Magic numbers per UI design spec.
+            colorOptions: [
+                {
+                    id: "colorSwatchesLabel",
+                    type: "image",
+                    properties: {
+                        color: UIT.colors.white,
+                        url: Script.resolvePath("../assets/tools/color/swatches-label.svg"),
+                        scale: 0.0345,
+                        localPosition: {
+                            x: -UIT.dimensions.panel.x / 2 + UIT.dimensions.leftMargin + 0.0345 / 2,
+                            y: UIT.dimensions.panel.y / 2 - UIT.dimensions.topMargin - 0.0047 / 2,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.imageOverlayOffset
+                        }
+                    }
+                },
+                {
+                    id: "colorRule1",
+                    type: "horizontalRule",
+                    properties: {
+                        dimensions: { x: 0.0668, y: 0.001 },
+                        localPosition: {
+                            x: -UIT.dimensions.panel.x / 2 + UIT.dimensions.leftMargin + 0.0668 / 2,
+                            y: UIT.dimensions.panel.y / 2 - 0.0199,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.imageOverlayOffset
+                        }
+                    }
+                },
+                {
+                    id: "colorSwatch1",
+                    type: "swatch",
+                    properties: {
+                        localPosition: {
+                            x: -0.0935,
+                            y: 0.0513 + UIT.dimensions.footerHeight / 2,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.buttonDimensions.z / 2
+                        }
+                    },
+                    setting: {
+                        key: "VREdit.colorTool.swatch1Color",
+                        property: "color"
+                    },
+                    command: {
+                        method: "setColorPerSwatch"
+                    },
+                    clear: {
+                        method: "clearSwatch"
+                    }
+                },
+                {
+                    id: "colorSwatch2",
+                    type: "swatch",
+                    properties: {
+                        localPosition: {
+                            x: -0.0561,
+                            y: 0.0513 + UIT.dimensions.footerHeight / 2,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.buttonDimensions.z / 2
+                        }
+                    },
+                    setting: {
+                        key: "VREdit.colorTool.swatch2Color",
+                        property: "color"
+                    },
+                    command: {
+                        method: "setColorPerSwatch"
+                    },
+                    clear: {
+                        method: "clearSwatch"
+                    }
+                },
+                {
+                    id: "colorSwatch3",
+                    type: "swatch",
+                    properties: {
+                        localPosition: {
+                            x: -0.0935,
+                            y: 0.0153 + UIT.dimensions.footerHeight / 2,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.buttonDimensions.z / 2
+                        }
+                    },
+                    setting: {
+                        key: "VREdit.colorTool.swatch3Color",
+                        property: "color"
+                    },
+                    command: {
+                        method: "setColorPerSwatch"
+                    },
+                    clear: {
+                        method: "clearSwatch"
+                    }
+                },
+                {
+                    id: "colorSwatch4",
+                    type: "swatch",
+                    properties: {
+                        localPosition: {
+                            x: -0.0561,
+                            y: 0.0153 + UIT.dimensions.footerHeight / 2,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.buttonDimensions.z / 2
+                        }
+                    },
+                    setting: {
+                        key: "VREdit.colorTool.swatch4Color",
+                        property: "color"
+                    },
+                    command: {
+                        method: "setColorPerSwatch"
+                    },
+                    clear: {
+                        method: "clearSwatch"
+                    }
+                },
+                {
+                    id: "colorSwatch5",
+                    type: "swatch",
+                    properties: {
+                        localPosition: {
+                            x: -0.0935,
+                            y: -0.0207 + UIT.dimensions.footerHeight / 2,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.buttonDimensions.z / 2
+                        }
+                    },
+                    setting: {
+                        key: "VREdit.colorTool.swatch5Color",
+                        property: "color"
+                    },
+                    command: {
+                        method: "setColorPerSwatch"
+                    },
+                    clear: {
+                        method: "clearSwatch"
+                    }
+                },
+                {
+                    id: "colorSwatch6",
+                    type: "swatch",
+                    properties: {
+                        localPosition: {
+                            x: -0.0561,
+                            y: -0.0207 + UIT.dimensions.footerHeight / 2,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.buttonDimensions.z / 2
+                        }
+                    },
+                    setting: {
+                        key: "VREdit.colorTool.swatch6Color",
+                        property: "color"
+                    },
+                    command: {
+                        method: "setColorPerSwatch"
+                    },
+                    clear: {
+                        method: "clearSwatch"
+                    }
+                },
+                {
+                    id: "colorRule2",
+                    type: "horizontalRule",
+                    properties: {
+                        dimensions: { x: 0.0668, y: 0.001 },
+                        localPosition: {
+                            x: -UIT.dimensions.panel.x / 2 + UIT.dimensions.leftMargin + 0.0668 / 2,
+                            y: -UIT.dimensions.panel.y / 2 + 0.0481 + UIT.dimensions.footerHeight / 2,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.imageOverlayOffset
+                        }
+                    }
+                },
+                {
+                    id: "colorCircle",
+                    type: "colorCircle",
+                    properties: {
+                        localPosition: {
+                            x: 0.04675,
+                            y: 0.01655 + UIT.dimensions.footerHeight / 2,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.buttonDimensions.z / 2
+                        }
+                    },
+                    imageURL: Script.resolvePath("../assets/tools/color/color-circle.png"),
+                    imageOverlayURL: Script.resolvePath("../assets/tools/color/color-circle-black.png"),
+                    command: {
+                        method: "setColorPerCircle"
+                    }
+                },
+                {
+                    id: "colorSlider",
+                    type: "imageSlider",
+                    properties: {
+                        localPosition: {
+                            x: 0.04675,
+                            y: -0.064 + UIT.dimensions.footerHeight / 2,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.buttonDimensions.z / 2
+                        },
+                        localRotation: Quat.fromVec3Degrees({ x: 0, y: 0, z: -90 })
+                    },
+                    useBaseColor: true,
+                    imageURL: Script.resolvePath("../assets/tools/color/slider-white.png"),
+                    // Alpha PNG created by overlaying two black-to-transparent gradients in order to achieve visual effect.
+                    imageOverlayURL: Script.resolvePath("../assets/tools/color/slider-alpha.png"),
+                    command: {
+                        method: "setColorPerSlider"
+                    }
+                },
+                {
+                    id: "pickColor",
+                    type: "toggleButton",
+                    properties: {
+                        dimensions: { x: 0.0294, y: 0.0280, z: UIT.dimensions.buttonDimensions.z },
+                        localPosition: {
+                            x: -0.0935,
+                            y: -0.064 + UIT.dimensions.footerHeight / 2,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.buttonDimensions.z / 2
+                        }
+                    },
+                    label: {
+                        url: Script.resolvePath("../assets/tools/color/pick-color-label.svg"),
+                        scale: 0.0120
+                    },
+                    command: {
+                        method: "togglePickColor"
+                    }
+                },
+                {
+                    id: "currentColor",
+                    type: "square",
+                    properties: {
+                        dimensions: { x: 0.0294, y: 0.0280, z: UIT.dimensions.imageOverlayOffset },
+                        localPosition: {
+                            x: -0.0561,
+                            y: -0.064 + UIT.dimensions.footerHeight / 2,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.buttonDimensions.z / 2
+                        }
+                    },
+                    setting: {
+                        key: "VREdit.colorTool.currentColor",
+                        property: "color",
+                        defaultValue: { red: 255, green: 255, blue: 255 },
+                        command: "setPickColor"
+                    }
+                }
+            ],
+            scaleOptions: [
+                {
+                    id: "stretchActionsLabel",
+                    type: "image",
+                    properties: {
+                        color: UIT.colors.white,
+                        url: Script.resolvePath("../assets/tools/common/actions-label.svg"),
+                        scale: 0.0276,
+                        localPosition: {
+                            x: -UIT.dimensions.panel.x / 2 + UIT.dimensions.leftMargin + 0.0276 / 2,
+                            y: UIT.dimensions.panel.y / 2 - UIT.dimensions.topMargin - 0.0047 / 2,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.imageOverlayOffset
+                        }
+                    }
+                },
+                {
+                    id: "stretchRule1",
+                    type: "horizontalRule",
+                    properties: {
+                        localPosition: {
+                            x: 0,
+                            y: UIT.dimensions.panel.y / 2 - 0.0199,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.imageOverlayOffset
+                        }
+                    }
+                },
+                {
+                    id: "stretchFinishButton",
+                    type: "button",
+                    properties: {
+                        localPosition: {
+                            x: 0,
+                            y: UIT.dimensions.panel.y / 2 - 0.0280 - UIT.dimensions.buttonDimensions.y / 2,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.buttonDimensions.z / 2
+                        }
+                    },
+                    label: {
+                        url: Script.resolvePath("../assets/tools/common/finish-label.svg"),
+                        scale: 0.0318
+                    },
+                    command: {
+                        method: "clearTool"
+                    }
+                },
+                {
+                    id: "stretchRule2",
+                    type: "horizontalRule",
+                    properties: {
+                        localPosition: {
+                            x: 0,
+                            y: UIT.dimensions.panel.y / 2 - 0.1197,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.imageOverlayOffset
+                        }
+                    }
+                },
+                {
+                    id: "stretchInfoIcon",
+                    type: "image",
+                    properties: {
+                        url: Script.resolvePath("../assets/tools/common/info-icon.svg"),
+                        dimensions: { x: 0.0321, y: 0.0320 },
+                        localPosition: {
+                            x: -UIT.dimensions.panel.x / 2 + UIT.dimensions.leftMargin + 0.0321 / 2,
+                            y: -UIT.dimensions.panel.y / 2 + 0.0200 + 0.0320 / 2 + UIT.dimensions.footerHeight,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.imageOverlayOffset
+                        },
+                        color: UIT.colors.white // Icon SVG is already lightGray color.
+                    }
+                },
+                {
+                    id: "stretchInfo",
+                    type: "image",
+                    properties: {
+                        url: Script.resolvePath("../assets/tools/stretch/info-text.svg"),
+                        scale: 0.1340,
+                        localPosition: { // Vertically center on info icon.
+                            x: -UIT.dimensions.panel.x / 2 + 0.0679 + 0.1340 / 2,
+                            y: -UIT.dimensions.panel.y / 2 + 0.0200 + 0.0320 / 2 + UIT.dimensions.footerHeight,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.imageOverlayOffset
+                        },
+                        color: UIT.colors.white
+                    }
+                }
+            ],
+            cloneOptions: [
+                {
+                    id: "cloneActionsLabel",
+                    type: "image",
+                    properties: {
+                        color: UIT.colors.white,
+                        url: Script.resolvePath("../assets/tools/common/actions-label.svg"),
+                        scale: 0.0276,
+                        localPosition: {
+                            x: -UIT.dimensions.panel.x / 2 + UIT.dimensions.leftMargin + 0.0276 / 2,
+                            y: UIT.dimensions.panel.y / 2 - UIT.dimensions.topMargin - 0.0047 / 2,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.imageOverlayOffset
+                        }
+                    }
+                },
+                {
+                    id: "cloneRule1",
+                    type: "horizontalRule",
+                    properties: {
+                        localPosition: {
+                            x: 0,
+                            y: UIT.dimensions.panel.y / 2 - 0.0199,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.imageOverlayOffset
+                        }
+                    }
+                },
+                {
+                    id: "cloneFinishButton",
+                    type: "button",
+                    properties: {
+                        localPosition: {
+                            x: 0,
+                            y: UIT.dimensions.panel.y / 2 - 0.0280 - UIT.dimensions.buttonDimensions.y / 2,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.buttonDimensions.z / 2
+                        }
+                    },
+                    label: {
+                        url: Script.resolvePath("../assets/tools/common/finish-label.svg"),
+                        scale: 0.0318
+                    },
+                    command: {
+                        method: "clearTool"
+                    }
+                }
+            ],
+            groupOptions: [
+                {
+                    id: "groupActionsLabel",
+                    type: "image",
+                    properties: {
+                        color: UIT.colors.white,
+                        url: Script.resolvePath("../assets/tools/common/actions-label.svg"),
+                        scale: 0.0276,
+                        localPosition: {
+                            x: -UIT.dimensions.panel.x / 2 + UIT.dimensions.leftMargin + 0.0276 / 2,
+                            y: UIT.dimensions.panel.y / 2 - UIT.dimensions.topMargin - 0.0047 / 2,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.imageOverlayOffset
+                        }
+                    }
+                },
+                {
+                    id: "groupRule1",
+                    type: "horizontalRule",
+                    properties: {
+                        localPosition: {
+                            x: 0,
+                            y: UIT.dimensions.panel.y / 2 - 0.0199,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.imageOverlayOffset
+                        }
+                    }
+                },
+                {
+                    id: "groupButton",
+                    type: "button",
+                    properties: {
+                        dimensions: {
+                            x: UIT.dimensions.buttonDimensions.x,
+                            y: 0.0400,
+                            z: UIT.dimensions.buttonDimensions.z
+                        },
+                        localPosition: {
+                            x: 0,
+                            y: UIT.dimensions.panel.y / 2 - 0.0280 - 0.0400 / 2,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.buttonDimensions.z / 2
+                        },
+                        color: UIT.colors.baseGrayShadow
+                    },
+                    enabledColor: UIT.colors.greenHighlight,
+                    highlightColor: UIT.colors.greenShadow,
+                    label: {
+                        url: Script.resolvePath("../assets/tools/group/group-label.svg"),
+                        scale: 0.0351,
+                        color: UIT.colors.baseGray
+                    },
+                    labelEnabledColor: UIT.colors.white,
+                    callback: {
+                        method: "groupButton"
+                    }
+                },
+                {
+                    id: "ungroupButton",
+                    type: "button",
+                    properties: {
+                        dimensions: { x: UIT.dimensions.buttonDimensions.x, y: 0.0400, z: UIT.dimensions.buttonDimensions.z },
+                        localPosition: {
+                            x: 0,
+                            y: UIT.dimensions.panel.y / 2 - 0.0280 - 0.0400 - 0.0040 - 0.0400 / 2,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.buttonDimensions.z / 2
+                        },
+                        color: UIT.colors.baseGrayShadow
+                    },
+                    enabledColor: UIT.colors.redHighlight,
+                    highlightColor: UIT.colors.redAccent,
+                    label: {
+                        url: Script.resolvePath("../assets/tools/group/ungroup-label.svg"),
+                        scale: 0.0496,
+                        color: UIT.colors.baseGray
+                    },
+                    labelEnabledColor: UIT.colors.white,
+                    callback: {
+                        method: "ungroupButton"
+                    }
+                },
+                {
+                    id: "groupRule2",
+                    type: "horizontalRule",
+                    properties: {
+                        localPosition: {
+                            x: 0,
+                            y: -UIT.dimensions.panel.y / 2 + 0.0603,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.imageOverlayOffset
+                        }
+                    }
+                },
+                {
+                    id: "groupSelectionBoxButton",
+                    type: "toggleButton",
+                    properties: {
+                        dimensions: { x: 0.1042, y: 0.0400, z: UIT.dimensions.buttonDimensions.z },
+                        localPosition: {
+                            x: -0.0040 - 0.1042 / 2,
+                            y: UIT.dimensions.panel.y / 2 - 0.0280 - 2 * 0.0400 - 0.0160 - 0.0400 / 2,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.buttonDimensions.z / 2
+                        }
+                    },
+                    label: {
+                        url: Script.resolvePath("../assets/tools/group/selection-box-label.svg"),
+                        scale: 0.0161
+                    },
+                    command: {
+                        method: "toggleGroupSelectionBox"
+                    }
+                },
+                {
+                    id: "clearGroupingButton",
+                    type: "button",
+                    properties: {
+                        dimensions: { x: 0.1042, y: 0.0400, z: UIT.dimensions.buttonDimensions.z },
+                        localPosition: {
+                            x: 0.0040 + 0.1042 / 2,
+                            y: UIT.dimensions.panel.y / 2 - 0.0280 - 2 * 0.0400 - 0.0160 - 0.0400 / 2,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.buttonDimensions.z / 2
+                        },
+                        color: UIT.colors.baseGrayShadow
+                    },
+                    enabledColor: UIT.colors.greenHighlight,
+                    highlightColor: UIT.colors.greenShadow,
+                    label: {
+                        url: Script.resolvePath("../assets/tools/group/clear-label.svg"),
+                        scale: 0.0314,
+                        color: UIT.colors.baseGray
+                    },
+                    labelEnabledColor: UIT.colors.white,
+                    enabled: false,
+                    command: {
+                        method: "clearGroupSelection"
+                    }
+                }
+            ],
+            physicsOptions: [
+                {
+                    id: "physicsPropertiesLabel",
+                    type: "image",
+                    properties: {
+                        color: UIT.colors.white,
+                        url: Script.resolvePath("../assets/tools/physics/properties-label.svg"),
+                        scale: 0.0376,
+                        localPosition: {
+                            x: -UIT.dimensions.panel.x / 2 + UIT.dimensions.leftMargin + 0.0376 / 2,
+                            y: UIT.dimensions.panel.y / 2 - UIT.dimensions.topMargin - 0.0047 / 2,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.imageOverlayOffset
+                        }
+                    }
+                },
+                {
+                    id: "physicsRule1",
+                    type: "horizontalRule",
+                    properties: {
+                        dimensions: { x: 0.0668, y: 0.001 },
+                        localPosition: {
+                            x: -UIT.dimensions.panel.x / 2 + UIT.dimensions.leftMargin + 0.0668 / 2,
+                            y: UIT.dimensions.panel.y / 2 - 0.0199,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.imageOverlayOffset
+                        }
+                    }
+                },
+                {
+                    id: "gravityToggle",
+                    type: "toggleButton",
+                    properties: {
+                        dimensions: { x: 0.0668, y: 0.0280, z: UIT.dimensions.buttonDimensions.z },
+                        localPosition: {
+                            x: -0.0748,
+                            y: 0.0480 + UIT.dimensions.footerHeight / 2,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.buttonDimensions.z / 2
+                        }
+                    },
+                    label: {
+                        localPosition: {
+                            x: 0,
+                            y: 0.0034,
+                            z: UIT.dimensions.buttonDimensions.z / 2 + UIT.dimensions.imageOverlayOffset
+                        },
+                        url: Script.resolvePath("../assets/tools/physics/buttons/gravity-label.svg"),
+                        scale: 0.0240,
+                        color: UIT.colors.white
+                    },
+                    sublabel: {
+                        localPosition: {
+                            x: 0,
+                            y: -0.0034,
+                            z: UIT.dimensions.buttonDimensions.z / 2 + UIT.dimensions.imageOverlayOffset
+                        },
+                        url: Script.resolvePath("../assets/tools/physics/buttons/off-label.svg"),
+                        scale: 0.0104,
+                        color: UIT.colors.white // SVG has gray color.
+                    },
+                    onSublabel: {
+                        url: Script.resolvePath("../assets/tools/physics/buttons/on-label.svg"),
+                        scale: 0.0081
+                    },
+                    offSublabel: {
+                        url: Script.resolvePath("../assets/tools/physics/buttons/off-label.svg"),
+                        scale: 0.0104
+                    },
+                    setting: {
+                        key: "VREdit.physicsTool.gravityOn",
+                        defaultValue: false,
+                        callback: "setGravityOn"
+                    },
+                    command: {
+                        method: "setGravityOn"
+                    }
+                },
+                {
+                    id: "collideToggle",
+                    type: "toggleButton",
+                    properties: {
+                        dimensions: { x: 0.0668, y: 0.0280, z: UIT.dimensions.buttonDimensions.z },
+                        localPosition: {
+                            x: -0.0748,
+                            y: 0.0120 + UIT.dimensions.footerHeight / 2,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.buttonDimensions.z / 2
+                        }
+                    },
+                    label: {
+                        localPosition: {
+                            x: 0,
+                            y: 0.0034,
+                            z: UIT.dimensions.buttonDimensions.z / 2 + UIT.dimensions.imageOverlayOffset
+                        },
+                        url: Script.resolvePath("../assets/tools/physics/buttons/collisions-label.svg"),
+                        scale: 0.0338,
+                        color: UIT.colors.white
+                    },
+                    sublabel: {
+                        localPosition: {
+                            x: 0,
+                            y: -0.0034,
+                            z: UIT.dimensions.buttonDimensions.z / 2 + UIT.dimensions.imageOverlayOffset
+                        },
+                        url: Script.resolvePath("../assets/tools/physics/buttons/off-label.svg"),
+                        scale: 0.0104,
+                        color: UIT.colors.white // SVG has gray color.
+                    },
+                    onSublabel: {
+                        url: Script.resolvePath("../assets/tools/physics/buttons/on-label.svg"),
+                        scale: 0.0081
+                    },
+                    offSublabel: {
+                        url: Script.resolvePath("../assets/tools/physics/buttons/off-label.svg"),
+                        scale: 0.0104
+                    },
+                    setting: {
+                        key: "VREdit.physicsTool.collideOn",
+                        defaultValue: true,
+                        callback: "setCollideOn"
+                    },
+                    command: {
+                        method: "setCollideOn"
+                    }
+                },
+                {
+                    id: "grabToggle",
+                    type: "toggleButton",
+                    properties: {
+                        dimensions: { x: 0.0668, y: 0.0280, z: UIT.dimensions.buttonDimensions.z },
+                        localPosition: {
+                            x: -0.0748,
+                            y: -0.0240 + UIT.dimensions.footerHeight / 2,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.buttonDimensions.z / 2
+                        }
+                    },
+                    label: {
+                        localPosition: {
+                            x: 0,
+                            y: 0.0034,
+                            z: UIT.dimensions.buttonDimensions.z / 2 + UIT.dimensions.imageOverlayOffset
+                        },
+                        url: Script.resolvePath("../assets/tools/physics/buttons/grabbable-label.svg"),
+                        scale: 0.0334,
+                        color: UIT.colors.white
+                    },
+                    sublabel: {
+                        localPosition: {
+                            x: 0,
+                            y: -0.0034,
+                            z: UIT.dimensions.buttonDimensions.z / 2 + UIT.dimensions.imageOverlayOffset
+                        },
+                        url: Script.resolvePath("../assets/tools/physics/buttons/off-label.svg"),
+                        scale: 0.0104,
+                        color: UIT.colors.white // SVG has gray color.
+                    },
+                    onSublabel: {
+                        url: Script.resolvePath("../assets/tools/physics/buttons/on-label.svg"),
+                        scale: 0.0081
+                    },
+                    offSublabel: {
+                        url: Script.resolvePath("../assets/tools/physics/buttons/off-label.svg"),
+                        scale: 0.0104
+                    },
+                    setting: {
+                        key: "VREdit.physicsTool.grabOn",
+                        defaultValue: false,
+                        callback: "setGrabOn"
+                    },
+                    command: {
+                        method: "setGrabOn"
+                    }
+                },
+
+                {
+                    id: "physicsPresetsLabel",
+                    type: "image",
+                    properties: {
+                        color: UIT.colors.white,
+                        url: Script.resolvePath("../assets/tools/physics/presets-label.svg"),
+                        scale: 0.0270,
+                        localPosition: {
+                            x: UIT.dimensions.panel.x / 2 - UIT.dimensions.rightMargin - 0.1416 + 0.0270 / 2,
+                            y: UIT.dimensions.panel.y / 2 - UIT.dimensions.topMargin - 0.0047 / 2,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.imageOverlayOffset
+                        }
+                    }
+                },
+                {
+                    id: "physicsRule2",
+                    type: "horizontalRule",
+                    properties: {
+                        dimensions: { x: 0.1416, y: 0.001 },
+                        localPosition: {
+                            x: UIT.dimensions.panel.x / 2 - UIT.dimensions.rightMargin - 0.1416 / 2,
+                            y: UIT.dimensions.panel.y / 2 - 0.0199,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.imageOverlayOffset
+                        }
+                    }
+                },
+                {
+                    id: "presetDefault",
+                    type: "picklistItem",
+                    label: {
+                        url: Script.resolvePath("../assets/tools/physics/presets/default-label.svg"),
+                        scale: 0.0436,
+                        localPosition: {
+                            x: -0.1416 / 2 + 0.017 + 0.0436 / 2,
+                            y: 0,
+                            z: UIT.dimensions.buttonDimensions.z / 2 + UIT.dimensions.imageOverlayOffset
+                        }
+                    },
+                    command: {
+                        method: "pickPhysicsPreset",
+                        value: "default"
+                    }
+                },
+                {
+                    id: "presetLead",
+                    type: "picklistItem",
+                    label: {
+                        url: Script.resolvePath("../assets/tools/physics/presets/lead-label.svg"),
+                        scale: 0.0243,
+                        localPosition: {
+                            x: -0.1416 / 2 + 0.017 + 0.0243 / 2,
+                            y: 0,
+                            z: UIT.dimensions.buttonDimensions.z / 2 + UIT.dimensions.imageOverlayOffset
+                        }
+                    },
+                    command: { method: "pickPhysicsPreset" }
+                },
+                {
+                    id: "presetWood",
+                    type: "picklistItem",
+                    label: {
+                        url: Script.resolvePath("../assets/tools/physics/presets/wood-label.svg"),
+                        scale: 0.0316,
+                        localPosition: {
+                            x: -0.1416 / 2 + 0.017 + 0.0316 / 2,
+                            y: 0,
+                            z: UIT.dimensions.buttonDimensions.z / 2 + UIT.dimensions.imageOverlayOffset
+                        }
+                    },
+                    command: { method: "pickPhysicsPreset" }
+                },
+                {
+                    id: "presetIce",
+                    type: "picklistItem",
+                    label: {
+                        url: Script.resolvePath("../assets/tools/physics/presets/ice-label.svg"),
+                        scale: 0.0144,
+                        localPosition: {
+                            x: -0.1416 / 2 + 0.017 + 0.0144 / 2,
+                            y: 0,
+                            z: UIT.dimensions.buttonDimensions.z / 2 + UIT.dimensions.imageOverlayOffset
+                        }
+                    },
+                    command: { method: "pickPhysicsPreset" }
+                },
+                {
+                    id: "presetRubber",
+                    type: "picklistItem",
+                    label: {
+                        url: Script.resolvePath("../assets/tools/physics/presets/rubber-label.svg"),
+                        scale: 0.0400,
+                        localPosition: {
+                            x: -0.1416 / 2 + 0.017 + 0.0400 / 2,
+                            y: 0,
+                            z: UIT.dimensions.buttonDimensions.z / 2 + UIT.dimensions.imageOverlayOffset
+                        }
+                    },
+                    command: { method: "pickPhysicsPreset" }
+                },
+                {
+                    id: "presetCotton",
+                    type: "picklistItem",
+                    label: {
+                        url: Script.resolvePath("../assets/tools/physics/presets/cotton-label.svg"),
+                        scale: 0.0393,
+                        localPosition: {
+                            x: -0.1416 / 2 + 0.017 + 0.0393 / 2,
+                            y: 0,
+                            z: UIT.dimensions.buttonDimensions.z / 2 + UIT.dimensions.imageOverlayOffset
+                        }
+                    },
+                    command: { method: "pickPhysicsPreset" }
+                },
+                {
+                    id: "presetTumbleweed",
+                    type: "picklistItem",
+                    label: {
+                        url: Script.resolvePath("../assets/tools/physics/presets/tumbleweed-label.svg"),
+                        scale: 0.0687,
+                        localPosition: {
+                            x: -0.1416 / 2 + 0.017 + 0.0687 / 2,
+                            y: 0,
+                            z: UIT.dimensions.buttonDimensions.z / 2 + UIT.dimensions.imageOverlayOffset
+                        }
+                    },
+                    command: { method: "pickPhysicsPreset" }
+                },
+                {
+                    id: "presetZeroG",
+                    type: "picklistItem",
+                    label: {
+                        url: Script.resolvePath("../assets/tools/physics/presets/zero-g-label.svg"),
+                        scale: 0.0375,
+                        localPosition: {
+                            x: -0.1416 / 2 + 0.017 + 0.0375 / 2,
+                            y: 0,
+                            z: UIT.dimensions.buttonDimensions.z / 2 + UIT.dimensions.imageOverlayOffset
+                        }
+                    },
+                    command: { method: "pickPhysicsPreset" }
+                },
+                {
+                    id: "presetBalloon",
+                    type: "picklistItem",
+                    label: {
+                        url: Script.resolvePath("../assets/tools/physics/presets/balloon-label.svg"),
+                        scale: 0.0459,
+                        localPosition: {
+                            x: -0.1416 / 2 + 0.017 + 0.0459 / 2,
+                            y: 0,
+                            z: UIT.dimensions.buttonDimensions.z / 2 + UIT.dimensions.imageOverlayOffset
+                        }
+                    },
+                    command: { method: "pickPhysicsPreset" }
+                },
+                {
+                    id: "physicsPresets",
+                    type: "picklist",
+                    properties: {
+                        dimensions: { x: 0.1416, y: 0.0280, z: UIT.dimensions.buttonDimensions.z },
+                        localPosition: {
+                            x: UIT.dimensions.panel.x / 2 - UIT.dimensions.rightMargin - 0.1416 / 2,
+                            y: 0.0480 + UIT.dimensions.footerHeight / 2,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.buttonDimensions.z / 2
+                        }
+                    },
+                    label: {
+                        url: Script.resolvePath("../assets/tools/physics/presets/default-label.svg"),
+                        scale: 0.0436,
+                        localPosition: {
+                            x: -0.1416 / 2 + 0.017 + 0.0436 / 2,
+                            y: 0,
+                            z: UIT.dimensions.buttonDimensions.z / 2 + UIT.dimensions.imageOverlayOffset
+                        }
+                    },
+                    sublabel: {
+                        url: Script.resolvePath("../assets/tools/common/down-arrow.svg"),
+                        scale: 0.0080,
+                        localPosition: {
+                            x: 0.1416 / 2 - 0.0108 - 0.0080 / 2,
+                            y: 0,
+                            z: UIT.dimensions.buttonDimensions.z / 2 + UIT.dimensions.imageOverlayOffset
+                        },
+                        color: UIT.colors.white // SVG is colored baseGrayHighlight
+                    },
+                    customLabel: {
+                        url: Script.resolvePath("../assets/tools/physics/presets/custom-label.svg"),
+                        scale: 0.0522,
+                        localPosition: {
+                            x: -0.1416 / 2 + 0.017 + 0.0522 / 2,
+                            y: 0,
+                            z: UIT.dimensions.buttonDimensions.z / 2 + UIT.dimensions.imageOverlayOffset
+                        }
+                    },
+                    setting: {
+                        key: "VREdit.physicsTool.physicsPreset",
+                        defaultValue: "presetDefault"
+                    },
+                    command: {
+                        method: "togglePhysicsPresets"
+                    },
+                    items: [
+                        "presetDefault",
+                        "presetLead",
+                        "presetWood",
+                        "presetIce",
+                        "presetRubber",
+                        "presetCotton",
+                        "presetTumbleweed",
+                        "presetZeroG",
+                        "presetBalloon"
+                    ]
+                },
+
+                {
+                    id: "gravitySlider",
+                    type: "barSlider",
+                    properties: {
+                        dimensions: { x: 0.0294, y: 0.1000, z: UIT.dimensions.buttonDimensions.z },
+                        localPosition: {
+                            x: -0.0187,
+                            y: -0.0240 + UIT.dimensions.footerHeight / 2,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.buttonDimensions.z / 2
+                        }
+                    },
+                    label: {
+                        localPosition: {
+                            x: 0,
+                            y: -0.04375,
+                            z: UIT.dimensions.buttonDimensions.z / 2 + UIT.dimensions.imageOverlayOffset
+                        },
+                        url: Script.resolvePath("../assets/tools/physics/sliders/gravity-label.svg"),
+                        scale: 0.0240
+                    },
+                    setting: {
+                        key: "VREdit.physicsTool.gravity",
+                        defaultValue: 0.5,
+                        callback: "setGravity"
+                    },
+                    command: {
+                        method: "setGravity"
+                    }
+                },
+                {
+                    id: "bounceSlider",
+                    type: "barSlider",
+                    properties: {
+                        dimensions: { x: 0.0294, y: 0.1000, z: UIT.dimensions.buttonDimensions.z },
+                        localPosition: {
+                            x: 0.0187,
+                            y: -0.0240 + UIT.dimensions.footerHeight / 2,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.buttonDimensions.z / 2
+                        }
+                    },
+                    label: {
+                        localPosition: {
+                            x: 0,
+                            y: -0.04375,
+                            z: UIT.dimensions.buttonDimensions.z / 2 + UIT.dimensions.imageOverlayOffset
+                        },
+                        url: Script.resolvePath("../assets/tools/physics/sliders/bounce-label.svg"),
+                        scale: 0.0233
+                    },
+                    setting: {
+                        key: "VREdit.physicsTool.bounce",
+                        defaultValue: 0.5,
+                        callback: "setBounce"
+                    },
+                    command: {
+                        method: "setBounce"
+                    }
+                },
+                {
+                    id: "frictionSlider",
+                    type: "barSlider",
+                    properties: {
+                        dimensions: { x: 0.0294, y: 0.1000, z: UIT.dimensions.buttonDimensions.z },
+                        localPosition: {
+                            x: 0.0561,
+                            y: -0.0240 + UIT.dimensions.footerHeight / 2,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.buttonDimensions.z / 2
+                        }
+                    },
+                    label: {
+                        localPosition: {
+                            x: 0,
+                            y: -0.04375,
+                            z: UIT.dimensions.buttonDimensions.z / 2 + UIT.dimensions.imageOverlayOffset
+                        },
+                        url: Script.resolvePath("../assets/tools/physics/sliders/friction-label.svg"),
+                        scale: 0.0258
+                    },
+                    setting: {
+                        key: "VREdit.physicsTool.friction",
+                        defaultValue: 0.5,
+                        callback: "setFriction"
+                    },
+                    command: {
+                        method: "setFriction"
+                    }
+                },
+                {
+                    id: "densitySlider",
+                    type: "barSlider",
+                    properties: {
+                        dimensions: { x: 0.0294, y: 0.1000, z: UIT.dimensions.buttonDimensions.z },
+                        localPosition: {
+                            x: 0.0935,
+                            y: -0.0240 + UIT.dimensions.footerHeight / 2,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.buttonDimensions.z / 2
+                        }
+                    },
+                    label: {
+                        localPosition: {
+                            x: 0,
+                            y: -0.04375,
+                            z: UIT.dimensions.buttonDimensions.z / 2 + UIT.dimensions.imageOverlayOffset
+                        },
+                        url: Script.resolvePath("../assets/tools/physics/sliders/density-label.svg"),
+                        scale: 0.0241
+                    },
+                    setting: {
+                        key: "VREdit.physicsTool.density",
+                        defaultValue: 0.5,
+                        callback: "setDensity"
+                    },
+                    command: {
+                        method: "setDensity"
+                    }
+                }
+            ],
+            deleteOptions: [
+                {
+                    id: "deleteActionsLabel",
+                    type: "image",
+                    properties: {
+                        color: UIT.colors.white,
+                        url: Script.resolvePath("../assets/tools/common/actions-label.svg"),
+                        scale: 0.0276,
+                        localPosition: {
+                            x: -UIT.dimensions.panel.x / 2 + UIT.dimensions.leftMargin + 0.0276 / 2,
+                            y: UIT.dimensions.panel.y / 2 - UIT.dimensions.topMargin - 0.0047 / 2,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.imageOverlayOffset
+                        }
+                    }
+                },
+                {
+                    id: "deleteRule1",
+                    type: "horizontalRule",
+                    properties: {
+                        localPosition: {
+                            x: 0,
+                            y: UIT.dimensions.panel.y / 2 - 0.0199,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.imageOverlayOffset
+                        }
+                    }
+                },
+                {
+                    id: "deleteFinishButton",
+                    type: "button",
+                    properties: {
+                        localPosition: {
+                            x: 0,
+                            y: UIT.dimensions.panel.y / 2 - 0.0280 - UIT.dimensions.buttonDimensions.y / 2,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.buttonDimensions.z / 2
+                        }
+                    },
+                    label: {
+                        url: Script.resolvePath("../assets/tools/common/finish-label.svg"),
+                        scale: 0.0318
+                    },
+                    command: {
+                        method: "clearTool"
+                    }
+                },
+                {
+                    id: "deleteRule2",
+                    type: "horizontalRule",
+                    properties: {
+                        localPosition: {
+                            x: 0,
+                            y: UIT.dimensions.panel.y / 2 - 0.1197,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.imageOverlayOffset
+                        }
+                    }
+                },
+                {
+                    id: "deleteInfoIcon",
+                    type: "image",
+                    properties: {
+                        url: Script.resolvePath("../assets/tools/common/info-icon.svg"),
+                        dimensions: { x: 0.0321, y: 0.0320 },
+                        localPosition: {
+                            x: -UIT.dimensions.panel.x / 2 + UIT.dimensions.leftMargin + 0.0321 / 2,
+                            y: -UIT.dimensions.panel.y / 2 + 0.0200 + 0.0320 / 2 + UIT.dimensions.footerHeight,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.imageOverlayOffset
+                        },
+                        color: UIT.colors.white // Icon SVG is already lightGray color.
+                    }
+                },
+                {
+                    id: "deleteInfo",
+                    type: "image",
+                    properties: {
+                        url: Script.resolvePath("../assets/tools/delete/info-text.svg"),
+                        scale: 0.1416,
+                        localPosition: { // Vertically off-center w.r.t. info icon.
+                            x: -UIT.dimensions.panel.x / 2 + 0.0679 + 0.1340 / 2,
+                            y: -UIT.dimensions.panel.y / 2 + 0.0200 + 0.0240 / 2 + 0.0063 / 2 + UIT.dimensions.footerHeight,
+                            z: UIT.dimensions.panel.z / 2 + UIT.dimensions.imageOverlayOffset
+                        },
+                        color: UIT.colors.white
+                    }
+                }
+            ]
+        },
+
+        MENU_ITEM_XS = [-0.08415, -0.02805, 0.02805, 0.08415],
+        MENU_ITEM_YS = [0.086, 0.030, -0.026, -0.082],
+
+        MENU_ITEMS = [
+            // Magic numbers per UI design spec.
+            {
+                id: "colorButton",
+                type: "menuButton",
+                properties: {
+                    localPosition: {
+                        x: MENU_ITEM_XS[0],
+                        y: MENU_ITEM_YS[0],
+                        z: UIT.dimensions.panel.z / 2 + UI_ELEMENTS.menuButton.properties.dimensions.z / 2
+                    }
+                },
+                icon: {
+                    properties: {
+                        url: Script.resolvePath("../assets/tools/color-icon.svg"),
+                        dimensions: { x: 0.0165, y: 0.0187 }
+                    },
+                    headerOffset: { x: -0.00825, y: 0.0020, z: 0 }
+                },
+                label: {
+                    properties: {
+                        url: Script.resolvePath("../assets/tools/color-label.svg"),
+                        scale: 0.0241
+                    }
+                },
+                sublabel: {
+                    properties: {
+                        url: Script.resolvePath("../assets/tools/tool-label.svg"),
+                        scale: 0.0152
+                    }
+                },
+                title: {
+                    url: Script.resolvePath("../assets/tools/color-tool-heading.svg"),
+                    scale: 0.0631
+                },
+                toolOptions: "colorOptions",
+                callback: {
+                    method: "colorTool",
+                    parameter: "currentColor.color"
+                }
+            },
+            {
+                id: "scaleButton",
+                type: "menuButton",
+                properties: {
+                    localPosition: {
+                        x: MENU_ITEM_XS[1],
+                        y: MENU_ITEM_YS[0],
+                        z: UIT.dimensions.panel.z / 2 + UI_ELEMENTS.menuButton.properties.dimensions.z / 2
+                    }
+                },
+                icon: {
+                    properties: {
+                        url: Script.resolvePath("../assets/tools/stretch-icon.svg"),
+                        dimensions: { x: 0.0167, y: 0.0167 }
+                    },
+                    headerOffset: { x: -0.00835, y: 0, z: 0 }
+                },
+                label: {
+                    properties: {
+                        url: Script.resolvePath("../assets/tools/stretch-label.svg"),
+                        scale: 0.0311
+                    }
+                },
+                sublabel: {
+                    properties: {
+                        url: Script.resolvePath("../assets/tools/tool-label.svg"),
+                        scale: 0.0152
+                    }
+                },
+                title: {
+                    url: Script.resolvePath("../assets/tools/stretch-tool-heading.svg"),
+                    scale: 0.0737
+                },
+                toolOptions: "scaleOptions",
+                callback: {
+                    method: "scaleTool"
+                }
+            },
+            {
+                id: "cloneButton",
+                type: "menuButton",
+                properties: {
+                    localPosition: {
+                        x: MENU_ITEM_XS[2],
+                        y: MENU_ITEM_YS[0],
+                        z: UIT.dimensions.panel.z / 2 + UI_ELEMENTS.menuButton.properties.dimensions.z / 2
+                    }
+                },
+                icon: {
+                    properties: {
+                        url: Script.resolvePath("../assets/tools/clone-icon.svg"),
+                        dimensions: { x: 0.0154, y: 0.0155 }
+                    },
+                    headerOffset: { x: -0.0077, y: 0, z: 0 }
+                },
+                label: {
+                    properties: {
+                        url: Script.resolvePath("../assets/tools/clone-label.svg"),
+                        scale: 0.0231
+                    }
+                },
+                sublabel: {
+                    properties: {
+                        url: Script.resolvePath("../assets/tools/tool-label.svg"),
+                        scale: 0.0152
+                    }
+                },
+                title: {
+                    url: Script.resolvePath("../assets/tools/clone-tool-heading.svg"),
+                    scale: 0.0621
+                },
+                toolOptions: "cloneOptions",
+                callback: {
+                    method: "cloneTool"
+                }
+            },
+            {
+                id: "groupButton",
+                type: "menuButton",
+                properties: {
+                    localPosition: {
+                        x: MENU_ITEM_XS[3],
+                        y: MENU_ITEM_YS[0],
+                        z: UIT.dimensions.panel.z / 2 + UI_ELEMENTS.menuButton.properties.dimensions.z / 2
+                    }
+                },
+                icon: {
+                    properties: {
+                        url: Script.resolvePath("../assets/tools/group-icon.svg"),
+                        dimensions: { x: 0.0161, y: 0.0114 }
+                    },
+                    headerOffset: { x: -0.00805, y: 0, z: 0 }
+                },
+                label: {
+                    properties: {
+                        url: Script.resolvePath("../assets/tools/group-label.svg"),
+                        scale: 0.0250
+                    }
+                },
+                sublabel: {
+                    properties: {
+                        url: Script.resolvePath("../assets/tools/tool-label.svg"),
+                        scale: 0.0152
+                    }
+                },
+                title: {
+                    url: Script.resolvePath("../assets/tools/group-tool-heading.svg"),
+                    scale: 0.0647
+                },
+                toolOptions: "groupOptions",
+                callback: {
+                    method: "groupTool"
+                }
+            },
+            {
+                id: "physicsButton",
+                type: "menuButton",
+                properties: {
+                    localPosition: {
+                        x: MENU_ITEM_XS[0],
+                        y: MENU_ITEM_YS[1],
+                        z: UIT.dimensions.panel.z / 2 + UI_ELEMENTS.menuButton.properties.dimensions.z / 2
+                    }
+                },
+                icon: {
+                    properties: {
+                        url: Script.resolvePath("../assets/tools/physics-icon.svg"),
+                        dimensions: { x: 0.0180, y: 0.0198 }
+                    },
+                    headerOffset: { x: -0.009, y: 0, z: 0 }
+                },
+                label: {
+                    properties: {
+                        url: Script.resolvePath("../assets/tools/physics-label.svg"),
+                        scale: 0.0297
+                    }
+                },
+                sublabel: {
+                    properties: {
+                        url: Script.resolvePath("../assets/tools/tool-label.svg"),
+                        scale: 0.0152
+                    }
+                },
+                title: {
+                    url: Script.resolvePath("../assets/tools/physics-tool-heading.svg"),
+                    scale: 0.0712
+                },
+                toolOptions: "physicsOptions",
+                callback: {
+                    method: "physicsTool"
+                }
+            },
+            {
+                id: "deleteButton",
+                type: "menuButton",
+                properties: {
+                    localPosition: {
+                        x: MENU_ITEM_XS[1],
+                        y: MENU_ITEM_YS[1],
+                        z: UIT.dimensions.panel.z / 2 + UI_ELEMENTS.menuButton.properties.dimensions.z / 2
+                    }
+                },
+                icon: {
+                    properties: {
+                        url: Script.resolvePath("../assets/tools/delete-icon.svg"),
+                        dimensions: { x: 0.0161, y: 0.0161 }
+                    },
+                    headerOffset: { x: -0.00805, y: 0, z: 0 }
+                },
+                label: {
+                    properties: {
+                        url: Script.resolvePath("../assets/tools/delete-label.svg"),
+                        scale: 0.0254
+                    }
+                },
+                sublabel: {
+                    properties: {
+                        url: Script.resolvePath("../assets/tools/tool-label.svg"),
+                        scale: 0.0152
+                    }
+                },
+                title: {
+                    url: Script.resolvePath("../assets/tools/delete-tool-heading.svg"),
+                    scale: 0.0653
+                },
+                toolOptions: "deleteOptions",
+                callback: {
+                    method: "deleteTool"
+                }
+            }
+        ],
+        COLOR_TOOL = 0, // Indexes of corresponding MENU_ITEMS item.
+        SCALE_TOOL = 1,
+        CLONE_TOOL = 2,
+        GROUP_TOOL = 3,
+        PHYSICS_TOOL = 4,
+        DELETE_TOOL = 5,
+
+        FOOTER_ITEMS = [
+            // Magic numbers per UI design spec.
+            {
+                id: "footerRule",
+                type: "horizontalRule",
+                properties: {
+                    localPosition: {
+                        x: 0,
+                        y: -UIT.dimensions.panel.y / 2 + 0.0600,
+                        z: UIT.dimensions.panel.z / 2 + UIT.dimensions.imageOverlayOffset
+                    }
+                }
+            },
+            {
+                id: "undoButton",
+                type: "menuButton",
+                properties: {
+                    localPosition: {
+                        x: MENU_ITEM_XS[2],
+                        y: MENU_ITEM_YS[3] - 0.008, // Allow space for horizontal rule and Line up with Create palette row.
+                        z: UIT.dimensions.panel.z / 2 + UI_ELEMENTS.menuButton.properties.dimensions.z / 2
+                    }
+                },
+                icon: {
+                    properties: {
+                        url: Script.resolvePath("../assets/tools/undo-icon.svg"),
+                        dimensions: { x: 0.0180, y: 0.0186 }
+                    }
+                },
+                label: {
+                    properties: {
+                        url: Script.resolvePath("../assets/tools/undo-label.svg"),
+                        scale: 0.0205
+                    }
+                },
+                callback: {
+                    method: "undoAction"
+                }
+            },
+            {
+                id: "redoButton",
+                type: "menuButton",
+                properties: {
+                    localPosition: {
+                        x: MENU_ITEM_XS[3],
+                        y: MENU_ITEM_YS[3] - 0.008,
+                        z: UIT.dimensions.panel.z / 2 + UI_ELEMENTS.menuButton.properties.dimensions.z / 2
+                    }
+                },
+                icon: {
+                    properties: {
+                        url: Script.resolvePath("../assets/tools/redo-icon.svg"),
+                        dimensions: { x: 0.0180, y: 0.0186 }
+                    }
+                },
+                label: {
+                    properties: {
+                        url: Script.resolvePath("../assets/tools/redo-label.svg"),
+                        scale: 0.0192
+                    }
+                },
+                callback: {
+                    method: "redoAction"
+                }
+            }
+        ],
+
+        NONE = -1,
+
+        optionsItems,
+        intersectionOverlays,
+        intersectionEnabled,
+        hoveredItem,
+        hoveredSourceOverlays,
+        hoveredSourceItems,
+        hoveredElementType = null,
+        isHoveringButtonElement,
+        isPicklistOpen,
+        pressedItem = null,
+        pressedSource = null,
+        isPicklistPressed,
+        isPicklistItemPressed,
+        isTriggerClicked,
+        wasTriggerClicked,
+        isGripClicked,
+
+        isGroupButtonEnabled,
+        isUngroupButtonEnabled,
+        isClearGroupingButtonEnabled,
+        groupButtonIndex,
+        ungroupButtonIndex,
+        clearGroupingButtonIndex,
+
+        hsvControl = {
+            hsv: { h: 0, s: 0, v: 0 },
+            circle: {},
+            slider: {}
+        },
+
+        isDisplaying = false,
+        isVisible = true,
+        isOptionsOpen = false,
+        isOptionsHeadingRaised = false,
+        optionsHeadingURL,
+        optionsHeadingScale,
+
+        otherSide,
+
+        // References.
+        controlHand,
+
+        // Forward declarations.
+        doCommand;
+
+    if (!(this instanceof ToolsMenu)) {
+        return new ToolsMenu();
+    }
+
+    function getAssetURLs() {
+        return Preload.findURLs([MENU_HEADER_HEADING_PROPERTIES, MENU_HEADER_BAR_PROPERTIES, MENU_HEADER_BACK_PROPERTIES,
+            MENU_HEADER_TITLE_PROPERTIES, MENU_HEADER_TITLE_BACK_URL, MENU_HEADER_ICON_PROPERTIES, UI_ELEMENTS,
+            PICKLIST_UP_ARROW, PICKLIST_DOWN_ARROW, OPTONS_PANELS, MENU_ITEMS, FOOTER_ITEMS]);
+    }
+
+    controlHand = side === LEFT_HAND ? rightInputs.hand() : leftInputs.hand();
+
+    function setHand(hand) {
+        // Assumes UI is not displaying.
+        var NUMBER_OF_HANDS = 2;
+        side = hand;
+        if (side === LEFT_HAND) {
+            controlHand = rightInputs.hand();
+            attachmentJointName = "LeftHand";
+            panelLateralOffset = -UIT.dimensions.handLateralOffset;
+            menuOriginLocalPosition = PANEL_ORIGIN_POSITION_LEFT_HAND;
+            menuOriginLocalRotation = PANEL_ORIGIN_ROTATION_LEFT_HAND;
+        } else {
+            controlHand = leftInputs.hand();
+            attachmentJointName = "RightHand";
+            panelLateralOffset = UIT.dimensions.handLateralOffset;
+            menuOriginLocalPosition = PANEL_ORIGIN_POSITION_RIGHT_HAND;
+            menuOriginLocalRotation = PANEL_ORIGIN_ROTATION_RIGHT_HAND;
+        }
+        otherSide = (side + 1) % NUMBER_OF_HANDS;
+    }
+
+    setHand(side);
+
+    function getOverlayIDs() {
+        return [menuHeaderOverlay, menuPanelOverlay].concat(menuOverlays).concat(optionsOverlays).concat(footerOverlays);
+    }
+
+    function getIconInfo(tool) {
+        // Provides details of tool icon, label, and sublabel images for the specified tool.
+        var sublabelProperties;
+
+        sublabelProperties = Object.clone(UI_ELEMENTS.menuButton.sublabel);
+        sublabelProperties = Object.merge(sublabelProperties, MENU_ITEMS[tool].sublabel);
+        return {
+            icon: MENU_ITEMS[tool].icon,
+            label: MENU_ITEMS[tool].label,
+            sublabel: sublabelProperties
+        };
+    }
+
+    function openMenu() {
+        var properties,
+            itemID,
+            buttonID,
+            overlayID,
+            i,
+            length;
+
+        // Update header.
+        Overlays.editOverlay(menuHeaderBackOverlay, { visible: false });
+        Overlays.editOverlay(menuHeaderTitleOverlay, {
+            url: MENU_HEADER_TITLE_PROPERTIES.url,
+            scale: MENU_HEADER_TITLE_PROPERTIES.scale
+        });
+        Overlays.editOverlay(menuHeaderIconOverlay, { visible: false });
+
+        // Display menu items.
+        for (i = 0, length = MENU_ITEMS.length; i < length; i++) {
+            properties = Object.clone(UI_ELEMENTS[MENU_ITEMS[i].type].properties);
+            properties = Object.merge(properties, MENU_ITEMS[i].properties);
+            properties.visible = isVisible;
+            properties.parentID = menuPanelOverlay;
+            itemID = Overlays.addOverlay(UI_ELEMENTS[MENU_ITEMS[i].type].overlay, properties);
+            menuOverlays[i] = itemID;
+            menuEnabled[i] = true;
+
+            // Collision overlay.
+            properties = Object.clone(UI_ELEMENTS.menuButton.hoverButton.properties);
+            properties.parentID = itemID;
+            buttonID = Overlays.addOverlay(UI_ELEMENTS.menuButton.hoverButton.overlay, properties);
+            menuHoverOverlays[i] = buttonID;
+
+            // Icon.
+            properties = Object.clone(UI_ELEMENTS[UI_ELEMENTS.menuButton.icon.type].properties);
+            properties = Object.merge(properties, UI_ELEMENTS.menuButton.icon.properties);
+            properties = Object.merge(properties, MENU_ITEMS[i].icon.properties);
+            properties.visible = isVisible;
+            properties.parentID = buttonID;
+            overlayID = Overlays.addOverlay(UI_ELEMENTS[UI_ELEMENTS.menuButton.icon.type].overlay, properties);
+            menuIconOverlays[i] = overlayID;
+
+            // Label.
+            properties = Object.clone(UI_ELEMENTS[UI_ELEMENTS.menuButton.label.type].properties);
+            properties = Object.merge(properties, UI_ELEMENTS.menuButton.label.properties);
+            properties = Object.merge(properties, MENU_ITEMS[i].label.properties);
+            properties.visible = isVisible;
+            properties.parentID = itemID;
+            overlayID = Overlays.addOverlay(UI_ELEMENTS[UI_ELEMENTS.menuButton.label.type].overlay, properties);
+            menuLabelOverlays.push(overlayID);
+
+            // Sublabel.
+            if (MENU_ITEMS[i].sublabel) {
+                properties = Object.clone(UI_ELEMENTS[UI_ELEMENTS.menuButton.sublabel.type].properties);
+                properties = Object.merge(properties, UI_ELEMENTS.menuButton.sublabel.properties);
+                properties = Object.merge(properties, MENU_ITEMS[i].sublabel.properties);
+                properties.visible = isVisible;
+                properties.parentID = itemID;
+                overlayID = Overlays.addOverlay(UI_ELEMENTS[UI_ELEMENTS.menuButton.sublabel.type].overlay, properties);
+                menuLabelOverlays.push(overlayID);
+            }
+        }
+    }
+
+    function closeMenu() {
+        var i,
+            length;
+
+        for (i = 0, length = menuOverlays.length; i < length; i++) {
+            Overlays.deleteOverlay(menuOverlays[i]);
+        }
+
+        menuOverlays = [];
+        menuHoverOverlays = [];
+        menuIconOverlays = [];
+        menuLabelOverlays = [];
+        menuEnabled = [];
+        pressedItem = null;
+    }
+
+    function openOptions(menuItem) {
+        var properties,
+            childProperties,
+            auxiliaryProperties,
+            parentID,
+            sublabelModifier,
+            value,
+            imageOffset,
+            IMAGE_OFFSET = 0.0005,
+            CIRCLE_CURSOR_SPHERE_DIMENSIONS = { x: 0.01, y: 0.01, z: 0.01 },
+            CIRCLE_CURSOR_GAP = 0.002,
+            id,
+            i,
+            length;
+
+        // Remove menu items.
+        closeMenu();
+
+        // Update header.
+        optionsHeadingURL = menuItem.title.url;
+        optionsHeadingScale = menuItem.title.scale;
+        Overlays.editOverlay(menuHeaderBackOverlay, { visible: isVisible });
+        Overlays.editOverlay(menuHeaderTitleOverlay, {
+            url: optionsHeadingURL,
+            scale: optionsHeadingScale
+        });
+        Overlays.editOverlay(menuHeaderIconOverlay, {
+            url: menuItem.icon.properties.url,
+            dimensions: menuItem.icon.properties.dimensions,
+            localPosition: Vec3.sum(MENU_HEADER_ICON_OFFSET, menuItem.icon.headerOffset),
+            visible: isVisible
+        });
+
+        // Open specified options panel.
+        optionsItems = OPTONS_PANELS[menuItem.toolOptions];
+        parentID = menuPanelOverlay;
+        for (i = 0, length = optionsItems.length; i < length; i++) {
+            properties = Object.clone(UI_ELEMENTS[optionsItems[i].type].properties);
+            if (optionsItems[i].properties) {
+                properties = Object.merge(properties, optionsItems[i].properties);
+            }
+            properties.parentID = parentID;
+            sublabelModifier = null;
+            if (optionsItems[i].setting) {
+                optionsSettings[optionsItems[i].id] = { key: optionsItems[i].setting.key };
+                value = Settings.getValue(optionsItems[i].setting.key);
+                if (value === "" && optionsItems[i].setting.defaultValue !== undefined) {
+                    value = optionsItems[i].setting.defaultValue;
+                }
+                optionsSettings[optionsItems[i].id].value = value;
+                if (value !== "") {
+                    properties[optionsItems[i].setting.property] = value;
+                    if (optionsItems[i].type === "toggleButton") {
+                        optionsToggles[optionsItems[i].id] = value;
+                        properties.color = value
+                            ? UI_ELEMENTS[optionsItems[i].type].onColor
+                            : UI_ELEMENTS[optionsItems[i].type].offColor;
+                        if (optionsItems[i].hasOwnProperty("onSublabel")) {
+                            sublabelModifier = value ? optionsItems[i].onSublabel : optionsItems[i].offSublabel;
+                        }
+                    } else if (optionsItems[i].type === "picklist") {
+                        if (value === "custom") {
+                            optionsItems[i].label = optionsItems[i].customLabel;
+                        } else {
+                            optionsItems[i].label = optionsItems[optionsOverlaysIDs.indexOf(value)].label;
+                        }
+                    }
+                    if (optionsItems[i].setting.command) {
+                        doCommand(optionsItems[i].setting.command, value);
+                    }
+                    if (optionsItems[i].setting.callback) {
+                        uiCommandCallback(optionsItems[i].setting.callback, value);
+                    }
+                }
+            } else if (optionsItems[i].type === "toggleButton") {
+                optionsToggles[optionsItems[i].id] = false; // Default to off.
+            }
+
+            optionsOverlays.push(Overlays.addOverlay(UI_ELEMENTS[optionsItems[i].type].overlay, properties));
+            optionsOverlaysIDs.push(optionsItems[i].id);
+            if (optionsItems[i].label) {
+                childProperties = Object.clone(UI_ELEMENTS.image.properties);
+                childProperties = Object.merge(childProperties, UI_ELEMENTS[optionsItems[i].type].label);
+                childProperties = Object.merge(childProperties, optionsItems[i].label);
+                childProperties.parentID = optionsOverlays[optionsOverlays.length - 1];
+                id = Overlays.addOverlay(UI_ELEMENTS.image.overlay, childProperties);
+                optionsOverlaysLabels[i] = id;
+            }
+            if (optionsItems[i].sublabel) {
+                childProperties = Object.clone(UI_ELEMENTS.image.properties);
+                childProperties = Object.merge(childProperties, UI_ELEMENTS[optionsItems[i].type].label);
+                childProperties = Object.merge(childProperties, optionsItems[i].sublabel);
+                if (sublabelModifier) {
+                    childProperties = Object.merge(childProperties, sublabelModifier);
+                }
+                childProperties.parentID = optionsOverlays[optionsOverlays.length - 1];
+                id = Overlays.addOverlay(UI_ELEMENTS.image.overlay, childProperties);
+                optionsOverlaysSublabels[i] = id;
+            }
+
+            if (optionsItems[i].type === "barSlider") {
+                // Value and remainder bars.
+                optionsSliderData[i] = {};
+                auxiliaryProperties = Object.clone(UI_ELEMENTS.barSlider.sliderValue.properties);
+                auxiliaryProperties.localPosition = { x: 0, y: (-0.5 + value / 2) * properties.dimensions.y, z: 0 };
+                auxiliaryProperties.dimensions = {
+                    x: properties.dimensions.x,
+                    y: Math.max(value * properties.dimensions.y, MIN_BAR_SLIDER_DIMENSION),
+                    z: properties.dimensions.z
+                };
+                auxiliaryProperties.parentID = optionsOverlays[optionsOverlays.length - 1];
+                optionsSliderData[i].value = Overlays.addOverlay(UI_ELEMENTS.barSlider.sliderValue.overlay,
+                    auxiliaryProperties);
+                optionsExtraOverlays.push(optionsSliderData[i].value);
+                auxiliaryProperties = Object.clone(UI_ELEMENTS.barSlider.sliderRemainder.properties);
+                auxiliaryProperties.localPosition = { x: 0, y: (0.5 - (1.0 - value) / 2) * properties.dimensions.y, z: 0 };
+                auxiliaryProperties.dimensions = {
+                    x: properties.dimensions.x,
+                    y: Math.max((1.0 - value) * properties.dimensions.y, MIN_BAR_SLIDER_DIMENSION),
+                    z: properties.dimensions.z
+                };
+                auxiliaryProperties.parentID = optionsOverlays[optionsOverlays.length - 1];
+                optionsSliderData[i].remainder = Overlays.addOverlay(UI_ELEMENTS.barSlider.sliderRemainder.overlay,
+                    auxiliaryProperties);
+                optionsExtraOverlays.push(optionsSliderData[i].remainder);
+
+                // Zero indicator.
+                childProperties = Object.clone(UI_ELEMENTS.barSlider.zeroIndicator.properties);
+                childProperties.dimensions = {
+                    x: properties.dimensions.x,
+                    y: UI_ELEMENTS.barSlider.zeroIndicator.properties.dimensions.y
+                };
+                childProperties.localPosition = {
+                    x: 0,
+                    y: 0,
+                    z: properties.dimensions.z / 2 + UIT.dimensions.imageOverlayOffset
+                };
+                childProperties.parentID = optionsOverlays[optionsOverlays.length - 1];
+                id = Overlays.addOverlay(UI_ELEMENTS.barSlider.zeroIndicator.overlay, childProperties);
+                optionsExtraOverlays.push(id);
+            }
+
+            if (optionsItems[i].type === "imageSlider") {
+                imageOffset = 0.0;
+
+                // Primary image.
+                if (optionsItems[i].imageURL) {
+                    childProperties = Object.clone(UI_ELEMENTS.image.properties);
+                    childProperties.url = optionsItems[i].imageURL;
+                    childProperties.dimensions = { x: properties.dimensions.x, y: properties.dimensions.y };
+                    imageOffset += 2 * IMAGE_OFFSET; // Double offset to prevent clipping against background.
+                    if (optionsItems[i].useBaseColor) {
+                        childProperties.color = properties.color;
+                    }
+                    childProperties.localPosition = { x: 0, y: 0, z: properties.dimensions.z / 2 + imageOffset };
+                    hsvControl.slider.localPosition = childProperties.localPosition;
+                    childProperties.parentID = optionsOverlays[optionsOverlays.length - 1];
+                    hsvControl.slider.colorOverlay = Overlays.addOverlay(UI_ELEMENTS.image.overlay, childProperties);
+                    hsvControl.slider.length = properties.dimensions.y;
+                    optionsExtraOverlays.push(hsvControl.slider.colorOverlay);
+                }
+
+                // Overlay image.
+                if (optionsItems[i].imageOverlayURL) {
+                    childProperties = Object.clone(UI_ELEMENTS.image.properties);
+                    childProperties.url = optionsItems[i].imageOverlayURL;
+                    childProperties.dimensions = { x: properties.dimensions.x, y: properties.dimensions.y };
+                    childProperties.emissive = false;
+                    imageOffset += IMAGE_OFFSET;
+                    childProperties.localPosition = { x: 0, y: 0, z: properties.dimensions.z / 2 + imageOffset };
+                    childProperties.parentID = optionsOverlays[optionsOverlays.length - 1];
+                    id = Overlays.addOverlay(UI_ELEMENTS.image.overlay, childProperties);
+                    optionsExtraOverlays.push(id);
+                }
+
+                // Value pointers.
+                optionsSliderData[i] = {};
+                optionsSliderData[i].offset =
+                    { x: -properties.dimensions.x / 2, y: 0, z: properties.dimensions.z / 2 + imageOffset };
+                auxiliaryProperties = Object.clone(UI_ELEMENTS.sliderPointer.properties);
+                auxiliaryProperties.localPosition = optionsSliderData[i].offset;
+                hsvControl.slider.localPosition = auxiliaryProperties.localPosition;
+                auxiliaryProperties.parentID = optionsOverlays[optionsOverlays.length - 1];
+                id = optionsSliderData[i].value = Overlays.addOverlay(UI_ELEMENTS.sliderPointer.overlay, auxiliaryProperties);
+                optionsExtraOverlays.push(id);
+                hsvControl.slider.pointerOverlay = optionsSliderData[i].value;
+                auxiliaryProperties.localPosition = { x: 0, y: properties.dimensions.x, z: 0 };
+                auxiliaryProperties.localRotation = Quat.fromVec3Degrees({ x: 0, y: 0, z: 180 });
+                auxiliaryProperties.parentID = optionsSliderData[i].value;
+                id = Overlays.addOverlay(UI_ELEMENTS.sliderPointer.overlay, auxiliaryProperties);
+                optionsExtraOverlays.push(id);
+            }
+
+            if (optionsItems[i].type === "colorCircle") {
+                imageOffset = 0.0;
+
+                // Primary image.
+                if (optionsItems[i].imageURL) {
+                    childProperties = Object.clone(UI_ELEMENTS.image.properties);
+                    childProperties.url = optionsItems[i].imageURL;
+                    childProperties.scale = properties.dimensions.x;
+                    imageOffset += 2 * IMAGE_OFFSET; // Double offset to prevent clipping against background.
+                    childProperties.localPosition = { x: 0, y: properties.dimensions.y / 2 + imageOffset, z: 0 };
+                    childProperties.localRotation = Quat.fromVec3Degrees({ x: -90, y: 90, z: 0 });
+                    childProperties.parentID = optionsOverlays[optionsOverlays.length - 1];
+                    id = Overlays.addOverlay(UI_ELEMENTS.image.overlay, childProperties);
+                    optionsExtraOverlays.push(id);
+                }
+
+                // Overlay image.
+                if (optionsItems[i].imageOverlayURL) {
+                    childProperties = Object.clone(UI_ELEMENTS.image.properties);
+                    childProperties.url = optionsItems[i].imageOverlayURL;
+                    childProperties.scale = properties.dimensions.x;
+                    imageOffset += IMAGE_OFFSET;
+                    childProperties.emissive = false;
+                    childProperties.localPosition = { x: 0, y: properties.dimensions.y / 2 + imageOffset, z: 0 };
+                    childProperties.localRotation = Quat.fromVec3Degrees({ x: 90, y: 90, z: 0 });
+                    childProperties.parentID = optionsOverlays[optionsOverlays.length - 1];
+                    childProperties.alpha = 0.0;
+                    hsvControl.circle.overlay = Overlays.addOverlay(UI_ELEMENTS.image.overlay, childProperties);
+                    optionsExtraOverlays.push(hsvControl.circle.overlay);
+                }
+
+                // Value pointers.
+                // Invisible sphere at target point with cones as decoration.
+                optionsColorData[i] = {};
+                optionsColorData[i].offset =
+                    { x: 0, y: properties.dimensions.y / 2 + imageOffset, z: 0 };
+                auxiliaryProperties = Object.clone(UI_ELEMENTS.sphere.properties);
+                auxiliaryProperties.dimensions = CIRCLE_CURSOR_SPHERE_DIMENSIONS;
+                auxiliaryProperties.localPosition = optionsColorData[i].offset;
+                auxiliaryProperties.parentID = optionsOverlays[optionsOverlays.length - 1];
+                auxiliaryProperties.visible = false;
+                optionsColorData[i].value = Overlays.addOverlay(UI_ELEMENTS.sphere.overlay, auxiliaryProperties);
+                hsvControl.circle.radius = childProperties.scale / 2;
+                hsvControl.circle.localPosition = auxiliaryProperties.localPosition;
+                hsvControl.circle.cursorOverlay = optionsColorData[i].value;
+
+                auxiliaryProperties = Object.clone(UI_ELEMENTS.circlePointer.properties);
+                auxiliaryProperties.parentID = optionsColorData[i].value;
+                auxiliaryProperties.localPosition =
+                    { x: -(auxiliaryProperties.dimensions.x + CIRCLE_CURSOR_GAP) / 2, y: 0, z: 0 };
+                auxiliaryProperties.localRotation = Quat.fromVec3Degrees({ x: 0, y: 90, z: -90 });
+                id = Overlays.addOverlay(UI_ELEMENTS.circlePointer.overlay, auxiliaryProperties);
+                optionsExtraOverlays.push(id);
+                auxiliaryProperties.localPosition =
+                    { x: (auxiliaryProperties.dimensions.x + CIRCLE_CURSOR_GAP) / 2, y: 0, z: 0 };
+                auxiliaryProperties.localRotation = Quat.fromVec3Degrees({ x: 0, y: 0, z: 90 });
+                id = Overlays.addOverlay(UI_ELEMENTS.circlePointer.overlay, auxiliaryProperties);
+                optionsExtraOverlays.push(id);
+                auxiliaryProperties.localPosition =
+                    { x: 0, y: 0, z: -(auxiliaryProperties.dimensions.x + CIRCLE_CURSOR_GAP) / 2 };
+                auxiliaryProperties.localRotation = Quat.fromVec3Degrees({ x: 90, y: 0, z: 0 });
+                id = Overlays.addOverlay(UI_ELEMENTS.circlePointer.overlay, auxiliaryProperties);
+                optionsExtraOverlays.push(id);
+                auxiliaryProperties.localPosition =
+                    { x: 0, y: 0, z: (auxiliaryProperties.dimensions.x + CIRCLE_CURSOR_GAP) / 2 };
+                auxiliaryProperties.localRotation = Quat.fromVec3Degrees({ x: -90, y: 0, z: 0 });
+                id = Overlays.addOverlay(UI_ELEMENTS.circlePointer.overlay, auxiliaryProperties);
+                optionsExtraOverlays.push(id);
+            }
+
+            if (optionsItems[i].type === "swatch" && swatchHighlightOverlay === null) {
+                properties = Object.clone(UI_ELEMENTS.swatchHighlight.properties);
+                properties.parentID = optionsOverlays[optionsOverlays.length - 1];
+                swatchHighlightOverlay = Overlays.addOverlay(UI_ELEMENTS.swatchHighlight.overlay, properties);
+            }
+
+            optionsEnabled.push(optionsItems[i].enabled === undefined || optionsItems[i].enabled);
+        }
+
+        // Special handling for Group options.
+        if (menuItem.toolOptions === "groupOptions") {
+            optionsEnabled[groupButtonIndex] = false;
+            optionsEnabled[ungroupButtonIndex] = false;
+            optionsEnabled[clearGroupingButtonIndex] = false;
+        }
+
+        isOptionsOpen = true;
+    }
+
+    function closeOptions() {
+        var i,
+            length;
+
+        if (swatchHighlightOverlay !== null) {
+            Overlays.deleteOverlay(swatchHighlightOverlay);
+            swatchHighlightOverlay = null;
+        }
+
+        for (i = 0, length = optionsOverlays.length; i < length; i++) {
+            Overlays.deleteOverlay(optionsOverlays[i]);
+        }
+        optionsOverlays = [];
+
+        optionsOverlaysIDs = [];
+        optionsOverlaysLabels = [];
+        optionsOverlaysSublabels = [];
+        optionsSliderData = [];
+        optionsColorData = [];
+        optionsEnabled = [];
+        optionsExtraOverlays = [];
+        optionsItems = null;
+
+        isPicklistOpen = false;
+
+        pressedItem = null;
+
+        isOptionsOpen = false;
+    }
+
+    function displayFooter() {
+        var properties,
+            itemID,
+            buttonID,
+            overlayID,
+            i,
+            length;
+
+        // Display footer items.
+        for (i = 0, length = FOOTER_ITEMS.length; i < length; i++) {
+            properties = Object.clone(UI_ELEMENTS[FOOTER_ITEMS[i].type].properties);
+            properties = Object.merge(properties, FOOTER_ITEMS[i].properties);
+            properties.visible = isVisible;
+            properties.parentID = menuPanelOverlay;
+            itemID = Overlays.addOverlay(UI_ELEMENTS[FOOTER_ITEMS[i].type].overlay, properties);
+            footerOverlays[i] = itemID;
+            footerEnabled[i] = true;
+
+            if (FOOTER_ITEMS[i].type === "menuButton") {
+                // Collision overlay.
+                properties = Object.clone(UI_ELEMENTS.menuButton.hoverButton.properties);
+                properties.parentID = itemID;
+                buttonID = Overlays.addOverlay(UI_ELEMENTS.menuButton.hoverButton.overlay, properties);
+                footerHoverOverlays[i] = buttonID;
+
+                // Icon.
+                properties = Object.clone(UI_ELEMENTS[UI_ELEMENTS.menuButton.icon.type].properties);
+                properties = Object.merge(properties, UI_ELEMENTS.menuButton.icon.properties);
+                properties = Object.merge(properties, FOOTER_ITEMS[i].icon.properties);
+                properties.visible = isVisible;
+                properties.parentID = buttonID;
+                overlayID = Overlays.addOverlay(UI_ELEMENTS[UI_ELEMENTS.menuButton.icon.type].overlay, properties);
+                footerIconOverlays[i] = overlayID;
+
+                // Label.
+                properties = Object.clone(UI_ELEMENTS[UI_ELEMENTS.menuButton.label.type].properties);
+                properties = Object.merge(properties, UI_ELEMENTS.menuButton.label.properties);
+                properties = Object.merge(properties, FOOTER_ITEMS[i].label.properties);
+                properties.visible = isVisible;
+                properties.parentID = itemID;
+                overlayID = Overlays.addOverlay(UI_ELEMENTS[UI_ELEMENTS.menuButton.label.type].overlay, properties);
+                footerLabelOverlays.push(overlayID);
+            }
+        }
+    }
+
+    function clearTool() {
+        closeOptions();
+        openMenu();
+    }
+
+    function setPresetsLabelToCustom() {
+        var label;
+        if (optionsSettings.physicsPresets.value !== "custom") {
+            optionsSettings.physicsPresets.value = "custom";
+            label = optionsItems[optionsOverlaysIDs.indexOf("physicsPresets")].customLabel;
+            Overlays.editOverlay(optionsOverlaysLabels[optionsOverlaysIDs.indexOf("physicsPresets")], {
+                url: label.url,
+                scale: label.scale,
+                localPosition: label.localPosition
+            });
+            Settings.setValue(optionsSettings.physicsPresets.key, "custom");
+        }
+    }
+
+    function setBarSliderValue(item, fraction) {
+        var overlayDimensions,
+            otherFraction;
+
+        overlayDimensions = optionsItems[item].properties.dimensions;
+        if (overlayDimensions === undefined) {
+            overlayDimensions = UI_ELEMENTS.barSlider.properties.dimensions;
+        }
+
+        otherFraction = 1.0 - fraction;
+
+        Overlays.editOverlay(optionsSliderData[item].value, {
+            localPosition: { x: 0, y: (-0.5 + fraction / 2) * overlayDimensions.y, z: 0 },
+            dimensions: {
+                x: overlayDimensions.x,
+                y: Math.max(fraction * overlayDimensions.y, MIN_BAR_SLIDER_DIMENSION),
+                z: overlayDimensions.z
+            }
+        });
+        Overlays.editOverlay(optionsSliderData[item].remainder, {
+            localPosition: { x: 0, y: (0.5 - otherFraction / 2) * overlayDimensions.y, z: 0 },
+            dimensions: {
+                x: overlayDimensions.x,
+                y: Math.max(otherFraction * overlayDimensions.y, MIN_BAR_SLIDER_DIMENSION),
+                z: overlayDimensions.z
+            }
+        });
+    }
+
+    function hsvToRGB(hsv) {
+        // https://en.wikipedia.org/wiki/HSL_and_HSV
+        var c, h, x, rgb, m;
+
+        c = hsv.v * hsv.s;
+        h = hsv.h * 6.0;
+        x = c * (1 - Math.abs(h % 2 - 1));
+        if (0 <= h && h <= 1) {
+            rgb = { red: c, green: x, blue: 0 };
+        } else if (1 < h && h <= 2) {
+            rgb = { red: x, green: c, blue: 0 };
+        } else if (2 < h && h <= 3) {
+            rgb = { red: 0, green: c, blue: x };
+        } else if (3 < h && h <= 4) {
+            rgb = { red: 0, green: x, blue: c };
+        } else if (4 < h && h <= 5) {
+            rgb = { red: x, green: 0, blue: c };
+        } else {
+            rgb = { red: c, green: 0, blue: x };
+        }
+        m = hsv.v - c;
+        rgb = {
+            red: Math.round((rgb.red + m) * 255),
+            green: Math.round((rgb.green + m) * 255),
+            blue: Math.round((rgb.blue + m) * 255)
+        };
+        return rgb;
+    }
+
+    function rgbToHSV(rgb) {
+        // https://en.wikipedia.org/wiki/HSL_and_HSV
+        var mMax, mMin, c, h, v, s;
+
+        mMax = Math.max(rgb.red, rgb.green, rgb.blue);
+        mMin = Math.min(rgb.red, rgb.green, rgb.blue);
+        c = mMax - mMin;
+
+        if (c === 0) {
+            h = 0;
+        } else if (mMax === rgb.red) {
+            h = ((rgb.green - rgb.blue) / c) % 6;
+        } else if (mMax === rgb.green) {
+            h = (rgb.blue - rgb.red) / c + 2;
+        } else {
+            h = (rgb.red - rgb.green) / c + 4;
+        }
+        h = h / 6;
+        v = mMax / 255;
+        s = v === 0 ? 0 : c / mMax;
+        return { h: h, s: s, v: v };
+    }
+
+    function updateColorCircle() {
+        var theta, r, x, y;
+
+        // V overlay alpha per v.
+        Overlays.editOverlay(hsvControl.circle.overlay, { alpha: 1.0 - hsvControl.hsv.v });
+
+        // Cursor position per h & s.
+        theta = 2 * Math.PI * hsvControl.hsv.h;
+        r = hsvControl.hsv.s * hsvControl.circle.radius;
+        x = r * Math.cos(theta);
+        y = r * Math.sin(theta);
+        Overlays.editOverlay(hsvControl.circle.cursorOverlay, {
+            // Coordinates based on rotate cylinder entity. TODO: Use FBX model instead of cylinder entity.
+            localPosition: { x: -y, y: hsvControl.circle.localPosition.y, z: -x }
+        });
+    }
+
+    function updateColorSlider() {
+        // Base color per h & s.
+        Overlays.editOverlay(hsvControl.slider.colorOverlay, {
+            color: hsvToRGB({ h: hsvControl.hsv.h, s: hsvControl.hsv.s, v: 1.0 })
+        });
+
+        // Slider position per v.
+        Overlays.editOverlay(hsvControl.slider.pointerOverlay, {
+            localPosition: {
+                x: hsvControl.slider.localPosition.x,
+                y: (hsvControl.hsv.v - 0.5) * hsvControl.slider.length,
+                z: hsvControl.slider.localPosition.z
+            }
+        });
+    }
+
+    function setColorPicker(rgb) {
+        hsvControl.hsv = rgbToHSV(rgb);
+        updateColorCircle();
+        updateColorSlider();
+    }
+
+    function setCurrentColor(rgb) {
+        Overlays.editOverlay(optionsOverlays[optionsOverlaysIDs.indexOf("currentColor")], {
+            color: rgb
+        });
+        if (optionsSettings.currentColor) {
+            optionsSettings.currentColor.value = rgb;
+            Settings.setValue(optionsSettings.currentColor.key, rgb);
+        }
+    }
+
+    function evaluateParameter(parameter) {
+        var parameters,
+            overlayID,
+            overlayProperty;
+
+        parameters = parameter.split(".");
+        overlayID = parameters[0];
+        overlayProperty = parameters[1];
+
+        return Overlays.getProperty(optionsOverlays[optionsOverlaysIDs.indexOf(overlayID)], overlayProperty);
+    }
+
+    doCommand = function (command, parameter) {
+        var index,
+            value,
+            properties,
+            items,
+            parentID,
+            label,
+            values,
+            isHighlightingPicklist,
+            i,
+            length;
+
+        switch (command) {
+
+            case "setPickColor":
+                setColorPicker(parameter);
+                break;
+
+            case "setColorPerCircle":
+                hsvControl.hsv.h = parameter.h;
+                hsvControl.hsv.s = parameter.s;
+                updateColorSlider();
+                value = hsvToRGB(hsvControl.hsv);
+                setCurrentColor(value);
+                uiCommandCallback("setColor", value);
+                break;
+
+            case "setColorPerSlider":
+                hsvControl.hsv.v = parameter;
+                updateColorCircle();
+                value = hsvToRGB(hsvControl.hsv);
+                setCurrentColor(value);
+                uiCommandCallback("setColor", value);
+                break;
+
+            case "setColorPerSwatch":
+                index = optionsOverlaysIDs.indexOf(parameter);
+                value = optionsSettings[parameter].value;
+                if (value !== "") {
+                    // Set current color to swatch color.
+                    setCurrentColor(value);
+                    setColorPicker(value);
+                    uiCommandCallback("setColor", value);
+                } else {
+                    // Swatch has no color; set swatch color to current color.
+                    value = optionsSettings.currentColor.value;
+                    Overlays.editOverlay(optionsOverlays[index], {
+                        color: value
+                    });
+                    optionsSettings[parameter].value = value;
+                    Settings.setValue(optionsSettings[parameter].key, value);
+                }
+                break;
+
+            case "togglePickColor":
+                optionsToggles.pickColor = !optionsToggles.pickColor;
+                index = optionsOverlaysIDs.indexOf("pickColor");
+                Overlays.editOverlay(optionsOverlays[index], {
+                    color: optionsToggles.pickColor
+                        ? UI_ELEMENTS[optionsItems[index].type].onHoverColor
+                        : UI_ELEMENTS[optionsItems[index].type].offHoverColor
+                });
+                uiCommandCallback("pickColorTool", optionsToggles.pickColor);
+                break;
+
+            case "setColorFromPick":
+                optionsToggles.pickColor = false;
+                index = optionsOverlaysIDs.indexOf("pickColor");
+                Overlays.editOverlay(optionsOverlays[index], {
+                    color: UI_ELEMENTS[optionsItems[index].type].offColor
+                });
+                setCurrentColor(parameter);
+                setColorPicker(parameter);
+                break;
+
+            case "toggleGroupSelectionBox":
+                optionsToggles.groupSelectionBoxButton = !optionsToggles.groupSelectionBoxButton;
+                index = optionsOverlaysIDs.indexOf("groupSelectionBoxButton");
+                Overlays.editOverlay(optionsOverlays[index], {
+                    color: optionsToggles.groupSelectionBoxButton
+                        ? UI_ELEMENTS[optionsItems[index].type].onHoverColor
+                        : UI_ELEMENTS[optionsItems[index].type].offHoverColor
+                });
+                uiCommandCallback("toggleGroupSelectionBoxTool", optionsToggles.groupSelectionBoxButton);
+                break;
+
+            case "clearGroupSelection":
+                index = clearGroupingButtonIndex;
+                Overlays.editOverlay(optionsOverlays[index], {
+                    color: optionsItems[index].properties.color
+                });
+                Overlays.editOverlay(optionsOverlaysLabels[index], {
+                    color: optionsItems[index].label.color
+                });
+                optionsEnabled[index] = false;
+                uiCommandCallback("clearGroupSelectionTool");
+                break;
+
+            case "setGravityOn":
+            case "setGrabOn":
+            case "setCollideOn":
+                value = !optionsSettings[parameter].value;
+                optionsSettings[parameter].value = value;
+                optionsToggles[parameter] = value;
+                Settings.setValue(optionsSettings[parameter].key, value);
+                index = optionsOverlaysIDs.indexOf(parameter);
+                Overlays.editOverlay(optionsOverlays[index], {
+                    color: value
+                        ? UI_ELEMENTS[optionsItems[index].type].onHoverColor
+                        : UI_ELEMENTS[optionsItems[index].type].offHoverColor
+                });
+                properties = Object.clone(value ? optionsItems[index].onSublabel : optionsItems[index].offSublabel);
+                Overlays.editOverlay(optionsOverlaysSublabels[index], properties);
+                uiCommandCallback(command, value);
+                break;
+
+            case "togglePhysicsPresets":
+                if (isPicklistOpen) {
+                    // Close picklist.
+                    index = optionsOverlaysIDs.indexOf("physicsPresets");
+
+                    // Lower picklist.
+                    isHighlightingPicklist = hoveredElementType === "picklist";
+                    Overlays.editOverlay(optionsOverlays[index], {
+                        localPosition: isHighlightingPicklist
+                            ? Vec3.sum(optionsItems[index].properties.localPosition, OPTION_HOVER_DELTA)
+                            : optionsItems[index].properties.localPosition,
+                        color: isHighlightingPicklist
+                            ? UIT.colors.highlightColor
+                            : UI_ELEMENTS.picklist.properties.color
+                    });
+                    Overlays.editOverlay(optionsOverlaysSublabels[index], {
+                        url: PICKLIST_DOWN_ARROW
+                    });
+
+                    // Hide options.
+                    items = optionsItems[index].items;
+                    for (i = 0, length = items.length; i < length; i++) {
+                        index = optionsOverlaysIDs.indexOf(items[i]);
+                        Overlays.editOverlay(optionsOverlays[index], {
+                            localPosition: Vec3.ZERO,
+                            visible: false
+                        });
+                        Overlays.editOverlay(optionsOverlaysLabels[index], {
+                            visible: false
+                        });
+                    }
+                }
+
+                isPicklistOpen = !isPicklistOpen;
+
+                if (isPicklistOpen) {
+                    // Open picklist.
+                    index = optionsOverlaysIDs.indexOf("physicsPresets");
+                    parentID = optionsOverlays[index];
+
+                    // Raise picklist.
+                    Overlays.editOverlay(parentID, {
+                        localPosition: Vec3.sum(optionsItems[index].properties.localPosition, PICKLIST_HOVER_DELTA)
+                    });
+                    Overlays.editOverlay(optionsOverlaysSublabels[index], {
+                        url: PICKLIST_UP_ARROW
+                    });
+
+                    // Show options.
+                    items = optionsItems[index].items;
+                    for (i = 0, length = items.length; i < length; i++) {
+                        index = optionsOverlaysIDs.indexOf(items[i]);
+                        Overlays.editOverlay(optionsOverlays[index], {
+                            parentID: parentID,
+                            localPosition: { x: 0, y: (i + 1) * UI_ELEMENTS.picklistItem.properties.dimensions.y, z: 0 },
+                            visible: true
+                        });
+                        Overlays.editOverlay(optionsOverlaysLabels[index], {
+                            visible: true
+                        });
+                    }
+                }
+                break;
+
+            case "pickPhysicsPreset":
+                // Close picklist.
+                doCommand("togglePhysicsPresets");
+
+                // Update picklist label.
+                label = optionsItems[optionsOverlaysIDs.indexOf(parameter)].label;
+                Overlays.editOverlay(optionsOverlaysLabels[optionsOverlaysIDs.indexOf("physicsPresets")], {
+                    url: label.url,
+                    scale: label.scale,
+                    localPosition: label.localPosition
+                });
+                optionsSettings.physicsPresets.value = parameter;
+                Settings.setValue(optionsSettings.physicsPresets.key, parameter);
+
+                // Update sliders.
+                values = PHYSICS_SLIDER_PRESETS[parameter];
+                setBarSliderValue(optionsOverlaysIDs.indexOf("gravitySlider"), values.gravity);
+                Settings.setValue(optionsSettings.gravitySlider.key, values.gravity);
+                uiCommandCallback("setGravity", values.gravity);
+                setBarSliderValue(optionsOverlaysIDs.indexOf("bounceSlider"), values.bounce);
+                Settings.setValue(optionsSettings.bounceSlider.key, values.bounce);
+                uiCommandCallback("setBounce", values.bounce);
+                setBarSliderValue(optionsOverlaysIDs.indexOf("frictionSlider"), values.friction);
+                Settings.setValue(optionsSettings.frictionSlider.key, values.friction);
+                uiCommandCallback("setFriction", values.friction);
+                setBarSliderValue(optionsOverlaysIDs.indexOf("densitySlider"), values.density);
+                Settings.setValue(optionsSettings.densitySlider.key, values.density);
+                uiCommandCallback("setDensity", values.density);
+
+                break;
+
+            case "setGravity":
+                setPresetsLabelToCustom();
+                Settings.setValue(optionsSettings.gravitySlider.key, parameter);
+                uiCommandCallback("setGravity", parameter);
+                break;
+            case "setBounce":
+                setPresetsLabelToCustom();
+                Settings.setValue(optionsSettings.bounceSlider.key, parameter);
+                uiCommandCallback("setBounce", parameter);
+                break;
+            case "setFriction":
+                setPresetsLabelToCustom();
+                Settings.setValue(optionsSettings.frictionSlider.key, parameter);
+                uiCommandCallback("setFriction", parameter);
+                break;
+            case "setDensity":
+                setPresetsLabelToCustom();
+                Settings.setValue(optionsSettings.densitySlider.key, parameter);
+                uiCommandCallback("setDensity", parameter);
+                break;
+
+            case "closeOptions":
+                closeOptions();
+                openMenu();
+                break;
+
+            case "clearTool":
+                uiCommandCallback("clearTool");
+                break;
+
+            default:
+                App.log(side, "ERROR: ToolsMenu: Unexpected command! " + command);
+        }
+    };
+
+    function doGripClicked(command, parameter) {
+        switch (command) {
+            case "clearSwatch":
+                // Remove highlight ring and change swatch to current color.
+                Overlays.editOverlay(swatchHighlightOverlay, { visible: false });
+                Overlays.editOverlay(optionsOverlays[optionsOverlaysIDs.indexOf(parameter)], {
+                    color: optionsSettings.currentColor.value,
+                    dimensions: UI_ELEMENTS.swatch.properties.dimensions
+                });
+                optionsSettings[parameter].value = ""; // Emulate Settings.getValue() returning "" for nonexistent setting.
+                Settings.setValue(optionsSettings[parameter].key, null); // Delete settings value.
+                break;
+            default:
+                App.log(side, "ERROR: ToolsMenu: Unexpected command! " + command);
+        }
+    }
+
+    function adjustSliderFraction(fraction) {
+        // Makes slider values achieve and saturate at 0.0 and 1.0.
+        return Math.min(1.0, Math.max(0.0, fraction * 1.01 - 0.005));
+    }
+
+    function setVisible(visible) {
+        var i,
+            length;
+
+        for (i = 0, length = staticOverlays.length; i < length; i++) {
+            Overlays.editOverlay(staticOverlays[i], { visible: visible });
+        }
+
+        if (isOptionsOpen) {
+            Overlays.editOverlay(menuHeaderBackOverlay, { visible: visible });
+            Overlays.editOverlay(menuHeaderIconOverlay, { visible: visible });
+            for (i = 0, length = optionsOverlays.length; i < length; i++) {
+                Overlays.editOverlay(optionsOverlays[i], { visible: visible });
+            }
+            for (i = 0, length = optionsOverlaysLabels.length; i < length; i++) {
+                Overlays.editOverlay(optionsOverlaysLabels[i], { visible: visible });
+            }
+            for (i = 0, length = optionsOverlaysSublabels.length; i < length; i++) {
+                Overlays.editOverlay(optionsOverlaysSublabels[i], { visible: visible });
+            }
+            for (i = 0, length = optionsExtraOverlays.length; i < length; i++) {
+                Overlays.editOverlay(optionsExtraOverlays[i], { visible: visible });
+            }
+        } else {
+            for (i = 0, length = menuOverlays.length; i < length; i++) {
+                Overlays.editOverlay(menuOverlays[i], { visible: visible });
+            }
+            for (i = 0, length = menuIconOverlays.length; i < length; i++) {
+                Overlays.editOverlay(menuIconOverlays[i], { visible: visible });
+            }
+            for (i = 0, length = menuLabelOverlays.length; i < length; i++) {
+                Overlays.editOverlay(menuLabelOverlays[i], { visible: visible });
+            }
+            if (!visible) {
+                for (i = 0, length = menuHoverOverlays.length; i < length; i++) {
+                    Overlays.editOverlay(menuHoverOverlays[i], { visible: false });
+                }
+            }
+        }
+
+        for (i = 0, length = footerOverlays.length; i < length; i++) {
+            Overlays.editOverlay(footerOverlays[i], { visible: visible });
+        }
+        for (i = 0, length = footerIconOverlays.length; i < length; i++) {
+            Overlays.editOverlay(footerIconOverlays[i], { visible: visible });
+        }
+        for (i = 0, length = footerLabelOverlays.length; i < length; i++) {
+            Overlays.editOverlay(footerLabelOverlays[i], { visible: visible });
+        }
+        if (!visible) {
+            for (i = 0, length = footerHoverOverlays.length; i < length; i++) {
+                Overlays.editOverlay(footerHoverOverlays[i], { visible: false });
+            }
+        }
+
+        isVisible = visible;
+    }
+
+    function update(intersection, groupsCount, entitiesCount) {
+        var intersectedItem = NONE,
+            intersectionItems,
+            menuButtonHoverOverlays,
+            menuButtonIconOverlays,
+            color,
+            localPosition,
+            parameter,
+            parameterValue,
+            enableGroupButton,
+            enableUngroupButton,
+            enableClearGroupingButton,
+            sliderProperties,
+            overlayDimensions,
+            basePoint,
+            fraction,
+            delta,
+            radius,
+            x,
+            y,
+            s,
+            h;
+
+        isTriggerClicked = controlHand.triggerClicked();
+
+        // Handle heading.
+        if (isOptionsOpen && intersection.overlayID === menuHeaderOverlay) {
+            if (isTriggerClicked && !wasTriggerClicked) {
+                // Lower and unhighlight heading; go back to Tools menu.
+                Overlays.editOverlay(menuHeaderHeadingOverlay, {
+                    url: MENU_HEADER_HEADING_PROPERTIES.url,
+                    localPosition: MENU_HEADER_HEADING_PROPERTIES.localPosition,
+                    emissive: false
+                });
+                isOptionsHeadingRaised = false;
+                doCommand("clearTool");
+            } else if (!isOptionsHeadingRaised) {
+                // Hover heading.
+                Feedback.play(otherSide, Feedback.HOVER_BUTTON);
+                Overlays.editOverlay(menuHeaderHeadingOverlay, {
+                    url: MENU_HEADER_HEADING_PROPERTIES.highlightURL,
+                    localPosition: Vec3.sum(MENU_HEADER_HEADING_PROPERTIES.localPosition, MENU_HEADER_HOVER_OFFSET),
+                    emissive: true // TODO: This has no effect.
+                });
+                Overlays.editOverlay(menuHeaderBackOverlay, {
+                    color: UIT.colors.white
+                });
+                Overlays.editOverlay(menuHeaderTitleOverlay, {
+                    url: MENU_HEADER_TITLE_BACK_URL,
+                    scale: MENU_HEADER_TITLE_BACK_SCALE
+                });
+                Overlays.editOverlay(menuHeaderIconOverlay, {
+                    visible: false
+                });
+                isOptionsHeadingRaised = true;
+            }
+        } else {
+            if (isOptionsHeadingRaised) {
+                // Unhover heading.
+                Overlays.editOverlay(menuHeaderHeadingOverlay, {
+                    url: MENU_HEADER_HEADING_PROPERTIES.url,
+                    localPosition: MENU_HEADER_HEADING_PROPERTIES.localPosition,
+                    emissive: false
+                });
+                Overlays.editOverlay(menuHeaderBackOverlay, {
+                    color: MENU_HEADER_BACK_PROPERTIES.color
+                });
+                Overlays.editOverlay(menuHeaderTitleOverlay, {
+                    url: optionsHeadingURL,
+                    scale: optionsHeadingScale
+                });
+                Overlays.editOverlay(menuHeaderIconOverlay, {
+                    visible: isVisible
+                });
+                isOptionsHeadingRaised = false;
+            }
+        }
+
+        // Intersection details for menus and options.
+        intersectionOverlays = null;
+        intersectionEnabled = null;
+        if (intersection.overlayID) {
+            intersectedItem = menuOverlays.indexOf(intersection.overlayID);
+            if (intersectedItem !== NONE) {
+                intersectionItems = MENU_ITEMS;
+                intersectionOverlays = menuOverlays;
+                intersectionEnabled = menuEnabled;
+            } else {
+                intersectedItem = optionsOverlays.indexOf(intersection.overlayID);
+                if (intersectedItem !== NONE) {
+                    intersectionItems = optionsItems;
+                    intersectionOverlays = optionsOverlays;
+                    intersectionEnabled = optionsEnabled;
+                } else {
+                    intersectedItem = footerOverlays.indexOf(intersection.overlayID);
+                    if (intersectedItem !== NONE) {
+                        intersectionItems = FOOTER_ITEMS;
+                        intersectionOverlays = footerOverlays;
+                        intersectionEnabled = footerEnabled;
+                    }
+                }
+            }
+        }
+
+        // Hover clickable item.
+        if (intersectedItem !== hoveredItem || intersectionOverlays !== hoveredSourceOverlays) {
+
+            if (hoveredItem !== NONE) {
+                // Unhover old item.
+                switch (hoveredElementType) {
+                    case "menuButton":
+                        if (hoveredSourceOverlays === menuOverlays) {
+                            menuButtonHoverOverlays = menuHoverOverlays;
+                            menuButtonIconOverlays = menuIconOverlays;
+                        } else {
+                            menuButtonHoverOverlays = footerHoverOverlays;
+                            menuButtonIconOverlays = footerIconOverlays;
+                        }
+                        Overlays.editOverlay(menuButtonHoverOverlays[hoveredItem], {
+                            localPosition: UI_ELEMENTS.menuButton.hoverButton.properties.localPosition,
+                            visible: false
+                        });
+                        Overlays.editOverlay(menuButtonIconOverlays[hoveredItem], {
+                            color: UI_ELEMENTS.menuButton.icon.properties.color
+                        });
+                        break;
+                    case "button":
+                        if (hoveredSourceItems[hoveredItem].enabledColor !== undefined && optionsEnabled[hoveredItem]) {
+                            color = hoveredSourceItems[hoveredItem].enabledColor;
+                        } else {
+                            color = hoveredSourceItems[hoveredItem].properties.color !== undefined
+                                ? hoveredSourceItems[hoveredItem].properties.color
+                                : UI_ELEMENTS.button.properties.color;
+                        }
+                        Overlays.editOverlay(hoveredSourceOverlays[hoveredItem], {
+                            color: color,
+                            localPosition: hoveredSourceItems[hoveredItem].properties.localPosition
+                        });
+                        break;
+                    case "toggleButton":
+                        color = optionsToggles[hoveredSourceItems[hoveredItem].id]
+                            ? UI_ELEMENTS.toggleButton.onColor
+                            : UI_ELEMENTS.toggleButton.offColor;
+                        Overlays.editOverlay(hoveredSourceOverlays[hoveredItem], {
+                            color: color,
+                            localPosition: hoveredSourceItems[hoveredItem].properties.localPosition
+                        });
+                        break;
+                    case "swatch":
+                        Overlays.editOverlay(swatchHighlightOverlay, { visible: false });
+                        color = optionsSettings[hoveredSourceItems[hoveredItem].id].value;
+                        Overlays.editOverlay(hoveredSourceOverlays[hoveredItem], {
+                            dimensions: UI_ELEMENTS.swatch.properties.dimensions,
+                            color: color === "" ? EMPTY_SWATCH_COLOR : color,
+                            localPosition: hoveredSourceItems[hoveredItem].properties.localPosition
+                        });
+                        break;
+                    case "barSlider":
+                    case "imageSlider":
+                    case "colorCircle":
+                        // Lower old slider or color circle.
+                        Overlays.editOverlay(hoveredSourceOverlays[hoveredItem], {
+                            localPosition: hoveredSourceItems[hoveredItem].properties.localPosition
+                        });
+                        break;
+                    case "picklist":
+                        if (hoveredSourceItems[hoveredItem].type !== "picklistItem" && !isPicklistOpen) {
+                            Overlays.editOverlay(hoveredSourceOverlays[hoveredItem], {
+                                localPosition: hoveredSourceItems[hoveredItem].properties.localPosition,
+                                color: UI_ELEMENTS.picklist.properties.color
+                            });
+                        } else {
+                            Overlays.editOverlay(hoveredSourceOverlays[hoveredItem], {
+                                color: UIT.colors.darkGray
+                            });
+                        }
+                        break;
+                    case "picklistItem":
+                        Overlays.editOverlay(hoveredSourceOverlays[hoveredItem], {
+                            color: UI_ELEMENTS.picklistItem.properties.color
+                        });
+                        break;
+                    case null:
+                        // Nothing to do.
+                        break;
+                    default:
+                        App.log(side, "ERROR: ToolsMenu: Unexpected hover item! " + hoveredElementType);
+                }
+
+                // Update status variables.
+                hoveredItem = NONE;
+                isHoveringButtonElement = false;
+                hoveredElementType = null;
+            }
+
+            if (intersectedItem !== NONE && intersectionItems[intersectedItem] &&
+                    (intersectionItems[intersectedItem].command !== undefined
+                    || intersectionItems[intersectedItem].callback !== undefined)) {
+
+                // Update status variables.
+                hoveredItem = intersectedItem;
+                isHoveringButtonElement = BUTTON_UI_ELEMENTS.indexOf(intersectionItems[hoveredItem].type) !== NONE;
+                hoveredElementType = intersectionItems[hoveredItem].type;
+
+                // Hover new item.
+                switch (hoveredElementType) {
+                    case "menuButton":
+                        Feedback.play(otherSide, Feedback.HOVER_MENU_ITEM);
+                        if (intersectionOverlays === menuOverlays) {
+                            menuButtonHoverOverlays = menuHoverOverlays;
+                            menuButtonIconOverlays = menuIconOverlays;
+                        } else {
+                            menuButtonHoverOverlays = footerHoverOverlays;
+                            menuButtonIconOverlays = footerIconOverlays;
+                        }
+                        Overlays.editOverlay(menuButtonHoverOverlays[hoveredItem], {
+                            localPosition: Vec3.sum(UI_ELEMENTS.menuButton.hoverButton.properties.localPosition,
+                                MENU_HOVER_DELTA),
+                            visible: true
+                        });
+                        Overlays.editOverlay(menuButtonIconOverlays[hoveredItem], {
+                            color: UI_ELEMENTS.menuButton.icon.highlightColor
+                        });
+                        break;
+                    case "button":
+                        if (intersectionEnabled[hoveredItem]) {
+                            Feedback.play(otherSide, Feedback.HOVER_BUTTON);
+                            localPosition = intersectionItems[hoveredItem].properties.localPosition;
+                            Overlays.editOverlay(intersectionOverlays[hoveredItem], {
+                                color: intersectionItems[hoveredItem].highlightColor !== undefined
+                                    ? intersectionItems[hoveredItem].highlightColor
+                                    : UIT.colors.greenHighlight,
+                                localPosition: Vec3.sum(localPosition, OPTION_HOVER_DELTA)
+                            });
+                        }
+                        break;
+                    case "toggleButton":
+                        if (intersectionEnabled[hoveredItem]) {
+                            Feedback.play(otherSide, Feedback.HOVER_BUTTON);
+                            localPosition = intersectionItems[hoveredItem].properties.localPosition;
+                            Overlays.editOverlay(intersectionOverlays[hoveredItem], {
+                                color: optionsToggles[intersectionItems[hoveredItem].id]
+                                    ? UI_ELEMENTS.toggleButton.onHoverColor
+                                    : UI_ELEMENTS.toggleButton.offHoverColor,
+                                localPosition: Vec3.sum(localPosition, OPTION_HOVER_DELTA)
+                            });
+                        }
+                        break;
+                    case "swatch":
+                        Feedback.play(otherSide, Feedback.HOVER_BUTTON);
+                        localPosition = intersectionItems[hoveredItem].properties.localPosition;
+                        if (optionsSettings[intersectionItems[hoveredItem].id].value === "") {
+                            // Swatch is empty; highlight it with current color.
+                            Overlays.editOverlay(intersectionOverlays[hoveredItem], {
+                                color: optionsSettings.currentColor.value,
+                                localPosition: Vec3.sum(localPosition, OPTION_HOVER_DELTA)
+                            });
+                        } else {
+                            // Swatch is full; highlight it with ring.
+                            Overlays.editOverlay(intersectionOverlays[hoveredItem], {
+                                dimensions: Vec3.subtract(UI_ELEMENTS.swatch.properties.dimensions,
+                                    { x: SWATCH_HIGHLIGHT_DELTA, y: 0, z: SWATCH_HIGHLIGHT_DELTA }),
+                                localPosition: Vec3.sum(localPosition, OPTION_HOVER_DELTA)
+                            });
+                            Overlays.editOverlay(swatchHighlightOverlay, {
+                                parentID: intersectionOverlays[hoveredItem],
+                                localPosition: UI_ELEMENTS.swatchHighlight.properties.localPosition,
+                                visible: true
+                            });
+                        }
+                        break;
+                    case "barSlider":
+                    case "imageSlider":
+                    case "colorCircle":
+                        Feedback.play(otherSide, Feedback.HOVER_BUTTON);
+                        localPosition = intersectionItems[hoveredItem].properties.localPosition;
+                        Overlays.editOverlay(intersectionOverlays[hoveredItem], {
+                            localPosition: Vec3.sum(localPosition, OPTION_HOVER_DELTA)
+                        });
+                        break;
+                    case "picklist":
+                        Feedback.play(otherSide, Feedback.HOVER_BUTTON);
+                        if (!isPicklistOpen) {
+                            localPosition = intersectionItems[hoveredItem].properties.localPosition;
+                            Overlays.editOverlay(intersectionOverlays[hoveredItem], {
+                                localPosition: Vec3.sum(localPosition, OPTION_HOVER_DELTA),
+                                color: UIT.colors.greenHighlight
+                            });
+                        } else {
+                            Overlays.editOverlay(intersectionOverlays[hoveredItem], {
+                                color: UIT.colors.greenHighlight
+                            });
+                        }
+                        break;
+                    case "picklistItem":
+                        Feedback.play(otherSide, Feedback.HOVER_BUTTON);
+                        Overlays.editOverlay(intersectionOverlays[hoveredItem], {
+                            color: UIT.colors.greenHighlight
+                        });
+                        break;
+                    case null:
+                        // Nothing to do.
+                        break;
+                    default:
+                        App.log(side, "ERROR: ToolsMenu: Unexpected hover item! " + hoveredElementType);
+                }
+            }
+
+            hoveredSourceOverlays = intersectionOverlays;
+            hoveredSourceItems = intersectionItems;
+        }
+
+        // Press/unpress button.
+        if ((pressedItem && intersectedItem !== pressedItem.index) || intersectionOverlays !== pressedSource
+                || isTriggerClicked !== (pressedItem !== null)) {
+            if (pressedItem) {
+                // Unpress previous button.
+                if (pressedItem !== null) {
+                    if (pressedItem.pressedOverlays) {
+                        pressedSource = pressedItem.pressedOverlays;
+                    }
+                    Overlays.editOverlay(pressedSource[pressedItem.index], {
+                        localPosition: isHoveringButtonElement && hoveredItem === pressedItem.index
+                                && intersectionEnabled[pressedItem.index]
+                            ? Vec3.sum(pressedItem.localPosition, pressedItem.hoverDelta)
+                            : pressedItem.localPosition
+                    });
+                    pressedItem = null;
+                }
+                pressedSource = null;
+            }
+            if (isHoveringButtonElement && (intersectionEnabled === null || intersectionEnabled[intersectedItem])
+                    && isTriggerClicked && !wasTriggerClicked) {
+                // Press new button.
+                pressedSource = intersectionOverlays;
+                if (hoveredElementType === "menuButton") {
+                    if (intersectionItems === MENU_ITEMS) {
+                        menuButtonHoverOverlays = menuHoverOverlays;
+                    } else {
+                        menuButtonHoverOverlays = footerHoverOverlays;
+                    }
+                    localPosition = UI_ELEMENTS.menuButton.hoverButton.properties.localPosition;
+                    Overlays.editOverlay(menuButtonHoverOverlays[intersectedItem], {
+                        localPosition: Vec3.sum(Vec3.sum(localPosition, MENU_HOVER_DELTA), BUTTON_PRESS_DELTA)
+                    });
+                    pressedItem = {
+                        index: intersectedItem,
+                        localPosition: localPosition,
+                        hoverDelta: MENU_HOVER_DELTA,
+                        pressedOverlays: menuButtonHoverOverlays
+                    };
+                } else {
+                    localPosition = intersectionItems[intersectedItem].properties.localPosition;
+                    Overlays.editOverlay(intersectionOverlays[intersectedItem], {
+                        localPosition: Vec3.sum(localPosition, BUTTON_PRESS_DELTA)
+                    });
+                    pressedItem = {
+                        index: intersectedItem,
+                        localPosition: localPosition,
+                        hoverDelta: OPTION_HOVER_DELTA
+                    };
+                }
+                pressedSource = intersectionOverlays;
+
+                // Button press actions.
+                if (intersectionOverlays === menuOverlays) {
+                    openOptions(intersectionItems[intersectedItem]);
+                }
+                if (intersectionItems[intersectedItem].command) {
+                    parameter = intersectionItems[intersectedItem].id;
+                    doCommand(intersectionItems[intersectedItem].command.method, parameter);
+                }
+                if (intersectionItems[intersectedItem].callback) {
+                    if (intersectionItems[intersectedItem].callback.parameter) {
+                        parameterValue = evaluateParameter(intersectionItems[intersectedItem].callback.parameter);
+                    }
+                    uiCommandCallback(intersectionItems[intersectedItem].callback.method, parameterValue);
+                }
+            }
+        }
+
+        // Picklist update.
+        if (intersectionItems && ((hoveredElementType === "picklist"
+                && controlHand.triggerClicked() !== isPicklistPressed)
+                    || (intersectionItems[intersectedItem].type !== "picklist" && isPicklistPressed))) {
+            isPicklistPressed = controlHand.triggerClicked();
+            if (isPicklistPressed) {
+                doCommand(intersectionItems[intersectedItem].command.method, intersectionItems[intersectedItem].id);
+            }
+        }
+        if (intersectionItems && ((hoveredElementType === "picklistItem"
+                && controlHand.triggerClicked() !== isPicklistItemPressed)
+                    || (intersectionItems[intersectedItem].type !== "picklistItem" && isPicklistItemPressed))) {
+            isPicklistItemPressed = controlHand.triggerClicked();
+            if (isPicklistItemPressed) {
+                doCommand(intersectionItems[intersectedItem].command.method, intersectionItems[intersectedItem].id);
+            }
+        }
+        if (intersectionItems && isPicklistOpen && controlHand.triggerClicked()
+                && hoveredElementType !== "picklist" && hoveredElementType !== "picklistItem") {
+            doCommand("togglePhysicsPresets");
+        }
+
+        // Grip click.
+        if (controlHand.gripClicked() !== isGripClicked) {
+            isGripClicked = !isGripClicked;
+            if (isGripClicked && intersectionItems && intersectedItem && intersectionItems[intersectedItem].clear) {
+                controlHand.setGripClickedHandled();
+                parameter = intersectionItems[intersectedItem].id;
+                doGripClicked(intersectionItems[intersectedItem].clear.method, parameter);
+            }
+        }
+
+        // Bar slider update.
+        if (intersectionItems && hoveredElementType === "barSlider" && controlHand.triggerClicked()) {
+            sliderProperties = Overlays.getProperties(intersection.overlayID, ["position", "orientation"]);
+            overlayDimensions = intersectionItems[intersectedItem].properties.dimensions;
+            if (overlayDimensions === undefined) {
+                overlayDimensions = UI_ELEMENTS.barSlider.properties.dimensions;
+            }
+            basePoint = Vec3.sum(sliderProperties.position,
+                Vec3.multiplyQbyV(sliderProperties.orientation, { x: 0, y: -overlayDimensions.y / 2, z: 0 }));
+            fraction = Vec3.dot(Vec3.subtract(intersection.intersection, basePoint),
+                Vec3.multiplyQbyV(sliderProperties.orientation, Vec3.UNIT_Y)) / overlayDimensions.y;
+            fraction = adjustSliderFraction(fraction);
+            setBarSliderValue(intersectedItem, fraction);
+            if (intersectionItems[intersectedItem].command) {
+                doCommand(intersectionItems[intersectedItem].command.method, fraction);
+            }
+        }
+
+        // Image slider update.
+        if (intersectionItems && hoveredElementType === "imageSlider" && controlHand.triggerClicked()) {
+            sliderProperties = Overlays.getProperties(intersection.overlayID, ["position", "orientation"]);
+            overlayDimensions = intersectionItems[intersectedItem].properties.dimensions;
+            if (overlayDimensions === undefined) {
+                overlayDimensions = UI_ELEMENTS.imageSlider.properties.dimensions;
+            }
+            basePoint = Vec3.sum(sliderProperties.position,
+                Vec3.multiplyQbyV(sliderProperties.orientation, { x: 0, y: -overlayDimensions.y / 2, z: 0 }));
+            fraction = Vec3.dot(Vec3.subtract(intersection.intersection, basePoint),
+                Vec3.multiplyQbyV(sliderProperties.orientation, Vec3.UNIT_Y)) / overlayDimensions.y;
+            fraction = adjustSliderFraction(fraction);
+            Overlays.editOverlay(optionsSliderData[intersectedItem].value, {
+                localPosition: Vec3.sum(optionsSliderData[intersectedItem].offset,
+                    { x: 0, y: (fraction - 0.5) * overlayDimensions.y, z: 0 })
+            });
+            if (intersectionItems[intersectedItem].command) {
+                doCommand(intersectionItems[intersectedItem].command.method, fraction);
+            }
+        }
+
+        // Color circle update.
+        if (intersectionItems && hoveredElementType === "colorCircle" && controlHand.triggerClicked()) {
+            sliderProperties = Overlays.getProperties(intersection.overlayID, ["position", "orientation"]);
+            delta = Vec3.multiplyQbyV(Quat.inverse(sliderProperties.orientation),
+                Vec3.subtract(intersection.intersection, sliderProperties.position));
+            radius = Vec3.length(delta);
+            if (radius > hsvControl.circle.radius) {
+                delta = Vec3.multiply(hsvControl.circle.radius / radius, delta);
+            }
+            Overlays.editOverlay(optionsColorData[intersectedItem].value, {
+                localPosition: Vec3.sum(optionsColorData[intersectedItem].offset,
+                    { x: delta.x, y: 0, z: delta.z })
+            });
+            if (intersectionItems[intersectedItem].command) {
+                // Cartesian planar coordinates.
+                x = -delta.z; // Coordinates based on rotate cylinder entity. TODO: Use FBX model instead of cylinder entity.
+                y = -delta.x; // ""
+                s = Math.sqrt(x * x + y * y) / hsvControl.circle.radius;
+                h = Math.atan2(y, x) / (2 * Math.PI);
+                if (h < 0) {
+                    h = h + 1;
+                }
+                doCommand(intersectionItems[intersectedItem].command.method, { h: h, s: s });
+            }
+        }
+
+        // Special handling for Group options.
+        if (optionsItems && optionsItems === OPTONS_PANELS.groupOptions) {
+            enableGroupButton = groupsCount > 1;
+            if (enableGroupButton !== isGroupButtonEnabled) {
+                isGroupButtonEnabled = enableGroupButton;
+                Overlays.editOverlay(optionsOverlays[groupButtonIndex], {
+                    color: isGroupButtonEnabled
+                        ? (hoveredItem === groupButtonIndex
+                            ? OPTONS_PANELS.groupOptions[groupButtonIndex].highlightColor
+                            : OPTONS_PANELS.groupOptions[groupButtonIndex].enabledColor)
+                        : OPTONS_PANELS.groupOptions[groupButtonIndex].properties.color
+                });
+                Overlays.editOverlay(optionsOverlaysLabels[groupButtonIndex], {
+                    color: isGroupButtonEnabled
+                        ? OPTONS_PANELS.groupOptions[groupButtonIndex].labelEnabledColor
+                        : OPTONS_PANELS.groupOptions[groupButtonIndex].label.color
+                });
+                optionsEnabled[groupButtonIndex] = isGroupButtonEnabled;
+            }
+
+            enableUngroupButton = groupsCount === 1 && entitiesCount > 1;
+            if (enableUngroupButton !== isUngroupButtonEnabled) {
+                isUngroupButtonEnabled = enableUngroupButton;
+                Overlays.editOverlay(optionsOverlays[ungroupButtonIndex], {
+                    color: isUngroupButtonEnabled
+                        ? (hoveredItem === ungroupButtonIndex
+                            ? OPTONS_PANELS.groupOptions[ungroupButtonIndex].highlightColor
+                            : OPTONS_PANELS.groupOptions[ungroupButtonIndex].enabledColor)
+                        : OPTONS_PANELS.groupOptions[ungroupButtonIndex].properties.color
+                });
+                Overlays.editOverlay(optionsOverlaysLabels[ungroupButtonIndex], {
+                    color: isUngroupButtonEnabled
+                        ? OPTONS_PANELS.groupOptions[ungroupButtonIndex].labelEnabledColor
+                        : OPTONS_PANELS.groupOptions[ungroupButtonIndex].label.color
+                });
+                optionsEnabled[ungroupButtonIndex] = isUngroupButtonEnabled;
+            }
+
+            enableClearGroupingButton = groupsCount > 0;
+            if (enableClearGroupingButton !== isClearGroupingButtonEnabled) {
+                isClearGroupingButtonEnabled = enableClearGroupingButton;
+                Overlays.editOverlay(optionsOverlays[clearGroupingButtonIndex], {
+                    color: isClearGroupingButtonEnabled
+                        ? optionsItems[clearGroupingButtonIndex].enabledColor
+                        : optionsItems[clearGroupingButtonIndex].properties.color
+                });
+                Overlays.editOverlay(optionsOverlaysLabels[clearGroupingButtonIndex], {
+                    color: isClearGroupingButtonEnabled
+                        ? optionsItems[clearGroupingButtonIndex].labelEnabledColor
+                        : optionsItems[clearGroupingButtonIndex].label.color
+                });
+                optionsEnabled[clearGroupingButtonIndex] = isClearGroupingButtonEnabled;
+            }
+        }
+
+        wasTriggerClicked = isTriggerClicked;
+    }
+
+    function display() {
+        // Creates and shows menu entities.
+        var handJointIndex,
+            properties,
+            id,
+            i,
+            length;
+
+        if (isDisplaying) {
+            return;
+        }
+
+        // Joint index.
+        handJointIndex = MyAvatar.getJointIndex(attachmentJointName);
+        if (handJointIndex === NONE) {
+            // Don't display if joint isn't available (yet) to attach to.
+            // User can clear this condition by toggling the app off and back on once avatar finishes loading.
+            App.log(side, "ERROR: ToolsMenu: Hand joint index isn't available!");
+            return;
+        }
+
+        // Menu origin.
+        properties = Object.clone(MENU_ORIGIN_PROPERTIES);
+        properties.parentJointIndex = handJointIndex;
+        properties.localPosition = Vec3.sum(menuOriginLocalPosition, { x: panelLateralOffset, y: 0, z: 0 });
+        properties.localRotation = menuOriginLocalRotation;
+        menuOriginOverlay = Overlays.addOverlay("sphere", properties);
+
+        // Header.
+        properties = Object.clone(MENU_HEADER_PROPERTIES);
+        properties.parentID = menuOriginOverlay;
+        menuHeaderOverlay = Overlays.addOverlay("cube", properties);
+        properties = Object.clone(MENU_HEADER_HEADING_PROPERTIES);
+        properties.parentID = menuHeaderOverlay;
+        menuHeaderHeadingOverlay = Overlays.addOverlay("model", properties);
+        properties = Object.clone(MENU_HEADER_BAR_PROPERTIES);
+        properties.parentID = menuHeaderHeadingOverlay;
+        menuHeaderBarOverlay = Overlays.addOverlay("model", properties);
+
+        // Heading content.
+        properties = Object.clone(MENU_HEADER_BACK_PROPERTIES);
+        properties.parentID = menuHeaderHeadingOverlay;
+        menuHeaderBackOverlay = Overlays.addOverlay("image3d", properties);
+        properties = Object.clone(MENU_HEADER_TITLE_PROPERTIES);
+        properties.parentID = menuHeaderHeadingOverlay;
+        menuHeaderTitleOverlay = Overlays.addOverlay("image3d", properties);
+        properties = Object.clone(MENU_HEADER_ICON_PROPERTIES);
+        properties.parentID = menuHeaderHeadingOverlay;
+        menuHeaderIconOverlay = Overlays.addOverlay("image3d", properties);
+
+        // Panel background.
+        properties = Object.clone(MENU_PANEL_PROPERTIES);
+        properties.parentID = menuOriginOverlay;
+        menuPanelOverlay = Overlays.addOverlay("cube", properties);
+
+        // Always-visible overlays.
+        staticOverlays = [menuHeaderOverlay, menuHeaderHeadingOverlay, menuHeaderBarOverlay, menuHeaderTitleOverlay,
+            menuPanelOverlay];
+
+        // Menu and footer.
+        openMenu();
+        displayFooter();
+
+        // Initial values.
+        optionsItems = null;
+        intersectionOverlays = null;
+        intersectionEnabled = null;
+        hoveredItem = NONE;
+        hoveredSourceOverlays = null;
+        isHoveringButtonElement = false;
+        hoveredElementType = null;
+        pressedItem = null;
+        pressedSource = null;
+        isPicklistOpen = false;
+        isPicklistPressed = false;
+        isPicklistItemPressed = false;
+        isTriggerClicked = false;
+        wasTriggerClicked = false;
+        isGripClicked = false;
+
+        // Special handling for Group options.
+        isGroupButtonEnabled = false;
+        isUngroupButtonEnabled = false;
+        isClearGroupingButtonEnabled = false;
+        for (i = 0, length = OPTONS_PANELS.groupOptions.length; i < length; i++) {
+            id = OPTONS_PANELS.groupOptions[i].id;
+            if (id === "groupButton") {
+                groupButtonIndex = i;
+            }
+            if (id === "ungroupButton") {
+                ungroupButtonIndex = i;
+            }
+            if (id === "clearGroupingButton") {
+                clearGroupingButtonIndex = i;
+            }
+        }
+
+        isDisplaying = true;
+    }
+
+    function clear() {
+        // Deletes menu entities.
+        if (!isDisplaying) {
+            return;
+        }
+
+        if (isOptionsOpen) {
+            closeOptions();
+        }
+
+        Overlays.deleteOverlay(menuOriginOverlay); // Automatically deletes all other overlays because they're children.
+        menuOverlays = [];
+        menuHoverOverlays = [];
+        menuIconOverlays = [];
+        menuLabelOverlays = [];
+        menuEnabled = [];
+        footerOverlays = [];
+        footerHoverOverlays = [];
+        footerIconOverlays = [];
+        footerLabelOverlays = [];
+        footerEnabled = [];
+        isDisplaying = false;
+    }
+
+    function destroy() {
+        clear();
+    }
+
+    return {
+        assetURLs: getAssetURLs,
+        COLOR_TOOL: COLOR_TOOL,
+        SCALE_TOOL: SCALE_TOOL,
+        CLONE_TOOL: CLONE_TOOL,
+        GROUP_TOOL: GROUP_TOOL,
+        PHYSICS_TOOL: PHYSICS_TOOL,
+        DELETE_TOOL: DELETE_TOOL,
+        iconInfo: getIconInfo,
+        setHand: setHand,
+        overlayIDs: getOverlayIDs,
+        clearTool: clearTool,
+        doCommand: doCommand,
+        setVisible: setVisible,
+        update: update,
+        display: display,
+        clear: clear,
+        destroy: destroy
+    };
+};
+
+ToolsMenu.prototype = {};
diff --git a/unpublishedScripts/marketplace/shapes/modules/uit.js b/unpublishedScripts/marketplace/shapes/modules/uit.js
new file mode 100644
index 0000000000..f79be9fc0c
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/modules/uit.js
@@ -0,0 +1,70 @@
+//
+//  uit.js
+//
+//  Created by David Rowe on 22 Aug 2017.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+/* global UIT:true */
+
+UIT = (function () {
+    // User Interface Toolkit. Global object.
+
+    return {
+        colors: {
+            white: { red: 0xff, green: 0xff, blue: 0xff },
+            faintGray: { red: 0xe3, green: 0xe3, blue: 0xe3 },
+            lightGrayText: { red: 0xaf, green: 0xaf, blue: 0xaf },
+            lightGray: { red: 0x6a, green: 0x6a, blue: 0x6a },
+            baseGray: { red: 0x40, green: 0x40, blue: 0x40 },
+            baseGrayShadow: { red: 0x25, green: 0x25, blue: 0x25 },
+            darkGray: { red: 0x12, green: 0x12, blue: 0x12 },
+            redAccent: { red: 0xc6, green: 0x21, blue: 0x47 },
+            redHighlight: { red: 0xea, green: 0x4c, blue: 0x5f },
+            greenShadow: { red: 0x35, green: 0x9d, blue: 0x85 },
+            greenHighlight: { red: 0x1f, green: 0xc6, blue: 0xa6 },
+            blueHighlight: { red: 0x00, green: 0xbf, blue: 0xef }
+        },
+
+        // Coordinate system: UI lies in x-y plane with the front surface being +z.
+        // Offsets are relative to parents' centers.
+        dimensions: {
+            canvas: { x: 0.24, y: 0.296 }, // Overall UI size.
+            canvasSeparation: 0.004, // Gap between Tools menu and Create panel.
+            handOffset: 0.085, // Distance from hand (wrist) joint to center of canvas.
+            handLateralOffset: 0.01, // Offset of UI in direction of palm normal.
+
+            topMargin: 0.010,
+            leftMargin: 0.0118,
+            rightMargin: 0.0118,
+
+            header: { x: 0.24, y: 0.048, z: 0.012 },
+            headerHeading: { x: 0.24, y: 0.044, z: 0.012 },
+            headerBar: { x: 0.24, y: 0.004, z: 0.012 },
+            panel: { x: 0.24, y: 0.236, z: 0.008 },
+            footerHeight: 0.056,
+
+            itemCollisionZone: { x: 0.0481, y: 0.0480, z: 0.0040 }, // Cursor intersection zone for Tools and Create items.
+
+            buttonDimensions: { x: 0.2164, y: 0.0840, z: 0.0040 }, // Default size of large single options button.
+
+            menuButtonDimensions: { x: 0.0267, y: 0.0267, z: 0.0040 },
+            menuButtonIconOffset: { x: 0, y: 0.00935, z: -0.0040 }, // Non-hovered position relative to itemCollisionZone.
+            menuButtonLabelYOffset: -0.00915, // Relative to itemCollisionZone.
+            menuButtonSublabelYOffset: -0.01775, // Relative to itemCollisionZone.
+
+            paletteItemButtonDimensions: { x: 0.0481, y: 0.0480, z: 0.0020 },
+            paletteItemButtonOffset: { x: 0, y: 0, z: -0.0020 }, // Non-hovered position relative to itemCollisionZone.
+            paletteItemButtonHoveredOffset: { x: 0, y: 0, z: -0.0010 },
+            paletteItemIconDimensions: { x: 0.024, y: 0.024, z: 0.024 },
+            paletteItemIconOffset: { x: 0, y: 0, z: 0.015 }, // Non-hovered position relative to palette button.
+
+            horizontalRuleHeight : 0.0004,
+
+            imageOverlayOffset: 0.001 // Raise image above surface.
+        }
+    };
+}());
diff --git a/unpublishedScripts/marketplace/shapes/shapes.js b/unpublishedScripts/marketplace/shapes/shapes.js
new file mode 100644
index 0000000000..cd5f119588
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/shapes.js
@@ -0,0 +1,2043 @@
+//
+//  shapes.js
+//
+//  Created by David Rowe on 27 Jun 2017.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+/* global Feedback, History, Preload */
+
+(function () {
+
+    "use strict";
+
+    var APP_NAME = "SHAPES",
+        APP_ICON_INACTIVE = Script.resolvePath("./assets/shapes-i.svg"),
+        APP_ICON_ACTIVE = Script.resolvePath("./assets/shapes-a.svg"),
+        APP_ICON_DISABLED = Script.resolvePath("./assets/shapes-d.svg"),
+        ENABLED_CAPTION_COLOR_OVERRIDE = "",
+        DISABLED_CAPTION_COLOR_OVERRIDE = "#888888",
+        START_DELAY = 2000, // ms
+
+        // Application state
+        isAppActive,
+        dominantHand,
+
+        // Tool state
+        TOOL_NONE = 0,
+        TOOL_SCALE = 1,
+        TOOL_CLONE = 2,
+        TOOL_GROUP = 3,
+        TOOL_GROUP_BOX = 4,
+        TOOL_COLOR = 5,
+        TOOL_PICK_COLOR = 6,
+        TOOL_PHYSICS = 7,
+        TOOL_DELETE = 8,
+        toolSelected = TOOL_NONE,
+        colorToolColor = { red: 128, green: 128, blue: 128 },
+        physicsToolPhysics = { userData: { grabbableKey: {} } },
+        EARTH_GRAVITY = -9.80665,
+        physicsToolGravity = EARTH_GRAVITY,
+
+        // Primary objects
+        App,
+        Inputs,
+        inputs = [],
+        UI,
+        ui,
+        Editor,
+        editors = [],
+        LEFT_HAND = 0,
+        RIGHT_HAND = 1,
+        Grouping,
+        grouping,
+
+        // Modules
+        CreatePalette,
+        Groups,
+        Hand,
+        Handles,
+        Highlights,
+        Laser,
+        SelectionManager,
+        ToolIcon,
+        ToolsMenu,
+
+        // Miscellaneous
+        UPDATE_LOOP_TIMEOUT = 16,
+        updateTimer = null,
+        tablet,
+        button,
+        DOMAIN_CHANGED_MESSAGE = "Toolbar-DomainChanged",
+
+        DEBUG = false;
+
+    // Utilities
+    Script.include("./utilities/utilities.js");
+
+    // Modules
+    Script.include("./modules/createPalette.js");
+    Script.include("./modules/feedback.js");
+    Script.include("./modules/groups.js");
+    Script.include("./modules/hand.js");
+    Script.include("./modules/handles.js");
+    Script.include("./modules/highlights.js");
+    Script.include("./modules/history.js");
+    Script.include("./modules/laser.js");
+    Script.include("./modules/preload.js");
+    Script.include("./modules/selection.js");
+    Script.include("./modules/toolIcon.js");
+    Script.include("./modules/toolsMenu.js");
+    Script.include("./modules/uit.js");
+
+
+    function log(side, message) {
+        // Optional parameter: side.
+        var hand = "",
+            HAND_LETTERS = ["L", "R"];
+        if (side === 0 || side === 1) {
+            hand = HAND_LETTERS[side] + " ";
+        } else {
+            message = side;
+        }
+        print(APP_NAME + ": " + hand + message);
+    }
+
+    function debug(side, message) {
+        // Optional parameter: side.
+        if (DEBUG) {
+            log(side, message);
+        }
+    }
+
+    function otherHand(hand) {
+        var NUMBER_OF_HANDS = 2;
+        return (hand + 1) % NUMBER_OF_HANDS;
+    }
+
+    App = {
+        log: log,
+        debug: debug,
+        DEBUG: DEBUG
+    };
+
+
+    Inputs = function (side) {
+        // A hand plus a laser.
+
+        var
+            // Primary objects.
+            hand,
+            laser,
+
+            intersection = {};
+
+
+        if (!(this instanceof Inputs)) {
+            return new Inputs();
+        }
+
+        hand = new Hand(side);
+        laser = new Laser(side);
+
+
+        function setUIOverlays(overlayIDs) {
+            laser.setUIOverlays(overlayIDs);
+        }
+
+        function getHand() {
+            return hand;
+        }
+
+        function getLaser() {
+            return laser;
+        }
+
+        function getIntersection() {
+            return intersection;
+        }
+
+        function update() {
+            var laserIntersection,
+                handIntersection;
+
+            hand.update();
+            if (hand.valid()) {
+                laser.update(hand);
+                // Use intersections in order to achieve entity manipulation while inside an entity:
+                // - Use laser overlay intersection if there is one (for UI).
+                // - Otherwise use hand overlay if there is one (for UI).
+                // - Otherwise use laser entity intersection if there is one (for entity manipulation).
+                //   Except if hand intersection is for same entity.
+                // - Otherwise use hand entity intersection if there is one (for entity manipulation).
+                laserIntersection = laser.intersection();
+                if (laserIntersection.intersects && laserIntersection.overlayID !== null) {
+                    intersection = laserIntersection;
+                } else {
+                    handIntersection = hand.intersection();
+                    if (handIntersection.intersects && handIntersection.overlayID !== null) {
+                        intersection = handIntersection;
+                    } else if (laserIntersection.intersects && laserIntersection.entityID !== handIntersection.entityID) {
+                        intersection = laserIntersection;
+                    } else {
+                        intersection = handIntersection;
+                    }
+                }
+            } else {
+                intersection = {};
+            }
+        }
+
+        function clear() {
+            hand.clear();
+            laser.clear();
+        }
+
+        function destroy() {
+            if (hand) {
+                hand.destroy();
+                hand = null;
+            }
+            if (laser) {
+                laser.destroy();
+                laser = null;
+            }
+        }
+
+        return {
+            setUIOverlays: setUIOverlays,
+            hand: getHand,
+            laser: getLaser,
+            intersection: getIntersection,
+            update: update,
+            clear: clear,
+            destroy: destroy
+        };
+    };
+
+
+    UI = function (side, leftInputs, rightInputs, uiCommandCallback) {
+        // Tool menu and Create palette.
+
+        var // Primary objects.
+            toolsMenu,
+            toolIcon,
+            createPalette,
+
+            isDisplaying = false,
+
+            getIntersection; // Function.
+
+        if (!(this instanceof UI)) {
+            return new UI();
+        }
+
+        toolIcon = new ToolIcon(otherHand(side));
+        createPalette = new CreatePalette(side, leftInputs, rightInputs, uiCommandCallback);
+        toolsMenu = new ToolsMenu(side, leftInputs, rightInputs, uiCommandCallback);
+
+        Preload.load(toolIcon.assetURLs());
+        Preload.load(createPalette.assetURLs());
+        Preload.load(toolsMenu.assetURLs());
+
+        getIntersection = side === LEFT_HAND ? rightInputs.intersection : leftInputs.intersection;
+
+
+        function setHand(newSide) {
+            side = newSide;
+            toolIcon.setHand(otherHand(side));
+            toolsMenu.setHand(side);
+            createPalette.setHand(side);
+            getIntersection = side === LEFT_HAND ? rightInputs.intersection : leftInputs.intersection;
+        }
+
+        function setToolIcon(icon) {
+            toolIcon.display(toolsMenu.iconInfo(icon));
+        }
+
+        function clearTool() {
+            toolIcon.clear();
+            toolsMenu.clearTool();
+        }
+
+        function setUIOverlays() {
+            var uiOverlayIDs = [].concat(toolsMenu.overlayIDs(), createPalette.overlayIDs());
+            leftInputs.setUIOverlays(side === RIGHT_HAND ? uiOverlayIDs : []);
+            rightInputs.setUIOverlays(side === LEFT_HAND ? uiOverlayIDs : []);
+        }
+
+        function display() {
+            toolsMenu.display();
+            createPalette.display();
+            setUIOverlays();
+            isDisplaying = true;
+        }
+
+        function update() {
+            var intersection;
+
+            if (isDisplaying) {
+                intersection = getIntersection();
+                toolsMenu.update(intersection, grouping.groupsCount(), grouping.entitiesCount());
+                createPalette.update(intersection.overlayID);
+            }
+        }
+
+        function doPickColor(color) {
+            toolsMenu.doCommand("setColorFromPick", color);
+        }
+
+        function clear() {
+            leftInputs.setUIOverlays([]);
+            rightInputs.setUIOverlays([]);
+            toolIcon.clear();
+            toolsMenu.clear();
+            createPalette.clear();
+            isDisplaying = false;
+        }
+
+        function setVisible(visible) {
+            toolsMenu.setVisible(visible);
+            createPalette.setVisible(visible);
+        }
+
+        function destroy() {
+            if (createPalette) {
+                createPalette.destroy();
+                createPalette = null;
+            }
+            if (toolsMenu) {
+                toolsMenu.destroy();
+                toolsMenu = null;
+            }
+            if (toolIcon) {
+                toolIcon.destroy();
+                toolIcon = null;
+            }
+        }
+
+        return {
+            setHand: setHand,
+            setToolIcon: setToolIcon,
+            clearTool: clearTool,
+            COLOR_TOOL: toolsMenu.COLOR_TOOL,
+            SCALE_TOOL: toolsMenu.SCALE_TOOL,
+            CLONE_TOOL: toolsMenu.CLONE_TOOL,
+            GROUP_TOOL: toolsMenu.GROUP_TOOL,
+            PHYSICS_TOOL: toolsMenu.PHYSICS_TOOL,
+            DELETE_TOOL: toolsMenu.DELETE_TOOL,
+            display: display,
+            setVisible: setVisible,
+            updateUIOverlays: setUIOverlays,
+            doPickColor: doPickColor,
+            update: update,
+            clear: clear,
+            destroy: destroy
+        };
+    };
+
+
+    Editor = function (side) {
+        // An entity selection, entity highlights, and entity handles.
+
+        var
+            // Primary objects.
+            selection,
+            highlights,
+            handles,
+
+            // References.
+            otherEditor, // Other hand's Editor object.
+            hand,
+            laser,
+
+            // Editor states.
+            EDITOR_IDLE = 0,
+            EDITOR_SEARCHING = 1,
+            EDITOR_HIGHLIGHTING = 2, // Highlighting an entity (not hovering a handle).
+            EDITOR_GRABBING = 3,
+            EDITOR_DIRECT_SCALING = 4, // Scaling data are sent to other editor's EDITOR_GRABBING state.
+            EDITOR_HANDLE_SCALING = 5, // ""
+            EDITOR_CLONING = 6,
+            EDITOR_GROUPING = 7,
+            EDITOR_STATE_STRINGS = ["EDITOR_IDLE", "EDITOR_SEARCHING", "EDITOR_HIGHLIGHTING", "EDITOR_GRABBING",
+                "EDITOR_DIRECT_SCALING", "EDITOR_HANDLE_SCALING", "EDITOR_CLONING", "EDITOR_GROUPING"],
+            editorState = EDITOR_IDLE,
+
+            // State machine.
+            STATE_MACHINE,
+            intersectedEntityID = null, // Intersected entity of highlighted entity set.
+            rootEntityID = null, // Root entity of highlighted entity set.
+            wasScaleTool = false,
+            isOtherEditorEditingEntityID = false,
+            isTriggerClicked = false,
+            wasTriggerClicked = false,
+            isGripClicked = false,
+            wasGripClicked = false,
+            hoveredOverlayID = null,
+            isAutoGrab = false,
+
+            // Position values.
+            initialHandOrientationInverse,
+            initialHandToSelectionVector,
+            initialSelectionOrientation,
+
+            // Scaling values.
+            isScalingWithHand = false,
+            isDirectScaling = false, // Modifies EDITOR_GRABBING state.
+            isHandleScaling = false, // ""
+            initialTargetsSeparation,
+            initialtargetsDirection,
+            otherTargetPosition,
+            handleUnitScaleAxis,
+            handleScaleDirections,
+            handleTargetOffset,
+            initialHandToTargetOffset,
+            initialHandleDistance,
+            laserOffset,
+            MIN_SCALE = 0.001,
+            MIN_SCALE_HANDLE_DISTANCE = 0.0001,
+
+            getIntersection, // Function.
+            intersection,
+            isUIVisible = true;
+
+
+        if (!(this instanceof Editor)) {
+            return new Editor();
+        }
+
+        selection = new SelectionManager(side);
+        highlights = new Highlights(side);
+        handles = new Handles(side);
+
+        function setReferences(inputs, editor) {
+            hand = inputs.hand(); // Object.
+            laser = inputs.laser(); // Object.
+            getIntersection = inputs.intersection; // Function.
+            otherEditor = editor; // Object.
+
+            laserOffset = laser.handOffset(); // Value.
+
+            highlights.setHandHighlightRadius(hand.getNearGrabRadius());
+        }
+
+
+        function hoverHandle(overlayID) {
+            // Highlights handle if overlayID is a handle, otherwise unhighlights currently highlighted handle if any.
+            handles.hover(overlayID);
+        }
+
+        function enableAutoGrab() {
+            // Used to grab entity created from Create palette.
+            isAutoGrab = true;
+        }
+
+        function isHandle(overlayID) {
+            return handles.isHandle(overlayID);
+        }
+
+        function setHandleOverlays(overlayIDs) {
+            hand.setHandleOverlays(overlayIDs);
+        }
+
+        function isEditing(aRootEntityID) {
+            // aRootEntityID is an optional parameter.
+            return editorState > EDITOR_HIGHLIGHTING
+                && (aRootEntityID === undefined || aRootEntityID === rootEntityID);
+        }
+
+        function isScaling() {
+            return editorState === EDITOR_DIRECT_SCALING || editorState === EDITOR_HANDLE_SCALING;
+        }
+
+        function getIntersectedEntityID() {
+            return intersectedEntityID;
+        }
+
+        function getRootEntityID() {
+            return rootEntityID;
+        }
+
+        function isCameraOutsideEntity(entityID, testPosition) {
+            var cameraPosition,
+                pickRay,
+                PRECISION_PICKING = true,
+                NO_EXCLUDE_IDS = [],
+                VISIBLE_ONLY = true,
+                intersection;
+
+            cameraPosition = Camera.position;
+            pickRay = {
+                origin: cameraPosition,
+                direction: Vec3.normalize(Vec3.subtract(testPosition, cameraPosition)),
+                length: Vec3.distance(testPosition, cameraPosition)
+            };
+            intersection = Entities.findRayIntersection(pickRay, PRECISION_PICKING, [entityID], NO_EXCLUDE_IDS, VISIBLE_ONLY);
+            return !intersection.intersects || intersection.distance < pickRay.length;
+        }
+
+
+        function startEditing() {
+            var selectionPositionAndOrientation;
+
+            initialHandOrientationInverse = Quat.inverse(hand.orientation());
+            selectionPositionAndOrientation = selection.getPositionAndOrientation();
+            initialHandToSelectionVector = Vec3.subtract(selectionPositionAndOrientation.position, hand.position());
+            initialSelectionOrientation = selectionPositionAndOrientation.orientation;
+
+            selection.startEditing();
+        }
+
+        function finishEditing() {
+            selection.finishEditing();
+        }
+
+
+        function getScaleTargetPosition() {
+            if (isScalingWithHand) {
+                return hand.palmPosition();
+            }
+            return Vec3.sum(Vec3.sum(hand.position(), Vec3.multiplyQbyV(hand.orientation(), laserOffset)),
+                Vec3.multiply(laser.length(), Quat.getUp(hand.orientation())));
+        }
+
+        function startDirectScaling(targetPosition) {
+            // Called on grabbing hand by scaling hand.
+            var initialTargetPosition,
+                initialTargetsCenter;
+
+            isScalingWithHand = intersection.handIntersected;
+
+            otherTargetPosition = targetPosition;
+            initialTargetPosition = getScaleTargetPosition();
+            initialTargetsCenter = Vec3.multiply(0.5, Vec3.sum(initialTargetPosition, otherTargetPosition));
+            initialTargetsSeparation = Vec3.distance(initialTargetPosition, otherTargetPosition);
+            initialtargetsDirection = Vec3.subtract(otherTargetPosition, initialTargetPosition);
+
+            selection.startDirectScaling(initialTargetsCenter);
+            isDirectScaling = true;
+        }
+
+        function updateDirectScaling(targetPosition) {
+            // Called on grabbing hand by scaling hand.
+            otherTargetPosition = targetPosition;
+        }
+
+        function stopDirectScaling() {
+            // Called on grabbing hand by scaling hand.
+            if (isDirectScaling) {
+                selection.finishDirectScaling();
+                isDirectScaling = false;
+            }
+        }
+
+        function startHandleScaling(targetPosition, overlayID) {
+            // Called on grabbing hand by scaling hand.
+            var initialTargetPosition,
+                selectionPositionAndOrientation,
+                scaleAxis;
+
+            // Keep grabbed handle highlighted and hide other handles.
+            handles.grab(overlayID);
+
+            isScalingWithHand = intersection.handIntersected;
+
+            // Grab center of selection.
+            otherTargetPosition = targetPosition;
+            initialTargetPosition = selection.boundingBox().center;
+            initialHandToTargetOffset = Vec3.subtract(initialTargetPosition, hand.position());
+
+            // Initial handle offset from center of selection.
+            selectionPositionAndOrientation = selection.getPositionAndOrientation();
+            handleUnitScaleAxis = handles.scalingAxis(overlayID); // Unit vector in direction of scaling.
+            handleScaleDirections = handles.scalingDirections(overlayID); // Which axes to scale the selection on.
+            scaleAxis = Vec3.multiplyQbyV(selectionPositionAndOrientation.orientation, handleUnitScaleAxis);
+            handleTargetOffset = handles.handleOffset(overlayID)
+                + Vec3.dot(Vec3.subtract(otherTargetPosition, Overlays.getProperty(overlayID, "position")), scaleAxis);
+            initialHandleDistance = Math.abs(Vec3.dot(Vec3.subtract(otherTargetPosition, initialTargetPosition), scaleAxis));
+            initialHandleDistance -= handleTargetOffset;
+            initialHandleDistance = Math.max(initialHandleDistance, MIN_SCALE_HANDLE_DISTANCE);
+
+            // Start scaling.
+            selection.startHandleScaling(initialTargetPosition);
+            handles.startScaling();
+            isHandleScaling = true;
+        }
+
+        function updateHandleScaling(targetPosition) {
+            // Called on grabbing hand by scaling hand.
+            otherTargetPosition = targetPosition;
+        }
+
+        function stopHandleScaling() {
+            // Called on grabbing hand by scaling hand.
+            if (isHandleScaling) {
+                handles.finishScaling();
+                selection.finishHandleScaling();
+                handles.grab(null); // Stop highlighting grabbed handle and resume displaying all handles.
+                isHandleScaling = false;
+            }
+        }
+
+
+        function applyGrab() {
+            // Sets position and orientation of selection per grabbing hand.
+            var deltaOrientation,
+                selectionPosition,
+                selectionOrientation;
+
+            deltaOrientation = Quat.multiply(hand.orientation(), initialHandOrientationInverse);
+            selectionPosition = Vec3.sum(hand.position(), Vec3.multiplyQbyV(deltaOrientation, initialHandToSelectionVector));
+            selectionOrientation = Quat.multiply(deltaOrientation, initialSelectionOrientation);
+
+            selection.setPositionAndOrientation(selectionPosition, selectionOrientation);
+        }
+
+        function applyDirectScale() {
+            // Scales, rotates, and positions selection per changing length, orientation, and position of vector between hands.
+            var targetPosition,
+                targetsSeparation,
+                scale,
+                rotation,
+                center,
+                selectionPositionAndOrientation;
+
+            // Scale selection.
+            targetPosition = getScaleTargetPosition();
+            targetsSeparation = Vec3.distance(targetPosition, otherTargetPosition);
+            scale = targetsSeparation / initialTargetsSeparation;
+            scale = Math.max(scale, MIN_SCALE);
+
+            rotation = Quat.rotationBetween(initialtargetsDirection, Vec3.subtract(otherTargetPosition, targetPosition));
+            center = Vec3.multiply(0.5, Vec3.sum(targetPosition, otherTargetPosition));
+            selection.directScale(scale, rotation, center);
+
+            // Update grab offset.
+            selectionPositionAndOrientation = selection.getPositionAndOrientation();
+            initialHandOrientationInverse = Quat.inverse(hand.orientation());
+            initialHandToSelectionVector = Vec3.subtract(selectionPositionAndOrientation.position, hand.position());
+            initialSelectionOrientation = selectionPositionAndOrientation.orientation;
+        }
+
+        function applyHandleScale() {
+            // Scales selection per changing position of scaling hand; positions and orients per grabbing hand.
+            var targetPosition,
+                deltaHandOrientation,
+                selectionOrientation,
+                scaleAxis,
+                handleDistance,
+                scale,
+                scale3D,
+                selectionPositionAndOrientation;
+
+            // Orient selection per grabbing hand.
+            deltaHandOrientation = Quat.multiply(hand.orientation(), initialHandOrientationInverse);
+            selectionOrientation = Quat.multiply(deltaHandOrientation, initialSelectionOrientation);
+
+            // Position selection per grabbing hand.
+            targetPosition = Vec3.sum(hand.position(), Vec3.multiplyQbyV(deltaHandOrientation, initialHandToTargetOffset));
+
+            // Desired distance of handle from other hand
+            scaleAxis = Vec3.multiplyQbyV(selection.getPositionAndOrientation().orientation, handleUnitScaleAxis);
+            handleDistance = Vec3.dot(Vec3.subtract(otherTargetPosition, targetPosition), scaleAxis);
+            handleDistance -= handleTargetOffset;
+            handleDistance = Math.max(handleDistance, MIN_SCALE_HANDLE_DISTANCE);
+
+            // Scale selection relative to initial dimensions.
+            scale = handleDistance / initialHandleDistance;
+            scale = Math.max(scale, MIN_SCALE);
+            scale3D = Vec3.multiply(scale, handleScaleDirections);
+            scale3D = {
+                x: handleScaleDirections.x !== 0 ? scale3D.x : 1,
+                y: handleScaleDirections.y !== 0 ? scale3D.y : 1,
+                z: handleScaleDirections.z !== 0 ? scale3D.z : 1
+            };
+
+            // Scale.
+            handles.scale(scale3D);
+            selection.handleScale(scale3D, targetPosition, selectionOrientation);
+
+            // Update grab offset.
+            selectionPositionAndOrientation = selection.getPositionAndOrientation();
+            initialHandOrientationInverse = Quat.inverse(hand.orientation());
+            initialHandToSelectionVector = Vec3.subtract(selectionPositionAndOrientation.position, hand.position());
+            initialSelectionOrientation = selectionPositionAndOrientation.orientation;
+        }
+
+
+        function enterEditorIdle() {
+            laser.clear();
+            selection.clear();
+        }
+
+        function exitEditorIdle() {
+            // Nothing to do.
+        }
+
+        function enterEditorSearching() {
+            selection.clear();
+            intersectedEntityID = null;
+            rootEntityID = null;
+            hoveredOverlayID = intersection.overlayID;
+            otherEditor.hoverHandle(hoveredOverlayID);
+        }
+
+        function updateEditorSearching() {
+            if (toolSelected === TOOL_SCALE && intersection.overlayID !== hoveredOverlayID && otherEditor.isEditing()) {
+                hoveredOverlayID = intersection.overlayID;
+                otherEditor.hoverHandle(hoveredOverlayID);
+            }
+        }
+
+        function exitEditorSearching() {
+            otherEditor.hoverHandle(null);
+        }
+
+        function enterEditorHighlighting() {
+            selection.select(intersectedEntityID);
+            if (!intersection.laserIntersected && !isUIVisible) {
+                laser.disable();
+            }
+            if (toolSelected !== TOOL_SCALE || !otherEditor.isEditing(rootEntityID)) {
+                highlights.display(intersection.handIntersected, selection.selection(),
+                    toolSelected === TOOL_COLOR || toolSelected === TOOL_PICK_COLOR ? selection.intersectedEntityIndex() : null,
+                    null,
+                    toolSelected === TOOL_SCALE || otherEditor.isEditing(rootEntityID)
+                        ? highlights.SCALE_COLOR : highlights.HIGHLIGHT_COLOR);
+            }
+            isOtherEditorEditingEntityID = otherEditor.isEditing(rootEntityID);
+            wasScaleTool = toolSelected === TOOL_SCALE;
+        }
+
+        function updateEditorHighlighting() {
+            selection.select(intersectedEntityID);
+            if (toolSelected !== TOOL_SCALE || !otherEditor.isEditing(rootEntityID)) {
+                highlights.display(intersection.handIntersected, selection.selection(),
+                    toolSelected === TOOL_COLOR || toolSelected === TOOL_PICK_COLOR ? selection.intersectedEntityIndex() : null,
+                    null,
+                    toolSelected === TOOL_SCALE || otherEditor.isEditing(rootEntityID)
+                        ? highlights.SCALE_COLOR : highlights.HIGHLIGHT_COLOR);
+                if (!intersection.laserIntersected && !isUIVisible) {
+                    laser.disable();
+                } else {
+                    laser.enable();
+                }
+            } else {
+                highlights.clear();
+                laser.enable();
+            }
+            isOtherEditorEditingEntityID = otherEditor.isEditing(rootEntityID);
+        }
+
+        function exitEditorHighlighting() {
+            highlights.clear();
+            isOtherEditorEditingEntityID = false;
+            laser.enable();
+        }
+
+        function enterEditorGrabbing() {
+            selection.select(intersectedEntityID); // For when transitioning from EDITOR_SEARCHING.
+            if (intersection.laserIntersected) {
+                laser.setLength(laser.length());
+            } else {
+                laser.disable();
+            }
+            if (toolSelected === TOOL_SCALE) {
+                handles.display(rootEntityID, selection.boundingBox(), selection.count() > 1, selection.is2D());
+                otherEditor.setHandleOverlays(handles.overlays());
+            }
+            startEditing();
+            wasScaleTool = toolSelected === TOOL_SCALE;
+        }
+
+        function updateEditorGrabbing() {
+            selection.select(intersectedEntityID);
+            if (toolSelected === TOOL_SCALE) {
+                handles.display(rootEntityID, selection.boundingBox(), selection.count() > 1, selection.is2D());
+                otherEditor.setHandleOverlays(handles.overlays());
+            } else {
+                handles.clear();
+                otherEditor.setHandleOverlays([]);
+            }
+        }
+
+        function exitEditorGrabbing() {
+            stopDirectScaling();
+            stopHandleScaling();
+            finishEditing();
+            handles.clear();
+            otherEditor.setHandleOverlays([]);
+            laser.clearLength();
+            laser.enable();
+        }
+
+        function enterEditorDirectScaling() {
+            selection.select(intersectedEntityID); // In case need to transition to EDITOR_GRABBING.
+            isScalingWithHand = intersection.handIntersected;
+            if (intersection.laserIntersected) {
+                laser.setLength(laser.length());
+            } else {
+                laser.disable();
+            }
+            otherEditor.startDirectScaling(getScaleTargetPosition());
+        }
+
+        function updateEditorDirectScaling() {
+            otherEditor.updateDirectScaling(getScaleTargetPosition());
+        }
+
+        function exitEditorDirectScaling() {
+            otherEditor.stopDirectScaling();
+            laser.clearLength();
+            laser.enable();
+        }
+
+        function enterEditorHandleScaling() {
+            selection.select(intersectedEntityID); // In case need to transition to EDITOR_GRABBING.
+            isScalingWithHand = intersection.handIntersected;
+            if (intersection.laserIntersected) {
+                laser.setLength(laser.length());
+            } else {
+                laser.disable();
+            }
+            otherEditor.startHandleScaling(getScaleTargetPosition(), intersection.overlayID);
+        }
+
+        function updateEditorHandleScaling() {
+            otherEditor.updateHandleScaling(getScaleTargetPosition());
+        }
+
+        function exitEditorHandleScaling() {
+            otherEditor.stopHandleScaling();
+            laser.clearLength();
+            laser.enable();
+        }
+
+        function enterEditorCloning() {
+            Feedback.play(side, Feedback.CLONE_ENTITY);
+            selection.select(intersectedEntityID); // For when transitioning from EDITOR_SEARCHING.
+            selection.cloneEntities();
+            intersectedEntityID = selection.intersectedEntityID();
+            rootEntityID = selection.rootEntityID();
+            intersectedEntityID = rootEntityID;
+        }
+
+        function exitEditorCloning() {
+            // Nothing to do.
+        }
+
+        function enterEditorGrouping() {
+            if (!grouping.includes(rootEntityID)) {
+                highlights.display(false, selection.selection(), null, null, highlights.GROUP_COLOR);
+            }
+            if (toolSelected === TOOL_GROUP_BOX) {
+                if (!grouping.includes(rootEntityID)) {
+                    Feedback.play(side, Feedback.SELECT_ENTITY);
+                    grouping.toggle(selection.selection());
+                    grouping.selectInBox();
+                } else {
+                    Feedback.play(side, Feedback.GENERAL_ERROR);
+                }
+            } else {
+                Feedback.play(side, Feedback.SELECT_ENTITY);
+                grouping.toggle(selection.selection());
+            }
+        }
+
+        function exitEditorGrouping() {
+            highlights.clear();
+        }
+
+        STATE_MACHINE = {
+            EDITOR_IDLE: {
+                enter: enterEditorIdle,
+                update: null,
+                exit: exitEditorIdle
+            },
+            EDITOR_SEARCHING: {
+                enter: enterEditorSearching,
+                update: updateEditorSearching,
+                exit: exitEditorSearching
+            },
+            EDITOR_HIGHLIGHTING: {
+                enter: enterEditorHighlighting,
+                update: updateEditorHighlighting,
+                exit: exitEditorHighlighting
+            },
+            EDITOR_GRABBING: {
+                enter: enterEditorGrabbing,
+                update: updateEditorGrabbing,
+                exit: exitEditorGrabbing
+            },
+            EDITOR_DIRECT_SCALING: {
+                enter: enterEditorDirectScaling,
+                update: updateEditorDirectScaling,
+                exit: exitEditorDirectScaling
+            },
+            EDITOR_HANDLE_SCALING: {
+                enter: enterEditorHandleScaling,
+                update: updateEditorHandleScaling,
+                exit: exitEditorHandleScaling
+            },
+            EDITOR_CLONING: {
+                enter: enterEditorCloning,
+                update: null,
+                exit: exitEditorCloning
+            },
+            EDITOR_GROUPING: {
+                enter: enterEditorGrouping,
+                update: null,
+                exit: exitEditorGrouping
+            }
+        };
+
+        function setState(state) {
+            if (state !== editorState) {
+                STATE_MACHINE[EDITOR_STATE_STRINGS[editorState]].exit();
+                STATE_MACHINE[EDITOR_STATE_STRINGS[state]].enter();
+                editorState = state;
+            } else {
+                log(side, "ERROR: Editor: Null state transition: " + state + "!");
+            }
+        }
+
+        function updateState() {
+            STATE_MACHINE[EDITOR_STATE_STRINGS[editorState]].update();
+        }
+
+
+        function updateTool() {
+            if (!wasGripClicked && isGripClicked && (toolSelected !== TOOL_NONE)) {
+                Feedback.play(side, Feedback.DROP_TOOL);
+                toolSelected = TOOL_NONE;
+                grouping.clear();
+                ui.clearTool();
+                ui.updateUIOverlays();
+            }
+        }
+
+
+        function update() {
+            var isTriggerPressed,
+                showUI,
+                previousState = editorState,
+                doUpdateState,
+                color;
+
+            intersection = getIntersection();
+            isTriggerClicked = hand.triggerClicked();
+            isGripClicked = hand.gripClicked();
+            isTriggerPressed = hand.triggerPressed();
+
+            // Hide UI if hand is intersecting entity and camera is outside entity, or if hand is intersecting stretch handle.
+            if (side !== dominantHand) {
+                showUI = !intersection.handIntersected || (intersection.entityID !== null
+                    && !isCameraOutsideEntity(intersection.entityID, intersection.intersection));
+                if (showUI !== isUIVisible) {
+                    isUIVisible = !isUIVisible;
+                    ui.setVisible(isUIVisible);
+                }
+            }
+
+            // State update.
+            switch (editorState) {
+                case EDITOR_IDLE:
+                    if (!hand.valid()) {
+                        // No transition.
+                        break;
+                    }
+                    setState(EDITOR_SEARCHING);
+                    break;
+                case EDITOR_SEARCHING:
+                    if (hand.valid()
+                            && !(intersection.overlayID && !wasTriggerClicked && isTriggerClicked
+                                && otherEditor.isHandle(intersection.overlayID))
+                            && !(intersection.entityID && (intersection.editableEntity || toolSelected === TOOL_PICK_COLOR)
+                                && (wasTriggerClicked || !isTriggerClicked) && !isAutoGrab
+                                && (isTriggerPressed 
+                                    || isCameraOutsideEntity(intersection.entityID, intersection.intersection)))
+                            && !(intersection.entityID && (intersection.editableEntity || toolSelected === TOOL_PICK_COLOR)
+                                && (!wasTriggerClicked || isAutoGrab) && isTriggerClicked)) {
+                        // No transition.
+                        updateState();
+                        updateTool();
+                        break;
+                    }
+                    if (!hand.valid()) {
+                        setState(EDITOR_IDLE);
+                    } else if (intersection.overlayID && !wasTriggerClicked && isTriggerClicked
+                            && otherEditor.isHandle(intersection.overlayID)) {
+                        intersectedEntityID = otherEditor.intersectedEntityID();
+                        rootEntityID = otherEditor.rootEntityID();
+                        setState(EDITOR_HANDLE_SCALING);
+                    } else if (intersection.entityID && (intersection.editableEntity || toolSelected === TOOL_PICK_COLOR)
+                            && (wasTriggerClicked || !isTriggerClicked) && !isAutoGrab
+                            && (isTriggerPressed || isCameraOutsideEntity(intersection.entityID, intersection.intersection))) {
+                        intersectedEntityID = intersection.entityID;
+                        rootEntityID = Entities.rootOf(intersectedEntityID);
+                        setState(EDITOR_HIGHLIGHTING);
+                    } else if (intersection.entityID && (intersection.editableEntity || toolSelected === TOOL_PICK_COLOR)
+                            && (!wasTriggerClicked || isAutoGrab) && isTriggerClicked) {
+                        intersectedEntityID = intersection.entityID;
+                        rootEntityID = Entities.rootOf(intersectedEntityID);
+                        if (isAutoGrab) {
+                            setState(EDITOR_GRABBING);
+                        } else if (otherEditor.isEditing(rootEntityID)) {
+                            if (toolSelected !== TOOL_SCALE) {
+                                setState(EDITOR_DIRECT_SCALING);
+                            }
+                        } else if (toolSelected === TOOL_CLONE) {
+                            setState(EDITOR_CLONING);
+                        } else if (toolSelected === TOOL_GROUP || toolSelected === TOOL_GROUP_BOX) {
+                            setState(EDITOR_GROUPING);
+                        } else if (toolSelected === TOOL_COLOR) {
+                            setState(EDITOR_HIGHLIGHTING);
+                            if (selection.applyColor(colorToolColor, false)) {
+                                Feedback.play(side, Feedback.APPLY_PROPERTY);
+                            } else {
+                                Feedback.play(side, Feedback.APPLY_ERROR);
+                            }
+                        } else if (toolSelected === TOOL_PICK_COLOR) {
+                            color = selection.getColor(intersection.entityID);
+                            if (color) {
+                                colorToolColor = color;
+                                ui.doPickColor(colorToolColor);
+                            } else {
+                                Feedback.play(side, Feedback.APPLY_ERROR);
+                            }
+                            toolSelected = TOOL_COLOR;
+                            ui.setToolIcon(ui.COLOR_TOOL);
+                        } else if (toolSelected === TOOL_PHYSICS) {
+                            setState(EDITOR_HIGHLIGHTING);
+                            selection.applyPhysics(physicsToolPhysics);
+                        } else if (toolSelected === TOOL_DELETE) {
+                            setState(EDITOR_HIGHLIGHTING);
+                            Feedback.play(side, Feedback.DELETE_ENTITY);
+                            selection.deleteEntities();
+                            setState(EDITOR_SEARCHING);
+                        } else {
+                            log(side, "ERROR: Editor: Unexpected condition A in EDITOR_SEARCHING!");
+                        }
+                    } else {
+                        log(side, "ERROR: Editor: Unexpected condition B in EDITOR_SEARCHING!");
+                    }
+                    break;
+                case EDITOR_HIGHLIGHTING:
+                    if (hand.valid()
+                            && intersection.entityID && (intersection.editableEntity || toolSelected === TOOL_PICK_COLOR)
+                                && (isTriggerPressed || isCameraOutsideEntity(intersection.entityID, intersection.intersection))
+                            && !(!wasTriggerClicked && isTriggerClicked
+                                && (!otherEditor.isEditing(rootEntityID) || toolSelected !== TOOL_SCALE))
+                            && !(!wasTriggerClicked && isTriggerClicked && intersection.overlayID
+                                && otherEditor.isHandle(intersection.overlayID))) {
+                        // No transition.
+                        doUpdateState = false;
+                        if (otherEditor.isEditing(rootEntityID) !== isOtherEditorEditingEntityID) {
+                            doUpdateState = true;
+                        }
+                        if (Entities.rootOf(intersection.entityID) !== rootEntityID) {
+                            intersectedEntityID = intersection.entityID;
+                            rootEntityID = Entities.rootOf(intersectedEntityID);
+                            doUpdateState = true;
+                        }
+                        if ((toolSelected === TOOL_SCALE) !== wasScaleTool) {
+                            wasScaleTool = toolSelected === TOOL_SCALE;
+                            doUpdateState = true;
+                        }
+                        if ((toolSelected === TOOL_COLOR || toolSelected === TOOL_PHYSICS)
+                                && intersection.entityID !== intersectedEntityID) {
+                            intersectedEntityID = intersection.entityID;
+                            doUpdateState = true;
+                        }
+                        if (doUpdateState) {
+                            updateState();
+                        }
+                        updateTool();
+                        break;
+                    }
+                    if (!hand.valid()) {
+                        setState(EDITOR_IDLE);
+                    } else if (intersection.overlayID && !wasTriggerClicked && isTriggerClicked
+                            && otherEditor.isHandle(intersection.overlayID)) {
+                        intersectedEntityID = otherEditor.intersectedEntityID();
+                        rootEntityID = otherEditor.rootEntityID();
+                        setState(EDITOR_HANDLE_SCALING);
+                    } else if (intersection.entityID && (intersection.editableEntity || toolSelected === TOOL_PICK_COLOR)
+                            && !wasTriggerClicked && isTriggerClicked) {
+                        intersectedEntityID = intersection.entityID; // May be a different entityID.
+                        rootEntityID = Entities.rootOf(intersectedEntityID);
+                        if (otherEditor.isEditing(rootEntityID)) {
+                            if (toolSelected !== TOOL_SCALE) {
+                                setState(EDITOR_DIRECT_SCALING);
+                            } else {
+                                log(side, "ERROR: Editor: Unexpected condition A in EDITOR_HIGHLIGHTING!");
+                            }
+                        } else if (toolSelected === TOOL_CLONE) {
+                            setState(EDITOR_CLONING);
+                        } else if (toolSelected === TOOL_GROUP || toolSelected === TOOL_GROUP_BOX) {
+                            setState(EDITOR_GROUPING);
+                        } else if (toolSelected === TOOL_COLOR) {
+                            if (selection.applyColor(colorToolColor, false)) {
+                                Feedback.play(side, Feedback.APPLY_PROPERTY);
+                            } else {
+                                Feedback.play(side, Feedback.APPLY_ERROR);
+                            }
+                        } else if (toolSelected === TOOL_PICK_COLOR) {
+                            color = selection.getColor(intersection.entityID);
+                            if (color) {
+                                colorToolColor = color;
+                                ui.doPickColor(colorToolColor);
+                                toolSelected = TOOL_COLOR;
+                                ui.setToolIcon(ui.COLOR_TOOL);
+                            } else {
+                                Feedback.play(side, Feedback.APPLY_ERROR);
+                            }
+                        } else if (toolSelected === TOOL_PHYSICS) {
+                            selection.applyPhysics(physicsToolPhysics);
+                        } else if (toolSelected === TOOL_DELETE) {
+                            Feedback.play(side, Feedback.DELETE_ENTITY);
+                            selection.deleteEntities();
+                            setState(EDITOR_SEARCHING);
+                        } else {
+                            setState(EDITOR_GRABBING);
+                        }
+
+                    } else if (!intersection.entityID || !intersection.editableEntity
+                            || (!isTriggerPressed && !isCameraOutsideEntity(intersection.entityID, intersection.intersection))) {
+                        setState(EDITOR_SEARCHING);
+                    } else {
+                        log(side, "ERROR: Editor: Unexpected condition B in EDITOR_HIGHLIGHTING!");
+                    }
+                    break;
+                case EDITOR_GRABBING:
+                    if (hand.valid() && isTriggerClicked && !isGripClicked) {
+                        // Don't test  intersection.intersected because when scaling with handles intersection may lag behind.
+                        // No transition.
+                        if ((toolSelected === TOOL_SCALE) !== wasScaleTool) {
+                            updateState();
+                            wasScaleTool = toolSelected === TOOL_SCALE;
+                        }
+                        // updateTool();  Don't updateTool() because grip button is used to delete grabbed entity.
+                        break;
+                    }
+                    if (!hand.valid()) {
+                        setState(EDITOR_IDLE);
+                    } else if (!isTriggerClicked) {
+                        if (intersection.entityID && intersection.editableEntity) {
+                            intersectedEntityID = intersection.entityID;
+                            rootEntityID = Entities.rootOf(intersectedEntityID);
+                            setState(EDITOR_HIGHLIGHTING);
+                        } else {
+                            setState(EDITOR_SEARCHING);
+                        }
+                    } else if (isGripClicked) {
+                        if (!wasGripClicked) {
+                            Feedback.play(side, Feedback.DELETE_ENTITY);
+                            selection.deleteEntities();
+                            setState(EDITOR_SEARCHING);
+                        }
+                    } else {
+                        log(side, "ERROR: Editor: Unexpected condition in EDITOR_GRABBING!");
+                    }
+                    break;
+                case EDITOR_DIRECT_SCALING:
+                    if (hand.valid() && isTriggerClicked
+                            && (otherEditor.isEditing(rootEntityID) || otherEditor.isHandle(intersection.overlayID))) {
+                        // Don't test for intersection.intersected because when scaling with handles intersection may lag behind.
+                        // Don't test toolSelected === TOOL_SCALE because this is a UI element and so not able to be changed while 
+                        // scaling with two hands.
+                        // No transition.
+                        updateState();
+                        // updateTool();  Don't updateTool() because this hand is currently using the scaling tool.
+                        break;
+                    }
+                    if (!hand.valid()) {
+                        setState(EDITOR_IDLE);
+                    } else if (!isTriggerClicked) {
+                        if (!intersection.entityID || !intersection.editableEntity) {
+                            setState(EDITOR_SEARCHING);
+                        } else {
+                            intersectedEntityID = intersection.entityID;
+                            rootEntityID = Entities.rootOf(intersectedEntityID);
+                            setState(EDITOR_HIGHLIGHTING);
+                        }
+                    } else if (!otherEditor.isEditing(rootEntityID)) {
+                        // Grab highlightEntityID that was scaling and has already been set.
+                        setState(EDITOR_GRABBING);
+                    } else {
+                        log(side, "ERROR: Editor: Unexpected condition in EDITOR_DIRECT_SCALING!");
+                    }
+                    break;
+                case EDITOR_HANDLE_SCALING:
+                    if (hand.valid() && isTriggerClicked && otherEditor.isEditing(rootEntityID)) {
+                        // Don't test intersection.intersected because when scaling with handles intersection may lag behind.
+                        // Don't test toolSelected === TOOL_SCALE because this is a UI element and so not able to be changed 
+                        // while scaling with two hands.
+                        // No transition.
+                        updateState();
+                        updateTool();
+                        break;
+                    }
+                    if (!hand.valid()) {
+                        setState(EDITOR_IDLE);
+                    } else if (!isTriggerClicked) {
+                        if (!intersection.entityID || !intersection.editableEntity) {
+                            setState(EDITOR_SEARCHING);
+                        } else {
+                            intersectedEntityID = intersection.entityID;
+                            rootEntityID = Entities.rootOf(intersectedEntityID);
+                            setState(EDITOR_HIGHLIGHTING);
+                        }
+                    } else if (!otherEditor.isEditing(rootEntityID)) {
+                        // Grab highlightEntityID that was scaling and has already been set.
+                        setState(EDITOR_GRABBING);
+                    } else {
+                        log(side, "ERROR: Editor: Unexpected condition in EDITOR_HANDLE_SCALING!");
+                    }
+                    break;
+                case EDITOR_CLONING:
+                    // Immediate transition out of state after cloning entities during state entry.
+                    if (hand.valid() && isTriggerClicked) {
+                        setState(EDITOR_GRABBING);
+                    } else if (!hand.valid()) {
+                        setState(EDITOR_IDLE);
+                    } else if (!isTriggerClicked) {
+                        if (intersection.entityID && intersection.editableEntity) {
+                            intersectedEntityID = intersection.entityID;
+                            rootEntityID = Entities.rootOf(intersectedEntityID);
+                            setState(EDITOR_HIGHLIGHTING);
+                        } else {
+                            setState(EDITOR_SEARCHING);
+                        }
+                    } else {
+                        log(side, "ERROR: Editor: Unexpected condition in EDITOR_CLONING!");
+                    }
+                    break;
+                case EDITOR_GROUPING:
+                    // Immediate transition out of state after updating group data during state entry.
+                    if (hand.valid() && isTriggerClicked) {
+                        // No transition.
+                        break;
+                    }
+                    if (!hand.valid()) {
+                        setState(EDITOR_IDLE);
+                    } else {
+                        setState(EDITOR_SEARCHING);
+                    }
+                    break;
+            }
+
+            wasTriggerClicked = isTriggerClicked;
+            wasGripClicked = isGripClicked;
+            isAutoGrab = isAutoGrab && isTriggerClicked && !isGripClicked;
+
+            if (DEBUG && editorState !== previousState) {
+                debug(side, EDITOR_STATE_STRINGS[editorState]);
+            }
+        }
+
+        function apply() {
+            switch (editorState) {
+                case EDITOR_GRABBING:
+                    if (isDirectScaling) {
+                        applyDirectScale();
+                    } else if (isHandleScaling) {
+                        applyHandleScale();
+                    } else {
+                        applyGrab();
+                    }
+                    break;
+            }
+        }
+
+        function clear() {
+            if (editorState !== EDITOR_IDLE) {
+                setState(EDITOR_IDLE);
+            }
+
+            selection.clear();
+            highlights.clear();
+            handles.clear();
+            otherEditor.setHandleOverlays([]);
+        }
+
+        function destroy() {
+            if (selection) {
+                selection.destroy();
+                selection = null;
+            }
+            if (highlights) {
+                highlights.destroy();
+                highlights = null;
+            }
+            if (handles) {
+                handles.destroy();
+                handles = null;
+            }
+        }
+
+        return {
+            setReferences: setReferences,
+            hoverHandle: hoverHandle,
+            enableAutoGrab: enableAutoGrab,
+            isHandle: isHandle,
+            setHandleOverlays: setHandleOverlays,
+            isEditing: isEditing,
+            isScaling: isScaling,
+            intersectedEntityID: getIntersectedEntityID,
+            rootEntityID: getRootEntityID,
+            startDirectScaling: startDirectScaling,
+            updateDirectScaling: updateDirectScaling,
+            stopDirectScaling: stopDirectScaling,
+            startHandleScaling: startHandleScaling,
+            updateHandleScaling: updateHandleScaling,
+            stopHandleScaling: stopHandleScaling,
+            update: update,
+            apply: apply,
+            clear: clear,
+            destroy: destroy
+        };
+    };
+
+
+    Grouping = function () {
+        // Grouping highlights and functions.
+
+        var groups,
+            highlights,
+            selectInBoxSelection, // Selection of all entities selected.
+            groupSelection, // New group to add to selection.
+            exludedLeftRootEntityID = null,
+            exludedrightRootEntityID = null,
+            excludedRootEntityIDs = [],
+            hasHighlights = false,
+            hasSelectionChanged = false,
+            isSelectInBox = false;
+
+        if (!(this instanceof Grouping)) {
+            return new Grouping();
+        }
+
+        groups = new Groups();
+        highlights = new Highlights();
+        selectInBoxSelection = new SelectionManager();
+        groupSelection = new SelectionManager();
+
+        function getAllChildrenIDs(entityID) {
+            var childrenIDs = [],
+                ENTITY_TYPE = "entity";
+
+            function traverseEntityTree(id) {
+                var children,
+                    i,
+                    length;
+                children = Entities.getChildrenIDs(id);
+                for (i = 0, length = children.length; i < length; i++) {
+                    if (Entities.getNestableType(children[i]) === ENTITY_TYPE) {
+                        childrenIDs.push(children[i]);
+                        traverseEntityTree(children[i]);
+                    }
+                }
+            }
+
+            traverseEntityTree(entityID);
+            return childrenIDs;
+        }
+
+        function isInsideBoundingBox(entityID, boundingBox) {
+            // Are all 8 corners of entityID's bounding box inside boundingBox?
+            var entityProperties,
+                cornerPosition,
+                boundingBoxInverseRotation,
+                boundingBoxHalfDimensions,
+                isInside = true,
+                i,
+                CORNER_REGISTRATION_OFFSETS = [
+                    { x: 0, y: 0, z: 0 },
+                    { x: 0, y: 0, z: 1 },
+                    { x: 0, y: 1, z: 0 },
+                    { x: 0, y: 1, z: 1 },
+                    { x: 1, y: 0, z: 0 },
+                    { x: 1, y: 0, z: 1 },
+                    { x: 1, y: 1, z: 0 },
+                    { x: 1, y: 1, z: 1 }
+                ],
+                NUM_CORNERS = 8;
+
+            entityProperties = Entities.getEntityProperties(entityID, ["position", "rotation", "dimensions",
+                "registrationPoint"]);
+
+            // Convert entity coordinates into boundingBox coordinates.
+            boundingBoxInverseRotation = Quat.inverse(boundingBox.orientation);
+            entityProperties.position = Vec3.multiplyQbyV(boundingBoxInverseRotation,
+                Vec3.subtract(entityProperties.position, boundingBox.center));
+            entityProperties.rotation = Quat.multiply(boundingBoxInverseRotation, entityProperties.rotation);
+
+            // Check all 8 corners of entity's bounding box are inside the given bounding box.
+            boundingBoxHalfDimensions = Vec3.multiply(0.5, boundingBox.dimensions);
+            i = 0;
+            while (isInside && i < NUM_CORNERS) {
+                cornerPosition = Vec3.sum(entityProperties.position, Vec3.multiplyQbyV(entityProperties.rotation,
+                    Vec3.multiplyVbyV(Vec3.subtract(CORNER_REGISTRATION_OFFSETS[i], entityProperties.registrationPoint),
+                        entityProperties.dimensions)));
+                isInside = Math.abs(cornerPosition.x) <= boundingBoxHalfDimensions.x
+                    && Math.abs(cornerPosition.y) <= boundingBoxHalfDimensions.y
+                    && Math.abs(cornerPosition.z) <= boundingBoxHalfDimensions.z;
+                i++;
+            }
+
+            return isInside;
+        }
+
+        function toggle(selection) {
+            groups.toggle(selection);
+            if (isSelectInBox) {
+                // When selecting in a box, toggle() is only called to add entities to the selection.
+                if (selectInBoxSelection.count() === 0) {
+                    selectInBoxSelection.select(selection[0].id);
+                } else {
+                    selectInBoxSelection.append(selection[0].id);
+                }
+            }
+            if (groups.groupsCount() === 0) {
+                hasHighlights = false;
+                highlights.clear();
+            } else {
+                hasHighlights = true;
+                hasSelectionChanged = true;
+            }
+        }
+
+        function selectInBox() {
+            // Add any entities or groups of entities wholly within bounding box of current selection.
+            // Must be wholly within otherwise selection could grow uncontrollably.
+            var boundingBox,
+                entityIDs,
+                checkedEntityIDs = [],
+                entityID,
+                rootID,
+                groupIDs,
+                doIncludeGroup,
+                i,
+                lengthI,
+                j,
+                lengthJ;
+
+            if (selectInBoxSelection.count() > 1) {
+                boundingBox = selectInBoxSelection.boundingBox();
+                entityIDs = Entities.findEntities(boundingBox.center, Vec3.length(boundingBox.dimensions) / 2);
+                for (i = 0, lengthI = entityIDs.length; i < lengthI; i++) {
+                    entityID = entityIDs[i];
+                    if (checkedEntityIDs.indexOf(entityID) === -1) {
+                        rootID = Entities.rootOf(entityID);
+                        if (!selectInBoxSelection.contains(entityID) && Entities.hasEditableRoot(rootID)) {
+                            groupIDs = [rootID].concat(getAllChildrenIDs(rootID));
+                            doIncludeGroup = true;
+                            j = 0;
+                            lengthJ = groupIDs.length;
+                            while (doIncludeGroup && j < lengthJ) {
+                                doIncludeGroup = isInsideBoundingBox(groupIDs[j], boundingBox);
+                                j++;
+                            }
+                            checkedEntityIDs = checkedEntityIDs.concat(groupIDs);
+                            if (doIncludeGroup) {
+                                groupSelection.select(rootID);
+                                groups.toggle(groupSelection.selection());
+                                groupSelection.clear();
+                                selectInBoxSelection.append(rootID);
+                                hasSelectionChanged = true;
+                            }
+                        } else {
+                            checkedEntityIDs.push(rootID);
+                        }
+                    }
+                }
+            }
+        }
+
+        function startSelectInBox() {
+            // Start automatically selecting entities in bounding box of current selection.
+            var rootEntityIDs,
+                i,
+                length;
+
+            isSelectInBox = true;
+
+            // Select entities current groups combined.
+            rootEntityIDs = groups.rootEntityIDs();
+            if (rootEntityIDs.length > 0) {
+                selectInBoxSelection.select(rootEntityIDs[0]);
+                for (i = 1, length = rootEntityIDs.length; i < length; i++) {
+                    selectInBoxSelection.append(rootEntityIDs[i]);
+                }
+            }
+
+            // Add any enclosed entities.
+            selectInBox();
+
+            // Show bounding box overlay plus any newly selected entities.
+            hasSelectionChanged = true;
+        }
+
+        function stopSelectInBox() {
+            // Stop automatically selecting entities within bounding box of current selection.
+
+            // Hide bounding box overlay.
+            selectInBoxSelection.clear();
+            hasSelectionChanged = true;
+
+            isSelectInBox = false;
+        }
+
+        function includes(rootEntityID) {
+            return groups.includes(rootEntityID);
+        }
+
+        function groupsCount() {
+            return groups.groupsCount();
+        }
+
+        function entitiesCount() {
+            return groups.entitiesCount();
+        }
+
+        function group() {
+            groups.group();
+        }
+
+        function ungroup() {
+            groups.ungroup();
+        }
+
+        function update(leftRootEntityID, rightRootEntityID) {
+            // Update highlights displayed, excluding entities highlighted by left or right hands.
+            var hasExludedRootEntitiesChanged,
+                boundingBox;
+
+            hasExludedRootEntitiesChanged = leftRootEntityID !== exludedLeftRootEntityID
+                || rightRootEntityID !== exludedrightRootEntityID;
+
+            if (!hasHighlights || (!hasSelectionChanged && !hasExludedRootEntitiesChanged)) {
+                return;
+            }
+
+            if (hasExludedRootEntitiesChanged) {
+                excludedRootEntityIDs = [];
+                if (leftRootEntityID) {
+                    excludedRootEntityIDs.push(leftRootEntityID);
+                }
+                if (rightRootEntityID) {
+                    excludedRootEntityIDs.push(rightRootEntityID);
+                }
+                exludedLeftRootEntityID = leftRootEntityID;
+                exludedrightRootEntityID = rightRootEntityID;
+            }
+
+            boundingBox = isSelectInBox && selectInBoxSelection.count() > 1 ? selectInBoxSelection.boundingBox() : null;
+            highlights.display(false, groups.selection(excludedRootEntityIDs), null, boundingBox, highlights.GROUP_COLOR);
+            hasSelectionChanged = false;
+        }
+
+        function clear() {
+            if (isSelectInBox) {
+                stopSelectInBox();
+            }
+            groups.clear();
+            highlights.clear();
+        }
+
+        function destroy() {
+            if (groups) {
+                groups.destroy();
+                groups = null;
+            }
+            if (highlights) {
+                highlights.destroy();
+                highlights = null;
+            }
+            if (selectInBoxSelection) {
+                selectInBoxSelection.destroy();
+                selectInBoxSelection = null;
+            }
+            if (groupSelection) {
+                groupSelection.destroy();
+                groupSelection = null;
+            }
+        }
+
+        return {
+            toggle: toggle,
+            startSelectInBox: startSelectInBox,
+            selectInBox: selectInBox,
+            stopSelectInBox: stopSelectInBox,
+            includes: includes,
+            groupsCount: groupsCount,
+            entitiesCount: entitiesCount,
+            group: group,
+            ungroup: ungroup,
+            update: update,
+            clear: clear,
+            destroy: destroy
+        };
+    };
+
+
+    function update() {
+        // Main update loop.
+        updateTimer = null;
+
+        // Update inputs - hands and lasers.
+        inputs[LEFT_HAND].update();
+        inputs[RIGHT_HAND].update();
+
+        // UI has first dibs on handling inputs.
+        ui.update();
+
+        // Each hand's edit action depends on the state of the other hand, so update the states first then apply actions.
+        editors[LEFT_HAND].update();
+        editors[RIGHT_HAND].update();
+        editors[LEFT_HAND].apply();
+        editors[RIGHT_HAND].apply();
+
+        // Grouping display.
+        grouping.update(editors[LEFT_HAND].rootEntityID(), editors[RIGHT_HAND].rootEntityID());
+
+        updateTimer = Script.setTimeout(update, UPDATE_LOOP_TIMEOUT);
+    }
+
+    function updateControllerDispatcher() {
+        // Communicate app status to controllerDispatcher.js.
+        var DISABLE_HANDS = "both",
+            ENABLE_HANDS = "none";
+        Messages.sendLocalMessage("Hifi-InVREdit-Disabler", isAppActive ? DISABLE_HANDS : ENABLE_HANDS);
+    }
+
+    function onUICommand(command, parameter) {
+        switch (command) {
+            case "scaleTool":
+                Feedback.play(dominantHand, Feedback.EQUIP_TOOL);
+                grouping.clear();
+                toolSelected = TOOL_SCALE;
+                ui.setToolIcon(ui.SCALE_TOOL);
+                ui.updateUIOverlays();
+                break;
+            case "cloneTool":
+                Feedback.play(dominantHand, Feedback.EQUIP_TOOL);
+                grouping.clear();
+                toolSelected = TOOL_CLONE;
+                ui.setToolIcon(ui.CLONE_TOOL);
+                ui.updateUIOverlays();
+                break;
+            case "groupTool":
+                Feedback.play(dominantHand, Feedback.EQUIP_TOOL);
+                toolSelected = TOOL_GROUP;
+                ui.setToolIcon(ui.GROUP_TOOL);
+                ui.updateUIOverlays();
+                break;
+            case "colorTool":
+                Feedback.play(dominantHand, Feedback.EQUIP_TOOL);
+                grouping.clear();
+                toolSelected = TOOL_COLOR;
+                ui.setToolIcon(ui.COLOR_TOOL);
+                colorToolColor = parameter;
+                ui.updateUIOverlays();
+                break;
+            case "pickColorTool":
+                if (parameter) {
+                    grouping.clear();
+                    toolSelected = TOOL_PICK_COLOR;
+                    ui.updateUIOverlays();
+                } else {
+                    Feedback.play(dominantHand, Feedback.EQUIP_TOOL);
+                    grouping.clear();
+                    toolSelected = TOOL_COLOR;
+                    ui.updateUIOverlays();
+                }
+                break;
+            case "physicsTool":
+                Feedback.play(dominantHand, Feedback.EQUIP_TOOL);
+                grouping.clear();
+                toolSelected = TOOL_PHYSICS;
+                ui.setToolIcon(ui.PHYSICS_TOOL);
+                ui.updateUIOverlays();
+                break;
+            case "deleteTool":
+                Feedback.play(dominantHand, Feedback.EQUIP_TOOL);
+                grouping.clear();
+                toolSelected = TOOL_DELETE;
+                ui.setToolIcon(ui.DELETE_TOOL);
+                ui.updateUIOverlays();
+                break;
+            case "clearTool":
+                Feedback.play(dominantHand, Feedback.DROP_TOOL);
+                grouping.clear();
+                toolSelected = TOOL_NONE;
+                ui.clearTool();
+                ui.updateUIOverlays();
+                break;
+
+            case "groupButton":
+                Feedback.play(dominantHand, Feedback.APPLY_PROPERTY);
+                grouping.group();
+                grouping.clear();
+                toolSelected = TOOL_NONE;
+                ui.clearTool();
+                ui.updateUIOverlays();
+                break;
+            case "ungroupButton":
+                Feedback.play(dominantHand, Feedback.APPLY_PROPERTY);
+                grouping.ungroup();
+                grouping.clear();
+                toolSelected = TOOL_NONE;
+                ui.clearTool();
+                ui.updateUIOverlays();
+                break;
+            case "toggleGroupSelectionBoxTool":
+                toolSelected = parameter ? TOOL_GROUP_BOX : TOOL_GROUP;
+                if (toolSelected === TOOL_GROUP_BOX) {
+                    grouping.startSelectInBox();
+                } else {
+                    grouping.stopSelectInBox();
+                }
+                break;
+            case "clearGroupSelectionTool":
+                if (grouping.groupsCount() > 0) {
+                    Feedback.play(dominantHand, Feedback.SELECT_ENTITY);
+                }
+                grouping.clear();
+                if (toolSelected === TOOL_GROUP_BOX) {
+                    grouping.startSelectInBox();
+                }
+                break;
+
+            case "setColor":
+                if (toolSelected === TOOL_PICK_COLOR) {
+                    toolSelected = TOOL_COLOR;
+                    ui.setToolIcon(ui.COLOR_TOOL);
+                }
+                colorToolColor = parameter;
+                break;
+
+            case "setGravityOn":
+                // Dynamic is true if the entity has gravity or is grabbable.
+                if (parameter) {
+                    physicsToolPhysics.gravity = { x: 0, y: physicsToolGravity, z: 0 };
+                    physicsToolPhysics.dynamic = true;
+                } else {
+                    physicsToolPhysics.gravity = Vec3.ZERO;
+                    physicsToolPhysics.dynamic = physicsToolPhysics.userData.grabbableKey.grabbable === true;
+                }
+                break;
+            case "setGrabOn":
+                // Dynamic is true if the entity has gravity or is grabbable.
+                physicsToolPhysics.userData.grabbableKey.grabbable = parameter;
+                physicsToolPhysics.dynamic = parameter
+                    || (physicsToolPhysics.gravity && Vec3.length(physicsToolPhysics.gravity) > 0);
+                break;
+            case "setCollideOn":
+                if (parameter) {
+                    physicsToolPhysics.collisionless = false;
+                    physicsToolPhysics.collidesWith = "static,dynamic,kinematic,myAvatar,otherAvatar";
+                } else {
+                    physicsToolPhysics.collisionless = true;
+                    physicsToolPhysics.collidesWith = "";
+                }
+                break;
+
+            case "setGravity":
+                if (parameter !== undefined) {
+                    // Power range 0.0, 0.5, 1.0 maps to -50.0, -9.80665, 50.0.
+                    physicsToolGravity = 82.36785162 * Math.pow(2.214065901, parameter) - 132.36785;
+                    if (physicsToolPhysics.dynamic === true) { // Only apply if gravity is turned on.
+                        physicsToolPhysics.gravity = { x: 0, y: physicsToolGravity, z: 0 };
+                    }
+                }
+                break;
+            case "setBounce":
+                if (parameter !== undefined) {
+                    // Linear range from 0.0, 0.5, 1.0 maps to 0.0, 0.5, 1.0;
+                    physicsToolPhysics.restitution = parameter;
+                }
+                break;
+            case "setFriction":
+                if (parameter !== undefined) {
+                    // Power range 0.0, 0.5, 1.0 maps to 0, 0.39, 1.0.
+                    physicsToolPhysics.damping = 0.69136364 * Math.pow(2.446416831, parameter) - 0.691364;
+                    // Power range 0.0, 0.5, 1.0 maps to 0, 0.3935, 1.0.
+                    physicsToolPhysics.angularDamping = 0.72695892 * Math.pow(2.375594, parameter) - 0.726959;
+                    // Linear range from 0.0, 0.5, 1.0 maps to 0.0, 0.5, 1.0;
+                    physicsToolPhysics.friction = parameter;
+                }
+                break;
+            case "setDensity":
+                if (parameter !== undefined) {
+                    // Power range 0.0, 0.5, 1.0 maps to 100, 1000, 10000.
+                    physicsToolPhysics.density = Math.pow(10, 2 + 2 * parameter);
+                }
+                break;
+
+            case "autoGrab":
+                if (dominantHand === LEFT_HAND) {
+                    editors[LEFT_HAND].enableAutoGrab();
+                } else {
+                    editors[RIGHT_HAND].enableAutoGrab();
+                }
+                break;
+
+            case "undoAction":
+                if (History.hasUndo()) {
+                    Feedback.play(dominantHand, Feedback.UNDO_ACTION);
+                    History.undo();
+                } else {
+                    Feedback.play(dominantHand, Feedback.GENERAL_ERROR);
+                }
+                break;
+            case "redoAction":
+                if (History.hasRedo()) {
+                    Feedback.play(dominantHand, Feedback.REDO_ACTION);
+                    History.redo();
+                } else {
+                    Feedback.play(dominantHand, Feedback.GENERAL_ERROR);
+                }
+                break;
+
+            default:
+                log("ERROR: Unexpected command in onUICommand(): " + command + ", " + parameter);
+        }
+    }
+
+    function startApp() {
+        ui.display();
+        update(); // Start main update loop.
+    }
+
+    function stopApp() {
+        Script.clearTimeout(updateTimer);
+        updateTimer = null;
+        inputs[LEFT_HAND].clear();
+        inputs[RIGHT_HAND].clear();
+        ui.clear();
+        grouping.clear();
+        editors[LEFT_HAND].clear();
+        editors[RIGHT_HAND].clear();
+        toolSelected = TOOL_NONE;
+    }
+
+
+    function onAppButtonClicked() {
+        var NOTIFICATIONS_MESSAGE_CHANNEL = "Hifi-Notifications",
+            EDIT_ERROR = 4, // Per notifications.js.
+            INSUFFICIENT_PERMISSIONS_ERROR_MSG =
+                "You do not have the necessary permissions to edit on this domain."; // Same as edit.js.
+
+        // Application tablet/toolbar button clicked.
+        if (!isAppActive && !(Entities.canRez() || Entities.canRezTmp())) {
+            Feedback.play(dominantHand, Feedback.GENERAL_ERROR);
+            Messages.sendLocalMessage(NOTIFICATIONS_MESSAGE_CHANNEL, JSON.stringify({
+                message: INSUFFICIENT_PERMISSIONS_ERROR_MSG,
+                notificationType: EDIT_ERROR
+            }));
+            return;
+        }
+
+        isAppActive = !isAppActive;
+        updateControllerDispatcher();
+        button.editProperties({ isActive: isAppActive });
+
+        if (isAppActive) {
+            startApp();
+        } else {
+            stopApp();
+        }
+    }
+
+    function onDomainChanged() {
+        // Fires when domain starts or domain changes; does not fire when domain stops.
+        var hasRezPermissions = Entities.canRez() || Entities.canRezTmp();
+        if (isAppActive && !hasRezPermissions) {
+            isAppActive = false;
+            updateControllerDispatcher();
+            stopApp();
+        }
+        button.editProperties({
+            icon: hasRezPermissions ? APP_ICON_INACTIVE : APP_ICON_DISABLED,
+            captionColorOverride: hasRezPermissions ? ENABLED_CAPTION_COLOR_OVERRIDE : DISABLED_CAPTION_COLOR_OVERRIDE,
+            isActive: isAppActive
+        });
+    }
+
+    function onCanRezChanged() {
+        // canRez or canRezTmp changed.
+        var hasRezPermissions = Entities.canRez() || Entities.canRezTmp();
+        if (isAppActive && !hasRezPermissions) {
+            isAppActive = false;
+            updateControllerDispatcher();
+            stopApp();
+        }
+        button.editProperties({
+            icon: hasRezPermissions ? APP_ICON_INACTIVE : APP_ICON_DISABLED,
+            captionColorOverride: hasRezPermissions ? ENABLED_CAPTION_COLOR_OVERRIDE : DISABLED_CAPTION_COLOR_OVERRIDE,
+            isActive: isAppActive
+        });
+    }
+
+    function onMessageReceived(channel) {
+        // Hacky but currently the only way of detecting server stopping or restarting. Also occurs if changing domains.
+        // TODO: Remove this when Window.domainChanged or other signal is emitted when you disconnect from a domain.
+        if (channel === DOMAIN_CHANGED_MESSAGE) {
+            // Happens a little while after server goes away.
+            if (isAppActive && !location.isConnected) {
+                // Interface deletes all overlays when domain connection is lost; restart app to work around this.
+                stopApp();
+                startApp();
+            }
+        }
+    }
+
+    function onDominantHandChanged(hand) {
+        dominantHand = hand === "left" ? LEFT_HAND : RIGHT_HAND;
+
+        if (isAppActive) {
+            // Stop operations.
+            stopApp();
+        }
+
+        // Swap UI hands.
+        ui.setHand(otherHand(dominantHand));
+
+        if (isAppActive) {
+            // Resume operations.
+            startApp();
+        }
+    }
+
+    function onSkeletonChanged() {
+        if (isAppActive) {
+            // Close the app because the new avatar may have different joint numbers meaning that the UI would be attached 
+            // incorrectly. Let the user reopen the app because it can take some time for the new avatar to load.
+            isAppActive = false;
+            updateControllerDispatcher();
+            button.editProperties({ isActive: false });
+            stopApp();
+        }
+    }
+
+
+    function setUp() {
+        var hasRezPermissions;
+
+        tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
+        if (!tablet) {
+            App.log("ERROR: Tablet not found! App not started.");
+            return;
+        }
+
+        // Application state.
+        isAppActive = false;
+        updateControllerDispatcher();
+        dominantHand = MyAvatar.getDominantHand() === "left" ? LEFT_HAND : RIGHT_HAND;
+
+        // Tablet/toolbar button.
+        hasRezPermissions = Entities.canRez() || Entities.canRezTmp();
+        button = tablet.addButton({
+            icon: hasRezPermissions ? APP_ICON_INACTIVE : APP_ICON_DISABLED,
+            captionColorOverride: hasRezPermissions ? ENABLED_CAPTION_COLOR_OVERRIDE : DISABLED_CAPTION_COLOR_OVERRIDE,
+            activeIcon: APP_ICON_ACTIVE,
+            text: APP_NAME,
+            isActive: isAppActive
+        });
+        if (button) {
+            button.clicked.connect(onAppButtonClicked);
+        }
+
+        // Input objects.
+        inputs[LEFT_HAND] = new Inputs(LEFT_HAND);
+        inputs[RIGHT_HAND] = new Inputs(RIGHT_HAND);
+
+        // UI object.
+        ui = new UI(otherHand(dominantHand), inputs[LEFT_HAND], inputs[RIGHT_HAND], onUICommand);
+
+        // Editor objects.
+        editors[LEFT_HAND] = new Editor(LEFT_HAND);
+        editors[RIGHT_HAND] = new Editor(RIGHT_HAND);
+        editors[LEFT_HAND].setReferences(inputs[LEFT_HAND], editors[RIGHT_HAND]);
+        editors[RIGHT_HAND].setReferences(inputs[RIGHT_HAND], editors[LEFT_HAND]);
+
+        // Grouping object.
+        grouping = new Grouping();
+
+        // Changes.
+        Window.domainChanged.connect(onDomainChanged);
+        Entities.canRezChanged.connect(onCanRezChanged);
+        Entities.canRezTmpChanged.connect(onCanRezChanged);
+        Messages.subscribe(DOMAIN_CHANGED_MESSAGE);
+        Messages.messageReceived.connect(onMessageReceived);
+        MyAvatar.dominantHandChanged.connect(onDominantHandChanged);
+        MyAvatar.skeletonChanged.connect(onSkeletonChanged);
+    }
+
+    function tearDown() {
+        if (!tablet) {
+            return;
+        }
+
+        if (updateTimer) {
+            Script.clearTimeout(updateTimer);
+        }
+
+        Window.domainChanged.disconnect(onDomainChanged);
+        Entities.canRezChanged.disconnect(onCanRezChanged);
+        Entities.canRezTmpChanged.disconnect(onCanRezChanged);
+        Messages.messageReceived.disconnect(onMessageReceived);
+        // Messages.unsubscribe(DOMAIN_CHANGED_MESSAGE);  Do not unsubscribe because edit.js also subscribes and 
+        // Messages.subscribe works script engine-wide which would mess things up if they're both run in the same engine.
+        MyAvatar.dominantHandChanged.disconnect(onDominantHandChanged);
+        MyAvatar.skeletonChanged.disconnect(onSkeletonChanged);
+
+        isAppActive = false;
+        updateControllerDispatcher();
+
+        if (button) {
+            button.clicked.disconnect(onAppButtonClicked);
+            tablet.removeButton(button);
+            button = null;
+        }
+
+        if (grouping) {
+            grouping.destroy();
+            grouping = null;
+        }
+
+        if (editors[LEFT_HAND]) {
+            editors[LEFT_HAND].destroy();
+            editors[LEFT_HAND] = null;
+        }
+        if (editors[RIGHT_HAND]) {
+            editors[RIGHT_HAND].destroy();
+            editors[RIGHT_HAND] = null;
+        }
+
+        if (ui) {
+            ui.destroy();
+            ui = null;
+        }
+
+        if (inputs[LEFT_HAND]) {
+            inputs[LEFT_HAND].destroy();
+            inputs[LEFT_HAND] = null;
+        }
+        if (inputs[RIGHT_HAND]) {
+            inputs[RIGHT_HAND].destroy();
+            inputs[RIGHT_HAND] = null;
+        }
+
+        tablet = null;
+    }
+
+    Script.setTimeout(setUp, START_DELAY); // Delay start so that Entities.canRez() work; button is enabled correctly.
+    Script.scriptEnding.connect(tearDown);
+}());
diff --git a/unpublishedScripts/marketplace/shapes/utilities/utilities.js b/unpublishedScripts/marketplace/shapes/utilities/utilities.js
new file mode 100644
index 0000000000..b67ba0d9d2
--- /dev/null
+++ b/unpublishedScripts/marketplace/shapes/utilities/utilities.js
@@ -0,0 +1,125 @@
+//
+//  utilities.js
+//
+//  Created by David Rowe on 21 Jul 2017.
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+if (typeof Vec3.min !== "function") {
+    Vec3.min = function (a, b) {
+        return { x: Math.min(a.x, b.x), y: Math.min(a.y, b.y), z: Math.min(a.z, b.z) };
+    };
+}
+
+if (typeof Vec3.max !== "function") {
+    Vec3.max = function (a, b) {
+        return { x: Math.max(a.x, b.x), y: Math.max(a.y, b.y), z: Math.max(a.z, b.z) };
+    };
+}
+
+if (typeof Vec3.abs !== "function") {
+    Vec3.abs = function (a) {
+        return { x: Math.abs(a.x), y: Math.abs(a.y), z: Math.abs(a.z) };
+    };
+}
+
+if (typeof Quat.ZERO !== "object") {
+    // TODO: Change to Quat.IDENTITY.
+    Quat.ZERO = Quat.fromVec3Radians(Vec3.ZERO);
+}
+
+if (typeof Uuid.NULL !== "string") {
+    Uuid.NULL = "{00000000-0000-0000-0000-000000000000}";
+}
+
+if (typeof Uuid.SELF !== "string") {
+    Uuid.SELF = "{00000000-0000-0000-0000-000000000001}";
+}
+
+if (typeof Entities.rootOf !== "function") {
+    Entities.rootOfCache = {
+        CACHE_ENTRY_EXPIRY_TIME: 1000 // ms
+    };
+
+    Entities.rootOf = function (entityID) {
+        if (Entities.rootOfCache[entityID]) {
+            if (Date.now() - Entities.rootOfCache[entityID].timeStamp
+                    < Entities.rootOfCache.CACHE_ENTRY_EXPIRY_TIME) {
+                return Entities.rootOfCache[entityID].rootOf;
+            }
+            delete Entities.rootOfCache[entityID];
+        }
+
+        var rootEntityID,
+            entityProperties,
+            PARENT_PROPERTIES = ["parentID"];
+        rootEntityID = entityID;
+        entityProperties = Entities.getEntityProperties(rootEntityID, PARENT_PROPERTIES);
+        while (entityProperties.parentID && entityProperties.parentID !== Uuid.NULL) {
+            rootEntityID = entityProperties.parentID;
+            entityProperties = Entities.getEntityProperties(rootEntityID, PARENT_PROPERTIES);
+        }
+
+        Entities.rootOfCache[entityID] = {
+            rootOf: rootEntityID,
+            timeStamp: Date.now()
+        };
+        return rootEntityID;
+    };
+}
+
+if (typeof Entities.hasEditableRoot !== "function") {
+    Entities.hasEditableRootCache = {
+        CACHE_ENTRY_EXPIRY_TIME: 5000 // ms
+    };
+
+    Entities.hasEditableRoot = function (entityID) {
+        if (Entities.hasEditableRootCache[entityID]) {
+            if (Date.now() - Entities.hasEditableRootCache[entityID].timeStamp
+                    < Entities.hasEditableRootCache.CACHE_ENTRY_EXPIRY_TIME) {
+                return Entities.hasEditableRootCache[entityID].hasEditableRoot;
+            }
+            delete Entities.hasEditableRootCache[entityID];
+        }
+
+        var EDITIBLE_ENTITY_QUERY_PROPERTYES = ["parentID", "visible", "locked", "type"],
+            NONEDITABLE_ENTITY_TYPES = ["Unknown", "Zone", "Light"],
+            properties,
+            isEditable;
+
+        properties = Entities.getEntityProperties(entityID, EDITIBLE_ENTITY_QUERY_PROPERTYES);
+        while (properties.parentID && properties.parentID !== Uuid.NULL) {
+            properties = Entities.getEntityProperties(properties.parentID, EDITIBLE_ENTITY_QUERY_PROPERTYES);
+        }
+        isEditable = properties.visible && !properties.locked && NONEDITABLE_ENTITY_TYPES.indexOf(properties.type) === -1;
+
+        Entities.hasEditableRootCache[entityID] = {
+            hasEditableRoot: isEditable,
+            timeStamp: Date.now()
+        };
+        return isEditable;
+    };
+}
+
+if (typeof Object.clone !== "function") {
+    Object.clone = function (object) {
+        return JSON.parse(JSON.stringify(object));
+    };
+}
+
+if (typeof Object.merge !== "function") {
+    Object.merge = function (objectA, objectB) {
+        var a = JSON.stringify(objectA),
+            b = JSON.stringify(objectB);
+        if (a === "{}") {
+            return JSON.parse(b); // Always return a new object.
+        }
+        if (b === "{}") {
+            return JSON.parse(a); // ""
+        }
+        return JSON.parse(a.slice(0, -1) + "," + b.slice(1));
+    };
+}
diff --git a/unpublishedScripts/marketplace/shortbow/bow/bow.js b/unpublishedScripts/marketplace/shortbow/bow/bow.js
index a8e76f76fd..5134fb6fd8 100644
--- a/unpublishedScripts/marketplace/shortbow/bow/bow.js
+++ b/unpublishedScripts/marketplace/shortbow/bow/bow.js
@@ -408,7 +408,6 @@ function getControllerLocation(controllerHand) {
                     dimensions: { "x": 5, "y": 5, "z": 5 },
                     ignoreForCollisions: 1,
                     linePoints: [ { "x": 0, "y": 0, "z": 0 }, { "x": 0, "y": -1.2, "z": 0 } ],
-                    lineWidth: 5,
                     color: { red: 153, green: 102, blue: 51 },
                     name: STRING_NAME,
                     parentID: this.entityID,
@@ -430,7 +429,6 @@ function getControllerLocation(controllerHand) {
         resetStringToIdlePosition: function() {
             Entities.editEntity(this.stringID, {
                 linePoints: [ { "x": 0, "y": 0, "z": 0 }, { "x": 0, "y": -1.2, "z": 0 } ],
-                lineWidth: 5,
                 localPosition: { "x": 0, "y": 0.6, "z": 0.1 },
                 localRotation: { "w": 1, "x": 0, "y": 0, "z": 0 },
             });
diff --git a/unpublishedScripts/marketplace/skyboxChanger/skyboxchanger.js b/unpublishedScripts/marketplace/skyboxChanger/skyboxchanger.js
new file mode 100644
index 0000000000..e7a135ec9e
--- /dev/null
+++ b/unpublishedScripts/marketplace/skyboxChanger/skyboxchanger.js
@@ -0,0 +1,118 @@
+"use strict";
+
+//
+//  skyboxchanger.js
+//
+//  Created by Cain Kilgore on 9th August 2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+(function() {
+    var TABLET_BUTTON_NAME = "SKYBOX";
+
+    var ICONS = {
+        icon: "http://mpassets.highfidelity.com/05904016-8f7d-4dfc-88e1-2bf9ba3fac20-v1/skyboxedit-i.svg",
+        activeIcon: "http://mpassets.highfidelity.com/05904016-8f7d-4dfc-88e1-2bf9ba3fac20-v1/skyboxedit-i.svg"
+    };
+
+    var onSkyboxChangerScreen = false;
+
+    function onClicked() {
+        if (onSkyboxChangerScreen) {
+            tablet.gotoHomeScreen();
+        } else {
+            tablet.loadQMLSource("../SkyboxChanger.qml");
+        }
+    }
+
+    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
+    });
+
+    var hasEventBridge = false;
+
+    function wireEventBridge(on) {
+        if (!tablet) {
+            print("Warning in wireEventBridge(): 'tablet' undefined!");
+            return;
+        }
+        if (on) {
+            if (!hasEventBridge) {
+                tablet.fromQml.connect(fromQml);
+                hasEventBridge = true;
+            }
+        } else {
+            if (hasEventBridge) {
+                tablet.fromQml.disconnect(fromQml);
+                hasEventBridge = false;
+            }
+        }
+    }
+
+    function onScreenChanged(type, url) {
+        if (url === "../SkyboxChanger.qml") {
+            onSkyboxChangerScreen = true;
+        } else { 
+            onSkyboxChangerScreen = false;
+        }
+        
+        button.editProperties({isActive: onSkyboxChangerScreen});
+        wireEventBridge(onSkyboxChangerScreen);
+    }
+
+    function fromQml(message) {
+        switch (message.method) {
+            case 'changeSkybox': // changeSkybox Code
+                var standingZone;
+                if (!Entities.canRez()) {
+                    Window.alert("You need to have rez permissions to change the Skybox.");
+                    break;
+                }
+                
+                var nearbyEntities = Entities.findEntities(MyAvatar.position, 5);
+                for (var i = 0; i < nearbyEntities.length; i++) {
+                    if (Entities.getEntityProperties(nearbyEntities[i]).type === "Zone") {
+                        standingZone = nearbyEntities[i];
+                    }
+                }
+                
+                if (Entities.getEntityProperties(standingZone).locked) {
+                    Window.alert("This zone is currently locked; the Skybox can't be changed.");
+                    break;
+                }
+                
+                var newSkybox = {
+                    skybox: {
+                        url: message.url
+                    },
+                    keyLight: {
+                        ambientURL: message.url
+                    }
+                };
+                
+                Entities.editEntity(standingZone, newSkybox);
+                break;
+            default:
+                print('Unrecognized message from QML: ' + JSON.stringify(message));
+        }
+    }
+        
+    button.clicked.connect(onClicked);
+    tablet.screenChanged.connect(onScreenChanged);
+
+    Script.scriptEnding.connect(function () {
+        if (onSkyboxChangerScreen) {
+            tablet.gotoHomeScreen();
+        }
+        button.clicked.disconnect(onClicked);
+        tablet.screenChanged.disconnect(onScreenChanged);
+        tablet.removeButton(button);
+    });
+}());
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/spectator-camera/cameraOn.wav b/unpublishedScripts/marketplace/spectator-camera/cameraOn.wav
new file mode 100644
index 0000000000..76dbb647b1
Binary files /dev/null and b/unpublishedScripts/marketplace/spectator-camera/cameraOn.wav differ
diff --git a/unpublishedScripts/marketplace/spectator-camera/spectator-camera.fbx b/unpublishedScripts/marketplace/spectator-camera/spectator-camera.fbx
new file mode 100644
index 0000000000..6584264c0d
Binary files /dev/null and b/unpublishedScripts/marketplace/spectator-camera/spectator-camera.fbx differ
diff --git a/unpublishedScripts/marketplace/spectator-camera/spectatorCamera.js b/unpublishedScripts/marketplace/spectator-camera/spectatorCamera.js
new file mode 100644
index 0000000000..f0b943ad92
--- /dev/null
+++ b/unpublishedScripts/marketplace/spectator-camera/spectatorCamera.js
@@ -0,0 +1,514 @@
+"use strict";
+/*jslint vars:true, plusplus:true, forin:true*/
+/*global Tablet, Script,  */
+/* eslint indent: ["error", 4, { "outerIIFEBody": 0 }] */
+//
+// spectatorCamera.js
+//
+// Created by Zach Fox on 2017-06-05
+// Copyright 2017 High Fidelity, Inc
+//
+// Distributed under the Apache License, Version 2.0
+// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+(function () { // BEGIN LOCAL_SCOPE
+
+    // FUNCTION VAR DECLARATIONS
+    var sendToQml, addOrRemoveButton, onTabletScreenChanged, fromQml,
+        onTabletButtonClicked, wireEventBridge, startup, shutdown, registerButtonMappings;
+
+    // Function Name: inFrontOf()
+    //
+    // Description:
+    //   -Returns the position in front of the given "position" argument, where the forward vector is based off
+    //    the "orientation" argument and the amount in front is based off the "distance" argument.
+    function inFrontOf(distance, position, orientation) {
+        return Vec3.sum(position || MyAvatar.position,
+                        Vec3.multiply(distance, Quat.getForward(orientation || MyAvatar.orientation)));
+    }
+
+    // Function Name: spectatorCameraOn()
+    //
+    // Description:
+    //   -Call this function to set up the spectator camera and
+    //    spawn the camera entity.
+    //
+    // Relevant Variables:
+    //   -spectatorCameraConfig: The render configuration of the spectator camera
+    //    render job. It controls various attributes of the Secondary Camera, such as:
+    //      -The entity ID to follow
+    //      -Position
+    //      -Orientation
+    //      -Rendered texture size
+    //      -Vertical field of view
+    //      -Near clip plane distance
+    //      -Far clip plane distance
+    //   -viewFinderOverlay: The in-world overlay that displays the spectator camera's view.
+    //   -camera: The in-world entity that corresponds to the spectator camera.
+    //   -cameraIsDynamic: "false" for now - maybe it shouldn't be? False means that the camera won't drift when you let go...
+    //   -cameraRotation: The rotation of the spectator camera.
+    //   -cameraPosition: The position of the spectator camera.
+    //   -glassPaneWidth: The width of the glass pane above the spectator camera that holds the viewFinderOverlay.
+    //   -viewFinderOverlayDim: The x, y, and z dimensions of the viewFinderOverlay.
+    //   -camera: The camera model which is grabbable.
+    //   -viewFinderOverlay: The preview of what the spectator camera is viewing, placed inside the glass pane.
+    var spectatorCameraConfig = Render.getConfig("SecondaryCamera");
+    var viewFinderOverlay = false;
+    var camera = false;
+    var cameraIsDynamic = false;
+    var cameraRotation;
+    var cameraPosition;
+    var glassPaneWidth = 0.16;
+    // The negative y dimension for viewFinderOverlay is necessary for now due to the way Image3DOverlay
+    // draws textures, but should be looked into at some point. Also the z dimension shouldn't affect
+    // the overlay since it is an Image3DOverlay so it is set to 0.
+    var viewFinderOverlayDim = { x: glassPaneWidth, y: -glassPaneWidth, z: 0 };
+    function spectatorCameraOn() {
+        // Sets the special texture size based on the window it is displayed in, which doesn't include the menu bar
+        spectatorCameraConfig.enableSecondaryCameraRenderConfigs(true);
+        spectatorCameraConfig.resetSizeSpectatorCamera(Window.innerWidth, Window.innerHeight);
+        cameraRotation = Quat.multiply(MyAvatar.orientation, Quat.fromPitchYawRollDegrees(15, -155, 0)), cameraPosition = inFrontOf(0.85, Vec3.sum(MyAvatar.position, { x: 0, y: 0.28, z: 0 }));
+        camera = Entities.addEntity({
+            "angularDamping": 1,
+            "damping": 1,
+            "collidesWith": "static,dynamic,kinematic,",
+            "collisionMask": 7,
+            "dynamic": cameraIsDynamic,
+            "modelURL": Script.resolvePath("spectator-camera.fbx"),
+            "registrationPoint": {
+                "x": 0.56,
+                "y": 0.545,
+                "z": 0.23
+            },
+            "rotation": cameraRotation,
+            "position": cameraPosition,
+            "shapeType": "simple-compound",
+            "type": "Model",
+            "userData": "{\"grabbableKey\":{\"grabbable\":true}}"
+        }, true);
+        spectatorCameraConfig.attachedEntityId = camera;
+        updateOverlay();
+        setDisplay(monitorShowsCameraView);
+        // Change button to active when window is first openend OR if the camera is on, false otherwise.
+        if (button) {
+            button.editProperties({ isActive: onSpectatorCameraScreen || camera });
+        }
+        Audio.playSound(CAMERA_ON_SOUND, {
+            volume: 0.15,
+            position: cameraPosition,
+            localOnly: true
+        });
+    }
+
+    // Function Name: spectatorCameraOff()
+    //
+    // Description:
+    //   -Call this function to shut down the spectator camera and
+    //    destroy the camera entity. "isChangingDomains" is true when this function is called
+    //    from the "Window.domainChanged()" signal.
+    var WAIT_AFTER_DOMAIN_SWITCH_BEFORE_CAMERA_DELETE_MS = 1 * 1000;
+    function spectatorCameraOff(isChangingDomains) {
+        function deleteCamera() {
+            Entities.deleteEntity(camera);
+            camera = false;
+            if (button) {
+                // Change button to active when window is first openend OR if the camera is on, false otherwise.
+                button.editProperties({ isActive: onSpectatorCameraScreen || camera });
+            }
+        }
+
+        spectatorCameraConfig.attachedEntityId = false;
+        spectatorCameraConfig.enableSecondaryCameraRenderConfigs(false);
+        if (camera) {
+            // Workaround for Avatar Entities not immediately having properties after
+            // the "Window.domainChanged()" signal is emitted.
+            // Should be removed after FB6155 is fixed.
+            if (isChangingDomains) {
+                Script.setTimeout(function () {
+                    deleteCamera();
+                    spectatorCameraOn();
+                }, WAIT_AFTER_DOMAIN_SWITCH_BEFORE_CAMERA_DELETE_MS);
+            } else {
+                deleteCamera();
+            }
+        }
+        if (viewFinderOverlay) {
+            Overlays.deleteOverlay(viewFinderOverlay);
+        }
+        viewFinderOverlay = false;
+        setDisplay(monitorShowsCameraView);
+    }
+
+    // Function Name: addOrRemoveButton()
+    //
+    // Description:
+    //   -Used to add or remove the "SPECTATOR" app button from the HUD/tablet. Set the "isShuttingDown" argument
+    //    to true if you're calling this function upon script shutdown. Set the "isHMDmode" to true if the user is
+    //    in HMD; otherwise set to false.
+    //
+    // Relevant Variables:
+    //   -button: The tablet button.
+    //   -buttonName: The name of the button.
+    //   -showSpectatorInDesktop: Set to "true" to show the "SPECTATOR" app in desktop mode.
+    var button = false;
+    var buttonName = "SPECTATOR";
+    var showSpectatorInDesktop = false;
+    function addOrRemoveButton(isShuttingDown, isHMDMode) {
+        if (!tablet) {
+            print("Warning in addOrRemoveButton(): 'tablet' undefined!");
+            return;
+        }
+        if (!button) {
+            if ((isHMDMode || showSpectatorInDesktop) && !isShuttingDown) {
+                button = tablet.addButton({
+                    text: buttonName,
+                    icon: "icons/tablet-icons/spectator-i.svg",
+                    activeIcon: "icons/tablet-icons/spectator-a.svg"
+                });
+                button.clicked.connect(onTabletButtonClicked);
+            }
+        } else if (button) {
+            if ((!isHMDMode && !showSpectatorInDesktop) || isShuttingDown) {
+                button.clicked.disconnect(onTabletButtonClicked);
+                tablet.removeButton(button);
+                button = false;
+            }
+        } else {
+            print("ERROR adding/removing Spectator button!");
+        }
+    }
+
+    // Function Name: startup()
+    //
+    // Description:
+    //   -startup() will be called when the script is loaded.
+    //
+    // Relevant Variables:
+    //   -tablet: The tablet instance to be modified.
+    var tablet = null;
+    function startup() {
+        tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
+        addOrRemoveButton(false, HMD.active);
+        tablet.screenChanged.connect(onTabletScreenChanged);
+        Window.domainChanged.connect(onDomainChanged);
+        Window.geometryChanged.connect(resizeViewFinderOverlay);
+        Controller.keyPressEvent.connect(keyPressEvent);
+        HMD.displayModeChanged.connect(onHMDChanged);
+        viewFinderOverlay = false;
+        camera = false;
+        registerButtonMappings();
+    }
+
+    // Function Name: wireEventBridge()
+    //
+    // Description:
+    //   -Used to connect/disconnect the script's response to the tablet's "fromQml" signal. Set the "on" argument to enable or
+    //    disable to event bridge.
+    //
+    // Relevant Variables:
+    //   -hasEventBridge: true/false depending on whether we've already connected the event bridge.
+    var hasEventBridge = false;
+    function wireEventBridge(on) {
+        if (!tablet) {
+            print("Warning in wireEventBridge(): 'tablet' undefined!");
+            return;
+        }
+        if (on) {
+            if (!hasEventBridge) {
+                tablet.fromQml.connect(fromQml);
+                hasEventBridge = true;
+            }
+        } else {
+            if (hasEventBridge) {
+                tablet.fromQml.disconnect(fromQml);
+                hasEventBridge = false;
+            }
+        }
+    }
+
+    // Function Name: setDisplay()
+    //
+    // Description:
+    //   -There are two bool variables that determine what the "url" argument to "setDisplayTexture(url)" should be:
+    //     Camera on/off switch, and the "Monitor Shows" on/off switch.
+    //     This results in four possible cases for the argument. Those four cases are:
+    //     1. Camera is off; "Monitor Shows" is "HMD Preview": "url" is ""
+    //     2. Camera is off; "Monitor Shows" is "Camera View": "url" is ""
+    //     3. Camera is on; "Monitor Shows" is "HMD Preview":  "url" is ""
+    //     4. Camera is on; "Monitor Shows" is "Camera View":  "url" is "resource://spectatorCameraFrame"
+    function setDisplay(showCameraView) {
+
+        var url = (camera) ? (showCameraView ? "resource://spectatorCameraFrame" : "resource://hmdPreviewFrame") : "";
+        sendToQml({ method: 'showPreviewTextureNotInstructions', setting: !!url, url: url});
+
+        // FIXME: temporary hack to avoid setting the display texture to hmdPreviewFrame
+        // until it is the correct mono.
+        if (url === "resource://hmdPreviewFrame") {
+            Window.setDisplayTexture("");
+        } else {
+            Window.setDisplayTexture(url);
+        }
+    }
+    const MONITOR_SHOWS_CAMERA_VIEW_DEFAULT = false;
+    var monitorShowsCameraView = !!Settings.getValue('spectatorCamera/monitorShowsCameraView', MONITOR_SHOWS_CAMERA_VIEW_DEFAULT);
+    function setMonitorShowsCameraView(showCameraView) {
+        if (showCameraView === monitorShowsCameraView) {
+            return;
+        }
+        monitorShowsCameraView = showCameraView;
+        setDisplay(showCameraView);
+        Settings.setValue('spectatorCamera/monitorShowsCameraView', showCameraView);
+    }
+    function setMonitorShowsCameraViewAndSendToQml(showCameraView) {
+        setMonitorShowsCameraView(showCameraView);
+        sendToQml({ method: 'updateMonitorShowsSwitch', params: showCameraView });
+    }
+    function keyPressEvent(event) {
+        if ((event.text === "0") && !event.isAutoRepeat && !event.isShifted && !event.isMeta && event.isControl && !event.isAlt) {
+            setMonitorShowsCameraViewAndSendToQml(!monitorShowsCameraView);
+        }
+    }
+    function updateOverlay() {
+        // The only way I found to update the viewFinderOverlay without turning the spectator camera on and off is to delete and recreate the
+        //     overlay, which is inefficient but resizing the window shouldn't be performed often
+        if (viewFinderOverlay) {
+            Overlays.deleteOverlay(viewFinderOverlay);
+        }
+        viewFinderOverlay = Overlays.addOverlay("image3d", {
+            url: "resource://spectatorCameraFrame",
+            emissive: true,
+            parentID: camera,
+            alpha: 1,
+            localRotation: { w: 1, x: 0, y: 0, z: 0 },
+            localPosition: { x: 0, y: 0.13, z: 0.126 },
+            dimensions: viewFinderOverlayDim
+        });
+    }
+
+    // Function Name: resizeViewFinderOverlay()
+    //
+    // Description:
+    //   -A function called when the window is moved/resized, which changes the viewFinderOverlay's texture and dimensions to be
+    //    appropriately altered to fit inside the glass pane while not distorting the texture. The "geometryChanged" argument gives information
+    //    on how the window changed, including x, y, width, and height.
+    //
+    // Relevant Variables:
+    //   -glassPaneRatio: The aspect ratio of the glass pane, currently set as a 16:9 aspect ratio (change if model changes).
+    //   -verticalScale: The amount the viewFinderOverlay should be scaled if the window size is vertical.
+    //   -squareScale: The amount the viewFinderOverlay should be scaled if the window size is not vertical but is more square than the
+    //     glass pane's aspect ratio.
+    function resizeViewFinderOverlay(geometryChanged) {
+        var glassPaneRatio = 16 / 9;
+        var verticalScale = 1 / glassPaneRatio;
+        var squareScale = verticalScale * (1 + (1 - (1 / (geometryChanged.width / geometryChanged.height))));
+
+        if (geometryChanged.height > geometryChanged.width) { //vertical window size
+            viewFinderOverlayDim = { x: (glassPaneWidth * verticalScale), y: (-glassPaneWidth * verticalScale), z: 0 };
+        } else if ((geometryChanged.width / geometryChanged.height) < glassPaneRatio) { //square-ish window size, in-between vertical and horizontal
+            viewFinderOverlayDim = { x: (glassPaneWidth * squareScale), y: (-glassPaneWidth * squareScale), z: 0 };
+        } else { //horizontal window size
+            viewFinderOverlayDim = { x: glassPaneWidth, y: -glassPaneWidth, z: 0 };
+        }
+        updateOverlay();
+        spectatorCameraConfig.resetSizeSpectatorCamera(geometryChanged.width, geometryChanged.height);
+        setDisplay(monitorShowsCameraView);
+    }
+
+    const SWITCH_VIEW_FROM_CONTROLLER_DEFAULT = false;
+    var switchViewFromController = !!Settings.getValue('spectatorCamera/switchViewFromController', SWITCH_VIEW_FROM_CONTROLLER_DEFAULT);
+    function setControllerMappingStatus(status) {
+        if (!controllerMapping) {
+            return;
+        }
+        if (status) {
+            controllerMapping.enable();
+        } else {
+            controllerMapping.disable();
+        }
+    }
+    function setSwitchViewFromController(setting) {
+        if (setting === switchViewFromController) {
+            return;
+        }
+        switchViewFromController = setting;
+        setControllerMappingStatus(switchViewFromController);
+        Settings.setValue('spectatorCamera/switchViewFromController', setting);
+    }
+
+    // Function Name: registerButtonMappings()
+    //
+    // Description:
+    //   -Updates controller button mappings for Spectator Camera.
+    //
+    // Relevant Variables:
+    //   -controllerMappingName: The name of the controller mapping.
+    //   -controllerMapping: The controller mapping itself.
+    //   -controllerType: "OculusTouch", "Vive", "Other".
+    var controllerMappingName;
+    var controllerMapping;
+    var controllerType = "Other";
+    function registerButtonMappings() {
+        var VRDevices = Controller.getDeviceNames().toString();
+        if (VRDevices) {
+            if (VRDevices.indexOf("Vive") !== -1) {
+                controllerType = "Vive";
+            } else if (VRDevices.indexOf("OculusTouch") !== -1) {
+                controllerType = "OculusTouch";
+            } else {
+                sendToQml({ method: 'updateControllerMappingCheckbox', setting: switchViewFromController, controller: controllerType });
+                return; // Neither Vive nor Touch detected
+            }
+        }
+
+        controllerMappingName = 'Hifi-SpectatorCamera-Mapping';
+        controllerMapping = Controller.newMapping(controllerMappingName);
+        if (controllerType === "OculusTouch") {
+            controllerMapping.from(Controller.Standard.LS).to(function (value) {
+                if (value === 1.0) {
+                    setMonitorShowsCameraViewAndSendToQml(!monitorShowsCameraView);
+                }
+                return;
+            });
+        } else if (controllerType === "Vive") {
+            controllerMapping.from(Controller.Standard.LeftPrimaryThumb).to(function (value) {
+                if (value === 1.0) {
+                    setMonitorShowsCameraViewAndSendToQml(!monitorShowsCameraView);
+                }
+                return;
+            });
+        }
+        setControllerMappingStatus(switchViewFromController);
+        sendToQml({ method: 'updateControllerMappingCheckbox', setting: switchViewFromController, controller: controllerType });
+    }
+
+    // Function Name: onTabletButtonClicked()
+    //
+    // Description:
+    //   -Fired when the Spectator Camera app button is pressed.
+    //
+    // Relevant Variables:
+    //   -SPECTATOR_CAMERA_QML_SOURCE: The path to the SpectatorCamera QML
+    //   -onSpectatorCameraScreen: true/false depending on whether we're looking at the spectator camera app.
+    var SPECTATOR_CAMERA_QML_SOURCE = Script.resourcesPath() + "qml/hifi/SpectatorCamera.qml";
+    var onSpectatorCameraScreen = false;
+    function onTabletButtonClicked() {
+        if (!tablet) {
+            print("Warning in onTabletButtonClicked(): 'tablet' undefined!");
+            return;
+        }
+        if (onSpectatorCameraScreen) {
+            // for toolbar-mode: go back to home screen, this will close the window.
+            tablet.gotoHomeScreen();
+        } else {
+            tablet.loadQMLSource(SPECTATOR_CAMERA_QML_SOURCE);
+            sendToQml({ method: 'updateSpectatorCameraCheckbox', params: !!camera });
+            sendToQml({ method: 'updateMonitorShowsSwitch', params: monitorShowsCameraView });
+            if (!controllerMapping) {
+                registerButtonMappings();
+            } else {
+                sendToQml({ method: 'updateControllerMappingCheckbox', setting: switchViewFromController, controller: controllerType });
+            }
+            Menu.setIsOptionChecked("Disable Preview", false);
+            Menu.setIsOptionChecked("Mono Preview", true);
+        }
+    }
+
+    // Function Name: onTabletScreenChanged()
+    //
+    // Description:
+    //   -Called when the TabletScriptingInterface::screenChanged() signal is emitted. The "type" argument can be either the string
+    //    value of "Home", "Web", "Menu", "QML", or "Closed". The "url" argument is only valid for Web and QML.
+    function onTabletScreenChanged(type, url) {
+        onSpectatorCameraScreen = (type === "QML" && url === SPECTATOR_CAMERA_QML_SOURCE);
+        wireEventBridge(onSpectatorCameraScreen);
+        // Change button to active when window is first openend OR if the camera is on, false otherwise.
+        if (button) {
+            button.editProperties({ isActive: onSpectatorCameraScreen || camera });
+        }
+    }
+
+    // Function Name: sendToQml()
+    //
+    // Description:
+    //   -Use this function to send a message to the QML (i.e. to change appearances). The "message" argument is what is sent to
+    //    SpectatorCamera QML in the format "{method, params}", like json-rpc. See also fromQml().
+    function sendToQml(message) {
+        tablet.sendToQml(message);
+    }
+
+    // Function Name: fromQml()
+    //
+    // Description:
+    //   -Called when a message is received from SpectatorCamera.qml. The "message" argument is what is sent from the SpectatorCamera QML
+    //    in the format "{method, params}", like json-rpc. See also sendToQml().
+    function fromQml(message) {
+        switch (message.method) {
+            case 'spectatorCameraOn':
+                spectatorCameraOn();
+                break;
+            case 'spectatorCameraOff':
+                spectatorCameraOff();
+                break;
+            case 'setMonitorShowsCameraView':
+                setMonitorShowsCameraView(message.params);
+                break;
+            case 'changeSwitchViewFromControllerPreference':
+                setSwitchViewFromController(message.params);
+                break;
+            default:
+                print('Unrecognized message from SpectatorCamera.qml:', JSON.stringify(message));
+        }
+    }
+
+    // Function Name: onHMDChanged()
+    //
+    // Description:
+    //   -Called from C++ when HMD mode is changed. The argument "isHMDMode" is true if HMD is on; false otherwise.
+    function onHMDChanged(isHMDMode) {
+        if (!controllerMapping) {
+            registerButtonMappings();
+        }
+        setDisplay(monitorShowsCameraView);
+        addOrRemoveButton(false, isHMDMode);
+        if (!isHMDMode && !showSpectatorInDesktop) {
+            spectatorCameraOff();
+        }
+    }
+
+    // Function Name: shutdown()
+    //
+    // Description:
+    //   -shutdown() will be called when the script ends (i.e. is stopped).
+    function shutdown() {
+        spectatorCameraOff();
+        Window.domainChanged.disconnect(onDomainChanged);
+        Window.geometryChanged.disconnect(resizeViewFinderOverlay);
+        addOrRemoveButton(true, HMD.active);
+        if (tablet) {
+            tablet.screenChanged.disconnect(onTabletScreenChanged);
+            if (onSpectatorCameraScreen) {
+                tablet.gotoHomeScreen();
+            }
+        }
+        HMD.displayModeChanged.disconnect(onHMDChanged);
+        Controller.keyPressEvent.disconnect(keyPressEvent);
+        if (controllerMapping) {
+            controllerMapping.disable();
+        }
+    }
+
+    // Function Name: onDomainChanged()
+    //
+    // Description:
+    //   -A small utility function used when the Window.domainChanged() signal is fired.
+    function onDomainChanged() {
+        spectatorCameraOff(true);
+    }
+
+    // These functions will be called when the script is loaded.
+    var CAMERA_ON_SOUND = SoundCache.getSound(Script.resolvePath("cameraOn.wav"));
+    startup();
+    Script.scriptEnding.connect(shutdown);
+
+}()); // END LOCAL_SCOPE
diff --git a/unpublishedScripts/marketplace/stopwatch/models/Stopwatch-min-hand.fbx b/unpublishedScripts/marketplace/stopwatch/models/Stopwatch-min-hand.fbx
deleted file mode 100644
index b504da13bd..0000000000
Binary files a/unpublishedScripts/marketplace/stopwatch/models/Stopwatch-min-hand.fbx and /dev/null differ
diff --git a/unpublishedScripts/marketplace/stopwatch/models/Stopwatch-sec-hand.fbx b/unpublishedScripts/marketplace/stopwatch/models/Stopwatch-sec-hand.fbx
deleted file mode 100644
index 12aa85f126..0000000000
Binary files a/unpublishedScripts/marketplace/stopwatch/models/Stopwatch-sec-hand.fbx and /dev/null differ
diff --git a/unpublishedScripts/marketplace/stopwatch/models/Stopwatch.fbx b/unpublishedScripts/marketplace/stopwatch/models/Stopwatch.fbx
deleted file mode 100644
index 073544875e..0000000000
Binary files a/unpublishedScripts/marketplace/stopwatch/models/Stopwatch.fbx and /dev/null differ
diff --git a/unpublishedScripts/marketplace/stopwatch/models/transparent-box.fbx b/unpublishedScripts/marketplace/stopwatch/models/transparent-box.fbx
deleted file mode 100644
index b1df7d962c..0000000000
Binary files a/unpublishedScripts/marketplace/stopwatch/models/transparent-box.fbx and /dev/null differ
diff --git a/unpublishedScripts/marketplace/stopwatch/sounds/chime.wav b/unpublishedScripts/marketplace/stopwatch/sounds/chime.wav
deleted file mode 100644
index cd7143eeeb..0000000000
Binary files a/unpublishedScripts/marketplace/stopwatch/sounds/chime.wav and /dev/null differ
diff --git a/unpublishedScripts/marketplace/stopwatch/sounds/tick.wav b/unpublishedScripts/marketplace/stopwatch/sounds/tick.wav
deleted file mode 100644
index 21781f8ce4..0000000000
Binary files a/unpublishedScripts/marketplace/stopwatch/sounds/tick.wav and /dev/null differ
diff --git a/unpublishedScripts/marketplace/stopwatch/spawnStopwatch.js b/unpublishedScripts/marketplace/stopwatch/spawnStopwatch.js
deleted file mode 100644
index 3a0a8a506b..0000000000
--- a/unpublishedScripts/marketplace/stopwatch/spawnStopwatch.js
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-//  spawnStopwatch.js
-//
-//  Created by Ryan Huffman on 1/20/17.
-//  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 forward = Quat.getFront(MyAvatar.orientation);
-Vec3.print("Forward: ", forward);
-var positionToSpawn = Vec3.sum(MyAvatar.position, Vec3.multiply(3, forward));
-var scale = 0.5;
-positionToSpawn.y += 0.5;
-
-var stopwatchID = Entities.addEntity({
-    type: "Model",
-    name: "stopwatch/base",
-    position: positionToSpawn,
-    modelURL: Script.resolvePath("models/Stopwatch.fbx"),
-    dimensions: Vec3.multiply(scale, {"x":4.129462242126465,"y":1.058512806892395,"z":5.773681640625}),
-    rotation: Quat.multiply(MyAvatar.orientation, Quat.fromPitchYawRollDegrees(90, 0, 0))
-});
-
-var secondHandID = Entities.addEntity({
-    type: "Model",
-    name: "stopwatch/seconds",
-    parentID: stopwatchID,
-    localPosition: Vec3.multiply(scale, {"x":-0.004985813982784748,"y":0.39391064643859863,"z":0.8312804698944092}),
-    dimensions: Vec3.multiply(scale, {"x":0.14095762372016907,"y":0.02546107769012451,"z":1.6077008247375488}),
-    registrationPoint: {"x":0.5,"y":0.5,"z":1},
-    modelURL: Script.resolvePath("models/Stopwatch-sec-hand.fbx"),
-});
-
-var minuteHandID = Entities.addEntity({
-    type: "Model",
-    name: "stopwatch/minutes",
-    parentID: stopwatchID,
-    localPosition: Vec3.multiply(scale, {"x":-0.0023056098725646734,"y":0.3308190703392029,"z":0.21810021996498108}),
-    dimensions: Vec3.multiply(scale, {"x":0.045471154153347015,"y":0.015412690117955208,"z":0.22930574417114258}),
-    registrationPoint: {"x":0.5,"y":0.5,"z":1},
-    modelURL: Script.resolvePath("models/Stopwatch-min-hand.fbx"),
-});
-
-var startStopButtonID = Entities.addEntity({
-    type: "Model",
-    name: "stopwatch/startStop",
-    parentID: stopwatchID,
-    dimensions: Vec3.multiply(scale, { x: 0.8, y: 0.8, z: 1.0 }),
-    localPosition: Vec3.multiply(scale, { x: 0, y: -0.1, z: -2.06 }),
-    modelURL: Script.resolvePath("models/transparent-box.fbx")
-});
-
-var resetButtonID = Entities.addEntity({
-    type: "Model",
-    name: "stopwatch/startStop",
-    parentID: stopwatchID,
-    dimensions: Vec3.multiply(scale, { x: 0.6, y: 0.6, z: 0.8 }),
-    localPosition: Vec3.multiply(scale, { x: -1.5, y: -0.1, z: -1.2 }),
-    localRotation: Quat.fromVec3Degrees({ x: 0, y: 36, z: 0 }),
-    modelURL: Script.resolvePath("models/transparent-box.fbx")
-});
-
-Entities.editEntity(stopwatchID, {
-    userData: JSON.stringify({
-        secondHandID: secondHandID,
-        minuteHandID: minuteHandID
-    }),
-    serverScripts: Script.resolvePath("stopwatchServer.js")
-});
-
-Entities.editEntity(startStopButtonID, {
-    userData: JSON.stringify({
-        stopwatchID: stopwatchID,
-        grabbableKey: { wantsTrigger: true }
-    }),
-    script: Script.resolvePath("stopwatchStartStop.js")
-});
-
-Entities.editEntity(resetButtonID, {
-    userData: JSON.stringify({
-        stopwatchID: stopwatchID,
-        grabbableKey: { wantsTrigger: true }
-    }),
-    script: Script.resolvePath("stopwatchReset.js")
-});
-
-Script.stop()
diff --git a/unpublishedScripts/marketplace/stopwatch/stopwatchReset.js b/unpublishedScripts/marketplace/stopwatch/stopwatchReset.js
deleted file mode 100644
index b65c1e7340..0000000000
--- a/unpublishedScripts/marketplace/stopwatch/stopwatchReset.js
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-//  stopwatchReset.js
-//
-//  Created by David Rowe on 26 May 2017.
-//  Copyright 2017 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-(function () {
-    this.preload = function (entityID) {
-        var properties = Entities.getEntityProperties(entityID, "userData");
-        this.messageChannel = "STOPWATCH-" + JSON.parse(properties.userData).stopwatchID;
-    };
-    function click() {
-        Messages.sendMessage(this.messageChannel, "reset");
-    }
-    this.startNearTrigger = click;
-    this.startFarTrigger = click;
-    this.clickDownOnEntity = click;
-});
diff --git a/unpublishedScripts/marketplace/stopwatch/stopwatchServer.js b/unpublishedScripts/marketplace/stopwatch/stopwatchServer.js
deleted file mode 100644
index 6ae1b69087..0000000000
--- a/unpublishedScripts/marketplace/stopwatch/stopwatchServer.js
+++ /dev/null
@@ -1,132 +0,0 @@
-//
-//  stopwatchServer.js
-//
-//  Created by Ryan Huffman on 1/20/17.
-//  Copyright 2017 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-(function() {
-    var self = this;
-
-    self.equipped = false;
-    self.isActive = false;
-    self.seconds = 0;
-
-    self.secondHandID = null;
-    self.minuteHandID = null;
-
-    self.tickSound = SoundCache.getSound(Script.resolvePath("sounds/tick.wav"));
-    self.tickInjector = null;
-    self.tickIntervalID = null;
-
-    self.chimeSound = SoundCache.getSound(Script.resolvePath("sounds/chime.wav"));
-
-    self.preload = function(entityID) {
-        print("Preloading stopwatch: ", entityID);
-        self.entityID = entityID;
-        self.messageChannel = "STOPWATCH-" + entityID;
-
-        var userData = Entities.getEntityProperties(self.entityID, 'userData').userData;
-        var data = JSON.parse(userData);
-        self.secondHandID = data.secondHandID;
-        self.minuteHandID = data.minuteHandID;
-
-        self.resetTimer();
-
-        Messages.subscribe(self.messageChannel);
-        Messages.messageReceived.connect(this, self.messageReceived);
-    };
-    self.unload = function() {
-        print("Unloading stopwatch:", self.entityID);
-        self.resetTimer();
-        Messages.unsubscribe(self.messageChannel);
-        Messages.messageReceived.disconnect(this, self.messageReceived);
-    };
-    self.messageReceived = function(channel, message, sender) {
-        print("Message received", channel, sender, message); 
-        if (channel === self.messageChannel) {
-            switch (message) {
-                case "startStop":
-                    if (self.isActive) {
-                        self.stopTimer();
-                    } else {
-                        self.startTimer();
-                    }
-                    break;
-                case "reset":
-                    self.stopTimer();
-                    self.resetTimer();
-                    break;
-            }
-        }
-    };
-    self.getStopwatchPosition = function() {
-        return Entities.getEntityProperties(self.entityID, "position").position;
-    };
-    self.resetTimer = function() {
-        print("Resetting stopwatch");
-        Entities.editEntity(self.secondHandID, {
-            localRotation: Quat.fromPitchYawRollDegrees(0, 0, 0),
-            angularVelocity: { x: 0, y: 0, z: 0 },
-        });
-        Entities.editEntity(self.minuteHandID, {
-            localRotation: Quat.fromPitchYawRollDegrees(0, 0, 0),
-            angularVelocity: { x: 0, y: 0, z: 0 },
-        });
-        self.seconds = 0;
-    };
-    self.startTimer = function() {
-        print("Starting stopwatch");
-        if (!self.tickInjector) {
-            self.tickInjector = Audio.playSound(self.tickSound, {
-                position: self.getStopwatchPosition(),
-                volume: 0.7,
-                loop: true
-            });
-        } else {
-            self.tickInjector.restart();
-        }
-
-        self.tickIntervalID = Script.setInterval(function() {
-            if (self.tickInjector) {
-                self.tickInjector.setOptions({
-                    position: self.getStopwatchPosition(),
-                    volume: 0.7,
-                    loop: true
-                });
-            }
-            self.seconds++;
-            const degreesPerTick = -360 / 60;
-            Entities.editEntity(self.secondHandID, {
-                localRotation: Quat.fromPitchYawRollDegrees(0, self.seconds * degreesPerTick, 0),
-            });
-
-            if (self.seconds % 60 == 0) {
-                Entities.editEntity(self.minuteHandID, {
-                    localRotation: Quat.fromPitchYawRollDegrees(0, (self.seconds / 60) * degreesPerTick, 0),
-                });
-                Audio.playSound(self.chimeSound, {
-                    position: self.getStopwatchPosition(),
-                    volume: 1.0,
-                    loop: false
-                });
-            }
-        }, 1000);
-
-        self.isActive = true;
-    };
-    self.stopTimer = function () {
-        print("Stopping stopwatch");
-        if (self.tickInjector) {
-            self.tickInjector.stop();
-        }
-        if (self.tickIntervalID !== null) {
-            Script.clearInterval(self.tickIntervalID);
-            self.tickIntervalID = null;
-        }
-        self.isActive = false;
-    };
-});
diff --git a/unpublishedScripts/marketplace/stopwatch/stopwatchStartStop.js b/unpublishedScripts/marketplace/stopwatch/stopwatchStartStop.js
deleted file mode 100644
index 88c037ee36..0000000000
--- a/unpublishedScripts/marketplace/stopwatch/stopwatchStartStop.js
+++ /dev/null
@@ -1,23 +0,0 @@
-//
-//  stopwatchStartStop.js
-//
-//  Created by David Rowe on 26 May 2017.
-//  Copyright 2017 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-(function () {
-    var messageChannel;
-    this.preload = function (entityID) {
-        var properties = Entities.getEntityProperties(entityID, "userData");
-        this.messageChannel = "STOPWATCH-" + JSON.parse(properties.userData).stopwatchID;
-    };
-    function click() {
-        Messages.sendMessage(this.messageChannel, "startStop");
-    }
-    this.startNearTrigger = click;
-    this.startFarTrigger = click;
-    this.clickDownOnEntity = click;
-});
diff --git a/unpublishedScripts/marketplace/xylophone/A4.wav b/unpublishedScripts/marketplace/xylophone/A4.wav
new file mode 100644
index 0000000000..8e3f4e370c
Binary files /dev/null and b/unpublishedScripts/marketplace/xylophone/A4.wav differ
diff --git a/unpublishedScripts/marketplace/xylophone/B4.wav b/unpublishedScripts/marketplace/xylophone/B4.wav
new file mode 100644
index 0000000000..49a6ad0873
Binary files /dev/null and b/unpublishedScripts/marketplace/xylophone/B4.wav differ
diff --git a/unpublishedScripts/marketplace/xylophone/C4.wav b/unpublishedScripts/marketplace/xylophone/C4.wav
new file mode 100644
index 0000000000..dc6724de6d
Binary files /dev/null and b/unpublishedScripts/marketplace/xylophone/C4.wav differ
diff --git a/unpublishedScripts/marketplace/xylophone/C5.wav b/unpublishedScripts/marketplace/xylophone/C5.wav
new file mode 100644
index 0000000000..815a7909df
Binary files /dev/null and b/unpublishedScripts/marketplace/xylophone/C5.wav differ
diff --git a/unpublishedScripts/marketplace/xylophone/D4.wav b/unpublishedScripts/marketplace/xylophone/D4.wav
new file mode 100644
index 0000000000..0c0a7a66f2
Binary files /dev/null and b/unpublishedScripts/marketplace/xylophone/D4.wav differ
diff --git a/unpublishedScripts/marketplace/xylophone/E4.wav b/unpublishedScripts/marketplace/xylophone/E4.wav
new file mode 100644
index 0000000000..dc84268702
Binary files /dev/null and b/unpublishedScripts/marketplace/xylophone/E4.wav differ
diff --git a/unpublishedScripts/marketplace/xylophone/F4.wav b/unpublishedScripts/marketplace/xylophone/F4.wav
new file mode 100644
index 0000000000..353adc1c6a
Binary files /dev/null and b/unpublishedScripts/marketplace/xylophone/F4.wav differ
diff --git a/unpublishedScripts/marketplace/xylophone/G4.wav b/unpublishedScripts/marketplace/xylophone/G4.wav
new file mode 100644
index 0000000000..7bb88e690f
Binary files /dev/null and b/unpublishedScripts/marketplace/xylophone/G4.wav differ
diff --git a/unpublishedScripts/marketplace/xylophone/Mallet3-2bpc_phys.obj b/unpublishedScripts/marketplace/xylophone/Mallet3-2bpc_phys.obj
new file mode 100644
index 0000000000..d23d2a9d4f
--- /dev/null
+++ b/unpublishedScripts/marketplace/xylophone/Mallet3-2bpc_phys.obj
@@ -0,0 +1,1060 @@
+# This file uses centimeters as units for non-parametric coordinates.
+
+g default
+v -1.006609 1.535144 -8.257065
+v -1.006609 -1.971825 -8.257065
+v 2.334219 -0.218341 -8.257065
+v -1.123304 0.882099 -2.057893
+v -1.123305 -1.703815 -2.057893
+v 1.753316 -0.218341 -2.057893
+v 0.005766 -0.218341 -8.257065
+v -0.265666 -0.218341 -2.057893
+vt 0.375000 0.312500
+vt 0.458333 0.312500
+vt 0.458333 0.688440
+vt 0.375000 0.688440
+vt 0.541667 0.312500
+vt 0.541667 0.688440
+vt 0.625000 0.312500
+vt 0.625000 0.688440
+vt 0.421875 0.291566
+vt 0.421875 0.020934
+vt 0.500000 0.150000
+vt 0.656250 0.156250
+vt 0.421875 0.979066
+vt 0.421875 0.708434
+vt 0.500000 0.837500
+vt 0.656250 0.843750
+vn -0.999823 0.000000 -0.018821
+vn -0.999823 0.000000 -0.018821
+vn -0.999823 0.000000 -0.018821
+vn -0.999823 0.000000 -0.018821
+vn 0.461543 -0.885970 0.045121
+vn 0.461543 -0.885970 0.045121
+vn 0.461543 -0.885970 0.045121
+vn 0.461543 -0.885970 0.045121
+vn 0.416112 0.906525 0.071161
+vn 0.416112 0.906525 0.071161
+vn 0.416112 0.906525 0.071161
+vn 0.416112 0.906525 0.071161
+vn 0.000000 0.000000 -1.000000
+vn 0.000000 0.000000 -1.000000
+vn 0.000000 0.000000 -1.000000
+vn 0.000000 0.000000 -1.000000
+vn 0.000000 0.000000 1.000000
+vn 0.000000 0.000000 1.000000
+vn 0.000000 0.000000 1.000000
+vn 0.000000 0.000000 1.000000
+s off
+g polySurface3 phys
+f 1/1/1 2/2/2 5/3/3 4/4/4
+f 2/2/5 3/5/6 6/6/7 5/3/8
+f 3/5/9 1/7/10 4/8/11 6/6/12
+s 1
+f 2/9/13 1/10/14 7/11/15
+f 3/12/16 2/9/13 7/11/15
+f 1/10/14 3/12/16 7/11/15
+s 2
+f 4/13/17 5/14/18 8/15/19
+f 5/14/18 6/16/20 8/15/19
+f 6/16/20 4/13/17 8/15/19
+g default
+v 0.648287 -0.670052 21.955959
+v 0.374289 -0.944046 21.955959
+v 0.000000 -1.044334 21.955959
+v -0.374289 -0.944046 21.955959
+v -0.648287 -0.670052 21.955959
+v -0.748577 -0.295761 21.955959
+v -0.648287 0.078529 21.955959
+v -0.374289 0.352524 21.955959
+v 0.000000 0.452820 21.955959
+v 0.374289 0.352524 21.955959
+v 0.648287 0.078529 21.955959
+v 0.748577 -0.295761 21.955959
+v 1.252394 -1.018829 21.667019
+v 0.723070 -1.548157 21.667019
+v 0.000000 -1.741898 21.667019
+v -0.723070 -1.548157 21.667019
+v -1.252394 -1.018829 21.667019
+v -1.446140 -0.295761 21.667019
+v -1.252394 0.427307 21.667019
+v -0.723070 0.956635 21.667019
+v 0.000000 1.150383 21.667019
+v 0.723070 0.956635 21.667019
+v 1.252394 0.427307 21.667019
+v 1.446140 -0.295761 21.667019
+v 1.771153 -1.318336 21.207382
+v 1.022575 -2.066917 21.207382
+v 0.000000 -2.340912 21.207382
+v -1.022575 -2.066917 21.207382
+v -1.771153 -1.318336 21.207382
+v -2.045151 -0.295761 21.207382
+v -1.771153 0.726814 21.207382
+v -1.022575 1.475388 21.207382
+v 0.000000 1.749390 21.207382
+v 1.022575 1.475388 21.207382
+v 1.771153 0.726814 21.207382
+v 2.045151 -0.295761 21.207382
+v 2.169210 -1.548157 20.608372
+v 1.252394 -2.464973 20.608372
+v 0.000000 -2.800545 20.608372
+v -1.252394 -2.464973 20.608372
+v -2.169210 -1.548157 20.608372
+v -2.504788 -0.295761 20.608372
+v -2.169210 0.956635 20.608372
+v -1.252394 1.873451 20.608372
+v 0.000000 2.209030 20.608372
+v 1.252394 1.873451 20.608372
+v 2.169210 0.956635 20.608372
+v 2.504788 -0.295761 20.608372
+v 2.419440 -1.692627 19.910809
+v 1.396864 -2.715202 19.910809
+v 0.000000 -3.089485 19.910809
+v -1.396864 -2.715202 19.910809
+v -2.419440 -1.692627 19.910809
+v -2.793728 -0.295761 19.910809
+v -2.419440 1.101105 19.910809
+v -1.396864 2.123680 19.910809
+v 0.000000 2.497971 19.910809
+v 1.396864 2.123680 19.910809
+v 2.419440 1.101105 19.910809
+v 2.793728 -0.295761 19.910809
+v 2.504788 -1.741905 19.162231
+v 1.446140 -2.800552 19.162231
+v 0.000000 -3.188042 19.162231
+v -1.446140 -2.800552 19.162231
+v -2.504788 -1.741905 19.162231
+v -2.892280 -0.295761 19.162231
+v -2.504788 1.150375 19.162231
+v -1.446140 2.209023 19.162230
+v 0.000000 2.596519 19.162231
+v 1.446140 2.209023 19.162230
+v 2.504788 1.150375 19.162231
+v 2.892280 -0.295761 19.162231
+v 2.419440 -1.692627 18.413654
+v 1.396864 -2.715202 18.413654
+v 0.000000 -3.089485 18.413654
+v -1.396864 -2.715202 18.413654
+v -2.419440 -1.692627 18.413654
+v -2.793728 -0.295761 18.413654
+v -2.419440 1.101105 18.413654
+v -1.396864 2.123680 18.413654
+v 0.000000 2.497971 18.413654
+v 1.396864 2.123680 18.413654
+v 2.419440 1.101105 18.413654
+v 2.793728 -0.295761 18.413654
+v 2.169210 -1.548157 17.716091
+v 1.252394 -2.464973 17.716091
+v 0.000000 -2.800545 17.716091
+v -1.252394 -2.464973 17.716091
+v -2.169210 -1.548157 17.716091
+v -2.504788 -0.295761 17.716091
+v -2.169210 0.956635 17.716091
+v -1.252394 1.873451 17.716091
+v 0.000000 2.209030 17.716091
+v 1.252394 1.873451 17.716091
+v 2.169210 0.956635 17.716091
+v 2.504788 -0.295761 17.716091
+v 1.771153 -1.318336 17.117081
+v 1.022575 -2.066917 17.117081
+v 0.000000 -2.340912 17.117081
+v -1.022575 -2.066917 17.117081
+v -1.771153 -1.318336 17.117081
+v -2.045151 -0.295761 17.117081
+v -1.771153 0.726814 17.117081
+v -1.022575 1.475388 17.117081
+v 0.000000 1.749390 17.117081
+v 1.022575 1.475388 17.117081
+v 1.771153 0.726814 17.117081
+v 2.045151 -0.295761 17.117081
+v 1.252394 -1.018829 16.657444
+v 0.723070 -1.548157 16.657444
+v 0.000000 -1.741898 16.657444
+v -0.723070 -1.548157 16.657444
+v -1.252394 -1.018829 16.657444
+v -1.446140 -0.295761 16.657444
+v -1.252394 0.427307 16.657444
+v -0.723070 0.956635 16.657444
+v 0.000000 1.150383 16.657444
+v 0.723070 0.956635 16.657444
+v 1.252394 0.427307 16.657444
+v 1.446140 -0.295761 16.657444
+v 0.648287 -0.670052 16.368504
+v 0.374289 -0.944046 16.368504
+v 0.000000 -1.044334 16.368504
+v -0.374289 -0.944046 16.368504
+v -0.648287 -0.670052 16.368504
+v -0.748577 -0.295761 16.368504
+v -0.648287 0.078529 16.368504
+v -0.374289 0.352524 16.368504
+v 0.000000 0.452820 16.368504
+v 0.374289 0.352524 16.368504
+v 0.648287 0.078529 16.368504
+v 0.748577 -0.295761 16.368504
+v 0.000000 -0.295761 22.054512
+v 0.000000 -0.295761 16.269951
+vt 0.000000 0.083333
+vt 0.083333 0.083333
+vt 0.083333 0.166667
+vt 0.000000 0.166667
+vt 0.166667 0.083333
+vt 0.166667 0.166667
+vt 0.250000 0.083333
+vt 0.250000 0.166667
+vt 0.333333 0.083333
+vt 0.333333 0.166667
+vt 0.416667 0.083333
+vt 0.416667 0.166667
+vt 0.500000 0.083333
+vt 0.500000 0.166667
+vt 0.583333 0.083333
+vt 0.583333 0.166667
+vt 0.666667 0.083333
+vt 0.666667 0.166667
+vt 0.750000 0.083333
+vt 0.750000 0.166667
+vt 0.833333 0.083333
+vt 0.833333 0.166667
+vt 0.916667 0.083333
+vt 0.916667 0.166667
+vt 1.000000 0.083333
+vt 1.000000 0.166667
+vt 0.083333 0.250000
+vt 0.000000 0.250000
+vt 0.166667 0.250000
+vt 0.250000 0.250000
+vt 0.333333 0.250000
+vt 0.416667 0.250000
+vt 0.500000 0.250000
+vt 0.583333 0.250000
+vt 0.666667 0.250000
+vt 0.750000 0.250000
+vt 0.833333 0.250000
+vt 0.916667 0.250000
+vt 1.000000 0.250000
+vt 0.083333 0.333333
+vt 0.000000 0.333333
+vt 0.166667 0.333333
+vt 0.250000 0.333333
+vt 0.333333 0.333333
+vt 0.416667 0.333333
+vt 0.500000 0.333333
+vt 0.583333 0.333333
+vt 0.666667 0.333333
+vt 0.750000 0.333333
+vt 0.833333 0.333333
+vt 0.916667 0.333333
+vt 1.000000 0.333333
+vt 0.083333 0.416667
+vt 0.000000 0.416667
+vt 0.166667 0.416667
+vt 0.250000 0.416667
+vt 0.333333 0.416667
+vt 0.416667 0.416667
+vt 0.500000 0.416667
+vt 0.583333 0.416667
+vt 0.666667 0.416667
+vt 0.750000 0.416667
+vt 0.833333 0.416667
+vt 0.916667 0.416667
+vt 1.000000 0.416667
+vt 0.083333 0.500000
+vt 0.000000 0.500000
+vt 0.166667 0.500000
+vt 0.250000 0.500000
+vt 0.333333 0.500000
+vt 0.416667 0.500000
+vt 0.500000 0.500000
+vt 0.583333 0.500000
+vt 0.666667 0.500000
+vt 0.750000 0.500000
+vt 0.833333 0.500000
+vt 0.916667 0.500000
+vt 1.000000 0.500000
+vt 0.083333 0.583333
+vt 0.000000 0.583333
+vt 0.166667 0.583333
+vt 0.250000 0.583333
+vt 0.333333 0.583333
+vt 0.416667 0.583333
+vt 0.500000 0.583333
+vt 0.583333 0.583333
+vt 0.666667 0.583333
+vt 0.750000 0.583333
+vt 0.833333 0.583333
+vt 0.916667 0.583333
+vt 1.000000 0.583333
+vt 0.083333 0.666667
+vt 0.000000 0.666667
+vt 0.166667 0.666667
+vt 0.250000 0.666667
+vt 0.333333 0.666667
+vt 0.416667 0.666667
+vt 0.500000 0.666667
+vt 0.583333 0.666667
+vt 0.666667 0.666667
+vt 0.750000 0.666667
+vt 0.833333 0.666667
+vt 0.916667 0.666667
+vt 1.000000 0.666667
+vt 0.083333 0.750000
+vt 0.000000 0.750000
+vt 0.166667 0.750000
+vt 0.250000 0.750000
+vt 0.333333 0.750000
+vt 0.416667 0.750000
+vt 0.500000 0.750000
+vt 0.583333 0.750000
+vt 0.666667 0.750000
+vt 0.750000 0.750000
+vt 0.833333 0.750000
+vt 0.916667 0.750000
+vt 1.000000 0.750000
+vt 0.083333 0.833333
+vt 0.000000 0.833333
+vt 0.166667 0.833333
+vt 0.250000 0.833333
+vt 0.333333 0.833333
+vt 0.416667 0.833333
+vt 0.500000 0.833333
+vt 0.583333 0.833333
+vt 0.666667 0.833333
+vt 0.750000 0.833333
+vt 0.833333 0.833333
+vt 0.916667 0.833333
+vt 1.000000 0.833333
+vt 0.083333 0.916667
+vt 0.000000 0.916667
+vt 0.166667 0.916667
+vt 0.250000 0.916667
+vt 0.333333 0.916667
+vt 0.416667 0.916667
+vt 0.500000 0.916667
+vt 0.583333 0.916667
+vt 0.666667 0.916667
+vt 0.750000 0.916667
+vt 0.833333 0.916667
+vt 0.916667 0.916667
+vt 1.000000 0.916667
+vt 0.041667 0.000000
+vt 0.125000 0.000000
+vt 0.208333 0.000000
+vt 0.291667 0.000000
+vt 0.375000 0.000000
+vt 0.458333 0.000000
+vt 0.541667 0.000000
+vt 0.625000 0.000000
+vt 0.708333 0.000000
+vt 0.791667 0.000000
+vt 0.875000 0.000000
+vt 0.958333 0.000000
+vt 0.041667 1.000000
+vt 0.125000 1.000000
+vt 0.208333 1.000000
+vt 0.291667 1.000000
+vt 0.375000 1.000000
+vt 0.458333 1.000000
+vt 0.541667 1.000000
+vt 0.625000 1.000000
+vt 0.708333 1.000000
+vt 0.791667 1.000000
+vt 0.875000 1.000000
+vt 0.958333 1.000000
+vn 0.289762 -0.167294 0.942365
+vn 0.167292 -0.289761 0.942365
+vn 0.270243 -0.468077 0.841352
+vn 0.468076 -0.270243 0.841352
+vn 0.167292 -0.289761 0.942365
+vn -0.000001 -0.334591 0.942364
+vn -0.000001 -0.540489 0.841351
+vn 0.270243 -0.468077 0.841352
+vn -0.000001 -0.334591 0.942364
+vn -0.167292 -0.289761 0.942365
+vn -0.270244 -0.468076 0.841352
+vn -0.000001 -0.540489 0.841351
+vn -0.167292 -0.289761 0.942365
+vn -0.289758 -0.167292 0.942366
+vn -0.468075 -0.270243 0.841353
+vn -0.270244 -0.468076 0.841352
+vn -0.289758 -0.167292 0.942366
+vn -0.334585 -0.000000 0.942366
+vn -0.540484 0.000000 0.841354
+vn -0.468075 -0.270243 0.841353
+vn -0.334585 -0.000000 0.942366
+vn -0.289758 0.167293 0.942366
+vn -0.468076 0.270244 0.841352
+vn -0.540484 0.000000 0.841354
+vn -0.289758 0.167293 0.942366
+vn -0.167293 0.289759 0.942366
+vn -0.270245 0.468078 0.841350
+vn -0.468076 0.270244 0.841352
+vn -0.167293 0.289759 0.942366
+vn 0.000002 0.334587 0.942365
+vn 0.000001 0.540490 0.841350
+vn -0.270245 0.468078 0.841350
+vn 0.000002 0.334587 0.942365
+vn 0.167293 0.289758 0.942366
+vn 0.270244 0.468077 0.841351
+vn 0.000001 0.540490 0.841350
+vn 0.167293 0.289758 0.942366
+vn 0.289761 0.167292 0.942365
+vn 0.468076 0.270243 0.841353
+vn 0.270244 0.468077 0.841351
+vn 0.289761 0.167292 0.942365
+vn 0.334591 0.000000 0.942364
+vn 0.540487 -0.000000 0.841352
+vn 0.468076 0.270243 0.841353
+vn 0.334591 0.000000 0.942364
+vn 0.289762 -0.167294 0.942365
+vn 0.468076 -0.270243 0.841352
+vn 0.540487 -0.000000 0.841352
+vn 0.468076 -0.270243 0.841352
+vn 0.270243 -0.468077 0.841352
+vn 0.364804 -0.631861 0.683864
+vn 0.631861 -0.364805 0.683863
+vn 0.270243 -0.468077 0.841352
+vn -0.000001 -0.540489 0.841351
+vn -0.000000 -0.729611 0.683863
+vn 0.364804 -0.631861 0.683864
+vn -0.000001 -0.540489 0.841351
+vn -0.270244 -0.468076 0.841352
+vn -0.364804 -0.631862 0.683863
+vn -0.000000 -0.729611 0.683863
+vn -0.270244 -0.468076 0.841352
+vn -0.468075 -0.270243 0.841353
+vn -0.631860 -0.364805 0.683864
+vn -0.364804 -0.631862 0.683863
+vn -0.468075 -0.270243 0.841353
+vn -0.540484 0.000000 0.841354
+vn -0.729609 0.000000 0.683864
+vn -0.631860 -0.364805 0.683864
+vn -0.540484 0.000000 0.841354
+vn -0.468076 0.270244 0.841352
+vn -0.631861 0.364806 0.683863
+vn -0.729609 0.000000 0.683864
+vn -0.468076 0.270244 0.841352
+vn -0.270245 0.468078 0.841350
+vn -0.364806 0.631861 0.683863
+vn -0.631861 0.364806 0.683863
+vn -0.270245 0.468078 0.841350
+vn 0.000001 0.540490 0.841350
+vn 0.000000 0.729610 0.683863
+vn -0.364806 0.631861 0.683863
+vn 0.000001 0.540490 0.841350
+vn 0.270244 0.468077 0.841351
+vn 0.364806 0.631861 0.683863
+vn 0.000000 0.729610 0.683863
+vn 0.270244 0.468077 0.841351
+vn 0.468076 0.270243 0.841353
+vn 0.631861 0.364805 0.683864
+vn 0.364806 0.631861 0.683863
+vn 0.468076 0.270243 0.841353
+vn 0.540487 -0.000000 0.841352
+vn 0.729610 -0.000000 0.683864
+vn 0.631861 0.364805 0.683864
+vn 0.540487 -0.000000 0.841352
+vn 0.468076 -0.270243 0.841352
+vn 0.631861 -0.364805 0.683863
+vn 0.729610 -0.000000 0.683864
+vn 0.631861 -0.364805 0.683863
+vn 0.364804 -0.631861 0.683864
+vn 0.438133 -0.758871 0.481823
+vn 0.758872 -0.438134 0.481822
+vn 0.364804 -0.631861 0.683864
+vn -0.000000 -0.729611 0.683863
+vn -0.000000 -0.876269 0.481822
+vn 0.438133 -0.758871 0.481823
+vn -0.000000 -0.729611 0.683863
+vn -0.364804 -0.631862 0.683863
+vn -0.438133 -0.758872 0.481822
+vn -0.000000 -0.876269 0.481822
+vn -0.364804 -0.631862 0.683863
+vn -0.631860 -0.364805 0.683864
+vn -0.758871 -0.438134 0.481823
+vn -0.438133 -0.758872 0.481822
+vn -0.631860 -0.364805 0.683864
+vn -0.729609 0.000000 0.683864
+vn -0.876269 0.000000 0.481823
+vn -0.758871 -0.438134 0.481823
+vn -0.729609 0.000000 0.683864
+vn -0.631861 0.364806 0.683863
+vn -0.758871 0.438134 0.481822
+vn -0.876269 0.000000 0.481823
+vn -0.631861 0.364806 0.683863
+vn -0.364806 0.631861 0.683863
+vn -0.438134 0.758869 0.481827
+vn -0.758871 0.438134 0.481822
+vn -0.364806 0.631861 0.683863
+vn 0.000000 0.729610 0.683863
+vn 0.000000 0.876264 0.481831
+vn -0.438134 0.758869 0.481827
+vn 0.000000 0.729610 0.683863
+vn 0.364806 0.631861 0.683863
+vn 0.438134 0.758870 0.481825
+vn 0.000000 0.876264 0.481831
+vn 0.364806 0.631861 0.683863
+vn 0.631861 0.364805 0.683864
+vn 0.758871 0.438135 0.481822
+vn 0.438134 0.758870 0.481825
+vn 0.631861 0.364805 0.683864
+vn 0.729610 -0.000000 0.683864
+vn 0.876269 -0.000000 0.481823
+vn 0.758871 0.438135 0.481822
+vn 0.729610 -0.000000 0.683864
+vn 0.631861 -0.364805 0.683863
+vn 0.758872 -0.438134 0.481822
+vn 0.876269 -0.000000 0.481823
+vn 0.758872 -0.438134 0.481822
+vn 0.438133 -0.758871 0.481823
+vn 0.484271 -0.838784 0.248842
+vn 0.838785 -0.484272 0.248839
+vn 0.438133 -0.758871 0.481823
+vn -0.000000 -0.876269 0.481822
+vn -0.000000 -0.968544 0.248843
+vn 0.484271 -0.838784 0.248842
+vn -0.000000 -0.876269 0.481822
+vn -0.438133 -0.758872 0.481822
+vn -0.484271 -0.838785 0.248842
+vn -0.000000 -0.968544 0.248843
+vn -0.438133 -0.758872 0.481822
+vn -0.758871 -0.438134 0.481823
+vn -0.838785 -0.484272 0.248839
+vn -0.484271 -0.838785 0.248842
+vn -0.758871 -0.438134 0.481823
+vn -0.876269 0.000000 0.481823
+vn -0.968545 -0.000000 0.248837
+vn -0.838785 -0.484272 0.248839
+vn -0.876269 0.000000 0.481823
+vn -0.758871 0.438134 0.481822
+vn -0.838785 0.484274 0.248836
+vn -0.968545 -0.000000 0.248837
+vn -0.758871 0.438134 0.481822
+vn -0.438134 0.758869 0.481827
+vn -0.484273 0.838785 0.248837
+vn -0.838785 0.484274 0.248836
+vn -0.438134 0.758869 0.481827
+vn 0.000000 0.876264 0.481831
+vn -0.000000 0.968546 0.248836
+vn -0.484273 0.838785 0.248837
+vn 0.000000 0.876264 0.481831
+vn 0.438134 0.758870 0.481825
+vn 0.484274 0.838785 0.248834
+vn -0.000000 0.968546 0.248836
+vn 0.438134 0.758870 0.481825
+vn 0.758871 0.438135 0.481822
+vn 0.838785 0.484274 0.248834
+vn 0.484274 0.838785 0.248834
+vn 0.758871 0.438135 0.481822
+vn 0.876269 -0.000000 0.481823
+vn 0.968546 -0.000000 0.248836
+vn 0.838785 0.484274 0.248834
+vn 0.876269 -0.000000 0.481823
+vn 0.758872 -0.438134 0.481822
+vn 0.838785 -0.484272 0.248839
+vn 0.968546 -0.000000 0.248836
+vn 0.838785 -0.484272 0.248839
+vn 0.484271 -0.838784 0.248842
+vn 0.499998 -0.866026 0.000000
+vn 0.866026 -0.500000 0.000000
+vn 0.484271 -0.838784 0.248842
+vn -0.000000 -0.968544 0.248843
+vn 0.000000 -1.000000 0.000002
+vn 0.499998 -0.866026 0.000000
+vn -0.000000 -0.968544 0.248843
+vn -0.484271 -0.838785 0.248842
+vn -0.499998 -0.866027 0.000002
+vn 0.000000 -1.000000 0.000002
+vn -0.484271 -0.838785 0.248842
+vn -0.838785 -0.484272 0.248839
+vn -0.866025 -0.500000 0.000000
+vn -0.499998 -0.866027 0.000002
+vn -0.838785 -0.484272 0.248839
+vn -0.968545 -0.000000 0.248837
+vn -1.000000 -0.000000 0.000000
+vn -0.866025 -0.500000 0.000000
+vn -0.968545 -0.000000 0.248837
+vn -0.838785 0.484274 0.248836
+vn -0.866026 0.500000 0.000002
+vn -1.000000 -0.000000 0.000000
+vn -0.838785 0.484274 0.248836
+vn -0.484273 0.838785 0.248837
+vn -0.500001 0.866025 0.000002
+vn -0.866026 0.500000 0.000002
+vn -0.484273 0.838785 0.248837
+vn -0.000000 0.968546 0.248836
+vn -0.000000 1.000000 0.000000
+vn -0.500001 0.866025 0.000002
+vn -0.000000 0.968546 0.248836
+vn 0.484274 0.838785 0.248834
+vn 0.500001 0.866025 -0.000000
+vn -0.000000 1.000000 0.000000
+vn 0.484274 0.838785 0.248834
+vn 0.838785 0.484274 0.248834
+vn 0.866026 0.499999 0.000000
+vn 0.500001 0.866025 -0.000000
+vn 0.838785 0.484274 0.248834
+vn 0.968546 -0.000000 0.248836
+vn 1.000000 -0.000000 0.000000
+vn 0.866026 0.499999 0.000000
+vn 0.968546 -0.000000 0.248836
+vn 0.838785 -0.484272 0.248839
+vn 0.866026 -0.500000 0.000000
+vn 1.000000 -0.000000 0.000000
+vn 0.866026 -0.500000 0.000000
+vn 0.499998 -0.866026 0.000000
+vn 0.484270 -0.838785 -0.248842
+vn 0.838785 -0.484272 -0.248838
+vn 0.499998 -0.866026 0.000000
+vn 0.000000 -1.000000 0.000002
+vn 0.000000 -0.968544 -0.248843
+vn 0.484270 -0.838785 -0.248842
+vn 0.000000 -1.000000 0.000002
+vn -0.499998 -0.866027 0.000002
+vn -0.484271 -0.838785 -0.248841
+vn 0.000000 -0.968544 -0.248843
+vn -0.499998 -0.866027 0.000002
+vn -0.866025 -0.500000 0.000000
+vn -0.838785 -0.484272 -0.248838
+vn -0.484271 -0.838785 -0.248841
+vn -0.866025 -0.500000 0.000000
+vn -1.000000 -0.000000 0.000000
+vn -0.968545 0.000000 -0.248837
+vn -0.838785 -0.484272 -0.248838
+vn -1.000000 -0.000000 0.000000
+vn -0.866026 0.500000 0.000002
+vn -0.838785 0.484274 -0.248834
+vn -0.968545 0.000000 -0.248837
+vn -0.866026 0.500000 0.000002
+vn -0.500001 0.866025 0.000002
+vn -0.484273 0.838785 -0.248835
+vn -0.838785 0.484274 -0.248834
+vn -0.500001 0.866025 0.000002
+vn -0.000000 1.000000 0.000000
+vn 0.000000 0.968545 -0.248837
+vn -0.484273 0.838785 -0.248835
+vn -0.000000 1.000000 0.000000
+vn 0.500001 0.866025 -0.000000
+vn 0.484273 0.838785 -0.248834
+vn 0.000000 0.968545 -0.248837
+vn 0.500001 0.866025 -0.000000
+vn 0.866026 0.499999 0.000000
+vn 0.838785 0.484273 -0.248834
+vn 0.484273 0.838785 -0.248834
+vn 0.866026 0.499999 0.000000
+vn 1.000000 -0.000000 0.000000
+vn 0.968546 0.000000 -0.248836
+vn 0.838785 0.484273 -0.248834
+vn 1.000000 -0.000000 0.000000
+vn 0.866026 -0.500000 0.000000
+vn 0.838785 -0.484272 -0.248838
+vn 0.968546 0.000000 -0.248836
+vn 0.838785 -0.484272 -0.248838
+vn 0.484270 -0.838785 -0.248842
+vn 0.438133 -0.758872 -0.481823
+vn 0.758871 -0.438134 -0.481823
+vn 0.484270 -0.838785 -0.248842
+vn 0.000000 -0.968544 -0.248843
+vn -0.000000 -0.876268 -0.481824
+vn 0.438133 -0.758872 -0.481823
+vn 0.000000 -0.968544 -0.248843
+vn -0.484271 -0.838785 -0.248841
+vn -0.438134 -0.758872 -0.481822
+vn -0.000000 -0.876268 -0.481824
+vn -0.484271 -0.838785 -0.248841
+vn -0.838785 -0.484272 -0.248838
+vn -0.758872 -0.438135 -0.481821
+vn -0.438134 -0.758872 -0.481822
+vn -0.838785 -0.484272 -0.248838
+vn -0.968545 0.000000 -0.248837
+vn -0.876268 0.000000 -0.481824
+vn -0.758872 -0.438135 -0.481821
+vn -0.968545 0.000000 -0.248837
+vn -0.838785 0.484274 -0.248834
+vn -0.758871 0.438134 -0.481823
+vn -0.876268 0.000000 -0.481824
+vn -0.838785 0.484274 -0.248834
+vn -0.484273 0.838785 -0.248835
+vn -0.438133 0.758869 -0.481827
+vn -0.758871 0.438134 -0.481823
+vn -0.484273 0.838785 -0.248835
+vn 0.000000 0.968545 -0.248837
+vn 0.000000 0.876264 -0.481831
+vn -0.438133 0.758869 -0.481827
+vn 0.000000 0.968545 -0.248837
+vn 0.484273 0.838785 -0.248834
+vn 0.438134 0.758870 -0.481825
+vn 0.000000 0.876264 -0.481831
+vn 0.484273 0.838785 -0.248834
+vn 0.838785 0.484273 -0.248834
+vn 0.758871 0.438135 -0.481822
+vn 0.438134 0.758870 -0.481825
+vn 0.838785 0.484273 -0.248834
+vn 0.968546 0.000000 -0.248836
+vn 0.876268 0.000000 -0.481824
+vn 0.758871 0.438135 -0.481822
+vn 0.968546 0.000000 -0.248836
+vn 0.838785 -0.484272 -0.248838
+vn 0.758871 -0.438134 -0.481823
+vn 0.876268 0.000000 -0.481824
+vn 0.758871 -0.438134 -0.481823
+vn 0.438133 -0.758872 -0.481823
+vn 0.364804 -0.631862 -0.683863
+vn 0.631861 -0.364805 -0.683863
+vn 0.438133 -0.758872 -0.481823
+vn -0.000000 -0.876268 -0.481824
+vn 0.000000 -0.729611 -0.683863
+vn 0.364804 -0.631862 -0.683863
+vn -0.000000 -0.876268 -0.481824
+vn -0.438134 -0.758872 -0.481822
+vn -0.364804 -0.631862 -0.683863
+vn 0.000000 -0.729611 -0.683863
+vn -0.438134 -0.758872 -0.481822
+vn -0.758872 -0.438135 -0.481821
+vn -0.631861 -0.364804 -0.683863
+vn -0.364804 -0.631862 -0.683863
+vn -0.758872 -0.438135 -0.481821
+vn -0.876268 0.000000 -0.481824
+vn -0.729609 -0.000000 -0.683864
+vn -0.631861 -0.364804 -0.683863
+vn -0.876268 0.000000 -0.481824
+vn -0.758871 0.438134 -0.481823
+vn -0.631861 0.364805 -0.683863
+vn -0.729609 -0.000000 -0.683864
+vn -0.758871 0.438134 -0.481823
+vn -0.438133 0.758869 -0.481827
+vn -0.364806 0.631861 -0.683863
+vn -0.631861 0.364805 -0.683863
+vn -0.438133 0.758869 -0.481827
+vn 0.000000 0.876264 -0.481831
+vn -0.000000 0.729610 -0.683863
+vn -0.364806 0.631861 -0.683863
+vn 0.000000 0.876264 -0.481831
+vn 0.438134 0.758870 -0.481825
+vn 0.364806 0.631862 -0.683862
+vn -0.000000 0.729610 -0.683863
+vn 0.438134 0.758870 -0.481825
+vn 0.758871 0.438135 -0.481822
+vn 0.631861 0.364805 -0.683863
+vn 0.364806 0.631862 -0.683862
+vn 0.758871 0.438135 -0.481822
+vn 0.876268 0.000000 -0.481824
+vn 0.729609 -0.000000 -0.683865
+vn 0.631861 0.364805 -0.683863
+vn 0.876268 0.000000 -0.481824
+vn 0.758871 -0.438134 -0.481823
+vn 0.631861 -0.364805 -0.683863
+vn 0.729609 -0.000000 -0.683865
+vn 0.631861 -0.364805 -0.683863
+vn 0.364804 -0.631862 -0.683863
+vn 0.270244 -0.468078 -0.841351
+vn 0.468077 -0.270244 -0.841352
+vn 0.364804 -0.631862 -0.683863
+vn 0.000000 -0.729611 -0.683863
+vn 0.000000 -0.540489 -0.841351
+vn 0.270244 -0.468078 -0.841351
+vn 0.000000 -0.729611 -0.683863
+vn -0.364804 -0.631862 -0.683863
+vn -0.270243 -0.468076 -0.841352
+vn 0.000000 -0.540489 -0.841351
+vn -0.364804 -0.631862 -0.683863
+vn -0.631861 -0.364804 -0.683863
+vn -0.468076 -0.270243 -0.841352
+vn -0.270243 -0.468076 -0.841352
+vn -0.631861 -0.364804 -0.683863
+vn -0.729609 -0.000000 -0.683864
+vn -0.540487 0.000000 -0.841352
+vn -0.468076 -0.270243 -0.841352
+vn -0.729609 -0.000000 -0.683864
+vn -0.631861 0.364805 -0.683863
+vn -0.468078 0.270244 -0.841351
+vn -0.540487 0.000000 -0.841352
+vn -0.631861 0.364805 -0.683863
+vn -0.364806 0.631861 -0.683863
+vn -0.270246 0.468078 -0.841350
+vn -0.468078 0.270244 -0.841351
+vn -0.364806 0.631861 -0.683863
+vn -0.000000 0.729610 -0.683863
+vn 0.000000 0.540490 -0.841350
+vn -0.270246 0.468078 -0.841350
+vn -0.000000 0.729610 -0.683863
+vn 0.364806 0.631862 -0.683862
+vn 0.270246 0.468078 -0.841350
+vn 0.000000 0.540490 -0.841350
+vn 0.364806 0.631862 -0.683862
+vn 0.631861 0.364805 -0.683863
+vn 0.468076 0.270244 -0.841352
+vn 0.270246 0.468078 -0.841350
+vn 0.631861 0.364805 -0.683863
+vn 0.729609 -0.000000 -0.683865
+vn 0.540485 -0.000000 -0.841354
+vn 0.468076 0.270244 -0.841352
+vn 0.729609 -0.000000 -0.683865
+vn 0.631861 -0.364805 -0.683863
+vn 0.468077 -0.270244 -0.841352
+vn 0.540485 -0.000000 -0.841354
+vn 0.468077 -0.270244 -0.841352
+vn 0.270244 -0.468078 -0.841351
+vn 0.167292 -0.289761 -0.942365
+vn 0.289759 -0.167293 -0.942366
+vn 0.270244 -0.468078 -0.841351
+vn 0.000000 -0.540489 -0.841351
+vn 0.000000 -0.334590 -0.942364
+vn 0.167292 -0.289761 -0.942365
+vn 0.000000 -0.540489 -0.841351
+vn -0.270243 -0.468076 -0.841352
+vn -0.167291 -0.289761 -0.942365
+vn 0.000000 -0.334590 -0.942364
+vn -0.270243 -0.468076 -0.841352
+vn -0.468076 -0.270243 -0.841352
+vn -0.289760 -0.167293 -0.942365
+vn -0.167291 -0.289761 -0.942365
+vn -0.468076 -0.270243 -0.841352
+vn -0.540487 0.000000 -0.841352
+vn -0.334588 0.000000 -0.942364
+vn -0.289760 -0.167293 -0.942365
+vn -0.540487 0.000000 -0.841352
+vn -0.468078 0.270244 -0.841351
+vn -0.289761 0.167293 -0.942365
+vn -0.334588 0.000000 -0.942364
+vn -0.468078 0.270244 -0.841351
+vn -0.270246 0.468078 -0.841350
+vn -0.167294 0.289759 -0.942365
+vn -0.289761 0.167293 -0.942365
+vn -0.270246 0.468078 -0.841350
+vn 0.000000 0.540490 -0.841350
+vn 0.000000 0.334587 -0.942365
+vn -0.167294 0.289759 -0.942365
+vn 0.000000 0.540490 -0.841350
+vn 0.270246 0.468078 -0.841350
+vn 0.167293 0.289759 -0.942365
+vn 0.000000 0.334587 -0.942365
+vn 0.270246 0.468078 -0.841350
+vn 0.468076 0.270244 -0.841352
+vn 0.289759 0.167293 -0.942365
+vn 0.167293 0.289759 -0.942365
+vn 0.468076 0.270244 -0.841352
+vn 0.540485 -0.000000 -0.841354
+vn 0.334585 0.000000 -0.942365
+vn 0.289759 0.167293 -0.942365
+vn 0.540485 -0.000000 -0.841354
+vn 0.468077 -0.270244 -0.841352
+vn 0.289759 -0.167293 -0.942366
+vn 0.334585 0.000000 -0.942365
+vn 0.167292 -0.289761 0.942365
+vn 0.289762 -0.167294 0.942365
+vn -0.000000 0.000000 1.000000
+vn -0.000001 -0.334591 0.942364
+vn 0.167292 -0.289761 0.942365
+vn -0.000000 0.000000 1.000000
+vn -0.167292 -0.289761 0.942365
+vn -0.000001 -0.334591 0.942364
+vn -0.000000 0.000000 1.000000
+vn -0.289758 -0.167292 0.942366
+vn -0.167292 -0.289761 0.942365
+vn -0.000000 0.000000 1.000000
+vn -0.334585 -0.000000 0.942366
+vn -0.289758 -0.167292 0.942366
+vn -0.000000 0.000000 1.000000
+vn -0.289758 0.167293 0.942366
+vn -0.334585 -0.000000 0.942366
+vn -0.000000 0.000000 1.000000
+vn -0.167293 0.289759 0.942366
+vn -0.289758 0.167293 0.942366
+vn -0.000000 0.000000 1.000000
+vn 0.000002 0.334587 0.942365
+vn -0.167293 0.289759 0.942366
+vn -0.000000 0.000000 1.000000
+vn 0.167293 0.289758 0.942366
+vn 0.000002 0.334587 0.942365
+vn -0.000000 0.000000 1.000000
+vn 0.289761 0.167292 0.942365
+vn 0.167293 0.289758 0.942366
+vn -0.000000 0.000000 1.000000
+vn 0.334591 0.000000 0.942364
+vn 0.289761 0.167292 0.942365
+vn -0.000000 0.000000 1.000000
+vn 0.289762 -0.167294 0.942365
+vn 0.334591 0.000000 0.942364
+vn -0.000000 0.000000 1.000000
+vn 0.289759 -0.167293 -0.942366
+vn 0.167292 -0.289761 -0.942365
+vn 0.000001 0.000000 -1.000000
+vn 0.167292 -0.289761 -0.942365
+vn 0.000000 -0.334590 -0.942364
+vn 0.000001 0.000000 -1.000000
+vn 0.000000 -0.334590 -0.942364
+vn -0.167291 -0.289761 -0.942365
+vn 0.000001 0.000000 -1.000000
+vn -0.167291 -0.289761 -0.942365
+vn -0.289760 -0.167293 -0.942365
+vn 0.000001 0.000000 -1.000000
+vn -0.289760 -0.167293 -0.942365
+vn -0.334588 0.000000 -0.942364
+vn 0.000001 0.000000 -1.000000
+vn -0.334588 0.000000 -0.942364
+vn -0.289761 0.167293 -0.942365
+vn 0.000001 0.000000 -1.000000
+vn -0.289761 0.167293 -0.942365
+vn -0.167294 0.289759 -0.942365
+vn 0.000001 0.000000 -1.000000
+vn -0.167294 0.289759 -0.942365
+vn 0.000000 0.334587 -0.942365
+vn 0.000001 0.000000 -1.000000
+vn 0.000000 0.334587 -0.942365
+vn 0.167293 0.289759 -0.942365
+vn 0.000001 0.000000 -1.000000
+vn 0.167293 0.289759 -0.942365
+vn 0.289759 0.167293 -0.942365
+vn 0.000001 0.000000 -1.000000
+vn 0.289759 0.167293 -0.942365
+vn 0.334585 0.000000 -0.942365
+vn 0.000001 0.000000 -1.000000
+vn 0.334585 0.000000 -0.942365
+vn 0.289759 -0.167293 -0.942366
+vn 0.000001 0.000000 -1.000000
+s off
+g phys polySurface4
+f 9/17/21 10/18/22 22/19/23 21/20/24
+f 10/18/25 11/21/26 23/22/27 22/19/28
+f 11/21/29 12/23/30 24/24/31 23/22/32
+f 12/23/33 13/25/34 25/26/35 24/24/36
+f 13/25/37 14/27/38 26/28/39 25/26/40
+f 14/27/41 15/29/42 27/30/43 26/28/44
+f 15/29/45 16/31/46 28/32/47 27/30/48
+f 16/31/49 17/33/50 29/34/51 28/32/52
+f 17/33/53 18/35/54 30/36/55 29/34/56
+f 18/35/57 19/37/58 31/38/59 30/36/60
+f 19/37/61 20/39/62 32/40/63 31/38/64
+f 20/39/65 9/41/66 21/42/67 32/40/68
+f 21/20/69 22/19/70 34/43/71 33/44/72
+f 22/19/73 23/22/74 35/45/75 34/43/76
+f 23/22/77 24/24/78 36/46/79 35/45/80
+f 24/24/81 25/26/82 37/47/83 36/46/84
+f 25/26/85 26/28/86 38/48/87 37/47/88
+f 26/28/89 27/30/90 39/49/91 38/48/92
+f 27/30/93 28/32/94 40/50/95 39/49/96
+f 28/32/97 29/34/98 41/51/99 40/50/100
+f 29/34/101 30/36/102 42/52/103 41/51/104
+f 30/36/105 31/38/106 43/53/107 42/52/108
+f 31/38/109 32/40/110 44/54/111 43/53/112
+f 32/40/113 21/42/114 33/55/115 44/54/116
+f 33/44/117 34/43/118 46/56/119 45/57/120
+f 34/43/121 35/45/122 47/58/123 46/56/124
+f 35/45/125 36/46/126 48/59/127 47/58/128
+f 36/46/129 37/47/130 49/60/131 48/59/132
+f 37/47/133 38/48/134 50/61/135 49/60/136
+f 38/48/137 39/49/138 51/62/139 50/61/140
+f 39/49/141 40/50/142 52/63/143 51/62/144
+f 40/50/145 41/51/146 53/64/147 52/63/148
+f 41/51/149 42/52/150 54/65/151 53/64/152
+f 42/52/153 43/53/154 55/66/155 54/65/156
+f 43/53/157 44/54/158 56/67/159 55/66/160
+f 44/54/161 33/55/162 45/68/163 56/67/164
+f 45/57/165 46/56/166 58/69/167 57/70/168
+f 46/56/169 47/58/170 59/71/171 58/69/172
+f 47/58/173 48/59/174 60/72/175 59/71/176
+f 48/59/177 49/60/178 61/73/179 60/72/180
+f 49/60/181 50/61/182 62/74/183 61/73/184
+f 50/61/185 51/62/186 63/75/187 62/74/188
+f 51/62/189 52/63/190 64/76/191 63/75/192
+f 52/63/193 53/64/194 65/77/195 64/76/196
+f 53/64/197 54/65/198 66/78/199 65/77/200
+f 54/65/201 55/66/202 67/79/203 66/78/204
+f 55/66/205 56/67/206 68/80/207 67/79/208
+f 56/67/209 45/68/210 57/81/211 68/80/212
+f 57/70/213 58/69/214 70/82/215 69/83/216
+f 58/69/217 59/71/218 71/84/219 70/82/220
+f 59/71/221 60/72/222 72/85/223 71/84/224
+f 60/72/225 61/73/226 73/86/227 72/85/228
+f 61/73/229 62/74/230 74/87/231 73/86/232
+f 62/74/233 63/75/234 75/88/235 74/87/236
+f 63/75/237 64/76/238 76/89/239 75/88/240
+f 64/76/241 65/77/242 77/90/243 76/89/244
+f 65/77/245 66/78/246 78/91/247 77/90/248
+f 66/78/249 67/79/250 79/92/251 78/91/252
+f 67/79/253 68/80/254 80/93/255 79/92/256
+f 68/80/257 57/81/258 69/94/259 80/93/260
+f 69/83/261 70/82/262 82/95/263 81/96/264
+f 70/82/265 71/84/266 83/97/267 82/95/268
+f 71/84/269 72/85/270 84/98/271 83/97/272
+f 72/85/273 73/86/274 85/99/275 84/98/276
+f 73/86/277 74/87/278 86/100/279 85/99/280
+f 74/87/281 75/88/282 87/101/283 86/100/284
+f 75/88/285 76/89/286 88/102/287 87/101/288
+f 76/89/289 77/90/290 89/103/291 88/102/292
+f 77/90/293 78/91/294 90/104/295 89/103/296
+f 78/91/297 79/92/298 91/105/299 90/104/300
+f 79/92/301 80/93/302 92/106/303 91/105/304
+f 80/93/305 69/94/306 81/107/307 92/106/308
+f 81/96/309 82/95/310 94/108/311 93/109/312
+f 82/95/313 83/97/314 95/110/315 94/108/316
+f 83/97/317 84/98/318 96/111/319 95/110/320
+f 84/98/321 85/99/322 97/112/323 96/111/324
+f 85/99/325 86/100/326 98/113/327 97/112/328
+f 86/100/329 87/101/330 99/114/331 98/113/332
+f 87/101/333 88/102/334 100/115/335 99/114/336
+f 88/102/337 89/103/338 101/116/339 100/115/340
+f 89/103/341 90/104/342 102/117/343 101/116/344
+f 90/104/345 91/105/346 103/118/347 102/117/348
+f 91/105/349 92/106/350 104/119/351 103/118/352
+f 92/106/353 81/107/354 93/120/355 104/119/356
+f 93/109/357 94/108/358 106/121/359 105/122/360
+f 94/108/361 95/110/362 107/123/363 106/121/364
+f 95/110/365 96/111/366 108/124/367 107/123/368
+f 96/111/369 97/112/370 109/125/371 108/124/372
+f 97/112/373 98/113/374 110/126/375 109/125/376
+f 98/113/377 99/114/378 111/127/379 110/126/380
+f 99/114/381 100/115/382 112/128/383 111/127/384
+f 100/115/385 101/116/386 113/129/387 112/128/388
+f 101/116/389 102/117/390 114/130/391 113/129/392
+f 102/117/393 103/118/394 115/131/395 114/130/396
+f 103/118/397 104/119/398 116/132/399 115/131/400
+f 104/119/401 93/120/402 105/133/403 116/132/404
+f 105/122/405 106/121/406 118/134/407 117/135/408
+f 106/121/409 107/123/410 119/136/411 118/134/412
+f 107/123/413 108/124/414 120/137/415 119/136/416
+f 108/124/417 109/125/418 121/138/419 120/137/420
+f 109/125/421 110/126/422 122/139/423 121/138/424
+f 110/126/425 111/127/426 123/140/427 122/139/428
+f 111/127/429 112/128/430 124/141/431 123/140/432
+f 112/128/433 113/129/434 125/142/435 124/141/436
+f 113/129/437 114/130/438 126/143/439 125/142/440
+f 114/130/441 115/131/442 127/144/443 126/143/444
+f 115/131/445 116/132/446 128/145/447 127/144/448
+f 116/132/449 105/133/450 117/146/451 128/145/452
+f 117/135/453 118/134/454 130/147/455 129/148/456
+f 118/134/457 119/136/458 131/149/459 130/147/460
+f 119/136/461 120/137/462 132/150/463 131/149/464
+f 120/137/465 121/138/466 133/151/467 132/150/468
+f 121/138/469 122/139/470 134/152/471 133/151/472
+f 122/139/473 123/140/474 135/153/475 134/152/476
+f 123/140/477 124/141/478 136/154/479 135/153/480
+f 124/141/481 125/142/482 137/155/483 136/154/484
+f 125/142/485 126/143/486 138/156/487 137/155/488
+f 126/143/489 127/144/490 139/157/491 138/156/492
+f 127/144/493 128/145/494 140/158/495 139/157/496
+f 128/145/497 117/146/498 129/159/499 140/158/500
+f 10/18/501 9/17/502 141/160/503
+f 11/21/504 10/18/505 141/161/506
+f 12/23/507 11/21/508 141/162/509
+f 13/25/510 12/23/511 141/163/512
+f 14/27/513 13/25/514 141/164/515
+f 15/29/516 14/27/517 141/165/518
+f 16/31/519 15/29/520 141/166/521
+f 17/33/522 16/31/523 141/167/524
+f 18/35/525 17/33/526 141/168/527
+f 19/37/528 18/35/529 141/169/530
+f 20/39/531 19/37/532 141/170/533
+f 9/41/534 20/39/535 141/171/536
+f 129/148/537 130/147/538 142/172/539
+f 130/147/540 131/149/541 142/173/542
+f 131/149/543 132/150/544 142/174/545
+f 132/150/546 133/151/547 142/175/548
+f 133/151/549 134/152/550 142/176/551
+f 134/152/552 135/153/553 142/177/554
+f 135/153/555 136/154/556 142/178/557
+f 136/154/558 137/155/559 142/179/560
+f 137/155/561 138/156/562 142/180/563
+f 138/156/564 139/157/565 142/181/566
+f 139/157/567 140/158/568 142/182/569
+f 140/158/570 129/159/571 142/183/572
diff --git a/unpublishedScripts/marketplace/xylophone/Mallet3-2pc.fbx b/unpublishedScripts/marketplace/xylophone/Mallet3-2pc.fbx
new file mode 100644
index 0000000000..559646d230
Binary files /dev/null and b/unpublishedScripts/marketplace/xylophone/Mallet3-2pc.fbx differ
diff --git a/unpublishedScripts/marketplace/xylophone/xyloKey_2_a_e.fbx b/unpublishedScripts/marketplace/xylophone/xyloKey_2_a_e.fbx
new file mode 100644
index 0000000000..405abb433b
Binary files /dev/null and b/unpublishedScripts/marketplace/xylophone/xyloKey_2_a_e.fbx differ
diff --git a/unpublishedScripts/marketplace/xylophone/xylophoneFrameWithWave.fbx b/unpublishedScripts/marketplace/xylophone/xylophoneFrameWithWave.fbx
new file mode 100644
index 0000000000..bb9ef84d42
--- /dev/null
+++ b/unpublishedScripts/marketplace/xylophone/xylophoneFrameWithWave.fbx
@@ -0,0 +1,1031 @@
+; FBX 7.5.0 project file
+; Copyright (C) 1997-2015 Autodesk Inc. and/or its licensors.
+; All rights reserved.
+; ----------------------------------------------------
+
+FBXHeaderExtension:  {
+	FBXHeaderVersion: 1003
+	FBXVersion: 7500
+	CreationTimeStamp:  {
+		Version: 1000
+		Year: 2017
+		Month: 3
+		Day: 6
+		Hour: 10
+		Minute: 48
+		Second: 41
+		Millisecond: 261
+	}
+	Creator: "FBX SDK/FBX Plugins version 2017.0.1"
+	SceneInfo: "SceneInfo::GlobalInfo", "UserData" {
+		Type: "UserData"
+		Version: 100
+		MetaData:  {
+			Version: 100
+			Title: ""
+			Subject: ""
+			Author: ""
+			Keywords: ""
+			Revision: ""
+			Comment: ""
+		}
+		Properties70:  {
+			P: "DocumentUrl", "KString", "Url", "", "F:\Dropbox\Dropbox\_High Fidelity\xylophone\xylophoneFrameWithWave.fbx"
+			P: "SrcDocumentUrl", "KString", "Url", "", "F:\Dropbox\Dropbox\_High Fidelity\xylophone\xylophoneFrameWithWave.fbx"
+			P: "Original", "Compound", "", ""
+			P: "Original|ApplicationVendor", "KString", "", "", "Autodesk"
+			P: "Original|ApplicationName", "KString", "", "", "Maya"
+			P: "Original|ApplicationVersion", "KString", "", "", "2017"
+			P: "Original|DateTime_GMT", "DateTime", "", "", "06/03/2017 18:48:41.259"
+			P: "Original|FileName", "KString", "", "", "F:\Dropbox\Dropbox\_High Fidelity\xylophone\xylophoneFrameWithWave.fbx"
+			P: "LastSaved", "Compound", "", ""
+			P: "LastSaved|ApplicationVendor", "KString", "", "", "Autodesk"
+			P: "LastSaved|ApplicationName", "KString", "", "", "Maya"
+			P: "LastSaved|ApplicationVersion", "KString", "", "", "2017"
+			P: "LastSaved|DateTime_GMT", "DateTime", "", "", "06/03/2017 18:48:41.259"
+			P: "Original|ApplicationActiveProject", "KString", "", "", "F:\Dropbox\Dropbox\_High Fidelity\xylophone"
+			P: "Original|ApplicationNativeFile", "KString", "", "", "F:\Dropbox\Dropbox\_High Fidelity\xylophone\xylophoneFrameWithWave.mb"
+		}
+	}
+}
+GlobalSettings:  {
+	Version: 1000
+	Properties70:  {
+		P: "UpAxis", "int", "Integer", "",1
+		P: "UpAxisSign", "int", "Integer", "",1
+		P: "FrontAxis", "int", "Integer", "",2
+		P: "FrontAxisSign", "int", "Integer", "",1
+		P: "CoordAxis", "int", "Integer", "",0
+		P: "CoordAxisSign", "int", "Integer", "",1
+		P: "OriginalUpAxis", "int", "Integer", "",1
+		P: "OriginalUpAxisSign", "int", "Integer", "",1
+		P: "UnitScaleFactor", "double", "Number", "",1
+		P: "OriginalUnitScaleFactor", "double", "Number", "",1
+		P: "AmbientColor", "ColorRGB", "Color", "",0,0,0
+		P: "DefaultCamera", "KString", "", "", "Producer Perspective"
+		P: "TimeMode", "enum", "", "",11
+		P: "TimeProtocol", "enum", "", "",2
+		P: "SnapOnFrameMode", "enum", "", "",0
+		P: "TimeSpanStart", "KTime", "Time", "",1924423250
+		P: "TimeSpanStop", "KTime", "Time", "",384884650000
+		P: "CustomFrameRate", "double", "Number", "",-1
+		P: "TimeMarker", "Compound", "", ""
+		P: "CurrentTimeMarker", "int", "Integer", "",-1
+	}
+}
+
+; Documents Description
+;------------------------------------------------------------------
+
+Documents:  {
+	Count: 1
+	Document: 1980820224, "", "Scene" {
+		Properties70:  {
+			P: "SourceObject", "object", "", ""
+			P: "ActiveAnimStackName", "KString", "", "", "Take 001"
+		}
+		RootNode: 0
+	}
+}
+
+; Document References
+;------------------------------------------------------------------
+
+References:  {
+}
+
+; Object definitions
+;------------------------------------------------------------------
+
+Definitions:  {
+	Version: 100
+	Count: 30
+	ObjectType: "GlobalSettings" {
+		Count: 1
+	}
+	ObjectType: "AnimationStack" {
+		Count: 1
+		PropertyTemplate: "FbxAnimStack" {
+			Properties70:  {
+				P: "Description", "KString", "", "", ""
+				P: "LocalStart", "KTime", "Time", "",0
+				P: "LocalStop", "KTime", "Time", "",0
+				P: "ReferenceStart", "KTime", "Time", "",0
+				P: "ReferenceStop", "KTime", "Time", "",0
+			}
+		}
+	}
+	ObjectType: "AnimationLayer" {
+		Count: 1
+		PropertyTemplate: "FbxAnimLayer" {
+			Properties70:  {
+				P: "Weight", "Number", "", "A",100
+				P: "Mute", "bool", "", "",0
+				P: "Solo", "bool", "", "",0
+				P: "Lock", "bool", "", "",0
+				P: "Color", "ColorRGB", "Color", "",0.8,0.8,0.8
+				P: "BlendMode", "enum", "", "",0
+				P: "RotationAccumulationMode", "enum", "", "",0
+				P: "ScaleAccumulationMode", "enum", "", "",0
+				P: "BlendModeBypass", "ULongLong", "", "",0
+			}
+		}
+	}
+	ObjectType: "NodeAttribute" {
+		Count: 5
+		PropertyTemplate: "FbxNull" {
+			Properties70:  {
+				P: "Color", "ColorRGB", "Color", "",0.8,0.8,0.8
+				P: "Size", "double", "Number", "",100
+				P: "Look", "enum", "", "",1
+			}
+		}
+	}
+	ObjectType: "Model" {
+		Count: 6
+		PropertyTemplate: "FbxNode" {
+			Properties70:  {
+				P: "QuaternionInterpolate", "enum", "", "",0
+				P: "RotationOffset", "Vector3D", "Vector", "",0,0,0
+				P: "RotationPivot", "Vector3D", "Vector", "",0,0,0
+				P: "ScalingOffset", "Vector3D", "Vector", "",0,0,0
+				P: "ScalingPivot", "Vector3D", "Vector", "",0,0,0
+				P: "TranslationActive", "bool", "", "",0
+				P: "TranslationMin", "Vector3D", "Vector", "",0,0,0
+				P: "TranslationMax", "Vector3D", "Vector", "",0,0,0
+				P: "TranslationMinX", "bool", "", "",0
+				P: "TranslationMinY", "bool", "", "",0
+				P: "TranslationMinZ", "bool", "", "",0
+				P: "TranslationMaxX", "bool", "", "",0
+				P: "TranslationMaxY", "bool", "", "",0
+				P: "TranslationMaxZ", "bool", "", "",0
+				P: "RotationOrder", "enum", "", "",0
+				P: "RotationSpaceForLimitOnly", "bool", "", "",0
+				P: "RotationStiffnessX", "double", "Number", "",0
+				P: "RotationStiffnessY", "double", "Number", "",0
+				P: "RotationStiffnessZ", "double", "Number", "",0
+				P: "AxisLen", "double", "Number", "",10
+				P: "PreRotation", "Vector3D", "Vector", "",0,0,0
+				P: "PostRotation", "Vector3D", "Vector", "",0,0,0
+				P: "RotationActive", "bool", "", "",0
+				P: "RotationMin", "Vector3D", "Vector", "",0,0,0
+				P: "RotationMax", "Vector3D", "Vector", "",0,0,0
+				P: "RotationMinX", "bool", "", "",0
+				P: "RotationMinY", "bool", "", "",0
+				P: "RotationMinZ", "bool", "", "",0
+				P: "RotationMaxX", "bool", "", "",0
+				P: "RotationMaxY", "bool", "", "",0
+				P: "RotationMaxZ", "bool", "", "",0
+				P: "InheritType", "enum", "", "",0
+				P: "ScalingActive", "bool", "", "",0
+				P: "ScalingMin", "Vector3D", "Vector", "",0,0,0
+				P: "ScalingMax", "Vector3D", "Vector", "",1,1,1
+				P: "ScalingMinX", "bool", "", "",0
+				P: "ScalingMinY", "bool", "", "",0
+				P: "ScalingMinZ", "bool", "", "",0
+				P: "ScalingMaxX", "bool", "", "",0
+				P: "ScalingMaxY", "bool", "", "",0
+				P: "ScalingMaxZ", "bool", "", "",0
+				P: "GeometricTranslation", "Vector3D", "Vector", "",0,0,0
+				P: "GeometricRotation", "Vector3D", "Vector", "",0,0,0
+				P: "GeometricScaling", "Vector3D", "Vector", "",1,1,1
+				P: "MinDampRangeX", "double", "Number", "",0
+				P: "MinDampRangeY", "double", "Number", "",0
+				P: "MinDampRangeZ", "double", "Number", "",0
+				P: "MaxDampRangeX", "double", "Number", "",0
+				P: "MaxDampRangeY", "double", "Number", "",0
+				P: "MaxDampRangeZ", "double", "Number", "",0
+				P: "MinDampStrengthX", "double", "Number", "",0
+				P: "MinDampStrengthY", "double", "Number", "",0
+				P: "MinDampStrengthZ", "double", "Number", "",0
+				P: "MaxDampStrengthX", "double", "Number", "",0
+				P: "MaxDampStrengthY", "double", "Number", "",0
+				P: "MaxDampStrengthZ", "double", "Number", "",0
+				P: "PreferedAngleX", "double", "Number", "",0
+				P: "PreferedAngleY", "double", "Number", "",0
+				P: "PreferedAngleZ", "double", "Number", "",0
+				P: "LookAtProperty", "object", "", ""
+				P: "UpVectorProperty", "object", "", ""
+				P: "Show", "bool", "", "",1
+				P: "NegativePercentShapeSupport", "bool", "", "",1
+				P: "DefaultAttributeIndex", "int", "Integer", "",-1
+				P: "Freeze", "bool", "", "",0
+				P: "LODBox", "bool", "", "",0
+				P: "Lcl Translation", "Lcl Translation", "", "A",0,0,0
+				P: "Lcl Rotation", "Lcl Rotation", "", "A",0,0,0
+				P: "Lcl Scaling", "Lcl Scaling", "", "A",1,1,1
+				P: "Visibility", "Visibility", "", "A",1
+				P: "Visibility Inheritance", "Visibility Inheritance", "", "",1
+			}
+		}
+	}
+	ObjectType: "Geometry" {
+		Count: 1
+		PropertyTemplate: "FbxMesh" {
+			Properties70:  {
+				P: "Color", "ColorRGB", "Color", "",0.8,0.8,0.8
+				P: "BBoxMin", "Vector3D", "Vector", "",0,0,0
+				P: "BBoxMax", "Vector3D", "Vector", "",0,0,0
+				P: "Primary Visibility", "bool", "", "",1
+				P: "Casts Shadows", "bool", "", "",1
+				P: "Receive Shadows", "bool", "", "",1
+			}
+		}
+	}
+	ObjectType: "Material" {
+		Count: 1
+		PropertyTemplate: "FbxSurfaceMaterial" {
+			Properties70:  {
+				P: "ShadingModel", "KString", "", "", "Unknown"
+				P: "MultiLayer", "bool", "", "",0
+			}
+		}
+	}
+	ObjectType: "Implementation" {
+		Count: 1
+		PropertyTemplate: "FbxImplementation" {
+			Properties70:  {
+				P: "ShaderLanguage", "KString", "", "", "MentalRaySL"
+				P: "ShaderLanguageVersion", "KString", "", "", ""
+				P: "RenderAPI", "KString", "", "", "MentalRay"
+				P: "RenderAPIVersion", "KString", "", "", ""
+				P: "RootBindingName", "KString", "", "", ""
+				P: "Constants", "Compound", "", ""
+			}
+		}
+	}
+	ObjectType: "BindingTable" {
+		Count: 1
+		PropertyTemplate: "FbxBindingTable" {
+			Properties70:  {
+				P: "TargetName", "KString", "", "", ""
+				P: "TargetType", "KString", "", "", ""
+				P: "CodeAbsoluteURL", "KString", "XRefUrl", "", ""
+				P: "CodeRelativeURL", "KString", "XRefUrl", "", ""
+				P: "CodeTAG", "KString", "", "", "shader"
+				P: "DescAbsoluteURL", "KString", "XRefUrl", "", ""
+				P: "DescRelativeURL", "KString", "XRefUrl", "", ""
+				P: "DescTAG", "KString", "", "", "shader"
+			}
+		}
+	}
+	ObjectType: "Texture" {
+		Count: 8
+		PropertyTemplate: "FbxFileTexture" {
+			Properties70:  {
+				P: "TextureTypeUse", "enum", "", "",0
+				P: "Texture alpha", "Number", "", "A",1
+				P: "CurrentMappingType", "enum", "", "",0
+				P: "WrapModeU", "enum", "", "",0
+				P: "WrapModeV", "enum", "", "",0
+				P: "UVSwap", "bool", "", "",0
+				P: "PremultiplyAlpha", "bool", "", "",1
+				P: "Translation", "Vector", "", "A",0,0,0
+				P: "Rotation", "Vector", "", "A",0,0,0
+				P: "Scaling", "Vector", "", "A",1,1,1
+				P: "TextureRotationPivot", "Vector3D", "Vector", "",0,0,0
+				P: "TextureScalingPivot", "Vector3D", "Vector", "",0,0,0
+				P: "CurrentTextureBlendMode", "enum", "", "",1
+				P: "UVSet", "KString", "", "", "default"
+				P: "UseMaterial", "bool", "", "",0
+				P: "UseMipMap", "bool", "", "",0
+			}
+		}
+	}
+	ObjectType: "Video" {
+		Count: 4
+		PropertyTemplate: "FbxVideo" {
+			Properties70:  {
+				P: "ImageSequence", "bool", "", "",0
+				P: "ImageSequenceOffset", "int", "Integer", "",0
+				P: "FrameRate", "double", "Number", "",0
+				P: "LastFrame", "int", "Integer", "",0
+				P: "Width", "int", "Integer", "",0
+				P: "Height", "int", "Integer", "",0
+				P: "Path", "KString", "XRefUrl", "", ""
+				P: "StartFrame", "int", "Integer", "",0
+				P: "StopFrame", "int", "Integer", "",0
+				P: "PlaySpeed", "double", "Number", "",0
+				P: "Offset", "KTime", "Time", "",0
+				P: "InterlaceMode", "enum", "", "",0
+				P: "FreeRunning", "bool", "", "",0
+				P: "Loop", "bool", "", "",0
+				P: "AccessMode", "enum", "", "",0
+			}
+		}
+	}
+}
+
+; Object properties
+;------------------------------------------------------------------
+
+Objects:  {
+	NodeAttribute: 1611246784, "NodeAttribute::", "Null" {
+		Properties70:  {
+			P: "Look", "enum", "", "",0
+		}
+		TypeFlags: "Null"
+	}
+	NodeAttribute: 1611245728, "NodeAttribute::", "Null" {
+		Properties70:  {
+			P: "Look", "enum", "", "",0
+		}
+		TypeFlags: "Null"
+	}
+	NodeAttribute: 1611246608, "NodeAttribute::", "Null" {
+		Properties70:  {
+			P: "Look", "enum", "", "",0
+		}
+		TypeFlags: "Null"
+	}
+	NodeAttribute: 1611246256, "NodeAttribute::", "Null" {
+		Properties70:  {
+			P: "Look", "enum", "", "",0
+		}
+		TypeFlags: "Null"
+	}
+	NodeAttribute: 1611247136, "NodeAttribute::", "Null" {
+		Properties70:  {
+			P: "Look", "enum", "", "",0
+		}
+		TypeFlags: "Null"
+	}
+	Geometry: 1983184160, "Geometry::", "Mesh" {
+		Vertices: *3117 {
+			a: -101.134796142578,80.4016571044922,-41.9429893493652,-93.2760238647461,80.4016571044922,-34.0842208862305,-84.7931442260742,80.4016571044922,-26.308177947998,-75.6639556884766,80.4016571044922,-19.3006763458252,-65.958625793457,80.4016647338867,-13.1157073974609,-55.7510528564453,80.4016571044922,-7.80038452148438,-45.1189613342285,80.4016647338867,-3.39517498016357,-34.143310546875,80.4016571044922,0.0663824081420898,-22.9076843261719,80.4016647338867,2.5579195022583,-11.497615814209,80.4016647338867,4.06047391891479,-4.2708282114827e-015,80.4016571044922,4.56259965896606,11.4976043701172,80.4016647338867,4.06047391891479,22.9076728820801,80.4016647338867,2.55792045593262,34.1433029174805,80.4016571044922,0.0663833618164063,45.1189575195313,80.4016571044922,-3.39517116546631,55.7510375976563,80.4016571044922,-7.80037879943848,65.958625793457,80.4016647338867,-13.1157073974609,75.663948059082,80.4016571044922,-19.3006649017334,84.7931289672852,80.4016571044922,-26.3081703186035,93.2760238647461,80.4016571044922,-34.0842208862305,-94.3248672485352,80.4016571044922,-33.558349609375,-85.7758941650391,80.4016571044922,-25.7204284667969,-76.5680999755859,80.4016571044922,-18.6525764465332,-66.7711563110352,80.4016571044922,-12.4092292785645,-56.4582214355469,80.4016571044922,-7.03904724121094,-45.7067222595215,80.4016647338867,-2.5843620300293,-34.598316192627,80.4016571044922,0.919064521789551,-23.2183227539063,80.4016571044922,3.44261598587036,-11.6552543640137,80.4016647338867,4.96531867980957,-1.27318719478353e-006,80.4016647338867,5.47432899475098,11.6552352905273,80.4016647338867,4.96532011032104,23.218318939209,80.4016571044922,3.44261646270752,34.5983009338379,80.4016647338867,0.919069290161133,45.7067070007324,80.4016571044922,-2.58435535430908,56.4582099914551,80.4016571044922,-7.03904151916504,66.7711715698242,80.4016647338867,-12.4092407226563,76.5680694580078,80.4016571044922,-18.6525630950928,85.7758636474609,80.4016571044922,-25.7204093933105,94.2930908203125,80.4016571044922,-33.5279312133789,
+-108.993537902832,66.775390625,-49.8017349243164,-110.662445068359,66.3969421386719,-51.4706420898438,-108.993537902832,69.2256240844727,-49.8017349243164,-107.324630737305,66.3969345092773,-48.1328277587891,-108.373474121094,66.3969268798828,-47.6069564819336,-110.042373657227,69.2256164550781,-49.2758636474609,-111.711296081543,66.3969421386719,-50.9447708129883,-110.042373657227,66.775390625,-49.2758636474609,-101.134796142578,63.8953247070313,-41.942985534668,-102.8037109375,64.2737884521484,-43.6119003295898,-101.134796142578,65.5349426269531,-41.942985534668,-99.4658813476563,64.2737884521484,-40.2740783691406,-100.514114379883,64.2709197998047,-39.7478942871094,-102.183639526367,65.5349426269531,-41.417121887207,-103.852119445801,64.2735900878906,-43.0856018066406,-102.183364868164,63.8944778442383,-41.4169235229492,-93.2502746582031,66.7794799804688,-34.0965347290039,-94.9441452026367,66.3973083496094,-35.7523422241211,-93.2760238647461,69.2256164550781,-34.0842208862305,-91.5082473754883,66.4115905761719,-32.4637451171875,-92.5253219604492,66.4146881103516,-31.9074630737305,-94.2947998046875,69.2256164550781,-33.5295562744141,-95.9614105224609,66.4003753662109,-35.1959609985352,-94.2673950195313,66.7811737060547,-33.5402221679688,-84.7451095581055,63.8937377929688,-26.3395690917969,-86.5636444091797,64.2603149414063,-27.93115234375,-84.7931442260742,65.5349426269531,-26.3081817626953,-82.8368988037109,64.280876159668,-24.8065795898438,-83.8190383911133,64.2743682861328,-24.2183609008789,-85.7758941650391,65.5349426269531,-25.7204284667969,-87.5458526611328,64.2569732666016,-27.3429107666016,-85.7275848388672,63.8910369873047,-25.7515563964844,-75.6172790527344,66.7636337280273,-19.3372459411621,-77.6282424926758,66.386589050293,-20.8084487915039,-75.6639556884766,69.2256240844727,-19.3006744384766,-73.5194854736328,66.3652114868164,-17.9340476989746,-74.4234085083008,66.3727569580078,-17.2858238220215,-76.5680847167969,69.2256164550781,-18.6525688171387,-78.5321960449219,66.393440246582,-20.160213470459,-76.5213241577148,66.7675933837891,-18.6890602111816,
+-65.914306640625,63.9208984375,-13.1578102111816,-68.1123962402344,64.3090362548828,-14.4882507324219,-65.958625793457,65.5349426269531,-13.1157073974609,-63.6341857910156,64.330451965332,-11.9053153991699,-64.4464797973633,64.3219451904297,-11.1987190246582,-66.7711410522461,65.5349426269531,-12.4092292785645,-68.9247131347656,64.3013000488281,-13.7816429138184,-66.7267532348633,63.9164009094238,-12.4512405395508,-55.7104187011719,66.7360992431641,-7.84817886352539,-58.0856781005859,66.3365783691406,-9.01607894897461,-55.7510528564453,69.2256164550781,-7.80038452148438,-53.2602767944336,66.3160858154297,-6.76837921142578,-53.9671859741211,66.3255996704102,-6.00693130493164,-56.4582176208496,69.2256164550781,-7.03904342651367,-58.7926025390625,66.3452911376953,-8.25461196899414,-56.4174880981445,66.7411651611328,-7.08674621582031,-45.0835609436035,63.9475708007813,-3.44853591918945,-47.6201858520508,64.3582611083984,-4.43151092529297,-45.1189613342285,65.5349502563477,-3.39517593383789,-42.4819679260254,64.3767395019531,-2.56350326538086,-43.0694389343262,64.3662338256836,-1.75260162353516,-45.7067108154297,65.5349426269531,-2.58435821533203,-48.2076873779297,64.3485336303711,-3.62059020996094,-45.6712112426758,63.9419059753418,-2.63762283325195,-34.1147918701172,66.711784362793,0.00797653198242188,-36.7901611328125,66.2906723022461,-0.768394470214844,-34.143310546875,69.2256164550781,0.0663833618164063,-31.3872623443604,66.2753829956055,0.677543640136719,-31.8420143127441,66.2867889404297,1.5302848815918,-34.5983200073242,69.2256164550781,0.919063568115234,-37.2449264526367,66.3013763427734,0.0843658447265625,-34.569694519043,66.7180023193359,0.860752105712891,-22.8876056671143,63.9678497314453,2.49544525146484,-25.6718997955322,64.3980102539063,1.9449462890625,-22.9076843261719,65.5349426269531,2.55791854858398,-20.0667133331299,64.4089508056641,2.93203735351563,-20.3771553039551,64.3968734741211,3.8167610168457,-23.2183265686035,65.5349426269531,3.4426155090332,-25.9823532104492,64.3864288330078,2.82968521118164,
+-23.198169708252,63.9611740112305,3.38022232055664,-11.487232208252,66.6971435546875,3.99534225463867,-14.3440227508545,66.2600021362305,3.68563842773438,-11.497615814209,69.2256240844727,4.06047439575195,-8.61154460906982,66.254280090332,4.18651580810547,-8.76906967163086,66.2667922973633,5.09136581420898,-11.655252456665,69.2256240844727,4.96531867980957,-14.5015478134155,66.272216796875,4.59049987792969,-11.6448211669922,66.7041244506836,4.90026092529297,-2.64522583393045e-007,63.9755401611328,4.49654388427734,-2.88798141479492,64.4170455932617,4.43647384643555,-4.3665691925438e-015,65.5349426269531,4.56259918212891,2.88798046112061,64.4170455932617,4.43647384643555,2.88798141479492,64.4045104980469,5.34820556640625,1.09400730252673e-006,65.5349426269531,5.47432708740234,-2.88797998428345,64.4045104980469,5.34820556640625,1.01989189715823e-006,63.9684524536133,5.40834426879883,11.4872207641602,66.6971435546875,3.99534225463867,8.61153507232666,66.254280090332,4.18651580810547,11.4976043701172,69.2256240844727,4.06047439575195,14.3440113067627,66.2600021362305,3.68564224243164,14.501537322998,66.272216796875,4.59049987792969,11.655237197876,69.2256240844727,4.9653205871582,8.76905536651611,66.2667770385742,5.09136581420898,11.6448078155518,66.7041244506836,4.90026473999023,22.8875980377197,63.9678497314453,2.49544906616211,20.0667057037354,64.4089508056641,2.93204116821289,22.9076728820801,65.5349426269531,2.55792236328125,25.6718902587891,64.3980102539063,1.9449462890625,25.982349395752,64.3864288330078,2.82968521118164,23.218318939209,65.5349426269531,3.4426155090332,20.3771438598633,64.3968658447266,3.8167610168457,23.1981620788574,63.9611778259277,3.38022613525391,34.1147804260254,66.711784362793,0.0079803466796875,31.3872566223145,66.275390625,0.677547454833984,34.1433029174805,69.2256164550781,0.0663833618164063,36.7901458740234,66.2906646728516,-0.768394470214844,37.2449111938477,66.301383972168,0.0843696594238281,34.5983047485352,69.2256164550781,0.9190673828125,31.8419990539551,66.2867965698242,1.53028869628906,
+34.5696792602539,66.7180023193359,0.860755920410156,45.0835494995117,63.9475708007813,-3.44853210449219,42.4819526672363,64.3767471313477,-2.56350326538086,45.1189575195313,65.5349426269531,-3.39517211914063,47.6201782226563,64.3582611083984,-4.4315071105957,48.2076721191406,64.3485260009766,-3.62058639526367,45.7067070007324,65.5349502563477,-2.58435440063477,43.0694351196289,64.3662338256836,-1.75259780883789,45.671199798584,63.9419021606445,-2.63761901855469,55.7104034423828,66.7360992431641,-7.84817504882813,53.2602653503418,66.3160858154297,-6.76837539672852,55.7510375976563,69.2256240844727,-7.80037689208984,58.0856590270996,66.3365859985352,-9.01607131958008,58.7925987243652,66.3452987670898,-8.25461196899414,56.4582138061523,69.2256240844727,-7.03904342651367,53.9671859741211,66.3255920410156,-6.00693130493164,56.41748046875,66.7411727905273,-7.08673858642578,65.914306640625,63.9208984375,-13.1578102111816,63.6341857910156,64.3304443359375,-11.9053153991699,65.958625793457,65.5349426269531,-13.1157073974609,68.1123962402344,64.3090515136719,-14.4882507324219,68.9246978759766,64.3013000488281,-13.7816314697266,66.771125793457,65.5349426269531,-12.4092178344727,64.4464645385742,64.3219451904297,-11.1987075805664,66.7267379760742,63.9163970947266,-12.451229095459,75.6172637939453,66.7636337280273,-19.3372459411621,73.5194702148438,66.3652038574219,-17.9340438842773,75.663948059082,69.2256164550781,-19.300666809082,77.6282348632813,66.386589050293,-20.8084411621094,78.5321807861328,66.3934326171875,-20.1602020263672,76.5680694580078,69.2256240844727,-18.6525535583496,74.4233932495117,66.3727569580078,-17.2858123779297,76.5213088989258,66.7675933837891,-18.6890411376953,84.7450942993164,63.893741607666,-26.3395614624023,82.8368835449219,64.280876159668,-24.8065643310547,84.7931289672852,65.5349426269531,-26.3081741333008,86.5636291503906,64.2603149414063,-27.9311447143555,87.5460586547852,64.2542266845703,-27.3433609008789,85.7758636474609,65.5349426269531,-25.7203979492188,83.8194808959961,64.2741928100586,-24.2186889648438,
+85.7277374267578,63.8902359008789,-25.7517395019531,93.2495880126953,66.7794799804688,-34.0958938598633,91.5069046020508,66.4110107421875,-32.462516784668,93.2760238647461,69.2256164550781,-34.0842208862305,94.9428863525391,66.3978881835938,-35.7510833740234,95.9909210205078,66.3982696533203,-35.2243957519531,94.3231811523438,69.2256240844727,-33.5567245483398,92.5550994873047,66.4166717529297,-31.9357757568359,94.2980804443359,66.7811431884766,-33.5695877075195,101.134765625,63.8953247070313,-41.9429702758789,99.4658660888672,64.2737884521484,-40.2740707397461,101.134765625,65.5349426269531,-41.9429702758789,102.803680419922,64.2737884521484,-43.6118774414063,103.852531433105,64.2737884521484,-43.0860137939453,102.183624267578,65.5349426269531,-41.4170989990234,100.514709472656,64.2737884521484,-39.7481918334961,102.183624267578,63.8953285217285,-41.4170989990234,108.993530273438,66.775390625,-49.8017349243164,107.324630737305,66.3969421386719,-48.1328201293945,108.993530273438,69.2256240844727,-49.8017349243164,110.662445068359,66.3969421386719,-51.4706420898438,111.711288452148,66.3969421386719,-50.9447708129883,110.042366027832,69.2256164550781,-49.2758636474609,108.373466491699,66.3969421386719,-47.6069564819336,110.042366027832,66.775390625,-49.2758636474609,100.759162902832,80.4016571044922,-41.5673751831055,101.526153564453,80.4016571044922,-40.7597465515137,101.134765625,79.9412155151367,-41.9429702758789,102.183624267578,79.5957336425781,-41.4170989990234,108.993530273438,70.3071975708008,-49.8017349243164,113.127655029297,65.2392120361328,-53.9358596801758,113.719665527344,65.4537506103516,-52.9531478881836,110.042366027832,69.9617309570313,-49.2758636474609,110.812942504883,69.0171051025391,-50.0464248657227,110.102928161621,68.9471893310547,-50.9111328125,-101.177276611328,80.4016571044922,-41.985466003418,-101.277847290039,80.4016571044922,-41.8712692260742,-101.914657592773,80.4016571044922,-41.1481285095215,-108.993537902832,69.9640274047852,-49.8017349243164,-110.042373657227,69.5481109619141,-49.2758636474609,
+-112.208450317383,65.6708984375,-53.0166473388672,-112.776893615723,65.8964996337891,-52.0103759765625,-102.183639526367,80.0424575805664,-41.417121887207,-110.345245361328,69.1436614990234,-49.578727722168,-109.687026977539,69.0379638671875,-50.4952163696289,-83.0836486816406,4.99999904632568,-27.2701225280762,-73.4974212646484,4.99999475479126,-20.0309410095215,-63.2841377258301,4.99999570846558,-13.7071371078491,-52.5309410095215,5.00000095367432,-8.35268497467041,-41.3295707702637,5.00000381469727,-4.01324415206909,-29.7755908966064,5.00000238418579,-0.725861072540283,-17.9675750732422,4.99999952316284,1.48143672943115,-6.00626611709595,4.99999618530273,2.58982419967651,6.00628566741943,4.99999618530273,2.58980798721313,17.9675941467285,4.99999952316284,1.48143815994263,29.7756099700928,5.00000238418579,-0.725861549377441,41.32958984375,5.00000381469727,-4.01325416564941,52.5309600830078,5.00000095367432,-8.35269165039063,63.2841529846191,4.99999570846558,-13.7071447372437,73.4974365234375,4.99999570846558,-20.0309410095215,83.0836563110352,5,-27.2701263427734,-83.0836486816406,1.9073486328125e-006,-27.2701148986816,-73.4974212646484,1.66893005371094e-006,-20.030933380127,-63.2841300964355,1.19209289550781e-006,-13.7071447372437,-52.530933380127,1.19209289550781e-006,-8.35269260406494,-41.3295707702637,1.19209289550781e-006,-4.01324415206909,-29.7755908966064,2.38418579101563e-007,-0.725861072540283,-17.9675750732422,2.38418579101563e-007,1.48143672943115,-6.00626611709595,-3.814697265625e-006,2.58982419967651,6.00628566741943,-3.814697265625e-006,2.58980798721313,17.9675941467285,2.38418579101563e-007,1.48143815994263,29.7756099700928,2.38418579101563e-007,-0.725861549377441,41.32958984375,1.19209289550781e-006,-4.01325416564941,52.5309600830078,2.14576721191406e-006,-8.35269165039063,63.2841529846191,2.14576721191406e-006,-13.7071447372437,73.4974365234375,1.66893005371094e-006,-20.0309410095215,83.0836563110352,1.9073486328125e-006,-27.2701263427734,-94.4441452026367,78.323600769043,-32.8871726989746,-94.6315307617188,78.5938415527344,-32.6924247741699,
+-85.4963531494141,78.5938110351563,-24.3646087646484,-85.3235931396484,78.3236770629883,-24.5726528167725,-75.6317443847656,78.5938110351563,-16.9152030944824,-75.4789199829102,78.3236770629883,-17.1382999420166,-65.1218719482422,78.5938110351563,-10.407769203186,-64.9902801513672,78.3236770629883,-10.6440143585205,-54.0564117431641,78.5938110351563,-4.89782238006592,-53.9471817016602,78.3236770629883,-5.14520645141602,-42.5297584533691,78.5938110351563,-0.432375907897949,-42.4438209533691,78.3236770629883,-0.688781976699829,-30.6402568817139,78.5938110351563,2.95048189163208,-30.5783443450928,78.3236770629883,2.68723702430725,-18.4893436431885,78.5938110351563,5.22187328338623,-18.4519824981689,78.3236770629883,4.95404529571533,-6.18068504333496,78.5938110351563,6.36244869232178,-6.16819620132446,78.3236770629883,6.09231615066528,6.18070507049561,78.5938110351563,6.36244773864746,6.16821622848511,78.3236770629883,6.09231519699097,18.4893627166748,78.5938110351563,5.2218713760376,18.4520015716553,78.3236770629883,4.9540433883667,30.6402759552002,78.5938110351563,2.95047760009766,30.5783634185791,78.3236770629883,2.68723273277283,42.5297775268555,78.5938110351563,-0.432382106781006,42.4438400268555,78.3236770629883,-0.688788175582886,54.0564308166504,78.5938110351563,-4.89783048629761,53.9472007751465,78.3236770629883,-5.14521408081055,65.1218872070313,78.5938110351563,-10.4077768325806,64.9902954101563,78.3236770629883,-10.644021987915,75.6317596435547,78.5938110351563,-16.9152126312256,75.4789352416992,78.3236770629883,-17.1383094787598,85.4963607788086,78.5938110351563,-24.364616394043,85.323600769043,78.3236770629883,-24.572660446167,94.6315383911133,78.5938415527344,-32.6924362182617,94.4441528320313,78.323600769043,-32.8871841430664,-94.6315307617188,83.0534973144531,-32.6924247741699,-94.4441528320313,83.3234939575195,-32.8872032165527,-85.4963531494141,83.0535430908203,-24.3646087646484,-85.3235931396484,83.3236770629883,-24.5726528167725,-75.6317443847656,83.0535430908203,-16.9152030944824,-75.4789199829102,83.3236770629883,-17.1382999420166,
+-65.1218719482422,83.0535430908203,-10.407769203186,-64.9902801513672,83.3236770629883,-10.6440143585205,-54.0564117431641,83.0535430908203,-4.89782238006592,-53.9471817016602,83.3236770629883,-5.14520645141602,-42.5297584533691,83.0535430908203,-0.432375907897949,-42.4438209533691,83.3236770629883,-0.688781976699829,-30.6402568817139,83.0535430908203,2.95048189163208,-30.5783443450928,83.3236770629883,2.68723702430725,-18.4893436431885,83.0535430908203,5.22187328338623,-18.4519824981689,83.3236770629883,4.95404529571533,-6.18068504333496,83.0535430908203,6.36244869232178,-6.16819620132446,83.3236770629883,6.09231615066528,6.18070507049561,83.0535430908203,6.36244773864746,6.16821622848511,83.3236770629883,6.09231519699097,18.4893627166748,83.0535430908203,5.2218713760376,18.4520015716553,83.3236770629883,4.9540433883667,30.6402759552002,83.0535430908203,2.95047760009766,30.5783634185791,83.3236770629883,2.68723273277283,42.5297775268555,83.0535430908203,-0.432382106781006,42.4438400268555,83.3236770629883,-0.688788175582886,54.0564308166504,83.0535430908203,-4.89783048629761,53.9472007751465,83.3236770629883,-5.14521408081055,65.1218872070313,83.0535430908203,-10.4077768325806,64.9902954101563,83.3236770629883,-10.644021987915,75.6317596435547,83.0535430908203,-16.9152126312256,75.4789352416992,83.3236770629883,-17.1383094787598,85.4963607788086,83.0535430908203,-24.364616394043,85.323600769043,83.3236770629883,-24.572660446167,94.4441604614258,83.3234939575195,-32.8872146606445,94.6315383911133,83.0534973144531,-32.6924362182617,-92.1468734741211,83.3236618041992,-35.1668243408203,-83.2564086914063,83.3236770629883,-27.0620708465576,-83.0836486816406,83.0535430908203,-27.2701148986816,-73.6502456665039,83.3236770629883,-19.8078365325928,-73.4974212646484,83.0535430908203,-20.030933380127,-63.4157257080078,83.3236770629883,-13.4708909988403,-63.2841377258301,83.0535430908203,-13.7071380615234,-52.6401710510254,83.3236770629883,-8.10530376434326,-52.5309410095215,83.0535430908203,-8.35268592834473,-41.4155082702637,83.3236770629883,-3.75684428215027,
+-41.3295707702637,83.0535430908203,-4.01324701309204,-29.8375034332275,83.3236770629883,-0.462619930505753,-29.7755908966064,83.0535430908203,-0.725862979888916,-18.0049362182617,83.3236770629883,1.74927043914795,-17.9675750732422,83.0535430908203,1.48144245147705,-6.01875495910645,83.3236770629883,2.85995674133301,-6.00626611709595,83.0535430908203,2.58982419967651,6.01877450942993,83.3236770629883,2.85995578765869,6.00628566741943,83.0535430908203,2.5898232460022,18.004955291748,83.3236770629883,1.74926805496216,17.9675941467285,83.0535430908203,1.48144006729126,29.8375225067139,83.3236770629883,-0.462624222040176,29.7756099700928,83.0535430908203,-0.72586727142334,41.41552734375,83.3236770629883,-3.75685048103333,41.32958984375,83.0535430908203,-4.0132532119751,52.6401901245117,83.3236770629883,-8.10531139373779,52.5309600830078,83.0535430908203,-8.35269355773926,63.4157409667969,83.3236770629883,-13.4708986282349,63.2841529846191,83.0535430908203,-13.707145690918,73.650260925293,83.3236770629883,-19.8078441619873,73.4974365234375,83.0535430908203,-20.0309410095215,83.2564163208008,83.3236770629883,-27.0620822906494,83.0836563110352,83.0535430908203,-27.2701263427734,92.1468887329102,83.3236618041992,-35.1668395996094,-91.9624938964844,78.5937728881836,-35.3643684387207,-92.1468353271484,78.3236770629883,-35.1668281555176,-83.0836486816406,78.5938110351563,-27.2701148986816,-83.2564086914063,78.3236770629883,-27.0620708465576,-73.4974212646484,78.5938110351563,-20.030933380127,-73.6502456665039,78.3236770629883,-19.8078365325928,-63.2841377258301,78.5938110351563,-13.7071380615234,-63.4157257080078,78.3236770629883,-13.4708909988403,-52.5309410095215,78.5938110351563,-8.35268592834473,-52.6401710510254,78.3236770629883,-8.10530376434326,-41.3295707702637,78.5938110351563,-4.01324701309204,-41.4155082702637,78.3236770629883,-3.75684428215027,-29.7755908966064,78.5938110351563,-0.725862979888916,-29.8375034332275,78.3236770629883,-0.462619930505753,-17.9675750732422,78.5938110351563,1.48144245147705,-18.0049362182617,78.3236770629883,1.74927043914795,
+-6.00626611709595,78.5938110351563,2.58982419967651,-6.01875495910645,78.3236770629883,2.85995674133301,6.00628566741943,78.5938110351563,2.5898232460022,6.01877450942993,78.3236770629883,2.85995578765869,17.9675941467285,78.5938110351563,1.48144006729126,18.004955291748,78.3236770629883,1.74926805496216,29.7756099700928,78.5938110351563,-0.72586727142334,29.8375225067139,78.3236770629883,-0.462624222040176,41.32958984375,78.5938110351563,-4.0132532119751,41.41552734375,78.3236770629883,-3.75685048103333,52.5309600830078,78.5938110351563,-8.35269355773926,52.6401901245117,78.3236770629883,-8.10531139373779,63.2841529846191,78.5938110351563,-13.707145690918,63.4157409667969,78.3236770629883,-13.4708986282349,73.4974365234375,78.5938110351563,-20.0309410095215,73.650260925293,78.3236770629883,-19.8078441619873,83.0836563110352,78.5938110351563,-27.2701263427734,83.2564163208008,78.3236770629883,-27.0620822906494,92.1468505859375,78.3236770629883,-35.1668395996094,91.9625091552734,78.5937728881836,-35.3643760681152,-94.4441528320313,0.000185161959961988,-32.8872032165527,-94.6315307617188,0.270181238651276,-32.6924247741699,-85.4963531494141,0.270133376121521,-24.3646087646484,-85.3235931396484,7.15255737304688e-007,-24.5726528167725,-75.6317443847656,0.270134806632996,-16.9152030944824,-75.4789199829102,2.14576721191406e-006,-17.1382999420166,-65.1218719482422,0.270135283470154,-10.4077682495117,-64.9902801513672,2.62260437011719e-006,-10.6440143585205,-54.0564117431641,0.270132899284363,-4.89782238006592,-53.9471817016602,1.19209289550781e-006,-5.14520835876465,-42.5297584533691,0.270130038261414,-0.432374000549316,-42.4438209533691,-2.62260437011719e-006,-0.688780546188354,-30.6402568817139,0.270129084587097,2.95048570632935,-30.5783443450928,1.66893005371094e-006,2.6872398853302,-18.4893436431885,0.270128130912781,5.22187423706055,-18.4519824981689,1.19209289550781e-006,4.95405578613281,-6.18068504333496,0.270128607749939,6.36244106292725,-6.16819620132446,-4.05311584472656e-006,6.09231042861938,6.18070507049561,0.270128607749939,6.3624382019043,
+6.16821622848511,-4.05311584472656e-006,6.09230947494507,18.4893627166748,0.270128130912781,5.22186088562012,18.4520015716553,1.19209289550781e-006,4.95404243469238,30.6402759552002,0.270129084587097,2.95048713684082,30.5783634185791,1.66893005371094e-006,2.68724322319031,42.5297775268555,0.270130038261414,-0.43237829208374,42.4438400268555,-2.62260437011719e-006,-0.688786745071411,54.0564308166504,0.270132899284363,-4.89783096313477,53.9472007751465,1.19209289550781e-006,-5.14521408081055,65.1218872070313,0.270135283470154,-10.4077749252319,64.9902954101563,2.62260437011719e-006,-10.6440238952637,75.6317596435547,0.270134806632996,-16.9152126312256,75.4789352416992,2.14576721191406e-006,-17.1383094787598,85.4963607788086,0.270133376121521,-24.364616394043,85.323600769043,7.15255737304688e-007,-24.572660446167,94.6315383911133,0.270181208848953,-32.6924362182617,94.4441604614258,0.000185148528544232,-32.8872146606445,-94.6315307617188,4.72983837127686,-32.6924247741699,-94.4441452026367,5.00008010864258,-32.8871726989746,-85.4963531494141,4.72986698150635,-24.3646087646484,-85.3235931396484,5,-24.5726528167725,-75.6317443847656,4.72986555099487,-16.9152030944824,-75.4789199829102,5.00000095367432,-17.1382999420166,-65.1218719482422,4.72986459732056,-10.4077682495117,-64.9902801513672,5,-10.6440143585205,-54.0564117431641,4.72986698150635,-4.89782238006592,-53.9471817016602,5.00000047683716,-5.14520835876465,-42.5297584533691,4.72987079620361,-0.432374000549316,-42.4438209533691,4.99999952316284,-0.688780546188354,-30.6402568817139,4.72986268997192,2.95048570632935,-30.5783443450928,4.99999904632568,2.6872398853302,-18.4893436431885,4.72986173629761,5.22187423706055,-18.4519824981689,5.00000047683716,4.95405578613281,-6.18068504333496,4.7298641204834,6.36244106292725,-6.16819620132446,4.99999618530273,6.09231042861938,6.18070507049561,4.7298641204834,6.3624382019043,6.16821622848511,4.99999618530273,6.09230947494507,18.4893627166748,4.72986173629761,5.22186088562012,18.4520015716553,5.00000047683716,4.95404243469238,
+30.6402759552002,4.72986268997192,2.95048713684082,30.5783634185791,4.99999904632568,2.68724322319031,42.5297775268555,4.72987079620361,-0.43237829208374,42.4438400268555,4.99999952316284,-0.688786745071411,54.0564308166504,4.72986698150635,-4.89783096313477,53.9472007751465,5.00000047683716,-5.14521408081055,65.1218872070313,4.72986459732056,-10.4077749252319,64.9902954101563,5,-10.6440238952637,75.6317596435547,4.72986555099487,-16.9152126312256,75.4789352416992,5.00000095367432,-17.1383094787598,85.4963607788086,4.72986698150635,-24.364616394043,85.323600769043,5,-24.572660446167,94.4441528320313,5.00008010864258,-32.8871841430664,94.6315383911133,4.72983837127686,-32.6924362182617,98.6819000244141,82.8489685058594,-36.8038597106934,98.5104904174805,83.118278503418,-37.0146865844727,98.6067047119141,78.5076522827148,-36.7290077209473,98.3990783691406,78.2377243041992,-36.903450012207,96.1720581054688,78.2377243041992,-39.1304817199707,95.9976196289063,78.5076522827148,-39.3381080627441,96.283203125,83.118278503418,-39.2419815063477,102.768844604492,81.8451538085938,-40.9448509216309,102.632362365723,82.1059417724609,-41.1906814575195,102.242713928223,77.6812515258789,-40.4191970825195,101.997947692871,77.4196395874023,-40.5565223693848,99.8251419067383,77.4196395874023,-42.7293434143066,99.6878128051758,77.6812515258789,-42.9741134643555,100.213500976563,81.8453369140625,-43.5002861022949,100.459167480469,82.1059417724609,-43.3638954162598,106.692047119141,79.4483261108398,-44.9149208068848,106.600936889648,79.6815795898438,-45.2061080932617,105.456016540527,75.7077484130859,-43.6793022155762,105.163986206055,75.474967956543,-43.7693672180176,103.037986755371,75.474967956543,-45.8953704833984,102.947929382324,75.7077484130859,-46.1874046325684,104.183609008789,79.448486328125,-47.423511505127,104.474594116211,79.6815795898438,-47.332462310791,110.188659667969,75.3871994018555,-48.4510765075684,110.137733459473,75.5740966796875,-48.7823677062988,108.269172668457,72.3770904541016,-46.5318298339844,107.93701171875,72.1915893554688,-46.5817413330078,
+105.850364685059,72.1915893554688,-48.668399810791,105.800453186035,72.3770904541016,-49.000560760498,107.719757080078,75.3872909545898,-50.9201240539551,108.050880432129,75.5740966796875,-50.8692283630371,113.060264587402,69.7372741699219,-51.3546676635742,113.035797119141,69.8725051879883,-51.7123184204102,110.683090209961,67.5686340332031,-48.9775848388672,110.325202941895,67.4341430664063,-49.0017509460449,108.270378112793,67.4341430664063,-51.0565872192383,108.246208190918,67.5686264038086,-51.4144744873047,110.623336791992,69.7373123168945,-53.7917098999023,110.980880737305,69.8725051879883,-53.7672424316406,115.232009887695,62.752025604248,-53.5506629943848,115.22200012207,62.8410568237305,-53.9227294921875,112.614677429199,61.3385581970215,-50.9333610534668,112.242645263672,61.24951171875,-50.9433670043945,110.211990356445,61.24951171875,-52.9740257263184,110.201988220215,61.3385581970215,-53.346061706543,112.819313049316,62.7520446777344,-55.9634284973145,113.19132232666,62.8410606384277,-55.9534187316895,116.6875,54.7475624084473,-55.0225448608398,116.684608459473,54.7977142333984,-55.4017028808594,113.960990905762,53.9592514038086,-52.2960395812988,113.581871032715,53.9088668823242,-52.2989540100098,111.567581176758,53.908863067627,-54.3132553100586,111.564666748047,53.9592475891113,-54.6923713684082,114.291175842285,54.7475662231445,-57.4188995361328,114.670310974121,54.7977142333984,-57.4160079956055,117.418212890625,46.0975914001465,-55.7616539001465,117.418212890625,46.1137619018555,-56.1436882019043,114.650894165039,45.8449211120605,-52.9943313598633,114.26887512207,45.8286399841309,-52.9943313598633,112.262962341309,45.8286361694336,-55.0002593994141,112.262962341309,45.8449172973633,-55.3822860717773,115.030281066895,46.097599029541,-58.1496086120605,115.412300109863,46.11376953125,-58.1496086120605,117.41822052002,37.2260780334473,-55.7616577148438,117.41822052002,37.2099075317383,-56.143684387207,114.650894165039,37.4787521362305,-52.9943237304688,114.26887512207,37.4950332641602,-52.9943237304688,
+112.262954711914,37.4950294494629,-55.0002632141113,112.262954711914,37.4787483215332,-55.3822822570801,115.0302734375,37.2260818481445,-58.1496047973633,115.412307739258,37.2099113464355,-58.1496047973633,116.6875,28.5761108398438,-55.0225563049316,116.684616088867,28.5259609222412,-55.401683807373,113.960968017578,29.364429473877,-52.2960205078125,113.581878662109,29.4148101806641,-52.2989387512207,111.567565917969,29.4148063659668,-54.3132629394531,111.564651489258,29.3644275665283,-54.6923522949219,114.291168212891,28.5761203765869,-57.418888092041,114.670318603516,28.5259666442871,-57.4159965515137,115.232032775879,20.5716323852539,-53.5506858825684,115.222023010254,20.4826164245605,-53.9226951599121,112.614639282227,21.9851341247559,-50.9333267211914,112.242668151855,22.0741653442383,-50.9433326721191,110.211952209473,22.074161529541,-52.9740524291992,110.201950073242,21.9851303100586,-53.3460273742676,112.819290161133,20.5716514587402,-55.9634056091309,113.191352844238,20.4826202392578,-55.9533958435059,113.060317993164,13.5863590240479,-51.3547096252441,113.035850524902,13.4511699676514,-51.7122611999512,110.683029174805,15.7550888061523,-48.9775276184082,110.325256347656,15.8895311355591,-49.0016899108887,108.270317077637,15.8895273208618,-51.0566444396973,108.246154785156,15.7550849914551,-51.4144134521484,110.62328338623,13.5864009857178,-53.7916641235352,110.980934143066,13.451171875,-53.7671928405762,110.18872833252,7.93638515472412,-48.4511451721191,110.137832641602,7.7495813369751,-48.7822723388672,108.269088745117,10.9466991424561,-46.5317420959473,107.937126159668,11.1320915222168,-46.5816230773926,105.850242614746,11.1320905685425,-48.6685104370117,105.800361633301,10.9466953277588,-49.0004730224609,107.719696044922,7.93647766113281,-50.9200592041016,108.050987243652,7.74958181381226,-50.8691368103027,106.692108154297,3.87519121170044,-44.9149932861328,106.601058959961,3.64210057258606,-45.205982208252,105.455932617188,7.61613893508911,-43.6792144775391,105.164154052734,7.8487114906311,-43.7691993713379,
+103.037811279297,7.84870958328247,-45.8955345153809,102.947830200195,7.61613750457764,-46.187313079834,104.183547973633,3.87534999847412,-47.4234466552734,104.474731445313,3.64209961891174,-47.3323364257813,102.768890380859,1.47834777832031,-40.944896697998,102.632499694824,1.21774280071259,-41.1905555725098,102.24267578125,5.64266109466553,-40.4191474914551,101.998123168945,5.90404605865479,-40.5563545227051,99.8249664306641,5.90404319763184,-42.7295112609863,99.6877593994141,5.64265871047974,-42.974063873291,100.213470458984,1.47852873802185,-43.5002555847168,100.45930480957,1.21773934364319,-43.36376953125,98.6819076538086,0.47459077835083,-36.8038711547852,98.5105743408203,0.205408349633217,-37.0145950317383,98.6067047119141,4.81617784500122,-36.7290000915527,98.3991851806641,5.08596038818359,-36.9033470153809,96.1719512939453,5.08596038818359,-39.1305847167969,95.9976043701172,4.81617975234985,-39.3381004333496,96.0724716186523,0.474717617034912,-39.4133033752441,96.2832946777344,0.205409303307533,-39.2418937683105,91.7614135742188,5,-35.1809463500977,92.1520843505859,5,-35.1718978881836,91.9610443115234,4.72987031936646,-35.3629341125488,91.9610443115234,0.270131468772888,-35.3629341125488,92.1520919799805,7.15255737304688e-007,-35.1718826293945,91.7614135742188,-2.86102294921875e-006,-35.1809463500977,-98.5104751586914,83.1182708740234,-37.0146789550781,-98.681884765625,82.8489608764648,-36.8038520812988,-96.2831802368164,83.1182708740234,-39.2419776916504,-95.9975967407227,78.5076446533203,-39.3381004333496,-96.1720352172852,78.2377166748047,-39.1304740905762,-98.3990631103516,78.2377166748047,-36.9034423828125,-98.606689453125,78.5076446533203,-36.7290000915527,-102.632354736328,82.1059341430664,-41.1906814575195,-102.768836975098,81.8451461791992,-40.9448509216309,-100.459136962891,82.1059341430664,-43.363899230957,-100.213478088379,81.845329284668,-43.5002861022949,-99.6877822875977,77.6812438964844,-42.9741096496582,-99.8251113891602,77.4196319580078,-42.7293395996094,-101.997924804688,77.4196319580078,-40.5565223693848,
+-102.242691040039,77.6812438964844,-40.4191970825195,-106.600921630859,79.6815719604492,-45.206111907959,-106.692031860352,79.4483184814453,-44.914924621582,-104.474555969238,79.6815719604492,-47.3324661254883,-104.183570861816,79.4484786987305,-47.4235153198242,-102.947891235352,75.7077407836914,-46.1874084472656,-103.037948608398,75.4749603271484,-45.8953742980957,-105.163955688477,75.4749603271484,-43.7693672180176,-105.455986022949,75.7077407836914,-43.6793060302734,-110.137710571289,75.5740966796875,-48.7823715209961,-110.188629150391,75.3871994018555,-48.4510803222656,-108.050842285156,75.574089050293,-50.8692359924316,-107.719718933105,75.3872833251953,-50.9201316833496,-105.800415039063,72.377082824707,-49.0005645751953,-105.850326538086,72.1915817260742,-48.6684036254883,-107.936973571777,72.1915740966797,-46.5817413330078,-108.269134521484,72.3770751953125,-46.5318298339844,-113.035766601563,69.8725051879883,-51.7123222351074,-113.060241699219,69.7372741699219,-51.3546714782715,-110.980834960938,69.8724975585938,-53.7672538757324,-110.623291015625,69.7373046875,-53.7917213439941,-108.246162414551,67.5686187744141,-51.414478302002,-108.270332336426,67.4341354370117,-51.0565910339355,-110.325157165527,67.4341354370117,-49.0017547607422,-110.683044433594,67.5686187744141,-48.9775886535645,-115.221977233887,62.8410606384277,-53.9227333068848,-115.231986999512,62.7520294189453,-53.550666809082,-113.191268920898,62.8410568237305,-55.9534339904785,-112.819259643555,62.7520408630371,-55.9634399414063,-110.201934814453,61.3385467529297,-53.346061706543,-110.211936950684,61.2495002746582,-52.9740257263184,-112.242607116699,61.2495002746582,-50.9433708190918,-112.614639282227,61.3385467529297,-50.9333648681641,-116.684585571289,54.7977142333984,-55.4017066955566,-116.687469482422,54.7475624084473,-55.0225486755371,-114.670257568359,54.7977104187012,-57.4160194396973,-114.291122436523,54.74755859375,-57.4189109802246,-111.564613342285,53.9592437744141,-54.6923713684082,-111.567527770996,53.9088592529297,-54.3132553100586,
+-113.581825256348,53.9088592529297,-52.298957824707,-113.960945129395,53.9592437744141,-52.2960433959961,-117.418190002441,46.11376953125,-56.1436996459961,-117.418190002441,46.097599029541,-55.7616653442383,-115.412254333496,46.11376953125,-58.1496238708496,-115.030235290527,46.097599029541,-58.1496238708496,-112.262908935547,45.8449172973633,-55.3822898864746,-112.262908935547,45.8286361694336,-55.0002632141113,-114.268836975098,45.8286323547363,-52.9943389892578,-114.650856018066,45.844913482666,-52.9943389892578,-117.418197631836,37.2099113464355,-56.1436958312988,-117.418197631836,37.2260818481445,-55.7616691589355,-115.412261962891,37.2099113464355,-58.1496200561523,-115.030227661133,37.2260818481445,-58.1496200561523,-112.262908935547,37.4787483215332,-55.3822860717773,-112.262908935547,37.4950294494629,-55.0002670288086,-114.268829345703,37.4950294494629,-52.9943351745605,-114.650848388672,37.4787483215332,-52.9943351745605,-116.684593200684,28.5259666442871,-55.4016952514648,-116.687484741211,28.5761165618896,-55.0225677490234,-114.670272827148,28.5259685516357,-57.4160079956055,-114.291122436523,28.5761222839355,-57.4188995361328,-111.564598083496,29.3644275665283,-54.6923561096191,-111.567512512207,29.4148082733154,-54.3132705688477,-113.581840515137,29.4148063659668,-52.298942565918,-113.960929870605,29.3644275665283,-52.296028137207,-115.222007751465,20.4826183319092,-53.9227066040039,-115.23201751709,20.5716361999512,-53.5506973266602,-113.191307067871,20.4826221466064,-55.9534072875977,-112.819244384766,20.5716533660889,-55.9634170532227,-110.201904296875,21.9851322174072,-53.3460273742676,-110.211906433105,22.0741634368896,-52.9740524291992,-112.242630004883,22.0741634368896,-50.9433403015137,-112.614601135254,21.9851322174072,-50.9333343505859,-113.035835266113,13.4511709213257,-51.712272644043,-113.06029510498,13.5863609313965,-51.3547210693359,-110.980895996094,13.4511737823486,-53.767204284668,-110.623237609863,13.5864028930664,-53.791675567627,-108.246101379395,15.7550888061523,-51.4144172668457,
+-108.270263671875,15.8895320892334,-51.0566482543945,-110.325218200684,15.8895330429077,-49.0016937255859,-110.682991027832,15.755090713501,-48.9775314331055,-110.137817382813,7.74958038330078,-48.7822761535645,-110.188705444336,7.93638467788696,-48.4511489868164,-108.050941467285,7.74958419799805,-50.8691444396973,-107.719650268555,7.9364800453186,-50.9200630187988,-105.800315856934,10.9467000961304,-49.0004730224609,-105.850196838379,11.1320953369141,-48.6685104370117,-107.937088012695,11.1320953369141,-46.5816230773926,-108.269050598145,10.946702003479,-46.5317420959473,-106.601051330566,3.64210081100464,-45.205982208252,-106.692100524902,3.87519216537476,-44.9149932861328,-104.47469329834,3.64210295677185,-47.3323364257813,-104.18350982666,3.87535333633423,-47.4234466552734,-102.947799682617,7.61614608764648,-46.187313079834,-103.037780761719,7.84871816635132,-45.8955345153809,-105.164123535156,7.84871673583984,-43.7691955566406,-105.455902099609,7.61614465713501,-43.6792106628418,-102.632484436035,1.21774196624756,-41.1905479431152,-102.76887512207,1.47834753990173,-40.9448890686035,-100.459274291992,1.21774077415466,-43.3637657165527,-100.213439941406,1.47853016853333,-43.5002479553223,-99.6877365112305,5.64266443252563,-42.9740600585938,-99.8249435424805,5.90404891967773,-42.7295074462891,-101.998092651367,5.90404891967773,-40.5563507080078,-102.242645263672,5.64266443252563,-40.4191436767578,-98.5105667114258,0.205408409237862,-37.0145874023438,-98.6819000244141,0.474591016769409,-36.8038635253906,-96.2832794189453,0.20541013777256,-39.241886138916,-96.0724487304688,0.474718600511551,-39.4132957458496,-95.9975891113281,4.81618356704712,-39.3380928039551,-96.1719360351563,5.08596420288086,-39.1305770874023,-98.399169921875,5.08596229553223,-36.9033393859863,-98.606689453125,4.81617975234985,-36.7289924621582,-91.7613983154297,-2.86102294921875e-006,-35.1809349060059,-92.1520767211914,7.15255737304688e-007,-35.1718711853027,-91.9610290527344,0.270131468772888,-35.362922668457,-91.9610290527344,4.72987031936646,-35.362922668457,
+-92.1520690917969,5,-35.1718864440918,-91.7613983154297,5,-35.1809349060059,-89.6443176269531,4.72986793518066,-37.9042282104492,-89.4686431884766,4.99999952316284,-37.6959571838379,-89.4686431884766,-7.15255737304688e-007,-37.6959571838379,-89.6443176269531,0.270131468772888,-37.9042282104492,-75.9273986816406,5.00000190734863,-35.8880500793457,-75.754638671875,4.72986793518066,-36.0960960388184,-67.014030456543,4.72986268997192,-29.4954986572266,-67.1668548583984,4.99999523162842,-29.2724018096924,-75.7546157836914,0.270132839679718,-36.0960731506348,-75.927375793457,2.38418579101563e-007,-35.8880271911621,-67.166877746582,1.19209289550781e-006,-29.2724132537842,-67.0140533447266,0.27013236284256,-29.4955101013184,-57.7017059326172,4.72986316680908,-23.729549407959,-57.8332939147949,4.99999570846558,-23.4933013916016,-57.8332748413086,1.19209289550781e-006,-23.4932918548584,-57.7016868591309,0.270131945610046,-23.7295417785645,-47.8970718383789,4.72986841201782,-18.8474235534668,-48.0063018798828,5.00000095367432,-18.6000442504883,-48.0062866210938,1.19209289550781e-006,-18.6000385284424,-47.8970565795898,0.270132899284363,-18.8474178314209,-37.6837921142578,4.72986841201782,-14.8907814025879,-37.7697296142578,5,-14.634373664856,-37.7697296142578,2.38418579101563e-007,-14.634373664856,-37.6837921142578,0.270135760307312,-14.8907814025879,-27.1490173339844,4.7298698425293,-11.8933773040771,-27.2109298706055,4.99999952316284,-11.6301412582397,-27.2109184265137,2.14576721191406e-006,-11.6301393508911,-27.1490058898926,0.270133852958679,-11.8933753967285,-16.3826236724854,4.72986602783203,-9.8807954788208,-16.4199848175049,4.99999809265137,-9.61295604705811,-16.4199848175049,-1.66893005371094e-006,-9.61295604705811,-16.3826236724854,0.270132422447205,-9.8807954788208,-5.47642993927002,4.72986316680908,-8.87018013000488,-5.48891830444336,4.99999713897705,-8.60004711151123,-5.48892736434937,-3.57627868652344e-006,-8.60004711151123,-5.47643804550171,0.270129084587097,-8.87018013000488,5.47645711898804,4.72986316680908,-8.87017440795898,
+5.48894596099854,4.99999713897705,-8.60004138946533,5.48894596099854,-3.57627868652344e-006,-8.60004138946533,5.47645711898804,0.270129084587097,-8.87017440795898,16.3826293945313,4.72986602783203,-9.88079261779785,16.4199905395508,4.99999809265137,-9.61296463012695,16.4200019836426,-1.66893005371094e-006,-9.61296463012695,16.382640838623,0.27013236284256,-9.88079261779785,27.1490230560303,4.7298698425293,-11.8933763504028,27.2109355926514,4.99999952316284,-11.6301441192627,27.2109260559082,2.14576721191406e-006,-11.6301422119141,27.1490135192871,0.270133852958679,-11.8933744430542,37.6837997436523,4.72986841201782,-14.8907861709595,37.7697372436523,5,-14.6343746185303,37.7697372436523,2.38418579101563e-007,-14.6343765258789,37.6837997436523,0.270135790109634,-14.8907880783081,47.8970909118652,4.72986841201782,-18.8474388122559,48.0063209533691,5.00000095367432,-18.6000480651855,48.0063171386719,1.19209289550781e-006,-18.6000442504883,47.897087097168,0.270132839679718,-18.8474349975586,57.7017211914063,4.72986316680908,-23.7295589447021,57.833309173584,4.99999570846558,-23.4933109283447,57.833324432373,1.19209289550781e-006,-23.4933204650879,57.7017364501953,0.270131945610046,-23.7295684814453,67.0140533447266,4.72986221313477,-29.4955139160156,67.166877746582,4.99999523162842,-29.2724170684814,67.1669082641602,1.19209289550781e-006,-29.2724323272705,67.0140838623047,0.27013224363327,-29.4955291748047,75.7546615600586,4.72986793518066,-36.0961227416992,75.9274215698242,5.00000190734863,-35.8880767822266,75.9274139404297,2.38418579101563e-007,-35.888069152832,75.7546539306641,0.27013286948204,-36.0961151123047,89.4686660766602,4.99999952316284,-37.695972442627,89.6443405151367,4.72986793518066,-37.904239654541,78.3127593994141,4.72986698150635,-38.4281349182129,78.4684677124023,4.99999952316284,-38.2045440673828,89.6443405151367,0.270131468772888,-37.904239654541,89.4686660766602,-7.15255737304688e-007,-37.695972442627,78.4684677124023,2.86102294921875e-006,-38.2045402526855,78.3127593994141,0.270130187273026,-38.4281311035156,
+-78.4684448242188,4.99999952316284,-38.2045211791992,-78.3127365112305,4.72986698150635,-38.4281120300293,-78.3127365112305,0.270130276679993,-38.4281120300293,-78.4684448242188,2.86102294921875e-006,-38.2045211791992,-86.1482315063477,4.72986745834351,-40.144115447998,-86.0634536743164,4.99999904632568,-39.877613067627,-86.0634536743164,-2.38418579101563e-006,-39.877613067627,-86.1482315063477,0.270132660865784,-40.144115447998,-82.0005798339844,4.72986507415771,-40.3358726501465,-82.0604095458984,5.00000190734863,-40.062686920166,-82.0604095458984,-9.5367431640625e-007,-40.062686920166,-82.0005798339844,0.270135521888733,-40.3358726501465,82.000602722168,4.72986507415771,-40.3358917236328,82.060432434082,5.00000190734863,-40.0627059936523,82.060432434082,-9.5367431640625e-007,-40.0627021789551,82.000602722168,0.270135402679443,-40.3358879089355,86.1482543945313,4.72986745834351,-40.1441307067871,86.0634765625,4.99999904632568,-39.877628326416,86.0634765625,-2.38418579101563e-006,-39.877628326416,86.1482543945313,0.270132660865784,-40.1441307067871,-86.1897201538086,78.6237640380859,-38.8950538635254,-89.0711135864258,78.5386657714844,-43.663818359375,-80.6813583374023,78.6515045166016,-39.9868278503418,-81.7489166259766,78.5672149658203,-45.3726387023926,-74.9691314697266,78.6769180297852,-39.4104385375977,-74.385368347168,78.5933837890625,-44.8047027587891,-68.8010025024414,78.699951171875,-37.5123443603516,-67.152946472168,78.6172103881836,-42.6215476989746,-62.1925888061523,78.7206115722656,-34.5955505371094,-59.9889450073242,78.6386489868164,-39.4320182800293,-55.2234268188477,78.738899230957,-31.0213279724121,-52.7927894592285,78.6576843261719,-35.6922760009766,-47.9520111083984,78.7548217773438,-27.1502933502197,-45.506778717041,78.6742858886719,-31.763708114624,-40.4174461364746,78.7683563232422,-23.3064727783203,-38.1116790771484,78.6884078979492,-27.9482345581055,-32.651180267334,78.7794952392578,-19.7678527832031,-30.612434387207,78.7000579833984,-24.4975814819336,-24.6848545074463,78.7882232666016,-16.7653865814209,
+-23.0276660919189,78.7091827392578,-21.6142272949219,-16.5554313659668,78.7945098876953,-14.4832572937012,-15.3818626403809,78.7157592773438,-19.4512329101563,-8.30865478515625,78.79833984375,-13.0575408935547,-7.69921398162842,78.7197647094727,-18.1134643554688,5.62667846679688e-005,78.7996673583984,-12.5727710723877,4.33921813964844e-005,78.7211608886719,-17.6610107421875,8.30876636505127,78.7983474731445,-13.0575523376465,7.69930076599121,78.7197647094727,-18.1134719848633,16.5555381774902,78.7945175170898,-14.4832792282104,15.3819484710693,78.7157669067383,-19.4512500762939,24.6849594116211,78.7882308959961,-16.7654190063477,23.0277481079102,78.7091827392578,-21.6142501831055,32.6512794494629,78.7795028686523,-19.7678909301758,30.6125106811523,78.700065612793,-24.4976100921631,40.417537689209,78.7683639526367,-23.3065166473389,38.1117553710938,78.6884231567383,-27.9482669830322,47.9520950317383,78.7548294067383,-27.1503391265869,45.5068435668945,78.6742935180664,-31.763744354248,55.223503112793,78.7389144897461,-31.0213756561279,52.7928504943848,78.6576995849609,-35.6923065185547,62.1926612854004,78.7206192016602,-34.5955924987793,59.9890060424805,78.6386642456055,-39.4320526123047,68.8010711669922,78.699951171875,-37.5123825073242,67.1529922485352,78.6172103881836,-42.6215782165527,74.9691848754883,78.6769256591797,-39.4104614257813,74.3853988647461,78.593391418457,-44.8047256469727,80.681396484375,78.6515045166016,-39.9868431091309,81.7489395141602,78.5672149658203,-45.3726654052734,86.1897506713867,78.6237640380859,-38.8950653076172,89.0711364746094,78.5386657714844,-43.6638374328613,83.5052795410156,78.6376342773438,-39.746654510498,85.5079727172852,78.5531158447266,-44.9173469543457,77.8048782348633,78.6648788452148,-39.8889770507813,78.0442886352539,78.5806732177734,-45.3531455993652,-83.505241394043,78.6376342773438,-39.746639251709,-85.5079574584961,78.553108215332,-44.9173164367676,-77.8048324584961,78.6648788452148,-39.8889579772949,-78.0442581176758,78.5806655883789,-45.3531188964844,-96.0659408569336,82.4715042114258,-39.4067611694336,
+-96.3051452636719,82.7926864624023,-39.6429595947266,-96.2552871704102,83.0826416015625,-39.2646560668945,-95.7960052490234,82.8628234863281,-39.140983581543,-88.9592971801758,82.8310241699219,-43.4113693237305,-89.1214141845703,82.4394149780273,-43.744758605957,-92.2420654296875,83.0394058227539,-35.6400260925293,-91.6675415039063,83.0535430908203,-35.0953712463379,-91.9579315185547,82.665641784668,-35.3601036071777,-86.3481750488281,83.0048675537109,-39.2447814941406,-86.1863708496094,82.6312942504883,-38.8900871276855,-85.4578399658203,82.8163223266602,-44.6448745727539,-85.5412368774414,82.4246063232422,-45.0062370300293,-83.5786056518555,82.9887390136719,-40.1234016418457,-83.502799987793,82.6152954101563,-39.7413291931152,-81.7458190917969,82.8018112182617,-45.0963973999023,-81.7661437988281,82.4101028442383,-45.4651260375977,-78.0765914916992,82.7877502441406,-45.0784111022949,-78.0473098754883,82.3960876464844,-45.4468116760254,-80.6798706054688,82.5996398925781,-39.9813613891602,-80.6896591186523,82.9729766845703,-40.3687896728516,-77.7652053833008,82.9577102661133,-40.2693023681641,-77.80419921875,82.5841979980469,-39.883472442627,-74.456169128418,82.7745666503906,-44.5367088317871,-74.3743515014648,82.3829040527344,-44.8971061706543,-67.2528305053711,82.7497253417969,-42.3628196716309,-67.1238403320313,82.358154296875,-42.7089195251465,-74.9693222045898,82.5704193115234,-39.4050712585449,-74.8798370361328,82.9438171386719,-39.7822494506836,-68.6668548583984,82.9173355102539,-37.8703346252441,-68.8022842407227,82.5437088012695,-37.5073318481445,-60.1106643676758,82.7274780273438,-39.1824684143066,-59.9504623413086,82.3359451293945,-39.5146255493164,-62.0279884338379,82.8932571411133,-34.9401016235352,-62.1944351196289,82.5196075439453,-34.5908584594727,-52.9206848144531,82.7077331542969,-35.4450035095215,-52.7505645751953,82.3162384033203,-35.7719993591309,-55.0469627380371,82.8717727661133,-31.3598461151123,-55.2255172729492,82.4981231689453,-31.0168380737305,-45.6363525390625,82.6905288696289,-31.5163612365723,
+-45.4650001525879,82.2990341186523,-31.8427257537842,-47.7754211425781,82.8529739379883,-27.488805770874,-47.9548416137695,82.4793243408203,-27.1462554931641,-38.2333526611328,82.6758728027344,-27.6959896087646,-38.0718269348145,82.2843780517578,-28.0274105072021,-40.2513771057129,82.8369293212891,-23.6503963470459,-40.4200592041016,82.4632720947266,-23.3023509979248,-30.7198219299316,82.6637954711914,-24.2381172180176,-30.5772476196289,82.2723007202148,-24.5782451629639,-32.5044784545898,82.8236923217773,-20.1206169128418,-32.6529808044434,82.4500503540039,-19.7633628845215,-23.114860534668,82.6543273925781,-21.346607208252,-22.9990940093994,82.2628326416016,-21.6969261169434,-24.5656700134277,82.8132934570313,-17.128547668457,-24.6863269805908,82.4396591186523,-16.7607917785645,-15.4435567855835,82.6475067138672,-19.1760902404785,-15.361644744873,82.2560119628906,-19.5359573364258,-16.4710693359375,82.8058013916016,-14.8562116622925,-16.5564785003662,82.4321670532227,-14.4785537719727,-7.73123073577881,82.6433563232422,-17.8329544067383,-7.68871688842773,82.2518615722656,-18.1996917724609,-8.26487064361572,82.8012390136719,-13.4375257492065,-8.30920600891113,82.4276123046875,-13.0527582168579,4.88245677843224e-005,82.6419219970703,-17.3785610198975,4.81299539387692e-005,82.2504272460938,-17.7477912902832,4.31912412750535e-005,82.7996597290039,-12.9553318023682,4.46349949925207e-005,82.426025390625,-12.5679578781128,7.7313289642334,82.6433563232422,-17.8329582214355,7.68881320953369,82.2518539428711,-18.1996994018555,8.26495552062988,82.8012390136719,-13.4375419616699,8.30929470062256,82.427604675293,-13.0527677536011,15.4436550140381,82.6475143432617,-19.176097869873,15.3617401123047,82.2560043334961,-19.5359725952148,16.4711513519287,82.8058090209961,-14.8562421798706,16.5565662384033,82.4321594238281,-14.4785709381104,23.1149597167969,82.6543273925781,-21.346622467041,22.9991893768311,82.262825012207,-21.696949005127,24.5657482147217,82.8133010864258,-17.128589630127,24.6864128112793,82.4396514892578,-16.760814666748,
+30.7199192047119,82.6638031005859,-24.2381324768066,30.5773391723633,82.2722930908203,-24.5782699584961,32.5045547485352,82.8236999511719,-20.120662689209,32.6530685424805,82.4500350952148,-19.7633895874023,38.2334442138672,82.6758804321289,-27.6960124969482,38.0719146728516,82.2843704223633,-28.0274410247803,40.2514533996582,82.8369445800781,-23.6504306793213,40.4201393127441,82.4632873535156,-23.3023853302002,45.6364364624023,82.6905364990234,-31.5163955688477,45.4650840759277,82.2990417480469,-31.8427600860596,47.7754936218262,82.8529815673828,-27.488842010498,47.9549140930176,82.4793319702148,-27.1462917327881,52.9207649230957,82.7077484130859,-35.4450225830078,52.7506370544434,82.3162384033203,-35.7720260620117,55.0470275878906,82.8717803955078,-31.3598747253418,55.2255821228027,82.4981384277344,-31.0168762207031,60.110725402832,82.7274932861328,-39.1825332641602,59.9505386352539,82.3359985351563,-39.5146598815918,62.0280609130859,82.8932647705078,-34.9401092529297,62.1944923400879,82.5196533203125,-34.5908966064453,67.2528533935547,82.7497406005859,-42.3629302978516,67.1238861083984,82.3582611083984,-42.7089462280273,68.6669311523438,82.9173431396484,-37.8702926635742,68.8023300170898,82.5437927246094,-37.5073699951172,74.4561920166016,82.7745742797852,-44.5368804931641,74.3744049072266,82.3830795288086,-44.8971290588379,74.8798751831055,82.9438247680664,-39.7822723388672,74.969367980957,82.5704345703125,-39.4050941467285,78.0766220092773,82.7877502441406,-45.0785942077637,78.0473556518555,82.3962631225586,-45.4468307495117,77.765251159668,82.9577178955078,-40.2691917419434,77.8042297363281,82.5843276977539,-39.8834915161133,81.7458648681641,82.8018112182617,-45.096565246582,81.7661819458008,82.410270690918,-45.4651412963867,85.4579544067383,82.8163146972656,-44.6451568603516,85.5412826538086,82.4248886108398,-45.0062561035156,80.6799011230469,82.5995178222656,-39.9813804626465,80.6896896362305,82.9729766845703,-40.3689308166504,83.5785827636719,82.9887466430664,-40.1231880187988,83.5028228759766,82.6155319213867,-39.7413482666016,
+95.796028137207,82.8628311157227,-39.1409873962402,96.2553100585938,83.082649230957,-39.2646598815918,96.3051681518555,82.7926940917969,-39.6429634094238,96.0659637451172,82.4715118408203,-39.4067687988281,88.9594345092773,82.8310241699219,-43.4115982055664,89.1195526123047,82.4396514892578,-43.745964050293,91.9579467773438,82.665641784668,-35.3601150512695,91.6675567626953,83.0535430908203,-35.0953826904297,92.2420806884766,83.0394058227539,-35.6400375366211,86.1880798339844,82.6315460205078,-38.8890686035156,86.3480987548828,83.0048751831055,-39.2445755004883
+		} 
+		PolygonVertexIndex: *4196 {
+			a: 0,233,-235,43,42,48,-54,1,0,234,235,-21,51,50,56,-62,2,1,20,-22,59,58,64,-70,3,2,21,-23,67,66,72,-78,4,3,22,-24,75,74,80,-86,5,4,23,-25,83,82,88,-94,6,5,24,-26,91,90,96,-102,7,6,25,-27,99,98,104,-110,8,7,26,-28,107,106,112,-118,9,8,27,-29,115,114,120,-126,10,9,28,-30,123,122,128,-134,11,10,29,-31,131,130,136,-142,12,11,30,-32,139,138,144,-150,13,12,31,-33,147,146,152,-158,14,13,32,-34,155,154,160,-166,15,14,33,-35,163,162,168,-174,16,15,34,-36,171,170,176,-182,17,16,35,-37,179,178,184,-190,18,17,36,-38,187,186,192,-198,19,18,37,-39,195,194,200,-206,203,202,208,-214,211,210,216,-222,219,218,228,-230,49,48,42,-42,53,52,44,-44,57,56,50,-50,61,60,52,-52,65,64,58,-58,69,68,60,-60,73,72,66,-66,77,76,68,-68,81,80,74,-74,85,84,76,-76,89,88,82,-82,93,92,84,-84,97,96,90,-90,101,100,92,-92,105,104,98,-98,109,108,100,-100,113,112,106,-106,117,116,108,-108,121,120,114,-114,125,124,116,-116,129,128,122,-122,133,132,124,-124,137,136,130,-130,141,140,132,-132,145,144,138,-138,149,148,140,-140,153,152,146,-146,157,156,148,-148,161,160,154,-154,165,164,156,-156,169,168,162,-162,173,172,164,-164,177,176,170,-170,181,180,172,-172,185,184,178,-178,189,188,180,-180,193,192,186,-186,197,196,188,-188,201,200,194,-194,205,204,196,-196,209,208,202,-202,204,212,226,224,-39,217,216,210,-210,212,220,230,-227,40,39,46,-46,39,42,43,-47,48,47,54,-54,47,50,51,-55,56,55,62,-62,55,58,59,-63,64,63,70,-70,63,66,67,-71,72,71,78,-78,71,74,75,-79,80,79,86,-86,79,82,83,-87,88,87,94,-94,87,90,91,-95,96,95,102,-102,95,98,99,-103,104,103,110,-110,103,106,107,-111,112,111,118,-118,111,114,115,-119,120,119,126,-126,119,122,123,-127,128,127,134,-134,127,130,131,-135,136,135,142,-142,135,138,139,-143,144,143,150,-150,143,146,147,-151,152,151,158,-158,151,154,155,-159,160,159,166,-166,159,162,163,-167,168,167,174,-174,167,170,171,-175,176,175,182,-182,175,178,179,-183,184,183,190,-190,183,186,187,-191,192,191,198,-198,191,194,195,-199,200,199,206,-206,199,202,203,-207,208,207,214,-214,207,210,211,-215,216,215,222,-222,215,218,219,-223,41,42,-40,
+41,39,-41,44,45,-47,44,46,-44,49,50,-48,49,47,-49,52,53,-55,52,54,-52,57,58,-56,57,55,-57,60,61,-63,60,62,-60,65,66,-64,65,63,-65,68,69,-71,68,70,-68,73,74,-72,73,71,-73,76,77,-79,76,78,-76,81,82,-80,81,79,-81,84,85,-87,84,86,-84,89,90,-88,89,87,-89,92,93,-95,92,94,-92,97,98,-96,97,95,-97,100,101,-103,100,102,-100,105,106,-104,105,103,-105,108,109,-111,108,110,-108,113,114,-112,113,111,-113,116,117,-119,116,118,-116,121,122,-120,121,119,-121,124,125,-127,124,126,-124,129,130,-128,129,127,-129,132,133,-135,132,134,-132,137,138,-136,137,135,-137,140,141,-143,140,142,-140,145,146,-144,145,143,-145,148,149,-151,148,150,-148,153,154,-152,153,151,-153,156,157,-159,156,158,-156,161,162,-160,161,159,-161,164,165,-167,164,166,-164,169,170,-168,169,167,-169,172,173,-175,172,174,-172,177,178,-176,177,175,-177,180,181,-183,180,182,-180,185,186,-184,185,183,-185,188,189,-191,188,190,-188,193,194,-192,193,191,-193,196,197,-199,196,198,-196,201,202,-200,201,199,-201,204,205,-207,204,206,-204,209,210,-208,209,207,-209,212,213,-215,212,214,-212,217,218,-216,217,215,-217,220,221,-223,220,222,-220,196,204,38,-38,213,212,204,-204,221,220,212,-212,188,196,37,-37,180,188,36,-36,172,180,35,-35,164,172,34,-34,156,164,33,-33,148,156,32,-32,140,148,31,-31,132,140,30,-30,124,132,29,-29,116,124,28,-28,108,116,27,-27,100,108,26,-26,92,100,25,-25,84,92,24,-24,76,84,23,-23,68,76,22,-22,60,68,21,-21,52,60,20,235,-241,44,52,240,-238,41,242,-237,49,41,236,233,-1,57,49,0,-2,65,57,1,-3,73,65,2,-4,81,73,3,-5,89,81,4,-6,97,89,5,-7,105,97,6,-8,113,105,7,-9,121,113,8,-10,129,121,9,-11,137,129,10,-12,145,137,11,-13,153,145,12,-14,161,153,13,-15,169,161,14,-16,177,169,15,-17,185,177,16,-18,193,185,17,-19,201,193,18,-20,209,201,19,223,-226,217,209,225,-228,224,223,19,-39,232,228,218,-218,231,230,-221,229,231,220,-220,227,232,-218,239,238,40,-46,238,242,41,-41,241,239,45,-45,237,241,-45,275,276,628,-628,276,275,278,-278,277,278,280,-280,279,280,282,-282,281,282,284,-284,283,284,286,-286,285,286,288,-288,287,288,290,-290,289,290,292,-292,291,292,294,-294,293,
+294,296,-296,295,296,298,-298,297,298,300,-300,299,300,302,-302,301,302,304,-304,303,304,306,-306,305,306,308,-308,307,308,310,-310,309,310,492,-492,311,312,622,-624,312,311,313,-315,314,313,315,-317,316,315,317,-319,318,317,319,-321,320,319,321,-323,322,321,323,-325,324,323,325,-327,326,325,327,-329,328,327,329,-331,330,329,331,-333,332,331,333,-335,334,333,335,-337,336,335,337,-339,338,337,339,-341,340,339,341,-343,342,341,343,-345,344,343,346,-346,345,346,489,-491,347,915,912,911,-625,349,348,350,-352,351,350,352,-354,353,352,354,-356,355,354,356,-358,357,356,358,-360,359,358,360,-362,361,360,362,-364,363,362,364,-366,365,364,366,-368,367,366,368,-370,369,368,370,-372,371,370,372,-374,373,372,374,-376,375,374,376,-378,377,376,378,-380,379,378,380,-1036,381,382,626,-626,382,381,383,-385,384,383,385,-387,386,385,387,-389,388,387,389,-391,390,389,391,-393,392,391,393,-395,394,393,395,-397,396,395,397,-399,398,397,399,-401,400,399,401,-403,402,401,403,-405,404,403,405,-407,406,405,407,-409,408,407,409,-411,410,409,411,-413,412,411,413,-415,414,413,416,-416,415,416,494,-494,417,418,742,-742,418,417,420,-420,419,420,422,-422,421,422,424,-424,423,424,426,-426,425,426,428,-428,427,428,430,-430,429,430,432,-432,431,432,434,-434,433,434,436,-436,435,436,438,-438,437,438,440,-440,439,440,442,-442,441,442,444,-444,443,444,446,-446,445,446,448,-448,447,448,450,-450,449,450,452,-452,451,452,609,-609,453,454,747,-749,454,453,455,-457,456,455,457,-459,458,457,459,-461,460,459,461,-463,462,461,463,-465,464,463,465,-467,466,465,467,-469,468,467,469,-471,470,469,471,-473,472,471,473,-475,474,473,475,-477,476,475,477,-479,478,477,479,-481,480,479,481,-483,482,481,483,-485,484,483,485,-487,486,485,488,-488,487,488,610,-612,490,489,496,-498,491,492,499,-499,493,494,501,-501,497,496,504,-506,498,499,507,-507,500,501,509,-509,502,503,511,-511,505,504,512,-514,506,507,515,-515,508,509,517,-517,510,511,519,-519,513,512,520,-522,514,515,523,-523,516,517,525,-525,518,519,527,-527,521,520,528,-530,522,523,531,-531,524,525,533,-533,526,527,
+535,-535,529,528,536,-538,530,531,539,-539,532,533,541,-541,534,535,543,-543,537,536,544,-546,538,539,547,-547,540,541,549,-549,542,543,551,-551,545,544,552,-554,546,547,555,-555,548,549,557,-557,550,551,559,-559,553,552,560,-562,554,555,563,-563,556,557,565,-565,558,559,567,-567,561,560,568,-570,562,563,571,-571,564,565,573,-573,566,567,575,-575,569,568,576,-578,570,571,579,-579,572,573,581,-581,574,575,583,-583,577,576,584,-586,578,579,587,-587,580,581,589,-589,582,583,591,-591,585,584,592,-594,586,587,595,-595,588,589,597,-597,590,591,599,-599,593,592,600,-602,594,595,603,-603,596,597,605,-605,598,599,607,-607,601,600,608,-610,602,603,611,-611,604,605,613,-613,606,607,615,-615,612,613,618,-618,614,615,620,-620,616,618,824,-824,619,621,828,-828,623,622,629,-631,624,911,910,632,-632,625,626,634,-634,627,628,636,-636,630,629,637,-639,631,632,640,-640,633,634,642,-642,635,636,644,-644,638,637,645,-647,639,640,648,-648,641,642,650,-650,643,644,652,-652,646,645,653,-655,647,648,656,-656,649,650,658,-658,651,652,660,-660,654,653,661,-663,655,656,664,-664,657,658,666,-666,659,660,668,-668,662,661,669,-671,663,664,672,-672,665,666,674,-674,667,668,676,-676,670,669,677,-679,671,672,680,-680,673,674,682,-682,675,676,684,-684,678,677,685,-687,679,680,688,-688,681,682,690,-690,683,684,692,-692,686,685,693,-695,687,688,696,-696,689,690,698,-698,691,692,700,-700,694,693,701,-703,695,696,704,-704,697,698,706,-706,699,700,708,-708,702,701,709,-711,703,704,712,-712,705,706,714,-714,707,708,716,-716,710,709,717,-719,711,712,720,-720,713,714,722,-722,715,716,724,-724,718,717,725,-727,719,720,728,-728,721,722,730,-730,723,724,732,-732,726,725,733,-735,727,728,736,-736,729,730,738,-738,731,732,740,-740,734,733,741,-743,735,736,744,-744,737,738,746,-746,739,740,748,-748,743,744,751,-751,745,746,753,-753,749,751,758,-758,752,754,756,-756,755,756,836,-836,757,758,838,-838,759,760,832,-832,760,759,762,-762,761,762,768,-768,763,764,834,-834,764,763,766,-766,765,766,770,-770,767,768,772,-772,769,770,774,-774,771,772,776,-776,773,774,778,-778,
+775,776,780,-780,777,778,782,-782,779,780,784,-784,781,782,786,-786,783,784,788,-788,785,786,790,-790,787,788,792,-792,789,790,794,-794,791,792,796,-796,793,794,798,-798,795,796,800,-800,797,798,802,-802,799,800,804,-804,801,802,806,-806,803,804,808,-808,805,806,810,-810,807,808,812,-812,809,810,814,-814,811,812,816,-816,813,814,818,-818,815,816,820,-820,817,818,822,-822,819,820,826,-826,821,822,830,-830,823,824,847,-849,825,826,844,-844,827,828,849,-851,829,830,846,-846,831,832,839,-841,833,834,841,-843,835,836,840,-840,837,838,842,-842,843,844,848,-848,845,846,850,-850,276,277,313,-312,277,279,315,-314,279,281,317,-316,281,283,319,-318,283,285,321,-320,285,287,323,-322,287,289,325,-324,289,291,327,-326,291,293,329,-328,293,295,331,-330,295,297,333,-332,297,299,335,-334,299,301,337,-336,301,303,339,-338,303,305,341,-340,305,307,343,-342,307,309,346,-344,312,314,348,-348,314,316,350,-349,316,318,352,-351,318,320,354,-353,320,322,356,-355,322,324,358,-357,324,326,360,-359,326,328,362,-361,328,330,364,-363,330,332,366,-365,332,334,368,-367,334,336,370,-369,336,338,372,-371,338,340,374,-373,340,342,376,-375,342,344,378,-377,344,345,380,-379,349,351,385,-384,351,353,387,-386,353,355,389,-388,355,357,391,-390,357,359,393,-392,359,361,395,-394,361,363,397,-396,363,365,399,-398,365,367,401,-400,367,369,403,-402,369,371,405,-404,371,373,407,-406,373,375,409,-408,375,377,411,-410,377,379,413,-412,379,1035,1034,416,-414,382,384,278,-276,384,386,280,-279,386,388,282,-281,388,390,284,-283,390,392,286,-285,392,394,288,-287,394,396,290,-289,396,398,292,-291,398,400,294,-293,400,402,296,-295,402,404,298,-297,404,406,300,-299,406,408,302,-301,408,410,304,-303,410,412,306,-305,412,414,308,-307,414,415,310,-309,418,419,455,-454,419,421,457,-456,421,423,459,-458,423,425,461,-460,425,427,463,-462,427,429,465,-464,429,431,467,-466,431,433,469,-468,433,435,471,-470,435,437,473,-472,437,439,475,-474,439,441,477,-476,441,443,479,-478,443,445,481,-480,445,447,483,-482,447,449,485,-484,449,451,488,-486,454,456,243,754,-754,456,458,244,-244,
+458,460,245,-245,460,462,246,-246,462,464,247,-247,464,466,248,-248,466,468,249,-249,468,470,250,-250,470,472,251,-251,472,474,252,-252,474,476,253,-253,476,478,254,-254,478,480,255,-255,480,482,256,-256,482,484,257,-257,484,486,258,-258,486,487,617,616,-259,833,832,760,-764,760,761,766,-764,761,767,770,-767,767,771,774,-771,771,775,778,-775,775,779,782,-779,779,783,786,-783,783,787,790,-787,787,791,794,-791,791,795,798,-795,795,799,802,-799,799,803,806,-803,803,807,810,-807,807,811,814,-811,811,815,818,-815,815,819,822,-819,819,825,830,-823,259,260,422,-421,260,261,424,-423,261,262,426,-425,262,263,428,-427,263,264,430,-429,264,265,432,-431,265,266,434,-433,266,267,436,-435,267,268,438,-437,268,269,440,-439,269,270,442,-441,270,271,444,-443,271,272,446,-445,272,273,448,-447,273,274,450,-449,274,621,620,452,-451,608,610,488,-452,611,612,617,-488,613,614,619,-619,615,609,452,-621,346,309,491,-490,310,415,493,-493,380,345,490,-496,489,491,498,-497,492,493,500,-500,494,1031,1030,502,-502,495,490,497,-504,496,498,506,-505,499,500,508,-508,501,502,510,-510,503,497,505,-512,504,506,514,-513,507,508,516,-516,509,510,518,-518,511,505,513,-520,512,514,522,-521,515,516,524,-524,517,518,526,-526,519,513,521,-528,520,522,530,-529,523,524,532,-532,525,526,534,-534,527,521,529,-536,528,530,538,-537,531,532,540,-540,533,534,542,-542,535,529,537,-544,536,538,546,-545,539,540,548,-548,541,542,550,-550,543,537,545,-552,544,546,554,-553,547,548,556,-556,549,550,558,-558,551,545,553,-560,552,554,562,-561,555,556,564,-564,557,558,566,-566,559,553,561,-568,560,562,570,-569,563,564,572,-572,565,566,574,-574,567,561,569,-576,568,570,578,-577,571,572,580,-580,573,574,582,-582,575,569,577,-584,576,578,586,-585,579,580,588,-588,581,582,590,-590,583,577,585,-592,584,586,594,-593,587,588,596,-596,589,590,598,-598,591,585,593,-600,592,594,602,-601,595,596,604,-604,597,598,606,-606,599,593,601,-608,600,602,610,-609,603,604,612,-612,605,606,614,-614,607,601,609,-616,741,743,750,-418,744,745,752,-752,746,747,454,-754,748,742,418,-454,312,347,624,
+-623,382,275,627,-627,276,311,623,-629,622,624,631,-630,626,627,635,-635,628,623,630,-637,629,631,639,-638,632,633,641,-641,634,635,643,-643,636,630,638,-645,637,639,647,-646,640,641,649,-649,642,643,651,-651,644,638,646,-653,645,647,655,-654,648,649,657,-657,650,651,659,-659,652,646,654,-661,653,655,663,-662,656,657,665,-665,658,659,667,-667,660,654,662,-669,661,663,671,-670,664,665,673,-673,666,667,675,-675,668,662,670,-677,669,671,679,-678,672,673,681,-681,674,675,683,-683,676,670,678,-685,677,679,687,-686,680,681,689,-689,682,683,691,-691,684,678,686,-693,685,687,695,-694,688,689,697,-697,690,691,699,-699,692,686,694,-701,693,695,703,-702,696,697,705,-705,698,699,707,-707,700,694,702,-709,701,703,711,-710,704,705,713,-713,706,707,715,-715,708,702,710,-717,709,711,719,-718,712,713,721,-721,714,715,723,-723,716,710,718,-725,717,719,727,-726,720,721,729,-729,722,723,731,-731,724,718,726,-733,725,727,735,-734,728,729,737,-737,730,731,739,-739,732,726,734,-741,733,735,743,-742,736,737,745,-745,738,739,747,-747,740,734,742,-749,758,751,752,-756,243,244,762,-760,260,259,764,-766,244,245,768,-763,261,260,765,-770,245,246,772,-769,262,261,769,-774,246,247,776,-773,263,262,773,-778,247,248,780,-777,264,263,777,-782,248,249,784,-781,265,264,781,-786,249,250,788,-785,266,265,785,-790,250,251,792,-789,267,266,789,-794,251,252,796,-793,268,267,793,-798,252,253,800,-797,269,268,797,-802,253,254,804,-801,270,269,801,-806,254,255,808,-805,271,270,805,-810,255,256,812,-809,272,271,809,-814,256,257,816,-813,273,272,813,-818,257,258,820,-817,274,273,817,-822,824,618,619,-828,755,835,838,-759,835,839,842,-839,839,832,833,-843,825,843,846,-831,843,847,850,-847,847,824,827,-851,840,836,756,754,243,759,-832,837,841,834,764,259,749,-758,848,844,826,820,258,616,-824,828,621,274,821,829,845,-850,750,749,259,420,-418,616,617,-619,619,620,-622,749,750,-752,752,753,-755,899,900,494,-417,381,625,852,-852,905,906,854,-854,907,908,856,-856,855,856,858,-858,857,858,860,-860,859,860,862,-862,861,862,864,-864,863,864,866,-866,865,866,868,-868,867,
+868,870,-870,869,870,872,-872,871,872,874,-874,873,874,876,-876,875,876,878,-878,877,878,880,-880,879,880,882,-882,881,882,884,-884,883,884,886,-886,885,886,888,-888,887,888,890,-890,889,890,892,-892,891,892,894,-894,893,894,896,-896,903,904,898,-898,901,902,900,-900,897,898,902,-902,895,896,904,-904,851,852,906,-906,853,854,908,-908,910,909,625,633,-633,916,347,348,-350,917,916,349,383,-382,1030,1029,495,503,-503,1036,380,495,1029,-1029,909,912,913,-915,914,913,920,-922,915,917,919,-919,918,919,923,-923,921,920,924,-926,922,923,928,-930,925,924,926,-928,927,926,932,-934,929,928,931,-931,930,931,936,-938,933,932,934,-936,935,934,940,-942,937,936,939,-939,938,939,943,-943,941,940,944,-946,942,943,947,-947,945,944,948,-950,946,947,951,-951,949,948,952,-954,950,951,955,-955,953,952,956,-958,954,955,959,-959,957,956,960,-962,958,959,963,-963,961,960,964,-966,962,963,967,-967,965,964,968,-970,966,967,971,-971,969,968,972,-974,970,971,975,-975,973,972,976,-978,974,975,979,-979,977,976,980,-982,978,979,983,-983,981,980,984,-986,982,983,987,-987,985,984,988,-990,986,987,991,-991,989,988,992,-994,990,991,995,-995,993,992,996,-998,994,995,999,-999,997,996,1000,-1002,998,999,1003,-1003,1001,1000,1004,-1006,1002,1003,1007,-1007,1005,1004,1008,-1010,1006,1007,1011,-1011,1009,1008,1012,-1014,1010,1011,1015,-1015,1013,1012,1016,-1018,1014,1015,1019,-1019,1017,1016,1020,-1022,1018,1019,1024,-1026,1021,1020,1022,-1024,1023,1022,1032,-1034,1025,1024,1027,-1027,1026,1027,1037,-1039,1028,1031,1033,-1033,1034,1036,1038,-1038,1032,1038,1036,-1029,1037,899,416,-1035,900,1033,1031,-495,913,912,915,-919,919,917,381,-852,625,909,914,-853,920,922,929,-925,923,905,853,-929,906,921,925,-855,926,930,937,-933,931,907,855,-937,908,927,933,-857,932,937,938,-935,936,855,857,-940,856,933,935,-859,934,938,942,-941,939,857,859,-944,858,935,941,-861,940,942,946,-945,943,859,861,-948,860,941,945,-863,944,946,950,-949,947,861,863,-952,862,945,949,-865,948,950,954,-953,951,863,865,-956,864,949,953,-867,952,954,958,-957,955,865,867,-960,866,953,957,-869,956,
+958,962,-961,959,867,869,-964,868,957,961,-871,960,962,966,-965,963,869,871,-968,870,961,965,-873,964,966,970,-969,967,871,873,-972,872,965,969,-875,968,970,974,-973,971,873,875,-976,874,969,973,-877,972,974,978,-977,975,875,877,-980,876,973,977,-879,976,978,982,-981,979,877,879,-984,878,977,981,-881,980,982,986,-985,983,879,881,-988,880,981,985,-883,984,986,990,-989,987,881,883,-992,882,985,989,-885,988,990,994,-993,991,883,885,-996,884,989,993,-887,992,994,998,-997,995,885,887,-1000,886,993,997,-889,996,998,1002,-1001,999,887,889,-1004,888,997,1001,-891,1000,1002,1006,-1005,1003,889,891,-1008,890,1001,1005,-893,1004,1006,1010,-1009,1007,891,893,-1012,892,1005,1009,-895,1008,1010,1014,-1013,1011,893,895,-1016,894,1009,1013,-897,1016,1018,1025,-1021,1019,903,897,-1025,904,1017,1021,-899,1022,1026,1038,-1033,1027,901,899,-1038,902,1023,1033,-901,1020,1025,1026,-1023,1024,897,901,-1028,898,1021,1023,-903,1012,1014,1018,-1017,1015,895,903,-1020,896,1013,1017,-905,913,918,922,-921,919,851,905,-924,852,914,921,-907,924,929,930,-927,928,853,907,-932,854,925,927,-909,909,910,911,-913,915,347,916,-918,1028,1029,1030,-1032,1034,1035,380,-1037
+		} 
+		Edges: *2108 {
+			a: 0,1,2,3,4,5,6,7,9,10,11,12,13,14,15,16,18,19,20,21,22,23,24,26,27,28,29,30,31,32,34,35,36,37,38,39,40,42,43,44,45,46,47,48,50,51,52,53,54,55,56,58,59,60,61,62,63,64,66,67,68,69,70,71,72,74,75,76,77,78,79,80,82,83,84,85,86,87,88,90,91,92,93,94,95,96,98,99,100,101,102,103,104,106,107,108,109,110,111,112,114,115,116,117,118,119,120,122,123,124,125,126,127,128,130,131,132,133,134,135,136,138,139,140,141,142,143,144,146,147,148,149,150,151,152,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,174,175,176,177,178,180,182,183,184,185,186,188,190,191,192,193,194,196,198,199,200,201,202,204,206,207,208,209,210,212,214,215,216,217,218,220,222,223,224,225,226,228,230,231,232,233,234,236,238,239,240,241,242,244,246,247,248,249,250,252,254,255,256,257,258,260,262,263,264,265,266,268,270,271,272,273,274,276,278,279,280,281,282,284,286,287,288,289,290,292,294,295,296,297,298,300,302,303,304,305,306,308,310,311,312,313,314,316,318,319,320,321,322,324,326,327,328,329,330,332,334,335,336,337,338,339,340,341,343,344,345,346,347,349,350,351,352,353,355,357,358,359,361,363,365,366,367,369,371,373,374,375,377,379,381,382,383,385,387,389,390,391,393,395,397,398,399,401,403,405,406,407,409,411,413,414,415,417,419,421,422,423,425,427,429,430,431,433,435,437,438,439,441,443,445,446,447,449,451,453,454,455,457,459,461,462,463,465,467,469,470,471,473,475,477,478,479,481,483,485,486,487,489,491,493,494,495,497,499,501,502,503,505,507,509,510,511,513,515,517,518,519,521,523,525,526,527,529,531,535,538,539,541,547,553,559,565,571,577,583,589,595,601,607,613,619,625,631,637,643,649,655,661,667,673,679,685,691,697,703,709,715,721,727,733,739,745,751,757,763,769,775,781,784,787,791,793,796,797,799,803,805,808,812,824,828,832,836,840,844,848,852,856,860,864,868,872,876,880,884,888,892,893,896,897,898,899,900,903,905,909,913,917,921,925,929,933,937,941,945,949,953,957,961,965,969,973,977,981,984,985,986,989,990,991,995,998,999,1001,1002,1006,1009,1010,1012,1013,1017,1020,1021,1024,1025,1026,1027,1029,1030,
+1031,1033,1034,1035,1037,1038,1039,1041,1042,1043,1045,1046,1047,1049,1050,1051,1053,1054,1055,1057,1058,1059,1061,1062,1063,1065,1066,1067,1069,1070,1071,1073,1074,1075,1077,1078,1079,1081,1082,1083,1085,1086,1087,1089,1090,1091,1093,1094,1095,1097,1098,1099,1100,1101,1102,1103,1105,1106,1107,1109,1110,1111,1113,1114,1115,1117,1118,1119,1121,1122,1123,1125,1126,1127,1129,1130,1131,1133,1134,1135,1137,1138,1139,1141,1142,1143,1145,1146,1147,1149,1150,1151,1153,1154,1155,1157,1158,1159,1161,1162,1163,1165,1166,1167,1169,1170,1171,1173,1174,1175,1176,1177,1178,1179,1180,1181,1182,1183,1184,1186,1187,1188,1190,1191,1192,1194,1195,1196,1198,1199,1200,1202,1203,1204,1206,1207,1208,1210,1211,1212,1214,1215,1216,1218,1219,1220,1222,1223,1224,1226,1227,1228,1230,1231,1232,1234,1235,1236,1238,1239,1240,1242,1243,1244,1245,1246,1247,1248,1250,1251,1252,1254,1255,1256,1258,1259,1260,1262,1263,1264,1266,1267,1268,1270,1271,1272,1274,1275,1276,1278,1279,1280,1282,1283,1284,1286,1287,1288,1290,1291,1292,1294,1295,1296,1298,1299,1300,1302,1303,1304,1306,1307,1308,1310,1311,1312,1314,1315,1316,1318,1319,1320,1321,1322,1323,1324,1326,1327,1328,1330,1331,1332,1334,1335,1336,1338,1339,1340,1342,1343,1344,1346,1347,1348,1350,1351,1352,1354,1355,1356,1358,1359,1360,1362,1363,1364,1366,1367,1368,1370,1371,1372,1374,1375,1376,1378,1379,1380,1382,1383,1384,1386,1387,1388,1390,1391,1392,1394,1395,1396,1397,1398,1399,1400,1402,1403,1404,1406,1407,1408,1410,1411,1412,1414,1415,1416,1418,1419,1420,1422,1423,1424,1426,1427,1428,1430,1431,1432,1434,1435,1436,1438,1439,1440,1442,1443,1444,1446,1447,1448,1450,1451,1452,1454,1455,1456,1458,1459,1460,1462,1463,1464,1466,1467,1468,1470,1471,1472,1474,1475,1476,1478,1479,1480,1482,1483,1484,1486,1487,1488,1490,1491,1492,1494,1495,1496,1497,1498,1499,1500,1502,1503,1504,1506,1507,1508,1510,1511,1512,1514,1515,1516,1518,1519,1520,1522,1523,1524,1526,1527,1528,1530,1531,1532,1534,1535,1536,1538,1539,1540,1542,1543,1544,1546,1547,1548,1550,1551,1552,1554,1555,1556,1558,1559,1560,1562,1563,1564,1566,1567,
+1568,1570,1571,1572,1574,1575,1576,1578,1579,1580,1582,1583,1584,1586,1587,1588,1590,1591,1592,1594,1595,1596,1598,1599,1600,1602,1603,1604,1606,1607,1608,1610,1611,1612,1614,1615,1616,1618,1619,1620,1622,1623,1624,1626,1627,1628,1630,1631,1632,1634,1635,1636,1638,1639,1640,1642,1643,1644,1646,1647,1648,1650,1651,1652,1654,1655,1656,1658,1659,1660,1662,1663,1664,1666,1667,1668,1670,1671,1672,1674,1675,1676,1678,1679,1680,1682,1683,1684,1686,1687,1688,1690,1691,1692,1694,1696,1698,1700,1702,1703,1704,1706,1707,1708,1710,1711,1712,1714,1715,1716,1717,1718,1719,1720,1721,1722,1723,1724,1726,1727,1728,1730,1731,1732,1733,1735,1736,1737,1739,1740,1741,1743,1744,1745,1747,1748,1749,1751,1752,1753,1755,1756,1757,1759,1760,1761,1763,1764,1765,1767,1768,1769,1771,1772,1773,1775,1776,1777,1779,1780,1781,1783,1784,1785,1787,1788,1789,1791,1792,1793,1795,1796,1797,1799,1800,1801,1803,1804,1805,1807,1808,1809,1811,1812,1813,1815,1816,1817,1819,1820,1821,1823,1824,1825,1827,1828,1829,1831,1832,1833,1835,1836,1837,1839,1840,1841,1843,1844,1845,1847,1848,1849,1851,1852,1853,1855,1856,1857,1859,1860,1861,1863,1864,1865,1867,1868,1869,1871,1872,1873,1875,1876,1877,1879,1880,1881,1883,1884,1885,1887,1888,1889,1891,1892,1893,1895,1896,1897,1899,1900,1901,1903,1904,1905,1907,1908,1909,1911,1912,1913,1915,1916,1917,1919,1920,1921,1923,1924,1925,1927,1928,1929,1931,1932,1933,1935,1936,1937,1939,1940,1941,1943,1944,1945,1947,1948,1949,1951,1953,1955,1956,1957,1959,1960,1961,1963,1965,1967,1968,1969,1971,1972,1973,1974,1975,1976,1977,1978,1979,1980,1981,1983,1984,1985,1987,1988,1989,1990,1991,1992,1993,1995,1996,1997,1999,2000,2001,2002,2003,2004,2005,2007,2008,2009,2011,2012,2013,2015,2016,2017,2019,2020,2021,2023,2024,2025,2027,2028,2029,2031,2032,2033,2035,2036,2037,2039,2040,2041,2043,2044,2045,2047,2048,2049,2051,2052,2053,2055,2056,2057,2059,2060,2061,2063,2064,2065,2067,2068,2069,2071,2072,2073,2075,2076,2077,2079,2080,2081,2083,2084,2085,2087,2088,2089,2091,2092,2093,2095,2096,2097,2099,2100,2101,2103,2104,2105,2107,2108,2109,2111,
+2112,2113,2115,2116,2117,2119,2120,2121,2123,2124,2125,2127,2128,2129,2131,2132,2133,2135,2136,2137,2139,2140,2141,2143,2144,2145,2147,2148,2149,2151,2153,2155,2157,2159,2161,2163,2165,2167,2169,2171,2175,2179,2183,2187,2191,2195,2199,2203,2207,2211,2215,2219,2223,2227,2231,2235,2236,2237,2239,2243,2247,2251,2255,2259,2263,2267,2271,2275,2279,2283,2287,2291,2295,2299,2303,2305,2307,2311,2315,2319,2323,2327,2331,2335,2339,2343,2347,2351,2355,2359,2363,2364,2368,2370,2372,2376,2380,2384,2388,2392,2396,2400,2404,2408,2412,2416,2420,2424,2428,2432,2436,2438,2440,2444,2448,2452,2456,2460,2464,2468,2472,2476,2480,2484,2488,2492,2496,2500,2504,2505,2506,2507,2509,2510,2513,2514,2517,2518,2521,2522,2525,2526,2529,2530,2533,2534,2537,2538,2541,2542,2545,2546,2549,2550,2553,2554,2557,2558,2561,2562,2565,2566,2569,2570,2571,2573,2575,2578,2582,2586,2590,2594,2598,2602,2606,2610,2614,2618,2622,2626,2630,2634,2638,2641,2642,2644,2645,2646,2649,2650,2653,2654,2657,2658,2661,2662,2665,2666,2669,2670,2673,2674,2677,2678,2681,2682,2685,2686,2689,2690,2693,2694,2697,2698,2701,2702,2703,2706,2710,2714,2716,2718,2724,2728,2732,2733,2736,2740,2742,2743,2744,2745,2749,2750,2753,2757,2761,2765,2769,2773,2777,2781,2785,2789,2793,2797,2801,2805,2809,2813,2817,2821,2825,2829,2833,2837,2841,2845,2849,2853,2857,2861,2865,2869,2873,2877,2881,2885,2889,2893,2897,2901,2905,2909,2913,2917,2921,2925,2929,2933,2937,2941,2945,2949,2953,2957,2975,2977,2979,2981,2983,2987,2993,2997,3001,3005,3009,3013,3017,3019,3021,3025,3029,3033,3037,3041,3045,3049,3053,3057,3061,3065,3069,3073,3077,3081,3085,3089,3093,3097,3101,3105,3109,3113,3117,3121,3125,3129,3133,3137,3141,3145,3149,3153,3157,3161,3165,3169,3173,3177,3181,3185,3189,3193,3197,3201,3205,3209,3213,3217,3221,3242,3244,3246,3248,3250,3252,3258,3260,3266,3268,3274,3276,3282,3284,3290,3292,3298,3300,3306,3308,3314,3316,3322,3324,3330,3332,3338,3340,3346,3348,3354,3356,3362,3366,3368,3372,3380,3384,3402,3419,3436,3437,3439,3441,3442,3443,3444,3445,3446,3447,3448,3449,3450,3451,3453,3454,3455,3457,3458,
+3459,3461,3462,3463,3465,3466,3467,3469,3470,3471,3473,3474,3475,3477,3478,3479,3481,3482,3483,3485,3486,3487,3489,3490,3491,3493,3494,3495,3497,3498,3499,3501,3502,3503,3505,3506,3507,3509,3510,3511,3513,3514,3515,3517,3518,3519,3521,3522,3523,3525,3526,3527,3529,3530,3531,3532,3533,3534,3535,3536,3537,3539,3541,3543,3545,3547,3549,3551,3553,3555,3556,3557,3561,3564,3565,3569,3570,3571,3575,3578,3579,3580,3581,3582,3583,3585,3586,3587,3588,3589,3590,3591,3593,3594,3595,3597,3598,3599,3601,3602,3603,3605,3606,3607,3609,3610,3611,3613,3614,3615,3617,3618,3619,3621,3622,3623,3625,3626,3627,3629,3630,3631,3633,3634,3635,3637,3638,3639,3641,3642,3643,3645,3646,3647,3649,3650,3651,3653,3654,3655,3657,3658,3659,3661,3662,3663,3665,3666,3667,3669,3670,3671,3673,3674,3675,3677,3678,3679,3681,3682,3683,3685,3686,3687,3689,3690,3691,3693,3694,3695,3697,3698,3699,3701,3702,3703,3705,3706,3707,3709,3710,3711,3713,3714,3715,3717,3718,3719,3721,3722,3723,3725,3726,3727,3729,3730,3731,3733,3734,3735,3737,3738,3739,3741,3742,3743,3745,3746,3747,3749,3750,3751,3753,3754,3755,3757,3758,3759,3761,3762,3763,3765,3766,3767,3769,3770,3771,3773,3774,3775,3777,3778,3779,3781,3782,3783,3785,3786,3787,3789,3790,3791,3793,3794,3795,3797,3798,3799,3801,3802,3803,3805,3806,3807,3809,3810,3811,3812,3813,3815,3816,3817,3819,3820,3824,3828,3835,3839,3842,3844,3846,3848,3850,3852,3854,3856,3858,3860,3862,3864,3866,3870,3874,3878,3882,3886,3890,3894,3898,3902,3906,3910,3914,3918,3922,3926,3930,3934,3938,3942,3946,3950,3954,3958,3962,3966,3970,3974,3978,3982,3986,3990,3994,3998,4002,4006,4010,4014,4018,4022,4026,4030,4034,4038,4042,4046,4050,4054,4058,4062,4066,4070,4074,4078,4082,4086,4090,4094,4098,4102,4106,4108,4110,4112,4114,4116,4118,4120,4124,4128
+		} 
+		GeometryVersion: 124
+		LayerElementNormal: 0 {
+			Version: 102
+			Name: ""
+			MappingInformationType: "ByPolygonVertex"
+			ReferenceInformationType: "Direct"
+			Normals: *12588 {
+				a: 0,0.999999940395355,-6.77275579619163e-007,0,0.999999940395355,-0.000209073783480562,0,0.999999940395355,-6.3660735349913e-007,-0.123129539191723,-0.961523473262787,-0.245584085583687,-0.134296879172325,-0.954053103923798,-0.267855852842331,-0.123066082596779,-0.961489975452423,-0.245747268199921,-0.134247705340385,-0.954042494297028,-0.267918437719345,0,0.999999940395355,-9.82406277216796e-007,0,0.999999940395355,-6.77275579619163e-007,0,0.999999940395355,-6.3660735349913e-007,0,0.999999940395355,-6.2574753201261e-007,0,0.999999940395355,-8.56359406498086e-007,0.126252546906471,-0.962023437023163,0.242014437913895,0.137900203466415,-0.954665720462799,0.263812065124512,0.127787038683891,-0.961508214473724,0.243253946304321,0.13794581592083,-0.954899609088898,0.262940555810928,0,0.999999940395355,-4.86190174342482e-007,0,0.999999940395355,-9.82406277216796e-007,0,0.999999940395355,-8.56359406498086e-007,0,0.999999940395355,-7.41921894586994e-007,-0.131450578570366,-0.964159369468689,-0.230472207069397,-0.143587067723274,-0.957179129123688,-0.251377761363983,-0.132310286164284,-0.963931381702423,-0.230933710932732,-0.143432065844536,-0.957425177097321,-0.250527828931808,-1.31546744341904e-006,0.999999940395355,0,0,0.999999940395355,-4.86190174342482e-007,0,0.999999940395355,-7.41921894586994e-007,-8.416567425229e-007,0.999999940395355,0,0.144131630659103,-0.964372336864471,0.221838071942329,0.159639403223991,-0.956378757953644,0.244652584195137,0.146075487136841,-0.964074671268463,0.221860155463219,0.158780738711357,-0.957254767417908,0.24176824092865,-1.79408743861131e-006,0.999999940395355,-2.15610089071561e-006,-1.31546744341904e-006,0.999999940395355,0,-8.416567425229e-007,0.999999940395355,0,-1.93867072084686e-006,0.999999940395355,-1.39202154514351e-006,-0.161632269620895,-0.965039670467377,-0.206333175301552,-0.179750815033913,-0.956787526607513,-0.228576377034187,-0.163880810141563,-0.964603304862976,-0.206599667668343,-0.178331092000008,-0.957811057567596,-0.225379332900047,-9.358831789541e-007,0.999999940395355,-1.48457388604584e-006,
+-1.79408743861131e-006,0.999999940395355,-2.15610089071561e-006,-1.93867072084686e-006,0.999999940395355,-1.39202154514351e-006,-1.13165833681705e-006,0.999999940395355,-2.20421816266025e-006,0.179300099611282,-0.965845704078674,0.187065213918686,0.199658587574959,-0.957649528980255,0.207469955086708,0.182106211781502,-0.965232372283936,0.187519207596779,0.19759675860405,-0.958829045295715,0.203966960310936,1.11337811858903e-007,0.999999940395355,-8.04795774911327e-007,-9.358831789541e-007,0.999999940395355,-1.48457388604584e-006,-1.13165833681705e-006,0.999999940395355,-2.20421816266025e-006,-8.50785681905109e-008,0.999999940395355,-5.59089983198646e-007,-0.196767270565033,-0.966735422611237,-0.163417130708694,-0.21850773692131,-0.958955049514771,-0.180719375610352,-0.200300946831703,-0.965905606746674,-0.164029240608215,-0.215638428926468,-0.960297226905823,-0.177000731229782,-4.25353761102087e-007,0.999999940395355,-1.30288344735163e-006,1.11337811858903e-007,0.999999940395355,-8.04795774911327e-007,-8.50785681905109e-008,0.999999940395355,-5.59089983198646e-007,-1.67745270118758e-007,0.999999940395355,-1.32454908907675e-006,0.213384836912155,-0.967595934867859,0.134999573230743,0.235109359025955,-0.960619151592255,0.148102536797524,0.217780500650406,-0.966528594493866,0.13562436401844,0.231288492679596,-0.962117195129395,0.144346848130226,-1.01354021353472e-006,0.999999940395355,1.30366913708713e-006,-4.25353761102087e-007,0.999999940395355,-1.30288344735163e-006,-1.67745270118758e-007,0.999999940395355,-1.32454908907675e-006,-1.04789671695471e-006,0.999999940395355,8.20861146166862e-007,-0.228280201554298,-0.968264937400818,-0.101739913225174,-0.248106509447098,-0.962458670139313,-0.110074102878571,-0.233579248189926,-0.96696013212204,-0.102121151983738,-0.243271812796593,-0.964087247848511,-0.106556825339794,-1.42609650310987e-007,0.999999940395355,-6.50051606498891e-006,-1.01354021353472e-006,0.999999940395355,1.30366913708713e-006,-1.04789671695471e-006,0.999999940395355,8.20861146166862e-007,-2.17229114696238e-007,0.999999940395355,-5.4751963034505e-006,
+0.24044206738472,-0.968555212020874,0.0639396756887436,0.256243735551834,-0.96423214673996,0.0677907466888428,0.246497705578804,-0.967045485973358,0.0637328922748566,0.250498324632645,-0.965942919254303,0.064843624830246,-4.00312134786127e-013,0.999999940395355,-9.63827642408432e-006,-1.42609650310987e-007,0.999999940395355,-6.50051606498891e-006,-2.17229114696238e-007,0.999999940395355,-5.4751963034505e-006,5.07831786605156e-013,0.999999940395355,-9.63828551903134e-006,-0.248784631490707,-0.968298077583313,-0.0224702134728432,-0.258676767349243,-0.965686082839966,-0.0231663081794977,-0.255236208438873,-0.966642022132874,-0.0213930755853653,-0.252337247133255,-0.967409312725067,-0.0210961177945137,1.42613316711504e-007,0.999999940395355,1.50629534800828e-006,-4.00312134786127e-013,0.999999940395355,-9.63827642408432e-006,5.07831786605156e-013,0.999999940395355,-9.63828551903134e-006,2.17225490928286e-007,0.999999940395355,2.11144924833206e-006,0.252336710691452,-0.967409372329712,-0.0210991706699133,0.255235403776169,-0.966642022132874,-0.0213962495326996,0.258676260709763,-0.965686142444611,-0.0231727231293917,0.248784989118576,-0.968297839164734,-0.0224768742918968,4.7249727685994e-007,0.999999940395355,4.66450956082554e-006,1.42613316711504e-007,0.999999940395355,1.50629534800828e-006,2.17225490928286e-007,0.999999940395355,2.11144924833206e-006,3.82746179639071e-007,1,4.04727961722529e-006,-0.25049901008606,-0.965942919254303,0.0648410692811012,-0.246498167514801,-0.967045485973358,0.0637305080890656,-0.256243944168091,-0.96423214673996,0.0677868127822876,-0.240441992878914,-0.968555450439453,0.0639362260699272,-3.99124985506205e-007,0.999999940395355,3.48969564356594e-007,4.7249727685994e-007,0.999999940395355,4.66450956082554e-006,3.82746179639071e-007,1,4.04727961722529e-006,-5.32811668563227e-007,0.999999940395355,-8.12569300734367e-009,0.243272989988327,-0.964087247848511,-0.10655415058136,0.233579874038696,-0.966960370540619,-0.102117598056793,0.248106852173805,-0.962458610534668,-0.110074289143085,0.228280708193779,-0.968264758586884,-0.101740501821041,
+-5.33322690898785e-007,0.999999940395355,-1.17187971682142e-006,-3.99124985506205e-007,0.999999940395355,3.48969564356594e-007,-5.32811668563227e-007,0.999999940395355,-8.12569300734367e-009,-3.70503499880215e-007,0.999999940395355,-1.22735616514547e-006,-0.231285884976387,-0.962116777896881,0.144354060292244,-0.217778474092484,-0.966528177261353,0.135631263256073,-0.235108658671379,-0.960618317127228,0.148108899593353,-0.213384747505188,-0.967595398426056,0.135003730654716,-1.98095904124784e-007,0.999999940395355,-2.58728448443435e-007,-5.33322690898785e-007,0.999999940395355,-1.17187971682142e-006,-3.70503499880215e-007,0.999999940395355,-1.22735616514547e-006,-2.94123537969426e-007,0.999999940395355,2.72011988045051e-007,0.215635389089584,-0.960296452045441,-0.177007928490639,0.200298473238945,-0.96590518951416,-0.164035454392433,0.218506082892418,-0.958953678607941,-0.180729284882545,0.196765840053558,-0.966734170913696,-0.163426294922829,-1.12631255433371e-007,0.999999940395355,2.67054986125004e-007,-1.98095904124784e-007,0.999999940395355,-2.58728448443435e-007,-2.94123537969426e-007,0.999999940395355,2.72011988045051e-007,8.06809552500454e-008,0.999999940395355,-2.80561948784452e-007,-0.197595536708832,-0.958828568458557,0.203969702124596,-0.182103976607323,-0.965232610702515,0.18752047419548,-0.199657276272774,-0.957649528980255,0.207471013069153,-0.179300174117088,-0.96584564447403,0.187065660953522,2.58566473121391e-007,0.999999940395355,-5.13899067300372e-007,-1.12631255433371e-007,0.999999940395355,2.67054986125004e-007,8.06809552500454e-008,0.999999940395355,-2.80561948784452e-007,1.65437768373522e-007,0.999999940395355,-1.05491501756205e-007,0.17833037674427,-0.957812011241913,-0.225376337766647,0.163881003856659,-0.964603304862976,-0.206599488854408,0.179750978946686,-0.956788539886475,-0.228572145104408,0.161633178591728,-0.96504020690918,-0.206329733133316,0,0.999999940395355,6.13136705851502e-007,2.58566473121391e-007,0.999999940395355,-5.13899067300372e-007,1.65437768373522e-007,0.999999940395355,-1.05491501756205e-007,
+0,0.999999940395355,6.09512312621519e-007,-0.158782511949539,-0.957255601882935,0.241763815283775,-0.146078124642372,-0.964075446128845,0.221854940056801,-0.159708470106125,-0.956372737884521,0.244630992412567,-0.144236877560616,-0.964375615119934,0.221754670143127,0,0.999999940395355,3.72259762571048e-007,0,0.999999940395355,6.13136705851502e-007,0,0.999999940395355,6.09512312621519e-007,0,0.999999940395355,2.54727126502985e-007,0.1395673006773,-0.957110404968262,-0.25389090180397,0.12891598045826,-0.963671624660492,-0.233917906880379,0.139830023050308,-0.956485092639923,-0.256093263626099,0.12652151286602,-0.964267253875732,-0.23276774585247,-0.134428739547729,-0.953873574733734,0.268428951501846,-0.123137466609478,-0.961373209953308,0.246167808771133,-0.134304076433182,-0.954049170017242,0.267866432666779,-0.123139314353466,-0.961518287658691,0.245599716901779,0.134296208620071,-0.954053580760956,-0.26785472035408,0.123128622770309,-0.961524426937103,-0.245581015944481,0.134295776486397,-0.954053938388824,-0.267853885889053,0.123128101229668,-0.961524724960327,-0.245580032467842,-0.124698102474213,-0.960518896579742,0.248704195022583,-0.110610224306583,-0.969070672988892,0.220606818795204,-0.148031041026115,-0.943885564804077,0.295240193605423,-0.148031055927277,-0.943885564804077,0.295240193605423,0.707106590270996,1.42274672043641e-007,-0.707106828689575,0.707108020782471,-3.30988609675842e-006,-0.707105457782745,0.707107961177826,-3.26363442582078e-006,-0.70710551738739,0.707107186317444,3.69263972288536e-007,-0.707106292247772,-0.707106471061707,-4.32224123869673e-006,0.70710700750351,-0.707085013389587,-2.146810402337e-005,0.707128524780273,-0.70710700750351,-2.43422903167811e-007,0.707106411457062,-0.70710700750351,-3.26353415402991e-006,0.707106471061707,0.691347479820251,7.67118253861554e-005,-0.72252231836319,0.706707179546356,0.000473011721624061,-0.707505941390991,0.70710551738739,3.30968100570317e-006,-0.707107961177826,0.707106590270996,1.42274672043641e-007,-0.707106828689575,-0.706649303436279,-0.000482297880807891,0.707563698291779,
+-0.69128429889679,-7.61363044148311e-005,0.722582817077637,-0.707085013389587,-2.146810402337e-005,0.707128524780273,-0.707045435905457,-1.59685823746258e-005,0.707167983055115,0.642951726913452,0.000354087329469621,-0.765906572341919,0.675355553627014,0.000949846638832241,-0.737491607666016,0.676116526126862,0.00045005464926362,-0.736794531345367,0.691347479820251,7.67118253861554e-005,-0.72252231836319,-0.67535662651062,-0.000938067911192775,0.737490653991699,-0.642901122570038,-0.000334645999828354,0.765949010848999,-0.69128429889679,-7.61363044148311e-005,0.722582817077637,-0.676113843917847,-0.000438447197666392,0.736797034740448,0.573717832565308,0.000174486121977679,-0.819052934646606,0.60798841714859,0.000997279770672321,-0.7939453125,0.609272241592407,0.000933395291212946,-0.792960464954376,0.642951726913452,0.000354087329469621,-0.765906572341919,-0.607998132705688,-0.000988467014394701,0.793937683105469,-0.573705315589905,-0.000173929744050838,0.819061636924744,-0.642901122570038,-0.000334645999828354,0.765949010848999,-0.609268307685852,-0.000925298081710935,0.792963564395905,0.500149011611938,0.000418230716604739,-0.865939140319824,0.537014782428741,0.00100837636273354,-0.84357225894928,0.538352131843567,0.00097976578399539,-0.842719316482544,0.573717832565308,0.000174486121977679,-0.819052934646606,-0.537014722824097,-0.00100110180210322,0.843572318553925,-0.50012868642807,-0.000412454508477822,0.8659508228302,-0.573705315589905,-0.000173929744050838,0.819061636924744,-0.538337409496307,-0.000971822126302868,0.842728734016418,0.422732502222061,0.000203691961360164,-0.906254410743713,0.46078297495842,0.0011021348182112,-0.88751208782196,0.462260723114014,0.000992326647974551,-0.886743426322937,0.500149011611938,0.000418230716604739,-0.865939140319824,-0.460802644491196,-0.00108629977330565,0.887502014636993,-0.422717064619064,-0.000202155963052064,0.906261622905731,-0.50012868642807,-0.000412454508477822,0.8659508228302,-0.462261557579041,-0.000978866359218955,0.886743128299713,0.342132270336151,0.000486210134113207,-0.939651727676392,
+0.38234880566597,0.00106282799970359,-0.924017369747162,0.38385745882988,0.00108430103864521,-0.92339164018631,0.422732502222061,0.000203691961360164,-0.906254410743713,-0.382351249456406,-0.00105047121178359,0.924016416072845,-0.342111021280289,-0.000477634341223165,0.939659357070923,-0.422717064619064,-0.000202155963052064,0.906261622905731,-0.383839637041092,-0.0010699441190809,0.923399090766907,0.258893400430679,0.000231088371947408,-0.965905725955963,0.299574762582779,0.0011948118917644,-0.954071998596191,0.301201343536377,0.00104877783451229,-0.953559935092926,0.342132270336151,0.000486210134113207,-0.939651727676392,-0.299597084522247,-0.00117788754869252,0.954064965248108,-0.25888004899025,-0.000228960256208666,0.965909421443939,-0.342111021280289,-0.000477634341223165,0.939659357070923,-0.301198542118073,-0.00103593873791397,0.953560769557953,0.173708394169807,0.000541333865839988,-0.984796941280365,0.216061800718308,0.0011032031616196,-0.976379036903381,0.217701762914658,0.0011836924823001,-0.97601455450058,0.258893400430679,0.000231088371947408,-0.965905725955963,-0.216063663363457,-0.00108678417745978,0.976378619670868,-0.173694118857384,-0.000530617660842836,0.98479950428009,-0.25888004899025,-0.000228960256208666,0.965909421443939,-0.217677369713783,-0.00116334727499634,0.976020038127899,0.0871815755963326,0.000248495460255072,-0.996192395687103,0.12927708029747,0.00125267426483333,-0.99160772562027,0.130986571311951,0.00109595316462219,-0.991383492946625,0.173708394169807,0.000541333865839988,-0.984796941280365,-0.129304751753807,-0.00123025104403496,0.991604089736938,-0.0871760025620461,-0.000246039213379845,0.996192753314972,-0.173694118857384,-0.000530617660842836,0.98479950428009,-0.130984872579575,-0.00107876374386251,0.991383731365204,1.17230980478666e-008,0.000562945730052888,-0.999999821186066,0.043199647217989,0.00111541769001633,-0.999065756797791,0.0449124947190285,0.00124767702072859,-0.998990118503571,0.0871815755963326,0.000248495460255072,-0.996192395687103,-0.0432011559605598,-0.00109732220880687,0.999065697193146,
+-8.76285852768888e-008,-0.000551345816347748,0.999999821186066,-0.0871760025620461,-0.000246039213379845,0.996192753314972,-0.0448841415345669,-0.0012244435492903,0.998991429805756,-0.0871815085411072,0.000248433614615351,-0.996192395687103,-0.0449125915765762,0.00124768249224871,-0.998990178108215,-0.0431997291743755,0.00111542060039938,-0.999065756797791,1.17230980478666e-008,0.000562945730052888,-0.999999821186066,0.0448841154575348,-0.00122483051382005,0.998991429805756,0.0871760323643684,-0.000246037408942357,0.996192753314972,-8.76285852768888e-008,-0.000551345816347748,0.999999821186066,0.0432012267410755,-0.00109775760211051,0.999065637588501,-0.173708364367485,0.00054123398149386,-0.984796941280365,-0.130986660718918,0.00109501811675727,-0.991383373737335,-0.129277110099792,0.00125175097491592,-0.991607666015625,-0.0871815085411072,0.000248433614615351,-0.996192395687103,0.130984857678413,-0.00107917352579534,0.991383671760559,0.173693999648094,-0.000530644960235804,0.98479950428009,0.0871760323643684,-0.000246037408942357,0.996192753314972,0.129304796457291,-0.00123067211825401,0.991604089736938,-0.25889328122139,0.00023112483904697,-0.965905785560608,-0.217702135443687,0.00118364382069558,-0.976014494895935,-0.216062128543854,0.00110320013482124,-0.976378917694092,-0.173708364367485,0.00054123398149386,-0.984796941280365,0.21767657995224,-0.00116316566709429,0.976020216941834,0.258879840373993,-0.000228985954890959,0.965909421443939,0.173693999648094,-0.000530644960235804,0.98479950428009,0.216062963008881,-0.00108651397749782,0.976378798484802,-0.34213200211525,0.000486268632812425,-0.939651727676392,-0.301199406385422,0.00105119287036359,-0.953560531139374,-0.299572914838791,0.00119721691589803,-0.954072594642639,-0.25889328122139,0.00023112483904697,-0.965905785560608,0.301198601722717,-0.00103476224467158,0.953560709953308,0.342110991477966,-0.000477676192531362,0.939659357070923,0.258879840373993,-0.000228985954890959,0.965909421443939,0.299597084522247,-0.00117666774895042,0.954065144062042,-0.422732412815094,0.000203606527065858,-0.906254470348358,
+-0.383859694004059,0.00108595681376755,-0.923390746116638,-0.382351160049438,0.00106450635939837,-0.924016416072845,-0.34213200211525,0.000486268632812425,-0.939651727676392,0.38383936882019,-0.00107024807948619,0.923399329185486,0.422717124223709,-0.000202067123609595,0.906261503696442,0.342110991477966,-0.000477676192531362,0.939659357070923,0.382351160049438,-0.00105092476587743,0.92401647567749,-0.500148892402649,0.000418226496549323,-0.865939199924469,-0.462262123823166,0.000992285786196589,-0.8867427110672,-0.460784375667572,0.00110203528311104,-0.887511372566223,-0.422732412815094,0.000203606527065858,-0.906254470348358,0.462260663509369,-0.000980581389740109,0.886743545532227,0.500128626823425,-0.000411972694564611,0.86595094203949,0.422717124223709,-0.000202067123609595,0.906261503696442,0.460801750421524,-0.00108774390537292,0.887502372264862,-0.573718070983887,0.00017472033505328,-0.819052696228027,-0.538351953029633,0.000978345633484423,-0.842719316482544,-0.537014484405518,0.00100671465042979,-0.843572378158569,-0.500148892402649,0.000418226496549323,-0.865939199924469,0.5383380651474,-0.000972610607277602,0.842728316783905,0.573705196380615,-0.000173079664818943,0.819061696529388,0.500128626823425,-0.000411972694564611,0.86595094203949,0.537015438079834,-0.00100191065575928,0.843571782112122,-0.642951726913452,0.000354452669853345,-0.765906572341919,-0.609271824359894,0.000933478528168052,-0.792960822582245,-0.607987761497498,0.000997181632556021,-0.793945670127869,-0.573718070983887,0.00017472033505328,-0.819052696228027,0.609269022941589,-0.000926709559280425,0.792962968349457,0.642927646636963,-0.00036650785477832,0.765926659107208,0.573705196380615,-0.000173079664818943,0.819061696529388,0.607998311519623,-0.000988370040431619,0.793937742710114,-0.691341698169708,7.67282908782363e-005,-0.722527801990509,-0.67611563205719,0.000452834210591391,-0.73679530620575,-0.675354897975922,0.000953109876718372,-0.737492144107819,-0.642951726913452,0.000354452669853345,-0.765906572341919,0.67617392539978,-0.000458253372926265,0.736741781234741,
+0.691334187984467,-7.63541393098421e-005,0.722535014152527,0.642927646636963,-0.00036650785477832,0.765926659107208,0.675419449806213,-0.000955127004999667,0.737433075904846,-0.70710676908493,-1.48291519508348e-007,-0.707106649875641,-0.707105934619904,3.30935336023686e-006,-0.707107484340668,-0.706706941127777,0.000473292486276478,-0.707506060600281,-0.691341698169708,7.67282908782363e-005,-0.722527801990509,0.691334187984467,-7.63541393098421e-005,0.722535014152527,0.707091152667999,2.06680033443263e-005,0.707122266292572,0.707083821296692,2.91770284093218e-005,0.707129657268524,0.707078635692596,3.53965515387245e-005,0.707134783267975,0.691218376159668,-1.27734935517765e-007,0.722645878791809,-0.707106411457062,-1.8572363558178e-007,-0.707107067108154,-0.707106947898865,-3.26363942804164e-006,-0.707106530666351,-0.707106649875641,-3.3098917811003e-006,-0.70710676908493,-0.70710676908493,-1.48291519508348e-007,-0.707106649875641,0.707091152667999,2.06680033443263e-005,0.707122266292572,0.707107722759247,-6.0464969919849e-008,0.707105755805969,0.707107841968536,0,0.70710563659668,0.707083821296692,2.91770284093218e-005,0.707129657268524,0.100992575287819,-0.974283337593079,0.201425895094872,-0.015247224830091,-0.999421000480652,-0.0304169561713934,0.0152474660426378,-0.999421358108521,0.0304058436304331,0.115416444838047,-0.966276109218597,0.230193823575974,-0.015247224830091,-0.999421000480652,-0.0304169561713934,-0.134296879172325,-0.954053103923798,-0.267855852842331,-0.123129539191723,-0.961523473262787,-0.245584085583687,0.0152474660426378,-0.999421358108521,0.0304058436304331,-0.123066082596779,-0.961489975452423,-0.245747268199921,0.0159337222576141,-0.999445557594299,0.0292362757027149,-0.0147036742419004,-0.999401688575745,-0.0313049554824829,-0.134247705340385,-0.954042494297028,-0.267918437719345,0.0159337222576141,-0.999445557594299,0.0292362757027149,0.137900203466415,-0.954665720462799,0.263812065124512,0.126252546906471,-0.962023437023163,0.242014437913895,-0.0147036742419004,-0.999401688575745,-0.0313049554824829,
+0.127787038683891,-0.961508214473724,0.243253946304321,-0.0151436198502779,-0.999611616134644,-0.0233937837183475,0.0154015300795436,-0.999354779720306,0.0324454456567764,0.13794581592083,-0.954899609088898,0.262940555810928,-0.0151436198502779,-0.999611616134644,-0.0233937837183475,-0.143587067723274,-0.957179129123688,-0.251377761363983,-0.131450578570366,-0.964159369468689,-0.230472207069397,0.0154015300795436,-0.999354779720306,0.0324454456567764,-0.132310286164284,-0.963931381702423,-0.230933710932732,0.0218442529439926,-0.999319314956665,0.0297255013138056,-0.0135709010064602,-0.999491274356842,-0.0288636293262243,-0.143432065844536,-0.957425177097321,-0.250527828931808,0.0218442529439926,-0.999319314956665,0.0297255013138056,0.159639403223991,-0.956378757953644,0.244652584195137,0.144131630659103,-0.964372336864471,0.221838071942329,-0.0135709010064602,-0.999491274356842,-0.0288636293262243,0.146075487136841,-0.964074671268463,0.221860155463219,-0.0255906563252211,-0.999307096004486,-0.027024744078517,0.0148703893646598,-0.999460279941559,0.029289348050952,0.158780738711357,-0.957254767417908,0.24176824092865,-0.0255906563252211,-0.999307096004486,-0.027024744078517,-0.179750815033913,-0.956787526607513,-0.228576377034187,-0.161632269620895,-0.965039670467377,-0.206333175301552,0.0148703893646598,-0.999460279941559,0.029289348050952,-0.163880810141563,-0.964603304862976,-0.206599667668343,0.0278484746813774,-0.999346613883972,0.0230371970683336,-0.0166208110749722,-0.999470233917236,-0.0279791969805956,-0.178331092000008,-0.957811057567596,-0.225379332900047,0.0278484746813774,-0.999346613883972,0.0230371970683336,0.199658587574959,-0.957649528980255,0.207469955086708,0.179300099611282,-0.965845704078674,0.187065213918686,-0.0166208110749722,-0.999470233917236,-0.0279791969805956,0.182106211781502,-0.965232372283936,0.187519207596779,-0.0287802908569574,-0.999434888362885,-0.0173639208078384,0.0175538267940283,-0.999519288539886,0.0255525894463062,0.19759675860405,-0.958829045295715,0.203966960310936,-0.0287802908569574,-0.999434888362885,-0.0173639208078384,
+-0.21850773692131,-0.958955049514771,-0.180719375610352,-0.196767270565033,-0.966735422611237,-0.163417130708694,0.0175538267940283,-0.999519288539886,0.0255525894463062,-0.200300946831703,-0.965905606746674,-0.164029240608215,0.0277864709496498,-0.999560177326202,0.0103667629882693,-0.0172408670186996,-0.999605417251587,-0.0221754740923643,-0.215638428926468,-0.960297226905823,-0.177000731229782,0.0277864709496498,-0.999560177326202,0.0103667629882693,0.235109359025955,-0.960619151592255,0.148102536797524,0.213384836912155,-0.967595934867859,0.134999573230743,-0.0172408670186996,-0.999605417251587,-0.0221754740923643,0.217780500650406,-0.966528594493866,0.13562436401844,-0.024346636608243,-0.999699473381042,-0.00283437198959291,0.0153207927942276,-0.999715745449066,0.0182649083435535,0.231288492679596,-0.962117195129395,0.144346848130226,-0.024346636608243,-0.999699473381042,-0.00283437198959291,-0.248106509447098,-0.962458670139313,-0.110074102878571,-0.228280201554298,-0.968264937400818,-0.101739913225174,0.0153207927942276,-0.999715745449066,0.0182649083435535,-0.233579248189926,-0.96696013212204,-0.102121151983738,0.0182486567646265,-0.999825060367584,-0.00406878488138318,-0.0116085018962622,-0.999827086925507,-0.0145186418667436,-0.243271812796593,-0.964087247848511,-0.106556825339794,0.0182486567646265,-0.999825060367584,-0.00406878488138318,0.256243735551834,-0.96423214673996,0.0677907466888428,0.24044206738472,-0.968555212020874,0.0639396756887436,-0.0116085018962622,-0.999827086925507,-0.0145186418667436,0.246497705578804,-0.967045485973358,0.0637328922748566,-0.0098147327080369,-0.999911367893219,0.00898595247417688,0.0062889507971704,-0.999910771846771,0.0117807649075985,0.250498324632645,-0.965942919254303,0.064843624830246,-0.0098147327080369,-0.999911367893219,0.00898595247417688,-0.258676767349243,-0.965686082839966,-0.0231663081794977,-0.248784631490707,-0.968298077583313,-0.0224702134728432,0.0062889507971704,-0.999910771846771,0.0117807649075985,-0.255236208438873,-0.966642022132874,-0.0213930755853653,
+-1.4923796243238e-007,-0.999942064285278,-0.0107591906562448,1.16896650581566e-007,-0.999942123889923,-0.0107591897249222,-0.252337247133255,-0.967409312725067,-0.0210961177945137,-1.4923796243238e-007,-0.999942064285278,-0.0107591906562448,0.255235403776169,-0.966642022132874,-0.0213962495326996,0.252336710691452,-0.967409372329712,-0.0210991706699133,1.16896650581566e-007,-0.999942123889923,-0.0107591897249222,0.258676260709763,-0.965686142444611,-0.0231727231293917,0.00981586892157793,-0.999911367893219,0.00898293498903513,-0.00628749560564756,-0.999910831451416,0.0117783099412918,0.248784989118576,-0.968297839164734,-0.0224768742918968,0.00981586892157793,-0.999911367893219,0.00898293498903513,-0.246498167514801,-0.967045485973358,0.0637305080890656,-0.25049901008606,-0.965942919254303,0.0648410692811012,-0.00628749560564756,-0.999910831451416,0.0117783099412918,-0.256243944168091,-0.96423214673996,0.0677868127822876,-0.0182476863265038,-0.999825179576874,-0.00406463537365198,0.0116092134267092,-0.999827265739441,-0.0145133594051003,-0.240441992878914,-0.968555450439453,0.0639362260699272,-0.0182476863265038,-0.999825179576874,-0.00406463537365198,0.233579874038696,-0.966960370540619,-0.102117598056793,0.243272989988327,-0.964087247848511,-0.10655415058136,0.0116092134267092,-0.999827265739441,-0.0145133594051003,0.248106852173805,-0.962458610534668,-0.110074289143085,0.0243457239121199,-0.999699592590332,-0.00283335032872856,-0.0153204007074237,-0.999715745449066,0.0182660911232233,0.228280708193779,-0.968264758586884,-0.101740501821041,0.0243457239121199,-0.999699592590332,-0.00283335032872856,-0.217778474092484,-0.966528177261353,0.135631263256073,-0.231285884976387,-0.962116777896881,0.144354060292244,-0.0153204007074237,-0.999715745449066,0.0182660911232233,-0.235108658671379,-0.960618317127228,0.148108899593353,-0.027790043503046,-0.999559938907623,0.0103657385334373,0.017237538471818,-0.999605417251587,-0.0221757385879755,-0.213384747505188,-0.967595398426056,0.135003730654716,-0.027790043503046,-0.999559938907623,0.0103657385334373,
+0.200298473238945,-0.96590518951416,-0.164035454392433,0.215635389089584,-0.960296452045441,-0.177007928490639,0.017237538471818,-0.999605417251587,-0.0221757385879755,0.218506082892418,-0.958953678607941,-0.180729284882545,0.0287829414010048,-0.99943470954895,-0.017369793727994,-0.017551438882947,-0.999519348144531,0.0255485940724611,0.196765840053558,-0.966734170913696,-0.163426294922829,0.0287829414010048,-0.99943470954895,-0.017369793727994,-0.182103976607323,-0.965232610702515,0.18752047419548,-0.197595536708832,-0.958828568458557,0.203969702124596,-0.017551438882947,-0.999519348144531,0.0255485940724611,-0.199657276272774,-0.957649528980255,0.207471013069153,-0.0278479680418968,-0.999346792697906,0.023030161857605,0.016618937253952,-0.999470174312592,-0.0279835537075996,-0.179300174117088,-0.96584564447403,0.187065660953522,-0.0278479680418968,-0.999346792697906,0.023030161857605,0.163881003856659,-0.964603304862976,-0.206599488854408,0.17833037674427,-0.957812011241913,-0.225376337766647,0.016618937253952,-0.999470174312592,-0.0279835537075996,0.179750978946686,-0.956788539886475,-0.228572145104408,0.0255907401442528,-0.999306976795197,-0.027028676122427,-0.014870441518724,-0.999460577964783,0.0292805526405573,0.161633178591728,-0.96504020690918,-0.206329733133316,0.0255907401442528,-0.999306976795197,-0.027028676122427,-0.146078124642372,-0.964075446128845,0.221854940056801,-0.158782511949539,-0.957255601882935,0.241763815283775,-0.014870441518724,-0.999460577964783,0.0292805526405573,-0.159708470106125,-0.956372737884521,0.244630992412567,-0.0225762035697699,-0.999316275119781,0.0292785465717316,0.0126480925828218,-0.999484896659851,-0.029494222253561,-0.144236877560616,-0.964375615119934,0.221754670143127,-0.0225762035697699,-0.999316275119781,0.0292785465717316,0.12891598045826,-0.963671624660492,-0.233917906880379,0.1395673006773,-0.957110404968262,-0.25389090180397,0.0126480925828218,-0.999484896659851,-0.029494222253561,0.139830023050308,-0.956485092639923,-0.256093263626099,0.0160598773509264,-0.99950647354126,-0.026997372508049,
+-0.016517473384738,-0.99918657541275,0.0367877781391144,0.12652151286602,-0.964267253875732,-0.23276774585247,0.0160598773509264,-0.99950647354126,-0.026997372508049,-0.123137466609478,-0.961373209953308,0.246167808771133,-0.134428739547729,-0.953873574733734,0.268428951501846,-0.016517473384738,-0.99918657541275,0.0367877781391144,-0.134304076433182,-0.954049170017242,0.267866432666779,-0.0152475573122501,-0.999421119689941,0.0304133631289005,0.015248853713274,-0.999421119689941,-0.0304128378629684,-0.123139314353466,-0.961518287658691,0.245599716901779,-0.0152475573122501,-0.999421119689941,0.0304133631289005,0.123128622770309,-0.961524426937103,-0.245581015944481,0.134296208620071,-0.954053580760956,-0.26785472035408,0.015248853713274,-0.999421119689941,-0.0304128378629684,0.134295776486397,-0.954053938388824,-0.267853885889053,0.0152467731386423,-0.999421119689941,-0.0304117072373629,-0.0152477622032166,-0.999421238899231,0.0304093286395073,0.123128101229668,-0.961524724960327,-0.245580032467842,0.0152467731386423,-0.999421119689941,-0.0304117072373629,-0.110610224306583,-0.969070672988892,0.220606818795204,-0.124698102474213,-0.960518896579742,0.248704195022583,-0.0152477622032166,-0.999421238899231,0.0304093286395073,0.707107186317444,3.69263972288536e-007,-0.707106292247772,0.707107961177826,-3.26363442582078e-006,-0.70710551738739,0.707106709480286,0,-0.707106709480286,0.707107186317444,3.69263972288536e-007,-0.707106292247772,0.707106709480286,0,-0.707106709480286,0.707104980945587,1.05163881016779e-005,-0.707108438014984,-0.70710700750351,-2.43422903167811e-007,0.707106411457062,-0.707105100154877,-3.95148617826635e-006,0.707108438014984,-0.70710676908493,0,0.707106709480286,-0.70710700750351,-2.43422903167811e-007,0.707106411457062,-0.70710676908493,0,0.707106709480286,-0.70710700750351,-3.26353415402991e-006,0.707106471061707,0.707106590270996,1.42274672043641e-007,-0.707106828689575,0.70710551738739,3.30968100570317e-006,-0.707107961177826,0.707107782363892,0,-0.707105755805969,0.707106590270996,1.42274672043641e-007,-0.707106828689575,
+0.707107782363892,0,-0.707105755805969,0.707108020782471,-3.30988609675842e-006,-0.707105457782745,-0.707085013389587,-2.146810402337e-005,0.707128524780273,-0.707106471061707,-4.32224123869673e-006,0.70710700750351,-0.70707494020462,-3.6989131331211e-005,0.707138419151306,-0.707085013389587,-2.146810402337e-005,0.707128524780273,-0.70707494020462,-3.6989131331211e-005,0.707138419151306,-0.707045435905457,-1.59685823746258e-005,0.707167983055115,0.691347479820251,7.67118253861554e-005,-0.72252231836319,0.676116526126862,0.00045005464926362,-0.736794531345367,0.691384553909302,0.0109176589176059,-0.722404301166534,0.691347479820251,7.67118253861554e-005,-0.72252231836319,0.691384553909302,0.0109176589176059,-0.722404301166534,0.706707179546356,0.000473011721624061,-0.707505941390991,-0.69128429889679,-7.61363044148311e-005,0.722582817077637,-0.706649303436279,-0.000482297880807891,0.707563698291779,-0.69135057926178,-0.010904373601079,0.722437083721161,-0.69128429889679,-7.61363044148311e-005,0.722582817077637,-0.69135057926178,-0.010904373601079,0.722437083721161,-0.676113843917847,-0.000438447197666392,0.736797034740448,0.642951726913452,0.000354087329469621,-0.765906572341919,0.609272241592407,0.000933395291212946,-0.792960464954376,0.641915321350098,0.0334380529820919,-0.766046047210693,0.642951726913452,0.000354087329469621,-0.765906572341919,0.641915321350098,0.0334380529820919,-0.766046047210693,0.675355553627014,0.000949846638832241,-0.737491607666016,-0.642901122570038,-0.000334645999828354,0.765949010848999,-0.67535662651062,-0.000938067911192775,0.737490653991699,-0.641911923885345,-0.0333690978586674,0.766051948070526,-0.642901122570038,-0.000334645999828354,0.765949010848999,-0.641911923885345,-0.0333690978586674,0.766051948070526,-0.609268307685852,-0.000925298081710935,0.792963564395905,0.573717832565308,0.000174486121977679,-0.819052934646606,0.538352131843567,0.00097976578399539,-0.842719316482544,0.573073506355286,0.0230355337262154,-0.819180011749268,0.573717832565308,0.000174486121977679,-0.819052934646606,
+0.573073506355286,0.0230355337262154,-0.819180011749268,0.60798841714859,0.000997279770672321,-0.7939453125,-0.573705315589905,-0.000173929744050838,0.819061636924744,-0.607998132705688,-0.000988467014394701,0.793937683105469,-0.573069989681244,-0.0230608135461807,0.819181978702545,-0.573705315589905,-0.000173929744050838,0.819061636924744,-0.573069989681244,-0.0230608135461807,0.819181978702545,-0.538337409496307,-0.000971822126302868,0.842728734016418,0.500149011611938,0.000418230716604739,-0.865939140319824,0.462260723114014,0.000992326647974551,-0.886743426322937,0.499047607183456,0.0362859182059765,-0.865814507007599,0.500149011611938,0.000418230716604739,-0.865939140319824,0.499047607183456,0.0362859182059765,-0.865814507007599,0.537014782428741,0.00100837636273354,-0.84357225894928,-0.50012868642807,-0.000412454508477822,0.8659508228302,-0.537014722824097,-0.00100110180210322,0.843572318553925,-0.499045848846436,-0.0361604206264019,0.865820825099945,-0.50012868642807,-0.000412454508477822,0.8659508228302,-0.499045848846436,-0.0361604206264019,0.865820825099945,-0.462261557579041,-0.000978866359218955,0.886743128299713,0.422732502222061,0.000203691961360164,-0.906254410743713,0.38385745882988,0.00108430103864521,-0.92339164018631,0.422118037939072,0.0242889747023582,-0.906215369701386,0.422732502222061,0.000203691961360164,-0.906254410743713,0.422118037939072,0.0242889747023582,-0.906215369701386,0.46078297495842,0.0011021348182112,-0.88751208782196,-0.422717064619064,-0.000202155963052064,0.906261622905731,-0.460802644491196,-0.00108629977330565,0.887502014636993,-0.422112256288528,-0.0243196655064821,0.906217217445374,-0.422717064619064,-0.000202155963052064,0.906261622905731,-0.422112256288528,-0.0243196655064821,0.906217217445374,-0.383839637041092,-0.0010699441190809,0.923399090766907,0.342132270336151,0.000486210134113207,-0.939651727676392,0.301201343536377,0.00104877783451229,-0.953559935092926,0.3411625623703,0.0391793847084045,-0.939187467098236,0.342132270336151,0.000486210134113207,-0.939651727676392,
+0.3411625623703,0.0391793847084045,-0.939187467098236,0.38234880566597,0.00106282799970359,-0.924017369747162,-0.342111021280289,-0.000477634341223165,0.939659357070923,-0.382351249456406,-0.00105047121178359,0.924016416072845,-0.341161400079727,-0.0390057191252708,0.939195096492767,-0.342111021280289,-0.000477634341223165,0.939659357070923,-0.341161400079727,-0.0390057191252708,0.939195096492767,-0.301198542118073,-0.00103593873791397,0.953560769557953,0.258893400430679,0.000231088371947408,-0.965905725955963,0.217701762914658,0.0011836924823001,-0.97601455450058,0.258441656827927,0.0253688059747219,-0.965693652629852,0.258893400430679,0.000231088371947408,-0.965905725955963,0.258441656827927,0.0253688059747219,-0.965693652629852,0.299574762582779,0.0011948118917644,-0.954071998596191,-0.25888004899025,-0.000228960256208666,0.965909421443939,-0.299597084522247,-0.00117788754869252,0.954064965248108,-0.258434951305389,-0.0254060681909323,0.96569436788559,-0.25888004899025,-0.000228960256208666,0.965909421443939,-0.258434951305389,-0.0254060681909323,0.96569436788559,-0.217677369713783,-0.00116334727499634,0.976020038127899,0.173708394169807,0.000541333865839988,-0.984796941280365,0.130986571311951,0.00109595316462219,-0.991383492946625,0.173126965761185,0.0414470694959164,-0.984026908874512,0.173708394169807,0.000541333865839988,-0.984796941280365,0.173126965761185,0.0414470694959164,-0.984026908874512,0.216061800718308,0.0011032031616196,-0.976379036903381,-0.173694118857384,-0.000530617660842836,0.98479950428009,-0.216063663363457,-0.00108678417745978,0.976378619670868,-0.173126697540283,-0.0412300266325474,0.984036147594452,-0.173694118857384,-0.000530617660842836,0.98479950428009,-0.173126697540283,-0.0412300266325474,0.984036147594452,-0.130984872579575,-0.00107876374386251,0.991383731365204,0.0871815755963326,0.000248495460255072,-0.996192395687103,0.0449124947190285,0.00124767702072859,-0.998990118503571,0.0870150774717331,0.0260103810578585,-0.995867311954498,0.0871815755963326,0.000248495460255072,-0.996192395687103,
+0.0870150774717331,0.0260103810578585,-0.995867311954498,0.12927708029747,0.00125267426483333,-0.99160772562027,-0.0871760025620461,-0.000246039213379845,0.996192753314972,-0.129304751753807,-0.00123025104403496,0.991604089736938,-0.0870119780302048,-0.026054572314024,0.995866417884827,-0.0871760025620461,-0.000246039213379845,0.996192753314972,-0.0870119780302048,-0.026054572314024,0.995866417884827,-0.0448841415345669,-0.0012244435492903,0.998991429805756,1.17230980478666e-008,0.000562945730052888,-0.999999821186066,-0.0431997291743755,0.00111542060039938,-0.999065756797791,1.19880610327527e-007,0.0423209592700005,-0.999104082584381,1.17230980478666e-008,0.000562945730052888,-0.999999821186066,1.19880610327527e-007,0.0423209592700005,-0.999104082584381,0.043199647217989,0.00111541769001633,-0.999065756797791,-8.76285852768888e-008,-0.000551345816347748,0.999999821186066,-0.0432011559605598,-0.00109732220880687,0.999065697193146,-1.35385903377028e-007,-0.0420839376747608,0.999114036560059,-8.76285852768888e-008,-0.000551345816347748,0.999999821186066,-1.35385903377028e-007,-0.0420839376747608,0.999114036560059,0.0432012267410755,-0.00109775760211051,0.999065637588501,-0.0871815085411072,0.000248433614615351,-0.996192395687103,-0.129277110099792,0.00125175097491592,-0.991607666015625,-0.0870143547654152,0.0260103438049555,-0.995867371559143,-0.0871815085411072,0.000248433614615351,-0.996192395687103,-0.0870143547654152,0.0260103438049555,-0.995867371559143,-0.0449125915765762,0.00124768249224871,-0.998990178108215,0.0871760323643684,-0.000246037408942357,0.996192753314972,0.0448841154575348,-0.00122483051382005,0.998991429805756,0.0870118960738182,-0.026053773239255,0.995866477489471,0.0871760323643684,-0.000246037408942357,0.996192753314972,0.0870118960738182,-0.026053773239255,0.995866477489471,0.129304796457291,-0.00123067211825401,0.991604089736938,-0.173708364367485,0.00054123398149386,-0.984796941280365,-0.216062128543854,0.00110320013482124,-0.976378917694092,-0.173127472400665,0.0414470806717873,-0.984026968479156,
+-0.173708364367485,0.00054123398149386,-0.984796941280365,-0.173127472400665,0.0414470806717873,-0.984026968479156,-0.130986660718918,0.00109501811675727,-0.991383373737335,0.173693999648094,-0.000530644960235804,0.98479950428009,0.130984857678413,-0.00107917352579534,0.991383671760559,0.173127800226212,-0.0412281304597855,0.984035968780518,0.173693999648094,-0.000530644960235804,0.98479950428009,0.173127800226212,-0.0412281304597855,0.984035968780518,0.216062963008881,-0.00108651397749782,0.976378798484802,-0.25889328122139,0.00023112483904697,-0.965905785560608,-0.299572914838791,0.00119721691589803,-0.954072594642639,-0.258442789316177,0.025368008762598,-0.965693414211273,-0.25889328122139,0.00023112483904697,-0.965905785560608,-0.258442789316177,0.025368008762598,-0.965693414211273,-0.217702135443687,0.00118364382069558,-0.976014494895935,0.258879840373993,-0.000228985954890959,0.965909421443939,0.21767657995224,-0.00116316566709429,0.976020216941834,0.258433550596237,-0.0254059247672558,0.965694844722748,0.258879840373993,-0.000228985954890959,0.965909421443939,0.258433550596237,-0.0254059247672558,0.965694844722748,0.299597084522247,-0.00117666774895042,0.954065144062042,-0.34213200211525,0.000486268632812425,-0.939651727676392,-0.382351160049438,0.00106450635939837,-0.924016416072845,-0.341161757707596,0.0391788966953754,-0.939187705516815,-0.34213200211525,0.000486268632812425,-0.939651727676392,-0.341161757707596,0.0391788966953754,-0.939187705516815,-0.301199406385422,0.00105119287036359,-0.953560531139374,0.342110991477966,-0.000477676192531362,0.939659357070923,0.301198601722717,-0.00103476224467158,0.953560709953308,0.341163694858551,-0.0390072986483574,0.939194083213806,0.342110991477966,-0.000477676192531362,0.939659357070923,0.341163694858551,-0.0390072986483574,0.939194083213806,0.382351160049438,-0.00105092476587743,0.92401647567749,-0.422732412815094,0.000203606527065858,-0.906254470348358,-0.460784375667572,0.00110203528311104,-0.887511372566223,-0.422117799520493,0.0242881625890732,-0.906215488910675,
+-0.422732412815094,0.000203606527065858,-0.906254470348358,-0.422117799520493,0.0242881625890732,-0.906215488910675,-0.383859694004059,0.00108595681376755,-0.923390746116638,0.422717124223709,-0.000202067123609595,0.906261503696442,0.38383936882019,-0.00107024807948619,0.923399329185486,0.422110944986343,-0.0243170969188213,0.906217813491821,0.422717124223709,-0.000202067123609595,0.906261503696442,0.422110944986343,-0.0243170969188213,0.906217813491821,0.460801750421524,-0.00108774390537292,0.887502372264862,-0.500148892402649,0.000418226496549323,-0.865939199924469,-0.537014484405518,0.00100671465042979,-0.843572378158569,-0.499046862125397,0.0362844876945019,-0.865814983844757,-0.500148892402649,0.000418226496549323,-0.865939199924469,-0.499046862125397,0.0362844876945019,-0.865814983844757,-0.462262123823166,0.000992285786196589,-0.8867427110672,0.500128626823425,-0.000411972694564611,0.86595094203949,0.462260663509369,-0.000980581389740109,0.886743545532227,0.49904653429985,-0.0361623391509056,0.865820229053497,0.500128626823425,-0.000411972694564611,0.86595094203949,0.49904653429985,-0.0361623391509056,0.865820229053497,0.537015438079834,-0.00100191065575928,0.843571782112122,-0.573718070983887,0.00017472033505328,-0.819052696228027,-0.607987761497498,0.000997181632556021,-0.793945670127869,-0.573073625564575,0.0230366475880146,-0.819179952144623,-0.573718070983887,0.00017472033505328,-0.819052696228027,-0.573073625564575,0.0230366475880146,-0.819179952144623,-0.538351953029633,0.000978345633484423,-0.842719316482544,0.573705196380615,-0.000173079664818943,0.819061696529388,0.5383380651474,-0.000972610607277602,0.842728316783905,0.573067963123322,-0.0230598505586386,0.81918329000473,0.573705196380615,-0.000173079664818943,0.819061696529388,0.573067963123322,-0.0230598505586386,0.81918329000473,0.607998311519623,-0.000988370040431619,0.793937742710114,-0.642951726913452,0.000354452669853345,-0.765906572341919,-0.675354897975922,0.000953109876718372,-0.737492144107819,-0.641916811466217,0.0334394052624702,-0.766044855117798,
+-0.642951726913452,0.000354452669853345,-0.765906572341919,-0.641916811466217,0.0334394052624702,-0.766044855117798,-0.609271824359894,0.000933478528168052,-0.792960822582245,0.642927646636963,-0.00036650785477832,0.765926659107208,0.609269022941589,-0.000926709559280425,0.792962968349457,0.641945540904999,-0.0333849042654037,0.76602303981781,0.642927646636963,-0.00036650785477832,0.765926659107208,0.641945540904999,-0.0333849042654037,0.76602303981781,0.675419449806213,-0.000955127004999667,0.737433075904846,-0.691341698169708,7.67282908782363e-005,-0.722527801990509,-0.706706941127777,0.000473292486276478,-0.707506060600281,-0.691372275352478,0.0109164593741298,-0.7224161028862,-0.691341698169708,7.67282908782363e-005,-0.722527801990509,-0.691372275352478,0.0109164593741298,-0.7224161028862,-0.67611563205719,0.000452834210591391,-0.73679530620575,0.691334187984467,-7.63541393098421e-005,0.722535014152527,0.67617392539978,-0.000458253372926265,0.736741781234741,0.691391050815582,-0.010900154709816,0.722398400306702,0.691334187984467,-7.63541393098421e-005,0.722535014152527,0.691391050815582,-0.010900154709816,0.722398400306702,0.706710398197174,-0.00045808037975803,0.707502782344818,-0.70710676908493,-1.48291519508348e-007,-0.707106649875641,-0.707106649875641,-3.3098917811003e-006,-0.70710676908493,-0.707106232643127,0,-0.707107186317444,-0.70710676908493,-1.48291519508348e-007,-0.707106649875641,-0.707106232643127,0,-0.707107186317444,-0.707105934619904,3.30935336023686e-006,-0.707107484340668,0.707091152667999,2.06680033443263e-005,0.707122266292572,0.707107901573181,9.92796321952483e-006,0.70710551738739,0.707106232643127,0,0.707107186317444,0.707091152667999,2.06680033443263e-005,0.707122266292572,0.707106232643127,0,0.707107186317444,0.707108199596405,0,0.707105278968811,-0.707106411457062,-1.8572363558178e-007,-0.707107067108154,-0.707106590270996,0,-0.707106947898865,-0.707108736038208,0,-0.707104742527008,-0.707106411457062,-1.8572363558178e-007,-0.707107067108154,-0.707108736038208,0,-0.707104742527008,
+-0.707106947898865,-3.26363942804164e-006,-0.707106530666351,0.707107722759247,-6.0464969919849e-008,0.707105755805969,0.707108199596405,0,0.707105278968811,0.707105457782745,0,0.707108020782471,0.707107722759247,-6.0464969919849e-008,0.707105755805969,0.707105457782745,0,0.707108020782471,0.707104623317719,-2.92431354864675e-006,0.707108795642853,0.642927646636963,-0.00036650785477832,0.765926659107208,0.691334187984467,-7.63541393098421e-005,0.722535014152527,0.691218376159668,-1.27734935517765e-007,0.722645878791809,0.642897427082062,-1.68050628417404e-005,0.765952169895172,0.707107901573181,9.92796321952483e-006,0.70710551738739,0.707091152667999,2.06680033443263e-005,0.707122266292572,0.691334187984467,-7.63541393098421e-005,0.722535014152527,0.706710398197174,-0.00045808037975803,0.707502782344818,0.707108199596405,0,0.707105278968811,0.707107722759247,-6.0464969919849e-008,0.707105755805969,0.707091152667999,2.06680033443263e-005,0.707122266292572,0.707108199596405,0,0.707105278968811,0.573705196380615,-0.000173079664818943,0.819061696529388,0.642927646636963,-0.00036650785477832,0.765926659107208,0.642897427082062,-1.68050628417404e-005,0.765952169895172,0.573690056800842,5.04443903537322e-007,0.819072365760803,0.500128626823425,-0.000411972694564611,0.86595094203949,0.573705196380615,-0.000173079664818943,0.819061696529388,0.573690056800842,5.04443903537322e-007,0.819072365760803,0.500099658966064,2.47287630372739e-007,0.865967810153961,0.422717124223709,-0.000202067123609595,0.906261503696442,0.500128626823425,-0.000411972694564611,0.86595094203949,0.500099658966064,2.47287630372739e-007,0.865967810153961,0.422701776027679,-4.03023427963944e-008,0.906268775463104,0.342110991477966,-0.000477676192531362,0.939659357070923,0.422717124223709,-0.000202067123609595,0.906261503696442,0.422701776027679,-4.03023427963944e-008,0.906268775463104,0.34208670258522,2.35801049797146e-008,0.939668416976929,0.258879840373993,-0.000228985954890959,0.965909421443939,0.342110991477966,-0.000477676192531362,0.939659357070923,
+0.34208670258522,2.35801049797146e-008,0.939668416976929,0.258868128061295,-3.64436161248705e-008,0.965912699699402,0.173693999648094,-0.000530644960235804,0.98479950428009,0.258879840373993,-0.000228985954890959,0.965909421443939,0.258868128061295,-3.64436161248705e-008,0.965912699699402,0.173680230975151,-5.85019712673329e-008,0.984802067279816,0.0871760323643684,-0.000246037408942357,0.996192753314972,0.173693999648094,-0.000530644960235804,0.98479950428009,0.173680230975151,-5.85019712673329e-008,0.984802067279816,0.0871715843677521,-3.00963201027571e-008,0.996193289756775,-8.76285852768888e-008,-0.000551345816347748,0.999999821186066,0.0871760323643684,-0.000246037408942357,0.996192753314972,0.0871715843677521,-3.00963201027571e-008,0.996193289756775,-1.0000957217926e-007,-6.4408808952976e-008,0.999999940395355,-0.0871760025620461,-0.000246039213379845,0.996192753314972,-8.76285852768888e-008,-0.000551345816347748,0.999999821186066,-1.0000957217926e-007,-6.4408808952976e-008,0.999999940395355,-0.0871715396642685,-3.88369088000218e-008,0.99619323015213,-0.173694118857384,-0.000530617660842836,0.98479950428009,-0.0871760025620461,-0.000246039213379845,0.996192753314972,-0.0871715396642685,-3.88369088000218e-008,0.99619323015213,-0.173680335283279,-6.93965063192081e-009,0.984802067279816,-0.25888004899025,-0.000228960256208666,0.965909421443939,-0.173694118857384,-0.000530617660842836,0.98479950428009,-0.173680335283279,-6.93965063192081e-009,0.984802067279816,-0.258868306875229,1.33019160131198e-008,0.965912580490112,-0.342111021280289,-0.000477634341223165,0.939659357070923,-0.25888004899025,-0.000228960256208666,0.965909421443939,-0.258868306875229,1.33019160131198e-008,0.965912580490112,-0.342086791992188,7.76351427589361e-008,0.939668297767639,-0.422717064619064,-0.000202155963052064,0.906261622905731,-0.342111021280289,-0.000477634341223165,0.939659357070923,-0.342086791992188,7.76351427589361e-008,0.939668297767639,-0.42270165681839,-1.45473251222938e-007,0.906268835067749,-0.50012868642807,-0.000412454508477822,0.8659508228302,
+-0.422717064619064,-0.000202155963052064,0.906261622905731,-0.42270165681839,-1.45473251222938e-007,0.906268835067749,-0.500099658966064,-3.89354511298734e-007,0.865967929363251,-0.573705315589905,-0.000173929744050838,0.819061636924744,-0.50012868642807,-0.000412454508477822,0.8659508228302,-0.500099658966064,-3.89354511298734e-007,0.865967929363251,-0.573690235614777,-3.89684430501802e-007,0.819072246551514,-0.642901122570038,-0.000334645999828354,0.765949010848999,-0.573705315589905,-0.000173929744050838,0.819061636924744,-0.573690235614777,-3.89684430501802e-007,0.819072246551514,-0.64288991689682,1.71349729498615e-005,0.765958607196808,-0.69128429889679,-7.61363044148311e-005,0.722582817077637,-0.642901122570038,-0.000334645999828354,0.765949010848999,-0.64288991689682,1.71349729498615e-005,0.765958607196808,-0.691309571266174,3.18763341056183e-007,0.722558677196503,-0.707085013389587,-2.146810402337e-005,0.707128524780273,-0.69128429889679,-7.61363044148311e-005,0.722582817077637,-0.691309571266174,3.18763341056183e-007,0.722558677196503,-0.707074046134949,-3.52495226252358e-005,0.707139372825623,-0.707079529762268,-2.94031415251084e-005,0.707133829593658,-0.70710700750351,-2.43422903167811e-007,0.707106411457062,-0.707085013389587,-2.146810402337e-005,0.707128524780273,-0.707079529762268,-2.94031415251084e-005,0.707133829593658,-0.707107067108154,0,0.707106411457062,0.707107186317444,3.69263972288536e-007,-0.707106292247772,0.707104623317719,1.26040858958731e-005,-0.707108855247498,0.707107186317444,4.21694664964889e-007,-0.707106232643127,0.707106590270996,1.42274672043641e-007,-0.707106828689575,0.707107186317444,3.69263972288536e-007,-0.707106292247772,0.707107186317444,4.21694664964889e-007,-0.707106232643127,0.707107245922089,4.2230837493662e-007,-0.707106232643127,0.707106590270996,1.58592484922337e-007,-0.70710688829422,0.691347479820251,7.67118253861554e-005,-0.72252231836319,0.707106590270996,1.42274672043641e-007,-0.707106828689575,0.707106590270996,1.58592484922337e-007,-0.70710688829422,0.691306948661804,-6.20872029344355e-008,-0.722561120986938,
+0.642951726913452,0.000354087329469621,-0.765906572341919,0.691347479820251,7.67118253861554e-005,-0.72252231836319,0.691306948661804,-6.20872029344355e-008,-0.722561120986938,0.64292186498642,-1.90611118000561e-007,-0.765931725502014,0.573717832565308,0.000174486121977679,-0.819052934646606,0.642951726913452,0.000354087329469621,-0.765906572341919,0.64292186498642,-1.90611118000561e-007,-0.765931725502014,0.573704659938812,-1.29539387216937e-007,-0.819062173366547,0.500149011611938,0.000418230716604739,-0.865939140319824,0.573717832565308,0.000174486121977679,-0.819052934646606,0.573704659938812,-1.29539387216937e-007,-0.819062173366547,0.500116527080536,0,-0.865958094596863,0.422732502222061,0.000203691961360164,-0.906254410743713,0.500149011611938,0.000418230716604739,-0.865939140319824,0.500116527080536,0,-0.865958094596863,0.422719746828079,6.01355694129779e-008,-0.906260371208191,0.342132270336151,0.000486210134113207,-0.939651727676392,0.422732502222061,0.000203691961360164,-0.906254410743713,0.422719746828079,6.01355694129779e-008,-0.906260371208191,0.342104315757751,6.69619311111092e-008,-0.939661860466003,0.258893400430679,0.000231088371947408,-0.965905725955963,0.342132270336151,0.000486210134113207,-0.939651727676392,0.342104315757751,6.69619311111092e-008,-0.939661860466003,0.258883982896805,1.03053761080218e-008,-0.965908408164978,0.173708394169807,0.000541333865839988,-0.984796941280365,0.258893400430679,0.000231088371947408,-0.965905725955963,0.258883982896805,1.03053761080218e-008,-0.965908408164978,0.173692211508751,9.04889319031099e-009,-0.984799861907959,0.0871815755963326,0.000248495460255072,-0.996192395687103,0.173708394169807,0.000541333865839988,-0.984796941280365,0.173692211508751,9.04889319031099e-009,-0.984799861907959,0.0871780663728714,5.56990009670244e-009,-0.996192693710327,1.17230980478666e-008,0.000562945730052888,-0.999999821186066,0.0871815755963326,0.000248495460255072,-0.996192395687103,0.0871780663728714,5.56990009670244e-009,-0.996192693710327,4.0552299296337e-009,3.81500603677254e-012,-0.999999940395355,
+-0.0871815085411072,0.000248433614615351,-0.996192395687103,1.17230980478666e-008,0.000562945730052888,-0.999999821186066,4.0552299296337e-009,3.81500603677254e-012,-0.999999940395355,-0.0871779918670654,-4.3997662402262e-008,-0.996192693710327,-0.173708364367485,0.00054123398149386,-0.984796941280365,-0.0871815085411072,0.000248433614615351,-0.996192395687103,-0.0871779918670654,-4.3997662402262e-008,-0.996192693710327,-0.173692137002945,-6.94812172241654e-008,-0.984799861907959,-0.25889328122139,0.00023112483904697,-0.965905785560608,-0.173708364367485,0.00054123398149386,-0.984796941280365,-0.173692137002945,-6.94812172241654e-008,-0.984799861907959,-0.25888380408287,1.63037086053919e-008,-0.965908408164978,-0.34213200211525,0.000486268632812425,-0.939651727676392,-0.25889328122139,0.00023112483904697,-0.965905785560608,-0.25888380408287,1.63037086053919e-008,-0.965908408164978,-0.342104107141495,-7.59015961193654e-009,-0.939662039279938,-0.422732412815094,0.000203606527065858,-0.906254470348358,-0.34213200211525,0.000486268632812425,-0.939651727676392,-0.342104107141495,-7.59015961193654e-009,-0.939662039279938,-0.422719538211823,-4.93736322937366e-008,-0.906260371208191,-0.500148892402649,0.000418226496549323,-0.865939199924469,-0.422732412815094,0.000203606527065858,-0.906254470348358,-0.422719538211823,-4.93736322937366e-008,-0.906260371208191,-0.500116288661957,7.42986401292001e-008,-0.865958154201508,-0.573718070983887,0.00017472033505328,-0.819052696228027,-0.500148892402649,0.000418226496549323,-0.865939199924469,-0.500116288661957,7.42986401292001e-008,-0.865958154201508,-0.573704898357391,1.35362668629568e-007,-0.819061934947968,-0.642951726913452,0.000354452669853345,-0.765906572341919,-0.573718070983887,0.00017472033505328,-0.819052696228027,-0.573704898357391,1.35362668629568e-007,-0.819061934947968,-0.642921924591064,6.10663164479774e-008,-0.76593154668808,-0.691341698169708,7.67282908782363e-005,-0.722527801990509,-0.642951726913452,0.000354452669853345,-0.765906572341919,-0.642921924591064,6.10663164479774e-008,-0.76593154668808,
+-0.691300690174103,-1.29587292008182e-007,-0.722567141056061,-0.70710676908493,-1.48291519508348e-007,-0.707106649875641,-0.691341698169708,7.67282908782363e-005,-0.722527801990509,-0.691300690174103,-1.29587292008182e-007,-0.722567141056061,-0.707107186317444,-2.63816531287375e-007,-0.707106292247772,-0.70710700750351,-2.1568841646058e-007,-0.707106411457062,-0.707106411457062,-1.8572363558178e-007,-0.707107067108154,-0.70710676908493,-1.48291519508348e-007,-0.707106649875641,-0.70710700750351,-2.1568841646058e-007,-0.707106411457062,-0.707106232643127,0,-0.707107245922089,0,0.999999940395355,0,0,0.999999940395355,0,0,0.999999940395355,3.72259762571048e-007,0,0.999999940395355,2.54727126502985e-007,-0.707106828689575,0,-0.707106590270996,-0.70710676908493,0,-0.70710676908493,-0.707106590270996,0,-0.707106947898865,-0.707106411457062,-1.8572363558178e-007,-0.707107067108154,0.707104921340942,-3.39268603966048e-006,0.707108557224274,0.707107841968536,0,0.70710563659668,0.707107722759247,-6.0464969919849e-008,0.707105755805969,0.707104980945587,-3.45451667271846e-006,0.707108497619629,0.707104921340942,-3.39268603966048e-006,0.707108557224274,0.707107722759247,-6.0464969919849e-008,0.707105755805969,0.707104623317719,-2.92431354864675e-006,0.707108795642853,-0.707106232643127,0,-0.707107245922089,-0.707106828689575,0,-0.707106590270996,-0.707106411457062,-1.8572363558178e-007,-0.707107067108154,0.148031264543533,-0.94388473033905,0.29524302482605,0.148031279444695,-0.94388473033905,0.29524302482605,0.100992575287819,-0.974283337593079,0.201425895094872,0.115416444838047,-0.966276109218597,0.230193823575974,0.707104623317719,1.28874571601045e-005,-0.707108914852142,0.707104623317719,1.26040858958731e-005,-0.707108855247498,0.707107186317444,3.69263972288536e-007,-0.707106292247772,0.707104980945587,1.05163881016779e-005,-0.707108438014984,-0.707105278968811,-5.42237103218213e-006,0.70710813999176,-0.707105398178101,-5.46179126104107e-006,0.707108080387115,-0.707105100154877,-3.95148617826635e-006,0.707108438014984,-0.70710700750351,-2.43422903167811e-007,0.707106411457062,
+-0.707107067108154,0,0.707106411457062,-0.707105278968811,-5.42237103218213e-006,0.70710813999176,-0.70710700750351,-2.43422903167811e-007,0.707106411457062,-0.482682675123215,-0.707144021987915,0.516686320304871,-0.482623934745789,-0.707143485546112,0.516741812229156,-0.462678164243698,-0.704149782657623,0.538610994815826,-0.46243742108345,-0.704122722148895,0.538853108882904,-0.482623934745789,-0.707143485546112,0.516741812229156,-0.482682675123215,-0.707144021987915,0.516686320304871,-0.45150950551033,-0.707460343837738,0.543726861476898,-0.451509594917297,-0.707460343837738,0.543726742267609,-0.451509594917297,-0.707460343837738,0.543726742267609,-0.45150950551033,-0.707460343837738,0.543726861476898,-0.399398028850555,-0.707483649253845,0.583050608634949,-0.399397999048233,-0.70748370885849,0.583050489425659,-0.399397999048233,-0.70748370885849,0.583050489425659,-0.399398028850555,-0.707483649253845,0.583050608634949,-0.343898296356201,-0.707483470439911,0.617414653301239,-0.343898624181747,-0.707483470439911,0.617414534091949,-0.343898624181747,-0.707483470439911,0.617414534091949,-0.343898296356201,-0.707483470439911,0.617414653301239,-0.285463899374008,-0.707486212253571,0.646508693695068,-0.285463809967041,-0.707486212253571,0.646508693695068,-0.285463809967041,-0.707486212253571,0.646508693695068,-0.285463899374008,-0.707486212253571,0.646508693695068,-0.224593043327332,-0.70749032497406,0.670085966587067,-0.224592909216881,-0.707490384578705,0.670085906982422,-0.224592909216881,-0.707490384578705,0.670085906982422,-0.224593043327332,-0.70749032497406,0.670085966587067,-0.161805525422096,-0.707488656044006,0.68795245885849,-0.161805331707001,-0.707488715648651,0.687952518463135,-0.161805331707001,-0.707488715648651,0.687952518463135,-0.161805525422096,-0.707488656044006,0.68795245885849,-0.0976394414901733,-0.70748645067215,0.699949502944946,-0.0976395085453987,-0.707486510276794,0.699949502944946,-0.0976395085453987,-0.707486510276794,0.699949502944946,-0.0976394414901733,-0.70748645067215,0.699949502944946,
+-0.0326396077871323,-0.707483053207397,0.705976128578186,-0.0326395854353905,-0.707483053207397,0.705976188182831,-0.0326395854353905,-0.707483053207397,0.705976188182831,-0.0326396077871323,-0.707483053207397,0.705976128578186,0.032639604061842,-0.707479774951935,0.705979406833649,0.0326395742595196,-0.707479774951935,0.705979406833649,0.0326395742595196,-0.707479774951935,0.705979406833649,0.032639604061842,-0.707479774951935,0.705979406833649,0.0976391211152077,-0.707483351230621,0.699952721595764,0.0976391807198524,-0.707483351230621,0.699952602386475,0.0976391807198524,-0.707483351230621,0.699952602386475,0.0976391211152077,-0.707483351230621,0.699952721595764,0.16180545091629,-0.707489252090454,0.687951862812042,0.161805257201195,-0.707489311695099,0.687951922416687,0.161805257201195,-0.707489311695099,0.687951922416687,0.16180545091629,-0.707489252090454,0.687951862812042,0.224591940641403,-0.707493960857391,0.670082449913025,0.224591851234436,-0.707493960857391,0.670082569122314,0.224591851234436,-0.707493960857391,0.670082569122314,0.224591940641403,-0.707493960857391,0.670082449913025,0.285461872816086,-0.707491099834442,0.646504282951355,0.285461813211441,-0.707490980625153,0.646504282951355,0.285461813211441,-0.707490980625153,0.646504282951355,0.285461872816086,-0.707491099834442,0.646504282951355,0.343897521495819,-0.70748507976532,0.617413282394409,0.343897819519043,-0.707485139369965,0.617413103580475,0.343897819519043,-0.707485139369965,0.617413103580475,0.343897521495819,-0.70748507976532,0.617413282394409,0.399399816989899,-0.707480490207672,0.583053231239319,0.399399727582932,-0.707480490207672,0.583053171634674,0.399399727582932,-0.707480490207672,0.583053171634674,0.399399816989899,-0.707480490207672,0.583053231239319,0.451515674591064,-0.707450687885284,0.543734431266785,0.451515734195709,-0.70745062828064,0.54373425245285,0.451515734195709,-0.70745062828064,0.54373425245285,0.451515674591064,-0.707450687885284,0.543734431266785,0.482688874006271,-0.707135140895844,0.516692578792572,0.482630282640457,-0.707134485244751,0.516748130321503,
+0.482630282640457,-0.707134485244751,0.516748130321503,0.482688874006271,-0.707135140895844,0.516692578792572,0.462436616420746,-0.704123079776764,0.538853347301483,0.462677359580994,-0.704150140285492,0.53861129283905,-0.491028189659119,0.707340955734253,0.508487939834595,-0.490713685750961,0.707341492176056,0.508790612220764,-0.555838882923126,0.702130615711212,0.445034384727478,-0.555629551410675,0.702163457870483,0.445243865251541,-0.490713685750961,0.707341492176056,0.508790612220764,-0.491028189659119,0.707340955734253,0.508487939834595,-0.45145457983017,0.707544207572937,0.543663322925568,-0.451454341411591,0.707544267177582,0.543663561344147,-0.451454341411591,0.707544267177582,0.543663561344147,-0.45145457983017,0.707544207572937,0.543663322925568,-0.399400293827057,0.707484781742096,0.583047747612,-0.399400293827057,0.707484781742096,0.583047688007355,-0.399400293827057,0.707484781742096,0.583047688007355,-0.399400293827057,0.707484781742096,0.583047747612,-0.343899607658386,0.707481861114502,0.617415845394135,-0.34389927983284,0.707481861114502,0.617416083812714,-0.34389927983284,0.707481861114502,0.617416083812714,-0.343899607658386,0.707481861114502,0.617415845394135,-0.285463780164719,0.707486271858215,0.646508753299713,-0.285463839769363,0.707486212253571,0.646508693695068,-0.285463839769363,0.707486212253571,0.646508693695068,-0.285463780164719,0.707486271858215,0.646508753299713,-0.224591076374054,0.707484245300293,0.670093059539795,-0.224591165781021,0.707484185695648,0.67009311914444,-0.224591165781021,0.707484185695648,0.67009311914444,-0.224591076374054,0.707484245300293,0.670093059539795,-0.161803752183914,0.707482635974884,0.687959134578705,-0.161803960800171,0.707482576370239,0.687959134578705,-0.161803960800171,0.707482576370239,0.687959134578705,-0.161803752183914,0.707482635974884,0.687959134578705,-0.0976390838623047,0.707483410835266,0.699952602386475,-0.0976390168070793,0.707483410835266,0.699952602386475,-0.0976390168070793,0.707483410835266,0.699952602386475,-0.0976390838623047,0.707483410835266,0.699952602386475,
+-0.0326393321156502,0.707476556301117,0.705982565879822,-0.0326393581926823,0.707476556301117,0.705982565879822,-0.0326393581926823,0.707476556301117,0.705982565879822,-0.0326393321156502,0.707476556301117,0.705982565879822,0.0326395034790039,0.70747983455658,0.705979347229004,0.0326395332813263,0.70747983455658,0.705979287624359,0.0326395332813263,0.70747983455658,0.705979287624359,0.0326395034790039,0.70747983455658,0.705979347229004,0.0976397171616554,0.707486629486084,0.699949264526367,0.0976396501064301,0.707486569881439,0.699949324131012,0.0976396501064301,0.707486569881439,0.699949324131012,0.0976397171616554,0.707486629486084,0.699949264526367,0.161803841590881,0.707482576370239,0.687959134578705,0.161804065108299,0.707482576370239,0.68795907497406,0.161804065108299,0.707482576370239,0.68795907497406,0.161803841590881,0.707482576370239,0.687959134578705,0.224590092897415,0.707487523555756,0.670090019702911,0.224590212106705,0.707487463951111,0.670089960098267,0.224590212106705,0.707487463951111,0.670089960098267,0.224590092897415,0.707487523555756,0.670090019702911,0.28546130657196,0.70748645067215,0.64650958776474,0.285461366176605,0.70748645067215,0.646509408950806,0.285461366176605,0.70748645067215,0.646509408950806,0.28546130657196,0.70748645067215,0.64650958776474,0.343898177146912,0.707479059696198,0.617419958114624,0.343897759914398,0.707479000091553,0.617420077323914,0.343897759914398,0.707479000091553,0.617420077323914,0.343898177146912,0.707479059696198,0.617419958114624,0.399403661489487,0.707484185695648,0.583046019077301,0.399403691291809,0.707484185695648,0.583045959472656,0.399403691291809,0.707484185695648,0.583045959472656,0.399403661489487,0.707484185695648,0.583046019077301,0.451460331678391,0.707540273666382,0.543663859367371,0.451460063457489,0.707540214061737,0.543664038181305,0.451460063457489,0.707540214061737,0.543664038181305,0.451460331678391,0.707540273666382,0.543663859367371,0.491029798984528,0.70733505487442,0.508494436740875,0.490715384483337,0.707335591316223,0.5087970495224,
+0.490715384483337,0.707335591316223,0.5087970495224,0.491029798984528,0.70733505487442,0.508494436740875,0.555630207061768,0.702166140079498,0.445238828659058,0.555839478969574,0.702133297920227,0.445029199123383,0.492509990930557,0.684213042259216,-0.537853479385376,0.492175161838531,0.686408638954163,-0.535356521606445,0.48941445350647,0.689920663833618,-0.533369302749634,0.45203822851181,0.691637694835663,-0.563292682170868,0.444328039884567,0.702110469341278,-0.556428968906403,0.451279312372208,0.707483410835266,-0.543888032436371,0.45127934217453,0.707483410835266,-0.543887794017792,0.399398952722549,0.707484126091003,-0.583049297332764,0.399398982524872,0.707484185695648,-0.583049297332764,0.399398982524872,0.707484185695648,-0.583049297332764,0.399398952722549,0.707484126091003,-0.583049297332764,0.343897670507431,0.707486629486084,-0.617411553859711,0.343897700309753,0.707486629486084,-0.617411434650421,0.343897700309753,0.707486629486084,-0.617411434650421,0.343897670507431,0.707486629486084,-0.617411553859711,0.285462141036987,0.707481145858765,-0.646515071392059,0.285462111234665,0.707481145858765,-0.646515071392059,0.285462111234665,0.707481145858765,-0.646515071392059,0.285462141036987,0.707481145858765,-0.646515071392059,0.224592670798302,0.707483351230621,-0.670093595981598,0.224592655897141,0.707483291625977,-0.670093595981598,0.224592655897141,0.707483291625977,-0.670093595981598,0.224592670798302,0.707483351230621,-0.670093595981598,0.16180631518364,0.707487761974335,-0.687953293323517,0.161806464195251,0.70748770236969,-0.687953233718872,0.161806464195251,0.70748770236969,-0.687953233718872,0.16180631518364,0.707487761974335,-0.687953293323517,0.0976399630308151,0.70748895406723,-0.699946880340576,0.0976398959755898,0.70748895406723,-0.699946939945221,0.0976398959755898,0.70748895406723,-0.699946939945221,0.0976399630308151,0.70748895406723,-0.699946880340576,0.0326396860182285,0.707491099834442,-0.705968081951141,0.0326397009193897,0.707491040229797,-0.705968081951141,0.0326397009193897,0.707491040229797,-0.705968081951141,
+0.0326396860182285,0.707491099834442,-0.705968081951141,-0.0326396822929382,0.70748770236969,-0.705971479415894,-0.0326397009193897,0.70748770236969,-0.705971479415894,-0.0326397009193897,0.70748770236969,-0.705971479415894,-0.0326396822929382,0.70748770236969,-0.705971479415894,-0.0976395159959793,0.707485616207123,-0.699950337409973,-0.0976394489407539,0.707485556602478,-0.699950397014618,-0.0976394489407539,0.707485556602478,-0.699950397014618,-0.0976395159959793,0.707485616207123,-0.699950337409973,-0.161806434392929,0.70748770236969,-0.687953293323517,-0.161806598305702,0.70748770236969,-0.687953174114227,-0.161806598305702,0.70748770236969,-0.687953174114227,-0.161806434392929,0.70748770236969,-0.687953293323517,-0.224592253565788,0.707485020160675,-0.670091986656189,-0.224592268466949,0.707485020160675,-0.670091986656189,-0.224592268466949,0.707485020160675,-0.670091986656189,-0.224592253565788,0.707485020160675,-0.670091986656189,-0.285460650920868,0.707484424114227,-0.646512091159821,-0.285460650920868,0.707484364509583,-0.646512150764465,-0.285460650920868,0.707484364509583,-0.646512150764465,-0.285460650920868,0.707484424114227,-0.646512091159821,-0.343896865844727,0.707488298416138,-0.617410004138947,-0.343896925449371,0.707488238811493,-0.617409944534302,-0.343896925449371,0.707488238811493,-0.617409944534302,-0.343896865844727,0.707488298416138,-0.617410004138947,-0.399399161338806,0.707484066486359,-0.583049297332764,-0.399399131536484,0.707484126091003,-0.583049237728119,-0.399399131536484,0.707484126091003,-0.583049237728119,-0.399399161338806,0.707484066486359,-0.583049297332764,-0.451279908418655,0.707477390766144,-0.543895244598389,-0.451279759407043,0.707477390766144,-0.543895304203033,-0.451279759407043,0.707477390766144,-0.543895304203033,-0.451279908418655,0.707477390766144,-0.543895244598389,-0.492512315511703,0.684202611446381,-0.537864506244659,-0.672601997852325,0.0576485246419907,-0.737755477428436,0.485205411911011,-0.707231462001801,-0.514197587966919,0.485205441713333,-0.707231462001801,-0.514197647571564,
+0.538861453533173,-0.704083323478699,-0.462487757205963,0.538620114326477,-0.704109966754913,-0.462728232145309,0.485205441713333,-0.707231462001801,-0.514197647571564,0.485205411911011,-0.707231462001801,-0.514197587966919,0.451475888490677,-0.707506239414215,-0.543695092201233,0.451475918292999,-0.707506239414215,-0.543694913387299,0.451475918292999,-0.707506239414215,-0.543694913387299,0.451475888490677,-0.707506239414215,-0.543695092201233,0.399399042129517,-0.707484126091003,-0.583049237728119,0.399399042129517,-0.707484126091003,-0.583049297332764,0.399399042129517,-0.707484126091003,-0.583049297332764,0.399399042129517,-0.707484126091003,-0.583049237728119,0.343897670507431,-0.707486569881439,-0.617411494255066,0.343897610902786,-0.707486569881439,-0.617411613464355,0.343897610902786,-0.707486569881439,-0.617411613464355,0.343897670507431,-0.707486569881439,-0.617411494255066,0.285463213920593,-0.707484126091003,-0.646511256694794,0.285463213920593,-0.707484126091003,-0.646511256694794,0.285463213920593,-0.707484126091003,-0.646511256694794,0.285463213920593,-0.707484126091003,-0.646511256694794,0.224592715501785,-0.707483291625977,-0.670093536376953,0.224592760205269,-0.707483351230621,-0.670093536376953,0.224592760205269,-0.707483351230621,-0.670093536376953,0.224592715501785,-0.707483291625977,-0.670093536376953,0.161806359887123,-0.70748770236969,-0.687953233718872,0.161806181073189,-0.707487761974335,-0.687953233718872,0.161806181073189,-0.707487761974335,-0.687953233718872,0.161806359887123,-0.70748770236969,-0.687953233718872,0.0976390540599823,-0.707482278347015,-0.69995379447937,0.0976391285657883,-0.707482278347015,-0.69995379447937,0.0976391285657883,-0.707482278347015,-0.69995379447937,0.0976390540599823,-0.707482278347015,-0.69995379447937,0.0326391458511353,-0.707477629184723,-0.705981552600861,0.0326391309499741,-0.707477688789368,-0.705981552600861,0.0326391309499741,-0.707477688789368,-0.705981552600861,0.0326391458511353,-0.707477629184723,-0.705981552600861,-0.0326393321156502,-0.707481026649475,-0.705978155136108,
+-0.0326393060386181,-0.707481026649475,-0.705978155136108,-0.0326393060386181,-0.707481026649475,-0.705978155136108,-0.0326393321156502,-0.707481026649475,-0.705978155136108,-0.0976395606994629,-0.707485616207123,-0.699950397014618,-0.0976396203041077,-0.707485616207123,-0.699950337409973,-0.0976396203041077,-0.707485616207123,-0.699950337409973,-0.0976395606994629,-0.707485616207123,-0.699950397014618,-0.161806508898735,-0.70748770236969,-0.687953233718872,-0.161806344985962,-0.70748770236969,-0.687953293323517,-0.161806344985962,-0.70748770236969,-0.687953293323517,-0.161806508898735,-0.70748770236969,-0.687953233718872,-0.224592357873917,-0.70748496055603,-0.670091867446899,-0.224592357873917,-0.707485020160675,-0.670091986656189,-0.224592357873917,-0.707485020160675,-0.670091986656189,-0.224592357873917,-0.70748496055603,-0.670091867446899,-0.285461902618408,-0.707487404346466,-0.64650821685791,-0.285461962223053,-0.707487463951111,-0.64650821685791,-0.285461962223053,-0.707487463951111,-0.64650821685791,-0.285461902618408,-0.707487404346466,-0.64650821685791,-0.343896865844727,-0.707488238811493,-0.617410063743591,-0.343896836042404,-0.707488238811493,-0.617410123348236,-0.343896836042404,-0.707488238811493,-0.617410123348236,-0.343896865844727,-0.707488238811493,-0.617410063743591,-0.399399310350418,-0.707484126091003,-0.583049178123474,-0.399399250745773,-0.707484126091003,-0.583049178123474,-0.399399250745773,-0.707484126091003,-0.583049178123474,-0.399399310350418,-0.707484126091003,-0.583049178123474,-0.451476335525513,-0.707500338554382,-0.543702244758606,-0.451476484537125,-0.707500338554382,-0.543702304363251,-0.451476484537125,-0.707500338554382,-0.543702304363251,-0.451476335525513,-0.707500338554382,-0.543702244758606,-0.48520627617836,-0.707219898700714,-0.514212667942047,-0.485206335783005,-0.707219898700714,-0.514212608337402,-0.485206335783005,-0.707219898700714,-0.514212608337402,-0.48520627617836,-0.707219898700714,-0.514212667942047,-0.538620173931122,-0.704100966453552,-0.462741851806641,-0.538861453533173,-0.704074323177338,-0.462501347064972,
+-0.490708649158478,-0.707344949245453,0.508790791034698,-0.491022944450378,-0.707344353199005,0.508488237857819,-0.555616497993469,-0.702168345451355,0.445252478122711,-0.555825233459473,-0.702135622501373,0.445043534040451,-0.491022944450378,-0.707344353199005,0.508488237857819,-0.490708649158478,-0.707344949245453,0.508790791034698,-0.451454043388367,-0.707546710968018,0.543660521507263,-0.451454281806946,-0.707546710968018,0.543660342693329,-0.451454281806946,-0.707546710968018,0.543660342693329,-0.451454043388367,-0.707546710968018,0.543660521507263,-0.399396270513535,-0.707487523555756,0.583046972751617,-0.399396300315857,-0.7074875831604,0.583047091960907,-0.399396300315857,-0.7074875831604,0.583047091960907,-0.399396270513535,-0.707487523555756,0.583046972751617,-0.343895494937897,-0.707488059997559,0.617411077022552,-0.343895763158798,-0.707488000392914,0.617410957813263,-0.343895763158798,-0.707488000392914,0.617410957813263,-0.343895494937897,-0.707488059997559,0.617411077022552,-0.285460829734802,-0.707489311695099,0.646506726741791,-0.28546068072319,-0.707489311695099,0.646506726741791,-0.28546068072319,-0.707489311695099,0.646506726741791,-0.285460829734802,-0.707489311695099,0.646506726741791,-0.224590182304382,-0.707492232322693,0.670084953308105,-0.224590063095093,-0.707492232322693,0.670085072517395,-0.224590063095093,-0.707492232322693,0.670085072517395,-0.224590182304382,-0.707492232322693,0.670084953308105,-0.161804422736168,-0.707492291927338,0.687948942184448,-0.161804184317589,-0.707492291927338,0.687949001789093,-0.161804184317589,-0.707492291927338,0.687949001789093,-0.161804422736168,-0.707492291927338,0.687948942184448,-0.0976386591792107,-0.707485198974609,0.699950873851776,-0.0976388975977898,-0.707485258579254,0.699950814247131,-0.0976388975977898,-0.707485258579254,0.699950814247131,-0.0976386591792107,-0.707485198974609,0.699950873851776,-0.0326391533017159,-0.707480251789093,0.70597892999649,-0.0326391533017159,-0.707480192184448,0.705978989601135,-0.0326391533017159,-0.707480192184448,0.705978989601135,
+-0.0326391533017159,-0.707480251789093,0.70597892999649,0.0326396264135838,-0.707479596138,0.705979585647583,0.0326396226882935,-0.707479596138,0.705979466438293,0.0326396226882935,-0.707479596138,0.705979466438293,0.0326396264135838,-0.707479596138,0.705979585647583,0.0976387113332748,-0.707483947277069,0.699952065944672,0.0976389721035957,-0.707484006881714,0.699952125549316,0.0976389721035957,-0.707484006881714,0.699952125549316,0.0976387113332748,-0.707483947277069,0.699952065944672,0.161804437637329,-0.707491278648376,0.687950015068054,0.161804258823395,-0.707491278648376,0.687950074672699,0.161804258823395,-0.707491278648376,0.687950074672699,0.161804437637329,-0.707491278648376,0.687950015068054,0.224590614438057,-0.707491755485535,0.670085251331329,0.224590420722961,-0.707491815090179,0.670085370540619,0.224590420722961,-0.707491815090179,0.670085370540619,0.224590614438057,-0.707491755485535,0.670085251331329,0.285460859537125,-0.707489371299744,0.646506607532501,0.285460859537125,-0.707489371299744,0.646506607532501,0.285460859537125,-0.707489371299744,0.646506607532501,0.285460859537125,-0.707489371299744,0.646506607532501,0.343896389007568,-0.707486391067505,0.617412328720093,0.343896567821503,-0.70748645067215,0.617412209510803,0.343896567821503,-0.70748645067215,0.617412209510803,0.343896389007568,-0.707486391067505,0.617412328720093,0.399399101734161,-0.707482814788818,0.583050787448883,0.399399101734161,-0.707482755184174,0.583050906658173,0.399399101734161,-0.707482755184174,0.583050906658173,0.399399101734161,-0.707482814788818,0.583050787448883,0.451458275318146,-0.707540273666382,0.543665289878845,0.451458424329758,-0.707540273666382,0.543665111064911,0.451458424329758,-0.707540273666382,0.543665111064911,0.451458275318146,-0.707540273666382,0.543665289878845,0.490713208913803,-0.707338452339172,0.508795440196991,0.491027504205704,-0.707337915897369,0.508492887020111,0.491027504205704,-0.707337915897369,0.508492887020111,0.490713208913803,-0.707338452339172,0.508795440196991,0.555825591087341,-0.702135443687439,0.445043385028839,
+0.555616974830627,-0.702167987823486,0.445252269506454,-0.482619643211365,0.70714259147644,0.516747176647186,-0.482678234577179,0.707143068313599,0.5166916847229,-0.462437093257904,0.704125642776489,0.538849651813507,-0.462677299976349,0.704152524471283,0.538608074188232,-0.482678234577179,0.707143068313599,0.5166916847229,-0.482619643211365,0.70714259147644,0.516747176647186,-0.451510667800903,0.707462072372437,0.543723702430725,-0.451510548591614,0.707462072372437,0.54372376203537,-0.451510548591614,0.707462072372437,0.54372376203537,-0.451510667800903,0.707462072372437,0.543723702430725,-0.399397850036621,0.707484841346741,0.583049237728119,-0.399397909641266,0.707484841346741,0.583049178123474,-0.399397909641266,0.707484841346741,0.583049178123474,-0.399397850036621,0.707484841346741,0.583049237728119,-0.343897521495819,0.707485139369965,0.617413222789764,-0.343897223472595,0.707485198974609,0.617413282394409,-0.343897223472595,0.707485198974609,0.617413282394409,-0.343897521495819,0.707485139369965,0.617413222789764,-0.285461217164993,0.707488715648651,0.646507084369659,-0.285461366176605,0.707488775253296,0.646507024765015,-0.285461366176605,0.707488775253296,0.646507024765015,-0.285461217164993,0.707488715648651,0.646507084369659,-0.224590063095093,0.707491397857666,0.670085906982422,-0.224590227007866,0.707491397857666,0.670085906982422,-0.224590227007866,0.707491397857666,0.670085906982422,-0.224590063095093,0.707491397857666,0.670085906982422,-0.161805585026741,0.70748382806778,0.687957465648651,-0.161805808544159,0.70748382806778,0.687957346439362,-0.161805808544159,0.70748382806778,0.687957346439362,-0.161805585026741,0.70748382806778,0.687957465648651,-0.0976404920220375,0.707474589347839,0.699961364269257,-0.097640261054039,0.707474529743195,0.699961364269257,-0.097640261054039,0.707474529743195,0.699961364269257,-0.0976404920220375,0.707474589347839,0.699961364269257,-0.0326396152377129,0.707477152347565,0.705982029438019,-0.0326396189630032,0.707477152347565,0.705982029438019,-0.0326396189630032,0.707477152347565,0.705982029438019,
+-0.0326396152377129,0.707477152347565,0.705982029438019,0.0326400808990002,0.707476913928986,0.705982148647308,0.0326400920748711,0.707476913928986,0.705982208251953,0.0326400920748711,0.707476913928986,0.705982208251953,0.0326400808990002,0.707476913928986,0.705982148647308,0.0976406112313271,0.707473814487457,0.699962198734283,0.0976403802633286,0.707473814487457,0.699962198734283,0.0976403802633286,0.707473814487457,0.699962198734283,0.0976406112313271,0.707473814487457,0.699962198734283,0.161805495619774,0.707483291625977,0.687958002090454,0.161805674433708,0.707483232021332,0.687958002090454,0.161805674433708,0.707483232021332,0.687958002090454,0.161805495619774,0.707483291625977,0.687958002090454,0.224590346217155,0.707491338253021,0.670085966587067,0.22459052503109,0.707491278648376,0.670085787773132,0.22459052503109,0.707491278648376,0.670085787773132,0.224590346217155,0.707491338253021,0.670085966587067,0.285461336374283,0.707488715648651,0.646507084369659,0.285461395978928,0.707488656044006,0.646507084369659,0.285461395978928,0.707488656044006,0.646507084369659,0.285461336374283,0.707488715648651,0.646507084369659,0.343898355960846,0.7074835896492,0.617414712905884,0.343898147344589,0.707483530044556,0.617414712905884,0.343898147344589,0.707483530044556,0.617414712905884,0.343898355960846,0.7074835896492,0.617414712905884,0.399400651454926,0.707479953765869,0.583053171634674,0.39940071105957,0.707479953765869,0.583053231239319,0.39940071105957,0.707479953765869,0.583053231239319,0.399400651454926,0.707479953765869,0.583053171634674,0.451516956090927,0.707452297210693,0.543731212615967,0.451516836881638,0.707452356815338,0.543731272220612,0.451516836881638,0.707452356815338,0.543731272220612,0.451516956090927,0.707452297210693,0.543731212615967,0.482624351978302,0.707135796546936,0.516751945018768,0.482682943344116,0.707136392593384,0.516696393489838,0.482682943344116,0.707136392593384,0.516696393489838,0.482624351978302,0.707135796546936,0.516751945018768,0.462674260139465,0.704156100749969,0.538606107234955,
+0.462434142827988,0.704129159450531,0.538847506046295,0.555839478969574,0.702133297920227,0.445029199123383,0.555630207061768,0.702166140079498,0.445238828659058,0.646781265735626,0.674310505390167,0.356341451406479,0.647080957889557,0.674181699752808,0.356041133403778,0.462677359580994,-0.704150140285492,0.53861129283905,0.462436616420746,-0.704123079776764,0.538853347301483,0.367919534444809,-0.678227782249451,0.63611501455307,0.368299216032028,-0.678379058837891,0.635733783245087,-0.538861453533173,-0.704074323177338,-0.462501347064972,-0.538620173931122,-0.704100966453552,-0.462741851806641,-0.635725319385529,-0.678380966186523,-0.368310183286667,-0.636106729507446,-0.678229570388794,-0.367930442094803,0.647080957889557,0.674181699752808,0.356041133403778,0.646781265735626,0.674310505390167,0.356341451406479,0.763977825641632,0.598722517490387,0.240560382604599,0.764238059520721,0.598495185375214,0.240298956632614,0.368299216032028,-0.678379058837891,0.635733783245087,0.367919534444809,-0.678227782249451,0.63611501455307,0.243654876947403,-0.600365698337555,0.761704206466675,0.243992671370506,-0.600655198097229,0.761367619037628,-0.636106729507446,-0.678229570388794,-0.367930442094803,-0.635725319385529,-0.678380966186523,-0.368310183286667,-0.76137363910675,-0.600646376609802,-0.243995875120163,-0.761708855628967,-0.600357830524445,-0.243659362196922,-0.355662167072296,0.674020230770111,-0.647457301616669,-0.355361133813858,0.673891007900238,-0.647757112979889,-0.240291401743889,0.59849601984024,-0.764239728450775,-0.240552306175232,0.5987229347229,-0.763979852199554,0.764238059520721,0.598495185375214,0.240298956632614,0.763977825641632,0.598722517490387,0.240560382604599,0.867361903190613,0.478563070297241,0.136603727936745,0.867511212825775,0.478335291147232,0.136453449726105,0.243992671370506,-0.600655198097229,0.761367619037628,0.243654876947403,-0.600365698337555,0.761704206466675,0.136167392134666,-0.477284878492355,0.868134498596191,0.13635079562664,-0.477561771869659,0.867953419685364,-0.761708855628967,-0.600357830524445,-0.243659362196922,
+-0.76137363910675,-0.600646376609802,-0.243995875120163,-0.867954254150391,-0.47756227850914,-0.136343687772751,-0.868135333061218,-0.477285325527191,-0.136160209774971,-0.240552306175232,0.5987229347229,-0.763979852199554,-0.240291401743889,0.59849601984024,-0.764239728450775,-0.136455118656158,0.478327333927155,-0.867515325546265,-0.136605381965637,0.478555142879486,-0.867365896701813,0.867511212825775,0.478335291147232,0.136453449726105,0.867361903190613,0.478563070297241,0.136603727936745,0.935613811016083,0.346612423658371,0.066982589662075,0.935676693916321,0.346454679965973,0.0669191628694534,0.13635079562664,-0.477561771869659,0.867953419685364,0.136167392134666,-0.477284878492355,0.868134498596191,0.0670884549617767,-0.346478641033173,0.93565571308136,0.0671620815992355,-0.346660047769547,0.935583293437958,-0.868135333061218,-0.477285325527191,-0.136160209774971,-0.867954254150391,-0.47756227850914,-0.136343687772751,-0.935582756996155,-0.346665799617767,-0.0671387538313866,-0.935654819011688,-0.346485435962677,-0.0670655369758606,-0.136605381965637,0.478555142879486,-0.867365896701813,-0.136455118656158,0.478327333927155,-0.867515325546265,-0.0669071078300476,0.346446961164474,-0.935680329799652,-0.0669702365994453,0.346603840589523,-0.935617804527283,0.935676693916321,0.346454679965973,0.0669191628694534,0.935613811016083,0.346612423658371,0.066982589662075,0.97310471534729,0.228593811392784,0.0284943804144859,0.973126292228699,0.228505045175552,0.0284727178514004,0.0671620815992355,-0.346660047769547,0.935583293437958,0.0670884549617767,-0.346478641033173,0.93565571308136,0.0289592538028955,-0.230122402310371,0.97273063659668,0.0289838071912527,-0.230221375823021,0.972706496715546,-0.935654819011688,-0.346485435962677,-0.0670655369758606,-0.935582756996155,-0.346665799617767,-0.0671387538313866,-0.972706973552704,-0.230220392346382,-0.0289766993373632,-0.972730994224548,-0.23012176156044,-0.0289522744715214,-0.0669702365994453,0.346603840589523,-0.935617804527283,-0.0669071078300476,0.346446961164474,-0.935680329799652,
+-0.0284632407128811,0.228499710559845,-0.973127782344818,-0.0284849293529987,0.228588730096817,-0.973106205463409,0.973126292228699,0.228505045175552,0.0284727178514004,0.97310471534729,0.228593811392784,0.0284943804144859,0.991605937480927,0.128948703408241,0.00947749987244606,0.99161159992218,0.128905266523361,0.00947175268083811,0.0289838071912527,-0.230221375823021,0.972706496715546,0.0289592538028955,-0.230122402310371,0.97273063659668,0.00974462553858757,-0.130555152893066,0.991393089294434,0.00975100509822369,-0.130602493882179,0.991386711597443,-0.972730994224548,-0.23012176156044,-0.0289522744715214,-0.972706973552704,-0.230220392346382,-0.0289766993373632,-0.991386771202087,-0.130602493882179,-0.00975536648184061,-0.991393089294434,-0.13055507838726,-0.00974896550178528,-0.0284849293529987,0.228588730096817,-0.973106205463409,-0.0284632407128811,0.228499710559845,-0.973127782344818,-0.00947134848684072,0.128903016448021,-0.991611957550049,-0.00947711803019047,0.128946557641029,-0.99160623550415,0.99161159992218,0.128905266523361,0.00947175268083811,0.991605937480927,0.128948703408241,0.00947749987244606,0.999132513999939,0.0416060276329517,0.00174752261955291,0.999133050441742,0.0415931269526482,0.00174698082264513,0.00975100509822369,-0.130602493882179,0.991386711597443,0.00974462553858757,-0.130555152893066,0.991393089294434,0.00182107579894364,-0.0422462821006775,0.999105513095856,0.00182168453466147,-0.0422604791820049,0.999104917049408,-0.991393089294434,-0.13055507838726,-0.00974896550178528,-0.991386771202087,-0.130602493882179,-0.00975536648184061,-0.999105036258698,-0.0422580614686012,-0.00181378703564405,-0.999105632305145,-0.0422439277172089,-0.00181318039540201,-0.00947711803019047,0.128946557641029,-0.99160623550415,-0.00947134848684072,0.128903016448021,-0.991611957550049,-0.00174250791314989,0.0415908098220825,-0.999133050441742,-0.00174304447136819,0.0416036210954189,-0.999132633209229,0.999133050441742,0.0415931269526482,0.00174698082264513,0.999132513999939,0.0416060276329517,0.00174752261955291,
+0.999132633209229,-0.0416023582220078,0.00175211823079735,0.999133110046387,-0.0415894985198975,0.00175157631747425,0.00182168453466147,-0.0422604791820049,0.999104917049408,0.00182107579894364,-0.0422462821006775,0.999105513095856,0.00181142590008676,0.0422468520700932,0.999105513095856,0.00181203021202236,0.0422610193490982,0.999104917049408,-0.999105632305145,-0.0422439277172089,-0.00181318039540201,-0.999105036258698,-0.0422580614686012,-0.00181378703564405,-0.999104857444763,0.0422600768506527,-0.001813834765926,-0.9991055727005,0.0422459281980991,-0.00181322731077671,-0.00174304447136819,0.0416036210954189,-0.999132633209229,-0.00174250791314989,0.0415908098220825,-0.999133050441742,-0.00174247135873884,-0.0415926389396191,-0.999133050441742,-0.00174301140941679,-0.0416055358946323,-0.999132513999939,0.999133110046387,-0.0415894985198975,0.00175157631747425,0.999132633209229,-0.0416023582220078,0.00175211823079735,0.991606831550598,-0.128941357135773,0.00948478560894728,0.991612434387207,-0.128898039460182,0.00947905890643597,0.00181203021202236,0.0422610193490982,0.999104917049408,0.00181142590008676,0.0422468520700932,0.999105513095856,0.00973523780703545,0.130556628108025,0.991393029689789,0.00974164064973593,0.130604073405266,0.991386711597443,-0.9991055727005,0.0422459281980991,-0.00181322731077671,-0.999104857444763,0.0422600768506527,-0.001813834765926,-0.991386771202087,0.13060274720192,-0.00975304469466209,-0.991393029689789,0.130555689334869,-0.00974669400602579,-0.00174301140941679,-0.0416055358946323,-0.999132513999939,-0.00174247135873884,-0.0415926389396191,-0.999133050441742,-0.00946606509387493,-0.128904193639755,-0.991611838340759,-0.00947175361216068,-0.128947168588638,-0.991606175899506,0.991612434387207,-0.128898039460182,0.00947905890643597,0.991606831550598,-0.128941357135773,0.00948478560894728,0.973105669021606,-0.228590488433838,0.0284895580261946,0.97312718629837,-0.228501483798027,0.028467858210206,0.00974164064973593,0.130604073405266,0.991386711597443,0.00973523780703545,0.130556628108025,0.991393029689789,
+0.0289422981441021,0.230125471949577,0.972730457782745,0.0289668049663305,0.230224370956421,0.972706377506256,-0.991393029689789,0.130555689334869,-0.00974669400602579,-0.991386771202087,0.13060274720192,-0.00975304469466209,-0.972706139087677,0.230224296450615,-0.028973700478673,-0.972730100154877,0.23012563586235,-0.0289492662996054,-0.00947175361216068,-0.128947168588638,-0.991606175899506,-0.00946606509387493,-0.128904193639755,-0.991611838340759,-0.0284691285341978,-0.228503823280334,-0.973126530647278,-0.028490761294961,-0.228592485189438,-0.973105192184448,0.97312718629837,-0.228501483798027,0.028467858210206,0.973105669021606,-0.228590488433838,0.0284895580261946,0.935613334178925,-0.346615195274353,0.0669738128781319,0.935676336288452,-0.346457093954086,0.0669102221727371,0.0289668049663305,0.230224370956421,0.972706377506256,0.0289422981441021,0.230125471949577,0.972730457782745,0.0670647472143173,0.346484035253525,0.935655415058136,0.0671381130814552,0.346664696931839,0.935583114624023,-0.972730100154877,0.23012563586235,-0.0289492662996054,-0.972706139087677,0.230224296450615,-0.028973700478673,-0.935579419136047,0.346673756837845,-0.0671428218483925,-0.935651838779449,0.346492767333984,-0.0670693293213844,-0.028490761294961,-0.228592485189438,-0.973105192184448,-0.0284691285341978,-0.228503823280334,-0.973126530647278,-0.066919669508934,-0.346451938152313,-0.935677707195282,-0.0669831559062004,-0.346609771251678,-0.935614764690399,0.935676336288452,-0.346457093954086,0.0669102221727371,0.935613334178925,-0.346615195274353,0.0669738128781319,0.867364585399628,-0.478558778762817,0.136602118611336,0.867514252662659,-0.478330314159393,0.136451378464699,0.0671381130814552,0.346664696931839,0.935583114624023,0.0670647472143173,0.346484035253525,0.935655415058136,0.136157229542732,0.477284908294678,0.868136048316956,0.13634081184864,0.477562010288239,0.867954730987549,-0.935651838779449,0.346492767333984,-0.0670693293213844,-0.935579419136047,0.346673756837845,-0.0671428218483925,-0.867949724197388,0.477568715810776,-0.136349186301231,
+-0.868131399154663,0.477291315793991,-0.136165350675583,-0.0669831559062004,-0.346609771251678,-0.935614764690399,-0.066919669508934,-0.346451938152313,-0.935677707195282,-0.136460855603218,-0.478334665298462,-0.867510378360748,-0.136611521244049,-0.478563070297241,-0.867360591888428,0.867514252662659,-0.478330314159393,0.136451378464699,0.867364585399628,-0.478558778762817,0.136602118611336,0.763979136943817,-0.598723530769348,0.240553230047226,0.764239847660065,-0.598495960235596,0.240291595458984,0.13634081184864,0.477562010288239,0.867954730987549,0.136157229542732,0.477284908294678,0.868136048316956,0.243649542331696,0.600366830825806,0.761704981327057,0.243986308574677,0.600655555725098,0.761369526386261,-0.868131399154663,0.477291315793991,-0.136165350675583,-0.867949724197388,0.477568715810776,-0.136349186301231,-0.761376917362213,0.60064297914505,-0.243994191288948,-0.761711835861206,0.600354671478271,-0.24365796148777,-0.136611521244049,-0.478563070297241,-0.867360591888428,-0.136460855603218,-0.478334665298462,-0.867510378360748,-0.240297332406044,-0.598501443862915,-0.764233648777008,-0.240558624267578,-0.598728597164154,-0.763973593711853,0.764239847660065,-0.598495960235596,0.240291595458984,0.763979136943817,-0.598723530769348,0.240553230047226,0.646768093109131,-0.674321353435516,0.356344789266586,0.647067368030548,-0.674192726612091,0.356044828891754,0.243986308574677,0.600655555725098,0.761369526386261,0.243649542331696,0.600366830825806,0.761704981327057,0.367922902107239,0.678237318992615,0.636102855205536,0.368302822113037,0.678388774394989,0.635721266269684,-0.761711835861206,0.600354671478271,-0.24365796148777,-0.761376917362213,0.60064297914505,-0.243994191288948,-0.635726988315582,0.678381860256195,-0.368305683135986,-0.636108636856079,0.678230285644531,-0.367925703525543,-0.240558624267578,-0.598728597164154,-0.763973593711853,-0.240297332406044,-0.598501443862915,-0.764233648777008,-0.356044232845306,-0.674181401729584,-0.647079527378082,-0.35634458065033,-0.674310207366943,-0.646779835224152,
+0.647067368030548,-0.674192726612091,0.356044828891754,0.646768093109131,-0.674321353435516,0.356344789266586,0.555616974830627,-0.702167987823486,0.445252269506454,0.555825591087341,-0.702135443687439,0.445043385028839,0.368302822113037,0.678388774394989,0.635721266269684,0.367922902107239,0.678237318992615,0.636102855205536,0.462434142827988,0.704129159450531,0.538847506046295,0.462674260139465,0.704156100749969,0.538606107234955,-0.636108636856079,0.678230285644531,-0.367925703525543,-0.635726988315582,0.678381860256195,-0.368305683135986,-0.538595020771027,0.704161822795868,-0.462678611278534,-0.538836717605591,0.70413476228714,-0.46243816614151,-0.35634458065033,-0.674310207366943,-0.646779835224152,-0.356044232845306,-0.674181401729584,-0.647079527378082,-0.445027619600296,-0.702146172523499,-0.555824637413025,-0.445236682891846,-0.702179074287415,-0.555615544319153,-0.538836717605591,0.70413476228714,-0.46243816614151,-0.538595020771027,0.704161822795868,-0.462678611278534,-0.503736972808838,0.707155406475067,-0.496165454387665,-0.503736913204193,0.707155406475067,-0.496165335178375,-0.445236682891846,-0.702179074287415,-0.555615544319153,-0.445027619600296,-0.702146172523499,-0.555824637413025,-0.478407740592957,-0.706670224666595,-0.521289885044098,-0.478407740592957,-0.706670224666595,-0.521289825439453,0.522558391094208,0.707105398178101,-0.476376414299011,0.522558450698853,0.707105398178101,-0.476376444101334,0.447547346353531,0.710118055343628,-0.543538093566895,0.447546601295471,0.710118114948273,-0.543538749217987,0.522561967372894,-0.707101583480835,-0.476378172636032,0.522562026977539,-0.70710164308548,-0.476378202438354,0.447548866271973,-0.710114479064941,-0.543541491031647,0.447549641132355,-0.710114479064941,-0.543540835380554,-0.555629551410675,0.702163457870483,0.445243865251541,-0.555838882923126,0.702130615711212,0.445034384727478,-0.647075414657593,0.674181759357452,0.356050878763199,-0.646775722503662,0.674310624599457,0.356351345777512,0.444328039884567,0.702110469341278,-0.556428968906403,
+0.45203822851181,0.691637694835663,-0.563292682170868,0.69258052110672,0.066249705851078,-0.718291759490967,0.355665177106857,0.674006164073944,-0.647470235824585,0.355364739894867,0.67387717962265,-0.647769451141357,0.538620114326477,-0.704109966754913,-0.462728232145309,0.538861453533173,-0.704083323478699,-0.462487757205963,0.63610714673996,-0.678232371807098,-0.367924362421036,0.635725915431976,-0.678383886814117,-0.368304044008255,-0.46243742108345,-0.704122722148895,0.538853108882904,-0.462678164243698,-0.704149782657623,0.538610994815826,-0.368305861949921,-0.678377330303192,0.635731756687164,-0.367926150560379,-0.678225874900818,0.636113047599792,-0.646775722503662,0.674310624599457,0.356351345777512,-0.647075414657593,0.674181759357452,0.356050878763199,-0.764231443405151,0.598499000072479,0.240310654044151,-0.763971149921417,0.598726272583008,0.240572094917297,0.355364739894867,0.67387717962265,-0.647769451141357,0.355665177106857,0.674006164073944,-0.647470235824585,0.240559369325638,0.598713159561157,-0.763985395431519,0.240298464894295,0.598486304283142,-0.764245212078094,0.635725915431976,-0.678383886814117,-0.368304044008255,0.63610714673996,-0.678232371807098,-0.367924362421036,0.761705935001373,-0.600358486175537,-0.243667483329773,0.761370658874512,-0.600646913051605,-0.244003847241402,-0.367926150560379,-0.678225874900818,0.636113047599792,-0.368305861949921,-0.678377330303192,0.635731756687164,-0.244000241160393,-0.600651204586029,0.761368453502655,-0.243662789463997,-0.600361883640289,0.761704742908478,-0.763971149921417,0.598726272583008,0.240572094917297,-0.764231443405151,0.598499000072479,0.240310654044151,-0.86750602722168,0.478340059518814,0.136469528079033,-0.86735612154007,0.478568613529205,0.136620387434959,0.240298464894295,0.598486304283142,-0.764245212078094,0.240559369325638,0.598713159561157,-0.763985395431519,0.136608868837357,0.478544026613235,-0.867371737957001,0.136458605527878,0.478316247463226,-0.867520928382874,0.761370658874512,-0.600646913051605,-0.244003847241402,0.761705935001373,-0.600358486175537,-0.243667483329773,
+0.868133187294006,-0.477285891771317,-0.136171191930771,0.867952108383179,-0.477562755346298,-0.13635465502739,-0.243662789463997,-0.600361883640289,0.761704742908478,-0.244000241160393,-0.600651204586029,0.761368453502655,-0.136351078748703,-0.477563053369522,0.867952525615692,-0.136167570948601,-0.477286070585251,0.868133783340454,-0.86735612154007,0.478568613529205,0.136620387434959,-0.86750602722168,0.478340059518814,0.136469528079033,-0.935675203800201,0.346459180116653,0.0669168159365654,-0.935612380504608,0.346616327762604,0.0669800341129303,0.136458605527878,0.478316247463226,-0.867520928382874,0.136608868837357,0.478544026613235,-0.867371737957001,0.0669864416122437,0.346597611904144,-0.935618937015533,0.0669233873486519,0.346440851688385,-0.935681402683258,0.867952108383179,-0.477562755346298,-0.13635465502739,0.868133187294006,-0.477285891771317,-0.136171191930771,0.935653567314148,-0.346488237380981,-0.0670686364173889,0.935581505298615,-0.346668601036072,-0.0671418681740761,-0.136167570948601,-0.477286070585251,0.868133783340454,-0.136351078748703,-0.477563053369522,0.867952525615692,-0.0671404525637627,-0.346663057804108,0.935583651065826,-0.0670673549175262,-0.346483081579208,0.93565559387207,-0.935612380504608,0.346616327762604,0.0669800341129303,-0.935675203800201,0.346459180116653,0.0669168159365654,-0.973125636577606,0.228507548570633,0.0284736659377813,-0.973104178905487,0.228596329689026,0.0284953135997057,0.0669233873486519,0.346440851688385,-0.935681402683258,0.0669864416122437,0.346597611904144,-0.935618937015533,0.028490100055933,0.228589817881584,-0.973105788230896,0.0284683406352997,0.228500694036484,-0.973127365112305,0.935581505298615,-0.346668601036072,-0.0671418681740761,0.935653567314148,-0.346488237380981,-0.0670686364173889,0.972730338573456,-0.23012438416481,-0.0289536379277706,0.972706198692322,-0.230223000049591,-0.0289780665189028,-0.0670673549175262,-0.346483081579208,0.93565559387207,-0.0671404525637627,-0.346663057804108,0.935583651065826,-0.0289726667106152,-0.230224281549454,0.972706139087677,
+-0.0289481543004513,-0.230125308036804,0.972730219364166,-0.973104178905487,0.228596329689026,0.0284953135997057,-0.973125636577606,0.228507548570633,0.0284736659377813,-0.99161159992218,0.128904536366463,0.00948285311460495,-0.991605877876282,0.128948196768761,0.00948862545192242,0.0284683406352997,0.228500694036484,-0.973127365112305,0.028490100055933,0.228589817881584,-0.973105788230896,0.0094723841175437,0.128947541117668,-0.991606116294861,0.00946670211851597,0.128904551267624,-0.991611778736115,0.972706198692322,-0.230223000049591,-0.0289780665189028,0.972730338573456,-0.23012438416481,-0.0289536379277706,0.991392731666565,-0.130557581782341,-0.00975023023784161,0.991386413574219,-0.130604982376099,-0.00975663028657436,-0.0289481543004513,-0.230125308036804,0.972730219364166,-0.0289726667106152,-0.230224281549454,0.972706139087677,-0.00975606311112642,-0.130604803562164,0.991386473178864,-0.00974967703223228,-0.13055744767189,0.991392731666565,-0.991605877876282,0.128948196768761,0.00948862545192242,-0.99161159992218,0.128904536366463,0.00948285311460495,-0.999133050441742,0.0415906645357609,0.00175207736901939,-0.999132513999939,0.0416035801172256,0.00175262149423361,0.00946670211851597,0.128904551267624,-0.991611778736115,0.0094723841175437,0.128947541117668,-0.991606116294861,0.00174758024513721,0.0416046716272831,-0.999132573604584,0.00174704112578183,0.0415918380022049,-0.999133050441742,0.991386413574219,-0.130604982376099,-0.00975663028657436,0.991392731666565,-0.130557581782341,-0.00975023023784161,0.9991055727005,-0.042247973382473,-0.00181319809053093,0.999104857444763,-0.0422620922327042,-0.0018138037994504,-0.00974967703223228,-0.13055744767189,0.991392731666565,-0.00975606311112642,-0.130604803562164,0.991386473178864,-0.00182168511673808,-0.0422607213258743,0.999104917049408,-0.00182107638102025,-0.0422465316951275,0.999105513095856,-0.999132513999939,0.0416035801172256,0.00175262149423361,-0.999133050441742,0.0415906645357609,0.00175207736901939,-0.999133110046387,-0.0415915735065937,0.00174674729350954,
+-0.999132633209229,-0.0416044369339943,0.00174728757701814,0.00174704112578183,0.0415918380022049,-0.999133050441742,0.00174758024513721,0.0416046716272831,-0.999132573604584,0.00174754939507693,-0.041606642305851,-0.999132573604584,0.00174700771458447,-0.041593749076128,-0.999133110046387,0.999104857444763,-0.0422620922327042,-0.0018138037994504,0.9991055727005,-0.042247973382473,-0.00181319809053093,0.999105513095856,0.04224743694067,-0.00181354314554483,0.999104797840118,0.0422615967690945,-0.00181415083352476,-0.00182107638102025,-0.0422465316951275,0.999105513095856,-0.00182168511673808,-0.0422607213258743,0.999104917049408,-0.00181687599979341,0.0422608032822609,0.999104917049408,-0.0018162700580433,0.0422466322779655,0.999105513095856,-0.999132633209229,-0.0416044369339943,0.00174728757701814,-0.999133110046387,-0.0415915735065937,0.00174674729350954,-0.991612255573273,-0.128900602459908,0.00946998037397861,-0.991606593132019,-0.128943726420403,0.00947568379342556,0.00174700771458447,-0.041593749076128,-0.999133110046387,0.00174754939507693,-0.041606642305851,-0.999132573604584,0.00947645865380764,-0.128948405385017,-0.991605997085571,0.00947077479213476,-0.128905445337296,-0.99161159992218,0.999104797840118,0.0422615967690945,-0.00181415083352476,0.999105513095856,0.04224743694067,-0.00181354314554483,0.991392612457275,0.130558103322983,-0.00974699854850769,0.991386353969574,0.130605518817902,-0.00975339580327272,-0.0018162700580433,0.0422466322779655,0.999105513095856,-0.00181687599979341,0.0422608032822609,0.999104917049408,-0.00975176692008972,0.130606427788734,0.991386294364929,-0.00974540784955025,0.130559310317039,0.991392493247986,-0.991606593132019,-0.128943726420403,0.00947568379342556,-0.991612255573273,-0.128900602459908,0.00946998037397861,-0.973128855228424,-0.228494644165039,0.0284685865044594,-0.97310733795166,-0.22858327627182,0.0284902174025774,0.00947077479213476,-0.128905445337296,-0.99161159992218,0.00947645865380764,-0.128948405385017,-0.991605997085571,0.0284905824810266,-0.228596061468124,-0.973104357719421,
+0.0284689608961344,-0.228507444262505,-0.973125755786896,0.991386353969574,0.130605518817902,-0.00975339580327272,0.991392612457275,0.130558103322983,-0.00974699854850769,0.972729504108429,0.230128437280655,-0.0289506744593382,0.97270542383194,0.230227008461952,-0.0289750974625349,-0.00974540784955025,0.130559310317039,0.991392493247986,-0.00975176692008972,0.130606427788734,0.991386294364929,-0.0289723165333271,0.230229601264,0.972705006599426,-0.0289478208869696,0.230130702257156,0.97272914648056,-0.97310733795166,-0.22858327627182,0.0284902174025774,-0.973128855228424,-0.228494644165039,0.0284685865044594,-0.93568366765976,-0.34643480181694,0.0669245794415474,-0.935620427131653,-0.346593260765076,0.0669883489608765,0.0284689608961344,-0.228507444262505,-0.973125755786896,0.0284905824810266,-0.228596061468124,-0.973104357719421,0.0669934973120689,-0.346606343984604,-0.935615181922913,0.0669297575950623,-0.346448004245758,-0.935678422451019,0.97270542383194,0.230227008461952,-0.0289750974625349,0.972729504108429,0.230128437280655,-0.0289506744593382,0.935653984546661,0.346486955881119,-0.0670693665742874,0.935581564903259,0.346668004989624,-0.0671428963541985,-0.0289478208869696,0.230130702257156,0.97272914648056,-0.0289723165333271,0.230229601264,0.972705006599426,-0.0671410262584686,0.346673011779785,0.935580015182495,-0.0670676380395889,0.346492320299149,0.935652136802673,-0.935620427131653,-0.346593260765076,0.0669883489608765,-0.93568366765976,-0.34643480181694,0.0669245794415474,-0.867519974708557,-0.478316396474838,0.13646388053894,-0.867369651794434,-0.478545725345612,0.136615142226219,0.0669297575950623,-0.346448004245758,-0.935678422451019,0.0669934973120689,-0.346606343984604,-0.935615181922913,0.136623501777649,-0.478551357984543,-0.867365181446075,0.136472627520561,-0.478322595357895,-0.867515206336975,0.935581564903259,0.346668004989624,-0.0671428963541985,0.935653984546661,0.346486955881119,-0.0670693665742874,0.868136048316956,0.477283269166946,-0.136163055896759,0.86795449256897,0.477560698986053,-0.136346906423569,
+-0.0670676380395889,0.346492320299149,0.935652136802673,-0.0671410262584686,0.346673011779785,0.935580015182495,-0.136352300643921,0.477556347846985,0.867956161499023,-0.136168569326401,0.47727906703949,0.868137538433075,-0.867369651794434,-0.478545725345612,0.136615142226219,-0.867519974708557,-0.478316396474838,0.13646388053894,-0.764244854450226,-0.598487496376038,0.240296483039856,-0.763984382152557,-0.59871506690979,0.240558132529259,0.136472627520561,-0.478322595357895,-0.867515206336975,0.136623501777649,-0.478551357984543,-0.867365181446075,0.240562543272972,-0.598724246025085,-0.76397567987442,0.240301370620728,-0.598497092723846,-0.76423579454422,0.86795449256897,0.477560698986053,-0.136346906423569,0.868136048316956,0.477283269166946,-0.136163055896759,0.76170152425766,0.600369870662689,-0.243652790784836,0.761366546154022,0.600658118724823,-0.243988931179047,-0.136168569326401,0.47727906703949,0.868137538433075,-0.136352300643921,0.477556347846985,0.867956161499023,-0.243996471166611,0.600645065307617,0.761374473571777,-0.243659719824791,0.600356221199036,0.761709988117218,-0.763984382152557,-0.59871506690979,0.240558132529259,-0.764244854450226,-0.598487496376038,0.240296483039856,-0.647077620029449,-0.674180448055267,0.35604926943779,-0.646778345108032,-0.674309253692627,0.356349289417267,0.240301370620728,-0.598497092723846,-0.76423579454422,0.240562543272972,-0.598724246025085,-0.76397567987442,0.35634782910347,-0.674309492111206,-0.646778762340546,0.356047034263611,-0.674180567264557,-0.6470787525177,0.761366546154022,0.600658118724823,-0.243988931179047,0.76170152425766,0.600369870662689,-0.243652790784836,0.636101305484772,0.678239345550537,-0.367921531200409,0.635719835758209,0.678390920162201,-0.368301540613174,-0.243659719824791,0.600356221199036,0.761709988117218,-0.243996471166611,0.600645065307617,0.761374473571777,-0.368303626775742,0.678389489650726,0.635720014572144,-0.367923676967621,0.678237915039063,0.63610166311264,-0.646778345108032,-0.674309253692627,0.356349289417267,-0.647077620029449,-0.674180448055267,0.35604926943779,
+-0.555825233459473,-0.702135622501373,0.445043534040451,-0.555616497993469,-0.702168345451355,0.445252478122711,0.356047034263611,-0.674180567264557,-0.6470787525177,0.35634782910347,-0.674309492111206,-0.646778762340546,0.445235192775726,-0.702182352542877,-0.555612683296204,0.445025563240051,-0.702149271965027,-0.555822312831879,0.635719835758209,0.678390920162201,-0.368301540613174,0.636101305484772,0.678239345550537,-0.367921531200409,0.538836717605591,0.704135239124298,-0.462437599897385,0.538595020771027,0.704162299633026,-0.462677985429764,-0.367923676967621,0.678237915039063,0.63610166311264,-0.368303626775742,0.678389489650726,0.635720014572144,-0.462677299976349,0.704152524471283,0.538608074188232,-0.462437093257904,0.704125642776489,0.538849651813507,0.445025563240051,-0.702149271965027,-0.555822312831879,0.445235192775726,-0.702182352542877,-0.555612683296204,0.478403866291046,-0.706676781177521,-0.521284520626068,0.478403836488724,-0.706676721572876,-0.521284461021423,0.538595020771027,0.704162299633026,-0.462677985429764,0.538836717605591,0.704135239124298,-0.462437599897385,0.503732919692993,0.707162320613861,-0.49615952372551,0.503733038902283,0.707162439823151,-0.496159583330154,-0.522553622722626,-0.707112491130829,-0.476371288299561,-0.522553563117981,-0.707112550735474,-0.476371347904205,-0.447550565004349,-0.710111677646637,-0.543543696403503,-0.447550237178802,-0.710111618041992,-0.543544054031372,-0.522550702095032,0.707116007804871,-0.476369321346283,-0.522550702095032,0.707116007804871,-0.476369321346283,-0.44754832983017,0.710115075111389,-0.543541133403778,-0.447548627853394,0.710115015506744,-0.543540894985199,-0.447548627853394,0.710115015506744,-0.543540894985199,-0.44754832983017,0.710115075111389,-0.543541133403778,-0.211014673113823,0.719250619411469,-0.661929786205292,-0.211013212800026,0.719250679016113,-0.66193026304245,-0.447550237178802,-0.710111618041992,-0.543544054031372,-0.447550565004349,-0.710111677646637,-0.543543696403503,-0.211013659834862,-0.719247996807098,-0.661933183670044,
+-0.211015194654465,-0.719247937202454,-0.661932647228241,0.438323557376862,0.707379341125488,-0.554514825344086,0.438323527574539,0.707379400730133,-0.55451488494873,0.395809412002563,0.710112869739532,-0.582300961017609,0.395809054374695,0.710112869739532,-0.582301199436188,0.438323527574539,0.707379400730133,-0.55451488494873,0.438323557376862,0.707379341125488,-0.554514825344086,0.399399369955063,0.707482516765594,-0.583051025867462,0.399399429559708,0.707482516765594,-0.583050966262817,0.399399429559708,0.707482516765594,-0.583050966262817,0.399399369955063,0.707482516765594,-0.583051025867462,0.343896359205246,0.707487344741821,-0.617411434650421,0.343896448612213,0.707487404346466,-0.617411375045776,0.438322812318802,-0.707381546497345,-0.554512619972229,0.438322842121124,-0.70738160610199,-0.554512619972229,0.39580711722374,-0.710118472576141,-0.582295656204224,0.395807474851608,-0.710118532180786,-0.582295417785645,0.438322842121124,-0.70738160610199,-0.554512619972229,0.438322812318802,-0.707381546497345,-0.554512619972229,0.399397939443588,-0.707484602928162,-0.583049356937408,0.399397969245911,-0.707484662532806,-0.583049476146698,0.399397969245911,-0.707484662532806,-0.583049476146698,0.399397939443588,-0.707484602928162,-0.583049356937408,0.343895643949509,-0.707487940788269,-0.617411077022552,0.343895435333252,-0.707487940788269,-0.617411077022552,0.343896448612213,0.707487404346466,-0.617411375045776,0.343896359205246,0.707487344741821,-0.617411434650421,0.28546068072319,0.707489788532257,-0.646506130695343,0.285460561513901,0.707489907741547,-0.646506249904633,0.343895435333252,-0.707487940788269,-0.617411077022552,0.343895643949509,-0.707487940788269,-0.617411077022552,0.28546130657196,-0.707486808300018,-0.646509110927582,0.28546154499054,-0.707486808300018,-0.646509110927582,0.285460561513901,0.707489907741547,-0.646506249904633,0.28546068072319,0.707489788532257,-0.646506130695343,0.22459089756012,0.707488596439362,-0.670088648796082,0.22459103167057,0.707488536834717,-0.670088529586792,0.28546154499054,-0.707486808300018,-0.646509110927582,
+0.28546130657196,-0.707486808300018,-0.646509110927582,0.224592015147209,-0.707485496997833,-0.670091450214386,0.224591866135597,-0.707485496997833,-0.670091569423676,0.22459103167057,0.707488536834717,-0.670088529586792,0.22459089756012,0.707488596439362,-0.670088648796082,0.161804348230362,0.707490146160126,-0.687951326370239,0.161804333329201,0.707490146160126,-0.687951266765594,0.224591866135597,-0.707485496997833,-0.670091569423676,0.224592015147209,-0.707485496997833,-0.670091450214386,0.161805137991905,-0.707487761974335,-0.687953531742096,0.161805123090744,-0.707487761974335,-0.687953412532806,0.161804333329201,0.707490146160126,-0.687951266765594,0.161804348230362,0.707490146160126,-0.687951326370239,0.0976380035281181,0.707491397857666,-0.699944674968719,0.0976380929350853,0.707491397857666,-0.699944674968719,0.161805123090744,-0.707487761974335,-0.687953412532806,0.161805137991905,-0.707487761974335,-0.687953531742096,0.0976382121443748,-0.707490503787994,-0.699945628643036,0.0976381003856659,-0.70749044418335,-0.699945688247681,0.0976380929350853,0.707491397857666,-0.699944674968719,0.0976380035281181,0.707491397857666,-0.699944674968719,0.0326393507421017,0.707486748695374,-0.705972373485565,0.0326394252479076,0.707486748695374,-0.70597231388092,0.0976381003856659,-0.70749044418335,-0.699945688247681,0.0976382121443748,-0.707490503787994,-0.699945628643036,0.0326393134891987,-0.707487761974335,-0.705971419811249,0.0326393321156502,-0.707487761974335,-0.705971419811249,0.0326394252479076,0.707486748695374,-0.70597231388092,0.0326393507421017,0.707486748695374,-0.705972373485565,-0.0326394625008106,0.707483291625977,-0.705975830554962,-0.032639492303133,0.707483291625977,-0.705975890159607,0.0326393321156502,-0.707487761974335,-0.705971419811249,0.0326393134891987,-0.707487761974335,-0.705971419811249,-0.0326394028961658,-0.707483947277069,-0.705975294113159,-0.0326393693685532,-0.707483947277069,-0.70597517490387,-0.032639492303133,0.707483291625977,-0.705975890159607,-0.0326394625008106,0.707483291625977,-0.705975830554962,
+-0.0976396277546883,0.707482814788818,-0.699953138828278,-0.0976395830512047,0.707482874393463,-0.699953138828278,-0.0326393693685532,-0.707483947277069,-0.70597517490387,-0.0326394028961658,-0.707483947277069,-0.705975294113159,-0.0976396203041077,-0.707481503486633,-0.699954450130463,-0.097639687359333,-0.707481503486633,-0.699954450130463,-0.0976395830512047,0.707482874393463,-0.699953138828278,-0.0976396277546883,0.707482814788818,-0.699953138828278,-0.161805883049965,0.707484543323517,-0.687956690788269,-0.161805778741837,0.707484424114227,-0.687956750392914,-0.097639687359333,-0.707481503486633,-0.699954450130463,-0.0976396203041077,-0.707481503486633,-0.699954450130463,-0.161806523799896,-0.707482218742371,-0.687958836555481,-0.161806628108025,-0.707482278347015,-0.687958776950836,-0.161805778741837,0.707484424114227,-0.687956750392914,-0.161805883049965,0.707484543323517,-0.687956690788269,-0.224589586257935,0.707493126392365,-0.670084238052368,-0.224589869379997,0.707493126392365,-0.670084059238434,-0.161806628108025,-0.707482278347015,-0.687958776950836,-0.161806523799896,-0.707482218742371,-0.687958836555481,-0.224590614438057,-0.707490086555481,-0.670086979866028,-0.224590361118317,-0.707490146160126,-0.670087158679962,-0.224589869379997,0.707493126392365,-0.670084059238434,-0.224589586257935,0.707493126392365,-0.670084238052368,-0.285457491874695,0.707496881484985,-0.646499872207642,-0.285457849502563,0.707496881484985,-0.646499693393707,-0.224590361118317,-0.707490146160126,-0.670087158679962,-0.224590614438057,-0.707490086555481,-0.670086979866028,-0.285457581281662,-0.707497000694275,-0.646499633789063,-0.285457193851471,-0.70749694108963,-0.646499812602997,-0.285457849502563,0.707496881484985,-0.646499693393707,-0.285457491874695,0.707496881484985,-0.646499872207642,-0.343894749879837,0.70749044418335,-0.617408692836761,-0.343894809484482,0.707490503787994,-0.617408573627472,-0.285457193851471,-0.70749694108963,-0.646499812602997,-0.285457581281662,-0.707497000694275,-0.646499633789063,-0.343893140554428,-0.707493484020233,-0.617406189441681,
+-0.343892991542816,-0.707493484020233,-0.617406249046326,-0.343894809484482,0.707490503787994,-0.617408573627472,-0.343894749879837,0.70749044418335,-0.617408692836761,-0.399397909641266,0.707485496997833,-0.583048403263092,-0.399397939443588,0.707485437393188,-0.583048343658447,-0.343892991542816,-0.707493484020233,-0.617406249046326,-0.343893140554428,-0.707493484020233,-0.617406189441681,-0.399396240711212,-0.707488417625427,-0.583046078681946,-0.399396181106567,-0.707488417625427,-0.583046019077301,-0.399397939443588,0.707485437393188,-0.583048343658447,-0.399397909641266,0.707485496997833,-0.583048403263092,-0.438322305679321,0.707381963729858,-0.554512500762939,-0.438322246074677,0.707381963729858,-0.554512560367584,-0.399396181106567,-0.707488417625427,-0.583046019077301,-0.399396240711212,-0.707488417625427,-0.583046078681946,-0.438320457935333,-0.707385897636414,-0.554508924484253,-0.438320577144623,-0.707385957241058,-0.554508924484253,-0.438322246074677,0.707381963729858,-0.554512560367584,-0.438322305679321,0.707381963729858,-0.554512500762939,-0.39580699801445,0.710115671157837,-0.58229923248291,-0.395807415246964,0.710115611553192,-0.582298934459686,-0.438320577144623,-0.707385957241058,-0.554508924484253,-0.438320457935333,-0.707385897636414,-0.554508924484253,-0.395805865526199,-0.710119903087616,-0.582294940948486,-0.395805478096008,-0.710119843482971,-0.582295179367065,0.447546601295471,0.710118114948273,-0.543538749217987,0.447547346353531,0.710118055343628,-0.543538093566895,0.211011067032814,0.719258248806,-0.661922812461853,0.211012691259384,0.719258248806,-0.66192227602005,-0.395807415246964,0.710115611553192,-0.582298934459686,-0.39580699801445,0.710115671157837,-0.58229923248291,-0.149038761854172,0.71925288438797,-0.678573906421661,-0.149039462208748,0.719252943992615,-0.678573787212372,0.447549641132355,-0.710114479064941,-0.543540835380554,0.447548866271973,-0.710114479064941,-0.543541491031647,0.211012944579124,-0.719255924224854,-0.661924719810486,0.211011379957199,-0.719255983829498,-0.661925196647644,
+-0.395805478096008,-0.710119843482971,-0.582295179367065,-0.395805865526199,-0.710119903087616,-0.582294940948486,-0.149037942290306,-0.719254493713379,-0.678572416305542,-0.149037331342697,-0.719254493713379,-0.678572475910187,0.395809054374695,0.710112869739532,-0.582301199436188,0.395809412002563,0.710112869739532,-0.582300961017609,0.149040043354034,0.719250082969666,-0.678576648235321,0.149039521813393,0.719250023365021,-0.678576767444611,0.395807474851608,-0.710118532180786,-0.582295417785645,0.39580711722374,-0.710118472576141,-0.582295656204224,0.149037957191467,-0.719251215457916,-0.678575813770294,0.149038508534431,-0.719251215457916,-0.678575694561005,-0.211013212800026,0.719250679016113,-0.66193026304245,-0.211014673113823,0.719250619411469,-0.661929786205292,0.149039521813393,0.719250023365021,-0.678576767444611,0.149040043354034,0.719250082969666,-0.678576648235321,-0.211015194654465,-0.719247937202454,-0.661932647228241,-0.211013659834862,-0.719247996807098,-0.661933183670044,0.149038508534431,-0.719251215457916,-0.678575694561005,0.149037957191467,-0.719251215457916,-0.678575813770294,-0.149039462208748,0.719252943992615,-0.678573787212372,-0.149038761854172,0.71925288438797,-0.678573906421661,0.211012691259384,0.719258248806,-0.66192227602005,0.211011067032814,0.719258248806,-0.661922812461853,-0.149037331342697,-0.719254493713379,-0.678572475910187,-0.149037942290306,-0.719254493713379,-0.678572416305542,0.211011379957199,-0.719255983829498,-0.661925196647644,0.211012944579124,-0.719255924224854,-0.661924719810486,-0.686134934425354,-3.75032250303775e-005,0.72747415304184,-0.638846457004547,0,0.769334137439728,-0.638846397399902,0,0.769334197044373,-0.685862421989441,-3.66751555702649e-005,0.727731227874756,-0.638846457004547,0,0.769334137439728,-0.565136194229126,0,0.82499760389328,-0.565136194229126,0,0.82499760389328,-0.638846397399902,0,0.769334197044373,-0.565136194229126,0,0.82499760389328,-0.486604362726212,0,0.873622357845306,-0.486604362726212,0,0.873622357845306,-0.565136194229126,0,0.82499760389328,
+-0.486604362726212,0,0.873622357845306,-0.40392079949379,0,0.914793908596039,-0.40392079949379,0,0.914793908596039,-0.486604362726212,0,0.873622357845306,-0.40392079949379,0,0.914793908596039,-0.317791253328323,0,0.948160529136658,-0.317791253328323,0,0.948160529136658,-0.40392079949379,0,0.914793908596039,-0.317791253328323,0,0.948160529136658,-0.228950336575508,0,0.973438024520874,-0.228950336575508,0,0.973438024520874,-0.317791253328323,0,0.948160529136658,-0.228950336575508,0,0.973438024520874,-0.138156443834305,0,0.990410387516022,-0.138156443834305,0,0.990410387516022,-0.228950336575508,0,0.973438024520874,-0.138156443834305,0,0.990410387516022,-0.0461838357150555,0,0.998932898044586,-0.0461838357150555,0,0.998932898044586,-0.138156443834305,0,0.990410387516022,-0.0461838357150555,0,0.998932898044586,0.0461839586496353,0,0.998932898044586,0.0461839586496353,0,0.998932898044586,-0.0461838357150555,0,0.998932898044586,0.0461839586496353,0,0.998932898044586,0.138156563043594,0,0.990410268306732,0.138156563043594,0,0.990410268306732,0.0461839586496353,0,0.998932898044586,0.138156563043594,0,0.990410268306732,0.22895048558712,0,0.973438024520874,0.22895048558712,0,0.973438024520874,0.138156563043594,0,0.990410268306732,0.22895048558712,0,0.973438024520874,0.317791432142258,0,0.948160469532013,0.317791432142258,0,0.948160469532013,0.22895048558712,0,0.973438024520874,0.317791432142258,0,0.948160469532013,0.403921067714691,0,0.914793789386749,0.403921067714691,0,0.914793789386749,0.317791432142258,0,0.948160469532013,0.403921067714691,0,0.914793789386749,0.486604690551758,0,0.873622238636017,0.486604690551758,0,0.873622238636017,0.403921067714691,0,0.914793789386749,0.486604690551758,0,0.873622238636017,0.565136194229126,0,0.82499760389328,0.565136194229126,0,0.82499760389328,0.486604690551758,0,0.873622238636017,0.565136194229126,0,0.82499760389328,0.638846457004547,0,0.769334137439728,0.638846457004547,0,0.769334197044373,0.565136194229126,0,0.82499760389328,0.638846457004547,0,0.769334137439728,0.686135053634644,-3.75032068404835e-005,0.72747415304184,
+0.685862421989441,-3.66751737601589e-005,0.727731108665466,0.638846457004547,0,0.769334197044373,-0.00817491393536329,0.999933063983917,-0.00817150250077248,-1.17474110084004e-005,0.999999940395355,6.00420025875792e-006,-1.17474382932414e-005,0.999999940395355,6.00421481067315e-006,-0.0078024473041296,0.999939143657684,-0.00779755134135485,-1.17474110084004e-005,0.999999940395355,6.00420025875792e-006,0,0.999999940395355,3.87351377639789e-007,0,0.999999940395355,3.8735129237466e-007,-1.17474382932414e-005,0.999999940395355,6.00421481067315e-006,0,0.999999940395355,3.87351377639789e-007,0,0.999999940395355,1.93675276705108e-007,0,0.999999940395355,1.93676768844853e-007,0,0.999999940395355,3.8735129237466e-007,0,0.999999940395355,1.93675276705108e-007,0,0.999999940395355,-9.68376738796906e-008,0,0.999999940395355,-9.68377236176821e-008,0,0.999999940395355,1.93676768844853e-007,0,0.999999940395355,-9.68376738796906e-008,0,0.999999940395355,-5.8102693856199e-007,0,0.999999940395355,-5.81027677526436e-007,0,0.999999940395355,-9.68377236176821e-008,0,0.999999940395355,-5.8102693856199e-007,0,0.999999940395355,-1.21047446555167e-006,0,0.999999940395355,-1.21047412449116e-006,0,0.999999940395355,-5.81027677526436e-007,0,0.999999940395355,-1.21047446555167e-006,0,0.999999940395355,-1.54940653374069e-006,0,0.999999940395355,-1.54940573793283e-006,0,0.999999940395355,-1.21047412449116e-006,0,0.999999940395355,-1.54940653374069e-006,0,0.999999940395355,-2.39673545365804e-006,0,0.999999940395355,-2.39673499891069e-006,0,0.999999940395355,-1.54940573793283e-006,0,0.999999940395355,-2.39673545365804e-006,0,0.999999940395355,-1.28310091440653e-006,0,0.999999940395355,-1.28310068703286e-006,0,0.999999940395355,-2.39673499891069e-006,0,0.999999940395355,-1.28310091440653e-006,0,0.999999940395355,-4.35770289186621e-007,0,0.999999940395355,-4.35770488138587e-007,0,0.999999940395355,-1.28310068703286e-006,0,0.999999940395355,-4.35770289186621e-007,0,0.999999940395355,-7.74703380557185e-007,0,0.999999940395355,-7.74703380557185e-007,0,0.999999940395355,-4.35770488138587e-007,
+0,0.999999940395355,-7.74703380557185e-007,0,0.999999940395355,-1.11363704036194e-006,0,0.999999940395355,-1.11363681298826e-006,0,0.999999940395355,-7.74703380557185e-007,0,0.999999940395355,-1.11363704036194e-006,0,0.999999940395355,-9.68379595178703e-007,0,0.999999940395355,-9.68379708865541e-007,0,0.999999940395355,-1.11363681298826e-006,0,0.999999940395355,-9.68379595178703e-007,0,0.999999940395355,9.68371693943482e-008,0,0.999999940395355,9.68384057387084e-008,0,0.999999940395355,-9.68379708865541e-007,0,0.999999940395355,9.68371693943482e-008,0,0.999999940395355,5.81026824875153e-007,0,0.999999940395355,5.81026768031734e-007,0,0.999999940395355,9.68384057387084e-008,0,0.999999940395355,5.81026824875153e-007,1.17473982754746e-005,0.999999940395355,6.58524595564813e-006,1.17474373837467e-005,0.999999940395355,6.58526732877363e-006,0,0.999999940395355,5.81026768031734e-007,1.17473982754746e-005,0.999999940395355,6.58524595564813e-006,0.00817459914833307,0.999933183193207,-0.00817013718187809,0.00780216697603464,0.999939203262329,-0.0077962507493794,1.17474373837467e-005,0.999999940395355,6.58526732877363e-006,0.638820946216583,4.4055873331672e-006,-0.769355297088623,0.565136194229126,0,-0.824997544288635,0.565136194229126,0,-0.824997544288635,0.638820946216583,4.40559188064071e-006,-0.769355297088623,0.565136194229126,0,-0.824997544288635,0.486604332923889,0,-0.873622417449951,0.486604332923889,0,-0.873622417449951,0.565136194229126,0,-0.824997544288635,0.486604332923889,0,-0.873622417449951,0.403921157121658,0,-0.914793729782104,0.403921157121658,0,-0.914793729782104,0.486604332923889,0,-0.873622417449951,0.403921157121658,0,-0.914793729782104,0.317791432142258,0,-0.948160588741302,0.317791432142258,0,-0.948160588741302,0.403921157121658,0,-0.914793729782104,0.317791432142258,0,-0.948160588741302,0.228950455784798,0,-0.973438024520874,0.228950455784798,0,-0.973438024520874,0.317791432142258,0,-0.948160588741302,0.228950455784798,0,-0.973438024520874,0.138156667351723,0,-0.990410327911377,0.138156667351723,0,-0.990410327911377,
+0.228950455784798,0,-0.973438024520874,0.138156667351723,0,-0.990410327911377,0.0461835525929928,0,-0.998932838439941,0.0461835525929928,0,-0.998932838439941,0.138156667351723,0,-0.990410327911377,0.0461835525929928,0,-0.998932838439941,-0.0461836941540241,0,-0.998932838439941,-0.0461836941540241,0,-0.998932838439941,0.0461835525929928,0,-0.998932838439941,-0.0461836941540241,0,-0.998932838439941,-0.138156801462173,0,-0.990410327911377,-0.138156801462173,0,-0.990410327911377,-0.0461836941540241,0,-0.998932838439941,-0.138156801462173,0,-0.990410327911377,-0.228950589895248,0,-0.973437905311584,-0.228950589895248,0,-0.973437905311584,-0.138156801462173,0,-0.990410327911377,-0.228950589895248,0,-0.973437905311584,-0.317791551351547,0,-0.948160529136658,-0.317791551351547,0,-0.948160529136658,-0.228950589895248,0,-0.973437905311584,-0.317791551351547,0,-0.948160529136658,-0.403921246528625,0,-0.914793729782104,-0.403921246528625,0,-0.914793729782104,-0.317791551351547,0,-0.948160529136658,-0.403921246528625,0,-0.914793729782104,-0.486604243516922,0,-0.873622477054596,-0.486604243516922,0,-0.873622477054596,-0.403921246528625,0,-0.914793729782104,-0.486604243516922,0,-0.873622477054596,-0.565136551856995,0,-0.824997305870056,-0.565136551856995,0,-0.824997305870056,-0.486604243516922,0,-0.873622477054596,-0.565136551856995,0,-0.824997305870056,-0.638821303844452,4.56553925687331e-006,-0.769355058670044,-0.638821303844452,4.56554380434682e-006,-0.769355058670044,-0.565136551856995,0,-0.824997305870056,-0.638821303844452,4.56553925687331e-006,-0.769355058670044,-0.672601997852325,0.0576485246419907,-0.737755477428436,-0.673727691173553,0.00137342023663223,-0.738978266716003,-0.673698425292969,9.12832365429495e-006,-0.739006280899048,-0.638821303844452,4.56554380434682e-006,-0.769355058670044,0.00329330540262163,-0.999989211559296,0.0032876399345696,5.12980477651581e-006,-0.999999940395355,-4.06736262448248e-006,5.12979158884264e-006,-0.999999940395355,-4.06735216529341e-006,0.00345196854323149,-0.999988079071045,0.00344691821373999,
+5.12980477651581e-006,-0.999999940395355,-4.06736262448248e-006,0,-0.999999940395355,1.93675546711347e-007,0,-0.999999940395355,1.93675560922202e-007,5.12979158884264e-006,-0.999999940395355,-4.06735216529341e-006,0,-0.999999940395355,1.93675546711347e-007,0,-0.999999940395355,1.93675845139296e-007,0,-0.999999940395355,1.93675560922202e-007,0,-0.999999940395355,1.93675560922202e-007,0,-0.999999940395355,1.93675845139296e-007,0,-0.999999940395355,6.77864932185912e-007,0,-0.999999940395355,6.77864989029331e-007,0,-0.999999940395355,1.93675560922202e-007,0,-0.999999940395355,6.77864932185912e-007,0,-0.999999940395355,1.06521679299476e-006,0,-0.999999940395355,1.06521713405527e-006,0,-0.999999940395355,6.77864989029331e-007,0,-0.999999940395355,1.06521679299476e-006,0,-0.999999940395355,-2.90514122980312e-007,0,-0.999999940395355,-2.90513554546123e-007,0,-0.999999940395355,1.06521713405527e-006,0,-0.999999940395355,-2.90514122980312e-007,0,-0.999999940395355,-1.01679790986964e-006,0,-0.999999940395355,-1.01679756880912e-006,0,-0.999999940395355,-2.90513554546123e-007,0,-0.999999940395355,-1.01679790986964e-006,0,-0.999999940395355,-5.20503192547039e-007,0,-0.999999940395355,-5.20503078860202e-007,0,-0.999999940395355,-1.01679756880912e-006,0,-0.999999940395355,-5.20503192547039e-007,0,-0.999999940395355,-1.06521576981322e-006,0,-0.999999940395355,-1.06521565612638e-006,0,-0.999999940395355,-5.20503078860202e-007,0,-0.999999940395355,-1.06521576981322e-006,0,-0.999999940395355,-1.31941590097995e-006,0,-0.999999940395355,-1.3194163557273e-006,0,-0.999999940395355,-1.06521565612638e-006,0,-0.999999940395355,-1.31941590097995e-006,0,-0.999999940395355,-5.32608680714475e-007,0,-0.999999940395355,-5.32608510184218e-007,0,-0.999999940395355,-1.3194163557273e-006,0,-0.999999940395355,-5.32608680714475e-007,0,-0.999999940395355,2.90513838763218e-007,0,-0.999999940395355,2.90514122980312e-007,0,-0.999999940395355,-5.32608510184218e-007,0,-0.999999940395355,2.90513838763218e-007,0,-0.999999940395355,4.84189683902514e-007,0,-0.999999940395355,4.84189683902514e-007,
+0,-0.999999940395355,2.90514122980312e-007,0,-0.999999940395355,4.84189683902514e-007,0,-0.999999940395355,9.68377236176821e-008,0,-0.999999940395355,9.68379083587934e-008,0,-0.999999940395355,4.84189683902514e-007,0,-0.999999940395355,9.68377236176821e-008,0,-0.999999940395355,-1.93675461446219e-007,0,-0.999999940395355,-1.93675475657074e-007,0,-0.999999940395355,9.68379083587934e-008,0,-0.999999940395355,-1.93675461446219e-007,-5.12980295752641e-006,-0.999999940395355,-3.29262479681347e-006,-5.12978431288502e-006,-0.999999940395355,-3.2926143376244e-006,0,-0.999999940395355,-1.93675475657074e-007,-5.12980295752641e-006,-0.999999940395355,-3.29262479681347e-006,-0.00329300877638161,-0.999989151954651,0.00328897964209318,-0.00345165352337062,-0.99998813867569,0.00344822439365089,-5.12978431288502e-006,-0.999999940395355,-3.2926143376244e-006,-0.685862958431244,3.66751737601589e-005,0.727730631828308,-0.638846635818481,0,0.769334077835083,-0.638846635818481,0,0.769334018230438,-0.686135590076447,3.75032832380384e-005,0.727473616600037,-0.638846635818481,0,0.769334077835083,-0.565136253833771,0,0.82499748468399,-0.565136253833771,0,0.82499748468399,-0.638846635818481,0,0.769334018230438,-0.565136253833771,0,0.82499748468399,-0.486604422330856,0,0.873622238636017,-0.486604422330856,0,0.873622238636017,-0.565136253833771,0,0.82499748468399,-0.486604422330856,0,0.873622238636017,-0.403920948505402,0,0.914793848991394,-0.403920948505402,0,0.914793848991394,-0.486604422330856,0,0.873622238636017,-0.403920948505402,0,0.914793848991394,-0.317791551351547,0,0.948160529136658,-0.317791491746902,0,0.948160469532013,-0.403920948505402,0,0.914793848991394,-0.317791551351547,0,0.948160529136658,-0.228950321674347,0,0.973437964916229,-0.228950336575508,0,0.973438024520874,-0.317791491746902,0,0.948160469532013,-0.228950321674347,0,0.973437964916229,-0.138155966997147,0,0.990410447120667,-0.138155981898308,0,0.990410447120667,-0.228950336575508,0,0.973438024520874,-0.138155966997147,0,0.990410447120667,-0.0461833812296391,0,0.998932957649231,
+-0.0461833775043488,0,0.998932838439941,-0.138155981898308,0,0.990410447120667,-0.0461833812296391,0,0.998932957649231,0.0461840592324734,0,0.998932898044586,0.0461840555071831,0,0.998932898044586,-0.0461833775043488,0,0.998932838439941,0.0461840592324734,0,0.998932898044586,0.138155773282051,0,0.990410387516022,0.138155788183212,0,0.990410387516022,0.0461840555071831,0,0.998932898044586,0.138155773282051,0,0.990410387516022,0.228949964046478,0,0.973438143730164,0.228949993848801,0,0.973438143730164,0.138155788183212,0,0.990410387516022,0.228949964046478,0,0.973438143730164,0.317791879177094,0,0.948160350322723,0.317791908979416,0,0.948160350322723,0.228949993848801,0,0.973438143730164,0.317791879177094,0,0.948160350322723,0.403921097517014,0,0.91479367017746,0.403921097517014,0,0.91479367017746,0.317791908979416,0,0.948160350322723,0.403921097517014,0,0.91479367017746,0.486604541540146,0,0.873622298240662,0.486604541540146,0,0.873622298240662,0.403921097517014,0,0.91479367017746,0.486604541540146,0,0.873622298240662,0.56513637304306,0,0.824997365474701,0.56513637304306,0,0.824997365474701,0.486604541540146,0,0.873622298240662,0.56513637304306,0,0.824997365474701,0.638846695423126,0,0.769334018230438,0.638846695423126,0,0.769334018230438,0.56513637304306,0,0.824997365474701,0.638846695423126,0,0.769334018230438,0.685862720012665,3.63009276043158e-005,0.727730810642242,0.686135351657867,3.71205824194476e-005,0.727473795413971,0.638846695423126,0,0.769334018230438,0.00326843559741974,0.999989330768585,0.00325691723264754,5.40158453077311e-006,0.999999940395355,-3.59079194822698e-006,1.54286988163221e-006,0.999999940395355,-7.93113315467053e-007,3.58468287231517e-006,0.999999940395355,-2.32788261200767e-006,0.00234573241323233,0.999994397163391,0.00233277003280818,5.40158453077311e-006,0.999999940395355,-3.59079194822698e-006,7.56545375679707e-007,0.999999940395355,-9.50518710851611e-007,2.80659662621474e-007,0.999999940395355,-1.0463888600043e-007,1.54286988163221e-006,0.999999940395355,-7.93113315467053e-007,7.56545375679707e-007,0.999999940395355,-9.50518710851611e-007,
+4.1036827269636e-007,0.999999940395355,-8.8342392245977e-007,-6.80723175605635e-008,0.999999940395355,-3.06603737953992e-007,2.80659662621474e-007,0.999999940395355,-1.0463888600043e-007,4.1036827269636e-007,0.999999940395355,-8.8342392245977e-007,-1.43287707032869e-007,0.999999940395355,2.79563323601906e-008,-1.9421602814873e-007,0.999999940395355,-1.35349409902119e-007,-6.80723175605635e-008,0.999999940395355,-3.06603737953992e-007,-1.43287707032869e-007,0.999999940395355,2.79563323601906e-008,-2.70829730197875e-007,0.999999940395355,7.99556460151507e-007,-1.6573590500002e-008,0.999999940395355,5.43974998379326e-008,-1.9421602814873e-007,0.999999940395355,-1.35349409902119e-007,-2.70829730197875e-007,0.999999940395355,7.99556460151507e-007,-1.13751511321425e-007,0.999999940395355,6.15042381468811e-007,1.11040328931722e-007,0.999999940395355,4.20550350099802e-008,-1.6573590500002e-008,0.999999940395355,5.43974998379326e-008,-1.13751511321425e-007,0.999999940395355,6.15042381468811e-007,1.59885175321506e-007,0.999999940395355,1.23008362606924e-007,1.91991318843066e-007,0.999999940395355,-2.97128277537695e-008,1.11040328931722e-007,0.999999940395355,4.20550350099802e-008,1.59885175321506e-007,0.999999940395355,1.23008362606924e-007,1.62280244353497e-007,0.999999940395355,1.5376063089434e-008,1.11701218941107e-007,0.999999940395355,1.2913625724309e-008,1.91991318843066e-007,0.999999940395355,-2.97128277537695e-008,1.62280244353497e-007,0.999999940395355,1.5376063089434e-008,-1.62280230142642e-007,0.999999940395355,1.67738729572875e-008,-1.11701154992261e-007,0.999999940395355,3.31620704230318e-008,1.11701218941107e-007,0.999999940395355,1.2913625724309e-008,-1.62280230142642e-007,0.999999940395355,1.67738729572875e-008,-1.59885317430053e-007,0.999999940395355,1.35588919647489e-007,-1.91991460951613e-007,0.999999940395355,-5.18416731765114e-009,-1.11701154992261e-007,0.999999940395355,3.31620704230318e-008,-1.59885317430053e-007,0.999999940395355,1.35588919647489e-007,1.13751866592793e-007,0.999999940395355,6.37407538306434e-007,
+-1.11040229455739e-007,0.999999940395355,4.101623218844e-008,-1.91991460951613e-007,0.999999940395355,-5.18416731765114e-009,1.13751866592793e-007,0.999999940395355,6.37407538306434e-007,2.70829758619584e-007,0.999999940395355,8.1632953197186e-007,1.65736508961345e-008,0.999999940395355,5.05326731570221e-008,-1.11040229455739e-007,0.999999940395355,4.101623218844e-008,2.70829758619584e-007,0.999999940395355,8.1632953197186e-007,1.43287593346031e-007,0.999999940395355,5.59119284204712e-009,1.94215914461893e-007,0.999999940395355,-1.52138156295223e-007,1.65736508961345e-008,0.999999940395355,5.05326731570221e-008,1.43287593346031e-007,0.999999940395355,5.59119284204712e-009,-3.91183732517675e-007,0.999999940395355,-8.33103001696145e-007,5.17173148750771e-008,0.999999940395355,-3.26426089714005e-007,1.94215914461893e-007,0.999999940395355,-1.52138156295223e-007,-3.91183732517675e-007,0.999999940395355,-8.33103001696145e-007,-6.55317251130327e-007,0.999999940395355,-7.71598536175588e-007,-2.94672474865365e-007,0.999999940395355,-1.01979537703301e-007,5.17173148750771e-008,0.999999940395355,-3.26426089714005e-007,-6.55317251130327e-007,0.999999940395355,-7.71598536175588e-007,-5.26017993252026e-006,1,-3.44537124874478e-006,-1.5232648138408e-006,0.999999940395355,-7.99458121036878e-007,-2.94672474865365e-007,0.999999940395355,-1.01979537703301e-007,-5.26017993252026e-006,1,-3.44537124874478e-006,-0.0032683121971786,0.99998939037323,0.00325681455433369,-0.00234561460092664,0.999994516372681,0.00233272672630847,-3.53971358890703e-006,0.999999940395355,-2.33828313866979e-006,-1.5232648138408e-006,0.999999940395355,-7.99458121036878e-007,0.561634242534637,4.53231876917926e-007,-0.827385544776917,0.561634302139282,4.53231962183054e-007,-0.827385485172272,0.620182693004608,-1.5011266896181e-007,-0.784457325935364,0.620182394981384,-1.50117600128397e-007,-0.784457504749298,0.620182693004608,-1.5011266896181e-007,-0.784457325935364,0.565136075019836,-5.27141708062118e-007,-0.82499760389328,0.565136432647705,-5.27141708062118e-007,-0.824997425079346,
+0.620182394981384,-1.50117600128397e-007,-0.784457504749298,0.565136075019836,-5.27141708062118e-007,-0.82499760389328,0.486604422330856,-9.23016756360084e-008,-0.873622238636017,0.486604273319244,-9.22991887364333e-008,-0.873622477054596,0.565136432647705,-5.27141708062118e-007,-0.824997425079346,0.486604422330856,-9.23016756360084e-008,-0.873622238636017,0.403920829296112,1.85712977440744e-007,-0.914793789386749,0.403920650482178,1.85712238476299e-007,-0.914793848991394,0.486604273319244,-9.22991887364333e-008,-0.873622477054596,0.403920829296112,1.85712977440744e-007,-0.914793789386749,0.317791253328323,1.62391884828139e-007,-0.948160529136658,0.317791312932968,1.62391899038994e-007,-0.948160588741302,0.403920650482178,1.85712238476299e-007,-0.914793848991394,0.317791253328323,1.62391884828139e-007,-0.948160529136658,0.228950500488281,1.33899874299459e-007,-0.973438024520874,0.228950336575508,1.33899277443561e-007,-0.973438084125519,0.317791312932968,1.62391899038994e-007,-0.948160588741302,0.228950500488281,1.33899874299459e-007,-0.973438024520874,0.138156399130821,-6.15460180597438e-008,-0.990410387516022,0.138156369328499,-6.15460180597438e-008,-0.990410387516022,0.228950336575508,1.33899277443561e-007,-0.973438084125519,0.138156399130821,-6.15460180597438e-008,-0.990410387516022,0.0461841076612473,-3.90892864743364e-008,-0.998932898044586,0.0461842007935047,-3.90893717394647e-008,-0.998932957649231,0.138156369328499,-6.15460180597438e-008,-0.990410387516022,0.0461841076612473,-3.90892864743364e-008,-0.998932898044586,-0.0461837500333786,-5.86339119479362e-008,-0.998932898044586,-0.0461837388575077,-5.86338977370815e-008,-0.998932898044586,0.0461842007935047,-3.90893717394647e-008,-0.998932957649231,-0.0461837500333786,-5.86339119479362e-008,-0.998932898044586,-0.138156622648239,-1.7590099332665e-007,-0.990410327911377,-0.138156771659851,-1.75901178067761e-007,-0.990410327911377,-0.0461837388575077,-5.86338977370815e-008,-0.998932898044586,-0.138156622648239,-1.7590099332665e-007,-0.990410327911377,-0.228950828313828,1.00635787703141e-007,-0.97343784570694,
+-0.228950753808022,1.00634800048738e-007,-0.973437964916229,-0.138156771659851,-1.75901178067761e-007,-0.990410327911377,-0.228950828313828,1.00635787703141e-007,-0.97343784570694,-0.317791700363159,1.06815143396943e-007,-0.948160409927368,-0.317791700363159,1.06815051026388e-007,-0.948160409927368,-0.228950753808022,1.00634800048738e-007,-0.973437964916229,-0.317791700363159,1.06815143396943e-007,-0.948160409927368,-0.403920888900757,-1.15109919818224e-007,-0.914793848991394,-0.403920859098434,-1.15110040610489e-007,-0.914793908596039,-0.317791700363159,1.06815051026388e-007,-0.948160409927368,-0.403920888900757,-1.15109919818224e-007,-0.914793848991394,-0.486604422330856,-1.39638265395092e-008,-0.873622238636017,-0.486604601144791,-1.39638602902892e-008,-0.873622238636017,-0.403920859098434,-1.15110040610489e-007,-0.914793908596039,-0.486604422330856,-1.39638265395092e-008,-0.873622238636017,-0.565136611461639,-4.81208417113521e-007,-0.824997305870056,-0.565136909484863,-4.81212680369936e-007,-0.824997007846832,-0.486604601144791,-1.39638602902892e-008,-0.873622238636017,-0.565136611461639,-4.81208417113521e-007,-0.824997305870056,-0.620182454586029,-9.82677420324762e-007,-0.784457564353943,-0.620182394981384,-9.82677079264249e-007,-0.784457564353943,-0.565136909484863,-4.81212680369936e-007,-0.824997007846832,-0.620182454586029,-9.82677420324762e-007,-0.784457564353943,-0.561632931232452,-1.15324326088739e-006,-0.827386438846588,-0.561632990837097,-1.15324314720056e-006,-0.827386379241943,-0.620182394981384,-9.82677079264249e-007,-0.784457564353943,-3.06279957840161e-006,-0.999999940395355,2.11532210414589e-006,-2.84219439095068e-008,-0.999999940395355,6.12528694432513e-008,-2.13682582739239e-008,-0.999999940395355,8.97612224548539e-008,-1.15069615276298e-005,-1,7.50591334508499e-006,-2.84219439095068e-008,-0.999999940395355,6.12528694432513e-008,-4.79960462484996e-008,-0.999999940395355,5.3143271117051e-008,-1.43477876690667e-007,-0.999999940395355,1.94058713987033e-007,-2.13682582739239e-008,-0.999999940395355,8.97612224548539e-008,
+-4.79960462484996e-008,-0.999999940395355,5.3143271117051e-008,-3.20978159606966e-008,-0.999999940395355,-4.38813394509907e-008,-4.64919125420238e-008,-0.999999940395355,-2.0388625898704e-007,-1.43477876690667e-007,-0.999999940395355,1.94058713987033e-007,-3.20978159606966e-008,-0.999999940395355,-4.38813394509907e-008,3.4919590774507e-008,-0.999999940395355,-1.12914229077887e-007,1.37813529477171e-007,-0.999999940395355,-4.27119687174127e-007,-4.64919125420238e-008,-0.999999940395355,-2.0388625898704e-007,3.4919590774507e-008,-0.999999940395355,-1.12914229077887e-007,-2.26367546929396e-008,-0.999999940395355,-1.6894109222676e-008,7.16016330670755e-008,-0.999999940395355,2.05571506484148e-008,1.37813529477171e-007,-0.999999940395355,-4.27119687174127e-007,-2.26367546929396e-008,-0.999999940395355,-1.6894109222676e-008,-2.19702116055487e-007,-0.999999940395355,5.90294462199381e-008,-2.35729999076284e-007,-0.999999940395355,1.98698742792658e-007,7.16016330670755e-008,-0.999999940395355,2.05571506484148e-008,-2.19702116055487e-007,-0.999999940395355,5.90294462199381e-008,-1.48727693272122e-007,-0.999999940395355,1.05255022475603e-008,-1.94834996136706e-007,-0.999999940395355,-8.1750850533524e-010,-2.35729999076284e-007,-0.999999940395355,1.98698742792658e-007,-1.48727693272122e-007,-0.999999940395355,1.05255022475603e-008,1.48727622217848e-007,-0.999999940395355,1.05254978066682e-008,1.94834868239013e-007,-0.999999940395355,-8.17575118716718e-010,-1.94834996136706e-007,-0.999999940395355,-8.1750850533524e-010,1.48727622217848e-007,-0.999999940395355,1.05254978066682e-008,2.19702172898906e-007,-0.999999940395355,5.90294106928013e-008,2.35730027497993e-007,-0.999999940395355,1.98698927533769e-007,1.94834868239013e-007,-0.999999940395355,-8.17575118716718e-010,2.19702172898906e-007,-0.999999940395355,5.90294106928013e-008,2.26366374533882e-008,-0.999999940395355,-1.6894153631597e-008,-7.16019599167339e-008,-0.999999940395355,2.055717018834e-008,2.35730027497993e-007,-0.999999940395355,1.98698927533769e-007,2.26366374533882e-008,-0.999999940395355,-1.6894153631597e-008,
+-1.65621631964541e-008,-0.999999940395355,-1.22109724998154e-007,-1.44142717317663e-007,-0.999999940395355,-4.97668054322276e-007,-7.16019599167339e-008,-0.999999940395355,2.055717018834e-008,-1.65621631964541e-008,-0.999999940395355,-1.22109724998154e-007,4.87227431733572e-008,-0.999999940395355,-5.65562672250053e-008,-2.05210035630898e-008,-0.999999940395355,-3.96305409822162e-007,-1.44142717317663e-007,-0.999999940395355,-4.97668054322276e-007,4.87227431733572e-008,-0.999999940395355,-5.65562672250053e-008,2.78624341376599e-008,-0.999999940395355,5.87718460565156e-008,3.03092804188054e-008,-0.999999940395355,2.46235583034604e-008,-2.05210035630898e-008,-0.999999940395355,-3.96305409822162e-007,2.78624341376599e-008,-0.999999940395355,5.87718460565156e-008,1.00207397935037e-008,-0.999999940395355,7.03606062302242e-008,-3.111677671086e-008,-0.999999940395355,4.21952712770235e-008,3.03092804188054e-008,-0.999999940395355,2.46235583034604e-008,1.00207397935037e-008,-0.999999940395355,7.03606062302242e-008,3.06257220472617e-006,-0.999999940395355,2.11517772186198e-006,1.15061066026101e-005,-0.999999940395355,7.50537128624273e-006,-3.111677671086e-008,-0.999999940395355,4.21952712770235e-008,3.06257220472617e-006,-0.999999940395355,2.11517772186198e-006,8.23828759166645e-006,-0.999999940395355,5.53500649402849e-006,0.00557108130306005,-0.999969065189362,-0.00554143497720361,0.00774445664137602,-0.99994021654129,-0.00771815702319145,1.15061066026101e-005,-0.999999940395355,7.50537128624273e-006,0.712200820446014,0.00040806716424413,0.701975584030151,0.712177574634552,0.000436556903878227,0.701999247074127,0.686135351657867,3.71205824194476e-005,0.727473795413971,0.685862720012665,3.63009276043158e-005,0.727730810642242,-0.0582698099315166,0.996598720550537,0.058269489556551,-0.0582698471844196,0.996598839759827,0.0582695230841637,-0.00234561460092664,0.999994516372681,0.00233272672630847,-0.0032683121971786,0.99998939037323,0.00325681455433369,-0.701999306678772,0.000437213864643127,-0.712177395820618,-0.701975703239441,0.000408661464462057,-0.71220064163208,
+-0.701735496520996,0.000117599207442254,-0.712437510490417,-0.701735436916351,0.000117599214718211,-0.712437570095062,0.0725920870900154,-0.994716465473175,-0.0725914984941483,0.0725923255085945,-0.99471640586853,-0.0725917369127274,0.00774445664137602,-0.99994021654129,-0.00771815702319145,0.00557108130306005,-0.999969065189362,-0.00554143497720361,0.685862421989441,-3.66751737601589e-005,0.727731108665466,0.686135053634644,-3.75032068404835e-005,0.72747415304184,0.712177455425262,-0.000437178503489122,0.701999306678772,0.712200701236725,-0.00040874071419239,0.701975643634796,-0.00345165352337062,-0.99998813867569,0.00344822439365089,-0.00329300877638161,-0.999989151954651,0.00328897964209318,-0.058239508420229,-0.996601521968842,0.0582520887255669,-0.0582395605742931,-0.996601581573486,0.0582521483302116,0.00780216697603464,0.999939203262329,-0.0077962507493794,0.00817459914833307,0.999933183193207,-0.00817013718187809,0.0725527405738831,0.994719803333282,-0.0725831240415573,0.0725531578063965,0.994719803333282,-0.0725835338234901,0.712200701236725,-0.00040874071419239,0.701975643634796,0.712177455425262,-0.000437178503489122,0.701999306678772,0.711510956287384,-0.00133867654949427,0.702673673629761,0.711565673351288,-0.00126002624165267,0.702618300914764,-0.0582395605742931,-0.996601581573486,0.0582521483302116,-0.058239508420229,-0.996601521968842,0.0582520887255669,-0.193470925092697,-0.961841106414795,0.193469643592834,-0.193470671772957,-0.96184116601944,0.193469360470772,-0.70225715637207,-0.000751536921598017,-0.711922943592072,-0.70209139585495,0.00159979064483196,-0.712084889411926,-0.692579448223114,0.0662549734115601,-0.718292355537415,-0.702618002891541,-0.00126177864149213,-0.711565971374512,-0.702673554420471,-0.00134028901811689,-0.711511015892029,0.0725531578063965,0.994719803333282,-0.0725835338234901,0.0725527405738831,0.994719803333282,-0.0725831240415573,0.201028928160667,0.958736121654511,-0.201027676463127,0.201029524207115,0.958735883235931,-0.201028272509575,0.711565673351288,-0.00126002624165267,0.702618300914764,
+0.711510956287384,-0.00133867654949427,0.702673673629761,0.710478007793427,-0.00232538697309792,0.703715443611145,0.710564017295837,-0.0022670435719192,0.703628778457642,-0.193470671772957,-0.96184116601944,0.193469360470772,-0.193470925092697,-0.961841106414795,0.193469643592834,-0.370507508516312,-0.851733207702637,0.370505958795547,-0.370507478713989,-0.851733326911926,0.370505958795547,-0.702673554420471,-0.00134028901811689,-0.711511015892029,-0.702618002891541,-0.00126177864149213,-0.711565971374512,-0.703629672527313,-0.00226755067706108,-0.710563182830811,-0.703716397285461,-0.00232598348520696,-0.710477113723755,0.201029524207115,0.958735883235931,-0.201028272509575,0.201028928160667,0.958736121654511,-0.201027676463127,0.367933213710785,0.853962659835815,-0.36793041229248,0.36793327331543,0.853962600231171,-0.367930471897125,0.710564017295837,-0.0022670435719192,0.703628778457642,0.710478007793427,-0.00232538697309792,0.703715443611145,0.709249019622803,-0.00269896280951798,0.704952836036682,0.709314942359924,-0.00269954348914325,0.704886436462402,-0.370507478713989,-0.851733326911926,0.370505958795547,-0.370507508516312,-0.851733207702637,0.370505958795547,-0.521234273910522,-0.675745487213135,0.521231889724731,-0.521234154701233,-0.675745666027069,0.521231770515442,-0.703716397285461,-0.00232598348520696,-0.710477113723755,-0.703629672527313,-0.00226755067706108,-0.710563182830811,-0.704887449741364,-0.00270128063857555,-0.709313869476318,-0.704953789710999,-0.00270076049491763,-0.709248006343842,0.36793327331543,0.853962600231171,-0.367930471897125,0.367933213710785,0.853962659835815,-0.36793041229248,0.516361355781555,0.683187067508698,-0.51635867357254,0.516361117362976,0.683187365531921,-0.516358435153961,0.709314942359924,-0.00269954348914325,0.704886436462402,0.709249019622803,-0.00269896280951798,0.704952836036682,0.708240866661072,-0.00238283886574209,0.705966770648956,0.708269476890564,-0.00240230862982571,0.705938041210175,-0.521234154701233,-0.675745666027069,0.521231770515442,-0.521234273910522,-0.675745487213135,0.521231889724731,
+-0.616617500782013,-0.489459097385406,0.616613745689392,-0.616617500782013,-0.489459246397018,0.616613686084747,-0.704953789710999,-0.00270076049491763,-0.709248006343842,-0.704887449741364,-0.00270128063857555,-0.709313869476318,-0.705939650535584,-0.00240451097488403,-0.708267748355865,-0.705968499183655,-0.00238503352738917,-0.708239138126373,0.516361117362976,0.683187365531921,-0.516358435153961,0.516361355781555,0.683187067508698,-0.51635867357254,0.614584505558014,0.49454402923584,-0.614582717418671,0.614584386348724,0.494544327259064,-0.614582538604736,0.708269476890564,-0.00240230862982571,0.705938041210175,0.708240866661072,-0.00238283886574209,0.705966770648956,0.707610070705414,-0.00173840392380953,0.706600844860077,0.70761901140213,-0.00175220682285726,0.706591904163361,-0.616617500782013,-0.489459246397018,0.616613686084747,-0.616617500782013,-0.489459097385406,0.616613745689392,-0.668814480304718,-0.324619084596634,0.668812036514282,-0.668814420700073,-0.324619174003601,0.668812096118927,-0.705968499183655,-0.00238503352738917,-0.708239138126373,-0.705939650535584,-0.00240451097488403,-0.708267748355865,-0.70659351348877,-0.00175322976429015,-0.707617342472076,-0.706602454185486,-0.00173938507214189,-0.70760852098465,0.614584386348724,0.494544327259064,-0.614582538604736,0.614584505558014,0.49454402923584,-0.614582717418671,0.6684929728508,0.32594296336174,-0.668489456176758,0.66849285364151,0.325943231582642,-0.668489456176758,0.70761901140213,-0.00175220682285726,0.706591904163361,0.707610070705414,-0.00173840392380953,0.706600844860077,0.707278251647949,-0.00103540846612304,0.706934452056885,0.707280397415161,-0.00104211654979736,0.706932365894318,-0.668814420700073,-0.324619174003601,0.668812096118927,-0.668814480304718,-0.324619084596634,0.668812036514282,-0.69503253698349,-0.18402037024498,0.695029675960541,-0.695032477378845,-0.184020519256592,0.695029616355896,-0.706602454185486,-0.00173938507214189,-0.70760852098465,-0.70659351348877,-0.00175322976429015,-0.707617342472076,-0.706933319568634,-0.0010425818618387,-0.707279324531555,
+-0.706935465335846,-0.00103588192723691,-0.707277238368988,0.66849285364151,0.325943231582642,-0.668489456176758,0.6684929728508,0.32594296336174,-0.668489456176758,0.695061802864075,0.183797791600227,-0.695059180259705,0.695061862468719,0.183797836303711,-0.695059239864349,0.707280397415161,-0.00104211654979736,0.706932365894318,0.707278251647949,-0.00103540846612304,0.706934452056885,0.707139551639557,-0.0003436490369495,0.707073867321014,0.707139730453491,-0.000345641688909382,0.707073748111725,-0.695032477378845,-0.184020519256592,0.695029616355896,-0.69503253698349,-0.18402037024498,0.695029675960541,-0.705855429172516,-0.0595241077244282,0.705850422382355,-0.705855429172516,-0.0595242232084274,0.705850422382355,-0.706935465335846,-0.00103588192723691,-0.707277238368988,-0.706933319568634,-0.0010425818618387,-0.707279324531555,-0.707074880599976,-0.00034577728365548,-0.707138538360596,-0.707074999809265,-0.000343778694514185,-0.707138299942017,0.695061862468719,0.183797836303711,-0.695059239864349,0.695061802864075,0.183797791600227,-0.695059180259705,0.705863416194916,0.059296615421772,-0.705861628055573,0.705863416194916,0.0592968612909317,-0.705861568450928,0.707139730453491,-0.000345641688909382,0.707073748111725,0.707139551639557,-0.0003436490369495,0.707073867321014,0.707139730453491,0.000343374616932124,0.707073628902435,0.70713996887207,0.000345362292136997,0.707073509693146,-0.705855429172516,-0.0595242232084274,0.705850422382355,-0.705855429172516,-0.0595241077244282,0.705850422382355,-0.70585560798645,0.0595244877040386,0.705850303173065,-0.705855667591095,0.0595244131982327,0.70585024356842,-0.707074999809265,-0.000343778694514185,-0.707138299942017,-0.707074880599976,-0.00034577728365548,-0.707138538360596,-0.70707505941391,0.000346029293723404,-0.707138359546661,-0.707075238227844,0.000344042462529615,-0.707138180732727,0.705863416194916,0.0592968612909317,-0.705861568450928,0.705863416194916,0.059296615421772,-0.705861628055573,0.705864369869232,-0.0592965148389339,-0.705860733985901,0.705864310264587,-0.0592963472008705,-0.705860733985901,
+0.70713996887207,0.000345362292136997,0.707073509693146,0.707139730453491,0.000343374616932124,0.707073628902435,0.707278728485107,0.00103503430727869,0.706933856010437,0.707280933856964,0.00104175764136016,0.706931829452515,-0.705855667591095,0.0595244131982327,0.70585024356842,-0.70585560798645,0.0595244877040386,0.705850303173065,-0.695033431053162,0.184020966291428,0.69502854347229,-0.695033490657806,0.184020906686783,0.69502854347229,-0.707075238227844,0.000344042462529615,-0.707138180732727,-0.70707505941391,0.000346029293723404,-0.707138359546661,-0.706933975219727,0.00104211340658367,-0.707278728485107,-0.706936061382294,0.0010353981051594,-0.70727664232254,0.705864310264587,-0.0592963472008705,-0.705860733985901,0.705864369869232,-0.0592965148389339,-0.705860733985901,0.695063352584839,-0.183798536658287,-0.695057451725006,0.695063412189484,-0.183798223733902,-0.695057511329651,0.707280933856964,0.00104175764136016,0.706931829452515,0.707278728485107,0.00103503430727869,0.706933856010437,0.707609713077545,0.00173987320158631,0.706601202487946,0.707618594169617,0.00175371766090393,0.706592321395874,-0.695033490657806,0.184020906686783,0.69502854347229,-0.695033431053162,0.184020966291428,0.69502854347229,-0.6688152551651,0.324619799852371,0.668810963630676,-0.668815195560455,0.324619650840759,0.668811023235321,-0.706936061382294,0.0010353981051594,-0.70727664232254,-0.706933975219727,0.00104211340658367,-0.707278728485107,-0.706593632698059,0.00175347202457488,-0.707617342472076,-0.706602573394775,0.00173964002169669,-0.70760840177536,0.695063412189484,-0.183798223733902,-0.695057511329651,0.695063352584839,-0.183798536658287,-0.695057451725006,0.668494343757629,-0.325943827629089,-0.668487668037415,0.668494522571564,-0.325943320989609,-0.668487846851349,0.707618594169617,0.00175371766090393,0.706592321395874,0.707609713077545,0.00173987320158631,0.706601202487946,0.7082399725914,0.00238309823907912,0.705967664718628,0.708268523216248,0.00240239221602678,0.705938935279846,-0.668815195560455,0.324619650840759,0.668811023235321,
+-0.6688152551651,0.324619799852371,0.668810963630676,-0.616616368293762,0.489462167024612,0.616612493991852,-0.616616308689117,0.489462226629257,0.616612434387207,-0.706602573394775,0.00173964002169669,-0.70760840177536,-0.706593632698059,0.00175347202457488,-0.707617342472076,-0.705939590930939,0.00240392005071044,-0.708267867565155,-0.705968379974365,0.00238448660820723,-0.708239197731018,0.668494522571564,-0.325943320989609,-0.668487846851349,0.668494343757629,-0.325943827629089,-0.668487668037415,0.614585697650909,-0.494544953107834,-0.614580810070038,0.614585936069489,-0.494544327259064,-0.614581108093262,0.708268523216248,0.00240239221602678,0.705938935279846,0.7082399725914,0.00238309823907912,0.705967664718628,0.709249079227448,0.00269569433294237,0.704952657222748,0.709315061569214,0.00269618816673756,0.704886317253113,-0.616616308689117,0.489462226629257,0.616612434387207,-0.616616368293762,0.489462167024612,0.616612493991852,-0.521231055259705,0.675749778747559,0.521229565143585,-0.521231055259705,0.675749778747559,0.521229565143585,-0.705968379974365,0.00238448660820723,-0.708239197731018,-0.705939590930939,0.00240392005071044,-0.708267867565155,-0.704887390136719,0.00270002521574497,-0.709313988685608,-0.704953789710999,0.00269951135851443,-0.709248065948486,0.614585936069489,-0.494544327259064,-0.614581108093262,0.614585697650909,-0.494544953107834,-0.614580810070038,0.516362071037292,-0.683187127113342,-0.516357839107513,0.516362607479095,-0.683186292648315,-0.516358375549316,0.709315061569214,0.00269618816673756,0.704886317253113,0.709249079227448,0.00269569433294237,0.704952657222748,0.710478782653809,0.00232182210311294,0.703714728355408,0.710564792156219,0.00226357439532876,0.703628122806549,-0.521231055259705,0.675749778747559,0.521229565143585,-0.521231055259705,0.675749778747559,0.521229565143585,-0.370504170656204,0.851735234260559,0.370504558086395,-0.37050449848175,0.85173511505127,0.370504826307297,-0.704953789710999,0.00269951135851443,-0.709248065948486,-0.704887390136719,0.00270002521574497,-0.709313988685608,
+-0.703628540039063,0.00226764404214919,-0.710564315319061,-0.703715205192566,0.00232588406652212,-0.710478246212006,0.516362607479095,-0.683186292648315,-0.516358375549316,0.516362071037292,-0.683187127113342,-0.516357839107513,0.367933988571167,-0.853962421417236,-0.367929995059967,0.367934763431549,-0.853961884975433,-0.367930769920349,0.710564792156219,0.00226357439532876,0.703628122806549,0.710478782653809,0.00232182210311294,0.703714728355408,0.711511492729187,0.00133715849369764,0.702673017978668,0.71156632900238,0.00125871121417731,0.702617764472961,-0.37050449848175,0.85173511505127,0.370504826307297,-0.370504170656204,0.851735234260559,0.370504558086395,-0.193471863865852,0.961840689182281,0.193471387028694,-0.193471983075142,0.961840629577637,0.193471491336823,-0.703715205192566,0.00232588406652212,-0.710478246212006,-0.703628540039063,0.00226764404214919,-0.710564315319061,-0.702617406845093,0.00126127956900746,-0.711566627025604,-0.702672719955444,0.00133992440532893,-0.711511850357056,0.367934763431549,-0.853961884975433,-0.367930769920349,0.367933988571167,-0.853962421417236,-0.367929995059967,0.201029449701309,-0.958736300468445,-0.201026827096939,0.201029539108276,-0.958736181259155,-0.201026931405067,0.71156632900238,0.00125871121417731,0.702617764472961,0.711511492729187,0.00133715849369764,0.702673017978668,0.712177574634552,0.000436556903878227,0.701999247074127,0.712200820446014,0.00040806716424413,0.701975584030151,-0.193471983075142,0.961840629577637,0.193471491336823,-0.193471863865852,0.961840689182281,0.193471387028694,-0.0582698471844196,0.996598839759827,0.0582695230841637,-0.0582698099315166,0.996598720550537,0.058269489556551,-0.702672719955444,0.00133992440532893,-0.711511850357056,-0.702617406845093,0.00126127956900746,-0.711566627025604,-0.701975703239441,0.000408661464462057,-0.71220064163208,-0.701999306678772,0.000437213864643127,-0.712177395820618,0.201029539108276,-0.958736181259155,-0.201026931405067,0.201029449701309,-0.958736300468445,-0.201026827096939,0.0725923255085945,-0.99471640586853,-0.0725917369127274,
+0.0725920870900154,-0.994716465473175,-0.0725914984941483,-0.0725920051336288,-0.99471640586853,-0.0725921094417572,-0.0725917294621468,-0.994716346263886,-0.0725918263196945,-0.00557107385247946,-0.999969065189362,-0.00554148014634848,-0.0077444645576179,-0.999940276145935,-0.00771824037656188,0.701976239681244,0.000410496402764693,-0.712200164794922,0.701999723911285,0.000439110532170162,-0.712176978588104,0.70173579454422,0.000118811592983548,-0.712437212467194,0.70173579454422,0.000118811578431632,-0.712437152862549,0.0582700967788696,0.996598780155182,0.0582702159881592,0.0582699738442898,0.996598780155182,0.0582700930535793,0.00326843559741974,0.999989330768585,0.00325691723264754,0.00234573241323233,0.999994397163391,0.00233277003280818,-0.712178409099579,0.000437804847024381,0.701998293399811,-0.712201654911041,0.000409312313422561,0.70197468996048,-0.685862958431244,3.66751737601589e-005,0.727730631828308,-0.686135590076447,3.75032832380384e-005,0.727473616600037,-0.00817491393536329,0.999933063983917,-0.00817150250077248,-0.0078024473041296,0.999939143657684,-0.00779755134135485,-0.0725536197423935,0.994719684123993,-0.0725851133465767,-0.0725531578063965,0.994719743728638,-0.0725846588611603,0.00329330540262163,-0.999989211559296,0.0032876399345696,0.00345196854323149,-0.999988079071045,0.00344691821373999,0.0582403726875782,-0.996601581573486,0.0582522228360176,0.0582403019070625,-0.996601462364197,0.0582521520555019,-0.686134934425354,-3.75032250303775e-005,0.72747415304184,-0.685862421989441,-3.66751555702649e-005,0.727731227874756,-0.712201535701752,-0.000409920554375276,0.701974868774414,-0.712178289890289,-0.000438474264228716,0.701998472213745,-0.0725531578063965,0.994719743728638,-0.0725846588611603,-0.0725536197423935,0.994719684123993,-0.0725851133465767,-0.201028853654861,0.958736181259155,-0.201027929782867,-0.201028570532799,0.958736300468445,-0.201027631759644,0.0582403019070625,-0.996601462364197,0.0582521520555019,0.0582403726875782,-0.996601581573486,0.0582522228360176,0.193470701575279,-0.961840987205505,0.193470627069473,
+0.193470850586891,-0.961840987205505,0.193470790982246,-0.712178289890289,-0.000438474264228716,0.701998472213745,-0.712201535701752,-0.000409920554375276,0.701974868774414,-0.711566805839539,-0.00126264442224056,0.702617287635803,-0.7115119099617,-0.00134130055084825,0.702672600746155,-0.201028570532799,0.958736300468445,-0.201027631759644,-0.201028853654861,0.958736181259155,-0.201027929782867,-0.367931336164474,0.853962600231171,-0.367932111024857,-0.367931693792343,0.853962481021881,-0.367932498455048,0.70261937379837,-0.00126389553770423,-0.711564660072327,0.702674746513367,-0.00134213594719768,-0.711509943008423,0.703717112541199,-0.00232598488219082,-0.710476338863373,0.703630328178406,-0.0022675518412143,-0.710562527179718,0.193470850586891,-0.961840987205505,0.193470790982246,0.193470701575279,-0.961840987205505,0.193470627069473,0.370508253574371,-0.851732432842255,0.37050673365593,0.370508372783661,-0.851732432842255,0.370506823062897,-0.7115119099617,-0.00134130055084825,0.702672600746155,-0.711566805839539,-0.00126264442224056,0.702617287635803,-0.71056455373764,-0.00226968876086175,0.703628301620483,-0.710478544235229,-0.00232802587561309,0.703714966773987,-0.367931693792343,0.853962481021881,-0.367932498455048,-0.367931336164474,0.853962600231171,-0.367932111024857,-0.516359269618988,0.683186709880829,-0.516361236572266,-0.516359567642212,0.68318647146225,-0.5163614153862,0.703630328178406,-0.0022675518412143,-0.710562527179718,0.703717112541199,-0.00232598488219082,-0.710476338863373,0.704955339431763,-0.00269814836792648,-0.709246456623077,0.704889118671417,-0.00269892672076821,-0.709312379360199,0.370508372783661,-0.851732432842255,0.370506823062897,0.370508253574371,-0.851732432842255,0.37050673365593,0.521235704421997,-0.675744712352753,0.521231472492218,0.521235823631287,-0.675744593143463,0.521231532096863,-0.710478544235229,-0.00232802587561309,0.703714966773987,-0.71056455373764,-0.00226968876086175,0.703628301620483,-0.7093146443367,-0.00270144059322774,0.704886734485626,-0.709248661994934,-0.00270078261382878,0.704953134059906,
+-0.516359567642212,0.68318647146225,-0.5163614153862,-0.516359269618988,0.683186709880829,-0.516361236572266,-0.61458283662796,0.494543761014938,-0.614584624767303,-0.61458295583725,0.494543641805649,-0.614584684371948,0.704889118671417,-0.00269892672076821,-0.709312379360199,0.704955339431763,-0.00269814836792648,-0.709246456623077,0.705968856811523,-0.00238343887031078,-0.708238840103149,0.705940186977386,-0.00240271771326661,-0.708267331123352,0.521235823631287,-0.675744593143463,0.521231532096863,0.521235704421997,-0.675744712352753,0.521231472492218,0.616616427898407,-0.489459127187729,0.616614758968353,0.616616547107697,-0.489458918571472,0.616614878177643,-0.709248661994934,-0.00270078261382878,0.704953134059906,-0.7093146443367,-0.00270144059322774,0.704886734485626,-0.708267986774445,-0.00240451144054532,0.705939412117004,-0.708239495754242,-0.00238511036150157,0.705968141555786,-0.61458295583725,0.494543641805649,-0.614584684371948,-0.61458283662796,0.494543761014938,-0.614584624767303,-0.668489813804626,0.325942695140839,-0.66849273443222,-0.668489873409271,0.325942546129227,-0.66849273443222,0.705940186977386,-0.00240271771326661,-0.708267331123352,0.705968856811523,-0.00238343887031078,-0.708238840103149,0.706603288650513,-0.00174040079582483,-0.707607686519623,0.706594228744507,-0.00175424828194082,-0.707616627216339,0.616616547107697,-0.489458918571472,0.616614878177643,0.616616427898407,-0.489459127187729,0.616614758968353,0.668812215328217,-0.324618369340897,0.668814659118652,0.668812215328217,-0.324618458747864,0.668814599514008,-0.708239495754242,-0.00238511036150157,0.705968141555786,-0.708267986774445,-0.00240451144054532,0.705939412117004,-0.707616925239563,-0.00175426388159394,0.706594049930573,-0.707607984542847,-0.00174041697755456,0.706602931022644,-0.668489873409271,0.325942546129227,-0.66849273443222,-0.668489813804626,0.325942695140839,-0.66849273443222,-0.695057928562164,0.183798059821129,-0.695062935352325,-0.695057988166809,0.183798030018806,-0.695062935352325,0.706594228744507,-0.00175424828194082,-0.707616627216339,
+0.706603288650513,-0.00174040079582483,-0.707607686519623,0.706936895847321,-0.00103634945116937,-0.707275807857513,0.706934750080109,-0.00104305800050497,-0.707277894020081,0.668812215328217,-0.324618458747864,0.668814599514008,0.668812215328217,-0.324618369340897,0.668814659118652,0.695030570030212,-0.18401962518692,0.695031821727753,0.695030570030212,-0.184019595384598,0.695031762123108,-0.707607984542847,-0.00174041697755456,0.706602931022644,-0.707616925239563,-0.00175426388159394,0.706594049930573,-0.707278251647949,-0.00104224123060703,0.706934452056885,-0.707276046276093,-0.00103551684878767,0.706936597824097,-0.695057988166809,0.183798030018806,-0.695062935352325,-0.695057928562164,0.183798059821129,-0.695062935352325,-0.705859661102295,0.0592971928417683,-0.705865263938904,-0.705859661102295,0.0592971406877041,-0.705865263938904,0.706934750080109,-0.00104305800050497,-0.707277894020081,0.706936895847321,-0.00103634945116937,-0.707275807857513,0.707076191902161,-0.000343966588843614,-0.707137227058411,0.707075953483582,-0.000345963781001046,-0.707137405872345,0.695030570030212,-0.184019595384598,0.695031762123108,0.695030570030212,-0.18401962518692,0.695031821727753,0.705853283405304,-0.0595242455601692,0.705852627754211,0.705853283405304,-0.059524342417717,0.705852627754211,-0.707276046276093,-0.00103551684878767,0.706936597824097,-0.707278251647949,-0.00104224123060703,0.706934452056885,-0.707137286663055,-0.000345595588441938,0.707076072692871,-0.707137048244476,-0.000343605235684663,0.70707631111145,-0.705859661102295,0.0592971406877041,-0.705865263938904,-0.705859661102295,0.0592971928417683,-0.705865263938904,-0.705860376358032,-0.0592969059944153,-0.705864667892456,-0.705860376358032,-0.0592969618737698,-0.705864667892456,0.707075953483582,-0.000345963781001046,-0.707137405872345,0.707076191902161,-0.000343966588843614,-0.707137227058411,0.707076191902161,0.000344308617059141,-0.707137227058411,0.707076013088226,0.000346299057127908,-0.707137405872345,0.705853283405304,-0.059524342417717,0.705852627754211,
+0.705853283405304,-0.0595242455601692,0.705852627754211,0.705853521823883,0.0595246963202953,0.705852270126343,0.705853521823883,0.0595246888697147,0.705852270126343,-0.707137048244476,-0.000343605235684663,0.70707631111145,-0.707137286663055,-0.000345595588441938,0.707076072692871,-0.707137882709503,0.000345406122505665,0.707075536251068,-0.707137703895569,0.000343415595125407,0.707075655460358,-0.705860376358032,-0.0592969618737698,-0.705864667892456,-0.705860376358032,-0.0592969059944153,-0.705864667892456,-0.695059299468994,-0.183798015117645,-0.69506162405014,-0.695059299468994,-0.183798164129257,-0.69506162405014,0.707076013088226,0.000346299057127908,-0.707137405872345,0.707076191902161,0.000344308617059141,-0.707137227058411,0.706936597824097,0.00103563966695219,-0.707276105880737,0.70693451166153,0.00104234111495316,-0.707278251647949,0.705853521823883,0.0595246888697147,0.705852270126343,0.705853521823883,0.0595246963202953,0.705852270126343,0.695031404495239,0.184020981192589,0.695030510425568,0.695031404495239,0.184020921587944,0.695030570030212,-0.707137703895569,0.000343415595125407,0.707075655460358,-0.707137882709503,0.000345406122505665,0.707075536251068,-0.707278966903687,0.00104234402533621,0.706933796405792,-0.707276880741119,0.00103562406729907,0.706935822963715,-0.695059299468994,-0.183798164129257,-0.69506162405014,-0.695059299468994,-0.183798015117645,-0.69506162405014,-0.668490707874298,-0.32594221830368,-0.668492019176483,-0.668490648269653,-0.325942575931549,-0.668492019176483,0.70693451166153,0.00104234111495316,-0.707278251647949,0.706936597824097,0.00103563966695219,-0.707276105880737,0.706603467464447,0.00174012721981853,-0.707607448101044,0.706594526767731,0.00175399880390614,-0.707616329193115,0.695031404495239,0.184020921587944,0.695030570030212,0.695031404495239,0.184020981192589,0.695030510425568,0.668812394142151,0.324619054794312,0.668814122676849,0.668812334537506,0.324619114398956,0.668814063072205,-0.707276880741119,0.00103562406729907,0.706935822963715,-0.707278966903687,0.00104234402533621,0.706933796405792,
+-0.70761638879776,0.0017542204586789,0.706594467163086,-0.707607567310333,0.00174037693068385,0.706603407859802,-0.668490648269653,-0.325942575931549,-0.668492019176483,-0.668490707874298,-0.32594221830368,-0.668492019176483,-0.614582359790802,-0.494543999433517,-0.614584863185883,-0.614582300186157,-0.494544446468353,-0.614584743976593,0.706594526767731,0.00175399880390614,-0.707616329193115,0.706603467464447,0.00174012721981853,-0.707607448101044,0.705969274044037,0.00238535227254033,-0.708238303661346,0.705940544605255,0.00240473099984229,-0.708266913890839,0.668812334537506,0.324619114398956,0.668814063072205,0.668812394142151,0.324619054794312,0.668814122676849,0.616613686084747,0.489462107419968,0.616615235805511,0.616613686084747,0.489462107419968,0.616615176200867,-0.707607567310333,0.00174037693068385,0.706603407859802,-0.70761638879776,0.0017542204586789,0.706594467163086,-0.708267450332642,0.00240382272750139,0.705940067768097,-0.708238840103149,0.00238446751609445,0.705968856811523,-0.614582300186157,-0.494544446468353,-0.614584743976593,-0.614582359790802,-0.494543999433517,-0.614584863185883,-0.51635867357254,-0.683186769485474,-0.516361773014069,-0.516358375549316,-0.683187246322632,-0.516361474990845,0.705940544605255,0.00240473099984229,-0.708266913890839,0.705969274044037,0.00238535227254033,-0.708238303661346,0.704954504966736,0.00269951019436121,-0.709247291088104,0.704888164997101,0.00270002475008368,-0.709313213825226,0.616613686084747,0.489462107419968,0.616615176200867,0.616613686084747,0.489462107419968,0.616615235805511,0.52122974395752,0.675749957561493,0.521230757236481,0.521229803562164,0.675749838352203,0.521230816841125,-0.708238840103149,0.00238446751609445,0.705968856811523,-0.708267450332642,0.00240382272750139,0.705940067768097,-0.70931476354599,0.00269999378360808,0.704886615276337,-0.709248781204224,0.00269934698008001,0.704953014850616,-0.516358375549316,-0.683187246322632,-0.516361474990845,-0.51635867357254,-0.683186769485474,-0.516361773014069,-0.367931813001633,-0.853962063789368,-0.367933183908463,
+-0.367931485176086,-0.853962242603302,-0.367932856082916,0.704888164997101,0.00270002475008368,-0.709313213825226,0.704954504966736,0.00269951019436121,-0.709247291088104,0.703716576099396,0.00232465262524784,-0.710476875305176,0.703629970550537,0.00226622214540839,-0.710562884807587,0.521229803562164,0.675749838352203,0.521230816841125,0.52122974395752,0.675749957561493,0.521230757236481,0.370505303144455,0.851734161376953,0.370505899190903,0.370505303144455,0.851734161376953,0.37050586938858,-0.709248781204224,0.00269934698008001,0.704953014850616,-0.70931476354599,0.00269999378360808,0.704886615276337,-0.710563957691193,0.00226672505959868,0.703628838062286,-0.710478067398071,0.00232524517923594,0.7037153840065,-0.367931485176086,-0.853962242603302,-0.367932856082916,-0.367931813001633,-0.853962063789368,-0.367933183908463,-0.201028272509575,-0.958736300468445,-0.201028108596802,-0.201028317213058,-0.958736300468445,-0.201028138399124,0.703629970550537,0.00226622214540839,-0.710562884807587,0.703716576099396,0.00232465262524784,-0.710476875305176,0.702673971652985,0.00133976130746305,-0.71151065826416,0.702618539333344,0.00126147933769971,-0.711565494537354,0.370505303144455,0.851734161376953,0.37050586938858,0.370505303144455,0.851734161376953,0.370505899190903,0.193472996354103,0.961840152740479,0.193472623825073,0.193473190069199,0.961840033531189,0.193472847342491,-0.710478067398071,0.00232524517923594,0.7037153840065,-0.710563957691193,0.00226672505959868,0.703628838062286,-0.71156632900238,0.00126001914031804,0.702617704868317,-0.711511433124542,0.00133846921380609,0.702673256397247,-0.201028317213058,-0.958736300468445,-0.201028138399124,-0.201028272509575,-0.958736300468445,-0.201028108596802,-0.0725917294621468,-0.994716346263886,-0.0725918263196945,-0.0725920051336288,-0.99471640586853,-0.0725921094417572,0.702618539333344,0.00126147933769971,-0.711565494537354,0.702673971652985,0.00133976130746305,-0.71151065826416,0.701999723911285,0.000439110532170162,-0.712176978588104,0.701976239681244,0.000410496402764693,-0.712200164794922,
+0.193473190069199,0.961840033531189,0.193472847342491,0.193472996354103,0.961840152740479,0.193472623825073,0.0582699738442898,0.996598780155182,0.0582700930535793,0.0582700967788696,0.996598780155182,0.0582702159881592,-0.711511433124542,0.00133846921380609,0.702673256397247,-0.71156632900238,0.00126001914031804,0.702617704868317,-0.712201654911041,0.000409312313422561,0.70197468996048,-0.712178409099579,0.000437804847024381,0.701998293399811,-0.635246872901917,0,-0.772309124469757,-0.739008128643036,0,-0.673696339130402,-0.739008128643036,0,-0.673696398735046,-0.635246813297272,0,-0.772309124469757,1.54286988163221e-006,0.999999940395355,-7.93113315467053e-007,2.80659662621474e-007,0.999999940395355,-1.0463888600043e-007,1.13341123153532e-007,0.999999940395355,1.92766293594104e-007,1.0110088055626e-007,0.999999940395355,2.52210782036855e-007,-2.84219439095068e-008,-0.999999940395355,6.12528694432513e-008,-3.06279957840161e-006,-0.999999940395355,2.11532210414589e-006,9.22658784929808e-008,-0.999999940395355,1.01188582846135e-007,-3.09019689836987e-008,-0.999999940395355,5.12295663668283e-008,2.80659662621474e-007,0.999999940395355,-1.0463888600043e-007,-6.80723175605635e-008,0.999999940395355,-3.06603737953992e-007,-2.3628878409454e-007,0.999999940395355,-1.0379736181676e-007,1.13341123153532e-007,0.999999940395355,1.92766293594104e-007,-4.79960462484996e-008,-0.999999940395355,5.3143271117051e-008,-2.84219439095068e-008,-0.999999940395355,6.12528694432513e-008,-3.09019689836987e-008,-0.999999940395355,5.12295663668283e-008,-1.44252831901781e-008,-0.999999940395355,3.59837981633859e-009,-6.80723175605635e-008,0.999999940395355,-3.06603737953992e-007,-1.9421602814873e-007,0.999999940395355,-1.35349409902119e-007,-2.12122287734928e-007,0.999999940395355,-1.92766464124361e-007,-2.3628878409454e-007,0.999999940395355,-1.0379736181676e-007,-3.20978159606966e-008,-0.999999940395355,-4.38813394509907e-008,-4.79960462484996e-008,-0.999999940395355,5.3143271117051e-008,-1.44252831901781e-008,-0.999999940395355,3.59837981633859e-009,
+-2.70369984178842e-008,-0.999999940395355,1.23754624326011e-008,-1.9421602814873e-007,0.999999940395355,-1.35349409902119e-007,-1.6573590500002e-008,0.999999940395355,5.43974998379326e-008,7.28207965039473e-008,0.999999940395355,-2.07594496259844e-007,-2.12122287734928e-007,0.999999940395355,-1.92766464124361e-007,3.4919590774507e-008,-0.999999940395355,-1.12914229077887e-007,-3.20978159606966e-008,-0.999999940395355,-4.38813394509907e-008,-2.70369984178842e-008,-0.999999940395355,1.23754624326011e-008,-1.2572110019704e-009,-0.999999940395355,-2.44187359221826e-009,-1.6573590500002e-008,0.999999940395355,5.43974998379326e-008,1.11040328931722e-007,0.999999940395355,4.20550350099802e-008,1.90075454042926e-007,0.999999940395355,-1.59403057864438e-007,7.28207965039473e-008,0.999999940395355,-2.07594496259844e-007,-2.26367546929396e-008,-0.999999940395355,-1.6894109222676e-008,3.4919590774507e-008,-0.999999940395355,-1.12914229077887e-007,-1.2572110019704e-009,-0.999999940395355,-2.44187359221826e-009,-5.57704069592546e-008,-0.999999940395355,-3.00616775916751e-008,1.11040328931722e-007,0.999999940395355,4.20550350099802e-008,1.91991318843066e-007,0.999999940395355,-2.97128277537695e-008,2.03279682864377e-007,0.999999940395355,-8.34085724932265e-008,1.90075454042926e-007,0.999999940395355,-1.59403057864438e-007,-2.19702116055487e-007,-0.999999940395355,5.90294462199381e-008,-2.26367546929396e-008,-0.999999940395355,-1.6894109222676e-008,-5.57704069592546e-008,-0.999999940395355,-3.00616775916751e-008,-2.14066815829028e-007,-0.999999940395355,9.92259074905633e-009,1.91991318843066e-007,0.999999940395355,-2.97128277537695e-008,1.11701218941107e-007,0.999999940395355,1.2913625724309e-008,9.39178832481957e-008,0.999999940395355,1.20479333176604e-008,2.03279682864377e-007,0.999999940395355,-8.34085724932265e-008,-1.48727693272122e-007,-0.999999940395355,1.05255022475603e-008,-2.19702116055487e-007,-0.999999940395355,5.90294462199381e-008,-2.14066815829028e-007,-0.999999940395355,9.92259074905633e-009,-1.32516703388319e-007,-0.999999940395355,1.4513643620262e-008,
+1.11701218941107e-007,0.999999940395355,1.2913625724309e-008,-1.11701154992261e-007,0.999999940395355,3.31620704230318e-008,-9.39179187753325e-008,0.999999940395355,3.89240248921396e-008,9.39178832481957e-008,0.999999940395355,1.20479333176604e-008,1.48727622217848e-007,-0.999999940395355,1.05254978066682e-008,-1.48727693272122e-007,-0.999999940395355,1.05255022475603e-008,-1.32516703388319e-007,-0.999999940395355,1.4513643620262e-008,1.325166465449e-007,-0.999999940395355,1.4513637403013e-008,-1.11701154992261e-007,0.999999940395355,3.31620704230318e-008,-1.91991460951613e-007,0.999999940395355,-5.18416731765114e-009,-2.03279711286086e-007,0.999999940395355,-5.46789848954177e-008,-9.39179187753325e-008,0.999999940395355,3.89240248921396e-008,2.19702172898906e-007,-0.999999940395355,5.90294106928013e-008,1.48727622217848e-007,-0.999999940395355,1.05254978066682e-008,1.325166465449e-007,-0.999999940395355,1.4513637403013e-008,2.14066830039883e-007,-0.999999940395355,9.92252680021011e-009,-1.91991460951613e-007,0.999999940395355,-5.18416731765114e-009,-1.11040229455739e-007,0.999999940395355,4.101623218844e-008,-1.90075539308054e-007,0.999999940395355,-1.68670595712683e-007,-2.03279711286086e-007,0.999999940395355,-5.46789848954177e-008,2.26366374533882e-008,-0.999999940395355,-1.6894153631597e-008,2.19702172898906e-007,-0.999999940395355,5.90294106928013e-008,2.14066830039883e-007,-0.999999940395355,9.92252680021011e-009,5.57705099879513e-008,-0.999999940395355,-3.00617060133845e-008,-1.11040229455739e-007,0.999999940395355,4.101623218844e-008,1.65736508961345e-008,0.999999940395355,5.05326731570221e-008,-7.28209812450586e-008,0.999999940395355,-2.18715669575431e-007,-1.90075539308054e-007,0.999999940395355,-1.68670595712683e-007,-1.65621631964541e-008,-0.999999940395355,-1.22109724998154e-007,2.26366374533882e-008,-0.999999940395355,-1.6894153631597e-008,5.57705099879513e-008,-0.999999940395355,-3.00617060133845e-008,2.82940550988542e-008,-0.999999940395355,9.93358995060589e-009,1.65736508961345e-008,0.999999940395355,5.05326731570221e-008,
+1.94215914461893e-007,0.999999940395355,-1.52138156295223e-007,2.12122188258945e-007,0.999999940395355,-2.07594553103263e-007,-7.28209812450586e-008,0.999999940395355,-2.18715669575431e-007,4.87227431733572e-008,-0.999999940395355,-5.65562672250053e-008,-1.65621631964541e-008,-0.999999940395355,-1.22109724998154e-007,2.82940550988542e-008,-0.999999940395355,9.93358995060589e-009,7.30682643279579e-008,-0.999999940395355,6.28967811167058e-008,1.94215914461893e-007,0.999999940395355,-1.52138156295223e-007,5.17173148750771e-008,0.999999940395355,-3.26426089714005e-007,2.07438020538575e-007,0.999999940395355,-1.48281870337996e-007,2.12122188258945e-007,0.999999940395355,-2.07594553103263e-007,2.78624341376599e-008,-0.999999940395355,5.87718460565156e-008,4.87227431733572e-008,-0.999999940395355,-5.65562672250053e-008,7.30682643279579e-008,-0.999999940395355,6.28967811167058e-008,2.70020947823468e-008,-0.999999940395355,7.07780500874833e-008,5.17173148750771e-008,0.999999940395355,-3.26426089714005e-007,-2.94672474865365e-007,0.999999940395355,-1.01979537703301e-007,-1.67872457268459e-007,0.999999940395355,1.33453696093966e-007,2.07438020538575e-007,0.999999940395355,-1.48281870337996e-007,1.00207397935037e-008,-0.999999940395355,7.03606062302242e-008,2.78624341376599e-008,-0.999999940395355,5.87718460565156e-008,2.70020947823468e-008,-0.999999940395355,7.07780500874833e-008,2.44844358121554e-008,-0.999999940395355,8.02633977059486e-008,-2.94672474865365e-007,0.999999940395355,-1.01979537703301e-007,-1.5232648138408e-006,0.999999940395355,-7.99458121036878e-007,-1.27007069750107e-007,0.999999940395355,1.89157702834564e-007,-1.67872457268459e-007,0.999999940395355,1.33453696093966e-007,3.06257220472617e-006,-0.999999940395355,2.11517772186198e-006,1.00207397935037e-008,-0.999999940395355,7.03606062302242e-008,2.44844358121554e-008,-0.999999940395355,8.02633977059486e-008,-9.22661413937931e-008,-0.999999940395355,1.01188476264724e-007,0.635247647762299,0,-0.772308468818665,0.739009261131287,0,-0.673695206642151,0.739009261131287,0,-0.673695206642151,
+0.635247588157654,0,-0.772308468818665,-0.635246813297272,0,-0.772309124469757,-0.303152590990067,0,-0.95294201374054,-0.303152590990067,0,-0.952941954135895,-0.635246872901917,0,-0.772309124469757,-0.303152590990067,0,-0.95294201374054,-0.0461830161511898,0,-0.998933017253876,-0.0461830161511898,0,-0.998932957649231,-0.303152590990067,0,-0.952941954135895,0.45947140455246,0,-0.888192415237427,0.561634302139282,4.53231962183054e-007,-0.827385485172272,0.561634242534637,4.53231876917926e-007,-0.827385544776917,0.459471434354782,0,-0.888192474842072,-0.561632931232452,-1.15324326088739e-006,-0.827386438846588,-0.45947140455246,-1.17162176138663e-006,-0.888192474842072,-0.459471434354782,-1.17162198876031e-006,-0.888192534446716,-0.561632990837097,-1.15324314720056e-006,-0.827386379241943,0.0461838319897652,-4.11893012142173e-007,-0.998932838439941,0.0461838357150555,-4.11893040563882e-007,-0.998932898044586,0.0461838394403458,-4.11893068985592e-007,-0.998932898044586,0.0461838357150555,-4.11893068985592e-007,-0.998932898044586,0.539463400840759,0,-0.842009007930756,0.635247647762299,0,-0.772308468818665,0.635247588157654,0,-0.772308468818665,0.539463341236115,0,-0.842009007930756,-1.14132411965784e-007,0.999999940395355,6.72959998837541e-008,-1.14132419071211e-007,0.999999940395355,6.72959998837541e-008,-1.14132426176639e-007,0.999999940395355,6.72960069891815e-008,3.58468287231517e-006,0.999999940395355,-2.32788261200767e-006,1.54286988163221e-006,0.999999940395355,-7.93113315467053e-007,1.0110088055626e-007,0.999999940395355,2.52210782036855e-007,-1.14132426176639e-007,0.999999940395355,6.72959998837541e-008,2.34338898508213e-007,-0.999999940395355,1.07912207170102e-007,2.34338898508213e-007,-0.999999940395355,1.07912200064675e-007,2.34338884297358e-007,-0.999999940395355,1.07912207170102e-007,9.22658784929808e-008,-0.999999940395355,1.01188582846135e-007,-3.06279957840161e-006,-0.999999940395355,2.11532210414589e-006,-8.23889513412723e-006,-0.999999940395355,5.53539075553999e-006,2.34338870086503e-007,-0.999999940395355,1.07912200064675e-007,
+1.17106608854556e-007,0.999999940395355,0,1.17106594643701e-007,0.999999940395355,0,1.17106587538274e-007,0.999999940395355,0,-1.27007069750107e-007,0.999999940395355,1.89157702834564e-007,-1.5232648138408e-006,0.999999940395355,-7.99458121036878e-007,-3.53971358890703e-006,0.999999940395355,-2.33828313866979e-006,1.17106587538274e-007,0.999999940395355,0,-2.34339410098983e-007,-0.999999940395355,1.07912242697239e-007,8.23828759166645e-006,-0.999999940395355,5.53500649402849e-006,3.06257220472617e-006,-0.999999940395355,2.11517772186198e-006,-9.22661413937931e-008,-0.999999940395355,1.01188476264724e-007,-2.34339395888128e-007,-0.999999940395355,1.07912235591812e-007,-2.34339410098983e-007,-0.999999940395355,1.07912249802666e-007,-2.34339410098983e-007,-0.999999940395355,1.07912228486384e-007,-0.00557107385247946,-0.999969065189362,-0.00554148014634848,-8.23889513412723e-006,-0.999999940395355,5.53539075553999e-006,-3.06279957840161e-006,-0.999999940395355,2.11532210414589e-006,-1.15069615276298e-005,-1,7.50591334508499e-006,-0.0077444645576179,-0.999940276145935,-0.00771824037656188,0.0190604254603386,0.568274319171906,-0.822618365287781,0.0190604254603386,0.568274259567261,-0.822618424892426,0.0190604273229837,0.568274319171906,-0.822618424892426,0.0190742742270231,-0.568303346633911,-0.822597861289978,0.0190742779523134,-0.568303465843201,-0.822597980499268,0.0190742779523134,-0.568303406238556,-0.822597920894623,-0.0190894585102797,-0.568283140659332,-0.822611570358276,-0.0190894603729248,-0.568283140659332,-0.822611570358276,-0.0190894585102797,-0.568283081054688,-0.822611510753632,-0.0190455634146929,0.56827437877655,-0.82261860370636,-0.0190455634146929,0.56827437877655,-0.82261860370636,-0.0190455634146929,0.568274438381195,-0.82261860370636,-0.0105106672272086,-0.999880790710449,0.011308298446238,-0.0106544271111488,-0.99988067150116,0.0111874593421817,-0.0113585498183966,-0.99987930059433,0.0105955852195621,-0.0113585498183966,-0.99987930059433,0.0105955852195621,0.0113593144342303,-0.99987930059433,0.0105963386595249,
+0.0113593144342303,-0.99987930059433,0.0105963386595249,0.0106547428295016,-0.999880611896515,0.0111887147650123,0.0105108851566911,-0.999880731105804,0.0113096628338099,0.00714113004505634,-0.999881982803345,0.013599039055407,0.00744556356221437,-0.9998819231987,0.0134416632354259,0.00487630348652601,-0.999880611896515,0.0146546727046371,0.00468466011807323,-0.999880492687225,0.0147288199514151,0.00247988430783153,-0.999879896640778,0.0152971195057034,0.00268623768351972,-0.999879837036133,0.0152615616098046,-0.000318829115713015,-0.99987918138504,0.0155367832630873,-0.000491580227389932,-0.999879121780396,0.015541622415185,-0.000491580227389932,-0.999879121780396,0.015541622415185,-0.000318829115713015,-0.99987918138504,0.0155367832630873,-0.00245660613290966,-0.999879121780396,0.0153509695082903,-0.00252516660839319,-0.999879121780396,0.0153390010818839,-0.00252516660839319,-0.999879121780396,0.0153390010818839,-0.00245660613290966,-0.999879121780396,0.0153509695082903,-0.00432269088923931,-0.999879062175751,0.0149366147816181,-0.00433902209624648,-0.999879062175751,0.0149315912276506,-0.00433902209624648,-0.999879062175751,0.0149315912276506,-0.00432269088923931,-0.999879062175751,0.0149366147816181,-0.00525987707078457,-0.99987930059433,0.0146226054057479,-0.00526147894561291,-0.99987930059433,0.0146219655871391,-0.00526147894561291,-0.99987930059433,0.0146219655871391,-0.00525987707078457,-0.99987930059433,0.0146226054057479,-0.0055574937723577,-0.999879479408264,0.0144935231655836,-0.00555739784613252,-0.999879479408264,0.0144936218857765,-0.00555739784613252,-0.999879479408264,0.0144936218857765,-0.0055574937723577,-0.999879479408264,0.0144935231655836,-0.00538267521187663,-0.999879837036133,0.0145378783345222,-0.00538495136424899,-0.999879777431488,0.0145371435210109,-0.00538495136424899,-0.999879777431488,0.0145371435210109,-0.00538267521187663,-0.999879837036133,0.0145378783345222,-0.00482724932953715,-0.999880135059357,0.0147103499621153,-0.00483253411948681,-0.999880015850067,0.0147087406367064,-0.00483253411948681,-0.999880015850067,0.0147087406367064,
+-0.00482724932953715,-0.999880135059357,0.0147103499621153,-0.00394987734034657,-0.999880373477936,0.0149511136114597,-0.00395712302997708,-0.999880373477936,0.0149492807686329,-0.00395712302997708,-0.999880373477936,0.0149492807686329,-0.00394987734034657,-0.999880373477936,0.0149511136114597,-0.00280143902637064,-0.99988055229187,0.0151950409635901,-0.00280852057039738,-0.99988067150116,0.0151937715709209,-0.00280852057039738,-0.99988067150116,0.0151937715709209,-0.00280143902637064,-0.99988055229187,0.0151950409635901,-0.00145049777347595,-0.999880731105804,0.0153744779527187,-0.00145489897113293,-0.99988067150116,0.0153740774840117,-0.00145489897113293,-0.99988067150116,0.0153740774840117,-0.00145049777347595,-0.999880731105804,0.0153744779527187,2.68064781039357e-007,-0.999880731105804,0.0154413534328341,2.69874817604432e-007,-0.999880790710449,0.0154413543641567,2.69874817604432e-007,-0.999880790710449,0.0154413543641567,2.68064781039357e-007,-0.999880731105804,0.0154413534328341,0.00145107042044401,-0.999880731105804,0.0153759755194187,0.00145547511056066,-0.99988067150116,0.0153755629435182,0.00145547511056066,-0.99988067150116,0.0153755629435182,0.00145107042044401,-0.999880731105804,0.0153759755194187,0.00280162901617587,-0.99988055229187,0.0151950446888804,0.00280870846472681,-0.999880611896515,0.0151937762275338,0.00280870846472681,-0.999880611896515,0.0151937762275338,0.00280162901617587,-0.99988055229187,0.0151950446888804,0.00395011901855469,-0.999880373477936,0.0149511182680726,0.00395737402141094,-0.999880373477936,0.0149492854252458,0.00395737402141094,-0.999880373477936,0.0149492854252458,0.00395011901855469,-0.999880373477936,0.0149511182680726,0.00482765957713127,-0.999880075454712,0.0147096505388618,0.0048329415731132,-0.999880015850067,0.0147080291062593,0.0048329415731132,-0.999880015850067,0.0147080291062593,0.00482765957713127,-0.999880075454712,0.0147096505388618,0.00538237346336246,-0.999879837036133,0.0145364869385958,0.0053846463561058,-0.999879896640778,0.0145357567816973,0.0053846463561058,-0.999879896640778,0.0145357567816973,
+0.00538237346336246,-0.999879837036133,0.0145364869385958,0.00555754266679287,-0.999879479408264,0.0144921410828829,0.00555745186284184,-0.999879479408264,0.0144922416657209,0.00555745186284184,-0.999879479408264,0.0144922416657209,0.00555754266679287,-0.999879479408264,0.0144921410828829,0.00525992177426815,-0.999879240989685,0.0146219152957201,0.00526152784004807,-0.999879240989685,0.0146212745457888,0.00526152784004807,-0.999879240989685,0.0146212745457888,0.00525992177426815,-0.999879240989685,0.0146219152957201,0.00432145828381181,-0.999879062175751,0.0149366278201342,0.00433779880404472,-0.999879062175751,0.0149316051974893,0.00433779880404472,-0.999879062175751,0.0149316051974893,0.00432145828381181,-0.999879062175751,0.0149366278201342,0.00245627365075052,-0.999879002571106,0.0153517946600914,0.00252474751323462,-0.999879121780396,0.015339782461524,0.00252474751323462,-0.999879121780396,0.015339782461524,0.00245627365075052,-0.999879002571106,0.0153517946600914,0.000319064332870767,-0.99987918138504,0.0155375516042113,0.000491964456159621,-0.999879121780396,0.0155425565317273,-0.00248113460838795,-0.999879896640778,0.0152970626950264,-0.00268747773952782,-0.999879896640778,0.0152616528794169,-0.00487618381157517,-0.99988067150116,0.0146555285900831,-0.00468478258699179,-0.999880492687225,0.0147296776995063,-0.00714085716754198,-0.9998819231987,0.0135983293876052,-0.00744548859074712,-0.9998819231987,0.0134406192228198,-0.0106544271111488,-0.99988067150116,0.0111874593421817,-0.0105106672272086,-0.999880790710449,0.011308298446238,-0.00468478258699179,-0.999880492687225,0.0147296776995063,-0.00487618381157517,-0.99988067150116,0.0146555285900831,-0.00744548859074712,-0.9998819231987,0.0134406192228198,-0.00714085716754198,-0.9998819231987,0.0135983293876052,0.000491964456159621,-0.999879121780396,0.0155425565317273,0.000319064332870767,-0.99987918138504,0.0155375516042113,-0.00268747773952782,-0.999879896640778,0.0152616528794169,-0.00248113460838795,-0.999879896640778,0.0152970626950264,0.0105108851566911,-0.999880731105804,0.0113096628338099,
+0.0106547428295016,-0.999880611896515,0.0111887147650123,0.00744556356221437,-0.9998819231987,0.0134416632354259,0.00714113004505634,-0.999881982803345,0.013599039055407,0.00468466011807323,-0.999880492687225,0.0147288199514151,0.00487630348652601,-0.999880611896515,0.0146546727046371,0.00268623768351972,-0.999879837036133,0.0152615616098046,0.00247988430783153,-0.999879896640778,0.0152971195057034,0.69258052110672,0.066249705851078,-0.718291759490967,0.702093660831451,0.00159587385132909,-0.712082743644714,0.702259421348572,-0.00075539801036939,-0.711920738220215,0.702674746513367,-0.00134213594719768,-0.711509943008423,0.70261937379837,-0.00126389553770423,-0.711564660072327,0.672602593898773,0.0576497130095959,-0.737754821777344,0.492509990930557,0.684213042259216,-0.537853479385376,0.45127934217453,0.707483410835266,-0.543887794017792,0.451279312372208,0.707483410835266,-0.543888032436371,0.673727691173553,0.00137309439014643,-0.738978266716003,0.672602593898773,0.0576497130095959,-0.737754821777344,0.638820946216583,4.4055873331672e-006,-0.769355297088623,0.638820946216583,4.40559188064071e-006,-0.769355297088623,0.673698425292969,8.80851894180523e-006,-0.739006280899048,-0.692579448223114,0.0662549734115601,-0.718292355537415,-0.452041566371918,0.691643595695496,-0.56328272819519,-0.444331377744675,0.702116191387177,-0.556419253349304,-0.355361133813858,0.673891007900238,-0.647757112979889,-0.355662167072296,0.674020230770111,-0.647457301616669,-0.492179602384567,0.686401307582855,-0.53536182641983,-0.492512315511703,0.684202611446381,-0.537864506244659,-0.444331377744675,0.702116191387177,-0.556419253349304,-0.452041566371918,0.691643595695496,-0.56328272819519,-0.489418894052505,0.689913988113403,-0.533373892307281,-0.383498281240463,0.68536388874054,-0.619035661220551,-0.383498340845108,0.685363948345184,-0.619035661220551,-0.338924586772919,0.687195122241974,-0.64256751537323,-0.338918298482895,0.687195181846619,-0.642570674419403,-0.338918298482895,0.687195181846619,-0.642570674419403,-0.338924586772919,0.687195122241974,-0.64256751537323,
+-0.162948578596115,0.687391817569733,-0.707771182060242,-0.162462383508682,0.687392234802246,-0.707882642745972,0.365432262420654,0.719523131847382,0.590546727180481,0.365432322025299,0.719523191452026,0.590546786785126,0.32150587439537,0.721647083759308,0.613073706626892,0.321797013282776,0.721638798713684,0.612930595874786,0.321797013282776,0.721638798713684,0.612930595874786,0.32150587439537,0.721647083759308,0.613073706626892,0.138442024588585,0.721792697906494,0.678121566772461,0.138806313276291,0.721792578697205,0.67804741859436,-0.162462383508682,0.687392234802246,-0.707882642745972,-0.162948578596115,0.687391817569733,-0.707771182060242,-0.0402094908058643,0.68602728843689,-0.726463735103607,-0.0399280115962029,0.686027407646179,-0.726479232311249,0.138806313276291,0.721792578697205,0.67804741859436,0.138442024588585,0.721792697906494,0.678121566772461,0.0211235377937555,0.720210075378418,0.693434298038483,0.0213157050311565,0.720210492610931,0.693427920341492,-0.0399280115962029,0.686027407646179,-0.726479232311249,-0.0402094908058643,0.68602728843689,-0.726463735103607,0.0580754019320011,0.686258852481842,-0.725035071372986,0.0583713613450527,0.686259031295776,-0.725011229515076,0.0583713613450527,0.686259031295776,-0.725011229515076,0.0580754019320011,0.686258852481842,-0.725035071372986,0.179052919149399,0.686231672763824,-0.705000698566437,0.179291248321533,0.68622875213623,-0.704942882061005,0.0213157050311565,0.720210492610931,0.693427920341492,0.0211235377937555,0.720210075378418,0.693434298038483,-0.0661668032407761,0.720267534255981,0.690533518791199,-0.0659657269716263,0.720267534255981,0.690552711486816,-0.0659657269716263,0.720267534255981,0.690552711486816,-0.0661668032407761,0.720267534255981,0.690533518791199,-0.174090653657913,0.720040559768677,0.671739518642426,-0.173943772912025,0.720042645931244,0.671775221824646,0.179291248321533,0.68622875213623,-0.704942882061005,0.179052919149399,0.686231672763824,-0.705000698566437,0.256237685680389,0.686144411563873,-0.680843591690063,0.256386369466782,0.686144351959229,-0.680787742137909,
+0.256386369466782,0.686144351959229,-0.680787742137909,0.256237685680389,0.686144411563873,-0.680843591690063,0.318016082048416,0.685619592666626,-0.654821634292603,0.318068236112595,0.685619652271271,-0.654796302318573,-0.173943772912025,0.720042645931244,0.671775221824646,-0.174090653657913,0.720040559768677,0.671739518642426,-0.242325529456139,0.719878375530243,0.650425493717194,-0.242199197411537,0.719878792762756,0.650471985340118,-0.242199197411537,0.719878792762756,0.650471985340118,-0.242325529456139,0.719878375530243,0.650425493717194,-0.297666609287262,0.719325721263886,0.627666294574738,-0.297616750001907,0.719325840473175,0.627689838409424,0.318068236112595,0.685619652271271,-0.654796302318573,0.318016082048416,0.685619592666626,-0.654821634292603,0.342151582241058,0.685478627681732,-0.642690539360046,0.342131197452545,0.685478687286377,-0.64270144701004,-0.297616750001907,0.719325840473175,0.627689838409424,-0.297666609287262,0.719325721263886,0.627666294574738,-0.320342540740967,0.719149827957153,0.616606831550598,-0.320324659347534,0.719149887561798,0.616616070270538,0.342131197452545,0.685478687286377,-0.64270144701004,0.342151582241058,0.685478627681732,-0.642690539360046,0.340912818908691,0.685494065284729,-0.643332064151764,0.340912759304047,0.685494065284729,-0.643332123756409,-0.320324659347534,0.719149887561798,0.616616070270538,-0.320342540740967,0.719149827957153,0.616606831550598,-0.31976056098938,0.719134509563446,0.616926729679108,-0.31976056098938,0.719134569168091,0.616926729679108,0.340912759304047,0.685494065284729,-0.643332123756409,0.340912818908691,0.685494065284729,-0.643332064151764,0.320244610309601,0.685579359531403,-0.653776943683624,0.320227265357971,0.685579299926758,-0.653785407543182,-0.31976056098938,0.719134569168091,0.616926729679108,-0.31976056098938,0.719134509563446,0.616926729679108,-0.300814151763916,0.719200074672699,0.626308083534241,-0.300814241170883,0.719200134277344,0.626308143138886,0.320227265357971,0.685579299926758,-0.653785407543182,0.320244610309601,0.685579359531403,-0.653776943683624,
+0.282692462205887,0.685693264007568,-0.670752942562103,0.282672554254532,0.685693323612213,-0.670761406421661,-0.300814241170883,0.719200134277344,0.626308143138886,-0.300814151763916,0.719200074672699,0.626308083534241,-0.265767216682434,0.719316244125366,0.641834676265717,-0.265794187784195,0.719316244125366,0.641823530197144,0.282672554254532,0.685693323612213,-0.670761406421661,0.282692462205887,0.685693264007568,-0.670752942562103,0.22958716750145,0.685834527015686,-0.690594434738159,0.229568511247635,0.685834527015686,-0.690600514411926,-0.265794187784195,0.719316244125366,0.641823530197144,-0.265767216682434,0.719316244125366,0.641834676265717,-0.215921372175217,0.719452500343323,0.66012567281723,-0.215948820114136,0.719452500343323,0.660116732120514,0.229568511247635,0.685834527015686,-0.690600514411926,0.22958716750145,0.685834527015686,-0.690594434738159,0.162498667836189,0.685973882675171,-0.709248781204224,0.162483796477318,0.685973882675171,-0.709252178668976,-0.215948820114136,0.719452500343323,0.660116732120514,-0.215921372175217,0.719452500343323,0.66012567281723,-0.152828946709633,0.719589054584503,0.677373468875885,-0.152851581573486,0.719589114189148,0.67736828327179,0.162483796477318,0.685973882675171,-0.709252178668976,0.162498667836189,0.685973882675171,-0.709248781204224,0.084364153444767,0.686083495616913,-0.722614645957947,0.0843560323119164,0.686083495616913,-0.722615599632263,-0.152851581573486,0.719589114189148,0.67736828327179,-0.152828946709633,0.719589054584503,0.677373468875885,-0.0793238133192062,0.719706952571869,0.689731538295746,-0.0793369337916374,0.719706892967224,0.689730048179626,0.0843560323119164,0.686083495616913,-0.722615599632263,0.084364153444767,0.686083495616913,-0.722614645957947,-2.88596851305556e-007,0.686125338077545,-0.72748327255249,-2.38546874697931e-007,0.6861252784729,-0.72748327255249,-0.0793369337916374,0.719706892967224,0.689730048179626,-0.0793238133192062,0.719706952571869,0.689731538295746,9.44135081226705e-007,0.719751358032227,0.694231867790222,8.24454048142798e-007,0.719751358032227,0.694231748580933,
+-2.38546874697931e-007,0.6861252784729,-0.72748327255249,-2.88596851305556e-007,0.686125338077545,-0.72748327255249,-0.084365613758564,0.686079919338226,-0.722617864608765,-0.0843574106693268,0.686079919338226,-0.722618877887726,8.24454048142798e-007,0.719751358032227,0.694231748580933,9.44135081226705e-007,0.719751358032227,0.694231867790222,0.0793255418539047,0.719706416130066,0.689731895923615,0.0793384239077568,0.719706356525421,0.689730405807495,-0.0843574106693268,0.686079919338226,-0.722618877887726,-0.084365613758564,0.686079919338226,-0.722617864608765,-0.162500694394112,0.685973465442657,-0.709248781204224,-0.162485763430595,0.685973465442657,-0.709252178668976,0.0793384239077568,0.719706356525421,0.689730405807495,0.0793255418539047,0.719706416130066,0.689731895923615,0.152832329273224,0.719600915908813,0.677360057830811,0.152854770421982,0.719600856304169,0.677354991436005,-0.162485763430595,0.685973465442657,-0.709252178668976,-0.162500694394112,0.685973465442657,-0.709248781204224,-0.229590386152267,0.685838460922241,-0.690589427947998,-0.22957170009613,0.685838520526886,-0.69059556722641,0.152854770421982,0.719600856304169,0.677354991436005,0.152832329273224,0.719600915908813,0.677360057830811,0.215923085808754,0.719459056854248,0.660117924213409,0.215950459241867,0.719459056854248,0.660108983516693,-0.22957170009613,0.685838520526886,-0.69059556722641,-0.229590386152267,0.685838460922241,-0.690589427947998,-0.282696217298508,0.685694098472595,-0.670750617980957,-0.282676160335541,0.685694098472595,-0.670759081840515,0.215950459241867,0.719459056854248,0.660108983516693,0.215923085808754,0.719459056854248,0.660117924213409,0.265764862298965,0.719314634799957,0.641837537288666,0.265791684389114,0.719314575195313,0.641826510429382,-0.282676160335541,0.685694098472595,-0.670759081840515,-0.282696217298508,0.685694098472595,-0.670750617980957,-0.320244997739792,0.685571670532227,-0.653784811496735,-0.32022762298584,0.685571551322937,-0.653793275356293,0.265791684389114,0.719314575195313,0.641826510429382,
+0.265764862298965,0.719314634799957,0.641837537288666,0.300814002752304,0.719201803207397,0.626306176185608,0.300814002752304,0.719201982021332,0.626306176185608,-0.32022762298584,0.685571551322937,-0.653793275356293,-0.320244997739792,0.685571670532227,-0.653784811496735,-0.340912669897079,0.685487031936646,-0.64333963394165,-0.340912669897079,0.68548709154129,-0.643339693546295,0.300814002752304,0.719201982021332,0.626306176185608,0.300814002752304,0.719201803207397,0.626306176185608,0.319761753082275,0.719135463237762,0.616925060749054,0.319761782884598,0.719135463237762,0.616925120353699,-0.340912669897079,0.68548709154129,-0.643339693546295,-0.340912669897079,0.685487031936646,-0.64333963394165,-0.342153310775757,0.685474991798401,-0.642693638801575,-0.342132925987244,0.685474991798401,-0.642704427242279,0.319761782884598,0.719135463237762,0.616925120353699,0.319761753082275,0.719135463237762,0.616925060749054,0.320341855287552,0.719149351119995,0.616607844829559,0.320323973894119,0.719149351119995,0.61661696434021,-0.342132925987244,0.685474991798401,-0.642704427242279,-0.342153310775757,0.685474991798401,-0.642693638801575,-0.318023294210434,0.68562126159668,-0.654816448688507,-0.318075388669968,0.685621201992035,-0.654791176319122,0.320323973894119,0.719149351119995,0.61661696434021,0.320341855287552,0.719149351119995,0.616607844829559,0.297664821147919,0.719327211380005,0.627665519714355,0.297614902257919,0.719327330589294,0.627689003944397,-0.318075388669968,0.685621201992035,-0.654791176319122,-0.318023294210434,0.68562126159668,-0.654816448688507,-0.256243616342545,0.686142086982727,-0.680843710899353,-0.256393074989319,0.686141967773438,-0.680787444114685,0.297614902257919,0.719327330589294,0.627689003944397,0.297664821147919,0.719327211380005,0.627665519714355,0.242323637008667,0.719872057437897,0.65043318271637,0.242197304964066,0.719872415065765,0.650479733943939,-0.256393074989319,0.686141967773438,-0.680787444114685,-0.256243616342545,0.686142086982727,-0.680843710899353,-0.179055020213127,0.686225235462189,-0.70500648021698,
+-0.179293647408485,0.686222314834595,-0.704948663711548,0.242197304964066,0.719872415065765,0.650479733943939,0.242323637008667,0.719872057437897,0.65043318271637,0.174084365367889,0.720028698444366,0.671753764152527,0.173938184976578,0.720030784606934,0.671789407730103,-0.179293647408485,0.686222314834595,-0.704948663711548,-0.179055020213127,0.686225235462189,-0.70500648021698,-0.0580752529203892,0.686269223690033,-0.725025296211243,-0.0583709292113781,0.686269402503967,-0.725001454353333,0.173938184976578,0.720030784606934,0.671789407730103,0.174084365367889,0.720028698444366,0.671753764152527,0.0661780834197998,0.72026002407074,0.690540373325348,0.065977044403553,0.72026002407074,0.690559446811676,-0.0583709292113781,0.686269402503967,-0.725001454353333,-0.0580752529203892,0.686269223690033,-0.725025296211243,0.0401956140995026,0.68602591753006,-0.726465821266174,0.0399142876267433,0.686026096343994,-0.726481199264526,0.065977044403553,0.72026002407074,0.690559446811676,0.0661780834197998,0.72026002407074,0.690540373325348,-0.0211333427578211,0.720214307308197,0.69342964887619,-0.0213255565613508,0.720214784145355,0.693423211574554,0.0399142876267433,0.686026096343994,-0.726481199264526,0.0401956140995026,0.68602591753006,-0.726465821266174,0.16287662088871,0.687505722045898,-0.707677125930786,0.162391528487206,0.687505304813385,-0.70778900384903,0.162391528487206,0.687505304813385,-0.70778900384903,0.16287662088871,0.687505722045898,-0.707677125930786,0.339071542024612,0.687274038791656,-0.642405331134796,0.338742852210999,0.687281608581543,-0.642570734024048,-0.0213255565613508,0.720214784145355,0.693423211574554,-0.0211333427578211,0.720214307308197,0.69342964887619,-0.138489559292793,0.721896827220917,0.67800110578537,-0.138850584626198,0.721897065639496,0.677926957607269,-0.138850584626198,0.721897065639496,0.677926957607269,-0.138489559292793,0.721896827220917,0.67800110578537,-0.321610242128372,0.721701502799988,0.612954914569855,-0.32161009311676,0.721701502799988,0.612955033779144,0.383515685796738,0.685370922088623,-0.61901718378067,
+0.383515685796738,0.685370981693268,-0.61901718378067,0.338742852210999,0.687281608581543,-0.642570734024048,0.339071542024612,0.687274038791656,-0.642405331134796,-0.365410685539246,0.719522297382355,0.590561151504517,-0.365410715341568,0.719522297382355,0.590561151504517,-0.32161009311676,0.721701502799988,0.612955033779144,-0.321610242128372,0.721701502799988,0.612954914569855,0.0131631745025516,0.999333202838898,-0.0340579077601433,0.0126317422837019,0.99933385848999,-0.0342398285865784,0.015389365144074,0.999327003955841,-0.0332957096397877,0.0153893642127514,0.999327003955841,-0.033295713365078,-0.460911393165588,-0.0015001556603238,0.887444853782654,-0.460845828056335,-0.00150016788393259,0.88747900724411,-0.52176171541214,-0.00148511060979217,0.853089928627014,-0.521761655807495,-0.00148511037696153,0.853089928627014,0.47009265422821,-0.0242825504392385,-0.882282912731171,0.470315217971802,-0.0242821630090475,-0.882164418697357,0.529598116874695,-0.024118160828948,-0.847905576229095,0.529598116874695,-0.0241181626915932,-0.84790563583374,-0.0131643153727055,0.999333143234253,-0.0340595357120037,-0.0153902359306812,0.999326884746552,-0.0332980714738369,-0.0153902349993587,0.999326825141907,-0.0332980677485466,-0.0126328654587269,0.999333798885345,-0.0342413075268269,0.460884869098663,-0.00148310395888984,0.887458622455597,0.521760523319244,-0.00148593739140779,0.853090643882751,0.5217604637146,-0.00148593727499247,0.853090584278107,0.460872918367386,-0.00148310279473662,0.887464880943298,-0.529596745967865,-0.0241164900362492,-0.847906589508057,-0.529596745967865,-0.0241164918988943,-0.847906589508057,-0.470346659421921,-0.0242615062743425,-0.882148087024689,-0.470063239336014,-0.024261923506856,-0.882299244403839,-0.00376740307547152,0.999321699142456,-0.0366325415670872,-0.00286277197301388,0.999319493770599,-0.0367751084268093,0.00312694348394871,0.999315798282623,-0.0368516109883785,0.00262344162911177,0.999313712120056,-0.0369480066001415,0.195184916257858,-0.0014299291651696,0.980765402317047,0.195183932781219,-0.00142992869950831,0.980765461921692,
+0.0253604594618082,-0.00139178044628352,0.999677360057831,0.0253602173179388,-0.00139178044628352,0.999677360057831,-0.22788493335247,-0.0242961775511503,-0.973384857177734,-0.228314444422722,-0.0242962781339884,-0.973284184932709,-0.0589788295328617,-0.0242542717605829,-0.99796450138092,-0.0587277039885521,-0.0242546051740646,-0.997979283332825,0.00719420751556754,0.999327301979065,-0.0359572172164917,0.00764755439013243,0.999328017234802,-0.0358454324305058,0.0128326592966914,0.999336004257202,-0.0340977013111115,0.0125016625970602,0.999335765838623,-0.034229651093483,-0.0999671965837479,-0.00137442408595234,0.99498975276947,-0.0999697670340538,-0.00137442362029105,0.994989395141602,-0.254808723926544,-0.00134705530945212,0.96699047088623,-0.254807084798813,-0.0013470557751134,0.966990947723389,0.0764444246888161,-0.0243818759918213,-0.99677562713623,0.0761941745877266,-0.0243817735463381,-0.996794819831848,0.242582231760025,-0.0244307331740856,-0.969823062419891,0.242784962058067,-0.0244306679815054,-0.969772458076477,0.0125016625970602,0.999335765838623,-0.034229651093483,0.0128326592966914,0.999336004257202,-0.0340977013111115,0.0158067941665649,0.999346613883972,-0.0325015783309937,0.0156991463154554,0.999346196651459,-0.0325697809457779,-0.254807084798813,-0.0013470557751134,0.966990947723389,-0.254808723926544,-0.00134705530945212,0.96699047088623,-0.352188467979431,-0.00133378047030419,0.935928165912628,-0.352180182933807,-0.00133378128521144,0.935931205749512,0.242784962058067,-0.0244306679815054,-0.969772458076477,0.242582231760025,-0.0244307331740856,-0.969823062419891,0.349012762308121,-0.0245249420404434,-0.936796903610229,0.349080473184586,-0.0245250444859266,-0.936771750450134,0.0156991463154554,0.999346196651459,-0.0325697809457779,0.0158067941665649,0.999346613883972,-0.0325015783309937,0.0180271118879318,0.999356627464294,-0.0310048777610064,0.0180081818252802,0.99935644865036,-0.0310193449258804,-0.352180182933807,-0.00133378128521144,0.935931205749512,-0.352188467979431,-0.00133378047030419,0.935928165912628,
+-0.43111976981163,-0.00132315163500607,0.902293682098389,-0.431115567684174,-0.001323152333498,0.902295768260956,0.349080473184586,-0.0245250444859266,-0.936771750450134,0.349012762308121,-0.0245249420404434,-0.936796903610229,0.43428310751915,-0.0246105510741472,-0.900440216064453,0.434295833110809,-0.024610560387373,-0.900433957576752,0.0180081818252802,0.99935644865036,-0.0310193449258804,0.0180271118879318,0.999356627464294,-0.0310048777610064,0.0187046583741903,0.999361515045166,-0.0304397344589233,0.0187044516205788,0.999361515045166,-0.0304401498287916,-0.431115567684174,-0.001323152333498,0.902295768260956,-0.43111976981163,-0.00132315163500607,0.902293682098389,-0.463271737098694,-0.00131704576779157,0.886215269565582,-0.463270574808121,-0.00131704588420689,0.88621574640274,0.434295833110809,-0.024610560387373,-0.900433957576752,0.43428310751915,-0.0246105510741472,-0.900440216064453,0.467806398868561,-0.0246429499238729,-0.883487403392792,0.467806607484818,-0.0246429461985826,-0.883487045764923,0.0187044516205788,0.999361515045166,-0.0304401498287916,0.0187046583741903,0.999361515045166,-0.0304397344589233,0.0183111783117056,0.999363839626312,-0.030603151768446,0.0183082558214664,0.999363839626312,-0.0306047648191452,-0.463270574808121,-0.00131704588420689,0.88621574640274,-0.463271737098694,-0.00131704576779157,0.886215269565582,-0.462133705615997,-0.00131395109929144,0.886809110641479,-0.46213698387146,-0.00131395133212209,0.886807382106781,0.467806607484818,-0.0246429461985826,-0.883487045764923,0.467806398868561,-0.0246429499238729,-0.883487403392792,0.466500252485275,-0.0246493443846703,-0.884177505970001,0.466500133275986,-0.0246493425220251,-0.884177505970001,0.0183082558214664,0.999363839626312,-0.0306047648191452,0.0183111783117056,0.999363839626312,-0.030603151768446,0.0170473419129848,0.999364912509918,-0.0312883779406548,0.0170355159789324,0.999364972114563,-0.0312947332859039,-0.46213698387146,-0.00131395133212209,0.886807382106781,-0.462133705615997,-0.00131395109929144,0.886809110641479,-0.434638142585754,-0.00131313630845398,0.90060418844223,
+-0.434645384550095,-0.00131313619203866,0.900600671768188,0.466500133275986,-0.0246493425220251,-0.884177505970001,0.466500252485275,-0.0246493443846703,-0.884177505970001,0.43844810128212,-0.0246416572481394,-0.898418545722961,0.438455283641815,-0.0246416609734297,-0.898415088653564,0.0170355159789324,0.999364972114563,-0.0312947332859039,0.0170473419129848,0.999364912509918,-0.0312883779406548,0.0149852689355612,0.999365508556366,-0.0323123820126057,0.0149642154574394,0.999365389347076,-0.0323222279548645,-0.434645384550095,-0.00131313619203866,0.900600671768188,-0.434638142585754,-0.00131313630845398,0.90060418844223,-0.384021282196045,-0.00131650688126683,0.923323214054108,-0.384024977684021,-0.00131650664843619,0.923321723937988,0.438455283641815,-0.0246416609734297,-0.898415088653564,0.43844810128212,-0.0246416572481394,-0.898418545722961,0.387191861867905,-0.0246272254735231,-0.921670138835907,0.387204706668854,-0.0246272329241037,-0.921664774417877,0.0149642154574394,0.999365389347076,-0.0323222279548645,0.0149852689355612,0.999365508556366,-0.0323123820126057,0.0121525842696428,0.999365389347076,-0.0334807820618153,0.0121258422732353,0.999365389347076,-0.0334906280040741,-0.384024977684021,-0.00131650664843619,0.923321723937988,-0.384021282196045,-0.00131650688126683,0.923323214054108,-0.312054842710495,-0.0013214967912063,0.950063109397888,-0.312058836221695,-0.00132149655837566,0.950061798095703,0.387204706668854,-0.0246272329241037,-0.921664774417877,0.387191861867905,-0.0246272254735231,-0.921670138835907,0.314557641744614,-0.0246115271002054,-0.948919117450714,0.31457382440567,-0.0246115326881409,-0.948913872241974,0.0121258422732353,0.999365389347076,-0.0334906280040741,0.0121525842696428,0.999365389347076,-0.0334807820618153,0.00860310904681683,0.999365329742432,-0.034568402916193,0.00857762061059475,0.999365210533142,-0.0345748588442802,-0.312058836221695,-0.00132149655837566,0.950061798095703,-0.312054842710495,-0.0013214967912063,0.950063109397888,-0.220922365784645,-0.00132442137692124,0.975290477275848,
+-0.220925733447075,-0.00132442126050591,0.975289702415466,0.31457382440567,-0.0246115326881409,-0.948913872241974,0.314557641744614,-0.0246115271002054,-0.948919117450714,0.222691595554352,-0.0245956927537918,-0.974578499794006,0.222706869244576,-0.0245956983417273,-0.974575102329254,0.00857762061059475,0.999365210533142,-0.0345748588442802,0.00860310904681683,0.999365329742432,-0.034568402916193,0.00447287643328309,0.999365091323853,-0.0353453904390335,0.00445707002654672,0.999365091323853,-0.0353474207222462,-0.220925733447075,-0.00132442126050591,0.975289702415466,-0.220922365784645,-0.00132442137692124,0.975290477275848,-0.114692710340023,-0.00132638728246093,0.993400156497955,-0.114694803953171,-0.00132638728246093,0.993399858474731,0.222706869244576,-0.0245956983417273,-0.974575102329254,0.222691595554352,-0.0245956927537918,-0.974578499794006,0.115630611777306,-0.0245844181627035,-0.992987930774689,0.115640066564083,-0.0245844163000584,-0.992986857891083,0.00445707002654672,0.999365091323853,-0.0353474207222462,0.00447287643328309,0.999365091323853,-0.0353453904390335,-1.9959877306519e-008,0.999365091323853,-0.0356280356645584,-2.55647432112482e-008,0.999365150928497,-0.0356280393898487,-0.114694803953171,-0.00132638728246093,0.993399858474731,-0.114692710340023,-0.00132638728246093,0.993400156497955,7.60219336370938e-007,-0.00132701348047704,0.999999046325684,5.23635890203877e-007,-0.00132701324764639,0.999998986721039,0.115640066564083,-0.0245844163000584,-0.992986857891083,0.115630611777306,-0.0245844181627035,-0.992987930774689,-5.94260257003043e-007,-0.0245804917067289,-0.999697864055634,-5.11501411892823e-007,-0.0245804879814386,-0.999697804450989,-2.55647432112482e-008,0.999365150928497,-0.0356280393898487,-1.9959877306519e-008,0.999365091323853,-0.0356280356645584,-0.00447338819503784,0.999364972114563,-0.0353463552892208,-0.00445759017020464,0.999365091323853,-0.0353483855724335,5.23635890203877e-007,-0.00132701324764639,0.999998986721039,7.60219336370938e-007,-0.00132701348047704,0.999999046325684,
+0.114693880081177,-0.00132633664179593,0.993399918079376,0.11469554156065,-0.00132633652538061,0.993399739265442,-5.11501411892823e-007,-0.0245804879814386,-0.999697804450989,-5.94260257003043e-007,-0.0245804917067289,-0.999697864055634,-0.115631923079491,-0.0245840959250927,-0.992987811565399,-0.115641176700592,-0.0245840977877378,-0.992986738681793,-0.00445759017020464,0.999365091323853,-0.0353483855724335,-0.00447338819503784,0.999364972114563,-0.0353463552892208,-0.00860353372991085,0.999365210533142,-0.0345694310963154,-0.00857806019484997,0.999365150928497,-0.0345758944749832,0.11469554156065,-0.00132633652538061,0.993399739265442,0.114693880081177,-0.00132633664179593,0.993399918079376,0.220923021435738,-0.00132473604753613,0.975290358066559,0.22092604637146,-0.00132473604753613,0.975289702415466,-0.115641176700592,-0.0245840977877378,-0.992986738681793,-0.115631923079491,-0.0245840959250927,-0.992987811565399,-0.222693011164665,-0.0245950035750866,-0.974578261375427,-0.222708120942116,-0.024595009163022,-0.97457492351532,-0.00857806019484997,0.999365150928497,-0.0345758944749832,-0.00860353372991085,0.999365210533142,-0.0345694310963154,-0.0121529549360275,0.999365389347076,-0.0334810242056847,-0.01212621293962,0.999365448951721,-0.0334908738732338,0.22092604637146,-0.00132473604753613,0.975289702415466,0.220923021435738,-0.00132473604753613,0.975290358066559,0.312055915594101,-0.00132230448070914,0.95006275177002,0.312059581279755,-0.00132230448070914,0.950061559677124,-0.222708120942116,-0.024595009163022,-0.97457492351532,-0.222693011164665,-0.0245950035750866,-0.974578261375427,-0.314557820558548,-0.0246100202202797,-0.948919177055359,-0.314573764801025,-0.0246100220829248,-0.948913931846619,-0.01212621293962,0.999365448951721,-0.0334908738732338,-0.0121529549360275,0.999365389347076,-0.0334810242056847,-0.0149861099198461,0.999365389347076,-0.0323134325444698,-0.0149650610983372,0.999365448951721,-0.0323232747614384,0.312059581279755,-0.00132230448070914,0.950061559677124,0.312055915594101,-0.00132230448070914,0.95006275177002,
+0.384022444486618,-0.00131748872809112,0.923322737216949,0.384026020765305,-0.00131748849526048,0.92332124710083,-0.314573764801025,-0.0246100220829248,-0.948913931846619,-0.314557820558548,-0.0246100202202797,-0.948919177055359,-0.38719242811203,-0.0246253795921803,-0.921670079231262,-0.387205064296722,-0.0246253814548254,-0.921664655208588,-0.0149650610983372,0.999365448951721,-0.0323232747614384,-0.0149861099198461,0.999365389347076,-0.0323134325444698,-0.0170477982610464,0.999364972114563,-0.0312885195016861,-0.0170359797775745,0.999364972114563,-0.0312948934733868,0.384026020765305,-0.00131748849526048,0.92332124710083,0.384022444486618,-0.00131748872809112,0.923322737216949,0.434638351202011,-0.00131459441035986,0.900604069232941,0.434645563364029,-0.0013145946431905,0.900600552558899,-0.387205064296722,-0.0246253814548254,-0.921664655208588,-0.38719242811203,-0.0246253795921803,-0.921670079231262,-0.43844872713089,-0.024639330804348,-0.898418307304382,-0.438455790281296,-0.0246393345296383,-0.898414790630341,-0.0170359797775745,0.999364972114563,-0.0312948934733868,-0.0170477982610464,0.999364972114563,-0.0312885195016861,-0.0183112397789955,0.999363780021667,-0.030601654201746,-0.0183083191514015,0.999363839626312,-0.0306032691150904,0.434645563364029,-0.0013145946431905,0.900600552558899,0.434638351202011,-0.00131459441035986,0.900604069232941,0.462134152650833,-0.00131517648696899,0.88680899143219,0.462137460708618,-0.00131517683621496,0.886807322502136,-0.438455790281296,-0.0246393345296383,-0.898414790630341,-0.43844872713089,-0.024639330804348,-0.898418307304382,-0.466499716043472,-0.0246468484401703,-0.88417786359787,-0.466499507427216,-0.0246468484401703,-0.884177923202515,-0.0183083191514015,0.999363839626312,-0.0306032691150904,-0.0183112397789955,0.999363780021667,-0.030601654201746,-0.0187042988836765,0.999361574649811,-0.0304380990564823,-0.0187040884047747,0.999361574649811,-0.0304385125637054,0.462137460708618,-0.00131517683621496,0.886807322502136,0.462134152650833,-0.00131517648696899,0.88680899143219,
+0.463272273540497,-0.00131704297382385,0.886214971542358,0.463271230459213,-0.00131704343948513,0.886215627193451,-0.466499507427216,-0.0246468484401703,-0.884177923202515,-0.466499716043472,-0.0246468484401703,-0.88417786359787,-0.467806994915009,-0.0246409345418215,-0.883487045764923,-0.467807292938232,-0.0246409326791763,-0.883486747741699,-0.0187040884047747,0.999361574649811,-0.0304385125637054,-0.0187042988836765,0.999361574649811,-0.0304380990564823,-0.0180262289941311,0.999356687068939,-0.0310027878731489,-0.0180072914808989,0.999356508255005,-0.0310172438621521,0.463271230459213,-0.00131704343948513,0.886215627193451,0.463272273540497,-0.00131704297382385,0.886214971542358,0.431119650602341,-0.00132260541431606,0.902293741703033,0.431115508079529,-0.00132260611280799,0.902295827865601,-0.467807292938232,-0.0246409326791763,-0.883486747741699,-0.467806994915009,-0.0246409345418215,-0.883487045764923,-0.434283167123795,-0.024608762934804,-0.900440096855164,-0.434296250343323,-0.0246087852865458,-0.900433838367462,-0.0180072914808989,0.999356508255005,-0.0310172438621521,-0.0180262289941311,0.999356687068939,-0.0310027878731489,-0.0158059261739254,0.999346673488617,-0.0325006693601608,-0.0156982764601707,0.999346137046814,-0.032568983733654,0.431115508079529,-0.00132260611280799,0.902295827865601,0.431119650602341,-0.00132260541431606,0.902293741703033,0.352187633514404,-0.00133318325970322,0.935928404331207,0.352179825305939,-0.00133318407461047,0.935931324958801,-0.434296250343323,-0.0246087852865458,-0.900433838367462,-0.434283167123795,-0.024608762934804,-0.900440096855164,-0.349011093378067,-0.0245229639112949,-0.936797618865967,-0.349079012870789,-0.024523064494133,-0.936772286891937,-0.0156982764601707,0.999346137046814,-0.032568983733654,-0.0158059261739254,0.999346673488617,-0.0325006693601608,-0.0128314904868603,0.999336063861847,-0.0340994633734226,-0.0125004034489393,0.999335706233978,-0.0342316552996635,0.352179825305939,-0.00133318407461047,0.935931324958801,0.352187633514404,-0.00133318325970322,0.935928404331207,
+0.254807651042938,-0.00134640850592405,0.966990649700165,0.254805713891983,-0.0013464093208313,0.966991364955902,-0.349079012870789,-0.024523064494133,-0.936772286891937,-0.349011093378067,-0.0245229639112949,-0.936797618865967,-0.242581218481064,-0.0244281105697155,-0.96982342004776,-0.242784574627876,-0.0244280435144901,-0.969772636890411,-0.00719341542571783,0.99932724237442,-0.0359595641493797,-0.00764655787497759,0.999328017234802,-0.0358480922877789,-0.00312637072056532,0.999315857887268,-0.0368501283228397,-0.00262271333485842,0.999313831329346,-0.0369459018111229,0.0999695733189583,-0.00137380301021039,0.994989573955536,0.0999707505106926,-0.00137380277737975,0.994989395141602,-0.0253609754145145,-0.00139124237466604,0.999677240848541,-0.0253613106906414,-0.00139124237466604,0.999677300453186,-0.0764440819621086,-0.0243785437196493,-0.996775686740875,-0.0761935859918594,-0.0243784338235855,-0.996794879436493,0.0589798465371132,-0.024250665679574,-0.997964441776276,0.058727853000164,-0.0242510046809912,-0.997979402542114,0.00376733532175422,0.999321758747101,-0.0366305820643902,0.00286316918209195,0.999319493770599,-0.036772582679987,0.0126317422837019,0.99933385848999,-0.0342398285865784,0.0131631745025516,0.999333202838898,-0.0340579077601433,-0.195252671837807,-0.00146022799890488,0.980751812458038,-0.195247769355774,-0.00146022567059845,0.980752825737,-0.460845828056335,-0.00150016788393259,0.88747900724411,-0.460911393165588,-0.0015001556603238,0.887444853782654,0.227837592363358,-0.0243255347013474,-0.973395168781281,0.228268876671791,-0.0243257712572813,-0.973294138908386,0.470315217971802,-0.0242821630090475,-0.882164418697357,0.47009265422821,-0.0242825504392385,-0.882282912731171,-0.00262271333485842,0.999313831329346,-0.0369459018111229,-0.00312637072056532,0.999315857887268,-0.0368501283228397,0.00286316918209195,0.999319493770599,-0.036772582679987,0.00376733532175422,0.999321758747101,-0.0366305820643902,-0.0253613106906414,-0.00139124237466604,0.999677300453186,-0.0253609754145145,-0.00139124237466604,0.999677240848541,
+-0.195247769355774,-0.00146022567059845,0.980752825737,-0.195252671837807,-0.00146022799890488,0.980751812458038,0.058727853000164,-0.0242510046809912,-0.997979402542114,0.0589798465371132,-0.024250665679574,-0.997964441776276,0.228268876671791,-0.0243257712572813,-0.973294138908386,0.227837592363358,-0.0243255347013474,-0.973395168781281,-0.0125004034489393,0.999335706233978,-0.0342316552996635,-0.0128314904868603,0.999336063861847,-0.0340994633734226,-0.00764655787497759,0.999328017234802,-0.0358480922877789,-0.00719341542571783,0.99932724237442,-0.0359595641493797,0.254805713891983,-0.0013464093208313,0.966991364955902,0.254807651042938,-0.00134640850592405,0.966990649700165,0.0999707505106926,-0.00137380277737975,0.994989395141602,0.0999695733189583,-0.00137380301021039,0.994989573955536,-0.242784574627876,-0.0244280435144901,-0.969772636890411,-0.242581218481064,-0.0244281105697155,-0.96982342004776,-0.0761935859918594,-0.0243784338235855,-0.996794879436493,-0.0764440819621086,-0.0243785437196493,-0.996775686740875,-0.0131643153727055,0.999333143234253,-0.0340595357120037,-0.0126328654587269,0.999333798885345,-0.0342413075268269,-0.00286277197301388,0.999319493770599,-0.0367751084268093,-0.00376740307547152,0.999321699142456,-0.0366325415670872,0.460884869098663,-0.00148310395888984,0.887458622455597,0.460872918367386,-0.00148310279473662,0.887464880943298,0.195183932781219,-0.00142992869950831,0.980765461921692,0.195184916257858,-0.0014299291651696,0.980765402317047,-0.470063239336014,-0.024261923506856,-0.882299244403839,-0.470346659421921,-0.0242615062743425,-0.882148087024689,-0.228314444422722,-0.0242962781339884,-0.973284184932709,-0.22788493335247,-0.0242961775511503,-0.973384857177734,0.00262344162911177,0.999313712120056,-0.0369480066001415,0.00312694348394871,0.999315798282623,-0.0368516109883785,0.00764755439013243,0.999328017234802,-0.0358454324305058,0.00719420751556754,0.999327301979065,-0.0359572172164917,0.0253602173179388,-0.00139178044628352,0.999677360057831,0.0253604594618082,-0.00139178044628352,0.999677360057831,
+-0.0999697670340538,-0.00137442362029105,0.994989395141602,-0.0999671965837479,-0.00137442408595234,0.99498975276947,-0.0587277039885521,-0.0242546051740646,-0.997979283332825,-0.0589788295328617,-0.0242542717605829,-0.99796450138092,0.0761941745877266,-0.0243817735463381,-0.996794819831848,0.0764444246888161,-0.0243818759918213,-0.99677562713623,0.702093660831451,0.00159587385132909,-0.712082743644714,0.69258052110672,0.066249705851078,-0.718291759490967,0.45203822851181,0.691637694835663,-0.563292682170868,0.48941445350647,0.689920663833618,-0.533369302749634,0.492175161838531,0.686408638954163,-0.535356521606445,0.492509990930557,0.684213042259216,-0.537853479385376,0.672602593898773,0.0576497130095959,-0.737754821777344,0.673727691173553,0.00137309439014643,-0.738978266716003,-0.489418894052505,0.689913988113403,-0.533373892307281,-0.452041566371918,0.691643595695496,-0.56328272819519,-0.692579448223114,0.0662549734115601,-0.718292355537415,-0.70209139585495,0.00159979064483196,-0.712084889411926,-0.673727691173553,0.00137342023663223,-0.738978266716003,-0.672601997852325,0.0576485246419907,-0.737755477428436,-0.492512315511703,0.684202611446381,-0.537864506244659,-0.492179602384567,0.686401307582855,-0.53536182641983
+			} 
+			NormalsW: *4196 {
+				a: 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+			} 
+		}
+		LayerElementUV: 0 {
+			Version: 101
+			Name: "map1"
+			MappingInformationType: "ByPolygonVertex"
+			ReferenceInformationType: "IndexToDirect"
+			UV: *3396 {
+				a: 0.674125075340271,0.73811537027359,0.67329478263855,0.7376469373703,0.680572211742401,0.723486304283142,0.681468546390533,0.723825216293335,0.665161728858948,0.748410165309906,0.664431989192963,0.747825562953949,0.668484508991241,0.730102598667145,0.674614429473877,0.718050956726074,0.686076104640961,0.705978870391846,0.687008619308472,0.706202030181885,0.679355502128601,0.73811537027359,0.68661892414093,0.723825216293335,0.655097723007202,0.754486441612244,0.654481589794159,0.753832817077637,0.661335051059723,0.738450407981873,0.67951625585556,0.70243626832962,0.689765155315399,0.685916900634766,0.690715432167053,0.686042666435242,0.692098259925842,0.706202030181885,0.644631266593933,0.757023751735687,0.644102811813354,0.756348788738251,0.653164148330688,0.743396639823914,0.682931542396545,0.683941125869751,0.691617608070374,0.664237141609192,0.692575097084045,0.664277672767639,0.695764005184174,0.686042666435242,0.634286344051361,0.757538020610809,0.633798241615295,0.756861388683319,0.643915235996246,0.745467901229858,0.684681713581085,0.663603901863098,0.691617608070374,0.642002046108246,0.692575097084045,0.641961574554443,0.69760262966156,0.664277672767639,0.633798241615295,0.745683908462524,0.684681713581085,0.642635345458984,0.689765155315399,0.620322227478027,0.690715372562408,0.620196580886841,0.69760262966156,0.641961574554443,0.612925827503204,0.74568384885788,0.612925827503204,0.756861448287964,0.682931542396545,0.622298061847687,0.686076164245605,0.600260257720947,0.687008500099182,0.600037157535553,0.695764005184174,0.620196580886841,0.594255030155182,0.74568384885788,0.594255030155182,0.756861448287964,0.679516196250916,0.603802978992462,0.680572271347046,0.582752764225006,0.681468427181244,0.582413971424103,0.692098200321198,0.600037157535553,0.577945172786713,0.74568384885788,0.577945172786713,0.756861448287964,0.674614250659943,0.588188350200653,0.673294961452484,0.568592011928558,0.674124896526337,0.568123817443848,0.686618804931641,0.582413971424103,0.668484330177307,0.576136887073517,
+0.664432168006897,0.55841326713562,0.665161490440369,0.557829022407532,0.679355263710022,0.568123817443848,0.661334812641144,0.567789375782013,0.654481709003448,0.552405953407288,0.655097424983978,0.551752746105194,0.653163969516754,0.562843143939972,0.644102931022644,0.549890160560608,0.644631028175354,0.549215495586395,0.643915235996246,0.560771703720093,0.633798241615295,0.549377858638763,0.634286344051361,0.548701167106628,0.633798241615295,0.560555279254913,0.612925827503204,0.549377739429474,0.612925827503204,0.560555398464203,0.594255030155182,0.549377739429474,0.594255030155182,0.560555398464203,0.577945172786713,0.549377739429474,0.577945172786713,0.560555398464203,0.474232137203217,0.738327622413635,0.473399639129639,0.738792598247528,0.467349499464035,0.726740956306458,0.46824648976326,0.726403892040253,0.481182307004929,0.74655693769455,0.480450361967087,0.747140407562256,0.468588531017303,0.746337175369263,0.461391359567642,0.73217636346817,0.462508320808411,0.711126267910004,0.463440716266632,0.71090304851532,0.479462027549744,0.738327622413635,0.473396629095078,0.726403892040253,0.489117443561554,0.751430928707123,0.488503992557526,0.752086639404297,0.477352231740952,0.756515979766846,0.455948263406754,0.714668929576874,0.459133982658386,0.692631125450134,0.460084170103073,0.692504823207855,0.468530267477036,0.71090304851532,0.498137444257736,0.753481388092041,0.497617065906525,0.754157900810242,0.487185209989548,0.762523293495178,0.45230033993721,0.694606959819794,0.45740482211113,0.672293901443481,0.458362311124802,0.672253012657166,0.465132713317871,0.692504823207855,0.508071660995483,0.753696739673615,0.507576584815979,0.754373788833618,0.497444957494736,0.764092683792114,0.496852964162827,0.764897644519806,0.450468957424164,0.67292720079422,0.457404851913452,0.651325345039368,0.458362311124802,0.651366114616394,0.463389873504639,0.672253012657166,0.498111099004745,0.765073478221893,0.497801154851913,0.765624403953552,0.450468957424164,0.650692105293274,0.459134042263031,0.630988001823425,0.460084170103073,
+0.631114304065704,0.463389873504639,0.651366114616394,0.452300399541855,0.629012286663055,0.462508380413055,0.612492978572845,0.46344068646431,0.61271607875824,0.465132743120193,0.631114304065704,0.455948323011398,0.60895037651062,0.467349678277969,0.596878290176392,0.468246340751648,0.597215294837952,0.468530386686325,0.612716138362885,0.461391478776932,0.591442823410034,0.473399847745895,0.5848268866539,0.474231868982315,0.585291504859924,0.473396807909012,0.597215294837952,0.468588680028915,0.577282249927521,0.480450600385666,0.576479315757751,0.481181889772415,0.577062249183655,0.479462325572968,0.585291504859924,0.477352410554886,0.567103624343872,0.488504081964493,0.571533143520355,0.489116996526718,0.572188258171082,0.487185269594193,0.561096370220184,0.497617065906525,0.569461703300476,0.498137205839157,0.570137858390808,0.497428596019745,0.55858051776886,0.507580161094666,0.569245338439941,0.508058965206146,0.569922387599945,0.507580161094666,0.558067739009857,0.72804582118988,0.737646579742432,0.72721540927887,0.738115012645721,0.719871997833252,0.723824918270111,0.720768451690674,0.723485946655273,0.736908614635468,0.74782520532608,0.736178755760193,0.748409807682037,0.721985101699829,0.738115012645721,0.7147216796875,0.723824858665466,0.714331984519959,0.706201672554016,0.715264439582825,0.705978512763977,0.732856094837189,0.730102181434631,0.726726174354553,0.718050539493561,0.746858954429626,0.753832459449768,0.746242880821228,0.75448602437973,0.740005552768707,0.738449990749359,0.709242284297943,0.706201612949371,0.710625112056732,0.686042308807373,0.711575448513031,0.685916543006897,0.72182434797287,0.702435851097107,0.757237732410431,0.756348371505737,0.756709337234497,0.757023334503174,0.748176455497742,0.743396282196045,0.705576598644257,0.686042308807373,0.70876544713974,0.664277315139771,0.709722936153412,0.664236783981323,0.718408942222595,0.683940827846527,0.76754242181778,0.756860971450806,0.767054200172424,0.757537722587585,0.757425367832184,0.74546754360199,0.703737854957581,0.664277315139771,
+0.70876544713974,0.641961216926575,0.709722936153412,0.642001688480377,0.7166588306427,0.663603484630585,0.76754242181778,0.745683550834656,0.703737854957581,0.641961216926575,0.710625231266022,0.620196223258972,0.711575388908386,0.620321929454803,0.7166588306427,0.642634987831116,0.788414776325226,0.745683491230011,0.788414776325226,0.756861090660095,0.705576598644257,0.620196223258972,0.714331984519959,0.600036859512329,0.71526437997818,0.600259959697723,0.71840900182724,0.622297704219818,0.807085573673248,0.745683491230011,0.807085573673248,0.756861090660095,0.709242403507233,0.600036859512329,0.719872176647186,0.582413613796234,0.72076827287674,0.582752466201782,0.721824407577515,0.603802680969238,0.823395371437073,0.745683491230011,0.823395371437073,0.756861090660095,0.714721739292145,0.582413613796234,0.727215707302094,0.568123459815979,0.728045582771301,0.56859165430069,0.726726353168488,0.588187992572784,0.721985280513763,0.568123459815979,0.736179113388062,0.557828664779663,0.736908495426178,0.558412909507751,0.732856333255768,0.576136529445648,0.746243178844452,0.551752388477325,0.746858894824982,0.552405595779419,0.740005731582642,0.567789018154144,0.756709575653076,0.549215197563171,0.757237732410431,0.549889862537384,0.748176574707031,0.562842786312103,0.767054200172424,0.54870080947876,0.76754242181778,0.549377501010895,0.757425367832184,0.560771346092224,0.76754242181778,0.560554981231689,0.788414776325226,0.549377381801605,0.788414776325226,0.560555040836334,0.807085573673248,0.549377381801605,0.807085573673248,0.560555040836334,0.823395371437073,0.549377381801605,0.823395371437073,0.560555040836334,0.548879086971283,0.738792538642883,0.548046588897705,0.738327622413635,0.554032206535339,0.726403832435608,0.554929196834564,0.726740896701813,0.541828393936157,0.747140347957611,0.541096448898315,0.74655693769455,0.542816758155823,0.738327622413635,0.548882126808167,0.726403832435608,0.55883800983429,0.71090304851532,0.559770405292511,0.711126148700714,0.553690195083618,0.746337175369263,0.560887396335602,
+0.73217636346817,0.533774733543396,0.752086639404297,0.533161282539368,0.751430928707123,0.544926464557648,0.756515920162201,0.553748488426209,0.71090304851532,0.562194526195526,0.692504823207855,0.563144743442535,0.692631125450134,0.56633049249649,0.714668929576874,0.524661660194397,0.754157900810242,0.524141252040863,0.753481388092041,0.535093545913696,0.762523233890533,0.557145953178406,0.692504823207855,0.563916444778442,0.672253012657166,0.564873874187469,0.672293901443481,0.569978415966034,0.694606900215149,0.514702141284943,0.754373788833618,0.514207005500793,0.753696739673615,0.525425732135773,0.764897644519806,0.524833798408508,0.764092683792114,0.558888852596283,0.672253012657166,0.563916444778442,0.651366114616394,0.564873874187469,0.651325345039368,0.571809828281403,0.67292720079422,0.524477541446686,0.765624344348907,0.524167656898499,0.765073418617249,0.558888852596283,0.651366114616394,0.562194585800171,0.631114304065704,0.563144683837891,0.630988001823425,0.571809768676758,0.650692105293274,0.557145953178406,0.631114304065704,0.558838069438934,0.61271607875824,0.559770345687866,0.612492978572845,0.569978356361389,0.629012286663055,0.553748369216919,0.61271607875824,0.554032385349274,0.597215294837952,0.554929077625275,0.596878290176392,0.566330432891846,0.60895037651062,0.548881947994232,0.597215294837952,0.548046886920929,0.585291564464569,0.548878848552704,0.5848268866539,0.560887277126312,0.591442883014679,0.542816400527954,0.585291564464569,0.541096806526184,0.577062249183655,0.541828155517578,0.576479375362396,0.553690016269684,0.577282249927521,0.533161699771881,0.572188258171082,0.533774614334106,0.571533143520355,0.544926285743713,0.567103683948517,0.524141550064087,0.570137858390808,0.524661660194397,0.569461703300476,0.535093426704407,0.561096370220184,0.514219641685486,0.569922387599945,0.514698445796967,0.569245338439941,0.524850130081177,0.55858051776886,0.514698445796967,0.558067739009857,0.962978482246399,0.509928226470947,0.963084995746613,0.510034739971161,0.962798714637756,0.510286748409271,
+0.943281710147858,0.490231513977051,0.960986316204071,0.511882901191711,0.941963672637939,0.492860287427902,0.923792243003845,0.468970507383347,0.922319173812866,0.471433579921722,0.906229078769684,0.446089595556259,0.904604732990265,0.448355674743652,0.890727400779724,0.421764671802521,0.888956725597382,0.423801183700562,0.877405345439911,0.396180987358093,0.875497162342072,0.397953420877457,0.866364359855652,0.369533360004425,0.86433219909668,0.371006458997726,0.857688546180725,0.342024594545364,0.855551421642303,0.34316498041153,0.851443886756897,0.313864231109619,0.849226534366608,0.314642757177353,0.847678005695343,0.285266637802124,0.845410168170929,0.28566175699234,0.846419453620911,0.256449669599533,0.844134330749512,0.256449669599533,0.847678005695343,0.227632761001587,0.845410108566284,0.227237597107887,0.851443886756897,0.199035197496414,0.849226534366608,0.198256582021713,0.857688546180725,0.170874819159508,0.855551421642303,0.169734433293343,0.866364359855652,0.143366053700447,0.86433219909668,0.141892954707146,0.877405345439911,0.116718411445618,0.875497162342072,0.11494592577219,0.890727400779724,0.0911346822977066,0.888956725597382,0.0890980884432793,0.906229019165039,0.0668097659945488,0.904604613780975,0.0645437389612198,0.923792243003845,0.043928898870945,0.922319114208221,0.0414658486843109,0.943281710147858,0.022667845711112,0.941887497901917,0.0201187059283257,0.960012912750244,0.00199021096341312,0.962037086486816,0.00391250289976597,0.0178544688969851,0.558632075786591,0.0165364313870668,0.556003332138062,0.0278674438595772,0.54467236995697,0.0291865319013596,0.547300040721893,0.0123535860329866,0.560186207294464,0.0136715872213244,0.562814950942993,0.0320503227412701,0.540489494800568,0.033368818461895,0.543117582798004,0.00817073974758387,0.564369022846222,0.00948874186724424,0.566997885704041,0.0362331718206406,0.53630656003952,0.0375519767403603,0.53893381357193,0.00681797228753567,0.569668591022491,0.0042959158308804,0.568243861198425,0.0475661791861057,0.524973571300507,0.0489606969058514,
+0.527523219585419,0.051716223359108,0.52072811126709,0.0531105287373066,0.523277401924133,0.0558085590600967,0.516362011432648,0.0572027936577797,0.518911182880402,0.0671687945723534,0.503969192504883,0.0686431229114532,0.506430923938751,0.071157842874527,0.499411314725876,0.0726316124200821,0.501873731613159,0.0750000402331352,0.494628638029099,0.0764743387699127,0.497090250253677,0.0850207358598709,0.481573969125748,0.0866454243659973,0.483839601278305,0.0887080803513527,0.476533800363541,0.0903326645493507,0.478799641132355,0.0922249630093575,0.471276015043259,0.0938496515154839,0.473541557788849,0.100861310958862,0.45772397518158,0.102632328867912,0.459759920835495,0.10419587045908,0.452214777469635,0.105966784060001,0.454251110553741,0.107335060834885,0.446500033140183,0.109106041491032,0.448535919189453,0.11457647383213,0.432593584060669,0.116484977304935,0.43436536192894,0.117503620684147,0.42664036154747,0.119412057101727,0.428412526845932,0.120209999382496,0.420499473810196,0.122118435800076,0.422271221876144,0.126066967844963,0.40636345744133,0.128099411725998,0.407835930585861,0.128530651330948,0.400005787611008,0.130563095211983,0.40147864818573,0.130748853087425,0.393485277891159,0.132781237363815,0.394957691431046,0.135248005390167,0.379219681024551,0.137385353446007,0.380359470844269,0.137193873524666,0.372514307498932,0.139331221580505,0.373654425144196,0.138872027397156,0.365678161382675,0.141009300947189,0.36681792140007,0.142048582434654,0.351353466510773,0.144266054034233,0.352131605148315,0.143428325653076,0.344375103712082,0.145645871758461,0.345153480768204,0.144522562623024,0.337304949760437,0.14674000442028,0.338083058595657,0.14641135931015,0.322961926460266,0.148679241538048,0.323356747627258,0.14718759059906,0.315801799297333,0.149455606937408,0.316196799278259,0.147666737437248,0.308594346046448,0.149934589862823,0.30898916721344,0.148293197154999,0.294249147176743,0.150578305125237,0.294249147176743,0.14844374358654,0.287010878324509,0.150729060173035,0.287010878324509,0.148293197154999,
+0.279772609472275,0.150578305125237,0.279772579669952,0.147666737437248,0.26542741060257,0.149934589862823,0.265032589435577,0.14718759059906,0.258219927549362,0.149455651640892,0.257824957370758,0.14641135931015,0.251059830188751,0.148679241538048,0.250665009021759,0.144522607326508,0.23671680688858,0.14674000442028,0.235938712954521,0.143428325653076,0.229646652936935,0.145645871758461,0.228868290781975,0.142048582434654,0.222668260335922,0.144266054034233,0.221890166401863,0.138872057199478,0.208343610167503,0.141009300947189,0.20720386505127,0.137193873524666,0.201507464051247,0.139331221580505,0.200367331504822,0.135248005390167,0.194802105426788,0.137385353446007,0.193662285804749,0.130748853087425,0.180536478757858,0.132781267166138,0.179064035415649,0.12853068113327,0.17401596903801,0.130563095211983,0.172543108463287,0.126066997647285,0.167658299207687,0.128099456429482,0.166185840964317,0.120209999382496,0.153522297739983,0.122118435800076,0.151750504970551,0.11750365793705,0.147381410002708,0.119412057101727,0.145609244704247,0.114576511085033,0.141428217291832,0.116484977304935,0.139656394720078,0.107335060834885,0.127521678805351,0.109106041491032,0.125485837459564,0.10419587045908,0.121806941926479,0.105966821312904,0.119770705699921,0.100861310958862,0.116297744214535,0.102632366120815,0.114261820912361,0.0922250002622604,0.102745749056339,0.0938496887683868,0.10048021376133,0.0887080803513527,0.0974879860877991,0.0903327018022537,0.0952221006155014,0.0850207731127739,0.0924478024244308,0.0866454616189003,0.0901822000741959,0.0750000774860382,0.0793931037187576,0.0764734968543053,0.0769304037094116,0.07115788012743,0.0746104940772057,0.0726311579346657,0.0721476525068283,0.0671688318252563,0.0700526162981987,0.0686419978737831,0.0675903037190437,0.0558116100728512,0.0576630719006062,0.0571318231523037,0.0550359077751637,0.0517178028821945,0.0532952733337879,0.0530369281768799,0.0506674088537693,0.0475693382322788,0.0490513145923615,0.0488894097507,0.0464245714247227,0.0362331718206406,0.0377151444554329,
+0.0375512056052685,0.0350863710045815,0.0320503599941731,0.0335322991013527,0.0333683602511883,0.0309035237878561,0.0278674773871899,0.0293494537472725,0.0291854795068502,0.0267206784337759,0.0165364667773247,0.0180184077471495,0.0178544688969851,0.0153896315023303,0.0123535860329866,0.0138355614617467,0.0136715872213244,0.0112067852169275,0.00817073974758387,0.00965264532715082,0.00948874186724424,0.00702393939718604,0.00199203519150615,0.00347397569566965,0.00445504812523723,0.00199021096341312,0.503993153572083,0.514742851257324,0.483154028654099,0.49188357591629,0.489393383264542,0.486702501773834,0.509706676006317,0.508985042572021,0.503504991531372,0.51521247625351,0.482632637023926,0.492316573858261,0.464520990848541,0.467209458351135,0.471211791038513,0.462626129388809,0.509527623653412,0.507783651351929,0.489914834499359,0.486269474029541,0.519920408725739,0.519352078437805,0.514338076114655,0.524934470653534,0.463961839675903,0.467592418193817,0.448244124650955,0.440921276807785,0.455329239368439,0.436974883079529,0.471770912408829,0.46224308013916,0.510892689228058,0.509223639965057,0.519667327404022,0.518131077289581,0.519977271556854,0.519282221794128,0.530251383781433,0.529818475246429,0.524804532527924,0.535265326499939,0.447652012109756,0.441251128911972,0.434462159872055,0.413243502378464,0.441881209611893,0.409967660903931,0.455921351909637,0.436645120382309,0.530370354652405,0.500995874404907,0.519927501678467,0.494451522827148,0.520925462245941,0.519407093524933,0.53059321641922,0.529202699661255,0.540197968482971,0.53988242149353,0.534868538379669,0.545211851596832,0.433842122554779,0.413517206907272,0.423292845487595,0.384412050247192,0.430982440710068,0.381834775209427,0.442501246929169,0.409693866968155,0.520333468914032,0.518807590007782,0.531205892562866,0.501402199268341,0.510191142559052,0.508511543273926,0.519038438796997,0.494045972824097,0.522129595279694,0.487510025501251,0.533461928367615,0.492220014333725,0.540426135063171,0.539153158664703,0.549062311649323,0.548845946788788,0.543831944465637,
+0.554076254367828,0.422650218009949,0.384627461433411,0.41483137011528,0.354673117399216,0.422725975513458,0.352816373109818,0.431625068187714,0.381619393825531,0.534367680549622,0.492429047822952,0.521171987056732,0.48732003569603,0.522744596004486,0.480269372463226,0.53459358215332,0.482916444540024,0.549189865589142,0.548016011714935,0.414171636104584,0.354828268289566,0.409149974584579,0.324280261993408,0.417182236909866,0.323159873485565,0.423385798931122,0.352661162614822,0.535517811775208,0.482967376708984,0.52177357673645,0.480244815349579,0.522495210170746,0.472939640283585,0.53454852104187,0.473720073699951,0.408478707075119,0.324373930692673,0.406297087669373,0.29349285364151,0.414398461580276,0.293118327856064,0.417853504419327,0.323066204786301,0.53547191619873,0.473646700382233,0.521528244018555,0.473037391901016,0.521274507045746,0.465707957744598,0.533190846443176,0.464646071195602,0.405620068311691,0.293524205684662,0.406297087669373,0.262573540210724,0.414398461580276,0.262948155403137,0.415075540542603,0.293087035417557,0.534094095230103,0.464441001415253,0.520329177379608,0.465932190418243,0.516482651233673,0.450136035680771,0.527742326259613,0.446592032909393,0.405620068311691,0.262542247772217,0.409149974584579,0.231786206364632,0.417182236909866,0.232906669378281,0.415075540542603,0.262979447841644,0.528609752655029,0.446268707513809,0.515572845935822,0.450475484132767,0.509138464927673,0.43349677324295,0.519771337509155,0.428691297769547,0.408478707075119,0.231692537665367,0.41483137011528,0.201393350958824,0.422725975513458,0.203250169754028,0.417853504419327,0.233000263571739,0.520603835582733,0.428289741277695,0.508263111114502,0.433913975954056,0.500165104866028,0.415999889373779,0.510403871536255,0.410670697689056,0.414171636104584,0.201238140463829,0.423292845487595,0.171654403209686,0.430982500314713,0.174231678247452,0.423385798931122,0.203405380249023,0.511223495006561,0.410244315862656,0.499305367469788,0.416447401046753,0.490462899208069,0.397774934768677,0.500557363033295,0.392413675785065,
+0.422650218009949,0.171439006924629,0.4344622194767,0.142822980880737,0.441881209611893,0.146098807454109,0.431625127792358,0.17444708943367,0.501375377178192,0.391984194517136,0.489604383707047,0.398224622011185,0.480842530727386,0.378917068243027,0.490982174873352,0.373859196901321,0.433842182159424,0.142549201846123,0.448244124650955,0.115145191550255,0.455329239368439,0.119091585278511,0.442501246929169,0.146372586488724,0.491812855005264,0.373454362154007,0.479970246553421,0.379339873790741,0.471995711326599,0.359500646591187,0.482315570116043,0.355027735233307,0.447652012109756,0.114815421402454,0.464521050453186,0.08885707706213,0.471211791038513,0.0934403464198112,0.455921351909637,0.119421355426311,0.483168065547943,0.354670375585556,0.471100300550461,0.359872847795486,0.464496552944183,0.339603304862976,0.475068509578705,0.335967093706131,0.463961839675903,0.0884740501642227,0.483154088258743,0.0641829520463943,0.489393383264542,0.0693640261888504,0.471771001815796,0.0938233733177185,0.475946456193924,0.335676908493042,0.463574826717377,0.339905709028244,0.458801329135895,0.319315433502197,0.469628393650055,0.316740125417709,0.482632637023926,0.0637499690055847,0.503993153572083,0.0413236953318119,0.509706735610962,0.0470814518630505,0.489914834499359,0.06979700922966,0.470530331134796,0.316534817218781,0.457854747772217,0.319529503583908,0.455245614051819,0.29874786734581,0.46626204252243,0.297410398721695,0.503505051136017,0.0408540181815624,0.514338076114655,0.031132047995925,0.519920408725739,0.036714393645525,0.509527623653412,0.0482828058302403,0.467181175947189,0.297303825616837,0.454281210899353,0.298859030008316,0.454037040472031,0.278033137321472,0.465123206377029,0.278033137321472,0.524804532527924,0.0208011940121651,0.530251383781433,0.02624805085361,0.510892689228058,0.0468428209424019,0.519977331161499,0.0367843471467495,0.519667327404022,0.0379354618489742,0.46604859828949,0.278033137321472,0.453066170215607,0.278033137321472,0.455245614051819,0.257318437099457,0.46626204252243,0.258655846118927,
+0.534868538379669,0.0108546307310462,0.540197968482971,0.0161839611828327,0.520925462245941,0.0366593822836876,0.53059321641922,0.0268637426197529,0.530370950698853,0.0550702884793282,0.519926905632019,0.0616152174770832,0.467181265354156,0.258762508630753,0.454281270503998,0.257207304239273,0.45880138874054,0.236750900745392,0.4696284532547,0.239326134324074,0.543831944465637,0.00199021096341312,0.549062311649323,0.00722053973004222,0.540426135063171,0.0169132500886917,0.533462703227997,0.063846230506897,0.522129058837891,0.0685565769672394,0.510191142559052,0.0475549884140491,0.519035935401917,0.0620162785053253,0.520333468914032,0.037258867174387,0.53120893239975,0.054668951779604,0.470530420541763,0.239531442523003,0.457854807376862,0.236536830663681,0.464496701955795,0.216463029384613,0.475068509578705,0.220099225640297,0.549189865589142,0.0080505134537816,0.534593999385834,0.0731499493122101,0.522744953632355,0.0757971107959747,0.521171987056732,0.0687464401125908,0.534367740154266,0.0636373534798622,0.475946545600891,0.220389351248741,0.463574886322021,0.216160625219345,0.471995860338211,0.196565613150597,0.482315629720688,0.201038599014282,0.534549057483673,0.0823463872075081,0.522494971752167,0.0831267535686493,0.521773636341095,0.0758216679096222,0.535517811775208,0.0730990841984749,0.483168125152588,0.201395943760872,0.471100360155106,0.196193471550941,0.480842679738998,0.177149251103401,0.490982264280319,0.182207047939301,0.53319126367569,0.0914204567670822,0.521274566650391,0.0903585255146027,0.521528303623199,0.0830290839076042,0.53547191619873,0.0824197083711624,0.491812944412231,0.182611897587776,0.479970306158066,0.176726520061493,0.490463048219681,0.158291399478912,0.500557422637939,0.163652658462524,0.527742624282837,0.109474442899227,0.516482472419739,0.105930298566818,0.520329236984253,0.0901342034339905,0.534094154834747,0.0916254073381424,0.501375436782837,0.164082139730453,0.489604443311691,0.15784178674221,0.500165164470673,0.140066504478455,0.5104039311409,0.145395621657372,0.519771456718445,
+0.127375110983849,0.509138464927673,0.122569628059864,0.515572905540466,0.105590984225273,0.528609812259674,0.109797686338425,0.511223554611206,0.145822018384933,0.499305486679077,0.139618992805481,0.508263230323792,0.122152432799339,0.520603895187378,0.127776592969894,0.589529037475586,0.50430166721344,0.609842300415039,0.482019186019897,0.616081595420837,0.487200260162354,0.595242559909821,0.510059535503387,0.589033901691437,0.503839671611786,0.609320819377899,0.481586217880249,0.62802392244339,0.457942873239517,0.634714722633362,0.462526142597198,0.595730721950531,0.510529220104218,0.616603076457977,0.487633287906647,0.585176408290863,0.519971907138824,0.579594731330872,0.514390170574188,0.627464771270752,0.457559823989868,0.643906533718109,0.432291626930237,0.650991559028625,0.436237990856171,0.635273873806,0.462909162044525,0.585613667964935,0.520492255687714,0.57602059841156,0.528991878032684,0.570574760437012,0.523546099662781,0.643314301967621,0.431961834430695,0.657354474067688,0.405284374952316,0.664773523807526,0.408560186624527,0.651583731174469,0.436567783355713,0.576364755630493,0.529605388641357,0.56796807050705,0.536927044391632,0.562639534473419,0.531598567962646,0.656734466552734,0.405010610818863,0.668253242969513,0.377151489257813,0.675942838191986,0.3797287940979,0.665393471717834,0.40883395075798,0.568193793296814,0.537658989429474,0.560919284820557,0.543877184391022,0.55568939447403,0.538647353649139,0.6676105260849,0.376936107873917,0.676509618759155,0.348133027553558,0.684404313564301,0.349989831447601,0.676585495471954,0.379944205284119,0.56104439496994,0.5447096824646,0.675849914550781,0.347977876663208,0.682053446769714,0.318476557731628,0.690085709095001,0.319597005844116,0.685064077377319,0.350145012140274,0.681382179260254,0.318382918834686,0.684837222099304,0.288435071706772,0.692938625812531,0.288809597492218,0.690756976604462,0.319690644741058,0.684160113334656,0.288403779268265,0.684837222099304,0.258264869451523,0.692938625812531,0.257890284061432,0.693615674972534,0.288840889930725,
+0.684160113334656,0.25829616189003,0.682053446769714,0.228223368525505,0.690085709095001,0.227102920413017,0.693615674972534,0.257858991622925,0.681382119655609,0.228317007422447,0.676509618759155,0.198566883802414,0.684404313564301,0.196710050106049,0.690756976604462,0.227009251713753,0.675849854946136,0.198722049593925,0.668253242969513,0.169548392295837,0.675942838191986,0.166971117258072,0.685064077377319,0.196554884314537,0.6676105260849,0.169763803482056,0.657354474067688,0.141415521502495,0.664773523807526,0.138139724731445,0.676585495471954,0.166755706071854,0.656734466552734,0.141689300537109,0.64390641450882,0.114408291876316,0.650991559028625,0.11046189814806,0.665393471717834,0.137865945696831,0.643314301967621,0.11473809927702,0.628023862838745,0.0887570530176163,0.634714722633362,0.084173783659935,0.651583671569824,0.110132128000259,0.627464771270752,0.0891400799155235,0.609842300415039,0.0646807327866554,0.616081595420837,0.0594996586441994,0.63527375459671,0.0837907567620277,0.609320819377899,0.0651137158274651,0.589528977870941,0.0423982292413712,0.595242559909821,0.0366404019296169,0.616603076457977,0.0590666756033897,0.589033901691437,0.0428602583706379,0.579594731330872,0.0323096849024296,0.585176408290863,0.0267280451953411,0.595730721950531,0.0361707583069801,0.570574700832367,0.0231538042426109,0.57602059841156,0.0177079997956753,0.585613608360291,0.0262075662612915,0.562639594078064,0.0151012558490038,0.56796807050705,0.00977283716201782,0.576364755630493,0.0170944835990667,0.55568939447403,0.00805254839360714,0.560919284820557,0.00282264035195112,0.568193793296814,0.00904088281095028,0.56104439496994,0.00199021096341312,0.798284947872162,0.510059356689453,0.7774458527565,0.487200111150742,0.784206688404083,0.48158597946167,0.804033815860748,0.503335475921631,0.804011166095734,0.504314601421356,0.797796785831451,0.510528981685638,0.776924431324005,0.487633109092712,0.758812785148621,0.462525993585587,0.766062796115875,0.457559615373611,0.816269218921661,0.479021430015564,0.815805375576019,0.489054411649704,
+0.810337424278259,0.497588992118835,0.8058061003685,0.463650017976761,0.811612010002136,0.470018714666367,0.804489970207214,0.503835797309875,0.81393301486969,0.514389753341675,0.80835086107254,0.519972026348114,0.807913839817047,0.520492136478424,0.758253633975983,0.462908953428268,0.742535948753357,0.436237812042236,0.750213146209717,0.43196165561676,0.789225041866302,0.441693097352982,0.816473364830017,0.489266961812973,0.816953897476196,0.478871464729309,0.810859441757202,0.498029291629791,0.80632758140564,0.463216960430145,0.812172412872314,0.4696284532547,0.822953224182129,0.523545503616333,0.817506492137909,0.528992116451263,0.8171626329422,0.529605031013489,0.741943836212158,0.436567664146423,0.728753983974457,0.408560007810593,0.736793041229248,0.405010402202606,0.774740636348724,0.418299943208694,0.789784252643585,0.441310048103333,0.830888330936432,0.531597971916199,0.825558960437775,0.536927282810211,0.825333476066589,0.537658631801605,0.728133916854858,0.408833742141724,0.717584669589996,0.379728585481644,0.725916862487793,0.37693589925766,0.762476444244385,0.393670111894608,0.775332748889923,0.41797012090683,0.837838351726532,0.538646817207336,0.832607924938202,0.543877303600311,0.832482933998108,0.544709324836731,0.716942012310028,0.379943996667862,0.709123194217682,0.349989652633667,0.717677652835846,0.347977697849274,0.752537071704865,0.368013739585876,0.763096451759338,0.393396317958832,0.708463430404663,0.350144803524017,0.703441798686981,0.31959679722786,0.712145388126373,0.318382740020752,0.745007455348969,0.341549813747406,0.753179788589478,0.367798328399658,0.702770531177521,0.319690465927124,0.700588881969452,0.288809388875961,0.709367394447327,0.288403570652008,0.739951729774475,0.314503967761993,0.745667219161987,0.341394603252411,0.699911892414093,0.288840740919113,0.700588881969452,0.257890075445175,0.709367394447327,0.258295983076096,0.737413048744202,0.287106931209564,0.74062305688858,0.314410299062729,0.699911892414093,0.257858783006668,0.703441798686981,0.227102741599083,0.712145328521729,
+0.22831679880619,0.737413048744202,0.259592622518539,0.738090038299561,0.287075638771057,0.702770590782166,0.227009072899818,0.709123194217682,0.196709871292114,0.717677652835846,0.198721915483475,0.739951729774475,0.232195615768433,0.738090038299561,0.259623914957047,0.708463370800018,0.19655467569828,0.717584669589996,0.166970938444138,0.725916981697083,0.169763624668121,0.745007455348969,0.205149799585342,0.740622997283936,0.232289284467697,0.716942012310028,0.166755542159081,0.728754043579102,0.138139516115189,0.736793041229248,0.141689121723175,0.752537071704865,0.178685858845711,0.745667219161987,0.205305010080338,0.728134036064148,0.137865737080574,0.742535948753357,0.110461719334126,0.750213146209717,0.114737883210182,0.76247650384903,0.153029426932335,0.753179788589478,0.178901195526123,0.741943836212158,0.110131949186325,0.758812844753265,0.0841736048460007,0.766062796115875,0.0891399085521698,0.774740636348724,0.128399580717087,0.763096511363983,0.153303205966949,0.758253633975983,0.0837905779480934,0.777445912361145,0.0594994835555553,0.784206688404083,0.0651135370135307,0.789225101470947,0.105006515979767,0.775332748889923,0.128729417920113,0.776924431324005,0.0590665005147457,0.798284947872162,0.0366402268409729,0.804011225700378,0.0423849336802959,0.804033935070038,0.0433640740811825,0.805806159973145,0.0830495730042458,0.789784252643585,0.105389475822449,0.797796845436096,0.0361705496907234,0.80835086107254,0.0267275534570217,0.81393301486969,0.0323097556829453,0.804490029811859,0.042863804847002,0.815805375576019,0.057645108550787,0.816269278526306,0.0676781162619591,0.811612069606781,0.0766808316111565,0.810337424278259,0.0491105318069458,0.806327641010284,0.0834825560450554,0.807913839817047,0.0262074247002602,0.817506492137909,0.0177073683589697,0.822953224182129,0.0231540855020285,0.810859441757202,0.0486701801419258,0.816953957080841,0.0678280591964722,0.816473364830017,0.0574325807392597,0.812172472476959,0.0770710855722427,0.8171626329422,0.0170944128185511,0.825558960437775,0.00977220572531223,
+0.830888330936432,0.0151016069576144,0.825333476066589,0.00904095359146595,0.832607924938202,0.0028222193941474,0.837838351726532,0.00805261824280024,0.832482933998108,0.00199021096341312,0.314825654029846,0.486269801855087,0.332969516515732,0.462243437767029,0.340219438076019,0.467209756374359,0.321586400270462,0.491883873939514,0.293226212263107,0.468333721160889,0.309807181358337,0.446376919746399,0.348819106817245,0.43664538860321,0.356496393680573,0.440921604633331,0.322107821702957,0.492316901683807,0.34077861905098,0.467592775821686,0.295021116733551,0.508998394012451,0.294998407363892,0.508019268512726,0.300747275352478,0.514743149280548,0.283226907253265,0.493738234043121,0.282763063907623,0.483705222606659,0.287420302629471,0.474702537059784,0.288694888353348,0.502272844314575,0.292704790830612,0.467900723218918,0.309248030185699,0.44599387049675,0.32429164648056,0.422983705997467,0.362239211797714,0.409694194793701,0.370278269052505,0.413243800401688,0.357088506221771,0.441251397132874,0.301235496997833,0.515212774276733,0.29454231262207,0.50851958990097,0.29040265083313,0.524935007095337,0.284820288419724,0.519352614879608,0.282558977603912,0.493950694799423,0.282078355550766,0.483555287122726,0.286859899759293,0.474312275648117,0.288172900676727,0.502713084220886,0.323699533939362,0.42265385389328,0.336555868387222,0.398353844881058,0.373115360736847,0.381619721651077,0.381447613239288,0.384412407875061,0.370898306369781,0.413517564535141,0.284390658140183,0.518824219703674,0.279936283826828,0.535265922546387,0.274489432573318,0.529819130897522,0.335935801267624,0.398080110549927,0.346495151519775,0.372697532176971,0.381354689598084,0.352661490440369,0.389909088611603,0.354673445224762,0.382090240716934,0.384627819061279,0.274147391319275,0.529202997684479,0.269872188568115,0.54521256685257,0.264542818069458,0.539883136749268,0.34585252404213,0.372482150793076,0.354024797677994,0.346233516931534,0.386886924505234,0.323066532611847,0.395590484142303,0.324280619621277,0.390568882226944,0.354828596115112,
+0.264314472675323,0.539153337478638,0.260908782482147,0.554076910018921,0.25567838549614,0.548846423625946,0.353365063667297,0.346078336238861,0.35908055305481,0.319187730550766,0.38966491818428,0.293087363243103,0.39844337105751,0.293493211269379,0.396261751651764,0.324374228715897,0.255550742149353,0.54801607131958,0.358409255743027,0.319094061851501,0.361619263887405,0.291790753602982,0.38966491818428,0.262979775667191,0.39844337105751,0.262573897838593,0.399120390415192,0.293524503707886,0.360942214727402,0.291759431362152,0.361619293689728,0.264276385307312,0.386886924505234,0.233000621199608,0.395590484142303,0.231786534190178,0.399120390415192,0.262542605400085,0.360942244529724,0.264307677745819,0.359080523252487,0.236879408359528,0.381354689598084,0.203405663371086,0.389909088611603,0.201393663883209,0.396261721849442,0.231692865490913,0.358409255743027,0.23697304725647,0.354024797677994,0.20983362197876,0.373115360736847,0.174447402358055,0.381447613239288,0.171654731035233,0.390568882226944,0.201238498091698,0.353365063667297,0.209988832473755,0.346495151519775,0.183369636535645,0.362239211797714,0.14637291431427,0.370278269052505,0.142823323607445,0.382090240716934,0.171439319849014,0.345852494239807,0.183585003018379,0.336555808782578,0.15771321952343,0.348819106817245,0.1194217056036,0.356496334075928,0.11514550447464,0.370898276567459,0.14254954457283,0.335935771465302,0.157986998558044,0.324291586875916,0.133083358407021,0.332969516515732,0.0938236936926842,0.340219438076019,0.088857389986515,0.357088446617126,0.114815734326839,0.323699474334717,0.133413165807724,0.309807151556015,0.109690196812153,0.314825624227524,0.0697973221540451,0.321586400270462,0.0641832649707794,0.340778589248657,0.0884743630886078,0.309247970581055,0.11007322371006,0.293226093053818,0.0877333581447601,0.294998377561569,0.0480478927493095,0.295021116733551,0.04706871509552,0.300747245550156,0.0413240119814873,0.322107821702957,0.0637502819299698,0.292704641819,0.0881663411855698,0.288694858551025,0.0537943169474602,0.287420213222504,
+0.0813646167516708,0.282763034105301,0.0723619014024735,0.283226877450943,0.0623288936913013,0.294542223215103,0.0475475527346134,0.284820288419724,0.036714531481266,0.290402621030808,0.0311321187764406,0.301235467195511,0.0408543683588505,0.286859810352325,0.0817548707127571,0.288172870874405,0.0533539988100529,0.282078325748444,0.0725118443369865,0.28255894780159,0.0621163994073868,0.284390658140183,0.0372428707778454,0.274489432573318,0.0262479800730944,0.279936254024506,0.0208012647926807,0.27414733171463,0.0268641635775566,0.264542818069458,0.016183890402317,0.269872188568115,0.0108546307310462,0.264314472675323,0.016913739964366,0.25567838549614,0.0072206100448966,0.260908782482147,0.00199021096341312,0.255550742149353,0.00805093441158533,0.932035326957703,0.540456295013428,0.920083105564117,0.533234596252441,0.930924892425537,0.51587438583374,0.940884411334991,0.52598774433136,0.929900884628296,0.547184467315674,0.916941404342651,0.542165040969849,0.929298877716064,0.554262101650238,0.915800213813782,0.551586508750916,0.92954421043396,0.561471700668335,0.915849089622498,0.560871660709381,0.930743515491486,0.568578898906708,0.917223632335663,0.570042073726654,0.935500800609589,0.584038257598877,0.922695398330688,0.588168978691101,0.94281131029129,0.600601255893707,0.93068939447403,0.606124460697174,0.951769471168518,0.618068337440491,0.940062522888184,0.624160468578339,0.961471617221832,0.636292994022369,0.949908852577209,0.642421722412109,0.971105635166168,0.655177235603333,0.959471702575684,0.66095632314682,0.979974567890167,0.674642145633698,0.968120276927948,0.679751992225647,0.98749977350235,0.694608509540558,0.975346982479095,0.698761940002441,0.993219673633575,0.714983582496643,0.980768203735352,0.717925012111664,0.996793031692505,0.735652804374695,0.984121084213257,0.737180411815643,0.998008012771606,0.756477296352386,0.985255181789398,0.756477355957031,0.996793031692505,0.777301788330078,0.984121143817902,0.775774300098419,0.99321973323822,0.797971069812775,0.980768203735352,0.795029699802399,0.987499892711639,
+0.818346261978149,0.97534704208374,0.814192712306976,0.979974627494812,0.83831262588501,0.968120336532593,0.83320277929306,0.971105694770813,0.857777535915375,0.959471821784973,0.851998448371887,0.961471736431122,0.876661777496338,0.949908971786499,0.870533108711243,0.951769590377808,0.894886374473572,0.940062582492828,0.888794362545013,0.942811369895935,0.912353515625,0.930689513683319,0.906830430030823,0.935500860214233,0.92891651391983,0.922695457935333,0.924785852432251,0.93074357509613,0.944375932216644,0.917223691940308,0.942912817001343,0.929544270038605,0.951483190059662,0.915849149227142,0.952083289623261,0.929298996925354,0.958692789077759,0.915800273418427,0.961368441581726,0.929900884628296,0.965770363807678,0.916941404342651,0.970789849758148,0.932035326957703,0.972498595714569,0.920083165168762,0.9797203540802,0.940884411334991,0.986967146396637,0.930924892425537,0.997080504894257,0.23483806848526,0.425258278846741,0.242078885436058,0.431109726428986,0.247106999158859,0.445016294717789,0.244088098406792,0.450842022895813,0.24107763171196,0.425156563520432,0.24813349545002,0.450731009244919,0.20682692527771,0.450842022895813,0.206827059388161,0.425258278846741,0.242130234837532,0.419015616178513,0.247160598635674,0.456240177154541,0.23483806848526,0.475167006254196,0.206827059388161,0.475167006254196,0.244088098406792,0.398610711097717,0.20682692527771,0.398610711097717,0.247037246823311,0.404879629611969,0.242007166147232,0.469792157411575,0.244088098406792,0.498047888278961,0.206827059388161,0.498047888278961,0.23483806848526,0.371101945638657,0.206827059388161,0.371101945638657,0.248066559433937,0.398522049188614,0.241008594632149,0.47504997253418,0.241953566670418,0.480090171098709,0.247231185436249,0.493144780397415,0.23483806848526,0.519308805465698,0.206827059388161,0.519308805465698,0.242193952202797,0.37773585319519,0.246990948915482,0.392001509666443,0.244088098406792,0.342941522598267,0.20682692527771,0.342941522598267,0.248201563954353,0.497927486896515,0.247282683849335,0.502485334873199,
+0.241890981793404,0.514878213405609,0.244088098406792,0.53900557756424,0.206827059388161,0.53900557756424,0.241138532757759,0.371030390262604,0.246937617659569,0.349869668483734,0.242232263088226,0.364194273948669,0.23483806848526,0.314343929290771,0.20682692527771,0.314343929290771,0.240968883037567,0.519244372844696,0.24192675948143,0.523489713668823,0.247249007225037,0.534822821617126,0.23483806848526,0.558702409267426,0.232987269759178,0.558702409267426,0.206827059388161,0.539112091064453,0.248015761375427,0.342891275882721,0.242270857095718,0.321478098630905,0.246910259127617,0.335821092128754,0.244088098406792,0.285527020692825,0.206827059388161,0.285527020692825,0.248197495937347,0.53900557756424,0.247249007225037,0.543188512325287,0.241927608847618,0.554519474506378,0.235308304429054,0.560440540313721,0.241175308823586,0.314317971467972,0.246889904141426,0.292765319347382,0.242285162210464,0.307110548019409,0.23483806848526,0.256710112094879,0.20682692527771,0.256710112094879,0.240979120135307,0.558702409267426,0.243747383356094,0.566760063171387,0.241927608847618,0.562885165214539,0.247996538877487,0.285527020692825,0.242285162210464,0.263943493366241,0.246889904141426,0.278288751840591,0.244088098406792,0.228112548589706,0.20682692527771,0.228112548589706,0.241175308823586,0.256736069917679,0.246910259127617,0.235232964158058,0.242270857095718,0.249575957655907,0.23483806848526,0.199952244758606,0.206827059388161,0.199952244758606,0.248015761375427,0.228162780404091,0.242232263088226,0.206859782338142,0.246937617659569,0.221184387803078,0.244088098406792,0.172443330287933,0.206827059388161,0.172443330287933,0.241138532757759,0.200023666024208,0.246990948915482,0.17905268073082,0.242193952202797,0.193318352103233,0.23483806848526,0.145795777440071,0.206827059388161,0.145795777440071,0.248066559433937,0.172532171010971,0.242130234837532,0.152038425207138,0.247037246823311,0.166174441576004,0.244088098406792,0.120212033390999,0.20682692527771,0.120212033390999,0.24107763171196,0.145897582173347,0.247106999158859,
+0.12603785097599,0.242078885436058,0.139944344758987,0.23483806848526,0.095887117087841,0.206827059388161,0.095887117087841,0.24813349545002,0.120323106646538,0.242007166147232,0.101261913776398,0.247160598635674,0.11481387168169,0.244088098406792,0.0730062574148178,0.206827059388161,0.0730062574148178,0.241008594632149,0.0960041508078575,0.247231185436249,0.0779092684388161,0.241953566670418,0.0909639671444893,0.23483806848526,0.0517452023923397,0.206827059388161,0.0517452023923397,0.248201563954353,0.0731266587972641,0.241892382502556,0.0561792366206646,0.247282683849335,0.0685687810182571,0.244088098406792,0.0320484638214111,0.206827059388161,0.0329898595809937,0.207980990409851,0.0320484638214111,0.240968883037567,0.0518114380538464,0.247249007225037,0.0362313091754913,0.241925224661827,0.0475674793124199,0.23483806848526,0.0123517271131277,0.23212718963623,0.0123517271131277,0.248197495937347,0.0320484638214111,0.241927608847618,0.0165345724672079,0.247249007225037,0.0278656184673309,0.235535770654678,0.00957118533551693,0.240979120135307,0.0123517271131277,0.244829326868057,0.00199021096341312,0.241927608847618,0.00816888082772493,0.164256349205971,0.434365302324295,0.171475455164909,0.428514569997787,0.162225335836411,0.454362273216248,0.159185156226158,0.448535889387131,0.165248543024063,0.42841249704361,0.199486449360847,0.428514569997787,0.199486449360847,0.454362332820892,0.158168718218803,0.454251050949097,0.164206996560097,0.422271221876144,0.162225335836411,0.401567548513412,0.199486449360847,0.401567608118057,0.171475455164909,0.478916823863983,0.199486449360847,0.478916823863983,0.159133404493332,0.45975986123085,0.159251779317856,0.407835900783539,0.171475455164909,0.37372612953186,0.199486449360847,0.37372612953186,0.164325222373009,0.473541557788849,0.162225335836411,0.501994729042053,0.199486449360847,0.501994729042053,0.158232644200325,0.401478588581085,0.164146304130554,0.380359441041946,0.159296154975891,0.394957661628723,0.162225335836411,0.345203965902328,0.199486449360847,0.345203936100006,
+0.165314823389053,0.47879958152771,0.16437703371048,0.483839571475983,0.159065917134285,0.497090250253677,0.171475455164909,0.523346066474915,0.199486449360847,0.523421406745911,0.165190488100052,0.373654395341873,0.159346774220467,0.352131575345993,0.164109751582146,0.366817891597748,0.171475455164909,0.316222906112671,0.199486449360847,0.316222906112671,0.15810514986515,0.501873672008514,0.159022301435471,0.506430864334106,0.164430290460587,0.518911123275757,0.162225335836411,0.543118178844452,0.199486449360847,0.542444050312042,0.19858618080616,0.543118178844452,0.158280909061432,0.345153450965881,0.164073184132576,0.323356717824936,0.159372955560684,0.338083028793335,0.162225335836411,0.287010818719864,0.199486449360847,0.287010818719864,0.165348842740059,0.523277401924133,0.164394408464432,0.527523159980774,0.159057289361954,0.538933753967285,0.171475455164909,0.562814891338348,0.172283753752708,0.562814891338348,0.165155723690987,0.316196769475937,0.159392103552818,0.29424911737442,0.164059609174728,0.308989137411118,0.171475455164909,0.257798790931702,0.199486449360847,0.257798790931702,0.158113777637482,0.543117523193359,0.159063950181007,0.547299981117249,0.164385765790939,0.558632075786591,0.17127001285553,0.563574016094208,0.158299162983894,0.287010818719864,0.164059579372406,0.265032559633255,0.159392103552818,0.27977254986763,0.162225335836411,0.228817731142044,0.199486449360847,0.228817731142044,0.165334329009056,0.562814891338348,0.163131520152092,0.569668531417847,0.164385810494423,0.566997826099396,0.165155723690987,0.257824927568436,0.159372955560684,0.235938683152199,0.164073184132576,0.250664979219437,0.171475455164909,0.200295552611351,0.199486449360847,0.200295597314835,0.158280953764915,0.228868260979652,0.164109751582146,0.207203835248947,0.159346774220467,0.221890136599541,0.162225335836411,0.172454074025154,0.199486449360847,0.172454074025154,0.165190488100052,0.200367301702499,0.159296154975891,0.179064005613327,0.164146304130554,0.193662256002426,0.171475455164909,0.145507112145424,0.199486449360847,
+0.145507112145424,0.158232644200325,0.172543078660965,0.164206996560097,0.151750475168228,0.159251779317856,0.166185796260834,0.162225335836411,0.119659386575222,0.199486449360847,0.119659282267094,0.165248587727547,0.145609200000763,0.159185156226158,0.125485792756081,0.164256393909454,0.139656364917755,0.171475455164909,0.0951048955321312,0.199486449360847,0.0951048955321312,0.158168718218803,0.119770668447018,0.164325222373009,0.100480183959007,0.159133404493332,0.114261783659458,0.162225335836411,0.0720270052552223,0.199486449360847,0.0720270052552223,0.165314823389053,0.0952220633625984,0.159065499901772,0.0769303664565086,0.164377003908157,0.0901821628212929,0.171475455164909,0.0506044700741768,0.199486449360847,0.0506798624992371,0.158103123307228,0.0721476152539253,0.164435237646103,0.055035874247551,0.15901543200016,0.0675902739167213,0.162225335836411,0.0309034883975983,0.197466522455215,0.0309034883975983,0.199486449360847,0.0325513333082199,0.165348783135414,0.0506673753261566,0.159064441919327,0.0350863710045815,0.164389133453369,0.04642453789711,0.171475455164909,0.0112067498266697,0.173320427536964,0.0112067498266697,0.158115893602371,0.0309034883975983,0.164385810494423,0.0153895961120725,0.159064441919327,0.0267206430435181,0.170952841639519,0.00927544198930264,0.165334329009056,0.0112067498266697,0.162021860480309,0.00199017580598593,0.164385810494423,0.00702390447258949,0.37750768661499,0.712034046649933,0.376675188541412,0.71156907081604,0.382660835981369,0.699645340442657,0.383557796478271,0.699982404708862,0.387466579675674,0.684144496917725,0.388399004936218,0.684367656707764,0.390823155641556,0.66574627161026,0.391773343086243,0.665872573852539,0.392545014619827,0.64549446105957,0.393502473831177,0.645535290241241,0.392545014619827,0.624607563018799,0.393502473831177,0.624566793441772,0.390823185443878,0.604355752468109,0.391773283481598,0.604229509830475,0.387466669082642,0.585957586765289,0.388398945331573,0.58573442697525,0.382660955190659,0.570456743240356,0.383557677268982,0.570119798183441,
+0.376675456762314,0.558532953262329,0.377507477998734,0.558068335056305,0.425053507089615,0.558536052703857,0.425883442163467,0.558067739009857,0.433227032423019,0.572358012199402,0.432330876588821,0.57269674539566,0.438767164945602,0.589981138706207,0.437834739685059,0.590204298496246,0.442474007606506,0.61014062166214,0.441523790359497,0.610266208648682,0.444333672523499,0.631905615329742,0.443376183509827,0.6319460272789,0.444333732128143,0.654221653938293,0.443376183509827,0.654181122779846,0.442474007606506,0.675986647605896,0.441523730754852,0.67586088180542,0.438767224550247,0.696145951747894,0.437834680080414,0.6959228515625,0.433227121829987,0.713769257068634,0.432330787181854,0.713430345058441,0.425883710384369,0.728059351444244,0.425053387880325,0.727590918540955,0.418087989091873,0.55806839466095,0.418917894363403,0.558536648750305,0.411640554666519,0.572697401046753,0.410744458436966,0.57235860824585,0.406136691570282,0.590204894542694,0.405204355716705,0.5899817943573,0.402447730302811,0.610266864299774,0.401497453451157,0.610141277313232,0.400595247745514,0.631946682929993,0.399637788534164,0.63190621137619,0.400595247745514,0.654181718826294,0.399637758731842,0.654222309589386,0.402447730302811,0.675861537456512,0.401497423648834,0.675987243652344,0.406136751174927,0.695923447608948,0.405204206705093,0.696146607398987,0.411640703678131,0.713431000709534,0.410744279623032,0.713769912719727,0.41891810297966,0.727591574192047,0.418087780475616,0.728060007095337,0.370539873838425,0.71156907081604,0.369707375764847,0.712033987045288,0.363657265901566,0.699982345104218,0.364554286003113,0.699645280838013,0.358816057443619,0.684367597103119,0.359748482704163,0.684144496917725,0.355441749095917,0.665872573852539,0.356391936540604,0.66574627161026,0.35371258854866,0.645535230636597,0.35467004776001,0.64549446105957,0.353712618350983,0.624566793441772,0.354670077562332,0.624607563018799,0.355441778898239,0.60422945022583,0.356391906738281,0.604355752468109,0.358816117048264,0.58573442697525,0.359748423099518,
+0.585957586765289,0.363657414913177,0.570119798183441,0.364554107189178,0.570456743240356,0.369707584381104,0.558068335056305,0.370539605617523,0.558533012866974,0.846843659877777,0.842310011386871,0.846843659877777,0.814576148986816,0.858021259307861,0.814576148986816,0.858021259307861,0.842310011386871,0.846843659877777,0.785686433315277,0.858021259307861,0.785686433315277,0.846843659877777,0.75588721036911,0.858021259307861,0.75588721036911,0.846843659877777,0.725432813167572,0.858021259307861,0.725432813167572,0.846843659877777,0.694583117961884,0.858021259307861,0.694583117961884,0.846843659877777,0.663601219654083,0.858021259307861,0.663601219654083,0.846843659877777,0.632751524448395,0.858021259307861,0.632751524448395,0.846843659877777,0.602297127246857,0.858021259307861,0.602297127246857,0.846843659877777,0.572497963905334,0.858021259307861,0.572497963905334,0.846843659877777,0.54360818862915,0.858021259307861,0.54360818862915,0.846843659877777,0.515874326229095,0.858021259307861,0.515874326229095,0.898487150669098,0.905676603317261,0.898487150669098,0.878725528717041,0.909664869308472,0.878725528717041,0.909664869308472,0.905676603317261,0.898487150669098,0.85065096616745,0.909664869308472,0.85065096616745,0.898487150669098,0.931274652481079,0.909664869308472,0.931274652481079,0.898487150669098,0.821692705154419,0.909664869308472,0.821692705154419,0.898487150669098,0.95530104637146,0.909664869308472,0.95530104637146,0.898487150669098,0.792097687721252,0.909664869308472,0.792097687721252,0.899459481239319,0.977543115615845,0.898487150669098,0.976815223693848,0.909664869308472,0.977554500102997,0.898487150669098,0.762118577957153,0.909664869308472,0.762118577957153,0.898522675037384,0.978255152702332,0.897810220718384,0.978016555309296,0.898487150669098,0.732010960578918,0.909664869308472,0.732010960578918,0.898487150669098,0.702031850814819,0.909664869308472,0.702031850814819,0.898487150669098,0.672436952590942,0.909664869308472,0.672436952590942,0.898487150669098,0.643478631973267,0.909664869308472,0.643478631973267,
+0.898487150669098,0.61540412902832,0.909664869308472,0.61540412902832,0.898487150669098,0.588452935218811,0.909664869308472,0.588452935218811,0.898487150669098,0.562854945659637,0.909664869308472,0.562854945659637,0.898487150669098,0.538828551769257,0.909664869308472,0.538828551769257,0.898487150669098,0.517314374446869,0.899459481239319,0.516586542129517,0.909664869308472,0.51657509803772,0.897810220718384,0.516112983226776,0.898522675037384,0.51587438583374,0.829530775547028,0.87513655424118,0.829530775547028,0.847402632236481,0.840708434581757,0.847402632236481,0.840708434581757,0.87513655424118,0.829530775547028,0.818512856960297,0.840708434581757,0.818512856960297,0.829530775547028,0.788713693618774,0.840708374977112,0.788713693618774,0.829530775547028,0.758259356021881,0.840708374977112,0.758259356021881,0.829530775547028,0.727409601211548,0.840708434581757,0.727409601211548,0.829530775547028,0.696427643299103,0.840708434581757,0.696427643299103,0.829530775547028,0.66557788848877,0.840708374977112,0.66557788848877,0.829530775547028,0.635123550891876,0.840708374977112,0.635123550891876,0.829530775547028,0.605324447154999,0.840708434581757,0.605324447154999,0.829530775547028,0.57643461227417,0.840708434581757,0.57643461227417,0.829530775547028,0.54870080947876,0.840708434581757,0.54870080947876,0.864156603813171,0.890980660915375,0.864156603813171,0.866406917572021,0.875334203243256,0.866406917572021,0.875334203243256,0.890980660915375,0.864156603813171,0.840808987617493,0.875334203243256,0.840808987617493,0.864156603813171,0.914320588111877,0.875334203243256,0.914320707321167,0.864156603813171,0.814405202865601,0.875334203243256,0.814405202865601,0.864156603813171,0.936227560043335,0.875334203243256,0.936227560043335,0.864156603813171,0.787420809268951,0.875334203243256,0.787420809268951,0.875334203243256,0.942639052867889,0.864156603813171,0.942639052867889,0.864156603813171,0.760086178779602,0.875334203243256,0.760086178779602,0.864156603813171,0.951882064342499,0.875334203243256,0.951882064342499,0.864156603813171,
+0.732634544372559,0.875334203243256,0.732634544372559,0.864156603813171,0.962277472019196,0.875334203243256,0.962277472019196,0.864156603813171,0.705299913883209,0.875334203243256,0.70529979467392,0.864156603813171,0.971039891242981,0.875334203243256,0.971039891242981,0.864156603813171,0.678315579891205,0.875334203243256,0.678315579891205,0.875334203243256,0.976846396923065,0.864156603813171,0.976846396923065,0.864156603813171,0.651911795139313,0.875334203243256,0.651911795139313,0.864156603813171,0.626313745975494,0.875334203243256,0.626313745975494,0.864156603813171,0.601739943027496,0.875334203243256,0.601739943027496,0.864156603813171,0.578400075435638,0.875334203243256,0.578400075435638,0.864156603813171,0.55649322271347,0.875334203243256,0.55649322271347,0.864156603813171,0.550081610679626,0.875334203243256,0.550081610679626,0.864156603813171,0.540838718414307,0.875334203243256,0.540838718414307,0.864156603813171,0.53044319152832,0.875334203243256,0.53044319152832,0.864156603813171,0.521680772304535,0.875334203243256,0.521680772304535,0.864156603813171,0.51587438583374,0.875334203243256,0.51587438583374,0.891548752784729,0.955650806427002,0.881579279899597,0.955656945705414,0.881614089012146,0.948579370975494,0.891509532928467,0.948575556278229,0.891588807106018,0.962376713752747,0.881544649600983,0.962385177612305,0.881647646427155,0.941369831562042,0.891470789909363,0.941368162631989,0.891674995422363,0.976842403411865,0.881469428539276,0.976853728294373,0.881677806377411,0.934262454509735,0.891436278820038,0.934263050556183,0.881735503673553,0.918803036212921,0.891369342803955,0.918806254863739,0.881787240505219,0.90224015712738,0.891308903694153,0.902244806289673,0.881833136081696,0.884773015975952,0.891255080699921,0.884778261184692,0.88187301158905,0.866548299789429,0.891207933425903,0.866555452346802,0.881906986236572,0.84766411781311,0.89116770029068,0.84767073392868,0.881934881210327,0.828199148178101,0.891134560108185,0.828203618526459,0.881956815719604,0.808232724666595,0.891108512878418,0.808236539363861,
+0.88197249174118,0.787857711315155,0.891089797019959,0.78786027431488,0.881982207298279,0.767188429832459,0.891078293323517,0.767189860343933,0.881985425949097,0.746363937854767,0.891074359416962,0.746363937854767,0.881982207298279,0.725539445877075,0.891078293323517,0.725538074970245,0.88197249174118,0.704870164394379,0.891089797019959,0.704867660999298,0.881956815719604,0.684495031833649,0.891108453273773,0.684491395950317,0.881934881210327,0.664528727531433,0.891134560108185,0.664524257183075,0.881906986236572,0.645063817501068,0.891167759895325,0.645057260990143,0.881873071193695,0.62617963552475,0.891207933425903,0.626172542572021,0.881833136081696,0.607954919338226,0.891255080699921,0.607949733734131,0.881787359714508,0.590487897396088,0.891308963298798,0.590483248233795,0.881735503673553,0.573924839496613,0.891369462013245,0.573921740055084,0.881677806377411,0.558465480804443,0.891436278820038,0.558465003967285,0.881647646427155,0.551358282566071,0.891471087932587,0.551359891891479,0.881614089012146,0.544148683547974,0.891509234905243,0.544152438640594,0.881579279899597,0.537071049213409,0.891549348831177,0.537077248096466,0.881544649600983,0.530342876911163,0.891589522361755,0.530347049236298,0.881469428539276,0.515874326229095,0.891674995422363,0.515885770320892,0.980637073516846,0.457077026367188,0.970933794975281,0.457160383462906,0.970970094203949,0.44769874215126,0.980601727962494,0.447655498981476,0.980673253536224,0.466007560491562,0.970896601676941,0.466133564710617,0.971005201339722,0.438378095626831,0.980567872524261,0.438370376825333,0.980751037597656,0.483367592096329,0.970816195011139,0.483538955450058,0.971038162708282,0.429172396659851,0.980536043643951,0.429199904203415,0.971100330352783,0.41100013256073,0.980476379394531,0.411072969436646,0.971155941486359,0.393021076917648,0.980422675609589,0.393117487430573,0.971205294132233,0.374975651502609,0.980374932289124,0.375081479549408,0.971248388290405,0.356715530157089,0.980333268642426,0.356820225715637,0.971285164356232,0.338185697793961,0.980297923088074,
+0.338285624980927,0.971315443515778,0.319401741027832,0.980268716812134,0.319489866495132,0.971339166164398,0.300408244132996,0.98024582862854,0.300479829311371,0.971356332302094,0.281266152858734,0.980229437351227,0.281316816806793,0.971366703510284,0.262035250663757,0.980219304561615,0.262061476707459,0.971370339393616,0.242764472961426,0.980215787887573,0.242764472961426,0.971366703510284,0.223493844270706,0.980219304561615,0.223467454314232,0.971356332302094,0.204262793064117,0.980229258537292,0.204212129116058,0.971339166164398,0.185120701789856,0.98024582862854,0.185049131512642,0.971315443515778,0.166127219796181,0.980268716812134,0.16603909432888,0.971285164356232,0.147343248128891,0.980297923088074,0.147243469953537,0.971248388290405,0.128813475370407,0.980333268642426,0.12870879471302,0.971205294132233,0.110553354024887,0.980374932289124,0.11044754832983,0.971155762672424,0.0925079360604286,0.980422675609589,0.092411532998085,0.971100091934204,0.0745290294289589,0.980476379394531,0.0744561329483986,0.971037745475769,0.0563567541539669,0.980536043643951,0.0563291795551777,0.971004784107208,0.0471510551869869,0.980567872524261,0.047158770263195,0.970969676971436,0.0378304272890091,0.980601727962494,0.0378736481070518,0.970933079719543,0.0283686965703964,0.980637073516846,0.028452193364501,0.970896005630493,0.019400293007493,0.980673253536224,0.0195216778665781,0.970816195011139,0.00199021096341312,0.980751037597656,0.00216155219823122
+			} 
+			UVIndex: *4196 {
+				a: 284,285,286,328,329,330,331,287,284,286,288,289,339,338,342,343,290,287,289,291,347,346,348,349,292,290,291,293,353,352,354,355,294,292,293,295,359,358,360,361,296,294,295,297,365,364,366,367,298,296,297,299,371,370,372,373,300,298,299,301,377,376,378,379,302,300,301,303,383,382,384,385,304,302,303,305,389,388,390,391,306,304,305,307,395,394,396,397,308,306,307,309,401,400,402,403,310,308,309,311,407,406,408,409,312,310,311,313,413,412,414,415,314,312,313,315,419,418,420,421,316,314,315,317,425,424,426,427,318,316,317,319,431,430,432,433,320,318,319,321,437,436,438,439,322,320,321,323,443,442,444,445,324,322,323,325,449,448,450,451,455,454,456,457,461,460,462,463,467,466,468,469,1143,1162,1163,1153,1288,1269,1280,1289,1134,1151,1152,1143,1278,1259,1269,1279,1126,1141,1142,1134,1267,1249,1259,1268,1120,1132,1133,1126,1257,1242,1249,1258,1113,1119,1125,1120,1244,1233,1242,1248,1110,1111,1112,1113,1231,1232,1233,1234,1122,1124,1118,1110,1245,1240,1232,1239,1128,1136,1137,1122,1252,1246,1240,1253,1138,1146,1147,1128,1262,1254,1246,1263,1148,1157,1158,1138,1273,1264,1254,1274,1159,1166,1167,1148,1283,1275,1264,1284,1168,1174,1175,1159,1292,1285,1275,1293,1176,1179,1180,1168,1300,1294,1285,1301,1181,1184,1185,1176,1305,1302,1294,1306,1186,1189,1190,1181,1310,1307,1302,1311,1191,1194,1195,1186,1315,1312,1307,1316,1196,1199,1200,1191,1320,1317,1312,1321,1201,1204,1205,1196,1325,1322,1317,1326,1206,1209,1210,1201,1330,1327,1322,1331,1211,1214,1215,1206,1335,1332,1327,1336,1216,1220,1221,1211,1332,1337,1338,1339,1333,1222,1225,1226,1216,1337,1343,1344,1338,336,332,333,337,332,329,328,333,330,334,335,331,334,338,339,335,342,344,345,343,344,346,347,345,348,350,351,349,350,352,353,351,354,356,357,355,356,358,359,357,360,362,363,361,362,364,365,363,366,368,369,367,368,370,371,369,372,374,375,373,374,376,377,375,378,380,381,379,380,382,383,381,384,386,387,385,386,388,389,387,390,392,393,391,392,394,395,393,396,398,399,397,398,400,401,399,402,404,405,403,404,406,407,405,408,410,411,409,410,412,413,411,414,
+416,417,415,416,418,419,417,420,422,423,421,422,424,425,423,426,428,429,427,428,430,431,429,432,434,435,433,434,436,437,435,438,440,441,439,440,442,443,441,444,446,447,445,446,448,449,447,450,452,453,451,452,454,455,453,456,458,459,457,458,460,461,459,462,464,465,463,464,466,467,465,1153,1163,1170,1153,1170,1172,1280,1298,1296,1280,1296,1289,1143,1152,1161,1143,1161,1162,1269,1288,1287,1269,1287,1279,1134,1142,1150,1134,1150,1151,1259,1278,1277,1259,1277,1268,1126,1133,1140,1126,1140,1141,1249,1267,1266,1249,1266,1258,1120,1125,1131,1120,1131,1132,1242,1257,1256,1242,1256,1248,1113,1112,1115,1113,1115,1119,1233,1244,1238,1233,1238,1234,1110,1118,1114,1110,1114,1111,1232,1231,1235,1232,1235,1239,1122,1137,1130,1122,1130,1124,1240,1245,1251,1240,1251,1253,1128,1147,1145,1128,1145,1136,1246,1252,1261,1246,1261,1263,1138,1158,1156,1138,1156,1146,1254,1262,1272,1254,1272,1274,1148,1167,1165,1148,1165,1157,1264,1273,1282,1264,1282,1284,1159,1175,1173,1159,1173,1166,1275,1283,1291,1275,1291,1293,1168,1180,1178,1168,1178,1174,1285,1292,1299,1285,1299,1301,1176,1185,1183,1176,1183,1179,1294,1300,1304,1294,1304,1306,1181,1190,1188,1181,1188,1184,1302,1305,1309,1302,1309,1311,1186,1195,1193,1186,1193,1189,1307,1310,1314,1307,1314,1316,1191,1200,1198,1191,1198,1194,1312,1315,1319,1312,1319,1321,1196,1205,1203,1196,1203,1199,1317,1320,1324,1317,1324,1326,1201,1210,1208,1201,1208,1204,1322,1325,1329,1322,1329,1331,1206,1215,1213,1206,1213,1209,1327,1330,1334,1327,1334,1336,1211,1221,1219,1211,1219,1214,1332,1335,1340,1332,1340,1342,1216,1226,1224,1216,1224,1220,1337,1341,1345,1337,1345,1347,1222,1230,1228,1222,1228,1225,1343,1346,1349,1343,1349,1351,1327,1332,1333,1328,1341,1337,1332,1342,1346,1343,1337,1347,1322,1327,1328,1323,1317,1322,1323,1318,1312,1317,1318,1313,1307,1312,1313,1308,1302,1307,1308,1303,1294,1302,1303,1295,1285,1294,1295,1286,1275,1285,1286,1276,1264,1275,1276,1265,1254,1264,1265,1255,1246,1254,1255,1247,1240,1246,1247,1241,1232,1240,1241,1236,1233,1232,1236,1237,1242,1233,1237,1243,1249,1242,1243,1250,1259,
+1249,1250,1260,1269,1259,1260,1270,1271,1280,1269,1271,1281,1153,1164,1154,1143,1153,1154,1155,1144,1134,1143,1144,1135,1126,1134,1135,1127,1120,1126,1127,1121,1113,1120,1121,1116,1110,1113,1116,1117,1122,1110,1117,1123,1128,1122,1123,1129,1138,1128,1129,1139,1148,1138,1139,1149,1159,1148,1149,1160,1168,1159,1160,1169,1176,1168,1169,1177,1181,1176,1177,1182,1186,1181,1182,1187,1191,1186,1187,1192,1196,1191,1192,1197,1201,1196,1197,1202,1206,1201,1202,1207,1211,1206,1207,1212,1216,1211,1212,1217,1218,1222,1216,1218,1223,326,327,324,325,1227,1229,1230,1222,1348,1344,1343,1350,1348,1343,1351,1223,1227,1222,340,341,336,337,1171,1164,1153,1172,1290,1297,1298,1280,1281,1290,1280,695,700,708,702,700,695,694,701,701,694,699,707,707,699,706,714,714,706,713,721,721,713,720,728,728,720,727,733,733,727,732,737,737,732,736,741,741,736,740,745,745,740,744,749,749,744,748,753,753,748,752,757,757,752,756,761,761,756,760,765,765,760,764,769,769,764,768,773,773,768,772,777,777,772,776,780,168,169,162,161,470,474,475,471,471,475,482,476,476,482,491,483,483,491,501,492,492,501,514,502,502,514,523,515,515,523,531,524,524,531,539,532,532,539,547,540,540,547,555,548,548,555,563,556,556,563,571,564,564,571,579,572,572,579,587,580,580,587,595,588,588,595,603,596,596,603,611,604,26,27,20,19,473,486,487,488,480,479,472,477,485,485,477,484,494,494,484,493,504,504,493,503,517,517,503,516,526,526,516,525,534,534,525,533,542,542,533,541,550,550,541,549,558,558,549,557,566,566,557,565,574,574,565,573,582,582,573,581,590,590,581,589,598,598,589,597,606,606,597,605,614,244,245,238,237,692,696,697,693,693,697,704,698,698,704,711,705,705,711,718,712,712,718,725,719,719,725,730,726,726,730,734,731,731,734,738,735,735,738,742,739,739,742,746,743,743,746,750,747,747,750,754,751,751,754,758,755,755,758,762,759,759,762,766,763,763,766,770,767,767,770,774,771,102,103,96,95,208,209,206,205,941,930,921,926,926,921,920,927,927,920,925,940,940,925,939,953,953,939,952,961,961,952,960,969,969,960,968,977,977,968,976,983,983,976,982,988,988,982,987,993,993,987,992,
+998,998,992,997,1003,1003,997,1002,1008,1008,1002,1007,1013,1013,1007,1012,1018,1018,1012,1017,1024,1024,1017,1023,1033,67,68,65,64,793,788,804,805,788,793,794,789,789,794,806,795,795,806,818,807,807,818,826,819,819,826,834,827,827,834,839,835,835,839,844,840,840,844,849,845,845,849,854,850,850,854,859,855,855,859,864,860,860,864,869,865,865,869,874,870,870,874,879,875,875,879,884,880,880,884,889,885,885,889,895,890,890,895,904,896,19,20,13,12,780,776,779,783,95,96,89,88,12,13,5,4,783,779,782,786,88,89,81,80,631,620,629,640,4,5,1,0,786,782,785,787,80,81,77,76,640,629,639,651,0,1,2,3,1352,1353,1354,1355,76,77,78,79,1372,1373,1374,1375,3,2,8,9,1355,1354,1356,1357,79,78,84,85,1375,1374,1376,1377,9,8,16,17,1357,1356,1358,1359,85,84,92,93,1377,1376,1378,1379,17,16,23,24,1359,1358,1360,1361,93,92,99,100,1379,1378,1380,1381,24,23,30,31,1361,1360,1362,1363,100,99,107,108,1381,1380,1382,1383,31,30,35,36,1363,1362,1364,1365,108,107,113,114,1383,1382,1384,1385,36,35,41,42,1365,1364,1366,1367,114,113,117,118,1385,1384,1386,1387,42,41,47,48,1367,1366,1368,1369,118,117,121,122,1387,1386,1388,1389,48,47,53,54,1369,1368,1370,1371,122,121,125,126,1389,1388,1390,1391,54,53,57,58,917,915,912,914,126,125,129,130,1047,1045,1042,1044,58,57,61,62,914,912,905,911,130,129,133,134,1044,1042,1039,1041,62,61,64,65,911,905,896,904,134,133,136,137,1041,1039,1031,1038,137,136,139,140,1038,1031,1022,1030,892,898,907,902,1030,1021,1026,1035,161,162,155,154,480,488,497,498,489,237,238,231,230,702,708,715,709,154,155,147,146,489,498,511,499,230,231,223,222,709,715,722,716,146,147,143,142,499,511,522,512,222,223,219,218,716,722,729,723,142,143,144,145,1392,1393,1394,1395,218,219,220,221,1412,1413,1414,1415,145,144,150,151,1395,1394,1396,1397,221,220,226,227,1415,1414,1416,1417,151,150,158,159,1397,1396,1398,1399,227,226,234,235,1417,1416,1418,1419,159,158,165,166,1399,1398,1400,1401,235,234,241,242,1419,1418,1420,1421,166,165,172,173,1401,1400,1402,1403,242,241,249,250,1421,1420,1422,1423,173,172,177,178,1403,1402,1404,1405,250,249,255,256,1423,1422,
+1424,1425,178,177,183,184,1405,1404,1406,1407,256,255,259,260,1425,1424,1426,1427,184,183,189,190,1407,1406,1408,1409,260,259,263,264,1427,1426,1428,1429,190,189,195,196,1409,1408,1410,1411,264,263,267,268,1429,1428,1430,1431,196,195,199,200,972,978,970,964,268,267,271,272,832,833,825,824,200,199,202,203,964,970,962,956,272,271,274,275,824,825,817,816,203,202,205,206,956,962,954,944,275,274,277,278,816,817,805,804,944,954,942,928,278,277,280,281,929,942,948,934,802,791,799,812,812,799,798,810,934,948,945,931,800,813,814,801,813,800,809,822,822,809,821,830,935,922,933,947,922,935,936,923,923,936,949,937,830,821,829,838,937,949,957,950,838,829,837,843,950,957,965,958,843,837,842,848,958,965,973,966,848,842,847,853,966,973,979,974,853,847,852,858,974,979,984,980,858,852,857,863,980,984,989,985,863,857,862,868,985,989,994,990,868,862,867,873,990,994,999,995,873,867,872,878,995,999,1004,1000,878,872,877,883,1000,1004,1009,1005,883,877,882,888,1005,1009,1014,1010,888,882,887,894,1010,1014,1019,1015,894,887,893,903,1015,1019,1025,1020,903,893,901,910,1020,1025,1034,1027,902,907,909,899,910,901,900,908,1035,1026,1029,1037,1027,1034,1036,1028,801,814,811,797,947,933,932,946,810,798,797,811,931,945,946,932,908,900,899,909,1028,1036,1037,1029,175,180,181,168,180,186,187,181,186,192,193,187,1432,1433,1434,1435,1433,1436,1437,1434,1436,1438,1439,1437,1438,1440,1441,1439,1440,1442,1443,1441,1442,1444,1445,1443,1444,1446,1447,1445,1446,1448,1449,1447,1448,1450,1451,1449,1450,1452,1453,1451,1452,1454,1455,1453,50,44,45,51,44,38,39,45,38,33,27,39,470,471,472,473,471,476,477,472,476,483,484,477,483,492,493,484,492,502,503,493,502,515,516,503,515,524,525,516,524,532,533,525,532,540,541,533,540,548,549,541,548,556,557,549,556,564,565,557,564,572,573,565,572,580,581,573,580,588,589,581,588,596,597,589,596,604,605,597,1466,1462,1463,1467,1462,1456,1459,1463,1456,1457,1458,1459,1457,1460,1461,1458,1460,1464,1465,1461,1464,1468,1469,1465,1468,1473,1474,1469,1473,1477,1478,1474,1477,1479,1480,1478,1479,1481,1482,1480,1481,1483,1484,1482,1483,
+1485,1486,1484,1485,1487,1488,1486,1487,1489,1490,1488,1489,1491,1492,1490,1491,1493,1494,1495,1492,692,693,694,695,693,698,699,694,698,705,706,699,705,712,713,706,712,719,720,713,719,726,727,720,726,731,732,727,731,735,736,732,735,739,740,736,739,743,744,740,743,747,748,744,747,751,752,748,751,755,756,752,755,759,760,756,759,763,764,760,763,767,768,764,767,771,772,768,209,212,213,211,212,214,215,213,214,216,217,215,1498,1499,1500,1501,1499,1502,1503,1500,1502,1504,1505,1503,1504,1506,1507,1505,1506,1508,1509,1507,1508,1510,1511,1509,1510,1512,1513,1511,1512,1514,1515,1513,1514,1516,1517,1515,1516,1518,1519,1517,1518,1520,1521,1519,74,72,73,75,72,70,71,73,70,67,69,71,788,789,790,791,792,789,795,796,790,795,807,808,796,807,819,820,808,819,827,828,820,827,835,836,828,835,840,841,836,840,845,846,841,845,850,851,846,850,855,856,851,855,860,861,856,860,865,866,861,865,870,871,866,870,875,876,871,875,880,881,876,880,885,886,881,885,890,891,892,886,1536,1537,1532,1533,1532,1528,1529,1533,1528,1522,1525,1529,1522,1523,1524,1525,1523,1526,1527,1524,1526,1530,1531,1527,1530,1534,1535,1531,1534,1538,1539,1535,1538,1542,1543,1539,1542,1546,1547,1543,1546,1550,1551,1547,1550,1554,1555,1551,1554,1556,1557,1555,1556,1558,1559,1557,1558,1560,1561,1559,1560,1562,1563,1561,1562,1564,1565,1563,918,919,920,921,919,924,925,920,924,938,939,925,938,951,952,939,951,959,960,952,959,967,968,960,967,975,976,968,975,981,982,976,981,986,987,982,986,991,992,987,991,996,997,992,996,1001,1002,997,1001,1006,1007,1002,1006,1011,1012,1007,1011,1016,1017,1012,1016,1021,1022,1023,1017,64,66,69,67,896,897,891,890,136,138,141,139,1031,1032,1023,1022,27,33,28,20,772,771,775,776,605,604,612,613,20,28,21,13,776,775,778,779,96,104,105,97,89,613,612,619,620,13,21,14,5,779,778,781,782,89,97,90,81,620,619,628,629,5,14,6,1,782,781,784,785,81,90,82,77,629,628,638,639,1,6,7,2,86,76,79,87,77,82,83,78,10,0,3,11,2,7,15,8,87,79,85,94,78,83,91,84,11,3,9,18,8,15,22,16,94,85,93,101,84,91,98,92,18,9,17,25,16,22,29,23,101,93,100,109,92,98,106,99,25,17,24,32,23,29,34,30,109,
+100,108,115,99,106,112,107,32,24,31,37,30,34,40,35,115,108,114,119,107,112,116,113,37,31,36,43,35,40,46,41,119,114,118,123,113,116,120,117,43,36,42,49,41,46,52,47,123,118,122,127,117,120,124,121,49,42,48,55,47,52,56,53,127,122,126,131,121,124,128,125,55,48,54,59,53,56,60,57,915,916,913,912,125,128,132,129,1045,1046,1043,1042,57,60,63,61,912,913,906,905,129,132,135,133,1042,1043,1040,1039,61,63,66,64,905,906,897,896,133,135,138,136,1039,1040,1032,1031,943,944,928,930,282,278,281,283,803,804,788,792,210,206,209,211,470,473,480,481,692,695,702,703,175,168,161,170,481,480,489,490,703,702,709,710,170,161,154,163,490,489,499,500,239,230,222,232,710,709,716,717,163,154,146,156,500,499,512,513,232,222,218,228,717,716,723,724,156,146,142,152,143,148,149,144,228,218,221,229,219,224,225,220,152,142,145,153,144,149,157,150,229,221,227,236,220,225,233,226,153,145,151,160,150,157,164,158,236,227,235,243,226,233,240,234,160,151,159,167,158,164,171,165,243,235,242,251,234,240,248,241,167,159,166,174,165,171,176,172,251,242,250,257,241,248,254,249,174,166,173,179,172,176,182,177,257,250,256,261,249,254,258,255,179,173,178,185,177,182,188,183,261,256,260,265,255,258,262,259,185,178,184,191,183,188,194,189,265,260,264,269,259,262,266,263,191,184,190,197,189,194,198,195,269,264,268,273,263,266,270,267,197,190,196,201,971,972,964,963,273,268,272,276,831,832,824,823,201,196,200,204,963,964,956,955,276,272,275,279,823,824,816,815,204,200,203,207,955,956,944,943,279,275,278,282,815,816,804,803,207,203,206,210,1549,1552,1553,1548,790,796,809,800,919,918,922,923,796,808,821,809,924,919,923,937,808,820,829,821,938,924,937,950,820,828,837,829,951,938,950,958,828,836,842,837,959,951,958,966,836,841,847,842,967,959,966,974,841,846,852,847,975,967,974,980,846,851,857,852,981,975,980,985,851,856,862,857,986,981,985,990,856,861,867,862,991,986,990,995,861,866,872,867,996,991,995,1000,866,871,877,872,1001,996,1000,1005,871,876,882,877,1006,1001,1005,1010,876,881,887,882,1011,1006,1010,1015,881,886,893,887,1016,1011,1015,1020,1570,1572,1573,1571,1548,
+1544,1545,1549,1544,1540,1541,1545,1540,1537,1536,1541,1564,1566,1567,1565,1566,1568,1569,1567,1568,1570,1571,1569,797,798,799,791,790,800,801,931,932,933,922,918,929,934,899,900,901,893,886,892,902,1026,1021,1016,1020,1027,1028,1029,928,929,918,921,930,892,891,898,1030,1022,1021,929,928,942,802,792,791,1048,1049,1050,1051,1108,1109,1107,1106,1104,1105,1103,1102,1100,1101,1099,1098,1098,1099,1097,1096,1096,1097,1095,1094,1094,1095,1093,1092,1092,1093,1091,1090,1090,1091,1089,1088,1088,1089,1087,1086,1086,1087,1085,1084,1084,1085,1083,1082,1082,1083,1081,1080,1080,1081,1079,1078,1078,1079,1077,1076,1076,1077,1075,1074,1074,1075,1073,1072,1072,1073,1071,1070,1070,1071,1069,1068,1068,1069,1067,1066,1066,1067,1065,1064,1064,1065,1063,1062,1062,1063,1061,1060,1060,1061,1059,1058,1056,1057,1055,1054,1052,1053,1049,1048,1054,1055,1053,1052,1058,1059,1057,1056,1106,1107,1105,1104,1102,1103,1101,1100,246,247,237,230,239,478,473,472,479,1470,1471,1466,1467,1472,630,622,613,620,631,621,605,613,622,623,505,487,495,506,506,495,510,518,486,507,508,496,496,508,519,509,518,510,521,527,509,519,528,520,527,521,530,535,535,530,538,543,520,528,536,529,529,536,544,537,543,538,546,551,551,546,554,559,537,544,552,545,545,552,560,553,559,554,562,567,553,560,568,561,567,562,570,575,561,568,576,569,575,570,578,583,569,576,584,577,583,578,586,591,577,584,592,585,591,586,594,599,585,592,600,593,599,594,602,607,593,600,608,601,607,602,610,615,601,608,616,609,615,610,618,624,609,616,625,617,624,618,627,634,617,625,635,626,634,627,637,647,626,635,648,636,647,637,650,656,636,648,657,649,656,650,659,664,649,657,665,658,664,659,667,672,658,665,673,666,672,667,675,680,666,673,681,674,680,675,683,688,674,681,689,682,688,683,684,691,682,689,690,685,691,684,676,687,685,690,686,677,687,676,668,679,677,686,678,669,679,668,660,671,669,678,670,661,671,660,652,663,661,670,662,653,663,652,641,655,655,641,632,646,653,662,654,642,642,654,644,633,623,645,646,632,643,621,633,644,632,633,621,623,1633,1632,1634,1635,1695,1694,1696,1697,495,487,486,496,1578,1582,1583,
+1579,1644,1645,1641,1640,510,509,520,521,1574,1575,1576,1577,1636,1637,1638,1639,530,529,537,538,1581,1580,1584,1585,1643,1642,1646,1647,538,537,545,546,1585,1584,1586,1587,1647,1646,1648,1649,546,545,553,554,1587,1586,1588,1589,1649,1648,1650,1651,554,553,561,562,1589,1588,1590,1591,1651,1650,1652,1653,562,561,569,570,1591,1590,1592,1593,1653,1652,1654,1655,570,569,577,578,1593,1592,1594,1595,1655,1654,1656,1657,578,577,585,586,1595,1594,1596,1597,1657,1656,1658,1659,586,585,593,594,1597,1596,1598,1599,1659,1658,1660,1661,594,593,601,602,1599,1598,1600,1601,1661,1660,1662,1663,602,601,609,610,1601,1600,1602,1603,1663,1662,1664,1665,610,609,617,618,1603,1602,1604,1605,1665,1664,1666,1667,618,617,626,627,1605,1604,1606,1607,1667,1666,1668,1669,627,626,636,637,1607,1606,1608,1609,1669,1668,1670,1671,637,636,649,650,1609,1608,1610,1611,1671,1670,1672,1673,650,649,658,659,1611,1610,1612,1613,1673,1672,1674,1675,659,658,666,667,1613,1612,1614,1615,1675,1674,1676,1677,667,666,674,675,1615,1614,1616,1617,1677,1676,1678,1679,675,674,682,683,1617,1616,1618,1619,1679,1678,1680,1681,683,682,685,684,1619,1618,1620,1621,1681,1680,1682,1683,684,685,677,676,1621,1620,1622,1623,1683,1682,1684,1685,676,677,669,668,1623,1622,1624,1625,1685,1684,1686,1687,660,661,653,652,1627,1626,1628,1629,1689,1688,1690,1691,641,642,633,632,1631,1630,1632,1633,1693,1692,1694,1695,652,653,642,641,1629,1628,1630,1631,1691,1690,1692,1693,668,669,661,660,1625,1624,1626,1627,1687,1686,1688,1689,495,496,509,510,1578,1579,1575,1574,1640,1641,1637,1636,521,520,529,530,1577,1576,1580,1581,1639,1638,1642,1643,247,246,252,253,1475,1476,1471,1470,110,111,105,104,1494,1493,1496,1497
+			} 
+		}
+		LayerElementMaterial: 0 {
+			Version: 101
+			Name: ""
+			MappingInformationType: "AllSame"
+			ReferenceInformationType: "IndexToDirect"
+			Materials: *1 {
+				a: 0
+			} 
+		}
+		Layer: 0 {
+			Version: 100
+			LayerElement:  {
+				Type: "LayerElementNormal"
+				TypedIndex: 0
+			}
+			LayerElement:  {
+				Type: "LayerElementMaterial"
+				TypedIndex: 0
+			}
+			LayerElement:  {
+				Type: "LayerElementUV"
+				TypedIndex: 0
+			}
+		}
+	}
+	Model: 363536144, "Model::HiFi_Xylophone1", "Null" {
+		Version: 232
+		Properties70:  {
+			P: "RotationActive", "bool", "", "",1
+			P: "InheritType", "enum", "", "",1
+			P: "ScalingMax", "Vector3D", "Vector", "",0,0,0
+			P: "DefaultAttributeIndex", "int", "Integer", "",0
+		}
+		Shading: Y
+		Culling: "CullingOff"
+	}
+	Model: 363538464, "Model::Frame", "Null" {
+		Version: 232
+		Properties70:  {
+			P: "RotationPivot", "Vector3D", "Vector", "",3.814697265625e-006,41.661837392844,-14.5002459569288
+			P: "ScalingPivot", "Vector3D", "Vector", "",3.814697265625e-006,41.661837392844,-14.5002459569288
+			P: "RotationActive", "bool", "", "",1
+			P: "InheritType", "enum", "", "",1
+			P: "ScalingMax", "Vector3D", "Vector", "",0,0,0
+			P: "DefaultAttributeIndex", "int", "Integer", "",0
+			P: "currentUVSet", "KString", "", "U", "map1"
+		}
+		Shading: Y
+		Culling: "CullingOff"
+	}
+	Model: 363550064, "Model::Wave", "Null" {
+		Version: 232
+		Properties70:  {
+			P: "RotationPivot", "Vector3D", "Vector", "",-4.39795767187518e-015,84.4647528022276,4.56259961274829
+			P: "ScalingPivot", "Vector3D", "Vector", "",-4.39795767187518e-015,84.4647528022276,4.56259961274829
+			P: "RotationActive", "bool", "", "",1
+			P: "InheritType", "enum", "", "",1
+			P: "ScalingMax", "Vector3D", "Vector", "",0,0,0
+			P: "DefaultAttributeIndex", "int", "Integer", "",0
+			P: "currentUVSet", "KString", "", "U", "map1"
+		}
+		Shading: Y
+		Culling: "CullingOff"
+	}
+	Model: 363517584, "Model::transform2", "Null" {
+		Version: 232
+		Properties70:  {
+			P: "RotationActive", "bool", "", "",1
+			P: "InheritType", "enum", "", "",1
+			P: "ScalingMax", "Vector3D", "Vector", "",0,0,0
+			P: "DefaultAttributeIndex", "int", "Integer", "",0
+			P: "Visibility", "Visibility", "", "A",0
+		}
+		Shading: Y
+		Culling: "CullingOff"
+	}
+	Model: 363503664, "Model::transform1", "Null" {
+		Version: 232
+		Properties70:  {
+			P: "RotationActive", "bool", "", "",1
+			P: "InheritType", "enum", "", "",1
+			P: "ScalingMax", "Vector3D", "Vector", "",0,0,0
+			P: "DefaultAttributeIndex", "int", "Integer", "",0
+			P: "Visibility", "Visibility", "", "A",0
+		}
+		Shading: Y
+		Culling: "CullingOff"
+	}
+	Model: 363501344, "Model::Wave", "Mesh" {
+		Version: 232
+		Properties70:  {
+			P: "RotationPivot", "Vector3D", "Vector", "",1.1444091796875e-005,41.6618365049362,-25.8935875892639
+			P: "ScalingPivot", "Vector3D", "Vector", "",1.1444091796875e-005,41.6618365049362,-25.8935875892639
+			P: "RotationActive", "bool", "", "",1
+			P: "InheritType", "enum", "", "",1
+			P: "ScalingMax", "Vector3D", "Vector", "",0,0,0
+			P: "DefaultAttributeIndex", "int", "Integer", "",0
+			P: "currentUVSet", "KString", "", "U", "map1"
+		}
+		Shading: T
+		Culling: "CullingOff"
+	}
+	Material: 1611742192, "Material::Steel", "" {
+		Version: 102
+		ShadingModel: "unknown"
+		MultiLayer: 0
+		Properties70:  {
+			P: "Maya", "Compound", "", ""
+			P: "Maya|TypeId", "int", "Integer", "",1166017
+			P: "Maya|TEX_global_diffuse_cube", "Vector3D", "Vector", "",0,0,0
+			P: "Maya|TEX_global_specular_cube", "Vector3D", "Vector", "",0,0,0
+			P: "Maya|TEX_brdf_lut", "Vector3D", "Vector", "",0,0,0
+			P: "Maya|use_normal_map", "float", "", "",1
+			P: "Maya|uv_offset", "Vector2D", "Vector2", "",0,0
+			P: "Maya|uv_scale", "Vector2D", "Vector2", "",1,1
+			P: "Maya|TEX_normal_map", "Vector3D", "Vector", "",0,0,0
+			P: "Maya|use_color_map", "float", "", "",1
+			P: "Maya|TEX_color_map", "Vector3D", "Vector", "",0,0,0
+			P: "Maya|base_color", "Vector3D", "Vector", "",1,1,1
+			P: "Maya|use_metallic_map", "float", "", "",1
+			P: "Maya|TEX_metallic_map", "Vector3D", "Vector", "",0,0,0
+			P: "Maya|metallic", "float", "", "",1
+			P: "Maya|use_roughness_map", "float", "", "",1
+			P: "Maya|TEX_roughness_map", "Vector3D", "Vector", "",0,0,0
+			P: "Maya|roughness", "float", "", "",0.5
+			P: "Maya|use_emissive_map", "float", "", "",0
+			P: "Maya|TEX_emissive_map", "Vector3D", "Vector", "",0,0,0
+			P: "Maya|emissive", "Vector3D", "Vector", "",0,0,0
+			P: "Maya|emissive_intensity", "float", "", "",0
+			P: "Maya|use_ao_map", "float", "", "",1
+			P: "Maya|TEX_ao_map", "Vector3D", "Vector", "",0,0,0
+		}
+	}
+	Video: 1971809008, "Video::file6", "Clip" {
+		Type: "Clip"
+		Properties70:  {
+			P: "Path", "KString", "XRefUrl", "", "F:/Dropbox/Dropbox/_High Fidelity/xylophone/xylophoneFrameWithWave_Steel_Metallic.png"
+		}
+		UseMipMap: 0
+		Filename: "F:/Dropbox/Dropbox/_High Fidelity/xylophone/xylophoneFrameWithWave_Steel_Metallic.png"
+		RelativeFilename: "xylophoneFrameWithWave_Steel_Metallic.png"
+	}
+	Video: 1971833408, "Video::file7", "Clip" {
+		Type: "Clip"
+		Properties70:  {
+			P: "Path", "KString", "XRefUrl", "", "F:/Dropbox/Dropbox/_High Fidelity/xylophone/xylophoneFrameWithWave_Steel_Roughness.png"
+		}
+		UseMipMap: 0
+		Filename: "F:/Dropbox/Dropbox/_High Fidelity/xylophone/xylophoneFrameWithWave_Steel_Roughness.png"
+		RelativeFilename: "xylophoneFrameWithWave_Steel_Roughness.png"
+	}
+	Video: 1971825008, "Video::file4", "Clip" {
+		Type: "Clip"
+		Properties70:  {
+			P: "Path", "KString", "XRefUrl", "", "F:/Dropbox/Dropbox/_High Fidelity/xylophone/xylophoneFrameWithWave_Steel_BaseColor.png"
+		}
+		UseMipMap: 0
+		Filename: "F:/Dropbox/Dropbox/_High Fidelity/xylophone/xylophoneFrameWithWave_Steel_BaseColor.png"
+		RelativeFilename: "xylophoneFrameWithWave_Steel_BaseColor.png"
+	}
+	Video: 1971829008, "Video::file5", "Clip" {
+		Type: "Clip"
+		Properties70:  {
+			P: "Path", "KString", "XRefUrl", "", "F:/Dropbox/Dropbox/_High Fidelity/xylophone/xylophoneFrameWithWave_Steel_Normal.png"
+		}
+		UseMipMap: 0
+		Filename: "F:/Dropbox/Dropbox/_High Fidelity/xylophone/xylophoneFrameWithWave_Steel_Normal.png"
+		RelativeFilename: "xylophoneFrameWithWave_Steel_Normal.png"
+	}
+	Texture: 1982231296, "Texture::file6", "" {
+		Type: "TextureVideoClip"
+		Version: 202
+		TextureName: "Texture::file6"
+		Properties70:  {
+			P: "UseMaterial", "bool", "", "",1
+		}
+		Media: "Video::file6"
+		FileName: "F:/Dropbox/Dropbox/_High Fidelity/xylophone/xylophoneFrameWithWave_Steel_Metallic.png"
+		RelativeFilename: "xylophoneFrameWithWave_Steel_Metallic.png"
+		ModelUVTranslation: 0,0
+		ModelUVScaling: 1,1
+		Texture_Alpha_Source: "None"
+		Cropping: 0,0,0,0
+	}
+	Texture: 1982230816, "Texture::file8", "" {
+		Type: "TextureVideoClip"
+		Version: 202
+		TextureName: "Texture::file8"
+		Properties70:  {
+			P: "UseMaterial", "bool", "", "",1
+		}
+		Media: ""
+		FileName: ""
+		RelativeFilename: ""
+		ModelUVTranslation: 0,0
+		ModelUVScaling: 1,1
+		Texture_Alpha_Source: "None"
+		Cropping: 0,0,0,0
+	}
+	Texture: 1982230336, "Texture::file2", "" {
+		Type: "TextureVideoClip"
+		Version: 202
+		TextureName: "Texture::file2"
+		Properties70:  {
+			P: "UseMaterial", "bool", "", "",1
+		}
+		Media: ""
+		FileName: ""
+		RelativeFilename: ""
+		ModelUVTranslation: 0,0
+		ModelUVScaling: 1,1
+		Texture_Alpha_Source: "None"
+		Cropping: 0,0,0,0
+	}
+	Texture: 1971096816, "Texture::file1", "" {
+		Type: "TextureVideoClip"
+		Version: 202
+		TextureName: "Texture::file1"
+		Properties70:  {
+			P: "UseMaterial", "bool", "", "",1
+		}
+		Media: ""
+		FileName: ""
+		RelativeFilename: ""
+		ModelUVTranslation: 0,0
+		ModelUVScaling: 1,1
+		Texture_Alpha_Source: "None"
+		Cropping: 0,0,0,0
+	}
+	Texture: 1531689904, "Texture::file7", "" {
+		Type: "TextureVideoClip"
+		Version: 202
+		TextureName: "Texture::file7"
+		Properties70:  {
+			P: "UseMaterial", "bool", "", "",1
+		}
+		Media: "Video::file7"
+		FileName: "F:/Dropbox/Dropbox/_High Fidelity/xylophone/xylophoneFrameWithWave_Steel_Roughness.png"
+		RelativeFilename: "xylophoneFrameWithWave_Steel_Roughness.png"
+		ModelUVTranslation: 0,0
+		ModelUVScaling: 1,1
+		Texture_Alpha_Source: "None"
+		Cropping: 0,0,0,0
+	}
+	Texture: 1612282368, "Texture::file3", "" {
+		Type: "TextureVideoClip"
+		Version: 202
+		TextureName: "Texture::file3"
+		Properties70:  {
+			P: "UseMaterial", "bool", "", "",1
+		}
+		Media: ""
+		FileName: ""
+		RelativeFilename: ""
+		ModelUVTranslation: 0,0
+		ModelUVScaling: 1,1
+		Texture_Alpha_Source: "None"
+		Cropping: 0,0,0,0
+	}
+	Texture: 1612282848, "Texture::file4", "" {
+		Type: "TextureVideoClip"
+		Version: 202
+		TextureName: "Texture::file4"
+		Properties70:  {
+			P: "UseMaterial", "bool", "", "",1
+		}
+		Media: "Video::file4"
+		FileName: "F:/Dropbox/Dropbox/_High Fidelity/xylophone/xylophoneFrameWithWave_Steel_BaseColor.png"
+		RelativeFilename: "xylophoneFrameWithWave_Steel_BaseColor.png"
+		ModelUVTranslation: 0,0
+		ModelUVScaling: 1,1
+		Texture_Alpha_Source: "None"
+		Cropping: 0,0,0,0
+	}
+	Texture: 1612283328, "Texture::file5", "" {
+		Type: "TextureVideoClip"
+		Version: 202
+		TextureName: "Texture::file5"
+		Properties70:  {
+			P: "UseMaterial", "bool", "", "",1
+		}
+		Media: "Video::file5"
+		FileName: "F:/Dropbox/Dropbox/_High Fidelity/xylophone/xylophoneFrameWithWave_Steel_Normal.png"
+		RelativeFilename: "xylophoneFrameWithWave_Steel_Normal.png"
+		ModelUVTranslation: 0,0
+		ModelUVScaling: 1,1
+		Texture_Alpha_Source: "None"
+		Cropping: 0,0,0,0
+	}
+	Implementation: 1981166160, "Implementation::Steel_Implementation", "" {
+		Version: 100
+		Properties70:  {
+			P: "ShaderLanguage", "KString", "", "", "SFX"
+			P: "ShaderLanguageVersion", "KString", "", "", "28"
+			P: "RenderAPI", "KString", "", "", "SFX_PBS_SHADER"
+			P: "RootBindingName", "KString", "", "", "root"
+			P: "ShaderGraph", "Blob", "", "",32006 {
+				BinaryData: "U0ZCX1dJTiA9IHsgIC8qClZlcnNpb249MjgKR3JvdXBWZXJzaW9uPS0xLjAKQWR2YW5jZWQ9MApIZWxwSUQ9MApQYXJlbnRNYXRlcmlhbD1wcmVzZXRzL1N0YW5kYXJkCk51bWJlck9mTm9kZXM9MzIKI05UPTIwMTg5IDAKCVBDPTMKCW5hbWU9MSB2PTUwMDAgTWV0YWxsaWNfTWFwX1N3aXRjaAoJcG9zeD0xIHY9MjAwMyAxMDIwLjAKCXBvc3k9MSB2PTIwMDMgMjQwLjAKCWdyb3VwPS0xCglJU0M9NAoJCVNWVD01MDIyIDIwMDMgMSAwIDAgCgkJU1ZUPTUwMjIgMjAwMyAyIDEgMCAKCQlTRFY9MS4wCgkJU1ZUPTUwMjIgMjAwMyAzIDAgMSAKCQlTQ1M9cgoJCVNWVD01MDIyIDIwMDMgNCAwIDAgCglPU0M9MQoJCVNWVD01MDIyIDIwMDMgNSAKCQlDQz0xCgkJCUM9MCAwIDUgNSA1IDYgMAoJCQlDUEM9MAojTlQ9MjAxODkgMAoJUEM9MwoJbmFtZT0xIHY9NTAwMCBFbWlzc2l2ZV9NYXBfU3dpdGNoCglwb3N4PTEgdj0yMDAzIDc0MC4wCglwb3N5PTEgdj0yMDAzIDc4MC4wCglncm91cD0tMQoJSVNDPTQKCQlTVlQ9NTAyMiAyMDAzIDEgMCAwIAoJCVNWVD01MDIyIDIwMDMgMiAxIDAgCgkJU0RWPTEuMAoJCVNWVD01MDIyIDMwMDIgMyAwIDEgCgkJU0NTPXJnYgoJCVNWVD01MDIyIDMwMDIgNCAwIDAgCglPU0M9MQoJCVNWVD01MDIyIDMwMDIgNSAKCQlDQz0xCgkJCUM9MSAwIDUgMTAgMCAxIDAKCQkJQ1BDPTAKI05UPTIwMTg5IDAKCVBDPTMKCW5hbWU9MSB2PTUwMDAgQ29sb3JfTWFwX1N3aXRjaAoJcG9zeD0xIHY9MjAwMyAxMDIwLjAKCXBvc3k9MSB2PTIwMDMgLTM0MC4wCglncm91cD0tMQoJSVNDPTQKCQlTVlQ9NTAyMiAyMDAzIDEgMCAwIAoJCVNWVD01MDIyIDIwMDMgMiAxIDAgCgkJU0RWPTEuMAoJCVNWVD01MDIyIDMwMDIgMyAwIDEgCgkJU0NTPXJnYgoJCVNWVD01MDIyIDMwMDIgNCAwIDAgCglPU0M9MQoJCVNWVD01MDIyIDMwMDIgNSAKCQlDQz0xCgkJCUM9MiAwIDUgNSAxIDIgMAoJCQlDUEM9MAojTlQ9MjAxODkgMAoJUEM9MwoJbmFtZT0xIHY9NTAwMCBOb3JtYWxfTWFwX1N3aXRjaAoJcG9zeD0xIHY9MjAwMyAxMDIwLjAKCXBvc3k9MSB2PTIwMDMgLTYwLjAKCWdyb3VwPS0xCglJU0M9NAoJCVNWVD01MDIyIDIwMDMgMSAwIDAgCgkJU1ZUPTUwMjIgMjAwMyAyIDEgMCAKCQlTRFY9MS4wCgkJU1ZUPTUwMjIgMzAwMiAzIDAgMCAKCQlTVlQ9NTAyMiAzMDAyIDQgMCAwIAoJT1NDPTEKCQlTVlQ9NTAyMiAzMDAyIDUgCgkJQ0M9MQoJCQlDPTMgMCA1IDUgNCA1IDAKCQkJQ1BDPTAKI05UPTIwMTg5IDAKCVBDPTMKCW5hbWU9MSB2PTUwMDAgUm91Z2huZXNzX01hcF9Td2l0Y2gKCXBvc3g9MSB2PTIwMDMgMTAyMC4wCglwb3N5PTEgdj0yMDAzIDU0MC4wCglncm91cD0tMQoJSVNDPTQKCQlTVlQ9NTAyMiAyMDAzIDEgMCAwIAoJCVNWVD01MDIyIDIwMDMgMiAxIDAgCgkJU0RWPTEuMAoJCVNWVD01MDIyIDIwMDMgMyAwIDEgCgkJU0NTPXIKCQlTVlQ9NTAyMiAyMDAzIDQgMCAwIAoJT1NDPTEKCQlTVlQ9NTAyMiAyMDAzIDUgCgkJQ0M9MQoJCQlDPTQgMCA1IDUgNiA3IDAKCQkJQ1BDPTAKI05UPTIwMTc2IDAKCVBDPTQKCXBvc3g9MSB2PTIwMDMgMTM2MC4wCglwb3N5PTEgdj0yMDAzIDI2MC4wCglwcmVzZXRfcGF0aD0xIHY9NTAwMCBwcmVzZXRzL1N0YW5kYXJkCglub3JtYWxzcGFjZT0yIGU9MCB2PTUwMTIgMQoJZ3JvdXA9LTEKCUlTQz0xMwoJCVNWVD01MDIyIDMwMDIgMSAwIDAgCgkJU1ZUPTUwMjIgMzAwMiAyIDAgMCAKCQlTVlQ9NTAyMiAyMDAzIDMgMCAwIAoJCVNWVD01MDIyIDIwMDMgNCAwIDAgCgkJU1ZUPTUwMjIgMzAwMiA1IDAgMCAKCQlTVlQ9NTAyMiAyMDAzIDYgMCAwIAoJCVNWVD01MDIyIDIwMDMgNyAwIDAgCgkJU1ZUPTUwMjIgMzAwMiA4IDAgMCAKCQlTVlQ9NTAyMiAyMDAzIDkgMCAwIAoJCVNWVD01MDIyIDIwMDMgMTAgMCAwIAoJCVNWVD01MDIyIDIwMDMgMTEgMCAwIAoJCVNWVD01MDIyIDIwMDMgMTQgMCAwIAoJCVNWVD01MDIyIDIwMDMgMTUgMCAwIAoJT1NDPTAKI05UPTIwMTg5IDAKCVBDPTMKCW5hbWU9MSB2PTUwMDAgQW9fTWFwX1N3dGljaAoJcG9zeD0xIHY9MjAwMyAxMDIwLjAKCXBvc3k9MSB2PTIwMDMgMTEwMC4wCglncm91cD0tMQoJSVNDPTQKCQlTVlQ9NTAyMiAyMDAzIDEgMCAwIAoJCVNWVD01MDIyIDIwMDMgMiAxIDAgCgkJU0RWPTEuMAoJCVNWVD01MDIyIDIwMDMgMyAwIDEgCgkJU0NTPXIKCQlTVlQ9NTAyMiAyMDAzIDQgMSAwIAoJCVNEVj0xLjAKCU9TQz0xCgkJU1ZUPTUwMjIgMjAwMyA1IAoJCUNDPTEKCQkJQz02IDAgNSA1IDggOSAwCgkJCUNQQz0wCiNOVD0yMDE3OCAwCglQQz0yCglwb3N4PTEgdj0yMDAzIC0yNjAuMAoJcG9zeT0xIHY9MjAwMyA0MjAuMAoJZ3JvdXA9LTEKCUlTQz0wCglPU0M9MQoJCVNWVD01MDIyIDMwMDEgMSAKCQlDQz0xCgkJCUM9NyAwIDEgMjggMSAyIDAKCQkJQ1BDPTAKI05UPTIwMTc3IDAKCVBDPTYKCW5hbWU9MSB2PTUwMDAgcm91Z2huZXNzX21hcAoJcG9zeD0xIHY9MjAwMyA3MDAuMAoJcG9zeT0xIHY9MjAwMyA1NDAuMAoJdGV4dHVyZXBhdGg9MiBlPTEgdj01MDAwIEY6L0Ryb3Bib3gvRHJvcGJveC9fSGlnaCBGaWRlbGl0eS94eWxvcGhvbmUveHlsb3Bob25lRnJhbWVXaXRoV2F2ZV9TdGVlbF9Sb3VnaG5lc3MucG5nCgllbmNvZGluZz0yIGU9MCB2PTUwMTIgMAoJdWlvcmRlcj0yIGU9MCB2PTIwMDIgNAoJZ3JvdXA9LTEKCUlTQz0yCgkJU1ZUPTUw",
+ "MjIgMzAwMSAxIDAgMCAKCQlTVlQ9NTAyMiAyMDAzIDIgMCAwIAoJT1NDPTEKCQlTVlQ9NTAyMiAzMDAzIDMgCgkJQ0M9MQoJCQlDPTggMCAzIDQgMiAzIDAKCQkJQ1BDPTAKI05UPTIwMTc3IDAKCVBDPTQKCW5hbWU9MSB2PTUwMDAgZW1pc3NpdmVfbWFwCglwb3N4PTEgdj0yMDAzIDQyMC4wCglwb3N5PTEgdj0yMDAzIDc4MC4wCgl1aW9yZGVyPTIgZT0wIHY9MjAwMiA1Cglncm91cD0tMQoJSVNDPTIKCQlTVlQ9NTAyMiAzMDAxIDEgMCAwIAoJCVNWVD01MDIyIDIwMDMgMiAwIDAgCglPU0M9MQoJCVNWVD01MDIyIDMwMDMgMyAKCQlDQz0xCgkJCUM9OSAwIDMgMSAyIDMgMAoJCQlDUEM9MAojTlQ9MjAxODYgMAoJUEM9MgoJcG9zeD0xIHY9MjAwMyAxMDIwLjAKCXBvc3k9MSB2PTIwMDMgODQwLjAKCWdyb3VwPS0xCglJU0M9MgoJCVNWVD01MDIyIDMwMDIgMSAwIDAgCgkJU1ZUPTUwMjIgMjAwMyAyIDAgMCAKCU9TQz0xCgkJU1ZUPTUwMjIgMzAwMiAzIAoJCUNDPTEKCQkJQz0xMCAwIDMgNSA3IDggMAoJCQlDUEM9MAojTlQ9MjAxODUgMAoJUEM9NwoJbmFtZT0xIHY9NTAwMCB1c2VfY29sb3JfbWFwCglwb3N4PTEgdj0yMDAzIDcwMC4wCglwb3N5PTEgdj0yMDAzIC00MDAuMAoJdHlwZT0yIGU9MCB2PTUwMTIgMAoJZGVmYXVsdHNjYWxhcj0yIGU9MCB2PTIwMDMgMS4wCgl1aXR5cGU9MiBlPTAgdj01MDEyIDEKCXVpb3JkZXI9MiBlPTAgdj0yMDAyIDEwCglncm91cD0tMQoJSVNDPTAKCU9TQz0xCgkJU1ZUPTUwMjIgMjAwMyAxIAoJCUNDPTEKCQkJQz0xMSAwIDEgMiAwIDEgMAoJCQlDUEM9MAojTlQ9MjAxNzcgMAoJUEM9NQoJbmFtZT0xIHY9NTAwMCBjb2xvcl9tYXAKCXBvc3g9MSB2PTIwMDMgNzAwLjAKCXBvc3k9MSB2PTIwMDMgLTM0MC4wCgl0ZXh0dXJlcGF0aD0yIGU9MSB2PTUwMDAgRjovRHJvcGJveC9Ecm9wYm94L19IaWdoIEZpZGVsaXR5L3h5bG9waG9uZS94eWxvcGhvbmVGcmFtZVdpdGhXYXZlX1N0ZWVsX0Jhc2VDb2xvci5wbmcKCXVpb3JkZXI9MiBlPTAgdj0yMDAyIDEKCWdyb3VwPS0xCglJU0M9MgoJCVNWVD01MDIyIDMwMDEgMSAwIDAgCgkJU1ZUPTUwMjIgMjAwMyAyIDAgMCAKCU9TQz0xCgkJU1ZUPTUwMjIgMzAwMyAzIAoJCUNDPTEKCQkJQz0xMiAwIDMgMiAyIDMgMAoJCQlDUEM9MAojTlQ9MjAxODUgMAoJUEM9NwoJbmFtZT0xIHY9NTAwMCBiYXNlX2NvbG9yCglwb3N4PTEgdj0yMDAzIDcwMC4wCglwb3N5PTEgdj0yMDAzIC0yNDAuMAoJdHlwZT0yIGU9MCB2PTUwMTIgMgoJZGVmYXVsdHZlY3RocmVlPTIgZT0wIHY9MzAwMiAxLjAsMS4wLDEuMAoJZGVmYXVsdHZlY3Rvcj0yIGU9MCB2PTMwMDMgMC41LDAuNSwwLjUsMC4wCgl1aW9yZGVyPTIgZT0wIHY9MjAwMiAyMAoJZ3JvdXA9LTEKCUlTQz0wCglPU0M9MQoJCVNWVD01MDIyIDMwMDIgMSAKCQlDQz0xCgkJCUM9MTMgMCAxIDIgMyA0IDAKCQkJQ1BDPTAKI05UPTIwMTg1IDAKCVBDPTcKCW5hbWU9MSB2PTUwMDAgdXNlX25vcm1hbF9tYXAKCXBvc3g9MSB2PTIwMDMgNzAwLjAKCXBvc3k9MSB2PTIwMDMgLTEyMC4wCgl0eXBlPTIgZT0wIHY9NTAxMiAwCglkZWZhdWx0c2NhbGFyPTIgZT0wIHY9MjAwMyAxLjAKCXVpdHlwZT0yIGU9MCB2PTUwMTIgMQoJdWlvcmRlcj0yIGU9MCB2PTIwMDIgMTEKCWdyb3VwPS0xCglJU0M9MAoJT1NDPTEKCQlTVlQ9NTAyMiAyMDAzIDEgCgkJQ0M9MQoJCQlDPTE0IDAgMSAzIDAgMSAwCgkJCUNQQz0wCiNOVD0yMDE5NCAwCglQQz0yCglwb3N4PTEgdj0yMDAzIDY4MC4wCglwb3N5PTEgdj0yMDAzIDYwLjAKCWdyb3VwPS0xCglJU0M9MAoJT1NDPTEKCQlTVlQ9NTAyMiAzMDAyIDEgCgkJQ0M9MQoJCQlDPTE1IDAgMSAzIDMgNCAwCgkJCUNQQz0wCiNOVD0yMDE5NSAwCglQQz0yCglwb3N4PTEgdj0yMDAzIDc0MC4wCglwb3N5PTEgdj0yMDAzIC02MC4wCglncm91cD0tMQoJSVNDPTEKCQlTVlQ9NTAyMiAzMDAyIDEgMCAxIAoJCVNDUz1yZ2IKCU9TQz0xCgkJU1ZUPTUwMjIgMzAwMiAyIAoJCUNDPTEKCQkJQz0xNiAwIDIgMyAyIDMgMAoJCQlDUEM9MAojTlQ9MjAxNzcgMAoJUEM9NgoJbmFtZT0xIHY9NTAwMCBub3JtYWxfbWFwCglwb3N4PTEgdj0yMDAzIDQ0MC4wCglwb3N5PTEgdj0yMDAzIC02MC4wCgl0ZXh0dXJlcGF0aD0yIGU9MSB2PTUwMDAgRjovRHJvcGJveC9Ecm9wYm94L19IaWdoIEZpZGVsaXR5L3h5bG9waG9uZS94eWxvcGhvbmVGcmFtZVdpdGhXYXZlX1N0ZWVsX05vcm1hbC5wbmcKCWVuY29kaW5nPTIgZT0wIHY9NTAxMiAyCgl1aW9yZGVyPTIgZT0wIHY9MjAwMiAyCglncm91cD0tMQoJSVNDPTIKCQlTVlQ9NTAyMiAzMDAxIDEgMCAwIAoJCVNWVD01MDIyIDIwMDMgMiAwIDAgCglPU0M9MQoJCVNWVD01MDIyIDMwMDMgMyAKCQlDQz0xCgkJCUM9MTcgMCAzIDE2IDAgMSAwCgkJCUNQQz0wCiNOVD0yMDE3NyAwCglQQz03CgluYW1lPTEgdj01MDAwIG1ldGFsbGljX21hcAoJcG9zeD0xIHY9MjAwMyA3MDAuMAoJcG9zeT0xIHY9MjAwMyAyNDAuMAoJdGV4dHVyZXBhdGg9MiBlPTEgdj01MDAwIEY6L0Ryb3Bib3gvRHJvcGJveC9fSGlnaCBGaWRlbGl0eS94eWxvcGhvbmUveHlsb3Bob25lRnJhbWVXaXRoV2F2ZV9TdGVlbF9NZXRhbGxpYy5wbmcKCWVuY29kaW5nPTIgZT0wIHY9NTAxMiAwCglmaWx0ZXI9MiBlPTAgdj01MDEyIDEKCXVpb3JkZXI9MiBlPTAgdj0yMDAyIDMKCWdyb3VwPS0xCglJU0M9MgoJCVNWVD01MDIy",
+ "IDMwMDEgMSAwIDAgCgkJU1ZUPTUwMjIgMjAwMyAyIDAgMCAKCU9TQz0xCgkJU1ZUPTUwMjIgMzAwMyAzIAoJCUNDPTEKCQkJQz0xOCAwIDMgMCAyIDMgMAoJCQlDUEM9MAojTlQ9MjAxODUgMAoJUEM9NwoJbmFtZT0xIHY9NTAwMCB1c2VfbWV0YWxsaWNfbWFwCglwb3N4PTEgdj0yMDAzIDcwMC4wCglwb3N5PTEgdj0yMDAzIDE4MC4wCgl0eXBlPTIgZT0wIHY9NTAxMiAwCglkZWZhdWx0c2NhbGFyPTIgZT0wIHY9MjAwMyAxLjAKCXVpdHlwZT0yIGU9MCB2PTUwMTIgMQoJdWlvcmRlcj0yIGU9MCB2PTIwMDIgMTIKCWdyb3VwPS0xCglJU0M9MAoJT1NDPTEKCQlTVlQ9NTAyMiAyMDAzIDEgCgkJQ0M9MQoJCQlDPTE5IDAgMSAwIDAgMSAwCgkJCUNQQz0wCiNOVD0yMDE4NSAwCglQQz02CgluYW1lPTEgdj01MDAwIG1ldGFsbGljCglwb3N4PTEgdj0yMDAzIDcwMC4wCglwb3N5PTEgdj0yMDAzIDM0MC4wCgl0eXBlPTIgZT0wIHY9NTAxMiAwCglkZWZhdWx0c2NhbGFyPTIgZT0wIHY9MjAwMyAxLjAKCXVpb3JkZXI9MiBlPTAgdj0yMDAyIDIxCglncm91cD0tMQoJSVNDPTAKCU9TQz0xCgkJU1ZUPTUwMjIgMjAwMyAxIAoJCUNDPTEKCQkJQz0yMCAwIDEgMCAzIDQgMAoJCQlDUEM9MAojTlQ9MjAxODUgMAoJUEM9NwoJbmFtZT0xIHY9NTAwMCB1c2Vfcm91Z2huZXNzX21hcAoJcG9zeD0xIHY9MjAwMyA3MDAuMAoJcG9zeT0xIHY9MjAwMyA0ODAuMAoJdHlwZT0yIGU9MCB2PTUwMTIgMAoJZGVmYXVsdHNjYWxhcj0yIGU9MCB2PTIwMDMgMS4wCgl1aXR5cGU9MiBlPTAgdj01MDEyIDEKCXVpb3JkZXI9MiBlPTAgdj0yMDAyIDEzCglncm91cD0tMQoJSVNDPTAKCU9TQz0xCgkJU1ZUPTUwMjIgMjAwMyAxIAoJCUNDPTEKCQkJQz0yMSAwIDEgNCAwIDEgMAoJCQlDUEM9MAojTlQ9MjAxODUgMAoJUEM9NgoJbmFtZT0xIHY9NTAwMCByb3VnaG5lc3MKCXBvc3g9MSB2PTIwMDMgNzAwLjAKCXBvc3k9MSB2PTIwMDMgNjQwLjAKCXR5cGU9MiBlPTAgdj01MDEyIDAKCWRlZmF1bHRzY2FsYXI9MiBlPTAgdj0yMDAzIDAuNQoJdWlvcmRlcj0yIGU9MCB2PTIwMDIgMjIKCWdyb3VwPS0xCglJU0M9MAoJT1NDPTEKCQlTVlQ9NTAyMiAyMDAzIDEgCgkJQ0M9MQoJCQlDPTIyIDAgMSA0IDMgNCAwCgkJCUNQQz0wCiNOVD0yMDE4NSAwCglQQz01CgluYW1lPTEgdj01MDAwIGVtaXNzaXZlCglwb3N4PTEgdj0yMDAzIDQyMC4wCglwb3N5PTEgdj0yMDAzIDg4MC4wCgl0eXBlPTIgZT0wIHY9NTAxMiAyCgl1aW9yZGVyPTIgZT0wIHY9MjAwMiAyMwoJZ3JvdXA9LTEKCUlTQz0wCglPU0M9MQoJCVNWVD01MDIyIDMwMDIgMSAKCQlDQz0xCgkJCUM9MjMgMCAxIDEgMyA0IDAKCQkJQ1BDPTAKI05UPTIwMTg1IDAKCVBDPTYKCW5hbWU9MSB2PTUwMDAgdXNlX2VtaXNzaXZlX21hcAoJcG9zeD0xIHY9MjAwMyA0MjAuMAoJcG9zeT0xIHY9MjAwMyA3MjAuMAoJdHlwZT0yIGU9MCB2PTUwMTIgMAoJdWl0eXBlPTIgZT0wIHY9NTAxMiAxCgl1aW9yZGVyPTIgZT0wIHY9MjAwMiAxNAoJZ3JvdXA9LTEKCUlTQz0wCglPU0M9MQoJCVNWVD01MDIyIDIwMDMgMSAKCQlDQz0xCgkJCUM9MjQgMCAxIDEgMCAxIDAKCQkJQ1BDPTAKI05UPTIwMTg1IDAKCVBDPTcKCW5hbWU9MSB2PTUwMDAgdXNlX2FvX21hcAoJcG9zeD0xIHY9MjAwMyA3MDAuMAoJcG9zeT0xIHY9MjAwMyAxMTAwLjAKCXR5cGU9MiBlPTAgdj01MDEyIDAKCWRlZmF1bHRzY2FsYXI9MiBlPTAgdj0yMDAzIDEuMAoJdWl0eXBlPTIgZT0wIHY9NTAxMiAxCgl1aW9yZGVyPTIgZT0wIHY9MjAwMiAxNQoJZ3JvdXA9LTEKCUlTQz0wCglPU0M9MQoJCVNWVD01MDIyIDIwMDMgMSAKCQlDQz0xCgkJCUM9MjUgMCAxIDYgMCAxIDAKCQkJQ1BDPTAKI05UPTIwMTc3IDAKCVBDPTcKCW5hbWU9MSB2PTUwMDAgYW9fbWFwCglwb3N4PTEgdj0yMDAzIDcwMC4wCglwb3N5PTEgdj0yMDAzIDExNjAuMAoJdGV4dHVyZXBhdGg9MiBlPTEgdj01MDAwIEY6L0Ryb3Bib3gvRHJvcGJveC9fSGlnaCBGaWRlbGl0eS94eWxvcGhvbmUvCgllbmNvZGluZz0yIGU9MCB2PTUwMTIgMAoJZmlsdGVyPTIgZT0wIHY9NTAxMiAxCgl1aW9yZGVyPTIgZT0wIHY9MjAwMiA2Cglncm91cD0tMQoJSVNDPTIKCQlTVlQ9NTAyMiAzMDAxIDEgMCAwIAoJCVNWVD01MDIyIDIwMDMgMiAwIDAgCglPU0M9MQoJCVNWVD01MDIyIDMwMDMgMyAKCQlDQz0xCgkJCUM9MjYgMCAzIDYgMiAzIDAKCQkJQ1BDPTAKI05UPTIwMTg1IDAKCVBDPTYKCW5hbWU9MSB2PTUwMDAgZW1pc3NpdmVfaW50ZW5zaXR5Cglwb3N4PTEgdj0yMDAzIDc0MC4wCglwb3N5PTEgdj0yMDAzIDkyMC4wCgl0eXBlPTIgZT0wIHY9NTAxMiAwCgltYXhyYW5nZT0yIGU9MCB2PTIwMDMgMTAuMAoJdWlvcmRlcj0yIGU9MCB2PTIwMDIgNTMKCWdyb3VwPS0xCglJU0M9MAoJT1NDPTEKCQlTVlQ9NTAyMiAyMDAzIDEgCgkJQ0M9MQoJCQlDPTI3IDAgMSAxMCAxIDIgMAoJCQlDUEM9MAojTlQ9MjAxODYgMAoJUEM9MgoJcG9zeD0xIHY9MjAwMyAtNjAuMAoJcG9zeT0xIHY9MjAwMyA0MDAuMAoJZ3JvdXA9LTEKCUlTQz0yCgkJU1ZUPTUwMjIgMzAwMSAxIDAgMCAKCQlTVlQ9NTAyMiAzMDAxIDIgMCAwIAoJT1NDPTEKCQlTVlQ9NTAyMiAzMDAxIDMgCgkJQ0M9MQoJCQlDPTI4IDAgMyAyOSAxIDIgMAoJCQlDUEM9MAojTlQ9MjAxODcgMAoJUEM9MgoJcG9zeD0xIHY9MjAwMyAxMjAuMAoJcG9zeT0xIHY9MjAwMyA0MDAuMAoJ",
+ "Z3JvdXA9LTEKCUlTQz0yCgkJU1ZUPTUwMjIgMzAwMSAxIDAgMCAKCQlTVlQ9NTAyMiAzMDAxIDIgMCAwIAoJT1NDPTEKCQlTVlQ9NTAyMiAzMDAxIDMgCgkJQ0M9NgoJCQlDPTI5IDAgMyAxMiAwIDEgMAoJCQlDUEM9MAoJCQlDPTI5IDAgMyAxNyAwIDEgMAoJCQlDUEM9MAoJCQlDPTI5IDAgMyAxOCAwIDEgMAoJCQlDUEM9MAoJCQlDPTI5IDAgMyA4IDAgMSAwCgkJCUNQQz0wCgkJCUM9MjkgMCAzIDkgMCAxIDAKCQkJQ1BDPTAKCQkJQz0yOSAwIDMgMjYgMCAxIDAKCQkJQ1BDPTAKI05UPTIwMTg1IDAKCVBDPTcKCW5hbWU9MSB2PTUwMDAgdXZfb2Zmc2V0Cglwb3N4PTEgdj0yMDAzIC02MC4wCglwb3N5PTEgdj0yMDAzIDM0MC4wCgl0eXBlPTIgZT0wIHY9NTAxMiAxCgltaW5yYW5nZT0yIGU9MCB2PTIwMDMgLTFlKzAwOC4wCgltYXhyYW5nZT0yIGU9MCB2PTIwMDMgMWUrMDA4LjAKCXVpb3JkZXI9MiBlPTAgdj0yMDAyIDYwCglncm91cD0tMQoJSVNDPTAKCU9TQz0xCgkJU1ZUPTUwMjIgMzAwMSAxIAoJCUNDPTEKCQkJQz0zMCAwIDEgMjkgMCAxIDAKCQkJQ1BDPTAKI05UPTIwMTg1IDAKCVBDPTkKCW5hbWU9MSB2PTUwMDAgdXZfc2NhbGUKCXBvc3g9MSB2PTIwMDMgLTI0MC4wCglwb3N5PTEgdj0yMDAzIDM0MC4wCgl0eXBlPTIgZT0wIHY9NTAxMiAxCglkZWZhdWx0dmVjdHdvPTIgZT0wIHY9MzAwMSAxLjAsMS4wCglkZWZhdWx0dmVjdG9yPTIgZT0wIHY9MzAwMyAxLjAsMS4wLDAuMCwwLjAKCW1pbnJhbmdlPTIgZT0wIHY9MjAwMyAtMWUrMDA4LjAKCW1heHJhbmdlPTIgZT0wIHY9MjAwMyAxZSswMDguMAoJdWlvcmRlcj0yIGU9MCB2PTIwMDIgNjEKCWdyb3VwPS0xCglJU0M9MAoJT1NDPTEKCQlTVlQ9NTAyMiAzMDAxIDEgCgkJQ0M9MQoJCQlDPTMxIDAgMSAyOCAwIDEgMAoJCQlDUEM9MAoKICovIH0gCmNvbm5lY3Rpb25zID0gWwoJeyAKCQlkZXN0aW5hdGlvbiA9IHsgCgkJCWNvbm5lY3Rvcl9pZCA9ICJhY2E2OTBjYi02MzA1LTRhMmYtYmYzZC02OTE4M2E0OTNkYjMiIAoJCQlpbnN0YW5jZV9pZCA9ICJhYmJhYWJiYS1hYmJhLWFiYmEtYWJiYS1hYmJhYWJiYWFiYjYiIAoJCX0gCgkJc291cmNlID0geyAKCQkJaW5zdGFuY2VfaWQgPSAiYWJiYWFiYmEtYWJiYS1hYmJhLWFiYmEtYWJiYWFiYmFhYmIzIiAKCQl9IAoJfSAKCXsgCgkJZGVzdGluYXRpb24gPSB7IAoJCQljb25uZWN0b3JfaWQgPSAiQ0VEN0JCRjMtMEI0OC00MzM1LUI5MzMtMDk1QTQxQ0EwMjk0IiAKCQkJaW5zdGFuY2VfaWQgPSAiYWJiYWFiYmEtYWJiYS1hYmJhLWFiYmEtYWJiYWFiYmFhYmIzIiAKCQl9IAoJCXNvdXJjZSA9IHsgCgkJCWluc3RhbmNlX2lkID0gImFiYmFhYmJhLWFiYmEtYWJiYS1hYmJhLWFiYmFhYmJhYWIxMiIgCgkJfSAKCX0gCgl7IAoJCWRlc3RpbmF0aW9uID0geyAKCQkJY29ubmVjdG9yX2lkID0gIjRDQkI0NDgwLTc5RTgtNENFNy1BQzBGLThCMDlCQUYxMjM5MCIgCgkJCWluc3RhbmNlX2lkID0gImFiYmFhYmJhLWFiYmEtYWJiYS1hYmJhLWFiYmFhYmJhYWJiMyIgCgkJfSAKCQlzZWxlY3QgPSBbIAoJCQkicmdiIiAKCQkJXSAKCQlzb3VyY2UgPSB7IAoJCQlpbnN0YW5jZV9pZCA9ICJhYmJhYWJiYS1hYmJhLWFiYmEtYWJiYS1hYmJhYWJiYWFiMTMiIAoJCX0gCgl9IAoJeyAKCQlkZXN0aW5hdGlvbiA9IHsgCgkJCWNvbm5lY3Rvcl9pZCA9ICIxZWU5YWYxZi02NWYyLTQ3MzktYWQyOC01ZWE2YTBlNjhmYzMiIAoJCQlpbnN0YW5jZV9pZCA9ICJhYmJhYWJiYS1hYmJhLWFiYmEtYWJiYS1hYmJhYWJiYWFiMTMiIAoJCX0gCgkJc291cmNlID0geyAKCQkJaW5zdGFuY2VfaWQgPSAiYWJiYWFiYmEtYWJiYS1hYmJhLWFiYmEtYWJiYWFiYmFhYjMwIiAKCQl9IAoJfSAKCXsgCgkJZGVzdGluYXRpb24gPSB7IAoJCQljb25uZWN0b3JfaWQgPSAiMWVlOWFmMWYtNjVmMi00NzM5LWFkMjgtNWVhNmEwZTY4ZmMzIiAKCQkJaW5zdGFuY2VfaWQgPSAiYWJiYWFiYmEtYWJiYS1hYmJhLWFiYmEtYWJiYWFiYmFhYjE4IiAKCQl9IAoJCXNvdXJjZSA9IHsgCgkJCWluc3RhbmNlX2lkID0gImFiYmFhYmJhLWFiYmEtYWJiYS1hYmJhLWFiYmFhYmJhYWIzMCIgCgkJfSAKCX0gCgl7IAoJCWRlc3RpbmF0aW9uID0geyAKCQkJY29ubmVjdG9yX2lkID0gIjFlZTlhZjFmLTY1ZjItNDczOS1hZDI4LTVlYTZhMGU2OGZjMyIgCgkJCWluc3RhbmNlX2lkID0gImFiYmFhYmJhLWFiYmEtYWJiYS1hYmJhLWFiYmFhYmJhYWIxOSIgCgkJfSAKCQlzb3VyY2UgPSB7IAoJCQlpbnN0YW5jZV9pZCA9ICJhYmJhYWJiYS1hYmJhLWFiYmEtYWJiYS1hYmJhYWJiYWFiMzAiIAoJCX0gCgl9IAoJeyAKCQlkZXN0aW5hdGlvbiA9IHsgCgkJCWNvbm5lY3Rvcl9pZCA9ICIxZWU5YWYxZi02NWYyLTQ3MzktYWQyOC01ZWE2YTBlNjhmYzMiIAoJCQlpbnN0YW5jZV9pZCA9ICJhYmJhYWJiYS1hYmJhLWFiYmEtYWJiYS1hYmJhYWJiYWFiYjkiIAoJCX0gCgkJc291cmNlID0geyAKCQkJaW5zdGFuY2VfaWQgPSAiYWJiYWFiYmEtYWJiYS1hYmJhLWFiYmEtYWJiYWFiYmFhYjMwIiAKCQl9IAoJfSAKCXsgCgkJZGVzdGluYXRpb24gPSB7IAoJCQljb25uZWN0b3JfaWQgPSAiMWVlOWFmMWYtNjVmMi00NzM5LWFkMjgtNWVhNmEwZTY4ZmMzIiAKCQkJaW5zdGFuY2VfaWQgPSAiYWJiYWFiYmEtYWJiYS1hYmJhLWFiYmEtYWJiYWFiYmFhYjEwIiAKCQl9IAoJCXNvdXJjZSA9IHsgCgkJCWluc3RhbmNl",
+ "X2lkID0gImFiYmFhYmJhLWFiYmEtYWJiYS1hYmJhLWFiYmFhYmJhYWIzMCIgCgkJfSAKCX0gCgl7IAoJCWRlc3RpbmF0aW9uID0geyAKCQkJY29ubmVjdG9yX2lkID0gIjFlZTlhZjFmLTY1ZjItNDczOS1hZDI4LTVlYTZhMGU2OGZjMyIgCgkJCWluc3RhbmNlX2lkID0gImFiYmFhYmJhLWFiYmEtYWJiYS1hYmJhLWFiYmFhYmJhYWIyNyIgCgkJfSAKCQlzb3VyY2UgPSB7IAoJCQlpbnN0YW5jZV9pZCA9ICJhYmJhYWJiYS1hYmJhLWFiYmEtYWJiYS1hYmJhYWJiYWFiMzAiIAoJCX0gCgl9IAoJeyAKCQlkZXN0aW5hdGlvbiA9IHsgCgkJCWNvbm5lY3Rvcl9pZCA9ICJmNzI1OTdjNC03NDg3LTQxOWEtYWZmYi1kZjY5MGU2NTgyZTEiIAoJCQlpbnN0YW5jZV9pZCA9ICJhYmJhYWJiYS1hYmJhLWFiYmEtYWJiYS1hYmJhYWJiYWFiMzAiIAoJCX0gCgkJc291cmNlID0geyAKCQkJaW5zdGFuY2VfaWQgPSAiYWJiYWFiYmEtYWJiYS1hYmJhLWFiYmEtYWJiYWFiYmFhYjMxIiAKCQl9IAoJfSAKCXsgCgkJZGVzdGluYXRpb24gPSB7IAoJCQljb25uZWN0b3JfaWQgPSAiMDgwNmRiMGQtMmM0YS00M2NhLTk5Y2MtZjVhMmYwMzZhOGU4IiAKCQkJaW5zdGFuY2VfaWQgPSAiYWJiYWFiYmEtYWJiYS1hYmJhLWFiYmEtYWJiYWFiYmFhYjMwIiAKCQl9IAoJCXNvdXJjZSA9IHsgCgkJCWluc3RhbmNlX2lkID0gImFiYmFhYmJhLWFiYmEtYWJiYS1hYmJhLWFiYmFhYmJhYWIyOSIgCgkJfSAKCX0gCgl7IAoJCWRlc3RpbmF0aW9uID0geyAKCQkJY29ubmVjdG9yX2lkID0gImM1ODIzYzc1LTRhZTUtNGM3MS1iMDcwLTMxNWZhNGQwM2U4ZSIgCgkJCWluc3RhbmNlX2lkID0gImFiYmFhYmJhLWFiYmEtYWJiYS1hYmJhLWFiYmFhYmJhYWIyOSIgCgkJfSAKCQlzb3VyY2UgPSB7IAoJCQlpbnN0YW5jZV9pZCA9ICJhYmJhYWJiYS1hYmJhLWFiYmEtYWJiYS1hYmJhYWJiYWFiMzIiIAoJCX0gCgl9IAoJeyAKCQlkZXN0aW5hdGlvbiA9IHsgCgkJCWNvbm5lY3Rvcl9pZCA9ICIyNDJkMTY0OC1hNjI2LTQ0NWItOTUzNC1iY2NlYzA5NDExMmYiIAoJCQlpbnN0YW5jZV9pZCA9ICJhYmJhYWJiYS1hYmJhLWFiYmEtYWJiYS1hYmJhYWJiYWFiMjkiIAoJCX0gCgkJc291cmNlID0geyAKCQkJaW5zdGFuY2VfaWQgPSAiYWJiYWFiYmEtYWJiYS1hYmJhLWFiYmEtYWJiYWFiYmFhYmI4IiAKCQl9IAoJfSAKCXsgCgkJZGVzdGluYXRpb24gPSB7IAoJCQljb25uZWN0b3JfaWQgPSAiRjJGNzRFNTgtNDAyRC00NzJCLTg3REQtMzMxRTAwREI0MTZDIiAKCQkJaW5zdGFuY2VfaWQgPSAiYWJiYWFiYmEtYWJiYS1hYmJhLWFiYmEtYWJiYWFiYmFhYmIzIiAKCQl9IAoJCXNvdXJjZSA9IHsgCgkJCWluc3RhbmNlX2lkID0gImFiYmFhYmJhLWFiYmEtYWJiYS1hYmJhLWFiYmFhYmJhYWIxNCIgCgkJfSAKCX0gCgl7IAoJCWRlc3RpbmF0aW9uID0geyAKCQkJY29ubmVjdG9yX2lkID0gImIxYzg2NDA4LWFhY2ItNDQ2Ni1iNzU0LWRkY2YzN2EzYTJjOCIgCgkJCWluc3RhbmNlX2lkID0gImFiYmFhYmJhLWFiYmEtYWJiYS1hYmJhLWFiYmFhYmJhYWJiNiIgCgkJfSAKCQlzb3VyY2UgPSB7IAoJCQlpbnN0YW5jZV9pZCA9ICJhYmJhYWJiYS1hYmJhLWFiYmEtYWJiYS1hYmJhYWJiYWFiYjQiIAoJCX0gCgl9IAoJeyAKCQlkZXN0aW5hdGlvbiA9IHsgCgkJCWNvbm5lY3Rvcl9pZCA9ICJDRUQ3QkJGMy0wQjQ4LTQzMzUtQjkzMy0wOTVBNDFDQTAyOTQiIAoJCQlpbnN0YW5jZV9pZCA9ICJhYmJhYWJiYS1hYmJhLWFiYmEtYWJiYS1hYmJhYWJiYWFiYjQiIAoJCX0gCgkJc291cmNlID0geyAKCQkJaW5zdGFuY2VfaWQgPSAiYWJiYWFiYmEtYWJiYS1hYmJhLWFiYmEtYWJiYWFiYmFhYjE1IiAKCQl9IAoJfSAKCXsgCgkJZGVzdGluYXRpb24gPSB7IAoJCQljb25uZWN0b3JfaWQgPSAiNENCQjQ0ODAtNzlFOC00Q0U3LUFDMEYtOEIwOUJBRjEyMzkwIiAKCQkJaW5zdGFuY2VfaWQgPSAiYWJiYWFiYmEtYWJiYS1hYmJhLWFiYmEtYWJiYWFiYmFhYmI0IiAKCQl9IAoJCXNvdXJjZSA9IHsgCgkJCWluc3RhbmNlX2lkID0gImFiYmFhYmJhLWFiYmEtYWJiYS1hYmJhLWFiYmFhYmJhYWIxNyIgCgkJfSAKCX0gCgl7IAoJCWRlc3RpbmF0aW9uID0geyAKCQkJY29ubmVjdG9yX2lkID0gImY3MjU5N2M0LTc0ODctNDE5YS1hZmZiLWRmNjkwZTY1ODJlMSIgCgkJCWluc3RhbmNlX2lkID0gImFiYmFhYmJhLWFiYmEtYWJiYS1hYmJhLWFiYmFhYmJhYWIxNyIgCgkJfSAKCQlzZWxlY3QgPSBbIAoJCQkicmdiIiAKCQkJXSAKCQlzb3VyY2UgPSB7IAoJCQlpbnN0YW5jZV9pZCA9ICJhYmJhYWJiYS1hYmJhLWFiYmEtYWJiYS1hYmJhYWJiYWFiMTgiIAoJCX0gCgl9IAoJeyAKCQlkZXN0aW5hdGlvbiA9IHsgCgkJCWNvbm5lY3Rvcl9pZCA9ICJGMkY3NEU1OC00MDJELTQ3MkItODdERC0zMzFFMDBEQjQxNkMiIAoJCQlpbnN0YW5jZV9pZCA9ICJhYmJhYWJiYS1hYmJhLWFiYmEtYWJiYS1hYmJhYWJiYWFiYjQiIAoJCX0gCgkJc291cmNlID0geyAKCQkJaW5zdGFuY2VfaWQgPSAiYWJiYWFiYmEtYWJiYS1hYmJhLWFiYmEtYWJiYWFiYmFhYjE2IiAKCQl9IAoJfSAKCXsgCgkJZGVzdGluYXRpb24gPSB7IAoJCQljb25uZWN0b3JfaWQgPSAiYWQ1ZTA1MmYtZDMxNi00YTBmLThiNzktNTNjMzgyMDRkNjFiIiAKCQkJaW5zdGFuY2VfaWQgPSAiYWJiYWFiYmEtYWJiYS1hYmJhLWFiYmEtYWJiYWFiYmFhYmI2IiAKCQl9IAoJCXNvdXJj",
+ "ZSA9IHsgCgkJCWluc3RhbmNlX2lkID0gImFiYmFhYmJhLWFiYmEtYWJiYS1hYmJhLWFiYmFhYmJhYWJiMSIgCgkJfSAKCX0gCgl7IAoJCWRlc3RpbmF0aW9uID0geyAKCQkJY29ubmVjdG9yX2lkID0gIkNFRDdCQkYzLTBCNDgtNDMzNS1COTMzLTA5NUE0MUNBMDI5NCIgCgkJCWluc3RhbmNlX2lkID0gImFiYmFhYmJhLWFiYmEtYWJiYS1hYmJhLWFiYmFhYmJhYWJiMSIgCgkJfSAKCQlzb3VyY2UgPSB7IAoJCQlpbnN0YW5jZV9pZCA9ICJhYmJhYWJiYS1hYmJhLWFiYmEtYWJiYS1hYmJhYWJiYWFiMjAiIAoJCX0gCgl9IAoJeyAKCQlkZXN0aW5hdGlvbiA9IHsgCgkJCWNvbm5lY3Rvcl9pZCA9ICI0Q0JCNDQ4MC03OUU4LTRDRTctQUMwRi04QjA5QkFGMTIzOTAiIAoJCQlpbnN0YW5jZV9pZCA9ICJhYmJhYWJiYS1hYmJhLWFiYmEtYWJiYS1hYmJhYWJiYWFiYjEiIAoJCX0gCgkJc2VsZWN0ID0gWyAKCQkJInIiIAoJCQldIAoJCXNvdXJjZSA9IHsgCgkJCWluc3RhbmNlX2lkID0gImFiYmFhYmJhLWFiYmEtYWJiYS1hYmJhLWFiYmFhYmJhYWIxOSIgCgkJfSAKCX0gCgl7IAoJCWRlc3RpbmF0aW9uID0geyAKCQkJY29ubmVjdG9yX2lkID0gIkYyRjc0RTU4LTQwMkQtNDcyQi04N0RELTMzMUUwMERCNDE2QyIgCgkJCWluc3RhbmNlX2lkID0gImFiYmFhYmJhLWFiYmEtYWJiYS1hYmJhLWFiYmFhYmJhYWJiMSIgCgkJfSAKCQlzb3VyY2UgPSB7IAoJCQlpbnN0YW5jZV9pZCA9ICJhYmJhYWJiYS1hYmJhLWFiYmEtYWJiYS1hYmJhYWJiYWFiMjEiIAoJCX0gCgl9IAoJeyAKCQlkZXN0aW5hdGlvbiA9IHsgCgkJCWNvbm5lY3Rvcl9pZCA9ICIzNmJhNDZkMi1mNmVhLTRlNjAtYTQyOC1mZGMxN2M3NWJjNjIiIAoJCQlpbnN0YW5jZV9pZCA9ICJhYmJhYWJiYS1hYmJhLWFiYmEtYWJiYS1hYmJhYWJiYWFiYjYiIAoJCX0gCgkJc291cmNlID0geyAKCQkJaW5zdGFuY2VfaWQgPSAiYWJiYWFiYmEtYWJiYS1hYmJhLWFiYmEtYWJiYWFiYmFhYmI1IiAKCQl9IAoJfSAKCXsgCgkJZGVzdGluYXRpb24gPSB7IAoJCQljb25uZWN0b3JfaWQgPSAiQ0VEN0JCRjMtMEI0OC00MzM1LUI5MzMtMDk1QTQxQ0EwMjk0IiAKCQkJaW5zdGFuY2VfaWQgPSAiYWJiYWFiYmEtYWJiYS1hYmJhLWFiYmEtYWJiYWFiYmFhYmI1IiAKCQl9IAoJCXNvdXJjZSA9IHsgCgkJCWluc3RhbmNlX2lkID0gImFiYmFhYmJhLWFiYmEtYWJiYS1hYmJhLWFiYmFhYmJhYWIyMiIgCgkJfSAKCX0gCgl7IAoJCWRlc3RpbmF0aW9uID0geyAKCQkJY29ubmVjdG9yX2lkID0gIjRDQkI0NDgwLTc5RTgtNENFNy1BQzBGLThCMDlCQUYxMjM5MCIgCgkJCWluc3RhbmNlX2lkID0gImFiYmFhYmJhLWFiYmEtYWJiYS1hYmJhLWFiYmFhYmJhYWJiNSIgCgkJfSAKCQlzZWxlY3QgPSBbIAoJCQkiciIgCgkJCV0gCgkJc291cmNlID0geyAKCQkJaW5zdGFuY2VfaWQgPSAiYWJiYWFiYmEtYWJiYS1hYmJhLWFiYmEtYWJiYWFiYmFhYmI5IiAKCQl9IAoJfSAKCXsgCgkJZGVzdGluYXRpb24gPSB7IAoJCQljb25uZWN0b3JfaWQgPSAiRjJGNzRFNTgtNDAyRC00NzJCLTg3REQtMzMxRTAwREI0MTZDIiAKCQkJaW5zdGFuY2VfaWQgPSAiYWJiYWFiYmEtYWJiYS1hYmJhLWFiYmEtYWJiYWFiYmFhYmI1IiAKCQl9IAoJCXNvdXJjZSA9IHsgCgkJCWluc3RhbmNlX2lkID0gImFiYmFhYmJhLWFiYmEtYWJiYS1hYmJhLWFiYmFhYmJhYWIyMyIgCgkJfSAKCX0gCgl7IAoJCWRlc3RpbmF0aW9uID0geyAKCQkJY29ubmVjdG9yX2lkID0gIjExNjRhNWVmLTQ1NjMtNDc5NS1iM2I1LTQyODI1ZDZkZjAzNyIgCgkJCWluc3RhbmNlX2lkID0gImFiYmFhYmJhLWFiYmEtYWJiYS1hYmJhLWFiYmFhYmJhYWJiNiIgCgkJfSAKCQlzb3VyY2UgPSB7IAoJCQlpbnN0YW5jZV9pZCA9ICJhYmJhYWJiYS1hYmJhLWFiYmEtYWJiYS1hYmJhYWJiYWFiMTEiIAoJCX0gCgl9IAoJeyAKCQlkZXN0aW5hdGlvbiA9IHsgCgkJCWNvbm5lY3Rvcl9pZCA9ICJjNTgyM2M3NS00YWU1LTRjNzEtYjA3MC0zMTVmYTRkMDNlOGUiIAoJCQlpbnN0YW5jZV9pZCA9ICJhYmJhYWJiYS1hYmJhLWFiYmEtYWJiYS1hYmJhYWJiYWFiMTEiIAoJCX0gCgkJc291cmNlID0geyAKCQkJaW5zdGFuY2VfaWQgPSAiYWJiYWFiYmEtYWJiYS1hYmJhLWFiYmEtYWJiYWFiYmFhYmIyIiAKCQl9IAoJfSAKCXsgCgkJZGVzdGluYXRpb24gPSB7IAoJCQljb25uZWN0b3JfaWQgPSAiQ0VEN0JCRjMtMEI0OC00MzM1LUI5MzMtMDk1QTQxQ0EwMjk0IiAKCQkJaW5zdGFuY2VfaWQgPSAiYWJiYWFiYmEtYWJiYS1hYmJhLWFiYmEtYWJiYWFiYmFhYmIyIiAKCQl9IAoJCXNvdXJjZSA9IHsgCgkJCWluc3RhbmNlX2lkID0gImFiYmFhYmJhLWFiYmEtYWJiYS1hYmJhLWFiYmFhYmJhYWIyNSIgCgkJfSAKCX0gCgl7IAoJCWRlc3RpbmF0aW9uID0geyAKCQkJY29ubmVjdG9yX2lkID0gIjRDQkI0NDgwLTc5RTgtNENFNy1BQzBGLThCMDlCQUYxMjM5MCIgCgkJCWluc3RhbmNlX2lkID0gImFiYmFhYmJhLWFiYmEtYWJiYS1hYmJhLWFiYmFhYmJhYWJiMiIgCgkJfSAKCQlzZWxlY3QgPSBbIAoJCQkicmdiIiAKCQkJXSAKCQlzb3VyY2UgPSB7IAoJCQlpbnN0YW5jZV9pZCA9ICJhYmJhYWJiYS1hYmJhLWFiYmEtYWJiYS1hYmJhYWJiYWFiMTAiIAoJCX0gCgl9IAoJeyAKCQlkZXN0aW5hdGlvbiA9IHsgCgkJCWNvbm5lY3Rvcl9pZCA9ICJGMkY3NEU1OC00MDJELTQ3MkItODdERC0zMzFFMDBEQjQx",
+ "NkMiIAoJCQlpbnN0YW5jZV9pZCA9ICJhYmJhYWJiYS1hYmJhLWFiYmEtYWJiYS1hYmJhYWJiYWFiYjIiIAoJCX0gCgkJc291cmNlID0geyAKCQkJaW5zdGFuY2VfaWQgPSAiYWJiYWFiYmEtYWJiYS1hYmJhLWFiYmEtYWJiYWFiYmFhYjI0IiAKCQl9IAoJfSAKCXsgCgkJZGVzdGluYXRpb24gPSB7IAoJCQljb25uZWN0b3JfaWQgPSAiMjQyZDE2NDgtYTYyNi00NDViLTk1MzQtYmNjZWMwOTQxMTJmIiAKCQkJaW5zdGFuY2VfaWQgPSAiYWJiYWFiYmEtYWJiYS1hYmJhLWFiYmEtYWJiYWFiYmFhYjExIiAKCQl9IAoJCXNvdXJjZSA9IHsgCgkJCWluc3RhbmNlX2lkID0gImFiYmFhYmJhLWFiYmEtYWJiYS1hYmJhLWFiYmFhYmJhYWIyOCIgCgkJfSAKCX0gCgl7IAoJCWRlc3RpbmF0aW9uID0geyAKCQkJY29ubmVjdG9yX2lkID0gIjU5ZmQxY2Y0LWY3MzYtNDcwZC04NTEwLTFkZDdjMDE2NjM5ZSIgCgkJCWluc3RhbmNlX2lkID0gImFiYmFhYmJhLWFiYmEtYWJiYS1hYmJhLWFiYmFhYmJhYWJiNiIgCgkJfSAKCQlzb3VyY2UgPSB7IAoJCQlpbnN0YW5jZV9pZCA9ICJhYmJhYWJiYS1hYmJhLWFiYmEtYWJiYS1hYmJhYWJiYWFiYjciIAoJCX0gCgl9IAoJeyAKCQlkZXN0aW5hdGlvbiA9IHsgCgkJCWNvbm5lY3Rvcl9pZCA9ICJDRUQ3QkJGMy0wQjQ4LTQzMzUtQjkzMy0wOTVBNDFDQTAyOTQiIAoJCQlpbnN0YW5jZV9pZCA9ICJhYmJhYWJiYS1hYmJhLWFiYmEtYWJiYS1hYmJhYWJiYWFiYjciIAoJCX0gCgkJc291cmNlID0geyAKCQkJaW5zdGFuY2VfaWQgPSAiYWJiYWFiYmEtYWJiYS1hYmJhLWFiYmEtYWJiYWFiYmFhYjI2IiAKCQl9IAoJfSAKCXsgCgkJZGVzdGluYXRpb24gPSB7IAoJCQljb25uZWN0b3JfaWQgPSAiNENCQjQ0ODAtNzlFOC00Q0U3LUFDMEYtOEIwOUJBRjEyMzkwIiAKCQkJaW5zdGFuY2VfaWQgPSAiYWJiYWFiYmEtYWJiYS1hYmJhLWFiYmEtYWJiYWFiYmFhYmI3IiAKCQl9IAoJCXNlbGVjdCA9IFsgCgkJCSJyIiAKCQkJXSAKCQlzb3VyY2UgPSB7IAoJCQlpbnN0YW5jZV9pZCA9ICJhYmJhYWJiYS1hYmJhLWFiYmEtYWJiYS1hYmJhYWJiYWFiMjciIAoJCX0gCgl9IApdCmNvbnN0YW50cyA9IFsKCXsgCgkJY29ubmVjdG9yX2lkID0gIjM5QkM3NjE5LTI3NjgtNDgwQi1BQ0ZELTYzRkE2NkVGNjkwNSIgCgkJaWQgPSAiMWJiYWFiYmEtYWJiYS1hYmJhLWFiYmEtYWJiYWFiYmFhYmIzIiAKCQlpbnN0YW5jZV9pZCA9ICJhYmJhYWJiYS1hYmJhLWFiYmEtYWJiYS1hYmJhYWJiYWFiYjMiIAoJCXZhbHVlID0gWyAKCQkJMS4wCgkJXSAKCX0gCgl7IAoJCWNvbm5lY3Rvcl9pZCA9ICIzOUJDNzYxOS0yNzY4LTQ4MEItQUNGRC02M0ZBNjZFRjY5MDUiIAoJCWlkID0gIjFiYmFhYmJhLWFiYmEtYWJiYS1hYmJhLWFiYmFhYmJhYWJiNCIgCgkJaW5zdGFuY2VfaWQgPSAiYWJiYWFiYmEtYWJiYS1hYmJhLWFiYmEtYWJiYWFiYmFhYmI0IiAKCQl2YWx1ZSA9IFsgCgkJCTEuMAoJCV0gCgl9IAoJeyAKCQljb25uZWN0b3JfaWQgPSAiMzlCQzc2MTktMjc2OC00ODBCLUFDRkQtNjNGQTY2RUY2OTA1IiAKCQlpZCA9ICIxYmJhYWJiYS1hYmJhLWFiYmEtYWJiYS1hYmJhYWJiYWFiYjEiIAoJCWluc3RhbmNlX2lkID0gImFiYmFhYmJhLWFiYmEtYWJiYS1hYmJhLWFiYmFhYmJhYWJiMSIgCgkJdmFsdWUgPSBbIAoJCQkxLjAKCQldIAoJfSAKCXsgCgkJY29ubmVjdG9yX2lkID0gIjM5QkM3NjE5LTI3NjgtNDgwQi1BQ0ZELTYzRkE2NkVGNjkwNSIgCgkJaWQgPSAiMWJiYWFiYmEtYWJiYS1hYmJhLWFiYmEtYWJiYWFiYmFhYmI1IiAKCQlpbnN0YW5jZV9pZCA9ICJhYmJhYWJiYS1hYmJhLWFiYmEtYWJiYS1hYmJhYWJiYWFiYjUiIAoJCXZhbHVlID0gWyAKCQkJMS4wCgkJXSAKCX0gCgl7IAoJCWNvbm5lY3Rvcl9pZCA9ICIzOUJDNzYxOS0yNzY4LTQ4MEItQUNGRC02M0ZBNjZFRjY5MDUiIAoJCWlkID0gIjFiYmFhYmJhLWFiYmEtYWJiYS1hYmJhLWFiYmFhYmJhYWJiMiIgCgkJaW5zdGFuY2VfaWQgPSAiYWJiYWFiYmEtYWJiYS1hYmJhLWFiYmEtYWJiYWFiYmFhYmIyIiAKCQl2YWx1ZSA9IFsgCgkJCTEuMAoJCV0gCgl9IAoJeyAKCQljb25uZWN0b3JfaWQgPSAiMzlCQzc2MTktMjc2OC00ODBCLUFDRkQtNjNGQTY2RUY2OTA1IiAKCQlpZCA9ICIxYmJhYWJiYS1hYmJhLWFiYmEtYWJiYS1hYmJhYWJiYWFiYjciIAoJCWluc3RhbmNlX2lkID0gImFiYmFhYmJhLWFiYmEtYWJiYS1hYmJhLWFiYmFhYmJhYWJiNyIgCgkJdmFsdWUgPSBbIAoJCQkxLjAKCQldIAoJfSAKCXsgCgkJY29ubmVjdG9yX2lkID0gIkYyRjc0RTU4LTQwMkQtNDcyQi04N0RELTMzMUUwMERCNDE2QyIgCgkJaWQgPSAiM2JiYWFiYmEtYWJiYS1hYmJhLWFiYmEtYWJiYWFiYmFhYmI3IiAKCQlpbnN0YW5jZV9pZCA9ICJhYmJhYWJiYS1hYmJhLWFiYmEtYWJiYS1hYmJhYWJiYWFiYjciIAoJCXZhbHVlID0gWyAKCQkJMS4wCgkJXSAKCX0gCl0Kbm9kZXMgPSBbCgl7IAoJCWNvbnRlbnRfc2l6ZSA9IFsgCgkJCTE2MCAKCQkJMCAKCQldIAoJCWV4cG9ydCA9IHsgCgkJfSAKCQlpZCA9ICJhYmJhYWJiYS1hYmJhLWFiYmEtYWJiYS1hYmJhYWJiYWFiYjYiIAoJCW9wdGlvbnMgPSBbIAoJCQkiMmIxMzY0NDctNjc2ZS00OTQzLTk5N2ItMDRhMjhhZTY4NDk3IgoJCV0gCgkJcG9zaXRpb24gPSBbIAoJCQkxMzYwIAoJCQkyNjAgCgkJXSAKCQlzYW1wbGVycyA9IHsgCgkJfSAKCQl0aXRsZSA9ICJT",
+ "dGFuZGFyZCBCYXNlIiAKCQl0eXBlID0gImNvcmUvc3RpbmdyYXlfcmVuZGVyZXIvb3V0cHV0X25vZGVzL3N0YW5kYXJkX2Jhc2UiIAoJfSAKCXsgCgkJY29udGVudF9zaXplID0gWyAKCQkJMTYwIAoJCQkwIAoJCV0gCgkJZXhwb3J0ID0geyAKCQl9IAoJCWlkID0gImFiYmFhYmJhLWFiYmEtYWJiYS1hYmJhLWFiYmFhYmJhYWJiMyIgCgkJb3B0aW9ucyA9IFsgCgkJCSI5QTg0MjgyQi1GMUEyLTQ2RDQtOUZDNC01QTc2RkM5QjMwREQiCgkJXSAKCQlwb3NpdGlvbiA9IFsgCgkJCTEwMjAgCgkJCS0zNDAgCgkJXSAKCQlzYW1wbGVycyA9IHsgCgkJfSAKCQl0aXRsZSA9ICJDb2xvciBNYXAgU3dpdGNoIiAKCQl0eXBlID0gImNvcmUvc2hhZGVyX25vZGVzL2lmIiAKCX0gCgl7IAoJCWNvbnRlbnRfc2l6ZSA9IFsgCgkJCTE2MCAKCQkJMCAKCQldIAoJCWV4cG9ydCA9IHsgCgkJCW1hdGVyaWFsX3ZhcmlhYmxlID0geyAKCQkJCWRpc3BsYXlfbmFtZSA9ICJVc2UgQ29sb3IgTWFwIiAKCQkJCW5hbWUgPSAidXNlX2NvbG9yX21hcCIgCgkJCQl1aSA9IHsgCgkJCQkJbWF4ID0gMSAKCQkJCQltaW4gPSAwLjAgCgkJCQkJc3RlcCA9IDEgCgkJCQkJb3JkZXIgPSAxMCAKCQkJCQl1aV90eXBlID0gImNoZWNrYm94IiAKCQkJCX0gCgkJCQl0eXBlID0gImZsb2F0IiAKCQkJCXZhbHVlID0gMS4wIAoJCQl9IAoJCX0gCgkJaWQgPSAiYWJiYWFiYmEtYWJiYS1hYmJhLWFiYmEtYWJiYWFiYmFhYjEyIiAKCQlvcHRpb25zID0gWyAKCQldIAoJCXBvc2l0aW9uID0gWyAKCQkJNzAwIAoJCQktNDAwIAoJCV0gCgkJc2FtcGxlcnMgPSB7IAoJCX0gCgkJdGl0bGUgPSAiVXNlIENvbG9yIE1hcCIgCgkJdHlwZSA9ICJjb3JlL3NoYWRlcl9ub2Rlcy9tYXRlcmlhbF92YXJpYWJsZSIgCgl9IAoJeyAKCQljb250ZW50X3NpemUgPSBbIAoJCQkxNjAgCgkJCTAgCgkJXSAKCQlleHBvcnQgPSB7IAoJCX0gCgkJaWQgPSAiYWJiYWFiYmEtYWJiYS1hYmJhLWFiYmEtYWJiYWFiYmFhYjEzIiAKCQlvcHRpb25zID0gWyAKCQkJIjFlMDY3NDY0LTEyZDgtNDgyNi05YjcyLWNmZDU3NjUwMDNlMyIKCQkJImZiM2Y3MDliLWE1NGEtNGU5My1hYzlmLWU5ZmM3NmZiOGJjZCIKCQkJIjVkZDU5YjNkLTE3NjItNGExNC05OTMwLTc1MDAyMzBlZjNkYiIKCQldIAoJCXBvc2l0aW9uID0gWyAKCQkJNzAwIAoJCQktMzQwIAoJCV0gCgkJc2FtcGxlcnMgPSB7IAoJCQl0ZXh0dXJlX21hcCA9IHsgCgkJCQlkaXNwbGF5X25hbWUgPSAiQ29sb3IgTWFwIiAKCQkJCXNsb3RfbmFtZSA9ICJjb2xvcl9tYXAiIAoJCQkJdWkgPSB7IAoJCQkJCW9yZGVyID0gMSAKCQkJCX0gCgkJCX0gCgkJfSAKCQl0aXRsZSA9ICJDb2xvciBNYXAiIAoJCXR5cGUgPSAiY29yZS9zaGFkZXJfbm9kZXMvc2FtcGxlX3RleHR1cmUiIAoJfSAKCXsgCgkJY29udGVudF9zaXplID0gWyAKCQkJMTYwIAoJCQkwIAoJCV0gCgkJZXhwb3J0ID0geyAKCQl9IAoJCWlkID0gImFiYmFhYmJhLWFiYmEtYWJiYS1hYmJhLWFiYmFhYmJhYWIzMCIgCgkJb3B0aW9ucyA9IFsgCgkJXSAKCQlwb3NpdGlvbiA9IFsgCgkJCTEyMCAKCQkJNDAwIAoJCV0gCgkJc2FtcGxlcnMgPSB7IAoJCX0gCgkJdGl0bGUgPSAiQWRkIiAKCQl0eXBlID0gImNvcmUvc2hhZGVyX25vZGVzL2FkZCIgCgl9IAoJeyAKCQljb250ZW50X3NpemUgPSBbIAoJCQkxNjAgCgkJCTAgCgkJXSAKCQlleHBvcnQgPSB7IAoJCQltYXRlcmlhbF92YXJpYWJsZSA9IHsgCgkJCQlkaXNwbGF5X25hbWUgPSAiVXYgT2Zmc2V0IiAKCQkJCW5hbWUgPSAidXZfb2Zmc2V0IiAKCQkJCXVpID0geyAKCQkJCQltYXggPSBbIDFlKzAwOC4wIDFlKzAwOC4wIF0gCgkJCQkJbWluID0gWyAtMWUrMDA4LjAgLTFlKzAwOC4wIF0gCgkJCQkJc3RlcCA9IFsgMC4wMSAwLjAxIF0gCgkJCQkJb3JkZXIgPSA2MCAKCQkJCX0gCgkJCQl0eXBlID0gImZsb2F0MiIgCgkJCQl2YWx1ZSA9IFswLjAgMC4wXSAKCQkJfSAKCQl9IAoJCWlkID0gImFiYmFhYmJhLWFiYmEtYWJiYS1hYmJhLWFiYmFhYmJhYWIzMSIgCgkJb3B0aW9ucyA9IFsgCgkJXSAKCQlwb3NpdGlvbiA9IFsgCgkJCS02MCAKCQkJMzQwIAoJCV0gCgkJc2FtcGxlcnMgPSB7IAoJCX0gCgkJdGl0bGUgPSAiVXYgT2Zmc2V0IiAKCQl0eXBlID0gImNvcmUvc2hhZGVyX25vZGVzL21hdGVyaWFsX3ZhcmlhYmxlIiAKCX0gCgl7IAoJCWNvbnRlbnRfc2l6ZSA9IFsgCgkJCTE2MCAKCQkJMCAKCQldIAoJCWV4cG9ydCA9IHsgCgkJfSAKCQlpZCA9ICJhYmJhYWJiYS1hYmJhLWFiYmEtYWJiYS1hYmJhYWJiYWFiMjkiIAoJCW9wdGlvbnMgPSBbIAoJCV0gCgkJcG9zaXRpb24gPSBbIAoJCQktNjAgCgkJCTQwMCAKCQldIAoJCXNhbXBsZXJzID0geyAKCQl9IAoJCXRpdGxlID0gIk11bHRpcGx5IiAKCQl0eXBlID0gImNvcmUvc2hhZGVyX25vZGVzL211bCIgCgl9IAoJeyAKCQljb250ZW50X3NpemUgPSBbIAoJCQkxNjAgCgkJCTAgCgkJXSAKCQlleHBvcnQgPSB7IAoJCQltYXRlcmlhbF92YXJpYWJsZSA9IHsgCgkJCQlkaXNwbGF5X25hbWUgPSAiVXYgU2NhbGUiIAoJCQkJbmFtZSA9ICJ1dl9zY2FsZSIgCgkJCQl1aSA9IHsgCgkJCQkJbWF4ID0gWyAxZSswMDguMCAxZSswMDguMCBdIAoJCQkJCW1pbiA9IFsgLTFlKzAwOC4wIC0xZSswMDguMCBdIAoJCQkJCXN0ZXAgPSBbIDAuMDEgMC4wMSBdIAoJCQkJCW9yZGVyID0gNjEgCgkJCQl9IAoJCQkJdHlw",
+ "ZSA9ICJmbG9hdDIiIAoJCQkJdmFsdWUgPSBbMS4wIDEuMF0gCgkJCX0gCgkJfSAKCQlpZCA9ICJhYmJhYWJiYS1hYmJhLWFiYmEtYWJiYS1hYmJhYWJiYWFiMzIiIAoJCW9wdGlvbnMgPSBbIAoJCV0gCgkJcG9zaXRpb24gPSBbIAoJCQktMjQwIAoJCQkzNDAgCgkJXSAKCQlzYW1wbGVycyA9IHsgCgkJfSAKCQl0aXRsZSA9ICJVdiBTY2FsZSIgCgkJdHlwZSA9ICJjb3JlL3NoYWRlcl9ub2Rlcy9tYXRlcmlhbF92YXJpYWJsZSIgCgl9IAoJeyAKCQljb250ZW50X3NpemUgPSBbIAoJCQkxNjAgCgkJCTAgCgkJXSAKCQlleHBvcnQgPSB7IAoJCX0gCgkJaWQgPSAiYWJiYWFiYmEtYWJiYS1hYmJhLWFiYmEtYWJiYWFiYmFhYmI4IiAKCQlvcHRpb25zID0gWyAKCQldIAoJCXBvc2l0aW9uID0gWyAKCQkJLTI2MCAKCQkJNDIwIAoJCV0gCgkJc2FtcGxlcnMgPSB7IAoJCX0gCgkJdGl0bGUgPSAiVGV4Y29vcmQwIiAKCQl0eXBlID0gImNvcmUvc2hhZGVyX25vZGVzL3RleHR1cmVfY29vcmRpbmF0ZTAiIAoJfSAKCXsgCgkJY29udGVudF9zaXplID0gWyAKCQkJMTYwIAoJCQkwIAoJCV0gCgkJZXhwb3J0ID0geyAKCQkJbWF0ZXJpYWxfdmFyaWFibGUgPSB7IAoJCQkJZGlzcGxheV9uYW1lID0gIkJhc2UgQ29sb3IiIAoJCQkJbmFtZSA9ICJiYXNlX2NvbG9yIiAKCQkJCXVpID0geyAKCQkJCQltYXggPSBbIDEuMCAxLjAgMS4wIF0gCgkJCQkJbWluID0gWyAwLjAgMC4wIDAuMCBdIAoJCQkJCXN0ZXAgPSBbIDAuMDEgMC4wMSAwLjAxIF0gCgkJCQkJb3JkZXIgPSAyMCAKCQkJCQl1aV90eXBlID0gImNvbG9yIiAKCQkJCX0gCgkJCQl0eXBlID0gImZsb2F0MyIgCgkJCQl2YWx1ZSA9IFsxLjAgMS4wIDEuMF0gCgkJCX0gCgkJfSAKCQlpZCA9ICJhYmJhYWJiYS1hYmJhLWFiYmEtYWJiYS1hYmJhYWJiYWFiMTQiIAoJCW9wdGlvbnMgPSBbIAoJCV0gCgkJcG9zaXRpb24gPSBbIAoJCQk3MDAgCgkJCS0yNDAgCgkJXSAKCQlzYW1wbGVycyA9IHsgCgkJfSAKCQl0aXRsZSA9ICJCYXNlIENvbG9yIiAKCQl0eXBlID0gImNvcmUvc2hhZGVyX25vZGVzL21hdGVyaWFsX3ZhcmlhYmxlIiAKCX0gCgl7IAoJCWNvbnRlbnRfc2l6ZSA9IFsgCgkJCTE2MCAKCQkJMCAKCQldIAoJCWV4cG9ydCA9IHsgCgkJfSAKCQlpZCA9ICJhYmJhYWJiYS1hYmJhLWFiYmEtYWJiYS1hYmJhYWJiYWFiYjQiIAoJCW9wdGlvbnMgPSBbIAoJCQkiOUE4NDI4MkItRjFBMi00NkQ0LTlGQzQtNUE3NkZDOUIzMEREIgoJCV0gCgkJcG9zaXRpb24gPSBbIAoJCQkxMDIwIAoJCQktNjAgCgkJXSAKCQlzYW1wbGVycyA9IHsgCgkJfSAKCQl0aXRsZSA9ICJOb3JtYWwgTWFwIFN3aXRjaCIgCgkJdHlwZSA9ICJjb3JlL3NoYWRlcl9ub2Rlcy9pZiIgCgl9IAoJeyAKCQljb250ZW50X3NpemUgPSBbIAoJCQkxNjAgCgkJCTAgCgkJXSAKCQlleHBvcnQgPSB7IAoJCQltYXRlcmlhbF92YXJpYWJsZSA9IHsgCgkJCQlkaXNwbGF5X25hbWUgPSAiVXNlIE5vcm1hbCBNYXAiIAoJCQkJbmFtZSA9ICJ1c2Vfbm9ybWFsX21hcCIgCgkJCQl1aSA9IHsgCgkJCQkJbWF4ID0gMSAKCQkJCQltaW4gPSAwLjAgCgkJCQkJc3RlcCA9IDEgCgkJCQkJb3JkZXIgPSAxMSAKCQkJCQl1aV90eXBlID0gImNoZWNrYm94IiAKCQkJCX0gCgkJCQl0eXBlID0gImZsb2F0IiAKCQkJCXZhbHVlID0gMS4wIAoJCQl9IAoJCX0gCgkJaWQgPSAiYWJiYWFiYmEtYWJiYS1hYmJhLWFiYmEtYWJiYWFiYmFhYjE1IiAKCQlvcHRpb25zID0gWyAKCQldIAoJCXBvc2l0aW9uID0gWyAKCQkJNzAwIAoJCQktMTIwIAoJCV0gCgkJc2FtcGxlcnMgPSB7IAoJCX0gCgkJdGl0bGUgPSAiVXNlIE5vcm1hbCBNYXAiIAoJCXR5cGUgPSAiY29yZS9zaGFkZXJfbm9kZXMvbWF0ZXJpYWxfdmFyaWFibGUiIAoJfSAKCXsgCgkJY29udGVudF9zaXplID0gWyAKCQkJMTYwIAoJCQkwIAoJCV0gCgkJZXhwb3J0ID0geyAKCQl9IAoJCWlkID0gImFiYmFhYmJhLWFiYmEtYWJiYS1hYmJhLWFiYmFhYmJhYWIxNyIgCgkJb3B0aW9ucyA9IFsgCgkJCSIwYTBmYjVhZC0xNDVkLTQyMjktYWJkNC01YjM2NTYyNjA3YjMiCgkJXSAKCQlwb3NpdGlvbiA9IFsgCgkJCTc0MCAKCQkJLTYwIAoJCV0gCgkJc2FtcGxlcnMgPSB7IAoJCX0gCgkJdGl0bGUgPSAiVGFuZ2VudCBUbyBXb3JsZCIgCgkJdHlwZSA9ICJjb3JlL3NoYWRlcl9ub2Rlcy90YW5nZW50X3RvX3dvcmxkIiAKCX0gCgl7IAoJCWNvbnRlbnRfc2l6ZSA9IFsgCgkJCTE2MCAKCQkJMCAKCQldIAoJCWV4cG9ydCA9IHsgCgkJfSAKCQlpZCA9ICJhYmJhYWJiYS1hYmJhLWFiYmEtYWJiYS1hYmJhYWJiYWFiMTgiIAoJCW9wdGlvbnMgPSBbIAoJCQkiMWUwNjc0NjQtMTJkOC00ODI2LTliNzItY2ZkNTc2NTAwM2UzIgoJCQkiOTBlMjA4MjYtODY4OS00MmZhLThlMjQtZjQ4NGVjNjRjNWMzIgoJCQkiNWRkNTliM2QtMTc2Mi00YTE0LTk5MzAtNzUwMDIzMGVmM2RiIgoJCV0gCgkJcG9zaXRpb24gPSBbIAoJCQk0NDAgCgkJCS02MCAKCQldIAoJCXNhbXBsZXJzID0geyAKCQkJdGV4dHVyZV9tYXAgPSB7IAoJCQkJZGlzcGxheV9uYW1lID0gIk5vcm1hbCBNYXAiIAoJCQkJc2xvdF9uYW1lID0gIm5vcm1hbF9tYXAiIAoJCQkJdWkgPSB7IAoJCQkJCW9yZGVyID0gMiAKCQkJCX0gCgkJCX0gCgkJfSAKCQl0aXRsZSA9ICJOb3JtYWwgTWFwIiAKCQl0eXBlID0gImNvcmUvc2hhZGVyX25vZGVzL3NhbXBsZV90ZXh0dXJlIiAK",
+ "CX0gCgl7IAoJCWNvbnRlbnRfc2l6ZSA9IFsgCgkJCTE2MCAKCQkJMCAKCQldIAoJCWV4cG9ydCA9IHsgCgkJfSAKCQlpZCA9ICJhYmJhYWJiYS1hYmJhLWFiYmEtYWJiYS1hYmJhYWJiYWFiMTYiIAoJCW9wdGlvbnMgPSBbIAoJCV0gCgkJcG9zaXRpb24gPSBbIAoJCQk2ODAgCgkJCTYwIAoJCV0gCgkJc2FtcGxlcnMgPSB7IAoJCX0gCgkJdGl0bGUgPSAiV29ybGQgTm9ybWFsIiAKCQl0eXBlID0gImNvcmUvc2hhZGVyX25vZGVzL3dvcmxkX3NwYWNlX25vcm1hbCIgCgl9IAoJeyAKCQljb250ZW50X3NpemUgPSBbIAoJCQkxNjAgCgkJCTAgCgkJXSAKCQlleHBvcnQgPSB7IAoJCX0gCgkJaWQgPSAiYWJiYWFiYmEtYWJiYS1hYmJhLWFiYmEtYWJiYWFiYmFhYmIxIiAKCQlvcHRpb25zID0gWyAKCQkJIjlBODQyODJCLUYxQTItNDZENC05RkM0LTVBNzZGQzlCMzBERCIKCQldIAoJCXBvc2l0aW9uID0gWyAKCQkJMTAyMCAKCQkJMjQwIAoJCV0gCgkJc2FtcGxlcnMgPSB7IAoJCX0gCgkJdGl0bGUgPSAiTWV0YWxsaWMgTWFwIFN3aXRjaCIgCgkJdHlwZSA9ICJjb3JlL3NoYWRlcl9ub2Rlcy9pZiIgCgl9IAoJeyAKCQljb250ZW50X3NpemUgPSBbIAoJCQkxNjAgCgkJCTAgCgkJXSAKCQlleHBvcnQgPSB7IAoJCQltYXRlcmlhbF92YXJpYWJsZSA9IHsgCgkJCQlkaXNwbGF5X25hbWUgPSAiVXNlIE1ldGFsbGljIE1hcCIgCgkJCQluYW1lID0gInVzZV9tZXRhbGxpY19tYXAiIAoJCQkJdWkgPSB7IAoJCQkJCW1heCA9IDEgCgkJCQkJbWluID0gMC4wIAoJCQkJCXN0ZXAgPSAxIAoJCQkJCW9yZGVyID0gMTIgCgkJCQkJdWlfdHlwZSA9ICJjaGVja2JveCIgCgkJCQl9IAoJCQkJdHlwZSA9ICJmbG9hdCIgCgkJCQl2YWx1ZSA9IDEuMCAKCQkJfSAKCQl9IAoJCWlkID0gImFiYmFhYmJhLWFiYmEtYWJiYS1hYmJhLWFiYmFhYmJhYWIyMCIgCgkJb3B0aW9ucyA9IFsgCgkJXSAKCQlwb3NpdGlvbiA9IFsgCgkJCTcwMCAKCQkJMTgwIAoJCV0gCgkJc2FtcGxlcnMgPSB7IAoJCX0gCgkJdGl0bGUgPSAiVXNlIE1ldGFsbGljIE1hcCIgCgkJdHlwZSA9ICJjb3JlL3NoYWRlcl9ub2Rlcy9tYXRlcmlhbF92YXJpYWJsZSIgCgl9IAoJeyAKCQljb250ZW50X3NpemUgPSBbIAoJCQkxNjAgCgkJCTAgCgkJXSAKCQlleHBvcnQgPSB7IAoJCX0gCgkJaWQgPSAiYWJiYWFiYmEtYWJiYS1hYmJhLWFiYmEtYWJiYWFiYmFhYjE5IiAKCQlvcHRpb25zID0gWyAKCQkJImY2NjlhM2E2LTAzNzYtNDE4Ny04NDBlLTgwMDAwZTI5MzlkNSIKCQkJImU5NGU1M2U2LTQ5YjYtNDE5NC1hNzQ3LThmMDY0YTU5MzJlMCIKCQkJIjVkZDU5YjNkLTE3NjItNGExNC05OTMwLTc1MDAyMzBlZjNkYiIKCQldIAoJCXBvc2l0aW9uID0gWyAKCQkJNzAwIAoJCQkyNDAgCgkJXSAKCQlzYW1wbGVycyA9IHsgCgkJCXRleHR1cmVfbWFwID0geyAKCQkJCWRpc3BsYXlfbmFtZSA9ICJNZXRhbGxpYyBNYXAiIAoJCQkJc2xvdF9uYW1lID0gIm1ldGFsbGljX21hcCIgCgkJCQl1aSA9IHsgCgkJCQkJb3JkZXIgPSAzIAoJCQkJfSAKCQkJfSAKCQl9IAoJCXRpdGxlID0gIk1ldGFsbGljIE1hcCIgCgkJdHlwZSA9ICJjb3JlL3NoYWRlcl9ub2Rlcy9zYW1wbGVfdGV4dHVyZSIgCgl9IAoJeyAKCQljb250ZW50X3NpemUgPSBbIAoJCQkxNjAgCgkJCTAgCgkJXSAKCQlleHBvcnQgPSB7IAoJCQltYXRlcmlhbF92YXJpYWJsZSA9IHsgCgkJCQlkaXNwbGF5X25hbWUgPSAiTWV0YWxsaWMiIAoJCQkJbmFtZSA9ICJtZXRhbGxpYyIgCgkJCQl1aSA9IHsgCgkJCQkJbWF4ID0gMS4wIAoJCQkJCW1pbiA9IDAuMCAKCQkJCQlzdGVwID0gMC4wMSAKCQkJCQlvcmRlciA9IDIxIAoJCQkJfSAKCQkJCXR5cGUgPSAiZmxvYXQiIAoJCQkJdmFsdWUgPSAxLjAgCgkJCX0gCgkJfSAKCQlpZCA9ICJhYmJhYWJiYS1hYmJhLWFiYmEtYWJiYS1hYmJhYWJiYWFiMjEiIAoJCW9wdGlvbnMgPSBbIAoJCV0gCgkJcG9zaXRpb24gPSBbIAoJCQk3MDAgCgkJCTM0MCAKCQldIAoJCXNhbXBsZXJzID0geyAKCQl9IAoJCXRpdGxlID0gIk1ldGFsbGljIiAKCQl0eXBlID0gImNvcmUvc2hhZGVyX25vZGVzL21hdGVyaWFsX3ZhcmlhYmxlIiAKCX0gCgl7IAoJCWNvbnRlbnRfc2l6ZSA9IFsgCgkJCTE2MCAKCQkJMCAKCQldIAoJCWV4cG9ydCA9IHsgCgkJfSAKCQlpZCA9ICJhYmJhYWJiYS1hYmJhLWFiYmEtYWJiYS1hYmJhYWJiYWFiYjUiIAoJCW9wdGlvbnMgPSBbIAoJCQkiOUE4NDI4MkItRjFBMi00NkQ0LTlGQzQtNUE3NkZDOUIzMEREIgoJCV0gCgkJcG9zaXRpb24gPSBbIAoJCQkxMDIwIAoJCQk1NDAgCgkJXSAKCQlzYW1wbGVycyA9IHsgCgkJfSAKCQl0aXRsZSA9ICJSb3VnaG5lc3MgTWFwIFN3aXRjaCIgCgkJdHlwZSA9ICJjb3JlL3NoYWRlcl9ub2Rlcy9pZiIgCgl9IAoJeyAKCQljb250ZW50X3NpemUgPSBbIAoJCQkxNjAgCgkJCTAgCgkJXSAKCQlleHBvcnQgPSB7IAoJCQltYXRlcmlhbF92YXJpYWJsZSA9IHsgCgkJCQlkaXNwbGF5X25hbWUgPSAiVXNlIFJvdWdobmVzcyBNYXAiIAoJCQkJbmFtZSA9ICJ1c2Vfcm91Z2huZXNzX21hcCIgCgkJCQl1aSA9IHsgCgkJCQkJbWF4ID0gMSAKCQkJCQltaW4gPSAwLjAgCgkJCQkJc3RlcCA9IDEgCgkJCQkJb3JkZXIgPSAxMyAKCQkJCQl1aV90eXBlID0gImNoZWNrYm94IiAKCQkJCX0gCgkJCQl0eXBlID0gImZsb2F0IiAKCQkJCXZhbHVlID0gMS4wIAoJCQl9IAoJCX0gCgkJaWQg",
+ "PSAiYWJiYWFiYmEtYWJiYS1hYmJhLWFiYmEtYWJiYWFiYmFhYjIyIiAKCQlvcHRpb25zID0gWyAKCQldIAoJCXBvc2l0aW9uID0gWyAKCQkJNzAwIAoJCQk0ODAgCgkJXSAKCQlzYW1wbGVycyA9IHsgCgkJfSAKCQl0aXRsZSA9ICJVc2UgUm91Z2huZXNzIE1hcCIgCgkJdHlwZSA9ICJjb3JlL3NoYWRlcl9ub2Rlcy9tYXRlcmlhbF92YXJpYWJsZSIgCgl9IAoJeyAKCQljb250ZW50X3NpemUgPSBbIAoJCQkxNjAgCgkJCTAgCgkJXSAKCQlleHBvcnQgPSB7IAoJCX0gCgkJaWQgPSAiYWJiYWFiYmEtYWJiYS1hYmJhLWFiYmEtYWJiYWFiYmFhYmI5IiAKCQlvcHRpb25zID0gWyAKCQkJIjFlMDY3NDY0LTEyZDgtNDgyNi05YjcyLWNmZDU3NjUwMDNlMyIKCQkJImU5NGU1M2U2LTQ5YjYtNDE5NC1hNzQ3LThmMDY0YTU5MzJlMCIKCQkJIjVkZDU5YjNkLTE3NjItNGExNC05OTMwLTc1MDAyMzBlZjNkYiIKCQldIAoJCXBvc2l0aW9uID0gWyAKCQkJNzAwIAoJCQk1NDAgCgkJXSAKCQlzYW1wbGVycyA9IHsgCgkJCXRleHR1cmVfbWFwID0geyAKCQkJCWRpc3BsYXlfbmFtZSA9ICJSb3VnaG5lc3MgTWFwIiAKCQkJCXNsb3RfbmFtZSA9ICJyb3VnaG5lc3NfbWFwIiAKCQkJCXVpID0geyAKCQkJCQlvcmRlciA9IDQgCgkJCQl9IAoJCQl9IAoJCX0gCgkJdGl0bGUgPSAiUm91Z2huZXNzIE1hcCIgCgkJdHlwZSA9ICJjb3JlL3NoYWRlcl9ub2Rlcy9zYW1wbGVfdGV4dHVyZSIgCgl9IAoJeyAKCQljb250ZW50X3NpemUgPSBbIAoJCQkxNjAgCgkJCTAgCgkJXSAKCQlleHBvcnQgPSB7IAoJCQltYXRlcmlhbF92YXJpYWJsZSA9IHsgCgkJCQlkaXNwbGF5X25hbWUgPSAiUm91Z2huZXNzIiAKCQkJCW5hbWUgPSAicm91Z2huZXNzIiAKCQkJCXVpID0geyAKCQkJCQltYXggPSAxLjAgCgkJCQkJbWluID0gMC4wIAoJCQkJCXN0ZXAgPSAwLjAxIAoJCQkJCW9yZGVyID0gMjIgCgkJCQl9IAoJCQkJdHlwZSA9ICJmbG9hdCIgCgkJCQl2YWx1ZSA9IDAuNSAKCQkJfSAKCQl9IAoJCWlkID0gImFiYmFhYmJhLWFiYmEtYWJiYS1hYmJhLWFiYmFhYmJhYWIyMyIgCgkJb3B0aW9ucyA9IFsgCgkJXSAKCQlwb3NpdGlvbiA9IFsgCgkJCTcwMCAKCQkJNjQwIAoJCV0gCgkJc2FtcGxlcnMgPSB7IAoJCX0gCgkJdGl0bGUgPSAiUm91Z2huZXNzIiAKCQl0eXBlID0gImNvcmUvc2hhZGVyX25vZGVzL21hdGVyaWFsX3ZhcmlhYmxlIiAKCX0gCgl7IAoJCWNvbnRlbnRfc2l6ZSA9IFsgCgkJCTE2MCAKCQkJMCAKCQldIAoJCWV4cG9ydCA9IHsgCgkJfSAKCQlpZCA9ICJhYmJhYWJiYS1hYmJhLWFiYmEtYWJiYS1hYmJhYWJiYWFiMTEiIAoJCW9wdGlvbnMgPSBbIAoJCV0gCgkJcG9zaXRpb24gPSBbIAoJCQkxMDIwIAoJCQk4NDAgCgkJXSAKCQlzYW1wbGVycyA9IHsgCgkJfSAKCQl0aXRsZSA9ICJNdWx0aXBseSIgCgkJdHlwZSA9ICJjb3JlL3NoYWRlcl9ub2Rlcy9tdWwiIAoJfSAKCXsgCgkJY29udGVudF9zaXplID0gWyAKCQkJMTYwIAoJCQkwIAoJCV0gCgkJZXhwb3J0ID0geyAKCQl9IAoJCWlkID0gImFiYmFhYmJhLWFiYmEtYWJiYS1hYmJhLWFiYmFhYmJhYWJiMiIgCgkJb3B0aW9ucyA9IFsgCgkJCSI5QTg0MjgyQi1GMUEyLTQ2RDQtOUZDNC01QTc2RkM5QjMwREQiCgkJXSAKCQlwb3NpdGlvbiA9IFsgCgkJCTc0MCAKCQkJNzgwIAoJCV0gCgkJc2FtcGxlcnMgPSB7IAoJCX0gCgkJdGl0bGUgPSAiRW1pc3NpdmUgTWFwIFN3aXRjaCIgCgkJdHlwZSA9ICJjb3JlL3NoYWRlcl9ub2Rlcy9pZiIgCgl9IAoJeyAKCQljb250ZW50X3NpemUgPSBbIAoJCQkxNjAgCgkJCTAgCgkJXSAKCQlleHBvcnQgPSB7IAoJCQltYXRlcmlhbF92YXJpYWJsZSA9IHsgCgkJCQlkaXNwbGF5X25hbWUgPSAiVXNlIEVtaXNzaXZlIE1hcCIgCgkJCQluYW1lID0gInVzZV9lbWlzc2l2ZV9tYXAiIAoJCQkJdWkgPSB7IAoJCQkJCW1heCA9IDEgCgkJCQkJbWluID0gMC4wIAoJCQkJCXN0ZXAgPSAxIAoJCQkJCW9yZGVyID0gMTQgCgkJCQkJdWlfdHlwZSA9ICJjaGVja2JveCIgCgkJCQl9IAoJCQkJdHlwZSA9ICJmbG9hdCIgCgkJCQl2YWx1ZSA9IDAuMCAKCQkJfSAKCQl9IAoJCWlkID0gImFiYmFhYmJhLWFiYmEtYWJiYS1hYmJhLWFiYmFhYmJhYWIyNSIgCgkJb3B0aW9ucyA9IFsgCgkJXSAKCQlwb3NpdGlvbiA9IFsgCgkJCTQyMCAKCQkJNzIwIAoJCV0gCgkJc2FtcGxlcnMgPSB7IAoJCX0gCgkJdGl0bGUgPSAiVXNlIEVtaXNzaXZlIE1hcCIgCgkJdHlwZSA9ICJjb3JlL3NoYWRlcl9ub2Rlcy9tYXRlcmlhbF92YXJpYWJsZSIgCgl9IAoJeyAKCQljb250ZW50X3NpemUgPSBbIAoJCQkxNjAgCgkJCTAgCgkJXSAKCQlleHBvcnQgPSB7IAoJCX0gCgkJaWQgPSAiYWJiYWFiYmEtYWJiYS1hYmJhLWFiYmEtYWJiYWFiYmFhYjEwIiAKCQlvcHRpb25zID0gWyAKCQkJIjFlMDY3NDY0LTEyZDgtNDgyNi05YjcyLWNmZDU3NjUwMDNlMyIKCQkJImZiM2Y3MDliLWE1NGEtNGU5My1hYzlmLWU5ZmM3NmZiOGJjZCIKCQkJIjVkZDU5YjNkLTE3NjItNGExNC05OTMwLTc1MDAyMzBlZjNkYiIKCQldIAoJCXBvc2l0aW9uID0gWyAKCQkJNDIwIAoJCQk3ODAgCgkJXSAKCQlzYW1wbGVycyA9IHsgCgkJCXRleHR1cmVfbWFwID0geyAKCQkJCWRpc3BsYXlfbmFtZSA9ICJFbWlzc2l2ZSBNYXAiIAoJCQkJc2xvdF9uYW1lID0gImVtaXNzaXZlX21hcCIgCgkJCQl1aSA9IHsgCgkJCQkJb3JkZXIgPSA1IAoJCQkJfSAK",
+ "CQkJfSAKCQl9IAoJCXRpdGxlID0gIkVtaXNzaXZlIE1hcCIgCgkJdHlwZSA9ICJjb3JlL3NoYWRlcl9ub2Rlcy9zYW1wbGVfdGV4dHVyZSIgCgl9IAoJeyAKCQljb250ZW50X3NpemUgPSBbIAoJCQkxNjAgCgkJCTAgCgkJXSAKCQlleHBvcnQgPSB7IAoJCQltYXRlcmlhbF92YXJpYWJsZSA9IHsgCgkJCQlkaXNwbGF5X25hbWUgPSAiRW1pc3NpdmUiIAoJCQkJbmFtZSA9ICJlbWlzc2l2ZSIgCgkJCQl1aSA9IHsgCgkJCQkJbWF4ID0gWyAxLjAgMS4wIDEuMCBdIAoJCQkJCW1pbiA9IFsgMC4wIDAuMCAwLjAgXSAKCQkJCQlzdGVwID0gWyAwLjAxIDAuMDEgMC4wMSBdIAoJCQkJCW9yZGVyID0gMjMgCgkJCQkJdWlfdHlwZSA9ICJjb2xvciIgCgkJCQl9IAoJCQkJdHlwZSA9ICJmbG9hdDMiIAoJCQkJdmFsdWUgPSBbMC4wIDAuMCAwLjBdIAoJCQl9IAoJCX0gCgkJaWQgPSAiYWJiYWFiYmEtYWJiYS1hYmJhLWFiYmEtYWJiYWFiYmFhYjI0IiAKCQlvcHRpb25zID0gWyAKCQldIAoJCXBvc2l0aW9uID0gWyAKCQkJNDIwIAoJCQk4ODAgCgkJXSAKCQlzYW1wbGVycyA9IHsgCgkJfSAKCQl0aXRsZSA9ICJFbWlzc2l2ZSIgCgkJdHlwZSA9ICJjb3JlL3NoYWRlcl9ub2Rlcy9tYXRlcmlhbF92YXJpYWJsZSIgCgl9IAoJeyAKCQljb250ZW50X3NpemUgPSBbIAoJCQkxNjAgCgkJCTAgCgkJXSAKCQlleHBvcnQgPSB7IAoJCQltYXRlcmlhbF92YXJpYWJsZSA9IHsgCgkJCQlkaXNwbGF5X25hbWUgPSAiRW1pc3NpdmUgSW50ZW5zaXR5IiAKCQkJCW5hbWUgPSAiZW1pc3NpdmVfaW50ZW5zaXR5IiAKCQkJCXVpID0geyAKCQkJCQltYXggPSAxMC4wIAoJCQkJCW1pbiA9IDAuMCAKCQkJCQlzdGVwID0gMC4wMSAKCQkJCQlvcmRlciA9IDUzIAoJCQkJfSAKCQkJCXR5cGUgPSAiZmxvYXQiIAoJCQkJdmFsdWUgPSAwLjAgCgkJCX0gCgkJfSAKCQlpZCA9ICJhYmJhYWJiYS1hYmJhLWFiYmEtYWJiYS1hYmJhYWJiYWFiMjgiIAoJCW9wdGlvbnMgPSBbIAoJCV0gCgkJcG9zaXRpb24gPSBbIAoJCQk3NDAgCgkJCTkyMCAKCQldIAoJCXNhbXBsZXJzID0geyAKCQl9IAoJCXRpdGxlID0gIkVtaXNzaXZlIEludGVuc2l0eSIgCgkJdHlwZSA9ICJjb3JlL3NoYWRlcl9ub2Rlcy9tYXRlcmlhbF92YXJpYWJsZSIgCgl9IAoJeyAKCQljb250ZW50X3NpemUgPSBbIAoJCQkxNjAgCgkJCTAgCgkJXSAKCQlleHBvcnQgPSB7IAoJCX0gCgkJaWQgPSAiYWJiYWFiYmEtYWJiYS1hYmJhLWFiYmEtYWJiYWFiYmFhYmI3IiAKCQlvcHRpb25zID0gWyAKCQkJIjlBODQyODJCLUYxQTItNDZENC05RkM0LTVBNzZGQzlCMzBERCIKCQldIAoJCXBvc2l0aW9uID0gWyAKCQkJMTAyMCAKCQkJMTEwMCAKCQldIAoJCXNhbXBsZXJzID0geyAKCQl9IAoJCXRpdGxlID0gIkFvIE1hcCBTd3RpY2giIAoJCXR5cGUgPSAiY29yZS9zaGFkZXJfbm9kZXMvaWYiIAoJfSAKCXsgCgkJY29udGVudF9zaXplID0gWyAKCQkJMTYwIAoJCQkwIAoJCV0gCgkJZXhwb3J0ID0geyAKCQkJbWF0ZXJpYWxfdmFyaWFibGUgPSB7IAoJCQkJZGlzcGxheV9uYW1lID0gIlVzZSBBbyBNYXAiIAoJCQkJbmFtZSA9ICJ1c2VfYW9fbWFwIiAKCQkJCXVpID0geyAKCQkJCQltYXggPSAxIAoJCQkJCW1pbiA9IDAuMCAKCQkJCQlzdGVwID0gMSAKCQkJCQlvcmRlciA9IDE1IAoJCQkJCXVpX3R5cGUgPSAiY2hlY2tib3giIAoJCQkJfSAKCQkJCXR5cGUgPSAiZmxvYXQiIAoJCQkJdmFsdWUgPSAxLjAgCgkJCX0gCgkJfSAKCQlpZCA9ICJhYmJhYWJiYS1hYmJhLWFiYmEtYWJiYS1hYmJhYWJiYWFiMjYiIAoJCW9wdGlvbnMgPSBbIAoJCV0gCgkJcG9zaXRpb24gPSBbIAoJCQk3MDAgCgkJCTExMDAgCgkJXSAKCQlzYW1wbGVycyA9IHsgCgkJfSAKCQl0aXRsZSA9ICJVc2UgQW8gTWFwIiAKCQl0eXBlID0gImNvcmUvc2hhZGVyX25vZGVzL21hdGVyaWFsX3ZhcmlhYmxlIiAKCX0gCgl7IAoJCWNvbnRlbnRfc2l6ZSA9IFsgCgkJCTE2MCAKCQkJMCAKCQldIAoJCWV4cG9ydCA9IHsgCgkJfSAKCQlpZCA9ICJhYmJhYWJiYS1hYmJhLWFiYmEtYWJiYS1hYmJhYWJiYWFiMjciIAoJCW9wdGlvbnMgPSBbIAoJCQkiZjY2OWEzYTYtMDM3Ni00MTg3LTg0MGUtODAwMDBlMjkzOWQ1IgoJCQkiZTk0ZTUzZTYtNDliNi00MTk0LWE3NDctOGYwNjRhNTkzMmUwIgoJCQkiNWRkNTliM2QtMTc2Mi00YTE0LTk5MzAtNzUwMDIzMGVmM2RiIgoJCV0gCgkJcG9zaXRpb24gPSBbIAoJCQk3MDAgCgkJCTExNjAgCgkJXSAKCQlzYW1wbGVycyA9IHsgCgkJCXRleHR1cmVfbWFwID0geyAKCQkJCWRpc3BsYXlfbmFtZSA9ICJBbyBNYXAiIAoJCQkJc2xvdF9uYW1lID0gImFvX21hcCIgCgkJCQl1aSA9IHsgCgkJCQkJb3JkZXIgPSA2IAoJCQkJfSAKCQkJfSAKCQl9IAoJCXRpdGxlID0gIkFvIE1hcCIgCgkJdHlwZSA9ICJjb3JlL3NoYWRlcl9ub2Rlcy9zYW1wbGVfdGV4dHVyZSIgCgl9IApdCnZlcnNpb24gPSAzCgA="
+			}
+		}
+	}
+	BindingTable: 994552656, "BindingTable::root 2", "" {
+		Version: 100
+		Properties70:  {
+			P: "TargetName", "KString", "", "", "root"
+			P: "TargetType", "KString", "", "", "shader"
+		}
+		Entry: "Maya|use_metallic_map", "FbxPropertyEntry", "use_metallic_map", "FbxSemanticEntry"
+		Entry: "Maya|base_color", "FbxPropertyEntry", "base_color", "FbxSemanticEntry"
+		Entry: "Maya|use_ao_map", "FbxPropertyEntry", "use_ao_map", "FbxSemanticEntry"
+		Entry: "Maya|TEX_emissive_map", "FbxPropertyEntry", "TEX_emissive_map", "FbxSemanticEntry"
+		Entry: "Maya|TEX_metallic_map", "FbxPropertyEntry", "TEX_metallic_map", "FbxSemanticEntry"
+		Entry: "Maya|TEX_ao_map", "FbxPropertyEntry", "TEX_ao_map", "FbxSemanticEntry"
+		Entry: "Maya|uv_offset", "FbxPropertyEntry", "uv_offset", "FbxSemanticEntry"
+		Entry: "Maya|emissive_intensity", "FbxPropertyEntry", "emissive_intensity", "FbxSemanticEntry"
+		Entry: "Maya|metallic", "FbxPropertyEntry", "metallic", "FbxSemanticEntry"
+		Entry: "Maya|TEX_global_specular_cube", "FbxPropertyEntry", "TEX_global_specular_cube", "FbxSemanticEntry"
+		Entry: "Maya|use_roughness_map", "FbxPropertyEntry", "use_roughness_map", "FbxSemanticEntry"
+		Entry: "Maya|use_normal_map", "FbxPropertyEntry", "use_normal_map", "FbxSemanticEntry"
+		Entry: "Maya|use_color_map", "FbxPropertyEntry", "use_color_map", "FbxSemanticEntry"
+		Entry: "Maya|emissive", "FbxPropertyEntry", "emissive", "FbxSemanticEntry"
+		Entry: "Maya|use_emissive_map", "FbxPropertyEntry", "use_emissive_map", "FbxSemanticEntry"
+		Entry: "Maya|uv_scale", "FbxPropertyEntry", "uv_scale", "FbxSemanticEntry"
+		Entry: "Maya|TEX_global_diffuse_cube", "FbxPropertyEntry", "TEX_global_diffuse_cube", "FbxSemanticEntry"
+		Entry: "Maya|TEX_roughness_map", "FbxPropertyEntry", "TEX_roughness_map", "FbxSemanticEntry"
+		Entry: "Maya|roughness", "FbxPropertyEntry", "roughness", "FbxSemanticEntry"
+		Entry: "Maya|TEX_brdf_lut", "FbxPropertyEntry", "TEX_brdf_lut", "FbxSemanticEntry"
+		Entry: "Maya|TEX_color_map", "FbxPropertyEntry", "TEX_color_map", "FbxSemanticEntry"
+		Entry: "Maya|TEX_normal_map", "FbxPropertyEntry", "TEX_normal_map", "FbxSemanticEntry"
+	}
+	AnimationStack: 1971005888, "AnimStack::Take 001", "" {
+		Properties70:  {
+			P: "LocalStart", "KTime", "Time", "",1924423250
+			P: "LocalStop", "KTime", "Time", "",230930790000
+			P: "ReferenceStart", "KTime", "Time", "",1924423250
+			P: "ReferenceStop", "KTime", "Time", "",230930790000
+		}
+	}
+	AnimationLayer: 362989216, "AnimLayer::BaseLayer", "" {
+	}
+}
+
+; Object connections
+;------------------------------------------------------------------
+
+Connections:  {
+	
+	;Model::HiFi_Xylophone1, Model::RootNode
+	C: "OO",363536144,0
+	
+	;Model::Wave, Model::RootNode
+	C: "OO",363501344,0
+	
+	;AnimLayer::BaseLayer, AnimStack::Take 001
+	C: "OO",362989216,1971005888
+	
+	;NodeAttribute::, Model::HiFi_Xylophone1
+	C: "OO",1611246784,363536144
+	
+	;Model::Frame, Model::HiFi_Xylophone1
+	C: "OO",363538464,363536144
+	
+	;NodeAttribute::, Model::Frame
+	C: "OO",1611245728,363538464
+	
+	;Model::Wave, Model::Frame
+	C: "OO",363550064,363538464
+	
+	;Model::transform1, Model::Frame
+	C: "OO",363503664,363538464
+	
+	;NodeAttribute::, Model::Wave
+	C: "OO",1611246608,363550064
+	
+	;Model::transform2, Model::Wave
+	C: "OO",363517584,363550064
+	
+	;NodeAttribute::, Model::transform2
+	C: "OO",1611246256,363517584
+	
+	;NodeAttribute::, Model::transform1
+	C: "OO",1611247136,363503664
+	
+	;Texture::file1, Material::Steel
+	C: "OP",1971096816,1611742192, "Maya|TEX_global_diffuse_cube"
+	
+	;Texture::file2, Material::Steel
+	C: "OP",1982230336,1611742192, "Maya|TEX_global_specular_cube"
+	
+	;Texture::file3, Material::Steel
+	C: "OP",1612282368,1611742192, "Maya|TEX_brdf_lut"
+	
+	;Texture::file5, Material::Steel
+	C: "OP",1612283328,1611742192, "Maya|TEX_normal_map"
+	
+	;Texture::file4, Material::Steel
+	C: "OP",1612282848,1611742192, "Maya|TEX_color_map"
+	
+	;Texture::file6, Material::Steel
+	C: "OP",1982231296,1611742192, "Maya|TEX_metallic_map"
+	
+	;Texture::file7, Material::Steel
+	C: "OP",1531689904,1611742192, "Maya|TEX_roughness_map"
+	
+	;Texture::file8, Material::Steel
+	C: "OP",1982230816,1611742192, "Maya|TEX_ao_map"
+	
+	;Material::Steel, Implementation::Steel_Implementation
+	C: "OO",1611742192,1981166160
+	
+	;BindingTable::root 2, Implementation::Steel_Implementation
+	C: "OO",994552656,1981166160
+	
+	;Video::file6, Texture::file6
+	C: "OO",1971809008,1982231296
+	
+	;Video::file7, Texture::file7
+	C: "OO",1971833408,1531689904
+	
+	;Video::file4, Texture::file4
+	C: "OO",1971825008,1612282848
+	
+	;Video::file5, Texture::file5
+	C: "OO",1971829008,1612283328
+	
+	;Geometry::, Model::Wave
+	C: "OO",1983184160,363501344
+	
+	;Material::Steel, Model::Wave
+	C: "OO",1611742192,363501344
+}
+;Takes section
+;----------------------------------------------------
+
+Takes:  {
+	Current: "Take 001"
+	Take: "Take 001" {
+		FileName: "Take_001.tak"
+		LocalTime: 1924423250,230930790000
+		ReferenceTime: 1924423250,230930790000
+	}
+}
diff --git a/unpublishedScripts/marketplace/xylophone/xylophoneFrameWithWave_Steel_BaseColor.png b/unpublishedScripts/marketplace/xylophone/xylophoneFrameWithWave_Steel_BaseColor.png
new file mode 100644
index 0000000000..b40708b99d
Binary files /dev/null and b/unpublishedScripts/marketplace/xylophone/xylophoneFrameWithWave_Steel_BaseColor.png differ
diff --git a/unpublishedScripts/marketplace/xylophone/xylophoneFrameWithWave_Steel_Metallic.png b/unpublishedScripts/marketplace/xylophone/xylophoneFrameWithWave_Steel_Metallic.png
new file mode 100644
index 0000000000..7c14baf4fc
Binary files /dev/null and b/unpublishedScripts/marketplace/xylophone/xylophoneFrameWithWave_Steel_Metallic.png differ
diff --git a/unpublishedScripts/marketplace/xylophone/xylophoneFrameWithWave_Steel_Normal.png b/unpublishedScripts/marketplace/xylophone/xylophoneFrameWithWave_Steel_Normal.png
new file mode 100644
index 0000000000..e4359d0d76
Binary files /dev/null and b/unpublishedScripts/marketplace/xylophone/xylophoneFrameWithWave_Steel_Normal.png differ
diff --git a/unpublishedScripts/marketplace/xylophone/xylophoneFrameWithWave_Steel_Roughness.png b/unpublishedScripts/marketplace/xylophone/xylophoneFrameWithWave_Steel_Roughness.png
new file mode 100644
index 0000000000..b8fd8f8aac
Binary files /dev/null and b/unpublishedScripts/marketplace/xylophone/xylophoneFrameWithWave_Steel_Roughness.png differ
diff --git a/unpublishedScripts/marketplace/xylophone/xylophoneKey.js b/unpublishedScripts/marketplace/xylophone/xylophoneKey.js
new file mode 100644
index 0000000000..3d131252c8
--- /dev/null
+++ b/unpublishedScripts/marketplace/xylophone/xylophoneKey.js
@@ -0,0 +1,99 @@
+//
+//  xylophoneKey.js
+//
+//  Created by Patrick Gosch on 03/28/2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+(function() {
+    var TIMEOUT = 50; // at 30 ms, the key's color sometimes fails to switch when hit
+    var TEXTURE_GRAY = Script.resolvePath("xylotex_bar_gray.png");
+    var TEXTURE_BLACK = Script.resolvePath("xylotex_bar_black.png");
+    var IS_DEBUG = false;
+    var _this;
+ 
+    function XylophoneKey() {
+        _this = this;
+    }
+
+    XylophoneKey.prototype = {
+        sound: null,
+        isWaiting: false,
+        homePosition: null,
+        injector: null,
+
+        preload: function(entityID) {
+            _this.entityID = entityID;
+            var soundURL = Script.resolvePath(JSON.parse(Entities.getEntityProperties(_this.entityID, ["userData"]).userData).soundFile);
+            _this.sound = SoundCache.getSound(soundURL);
+            Entities.editEntity(_this.entityID, {dimensions: {x: 0.15182036161422729, y: 0.049085158854722977, z: 0.39702033996582031}});
+        },
+
+        collisionWithEntity: function(thisEntity, otherEntity, collision) {
+            if (collision.type === 0) {
+                _this.hit(otherEntity);                
+            }
+        },
+
+        clickDownOnEntity: function(otherEntity) {
+            _this.hit(otherEntity);
+        },
+
+        hit: function(otherEntity) {
+            if (!_this.isWaiting) {
+                _this.isWaiting = true;
+                _this.homePosition = Entities.getEntityProperties(_this.entityID, ["position"]).position;
+                _this.injector = Audio.playSound(_this.sound, {position: _this.homePosition, volume: 1});
+                _this.editEntityTextures(_this.entityID, "file5", TEXTURE_GRAY);
+                
+                var HAPTIC_STRENGTH = 1;
+                var HAPTIC_DURATION = 20;                
+                var userData = JSON.parse(Entities.getEntityProperties(otherEntity, 'userData').userData);
+                if (userData.hasOwnProperty('hand')){
+                    Controller.triggerHapticPulse(HAPTIC_STRENGTH, HAPTIC_DURATION, userData.hand);
+                }
+
+                _this.timeout();
+            }
+        },
+
+        timeout: function() {
+            Script.setTimeout(function() {
+                _this.editEntityTextures(_this.entityID, "file5", TEXTURE_BLACK);
+                _this.isWaiting = false;
+            }, TIMEOUT);
+        },
+
+        getEntityTextures: function(id) {
+            var results = null;
+            var properties = Entities.getEntityProperties(id, "textures");
+            if (properties.textures) { 
+                try {
+                    results = JSON.parse(properties.textures);
+                } catch (err) {
+                    if (IS_DEBUG) {
+                        print(err);
+                        print(properties.textures);
+                    }
+                }
+            }
+            return results ? results : {};
+        },
+
+        setEntityTextures: function(id, textureList) {
+            var json = JSON.stringify(textureList);
+            Entities.editEntity(id, {textures: json});
+        },
+
+        editEntityTextures: function(id, textureName, textureURL) {
+            var textureList = _this.getEntityTextures(id);
+            textureList[textureName] = textureURL;
+            _this.setEntityTextures(id, textureList);
+        }
+    };
+
+    return new XylophoneKey();
+});
diff --git a/unpublishedScripts/marketplace/xylophone/xylophoneMallet.js b/unpublishedScripts/marketplace/xylophone/xylophoneMallet.js
new file mode 100644
index 0000000000..061d1303bb
--- /dev/null
+++ b/unpublishedScripts/marketplace/xylophone/xylophoneMallet.js
@@ -0,0 +1,25 @@
+//
+//  xylophoneMallet.js
+//
+//  Created by Johnathan Franck on 07/30/2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+
+(function() {
+    function XylophoneMallet() {
+    }
+
+    XylophoneMallet.prototype = {
+        startEquip: function(entityID, args) {
+            var LEFT_HAND = 0;
+            var RIGHT_HAND = 1;
+            var userData = JSON.parse(Entities.getEntityProperties(entityID, 'userData').userData);
+            userData.hand = args[0] === "left" ? LEFT_HAND : RIGHT_HAND;
+            Entities.editEntity(entityID, {userData: JSON.stringify(userData)});
+        }
+    };
+
+    return new XylophoneMallet();
+});
diff --git a/unpublishedScripts/marketplace/xylophone/xylophoneRezzer.js b/unpublishedScripts/marketplace/xylophone/xylophoneRezzer.js
new file mode 100644
index 0000000000..6adf8710a7
--- /dev/null
+++ b/unpublishedScripts/marketplace/xylophone/xylophoneRezzer.js
@@ -0,0 +1,129 @@
+//
+//  xylophoneRezzer.js
+//
+//  Created by Patrick Gosch on 03/28/2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+var SOUND_FILES = ["C4.wav", "D4.wav", "E4.wav", "F4.wav", "G4.wav", "A4.wav", "B4.wav", "C5.wav"];
+var KEY_MODEL_URL = Script.resolvePath("xyloKey_2_a_e.fbx");
+var KEY_SCRIPT_URL = Script.resolvePath("xylophoneKey.js");
+var MALLET_SCRIPT_URL = Script.resolvePath("xylophoneMallet.js");
+var TEXTURE_BLACK = Script.resolvePath("xylotex_bar_black.png");
+var MALLET_MODEL_URL = Script.resolvePath("Mallet3-2pc.fbx");
+var MALLET_MODEL_COLLIDER_URL = Script.resolvePath("Mallet3-2bpc_phys.obj");
+var FORWARD = { x: 0, y: 0, z: -1 };
+var center = MyAvatar.position;
+
+var XYLOPHONE_FORWARD_OFFSET = 0.8;
+var xylophoneFramePosition = Vec3.sum(center, Vec3.multiply(FORWARD, XYLOPHONE_FORWARD_OFFSET));
+var xylophoneFrameID = Entities.addEntity({
+    name: "Xylophone",
+    type: "Model",
+    modelURL: Script.resolvePath("xylophoneFrameWithWave.fbx"),
+    position: xylophoneFramePosition,
+    rotation: Quat.fromVec3Radians({ x: 0, y: Math.PI, z: 0 }),
+    shapeType: "static-mesh"
+});
+
+var KEY_Y_OFFSET = 0.45;
+center.y += KEY_Y_OFFSET;
+var keyPosition, keyRotation, userData, textureData, keyID;
+var ROTATION_START = 0.9;
+var ROTATION_DELTA = 0.2;
+for (var i = 1; i <= SOUND_FILES.length; i++) {
+    
+    keyRotation = Quat.fromVec3Radians({ x: 0, y: ROTATION_START - (i*ROTATION_DELTA), z: 0 });
+    keyPosition = Vec3.sum(center, Vec3.multiplyQbyV(keyRotation, FORWARD));
+
+    userData = {
+        soundFile: SOUND_FILES[i-1]
+    };
+
+    textureData = {
+        "file4": Script.resolvePath("xylotex_bar" + i + ".png"),
+        "file5": TEXTURE_BLACK
+    };
+
+    keyID = Entities.addEntity({
+        name: ("XyloKey" + i),
+        type: "Model",
+        modelURL: KEY_MODEL_URL,
+        position: keyPosition,
+        rotation: keyRotation,
+        shapeType: "static-mesh",
+        script: KEY_SCRIPT_URL,
+        textures: JSON.stringify(textureData),
+        userData: JSON.stringify(userData),
+        parentID: xylophoneFrameID
+    });
+}
+
+// if rezzed on/above something, wait until after model has loaded so you can read its dimensions then move object on to that surface.
+var pickRay = {origin: center, direction: {x: 0, y: -1, z: 0}};
+var intersection = Entities.findRayIntersection(pickRay, true);
+if (intersection.intersects && (intersection.distance < 10)) {
+    var surfaceY = intersection.intersection.y;
+    Script.setTimeout( function() {
+        // should add loop to check for fbx loaded instead of delay
+        var xylophoneDimensions = Entities.getEntityProperties(xylophoneFrameID, ["dimensions"]).dimensions;
+        xylophoneFramePosition.y = surfaceY + (xylophoneDimensions.y/2);
+        Entities.editEntity(xylophoneFrameID, {position: xylophoneFramePosition});
+        rezMallets();
+    }, 2000);
+} else {
+    print("No surface detected.");
+    rezMallets();
+}
+
+function rezMallets() {
+    var malletProperties = {
+        name: "Xylophone Mallet",
+        type: "Model",
+        modelURL: MALLET_MODEL_URL,
+        compoundShapeURL: MALLET_MODEL_COLLIDER_URL,
+        collidesWith: "static,dynamic,kinematic",
+        collisionMask: 7,
+        collisionsWillMove: 1,
+        dynamic: 1,
+        damping: 1,
+        angularDamping: 1,
+        shapeType: "compound",
+        script: MALLET_SCRIPT_URL,
+        userData: JSON.stringify({
+            grabbableKey: {
+                invertSolidWhileHeld: true
+            },
+            wearable: {
+                joints: {
+                    LeftHand: [
+                        { x: 0, y: 0.2, z: 0.04 },
+                        Quat.fromVec3Degrees({ x: 0, y: 90, z: 90 })
+                    ],
+                    RightHand: [
+                        { x: 0, y: 0.2, z: 0.04 },
+                        Quat.fromVec3Degrees({ x: 0, y: 90, z: 90 })
+                    ]
+                }
+            }
+        }),
+        dimensions: { "x": 0.057845603674650192, "y": 0.057845607399940491, "z": 0.30429631471633911 } // not being set from fbx for some reason.
+    };
+
+    var LEFT_MALLET_POSITION = { x: 0.1, y: 0.55, z: 0 };
+    var LEFT_MALLET_ROTATION = { x: 0, y: Math.PI - 0.1, z: 0 };
+    var RIGHT_MALLET_POSITION = { x: -0.1, y: 0.55, z: 0 };
+    var RIGHT_MALLET_ROTATION = { x: 0, y: Math.PI + 0.1, z: 0 };
+
+    malletProperties.position = Vec3.sum(xylophoneFramePosition, LEFT_MALLET_POSITION);
+    malletProperties.rotation = Quat.fromVec3Radians(LEFT_MALLET_ROTATION);
+    Entities.addEntity(malletProperties);
+
+    malletProperties.position = Vec3.sum(xylophoneFramePosition, RIGHT_MALLET_POSITION);
+    malletProperties.rotation = Quat.fromVec3Radians(RIGHT_MALLET_ROTATION);
+    Entities.addEntity(malletProperties);
+    Script.stop();
+}
\ No newline at end of file
diff --git a/unpublishedScripts/marketplace/xylophone/xylotex_bar1.png b/unpublishedScripts/marketplace/xylophone/xylotex_bar1.png
new file mode 100644
index 0000000000..2651d86f95
Binary files /dev/null and b/unpublishedScripts/marketplace/xylophone/xylotex_bar1.png differ
diff --git a/unpublishedScripts/marketplace/xylophone/xylotex_bar2.png b/unpublishedScripts/marketplace/xylophone/xylotex_bar2.png
new file mode 100644
index 0000000000..606c193c98
Binary files /dev/null and b/unpublishedScripts/marketplace/xylophone/xylotex_bar2.png differ
diff --git a/unpublishedScripts/marketplace/xylophone/xylotex_bar3.png b/unpublishedScripts/marketplace/xylophone/xylotex_bar3.png
new file mode 100644
index 0000000000..2d94465b48
Binary files /dev/null and b/unpublishedScripts/marketplace/xylophone/xylotex_bar3.png differ
diff --git a/unpublishedScripts/marketplace/xylophone/xylotex_bar4.png b/unpublishedScripts/marketplace/xylophone/xylotex_bar4.png
new file mode 100644
index 0000000000..b6408ba30b
Binary files /dev/null and b/unpublishedScripts/marketplace/xylophone/xylotex_bar4.png differ
diff --git a/unpublishedScripts/marketplace/xylophone/xylotex_bar5.png b/unpublishedScripts/marketplace/xylophone/xylotex_bar5.png
new file mode 100644
index 0000000000..e860df384e
Binary files /dev/null and b/unpublishedScripts/marketplace/xylophone/xylotex_bar5.png differ
diff --git a/unpublishedScripts/marketplace/xylophone/xylotex_bar6.png b/unpublishedScripts/marketplace/xylophone/xylotex_bar6.png
new file mode 100644
index 0000000000..5eee08be3d
Binary files /dev/null and b/unpublishedScripts/marketplace/xylophone/xylotex_bar6.png differ
diff --git a/unpublishedScripts/marketplace/xylophone/xylotex_bar7.png b/unpublishedScripts/marketplace/xylophone/xylotex_bar7.png
new file mode 100644
index 0000000000..fe196d1db3
Binary files /dev/null and b/unpublishedScripts/marketplace/xylophone/xylotex_bar7.png differ
diff --git a/unpublishedScripts/marketplace/xylophone/xylotex_bar8.png b/unpublishedScripts/marketplace/xylophone/xylotex_bar8.png
new file mode 100644
index 0000000000..0548162878
Binary files /dev/null and b/unpublishedScripts/marketplace/xylophone/xylotex_bar8.png differ
diff --git a/unpublishedScripts/marketplace/xylophone/xylotex_bar_black.png b/unpublishedScripts/marketplace/xylophone/xylotex_bar_black.png
new file mode 100644
index 0000000000..ea9ccdb5c0
Binary files /dev/null and b/unpublishedScripts/marketplace/xylophone/xylotex_bar_black.png differ
diff --git a/unpublishedScripts/marketplace/xylophone/xylotex_bar_gray.png b/unpublishedScripts/marketplace/xylophone/xylotex_bar_gray.png
new file mode 100644
index 0000000000..bc886c1d46
Binary files /dev/null and b/unpublishedScripts/marketplace/xylophone/xylotex_bar_gray.png differ
diff --git a/unpublishedScripts/parent-ator/createParentator.js b/unpublishedScripts/parent-ator/createParentator.js
new file mode 100644
index 0000000000..470b7d1845
--- /dev/null
+++ b/unpublishedScripts/parent-ator/createParentator.js
@@ -0,0 +1,66 @@
+//  createParentator.js
+//
+//  Script Type: Entity Spawner
+//  Created by Jeff Moyes on 6/30/2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  This script creates a gun-looking item that, when tapped on an entity, and then a second entity, sets the second entity as the paernt of the first
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+var scriptURL = Script.resolvePath('parentator.js');
+var MODEL_URL = Script.resolvePath('resources/Parent-Tool-Production.fbx');
+var COLLISION_HULL_URL = Script.resolvePath('resources/Parent-Tool-CollisionHull.obj');
+
+// the fbx model needs to be rotated from where it would naturally face when it first initializes
+var ROT_Y_180 = {x: 0, y: 1, z: 0, w: 0};
+var START_ROTATION = Quat.normalize(Quat.multiply(Camera.getOrientation(), ROT_Y_180));
+var START_POSITION = Vec3.sum(Vec3.sum(MyAvatar.position, { x: 0, y: 0.5, z: 0 }), Vec3.multiply(0.7, Quat.getForward(Camera.getOrientation())));
+
+
+
+var parentator = Entities.addEntity({
+    name: "Parent-ator",
+    type: "Model",
+    modelURL: MODEL_URL,
+    shapeType: 'compound',
+    compoundShapeURL: COLLISION_HULL_URL,
+    dynamic: true,
+	damping: 0.9,
+    script: scriptURL,
+    dimensions: {
+        x: 0.1270,
+        y: 0.2715,
+        z: 0.4672
+    },
+    position: START_POSITION,
+    rotation: START_ROTATION,
+
+
+    userData: JSON.stringify({
+        "grabbableKey": {"grabbable": true},
+        "equipHotspots": [
+            {
+                "position": {"x": 0.0, "y": 0.0, "z": -0.170 },
+                "radius": 0.15,
+                "joints":{
+                    "RightHand":[
+                        {"x":0.05, "y":0.25, "z":0.03},
+                        {"x":-0.5, "y":-0.5, "z":-0.5, "w":0.5}
+                    ],
+                    "LeftHand":[
+                        {"x":-0.05, "y":0.25, "z":0.03},
+                        {"x":-0.5, "y":0.5, "z":0.5, "w":0.5}
+                    ]
+                }
+            }
+        ]
+    })
+});
+
+
+function cleanUp() {
+  Entities.deleteEntity(parentator);
+}
+Script.scriptEnding.connect(cleanUp);
\ No newline at end of file
diff --git a/unpublishedScripts/parent-ator/parentator.js b/unpublishedScripts/parent-ator/parentator.js
new file mode 100644
index 0000000000..546ac38ba1
--- /dev/null
+++ b/unpublishedScripts/parent-ator/parentator.js
@@ -0,0 +1,152 @@
+//  parentator.js
+//
+//  Script Type: Entity
+//  Created by Jeff Moyes on 6/30/2017
+//  Copyright 2017 High Fidelity, Inc.
+//
+//  This script allows users to parent one object to another via the "parent-ator" entity
+//  (which looks like a purple gun-like object). The user:
+//  1) equips their avatar with this parent-ator,
+//  2) taps the end of the parent-ator on an entity (which becomes the child entity), and
+//  3) taps the end of the parent-ator on a second entity (which becomes the parent entity)
+//
+//  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 MESSAGE_0_TEXTURE_URL = Script.resolvePath( 'resources/message-0-off.png' );
+    var MESSAGE_1_TEXTURE_URL = Script.resolvePath( 'resources/message-1-start.png' );
+    var MESSAGE_2_TEXTURE_URL = Script.resolvePath( 'resources/message-2-noperms.png' );
+    var MESSAGE_3_TEXTURE_URL = Script.resolvePath( 'resources/message-3-tryagain.png' );
+    var MESSAGE_4_TEXTURE_URL = Script.resolvePath( 'resources/message-4-setparent.png' );
+    var MESSAGE_5_TEXTURE_URL = Script.resolvePath( 'resources/message-5-success.png' );
+
+    var SOUND_1_URL = Script.resolvePath( 'resources/parent-tool-sound1.wav' );
+    var SOUND_2_URL = Script.resolvePath( 'resources/parent-tool-sound2.wav' );
+    var SOUND_ERROR_URL = Script.resolvePath( 'resources/parent-tool-sound-error.wav' );
+    var SOUND_SUCCESS_URL = Script.resolvePath( 'resources/parent-tool-sound-success.wav' );
+    var SOUND_1, SOUND_2, SOUND_ERROR, SOUND_SUCCESS;
+    var childEntityID, parentEntityID;
+    var active = false;
+
+
+
+
+    function Parentator() {
+        return;
+    }
+
+    Parentator.prototype.turnOff = function() {
+        childEntityID = 0;
+        parentEntityID = 0;
+        this.active = false;
+        Entities.editEntity( this.entityID, { textures: JSON.stringify({ "texture-message": MESSAGE_0_TEXTURE_URL }) });
+    }
+
+    Parentator.prototype.turnOn = function() {
+        childEntityID = 0;
+        parentEntityID = 0;
+        this.active = true;
+        if (Entities.canRez()) {
+            Entities.editEntity( this.entityID, { textures: JSON.stringify({ "texture-message": MESSAGE_1_TEXTURE_URL }) });
+            this.playSoundAtCurrentPosition( SOUND_1 );
+        } else {
+            Entities.editEntity( this.entityID, { textures: JSON.stringify({ "texture-message": MESSAGE_2_TEXTURE_URL }) });
+            this.playSoundAtCurrentPosition( SOUND_ERROR );
+        }
+    }
+
+
+    Parentator.prototype.preload = function( entityID ) {
+        this.entityID = entityID;
+        SOUND_1 = SoundCache.getSound( SOUND_1_URL );
+        SOUND_2 = SoundCache.getSound( SOUND_2_URL );
+        SOUND_ERROR = SoundCache.getSound( SOUND_ERROR_URL );
+        SOUND_SUCCESS = SoundCache.getSound( SOUND_SUCCESS_URL );
+
+        // Makue sure it's off
+        this.turnOff();
+    }
+
+    Parentator.prototype.startEquip = function( args ) {
+        this.hand = args[0];
+        this.turnOn();
+    }
+
+
+    Parentator.prototype.releaseEquip = function( args ) {
+        this.hand = undefined;
+        this.turnOff();
+    }
+
+    Parentator.prototype.collisionWithEntity = function( parentatorID, collidedID, collisionInfo ) {
+        if ( this.active ) {
+            // We don't want to be able to select Lights, Zone, and Particles but they are not collidable anyway so we don't have to worry about them
+            var collidedEntityProperties = Entities.getEntityProperties( collidedID );
+
+            if ( !Entities.canRez() ) {
+                Entities.editEntity( this.entityID, { textures: JSON.stringify({ "texture-message": MESSAGE_2_TEXTURE_URL }) });
+                this.playSoundAtCurrentPosition( SOUND_ERROR );
+            }
+
+            // User has just reclicked the first entity (or it's 'bounced')
+            if ( childEntityID == collidedID ) {
+                return;
+            }
+
+            if ( collidedEntityProperties.locked ) {
+                Entities.editEntity( this.entityID, { textures: JSON.stringify({ "texture-message": MESSAGE_3_TEXTURE_URL }) });
+                this.playSoundAtCurrentPosition( SOUND_ERROR );
+                return;
+            }
+
+            // If no entity has been chosen
+            if ( childEntityID == 0 ) {
+                childEntityID = collidedID;
+
+                // if there is a parentID, remove it
+                if ( collidedEntityProperties.parentID != "{00000000-0000-0000-0000-000000000000}" ) {
+                    Entities.editEntity( collidedID, { parentID: "{00000000-0000-0000-0000-000000000000}" });
+                }
+
+                if ( collidedEntityProperties.dynamic ) {
+                    Entities.editEntity( collidedID, { dynamic: false });
+                }
+
+                Entities.editEntity( this.entityID, { textures: JSON.stringify({ "texture-message": MESSAGE_4_TEXTURE_URL }) });
+                this.playSoundAtCurrentPosition( SOUND_2 );
+            } else {
+                parentEntityID = collidedID;
+                this.setParent();
+            }
+        }
+    }
+
+    Parentator.prototype.setParent = function() {
+        var _this = this;
+        Entities.editEntity( childEntityID, { parentID: parentEntityID });
+        Entities.editEntity( this.entityID, { textures: JSON.stringify({ "texture-message": MESSAGE_5_TEXTURE_URL }) });
+        this.playSoundAtCurrentPosition( SOUND_SUCCESS );
+        Script.setTimeout( function() {
+            _this.turnOn();     // reset
+        }, 5000 );
+    }
+
+    Parentator.prototype.playSoundAtCurrentPosition = function( sound ) {
+        var audioProperties = {
+            volume: 0.3,
+            position: Entities.getEntityProperties( this.entityID ).position,
+            localOnly: true
+        }
+        Audio.playSound( sound, audioProperties );
+    }
+
+    Parentator.prototype.unload = function () {
+        Entities.deleteEntity( this.entityID );
+    }
+
+    // entity scripts always need to return a newly constructed object of our type
+    return new Parentator();
+});
diff --git a/unpublishedScripts/parent-ator/resources/Parent-Tool-CollisionHull.obj b/unpublishedScripts/parent-ator/resources/Parent-Tool-CollisionHull.obj
new file mode 100644
index 0000000000..0daf822605
--- /dev/null
+++ b/unpublishedScripts/parent-ator/resources/Parent-Tool-CollisionHull.obj
@@ -0,0 +1,38 @@
+# Blender v2.78 (sub 5) OBJ File: 'untitled.blend'
+# www.blender.org
+mtllib Parent-Tool-CollisionHull.mtl
+o Cube.001
+v -0.153045 -0.072355 0.173769
+v -0.153045 0.040882 0.173769
+v -0.067387 0.040882 0.029156
+v -0.067387 -0.072355 0.029156
+v 0.062301 0.040882 0.029156
+v 0.062301 -0.072355 0.029156
+v 0.147960 -0.072355 0.173769
+v 0.147960 0.040882 0.173769
+v 0.147960 0.026770 0.337324
+v 0.147960 -0.047896 0.337324
+v -0.153045 0.026770 0.337324
+v -0.153045 -0.047896 0.337324
+vn -0.8604 0.0000 -0.5096
+vn 0.0000 0.0000 -1.0000
+vn 1.0000 0.0000 0.0000
+vn 0.0000 0.0000 1.0000
+vn 0.0000 -0.9890 0.1479
+vn 0.0000 0.9963 0.0860
+vn 0.0000 1.0000 0.0000
+vn 0.0000 -1.0000 -0.0000
+vn 0.8604 0.0000 -0.5096
+vn -1.0000 -0.0000 0.0000
+usemtl None
+s 1
+f 1//1 2//1 3//1 4//1
+f 4//2 3//2 5//2 6//2
+f 7//3 8//3 9//3 10//3
+f 10//4 9//4 11//4 12//4
+f 1//5 7//5 10//5 12//5
+f 8//6 2//6 11//6 9//6
+f 5//7 3//7 2//7 8//7
+f 4//8 6//8 7//8 1//8
+f 6//9 5//9 8//9 7//9
+f 12//10 11//10 2//10 1//10
diff --git a/unpublishedScripts/parent-ator/resources/Parent-Tool-Production.fbx b/unpublishedScripts/parent-ator/resources/Parent-Tool-Production.fbx
new file mode 100644
index 0000000000..3261bf62fd
Binary files /dev/null and b/unpublishedScripts/parent-ator/resources/Parent-Tool-Production.fbx differ
diff --git a/unpublishedScripts/parent-ator/resources/message-0-off.png b/unpublishedScripts/parent-ator/resources/message-0-off.png
new file mode 100644
index 0000000000..4985c8fda7
Binary files /dev/null and b/unpublishedScripts/parent-ator/resources/message-0-off.png differ
diff --git a/unpublishedScripts/parent-ator/resources/message-1-start.png b/unpublishedScripts/parent-ator/resources/message-1-start.png
new file mode 100644
index 0000000000..43bf1654e6
Binary files /dev/null and b/unpublishedScripts/parent-ator/resources/message-1-start.png differ
diff --git a/unpublishedScripts/parent-ator/resources/message-2-noperms.png b/unpublishedScripts/parent-ator/resources/message-2-noperms.png
new file mode 100644
index 0000000000..80b8f28ac2
Binary files /dev/null and b/unpublishedScripts/parent-ator/resources/message-2-noperms.png differ
diff --git a/unpublishedScripts/parent-ator/resources/message-3-tryagain.png b/unpublishedScripts/parent-ator/resources/message-3-tryagain.png
new file mode 100644
index 0000000000..e85a5e4b17
Binary files /dev/null and b/unpublishedScripts/parent-ator/resources/message-3-tryagain.png differ
diff --git a/unpublishedScripts/parent-ator/resources/message-4-setparent.png b/unpublishedScripts/parent-ator/resources/message-4-setparent.png
new file mode 100644
index 0000000000..c1e1143e0b
Binary files /dev/null and b/unpublishedScripts/parent-ator/resources/message-4-setparent.png differ
diff --git a/unpublishedScripts/parent-ator/resources/message-5-success.png b/unpublishedScripts/parent-ator/resources/message-5-success.png
new file mode 100644
index 0000000000..2ee88de911
Binary files /dev/null and b/unpublishedScripts/parent-ator/resources/message-5-success.png differ
diff --git a/unpublishedScripts/parent-ator/resources/parent-tool-sound-error.wav b/unpublishedScripts/parent-ator/resources/parent-tool-sound-error.wav
new file mode 100644
index 0000000000..47115503dc
Binary files /dev/null and b/unpublishedScripts/parent-ator/resources/parent-tool-sound-error.wav differ
diff --git a/unpublishedScripts/parent-ator/resources/parent-tool-sound-success.wav b/unpublishedScripts/parent-ator/resources/parent-tool-sound-success.wav
new file mode 100644
index 0000000000..86cdd3e1e3
Binary files /dev/null and b/unpublishedScripts/parent-ator/resources/parent-tool-sound-success.wav differ
diff --git a/unpublishedScripts/parent-ator/resources/parent-tool-sound1.wav b/unpublishedScripts/parent-ator/resources/parent-tool-sound1.wav
new file mode 100644
index 0000000000..1f0a2e6272
Binary files /dev/null and b/unpublishedScripts/parent-ator/resources/parent-tool-sound1.wav differ
diff --git a/unpublishedScripts/parent-ator/resources/parent-tool-sound2.wav b/unpublishedScripts/parent-ator/resources/parent-tool-sound2.wav
new file mode 100644
index 0000000000..3ffa826b9f
Binary files /dev/null and b/unpublishedScripts/parent-ator/resources/parent-tool-sound2.wav differ